From 3e7145fc12ed8475ba10bb2a3c63004d41aa42bc Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Fri, 7 Jul 2017 07:21:10 -0400 Subject: [PORTAL-25] Role Centralization Bump EP SDK version to 1.3.0-SNAPSHOT Support Role Centralization & Common Set of Roles across All ONAP On-Boarded Applications Change-Id: Icfc1bbfddaf2c7c7176b4cf7bb7017d853c63100 Signed-off-by: Christopher Lott (cl778h) --- .../scripts/DS2-controllers/admin-controller.js | 85 +----------- .../DS2-controllers/bootstrap-sample-controller.js | 5 + .../DS2-controllers/bootstrap-sample-route.js | 7 + .../fusion/scripts/DS2-services/adminService.js | 4 +- .../DS2-view-models/bootstrap-sample-content.html | 146 +++++++++++++++++++++ .../DS2-view-models/bootstrap-sample-page.html | 146 +++++++++++++++++++++ .../ds2-admin/modals/role-child-add-confirm.html | 12 +- .../modals/role-functions-child-roles-modal.html | 11 +- .../scripts/DS2-view-models/ds2-admin/role.html | 7 +- .../report-wizard-report-name-validation.html | 20 +++ .../ds2-reports/wz_steps/json/step1.json | 2 +- 11 files changed, 349 insertions(+), 96 deletions(-) create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-controller.js create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-route.js create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-content.html create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-report-name-validation.html (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts') 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 8d664fcb..3247ae7a 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 @@ -22,19 +22,12 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal } $scope.getCacheRegionsList = function(){ - // $scope.regions.length=0; AdminService.getCacheRegions().then(function(data){ var j = data; $scope.data = JSON.parse(j.data); - /* for(var i = 0; i< $scope.data.length; i++){ - if($scope.data[i].cacheName !== '[object Object]'){ - $scope.regions.push($scope.data[i]); - } - }*/ $scope.regions =$scope.data; },function(error){ console.log("failed"); - //reloadPageOnce(); }); } @@ -110,10 +103,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.cancel(); if(message.role){ $rootScope.$broadcast('updateRoleFunctions',{data:message.role}); - /*$modal.open({ - templateUrl: 'app/fusion/scripts/DS2-modal/success_modal.html', - sizeClass: 'modal-small', - })*/ }else{ $modal.open({ templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', @@ -161,11 +150,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal var message = msg; $scope.cancel(); if(message.role){ - //$rootScope.$broadcast('updateAvailbleRoles',{data:message.availableRoles}); - /*$modal.open({ - templateUrl: 'app/fusion/scripts/DS2-modal/success_modal.html', - sizeClass: 'modal-small', - })*/ }else{ $modal.open({ templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', @@ -243,10 +227,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.cancel(); if(message.role){ $rootScope.$broadcast('updateRoleFunctions',{data:message.role}); - /*$modal.open({ - templateUrl: 'app/fusion/scripts/DS2-modal/success_modal.html', - sizeClass: 'modal-small', - })*/ }else{ $modal.open({ templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', @@ -272,10 +252,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.cancel(); if(message.role){ $rootScope.$broadcast('updateRoleFunctions',{data:message.role}); - /*$modal.open({ - templateUrl: 'app/fusion/scripts/DS2-modal/success_modal.html', - sizeClass: 'modal-small', - })*/ }else{ $modal.open({ templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', @@ -301,10 +277,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.cancel(); if(message.availableRoles){ $rootScope.$broadcast('updateAvailbleRoles',{data:message.availableRoles}); - /*$modal.open({ - templateUrl: 'app/fusion/scripts/DS2-modal/success_modal.html', - sizeClass: 'modal-small', - })*/ }else{ $modal.open({ templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', @@ -330,10 +302,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.cancel(); if(message.availableRoles){ $rootScope.$broadcast('updateAvailbleRoles',{data:message.availableRoles}); - /*$modal.open({ - templateUrl: 'app/fusion/scripts/DS2-modal/success_modal.html', - sizeClass: 'modal-small', - })*/ }else{ $modal.open({ templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', @@ -359,7 +327,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal // Cancel for toggle switch on Role Fn $scope.cancelRoleFunSwitch = function (msg) { $scope.msg.availableRole.selected = !$scope.msg.availableRole.selected; - //$scope.msg.availableRoleFunctions[$scope.msg.availableRoleFunctions.indexOf($scope.msg.availableRole)] = $scope.selectedRoleFun; $modalInstance.dismiss('cancel'); }; @@ -481,7 +448,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal sizeClass: 'modal-small', resolve: { items: function () { - // return availableRoleFunction; } } }); @@ -512,7 +478,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal var modalInstance = $modal.open({ templateUrl: 'app/fusion/scripts/DS2-view-models/ds2-admin/modals/success_modalpopup.html', controller: ModalInstanceCtrl, - //sizeClass: 'modal-small', resolve: { items: function () { var message = { @@ -534,14 +499,9 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal var message = res.data; var msgParsed = JSON.stringify(message); - // alert('1 : '+msgParsed); var messaged = message.data; - var msgParsedd = JSON.stringify(messaged); - //alert('2 : '+msgParsedd); - //console.log('2 '+msgParsedd); - //console.log('4 '+msgParsedd.substr(3,msgParsedd.length -2).split('\\n')); - + var msgParsedd = JSON.stringify(messaged); if(message.data!=null && message.data!=''){ var status = res.status; @@ -554,7 +514,7 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal var htmlstring = message.data.toString(); var htmlStrReplace = htmlstring.replace(/['"]+/g, ''); var htmlStrReplaceSplit = htmlStrReplace.split('\n'); - var dataStr = htmlStrReplace.replace(/\\n/g, "\n"); //htmlstring.replace(/\n/g, " "); + var dataStr = htmlStrReplace.replace(/\\n/g, "\n"); $scope.successTestModelPopUp(dataStr); }else{ $scope.errorPopUp(''); @@ -705,11 +665,7 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal return message; } } - }); - - /*modalInstance.result.then(function (data) { - $scope.delRole(data); - });*/ + }); } // role activation @@ -727,7 +683,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal resolve: { items: function () { var message = { - //availableRole: $scope.msg.availableRole, text: toggleType, selected:selected, availableRole:availableRole, @@ -737,10 +692,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal } } }); - - /*modalInstance.result.then(function (data) { - $scope.activateRole(data); - });*/ } $scope.roleFnInit = function(){ @@ -748,12 +699,9 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal var j = data; $scope.data = JSON.parse(j.data); - $scope.role =JSON.parse($scope.data.role); - // console.log($scope.role); $scope.ociavailableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions); - // console.log($scope.ociavailableRoleFunctions); $scope.availableRoleFunctions=[]; if($scope.ociavailableRoleFunctions) @@ -770,25 +718,8 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal $scope.ociavailableRoles=JSON.parse($scope.data.availableRoles); - // console.log($scope.ociavailableRoles); - //console.log("testing roles if exist"); $scope.availableRoles=[]; - - if($scope.ociavailableRoles) - angular.forEach($scope.ociavailableRoles, function(a,i){ - var availableRole = a; - availableRole.selected = false; - if($scope.role.childRoles){ - angular.forEach($scope.role.childRoles, function(b,j){ - if(a.id === b.id) { - availableRole.selected = true; - } - }); - }; - $scope.availableRoles.push(availableRole); - }); - - + },function(error){ console.log("roleControllerDS2 failed: " + error); reloadPageOnce(); @@ -825,7 +756,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal return; } for (x in $scope.availableRoles){ - // console.log($scope.availableRoles[x].name); if ($scope.availableRoles[x].name==$scope.role.name){ errorMsg = 'Role already exists.'; var modalInstance = $modal.open({ @@ -849,7 +779,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal }; AdminService.saveRole(postData, $routeParams.roleId).then(function(msg){ if(msg.role){ - //$scope.role = msg.role; sessionStorage.setItem('addCall', true); location.href='admin#/role/'+msg.role.id; $scope.availableRoles.push(msg); @@ -891,7 +820,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal resolve: { items: function () { var message = { - roleFunctions:data, role:role, roleId:info.id, availableRoleFunctions:$scope.ociavailableRoleFunctions @@ -902,7 +830,8 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal }); } - $scope.addNewChildRoleFunctionModalPopup = function(data, role,info) { + $scope.addNewChildRoleFunctionModalPopup = function(data, role,info) { + data = $scope.role; var modalInstance = $modal.open({ templateUrl: 'app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html', controller: ModalInstanceCtrl, @@ -910,7 +839,7 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal resolve: { items: function () { var message = { - roleChildFunctions:data, + roleChildFunctions:$scope.ociavailableRoles, role:role, roleId:info.id }; diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-controller.js new file mode 100644 index 00000000..74a7423e --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-controller.js @@ -0,0 +1,5 @@ +appDS2.controller( + 'bootstrapSampleController', + function($scope, $interval, $http, $modal, $log, ManifestService) { + + }); diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-route.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-route.js new file mode 100644 index 00000000..ac1ba168 --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/bootstrap-sample-route.js @@ -0,0 +1,7 @@ +appDS2.config(function($routeProvider) { + $routeProvider + .otherwise({ + templateUrl: 'app/fusion/scripts/DS2-view-models/bootstrap-sample-content.html', + controller : "bootstrapSampleController" + }); +}); diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/adminService.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/adminService.js index e92ebaf3..105f0202 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/adminService.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/adminService.js @@ -373,7 +373,7 @@ getFnMenuItems: function(){ confirmRoleChildRemove: function(selected,availableRole,id){ return $http({ method: "POST", - url: "role/removeChildRole.htm?role_id=" + roleId, + url: "role/removeChildRole.htm?role_id=" + id, data:JSON.stringify({roleFunction:availableRole}) }).then(function(response) { @@ -394,7 +394,7 @@ getFnMenuItems: function(){ confirmRoleChildAdd: function(selected,availableRole,id){ return $http({ method: "POST", - url: "role/addChildRole.htm?role_id=" + roleId, + url: "role/addChildRole.htm?role_id=" + id, data:JSON.stringify({roleFunction:availableRole}) }).then(function(response) { diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-content.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-content.html new file mode 100644 index 00000000..23d138eb --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-content.html @@ -0,0 +1,146 @@ +
+
+

Bootstrap Sample Page

+ + +

Bootstrap Dropdowns

+
+ + +
+ + + +

Bootstrap Button Group

+
+ + + +
+ + +

Single Button Dropdowns

+
+ + +
+ + +

Table Sample

+
+ +
Table heading
+
+

Table description

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameUsername
1Mark Otto@mdo
2JacobThornton@fat
3Larrythe Bird@twitter
+
+ + + +

Checkboxes and radio addons

+

In order to make bootstrap checkbox and radio button appear, please make sure b2b-bootstrap-common.css in app/fusion/external/ds2-bootstrap directory is included in the main HTML page.

+ +

checkbox

+
+ +
+ +
+

radio button

+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ +

Available variations

+
+ Default + Primary + Success + Info + Warning + Danger +
+ +

Checkbox

+
+ +
+
+ +
+ +
+
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html new file mode 100644 index 00000000..779b2c5f --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html @@ -0,0 +1,146 @@ + + + + + + + + Welcome + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html index 62f05269..8a944d76 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-child-add-confirm.html @@ -1,5 +1,5 @@
-
+

Confirm

@@ -7,17 +7,17 @@ ng-click="$dismiss('cancel')">
-
- You are about to add the role function {{msg.roleFun}} to the role for {{msg.role}}. Do you want to continue? + You are about to add the child role {{msg.roleFun}} to the role for {{msg.role}}. Do you want to continue?
-
+
+ ng-click="confirmRoleChildRemove(msg.selected,msg.availableRole,msg.availableRole.id);">Yes + ng-click="confirmRoleChildAdd(msg.selected,msg.availableRole,msg.availableRole.id);">Yes
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html index 94211773..ec8b2b8e 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-child-roles-modal.html @@ -12,15 +12,14 @@ Role - + - + - {{ roleFunction.name }} + {{ role.name }} diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html index 12d8df70..e2aa188a 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/role.html @@ -49,9 +49,10 @@

-
+ +
Manage Role Functions

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-report-name-validation.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-report-name-validation.html new file mode 100644 index 00000000..50132ecf --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-report-name-validation.html @@ -0,0 +1,20 @@ +
+
+

Warning

+
+ +
+
+
+
+
+

Please enter the missing report name.

+ + +
+
+
+
+
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step1.json b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step1.json index 091d47e5..66562d4b 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step1.json +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step1.json @@ -15,7 +15,7 @@ { "input": "text", "name": "reportName", - "displayName": "Report Name:", + "displayName": "Report Name *:", "defaultValue": "" }, { -- cgit 1.2.3-korg