Update to new version 5.4HEADstable/jermamaster

Signed-off-by: Thomas Duval <thomas.duval@orange.com>
Change-Id: Idcd868133d75928a1ffd74d749ce98503e0555ea

4 files changed, 1314 insertions, 0 deletions

diff --git a/old/moon_gui/static/app/policy/edit/parameter/rules/rules-edit.tpl.html b/old/moon_gui/static/app/policy/edit/parameter/rules/rules-edit.tpl.html
new file mode 100755
index 00000000..685046a5
--- /dev/null
+++ b/old/moon_gui/static/app/policy/edit/parameter/rules/rules-edit.tpl.html
@@ -0,0 +1,341 @@
+<div>
+
+    <div class="col-md-12 col-sm-12 col-xs-12">
+
+        <form ng-if="!edit.fromList" class="form-horizontal" role="form" name="edit.form">
+
+            <!-- Select Policy -->
+            <div class="form-group" ng-class="{'has-error': edit.form.policyList.$invalid && edit.form.policyList.$dirty}" >
+
+                <label for="policyList" class="col-sm-3 control-label" data-translate="moon.policy.rules.edit.action.add.policies">Policy List</label>
+
+                <div class="col-sm-6" >
+
+                    <ui-select ng-model="edit.selectedPolicy"  name="policyList" id="policyList" required>
+
+                        <ui-select-match placeholder="(None)" ng-bind="$select.selected.name"></ui-select-match>
+                        <ui-select-choices repeat="aPolicy in edit.policyList">
+                            <div ng-value="aPolicy" ng-bind="aPolicy.name"></div>
+                        </ui-select-choices>
+
+                    </ui-select>
+
+                    <div class="help-block" ng-show="edit.form.policyList.$dirty && edit.form.policyList.$invalid">
+                        <small class="error" ng-show="edit.form.policyList.$error.required" data-translate="moon.policy.rules.edit.action.add.check.policy.required">Policy is required</small>
+                    </div>
+
+                </div>
+
+            </div>
+
+            <div ng-if="!edit.selectedPolicy.meta_rules_values">
+                <div class="col-sm-6 col-sm-offset-3">
+                    <moon-loader></moon-loader>
+                </div>
+            </div>
+
+            <div ng-if="edit.selectedPolicy.meta_rules_values">
+
+                <!-- Select Meta Rules -->
+                <div class="form-group" ng-class="{'has-error': edit.form.metaRulesList.$invalid && edit.form.metaRulesList.$dirty}" >
+
+                    <label for="metaRulesList" class="col-sm-3 control-label" data-translate="moon.policy.rules.edit.action.add.metarules">MetaRules List</label>
+
+                    <div class="col-sm-6" >
+
+                        <ui-select ng-model="edit.selectedMetaRules" name="metaRulesList" id="metaRulesList" required>
+
+                            <ui-select-match placeholder="(None)" ng-bind="$select.selected.name"></ui-select-match>
+                            <ui-select-choices repeat="aMetaRules in edit.selectedPolicy.meta_rules_values">
+                                <div ng-value="aMetaRules" ng-bind="aMetaRules.name"></div>
+                            </ui-select-choices>
+
+                        </ui-select>
+
+                        <div class="help-block" ng-show="edit.form.metaRulesList.$dirty && edit.form.metaRulesList.$invalid">
+                            <small class="error" ng-show="edit.form.metaRulesList.$error.required" data-translate="moon.policy.rules.edit.action.add.check.metarules.required">A MetaRules is required</small>
+                        </div>
+
+                    </div>
+
+                    <div>
+                        <a href="" ng-if="edit.selectedMetaRules" ng-click="edit.showDetailselectedMetaRules = !edit.showDetailselectedMetaRules">
+
+                            <span ng-if="!edit.showDetailselectedMetaRules">
+                                <span data-translate="moon.policy.rules.edit.action.add.details.show">Show</span>
+                                <span class="glyphicon glyphicon-eye-open"></span>
+                            </span>
+
+                            <span ng-if="edit.showDetailselectedMetaRules">
+                                <span data-translate="moon.policy.rules.edit.action.add.details.close">Close</span>
+                                <span class="glyphicon glyphicon-eye-close"></span>
+                            </span>
+
+                        </a>
+                    </div>
+
+                </div>
+
+                <div class="form-group" ng-if="edit.showDetailselectedMetaRules && edit.selectedMetaRules">
+                    <moon-meta-data-list edit-mode="edit.editMode" meta-rule="edit.selectedMetaRules" short-display="true"></moon-meta-data-list>
+                </div>
+
+                <!-- Select Data -->
+                <div class="form-group" ng-if="edit.selectedMetaRules">
+
+                    <div class="col-md-4">
+
+                        <div ng-if="edit.selectedMetaRules.subject_categories.length > 0">
+
+                            <div class="row">
+
+                                <div ng-if="!edit.data.loadingSubjects">
+
+                                    <label for="subjectsList" class="col-sm-3 control-label" data-translate="moon.policy.rules.edit.action.add.categories.subject" data-translate-values="{ number: edit.selectedMetaRules.subject_categories.length }">Select Subject(s)</label>
+
+                                    <div class="col-sm-7" >
+
+                                        <ui-select ng-model="edit.selectedSubject" name="subjectsList" id="subjectsList" required>
+
+                                            <ui-select-match placeholder="(None)" ng-bind="$select.selected.name"></ui-select-match>
+                                            <ui-select-choices repeat="aSubject in edit.data.subjectsToBeSelected">
+                                                <div ng-value="aSubject" ng-bind="aSubject.name"></div>
+                                            </ui-select-choices>
+
+                                        </ui-select>
+
+                                        <div class="help-block" ng-show="edit.form.subjectsList.$dirty && edit.form.subjectsList.$invalid || !edit.numberOfSelectedSubjectValid">
+                                            <small class="error" ng-show="edit.form.subjectsList.$error.required || !edit.numberOfSelectedSubjectValid" data-translate="moon.policy.rules.edit.action.add.check.subject.required" data-translate-values="{ number: edit.selectedMetaRules.subject_categories.length }">Some subject are required</small>
+                                        </div>
+
+                                    </div>
+
+                                    <div class="col-sm-2 text-center">
+                                        <a href="" ng-if="edit.selectedSubject && !edit.isNumberSelectedDataAtMaximum(edit.data.subjectCST)"
+                                           ng-click="edit.addDataToRules(edit.data.subjectCST)"><span style="font-size:1.5em; line-height: 1.5em;" class="glyphicon glyphicon-plus-sign"></span></a>
+                                    </div>
+
+                                </div>
+
+                                <div ng-if="edit.data.loadingSubjects">
+
+                                    <moon-loader></moon-loader>
+
+                                </div>
+
+                            </div>
+
+                            <div class="row" ng-if="!edit.data.loadingSubjects">
+
+                                <div class="form-group">
+
+                                    <label class="col-sm-3 control-label" data-translate="moon.policy.rules.edit.action.add.selectedSubjects">Selected Subjcet(s)</label>
+
+                                    <div class="col-sm-6">
+
+                                        <ul>
+
+                                            <li ng-repeat="(key, value) in edit.data.selectedSubjectsList">
+
+                                                <span ng-bind="value.name" ></span> <a href="" ng-click="edit.removeSelectedDataFromRules(value, edit.data.subjectCST)"><span style="font-size:1.5em; line-height: 1.5em" class="glyphicon glyphicon-remove"></span></a>
+
+                                            </li>
+
+                                        </ul>
+
+                                    </div>
+
+                                </div>
+
+                            </div>
+
+                        </div>
+
+                        <div ng-if="edit.selectedMetaRules.subject_categories.length === 0">
+
+                        </div>
+
+                    </div>
+
+                    <div class="col-md-4">
+
+                        <div ng-if="edit.selectedMetaRules.object_categories.length > 0">
+
+                            <div class="row">
+
+                                <div ng-if="!edit.data.loadingObjects">
+
+                                    <label for="objectsList" class="col-sm-3 control-label" data-translate="moon.policy.rules.edit.action.add.categories.object" data-translate-values="{ number: edit.selectedMetaRules.object_categories.length }">Select Object(s)</label>
+
+                                    <div class="col-sm-7" >
+
+                                        <ui-select ng-model="edit.selectedObject" name="objectsList" id="objectsList" required>
+
+                                            <ui-select-match placeholder="(None)" ng-bind="$select.selected.value.name"></ui-select-match>
+                                            <ui-select-choices repeat="aObject in edit.data.objectsToBeSelected">
+                                                <div ng-value="aObject" ng-bind="aObject.value.name"></div>
+                                            </ui-select-choices>
+
+                                        </ui-select>
+
+                                        <div class="help-block" ng-show="edit.form.objectsList.$dirty && edit.form.objectsList.$invalid || !edit.numberOfSelectedObjecttValid">
+                                            <small class="error" ng-show="edit.form.objectsList.$error.required  || !edit.numberOfSelectedObjecttValid" data-translate="moon.policy.rules.edit.action.add.check.object.required" data-translate-values="{ number: edit.selectedMetaRules.object_categories.length }">Some objects are required</small>
+                                        </div>
+
+                                    </div>
+
+                                    <div class="col-sm-2 text-center">
+                                        <a href="" ng-if="edit.selectedObject && !edit.isNumberSelectedDataAtMaximum(edit.data.objectCST)"
+                                           ng-click="edit.addDataToRules(edit.data.objectCST)"><span style="font-size:1.5em; line-height: 1.5em;" class="glyphicon glyphicon-plus-sign"></span></a>
+                                    </div>
+
+                                </div>
+
+                                <div ng-if="edit.data.loadingObjects">
+
+                                    <moon-loader></moon-loader>
+
+                                </div>
+
+                            </div>
+
+                            <div class="row" ng-if="!edit.data.loadingObjects">
+
+                                <div class="form-group">
+
+                                    <label class="col-sm-3 control-label" data-translate="moon.policy.rules.edit.action.add.selectedObjects">Selected Objcet(s)</label>
+
+                                    <div class="col-sm-6">
+
+                                        <ul>
+
+                                            <li ng-repeat="(key, value) in edit.data.selectedObjectsList">
+
+                                                <span ng-bind="value.value.name" ></span> <a href="" ng-click="edit.removeSelectedDataFromRules(value, edit.data.objectCST)"><span style="font-size:1.5em; line-height: 1.5em" class="glyphicon glyphicon-remove"></span></a>
+
+                                            </li>
+
+                                        </ul>
+
+                                    </div>
+                                </div>
+
+                            </div>
+
+                        </div>
+
+                        <div ng-if="edit.selectedMetaRules.object_categories.length === 0">
+
+                        </div>
+
+                    </div>
+
+                    <div class="col-md-4">
+
+                        <div ng-if="edit.selectedMetaRules.action_categories.length > 0">
+
+                            <div class="row">
+
+                                <div ng-if="!edit.data.loadingActions">
+
+                                    <label for="actionsList" class="col-sm-3 control-label" data-translate="moon.policy.rules.edit.action.add.categories.action" data-translate-values="{ number: edit.selectedMetaRules.action_categories.length }">Select Action(s)</label>
+
+                                    <div class="col-sm-7" >
+
+                                        <ui-select ng-model="edit.selectedAction" name="actionsList" id="actionsList" required>
+
+                                            <ui-select-match placeholder="(None)" ng-bind="$select.selected.value.name"></ui-select-match>
+                                            <ui-select-choices repeat="aAction in edit.data.actionsToBeSelected">
+                                                <div ng-value="aAction" ng-bind="aAction.value.name"></div>
+                                            </ui-select-choices>
+
+                                        </ui-select>
+
+                                        <div class="help-block" ng-show="edit.form.actionsList.$dirty && edit.form.actionsList.$invalid || !edit.numberOfSelectedActionsValid">
+                                            <small class="error" ng-show="edit.form.actionsList.$error.required  || !edit.numberOfSelectedActionsValid" data-translate="moon.policy.rules.edit.action.add.check.action.required" data-translate-values="{ number: edit.selectedMetaRules.action_categories.length }">Some action are required</small>
+                                        </div>
+                                    </div>
+
+                                    <div class="col-sm-2 text-center">
+                                        <a href="" ng-if="edit.selectedAction && !edit.isNumberSelectedDataAtMaximum(edit.data.actionCST)"
+                                           ng-click="edit.addDataToRules(edit.data.actionCST)"><span style="font-size:1.5em; line-height: 1.5em;" class="glyphicon glyphicon-plus-sign"></span></a>
+                                    </div>
+
+                                </div>
+
+                                <div ng-if="edit.data.loadingActions">
+
+                                    <moon-loader></moon-loader>
+
+                                </div>
+
+                            </div>
+
+                            <div class="row" ng-if="!edit.data.loadingActions">
+
+                                <div class="form-group">
+
+                                    <label class="col-sm-3 control-label" data-translate="moon.policy.rules.edit.action.add.selectedActions">Selected Action(s)</label>
+
+                                    <div class="col-sm-6">
+
+                                        <ul>
+
+                                            <li ng-repeat="(key, value) in edit.data.selectedActionsList">
+
+                                                <span ng-bind="value.value.name" ></span> <a href="" ng-click="edit.removeSelectedDataFromRules(value, edit.data.actionCST)"><span style="font-size:1.5em; line-height: 1.5em" class="glyphicon glyphicon-remove"></span></a>
+
+                                            </li>
+
+                                        </ul>
+
+                                    </div>
+                                </div>
+
+                            </div>
+
+                        </div>
+
+                        <div ng-if="edit.selectedMetaRules.action_categories.length === 0">
+
+                        </div>
+
+                    </div>
+
+                </div>
+
+                <div class="form-group" ng-class="{'has-error': edit.form.instructions.$invalid && edit.form.instructions.$dirty || !edit.instructionsValid}">
+
+                    <label for="instructions" class="col-sm-3 control-label" data-translate="moon.policy.rules.edit.action.add.instructions">Instruction</label>
+
+                    <div class="col-sm-6">
+                        <textarea id="instructions" name="instructions" class="form-control" ng-model="edit.rules.instructions" rows="6" required></textarea>
+                        <div class="help-block" ng-show="edit.form.instructions.$dirty && edit.form.instructions.$invalid || !edit.instructionsValid ">
+                            <small class="error"  data-translate="moon.policy.rules.edit.action.add.check.instructions.required">An instructions is required</small>
+                        </div>
+                    </div>
+
+                </div>
+
+                <div class="form-group">
+
+                    <div class="pull-right">
+
+                        <a href="" ng-disabled="edit.loading" ng-click="edit.create()" class="btn btn-warning">
+                            <span class="glyphicon glyphicon-save"></span>
+                            <span data-translate="moon.policy.rules.edit.action.create">Create</span>
+                        </a>
+
+                        <moon-loader ng-if="edit.loading"></moon-loader>
+
+                    </div>
+
+                </div>
+
+            </div>
+
+        </form>
+
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/old/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html b/old/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html
new file mode 100755
index 00000000..7f556f93
--- /dev/null
+++ b/old/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html
@@ -0,0 +1,134 @@
+<div>
+
+    <div class="panel panel-default">
+
+        <div class="panel-heading">
+
+            <h4 data-translate="moon.policy.rules.edit.title">List of associated Subjects</h4>
+
+        </div>
+
+        <div class="panel-body">
+
+            <div class="table-responsive" data-role="table">
+
+                <table class="table table-striped table-hover" ng-table="list.table">
+
+                    <thead>
+
+                    <tr>
+
+                        <th class="customTables sortable"
+                            ng-class="{ 'sort-asc': list.table.isSortBy('description', 'asc'), 'sort-desc': list.table.isSortBy('description', 'desc') }"
+                            ng-click="list.table.sorting('description', list.table.isSortBy('description', 'asc') ? 'desc' : 'asc')">
+                            <div data-translate="moon.policy.rules.list.table.metaRule">Meta Rule</div>
+                        </th>
+
+                        <th class="customTables sortable">
+                            <div data-translate="moon.policy.rules.list.table.rule">Rule</div>
+                        </th>
+
+                        <th class="customTables sortable">
+                            <div data-translate="moon.policy.rules.list.table.instructions">Instruction</div>
+                        </th>
+
+                        <th class="customTables sortable">
+                            <div data-translate="moon.policy.rules.list.table.action.title">Actions</div>
+                        </th>
+                    </tr>
+
+                    </thead>
+
+                    <moon-loader ng-if="list.loadingRules"></moon-loader>
+
+                    <tbody ng-if="!list.loadingRules && !list.hasRules()">
+                        <tr>
+                            <td colspan="4"><span data-translate="moon.policy.rules.list.table.notFound">There is no Rules</span></td>
+                        </tr>
+                    </tbody>
+
+                    <tbody ng-if="!list.loadingRules && list.hasRules()">
+
+                    <tr ng-repeat="aRule in $data | filter:list.search.find | orderBy:sort:reverse">
+                        <td>
+                            <span ng-if="!list.getMetaRuleFromRule(aRule)">
+                                <moon-loader ng-if="!list.getMetaRuleFromRule(aRule)" ></moon-loader>
+                                <em data-translate="moon.policy.rules.list.table.loading.metaRule">Loading </em>
+                            </span>
+
+                                <span ng-if="list.getMetaRuleFromRule(aRule)">
+                                <span ng-bind="aRule.meta_rule.name"></span>
+                            </span>
+                        </td>
+
+                        <td>
+
+                            <span ng-if="!list.getMetaRuleFromRule(aRule)">
+                                <moon-loader ng-if="!list.getMetaRuleFromRule(aRule)" ></moon-loader>
+                                <em data-translate="moon.policy.rules.list.table.loading.metaRule">Loading </em>
+                            </span>
+
+                            <span ng-if="list.getMetaRuleFromRule(aRule)" ng-repeat="(key, value) in aRule.rule">
+
+                             <span ng-if="!list.getCategoryFromRuleIndex(key, aRule)">
+                                <moon-loader ng-if="!list.getCategoryFromRuleIndex(key, aRule)" ></moon-loader>
+                            </span>
+
+                            <span ng-if="list.getCategoryFromRuleIndex(key, aRule)">
+                                <span ng-if="aRule.rule_value[key].category.name" ng-bind="aRule.rule_value[key].category.name"></span>
+                                <span ng-if="aRule.rule_value[key].category.value.name" ng-bind="aRule.rule_value[key].category.value.name"></span>
+                                <span ng-if="key < aRule.rule.length-1">,</span>
+                            </span>
+
+                        </span>
+
+                        </td>
+
+                        <td>
+                            <pre ng-bind="aRule.instructions | json "></pre>
+                        </td>
+
+                        <td>
+
+                            <a href=""  ng-if="!aRule.loader" ng-click="list.deleteRules(aRule)" >
+                                <span class="glyphicon glyphicon-transfer"></span>
+                                <span class="control-label" data-translate="moon.policy.rules.list.table.action.delete">Delete</span>
+                            </a>
+
+                            <div ng-if="aRule.loader">
+
+                                <moon-loader></moon-loader>
+
+                            </div>
+
+                        </td>
+
+                    </tr>
+
+                    </tbody>
+
+                </table>
+
+            </div>
+
+        </div>
+
+    </div>
+
+    <div ng-if="list.editMode" class="panel panel-default">
+
+        <div class="panel-heading">
+
+            <h4 data-translate="moon.policy.rules.edit.action.add.title">Add a Rule</h4>
+
+        </div>
+
+        <div class="panel-body">.
+
+            <moon-rules-edit policy="list.policy"></moon-rules-edit>
+
+        </div>
+
+    </div>
+
+</div>
\ No newline at end of file
diff --git a/old/moon_gui/static/app/policy/edit/parameter/rules/rules.edit.dir.js b/old/moon_gui/static/app/policy/edit/parameter/rules/rules.edit.dir.js
new file mode 100755
index 00000000..b7bb7614
--- /dev/null
+++ b/old/moon_gui/static/app/policy/edit/parameter/rules/rules.edit.dir.js
@@ -0,0 +1,537 @@
+(function() {
+
+    'use strict';
+
+    angular
+        .module('moon')
+        .directive('moonRulesEdit', moonRulesEdit);
+
+    moonRulesEdit.$inject = [];
+
+    function moonRulesEdit() {
+
+        return {
+            templateUrl : 'html/policy/edit/parameter/rules/rules-edit.tpl.html',
+            bindToController : true,
+            controller : moonRulesEditController,
+            controllerAs : 'edit',
+            scope : {
+                policy : '='
+            },
+            restrict : 'E',
+            replace : true
+        };
+
+    }
+
+    angular
+        .module('moon')
+        .controller('moonRulesEditController', moonRulesEditController);
+
+    moonRulesEditController.$inject = ['$scope', 'rulesService', 'alertService', '$translate',
+        'formService', 'policyService', 'utilService', 'metaRuleService', 'metaDataService', 'modelService', 'dataService', 'DATA_CST'];
+
+    function moonRulesEditController($scope, rulesService, alertService, $translate,
+                                    formService, policyService, utilService, metaRuleService, metaDataService, modelService, dataService, DATA_CST) {
+
+        var edit = this;
+
+        edit.policy = $scope.edit.policy;
+        edit.editMode = true;
+
+        edit.fromList = false;
+
+        edit.loading = false;
+
+        edit.form = {};
+        edit.showDetailselectedMetaRules = false;
+
+        edit.list = [];
+        edit.policyList = [];
+
+        edit.categories = {
+            subject : [],
+            loadingSubjects: true,
+            object : [],
+            loadingObjects: true,
+            action : [],
+            loadingActions : true
+        };
+
+        edit.data = {}; // this object is filled in declareDataObject():
+
+        edit.create = createRules;
+        edit.addDataToRules = addDataToRules;
+        edit.removeSelectedDataFromRules = removeSelectedDataFromRules;
+        edit.isNumberSelectedDataAtMaximum = isNumberSelectedDataAtMaximum;
+
+        //this variable is related to checks on Instruction field which is in JSON
+        edit.instructionsValid = true;
+        edit.numberOfSelectedSubjectValid = true;
+        edit.numberOfSelectedObjecttValid = true;
+        edit.numberOfSelectedActionsValid = true;
+
+        activate();
+
+        /*
+         *
+         */
+        function activate(){
+
+            edit.rules = {meta_rule_id: null,  rule: [], policy_id: null, instructions: '[{"decision": "grant"}]', enabled: true};
+            declareDataObject();
+            loadAllPolicies();
+            clearSelectedMetaRules();
+
+        }
+
+        function loadAllPolicies() {
+
+            edit.policyList = [];
+
+            policyService.findAllWithCallback( function(data) {
+
+                _.each(data, function(element){
+
+                    if(element.id === edit.policy.id){
+                        edit.selectedPolicy = element;
+                    }
+
+                });
+
+                edit.policyList = data;
+
+            });
+        }
+
+        $scope.$watch('edit.selectedPolicy', function(newValue){
+
+            clearSelectedMetaRules();
+
+            if(!_.isUndefined(newValue)){
+
+                loadRelatedMetaRules();
+
+            }
+
+        });
+
+        $scope.$watch('edit.selectedMetaRules', function(newValue){
+
+            clearSelectedData();
+
+            edit.categories = {
+                subject : [],
+                loadingSubjects: true,
+                object : [],
+                loadingObjects: true,
+                action : [],
+                loadingActions : true
+            };
+
+           declareDataObject();
+
+            if(!_.isUndefined(newValue)){
+
+                loadRelatedCategoriesAndData(newValue.subject_categories, newValue.object_categories, newValue.action_categories);
+
+            }
+
+        });
+
+        /**
+         * To get the related MetaRules, it is required to :
+         * - Get the model related to the policy
+         * - Get the metaRules associated to the model
+         * - Get the MetaData associated to the metaRules
+         */
+        function loadRelatedMetaRules() {
+
+            edit.selectedPolicy.meta_rules_values = undefined;
+
+            modelService.findOneWithCallback(edit.selectedPolicy.model_id, function(model){
+
+                metaRuleService.findSomeWithCallback(model.meta_rules, function(metaRules){
+
+                    edit.selectedPolicy.meta_rules_values = metaRules;
+
+                });
+
+            });
+
+        }
+
+        /**
+         * Load categories from arrays of id in args
+         * @param subjectsCategories, list of subject id related to the metaRule
+         * @param objectCategories, list of object id related to the metaRule
+         * @param actionsCategories, list of action id related to the metaRule
+         */
+        function loadRelatedCategoriesAndData(subjectsCategories, objectCategories, actionsCategories){
+
+            metaDataService.subject.findSomeWithCallback(subjectsCategories, function(list){
+
+                edit.categories.subject = list;
+                edit.categories.loadingSubjects = false;
+
+                _.each(edit.categories.subject, function(aSubject){
+
+                    dataService.subject.findAllFromCategoriesWithCallback(edit.selectedPolicy.id, aSubject.id, function(subjects){
+
+                        edit.data.subject = subjects;
+                        edit.data.loadingSubjects = false;
+                        edit.data.subjectsToBeSelected = angular.copy(edit.data.subject);
+
+                    });
+
+                });
+
+            });
+
+            metaDataService.object.findSomeWithCallback(objectCategories, function(list){
+
+                edit.categories.object = list;
+                edit.categories.loadingObjects = false;
+
+                _.each(edit.categories.object, function(aObject){
+
+                    dataService.object.findAllFromCategoriesWithCallback(edit.selectedPolicy.id, aObject.id, function(objects){
+
+                        edit.data.object = objects;
+                        edit.data.loadingObjects = false;
+                        edit.data.objectsToBeSelected = angular.copy(edit.data.object);
+
+                    });
+
+                });
+
+            });
+
+            metaDataService.action.findSomeWithCallback(actionsCategories, function(list){
+
+                edit.categories.action = list;
+                edit.categories.loadingActions = false;
+
+                _.each(edit.categories.action, function(aAction){
+
+                    dataService.action.findAllFromCategoriesWithCallback(edit.selectedPolicy.id, aAction.id, function(actions){
+
+                        edit.data.action = actions;
+                        edit.data.loadingActions = false;
+                        edit.data.actionsToBeSelected = angular.copy(edit.data.action);
+
+                    });
+
+                });
+
+            });
+
+        }
+
+        /**
+         * createRules, create Rules depending of what has been filled in the view
+         */
+        function createRules() {
+
+            edit.instructionsValid = true;
+            edit.numberOfSelectedSubjectValid = true;
+            edit.numberOfSelectedObjecttValid = true;
+            edit.numberOfSelectedActionsValid = true;
+
+            manageInstructionContent();
+            // bellow function is called here in order to display errors into the view
+            manageNumberOfSelectedData();
+
+            if(formService.isInvalid(edit.form)) {
+
+                formService.checkFieldsValidity(edit.form);
+
+                //manageNumberOfSelectedData is call again in order to check if errors have been display into the view
+            }else if(edit.instructionsValid && manageNumberOfSelectedData()){
+
+                startLoading();
+                buildRulesArray();
+
+                edit.rules.meta_rule_id = edit.selectedMetaRules.id;
+                edit.rules.policy_id = edit.selectedPolicy.id;
+
+                var rulesToSend = angular.copy(edit.rules);
+                rulesToSend.instructions = JSON.parse(edit.rules.instructions);
+
+                rulesService.add(rulesToSend, edit.policy.id, createSuccess, createError);
+            }
+
+
+            function createSuccess(data) {
+
+                var created = utilService.transformOne(data, 'rules');
+
+                $translate('moon.policy.rules.edit.action.add.create.success').then(function (translatedValue) {
+                    alertService.alertSuccess(translatedValue);
+                });
+
+                $scope.$emit('event:createRulesFromDataRulesSuccess', created);
+
+                activate();
+
+                stopLoading();
+
+            }
+
+            function createError(reason) {
+
+                $translate('moon.policy.rules.edit.action.add.create.error').then(function (translatedValue) {
+                    alertService.alertError(translatedValue);
+                });
+
+                stopLoading();
+
+            }
+
+        }
+
+        /**
+         * if instructions attribute is not good then edit.instructionsValid is set to false
+         * it will allow the view to display an error
+         */
+        function manageInstructionContent(){
+
+            if (!isInstructionValid(edit.rules.instructions)){
+
+                edit.instructionsValid = false;
+
+            }else{
+
+                edit.instructionsValid = true;
+
+            }
+        }
+
+        /**
+         * return true if the user has selected the number required of Selected Data (subject, object or action)
+         * if one is missing then return false
+         * it will also set numberOfSelected(Subject/Object/Action)Valid to true or false in order to display errors form in the view
+         * @returns {boolean}
+         */
+        function manageNumberOfSelectedData(){
+
+            isNumberSelectedDataAtMaximum(DATA_CST.TYPE.SUBJECT) ?
+                edit.numberOfSelectedSubjectValid = true: edit.numberOfSelectedSubjectValid = false;
+            isNumberSelectedDataAtMaximum(DATA_CST.TYPE.OBJECT) ?
+                edit.numberOfSelectedObjecttValid = true: edit.numberOfSelectedObjecttValid = false;
+            isNumberSelectedDataAtMaximum(DATA_CST.TYPE.ACTION) ?
+                edit.numberOfSelectedActionsValid = true: edit.numberOfSelectedActionsValid = false;
+
+            return edit.numberOfSelectedSubjectValid && edit.numberOfSelectedObjecttValid && edit.numberOfSelectedActionsValid;
+        }
+
+        /**
+         * Check if the variables in param is not undefined and if it is a JSON
+         * It is used for instructions attribute of a Rules object
+         * @param str
+         * @returns {boolean|*}
+         */
+        function isInstructionValid(str){
+
+            return !_.isUndefined(str) && isJsonString(str);
+
+        }
+
+        function isJsonString(str) {
+
+            var item = null;
+
+            try {
+                item = JSON.parse(str);
+            } catch (e) {
+
+                return false;
+            }
+
+            if (typeof item === 'object' && item !== null) {
+
+                return true;
+            }
+
+            return false;
+        }
+
+        function startLoading(){
+
+            edit.loading = true;
+
+        }
+
+        function stopLoading(){
+
+            edit.loading = false;
+
+        }
+
+        /**
+         * allow to clear selected values in the form
+         */
+        function clearSelectedMetaRules(){
+
+            edit.selectedMetaRules = undefined;
+
+            clearSelectedData();
+
+        }
+
+        function clearSelectedData(){
+
+            edit.selectedSubject = undefined;
+            edit.selectedObject = undefined;
+            edit.selectedAction = undefined;
+
+        }
+
+        /**
+         * check if the number of Selected Data is equal to the number of categories associated to the metaRule
+         * @param typeCST : 'SUBJECT', 'OBJECT', 'ACTION'
+         * @returns {boolean}
+         */
+        function isNumberSelectedDataAtMaximum(typeCST){
+
+            if(!edit.selectedMetaRules){
+                return false;
+            }
+
+            switch (typeCST) {
+
+                case DATA_CST.TYPE.SUBJECT:
+
+                    return edit.data.selectedSubjectsList.length === edit.selectedMetaRules.subject_categories.length;
+
+                case DATA_CST.TYPE.OBJECT:
+
+                    return  edit.data.selectedObjectsList.length === edit.selectedMetaRules.object_categories.length;
+
+                case DATA_CST.TYPE.ACTION:
+
+                  return edit.data.selectedActionsList.length === edit.selectedMetaRules.action_categories.length;
+            }
+        }
+
+        /**
+         * Add a data to an array of selected value (SUBJECT/OBJECT/ACTION)
+         * those arrays will used in the create function in order to filled the rule attribute of a rules object
+         * it will remove the selected value from the possible  value to be selected once the data is added
+         * @param typeCST
+         */
+        function addDataToRules(typeCST){
+
+            switch (typeCST) {
+                case DATA_CST.TYPE.SUBJECT:
+
+                    if (!edit.selectedSubject || isNumberSelectedDataAtMaximum(typeCST)
+                        || _.contains(edit.data.selectedSubjectsList, edit.selectedSubject)) {
+                        return;
+                    }
+
+                    edit.data.selectedSubjectsList.push(edit.selectedSubject);
+                    edit.data.subjectsToBeSelected = _.without(edit.data.subjectsToBeSelected, edit.selectedSubject);
+
+                    break;
+                case DATA_CST.TYPE.OBJECT:
+
+                    if (!edit.selectedObject || isNumberSelectedDataAtMaximum(typeCST)
+                        || _.contains(edit.data.selectedObjectsList, edit.selectedObject)) {
+                        return;
+                    }
+
+                    edit.data.selectedObjectsList.push(edit.selectedObject);
+                    edit.data.objectsToBeSelected = _.without(edit.data.objectsToBeSelected, edit.selectedObject);
+
+                    break;
+
+                case DATA_CST.TYPE.ACTION:
+                    if (!edit.selectedAction || isNumberSelectedDataAtMaximum(typeCST)
+                        || _.contains(edit.data.selectedActionsList, edit.selectedAction)) {
+                        return;
+                    }
+
+                    edit.data.selectedActionsList.push(edit.selectedAction);
+                    edit.data.actionsToBeSelected = _.without(edit.data.actionsToBeSelected, edit.selectedAction);
+
+                    break;
+            }
+
+        }
+
+        /**
+         * Remove a selected value,
+         * refresh the list of possible value to be selected with the removed selected value
+         * @param data
+         * @param typeCST
+         */
+        function removeSelectedDataFromRules(data, typeCST) {
+
+            switch (typeCST) {
+
+                case DATA_CST.TYPE.SUBJECT:
+
+                    edit.data.subjectsToBeSelected.push(data);
+                    edit.data.selectedSubjectsList = _.without(edit.data.selectedSubjectsList, data);
+                    break;
+
+                case DATA_CST.TYPE.OBJECT:
+
+                    edit.data.objectsToBeSelected.push(data);
+                    edit.data.selectedObjectsList = _.without(edit.data.selectedObjectsList, data);
+                    break;
+
+                case DATA_CST.TYPE.ACTION:
+
+                    edit.data.actionsToBeSelected.push(data);
+                    edit.data.selectedActionsList = _.without(edit.data.selectedActionsList, data);
+                    break;
+            }
+
+        }
+
+        /**
+         * fill edit.rules.rule array with the selected data
+         * it will first add subject list, object list and then action list
+         */
+        function buildRulesArray(){
+
+            _.each(edit.data.selectedSubjectsList, pushInRulesTab);
+            _.each(edit.data.selectedObjectsList, pushInRulesTab);
+            _.each(edit.data.selectedActionsList, pushInRulesTab);
+
+            function pushInRulesTab(elem){
+                edit.rules.rule.push(elem.id);
+            }
+        }
+
+        /**
+         * Declare the data object which contains attributes related to data,
+         * values to be selected, values selected, loader...
+         */
+        function declareDataObject(){
+
+            edit.data = {
+                subject : [], // List of subjects related to the policy
+                loadingSubjects: true, // allow to know if a call to the API is in progress
+                subjectsToBeSelected : [], // List of subjects the user can select
+                selectedSubjectsList: [], // List of subjects selected by the user from subjectsToBeSelected
+                subjectCST : DATA_CST.TYPE.SUBJECT,
+                object : [],
+                loadingObjects: true,
+                objectsToBeSelected: [],
+                selectedObjectsList: [],
+                objectCST : DATA_CST.TYPE.OBJECT,
+                action : [],
+                loadingActions : true,
+                actionsToBeSelected : [],
+                selectedActionsList: [],
+                actionCST : DATA_CST.TYPE.ACTION
+            }
+
+        }
+
+    }
+
+})();
\ No newline at end of file
diff --git a/old/moon_gui/static/app/policy/edit/parameter/rules/rules.list.dir.js b/old/moon_gui/static/app/policy/edit/parameter/rules/rules.list.dir.js
new file mode 100755
index 00000000..5c3e7457
--- /dev/null
+++ b/old/moon_gui/static/app/policy/edit/parameter/rules/rules.list.dir.js
@@ -0,0 +1,302 @@
+(function() {
+
+    'use strict';
+
+    angular
+        .module('moon')
+        .directive('moonRulesList', moonRulesList);
+
+    moonRulesList.$inject = [];
+
+    function moonRulesList() {
+
+        return {
+            templateUrl : 'html/policy/edit/parameter/rules/rules-list.tpl.html',
+            bindToController : true,
+            controller : moonRulesListController,
+            controllerAs : 'list',
+            scope : {
+                policy: '=',
+                editMode : '='
+            },
+            restrict : 'E',
+            replace : true
+        };
+    }
+
+    angular
+        .module('moon')
+        .controller('moonRulesListController', moonRulesListController);
+
+    moonRulesListController.$inject = [ '$scope', '$rootScope', 'NgTableParams', '$filter', 'metaRuleService', 'rulesService', 'dataService', '$translate', 'alertService' ];
+
+    function moonRulesListController( $scope, $rootScope, NgTableParams, $filter, metaRuleService, rulesService, dataService, $translate, alertService ) {
+
+        var list = this;
+
+        list.rules = [];
+        list.editMode = $scope.list.editMode;
+
+        list.loadingRules = true;
+
+        list.table = {};
+
+        list.getRules = getRules;
+        list.hasRules = hasRules;
+        list.refreshRules = refreshRules;
+        list.deleteRules = deleteRules;
+
+        list.getMetaRuleFromRule = getMetaRuleFromRule;
+        list.getCategoryFromRuleIndex = getCategoryFromRuleIndex;
+
+        list.isRuleIndexSubjectCategory = isRuleIndexSubjectCategory;
+        list.isRuleIndexObjectCategory = isRuleIndexObjectCategory;
+        list.isRuleIndexActionCategory = isRuleIndexActionCategory;
+
+        activate();
+
+        function activate(){
+
+            newRulesTable();
+
+            manageRules();
+
+        }
+
+        var rootListeners = {
+
+            'event:createRulesFromDataRulesSuccess': $rootScope.$on('event:createRulesFromDataRulesSuccess', addRulesToList)
+
+        };
+
+        _.each(rootListeners, function(unbind){
+            $scope.$on('$destroy', rootListeners[unbind]);
+        });
+
+        function manageRules(){
+
+            rulesService.findAllFromPolicyWithCallback(list.policy.id, function(data){
+
+                list.rules = data;
+                list.loadingRules = false;
+
+                refreshRules();
+
+            });
+        }
+
+        function newRulesTable() {
+
+            list.table = new NgTableParams({
+
+                page: 1,            // show first page
+                count: 10          // count per page
+
+            }, {
+
+                total: function () { return list.getRules().length; }, // length of data
+                getData: function($defer, params) {
+
+                    var orderedData = params.sorting() ? $filter('orderBy')(list.getRules(), params.orderBy()) : list.getRules();
+                    $defer.resolve(orderedData.slice((params.page() - 1) * params.count(), params.page() * params.count()));
+
+                },
+                $scope: { $data: {} }
+
+            });
+
+            return list.table;
+
+        }
+
+        function getMetaRuleFromRule(rule) {
+
+            if(_.has(rule, 'meta_rule')){
+                return rule.meta_rule;
+            }
+
+            // if the call has not been made
+            if(!_.has(rule, 'callMetaRuleInProgress')){
+
+                rule.callMetaRuleInProgress = true;
+
+                metaRuleService.findOneWithCallback(rule.meta_rule_id, function(meta_rule){
+
+                    rule.callMetaRuleInProgress = false;
+                    rule.meta_rule = meta_rule;
+
+                });
+
+            }
+
+            // if the call is in progress return false
+            return false;
+        }
+
+
+        /**
+         * Prerequisite : meta Rule must be completely loader
+         * Depending on the meta_rule, the rule array will be filled by subject(s),  object(s) or an action(s)
+         * the only way to know if rule[i] contains a subject/object/action is to check
+         * how many subject/object/action are associated to a MetaRule
+         * For example if the associated MetaRule contains 2 subjects, 1 object and 2 actions
+         * then the 2 first elements of rule array are 2 subject, the third one will be an object, and the 2 last will be action
+         * @param index
+         * @param rule
+         */
+        function getCategoryFromRuleIndex(index, rule){
+
+            if(!_.has(rule, 'rule_value')){
+                // setting an array which will contains every value of the category
+                rule.rule_value = Array.apply(null, new Array(rule.rule.length)).map(function(){
+                    return {
+                        category: {}
+                    };
+                });
+            }
+
+            if(_.has(rule.rule_value[index], 'callCategoryInProgress') && !rule.rule_value[index].callCategoryInProgress ){
+                return rule.rule_value[index].category;
+            }
+
+            // if the call has not been made
+            if(!_.has(rule.rule_value[index], 'callCategoryInProgress')){
+
+                rule.rule_value[index].callCategoryInProgress = true;
+
+                var categoryId = 0;
+
+                if(list.isRuleIndexSubjectCategory(index, rule)){
+
+                    categoryId = rule.meta_rule.subject_categories[index];
+
+                    dataService.subject.data.findOne(list.policy.id, categoryId, rule.rule[index], function(category){
+
+                        rule.rule_value[index].callCategoryInProgress = false;
+                        rule.rule_value[index].category = category;
+
+                    });
+
+                }else if(list.isRuleIndexObjectCategory(index, rule)){
+
+
+                    categoryId = rule.meta_rule.object_categories[index - rule.meta_rule.subject_categories.length ];
+
+                    dataService.object.data.findOne(list.policy.id, categoryId, rule.rule[index], function(category){
+
+                        rule.rule_value[index].callCategoryInProgress = false;
+                        rule.rule_value[index].category = category;
+
+                    });
+
+
+                }else if(list.isRuleIndexActionCategory(index, rule)){
+
+                    categoryId = rule.meta_rule.action_categories[index - rule.meta_rule.subject_categories.length - rule.meta_rule.object_categories.length ];
+
+                    dataService.action.data.findOne(list.policy.id, categoryId, rule.rule[index], function(category){
+
+                        rule.rule_value[index].callCategoryInProgress = false;
+                        rule.rule_value[index].category = category;
+
+                    });
+
+                }else{
+
+                    rule.rule_value[index].callCategoryInProgress = false;
+                    rule.rule_value[index].category = {
+                        name : 'ERROR'
+                    };
+                }
+
+            }
+
+            // if the call is in progress return false
+            return false;
+        }
+
+        function isRuleIndexSubjectCategory(index, rule){
+
+            var ind = index + 1;
+
+            return ind <= rule.meta_rule.subject_categories.length;
+
+        }
+
+        function isRuleIndexObjectCategory(index, rule){
+
+            var ind = index + 1;
+
+            return  rule.meta_rule.subject_categories.length < ind && ind <= ( rule.meta_rule.object_categories.length + rule.meta_rule.subject_categories.length );
+
+        }
+
+        function isRuleIndexActionCategory(index, rule){
+
+            var ind = index + 1;
+
+            return ( rule.meta_rule.object_categories.length + rule.meta_rule.subject_categories.length ) < ind && ind <= ( rule.meta_rule.object_categories.length + rule.meta_rule.subject_categories.length + rule.meta_rule.action_categories.length);
+
+        }
+
+        function getRules() {
+            return (list.rules) ? list.rules : [];
+        }
+
+        function hasRules() {
+            return list.getRules().length > 0;
+        }
+
+        /**
+         * Refresh the table
+         */
+        function refreshRules(){
+            list.table.total(list.rules.length);
+            list.table.reload();
+        }
+
+        function addRulesToList(event, rules){
+            list.rules.push(rules);
+            refreshRules();
+        }
+
+        /**
+         * Delete
+         */
+        function deleteRules(rules){
+
+            rules.loader = true;
+
+            rulesService.delete(rules.id, list.policy.id, deleteRulesSuccess, deleteRulesError );
+
+            function deleteRulesSuccess(){
+
+                $translate('moon.policy.rules.edit.action.add.delete.success').then( function(translatedValue) {
+                    alertService.alertSuccess(translatedValue);
+                });
+
+                removeRulesFromList(rules);
+                refreshRules();
+
+                rules.loader = false;
+
+            }
+
+            function deleteRulesError(reason){
+
+                $translate('moon.policy.rules.edit.action.add.delete.success', {reason: reason.message}).then( function(translatedValue) {
+                    alertService.alertError(translatedValue);
+                });
+
+                rules.loader = false;
+
+            }
+
+        }
+
+        function removeRulesFromList(rules){
+            list.rules = _.without(list.rules, rules);
+        }
+    }
+
+})();
\ No newline at end of file