From 60bb98696ee93f979914d8e88ed4708f59fcff9c Mon Sep 17 00:00:00 2001 From: asteroide Date: Fri, 9 Jun 2017 16:18:59 +0200 Subject: Stable version Change-Id: I70001bedbdf1823cb9e8dccd545800387777201b --- .../authentication/authentication.controller.js | 4 + .../static/app/common/header/header.controller.js | 5 +- .../static/app/common/header/header.tpl.html | 6 +- .../static/app/dashboard/dashboard.tpl.html | 2 +- .../app/model/edit/metadata/metadata-edit.tpl.html | 2 +- .../app/model/edit/metadata/metadata-list.tpl.html | 488 ++++++++++++++------- .../app/model/edit/metadata/metadata.edit.dir.js | 8 +- .../app/model/edit/metadata/metadata.list.dir.js | 219 ++++----- .../model/edit/metarules/metarules-list.tpl.html | 199 ++++----- .../app/model/edit/metarules/metarules.list.dir.js | 7 +- .../static/app/model/edit/model-edit.tpl.html | 6 +- .../static/app/model/edit/model.controller.edit.js | 10 +- moonv4/moon_gui/static/app/moon.constants.js | 31 +- .../moon_gui/static/app/pdp/edit/pdp-edit.tpl.html | 10 +- moonv4/moon_gui/static/app/pdp/pdp-list.tpl.html | 36 +- .../moon_gui/static/app/pdp/pdp.controller.list.js | 19 +- .../assignments/assignments-list.tpl.html | 68 +-- .../parameter/assignments/assignments.list.dir.js | 289 ++++-------- .../policy/edit/parameter/data/data-list.tpl.html | 75 +++- .../policy/edit/parameter/data/data.edit.dir.js | 210 +++------ .../policy/edit/parameter/data/data.list.dir.js | 170 ++----- .../parameter/perimeter/perimeter-list.tpl.html | 130 ++---- .../edit/parameter/perimeter/perimeter.list.dir.js | 212 +++------ .../edit/parameter/rules/rules-list.tpl.html | 148 ++++--- .../policy/edit/parameter/rules/rules.list.dir.js | 88 +++- .../static/app/policy/edit/policy-edit.tpl.html | 10 +- .../static/app/policy/policy.controller.list.js | 6 +- .../static/app/policy/policy.mapped.list.dir.js | 9 +- .../static/app/services/gui/form.service.js | 4 +- .../moon/policy/parameters/assignements.service.js | 53 ++- .../moon/policy/parameters/data.service.js | 85 +++- .../moon/policy/parameters/perimeter.service.js | 57 ++- .../app/services/moon/policy/policy.service.js | 2 +- .../app/services/moon/rule/metadata.service.js | 14 +- .../app/services/moon/rule/metarule.service.js | 4 +- 35 files changed, 1342 insertions(+), 1344 deletions(-) (limited to 'moonv4/moon_gui/static/app') diff --git a/moonv4/moon_gui/static/app/authentication/authentication.controller.js b/moonv4/moon_gui/static/app/authentication/authentication.controller.js index d3510fed..ce38bc5f 100644 --- a/moonv4/moon_gui/static/app/authentication/authentication.controller.js +++ b/moonv4/moon_gui/static/app/authentication/authentication.controller.js @@ -37,18 +37,22 @@ } function loginSuccess() { + $translate('moon.login.success').then( function(translatedValue) { alertService.alertSuccess(translatedValue); $state.go('moon.dashboard'); vm.loading = false; }); + } function loginError(reason) { + $translate('moon.login.error', { errorCode: reason.status }).then( function(translatedValue) { alertService.alertError(translatedValue); vm.loading = false; }); + } } })(); \ No newline at end of file diff --git a/moonv4/moon_gui/static/app/common/header/header.controller.js b/moonv4/moon_gui/static/app/common/header/header.controller.js index dfab502f..13ef4d6f 100644 --- a/moonv4/moon_gui/static/app/common/header/header.controller.js +++ b/moonv4/moon_gui/static/app/common/header/header.controller.js @@ -27,6 +27,7 @@ header.isModelTabActive = menuService.isModelTabActive; header.changeLocale = changeLocale; header.logout = logout; + header.currentLanguage = $translate.use(); header.getUser = authenticationService.GetUser; @@ -37,17 +38,19 @@ function changeLocale(localeKey, event) { event.preventDefault(); - $translate.use(localeKey); $translate.preferredLanguage(localeKey); + header.currentLanguage = localeKey; } function logout(){ + authenticationService.Logout(); $translate('moon.logout.success').then( function(translatedValue) { alertService.alertSuccess(translatedValue); }); + } } })(); \ No newline at end of file diff --git a/moonv4/moon_gui/static/app/common/header/header.tpl.html b/moonv4/moon_gui/static/app/common/header/header.tpl.html index ad7b461d..f703fa79 100644 --- a/moonv4/moon_gui/static/app/common/header/header.tpl.html +++ b/moonv4/moon_gui/static/app/common/header/header.tpl.html @@ -14,13 +14,15 @@
- fr_fr - en_en + + fr_fr + en_en Logout() + Login diff --git a/moonv4/moon_gui/static/app/dashboard/dashboard.tpl.html b/moonv4/moon_gui/static/app/dashboard/dashboard.tpl.html index 03da1b71..67184bcc 100644 --- a/moonv4/moon_gui/static/app/dashboard/dashboard.tpl.html +++ b/moonv4/moon_gui/static/app/dashboard/dashboard.tpl.html @@ -7,7 +7,7 @@
- ET + ET
diff --git a/moonv4/moon_gui/static/app/model/edit/metadata/metadata-edit.tpl.html b/moonv4/moon_gui/static/app/model/edit/metadata/metadata-edit.tpl.html index fde6cdb0..2616be1c 100644 --- a/moonv4/moon_gui/static/app/model/edit/metadata/metadata-edit.tpl.html +++ b/moonv4/moon_gui/static/app/model/edit/metadata/metadata-edit.tpl.html @@ -70,7 +70,7 @@
- +
diff --git a/moonv4/moon_gui/static/app/model/edit/metadata/metadata-list.tpl.html b/moonv4/moon_gui/static/app/model/edit/metadata/metadata-list.tpl.html index 35b61f57..30a42dbc 100644 --- a/moonv4/moon_gui/static/app/model/edit/metadata/metadata-list.tpl.html +++ b/moonv4/moon_gui/static/app/model/edit/metadata/metadata-list.tpl.html @@ -1,149 +1,156 @@
-
+ +
-
+
-

List of associated Subject Categories

+
-
+

List of associated Subject Categories

-
+
-
+
- +
-
- - - - - - - +
IdNameDescription
- + + + + + + + + - - - - - - + + + + + + - - + + + - - - - - - - - -
IdNameDescription
+ - - - Remove - +
- + -
+
--> - +
-
+ -
There is no Subjects
+ + + There is no Subjects + + + + + + + + +
-
+
-
+
-
+

Add a Subject Category

-

Add a Subject Category

+
-
+
-
+ - +
-
- -
+
-
+
-

List associated of Object Categories

+

List associated of Object Categories

-
+
-
+
-
+
- +
- - - - - - + + + + + + - - + + - + - + - + - + - + + +
IdNameDescription
IdNameDescription
- + Remove @@ -186,148 +193,299 @@
There is no Objects
- +
-
+
-
+
-
+

Add an Object Category

-

Add an Object Category

+
-
+
-
+ - +
-
+
-
+
-
+

List associated of Action Categories

-

List associated of Action Categories

- -
+
-
+
-
+
- +
- - - - - - - - + + + + + + + + - + - - - - - - + + + + + - - + + + - + - + -
IdNameDescription
IdNameDescription
+
- - - Remove - + + + Remove + - + --> -
+
- + -
+
-
There is no Actions
+ + +
-
+
-
+
-
+

Add an Action Category

-

Add an Action Category

+
-
+
. -
. + - +
+ +
+ +
+ +
+ +
+ +
+ +

List of associated Subject Categories

+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Name
There is no Subjects
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +

List associated of Object Categories

+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
Name
There is no Objects
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +

List associated of Action Categories

