From 1100c66ce03a059ebe7ece9734e799b49b3a5a9e Mon Sep 17 00:00:00 2001 From: WuKong Date: Sat, 23 Dec 2017 21:49:35 +0100 Subject: moonv4 cleanup Change-Id: Icef927f3236d985ac13ff7376f6ce6314b2b39b0 Signed-off-by: WuKong --- .../assignments/assignments-edit.tpl.html | 165 ------- .../assignments/assignments-list.tpl.html | 335 ------------- .../parameter/assignments/assignments.edit.dir.js | 439 ----------------- .../parameter/assignments/assignments.list.dir.js | 393 --------------- .../policy/edit/parameter/data/data-edit.tpl.html | 110 ----- .../policy/edit/parameter/data/data-list.tpl.html | 390 --------------- .../policy/edit/parameter/data/data.edit.dir.js | 260 ---------- .../policy/edit/parameter/data/data.list.dir.js | 293 ----------- .../parameter/perimeter/perimeter-edit.tpl.html | 166 ------- .../parameter/perimeter/perimeter-list.tpl.html | 240 --------- .../edit/parameter/perimeter/perimeter.edit.dir.js | 437 ----------------- .../edit/parameter/perimeter/perimeter.list.dir.js | 284 ----------- .../edit/parameter/rules/rules-edit.tpl.html | 341 ------------- .../edit/parameter/rules/rules-list.tpl.html | 134 ----- .../policy/edit/parameter/rules/rules.edit.dir.js | 537 --------------------- .../policy/edit/parameter/rules/rules.list.dir.js | 302 ------------ 16 files changed, 4826 deletions(-) delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments-edit.tpl.html delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments-list.tpl.html delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments.edit.dir.js delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments.list.dir.js delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/data/data-edit.tpl.html delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/data/data-list.tpl.html delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/data/data.edit.dir.js delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/data/data.list.dir.js delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter-edit.tpl.html delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter-list.tpl.html delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter.edit.dir.js delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter.list.dir.js delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-edit.tpl.html delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules.edit.dir.js delete mode 100755 moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules.list.dir.js (limited to 'moonv4/moon_gui/static/app/policy/edit/parameter') diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments-edit.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments-edit.tpl.html deleted file mode 100755 index 9069dcd0..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments-edit.tpl.html +++ /dev/null @@ -1,165 +0,0 @@ -
- -
- -
- - -
- - - -
- -
- -
- - - - - -
- - - - -
- Policy is required -
- -
- -
- - -
- - - -
- -
- -
- - - - - -
- - - - -
- Perimeter is required -
- -
- -
- - -
- - - -
- -
- -
- - - - - -
- - - - -
- Category is required -
- -
- -
- - -
- - - -
- -
- -
- - - - - -
- - - - -
- Data is required -
- -
- -
- -
- -
- - -
- - - -
- -
    - -
  • - - - -
    • - -
- -
- -
- -
- -
- - - - Create - - - - -
- -
- - -
- -
- -
\ No newline at end of file diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments-list.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments-list.tpl.html deleted file mode 100755 index 34bbc7a8..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments-list.tpl.html +++ /dev/null @@ -1,335 +0,0 @@ -
-
- -
- -

List of associated Subjects

- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Perimeter nameCategory nameData name
- -
- - Loading -
- -
- -
- - 		- -
- - Loading -
- -
- -
- - 		- - - - - - - - - - - () - - ,  - - - - - - -
- - - -
- -
There is no Subjects
- -
- -
- -
- -
- -
- -

Add a Subject Category

- -
- -
- - - -
- -
- -
- -
- -

List associated of Objects

- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Perimeter nameCategory nameData name
- -
- - Loading -
- -
- -
- - 		- -
- - Loading -
- -
- -
- - 		- - - - - - - - - - - - () - - ,  - - - -
There is no Objects
- -
- -
- -
- -
- -
- -

Add an Object Category

- -
- -
- - - -
- -
- -
- -
- -

List associated of Actions

- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Perimeter nameCategory nameData name
-
- - Loading -
- -
- -
- 		- -
- - Loading -
- -
- -
- - 		- - - - - - - - - - - - () - - ,  - - - - -
There is no Actions
- -
- - -
- -
- -
- -
- -

Add an Action Category

