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 ------------------ 4 files changed, 1332 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 (limited to 'moonv4/moon_gui/static/app/policy/edit/parameter/assignments') 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 -- cgit 1.2.3-korg