+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
Name
There is no Actions
+ +
+ +
+ +
+ +
+ +
+
\ No newline at end of file diff --git a/moonv4/moon_gui/static/app/model/edit/metadata/metadata.edit.dir.js b/moonv4/moon_gui/static/app/model/edit/metadata/metadata.edit.dir.js index 2e927c44..10df83b0 100644 --- a/moonv4/moon_gui/static/app/model/edit/metadata/metadata.edit.dir.js +++ b/moonv4/moon_gui/static/app/model/edit/metadata/metadata.edit.dir.js @@ -29,9 +29,11 @@ .module('moon') .controller('moonMetaDataEditController', moonMetaDataEditController); - moonMetaDataEditController.$inject = ['$scope', 'metaDataService', 'META_DATA_CST', 'alertService', '$translate', 'formService', 'metaRuleService', 'utilService']; + moonMetaDataEditController.$inject = ['$scope', 'metaDataService', 'META_DATA_CST', 'alertService', + '$translate', 'formService', 'metaRuleService', 'utilService']; - function moonMetaDataEditController($scope, metaDataService, META_DATA_CST, alertService, $translate, formService, metaRuleService, utilService) { + function moonMetaDataEditController($scope, metaDataService, META_DATA_CST, alertService, + $translate, formService, metaRuleService, utilService) { var edit = this; @@ -86,7 +88,7 @@ function callBackList(list){ - edit.list = list + edit.list = list; } diff --git a/moonv4/moon_gui/static/app/model/edit/metadata/metadata.list.dir.js b/moonv4/moon_gui/static/app/model/edit/metadata/metadata.list.dir.js index c4654be1..beb2ed86 100644 --- a/moonv4/moon_gui/static/app/model/edit/metadata/metadata.list.dir.js +++ b/moonv4/moon_gui/static/app/model/edit/metadata/metadata.list.dir.js @@ -17,7 +17,9 @@ controllerAs : 'list', scope : { metaRule: '=', - editMode : '=' + editMode: '=', + // shortDisplay : boolean value + shortDisplay: '=' }, restrict : 'E', replace : true @@ -36,6 +38,7 @@ list.metaRule = $scope.list.metaRule; list.editMode = $scope.list.editMode; + list.shortDisplay = $scope.list.shortDisplay; list.typeOfSubject = META_DATA_CST.TYPE.SUBJECT; list.typeOfObject = META_DATA_CST.TYPE.OBJECT; @@ -45,9 +48,9 @@ list.unMapObj = unMapObj; list.unMapAct = unMapAct; - list.deleteSub = deleteSub; - list.deleteObj = deleteObj; - list.deleteAct = deleteAct; + // list.deleteSub = deleteSub; + // list.deleteObj = deleteObj; + // list.deleteAct = deleteAct; list.getSubjectCategories = getSubjectCategories; list.getObjectCategories = getObjectCategories; @@ -82,7 +85,7 @@ list.loadingCatSub = true; - metaDataService.subject.findSomeWithCallback(list.metaRule.subject_categories, function(categories){ + metaDataService.subject.findSomeWithCallback(list.metaRule.subject_categories, function(categories){ list.catSub = categories; list.loadingCatSub = false; @@ -229,97 +232,99 @@ } - /** - * Delete - */ - - function deleteSub(subject){ - - subject.loader = true; - - metaDataService.subject.delete(subject, deleteSubSuccess, deleteSubError); - - function deleteSubSuccess(data){ - - $translate('moon.model.metadata.subject.delete.success', { subjectName: subject.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeSubFromSubList(subject); - - subject.loader = false; - - } - - function deleteSubError(reason){ - - $translate('moon.model.metadata.subject.delete.error', { subjectName: subject.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - subject.loader = false; - - } - } - - function deleteObj(object){ - - object.loader = true; - - metaDataService.object.delete(object, deleteObjSuccess, deleteObjError); - - function deleteObjSuccess(data){ - - $translate('moon.model.metadata.object.delete.success', { objectName: object.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeObjFromObjList(object); - list.catSub = metaDataService.subject.findSome(metaRule.subject_categories); - list.catObj = metaDataService.object.findSome(metaRule.object_categories); - list.catAct = metaDataService.action.findSome(metaRule.action_categories); - object.loader = false; - - } - - function deleteObjError(reason){ - - $translate('moon.model.metadata.object.delete.error', { objectName: object.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - object.loader = false; - } - } - - function deleteAct(action){ - - action.loader = true; - - metaDataService.action.delete(action, deleteActSuccess, deleteActError); - - function deleteActSuccess(data){ - - $translate('moon.model.metadata.action.delete.success', { actionName: action.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeActFromActList(action); - - action.loader = false; - - } - - function deleteActError(reason){ - - $translate('moon.model.metadata.action.delete.error', { actionName: action.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - action.loader = false; - - } - } + // /** + // * Delete + // */ + // + // function deleteSub(subject){ + // + // subject.loader = true; + // + // metaDataService.subject.delete(subject, deleteSubSuccess, deleteSubError); + // + // function deleteSubSuccess(data){ + // + // $translate('moon.model.metadata.subject.delete.success', { subjectName: subject.name }).then( function(translatedValue) { + // alertService.alertSuccess(translatedValue); + // }); + // + // removeSubFromSubList(subject); + // + // subject.loader = false; + // + // } + // + // function deleteSubError(reason){ + // + // $translate('moon.model.metadata.subject.delete.error', + // { subjectName: subject.name, reason: reason.message}).then( function(translatedValue) { + // alertService.alertError(translatedValue); + // }); + // + // subject.loader = false; + // + // } + // } + // + // function deleteObj(object){ + // + // object.loader = true; + // + // metaDataService.object.delete(object, deleteObjSuccess, deleteObjError); + // + // function deleteObjSuccess(data){ + // + // $translate('moon.model.metadata.object.delete.success', { objectName: object.name }).then( function(translatedValue) { + // alertService.alertSuccess(translatedValue); + // }); + // + // removeObjFromObjList(object); + // /*list.catSub = metaDataService.subject.findSome(list.metaRule.subject_categories); + // list.catObj = metaDataService.object.findSome(list.metaRule.object_categories); + // list.catAct = metaDataService.action.findSome(list.metaRule.action_categories);*/ + // + // object.loader = false; + // + // } + // + // function deleteObjError(reason){ + // + // $translate('moon.model.metadata.object.delete.error', { objectName: object.name, reason: reason.message}).then( function(translatedValue) { + // alertService.alertError(translatedValue); + // }); + // + // object.loader = false; + // } + // } + // + // function deleteAct(action){ + // + // action.loader = true; + // + // metaDataService.action.delete(action, deleteActSuccess, deleteActError); + // + // function deleteActSuccess(data){ + // + // $translate('moon.model.metadata.action.delete.success', { actionName: action.name }).then( function(translatedValue) { + // alertService.alertSuccess(translatedValue); + // }); + // + // removeActFromActList(action); + // + // action.loader = false; + // + // } + // + // function deleteActError(reason){ + // + // $translate('moon.model.metadata.action.delete.error', { actionName: action.name, reason: reason.message}).then( function(translatedValue) { + // alertService.alertError(translatedValue); + // }); + // + // action.loader = false; + // + // } + // } function getSubjectCategories(){ return list.catSub ? list.catSub : []; @@ -333,17 +338,17 @@ return list.catAct ? list.catAct : []; } - function removeSubFromSubList(subject){ - list.catSub = _.without(list.catSub, subject); - } - - function removeObjFromObjList(object){ - list.catObj = _.without(list.catObj, object); - } - - function removeActFromActList(action){ - list.catAct = _.without(list.catAct, action); - } + // function removeSubFromSubList(subject){ + // list.catSub = _.without(list.catSub, subject); + // } + // + // function removeObjFromObjList(object){ + // list.catObj = _.without(list.catObj, object); + // } + // + // function removeActFromActList(action){ + // list.catAct = _.without(list.catAct, action); + // } function updateMetaRuleCategories( event, metaRule){ diff --git a/moonv4/moon_gui/static/app/model/edit/metarules/metarules-list.tpl.html b/moonv4/moon_gui/static/app/model/edit/metarules/metarules-list.tpl.html index c36700ff..ebe307c3 100644 --- a/moonv4/moon_gui/static/app/model/edit/metarules/metarules-list.tpl.html +++ b/moonv4/moon_gui/static/app/model/edit/metarules/metarules-list.tpl.html @@ -1,149 +1,138 @@
-
-

List of Meta Rules

+

List of Meta Rules

-
- -
- -
- - - - - - - - - - +
+
- + + + + + + + + - + - + - + - + - + - + - - + - + + - - - - - + - + + + + + - - - - - - - -
+
+ + + + + + - + - + + -
-
Name
-
-
Description
- 		+
Name
+ 		-
Number of Subjects
- 		+
Description
+ 		-
Number of Subjects
- 		+
Number of Subjects
+ 		-
Number of Actions
- 		+
Number of Subjects
+ 		-
Actions
-
+
Number of Actions
+
+
Actions
+
There is no Meta Rules
There is no Meta Rules
+
-
+
- +
-
+
-
+
- + + -
+ -
- -
+ +
+
-
- -
- - - Settings - -
- +
+ + + Settings +
diff --git a/moonv4/moon_gui/static/app/model/edit/metarules/metarules.list.dir.js b/moonv4/moon_gui/static/app/model/edit/metarules/metarules.list.dir.js index 8fba0266..120b6a8b 100644 --- a/moonv4/moon_gui/static/app/model/edit/metarules/metarules.list.dir.js +++ b/moonv4/moon_gui/static/app/model/edit/metarules/metarules.list.dir.js @@ -59,6 +59,11 @@ list.edit = { modal: $modal({ template: 'html/model/edit/metarules/action/metarules-edit.tpl.html', show: false }), showModal: showEditModal }; + /*list.edit.modal.result.finally(function(){ + console.log('CATCHING'); + });*/ + + list.map = { modal: $modal({ template: 'html/model/edit/metarules/action/mapping/metarules-map.tpl.html', show: false }), showModal: showMapModal }; @@ -224,8 +229,6 @@ }); - - } function modelUnmappedError(event) { diff --git a/moonv4/moon_gui/static/app/model/edit/model-edit.tpl.html b/moonv4/moon_gui/static/app/model/edit/model-edit.tpl.html index c86d05ec..4955f441 100644 --- a/moonv4/moon_gui/static/app/model/edit/model-edit.tpl.html +++ b/moonv4/moon_gui/static/app/model/edit/model-edit.tpl.html @@ -53,7 +53,11 @@
- +
+ + + +
diff --git a/moonv4/moon_gui/static/app/model/edit/model.controller.edit.js b/moonv4/moon_gui/static/app/model/edit/model.controller.edit.js index f5972052..3e10a533 100644 --- a/moonv4/moon_gui/static/app/model/edit/model.controller.edit.js +++ b/moonv4/moon_gui/static/app/model/edit/model.controller.edit.js @@ -6,9 +6,9 @@ .module('moon') .controller('ModelEditController', ModelEditController); - ModelEditController.$inject = ['$scope', '$rootScope', 'model', '$stateParams']; + ModelEditController.$inject = ['$scope', '$rootScope', 'model', 'metaRuleService']; - function ModelEditController($scope, $rootScope, model, $stateParams) { + function ModelEditController($scope, $rootScope, model, metaRuleService) { var edit = this; @@ -48,6 +48,12 @@ edit.model = model; + metaRuleService.findSomeWithCallback(model.meta_rules, function(metaRules){ + + edit.model.meta_rules_values = metaRules; + + }); + } } diff --git a/moonv4/moon_gui/static/app/moon.constants.js b/moonv4/moon_gui/static/app/moon.constants.js index e3fd7595..ffe60f94 100644 --- a/moonv4/moon_gui/static/app/moon.constants.js +++ b/moonv4/moon_gui/static/app/moon.constants.js @@ -58,29 +58,22 @@ ACTION: 'ACTION' } }) - .constant('RULES_CST', { - TYPE: { - SUBJECT: 'SUBJECT', - OBJECT: 'OBJECT', - ACTION: 'ACTION' - } - }) .constant('REST_URI', { - PDP : 'http://172.18.0.11:38001/pdp/', - MODELS : 'http://172.18.0.11:38001/models/', - METARULES: 'http://172.18.0.11:38001/meta_rules/', - RULES: 'http://172.18.0.11:38001/rules/', - POLICIES: 'http://172.18.0.11:38001/policies/', + PDP : 'http://192.168.102.118:38001/pdp/', + MODELS : 'http://192.168.102.118:38001/models/', + METARULES: 'http://192.168.102.118:38001/meta_rules/', + RULES: 'http://192.168.102.118:38001/rules/', + POLICIES: 'http://192.168.102.118:38001/policies/', METADATA: { - subject : 'http://172.18.0.11:38001/subject_categories/', - object : 'http://172.18.0.11:38001/object_categories/', - action : 'http://172.18.0.11:38001/action_categories/' + subject : 'http://192.168.102.118:38001/subject_categories/', + object : 'http://192.168.102.118:38001/object_categories/', + action : 'http://192.168.102.118:38001/action_categories/' }, PERIMETERS :{ - subject : 'http://172.18.0.11:38001/subjects/', - object : 'http://172.18.0.11:38001/objects/', - action : 'http://172.18.0.11:38001/actions/' + subject : 'http://192.168.102.118:38001/subjects/', + object : 'http://192.168.102.118:38001/objects/', + action : 'http://192.168.102.118:38001/actions/' }, - KEYSTONE : 'http://keystone:5000/v3/' + KEYSTONE : 'http://192.168.102.118:5000/v3/' }); })(); diff --git a/moonv4/moon_gui/static/app/pdp/edit/pdp-edit.tpl.html b/moonv4/moon_gui/static/app/pdp/edit/pdp-edit.tpl.html index bc4582ce..1fbd555a 100644 --- a/moonv4/moon_gui/static/app/pdp/edit/pdp-edit.tpl.html +++ b/moonv4/moon_gui/static/app/pdp/edit/pdp-edit.tpl.html @@ -48,7 +48,15 @@
- +
+ +
+ + + +
+ +
diff --git a/moonv4/moon_gui/static/app/pdp/pdp-list.tpl.html b/moonv4/moon_gui/static/app/pdp/pdp-list.tpl.html index 6716ebba..8aa4e653 100644 --- a/moonv4/moon_gui/static/app/pdp/pdp-list.tpl.html +++ b/moonv4/moon_gui/static/app/pdp/pdp-list.tpl.html @@ -21,49 +21,49 @@
 