- -
- -
. - - - -
- -
- -
\ No newline at end of file diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments.edit.dir.js b/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments.edit.dir.js deleted file mode 100755 index 5297eccb..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments.edit.dir.js +++ /dev/null @@ -1,439 +0,0 @@ -(function () { - - 'use strict'; - - angular - .module('moon') - .directive('moonAssignmentsEdit', moonAssignmentsEdit); - - moonAssignmentsEdit.$inject = []; - - function moonAssignmentsEdit() { - - return { - templateUrl: 'html/policy/edit/parameter/assignments/assignments-edit.tpl.html', - bindToController: true, - controller: moonAssignmentsEditController, - controllerAs: 'edit', - scope: { - //Type can be 'ACTION', 'OBJECT', 'SUBJECT' - assignmentsType: '=', - policy: '=' - }, - restrict: 'E', - replace: true - }; - } - - angular - .module('moon') - .controller('moonAssignmentsEditController', moonAssignmentsEditController); - - moonAssignmentsEditController.$inject = ['$scope', 'assignmentsService', 'alertService', '$translate', 'formService', - 'policyService', 'utilService', 'perimeterService', 'ASSIGNMENTS_CST', - 'metaDataService', 'dataService']; - - function moonAssignmentsEditController($scope, assignmentsService, alertService, $translate, formService, - policyService, utilService, perimeterService, ASSIGNMENTS_CST, - metaDataService, dataService ) { - - var edit = this; - - edit.assignmentsType = $scope.edit.assignmentsType; - edit.policy = $scope.edit.policy; - - edit.laoading = false; - - edit.form = {}; - - edit.policyList = []; - edit.loadingPolicies = true; - - edit.categoryList = []; - edit.loadingCategories = true; - - edit.perimeterList = []; - edit.loadingPerimeters = true; - - edit.dataList = []; - edit.dataToBeSelected = []; - edit.selectedDataList = []; - edit.loadingData = true; - - edit.assignementsAttributeValid = true; - - edit.addSelectedData = addSelectedData; - edit.removeSelectedData = removeSelectedData; - edit.getName = getName; - edit.create = createAssignments; - - activate(); - - /* - * - */ - - function activate() { - - edit.assignments = {id: null, category_id: null, data_id: null, policy_id: null}; - - loadAllPolicies(); - loadAllCategories(); - - } - - function createAssignments() { - - edit.assignementsAttributeValid = true; - - manageSelectedDataListy(); - - if(formService.isInvalid(edit.form)) { - - formService.checkFieldsValidity(edit.form); - - }else if(edit.assignementsAttributeValid){ - - startLoading(); - - var throwEvent = false; - edit.assignments.id = edit.selectedPerimeter.id; - edit.assignments.category_id = edit.selectedCategory.id; - edit.assignments.policy_id = edit.selectedPolicy.id; - - var selectedDataListTemp = angular.copy(edit.selectedDataList); - - _.each(selectedDataListTemp, function(elem){ - - edit.assignments.data_id = elem.id; - - var assignmentsToSend = angular.copy(edit.assignments); - - switch(edit.assignmentsType){ - - case ASSIGNMENTS_CST.TYPE.SUBJECT: - - assignmentsService.subject.add(assignmentsToSend, edit.policy.id, createSuccess, createError); - break; - - case ASSIGNMENTS_CST.TYPE.OBJECT: - - assignmentsService.object.add(assignmentsToSend, edit.policy.id, createSuccess, createError); - break; - - case ASSIGNMENTS_CST.TYPE.ACTION: - - assignmentsService.action.add(assignmentsToSend, edit.policy.id, createSuccess, createError); - break; - - default : - - break; - - } - - }); - - throwEvent = true; - - } - - function createSuccess(data) { - - var created = {}; - - switch(edit.assignmentsType){ - - case ASSIGNMENTS_CST.TYPE.SUBJECT: - - created = utilService.transformOne(data, 'subject_assignments'); - break; - - case ASSIGNMENTS_CST.TYPE.OBJECT: - - created = utilService.transformOne(data, 'object_assignments'); - break; - - case ASSIGNMENTS_CST.TYPE.ACTION: - - created = utilService.transformOne(data, 'action_assignments'); - break; - - default: - - break; - - } - - $translate('moon.policy.assignments.edit.create.success').then(function (translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - if(throwEvent && created.policy_id === edit.policy.id){ - - $scope.$emit('event:createAssignmentsFromAssignmentsEditSuccess', edit.assignmentsType); - - activate(); - - stopLoading(); - - }else if(throwEvent){ - - activate(); - - stopLoading(); - - } - - } - - function createError(reason) { - - $translate('moon.policy.rules.edit.action.add.create.error').then(function (translatedValue) { - alertService.alertError(translatedValue); - }); - - stopLoading(); - - } - - } - - $scope.$watch('edit.selectedPolicy', function(newValue){ - - if(!_.isUndefined(newValue)){ - - loadRelatedPerimeters(); - - } - - }); - - - $scope.$watch('edit.selectedCategory', function(newValue){ - - clearSelectedCategories(); - - if(!_.isUndefined(newValue)){ - - loadRelatedData(newValue.id); - - } - - }); - - function loadAllPolicies() { - - edit.policyList = []; - edit.loadingPolicies = true; - - policyService.findAllWithCallback( function(data) { - - _.each(data, function(element){ - - if(element.id === edit.policy.id){ - edit.selectedPolicy = element; - } - - }); - - edit.policyList = data; - edit.loadingPolicies = false; - - }); - } - - function loadRelatedPerimeters(){ - - edit.perimeterList = []; - edit.loadingPerimeters = true; - - switch(edit.assignmentsType){ - - case ASSIGNMENTS_CST.TYPE.SUBJECT: - - perimeterService.subject.findAllFromPolicyWithCallback(edit.selectedPolicy.id, callBackList); - break; - - case ASSIGNMENTS_CST.TYPE.OBJECT: - - perimeterService.object.findAllFromPolicyWithCallback(edit.selectedPolicy.id,callBackList); - break; - - case ASSIGNMENTS_CST.TYPE.ACTION: - - perimeterService.action.findAllFromPolicyWithCallback(edit.selectedPolicy.id, callBackList); - break; - - default : - - edit.perimeterList = []; - edit.loadingPerimeters = false; - break; - - } - - function callBackList(list){ - - edit.perimeterList = list; - - edit.loadingPerimeters = false; - - } - } - - function loadAllCategories(){ - - edit.categoryList = []; - edit.loadingCategories = true; - - switch(edit.assignmentsType){ - - case ASSIGNMENTS_CST.TYPE.SUBJECT: - - metaDataService.subject.findAllWithCallback(callBackList); - break; - - case ASSIGNMENTS_CST.TYPE.OBJECT: - - metaDataService.object.findAllWithCallback(callBackList); - break; - - case ASSIGNMENTS_CST.TYPE.ACTION: - - metaDataService.action.findAllWithCallback(callBackList); - break; - - default : - - edit.categoryList = []; - edit.loadingCategories = false; - break; - - } - - function callBackList(list){ - - edit.categoryList = list; - edit.loadingCategories = false; - - } - } - - function loadRelatedData(categoryId){ - - edit.dataList = []; - edit.dataToBeSelected = []; - edit.selectedDataList = []; - edit.loadingData = true; - - switch(edit.assignmentsType){ - - case ASSIGNMENTS_CST.TYPE.SUBJECT: - - dataService.subject.findAllFromCategoriesWithCallback(edit.selectedPolicy.id, categoryId, callBackList); - break; - - case ASSIGNMENTS_CST.TYPE.OBJECT: - - dataService.object.findAllFromCategoriesWithCallback(edit.selectedPolicy.id, categoryId, callBackList); - break; - - case ASSIGNMENTS_CST.TYPE.ACTION: - - dataService.action.findAllFromCategoriesWithCallback(edit.selectedPolicy.id, categoryId, callBackList); - break; - - default : - - edit.loadingData = false; - break; - - } - - function callBackList(list){ - - edit.dataList = list; - edit.dataToBeSelected = angular.copy(edit.dataList); - edit.selectedDataList = []; - edit.loadingData = false; - - } - - } - - function addSelectedData(){ - - edit.dataToBeSelected = _.without(edit.dataToBeSelected, edit.selectedData); - edit.selectedDataList.push(edit.selectedData); - clearSelectedCategories(); - - } - - function removeSelectedData(data){ - - edit.dataToBeSelected.push(data); - edit.selectedDataList = _.without(edit.selectedDataList, data); - - } - - function clearSelectedCategories(){ - - edit.selectedData = undefined; - - } - - function getName(assignment){ - - if(_.isUndefined(assignment)) return '(None)'; - - switch(edit.assignmentsType){ - - case ASSIGNMENTS_CST.TYPE.SUBJECT: - - return assignment.name; - - case ASSIGNMENTS_CST.TYPE.OBJECT: - - return assignment.value.name; - - - case ASSIGNMENTS_CST.TYPE.ACTION: - - return assignment.value.name; - - default : - - return assignment.name; - - } - - } - - function manageSelectedDataListy(){ - - if (edit.selectedDataList.length >= 1 ){ - - edit.assignementsAttributeValid = true; - - }else{ - - edit.assignementsAttributeValid = false; - - } - } - - function startLoading(){ - - edit.loading = true; - - } - - function stopLoading(){ - - edit.loading = false; - - } - } - -})(); \ No newline at end of file diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments.list.dir.js b/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments.list.dir.js deleted file mode 100755 index 22931e4d..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/assignments/assignments.list.dir.js +++ /dev/null @@ -1,393 +0,0 @@ -(function () { - - 'use strict'; - - angular - .module('moon') - .directive('moonAssignmentsList', moonAssignmentsList); - - moonAssignmentsList.$inject = []; - - function moonAssignmentsList() { - - return { - templateUrl: 'html/policy/edit/parameter/assignments/assignments-list.tpl.html', - bindToController: true, - controller: moonAssignmentsListController, - controllerAs: 'list', - scope: { - policy: '=', - editMode: '=' - }, - restrict: 'E', - replace: true - }; - } - - angular - .module('moon') - .controller('moonAssignmentsListController', moonAssignmentsListController); - - moonAssignmentsListController.$inject = ['$scope', '$rootScope', 'assignmentsService', '$translate', 'alertService', - 'policyService', 'ASSIGNMENTS_CST', 'utilService', 'metaDataService', 'perimeterService', 'dataService']; - - function moonAssignmentsListController($scope, $rootScope, assignmentsService, $translate, alertService, - policyService, ASSIGNMENTS_CST, utilService, metaDataService, perimeterService, dataService) { - - var list = this; - - list.policy = $scope.list.policy; - list.editMode = $scope.list.editMode; - - list.typeOfSubject = ASSIGNMENTS_CST.TYPE.SUBJECT; - list.typeOfObject = ASSIGNMENTS_CST.TYPE.OBJECT; - list.typeOfAction = ASSIGNMENTS_CST.TYPE.ACTION; - - list.deleteSub = deleteSub; - list.deleteObj = deleteObj; - list.deleteAct = deleteAct; - - list.getSubjects = getSubjects; - list.getObjects = getObjects; - list.getActions = getActions; - - list.getCategoryFromAssignment = getCategoryFromAssignment; - list.getPerimeterFromAssignment = getPerimeterFromAssignment; - list.getDataFromAssignmentsIndex = getDataFromAssignmentsIndex; - - activate(); - - function activate() { - - manageSubjects(); - - manageObjects(); - - manageActions(); - - } - - var rootListeners = { - - 'event:createAssignmentsFromAssignmentsEditSuccess': $rootScope.$on('event:createAssignmentsFromAssignmentsEditSuccess', updateList) - - }; - - _.each(rootListeners, function(unbind){ - $scope.$on('$destroy', rootListeners[unbind]); - }); - - function manageSubjects() { - - list.loadingSub = true; - - assignmentsService.subject.findAllFromPolicyWithCallback(list.policy.id, function (data) { - - list.subjects = data; - list.loadingSub = false; - - }); - } - - function manageObjects() { - - list.loadingObj = true; - - assignmentsService.object.findAllFromPolicyWithCallback(list.policy.id, function (data) { - - list.objects = data; - list.loadingObj = false; - - }); - - } - - function manageActions() { - - list.loadingAct = true; - - assignmentsService.action.findAllFromPolicyWithCallback(list.policy.id, function (data) { - - list.actions = data; - list.loadingAct = false; - - }); - - } - - function getPerimeterFromAssignment(assignment, type) { - - if (_.has(assignment, 'perimeter')) { - return assignment.perimeter; - } - - // if the call has not been made - if (!_.has(assignment, 'callPerimeterInProgress')) { - - assignment.callPerimeterInProgress = true; - - switch (type) { - - case ASSIGNMENTS_CST.TYPE.SUBJECT: - perimeterService.subject.findOneFromPolicyWithCallback(list.policy.id, assignment.subject_id, setPerimeterToAssignment); - break; - - case ASSIGNMENTS_CST.TYPE.OBJECT: - perimeterService.object.findOneFromPolicyWithCallback(list.policy.id, assignment.object_id, setPerimeterToAssignment); - break; - - case ASSIGNMENTS_CST.TYPE.ACTION: - perimeterService.action.findOneFromPolicyWithCallback(list.policy.id, assignment.action_id, setPerimeterToAssignment); - break; - - } - - } - - // if the call is in progress return false - return false; - - function setPerimeterToAssignment(perimeter) { - - assignment.callPerimeterInProgress = false; - assignment.perimeter = perimeter; - - } - } - - function getCategoryFromAssignment(data, type) { - - if (_.has(data, 'category')) { - return data.category; - } - - // if the call has not been made - if (!_.has(data, 'callCategoryInProgress')) { - - data.callCategoryInProgress = true; - - switch (type) { - - case ASSIGNMENTS_CST.TYPE.SUBJECT: - metaDataService.subject.findOne(data.subject_cat_id, setCategoryToData); - break; - - case ASSIGNMENTS_CST.TYPE.OBJECT: - metaDataService.object.findOne(data.object_cat_id, setCategoryToData); - break; - - case ASSIGNMENTS_CST.TYPE.ACTION: - metaDataService.action.findOne(data.action_cat_id, setCategoryToData); - break; - - } - - } - - // if the call is in progress return false - return false; - - function setCategoryToData(category) { - - data.callCategoryInProgress = false; - data.category = category; - - } - } - - /** - * @param index - * @param assignment - * @param type - */ - function getDataFromAssignmentsIndex(index, assignment, type) { - - if (!_.has(assignment, 'assignments_value')) { - // setting an array which will contains every value of the category - assignment.assignments_value = Array.apply(null, new Array(assignment.assignments.length)).map(function () { - return { - data: {} - }; - }); - } - - if (_.has(assignment.assignments_value[index], 'callDataInProgress') && !assignment.assignments_value[index].callDataInProgress) { - return assignment.assignments_value[index].data; - } - - // if the call has not been made - if (!_.has(assignment.assignments_value[index], 'callDataInProgress')) { - - assignment.assignments_value[index].callDataInProgress = true; - - switch (type) { - - case ASSIGNMENTS_CST.TYPE.SUBJECT: - dataService.subject.data.findOne(list.policy.id, assignment.category_id, assignment.assignments[index], setDataToAssignment); - break; - - case ASSIGNMENTS_CST.TYPE.OBJECT: - dataService.object.data.findOne(list.policy.id, assignment.category_id, assignment.assignments[index], setDataToAssignment); - break; - - case ASSIGNMENTS_CST.TYPE.ACTION: - dataService.action.data.findOne(list.policy.id, assignment.category_id, assignment.assignments[index], setDataToAssignment); - break; - - } - - } - - // if the call is in progress return false - return false; - - function setDataToAssignment(data) { - - assignment.assignments_value[index].callDataInProgress = false; - assignment.assignments_value[index].data = data; - - } - } - - /** - * Delete - */ - - function deleteSub(subject, dataId) { - - subject.loader = true; - - assignmentsService.subject.delete(list.policy.id, subject.subject_id, subject.subject_cat_id, dataId, deleteSubSuccess, deleteSubError); - - function deleteSubSuccess(data) { - - $translate('moon.policy.assignments.subject.delete.success').then(function (translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - manageSubjects(); - - subject.loader = false; - - } - - function deleteSubError(reason) { - - $translate('moon.policy.assignments.subject.delete.error', { - subjectName: subject.name, - reason: reason.message - }).then(function (translatedValue) { - alertService.alertError(translatedValue); - }); - - subject.loader = false; - - } - } - - function deleteObj(object, dataId) { - - object.loader = true; - - assignmentsService.object.delete(list.policy.id, object.object_id, object.object_cat_id, dataId, deleteObjSuccess, deleteObjError); - - function deleteObjSuccess(data) { - - $translate('moon.policy.assignments.object.delete.success').then(function (translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - manageObjects(); - - object.loader = false; - - } - - function deleteObjError(reason) { - - $translate('moon.policy.assignments.object.delete.error', { - objectName: object.name, - reason: reason.message - }).then(function (translatedValue) { - alertService.alertError(translatedValue); - }); - - object.loader = false; - } - } - - function deleteAct(action, dataId) { - - action.loader = true; - - assignmentsService.action.delete(list.policy.id, action.action_id, action.action_cat_id, dataId, deleteActSuccess, deleteActError); - - function deleteActSuccess(data) { - - $translate('moon.policy.assignments.action.delete.success').then(function (translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - manageActions(); - - action.loader = false; - - } - - function deleteActError(reason) { - - $translate('moon.policy.assignments.action.delete.error', { - actionName: action.name, - reason: reason.message - }).then(function (translatedValue) { - alertService.alertError(translatedValue); - }); - - action.loader = false; - - } - } - - function getSubjects() { - return list.subjects ? list.subjects : []; - } - - function getObjects() { - return list.objects ? list.objects : []; - } - - function getActions() { - return list.actions ? list.actions : []; - } - - function updateList(event, type) { - - switch(type){ - - case ASSIGNMENTS_CST.TYPE.SUBJECT: - - manageSubjects(); - break; - - case ASSIGNMENTS_CST.TYPE.OBJECT: - - manageObjects(); - break; - - case ASSIGNMENTS_CST.TYPE.ACTION: - - manageActions(); - break; - - default : - - activate(); - break; - - } - - } - - } - -})(); \ No newline at end of file diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/data/data-edit.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/data/data-edit.tpl.html deleted file mode 100755 index 3f11a641..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/data/data-edit.tpl.html +++ /dev/null @@ -1,110 +0,0 @@ -
- -
- -
- -
- - - -
- - - -
- Name is required - -
- -
- -
- -
- - -
- -
- -
- -
- - - -
- - - - - -
- - - - -
- Policy is required - -
- -
- -
- -
- - - -
- - - - - -
- - - - -
- Category is required - -
- -
-
- -
- -
- - - - Create - - - - -
- -
- -
- -
- -
\ No newline at end of file diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/data/data-list.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/data/data-list.tpl.html deleted file mode 100755 index b69a4eed..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/data/data-list.tpl.html +++ /dev/null @@ -1,390 +0,0 @@ -
-
- -
- -

List of associated Subjects

- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionCategory
- -
- - Loading -
- -
- -
- - 		- - - - Delete - - -
- - - -
- -
There is no Subjects
- -
- -
- -
- -
- -
- -

Add a Subject Category

- -
- -
- - - -
- -
- -
- -
- -

List associated of Objects

- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionCategoryActions
- -
- - Loading -
- -
- -
- - 		- - - - Delete - - -
- - - -
- -
There is no Objects
- -
- -
- -
- -
- -
- -

Add an Object Category

- -
- -
- - - -
- -
- -
- -
- -

List associated of Actions

- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionCategoryActions
- -
- - Loading -
- -
- -
- - 		- - - - Delete - - -
- - - -
- -
There is no Actions
- -
- - -
- -
- -
- -
- -

Add an Action Category

- -
- -
. - - - -
- -
- -
\ No newline at end of file diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/data/data.edit.dir.js b/moonv4/moon_gui/static/app/policy/edit/parameter/data/data.edit.dir.js deleted file mode 100755 index 57ad0c9b..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/data/data.edit.dir.js +++ /dev/null @@ -1,260 +0,0 @@ -(function() { - - 'use strict'; - - angular - .module('moon') - .directive('moonDataEdit', moonDataEdit); - - moonDataEdit.$inject = []; - - function moonDataEdit() { - - return { - templateUrl : 'html/policy/edit/parameter/data/data-edit.tpl.html', - bindToController : true, - controller : moonDataEditController, - controllerAs : 'edit', - scope : { - //Type can be 'ACTION', 'OBJECT', 'SUBJECT' - mnDataType: '=', - policy : '=' - }, - restrict : 'E', - replace : true - }; - - } - - angular - .module('moon') - .controller('moonDataEditController', moonDataEditController); - - moonDataEditController.$inject = ['$scope', 'dataService', 'DATA_CST', 'alertService', '$translate', - 'formService', 'policyService', 'utilService', 'metaDataService']; - - function moonDataEditController($scope, dataService, DATA_CST, alertService, $translate, - formService, policyService, utilService, metaDataService) { - - var edit = this; - - edit.dataType = $scope.edit.mnDataType; - edit.policy = $scope.edit.policy; - - edit.fromList = false; - - edit.loading = false; - - edit.form = {}; - - edit.data = { name: null, description: null}; - - edit.list = []; - edit.policyList = []; - edit.categoriesToBeSelected = []; - - edit.create = createData; - - activate(); - - /* - * - */ - - function activate(){ - - loadAllCategories(); - loadAllPolicies(); - - switch(edit.dataType){ - - case DATA_CST.TYPE.SUBJECT: - - dataService.subject.findAllFromPolicyWithCallback(edit.policy.id, callBackList); - break; - - case DATA_CST.TYPE.OBJECT: - - dataService.object.findAllFromPolicyWithCallback(edit.policy.id, callBackList); - break; - - case DATA_CST.TYPE.ACTION: - - dataService.action.findAllFromPolicyWithCallback(edit.policy.id, callBackList); - break; - - default : - - edit.list = []; - break; - - } - - function callBackList(list){ - - // For each Data, there is a check about the mapping between the Data and the policy - _.each(list, function (element) { - if (element.policy_id !== edit.policy.id) { - - edit.list.push(element); - - } - }); - - } - - } - - function loadAllCategories(){ - - switch(edit.dataType){ - - case DATA_CST.TYPE.SUBJECT: - - metaDataService.subject.findAllWithCallback(callBackList); - break; - - case DATA_CST.TYPE.OBJECT: - - metaDataService.object.findAllWithCallback(callBackList); - break; - - case DATA_CST.TYPE.ACTION: - - metaDataService.action.findAllWithCallback(callBackList); - break; - - default : - - edit.categoriesToBeSelected = []; - break; - - } - - function callBackList(list){ - - edit.categoriesToBeSelected = list; - - } - } - - function loadAllPolicies() { - - edit.policyList = []; - - policyService.findAllWithCallback( function(data) { - - _.each(data, function(element){ - - if(element.id === edit.policy.id){ - edit.selectedPolicy = element; - } - - }); - - edit.policyList = data; - - }); - } - - - /** - * Create - */ - - function createData() { - - if(formService.isInvalid(edit.form)) { - - formService.checkFieldsValidity(edit.form); - - } else { - - startLoading(); - - var dataToSend = angular.copy(edit.data); - - switch(edit.dataType){ - - case DATA_CST.TYPE.SUBJECT: - - dataService.subject.add(dataToSend, edit.policy.id, edit.selectedCategory.id, createSuccess, createError); - break; - - case DATA_CST.TYPE.OBJECT: - - dataService.object.add(dataToSend, edit.policy.id, edit.selectedCategory.id, createSuccess, createError); - break; - - case DATA_CST.TYPE.ACTION: - - dataService.action.add(dataToSend, edit.policy.id, edit.selectedCategory.id, createSuccess, createError); - break; - } - - } - - /** - * @param data - */ - function createSuccess(data) { - - var created = {}; - - switch(edit.dataType){ - - case DATA_CST.TYPE.SUBJECT: - - created = utilService.transformOne(data['subject_data'], 'data'); - break; - - case DATA_CST.TYPE.OBJECT: - - created = utilService.transformOne(data['object_data'], 'data'); - break; - - case DATA_CST.TYPE.ACTION: - - created = utilService.transformOne(data['action_data'], 'data'); - break; - } - - $translate('moon.policy.data.edit.create.success', { name: created.name }).then(function (translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - $scope.$emit('event:createDataFromDataEditSuccess', created, edit.dataType); - - stopLoading(); - - edit.list.push(created); - - } - - function createError(reason) { - - $translate('moon.policy.data.edit.create.error', { name: dataToSend.name }).then(function (translatedValue) { - alertService.alertError(translatedValue); - }); - - stopLoading(); - - } - - } - - function startLoading(){ - - edit.loading = true; - - } - - function stopLoading(){ - - edit.loading = false; - - } - - } - -})(); \ No newline at end of file diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/data/data.list.dir.js b/moonv4/moon_gui/static/app/policy/edit/parameter/data/data.list.dir.js deleted file mode 100755 index 23a7e535..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/data/data.list.dir.js +++ /dev/null @@ -1,293 +0,0 @@ -(function() { - - 'use strict'; - - angular - .module('moon') - .directive('moonDataList', moonDataList); - - moonDataList.$inject = []; - - function moonDataList() { - - return { - templateUrl : 'html/policy/edit/parameter/data/data-list.tpl.html', - bindToController : true, - controller : moonDataListController, - controllerAs : 'list', - scope : { - policy: '=', - editMode : '=' - }, - restrict : 'E', - replace : true - }; - } - - angular - .module('moon') - .controller('moonDataListController', moonDataListController); - - moonDataListController.$inject = ['$scope', '$rootScope', 'dataService', '$translate', 'alertService', 'DATA_CST', 'metaDataService']; - - function moonDataListController($scope, $rootScope, dataService, $translate, alertService, DATA_CST, metaDataService){ - - var list = this; - - list.policy = $scope.list.policy; - list.editMode = $scope.list.editMode; - - list.typeOfSubject = DATA_CST.TYPE.SUBJECT; - list.typeOfObject = DATA_CST.TYPE.OBJECT; - list.typeOfAction = DATA_CST.TYPE.ACTION; - - list.deleteSub = deleteSub; - list.deleteObj = deleteObj; - list.deleteAct = deleteAct; - - list.getSubjects = getSubjects; - list.getObjects = getObjects; - list.getActions = getActions; - - list.getCategoryFromData = getCategoryFromData; - - activate(); - - function activate(){ - - manageSubjects(); - - manageObjects(); - - manageActions(); - - } - - var rootListeners = { - - 'event:createDataFromDataEditSuccess': $rootScope.$on('event:createDataFromDataEditSuccess', addDataToList) - - }; - - _.each(rootListeners, function(unbind){ - $scope.$on('$destroy', rootListeners[unbind]); - }); - - - function manageSubjects(){ - - list.loadingSub = true; - - dataService.subject.findAllFromPolicyWithCallback(list.policy.id, function(data){ - - list.subjects = data; - list.loadingSub = false; - - }); - } - - function manageObjects(){ - - list.loadingObj = true; - - dataService.object.findAllFromPolicyWithCallback(list.policy.id, function(data){ - - list.objects = data; - list.loadingObj = false; - - }); - - } - - function manageActions(){ - - list.loadingAct = true; - - dataService.action.findAllFromPolicyWithCallback(list.policy.id, function(data){ - - list.actions = data; - list.loadingAct = false; - - }); - - } - - function getCategoryFromData(data, type) { - - if(_.has(data, 'category')){ - return data.category; - } - - // if the call has not been made - if(!_.has(data, 'callCategoryInProgress')){ - - data.callCategoryInProgress = true; - - switch(type){ - - case DATA_CST.TYPE.SUBJECT: - metaDataService.subject.findOne(data.category_id, setCategoryToData); - break; - - case DATA_CST.TYPE.OBJECT: - metaDataService.object.findOne(data.category_id, setCategoryToData); - break; - - case DATA_CST.TYPE.ACTION: - metaDataService.action.findOne(data.category_id, setCategoryToData); - break; - - } - - } - - // if the call is in progress return false - return false; - - function setCategoryToData(category){ - - data.callCategoryInProgress = false; - data.category = category; - - } - } - - /** - * Delete - */ - - function deleteSub(subject){ - - subject.loader = true; - - dataService.subject.delete(subject, list.policy.id, subject.category_id, deleteSubSuccess, deleteSubError); - - function deleteSubSuccess(data){ - - $translate('moon.policy.data.subject.delete.success', { subjectName: subject.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeSubFromSubList(subject); - - subject.loader = false; - - } - - function deleteSubError(reason){ - - $translate('moon.policy.data.subject.delete.error', { subjectName: subject.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - subject.loader = false; - - } - } - - function deleteObj(object){ - - object.loader = true; - - dataService.object.delete(object, list.policy.id, object.category_id, deleteObjSuccess, deleteObjError); - - function deleteObjSuccess(data){ - - $translate('moon.policy.data.object.delete.success', { objectName: object.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeObjFromObjList(object); - - object.loader = false; - - } - - function deleteObjError(reason){ - - $translate('moon.policy.data.object.delete.error', { objectName: object.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - object.loader = false; - } - } - - function deleteAct(action){ - - action.loader = true; - - dataService.action.delete(action, list.policy.id, action.category_id, deleteActSuccess, deleteActError); - - function deleteActSuccess(data){ - - $translate('moon.policy.data.action.delete.success', { actionName: action.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeActFromActList(action); - - action.loader = false; - - } - - function deleteActError(reason){ - - $translate('moon.policy.data.action.delete.error', { actionName: action.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - action.loader = false; - - } - } - - function getSubjects(){ - return list.subjects ? list.subjects : []; - } - - function getObjects(){ - return list.objects ? list.objects : []; - } - - function getActions(){ - return list.actions ? list.actions : []; - } - - function removeSubFromSubList(subject){ - list.subjects = _.without(list.subjects, subject); - } - - function removeObjFromObjList(object){ - list.objects = _.without(list.objects, object); - } - - function removeActFromActList(action){ - list.actions = _.without(list.actions, action); - } - - function addDataToList( event, data, typeOfData){ - - switch(typeOfData){ - - case DATA_CST.TYPE.SUBJECT: - - list.subjects.push(data); - break; - - case DATA_CST.TYPE.OBJECT: - - list.objects.push(data); - break; - - case DATA_CST.TYPE.ACTION: - - list.actions.push(data); - break; - } - - } - - } - -})(); \ No newline at end of file diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter-edit.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter-edit.tpl.html deleted file mode 100755 index fa2f93c0..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter-edit.tpl.html +++ /dev/null @@ -1,166 +0,0 @@ -
- -
- - Add from the list - Add a new Perimeter - -
- -
- -
- -
- - - - - -
- - - - -
- -
- -
- - - - Delete - - -
- -
- - - - Add the selected Perimeter - - -
- -
- - - -
- -
- -
- - - -
- - - -
- Name is required -
- -
- -
- -
- - -
- -
- -
- - - - -
- - - -
- -
- -
- - -
- - - -
- - - - - -
- - - - -
- -
- -
- -
- -
- - - -
- -
    - -
  • - - - -
    • - -
- -
- -
- -
- -
- - - - Create - - - - -
- -
- -
- -
- -
\ No newline at end of file diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter-list.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter-list.tpl.html deleted file mode 100755 index a94d663e..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter-list.tpl.html +++ /dev/null @@ -1,240 +0,0 @@ -
-
- -
- -

List of associated Subjects

- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionEmail
- - - - Unmap - - -
- - - -
- -
There is no Subjects
- -
- -
- -
- -
- -
- -

Add a Subject Category

- -
- -
- - - -
- -
- - -
- -
- -

List associated of Objects

- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescription
- - - - Unmap - - -
- - - -
- -
There is no Objects
- -
- -
- -
- -
- -
- -

Add an Object Category

- -
- -
- - - -
- -
- -
- -
- -

List associated of Actions

- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescription
- - - - Unmap - - -
- - - -
- -
There is no Actions
- -
- - -
- -
- -
- -
- -

Add an Action Category

- -
- -
. - - - -
- -
- -
\ No newline at end of file diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter.edit.dir.js b/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter.edit.dir.js deleted file mode 100755 index a96741fe..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter.edit.dir.js +++ /dev/null @@ -1,437 +0,0 @@ -(function () { - - 'use strict'; - - angular - .module('moon') - .directive('moonPerimeterEdit', moonPerimeterEdit); - - moonPerimeterEdit.$inject = []; - - function moonPerimeterEdit() { - - return { - templateUrl: 'html/policy/edit/parameter/perimeter/perimeter-edit.tpl.html', - bindToController: true, - controller: moonPerimeterEditController, - controllerAs: 'edit', - scope: { - //Type can be 'ACTION', 'OBJECT', 'SUBJECT' - perimeterType: '=', - policy: '=' - }, - restrict: 'E', - replace: true - }; - } - - - angular - .module('moon') - .controller('moonPerimeterEditController', moonPerimeterEditController); - - moonPerimeterEditController.$inject = ['$scope', '$rootScope', - 'perimeterService', 'PERIMETER_CST', 'alertService', - '$translate', 'formService', 'policyService', 'utilService']; - - function moonPerimeterEditController($scope, $rootScope, - perimeterService, PERIMETER_CST, alertService, - $translate, formService, policyService, utilService) { - - var edit = this; - - edit.perimeterType = $scope.edit.perimeterType; - // This variable is used in the view in order to display or not display email field - edit.subjectType = PERIMETER_CST.TYPE.SUBJECT; - edit.policy = $scope.edit.policy; - - edit.fromList = true; - - edit.loading = false; - - edit.form = {}; - - edit.perimeter = {name: null, description: null, partner_id: null, policy_list: [], email: null}; - - edit.list = []; - edit.policyList = []; - edit.policiesToBeSelected = []; - edit.selectedPolicyList = []; // List of Policies to be added to a new perimeter - - edit.create = createPerimeter; - edit.addToPolicy = addToPolicy; - edit.addPolicyToPerimeter = addPolicyToPerimeter; - edit.clearSelectedPolicies = clearSelectedPolicies; - edit.removeSelectedPolicy = removeSelectedPolicy; - edit.deletePerimeter = deletePerimeter; - - activate(); - - /* - * - */ - - function activate() { - - loadAllPolicies(); - - switch (edit.perimeterType) { - - case PERIMETER_CST.TYPE.SUBJECT: - - perimeterService.subject.findAllWithCallback(callBackList); - break; - - case PERIMETER_CST.TYPE.OBJECT: - - perimeterService.object.findAllWithCallback(callBackList); - break; - - case PERIMETER_CST.TYPE.ACTION: - - perimeterService.action.findAllWithCallback(callBackList); - break; - - default : - - edit.list = []; - break; - - } - - function callBackList(list) { - - // For each Perimeter, there is a check about the mapping between the perimeter and the policy - _.each(list, function (element) { - - if (_.indexOf(element.policy_list, edit.policy.id) === -1) { - - edit.list.push(element); - - } - - }); - - } - - } - - var rootListeners = { - - 'event:unMapPerimeterFromPerimeterList': $rootScope.$on('event:unMapPerimeterFromPerimeterList', manageUnMappedPerimeter) - - }; - - _.each(rootListeners, function(unbind){ - $scope.$on('$destroy', rootListeners[unbind]); - }); - - - function loadAllPolicies() { - - edit.policyList = []; - - policyService.findAllWithCallback( function(data) { - - edit.policyList = data; - edit.policiesToBeSelected = angular.copy(edit.policyList); - - }); - } - - function addPolicyToPerimeter() { - - if (!edit.selectedPolicy || _.contains(edit.perimeter.policy_list, edit.selectedPolicy.id)) { - return; - } - - edit.perimeter.policy_list.push(edit.selectedPolicy.id); - edit.selectedPolicyList.push(edit.selectedPolicy); - edit.policiesToBeSelected = _.without(edit.policiesToBeSelected, edit.selectedPolicy); - - } - - function clearSelectedPolicies() { - - edit.perimeter.policy_list = []; - edit.selectedPolicyList = []; - edit.policiesToBeSelected = angular.copy(edit.policyList); - - } - - function removeSelectedPolicy(policy) { - - edit.policiesToBeSelected.push(policy); - edit.perimeter.policy_list = _.without(edit.perimeter.policy_list, policy.id); - edit.selectedPolicyList = _.without(edit.selectedPolicyList, policy); - - } - - /** - * Add - */ - - function addToPolicy() { - - if (!edit.selectedPerimeter) { - - return; - - } - - startLoading(); - - var perimeterToSend = edit.selectedPerimeter; - - perimeterToSend.policy_list.push(edit.policy.id); - - switch (edit.perimeterType) { - - case PERIMETER_CST.TYPE.SUBJECT: - - perimeterService.subject.update(perimeterToSend, updatePerimeterSuccess, updatePerimeterError); - break; - - case PERIMETER_CST.TYPE.OBJECT: - - perimeterService.object.update(perimeterToSend, updatePerimeterSuccess, updatePerimeterError); - break; - - case PERIMETER_CST.TYPE.ACTION: - - perimeterService.action.update(perimeterToSend, updatePerimeterSuccess, updatePerimeterError); - break; - } - - - function updatePerimeterSuccess(data) { - - $translate('moon.perimeter.update.success', {policyName: perimeterToSend.name}).then(function (translatedValue) { - - alertService.alertSuccess(translatedValue); - - }); - - stopLoading(); - - } - - function updatePerimeterError(reason) { - - $translate('moon.policy.update.error', { - policyName: perimeterToSend.name, - reason: reason.message - }).then(function (translatedValue) { - - alertService.alertError(translatedValue); - - }); - - stopLoading(); - - } - - } - - /** - * Create - */ - - function createPerimeter() { - - if (formService.isInvalid(edit.form)) { - - formService.checkFieldsValidity(edit.form); - - } else { - - startLoading(); - - var perimeterToSend = angular.copy(edit.perimeter); - - switch (edit.perimeterType) { - - case PERIMETER_CST.TYPE.SUBJECT: - - perimeterService.subject.add(perimeterToSend, createSuccess, createError); - break; - - case PERIMETER_CST.TYPE.OBJECT: - - perimeterService.object.add(perimeterToSend, createSuccess, createError); - break; - - case PERIMETER_CST.TYPE.ACTION: - - perimeterService.action.add(perimeterToSend, createSuccess, createError); - break; - } - - } - - function createSuccess(data) { - - var created = {}; - - switch (edit.perimeterType) { - - case PERIMETER_CST.TYPE.SUBJECT: - - created = utilService.transformOne(data, 'subjects'); - break; - - case PERIMETER_CST.TYPE.OBJECT: - - created = utilService.transformOne(data, 'objects'); - break; - - case PERIMETER_CST.TYPE.ACTION: - - created = utilService.transformOne(data, 'actions'); - break; - } - - $translate('moon.policy.perimeter.edit.create.success', {name: created.name}).then(function (translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - stopLoading(); - - /** - * If during the creating the created assignments has be mapped with the current policy, then it is not required to push the new Assignments in the list - */ - if (_.indexOf(created.policy_list, edit.policy.id) === -1) { - - edit.list.push(created); - - }else{ - - $scope.$emit('event:createAssignmentsFromAssignmentsEditSuccess', created, edit.perimeterType); - - } - - displayList(); - - clearSelectedPolicies(); - - } - - function createError(reason) { - - $translate('moon.policy.perimeter.edit.create.error', {name: perimeterToSend.name}).then(function (translatedValue) { - alertService.alertError(translatedValue); - }); - - stopLoading(); - - } - - } - - /** - * Delete - */ - function deletePerimeter() { - - if (!edit.selectedPerimeter) { - - return; - - } - - startLoading(); - - var perimeterToDelete = angular.copy(edit.selectedPerimeter); - - switch (edit.perimeterType) { - case PERIMETER_CST.TYPE.SUBJECT: - - perimeterService.subject.delete(perimeterToDelete, deleteSuccess, deleteError); - break; - - case PERIMETER_CST.TYPE.OBJECT: - - perimeterService.object.delete(perimeterToDelete, deleteSuccess, deleteError); - break; - - case PERIMETER_CST.TYPE.ACTION: - - perimeterService.action.delete(perimeterToDelete, deleteSuccess, deleteError); - break; - } - - - function deleteSuccess(data) { - - $translate('moon.policy.perimeter.edit.delete.success', {name: perimeterToDelete.name}) - .then(function (translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - policyService.findOneReturningPromise(edit.policy.id).then(function (data) { - - edit.policy = utilService.transformOne(data, 'policies'); - - cleanSelectedValue(); - activate(); - stopLoading(); - - $scope.$emit('event:deletePerimeterFromPerimeterAddSuccess', edit.policy); - - }); - - } - - function deleteError(reason) { - - $translate('moon.policy.perimeter.edit.delete.error', {name: perimeterToDelete.name}).then(function (translatedValue) { - alertService.alertError(translatedValue); - }); - - stopLoading(); - - } - } - - function cleanSelectedValue() { - - delete edit.selectedPerimeter; - - } - - function startLoading() { - - edit.loading = true; - - } - - function stopLoading() { - - edit.loading = false; - - } - - function displayList() { - - edit.fromList = true; - - } - - /** - * If A perimeter has been unMapped, maybe it has to be display into the available list of Perimeter - * @param perimeter - * @param type - */ - function manageUnMappedPerimeter(event, perimeter, type){ - - if(type === edit.perimeterType && _.indexOf(perimeter.policy_list, edit.policy.id) === -1){ - - edit.list.push(perimeter); - - } - - } - - } - -})(); \ No newline at end of file diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter.list.dir.js b/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter.list.dir.js deleted file mode 100755 index dffa7783..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/perimeter/perimeter.list.dir.js +++ /dev/null @@ -1,284 +0,0 @@ -(function() { - - 'use strict'; - - angular - .module('moon') - .directive('moonPerimeterList', moonPerimeterList); - - moonPerimeterList.$inject = []; - - function moonPerimeterList() { - - return { - templateUrl : 'html/policy/edit/parameter/perimeter/perimeter-list.tpl.html', - bindToController : true, - controller : moonPerimeterListController, - controllerAs : 'list', - scope : { - policy: '=', - editMode : '=' - }, - restrict : 'E', - replace : true - }; - - } - - angular - .module('moon') - .controller('moonPerimeterListController', moonPerimeterListController); - - moonPerimeterListController.$inject = ['$scope', '$rootScope', 'perimeterService', '$translate', 'alertService', 'PERIMETER_CST']; - - function moonPerimeterListController($scope, $rootScope, perimeterService, $translate, alertService, PERIMETER_CST){ - - var list = this; - - list.policy = $scope.list.policy; - list.editMode = $scope.list.editMode; - - list.typeOfSubject = PERIMETER_CST.TYPE.SUBJECT; - list.typeOfObject = PERIMETER_CST.TYPE.OBJECT; - list.typeOfAction = PERIMETER_CST.TYPE.ACTION; - - list.unMapSub = unMapSub; - list.unMapObj = unMapObj; - list.unMapAct = unMapAct; - - list.getSubjects = getSubjects; - list.getObjects = getObjects; - list.getActions = getActions; - - activate(); - - function activate(){ - - manageSubjects(); - - manageObjects(); - - manageActions(); - - } - - var rootListeners = { - - 'event:deletePerimeterFromPerimeterAddSuccess': $rootScope.$on('event:deletePerimeterFromPerimeterAddSuccess', deletePolicy), - 'event:createAssignmentsFromAssignmentsEditSuccess': $rootScope.$on('event:createAssignmentsFromAssignmentsEditSuccess', addAssignmentsToPolicy) - - }; - - _.each(rootListeners, function(unbind){ - $scope.$on('$destroy', rootListeners[unbind]); - }); - - - function manageSubjects(){ - - list.loadingSub = true; - - perimeterService.subject.findAllFromPolicyWithCallback(list.policy.id, function(perimeters){ - - list.subjects = perimeters; - list.loadingSub = false; - - }); - } - - function manageObjects(){ - - list.loadingObj = true; - - perimeterService.object.findAllFromPolicyWithCallback(list.policy.id, function(perimeters){ - - list.objects = perimeters; - list.loadingObj = false; - - }); - - } - - function manageActions(){ - - list.loadingAct = true; - - perimeterService.action.findAllFromPolicyWithCallback(list.policy.id, function(perimeters){ - - list.actions = perimeters; - list.loadingAct = false; - - }); - - } - - /** - * UnMap - */ - - function unMapSub(perimeter){ - - perimeter.policy_list = _.without(perimeter.policy_list, list.policy.id); - - perimeter.loader = true; - - var perimeterToSend = angular.copy(perimeter); - - perimeterService.subject.unMapPerimeterFromPolicy(list.policy.id , perimeter.id, updatePerimeterSuccess, updatePerimeterError); - - function updatePerimeterSuccess(data){ - - $translate('moon.policy.perimeter.update.success', { perimeterName: perimeterToSend.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - $scope.$emit('event:unMapPerimeterFromPerimeterList', perimeter, PERIMETER_CST.TYPE.SUBJECT); - - activate(); - - perimeter.loader = false; - } - - function updatePerimeterError(reason){ - - $translate('moon.policy.perimeter.update.error', { perimeterName: perimeter.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - perimeter.loader = false; - - } - - } - - function unMapObj(perimeter){ - - perimeter.policy_list = _.without(perimeter.policy_list, list.policy.id); - - perimeter.loader = true; - - var perimeterToSend = angular.copy(perimeter); - - perimeterService.object.unMapPerimeterFromPolicy(list.policy.id , perimeter.id, updatePerimeterSuccess, updatePerimeterError); - - function updatePerimeterSuccess(data){ - - $translate('moon.policy.perimeter.update.success', { perimeterName: perimeterToSend.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - $scope.$emit('event:unMapPerimeterFromPerimeterList', perimeter, PERIMETER_CST.TYPE.OBJECT); - - activate(); - - perimeter.loader = false; - } - - function updatePerimeterError(reason){ - - $translate('moon.policy.perimeter.update.error', { perimeterName: perimeter.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - perimeter.loader = false; - - } - - } - - function unMapAct(perimeter){ - - perimeter.policy_list = _.without(perimeter.policy_list, list.policy.id); - - perimeter.loader = true; - - var perimeterToSend = angular.copy(perimeter); - - perimeterService.action.unMapPerimeterFromPolicy(list.policy.id , perimeter.id, updatePerimeterSuccess, updatePerimeterError); - - function updatePerimeterSuccess(data){ - - $translate('moon.policy.perimeter.update.success', { perimeterName: perimeterToSend.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - $scope.$emit('event:unMapPerimeterFromPerimeterList', perimeter, PERIMETER_CST.TYPE.ACTION); - - activate(); - - perimeter.loader = false; - } - - function updatePerimeterError(reason){ - - $translate('moon.policy.perimeter.update.error', { perimeterName: perimeter.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - perimeter.loader = false; - - } - - } - - function getSubjects(){ - return list.subjects ? list.subjects : []; - } - - function getObjects(){ - return list.objects ? list.objects : []; - } - - function getActions(){ - return list.actions ? list.actions : []; - } - - function removeSubFromSubList(subject){ - list.subjects = _.without(list.subjects, subject); - } - - function removeObjFromObjList(object){ - list.objects = _.without(list.objects, object); - } - - function removeActFromActList(action){ - list.actions = _.without(list.actions, action); - } - - function deletePolicy( event, policy){ - - list.policy = policy; - - activate(); - - } - - function addAssignmentsToPolicy( event, assignments, type){ - - switch (type) { - - case PERIMETER_CST.TYPE.SUBJECT: - - list.subjects.push(assignments); - break; - - case PERIMETER_CST.TYPE.OBJECT: - - list.objects.push(assignments); - break; - - case PERIMETER_CST.TYPE.ACTION: - - list.actions.push(assignments); - break; - - default : - break; - - } - - } - - } - -})(); \ No newline at end of file diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-edit.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-edit.tpl.html deleted file mode 100755 index 685046a5..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-edit.tpl.html +++ /dev/null @@ -1,341 +0,0 @@ -
- -
- -
- - -
- - - -
- - - - - -
- - - - -
- Policy is required -
- -
- -
- -
-
- -
-
- -
- - -
- - - -
- - - - - -
- - - - -
- A MetaRules is required -
- -
- - - -
- -
- -
- - -
- -
- -
- -
- -
- - - -
- - - - - -
- - - - -
- Some subject are required -
- -
- -
- -
- -
- -
- - - -
- -
- -
- -
- - - -
- -
    - -
  • - - - -
    • - -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- - - -
- - - - - -
- - - - -
- Some objects are required -
- -
- -
- -
- -
- -
- - - -
- -
- -
- -
- - - -
- -
    - -
  • - - - -
    • - -
- -
-
- -
- -
- -
- -
- -
- -
- -
- -
- -
- - - -
- - - - - -
- - - - -
- Some action are required -
-
- -
- -
- -
- -
- - - -
- -
- -
- -
- - - -
- -
    - -
  • - - - -
    • - -
- -
-
- -
- -
- -
- -
- -
- -
- -
- - - -
- -
- An instructions is required -
-
- -
- -
- -
- - - - Create - - - - -
- -
- -
- -
- -
- -
\ No newline at end of file diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html deleted file mode 100755 index 76ac4365..00000000 --- a/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html +++ /dev/null @@ -1,134 +0,0 @@ -
- -
- -
- -

List of associated Subjects

- -
- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
Meta Rule
- 		-
Rule
- 		-
Instruction
- 		-
Actions
-
There is no Rules
- - - Loading - - - - - - - - - - Loading - - - - - - - - - - - - , - - - - - - 

-                        		
-
-                            
-                                
-                                Delete
-                            
-
-                            

-
-                                
-
-                            

-
-                        

-
-            

-
-        

-
-    

-
-    

-
-        

-
-            
Add a Rules

-
-        

-
-        
.
-
-            
-
-        

-
-    

-
-

\ No newline at end of file
diff --git a/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules.edit.dir.js b/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules.edit.dir.js
deleted file mode 100755
index b7bb7614..00000000
--- a/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules.edit.dir.js
+++ /dev/null
@@ -1,537 +0,0 @@
-(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/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules.list.dir.js b/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules.list.dir.js
deleted file mode 100755
index 5c3e7457..00000000
--- a/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules.list.dir.js
+++ /dev/null
@@ -1,302 +0,0 @@
-(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
-- 
cgit 1.2.3-korg