From d8895e0b035769743c5c90d71bd021a04f26e6c3 Mon Sep 17 00:00:00 2001 From: sa282w Date: Mon, 9 Apr 2018 12:25:12 -0400 Subject: Support fine-grained attributes of AAF for FW apps Issue-ID: PORTAL-188 Included the changes for the user story Support fine-grained attributes of AAF for FW apps. Change-Id: Ib16e7eeab9d2f9dc0803eb8a37aad6d281c7f454 Signed-off-by: sa282w --- .../scripts/DS2-controllers/admin-controller.js | 86 ++++++++++++++++++++-- .../ds2-admin/modals/role-function-add.html | 54 ++++++++++---- 2 files changed, 122 insertions(+), 18 deletions(-) (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/app') diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js index 0d95e72a..a8b89757 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js @@ -1,4 +1,4 @@ -appDS2.controller('adminController', function($scope, $http,AdminService, $modal, $routeParams, $rootScope){ +appDS2.controller('adminController', function($scope, $http,AdminService, $modal, $routeParams, $rootScope){ $scope.totalPages = 5; $scope.viewPerPage = 8; @@ -71,8 +71,63 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal }); } - $scope.addRoleFunction = function(roleData){ + if(/[^a-zA-Z0-9\-\.\_]/.test(roleData.type)){ + errorMsg = 'Type can only contain alphanumeric characters, dots(.) and underscores(_)'; + var modalInstance = $modal.open({ + templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', + controller: ModalInstanceCtrl, + sizeClass: 'modal-small', + resolve: { + items: function () { + return errorMsg; + } + } + }); + return; + } + if(roleData.action !== '*' && /[^a-zA-Z0-9\-\.\_]/.test(roleData.action)){ + errorMsg = 'Action can only contain alphanumeric characters, hyphens(-), dots(.) and underscores(_) and single asterisk character(*)'; + var modalInstance = $modal.open({ + templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', + controller: ModalInstanceCtrl, + sizeClass: 'modal-small', + resolve: { + items: function () { + return errorMsg; + } + } + }); + return; + } + if(/[^a-zA-Z0-9\-\:\_\./*]/.test(roleData.code)){ + errorMsg = 'Code can only contain alphanumeric characters, hyphens(-), dots(.), colons(:), forwardSlash(/) , asterisk(*) and underscores(_)'; + var modalInstance = $modal.open({ + templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', + controller: ModalInstanceCtrl, + sizeClass: 'modal-small', + resolve: { + items: function () { + return errorMsg; + } + } + }); + return; + } + if(/[^a-zA-Z0-9\-\_ \.]/.test(roleData.name)){ + errorMsg = 'Name can only contain alphanumeric characters, spaces, hyphens(-), dots(.) and underscores(_)'; + var modalInstance = $modal.open({ + templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', + controller: ModalInstanceCtrl, + sizeClass: 'modal-small', + resolve: { + items: function () { + return errorMsg; + } + } + }); + return; + } AdminService.addRoleFunctionList(roleData).then(function(msg){ var message = msg; if(message.data!=null && message.data!=''){ @@ -100,6 +155,22 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.roleFun=items; $scope.msg=items; + $scope.ngRepeatDemo = [ + {id: 'menuradiobutton1', value: 'menu', labelvalue: 'menu'}, + {id: 'urlradiobutton2', value: 'url', labelvalue: 'url'}, + {id: 'otherradiobutton3', value: 'other', labelvalue: 'other'} + ] + $scope.selectedvalueradioButtonGroup = { + type: 'menu' + } + $scope.roleFun = { + action: '*' + } + + $scope.selectedvalueradioButtonOther = { + type: '' + } + // remove role function associated to a role on Role Edit page $scope.roleFunRemoveRole = function (roleFunction) { AdminService.removeRoleFunction(roleFunction, $routeParams.roleId).then(function(msg){ @@ -324,7 +395,12 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal }); } - $scope.save = function (data) { + $scope.save = function (data,type) { + if(type !== 'other'){ + data.type = type ; + } else{ + data.type = $scope.selectedvalueradioButtonOther.type ; + } $modalInstance.close(data); }; @@ -419,8 +495,8 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal } }); - modalInstance.result.then(function (data) { - $scope.addRoleFunction(data); + modalInstance.result.then(function (data,type) { + $scope.addRoleFunction(data,type); }); } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-add.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-add.html index 5752a278..ad3d538b 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-add.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-function-add.html @@ -1,4 +1,4 @@ -
+

Role Function Create

@@ -6,13 +6,14 @@ ng-click="$dismiss('cancel')">
- +
- *Name *Name +

- *Code *Code +
- Code is Required + Code is + Required
-
+
- Type + * + Type + +
+
+
+ Type is Required

- Action *Action +
- +
+ Action is Required +

-
+ +
- +
-- cgit 1.2.3-korg