- +
- + - + - + - - - + - + - + - + - + - + - + @@ -111,15 +111,15 @@ - + - + - +
Name
Number of Securities
Project
Actions
There is no PDP
- +
- +
diff --git a/moonv4/moon_gui/static/app/pdp/pdp.controller.list.js b/moonv4/moon_gui/static/app/pdp/pdp.controller.list.js index 07c9aa2a..a831cfe3 100644 --- a/moonv4/moon_gui/static/app/pdp/pdp.controller.list.js +++ b/moonv4/moon_gui/static/app/pdp/pdp.controller.list.js @@ -15,7 +15,7 @@ '$scope', '$filter', '$modal', - 'ngTableParams', + 'NgTableParams', 'pdps', 'projectService']; @@ -23,7 +23,7 @@ $scope, $filter, $modal, - ngTableParams, + NgTableParams, pdps, projectService) { @@ -79,11 +79,11 @@ 'event:pdpDeletedError': $rootScope.$on('event:pdpDeletedError', pdpDeletedError), }; - - for (var unbind in rootListeners) { - $scope.$on('$destroy', rootListeners[unbind]); - } - + + _.each(rootListeners, function(unbind){ + $scope.$on('$destroy', rootListeners[unbind]); + }); + /* * */ @@ -189,13 +189,10 @@ */ function newPDPsTable() { - list.table = new ngTableParams({ + list.table = new NgTableParams({ page: 1, // show first page count: 10, // count per page - sorting: { - name: 'asc' // initial sorting - } }, { 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 index 0f919a4a..34bbc7a8 100644 --- 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 @@ -17,9 +17,7 @@ Perimeter name Category name - Data name - - + Data name @@ -29,13 +27,14 @@ +
Loading
- +
@@ -63,14 +62,26 @@ - - , + + () + + ,  + + +
+ + + +
+ + + @@ -101,7 +112,7 @@
- +
@@ -122,13 +133,11 @@ - - - - - - - + + + + + @@ -143,7 +152,7 @@
- +
@@ -169,10 +178,13 @@ + - - , + + () + + ,  @@ -207,7 +219,7 @@
- +
@@ -228,13 +240,11 @@
Perimeter nameCategory nameData name
Perimeter nameCategory nameData name
- - - - - - - + + + + + @@ -277,8 +287,10 @@ - - , + + () + + ,  @@ -314,7 +326,7 @@
. - +
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 index 747fd487..22931e4d 100644 --- 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 @@ -1,4 +1,4 @@ -(function() { +(function () { 'use strict'; @@ -11,16 +11,16 @@ function moonAssignmentsList() { return { - templateUrl : 'html/policy/edit/parameter/assignments/assignments-list.tpl.html', - bindToController : true, - controller : moonAssignmentsListController, - controllerAs : 'list', - scope : { + templateUrl: 'html/policy/edit/parameter/assignments/assignments-list.tpl.html', + bindToController: true, + controller: moonAssignmentsListController, + controllerAs: 'list', + scope: { policy: '=', - editMode : '=' + editMode: '=' }, - restrict : 'E', - replace : true + restrict: 'E', + replace: true }; } @@ -28,9 +28,11 @@ .module('moon') .controller('moonAssignmentsListController', moonAssignmentsListController); - moonAssignmentsListController.$inject = ['$scope', '$rootScope', 'assignmentService', '$translate', 'alertService', 'policyService', 'ASSIGNMENTS_CST', 'utilService', 'metaDataService', 'perimeterService', 'dataService']; + moonAssignmentsListController.$inject = ['$scope', '$rootScope', 'assignmentsService', '$translate', 'alertService', + 'policyService', 'ASSIGNMENTS_CST', 'utilService', 'metaDataService', 'perimeterService', 'dataService']; - function moonAssignmentsListController($scope, $rootScope, assignmentService, $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; @@ -41,10 +43,6 @@ list.typeOfObject = ASSIGNMENTS_CST.TYPE.OBJECT; list.typeOfAction = ASSIGNMENTS_CST.TYPE.ACTION; - list.unMapSub = unMapSub; - list.unMapObj = unMapObj; - list.unMapAct = unMapAct; - list.deleteSub = deleteSub; list.deleteObj = deleteObj; list.deleteAct = deleteAct; @@ -59,7 +57,7 @@ activate(); - function activate(){ + function activate() { manageSubjects(); @@ -71,37 +69,32 @@ var rootListeners = { - 'event:deleteDataFromDataAddSuccess': $rootScope.$on('event:deleteDataFromDataAddSuccess', deletePolicy) + 'event:createAssignmentsFromAssignmentsEditSuccess': $rootScope.$on('event:createAssignmentsFromAssignmentsEditSuccess', updateList) }; - for (var unbind in rootListeners) { + _.each(rootListeners, function(unbind){ $scope.$on('$destroy', rootListeners[unbind]); - } - + }); - function manageSubjects(){ + function manageSubjects() { list.loadingSub = true; - assignmentService.subject.findAllFromPolicyWithCallback(list.policy.id, function(data){ + assignmentsService.subject.findAllFromPolicyWithCallback(list.policy.id, function (data) { - console.log('subjects'); - console.log(data); list.subjects = data; list.loadingSub = false; }); } - function manageObjects(){ + function manageObjects() { list.loadingObj = true; - assignmentService.object.findAllFromPolicyWithCallback(list.policy.id, function(data){ + assignmentsService.object.findAllFromPolicyWithCallback(list.policy.id, function (data) { - console.log('objects'); - console.log(data); list.objects = data; list.loadingObj = false; @@ -109,14 +102,12 @@ } - function manageActions(){ + function manageActions() { list.loadingAct = true; - assignmentService.action.findAllFromPolicyWithCallback(list.policy.id, function(data){ + assignmentsService.action.findAllFromPolicyWithCallback(list.policy.id, function (data) { - console.log('actions'); - console.log(data); list.actions = data; list.loadingAct = false; @@ -126,16 +117,16 @@ function getPerimeterFromAssignment(assignment, type) { - if(_.has(assignment, 'perimeter')){ + if (_.has(assignment, 'perimeter')) { return assignment.perimeter; } // if the call has not been made - if(!_.has(assignment, 'callPerimeterInProgress')){ + if (!_.has(assignment, 'callPerimeterInProgress')) { assignment.callPerimeterInProgress = true; - switch(type){ + switch (type) { case ASSIGNMENTS_CST.TYPE.SUBJECT: perimeterService.subject.findOneFromPolicyWithCallback(list.policy.id, assignment.subject_id, setPerimeterToAssignment); @@ -156,7 +147,7 @@ // if the call is in progress return false return false; - function setPerimeterToAssignment(perimeter){ + function setPerimeterToAssignment(perimeter) { assignment.callPerimeterInProgress = false; assignment.perimeter = perimeter; @@ -166,16 +157,16 @@ function getCategoryFromAssignment(data, type) { - if(_.has(data, 'category')){ + if (_.has(data, 'category')) { return data.category; } // if the call has not been made - if(!_.has(data, 'callCategoryInProgress')){ + if (!_.has(data, 'callCategoryInProgress')) { data.callCategoryInProgress = true; - switch(type){ + switch (type) { case ASSIGNMENTS_CST.TYPE.SUBJECT: metaDataService.subject.findOne(data.subject_cat_id, setCategoryToData); @@ -196,7 +187,7 @@ // if the call is in progress return false return false; - function setCategoryToData(category){ + function setCategoryToData(category) { data.callCategoryInProgress = false; data.category = category; @@ -205,32 +196,31 @@ } /** - * Prerequisite : meta Rule should be completely loaded * @param index * @param assignment * @param type */ - function getDataFromAssignmentsIndex(index, assignment, type){ + function getDataFromAssignmentsIndex(index, assignment, type) { - if(!_.has(assignment, 'assignments_value')){ + 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(){ + 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 ){ + 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')){ + if (!_.has(assignment.assignments_value[index], 'callDataInProgress')) { assignment.assignments_value[index].callDataInProgress = true; - switch(type){ + switch (type) { case ASSIGNMENTS_CST.TYPE.SUBJECT: dataService.subject.data.findOne(list.policy.id, assignment.category_id, assignment.assignments[index], setDataToAssignment); @@ -251,7 +241,7 @@ // if the call is in progress return false return false; - function setDataToAssignment(data){ + function setDataToAssignment(data) { assignment.assignments_value[index].callDataInProgress = false; assignment.assignments_value[index].data = data; @@ -259,239 +249,142 @@ } } - - /** - * UnMap + * Delete */ - function unMapSub(subject){ + function deleteSub(subject, dataId) { subject.loader = true; - var policyToSend = angular.copy(list.policy); + assignmentsService.subject.delete(list.policy.id, subject.subject_id, subject.subject_cat_id, dataId, deleteSubSuccess, deleteSubError); - policyToSend.subject_categories = _.without(policyToSend.subject_categories, subject.id); + function deleteSubSuccess(data) { - policyService.update(policyToSend, updatePolicySuccess, updatePolicyError); - - function updatePolicySuccess(data){ - - $translate('moon.policy.metarules.update.success', { policyName: list.policy.name }).then( function(translatedValue) { + $translate('moon.policy.assignments.subject.delete.success').then(function (translatedValue) { alertService.alertSuccess(translatedValue); }); - list.policy = policyService.findDataFromPolicy(utilService.transformOne(data, 'meta_rules')); - - activate(); + manageSubjects(); subject.loader = false; } - function updatePolicyError(reason){ + function deleteSubError(reason) { - $translate('moon.policy.metarules.update.error', { policyName: list.policy.name, reason: reason.message}).then( function(translatedValue) { + $translate('moon.policy.assignments.subject.delete.error', { + subjectName: subject.name, + reason: reason.message + }).then(function (translatedValue) { alertService.alertError(translatedValue); }); subject.loader = false; } - } - function unMapObj(object){ + function deleteObj(object, dataId) { object.loader = true; - var policyToSend = angular.copy(list.policy); - - policyToSend.object_categories = _.without(policyToSend.object_categories, object.id); - - policyService.update(policyToSend, updatePolicySuccess, updatePolicyError); + assignmentsService.object.delete(list.policy.id, object.object_id, object.object_cat_id, dataId, deleteObjSuccess, deleteObjError); - function updatePolicySuccess(data){ + function deleteObjSuccess(data) { - $translate('moon.policy.metarules.update.success', { policyName: list.policy.name }).then( function(translatedValue) { + $translate('moon.policy.assignments.object.delete.success').then(function (translatedValue) { alertService.alertSuccess(translatedValue); }); - list.policy = policyService.findDataFromPolicy(utilService.transformOne(data, 'meta_rules')); - - activate(); + manageObjects(); object.loader = false; } - function updatePolicyError(reason){ + function deleteObjError(reason) { - $translate('moon.policy.metarules.update.error', { policyName: list.policy.name, reason: reason.message}).then( function(translatedValue) { + $translate('moon.policy.assignments.object.delete.error', { + objectName: object.name, + reason: reason.message + }).then(function (translatedValue) { alertService.alertError(translatedValue); }); object.loader = false; - } - } - function unMapAct(action){ + function deleteAct(action, dataId) { action.loader = true; - var policyToSend = angular.copy(list.policy); + assignmentsService.action.delete(list.policy.id, action.action_id, action.action_cat_id, dataId, deleteActSuccess, deleteActError); - policyToSend.action_categories = _.without(policyToSend.action_categories, action.id); + function deleteActSuccess(data) { - policyService.update(policyToSend, updatePolicySuccess, updatePolicyError); - - function updatePolicySuccess(data){ - - $translate('moon.policy.metarules.update.success', { policyName: list.policy.name }).then( function(translatedValue) { + $translate('moon.policy.assignments.action.delete.success').then(function (translatedValue) { alertService.alertSuccess(translatedValue); }); - list.policy = policyService.findDataFromPolicy(utilService.transformOne(data, 'meta_rules')); - - activate(); + manageActions(); action.loader = false; } - function updatePolicyError(reason){ + function deleteActError(reason) { - $translate('moon.policy.metarules.update.error', { policyName: list.policy.name, reason: reason.message}).then( function(translatedValue) { + $translate('moon.policy.assignments.action.delete.error', { + actionName: action.name, + reason: reason.message + }).then(function (translatedValue) { alertService.alertError(translatedValue); }); action.loader = false; } - } - /** - * Delete - */ - - function deleteSub(subject){ - - subject.loader = true; - - assignmentService.subject.delete(subject, deleteSubSuccess, deleteSubError); - - function deleteSubSuccess(data){ - - $translate('moon.policy.perimeter.subject.delete.success', { subjectName: subject.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeSubFromSubList(subject); - - subject.loader = false; - - } - - function deleteSubError(reason){ - - $translate('moon.policy.perimeter.subject.delete.error', { subjectName: subject.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - subject.loader = false; - - } + function getSubjects() { + return list.subjects ? list.subjects : []; } - function deleteObj(object){ - - object.loader = true; - - assignmentService.object.delete(object, deleteObjSuccess, deleteObjError); - - function deleteObjSuccess(data){ - - $translate('moon.policy.perimeter.object.delete.success', { objectName: object.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeObjFromObjList(object); - - object.loader = false; - - } - - function deleteObjError(reason){ - - $translate('moon.policy.perimeter.object.delete.error', { objectName: object.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - object.loader = false; - } + function getObjects() { + return list.objects ? list.objects : []; } - function deleteAct(action){ + function getActions() { + return list.actions ? list.actions : []; + } - action.loader = true; + function updateList(event, type) { - assignmentService.action.delete(action, deleteActSuccess, deleteActError); + switch(type){ - function deleteActSuccess(data){ + case ASSIGNMENTS_CST.TYPE.SUBJECT: - $translate('moon.policy.perimeter.action.delete.success', { actionName: action.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); + manageSubjects(); + break; - removeActFromActList(action); + case ASSIGNMENTS_CST.TYPE.OBJECT: - action.loader = false; + manageObjects(); + break; - } + case ASSIGNMENTS_CST.TYPE.ACTION: - function deleteActError(reason){ + manageActions(); + break; - $translate('moon.policy.perimeter.action.delete.error', { actionName: action.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); + default : - action.loader = false; + activate(); + break; } - } - - 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(); } 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 index b2bac597..b69a4eed 100644 --- 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 @@ -18,7 +18,7 @@ - + @@ -40,6 +40,23 @@ + + + + + @@ -156,6 +170,21 @@ + + + + @@ -271,6 +299,21 @@ + + + + @@ -27,40 +26,15 @@ - - + @@ -80,7 +54,6 @@ - @@ -102,12 +75,13 @@
- +
+
@@ -124,10 +98,9 @@
- - + @@ -135,39 +108,14 @@ - - + @@ -184,7 +132,6 @@ - @@ -206,7 +153,7 @@
- +
@@ -228,10 +175,9 @@ - - + @@ -239,39 +185,14 @@ - - + @@ -288,7 +209,6 @@ - @@ -311,7 +231,7 @@
. - +
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 index 8c50b22e..dffa7783 100644 --- 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 @@ -22,15 +22,16 @@ restrict : 'E', replace : true }; + } angular .module('moon') .controller('moonPerimeterListController', moonPerimeterListController); - moonPerimeterListController.$inject = ['$scope', '$rootScope', 'perimeterService', '$translate', 'alertService', 'policyService', 'PERIMETER_CST', 'utilService']; + moonPerimeterListController.$inject = ['$scope', '$rootScope', 'perimeterService', '$translate', 'alertService', 'PERIMETER_CST']; - function moonPerimeterListController($scope, $rootScope, perimeterService, $translate, alertService, policyService, PERIMETER_CST, utilService){ + function moonPerimeterListController($scope, $rootScope, perimeterService, $translate, alertService, PERIMETER_CST){ var list = this; @@ -45,10 +46,6 @@ list.unMapObj = unMapObj; list.unMapAct = unMapAct; - list.deleteSub = deleteSub; - list.deleteObj = deleteObj; - list.deleteAct = deleteAct; - list.getSubjects = getSubjects; list.getObjects = getObjects; list.getActions = getActions; @@ -67,13 +64,14 @@ var rootListeners = { - 'event:deletePerimeterFromPerimeterAddSuccess': $rootScope.$on('event:deletePerimeterFromPerimeterAddSuccess', deletePolicy) + 'event:deletePerimeterFromPerimeterAddSuccess': $rootScope.$on('event:deletePerimeterFromPerimeterAddSuccess', deletePolicy), + 'event:createAssignmentsFromAssignmentsEditSuccess': $rootScope.$on('event:createAssignmentsFromAssignmentsEditSuccess', addAssignmentsToPolicy) }; - for (var unbind in rootListeners) { + _.each(rootListeners, function(unbind){ $scope.$on('$destroy', rootListeners[unbind]); - } + }); function manageSubjects(){ @@ -94,8 +92,6 @@ perimeterService.object.findAllFromPolicyWithCallback(list.policy.id, function(perimeters){ - console.log('objects'); - console.log(perimeters); list.objects = perimeters; list.loadingObj = false; @@ -109,8 +105,6 @@ perimeterService.action.findAllFromPolicyWithCallback(list.policy.id, function(perimeters){ - console.log('actions'); - console.log(perimeters); list.actions = perimeters; list.loadingAct = false; @@ -118,207 +112,113 @@ } - /** * UnMap */ - function unMapSub(subject){ + function unMapSub(perimeter){ - subject.loader = true; + perimeter.policy_list = _.without(perimeter.policy_list, list.policy.id); - var policyToSend = angular.copy(list.policy); + perimeter.loader = true; - policyToSend.subject_categories = _.without(policyToSend.subject_categories, subject.id); + var perimeterToSend = angular.copy(perimeter); - policyService.update(policyToSend, updatePolicySuccess, updatePolicyError); + perimeterService.subject.unMapPerimeterFromPolicy(list.policy.id , perimeter.id, updatePerimeterSuccess, updatePerimeterError); - function updatePolicySuccess(data){ + function updatePerimeterSuccess(data){ - $translate('moon.policy.metarules.update.success', { policyName: list.policy.name }).then( function(translatedValue) { + $translate('moon.policy.perimeter.update.success', { perimeterName: perimeterToSend.name }).then( function(translatedValue) { alertService.alertSuccess(translatedValue); }); - list.policy = policyService.findPerimeterFromPolicy(utilService.transformOne(data, 'meta_rules')); + $scope.$emit('event:unMapPerimeterFromPerimeterList', perimeter, PERIMETER_CST.TYPE.SUBJECT); activate(); - subject.loader = false; - + perimeter.loader = false; } - function updatePolicyError(reason){ + function updatePerimeterError(reason){ - $translate('moon.policy.metarules.update.error', { policyName: list.policy.name, reason: reason.message}).then( function(translatedValue) { + $translate('moon.policy.perimeter.update.error', { perimeterName: perimeter.name, reason: reason.message}).then( function(translatedValue) { alertService.alertError(translatedValue); }); - subject.loader = false; + perimeter.loader = false; } } - function unMapObj(object){ + function unMapObj(perimeter){ - object.loader = true; + perimeter.policy_list = _.without(perimeter.policy_list, list.policy.id); - var policyToSend = angular.copy(list.policy); + perimeter.loader = true; - policyToSend.object_categories = _.without(policyToSend.object_categories, object.id); + var perimeterToSend = angular.copy(perimeter); - policyService.update(policyToSend, updatePolicySuccess, updatePolicyError); + perimeterService.object.unMapPerimeterFromPolicy(list.policy.id , perimeter.id, updatePerimeterSuccess, updatePerimeterError); - function updatePolicySuccess(data){ + function updatePerimeterSuccess(data){ - $translate('moon.policy.metarules.update.success', { policyName: list.policy.name }).then( function(translatedValue) { + $translate('moon.policy.perimeter.update.success', { perimeterName: perimeterToSend.name }).then( function(translatedValue) { alertService.alertSuccess(translatedValue); }); - list.policy = policyService.findPerimeterFromPolicy(utilService.transformOne(data, 'meta_rules')); + $scope.$emit('event:unMapPerimeterFromPerimeterList', perimeter, PERIMETER_CST.TYPE.OBJECT); activate(); - object.loader = false; - + perimeter.loader = false; } - function updatePolicyError(reason){ + function updatePerimeterError(reason){ - $translate('moon.policy.metarules.update.error', { policyName: list.policy.name, reason: reason.message}).then( function(translatedValue) { + $translate('moon.policy.perimeter.update.error', { perimeterName: perimeter.name, reason: reason.message}).then( function(translatedValue) { alertService.alertError(translatedValue); }); - object.loader = false; + perimeter.loader = false; } } - function unMapAct(action){ + function unMapAct(perimeter){ - action.loader = true; + perimeter.policy_list = _.without(perimeter.policy_list, list.policy.id); - var policyToSend = angular.copy(list.policy); + perimeter.loader = true; - policyToSend.action_categories = _.without(policyToSend.action_categories, action.id); + var perimeterToSend = angular.copy(perimeter); - policyService.update(policyToSend, updatePolicySuccess, updatePolicyError); + perimeterService.action.unMapPerimeterFromPolicy(list.policy.id , perimeter.id, updatePerimeterSuccess, updatePerimeterError); - function updatePolicySuccess(data){ + function updatePerimeterSuccess(data){ - $translate('moon.policy.metarules.update.success', { policyName: list.policy.name }).then( function(translatedValue) { + $translate('moon.policy.perimeter.update.success', { perimeterName: perimeterToSend.name }).then( function(translatedValue) { alertService.alertSuccess(translatedValue); }); - list.policy = policyService.findPerimeterFromPolicy(utilService.transformOne(data, 'meta_rules')); + $scope.$emit('event:unMapPerimeterFromPerimeterList', perimeter, PERIMETER_CST.TYPE.ACTION); activate(); - action.loader = false; - + perimeter.loader = false; } - function updatePolicyError(reason){ + function updatePerimeterError(reason){ - $translate('moon.policy.metarules.update.error', { policyName: list.policy.name, reason: reason.message}).then( function(translatedValue) { + $translate('moon.policy.perimeter.update.error', { perimeterName: perimeter.name, reason: reason.message}).then( function(translatedValue) { alertService.alertError(translatedValue); }); - action.loader = false; - - } - - } - - /** - * Delete - */ - - function deleteSub(subject){ - - subject.loader = true; - - perimeterService.subject.delete(subject, deleteSubSuccess, deleteSubError); - - function deleteSubSuccess(data){ - - $translate('moon.policy.perimeter.subject.delete.success', { subjectName: subject.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeSubFromSubList(subject); - - subject.loader = false; + perimeter.loader = false; } - function deleteSubError(reason){ - - $translate('moon.policy.perimeter.subject.delete.error', { subjectName: subject.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - subject.loader = false; - - } - } - - function deleteObj(object){ - - object.loader = true; - - perimeterService.object.delete(object, deleteObjSuccess, deleteObjError); - - function deleteObjSuccess(data){ - - $translate('moon.policy.perimeter.object.delete.success', { objectName: object.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeObjFromObjList(object); - - object.loader = false; - - } - - function deleteObjError(reason){ - - $translate('moon.policy.perimeter.object.delete.error', { objectName: object.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - object.loader = false; - } - } - - function deleteAct(action){ - - action.loader = true; - - perimeterService.action.delete(action, deleteActSuccess, deleteActError); - - function deleteActSuccess(data){ - - $translate('moon.policy.perimeter.action.delete.success', { actionName: action.name }).then( function(translatedValue) { - alertService.alertSuccess(translatedValue); - }); - - removeActFromActList(action); - - action.loader = false; - - } - - function deleteActError(reason){ - - $translate('moon.policy.perimeter.action.delete.error', { actionName: action.name, reason: reason.message}).then( function(translatedValue) { - alertService.alertError(translatedValue); - }); - - action.loader = false; - - } } function getSubjects(){ @@ -353,6 +253,32 @@ } + 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-list.tpl.html b/moonv4/moon_gui/static/app/policy/edit/parameter/rules/rules-list.tpl.html index 3ec54239..76ac4365 100644 --- 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 @@ -1,79 +1,74 @@
-
-
+
-
Perimeter nameCategory nameData name
Perimeter nameCategory nameData name
Name Description Category
+ + + + Delete + + +
+ + + +
+ + 		Actions
+ + + + Delete + + +
+ + + +
+ 		Actions
+ + + + Delete + + +
+ + + +
+
Id Name Description
There is no Objects
Id Name Description
There is no Actions
+
-
+

List of associated Subjects

- + + +
-
+
-
+
-
Id
- 		-
Meta Rule
-
- + - - + - + - + - - - + + + - - + - - + - + + + + - - - - + - + + - - - Loading - + + + + + + + + + + + + + + +
-
Enabled
-
-
Rule
-
+
Meta Rule
+ 		+
Rule
+
There is no Rules +
Instruction
+ 		+
Actions
+
- - - Loading - +
There is no Rules
- - -
+ + + Loading + - + + + + + + + Loading + - + @@ -87,13 +82,50 @@ - + 

+                        		
+
+                            
+                                
+                                Delete
+                            
+
+                            

+
+                                
 
-                

+
+            

+
+        

+
+    

+
+    

+
+        

+
+            
Add a Rules

+
+        

 
-                
+        
.
 
-            
+            
 
         

 
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
index 98e1d62b..5c3e7457 100644
--- 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
@@ -28,13 +28,14 @@
         .module('moon')
         .controller('moonRulesListController', moonRulesListController);
 
-    moonRulesListController.$inject = [ 'NgTableParams', '$filter', 'metaRuleService', 'ruleService', 'dataService'];
+    moonRulesListController.$inject = [ '$scope', '$rootScope', 'NgTableParams', '$filter', 'metaRuleService', 'rulesService', 'dataService', '$translate', 'alertService' ];
 
-    function moonRulesListController( NgTableParams, $filter, metaRuleService, ruleService, dataService) {
+    function moonRulesListController( $scope, $rootScope, NgTableParams, $filter, metaRuleService, rulesService, dataService, $translate, alertService ) {
 
         var list = this;
 
         list.rules = [];
+        list.editMode = $scope.list.editMode;
 
         list.loadingRules = true;
 
@@ -43,6 +44,7 @@
         list.getRules = getRules;
         list.hasRules = hasRules;
         list.refreshRules = refreshRules;
+        list.deleteRules = deleteRules;
 
         list.getMetaRuleFromRule = getMetaRuleFromRule;
         list.getCategoryFromRuleIndex = getCategoryFromRuleIndex;
@@ -55,41 +57,40 @@
 
         function activate(){
 
-
             newRulesTable();
 
             manageRules();
+
         }
 
+        var rootListeners = {
 
+            'event:createRulesFromDataRulesSuccess': $rootScope.$on('event:createRulesFromDataRulesSuccess', addRulesToList)
 
-        function manageRules(){
+        };
+
+        _.each(rootListeners, function(unbind){
+            $scope.$on('$destroy', rootListeners[unbind]);
+        });
 
-            ruleService.findAllFromPolicyWithCallback(list.policy.id, function(data){
+        function manageRules(){
 
-                console.log('rules');
-                console.log(data);
+            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
-                sorting: {
-                    name: 'asc' // initial sorting
-                }
+                count: 10          // count per page
 
             }, {
 
@@ -134,7 +135,12 @@
 
 
         /**
-         * Prerequisite : meta Rule  should be completely loaded
+         * 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
          */
@@ -145,7 +151,7 @@
                 rule.rule_value = Array.apply(null, new Array(rule.rule.length)).map(function(){
                     return {
                         category: {}
-                    }
+                    };
                 });
             }
 
@@ -200,10 +206,11 @@
                     rule.rule_value[index].callCategoryInProgress = false;
                     rule.rule_value[index].category = {
                         name : 'ERROR'
-                    }
+                    };
                 }
 
             }
+
             // if the call is in progress return false
             return false;
         }
@@ -220,7 +227,7 @@
 
             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 );
+            return  rule.meta_rule.subject_categories.length < ind && ind <= ( rule.meta_rule.object_categories.length + rule.meta_rule.subject_categories.length );
 
         }
 
@@ -240,7 +247,6 @@
             return list.getRules().length > 0;
         }
 
-
         /**
          * Refresh the table
          */
@@ -249,6 +255,48 @@
             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
diff --git a/moonv4/moon_gui/static/app/policy/edit/policy-edit.tpl.html b/moonv4/moon_gui/static/app/policy/edit/policy-edit.tpl.html
index 550d1e4c..a1a6a54a 100644
--- a/moonv4/moon_gui/static/app/policy/edit/policy-edit.tpl.html
+++ b/moonv4/moon_gui/static/app/policy/edit/policy-edit.tpl.html
@@ -87,7 +87,7 @@
 
         

 
-            
+            
 
         

 
@@ -120,9 +120,9 @@
 
         

 
-        

+        
 
 
-            
+            
 
         

 
@@ -157,7 +157,7 @@
 
         

 
-            
+            
 
         

 
@@ -193,7 +193,7 @@
 
         

 
-            
+            
 
         

 
diff --git a/moonv4/moon_gui/static/app/policy/policy.controller.list.js b/moonv4/moon_gui/static/app/policy/policy.controller.list.js
index dc2db2cc..fc2c6503 100644
--- a/moonv4/moon_gui/static/app/policy/policy.controller.list.js
+++ b/moonv4/moon_gui/static/app/policy/policy.controller.list.js
@@ -6,9 +6,9 @@
         .module('moon')
         .controller('PolicyListController', PolicyListController);
 
-    PolicyListController.$inject = ['$scope', 'policies', 'ngTableParams', '$filter', '$modal', '$rootScope'];
+    PolicyListController.$inject = ['$scope', 'policies', 'NgTableParams', '$filter', '$modal', '$rootScope'];
 
-    function PolicyListController($scope, policies, ngTableParams, $filter, $modal, $rootScope) {
+    function PolicyListController($scope, policies, NgTableParams, $filter, $modal, $rootScope) {
 
         var list = this;
 
@@ -69,7 +69,7 @@
 
         function newPoliciesTable() {
 
-            list.table = new ngTableParams({
+            list.table = new NgTableParams({
 
                 page: 1,            // show first page
                 count: 10,          // count per page
diff --git a/moonv4/moon_gui/static/app/policy/policy.mapped.list.dir.js b/moonv4/moon_gui/static/app/policy/policy.mapped.list.dir.js
index b3becde9..78bb3b8d 100644
--- a/moonv4/moon_gui/static/app/policy/policy.mapped.list.dir.js
+++ b/moonv4/moon_gui/static/app/policy/policy.mapped.list.dir.js
@@ -61,11 +61,13 @@
          */
         function loadPolicices(refresh){
 
+            if(_.isUndefined( list.pdp.security_pipeline)){
+                return;
+            }
             list.policiesId = list.pdp.security_pipeline;
 
             policyService.findSomeWithCallback(list.policiesId, function(policies){
 
-
                 list.policies = policies;
 
                 list.loadingPolicies = false;
@@ -114,10 +116,7 @@
             list.table = new NgTableParams({
 
                 page: 1,            // show first page
-                count: 10,          // count per page
-                sorting: {
-                    name: 'asc' // initial sorting
-                }
+                count: 10         // count per page
 
             }, {
 
diff --git a/moonv4/moon_gui/static/app/services/gui/form.service.js b/moonv4/moon_gui/static/app/services/gui/form.service.js
index bc137943..e436593c 100644
--- a/moonv4/moon_gui/static/app/services/gui/form.service.js
+++ b/moonv4/moon_gui/static/app/services/gui/form.service.js
@@ -41,7 +41,7 @@
     		});
 			
 		}
-		
+
 	}
-	
+
 })();
diff --git a/moonv4/moon_gui/static/app/services/moon/policy/parameters/assignements.service.js b/moonv4/moon_gui/static/app/services/moon/policy/parameters/assignements.service.js
index ad7d8e8b..ca138b45 100644
--- a/moonv4/moon_gui/static/app/services/moon/policy/parameters/assignements.service.js
+++ b/moonv4/moon_gui/static/app/services/moon/policy/parameters/assignements.service.js
@@ -8,17 +8,17 @@
 
     angular
         .module('moon')
-        .factory('assignmentService', assignmentService);
+        .factory('assignmentsService', assignmentsService);
 
-    assignmentService.$inject = ['$resource', 'REST_URI', 'utilService'];
+    assignmentsService.$inject = ['$resource', 'REST_URI', 'utilService'];
 
-    function assignmentService($resource, REST_URI, utilService) {
+    function assignmentsService($resource, REST_URI, utilService) {
 
         var data =  {
 
             subject: {
 
-                policy: $resource(REST_URI.POLICIES + ':policy_id/subject_assignments/:subject_id', {}, {
+                policy: $resource(REST_URI.POLICIES + ':policy_id/subject_assignments/:perimeter_id/:category_id/:data_id', {}, {
                     get: {method: 'GET'},
                     create: {method: 'POST'},
                     remove: {method: 'DELETE'}
@@ -29,8 +29,8 @@
 
             object: {
 
-                policy: $resource(REST_URI.POLICIES + ':policy_id/object_assignments/:object_id', {}, {
-                    get: {method: 'GET', isArray: false},
+                policy: $resource(REST_URI.POLICIES + ':policy_id/object_assignments/:perimeter_id/:category_id/:data_id', {}, {
+                    get: {method: 'GET'},
                     create: {method: 'POST'},
                     remove: {method: 'DELETE'}
                 })
@@ -39,8 +39,8 @@
 
             action: {
 
-                policy: $resource(REST_URI.POLICIES + ':policy_id/action_assignments/:action_id', {}, {
-                    get: {method: 'GET', isArray: false},
+                policy: $resource(REST_URI.POLICIES + ':policy_id/action_assignments/:perimeter_id/:category_id/:data_id', {}, {
+                    get: {method: 'GET'},
                     create: {method: 'POST'},
                     remove: {method: 'DELETE'}
                 })
@@ -53,6 +53,18 @@
 
             subject : {
 
+                delete: function (policyId, perimeterId, categoryId, dataId, callbackSuccess, callbackError ) {
+
+                    data.subject.policy.remove({policy_id: policyId, perimeter_id: perimeterId, category_id: categoryId, data_id: dataId}, {}, callbackSuccess, callbackError);
+
+                },
+
+                add:function (subject, policyId, callbackSuccess, callbackError ) {
+
+                    data.subject.policy.create({policy_id: policyId}, subject, callbackSuccess, callbackError);
+
+                },
+
                 findAllFromPolicyWithCallback: function(policyId, callback){
 
                     data.subject.policy.get({policy_id: policyId}).$promise.then(function(data) {
@@ -66,6 +78,19 @@
 
             object : {
 
+
+                delete: function (policyId, perimeterId, categoryId, dataId, callbackSuccess, callbackError ) {
+
+                    data.object.policy.remove({policy_id: policyId, perimeter_id: perimeterId, category_id: categoryId, data_id: dataId}, {}, callbackSuccess, callbackError);
+
+                },
+
+                add:function (object, policyId, callbackSuccess, callbackError ) {
+
+                    data.object.policy.create({policy_id: policyId}, object, callbackSuccess, callbackError);
+
+                },
+
                 findAllFromPolicyWithCallback: function(policyId, callback){
 
                     data.object.policy.get({policy_id: policyId}).$promise.then(function(data) {
@@ -79,6 +104,18 @@
 
             action : {
 
+                delete: function (policyId, perimeterId, categoryId, dataId, callbackSuccess, callbackError ) {
+
+                    data.action.policy.remove({policy_id: policyId, perimeter_id: perimeterId, category_id: categoryId, data_id: dataId}, {}, callbackSuccess, callbackError);
+
+                },
+
+                add:function (action, policyId, callbackSuccess, callbackError ) {
+
+                    data.action.policy.create({policy_id: policyId}, action, callbackSuccess, callbackError);
+
+                },
+
                 findAllFromPolicyWithCallback: function(policyId, callback){
 
                     data.action.policy.get({policy_id: policyId}).$promise.then(function(data) {
diff --git a/moonv4/moon_gui/static/app/services/moon/policy/parameters/data.service.js b/moonv4/moon_gui/static/app/services/moon/policy/parameters/data.service.js
index 22f35e45..1bbd3b24 100644
--- a/moonv4/moon_gui/static/app/services/moon/policy/parameters/data.service.js
+++ b/moonv4/moon_gui/static/app/services/moon/policy/parameters/data.service.js
@@ -18,7 +18,7 @@
 
             subject: {
 
-                policy: $resource(REST_URI.POLICIES + ':policy_id/subject_data/:subject_id/:data_id', {}, {
+                policy: $resource(REST_URI.POLICIES + ':policy_id/subject_data/:subject_id/:category_id/:data_id', {}, {
                     get: {method: 'GET'},
                     create: {method: 'POST'},
                     remove: {method: 'DELETE'}
@@ -28,7 +28,7 @@
 
             object: {
 
-                policy: $resource(REST_URI.POLICIES + ':policy_id/object_data/:object_id/:data_id', {}, {
+                policy: $resource(REST_URI.POLICIES + ':policy_id/object_data/:object_id/:category_id/:data_id', {}, {
                     get: {method: 'GET', isArray: false},
                     create: {method: 'POST'},
                     remove: {method: 'DELETE'}
@@ -38,7 +38,7 @@
 
             action: {
 
-                policy: $resource(REST_URI.POLICIES + ':policy_id/action_data/:action_id/:data_id', {}, {
+                policy: $resource(REST_URI.POLICIES + ':policy_id/action_data/:action_id/:category_id/:data_id', {}, {
                     get: {method: 'GET', isArray: false},
                     create: {method: 'POST'},
                     remove: {method: 'DELETE'}
@@ -62,15 +62,33 @@
 
                 },
 
-                delete: function (subject, callbackSuccess, callbackError ) {
+                findAllFromCategoriesWithCallback: function(policyId, categoryId, callback){
 
-                    data.subject.perimeter.remove({subject_id: subject.id}, subject, callbackSuccess, callbackError);
+                    data.subject.policy.get({policy_id: policyId, category_id: categoryId}).$promise.then(function(data) {
+
+                        if(data['subject_data'][0]) {
+
+                            callback(utilService.transform(data['subject_data'][0], 'data'));
+
+                        }else{
+
+                            callback([])
+
+                        }
+
+                    });
 
                 },
 
-                add: function (subject, callbackSuccess, callbackError ) {
+                delete: function (subject, policyId, categoryId, callbackSuccess, callbackError ) {
 
-                    data.subject.perimeter.create({}, subject, callbackSuccess, callbackError);
+                    data.subject.policy.remove({policy_id: policyId, category_id: categoryId, data_id: subject.id}, subject, callbackSuccess, callbackError);
+
+                },
+
+                add: function (subject, policyId, categoryId, callbackSuccess, callbackError ) {
+
+                    data.subject.policy.create({policy_id: policyId, category_id: categoryId}, subject, callbackSuccess, callbackError);
 
                 },
 
@@ -108,15 +126,33 @@
 
                 },
 
-                delete: function (object, callbackSuccess, callbackError ) {
+                findAllFromCategoriesWithCallback: function(policyId, categoryId, callback){
+
+                    data.object.policy.get({policy_id: policyId, category_id: categoryId}).$promise.then(function(data) {
+
+                        if(data['object_data'][0]) {
+
+                            callback(utilService.transform(data['object_data'][0], 'data'));
+
+                        }else{
+
+                            callback([])
+
+                        }
+
+                    });
+
+                },
+
+                delete: function (object, policyId, categoryId, callbackSuccess, callbackError ) {
 
-                    data.object.perimeter.remove({object_id: object.id}, object, callbackSuccess, callbackError);
+                    data.object.policy.remove({policy_id: policyId, category_id: categoryId, data_id: object.id}, object, callbackSuccess, callbackError);
 
                 },
 
-                add:function (object, callbackSuccess, callbackError ) {
+                add:function (object, policyId, categoryId, callbackSuccess, callbackError ) {
 
-                    data.object.perimeter.create({}, object, callbackSuccess, callbackError);
+                    data.object.policy.create({policy_id: policyId, category_id: categoryId}, object, callbackSuccess, callbackError);
 
                 },
 
@@ -126,7 +162,6 @@
 
                         data.object.policy.get({policy_id: policyId, object_id: objectId, data_id : dataId}).$promise.then(function(data) {
 
-
                             if(data['object_data'][0]){
 
                                 callback(utilService.transformOne(data['object_data'][0], 'data'));
@@ -155,15 +190,33 @@
 
                 },
 
-                delete: function (action, callbackSuccess, callbackError ) {
+                findAllFromCategoriesWithCallback: function(policyId, categoryId, callback){
+
+                    data.action.policy.get({policy_id: policyId, category_id: categoryId}).$promise.then(function(data) {
+
+                        if(data['action_data'][0]) {
+
+                            callback(utilService.transform(data['action_data'][0], 'data'));
+
+                        }else{
+
+                            callback([])
+
+                        }
+
+                    });
+
+                },
+
+                delete: function (action, policyId, categoryId, callbackSuccess, callbackError ) {
 
-                    data.action.perimeter.remove({action_id: action.id}, action, callbackSuccess, callbackError);
+                    data.action.policy.remove({policy_id: policyId, category_id: categoryId, data_id: action.id}, action, callbackSuccess, callbackError);
 
                 },
 
-                add:function (action, callbackSuccess, callbackError ) {
+                add:function (action, policyId, categoryId, callbackSuccess, callbackError ) {
 
-                    data.action.perimeter.create({}, action, callbackSuccess, callbackError);
+                    data.action.policy.create({policy_id: policyId, category_id: categoryId}, action, callbackSuccess, callbackError);
 
                 },
 
diff --git a/moonv4/moon_gui/static/app/services/moon/policy/parameters/perimeter.service.js b/moonv4/moon_gui/static/app/services/moon/policy/parameters/perimeter.service.js
index 6e929aba..42e7288a 100644
--- a/moonv4/moon_gui/static/app/services/moon/policy/parameters/perimeter.service.js
+++ b/moonv4/moon_gui/static/app/services/moon/policy/parameters/perimeter.service.js
@@ -21,30 +21,33 @@
                 perimeter: $resource(REST_URI.PERIMETERS.subject + ':subject_id', {}, {
                     get: {method: 'GET', isArray: false},
                     create: {method: 'POST'},
-                    remove: {method: 'DELETE'}
+                    remove: {method: 'DELETE'},
+                    update: { method: 'PATCH' }
                 }),
 
                 policy: $resource(REST_URI.POLICIES + ':policy_id/subjects/:subject_id', {}, {
                     get: {method: 'GET'},
                     create: {method: 'POST'},
-                    remove: {method: 'DELETE'}
+                    remove: {method: 'DELETE'},
+                    update: { method: 'PATCH' }
                 })
 
             },
 
-
             object: {
 
                 perimeter:  $resource(REST_URI.PERIMETERS.object + ':object_id', {}, {
                     get: {method: 'GET', isArray: false},
                     create: {method: 'POST'},
-                    remove: {method: 'DELETE'}
+                    remove: {method: 'DELETE'},
+                    update: { method: 'PATCH' }
                 }),
 
                 policy: $resource(REST_URI.POLICIES + ':policy_id/objects/:object_id', {}, {
                     get: {method: 'GET', isArray: false},
                     create: {method: 'POST'},
-                    remove: {method: 'DELETE'}
+                    remove: {method: 'DELETE'},
+                    update: { method: 'PATCH' }
                 })
 
             },
@@ -54,13 +57,15 @@
                 perimeter:  $resource(REST_URI.PERIMETERS.action + ':action_id', {}, {
                     get: {method: 'GET', isArray: false},
                     create: {method: 'POST'},
-                    remove: {method: 'DELETE'}
+                    remove: {method: 'DELETE'},
+                    update: { method: 'PATCH' }
                 }),
 
                 policy: $resource(REST_URI.POLICIES + ':policy_id/actions/:action_id', {}, {
                     get: {method: 'GET', isArray: false},
                     create: {method: 'POST'},
-                    remove: {method: 'DELETE'}
+                    remove: {method: 'DELETE'},
+                    update: { method: 'PATCH' }
                 })
 
             }
@@ -113,6 +118,12 @@
 
                 },
 
+                unMapPerimeterFromPolicy: function(policyId, subjectId, callbackSuccess, callbackError ){
+
+                    data.subject.policy.remove({policy_id: policyId, subject_id: subjectId}, {}, callbackSuccess, callbackError);
+
+                },
+
                 findAllFromPolicyWithCallback: function(policyId, callback){
 
                     data.subject.policy.get({policy_id: policyId}).$promise.then(function(data) {
@@ -162,6 +173,12 @@
 
                     data.subject.perimeter.create({}, subject, callbackSuccess, callbackError);
 
+                },
+
+                update: function(subject, callbackSuccess, callbackError){
+
+                    data.subject.perimeter.update({subject_id: subject.id}, subject, callbackSuccess, callbackError);
+
                 }
             },
 
@@ -173,7 +190,7 @@
 
                         callback(utilService.transformOne(data, 'objects'));
 
-                    })
+                    });
 
                 },
 
@@ -210,6 +227,12 @@
 
                 },
 
+                unMapPerimeterFromPolicy: function(policyId, objectId, callbackSuccess, callbackError ){
+
+                    data.object.policy.remove({policy_id: policyId, object_id: objectId}, {}, callbackSuccess, callbackError);
+
+                },
+
                 findSomeWithCallback: function(objectListId, callback){
 
                     var _self = this;
@@ -287,6 +310,12 @@
 
                     data.object.perimeter.create({}, object, callbackSuccess, callbackError);
 
+                },
+
+                update: function(object, callbackSuccess, callbackError){
+
+                    data.object.perimeter.update({object_id: object.id}, object, callbackSuccess, callbackError);
+
                 }
             },
 
@@ -334,6 +363,12 @@
 
                 },
 
+                unMapPerimeterFromPolicy: function(policyId, actionId, callbackSuccess, callbackError){
+
+                    data.action.policy.remove({policy_id: policyId, action_id: actionId}, {}, callbackSuccess, callbackError);
+
+                },
+
                 findSomeWithCallback: function(actionListId, callback){
 
                     var _self = this;
@@ -410,6 +445,12 @@
 
                     data.action.perimeter.create({}, action, callbackSuccess, callbackError);
 
+                },
+
+                update: function(action, callbackSuccess, callbackError){
+
+                    data.action.perimeter.update({action_id: action.id}, action, callbackSuccess, callbackError);
+
                 }
             }
 
diff --git a/moonv4/moon_gui/static/app/services/moon/policy/policy.service.js b/moonv4/moon_gui/static/app/services/moon/policy/policy.service.js
index 5c8ad4f5..5ad31421 100644
--- a/moonv4/moon_gui/static/app/services/moon/policy/policy.service.js
+++ b/moonv4/moon_gui/static/app/services/moon/policy/policy.service.js
@@ -82,7 +82,7 @@
 
             findOne: function (policyId) {
 
-                return  this.data.policy.get({policy_id: policyId}).$promise.then(function (data) {
+                return this.data.policy.get({policy_id: policyId}).$promise.then(function (data) {
 
                     return utilService.transformOne(data, 'policies');
 
diff --git a/moonv4/moon_gui/static/app/services/moon/rule/metadata.service.js b/moonv4/moon_gui/static/app/services/moon/rule/metadata.service.js
index 659e0b30..8c68b2ef 100644
--- a/moonv4/moon_gui/static/app/services/moon/rule/metadata.service.js
+++ b/moonv4/moon_gui/static/app/services/moon/rule/metadata.service.js
@@ -29,7 +29,7 @@
                 remove: {method: 'DELETE'}
             }),
 
-                action: $resource(REST_URI.METADATA.action + ':action_id', {}, {
+            action: $resource(REST_URI.METADATA.action + ':action_id', {}, {
                 get: {method: 'GET', isArray: false},
                 create: {method: 'POST'},
                 remove: {method: 'DELETE'}
@@ -194,9 +194,9 @@
                         callback([]);
                     }
 
-                    var promises = _(objectListId).map( function(subjectId) {
+                    var promises = _(objectListId).map( function(objectId) {
 
-                        return _self.findOneReturningPromise(subjectId);
+                        return _self.findOneReturningPromise(objectId);
 
                     });
 
@@ -249,7 +249,7 @@
 
                 findOne: function(actionId, callback){
 
-                    data.action.get({actionId: actionId}).$promise.then(function(data) {
+                    data.action.get({action_id: actionId}).$promise.then(function(data) {
 
                         callback(utilService.transformOne(data, 'action_categories'));
 
@@ -259,7 +259,7 @@
 
                 findOneReturningPromise: function(actionId){
 
-                    return data.action.get({actionId: actionId}).$promise;
+                    return data.action.get({action_id: actionId}).$promise;
 
                 },
 
@@ -297,9 +297,9 @@
                         callback([]);
                     }
 
-                    var promises = _(actionListId).map( function(subjectId) {
+                    var promises = _(actionListId).map( function(actionId) {
 
-                        return _self.findOneReturningPromise(subjectId);
+                        return _self.findOneReturningPromise(actionId);
 
                     });
 
diff --git a/moonv4/moon_gui/static/app/services/moon/rule/metarule.service.js b/moonv4/moon_gui/static/app/services/moon/rule/metarule.service.js
index 71a36c50..2679fc5b 100644
--- a/moonv4/moon_gui/static/app/services/moon/rule/metarule.service.js
+++ b/moonv4/moon_gui/static/app/services/moon/rule/metarule.service.js
@@ -115,7 +115,7 @@
 
                     return utilService.transformOne(data, 'meta_rules');
 
-                })
+                });
 
             },
 
@@ -141,7 +141,7 @@
 
                     return metaRule;
 
-                })
+                });
 
             },
 
-- 
cgit 1.2.3-korg