From d727214365c22854d337c010b216e42f1b718290 Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Mon, 19 Jun 2017 09:53:49 -0400 Subject: [PORTAL-15] Repair RAPTOR and role defects. Change-Id: I1fd4049f1253801021f97ef7bcb3ffb11d8b8c76 Signed-off-by: Christopher Lott (cl778h) --- .../main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml | 33 +++ .../ds2-reports/report-step-controller.js | 274 +++++++++++++++++++-- .../ds2-raptor-report/raptorReportFactory.js | 202 ++++++++++++++- .../modal/report-security-role-del-confirm.html | 26 ++ .../modal/report-security-user-del-confirm.html | 26 ++ .../modal/report-user-role-confirm-toggle.html | 23 ++ .../ds2-reports/wz_steps/json/step5.json | 19 +- .../ds2-reports/wz_steps/json/step6.json | 28 +++ .../ds2-reports/wz_steps/report-step.html | 148 ++++++++++- 9 files changed, 741 insertions(+), 38 deletions(-) create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-user-del-confirm.html create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html create mode 100644 ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step6.json (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp') diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml index 28060a7c..39939ca0 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/orm/Fusion.hbm.xml @@ -266,6 +266,17 @@ + + + + + + + + + + + @@ -349,4 +360,26 @@ select id, name from Role order by name + + + select repId, orderNo, roleId, userId, readOnlyYn from ReportUserRole where repId = :report_id and userId is not null + + + + select repId, orderNo, roleId, userId, readOnlyYn from ReportUserRole where repId = :report_id and roleId is not null + + + + + + + delete from ReportUserRole where repId = :report_id and userId =:user_id + + + + delete from ReportUserRole where repId = :report_id and roleId =:role_id + + diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-step-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-step-controller.js index ab073799..3196b336 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-step-controller.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/ds2-reports/report-step-controller.js @@ -3,7 +3,8 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout $scope.showLoader = true; // tabs for report wizard steps: $scope.activeTabsId = 'Definition'; - + $scope.addReportUserId = {'id':''}; + $scope.addReportRoleId = {'id':''}; // For all the dropdown box, please declare the active selection variable in the following manner: // $scope.selectedOpt = {}; // $scope.selectedOpt.value = ""; @@ -17,8 +18,95 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout $scope.showLoader = false; }); } + + $scope.addReportSecurityUser = function(userId) { + raptorReportFactory.addReportSecurityUser(userId).then(function(data){ + $scope.loadSecurityPage(); + },function(error){ + $log.error("raptorReportFactory: addReportSecurityUser failed."); + }); + } + + $scope.removeReportSecurityUser = function(securityUser) { + var modalInstance = $modal.open({ + scope: $scope, + animation: $scope.animationsEnabled, + templateUrl: 'app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-user-del-confirm.html', + sizeClass: 'modal-large', + controller: ['$scope', '$modalInstance', '$http', '$log','raptorReportFactory','securityUser', function ($scope, $modalInstance, $http, $log, raptorReportFactory,securityUser) { + $scope.securityUserName = securityUser.name; + $scope.ok = function() { + raptorReportFactory.removeReportSecurityUser(securityUser.id).then(function(data){ + $modalInstance.close(); + },function(error){ + $log.error("raptorReportFactory: removeReportSecurityUser failed."); + }); + } + $scope.cancel = function() { + $modalInstance.dismiss(); + }; + }], + resolve:{ + securityUser: function(){ + return securityUser; + } + } + }); + modalInstance.result.then(function () { + $scope.loadSecurityPage(); + }, function () { + }); + }; + + $scope.addReportSecurityRole = function(roleId) { + raptorReportFactory.addReportSecurityRole(roleId).then(function(data){ + $scope.loadSecurityPage(); + },function(error){ + $log.error("raptorReportFactory: addReportSecurityRole failed."); + }); + } + + $scope.removeReportSecurityRole = function(securityRole) { + var modalInstance = $modal.open({ + scope: $scope, + animation: $scope.animationsEnabled, + templateUrl: 'app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html', + sizeClass: 'modal-large', + controller: ['$scope', '$modalInstance', '$http', '$log','raptorReportFactory','securityRole', function ($scope, $modalInstance, $http, $log, raptorReportFactory,securityRole) { + $scope.securityRoleName = securityRole.name; + $scope.ok = function() { + raptorReportFactory.removeReportSecurityRole(securityRole.id).then(function(data){ + $modalInstance.close(); + },function(error){ + $log.error("raptorReportFactory: removeReportSecurityRole failed."); + }); + } + $scope.cancel = function() { + $modalInstance.dismiss(); + }; + }], + resolve:{ + securityRole: function(){ + return securityRole; + } + } + }); + modalInstance.result.then(function () { + $scope.loadSecurityPage(); + }, function () { + }); + } + $scope.saveReportSecurityInfo = function(userId, isPublic) { + var securityInfo = {'userId':userId+"",'isPublic':isPublic}; + raptorReportFactory.updateReportSecurityInfo(securityInfo).then(function(data){ + $scope.loadSecurityPage(); + },function(error){ + $log.error("raptorReportFactory: updateReportSecurityInfo failed."); + }); + }; + $scope.createNewDefinition = function() { raptorReportFactory.createNewDefinition().then(function(data){ $scope.loadDefinition(data); @@ -322,11 +410,17 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout tabPanelId: 'threetab4x', disabled: (!$scope.isEdit) }, { - title: 'Run', - id: 'Run', + title: 'Security', + id: 'Security', uniqueId: 'uniqueTab5x', tabPanelId: 'threetab5x', disabled: (!$scope.isEdit) + }, { + title: 'Run', + id: 'Run', + uniqueId: 'uniqueTab6x', + tabPanelId: 'threetab6x', + disabled: (!$scope.isEdit) } ]; @@ -434,6 +528,26 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout }, function () { }); }; + + + $scope.throwReportNameMissingError = function () { + var modalInstance = $modal.open({ + scope: $scope, + animation: $scope.animationsEnabled, + templateUrl: 'app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-wizard-report-name-validation.html', + sizeClass: 'modal-small', + controller: ['$scope', '$modalInstance', '$http', '$log', function ($scope, $modalInstance, $http, $log) { + $scope.close = function() { + $modalInstance.dismiss(); + }; + }] + }); + modalInstance.result.then(function () { + }, function () { + }); + }; + + $scope.addNewFormField = function () { var modalInstance = $modal.open({ scope: $scope, @@ -646,12 +760,7 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout raptorReportFactory.setDrillDownPopupOptions(null); - $scope.complete = function() { - - console.log("$scope.drillDownOptionList: "); - console.log($scope.drillDownOptionList); - - + $scope.complete = function() { var drillDownPopupOptions= { radioGroup : $scope.selectedvalueradioGroup.name, reportFF: $scope.selectedChildReportFormField.value, @@ -674,8 +783,6 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout } } raptorReportFactory.setDrillDownPopupOptions(reportId,drillDownParams); - console.log(raptorReportFactory.drillDownURL); - console.log(raptorReportFactory.drillDownParams); $modalInstance.close(); }; @@ -703,9 +810,10 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout /* stepFormFactory.getStepJSONData(getJsonSrcName($scope.stepNum))*/ $scope.isColumnStep = false; $scope.isFormFieldStep = false; + $scope.isSecurityStep = false; $scope.renderStep(selectedTab+1); if ($scope.stepNum == 1) { - $scope.showLoader = false; + $scope.showLoader = false; } else if ($scope.stepNum == 2) { loadSqlInSession(); @@ -728,6 +836,16 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout $log.error("raptorReportFactory: get formfields failed."); $scope.showLoader = false;}); } else if ($scope.stepNum == 5) { + $scope.isSecurityStep = true; + $scope.reportOwnerId={'id':''}; + $scope.isPublicOptionList = [ + {'value':'true','text':'Yes'}, + {'value':'false','text':'No'}, + ]; + $scope.loadSecurityPage(); + + } + else if ($scope.stepNum == 6) { raptorReportFactory.getDefinitionInSession().then(function(data){ $scope.reportId = data.reportId; $scope.showLoader = false; @@ -745,6 +863,64 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout } }); + $scope.loadSecurityPage = function() { + $scope.showLoader = true; + raptorReportFactory.resetSecurityLoadingCounter(); + + //API call 1: + raptorReportFactory.getSecurityReportOwnerList().then(function(data){ + $scope.reportOwnerList = data; + raptorReportFactory.icrementSecurityLoadingCounter(); + if(raptorReportFactory.checkSecurityLoadingCounter()){$scope.showLoader = false;}; + },function(error){ + $log.error("raptorReportFactory: getSecurityReportOwnerList failed."); + }); + + //API call 2: get report role list + raptorReportFactory.getReportRoleList().then(function(data){ + $scope.reportRoleList = data; + raptorReportFactory.icrementSecurityLoadingCounter(); + if(raptorReportFactory.checkSecurityLoadingCounter()){$scope.showLoader = false;}; + },function(error){ + $log.error("raptorReportFactory: getReportRoleList failed."); + }); + + //API call 3: get security page basic info + raptorReportFactory.getReportSecurityInfo().then(function(data){ + $scope.reportSecurityInfo = data; + $scope.reportOwnerId ={id: $scope.reportSecurityInfo.ownerId}; + raptorReportFactory.icrementSecurityLoadingCounter(); + if(raptorReportFactory.checkSecurityLoadingCounter()){$scope.showLoader = false;}; + },function(error){ + $log.error("raptorReportFactory: getReportSecurityInfo failed."); + $scope.showLoader = false;}); + + //API call 4: retrieve security users + raptorReportFactory.getReportSecurityUsers().then(function(data){ + $scope.reportSecurityUsers = data; + for (var i=0; i<$scope.reportSecurityUsers.length;i++) { + $scope.reportSecurityUsers[i]["accessAllowed"] = !$scope.reportSecurityUsers[i]["readOnly"]; + } + raptorReportFactory.icrementSecurityLoadingCounter(); + if(raptorReportFactory.checkSecurityLoadingCounter()){$scope.showLoader = false;}; + },function(error){ + $log.error("raptorReportFactory: reportSecurityUsers failed."); + }); + + //API call 5: retrieve security roles + raptorReportFactory.getReportSecurityRoles().then(function(data){ + $scope.reportSecurityRoles = data; + for (var i=0; i<$scope.reportSecurityRoles.length;i++) { + $scope.reportSecurityRoles[i]["accessAllowed"] = !$scope.reportSecurityRoles[i]["readOnly"]; + } + + raptorReportFactory.icrementSecurityLoadingCounter(); + if(raptorReportFactory.checkSecurityLoadingCounter()){$scope.showLoader = false;}; + },function(error){ + $log.error("raptorReportFactory: reportSecurityRoles failed."); + }); + } + $scope.renderStep = function(stepNum){ var containerElement = angular.element(document.getElementById("stepView")); @@ -753,8 +929,70 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout var jsonSrcName = getJsonSrcName(stepNum); stepFormFactory.renderForm(jsonSrcName, containerElement, $scope); } + + $scope.toggleUserEditAccessActive = function(rowData) { + var modalInstance = $modal.open({ + scope: $scope, + animation: $scope.animationsEnabled, + templateUrl: 'app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html', + sizeClass: 'modal-small', + controller: ['$scope', '$modalInstance', '$http', '$log','raptorReportFactory','rowData', function ($scope, $modalInstance, $http, $log, raptorReportFactory, rowData) { + $scope.rowData = rowData; + $scope.toggleEditAccessStatus = function(rowData) { + raptorReportFactory.toggleUserEditAccess(rowData); + $modalInstance.close(); + }; + + $scope.cancelEditAccessToggle = function(rowData) { + rowData.accessAllowed = ! rowData.accessAllowed; + $modalInstance.dismiss('cancel');} + }], + resolve:{ + rowData: function(){ + return rowData; + } + } + }); + modalInstance.result.then(function () { + + }, function () { + }); + } + + $scope.toggleRoleEditAccessActive = function(rowData) { + var modalInstance = $modal.open({ + scope: $scope, + animation: $scope.animationsEnabled, + templateUrl: 'app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html', + sizeClass: 'modal-small', + controller: ['$scope', '$modalInstance', '$http', '$log','raptorReportFactory','rowData', function ($scope, $modalInstance, $http, $log, raptorReportFactory, rowData) { + $scope.rowData = rowData; + $scope.toggleEditAccessStatus = function(rowData) { + raptorReportFactory.toggleRoleEditAccess(rowData); + $modalInstance.close(); + }; + + $scope.cancelEditAccessToggle = function(rowData) { + rowData.accessAllowed = ! rowData.accessAllowed; + $modalInstance.dismiss('cancel');} + }], + resolve:{ + rowData: function(){ + return rowData; + } + } + }); + modalInstance.result.then(function () { + + }, function () { + }); + } + + + + - // initialize the page at step 1; + // initialize the page at step 1; $scope.renderStep(1); // create a message to display in our view @@ -835,7 +1073,7 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout } }; - formSelect.selectAll("option").forEach(function(d) {d.forEach(function(optionD) { console.log(optionD);checkOption(optionD); }) }); + formSelect.selectAll("option").forEach(function(d) {d.forEach(function(optionD) {checkOption(optionD); }) }); } if(formElement[0].length == 0) { @@ -956,12 +1194,18 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout $scope.save = function() { if ($scope.stepNum ==1) { updateDefinitionData(); + } else if($scope.stepNum ==5) { + $scope.saveReportSecurityInfo($scope.reportOwnerId.id,$scope.reportSecurityInfo.isPublic); } }; //Next function $scope.next = function(){ if ($scope.stepNum ==1) { + if ($scope.reportName==="") { + $scope.throwReportNameMissingError(); + return; + } updateDefinitionData(); } $scope.stepNum = $scope.stepNum +1; @@ -982,8 +1226,6 @@ appDS2.controller('reportStepController', function($scope,$http,$location, $rout }); $scope.$on('openDrillDownpage', function(event, reportId) { - console.log("$scope.reportId"); - console.log($scope.reportId); if (reportId!="") { $scope.openDrillDownReportPopup(reportId,$scope.reportId); } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/ds2-raptor-report/raptorReportFactory.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/ds2-raptor-report/raptorReportFactory.js index b0aafdbf..83c051db 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/ds2-raptor-report/raptorReportFactory.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-services/ds2-raptor-report/raptorReportFactory.js @@ -361,7 +361,80 @@ appDS2.factory('raptorReportFactory', function($http, $q) { return $q.reject("raptorReportFactory: getSearchData callback failed"); }); }, - + + getSecurityReportOwnerList: function() { + return $http + .get('report/wizard/security/retrieveReportOwner') + .then(function(response) { + if (typeof response.data === 'object') { + return response.data; + } else { + return $q.reject("raptorReportFactory: getSecurityReportOwnerList did not return a valid JSON object."); + } + }, function(response) { + // something went wrong + return $q.reject("raptorReportFactory: getSecurityReportOwnerList callback failed"); + }); + }, + getReportRoleList: function() { + return $http + .get('report/wizard/security/retrieveReportRoleList') + .then(function(response) { + if (typeof response.data === 'object') { + return response.data; + } else { + return $q.reject("raptorReportFactory: getReportRoleList did not return a valid JSON object."); + } + }, function(response) { + // something went wrong + return $q.reject("raptorReportFactory: getReportRoleList callback failed"); + }); + }, + getReportSecurityInfo: function() { + return $http + .get('report/wizard/security/getReportSecurityInfo') + .then(function(response) { + if (typeof response.data === 'object') { + return response.data; + } else { + return $q.reject("raptorReportFactory: getReportSecurityInfo did not return a valid JSON object."); + } + }, function(response) { + // something went wrong + return $q.reject("raptorReportFactory: getReportSecurityInfo callback failed"); + }); + }, + getReportSecurityUsers: function() { + return $http + .get('report/wizard/security/retrieveReportUserList') + .then(function(response) { + if (typeof response.data === 'object') { + return response.data; + } else { + return $q.reject("raptorReportFactory: getReportSecurityUsers did not return a valid JSON object."); + } + }, function(response) { + // something went wrong + return $q.reject("raptorReportFactory: getReportSecurityUsers callback failed"); + }); + }, + + getReportSecurityRoles: function() { + return $http + .get('report/wizard/security/getReportSecurityRoles') + .then(function(response) { + if (typeof response.data === 'object') { + return response.data; + } else { + return $q.reject("raptorReportFactory: getReportSecurityUsers did not return a valid JSON object."); + } + }, function(response) { + // something went wrong + return $q.reject("raptorReportFactory: getReportSecurityUsers callback failed"); + }); + }, + + getSearchDataAtPage : function(pageSearchParameter) { return $http .get('raptor.htm?action=report.search.execute&r_page='+pageSearchParameter) @@ -392,6 +465,131 @@ appDS2.factory('raptorReportFactory', function($http, $q) { // something went wrong return $q.reject("raptorReportFactory: getReportDeleteStatus callback failed"); }); - } + }, + addReportSecurityUser: function(UserId) { + return $http({ + method: "POST", + url: "report/security/addReportUser", + data: UserId + }).then(function(response) { + if (typeof response.data === 'object') { + return response.data; + } else { + return $q.reject("raptorReportFactory: addReportSecurityUser did not return a valid JSON object."); + } + }, function(response) { + // something went wrong + return $q.reject("raptorReportFactory: saveNewDefinition callback failed"); + }); + }, + removeReportSecurityUser: function(UserId) { + return $http({ + method: "POST", + url: "report/security/removeReportUser", + data: UserId + }).then(function(response) { + if (typeof response.data === 'object') { + return response.data; + } else { + return $q.reject("raptorReportFactory: removeReportSecurityUser did not return a valid JSON object."); + } + }, function(response) { + // something went wrong + return $q.reject("raptorReportFactory: saveNewDefinition callback failed"); + }); + }, + addReportSecurityRole: function(RoleId) { + return $http({ + method: "POST", + url: "report/security/addReportRole", + data: RoleId + }).then(function(response) { + if (typeof response.data === 'object') { + return response.data; + } else { + return $q.reject("raptorReportFactory: addReportSecurityRole did not return a valid JSON object."); + } + }, function(response) { + // something went wrong + return $q.reject("raptorReportFactory: saveNewDefinition callback failed"); + }); + }, + removeReportSecurityRole: function(RoleId) { + return $http({ + method: "POST", + url: "report/security/removeReportRole", + data: RoleId + }).then(function(response) { + if (typeof response.data === 'object') { + return response.data; + } else { + return $q.reject("raptorReportFactory: removeReportSecurityRole did not return a valid JSON object."); + } + }, function(response) { + // something went wrong + return $q.reject("raptorReportFactory: removeReportSecurityRole callback failed"); + }); + }, + updateReportSecurityInfo: function(securityInfo) { + return $http({ + method: "POST", + url: "report/security/updateReportSecurityInfo", + data: securityInfo + }).then(function(response) { + if (typeof response.data === 'object') { + return response.data; + } else { + return $q.reject("raptorReportFactory: updateReportSecurityInfo did not return a valid JSON object."); + } + }, function(response) { + // something went wrong + return $q.reject("raptorReportFactory: updateReportSecurityInfo callback failed"); + }); + }, + + toggleUserEditAccess: function(reportUser) { + var readOnly = reportUser.accessAllowed?"N":"Y"; + return $http({ + method: "POST", + url:"report/security/toggleUserEditAccess/"+reportUser.id, + data: readOnly + }).then(function(response) { + if (typeof response.data === 'object') { + return response.data; + } else { + return $q.reject("raptorReportFactory: toggleUserEditAccess did not return a valid JSON object."); + } + }, function(response) { + // something went wrong + return $q.reject("raptorReportFactory: toggleUserEditAccess callback failed"); + }); + }, + toggleRoleEditAccess: function(reportRole) { + var readOnly = reportRole.accessAllowed?"N":"Y"; + return $http({ + method: "POST", + url:"report/security/toggleRoleEditAccess/"+reportRole.id, + data: readOnly + }).then(function(response) { + if (typeof response.data === 'object') { + return response.data; + } else { + return $q.reject("raptorReportFactory: toggleRoleEditAccess did not return a valid JSON object."); + } + }, function(response) { + // something went wrong + return $q.reject("raptorReportFactory: toggleRoleEditAccess callback failed"); + }); + }, + resetSecurityLoadingCounter: function() { + this.securityPageApiCounter = 0; + this.securityPageApiTotalCount = 5; + }, + icrementSecurityLoadingCounter: function() { + this.securityPageApiCounter = this.securityPageApiCounter+1; + }, + checkSecurityLoadingCounter: function() { + return (this.securityPageApiCounter ==this.securityPageApiTotalCount); + } }; }); diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html new file mode 100644 index 00000000..01d1e609 --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-role-del-confirm.html @@ -0,0 +1,26 @@ +
+
+

Remove Report Role

+
+ +
+
+
+
+ +
+ +
+ +
+
+ + +
+
+
+
+
+
\ 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/modal/report-security-user-del-confirm.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-user-del-confirm.html new file mode 100644 index 00000000..6620fe7c --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-security-user-del-confirm.html @@ -0,0 +1,26 @@ +
+
+

Remove Report User

+
+ +
+
+
+
+ +
+ +
+ +
+
+ + +
+
+
+
+
+
\ 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/modal/report-user-role-confirm-toggle.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html new file mode 100644 index 00000000..21bb046f --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/modal/report-user-role-confirm-toggle.html @@ -0,0 +1,23 @@ +
+
+

+

Confirm

+
+ +
+
+
+ You are about to {{rowData.accessAllowed?"grant":"revoke"}} {{rowData.name}} edit access. Would you like to continue? +
+
+
+ + +
+
+
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step5.json b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step5.json index e1675cde..cc10114d 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step5.json +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step5.json @@ -1,20 +1,12 @@ { "step" : "5", - "last_step": true, - "hideSaveButton":true, - "hideBackButton":true, "content": { - "title": "Step 5 : Run", + "title": "", "sections": [ { - "elements": [ - ], - "buttons": [ - { - "text":"Run Report", - "value":"next", - "ngFunction":"RunCurrentReport()" - }] + "title": "", + "elements": [ + ] }, { "title": "finalButton", @@ -22,7 +14,6 @@ "next":"Microservice Config", "previous":"none" } - ] - + ] } } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step6.json b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step6.json new file mode 100644 index 00000000..e3b1ccce --- /dev/null +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/json/step6.json @@ -0,0 +1,28 @@ +{ + "step" : "6", + "last_step": true, + "hideSaveButton":true, + "hideBackButton":true, + "content": { + "title": "Step 6 : Run", + "sections": [ + { + "elements": [ + ], + "buttons": [ + { + "text":"Run Report", + "value":"next", + "ngFunction":"RunCurrentReport()" + }] + }, + { + "title": "finalButton", + "submitAction" : "", + "next":"Microservice Config", + "previous":"none" + } + ] + + } +} diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/report-step.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/report-step.html index 6665dcf2..9b498870 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/report-step.html +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/wz_steps/report-step.html @@ -9,6 +9,12 @@ } +.noTableBorder table tbody td { + border: none; +} +.noTableBorder table tbody tr { + border: none; +} .selectWrap { width: 300px; } @@ -16,6 +22,10 @@ text-align: right; vertical-align:middle; } + +.tabs.tabs-justified > li.active, .tabs.promo-tabs > li.active { +z-index:0; +}
@@ -87,7 +97,6 @@ {{$index+1}} {{rowData.name}}[{{rowData.id}}] - @@ -95,13 +104,140 @@
+
+

Step 5 : Report Security

+
+ + + + + + + + + + + + + + + +
Created By: {{reportSecurityInfo.createdUser}}Created Date: {{reportSecurityInfo.createdDate}}
Last Updated By: {{reportSecurityInfo.updateUser}}Last Updated: {{reportSecurityInfo.updatedDate}}
+ Report Owner: + + + + + Public? (All users can run the report): + +
+
+ +
+

Report Users

+ + + + + + + + + + + + + + + + + + + + + + + + + + +
NoUser NameRun AccessEdit AccessRemove
{{$index+1}}{{reportUser.name}} + + + + + +
+ Grant Access To: + + + + +
+
+ +
+

Report Roles

+ + + + + + + + + + + + + + + + + + + + + + + + +
NoRole NameRun AccessEdit AccessRemove
{{$index+1}}{{reportRole.name}} + + + + + + +
+ Grant Access To: + + + + +
+
+ +
+
-
- -- cgit 1.2.3-korg