From 627badaf69987c01811c477219fd943757a635f5 Mon Sep 17 00:00:00 2001 From: "Christopher Lott (Christopher) (cl778h)" Date: Mon, 12 Jun 2017 09:49:00 -0400 Subject: [PORTAL-16 PORTAL-18] Widget ms; staging Remove staging repositories from poms. Add widget microservice code base. Add portal unit tests. Repair defects. Normalize line endings. Change-Id: Ia5e48da2a3141b352439ecd548cddf918f4df585 Signed-off-by: Christopher Lott (cl778h) --- .../account-add-details/account-add-details.html | 6 + .../account-add-details/account-add-details.js | 15 +- .../account-onboarding/account-onboarding.less | 22 +- .../account-onboarding/account-onboarding.tpl.html | 2 +- .../add-admin-dialogs/new-admin.controller.js | 505 +++--- .../add-admin-dialogs/new-admin.controller.spec.js | 268 +-- .../admins/add-admin-dialogs/new-admin.modal.html | 25 +- .../admins/add-admin-dialogs/new-admin.modal.less | 6 +- .../app/views/admins/admins.controller.spec.js | 38 +- .../client/app/views/admins/admins.less | 57 +- .../client/app/views/admins/admins.tpl.html | 132 +- .../add-catalog-dialogs/new-catalog.modal.less | 250 +-- .../client/app/views/catalog/catalog.controller.js | 483 +++--- .../client/app/views/catalog/catalog.tpl.html | 180 +- .../app/views/catalog/information-box.tpl.html | 84 +- .../admin-confirmation-box.tpl.html | 62 +- .../confirmation-box.controller.js | 98 +- .../confirmation-box/confirmation-box.tpl.html | 56 +- .../dragdrop-confirmation-box.tpl.html | 62 +- .../confirmation-box/information-box.tpl.html | 54 +- .../views/dashboard/dashboard-widget-manage.html | 305 ++-- .../dashboard-widget-parameter-manage.html | 178 +- .../dashboard-widget-parameters.controller.js | 162 +- .../dashboard-widget-parameters.controller.less | 54 +- .../views/dashboard/dashboard-widget.controller.js | 844 ++++----- .../app/views/dashboard/dashboard.controller.js | 1029 +++++------ .../client/app/views/dashboard/dashboard.less | 1809 ++++++++++---------- .../client/app/views/dashboard/dashboard.tpl.html | 362 ++-- .../menu-details.controller.js | 400 +++++ .../menu-details.delete.modal.html | 18 + .../functionalMenu-dialog/menu-details.modal.html | 97 ++ .../functionalMenu-dialog/modal-details.modal.less | 95 +- .../client/app/views/header/header.controller.js | 1007 ++++++----- .../app/views/header/header.controller.spec.js | 38 +- .../client/app/views/header/header.less | 54 +- .../client/app/views/header/header.tpl.html | 596 ++++--- .../microservice-add-details.html | 416 ++--- .../microservice-add-details.js | 673 ++++---- .../microservice-onboarding.less | 20 +- .../microservice-onboarding.tpl.html | 150 +- .../notificationhistory.controller.js | 174 +- .../notificationhistory.tpl.html | 200 +-- .../new-portal-admin.controller.js | 190 +- .../new-portal-admin.controller.spec.js | 38 +- .../new-portal-admin/new-portal-admin.modal.html | 78 +- .../views/portal-admin/portal-admin-controller.js | 220 +-- .../app/views/portal-admin/portal-admin.tpl.html | 128 +- .../app/views/role/popup_modal_rolefunction.html | 114 +- .../client/app/views/role/role-controller.js | 438 ++--- .../views/role/role-function-list-controller.js | 320 ++-- .../client/app/views/role/role-list-controller.js | 294 ++-- .../client/app/views/role/role.html | 192 +-- .../client/app/views/role/role.less | 98 +- .../app/views/role/role_childrole_popup.html | 106 +- .../client/app/views/role/role_function_list.html | 214 +-- .../app/views/role/role_functions_popup.html | 104 +- .../client/app/views/role/role_list.html | 112 +- .../app/views/role/rolefunctionpopupController.js | 190 +- .../app/views/role/rolepopupmodelController.js | 502 +++--- .../client/app/views/sidebar/sidebar.controller.js | 126 +- .../client/app/views/sidebar/sidebar.less | 72 +- .../client/app/views/sidebar/sidebar.tpl.html | 40 +- .../contact-us-manage.controller.js | 404 ++--- .../contact-us-manage.controller.less | 18 + .../contact-us-manage/contact-us-manage.html | 361 ++-- .../support/contact-us/contact-us.controller.js | 342 ++-- .../contact-us/contact-us.controller.spec.js | 38 +- .../views/support/contact-us/contact-us.tpl.html | 250 ++- .../support/get-access/get-access.controller.js | 248 +-- .../get-access/get-access.controller.spec.js | 38 +- .../views/support/get-access/get-access.tpl.html | 204 +-- .../client/app/views/tabs/tabs.controller.js | 17 +- .../user.notifications.Json.details.controller.js | 72 +- ...user.notifications.Json.details.modal.page.html | 96 +- .../user.notifications.controller.js | 392 ++--- ...user.notifications.json.details.modal.page.less | 94 +- .../user.notifications.modal.controller.js | 1494 ++++++++-------- .../user.notifications.modal.page.html | 328 ++-- .../user.notifications.tpl.html | 234 +-- .../users/new-user-dialogs/bulk-user.ack.html | 64 +- .../users/new-user-dialogs/bulk-user.confirm.html | 166 +- .../users/new-user-dialogs/bulk-user.controller.js | 1154 ++++++------- .../users/new-user-dialogs/bulk-user.modal.html | 146 +- .../users/new-user-dialogs/new-user.controller.js | 433 ++--- .../new-user-dialogs/new-user.controller.spec.js | 510 +++--- .../users/new-user-dialogs/new-user.modal.html | 174 +- .../client/app/views/users/users.controller.js | 487 +++--- .../app/views/users/users.controller.spec.js | 282 +-- .../client/app/views/users/users.less | 43 +- .../client/app/views/users/users.tpl.html | 196 +-- .../widget-catalog/widget-catalog.controller.js | 700 ++++---- .../widget-catalog.controller.spec.js | 40 +- .../views/widget-catalog/widget-catalog.tpl.html | 152 +- .../widget-details.controller.js | 762 ++++----- .../widget-details.controller.spec.js | 308 ++-- .../widget-details.modal.html | 312 ++-- .../widget-onboarding.controller.js | 408 ++--- .../widget-onboarding.controller.spec.js | 40 +- .../views/widget-onboarding/widget-onboarding.less | 6 + .../widget-onboarding/widget-onboarding.tpl.html | 228 +-- .../widget-details.controller.js | 452 ++--- .../widget-details.controller.spec.js | 308 ++-- .../widget-details.modal.html | 304 ++-- .../client/app/views/widgets/widgets.controller.js | 336 ++-- .../app/views/widgets/widgets.controller.spec.js | 38 +- .../client/app/views/widgets/widgets.tpl.html | 162 +- 106 files changed, 14225 insertions(+), 13278 deletions(-) create mode 100644 ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.controller.js create mode 100644 ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.delete.modal.html create mode 100644 ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html (limited to 'ecomp-portal-FE-common/client/app/views') diff --git a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.html b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.html index 91027f9e..3ecb47d0 100644 --- a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.html +++ b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.html @@ -123,3 +123,9 @@ + + diff --git a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js index ff89dce3..2f9afd39 100644 --- a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js +++ b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js @@ -1,9 +1,8 @@ 'use strict'; (function () { class AccountAddDetailsCtrl { - constructor($scope, $log, $interval, basicAuthAccountSerivce, errorMessageByCode, ECOMP_URL_REGEX, $window, confirmBoxService, $cookies) { - - + constructor($scope, $log, $interval, basicAuthAccountService, errorMessageByCode, ECOMP_URL_REGEX, $window, confirmBoxService, $cookies) { + this.addEndpoint = () => { this.account.endpointList.push({ valid: true @@ -144,28 +143,24 @@ var message = "Are you sure you want to change '" + this.account.applicationName + "'?" confirmBoxService.editItem(message).then(isConfirmed => { if(isConfirmed){ - basicAuthAccountSerivce.updateAccount(this.account.id, newAccount).then(() => { + basicAuthAccountService.updateAccount(this.account.id, newAccount).then(() => { $scope.closeThisDialog(true); }); } }); }else{ - basicAuthAccountSerivce.createAccount(newAccount).then(() => { + basicAuthAccountService.createAccount(newAccount).then(() => { $scope.closeThisDialog(true); }); } - - - } - init(); $scope.$on('$stateChangeStart', e => { e.preventDefault(); }); } } - AccountAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'basicAuthAccountSerivce', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window', 'confirmBoxService', '$cookies']; + AccountAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'basicAuthAccountService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window', 'confirmBoxService', '$cookies']; angular.module('ecompApp').controller('AccountAddDetailsCtrl', AccountAddDetailsCtrl); })(); \ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.less b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.less index 8d3663c3..7c01a5ae 100644 --- a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.less +++ b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.less @@ -1,12 +1,14 @@ .account-onboarding{ - position: @page-main-position; - top: @page-main-top; - left: @page-main-left; - right: @page-main-right; - bottom: @page-main-bottom; - padding-top: @padding-top; - overflow-y: @page-main-overflow-y; - padding-left: @padding-left-side; + .bg_portalWhite;//white for 1702 + //.bg_portalGray; // gray for 1610 + position: @page-main-position; + top: @page-main-top; + left: @page-main-left; + right: @page-main-right; + bottom: @page-main-bottom; + padding-top: @padding-top; + overflow-y: @page-main-overflow-y; + padding-left: @padding-left-side; .account-table { width: @table-width; @@ -17,8 +19,4 @@ } } - .delete-account{ - .ico_trash_default; - } - } \ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.tpl.html b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.tpl.html index 5f46a1cc..d5a3c245 100644 --- a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-onboarding.tpl.html @@ -61,7 +61,7 @@ diff --git a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.js b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.js index 5a164e1a..9aec9b4f 100644 --- a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.js +++ b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.js @@ -1,252 +1,253 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ - -'use strict'; -(function () { - class NewAdminModalCtrl { - constructor($log, adminsService, $scope, confirmBoxService, utilsService, $location) { - - let init = () => { - this.isSaving = false; - this.originalApps = []; - /* istanbul ignore if */ - if ($scope.ngDialogData && $scope.ngDialogData.selectedUser && $scope.ngDialogData.dialogState) { - this.selectedUser = $scope.ngDialogData.selectedUser; - this.dialogState = $scope.ngDialogData.dialogState; - this.isShowBack = false; - if (this.dialogState === 2) { - this.getAdminAppsRoles(); - } - } else { - this.isShowBack = true; - this.selectedUser = null; - this.dialogState = 1; - } - - //this.searchUsersInProgress = false; - //this.showNewAdminAppDropdown = false; - $log.info('NewAdminModalCtrl::initiated'); - this.appsOrder = []; - }; - - let orderList = (apps) => { - this.appsOrder = []; - for (var i = 0; i < apps.length; i++) { - if (apps[i].isAdmin) { - this.appsOrder.push(apps[i].id); - } - } - }; - - this.orderFilter = app => { - if (!app || !app.id || !this.appsOrder.length) { - return; - } - return this.appsOrder.indexOf(app.id); - }; - - /** - * this function get the selected admin apps roles - */ - this.getAdminAppsRoles = () => { - if (!this.selectedUser || !this.selectedUser.orgUserId) { - $log.error('No user is selected / searchUsers is InProgress'); - this.dialogState = 1; - return; - } - adminsService.getAdminAppsRoles(this.selectedUser.orgUserId).then(roles => { - $log.debug('apps roles res: ', JSON.stringify(roles)); - if (!roles.appsRoles) { - return; - } - - this.adminAppsRoles = []; - for (var i = 0; i < roles.appsRoles.length; i++) { - if (!roles.appsRoles[i].restrictedApp) { - $log.debug('pushing: {id: ', roles.appsRoles[i].id, - 'name: ', roles.appsRoles[i].appName, - 'restrictedApp: ', roles.appsRoles[i].restrictedApp, - 'isAdmin: ', roles.appsRoles[i].isAdmin, '}'); - this.adminAppsRoles.push({ - id: roles.appsRoles[i].id, - appName: roles.appsRoles[i].appName, - isAdmin: roles.appsRoles[i].isAdmin, - restrictedApp: roles.appsRoles[i].restrictedApp - }); - } - } - this.dialogState = 2; - this.adminAppsRoles = this.adminAppsRoles.sort(getSortOrder("appName")); - - orderList(roles.appsRoles); - if (this.appsOrder != null) { - for (var j = 0; j < this.appsOrder.length; j++) { - this.originalApps.push(this.appsOrder[j]); - } - } - }).catch(err => { - $log.error(err); - }); - }; - - // Refactor this into a directive - let getSortOrder = (prop) => { - return function (a, b) { - if (a[prop].toLowerCase() > b[prop].toLowerCase()) { - return 1; - } else if (a[prop].toLowerCase() < b[prop].toLowerCase()) { - return -1; - } - return 0; - } - } - - /** - * this function set the selected user - * @param user: selected user object - */ - this.setSelectedUser = (user) => { - $log.debug('selected user: ', user); - this.selectedUser = user; - }; - - /** - * Mark the user as not admin of the selected app - * @param app: selected app object - */ - this.unadminApp = (app) => { - confirmBoxService.deleteItem(app.appName).then(confirmed => { - if (confirmed === true) { - app.isAdmin = false; - this.appsOrder.splice(this.appsOrder.indexOf(app.id), 1); - } - }).catch(err => { - $log(err); - }); - }; - - /** - * update the selected admin app with the new roles - */ - this.updateAdminAppsRoles = () => { - if (!this.selectedUser || !this.selectedUser.orgUserId || !this.adminAppsRoles) { - return; - } - this.isSaving = true; - $log.debug('going to update user: ' + this.selectedUser.orgUserId + ' with app roles: ' + JSON.stringify(this.adminAppsRoles)); - confirmBoxService.makeAdminChanges('Are you sure you want to make these admin changes?') - .then(confirmed => { - if(confirmed === true){ - adminsService.updateAdminAppsRoles({ - orgUserId: this.selectedUser.orgUserId, - appsRoles: this.adminAppsRoles - }) - .then(res => { - $log.debug('Admin apps roles updated successfully!', res); - //close and resolve dialog promise with true (to update the table) - this.remindToAddUserIfNecessary(); - $scope.closeThisDialog(true); - }).catch(err => { - $log.error('NewAdminModalCtrl.updateAdminAppsRoles:: Failed - ' + err); - }).finally(()=> { - this.isSaving = false; - }) - }else{ - this.isSaving = false; - } - }); - }; - - /** - * Navigate between dialog screens using step number: 1,2,... - */ - this.navigateBack = () => { - if (this.dialogState === 1) { - //back from 1st screen? - } - if (this.dialogState === 2) { - this.dialogState = 1; - } - }; - - init(); - - /** - * each time new app is selected in the drop down, - * add it to the user administrated apps list - */ - $scope.$watch('newAdmin.selectedNewApp', (newVal) => { - if (!newVal || newVal.isAdmin === undefined) { - return; - } - //newVal.isAdmin = true; - track by ruined this, here is the workaround: - let app = _.find(this.adminAppsRoles, {id: newVal.id}); - if (app) { - app.isAdmin = true; - this.appsOrder.push(app.id); - } - this.selectedNewApp = null; - //this.showNewAdminAppDropdown = false; - }); - - $scope.$on('$stateChangeStart', e => { - //Disable navigation when modal is opened - //**Nabil - note: this will cause the history back state to be replaced with current state - e.preventDefault(); - }); - - /** - * If an Admin was added for an application remind the portal admin to add the admin as a user - */ - this.remindToAddUserIfNecessary = () => { - - var adminAddedToNewApp = false; - if ((this.originalApps != null) && (this.originalApps.length > 0)) { - for (var i = 0; i < this.appsOrder.length; i++) { - var foundApp = false; - for (var j = 0; j < this.originalApps.length; j++) { - if (this.originalApps[j] === this.appsOrder[i]) { - foundApp = true; - } - } - if (foundApp === false) { - adminAddedToNewApp = true; - break; - } - } - } else { - adminAddedToNewApp = true; - } - - if (adminAddedToNewApp === true) { - confirmBoxService.confirm('Add this person as an application user? This allows them to access the application from ECOMP Portal. Press OK to go to the Add Users page.') - .then(confirmed => { - if (confirmed === true) { - $location.path('/users'); - } - }); - } - } - - } - } - NewAdminModalCtrl.$inject = ['$log', 'adminsService', '$scope', 'confirmBoxService', 'utilsService', '$location']; - angular.module('ecompApp').controller('NewAdminModalCtrl', NewAdminModalCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ + +'use strict'; +(function () { + class NewAdminModalCtrl { + constructor($log, adminsService, $scope, confirmBoxService, utilsService, $location) { + + let init = () => { + this.isSaving = false; + this.originalApps = []; + /* istanbul ignore if */ + if ($scope.ngDialogData && $scope.ngDialogData.selectedUser && $scope.ngDialogData.dialogState) { + this.selectedUser = $scope.ngDialogData.selectedUser; + this.dialogState = $scope.ngDialogData.dialogState; + this.isShowBack = false; + if (this.dialogState === 2) { + this.getAdminAppsRoles(); + } + } else { + this.isShowBack = true; + this.selectedUser = null; + this.dialogState = 1; + } + + //this.searchUsersInProgress = false; + //this.showNewAdminAppDropdown = false; + $log.info('NewAdminModalCtrl::initiated'); + this.appsOrder = []; + }; + + let orderList = (apps) => { + this.appsOrder = []; + for (var i = 0; i < apps.length; i++) { + if (apps[i].isAdmin) { + this.appsOrder.push(apps[i].id); + } + } + }; + + this.orderFilter = app => { + if (!app || !app.id || !this.appsOrder.length) { + return; + } + return this.appsOrder.indexOf(app.id); + }; + + /** + * this function get the selected admin apps roles + */ + this.getAdminAppsRoles = () => { + if (!this.selectedUser || !this.selectedUser.orgUserId) { + $log.error('No user is selected / searchUsers is InProgress'); + this.dialogState = 1; + return; + } + adminsService.getAdminAppsRoles(this.selectedUser.orgUserId).then(roles => { + $log.debug('apps roles res: ', JSON.stringify(roles)); + if (!roles.appsRoles) { + return; + } + + this.adminAppsRoles = []; + for (var i = 0; i < roles.appsRoles.length; i++) { + if (!roles.appsRoles[i].restrictedApp) { + $log.debug('pushing: {id: ', roles.appsRoles[i].id, + 'name: ', roles.appsRoles[i].appName, + 'restrictedApp: ', roles.appsRoles[i].restrictedApp, + 'isAdmin: ', roles.appsRoles[i].isAdmin, '}'); + this.adminAppsRoles.push({ + id: roles.appsRoles[i].id, + appName: roles.appsRoles[i].appName, + isAdmin: roles.appsRoles[i].isAdmin, + restrictedApp: roles.appsRoles[i].restrictedApp + }); + } + } + this.dialogState = 2; + this.adminAppsRoles = this.adminAppsRoles.sort(getSortOrder("appName")); + + orderList(roles.appsRoles); + if (this.appsOrder != null) { + for (var j = 0; j < this.appsOrder.length; j++) { + this.originalApps.push(this.appsOrder[j]); + } + } + }).catch(err => { + $log.error(err); + }); + }; + + // Refactor this into a directive + let getSortOrder = (prop) => { + return function (a, b) { + if (a[prop].toLowerCase() > b[prop].toLowerCase()) { + return 1; + } else if (a[prop].toLowerCase() < b[prop].toLowerCase()) { + return -1; + } + return 0; + } + } + + /** + * this function set the selected user + * @param user: selected user object + */ + this.setSelectedUser = (user) => { + $log.debug('selected user: ', user); + this.selectedUser = user; + }; + + /** + * Mark the user as not admin of the selected app + * @param app: selected app object + */ + this.unadminApp = (app) => { + confirmBoxService.deleteItem(app.appName).then(confirmed => { + if (confirmed === true) { + app.isAdmin = false; + this.appsOrder.splice(this.appsOrder.indexOf(app.id), 1); + } + }).catch(err => { + $log(err); + }); + }; + + /** + * update the selected admin app with the new roles + */ + this.updateAdminAppsRoles = () => { + if (!this.selectedUser || !this.selectedUser.orgUserId || !this.adminAppsRoles) { + return; + } + this.isSaving = true; + $log.debug('going to update user: ' + this.selectedUser.orgUserId + ' with app roles: ' + JSON.stringify(this.adminAppsRoles)); + confirmBoxService.makeAdminChanges('Are you sure you want to make these admin changes?') + .then(confirmed => { + if(confirmed === true){ + adminsService.updateAdminAppsRoles({ + orgUserId: this.selectedUser.orgUserId, + appsRoles: this.adminAppsRoles + }) + .then(res => { + $log.debug('Admin apps roles updated successfully!', res); + //close and resolve dialog promise with true (to update the table) + this.remindToAddUserIfNecessary(); + $scope.closeThisDialog(true); + }).catch(err => { + $log.error('NewAdminModalCtrl.updateAdminAppsRoles:: Failed - ' + err); + }).finally(()=> { + this.isSaving = false; + }) + }else{ + this.isSaving = false; + } + }); + }; + + /** + * Navigate between dialog screens using step number: 1,2,... + */ + this.navigateBack = () => { + if (this.dialogState === 1) { + //back from 1st screen? + } + if (this.dialogState === 2) { + this.dialogState = 1; + } + }; + + init(); + + /** + * each time new app is selected in the drop down, + * add it to the user administrated apps list + */ + $scope.$watch('newAdmin.selectedNewApp.value', (newVal) => { + var newVal= JSON.parse(newVal); + if (!newVal || newVal.isAdmin === undefined) { + return; + } + //newVal.isAdmin = true; - track by ruined this, here is the workaround: + let app = _.find(this.adminAppsRoles, {id: newVal.id}); + if (app) { + app.isAdmin = true; + this.appsOrder.push(app.id); + } + this.selectedNewApp = null; + //this.showNewAdminAppDropdown = false; + }); + + $scope.$on('$stateChangeStart', e => { + //Disable navigation when modal is opened + //**Nabil - note: this will cause the history back state to be replaced with current state + e.preventDefault(); + }); + + /** + * If an Admin was added for an application remind the portal admin to add the admin as a user + */ + this.remindToAddUserIfNecessary = () => { + + var adminAddedToNewApp = false; + if ((this.originalApps != null) && (this.originalApps.length > 0)) { + for (var i = 0; i < this.appsOrder.length; i++) { + var foundApp = false; + for (var j = 0; j < this.originalApps.length; j++) { + if (this.originalApps[j] === this.appsOrder[i]) { + foundApp = true; + } + } + if (foundApp === false) { + adminAddedToNewApp = true; + break; + } + } + } else { + adminAddedToNewApp = true; + } + + if (adminAddedToNewApp === true) { + confirmBoxService.confirm('Add this person as an application user? This allows them to access the application from ECOMP Portal. Press OK to go to the Add Users page.') + .then(confirmed => { + if (confirmed === true) { + $location.path('/users'); + } + }); + } + } + + } + } + NewAdminModalCtrl.$inject = ['$log', 'adminsService', '$scope', 'confirmBoxService', 'utilsService', '$location']; + angular.module('ecompApp').controller('NewAdminModalCtrl', NewAdminModalCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.spec.js b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.spec.js index 540459ed..c6011d18 100644 --- a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.spec.js +++ b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.spec.js @@ -1,134 +1,134 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -/** - * Created by nnaffar on 12/8/15. - */ -'use strict'; - -describe('Controller: NewAdminCtrl ', () => { - beforeEach(module('ecompApp')); - - //destroy $http default cache before starting to prevent the error 'default cache already exists' - beforeEach(inject((_CacheFactory_)=> { - _CacheFactory_.destroyAll(); - })); - - - let newCtrl, $controller, $q, $rootScope, $log; - - beforeEach(inject((_$controller_, _$q_, _$rootScope_, _$log_)=> { - [$controller, $q, $rootScope, $log] = [_$controller_, _$q_, _$rootScope_, _$log_]; - })); - - let deferredAdminAppsRoles, deferredUpdateRolesRes; - let adminsServiceMock; - beforeEach(()=> { - [deferredAdminAppsRoles, deferredUpdateRolesRes] = [$q.defer(), $q.defer()]; - - adminsServiceMock = jasmine.createSpyObj('adminsServiceMock', ['getAdminAppsRoles', 'updateAdminAppsRoles']); - - adminsServiceMock.getAdminAppsRoles.and.returnValue(deferredAdminAppsRoles.promise); - adminsServiceMock.updateAdminAppsRoles.and.returnValue(deferredUpdateRolesRes.promise); - - newCtrl = $controller('NewAdminModalCtrl', { - $log: $log, - adminsService: adminsServiceMock, - $scope: $rootScope - }); - }); - - it('should init default values when loading the controller', ()=> { - expect(newCtrl.dialogState).toBe(1); - expect(newCtrl.selectedUser).toBe(null); - }); - - it('should populate admin apps roles and move to the next screen when adminsService.getAdminAppsRoles succeeded', ()=> { - let userApps = {appsRoles: [{id: 1, isAdmin: false}, {id: 2, isAdmin: true}]}; - deferredAdminAppsRoles.resolve(userApps); - - newCtrl.selectedUser = {orgUserId: 'orgUserId'}; - - newCtrl.getAdminAppsRoles(); - $rootScope.$apply(); - - expect(adminsServiceMock.getAdminAppsRoles).toHaveBeenCalledWith(newCtrl.selectedUser.orgUserId); - expect(newCtrl.adminAppsRoles).toEqual(userApps.appsRoles); - expect(newCtrl.dialogState).toBe(2); - }); - - it('should log the error when adminsService.getAdminAppsRoles fails', ()=> { - spyOn($log, 'error'); - deferredAdminAppsRoles.reject('some error'); - - newCtrl.searchUsersInProgress = false; - newCtrl.selectedUser = {orgUserId: 'orgUserId'}; - - newCtrl.getAdminAppsRoles(); - $rootScope.$apply(); - - expect($log.error).toHaveBeenCalled(); - }); - it('should log the error when trying to getAdminAppsRoles without selecting user ', ()=> { - spyOn($log, 'error'); - - newCtrl.searchUsersInProgress = false; - newCtrl.selectedUser = null; - - newCtrl.getAdminAppsRoles(); - $rootScope.$apply(); - - expect($log.error).toHaveBeenCalled(); - }); - - it('should set isAdmin as true when adding app via the dropdown menu', ()=> { - newCtrl.adminAppsRoles = [{id: 1, isAdmin: false},{id: 2, isAdmin: true}]; - //simulate UI change - $rootScope.$apply('newAdmin.selectedNewApp = null'); - $rootScope.$apply('newAdmin.selectedNewApp = {id: 1, isAdmin: true}'); - - expect(newCtrl.adminAppsRoles[0].isAdmin).toBe(true); - expect(newCtrl.selectedNewApp).toBe(null); - }); - - it('should close the modal when updating apps roles succeeded', ()=> { - $rootScope.closeThisDialog = () => {}; - spyOn($rootScope,'closeThisDialog'); - - newCtrl.selectedUser = {orgUserId: 'orgUserId'}; - newCtrl.adminAppsRoles = [{id: 1}]; - - deferredUpdateRolesRes.resolve(); - newCtrl.updateAdminAppsRoles(); - $rootScope.$apply(); - - expect(adminsServiceMock.updateAdminAppsRoles).toHaveBeenCalledWith({orgUserId: newCtrl.selectedUser.orgUserId, appsRoles: newCtrl.adminAppsRoles}); - expect($rootScope.closeThisDialog).toHaveBeenCalled(); - }); - it('should log the error when updating apps roles fails', ()=> { - newCtrl.selectedUser = {orgUserId: 'orgUserId'}; - newCtrl.adminAppsRoles = [{id: 1}]; - - spyOn($log,'error'); - deferredUpdateRolesRes.reject(); - newCtrl.updateAdminAppsRoles(); - $rootScope.$apply(); - expect($log.error).toHaveBeenCalled(); - }); -}); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +/** + * Created by nnaffar on 12/8/15. + */ +'use strict'; + +describe('Controller: NewAdminCtrl ', () => { + beforeEach(module('ecompApp')); + + //destroy $http default cache before starting to prevent the error 'default cache already exists' + beforeEach(inject((_CacheFactory_)=> { + _CacheFactory_.destroyAll(); + })); + + + let newCtrl, $controller, $q, $rootScope, $log; + + beforeEach(inject((_$controller_, _$q_, _$rootScope_, _$log_)=> { + [$controller, $q, $rootScope, $log] = [_$controller_, _$q_, _$rootScope_, _$log_]; + })); + + let deferredAdminAppsRoles, deferredUpdateRolesRes; + let adminsServiceMock; + beforeEach(()=> { + [deferredAdminAppsRoles, deferredUpdateRolesRes] = [$q.defer(), $q.defer()]; + + adminsServiceMock = jasmine.createSpyObj('adminsServiceMock', ['getAdminAppsRoles', 'updateAdminAppsRoles']); + + adminsServiceMock.getAdminAppsRoles.and.returnValue(deferredAdminAppsRoles.promise); + adminsServiceMock.updateAdminAppsRoles.and.returnValue(deferredUpdateRolesRes.promise); + + newCtrl = $controller('NewAdminModalCtrl', { + $log: $log, + adminsService: adminsServiceMock, + $scope: $rootScope + }); + }); + + it('should init default values when loading the controller', ()=> { + expect(newCtrl.dialogState).toBe(1); + expect(newCtrl.selectedUser).toBe(null); + }); + + it('should populate admin apps roles and move to the next screen when adminsService.getAdminAppsRoles succeeded', ()=> { + let userApps = {appsRoles: [{id: 1, isAdmin: false}, {id: 2, isAdmin: true}]}; + deferredAdminAppsRoles.resolve(userApps); + + newCtrl.selectedUser = {orgUserId: 'orgUserId'}; + + newCtrl.getAdminAppsRoles(); + $rootScope.$apply(); + + expect(adminsServiceMock.getAdminAppsRoles).toHaveBeenCalledWith(newCtrl.selectedUser.orgUserId); + expect(newCtrl.adminAppsRoles).toEqual(userApps.appsRoles); + expect(newCtrl.dialogState).toBe(2); + }); + + it('should log the error when adminsService.getAdminAppsRoles fails', ()=> { + spyOn($log, 'error'); + deferredAdminAppsRoles.reject('some error'); + + newCtrl.searchUsersInProgress = false; + newCtrl.selectedUser = {orgUserId: 'orgUserId'}; + + newCtrl.getAdminAppsRoles(); + $rootScope.$apply(); + + expect($log.error).toHaveBeenCalled(); + }); + it('should log the error when trying to getAdminAppsRoles without selecting user ', ()=> { + spyOn($log, 'error'); + + newCtrl.searchUsersInProgress = false; + newCtrl.selectedUser = null; + + newCtrl.getAdminAppsRoles(); + $rootScope.$apply(); + + expect($log.error).toHaveBeenCalled(); + }); + + it('should set isAdmin as true when adding app via the dropdown menu', ()=> { + newCtrl.adminAppsRoles = [{id: 1, isAdmin: false},{id: 2, isAdmin: true}]; + //simulate UI change + $rootScope.$apply('newAdmin.selectedNewApp = null'); + $rootScope.$apply('newAdmin.selectedNewApp = {id: 1, isAdmin: true}'); + + expect(newCtrl.adminAppsRoles[0].isAdmin).toBe(true); + expect(newCtrl.selectedNewApp).toBe(null); + }); + + it('should close the modal when updating apps roles succeeded', ()=> { + $rootScope.closeThisDialog = () => {}; + spyOn($rootScope,'closeThisDialog'); + + newCtrl.selectedUser = {orgUserId: 'orgUserId'}; + newCtrl.adminAppsRoles = [{id: 1}]; + + deferredUpdateRolesRes.resolve(); + newCtrl.updateAdminAppsRoles(); + $rootScope.$apply(); + + expect(adminsServiceMock.updateAdminAppsRoles).toHaveBeenCalledWith({orgUserId: newCtrl.selectedUser.orgUserId, appsRoles: newCtrl.adminAppsRoles}); + expect($rootScope.closeThisDialog).toHaveBeenCalled(); + }); + it('should log the error when updating apps roles fails', ()=> { + newCtrl.selectedUser = {orgUserId: 'orgUserId'}; + newCtrl.adminAppsRoles = [{id: 1}]; + + spyOn($log,'error'); + deferredUpdateRolesRes.reject(); + newCtrl.updateAdminAppsRoles(); + $rootScope.$apply(); + expect($log.error).toHaveBeenCalled(); + }); +}); diff --git a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.html b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.html index 1b1b9de8..a18b8f60 100644 --- a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.html +++ b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.html @@ -31,8 +31,7 @@ - - +
@@ -43,16 +42,14 @@
-
- +
+
- +
@@ -75,3 +72,9 @@
+ + diff --git a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.less b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.less index 8b304b43..f7c1111d 100644 --- a/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.less +++ b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.less @@ -47,7 +47,7 @@ } .admin-roles-list { - height: 240px; + height: 185px; overflow-y: auto; } @@ -73,6 +73,10 @@ color: transparent; margin-left: 8px; } + + .awd-select-list { + max-height: 205px; + } } diff --git a/ecomp-portal-FE-common/client/app/views/admins/admins.controller.spec.js b/ecomp-portal-FE-common/client/app/views/admins/admins.controller.spec.js index 3841a2b3..32cc3a1f 100644 --- a/ecomp-portal-FE-common/client/app/views/admins/admins.controller.spec.js +++ b/ecomp-portal-FE-common/client/app/views/admins/admins.controller.spec.js @@ -1,19 +1,19 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ diff --git a/ecomp-portal-FE-common/client/app/views/admins/admins.less b/ecomp-portal-FE-common/client/app/views/admins/admins.less index 729ef693..38760ca3 100644 --- a/ecomp-portal-FE-common/client/app/views/admins/admins.less +++ b/ecomp-portal-FE-common/client/app/views/admins/admins.less @@ -1,6 +1,7 @@ .w-ecomp-admins-page-main { + .bg_portalWhite;//white for 1702 - position: @page-main-position; + position: @page-main-position; top: @page-main-top; left: @page-main-left; right: @page-main-right; @@ -8,38 +9,42 @@ padding-top: @padding-top; overflow-y: @page-main-overflow-y; padding-left: @padding-left-side; -#input-table-search::-webkit-input-placeholder, -{ -font-style: italic; - color: #D7D7D7; - -} + #input-table-search::-webkit-input-placeholder, + { + font-style: italic; + color: #D7D7D7; + + } .ecomp-spinner{ top: 255px; } + .table-admins-div{ + width:15px; + font-size:23px; + cursor: pointer; + } .admins-home-container { - position: relative; - padding-right: 0; - padding-left: 0; - padding-bottom: @container-bottom; + position: relative; + padding-right: 0; + padding-left: 0; + padding-bottom: @container-bottom; - .admins-table { - width: @table-width; - //margin-left: @table-margin-left; - margin: 0 auto; + .admins-table { + width: @table-width; + //margin-left: @table-margin-left; + margin: 0 auto; - .table-control { - .table-dropdown-filter { - width: @table-dropdown-filter-width; - display: @table-dropdown-filter-display; - } - } + .table-control { + .table-dropdown-filter { + width: @table-dropdown-filter-width; + display: @table-dropdown-filter-display; + } + } - .table-body { - cursor: pointer; - } - } + .table-body { + cursor: pointer; + } + } } } - diff --git a/ecomp-portal-FE-common/client/app/views/admins/admins.tpl.html b/ecomp-portal-FE-common/client/app/views/admins/admins.tpl.html index 907bf323..f9ea3ff9 100644 --- a/ecomp-portal-FE-common/client/app/views/admins/admins.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/admins/admins.tpl.html @@ -1,66 +1,66 @@ - -
-
-
-

Admins

-
-
-
-
-
- -
-
- -
- -
-
- -
- - - - - - - - - - - - - - - - - -
First NameLast NameUser IDApplications
-
-
-
-
-
-
- -
+ +
+
+
+

Admins

+
+
+
+
+
+ +
+
+ +
+ +
+
+ +
+ + + + + + + + + + + + + + + + + +
First NameLast NameUser IDApplications
+
+
+
+
+
+
+ + diff --git a/ecomp-portal-FE-common/client/app/views/catalog/add-catalog-dialogs/new-catalog.modal.less b/ecomp-portal-FE-common/client/app/views/catalog/add-catalog-dialogs/new-catalog.modal.less index b98289e7..5568ca8e 100644 --- a/ecomp-portal-FE-common/client/app/views/catalog/add-catalog-dialogs/new-catalog.modal.less +++ b/ecomp-portal-FE-common/client/app/views/catalog/add-catalog-dialogs/new-catalog.modal.less @@ -1,125 +1,125 @@ -.new-catalog-modal { - height: 430px; - - .user-catalog-roles{ - .title{ - //.n18r; - .dGray18r; //AT&T Dark Gray - border-bottom: @portalDBlue 3px solid; - } - - input:not([type="button"]) { - height: 13px; -} - .display-userApp-Catalog-Roles - { - padding-left: 16px; - padding-top: 10px; - font-family: Omnes-ECOMP-W02,Arial; - font-size: 18px; - color: #5a5a5a; - } - - #pending-checkbox{ - font-family: Omnes-ECOMP-W02,Arial; - font-size: 15px; - color: #5a5a5a; - } - .app-catalog-roles-list{ - height: 286px; - - - .app-catalog-item{ - border: 1px solid @portalLGray; - border-radius: 2px; - background-color: @funcBkgGray; - - padding: 10px; - margin-top: 8px; - //margin-right: 6px; - //margin-left: 6px; - - .app-catalog-item-left{ - padding-top: 0; - line-height: 30px; - height: 30px; - vertical-align: middle; - display:inline-block; - width: 45%; - border-radius: 2px; - border: 1px solid @portalLGray; - margin-right: 10px; - padding-left: 4px; - background: @portalWhite; - white-space: nowrap; - - } - .app-catalog-item-right{ - display:inline-block; - width: 45%; - border-radius: 2px; - border: 1px solid @portalLGray; - background: @portalWhite; - vertical-align: middle; - } - - .app-catalog-item-right-error{ - .portalRed; - padding: 7px 7px 7px 7px; - display:inline-block; - width: 45%; - border-radius: 2px; - border: 1px solid @portalLGray; - background: @portalWhite; - vertical-align: middle; - } - - .app-catalog-item-right-contacting{ - .portalGreen; - padding: 7px 7px 7px 7px; - display:inline-block; - width: 45%; - border-radius: 2px; - border: 1px solid @portalLGray; - background: @portalWhite; - vertical-align: middle; - } - - .app-select-left{ - width: 45%; - margin-right: 10px; - vertical-align: middle; - - - .select-field{ - padding-top: 0; - line-height: 30px; - height: 30px; - vertical-align: middle; - border-radius: 2px; - border: 1px solid @portalLGray; - margin-right: 10px; - padding-left: 4px; - background: @portalWhite; - display:inline-block; - } - } - - - .app-item-delete{ - .ico_trash_default; - display: inline-block; - vertical-align: 2px; - cursor: pointer; - position: relative; - top: 6px; - color: transparent; - margin-left: 8px; - - } - - } - } - - } -} +.new-catalog-modal { + height: 430px; + + .user-catalog-roles{ + .title{ + //.n18r; + .dGray18r; //AT&T Dark Gray + border-bottom: @portalDBlue 3px solid; + } + + input:not([type="button"]) { + height: 13px; +} + .display-userApp-Catalog-Roles + { + padding-left: 16px; + padding-top: 10px; + font-family: Omnes-ECOMP-W02,Arial; + font-size: 18px; + color: #5a5a5a; + } + + #pending-checkbox{ + font-family: Omnes-ECOMP-W02,Arial; + font-size: 15px; + color: #5a5a5a; + } + .app-catalog-roles-list{ + height: 286px; + + + .app-catalog-item{ + border: 1px solid @portalLGray; + border-radius: 2px; + background-color: @funcBkgGray; + + padding: 10px; + margin-top: 8px; + //margin-right: 6px; + //margin-left: 6px; + + .app-catalog-item-left{ + padding-top: 0; + line-height: 30px; + height: 30px; + vertical-align: middle; + display:inline-block; + width: 45%; + border-radius: 2px; + border: 1px solid @portalLGray; + margin-right: 10px; + padding-left: 4px; + background: @portalWhite; + white-space: nowrap; + + } + .app-catalog-item-right{ + display:inline-block; + width: 45%; + border-radius: 2px; + border: 1px solid @portalLGray; + background: @portalWhite; + vertical-align: middle; + } + + .app-catalog-item-right-error{ + .portalRed; + padding: 7px 7px 7px 7px; + display:inline-block; + width: 45%; + border-radius: 2px; + border: 1px solid @portalLGray; + background: @portalWhite; + vertical-align: middle; + } + + .app-catalog-item-right-contacting{ + .portalGreen; + padding: 7px 7px 7px 7px; + display:inline-block; + width: 45%; + border-radius: 2px; + border: 1px solid @portalLGray; + background: @portalWhite; + vertical-align: middle; + } + + .app-select-left{ + width: 45%; + margin-right: 10px; + vertical-align: middle; + + + .select-field{ + padding-top: 0; + line-height: 30px; + height: 30px; + vertical-align: middle; + border-radius: 2px; + border: 1px solid @portalLGray; + margin-right: 10px; + padding-left: 4px; + background: @portalWhite; + display:inline-block; + } + } + + + .app-item-delete{ + .ico_trash_default; + display: inline-block; + vertical-align: 2px; + cursor: pointer; + position: relative; + top: 6px; + color: transparent; + margin-left: 8px; + + } + + } + } + + } +} diff --git a/ecomp-portal-FE-common/client/app/views/catalog/catalog.controller.js b/ecomp-portal-FE-common/client/app/views/catalog/catalog.controller.js index ad34b08d..150a305e 100644 --- a/ecomp-portal-FE-common/client/app/views/catalog/catalog.controller.js +++ b/ecomp-portal-FE-common/client/app/views/catalog/catalog.controller.js @@ -1,238 +1,245 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; - -function _classCallCheck(instance, Constructor) { - if (!(instance instanceof Constructor)) { - throw new TypeError('Cannot call a class as a function'); - } -} - -(function() { - var HTTP_PROTOCOL_RGX = /https?:\/\//; - - var CatalogCtrl = function CatalogCtrl(conf, catalogService, confirmBoxService, ExternalRequestAccessService, - $log, $window, userProfileService, applicationsService, $scope, $state, - $timeout, $interval, $modal, ngDialog) { - - this.conf = conf; - var _this = this; - _classCallCheck(this, CatalogCtrl); - - // activate spinner - this.isLoading = true; - $scope.getAppCatalogIsDone = false; - $scope.radioValue = 'All'; - $scope.$watch('radioValue', function(newValue, oldValue) { - var appCatalog = $scope.appCatalog; - $scope.appCatalog = []; - $scope.appCatalog = appCatalog; - - - }); - - this.catalogService = catalogService; - this.userProfileService = userProfileService; - this.applicationsService = applicationsService; - var resultAccessValue = null; - $scope.demoNum = 1; - $scope.appRoles = []; - - let init = () => { - getExternalAccess(); - }; - - var getExternalAccess = () => { - ExternalRequestAccessService.getExternalRequestAccessServiceInfo().then( - function(property) { - resultAccessValue = property.accessValue; - // $log.info(res); - }).catch(err => { - $log.error('CatalogCtrl: failed getExternalRequestAccessServiceInfo: ' + JSON.stringify(err)); - }); - }; - - - - $scope.applyPresentationDetailsToAppsCatalog = function(res, value) { - - _this.apps = res; - var rowNo = 0; - - // defend against error string result - - // a huge list that should never happen. - var maxItems = 333; - if (_this.apps.length < maxItems) - maxItems = _this.apps.length; - for (var i = 0; i < maxItems; i++) { - let imgLnk = ''; - if (_this.apps[i].imageUrl) - imgLnk = conf.api.appThumbnail.replace(':appId', _this.apps[i].id); - //$log.debug('CatalogCtlr::applyPresn: imgLink = ' + imgLnk); - $scope.appCatalog[i] = { - sizeX : 2, - sizeY : 2, - id : _this.apps[i].id, - headerText : _this.apps[i].name, - imageLink : imgLnk, - restricted : _this.apps[i].restricted, - select : _this.apps[i].select, - access : _this.apps[i].access, - pending: _this.apps[i].pending, - mlproperty: value - }; - } - //$log.debug('CatalogCtrl: getAppCatalog count : ' - // + $scope.appCatalog.length); - _this.isLoading = false; - $scope.getAppCatalogIsDone = true; - } - - let getAppsCatalog = () => { - catalogService.getAppCatalog() - .then(appsList => { - $scope.applyPresentationDetailsToAppsCatalog(appsList); - }).catch(err => { - confirmBoxService.showInformation('There was a problem retrieving the Applications. ' + - 'Please try again later. Error Status: '+ err.status).then(isConfirmed => {}); - $log.error('CatalogCtrl:openAddRoleModal: Error: ', err); - }); - }; - - this.openAddRoleModal = (item) => { - let data = null; - - if((!item.restricted) && (item.mlproperty)){ - data = { - dialogState: 2, - selectedUser:{ - attuid: $scope.attuid, - firstName: $scope.firstName, - lastName: $scope.lastName, - headerText: item.headerText, - item: item - - } - } - ngDialog.open({ - templateUrl: 'app/views/catalog/add-catalog-dialogs/new-catalog.modal.html', - controller: 'NewCatalogModalCtrl', - controllerAs: 'userInfo', - data: data - }).closePromise.then(needUpdate => { - if(needUpdate.value === true){ - getAppsCatalog(); - } - - }); - } - }; - - // Run this function when user clicks on checkbox. - this.storeSelection = function(item) { - // $log.debug('CatalogCtrl:storeSelection: item.id is ' + item.id + ', select is ' + item.select); - var pendingFlag = false; - - if(item.access) - pendingFlag = false; - else - pendingFlag = item.pending; - - var appData = { - appId : item.id, - select : item.select, - pending : pendingFlag // TODO - }; - - catalogService.updateManualAppSort(appData).then( - function(result) { - // $log.debug('CatalogCtrl:storeSelection result is ', result); - })['catch'](function(err) { - $log.error('CatalogCtrl:storeSelection: exception: ', err); - }); - catalogService.updateAppCatalog(appData).then( - function(result) { - // $log.debug('CatalogCtrl:storeSelection result is ', result); - })['catch'](function(err) { - $log.error('CatalogCtrl:storeSelection: exception: ', err); - }); - }; - - userProfileService - .getUserProfile() - .then( - function(profile) { - $scope.attuid = profile.orgUserId; - $scope.firstName = profile.firstName; - $scope.lastName = profile.lastName; - $scope.appCatalog = []; - - catalogService.getAppCatalog().then( - function(res) { - $scope.applyPresentationDetailsToAppsCatalog(res, resultAccessValue); - })['catch'](function(err) { - $log.error('CatalogCtrl: failed getAppCatalog: ', JSON.stringify(err)); - _this.isLoading = false; - $scope.getAppCatalogIsDone = true; - }); - }); - - // applicationsService.getUserApps() - - - this.gridsterOpts = { - columns : 12, - colWidth : 95, - rowHeight : 95, - margins : [ 20, 20 ], - outerMargin : true, - pushing : true, - floating : true, - swapping : true, - }; - - if (getParameterByName('noUserError') != null) { - if (getParameterByName('noUserError') == "Show") { - $("#errorInfo").show(); - } - - } - - init(); - }; - - CatalogCtrl.$inject = [ 'conf', 'catalogService', 'confirmBoxService', 'ExternalRequestAccessService', '$log', - '$window', 'userProfileService', 'applicationsService', '$scope', - '$state', '$timeout', '$interval', '$modal', 'ngDialog' ]; - angular.module('ecompApp').controller('CatalogCtrl', CatalogCtrl); -})(); - -function getParameterByName(name, url) { - if (!url) - url = window.location.href; - name = name.replace(/[\[\]]/g, "\\$&"); - var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"), results = regex - .exec(url); - if (!results) - return ''; - if (!results[2]) - return ''; - return results[2].replace(/\+/g, " "); -} +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; + +function _classCallCheck(instance, Constructor) { + if (!(instance instanceof Constructor)) { + throw new TypeError('Cannot call a class as a function'); + } +} + +(function() { + var HTTP_PROTOCOL_RGX = /https?:\/\//; + + var CatalogCtrl = function CatalogCtrl(conf, catalogService, confirmBoxService, ExternalRequestAccessService, + $log, $window, userProfileService, applicationsService, $scope, $state, + $timeout, $interval, $modal, ngDialog) { + + this.conf = conf; + var _this = this; + var externalRequest = true; + _classCallCheck(this, CatalogCtrl); + + // activate spinner + this.isLoading = true; + $scope.getAppCatalogIsDone = false; + $scope.radioValue = 'All'; + $scope.$watch('radioValue', function(newValue, oldValue) { + var appCatalog = $scope.appCatalog; + $scope.appCatalog = []; + $scope.appCatalog = appCatalog; + + + }); + + this.catalogService = catalogService; + this.userProfileService = userProfileService; + this.applicationsService = applicationsService; + var resultAccessValue = null; + $scope.demoNum = 1; + $scope.appRoles = []; + + let init = () => { + getExternalAccess(); + }; + + var getExternalAccess = () => { + ExternalRequestAccessService.getExternalRequestAccessServiceInfo().then( + function(property) { + resultAccessValue = property.accessValue; + // $log.info(res); + }).catch(err => { + $log.error('CatalogCtrl: failed getExternalRequestAccessServiceInfo: ' + JSON.stringify(err)); + }); + }; + + + + $scope.applyPresentationDetailsToAppsCatalog = function(res, value) { + + _this.apps = res; + var rowNo = 0; + + // defend against error string result - + // a huge list that should never happen. + var maxItems = 333; + if (_this.apps.length < maxItems) + maxItems = _this.apps.length; + for (var i = 0; i < maxItems; i++) { + let imgLnk = ''; + if (_this.apps[i].imageUrl) + imgLnk = conf.api.appThumbnail.replace(':appId', _this.apps[i].id); + //$log.debug('CatalogCtlr::applyPresn: imgLink = ' + imgLnk); + $scope.appCatalog[i] = { + sizeX : 2, + sizeY : 2, + id : _this.apps[i].id, + headerText : _this.apps[i].name, + mlAppName: _this.apps[i].mlAppName, + imageLink : imgLnk, + restricted : _this.apps[i].restricted, + select : _this.apps[i].select, + access : _this.apps[i].access, + pending: _this.apps[i].pending, + mlproperty: value + }; + } + //$log.debug('CatalogCtrl: getAppCatalog count : ' + // + $scope.appCatalog.length); + _this.isLoading = false; + $scope.getAppCatalogIsDone = true; + } + + let getAppsCatalog = () => { + catalogService.getAppCatalog() + .then(appsList => { + $scope.applyPresentationDetailsToAppsCatalog(appsList); + }).catch(err => { + confirmBoxService.showInformation('There was a problem retrieving the Applications. ' + + 'Please try again later. Error Status: '+ err.status).then(isConfirmed => {}); + $log.error('CatalogCtrl:openAddRoleModal: Error: ', err); + }); + }; + + this.openAddRoleModal = (item) => { + let data = null; + + if((!item.restricted) && (item.mlproperty)){ + data = { + dialogState: 2, + selectedUser:{ + attuid: $scope.attuid, + firstName: $scope.firstName, + lastName: $scope.lastName, + headerText: item.headerText, + haloAppName : item.mlAppName, + item: item, + extReqValue : externalRequest + + } + } + ngDialog.open({ + templateUrl: 'app/views/catalog/add-catalog-dialogs/new-catalog.modal.html', + controller: 'NewCatalogModalCtrl', + controllerAs: 'userInfo', + data: data + }).closePromise.then(needUpdate => { + if(needUpdate.value === true){ + getAppsCatalog(); + } + + }); + } + }; + + // Run this function when user clicks on checkbox. + this.storeSelection = function(item) { + // $log.debug('CatalogCtrl:storeSelection: item.id is ' + item.id + ', select is ' + item.select); + var pendingFlag = false; + + if(item.access) + pendingFlag = false; + else + pendingFlag = item.pending; + + var appData = { + appId : item.id, + select : item.select, + pending : pendingFlag // TODO + }; + + catalogService.updateManualAppSort(appData).then( + function(result) { + // $log.debug('CatalogCtrl:storeSelection result is ', result); + })['catch'](function(err) { + $log.error('CatalogCtrl:storeSelection: exception: ', err); + }); + catalogService.updateAppCatalog(appData).then( + function(result) { + // $log.debug('CatalogCtrl:storeSelection result is ', result); + })['catch'](function(err) { + $log.error('CatalogCtrl:storeSelection: exception: ', err); + }); + }; + + userProfileService + .getUserProfile() + .then( + function(profile) { + $scope.attuid = profile.orgUserId; + $scope.firstName = profile.firstName; + $scope.lastName = profile.lastName; + $scope.appCatalog = []; + + catalogService.getAppCatalog().then( + function(res) { + $scope.applyPresentationDetailsToAppsCatalog(res, resultAccessValue); + })['catch'](function(err) { + $log.error('CatalogCtrl: failed getAppCatalog: ', JSON.stringify(err)); + _this.isLoading = false; + $scope.getAppCatalogIsDone = true; + }); + }); + + // applicationsService.getUserApps() + + + this.gridsterOpts = { + columns : 12, + colWidth : 95, + rowHeight : 95, + margins : [ 20, 20 ], + outerMargin : true, + pushing : true, + floating : true, + swapping : true, + resizable: { + enabled: false, + }, + }; + + if (getParameterByName('noUserError') != null) { + if (getParameterByName('noUserError') == "Show") { + $("#errorInfo").show(); + } + + } + + init(); + }; + + CatalogCtrl.$inject = [ 'conf', 'catalogService', 'confirmBoxService', 'ExternalRequestAccessService', '$log', + '$window', 'userProfileService', 'applicationsService', '$scope', + '$state', '$timeout', '$interval', '$modal', 'ngDialog' ]; + angular.module('ecompApp').controller('CatalogCtrl', CatalogCtrl); +})(); + +function getParameterByName(name, url) { + if (!url) + url = window.location.href; + name = name.replace(/[\[\]]/g, "\\$&"); + var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"), results = regex + .exec(url); + if (!results) + return ''; + if (!results[2]) + return ''; + return results[2].replace(/\+/g, " "); +} diff --git a/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html b/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html index 68bf9ef2..b4063ad6 100644 --- a/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/catalog/catalog.tpl.html @@ -1,90 +1,90 @@ - -
-
-
-

Application Catalog

-
-
-
- Click the check - boxes below to choose which applications are shown on the home page. -

- -
-
-
-
    -
  • -
    -
    - -

    {{item.headerText | - elipsis: 13}}

    -
    - - -
    -
    -
    -
    -
    -
    • -
-
-
- -
- -
- To request access to an application, please visit the Get Access page. -
- -
-
- -
-
+ +
+
+
+

Application Catalog

+
+
+
+ Click the check + boxes below to choose which applications are shown on the home page. +

+ +
+
+
+
    +
  • +
    +
    + +

    {{item.headerText | + elipsis: 13}}

    +
    + + +
    +
    +
    +
    +
    +
    • +
+
+
+ +
+ +
+ To request access to an application, please visit the Get Access page. +
+ +
+
+ +
+
diff --git a/ecomp-portal-FE-common/client/app/views/catalog/information-box.tpl.html b/ecomp-portal-FE-common/client/app/views/catalog/information-box.tpl.html index a5b754f6..8a848545 100644 --- a/ecomp-portal-FE-common/client/app/views/catalog/information-box.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/catalog/information-box.tpl.html @@ -1,42 +1,42 @@ - -
-
-
-
- You do not have access to this application. - See the - - Get Access page and request access at MyLogins. -

- You may check this box if access is pending: - -
- -
-
-
-
Close
-
-
+ +
+
+
+
+ You do not have access to this application. + See the + + Get Access page and request access at MyLogins. +

+ You may check this box if access is pending: + +
+ +
+
+
+
Close
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/admin-confirmation-box.tpl.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/admin-confirmation-box.tpl.html index 01b48de4..69f9af84 100644 --- a/ecomp-portal-FE-common/client/app/views/confirmation-box/admin-confirmation-box.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/admin-confirmation-box.tpl.html @@ -1,31 +1,31 @@ - -
-
-
-
-
-
-
-
-
Confirm
-
Cancel
-
-
+ +
+
+
+
+
+
+
+
+
Confirm
+
Cancel
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js index 26d39a76..36eb04a8 100644 --- a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js +++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.controller.js @@ -1,49 +1,49 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -/** - * Created by nnaffar on 1/18/16. - */ -'use strict'; -(function () { - class ConfirmationBoxCtrl { - constructor($scope,$state) { - - let init = () => { - let item = ($scope.ngDialogData && $scope.ngDialogData.item) || 'this'; - this.message = $scope.ngDialogData.message ? $scope.ngDialogData.message : `Are you sure you want to delete "${item}"?`; - this.title = $scope.ngDialogData.title ? $scope.ngDialogData.title : ''; - }; - - this.closeBox = isConfirmed => { - $scope.closeThisDialog(isConfirmed); - }; - - this.goTo = (state, params) => { - $scope.closeThisDialog(false); - $state.go(state,params); - - }; - - init(); - } - } - ConfirmationBoxCtrl.$inject = ['$scope','$state']; - angular.module('ecompApp').controller('ConfirmationBoxCtrl', ConfirmationBoxCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +/** + * Created by nnaffar on 1/18/16. + */ +'use strict'; +(function () { + class ConfirmationBoxCtrl { + constructor($scope,$state) { + + let init = () => { + let item = ($scope.ngDialogData && $scope.ngDialogData.item) || 'this'; + this.message = $scope.ngDialogData.message ? $scope.ngDialogData.message : `Are you sure you want to delete "${item}"?`; + this.title = $scope.ngDialogData.title ? $scope.ngDialogData.title : ''; + }; + + this.closeBox = isConfirmed => { + $scope.closeThisDialog(isConfirmed); + }; + + this.goTo = (state, params) => { + $scope.closeThisDialog(false); + $state.go(state,params); + + }; + + init(); + } + } + ConfirmationBoxCtrl.$inject = ['$scope','$state']; + angular.module('ecompApp').controller('ConfirmationBoxCtrl', ConfirmationBoxCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.tpl.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.tpl.html index 01313079..8f880ef4 100644 --- a/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/confirmation-box.tpl.html @@ -1,28 +1,28 @@ - -
-
-
-
-
-
OK
-
Cancel
-
-
+ +
+
+
+
+
+
OK
+
Cancel
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/dragdrop-confirmation-box.tpl.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/dragdrop-confirmation-box.tpl.html index a7a3fd46..f6a1a29b 100644 --- a/ecomp-portal-FE-common/client/app/views/confirmation-box/dragdrop-confirmation-box.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/dragdrop-confirmation-box.tpl.html @@ -1,31 +1,31 @@ - -
-
-
-
-
-
-
-
-
Confirm
-
Cancel
-
-
+ +
+
+
+
+
+
+
+
+
Confirm
+
Cancel
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/confirmation-box/information-box.tpl.html b/ecomp-portal-FE-common/client/app/views/confirmation-box/information-box.tpl.html index 912b971b..1eaa2819 100644 --- a/ecomp-portal-FE-common/client/app/views/confirmation-box/information-box.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/confirmation-box/information-box.tpl.html @@ -1,27 +1,27 @@ - -
-
-
{{confirmBox.message}}
-
-
-
Close
-
-
+ +
+
+
{{confirmBox.message}}
+
+
+
Close
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-manage.html b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-manage.html index 9883bd14..f47e17c2 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-manage.html +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-manage.html @@ -1,152 +1,153 @@ - -
-

-
-
- -
-
Manage {{widgetTypeDisplay}} Widgets
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
TitleURLDateContentOrderEditDelete
-
- - 		-
- - 		-
- - 		-
{{rowData.content | cut:true:20:' ...'}}
- - 		-
- - 		-
- -
- - Save - - 		-
- -
-
-
- -
-
-
-
-

Add

-
{{errMsg}}
-
-
-
-
-
-
-
Title
- -
-
-
URL
- -
-
-
Sort Order
- -
-
-
-

Event Date

-
-
-

- -

-
-
-
- -
-
Content
- -
-
-
- Add New - -
- -
- -
-
-
-
- Close -
-
-
-
-
- - + +
+

+
+
+ +
+
Manage {{widgetTypeDisplay}} Widgets
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
TitleURLDateContentOrderEditDelete
+
+ + 		+
+ + 		+
+ + 		+
{{rowData.content | cut:true:20:' ...'}}
+ + 		+
+ + 		+
+ +
+ + Save + + 		+
+ +
+
+
+ +
+
+
+
+

Add

+
{{errMsg}}
+
+
+
+
+
+
+
Title
+ +
+
+
URL
+ +
+
+
Sort Order
+ +
+
+
+

Event Date

+
+
+

+ +

+
+
+
+ +
+
Content
+ +
+
+
+ Add New + +
+ +
+ +
+
+
+
+ Close +
+
+
+
+
+ + diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameter-manage.html b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameter-manage.html index 59e6f4fa..1f958b7f 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameter-manage.html +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameter-manage.html @@ -1,86 +1,92 @@ - -
-
Manage - Widgets Parameters Page
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - -
Parameter - KeyMy ValueDefault ValueEditReset to Default
-
- 		-
- - 		-
- 		-
- -
Save - - 		-
- -
- -
-
- There is no parameter assoicated with this widget! -
- -
- -
-
-
+ +
+
Manage + Widgets Parameters Page
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + +
Parameter + KeyMy ValueDefault ValueEditReset to Default
+
+ 		+
+ + 		+
+ 		+
+ +
Save + + 		+
+ +
+ +
+
+ There is no parameter assoicated with this widget! +
+ +
+ +
+
+
+ + diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.js b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.js index 460618ea..fb9a254f 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.js +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.js @@ -1,81 +1,81 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; - -(function () { - class WidgetParameterController { - constructor($scope, widgetsCatalogService, userProfileService) { - let widgetId = $scope.ngDialogData.widgetId; - $scope.modflag = false; - $scope.isLoadingTable = false; - $scope.messageInfo = false; - - widgetsCatalogService.getWidgetCatalogParameters(widgetId).then(res => { - if(res.status == 'OK'){ - $scope.isLoadingTable = true; - $scope.widgetParam = res.response; - }else if(res.status == 'WARN'){ - $scope.messageInfo = true; - } - }).catch(err => { - $log.error('WidgetParameterController::init error: ' + err); - }) - - $scope.setEdit = function(index) { - if($scope.modflag === false){ - $scope.widgetParam[index].showEdit = true; - $scope.modflag = true; - } - } - - $scope.resetDefault = function(index) { - var widgetParamObject = {}; - widgetParamObject.user_value = $scope.widgetParam[parseInt(index)].default_value; - widgetParamObject.paramId = $scope.widgetParam[parseInt(index)].param_id; - widgetParamObject.widgetId = widgetId; - widgetsCatalogService.saveWidgetParameter(widgetParamObject) - .then(function(res){ - if(res.status == 'OK'){ - $scope.widgetParam[index].user_value = $scope.widgetParam[index].default_value; - } - }); - } - - $scope.modify = function(index) { - - var widgetParamObject = {}; - widgetParamObject.user_value = $scope.widgetParam[parseInt(index)].user_value; - widgetParamObject.paramId = $scope.widgetParam[parseInt(index)].param_id; - widgetParamObject.widgetId = widgetId; - - widgetsCatalogService.saveWidgetParameter(widgetParamObject) - .then(function(res){ - if(res.status == 'OK'){ - $scope.modflag = false; - $scope.widgetParam[index].showEdit = false; - } - }); - - }; - } - } - WidgetParameterController.$inject = ['$scope', 'widgetsCatalogService', 'userProfileService']; - angular.module('ecompApp').controller('WidgetParameterController', WidgetParameterController); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; + +(function () { + class WidgetParameterController { + constructor($scope, widgetsCatalogService, userProfileService) { + let widgetId = $scope.ngDialogData.widgetId; + $scope.modflag = false; + $scope.isLoadingTable = false; + $scope.messageInfo = false; + + widgetsCatalogService.getWidgetCatalogParameters(widgetId).then(res => { + if(res.status == 'OK'){ + $scope.isLoadingTable = true; + $scope.widgetParam = res.response; + }else if(res.status == 'WARN'){ + $scope.messageInfo = true; + } + }).catch(err => { + $log.error('WidgetParameterController::init error: ' + err); + }) + + $scope.setEdit = function(index) { + if($scope.modflag === false){ + $scope.widgetParam[index].showEdit = true; + $scope.modflag = true; + } + } + + $scope.resetDefault = function(index) { + var widgetParamObject = {}; + widgetParamObject.user_value = $scope.widgetParam[parseInt(index)].default_value; + widgetParamObject.paramId = $scope.widgetParam[parseInt(index)].param_id; + widgetParamObject.widgetId = widgetId; + widgetsCatalogService.saveWidgetParameter(widgetParamObject) + .then(function(res){ + if(res.status == 'OK'){ + $scope.widgetParam[index].user_value = $scope.widgetParam[index].default_value; + } + }); + } + + $scope.modify = function(index) { + + var widgetParamObject = {}; + widgetParamObject.user_value = $scope.widgetParam[parseInt(index)].user_value; + widgetParamObject.paramId = $scope.widgetParam[parseInt(index)].param_id; + widgetParamObject.widgetId = widgetId; + + widgetsCatalogService.saveWidgetParameter(widgetParamObject) + .then(function(res){ + if(res.status == 'OK'){ + $scope.modflag = false; + $scope.widgetParam[index].showEdit = false; + } + }); + + }; + } + } + WidgetParameterController.$inject = ['$scope', 'widgetsCatalogService', 'userProfileService']; + angular.module('ecompApp').controller('WidgetParameterController', WidgetParameterController); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.less b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.less index ce63acd4..76521f9b 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.less +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameters.controller.less @@ -1,28 +1,28 @@ -.manage-widget-parameters-title{ - color: #067ab4; - font-family: "Omnes-ECOMP-W02", Arial;; - font-size: 24px; - margin-left: 30px; - width: 1170px; - margin-top: 20px; - margin-bottom: 10px; -} - -.manage-widget-parameters-table{ - margin: 30px; -} - -.manage-widget-parameters-table-details{ - height: 300px; - background-color: #ffffff; -} - -.manage-widget-parameters-header{ - margin-top: 20px; - margin-bottom: 20px; - height:20px; -} - -.ngdialog-content{ - width: 40%; +.manage-widget-parameters-title{ + color: #067ab4; + font-family: "Omnes-ECOMP-W02", Arial;; + font-size: 24px; + margin-left: 30px; + width: 1170px; + margin-top: 20px; + margin-bottom: 10px; +} + +.manage-widget-parameters-table{ + margin: 30px; +} + +.manage-widget-parameters-table-details{ + height: 300px; + background-color: #ffffff; +} + +.manage-widget-parameters-header{ + margin-top: 20px; + margin-bottom: 20px; + height:20px; +} + +.ngdialog-content{ + width: 40%; } \ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.js b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.js index fe0bf453..aff4e0c1 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.js +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget.controller.js @@ -1,422 +1,422 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; - -(function () { - class CommonWidgetController { - constructor(dashboardService, $scope, message, $q, $http, conf, $filter,confirmBoxService,$log) { - $scope.widgetType = message.type; - $scope.widgetTypeDisplay = message.type; - $scope.modflag = false; - - switch (message.type) { - case 'EVENTS': - $scope.widgetTypeDisplay = 'Events' - break; - case 'NEWS': - $scope.widgetTypeDisplay = 'News' - break; - case 'IMPORTANTRESOURCES': - $scope.widgetTypeDisplay = 'Resources' - break; - } - - $scope.widgetData = []; - dashboardService.getCommonWidgetData(message.type) - .then(function (res) { - // console.log('CommonWidgetController: result is ' + res); - $scope.widgetData = res.response.items; - }); - - - - $scope.setEdit = function(index) { - - //for(var i=0; i<$scope.widgetData ) - - if($scope.modflag === false){ - $scope.widgetData[index].showEdit = true; - $scope.modflag = true; - } - } - - $scope.modify = function(index) { - - $scope.widgetObject = {}; - $scope.widgetObject.id = $scope.widgetData[parseInt(index)].id; - $scope.widgetObject.category = $scope.widgetData[parseInt(index)].category; - $scope.widgetObject.title = $scope.widgetData[parseInt(index)].title; - $scope.widgetObject.href = $scope.widgetData[parseInt(index)].href; - $scope.widgetObject.eventDate = $scope.widgetData[parseInt(index)].eventDate; - $scope.widgetObject.content = $scope.widgetData[parseInt(index)].content; - $scope.widgetObject.sortOrder = $scope.widgetData[parseInt(index)].sortOrder; - - var validateMsg = $scope.validateWidgetObject($scope.widgetObject); - if (validateMsg) { - confirmBoxService.showInformation(validateMsg).then(isConfirmed => {return;}); - return; - } - - dashboardService.saveCommonWidgetData($scope.widgetObject) - .then(function(res){ - if (res.status == 'OK') { - dashboardService.getCommonWidgetData(message.type) - .then(function(res){ - $scope.widgetData = res.response.items; - $scope.modflag = false; - $scope.cancelEdit(index); - }); - } - else { - // Save failed - confirmBoxService.showInformation("Save failed").then(isConfirmed => {return;}); - return; - } - }); - - }; - - $scope.newWidgetObject = {}; - - // Answers string error if validation fails; - // answers null if all is well. - $scope.validateWidgetObject = function(wo) { - if (wo.title == null || wo.title == '') - return "Please enter a title."; - if (wo.href == null || wo.href == '' || !validateUrl(wo.href)) - return "Please enter a valid URL that starts with http."; - if (wo.sortOrder == null || wo.sortOrder == '' || isNaN(parseInt(wo.sortOrder))) - return "Please enter a number for the sort order."; - if (wo.category=='EVENTS') { - if (wo.eventDate == null || wo.eventDate == '') - return "Please enter a date for the event."; - // Parses and normalizes the date with rollover. - var filteredDate = $filter('date')(wo.eventDate, "yyyy-MM-dd"); - // $log.debug('dashboard-widget-controller: date filter yields ' + filteredDate); - // The date picker shows mm/dd/yy. - if (filteredDate == null || filteredDate.length != 10) - return "Please enter a valid date as YYYY-MM-DD"; - if (wo.content==null || wo.content=='') - return "Please enter content for the event."; - } - return null; - }; - - $scope.saveNew = function() { - $scope.newWidgetObject.category = message.type; - // $log.info($scope.newWidgetObject); - var validateMsg = $scope.validateWidgetObject($scope.newWidgetObject); - if (validateMsg) { - confirmBoxService.showInformation(validateMsg).then(isConfirmed => {return;}); - return; - } - // Transform date into expected storage format - $scope.newWidgetObject.eventDate = $filter('date')($scope.newWidgetObject.eventDate, "yyyy-MM-dd"); - - dashboardService.saveCommonWidgetData($scope.newWidgetObject) - .then(function(res){ - if (res.status == 'OK') { - $scope.widgetForm.$setPristine(); - confirmBoxService.showInformation('You have added a new item').then(isConfirmed => { - }); - dashboardService.getCommonWidgetData(message.type) - .then(function(res){ - $scope.widgetData = res.response.items; - $scope.newWidgetObject = {}; - }); - } - else { - confirmBoxService.showInformation("Save failed").then(isConfirmed => {return;}); - return; - } - }); - }; - - $scope.remove = function(index) { - var confirmMsg = 'Are you sure you want to delete this item from the list?' + ' Press OK to delete.'; - confirmBoxService.confirm(confirmMsg).then(function (confirmed) { - if (confirmed == true) { - $scope.widgetObject = {}; - $scope.widgetObject.id = $scope.widgetData[parseInt(index)].id; - $scope.widgetObject.category = $scope.widgetData[parseInt(index)].category; - $scope.widgetObject.title = $scope.widgetData[parseInt(index)].title; - $scope.widgetObject.href = $scope.widgetData[parseInt(index)].href; - $scope.widgetObject.sortOrder = $scope.widgetData[parseInt(index)].sortOrder; - - - dashboardService.removeCommonWidgetData($scope.widgetObject) - .then(function(res){ - dashboardService.getCommonWidgetData(message.type) - .then(function(res){ - $scope.widgetData = res.response.items; - $scope.cancelEdit(index); - }); - }); - } - }); - - }; - $scope.closeDialog = function(){ - $scope.closeThisDialog( $scope.widgetData); - } - $scope.deleteSpeedDial = function(widget){ - - } - - $scope.manage = function(index) { - $scope.modflag = true; - - var thisdata = $scope.widgetData[index]; - $scope.editMode=true; - var category = "#category"+index; - var categoryEdit = "#categoryEdit"+index; - - var title = "#title"+index; - var titleEdit = "#titleEdit"+index; - - var url = "#href"+index; - var urlEdit = "#hrefEdit"+index; - - var order = "#order"+index; - var orderEdit = "#orderEdit"+index; - - var eventDate = "#eventDate"+index; - var eventDateEdit = "#eventDateEdit"+index; - - - var dsavebutton ="#savebutton"+index; - var dremovebutton="#removebutton"+index; - var dmanagebutton="#managebutton"+index; - var deditRbutton="#editRbutton"+index; - - $(title).css('display', 'none'); - $(titleEdit).css('display', 'inherit'); - $(url).css('display', 'none'); - $(urlEdit).css('display', 'inherit'); - $(order).css('display', 'none'); - $(orderEdit).css('display', 'inherit'); - $(eventDate).css('display', 'none'); - $(eventDateEdit).css('display', 'inherit'); - - $(dsavebutton).css('display', 'inherit'); - $(dremovebutton).css('display', 'inherit'); - $(dmanagebutton).css('display', 'none'); - $(deditRbutton).css('display', 'inherit'); - - }; - - $scope.cancelEdit = function(index) { - - $scope.editMode=false; - var category = "#category"+index; - var categoryEdit = "#categoryEdit"+index; - - var title = "#title"+index; - var titleEdit = "#titleEdit"+index; - - var url = "#href"+index; - var urlEdit = "#hrefEdit"+index; - - var order = "#order"+index; - var orderEdit = "#orderEdit"+index; - - var eventDate = "#eventDate"+index; - var eventDateEdit = "#eventDateEdit"+index; - - var dsavebutton ="#savebutton"+index; - var dremovebutton ="#removebutton"+index; - var dmanagebutton="#managebutton"+index; - var deditRbutton="#editRbutton"+index; - - $(title).css('display', 'inherit'); - $(titleEdit).css('display', 'none'); - - $(url).css('display', 'inherit'); - $(urlEdit).css('display', 'none'); - - $(order).css('display', 'inherit'); - $(orderEdit).css('display', 'none'); - - $(eventDate).css('display', 'inherit'); - $(eventDateEdit).css('display', 'none'); - - $(dsavebutton).css('display', 'none'); - $(dremovebutton).css('display', 'none'); - $(dmanagebutton).css('display', 'inherit'); - $(deditRbutton).css('display', 'none'); - - }; - - $scope.popupConfirmWin = function(title, msgBody, callback){ - modalService.popupConfirmWin.apply(null, arguments); - }; - } - } - CommonWidgetController.$inject = ['dashboardService', '$scope', 'message', '$q', '$http', 'conf', '$filter','confirmBoxService','$log']; - angular.module('ecompApp').controller('CommonWidgetController', CommonWidgetController); -})(); - -angular.module('ecompApp').filter('cut', function () { - return function (value, wordwise, max, tail) { - if (!value) return ''; - - max = parseInt(max, 10); - if (!max) return value; - if (value.length <= max) return value; - - value = value.substr(0, max); - if (wordwise) { - var lastspace = value.lastIndexOf(' '); - if (lastspace != -1) { - //Also remove . and , so its gives a cleaner result. - if (value.charAt(lastspace-1) == '.' || value.charAt(lastspace-1) == ',') { - lastspace = lastspace - 1; - } - value = value.substr(0, lastspace); - } - } - - return value + (tail || ' …'); - }; -}); - -angular.module('ecompApp').controller('DatePickerController', function ($scope, uibDateParser) { - $scope.today = function() { - $scope.dt = new Date(); - }; - $scope.today(); - - $scope.clear = function() { - $scope.dt = null; - }; - - $scope.inlineOptions = { - customClass: getDayClass, - minDate: new Date(), - showWeeks: true - }; - - $scope.dateOptions = { - dateDisabled: disabled, - formatYear: 'yy', - minDate: new Date(), - startingDay: 1 - }; - - // Disable weekend selection - function disabled(data) { - var date = data.date, - mode = data.mode; - return mode === 'day' && (date.getDay() === 0 || date.getDay() === 6); - } - - $scope.toggleMin = function() { - $scope.inlineOptions.minDate = $scope.inlineOptions.minDate ? null : new Date(); - $scope.dateOptions.minDate = $scope.inlineOptions.minDate; - }; - - $scope.toggleMin(); - - $scope.open1 = function() { - // console.log('In open1'); - $scope.popup1.opened = true; - }; - - $scope.open2 = function() { - // console.log('In open2'); - $scope.popup2.opened = true; - }; - - - $scope.setDate = function(year, month, day) { - $scope.dt = new Date(year, month, day); - }; - - $scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate']; - $scope.format = $scope.formats[3]; - $scope.altInputFormats = ['M!/d!/yyyy']; - - $scope.popup1 = { - opened: false - }; - - $scope.popup2 = { - opened: false - }; - - var tomorrow = new Date(); - tomorrow.setDate(tomorrow.getDate() + 1); - var afterTomorrow = new Date(); - afterTomorrow.setDate(tomorrow.getDate() + 1); - $scope.events = [ - { - date: tomorrow, - status: 'full' - }, - { - date: afterTomorrow, - status: 'partially' - } - ]; - - function getDayClass(data) { - var date = data.date, - mode = data.mode; - if (mode === 'day') { - var dayToCheck = new Date(date).setHours(0,0,0,0); - - for (var i = 0; i < $scope.events.length; i++) { - var currentDay = new Date($scope.events[i].date).setHours(0,0,0,0); - - if (dayToCheck === currentDay) { - return $scope.events[i].status; - } - } - } - - return ''; - } -}); - - - -function toggleCollapsible(id, clickedIconId, subtitutingIconId){ - $("#"+id).toggle(); - $("#"+clickedIconId).toggle(); - $("#"+subtitutingIconId).toggle(); - setTimeout(function(){focusFirstEle(id);}, 1000); -} - -function focusFirstEle(id){ - var focusItems = $("#"+id).find(":focusable"); - for(var i=0; i {return;}); + return; + } + + dashboardService.saveCommonWidgetData($scope.widgetObject) + .then(function(res){ + if (res.status == 'OK') { + dashboardService.getCommonWidgetData(message.type) + .then(function(res){ + $scope.widgetData = res.response.items; + $scope.modflag = false; + $scope.cancelEdit(index); + }); + } + else { + // Save failed + confirmBoxService.showInformation("Save failed").then(isConfirmed => {return;}); + return; + } + }); + + }; + + $scope.newWidgetObject = {}; + + // Answers string error if validation fails; + // answers null if all is well. + $scope.validateWidgetObject = function(wo) { + if (wo.title == null || wo.title == '') + return "Please enter a title."; + if (wo.href == null || wo.href == '' || !validateUrl(wo.href)) + return "Please enter a valid URL that starts with http."; + if (wo.sortOrder == null || wo.sortOrder == '' || isNaN(parseInt(wo.sortOrder))) + return "Please enter a number for the sort order."; + if (wo.category=='EVENTS') { + if (wo.eventDate == null || wo.eventDate == '') + return "Please enter a date for the event."; + // Parses and normalizes the date with rollover. + var filteredDate = $filter('date')(wo.eventDate, "yyyy-MM-dd"); + // $log.debug('dashboard-widget-controller: date filter yields ' + filteredDate); + // The date picker shows mm/dd/yy. + if (filteredDate == null || filteredDate.length != 10) + return "Please enter a valid date as YYYY-MM-DD"; + if (wo.content==null || wo.content=='') + return "Please enter content for the event."; + } + return null; + }; + + $scope.saveNew = function() { + $scope.newWidgetObject.category = message.type; + // $log.info($scope.newWidgetObject); + var validateMsg = $scope.validateWidgetObject($scope.newWidgetObject); + if (validateMsg) { + confirmBoxService.showInformation(validateMsg).then(isConfirmed => {return;}); + return; + } + // Transform date into expected storage format + $scope.newWidgetObject.eventDate = $filter('date')($scope.newWidgetObject.eventDate, "yyyy-MM-dd"); + + dashboardService.saveCommonWidgetData($scope.newWidgetObject) + .then(function(res){ + if (res.status == 'OK') { + $scope.widgetForm.$setPristine(); + confirmBoxService.showInformation('You have added a new item').then(isConfirmed => { + }); + dashboardService.getCommonWidgetData(message.type) + .then(function(res){ + $scope.widgetData = res.response.items; + $scope.newWidgetObject = {}; + }); + } + else { + confirmBoxService.showInformation("Save failed").then(isConfirmed => {return;}); + return; + } + }); + }; + + $scope.remove = function(index) { + var confirmMsg = 'Are you sure you want to delete this item from the list?' + ' Press OK to delete.'; + confirmBoxService.confirm(confirmMsg).then(function (confirmed) { + if (confirmed == true) { + $scope.widgetObject = {}; + $scope.widgetObject.id = $scope.widgetData[parseInt(index)].id; + $scope.widgetObject.category = $scope.widgetData[parseInt(index)].category; + $scope.widgetObject.title = $scope.widgetData[parseInt(index)].title; + $scope.widgetObject.href = $scope.widgetData[parseInt(index)].href; + $scope.widgetObject.sortOrder = $scope.widgetData[parseInt(index)].sortOrder; + + + dashboardService.removeCommonWidgetData($scope.widgetObject) + .then(function(res){ + dashboardService.getCommonWidgetData(message.type) + .then(function(res){ + $scope.widgetData = res.response.items; + $scope.cancelEdit(index); + }); + }); + } + }); + + }; + $scope.closeDialog = function(){ + $scope.closeThisDialog( $scope.widgetData); + } + $scope.deleteSpeedDial = function(widget){ + + } + + $scope.manage = function(index) { + $scope.modflag = true; + + var thisdata = $scope.widgetData[index]; + $scope.editMode=true; + var category = "#category"+index; + var categoryEdit = "#categoryEdit"+index; + + var title = "#title"+index; + var titleEdit = "#titleEdit"+index; + + var url = "#href"+index; + var urlEdit = "#hrefEdit"+index; + + var order = "#order"+index; + var orderEdit = "#orderEdit"+index; + + var eventDate = "#eventDate"+index; + var eventDateEdit = "#eventDateEdit"+index; + + + var dsavebutton ="#savebutton"+index; + var dremovebutton="#removebutton"+index; + var dmanagebutton="#managebutton"+index; + var deditRbutton="#editRbutton"+index; + + $(title).css('display', 'none'); + $(titleEdit).css('display', 'inherit'); + $(url).css('display', 'none'); + $(urlEdit).css('display', 'inherit'); + $(order).css('display', 'none'); + $(orderEdit).css('display', 'inherit'); + $(eventDate).css('display', 'none'); + $(eventDateEdit).css('display', 'inherit'); + + $(dsavebutton).css('display', 'inherit'); + $(dremovebutton).css('display', 'inherit'); + $(dmanagebutton).css('display', 'none'); + $(deditRbutton).css('display', 'inherit'); + + }; + + $scope.cancelEdit = function(index) { + + $scope.editMode=false; + var category = "#category"+index; + var categoryEdit = "#categoryEdit"+index; + + var title = "#title"+index; + var titleEdit = "#titleEdit"+index; + + var url = "#href"+index; + var urlEdit = "#hrefEdit"+index; + + var order = "#order"+index; + var orderEdit = "#orderEdit"+index; + + var eventDate = "#eventDate"+index; + var eventDateEdit = "#eventDateEdit"+index; + + var dsavebutton ="#savebutton"+index; + var dremovebutton ="#removebutton"+index; + var dmanagebutton="#managebutton"+index; + var deditRbutton="#editRbutton"+index; + + $(title).css('display', 'inherit'); + $(titleEdit).css('display', 'none'); + + $(url).css('display', 'inherit'); + $(urlEdit).css('display', 'none'); + + $(order).css('display', 'inherit'); + $(orderEdit).css('display', 'none'); + + $(eventDate).css('display', 'inherit'); + $(eventDateEdit).css('display', 'none'); + + $(dsavebutton).css('display', 'none'); + $(dremovebutton).css('display', 'none'); + $(dmanagebutton).css('display', 'inherit'); + $(deditRbutton).css('display', 'none'); + + }; + + $scope.popupConfirmWin = function(title, msgBody, callback){ + modalService.popupConfirmWin.apply(null, arguments); + }; + } + } + CommonWidgetController.$inject = ['dashboardService', '$scope', 'message', '$q', '$http', 'conf', '$filter','confirmBoxService','$log']; + angular.module('ecompApp').controller('CommonWidgetController', CommonWidgetController); +})(); + +angular.module('ecompApp').filter('cut', function () { + return function (value, wordwise, max, tail) { + if (!value) return ''; + + max = parseInt(max, 10); + if (!max) return value; + if (value.length <= max) return value; + + value = value.substr(0, max); + if (wordwise) { + var lastspace = value.lastIndexOf(' '); + if (lastspace != -1) { + //Also remove . and , so its gives a cleaner result. + if (value.charAt(lastspace-1) == '.' || value.charAt(lastspace-1) == ',') { + lastspace = lastspace - 1; + } + value = value.substr(0, lastspace); + } + } + + return value + (tail || ' …'); + }; +}); + +angular.module('ecompApp').controller('DatePickerController', function ($scope, uibDateParser) { + $scope.today = function() { + $scope.dt = new Date(); + }; + $scope.today(); + + $scope.clear = function() { + $scope.dt = null; + }; + + $scope.inlineOptions = { + customClass: getDayClass, + minDate: new Date(), + showWeeks: true + }; + + $scope.dateOptions = { + dateDisabled: disabled, + formatYear: 'yy', + minDate: new Date(), + startingDay: 1 + }; + + // Disable weekend selection + function disabled(data) { + var date = data.date, + mode = data.mode; + return mode === 'day' && (date.getDay() === 0 || date.getDay() === 6); + } + + $scope.toggleMin = function() { + $scope.inlineOptions.minDate = $scope.inlineOptions.minDate ? null : new Date(); + $scope.dateOptions.minDate = $scope.inlineOptions.minDate; + }; + + $scope.toggleMin(); + + $scope.open1 = function() { + // console.log('In open1'); + $scope.popup1.opened = true; + }; + + $scope.open2 = function() { + // console.log('In open2'); + $scope.popup2.opened = true; + }; + + + $scope.setDate = function(year, month, day) { + $scope.dt = new Date(year, month, day); + }; + + $scope.formats = ['dd-MMMM-yyyy', 'yyyy/MM/dd', 'dd.MM.yyyy', 'shortDate']; + $scope.format = $scope.formats[3]; + $scope.altInputFormats = ['M!/d!/yyyy']; + + $scope.popup1 = { + opened: false + }; + + $scope.popup2 = { + opened: false + }; + + var tomorrow = new Date(); + tomorrow.setDate(tomorrow.getDate() + 1); + var afterTomorrow = new Date(); + afterTomorrow.setDate(tomorrow.getDate() + 1); + $scope.events = [ + { + date: tomorrow, + status: 'full' + }, + { + date: afterTomorrow, + status: 'partially' + } + ]; + + function getDayClass(data) { + var date = data.date, + mode = data.mode; + if (mode === 'day') { + var dayToCheck = new Date(date).setHours(0,0,0,0); + + for (var i = 0; i < $scope.events.length; i++) { + var currentDay = new Date($scope.events[i].date).setHours(0,0,0,0); + + if (dayToCheck === currentDay) { + return $scope.events[i].status; + } + } + } + + return ''; + } +}); + + + +function toggleCollapsible(id, clickedIconId, subtitutingIconId){ + $("#"+id).toggle(); + $("#"+clickedIconId).toggle(); + $("#"+subtitutingIconId).toggle(); + setTimeout(function(){focusFirstEle(id);}, 1000); +} + +function focusFirstEle(id){ + var focusItems = $("#"+id).find(":focusable"); + for(var i=0; i { - if(resourceType=='NEWS'){ - $scope.updateNews(); - }else if(resourceType=='EVENTS'){ - $scope.updateEvents(); - }else if(resourceType=='IMPORTANTRESOURCES'){ - $scope.updateImportRes(); - } - }); - }; - - $scope.editWidgetParameters = function(widgetId) { - let data = { - widgetId: widgetId - } - ngDialog.open({ - templateUrl : 'app/views/dashboard/dashboard-widget-parameter-manage.html', - controller : 'WidgetParameterController', - data: data - }).closePromise.then(needUpdate => { - - }); - }; - - $scope.sort_options = [ - {index: 0, value: 'N', title: 'Name'}, - {index: 1, value: 'L', title: 'Last used'}, - {index: 2, value: 'F', title: 'Most used'}, - {index: 3, value: 'M', title: 'Manual'} - ]; - - $scope.selectedSortTypeChanged = function(userAppSortTypePref) { - $scope.appsViewData = []; - $scope.appsView = []; - - $scope.sort_type = userAppSortTypePref; - - applicationsService - .getAppsOrderBySortPref(userAppSortTypePref) - .then(function(res) { - _this.apps = res; - $scope.applyPresentationDetailsToApps(_this.apps); - }) - applicationsService - .saveAppsSortTypePreference($scope.selectedSortType) - .then(function(res) { - // Nothing to do - }) - - } - $scope.$watch('selectedSortType.value', (newVal, oldVal) => { - for(var i=0;i<$scope.sort_options.length;i++){ - if($scope.sort_options[i].value==newVal){ - $scope.selectedSortType=angular.copy($scope.sort_options[i]);; - } - } - }); - - $scope.restoreSortSelected = function(){ - confirmBoxService.confirm("Restore the default size and position of all widgets?").then( - function(confirmed){ - var checkConfirm = confirmed; - if(checkConfirm === true){ - applicationsService - .delWidgetsSortPref($scope.widgetsViewData).then(function(){ - $state.reload(); - }); - } - }); - /* if(confirm('Restore the default size and position of all widgets?') == true) - { - applicationsService - .delWidgetsSortPref($scope.widgetsViewData).then(function(){ - $state.reload(); - }) - }*/ - - } - - $scope.applyPresentationDetailsToApps = function(appsReturned) { - var rowNo = 0; - for (var i = 0; i < _this.apps.length; i++) { - $scope.appsView[i] = { - sizeX : 1, - sizeY : 1, - headerText : '', - subHeaderText : '', - imageLink : '', - order : '', - url : '', - appid: '', - }; - $scope.appsView[i].headerText = appsReturned[i].name; - $scope.appsView[i].subHeaderText = appsReturned[i].notes; - let imgLnk = ''; - if (appsReturned[i].imageUrl) - imgLnk = conf.api.appThumbnail.replace(':appId', appsReturned[i].id); - //$log.debug('DashboardCtlr::applyPresn: imgLink = ' + imgLnk); - $scope.appsView[i].imageLink = imgLnk; - $scope.appsView[i].order = appsReturned[i].order; - $scope.appsView[i].url = appsReturned[i].url; - $scope.appsView[i].restrictedApp = appsReturned[i].restrictedApp; - $scope.appsView[i].appid = appsReturned[i].id; - } - $scope.appsView[_this.apps.length] = { - addRemoveApps : true, - sizeX : 1, - sizeY : 1, - headerText : 'Add/Remove Applications', - subHeaderText : '', - imageLink : 'assets/images/cloud.png', - order : '', - restrictedApp : false, - url : '', - }; - if($scope.appsView.length>6){ - $(".dashboard-boarder").css({ - "height" : "400px" - }); - }else{ - $(".dashboard-boarder").css({ - "height" : "210px" - }); - } - - if ($scope.appsView != undefined - && $scope.appsView != null - && $scope.appsView.length > 0) { - $scope.appsViewData = $scope.appsView; - } - } - -$scope.widgetsView = []; - - $scope.applyPresentationDetailsToWidgets = function(widgetsReturned){ - var rowNo = 0; - for (var i = 0; i < widgetsReturned.length; i++) { - $scope.widgetsView[i] = { - sizeX : '', - sizeY :'', - headerText:'', - widgetText:'', - widgetIdentifier : '', - url : '', - widgetid: '', - attrb:'', - row:'', - col:'', - }; - $scope.widgetsView[i].widgetid = widgetsReturned[i].id; - $scope.widgetsView[i].headerText = widgetsReturned[i].headerName; - $scope.widgetsView[i].widgetText = widgetsReturned[i].name; - - if(widgetsReturned[i].headerName.toLowerCase() === 'news'){ - $scope.widgetsView[i].widgetIdentifier = 'NEWS'; - } - else - if(widgetsReturned[i].headerName.toLowerCase() === 'resources'){ - $scope.widgetsView[i].widgetIdentifier = 'IMPORTANTRESOURCES'; - } - else - if(widgetsReturned[i].headerName.toLowerCase() === 'events'){ - $scope.widgetsView[i].widgetIdentifier = 'EVENTS'; - } - - $scope.widgetsView[i].url = widgetsReturned[i].url; - $scope.widgetsView[i].attrb = widgetsReturned[i].attrs; - if(widgetsReturned[i].width === null){ - $scope.widgetsView[i].sizeX = 2; - }else{ - $scope.widgetsView[i].sizeX = widgetsReturned[i].width; - } - if(widgetsReturned[i].height === null){ - $scope.widgetsView[i].sizeY = 2; - }else{ - $scope.widgetsView[i].sizeY = widgetsReturned[i].height; - } - $scope.widgetsView[i].row = widgetsReturned[i].x; - $scope.widgetsView[i].col = widgetsReturned[i].y; - } - if ($scope.widgetsView != undefined - && $scope.widgetsView != null - && $scope.widgetsView.length > 0) { - $scope.widgetsViewData = $scope.widgetsView; - } - } - - applicationsService - .getUserAppsSortTypePreference().then(function(res) { - var resJson = {}; - resJson.value = res; - if (resJson.value==="N" || resJson.value==="") { - resJson.index = 0; - resJson.title = 'Name'; - }else if (resJson.value==="L") { - resJson.index = 1; - resJson.title = 'Last used'; - }else if(resJson.value==="F"){ - resJson.index = 2; - resJson.title = 'Most used'; - }else { - resJson.index = 3; - resJson.title = 'Manual'; - } - $scope.selectedSortType = resJson; - $scope.selectedSortTypeChanged(res); - - - }); - - $scope.widgetsList = []; - - let getUserWidgets = (loginName) => { - var conf = this.conf; - widgetsCatalogService.getUserWidgets(loginName).then(res => { - if(!(res instanceof Array)){ - this.isCommError = true; - return; - } - for(var i = 0; i < res.length; i++){ - var widget_id = res[i][0]; - var widget_name = res[i][1]; - let url = this.conf.api.widgetCommon + "/" + widget_id + "/framework.js"; - var header_name = widget_name; - if(res[i][7] == 1){ - header_name = (widget_name.length > 9) ?widget_name.substring(0, 8) + '...' : widget_name; - } - if(res[i][4] === "S" || res[i][4] === null ){ - $scope.widgetsList.push({ - id: widget_id, - headerName: header_name, - name: widget_name, - url: url, - attrs: [{attr: 'data-' + res[i][0], value: ''}], - x: res[i][3], - y: res[i][5], - height: res[i][6], - width: res[i][7] - }); - } - var script = document - .createElement('script'); - script.src = url; - script.async = false; - var entry = document - .getElementsByTagName('script')[0]; - entry.parentNode - .insertBefore(script, entry); - } - $scope.applyPresentationDetailsToWidgets($scope.widgetsList); - }).catch(err => { - $log.error('WidgetsHomeCtrl::getUserWidgets error: ' + err); - }).finally(()=> { - - }); - }; - - userProfileService.getUserProfile().then( - function(profile) { - $scope.orgUserId = profile.orgUserId; - getUserWidgets($scope.orgUserId); - }); - - /* Widget Gridster Section */ - $scope.newsGridsterItem = { - sizeX : 1, - sizeY : 1, - headerText : 'News', - subHeaderText : '', - imageLink : '', - order : '', - url : '' - }; - - $scope.eventsGridsterItem = { - sizeX : 1, - sizeY : 1, - headerText : 'Events', - subHeaderText : '', - imageLink : '', - order : '', - url : '' - }; - - $scope.impoResGridsterItem = { - sizeX : 1, - sizeY : 1, - headerText : 'Resources', - subHeaderText : '', - imageLink : '', - order : '', - url : '' - }; - - this.gridsterAppOpts = { - columns : 6, - colWidth : 190, - rowHeight : 190, - margins : [ 20, 20 ], - outerMargin : true, - pushing : true, - floating : true, - swapping : true, - resizable: { - enabled: false, - }, - draggable : { - handle:'.icon-content-gridguide', - stop: function stop() { - $scope.defaultSortBy = function() { - var resJson = {}; - resJson.value = 'M'; - resJson.index = 3; - resJson.title = 'Manual'; - $scope.selectedSortType = resJson; - applicationsService.saveAppsSortTypeManual($scope.appsViewData) - applicationsService.saveAppsSortTypePreference($scope.selectedSortType) - } - $scope.defaultSortBy(); - } - } - }; - - this.gridsterWidgetOpts = { - columns : 6, - colWidth : 190, - rowHeight : 190, - margins : [ 20, 20 ], - outerMargin : true, - pushing : true, - floating : true, - swapping : true, - resizable: { - enabled: true, - stop: function stop(event, uiWidget, $element){ - if($element.sizeX == 1) - $element.headerText = ($element.widgetText.length > 9) ? $element.widgetText.substring(0, 8) + '...' : $element.widgetText; - if($element.sizeX >= 2) - $element.headerText = $element.widgetText; - - applicationsService - .saveWidgetsSortManual($scope.widgetsViewData) - - } - }, - draggable : { - handle:'.icon-content-gridguide', - stop: function stop(){ - applicationsService - .saveWidgetsSortManual($scope.widgetsViewData) - - } - } - }; - - this.goToCatalog = function(item) { - $state.go('root.appCatalog'); - } - - this.goToWidgetCatLog = function(item) { - $state.go('root.widgetCatalog'); - } - - // navigate to application url in new tab - this.goToPortal = function(item) { - if (!item.url) { - $log.error('No URL found for this application, doing nothing!'); - return; - } - if (item.restrictedApp) { - // Link-based apps open in their own browser tab - $window.open(item.url, '_blank'); - } else { - // cache control so browsers load app page every time - var ccParam = 'cc=' + new Date().getTime(); - var urlParts = item.url.split('#'); - var appUrl = null; - if (urlParts.length < 2) { - // no # - let urlLastChar = item.url.charAt(item.url.length - 1); - if (item.url.includes("?")) - appUrl = (urlLastChar === '&' ? item.url + ccParam : item.url + '&' + ccParam); - else - appUrl = item.url + '?' + ccParam; - } else { - // has # - let urlLastChar = urlParts[0].charAt(urlParts[0].length - 1); - if (item.url.includes("?")) - appUrl = (urlLastChar === '&' ? urlParts[0] + ccParam + '#' + urlParts[1] : urlParts[0] + '&' + ccParam + '#' + urlParts[1]); - else - appUrl = urlParts[0] + '?' + ccParam + "#" + urlParts[1]; - } - // $log.debug('DashboardCtrlr::goToPortal: opening tab with URL - // ' + appUrl); - var tabContent = { - id: new Date(), - title: item.headerText, - url: appUrl, - appId: item.appId - }; - $cookies.putObject('addTab', tabContent); - } - - }; - - this.auditLog = function(app) { - console.log(app); - auditLogService.storeAudit(app.appid,'app',app.url); - }; - - if (getParameterByName('noUserError') != null) { - if (getParameterByName('noUserError') == "Show") { - $("#errorInfo").show(); - } - } - }; - - DashboardCtrl.$inject = [ 'conf', 'applicationsService', '$log', '$window', - 'userProfileService', '$scope', '$cookies', '$timeout', '$interval', - '$modal', '$state', 'beReaderService', 'dashboardService', 'confirmBoxService', - 'auditLogService', 'ngDialog', '$compile', 'widgetsCatalogService' ]; - angular.module('ecompApp').controller('DashboardCtrl', DashboardCtrl); -})(); - -function getParameterByName(name, url) { - if (!url) - url = window.location.href; - name = name.replace(/[\[\]]/g, "\\$&"); - var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"), results = regex - .exec(url); - if (!results) - return ''; - if (!results[2]) - return ''; - return results[2].replace(/\+/g, " "); -} +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; + +function _classCallCheck(instance, Constructor) { + if (!(instance instanceof Constructor)) { + throw new TypeError('Cannot call a class as a function'); + } +} + +(function() { + var HTTP_PROTOCOL_RGX = /https?:\/\//; + + var DashboardCtrl = function DashboardCtrl(conf, applicationsService, $log, + $window, userProfileService, $scope, $cookies, $timeout, $interval, + $modal, $state, beReaderService, dashboardService, confirmBoxService, + auditLogService,ngDialog, $compile, widgetsCatalogService) { + + this.conf = conf; + var _this = this; + + _classCallCheck(this, DashboardCtrl); + + // activate spinner + this.isLoading = true; + this.isCommError = false; + $scope.getUserAppsIsDone = false; + this.userProfileService = userProfileService; + $scope.demoNum = 1; + $scope.event_content_show = false; + $scope.widgetData = []; + $scope.activateThis = function(ele){ + $compile(ele.contents())($scope); + $scope.$apply(); + }; + + $scope.editWidgetModalPopup = function(availableData, resourceType) { + $scope.editData = JSON.stringify(availableData); + $scope.availableDataTemp = $scope.availableData; + ngDialog.open({ + templateUrl : 'app/views/dashboard/dashboard-widget-manage.html', + controller : 'CommonWidgetController', + resolve : { + message : function message() { + var message = { + type : resourceType, + availableData : $scope.editData + }; + return message; + } + } + }).closePromise.then(needUpdate => { + if(resourceType=='NEWS'){ + $scope.updateNews(); + }else if(resourceType=='EVENTS'){ + $scope.updateEvents(); + }else if(resourceType=='IMPORTANTRESOURCES'){ + $scope.updateImportRes(); + } + }); + }; + + $scope.editWidgetParameters = function(widgetId) { + let data = { + widgetId: widgetId + } + ngDialog.open({ + templateUrl : 'app/views/dashboard/dashboard-widget-parameter-manage.html', + controller : 'WidgetParameterController', + data: data + }).closePromise.then(needUpdate => { + + }); + }; + + $scope.sort_options = [ + {index: 0, value: 'N', title: 'Name'}, + {index: 1, value: 'L', title: 'Last used'}, + {index: 2, value: 'F', title: 'Most used'}, + {index: 3, value: 'M', title: 'Manual'} + ]; + + $scope.selectedSortTypeChanged = function(userAppSortTypePref) { + $scope.appsViewData = []; + $scope.appsView = []; + + $scope.sort_type = userAppSortTypePref; + + applicationsService + .getAppsOrderBySortPref(userAppSortTypePref) + .then(function(res) { + _this.apps = res; + $scope.applyPresentationDetailsToApps(_this.apps); + }) + applicationsService + .saveAppsSortTypePreference($scope.selectedSortType) + .then(function(res) { + // Nothing to do + }) + + } + $scope.$watch('selectedSortType.value', (newVal, oldVal) => { + for(var i=0;i<$scope.sort_options.length;i++){ + if($scope.sort_options[i].value==newVal){ + $scope.selectedSortType=angular.copy($scope.sort_options[i]);; + } + } + }); + + $scope.restoreSortSelected = function(){ + confirmBoxService.confirm("Restore the default size and position of all widgets?").then( + function(confirmed){ + var checkConfirm = confirmed; + if(checkConfirm === true){ + applicationsService + .delWidgetsSortPref($scope.widgetsViewData).then(function(){ + $state.reload(); + }); + } + }); + /* if(confirm('Restore the default size and position of all widgets?') == true) + { + applicationsService + .delWidgetsSortPref($scope.widgetsViewData).then(function(){ + $state.reload(); + }) + }*/ + + } + + $scope.applyPresentationDetailsToApps = function(appsReturned) { + var rowNo = 0; + for (var i = 0; i < _this.apps.length; i++) { + $scope.appsView[i] = { + sizeX : 1, + sizeY : 1, + headerText : '', + subHeaderText : '', + imageLink : '', + order : '', + url : '', + appid: '', + }; + $scope.appsView[i].headerText = appsReturned[i].name; + $scope.appsView[i].subHeaderText = appsReturned[i].notes; + let imgLnk = ''; + if (appsReturned[i].imageUrl) + imgLnk = conf.api.appThumbnail.replace(':appId', appsReturned[i].id); + //$log.debug('DashboardCtlr::applyPresn: imgLink = ' + imgLnk); + $scope.appsView[i].imageLink = imgLnk; + $scope.appsView[i].order = appsReturned[i].order; + $scope.appsView[i].url = appsReturned[i].url; + $scope.appsView[i].restrictedApp = appsReturned[i].restrictedApp; + $scope.appsView[i].appid = appsReturned[i].id; + } + $scope.appsView[_this.apps.length] = { + addRemoveApps : true, + sizeX : 1, + sizeY : 1, + headerText : 'Add/Remove Applications', + subHeaderText : '', + imageLink : 'assets/images/cloud.png', + order : '', + restrictedApp : false, + url : '', + }; + if($scope.appsView.length>6){ + $(".dashboard-boarder").css({ + "height" : "400px" + }); + }else{ + $(".dashboard-boarder").css({ + "height" : "210px" + }); + } + + if ($scope.appsView != undefined + && $scope.appsView != null + && $scope.appsView.length > 0) { + $scope.appsViewData = $scope.appsView; + } + } + +$scope.widgetsView = []; + + $scope.applyPresentationDetailsToWidgets = function(widgetsReturned){ + var rowNo = 0; + for (var i = 0; i < widgetsReturned.length; i++) { + $scope.widgetsView[i] = { + sizeX : '', + sizeY :'', + headerText:'', + widgetText:'', + widgetIdentifier : '', + url : '', + widgetid: '', + attrb:'', + row:'', + col:'', + }; + $scope.widgetsView[i].widgetid = widgetsReturned[i].id; + $scope.widgetsView[i].headerText = widgetsReturned[i].headerName; + $scope.widgetsView[i].widgetText = widgetsReturned[i].name; + + if(widgetsReturned[i].headerName.toLowerCase() === 'news'){ + $scope.widgetsView[i].widgetIdentifier = 'NEWS'; + } + else + if(widgetsReturned[i].headerName.toLowerCase() === 'resources'){ + $scope.widgetsView[i].widgetIdentifier = 'IMPORTANTRESOURCES'; + } + else + if(widgetsReturned[i].headerName.toLowerCase() === 'events'){ + $scope.widgetsView[i].widgetIdentifier = 'EVENTS'; + } + + $scope.widgetsView[i].url = widgetsReturned[i].url; + $scope.widgetsView[i].attrb = widgetsReturned[i].attrs; + if(widgetsReturned[i].width === null){ + $scope.widgetsView[i].sizeX = 2; + }else{ + $scope.widgetsView[i].sizeX = widgetsReturned[i].width; + } + if(widgetsReturned[i].height === null){ + $scope.widgetsView[i].sizeY = 2; + }else{ + $scope.widgetsView[i].sizeY = widgetsReturned[i].height; + } + $scope.widgetsView[i].row = widgetsReturned[i].x; + $scope.widgetsView[i].col = widgetsReturned[i].y; + } + if ($scope.widgetsView != undefined + && $scope.widgetsView != null + && $scope.widgetsView.length > 0) { + $scope.widgetsViewData = $scope.widgetsView; + } + } + + applicationsService + .getUserAppsSortTypePreference().then(function(res) { + var resJson = {}; + resJson.value = res; + if (resJson.value==="N" || resJson.value==="") { + resJson.index = 0; + resJson.title = 'Name'; + }else if (resJson.value==="L") { + resJson.index = 1; + resJson.title = 'Last used'; + }else if(resJson.value==="F"){ + resJson.index = 2; + resJson.title = 'Most used'; + }else { + resJson.index = 3; + resJson.title = 'Manual'; + } + $scope.selectedSortType = resJson; + $scope.selectedSortTypeChanged(res); + + + }); + + $scope.widgetsList = []; + + let getUserWidgets = (loginName) => { + var conf = this.conf; + widgetsCatalogService.getUserWidgets(loginName).then(res => { + if(!(res instanceof Array)){ + this.isCommError = true; + return; + } + for(var i = 0; i < res.length; i++){ + var widget_id = res[i][0]; + var widget_name = res[i][1]; + let url = this.conf.api.widgetCommon + "/" + widget_id + "/framework.js"; + var header_name = widget_name; + if(res[i][7] == 1){ + header_name = (widget_name.length > 9) ?widget_name.substring(0, 8) + '...' : widget_name; + } + if(res[i][4] === "S" || res[i][4] === null ){ + $scope.widgetsList.push({ + id: widget_id, + headerName: header_name, + name: widget_name, + url: url, + attrs: [{attr: 'data-' + res[i][0], value: ''}], + x: res[i][3], + y: res[i][5], + height: res[i][6], + width: res[i][7] + }); + } + var script = document + .createElement('script'); + script.src = url; + script.async = false; + var entry = document + .getElementsByTagName('script')[0]; + entry.parentNode + .insertBefore(script, entry); + } + $scope.applyPresentationDetailsToWidgets($scope.widgetsList); + }).catch(err => { + $log.error('WidgetsHomeCtrl::getUserWidgets error: ' + err); + }).finally(()=> { + + }); + }; + + userProfileService.getUserProfile().then( + function(profile) { + $scope.orgUserId = profile.orgUserId; + getUserWidgets($scope.orgUserId); + }); + + /* Widget Gridster Section */ + $scope.newsGridsterItem = { + sizeX : 1, + sizeY : 1, + headerText : 'News', + subHeaderText : '', + imageLink : '', + order : '', + url : '' + }; + + $scope.eventsGridsterItem = { + sizeX : 1, + sizeY : 1, + headerText : 'Events', + subHeaderText : '', + imageLink : '', + order : '', + url : '' + }; + + $scope.impoResGridsterItem = { + sizeX : 1, + sizeY : 1, + headerText : 'Resources', + subHeaderText : '', + imageLink : '', + order : '', + url : '' + }; + + this.gridsterAppOpts = { + columns : 6, + colWidth : 190, + rowHeight : 190, + margins : [ 20, 20 ], + outerMargin : true, + pushing : true, + floating : true, + swapping : true, + resizable: { + enabled: false, + }, + draggable : { + handle:'.icon-content-gridguide', + stop: function stop() { + $scope.defaultSortBy = function() { + var resJson = {}; + resJson.value = 'M'; + resJson.index = 3; + resJson.title = 'Manual'; + $scope.selectedSortType = resJson; + applicationsService.saveAppsSortTypeManual($scope.appsViewData) + applicationsService.saveAppsSortTypePreference($scope.selectedSortType) + } + $scope.defaultSortBy(); + } + } + }; + + this.gridsterWidgetOpts = { + columns : 6, + colWidth : 190, + rowHeight : 190, + margins : [ 20, 20 ], + outerMargin : true, + pushing : true, + floating : true, + swapping : true, + resizable: { + enabled: true, + stop: function stop(event, uiWidget, $element){ + if($element.sizeX == 1) + $element.headerText = ($element.widgetText.length > 9) ? $element.widgetText.substring(0, 8) + '...' : $element.widgetText; + if($element.sizeX >= 2) + $element.headerText = $element.widgetText; + + applicationsService + .saveWidgetsSortManual($scope.widgetsViewData) + + } + }, + draggable : { + handle:'.icon-content-gridguide', + stop: function stop(){ + applicationsService + .saveWidgetsSortManual($scope.widgetsViewData) + + } + } + }; + + this.goToCatalog = function(item) { + $state.go('root.appCatalog'); + } + + this.goToWidgetCatLog = function(item) { + $state.go('root.widgetCatalog'); + } + + // navigate to application url in new tab + this.goToPortal = function(item) { + userProfileService.getUserRolesForApplication($scope.orgUserId,item.appid) + .then(res=>{ + var count = 0; + for(var i=0;i0 && res.length == count)||res.length==0) + { + confirmBoxService.showInformation('You have no roles assigned to this application to access.').then(isConfirmed => {}); + + } + else{ + if (!item.url) { + $log.error('No URL found for this application, doing nothing!'); + return; + } + if (item.restrictedApp) { + // Link-based apps open in their own browser tab + $window.open(item.url, '_blank'); + } else { + // cache control so browsers load app page every time + var ccParam = 'cc=' + new Date().getTime(); + var urlParts = item.url.split('#'); + var appUrl = null; + if (urlParts.length < 2) { + // no # + let urlLastChar = item.url.charAt(item.url.length - 1); + if (item.url.includes("?")) + appUrl = (urlLastChar === '&' ? item.url + ccParam : item.url + '&' + ccParam); + else + appUrl = item.url + '?' + ccParam; + } else { + // has # + let urlLastChar = urlParts[0].charAt(urlParts[0].length - 1); + if (item.url.includes("?")) + appUrl = (urlLastChar === '&' ? urlParts[0] + ccParam + '#' + urlParts[1] : urlParts[0] + '&' + ccParam + '#' + urlParts[1]); + else + appUrl = urlParts[0] + '?' + ccParam + "#" + urlParts[1]; + } + // $log.debug('DashboardCtrlr::goToPortal: opening tab with URL + // ' + appUrl); + var tabContent = { + id: new Date(), + title: item.headerText, + url: appUrl, + appId: item.appId + }; + $cookies.putObject('addTab', tabContent); + } + + } + }); + + + + + }; + + this.auditLog = function(app) { + console.log(app); + auditLogService.storeAudit(app.appid,'app',app.url); + }; + + if (getParameterByName('noUserError') != null) { + if (getParameterByName('noUserError') == "Show") { + $("#errorInfo").show(); + } + } + }; + + DashboardCtrl.$inject = [ 'conf', 'applicationsService', '$log', '$window', + 'userProfileService', '$scope', '$cookies', '$timeout', '$interval', + '$modal', '$state', 'beReaderService', 'dashboardService', 'confirmBoxService', + 'auditLogService', 'ngDialog', '$compile', 'widgetsCatalogService' ]; + angular.module('ecompApp').controller('DashboardCtrl', DashboardCtrl); +})(); + +function getParameterByName(name, url) { + if (!url) + url = window.location.href; + name = name.replace(/[\[\]]/g, "\\$&"); + var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"), results = regex + .exec(url); + if (!results) + return ''; + if (!results[2]) + return ''; + return results[2].replace(/\+/g, " "); +} diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less index bf6530b4..ac2a3cba 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.less @@ -1,901 +1,910 @@ -.w-ecomp-dashboard-home { - .bg_portalWhite;//white for 1702 - position: @page-main-position; - top: @page-main-top; - left: @page-main-left; - right: @page-main-right; - bottom: @page-main-bottom; - padding-top: @padding-top; - overflow-y: @page-main-overflow-y; - padding-left: @padding-left-side; - - .gridster-item-container .gridster-item-body { - overflow-y:auto; - overflow-x:hidden; - } - - .dashboard-home-container { - position: relative; - padding-right: 0; - padding-left: 0; - padding-bottom: @container-bottom; - - .dashboard-home-title { - .blackText24m; - margin: auto; - .content_justify; - } - - .portals-list { - min-height: 70vh; - //display: flex; - justify-content: center; - flex-flow: row wrap; - width: @table-width; - //margin-left: 230px; - margin-bottom: 63px; - margin:auto; - .app-gridster-header { - background-color: @u; - font-size:12px; - overflow:hidden - } - - .app-gridster-footer { - background-color: @u; - } - - .portals-list-item { - background-color: @u; - border-radius: 2px; - box-shadow: 0px -1px 2px 0px rgba(0, 0, 0, 0.1); - display: inline-block; - width: 360px; - height: 300px; - background-size: cover; - cursor: pointer; - margin: 15px; - overflow: hidden; - - .portals-item-info { - background-color: @u; - height: 120px; - top: 180px; - position: relative; - box-shadow: 0px -1px 2px 0px rgba(0, 0, 0, 0.1); - padding: 16px; - - .info-title { - .blackText24m; - margin-bottom: 4px; - - text-overflow: ellipsis; - overflow: hidden; - } - .info-description { - .portalDBlue16r; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - } - .info-button { - .btn-green; - width: 96px; - position: absolute; - bottom: 16px; - left: 16px; - } - - &:hover { - opacity: .93; - z-index: 3; - } - } - } - } - } -} -.w-ecomp-main-error{ - .portalRed; - position: absolute; - width: 100%; - line-height: 1.5em; -} -.w-ecomp-main-disclaimer { - text-align: center; - .dGray14r; - //position: absolute; - bottom: -75px; - line-height: 1.5em; - margin: 0 auto; - width:1170px; - position: relative; - -} - -@keyframes fadein { - from { - opacity: 0; - } - to { - opacity: 1; - } -} - -.slide.ng-hide-add, -.slide.ng-hide-remove, -.slide.ng-enter, -.slide.ng-leave { - transition: all 0.5s ease; -} -.slide.ng-hide, -.slide.ng-enter { - transform: translate(-100%, 0); -} -.slide.ng-enter-active { - transform: translate(0, 0); -} -.slide.ng-leave { - transform: translate(0, 0); -} -.slide.ng-leave-active { - transform: translate(+100%, 0); -} -.dashboard-boarder{ - // border: 2px solid #ccc!important; - // border-radius: 16px!important; - height: 210px; - overflow: auto; -} -.dashboard-information-boarder{ - border: 2px solid #ccc!important; - border-radius: 16px!important; -} - -#information-section { - margin-top:50px; -} - -.information-section-title{ - color: #0574ac; - font-family: Omnes-ECOMP-W02-Bold,Arial; - font-size: 25px; - margin: 20px; - width: 1170px; -} -#left { - float: left; - width: 33%; - height:300px; - background-color: white; -} - -#center { - float: right; - width: 33%; - height:300px; - background: white; -} -#right { - margin-left:34%; - margin-right:34%; - height:300px; - background:white; -} - - -/*hover*/ - - -.dock ul{ -display: inline-block; - -width: auto; -margin: 0px; -padding: 0px; -list-style: none; - -} -.dock ul li { -width: auto; -height: auto; -display: inline-block; -bottom: 0; -vertical-align: bottom; -margin-top: -43px; -} -.dock ul li a { -display: block; -height: 150px; -width: 150px; -position: relative; --webkit-transition-property: width, height,margin-top; --webkit-transition-duration: 0.5s; --o-transition-property: width, height,margin-top; --o-transition-duration: 0.5s; --moz-transition-property: width, height,margin-top; --moz-transition-duration: 0.5s; -} -.dock ul li a:hover { -width: 200px; -height: 200px; -margin-top: -50px; -} -.dock ul li a img { -width: 100%; -position: absolute; -bottom: 0; -left: 0; -border: none; -padding: 0px 0px 0px 30px; -} -.dock_left{ -width: 31px; --webkit-transform: rotate(33deg); --moz-transform: rotate(33deg); --o-transform: rotate(33deg); -position: relative; -background: #EEE; -overflow: hidden; -float: left; -height: 100px; -z-index: 2; -margin: -18px; -} -.dock_right{ -width: 36px; --webkit-transform: rotate(-33deg); --moz-transform: rotate(-33deg); --o-transform: rotate(-33deg); -position: relative; -background: #EEE; -overflow: hidden; -float: left; -height: 100px; -z-index: 2; -margin: -18px; -} - - - - -/*Time for the CSS*/ -* {margin: 0; padding: 0;} -body {background: #ccc;} - -.slider{ - width: 640px; /*Same as width of the large image*/ - position: relative; - /*Instead of height we will use padding*/ - padding-top: 320px; /*That helps bring the labels down*/ - - margin: 50px auto; - - /*Lets add a shadow*/ - box-shadow: 0 10px 20px -5px rgba(0, 0, 0, 0.75); -} - - -/*Last thing remaining is to add transitions*/ -.slider>img{ - position: absolute; - left: 0; top: 0; - transition: all 0.5s; -} - -.slider input[name='slide_switch'] { - display: none; -} - -.slider label { - /*Lets add some spacing for the thumbnails*/ - margin: 18px 0 0 18px; - border: 3px solid #999; - - float: left; - cursor: pointer; - transition: all 0.5s; - - /*Default style = low opacity*/ - opacity: 0.6; -} - -.slider label img{ - display: block; -} - -/*Time to add the click effects*/ -.slider input[name='slide_switch']:checked+label { - border-color: #666; - opacity: 1; -} -/*Clicking any thumbnail now should change its opacity(style)*/ -/*Time to work on the main images*/ -.slider input[name='slide_switch'] ~ img { - opacity: 0; - transform: scale(1.1); -} -/*That hides all main images at a 110% size -On click the images will be displayed at normal size to complete the effect -*/ -.slider input[name='slide_switch']:checked+label+img { - opacity: 1; - transform: scale(1); -} -/*Clicking on any thumbnail now should activate the image related to it*/ - -/*We are done :)*/ - - - -.accordion { - width: 895px; height: 320px; - overflow: hidden; - box-shadow: 0 10px 6px -6px #111; - margin: 20px auto -} -.accordion ul { width: 200% } - -.accordion li { - position: relative; - display: block; - width: 160px; - float: left; - box-shadow: 0 0 30px 8px #222; - transition: all 0.4s ease .300ms; -} - -.accordion ul:hover li {width: 40px } -.accordion ul li:hover {width: 640px } - -.caption { - background: rgba(0, 0, 0, 0.5); - position: absolute; - bottom: 0; - width: 640px -} - -.caption a { - display: block; - color: #fff; - text-decoration: none; - font: normal 16px 'Lato', Helvetica, Arial, sans-serif; - -webkit-font-smoothing: antialiased; - padding: 15px; -} - - -/*events*/ -.events-date{ - margin-left: 10px; - float:left; - white-space: normal; - display: inline-block; - vertical-align: middle; - width: 55px; -} -.event-title-div{ - float: left; - width: 235px; - line-height: 20px; - padding: 5px; - font-size: 14px; - margin-left: 4px; -} -.events-date{ - height: 20px; - margin-left: 4px; - font-size: 14px; -} -.events-content{ - font-size: 14px; - color: #444; - margin-right: 10px; -} -.events-content-body{ - margin-top:5px; - color:#444; - margin-left:12px; - line-height:1.5; -} -.events { - border-radius: 4px; - padding: 3px; - -webkit-user-select: none; -} -.events ul { - float: left; - width:100%; - -webkit-user-select: none -} -.events ul li { - line-height: 30px; - list-style: none; - border-bottom: 2px solid grey; - height: 100%; - min-height: 42px; -} -.events ul li:hover { - background: #ddd; - cursor: pointer; -} -.events ul li a { - color: black; - text-decoration: none; - font: 14px Helvetica, Arial, sans-serif; - -webkit-font-smoothing: antialiased; - -webkit-user-select: none; - font-family: "Omnes-ECOMP-W02", Arial; -} -.events-link{ - color: #067ab4 !important; -} - - -/*widgets*/ - -.handle-e{ - width: 5px; -} - -.singleBtnBorder { - border-radius: 6px 6px 6px 6px; -} - -.widgetHeaderBtn{ - - height: 30px; - background-color: #FFFFFF; - position: relative; - display: inline-block; - -moz-background-clip: padding-box; - -webkit-background-clip: padding-box; - background-clip: padding-box; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - padding: 8px 20px; - font-size: 14px; - line-height: 14px; - min-width: 60px; - border: none; - border-radius: 6px; - background-color: #ffffff; - background-image: none; - color: #ffffff; - vertical-align: middle; - text-align: center; - text-decoration: none; - text-transform: capitalize; - text-shadow: none !important; - white-space: nowrap; - cursor: pointer; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - -o-user-select: none; - user-select: none; - -webkit-transition: background-color 0.3s ease-out; - -moz-transition: background-color 0.3s ease-out; - transition: background-color 0.3s ease-out; - } - -.widgetHeaderBtnPosition { - width: 30px; - min-width: 0px; - border: 1px solid #AAAAAA; - padding-left: 3px; - padding-right: 5px; - } - -.icon-anchor { - color: #888; -} - -.widgetHeaderBtn:hover, .widgetHeaderBtn:focus { - background: rgba(0, 0, 0, 0); - color: #3a7999; - box-shadow: inset 0 0 0 2px #3a7999; -} -/*news*/ - -@keyframes ticker { - 0% {margin-top: 0} - 25% {margin-top: -55px} - 50% {margin-top: -110px} - 75% {margin-top: -165px} - 100% {margin-top: 0} -} - -body { background: #333; width: 100%; height: 100% } - -.news { - - width: 350px; - height: 250px; - margin: 0px auto; - // overflow: auto; - border-radius: 4px; - padding: 3px; - -webkit-user-select: none; - -} - - - -.news ul { - float: left; - width:100%; - // animation: ticker 25s cubic-bezier(1, 0, .5, 0) infinite; - -webkit-user-select: none -} - -.news ul li {line-height: 30px; list-style: none; - border-bottom: 2px solid grey; - min-height: 42px; - } - -.news ul li:hover { - background: #ddd; - cursor: pointer; -} - -.news ul li a { - color: black; - text-decoration: none; - font-size: 14px; - line-height: 1.5; - display: inline-block; - width:100%; - min-height:40px; - padding-top: 5px; - padding-bottom: 5px; - -webkit-font-smoothing: antialiased; - -webkit-user-select: none; -} - -.news ul:hover { animation-play-state: paused } -.news span:hover+ul { animation-play-state: paused } -/*resources*/ -.resources { - - width: 100%; - height: 200px; - margin-left: 5px; - border-radius: 4px; - padding: 3px; - -webkit-user-select: none; - -} - - - -.resources ul { - float: left; - width:100%; - - -webkit-user-select: none -} - -.resources ul li {line-height: 30px; list-style: none; - border-bottom: 2px solid grey; - min-height: 42px; - } - -.resources ul li:hover { - background: #ddd; - cursor: pointer; -} - -.resources ul li a { - color: black; - text-decoration: none; - font-size: 14px; - line-height: 1.5; - width:100%; - min-height:40px; - display: inline-block; - padding-top: 5px; - padding-bottom: 5px; - -webkit-font-smoothing: antialiased; - -webkit-user-select: none; -} - - -/* OTHER COLORS */ -.blue { background: #347fd0 } -.blue span { background: #2c66be } -.red { background: #d23435 } -.red span { background: #c22b2c } -.green { background: #699B67 } -.green span { background: #547d52 } -.magenta { background: #b63ace } -.magenta span { background: #842696 } - - -/*broadcast*/ - -.box-one { - -webkit-transition:all linear 0.4s; - transition:all linear 0.4s; - height:100px; width:200px; background:white; border: 2px solid #ccc!important; - border-radius: 16px!important; -} -.box-one.ng-hide { -display: block!important; - opacity:0; -} - -.gridsterContent{ - height:120px; -} - -.gridster-item{ - z-index:0 !important; -} -.gridsterAppContent{ - height:120px; - -} - - .gridsterImage{ - height:84px; - width:168px; - } - .grider-content-ecomp{ - transition: transform 0.5s ease-out; - } - .grider-content-ecomp:hover{ - transform: scale(1.1); -} - - -/*information section*/ - -.information-section{ - /*margin-top:25px;*/ -} -.information-section-gridsterContent{ - /*height:300px;*/ -} -.information-sections-gridster-header{ - color: #0574ac; - font-family: Omnes-ECOMP-W02-Bold,Arial; - font-size: 25px; - -} -/*application empty div*/ -.app-error-block { - padding-top: 10px; - -} -/*news empty div*/ -.activity-error-block { - padding-top: 60px; - -} - -.activity-error-msg1{ - text-align: center; - margin-top: 20px; - font-family: "Omnes-ECOMP-W02", Arial; - color: #444; - font-size: 20px; - -} - -.newstape { - background: white; - color: black; - height: 400px; - overflow: hidden; -} - -.newstape-content { - position: relative; - padding: 15px; -} - -.newstape-drag { cursor: ns-resize; } - -.text-center { text-align: center; } - -.text-right { text-align: right; } - -.text-justify { text-align: justify; } - -// #newsContainer{ -// overflow:auto; -// height: 100%; -// } - -/*widget header*/ -.optionsMenu{ - position: absolute; - list-style: none; - top: 25px; - right: 10px; - border: 1px solid #067ab4; - display: none; - z-index: 2; - border-radius: 6px 0px 6px 6px; - background: #fff; - width: 130px; -} - -.optionsMenuLink { - position: relative; - padding-left: 8px; - padding-right: 2px; - font-size: 12px; - line-height: 30px; - color: #444444; -} -.optionsMenu > li:hover a { - color: #ffffff !important; -} -.optionsMenu > li { - width: 100%; - text-align: left; -} -.optionsMenu > li:hover { - background-color: #0faaf7; - border-color: none !important; - cursor: pointer; -} - -.dashboardSortHeader{ - margin-left: 756px; -} - -#dashboardAddWidgetPreference{ - display: inline-block; - font-size: 14px; - color: #3e3e3e; - width: 69%; - text-align: center; - padding: 15px 0px 15px 0px; - font-family: "Omnes-ECOMP-W02", Arial; -} - -#dashboardAddWidgetPreference:hover{ - background-color: #0568ae; - color:white !important; -} - -#dashboardDefaultPreference{ - display: inline-block; - font-size: 14px; - color: #3e3e3e; - width: 30%; - text-align: center; - padding: 15px 0px 15px 0px; - font-family: "Omnes-ECOMP-W02", Arial; -} - -#dashboardDefaultPreference:hover{ - background-color: #0568ae; - color:white !important; -} - -.simulateGridHeader{ - position: relative; - height: 50px !important; - border: 1px solid #d3d3d3; - border-bottom: 0; - background-color: #E5E5E5; - white-space: nowrap; - text-overflow: ellipsis; - z-index: 1; -} - -.simulateGridHeaderTitle{ - line-height: 44px; - margin-left: 26px; - font-family: "Omnes-ECOMP-W02", Arial; - font-size: 18px; - color: #444444; - float: left; -} - -.simulateGridHeaderHandle{ - cursor: move; - margin: 12px; - position: absolute; - top: 0; - left: 0; - border: 0; - vertical-align: middle; - -ms-interpolation-mode: bicubic; - display: block; -} - -/* apps gridsters */ -ul { - list-style: none; -} -.gridster-box { - height: 100%; - border: 1px solid #ccc; - background-color: #fff; - transition: transform 0.5s ease-out; -} -.gridster-box-header { - background-color: #fff; - padding: 0 0px 0 10px; - border-bottom: 1px solid #ccc; - position: relative; - height: 50px !important; -} -.gridster-box-header h3 { - margin-top: 15px; - display: inline-block; - font-family: "Omnes-ECOMP-W02", Arial; -} - -.gridster-box-header i { -font-size: 22px; -} - -.gridster-box-content { - padding: 59px; -} -.gridster-box:hover{ - transform: scale(1.1); -} -.gridster-box-header-btns { - top: 15px; - right: 10px; - position: absolute; -} - -/*** widgets ***/ -ul { - list-style: none; -} -.box { - height: 100%; - border: 1px solid #ccc; - background-color: #fff; - font-family: "Omnes-ECOMP-W02", Arial; -} -.box-header { - height : 50px; - background-color: #fff; - padding: 0 30px 0 10px; - border-bottom: 1px solid #ccc; - position: relative; -} -.box-header h3 { - margin-top: 15px; - display: inline-block; - font-size: 16px; -} -.box-content { - position: absolute; - width: 100%; - top: 50px; - left: 0; - right: 0; - bottom: 29px; - border: 1px solid #d3d3d3; - box-sizing: border-box; - overflow-y: auto; - overflow-x: hidden; - color: #444444; - bottom: 0px; -} -.box-header-btns { - top: 10px; - right: 10px; - cursor: pointer; - position: absolute; -} - -#widget-boarder{ - background-color: #eee; - border: 1px dashed white; -} -.icon-content-gridguide{ -cursor:move; +.w-ecomp-dashboard-home { + .bg_portalWhite;//white for 1702 + position: @page-main-position; + top: @page-main-top; + left: @page-main-left; + right: @page-main-right; + bottom: @page-main-bottom; + padding-top: @padding-top; + overflow-y: @page-main-overflow-y; + padding-left: @padding-left-side; + + .gridster-item-container .gridster-item-body { + overflow-y:auto; + overflow-x:hidden; + } + + .dashboard-home-container { + position: relative; + padding-right: 0; + padding-left: 0; + padding-bottom: @container-bottom; + + .dashboard-home-title { + .blackText24m; + margin: auto; + .content_justify; + } + + .portals-list { + min-height: 70vh; + //display: flex; + justify-content: center; + flex-flow: row wrap; + width: @table-width; + //margin-left: 230px; + margin-bottom: 63px; + margin:auto; + .app-gridster-header { + background-color: @u; + font-size:12px; + overflow:hidden + } + + .app-gridster-footer { + background-color: @u; + } + + .portals-list-item { + background-color: @u; + border-radius: 2px; + box-shadow: 0px -1px 2px 0px rgba(0, 0, 0, 0.1); + display: inline-block; + width: 360px; + height: 300px; + background-size: cover; + cursor: pointer; + margin: 15px; + overflow: hidden; + + .portals-item-info { + background-color: @u; + height: 120px; + top: 180px; + position: relative; + box-shadow: 0px -1px 2px 0px rgba(0, 0, 0, 0.1); + padding: 16px; + + .info-title { + .blackText24m; + margin-bottom: 4px; + + text-overflow: ellipsis; + overflow: hidden; + } + .info-description { + .portalDBlue16r; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + } + .info-button { + .btn-green; + width: 96px; + position: absolute; + bottom: 16px; + left: 16px; + } + + &:hover { + opacity: .93; + z-index: 3; + } + } + } + } + } +} +.w-ecomp-main-error{ + .portalRed; + position: absolute; + width: 100%; + line-height: 1.5em; +} +.w-ecomp-main-disclaimer { + text-align: center; + .dGray14r; + //position: absolute; + bottom: -75px; + line-height: 1.5em; + margin: 0 auto; + width:1170px; + position: relative; + +} + +@keyframes fadein { + from { + opacity: 0; + } + to { + opacity: 1; + } +} + +.slide.ng-hide-add, +.slide.ng-hide-remove, +.slide.ng-enter, +.slide.ng-leave { + transition: all 0.5s ease; +} +.slide.ng-hide, +.slide.ng-enter { + transform: translate(-100%, 0); +} +.slide.ng-enter-active { + transform: translate(0, 0); +} +.slide.ng-leave { + transform: translate(0, 0); +} +.slide.ng-leave-active { + transform: translate(+100%, 0); +} +.dashboard-boarder{ + // border: 2px solid #ccc!important; + // border-radius: 16px!important; + height: 210px; + overflow: auto; +} +.dashboard-information-boarder{ + border: 2px solid #ccc!important; + border-radius: 16px!important; +} + +#information-section { + margin-top:50px; +} + +.information-section-title{ + color: #0574ac; + font-family: Omnes-ECOMP-W02-Bold,Arial; + font-size: 25px; + margin: 20px; + width: 1170px; +} +#left { + float: left; + width: 33%; + height:300px; + background-color: white; +} + +#center { + float: right; + width: 33%; + height:300px; + background: white; +} +#right { + margin-left:34%; + margin-right:34%; + height:300px; + background:white; +} + + +/*hover*/ + + +.dock ul{ +display: inline-block; + +width: auto; +margin: 0px; +padding: 0px; +list-style: none; + +} +.dock ul li { +width: auto; +height: auto; +display: inline-block; +bottom: 0; +vertical-align: bottom; +margin-top: -43px; +} +.dock ul li a { +display: block; +height: 150px; +width: 150px; +position: relative; +-webkit-transition-property: width, height,margin-top; +-webkit-transition-duration: 0.5s; +-o-transition-property: width, height,margin-top; +-o-transition-duration: 0.5s; +-moz-transition-property: width, height,margin-top; +-moz-transition-duration: 0.5s; +} +.dock ul li a:hover { +width: 200px; +height: 200px; +margin-top: -50px; +} +.dock ul li a img { +width: 100%; +position: absolute; +bottom: 0; +left: 0; +border: none; +padding: 0px 0px 0px 30px; +} +.dock_left{ +width: 31px; +-webkit-transform: rotate(33deg); +-moz-transform: rotate(33deg); +-o-transform: rotate(33deg); +position: relative; +background: #EEE; +overflow: hidden; +float: left; +height: 100px; +z-index: 2; +margin: -18px; +} +.dock_right{ +width: 36px; +-webkit-transform: rotate(-33deg); +-moz-transform: rotate(-33deg); +-o-transform: rotate(-33deg); +position: relative; +background: #EEE; +overflow: hidden; +float: left; +height: 100px; +z-index: 2; +margin: -18px; +} + + + + +/*Time for the CSS*/ +* {margin: 0; padding: 0;} +body {background: #ccc;} + +.slider{ + width: 640px; /*Same as width of the large image*/ + position: relative; + /*Instead of height we will use padding*/ + padding-top: 320px; /*That helps bring the labels down*/ + + margin: 50px auto; + + /*Lets add a shadow*/ + box-shadow: 0 10px 20px -5px rgba(0, 0, 0, 0.75); +} + + +/*Last thing remaining is to add transitions*/ +.slider>img{ + position: absolute; + left: 0; top: 0; + transition: all 0.5s; +} + +.slider input[name='slide_switch'] { + display: none; +} + +.slider label { + /*Lets add some spacing for the thumbnails*/ + margin: 18px 0 0 18px; + border: 3px solid #999; + + float: left; + cursor: pointer; + transition: all 0.5s; + + /*Default style = low opacity*/ + opacity: 0.6; +} + +.slider label img{ + display: block; +} + +/*Time to add the click effects*/ +.slider input[name='slide_switch']:checked+label { + border-color: #666; + opacity: 1; +} +/*Clicking any thumbnail now should change its opacity(style)*/ +/*Time to work on the main images*/ +.slider input[name='slide_switch'] ~ img { + opacity: 0; + transform: scale(1.1); +} +/*That hides all main images at a 110% size +On click the images will be displayed at normal size to complete the effect +*/ +.slider input[name='slide_switch']:checked+label+img { + opacity: 1; + transform: scale(1); +} +/*Clicking on any thumbnail now should activate the image related to it*/ + +/*We are done :)*/ + + + +.accordion { + width: 895px; height: 320px; + overflow: hidden; + box-shadow: 0 10px 6px -6px #111; + margin: 20px auto +} +.accordion ul { width: 200% } + +.accordion li { + position: relative; + display: block; + width: 160px; + float: left; + box-shadow: 0 0 30px 8px #222; + transition: all 0.4s ease .300ms; +} + +.accordion ul:hover li {width: 40px } +.accordion ul li:hover {width: 640px } + +.caption { + background: rgba(0, 0, 0, 0.5); + position: absolute; + bottom: 0; + width: 640px +} + +.caption a { + display: block; + color: #fff; + text-decoration: none; + font: normal 16px 'Lato', Helvetica, Arial, sans-serif; + -webkit-font-smoothing: antialiased; + padding: 15px; +} + + +/*events*/ +.events-date{ + margin-left: 10px; + float:left; + white-space: normal; + display: inline-block; + vertical-align: middle; + width: 55px; +} +.event-title-div{ + float: left; + width: 235px; + line-height: 20px; + padding: 5px; + font-size: 14px; + margin-left: 4px; +} +.events-date{ + height: 20px; + margin-left: 4px; + font-size: 14px; +} +.events-content{ + font-size: 14px; + color: #444; + margin-right: 10px; +} +.events-content-body{ + margin-top:5px; + color:#444; + margin-left:12px; + line-height:1.5; +} +.events { + border-radius: 4px; + padding: 3px; + -webkit-user-select: none; +} +.events ul { + float: left; + width:100%; + -webkit-user-select: none +} +.events ul li { + line-height: 30px; + list-style: none; + border-bottom: 2px solid grey; + height: 100%; + min-height: 42px; +} +.events ul li:hover { + background: #ddd; + cursor: pointer; +} +.events ul li a { + color: black; + text-decoration: none; + font: 14px Helvetica, Arial, sans-serif; + -webkit-font-smoothing: antialiased; + -webkit-user-select: none; + font-family: "Omnes-ECOMP-W02", Arial; +} +.events-link{ + color: #067ab4 !important; +} + + +/*widgets*/ + +.handle-e{ + width: 5px; +} + +.singleBtnBorder { + border-radius: 6px 6px 6px 6px; +} + +.widgetHeaderBtn{ + + height: 30px; + background-color: #FFFFFF; + position: relative; + display: inline-block; + -moz-background-clip: padding-box; + -webkit-background-clip: padding-box; + background-clip: padding-box; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 8px 20px; + font-size: 14px; + line-height: 14px; + min-width: 60px; + border: none; + border-radius: 6px; + background-color: #ffffff; + background-image: none; + color: #ffffff; + vertical-align: middle; + text-align: center; + text-decoration: none; + text-transform: capitalize; + text-shadow: none !important; + white-space: nowrap; + cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; + -webkit-transition: background-color 0.3s ease-out; + -moz-transition: background-color 0.3s ease-out; + transition: background-color 0.3s ease-out; + } + +.widgetHeaderBtnPosition { + width: 30px; + min-width: 0px; + border: 1px solid #AAAAAA; + padding-left: 3px; + padding-right: 5px; + } + +.icon-anchor { + color: #888; +} + +.widgetHeaderBtn:hover, .widgetHeaderBtn:focus { + background: rgba(0, 0, 0, 0); + color: #3a7999; + box-shadow: inset 0 0 0 2px #3a7999; +} +/*news*/ + +@keyframes ticker { + 0% {margin-top: 0} + 25% {margin-top: -55px} + 50% {margin-top: -110px} + 75% {margin-top: -165px} + 100% {margin-top: 0} +} + +body { background: #333; width: 100%; height: 100% } + +.news { + + width: 350px; + height: 250px; + margin: 0px auto; + // overflow: auto; + border-radius: 4px; + padding: 3px; + -webkit-user-select: none; + +} + + + +.news ul { + float: left; + width:100%; + // animation: ticker 25s cubic-bezier(1, 0, .5, 0) infinite; + -webkit-user-select: none +} + +.news ul li {line-height: 30px; list-style: none; + border-bottom: 2px solid grey; + min-height: 42px; + } + +.news ul li:hover { + background: #ddd; + cursor: pointer; +} + +.news ul li a { + color: black; + text-decoration: none; + font-size: 14px; + line-height: 1.5; + display: inline-block; + width:100%; + min-height:40px; + padding-top: 5px; + padding-bottom: 5px; + -webkit-font-smoothing: antialiased; + -webkit-user-select: none; +} + +.news ul:hover { animation-play-state: paused } +.news span:hover+ul { animation-play-state: paused } +/*resources*/ +.resources { + + width: 100%; + height: 200px; + margin-left: 5px; + border-radius: 4px; + padding: 3px; + -webkit-user-select: none; + +} + + + +.resources ul { + float: left; + width:100%; + + -webkit-user-select: none +} + +.resources ul li {line-height: 30px; list-style: none; + border-bottom: 2px solid grey; + min-height: 42px; + } + +.resources ul li:hover { + background: #ddd; + cursor: pointer; +} + +.resources ul li a { + color: black; + text-decoration: none; + font-size: 14px; + line-height: 1.5; + width:100%; + min-height:40px; + display: inline-block; + padding-top: 5px; + padding-bottom: 5px; + -webkit-font-smoothing: antialiased; + -webkit-user-select: none; +} + + +/* OTHER COLORS */ +.blue { background: #347fd0 } +.blue span { background: #2c66be } +.red { background: #d23435 } +.red span { background: #c22b2c } +.green { background: #699B67 } +.green span { background: #547d52 } +.magenta { background: #b63ace } +.magenta span { background: #842696 } + + +/*broadcast*/ + +.box-one { + -webkit-transition:all linear 0.4s; + transition:all linear 0.4s; + height:100px; width:200px; background:white; border: 2px solid #ccc!important; + border-radius: 16px!important; +} +.box-one.ng-hide { +display: block!important; + opacity:0; +} + +.gridsterContent{ + height:120px; +} + +.gridster-item{ + z-index:0 !important; +} +.gridsterAppContent{ + height:120px; + +} + + .gridsterImage{ + height:84px; + width:168px; + } + .grider-content-ecomp{ + transition: transform 0.5s ease-out; + } + .grider-content-ecomp:hover{ + transform: scale(1.1); +} + + +/*information section*/ + +.information-section{ + /*margin-top:25px;*/ +} +.information-section-gridsterContent{ + /*height:300px;*/ +} +.information-sections-gridster-header{ + color: #0574ac; + font-family: Omnes-ECOMP-W02-Bold,Arial; + font-size: 25px; + +} +/*application empty div*/ +.app-error-block { + padding-top: 10px; + +} +/*news empty div*/ +.activity-error-block { + padding-top: 60px; + +} + +.activity-error-msg1{ + text-align: center; + margin-top: 20px; + font-family: "Omnes-ECOMP-W02", Arial; + color: #444; + font-size: 20px; + +} + +.newstape { + background: white; + color: black; + height: 400px; + overflow: hidden; +} + +.newstape-content { + position: relative; + padding: 15px; +} + +.newstape-drag { cursor: ns-resize; } + +.text-center { text-align: center; } + +.text-right { text-align: right; } + +.text-justify { text-align: justify; } + +// #newsContainer{ +// overflow:auto; +// height: 100%; +// } + +/*widget header*/ +.optionsMenu{ + position: absolute; + list-style: none; + top: 25px; + right: 10px; + border: 1px solid #067ab4; + display: none; + z-index: 2; + border-radius: 6px 0px 6px 6px; + background: #fff; + width: 130px; +} + +.optionsMenuLink { + position: relative; + padding-left: 8px; + padding-right: 2px; + font-size: 12px; + line-height: 30px; + color: #444444; +} +.optionsMenu > li:hover a { + color: #ffffff !important; +} +.optionsMenu > li { + width: 100%; + text-align: left; +} +.optionsMenu > li:hover { + background-color: #0faaf7; + border-color: none !important; + cursor: pointer; +} + +.dashboardSortHeader{ + margin-top: -44px; +margin-left: 735px; +} + +#dashboard-dropdown +{ +position: absolute; +margin-top: -37px; +left: 80%; +top: 42px; +} + +#dashboardAddWidgetPreference{ + display: inline-block; + font-size: 14px; + color: #3e3e3e; + width: 69%; + text-align: center; + padding: 15px 0px 15px 0px; + font-family: "Omnes-ECOMP-W02", Arial; +} + +#dashboardAddWidgetPreference:hover{ + background-color: #0568ae; + color:white !important; +} + +#dashboardDefaultPreference{ + display: inline-block; + font-size: 14px; + color: #3e3e3e; + width: 30%; + text-align: center; + padding: 15px 0px 15px 0px; + font-family: "Omnes-ECOMP-W02", Arial; +} + +#dashboardDefaultPreference:hover{ + background-color: #0568ae; + color:white !important; +} + +.simulateGridHeader{ + position: relative; + height: 50px !important; + border: 1px solid #d3d3d3; + border-bottom: 0; + background-color: #E5E5E5; + white-space: nowrap; + text-overflow: ellipsis; + z-index: 1; +} + +.simulateGridHeaderTitle{ + line-height: 44px; + margin-left: 26px; + font-family: "Omnes-ECOMP-W02", Arial; + font-size: 18px; + color: #444444; + float: left; +} + +.simulateGridHeaderHandle{ + cursor: move; + margin: 12px; + position: absolute; + top: 0; + left: 0; + border: 0; + vertical-align: middle; + -ms-interpolation-mode: bicubic; + display: block; +} + +/* apps gridsters */ +ul { + list-style: none; +} +.gridster-box { + height: 100%; + border: 1px solid #ccc; + background-color: #fff; + transition: transform 0.5s ease-out; +} +.gridster-box-header { + background-color: #fff; + padding: 0 0px 0 10px; + border-bottom: 1px solid #ccc; + position: relative; + height: 50px !important; +} +.gridster-box-header h3 { + margin-top: 15px; + display: inline-block; + font-family: "Omnes-ECOMP-W02", Arial; +} + +.gridster-box-header i { +font-size: 22px; +} + +.gridster-box-content { + padding: 59px; +} +.gridster-box:hover{ + transform: scale(1.1); +} +.gridster-box-header-btns { + top: 15px; + right: 10px; + position: absolute; +} + +/*** widgets ***/ +ul { + list-style: none; +} +.box { + height: 100%; + border: 1px solid #ccc; + background-color: #fff; + font-family: "Omnes-ECOMP-W02", Arial; +} +.box-header { + height : 50px; + background-color: #fff; + padding: 0 30px 0 10px; + border-bottom: 1px solid #ccc; + position: relative; +} +.box-header h3 { + margin-top: 15px; + display: inline-block; + font-size: 16px; +} +.box-content { + position: absolute; + width: 100%; + top: 50px; + left: 0; + right: 0; + bottom: 29px; + border: 1px solid #d3d3d3; + box-sizing: border-box; + overflow-y: auto; + overflow-x: hidden; + color: #444444; + bottom: 0px; +} +.box-header-btns { + top: 10px; + right: 10px; + cursor: pointer; + position: absolute; +} + +#widget-boarder{ + background-color: #eee; + border: 1px dashed white; +} +.icon-content-gridguide{ +cursor:move; } \ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html index 5e67526e..9a87c0ba 100644 --- a/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/dashboard/dashboard.tpl.html @@ -1,179 +1,183 @@ - -
-
- -
-
-
- Applications Sort by: -
-
-
-
-
-
-
-
- You do not have access to any application or function in ECOMP - Portal.
Please request access via MyLogins. -
-
-
- -
-
    -
  • -
    -
    - -

    {{item.headerText | - elipsis: 14}}

    -
    -
    -
    -
    -
    -
    - -

    Select applications...

    - -
    -
    - -
    -
    -
    • -
-
- -
- -
-
- -

- - -
Failed to communicate with the - widget microservice.
- -
-
    -
  • -
    -
    - -

    {{ widget.headerText}}

    -
    - ... - - - -
    -
    -
    -
    -
    -
    -
    • -
-
-
-
-
- Add Widget -
-   -
- Reset Widget Layout -
-
-
- -
-
+ +
+
+ +
+
+
+ Applications Sort by: + +
+ +
+ + +
+
+
+
+
+
+
+ You do not have access to any application or function in ECOMP + Portal. +
+
+
+
+ +
+
    +
  • +
    +
    + +

    {{item.headerText | + elipsis: 14}}

    +
    +
    +
    +
    +
    +
    + +

    Select applications...

    + +
    +
    + +
    +
    +
    • +
+
+ +
+ +
+
+ +

+ + +
Failed to communicate with the + widget microservice.
+ +
+
    +
  • +
    +
    + +

    {{ widget.headerText}}

    +
    + ... + + + +
    +
    +
    +
    +
    +
    +
    • +
+
+
+
+
+ Add Widget +
+   +
+ Reset Widget Layout +
+
+
+ +
+
diff --git a/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.controller.js b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.controller.js new file mode 100644 index 00000000..69fe6e4d --- /dev/null +++ b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.controller.js @@ -0,0 +1,400 @@ +/** + * Created by nnaffar on 12/20/15. + */ +'use strict'; +(function () { + class MenuDetailsModalCtrl { + constructor($scope, $log, functionalMenuService, errorMessageByCode, ECOMP_URL_REGEX,$rootScope,confirmBoxService) { + + $scope.isAllApplications = false; + let newMenuModel = { + name: null, + menuId: null, + parentMenuId: null, + url: null + }; + + let getAvailableRoles = (appid) => { + this.isSaving = true; + if (appid != null) { + $log.debug("MenuDetailsModalCtrl::getAvailableRoles: About to call getManagedRolesMenu"); + functionalMenuService.getManagedRolesMenu(appid).then(rolesObj => { + $log.debug("MenuDetailsModalCtrl::getAvailableRoles: Roles returned = " + JSON.stringify(rolesObj)) + this.availableRoles = rolesObj; + this.preSelectedRoles = {roles:[]}; + + if(($scope.ngDialogData.source==='edit') && this.isMidLevelMenuItem()){ + // in Edit flow , for Midlevel menu item no need to preSelect. + this.preSelectedRoles = {roles:[]}; + }else if(!angular.isUndefined(this.menuItem.menuDetails) && + $scope.ngDialogData.source==='edit' && this.isLeafMenuItem() && + this.menuItem.menuDetails.appid!=appid) { + // in Edit flow , for LeafMenuItem, if appid changed then no need to preSelect. + this.preSelectedRoles = {roles:[]}; + }else{ + if((!angular.isUndefined(this.menuItem.menuDetails)) && + (!angular.isUndefined(this.menuItem.menuDetails.roles))){ + $log.debug('menuDetails.roles: ' + this.menuItem.menuDetails.roles); + for(var i=0; i { + $log.error("MenuDetailsModalCtrl::getAvailableRoles: error: " + err); + }); + } else { + $log.debug("MenuDetailsModalCtrl::getAvailableRoles: appid was null"); + } + }; + + let getAvailableApps = () => { + $scope.isAllApplications = true; + functionalMenuService.getAvailableApplications().then(apps => { + $log.debug("MenuDetailsModalCtrl::getAvailableApps: Apps returned = " + JSON.stringify(apps)) + this.availableApps = apps; + // Keep track of whether or not the selected app is disabled + if (angular.isDefined(this.selectedApp) && angular.isDefined(this.selectedApp.index)) { + for (var i = 0; i < apps.length; i++) { + if (apps[i].index === this.selectedApp.index) { + $log.debug("MenuDetailsModalCtrl::getAvailableApps: found app with index: " + this.selectedApp.index); + $log.debug("MenuDetailsModalCtrl::getAvailableApps: setting isDisabled to: " + !apps[i].enabled); + this.selectedApp.isDisabled = !apps[i].enabled; + break; + } + } + $log.debug("didn't find index: " + this.selectedApp.index); + } + })['catch'](function (err) { + confirmBoxService.showInformation('There was a problem retrieving the Applications. ' + + 'Please try again later. Error Status: '+ err.status).then(isConfirmed => {}); + $log.error("MenuDetailsModalCtrl::getAvailableApps: getAvailableApps error: " + err); + $scope.isAllApplications = false; + }).finally(()=>{ + this.isSaving = false; + $scope.isAllApplications = false; + }); + }; + + let init = () => { + $scope.isAllApplications = false; + $log.info('MenuDetailsModalCtrl::init'); + this.saveOrContinueBtnText = "Save"; + this.isSaving = false; + this.displayRoles = $scope.ngDialogData.source==='view' ? true : false; + this.formEditable = $scope.ngDialogData.source==='view' ? false : true; + this.selectedRole = []; + this.availableRoles = []; + this.menuItem = _.clone($scope.ngDialogData.menuItem); + $log.info('MenuDetailsModalCtrl::getAvailableApps: Within init, about to check menuDetails for defined'); + if(!angular.isUndefined(this.menuItem.menuDetails) && + ($scope.ngDialogData.source==='view' || + ($scope.ngDialogData.source==='edit') && this.isLeafMenuItem() )){ + + $log.debug("MenuDetailsModalCtrl::init: menuItem: "); + $log.debug('MenuDetailsModalCtrl::init: ',this.menuItem); + this.menuItem.menu.url = this.menuItem.menuDetails.url; + this.selectedApp={}; + this.selectedApp.index = this.menuItem.menuDetails.appid; + getAvailableRoles(this.selectedApp.index); + + } + + if($scope.ngDialogData.source==='view' || $scope.ngDialogData.source==='edit'){ + this.menutitle = this.menuItem.menu.name; + this.menuLocation = this.isParentMenuItem() ? this.menuItem.menu.name : this.menuItem.menu.parent.name; + }else{ + this.menutitle = ''; + this.menuLocation = this.menuItem.menu.name; + } + // Temporarily passing 0 as dummy for getAvailableRoles incase of this.selectedApp is not there i.e., in Add flow + // getAvailableRoles(angular.isUndefined(this.selectedApp) ? 0: this.selectedApp.index ); + getAvailableApps(); + $log.debug("MenuDetailsModalCtrl::init: Menu details: " + JSON.stringify(this.menuItem.menuDetails)); + }; + + + this.ECOMP_URL_REGEX = ECOMP_URL_REGEX; + + //This part handles conflict errors (409) + this.conflictMessages = {}; + this.scrollApi = {}; + let handleConflictErrors = err => { + if(!err.data){ + return; + } + if(!err.data.length){ //support objects + err.data = [err.data] + } + $log.debug('MenuDetailsModalCtrl::handleConflictErrors: err.data = ' + JSON.stringify(err.data)); + _.forEach(err.data, item => { + _.forEach(item.fields, field => { + //set conflict message + this.conflictMessages[field.name] = errorMessageByCode[item.errorCode]; + //set field as invalid + $log.debug('MenuDetailsModalCtrl::handleConflictErrors: fieldName = ' + field.name); + $scope.functionalMenuForm[field.name].$setValidity('conflict', false); + //set watch once to clear error after user correction + watchOnce[field.name](); + }); + }); + this.scrollApi.scrollTop(); + }; + + let resetConflict = fieldName => { + delete this.conflictMessages[fieldName]; + $log.debug('MenuDetailsModalCtrl::resetConflict: $setValidity(true) = ' + fieldName); + if($scope.functionalMenuForm[fieldName]){ + $scope.functionalMenuForm[fieldName].$setValidity('conflict', true); + } + }; + + let watchOnce = { + text: () => { + let unregisterName = $scope.$watch('functionalMenuDetails.menutitle', (newVal, oldVal) => { + // $log.debug('title:: newVal, oldVal = ' + newVal.toLowerCase() + " | " + oldVal.toLowerCase()); + if(newVal.toLowerCase() !== oldVal.toLowerCase()){ + resetConflict('text'); + unregisterName(); + } + }); + }, + url: () => { + let unregisterUrl = $scope.$watch('functionalMenuDetails.menuItem.menu.url', (newVal, oldVal) => { + if(newVal.toLowerCase() !== oldVal.toLowerCase()){ + resetConflict('url'); + unregisterUrl(); + } + }); + } + }; + + //*************************** + + this.isLeafMenuItem = () => { + return this.menuItem.menu.children.length>0 ? false : true; + }; + + this.isMidLevelMenuItem = () => { + return this.menuItem.menu.parentMenuId!=null && this.menuItem.menu.children.length>0 ? true : false; + }; + + this.isParentMenuItem = () => { + return this.menuItem.menu.parentMenuId!=null ? false : true; + }; + + this.updateSelectedApp = (appItem) => { + if (!appItem) { + return; + } + $log.debug('MenuDetailsModalCtrl::updateSelectedApp: drop down app item = ' + JSON.stringify(appItem.index)); + $log.debug("MenuDetailsModalCtrl::updateSelectedApp: appItem in updateSelectedApp: "); + $log.debug('MenuDetailsModalCtrl::updateSelectedApp: ',appItem); + this.selectedApp.isDisabled = ! appItem.enabled; + $log.debug("MenuDetailsModalCtrl::updateSelectedApp: isDisabled: "+this.selectedApp.isDisabled); + getAvailableRoles(appItem.index); + }; + + this.continue = () => { + this.displayRoles = true; + this.formEditable = false; + }; + + this.saveChanges = () => { + + //todo : form validation was commented as dialog message is kept for error validations + /*if($scope.functionalMenuForm.$invalid){ + return; + }*/ + + if(!!this.menuItem.menu.url && (angular.isUndefined(this.selectedApp) || !this.selectedApp.index>0)) { + confirmBoxService.showInformation('Please select the appropriate app, or remove the url').then(isConfirmed => {}); + return; + }else if(!this.menuItem.menu.url && !angular.isUndefined(this.selectedApp) && this.selectedApp.index>0){ + confirmBoxService.showInformation('Please enter url, or select "No Application"').then(isConfirmed => {}); + return; + }else if(!this.menutitle){ + confirmBoxService.showInformation('Please enter the Menu title').then(isConfirmed => {}); + return; + } + + this.isSaving = true; + var activeMenuItem = {}; + + if ($scope.ngDialogData.source === 'edit') { // Edit Menu Item + $log.debug('MenuDetailsModalCtrl::saveChanges: Will be saving an edit menu item'); + activeMenuItem = { + menuId:this.menuItem.menu.menuId, + column:this.menuItem.menu.column, + text:this.menutitle, + parentMenuId:this.menuItem.menu.parentMenuId, + url:this.menuItem.menu.url, + appid: angular.isUndefined(this.selectedApp) ? null:this.selectedApp.index, + roles:this.selectedRole + }; + // If we have removed the url and appid, we must remove the roles + if (!activeMenuItem.appid && !activeMenuItem.url) { + activeMenuItem.roles = null; + } + functionalMenuService.saveEditedMenuItem(activeMenuItem) + .then(() => { + $log.debug('MenuDetailsModalCtrl::saveChanges: Menu Item saved'); + $scope.closeThisDialog(true); + }).catch(err => { + if(err.status === 409){//Conflict + handleConflictErrors(err); + } else { + confirmBoxService.showInformation('There was a problem saving your change. ' + + 'Please try again later. Error Status: '+ err.status).then(isConfirmed => {}); + } + $log.error('MenuDetailsModalCtrl::saveChanges: error - ',err); + }).finally(()=>{ + this.isSaving = false; + }); + + $log.debug("MenuDetailsModalCtrl::saveChanges: Edit Menu output will be: " + JSON.stringify(activeMenuItem)); + } else { // New Menu Item + $log.debug('MenuDetailsModalCtrl::saveChanges: Will be saving a New menu item'); + var newMenuItem = { + menuId:null, // this is a new menu item + column:this.menuItem.menu.column, + text:this.menutitle, + // We are creating this new menu item under the menu item that was clicked on. + parentMenuId:this.menuItem.menu.menuId, + url:this.menuItem.menu.url, + appid: angular.isUndefined(this.selectedApp) ? null:this.selectedApp.index, + roles:this.selectedRole + }; + + $log.debug("MenuDetailsModalCtrl::saveChanges: New Menu output will be: " + JSON.stringify(newMenuItem)); + functionalMenuService.saveMenuItem(newMenuItem) + .then(() => { + $log.debug('MenuDetailsModalCtrl::saveChanges: Menu Item saved'); + $scope.closeThisDialog(true); + }).catch(err => { + if(err.status === 409){//Conflict + handleConflictErrors(err); + } else { + confirmBoxService.showInformation('There was a problem saving your menu. ' + + 'Please try again later. Error Status: '+ err.status).then(isConfirmed => {}); + } + $log.error('MenuDetailsModalCtrl::saveChanges error: ', err); + }).finally(()=>{ + this.isSaving = false; + }); + + } + }; + + init(); + + $scope.$on('$stateChangeStart', e => { + //Disable navigation when modal is opened + e.preventDefault(); + }); + } + } + MenuDetailsModalCtrl.$inject = ['$scope', '$log', 'functionalMenuService', 'errorMessageByCode', 'ECOMP_URL_REGEX','$rootScope','confirmBoxService']; + angular.module('ecompApp').controller('MenuDetailsModalCtrl', MenuDetailsModalCtrl); + + angular.module('ecompApp').directive('dropdownMultiselect', ['functionalMenuService',function(){ + return { + restrict: 'E', + scope: { + model: '=', + options: '=', + populated_roles: '=preSelected', + dropdownTitle: '@', + source: '=' + }, + template: "
" + + "" + + "" + + "
    " + + "
  • {{option.rolename}}
    • " + + "
" + + "
", + controller: function ($scope) { + $scope.selectedItems = {}; + $scope.checkAll = false; + $scope.$on('availableRolesReady', function() { + init(); + }); + + function init() { + console.log('dropdownMultiselect init'); + $scope.dropdownTitle = $scope.source ==='view' ? 'View Roles' : 'Select Roles'; + console.log('$scope.populated_roles = ' + $scope.populated_roles); + } + + $scope.$watch('populated_roles', function(){ + if ($scope.populated_roles && $scope.populated_roles.length>0) { + for (var i = 0; i < $scope.populated_roles.length; i++) { + $scope.model.push($scope.populated_roles[i].roleId); + $scope.selectedItems[$scope.populated_roles[i].roleId] = true; + } + if ($scope.populated_roles.length === $scope.options.length) { + $scope.checkAll = true; + } + }else{ + deselectAll(); + } + }); + + $scope.openDropDown = function () { + + }; + + $scope.checkAllClicked = function () { + if ($scope.checkAll) { + selectAll(); + } else { + deselectAll(); + } + }; + + function selectAll() { + $scope.model = []; + $scope.selectedItems = {}; + angular.forEach($scope.options, function (option) { + $scope.model.push(option.roleId); + }); + angular.forEach($scope.model, function (id) { + $scope.selectedItems[id] = true; + }); + console.log($scope.model); + }; + + function deselectAll() { + $scope.model = []; + $scope.selectedItems = {}; + console.log($scope.model); + }; + + $scope.setSelectedItem = function (id) { + var filteredArray = []; + if ($scope.selectedItems[id] === true) { + $scope.model.push(id); + } else { + filteredArray = $scope.model.filter(function (value) { + return value != id; + }); + $scope.model = filteredArray; + $scope.checkAll = false; + } + console.log(filteredArray); + return false; + }; + + $scope.setDisable = function(source){ + return source ==='view' ? true : false; + } + } + } + }]); + +})(); \ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.delete.modal.html b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.delete.modal.html new file mode 100644 index 00000000..e80a0265 --- /dev/null +++ b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.delete.modal.html @@ -0,0 +1,18 @@ +
+
Delete Menu Item
+ +
+
+ +
+
+
+
+
+
+ + + +
+
\ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html new file mode 100644 index 00000000..7ba444eb --- /dev/null +++ b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html @@ -0,0 +1,97 @@ +
+
{{ngDialogData.title}}
+ + +
+
+ +
+
Parent
+ +
+ +
+
Title
+ +
+ +
+
+ + +
+
+
URL
+ +
+ Not valid URL! +
+
+
+
+
App
+
+ +
+ +
+
+ + +
+ + +
+
Roles
+ + +
+
Application is disabled
+
+ +
+
+
+ + + + + + + + + + +
+
+
Close
+
+
+ \ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/modal-details.modal.less b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/modal-details.modal.less index 0d5e98fc..ce434b47 100644 --- a/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/modal-details.modal.less +++ b/ecomp-portal-FE-common/client/app/views/functionalMenu/functionalMenu-dialog/modal-details.modal.less @@ -1,38 +1,101 @@ .functionalMenu-details-modal { - height: 430px; + height: 520px; - input:not([type="button"]) { - height: 13px; - } - + .title { //.n18r; - .dGray18r; //AT&T Dark Gray + .dGray18r; //ECOMP Dark Gray border-bottom: @blue-active 3px solid; + } - } + .span6{ +padding-top: 10px; + } + .right-item{ + padding-top: 10px; + + } + + .item{ + padding-top: 10px; + + } +.functionalMenu-height{ +height:35px; +width:140%; + +} + + select { + max-width: 150%; + width: 380px; + } +.btn{ +font-family: clearview_att_regular; + font-size: 14px !important; +} +.btn-group.open .dropdown-toggle { + -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.125); + box-shadow: inset 0 0px 0px rgba(0,0,0,.125); +} .btn-group { - display: table-cell; - max-width: 250px; - min-width: 290px; - background-color: #f2f2f2; - } + cursor: pointer; + position: relative; + border: 1px solid #5a5a5a; + white-space: nowrap; + text-overflow: ellipsis; + line-height: 30px; + height: 40px; + padding-left: 10px; + padding-right: 10px; + width: 70%; + min-width:50%; + background-color: #f2f2f2; + } + + .btn-group>.btn+.dropdown-toggle{ + + margin-left: 80px; + padding-top: 10px; + } .btn-medium{ width:168px; + margin-right: 86px; } - - + .caret { + margin-left: 75px; +} +.custom-select-wrap { + width: 86%; + } + .custom-select-wrap::after { + right: 101px; + } .dropdown-menu-medium{ - width:236px; - max-height: 200px; + max-height: 123px; overflow-y: auto; + z-index: 99999; + padding-left: 8px; + padding-right: 8px; + position: absolute; + top: 39px; + width: 100%; + background: #fff; + border: 1px #d2d2d2 solid; + left: 0px; } .functionalMenu-properties-main { padding: 16px; height: 306px; overflow-y: visible; + input[type=checkbox][disabled]{ + height:13px; + } + input[type=checkbox] { + height: 13px !important; + } .item{ position: relative; diff --git a/ecomp-portal-FE-common/client/app/views/header/header.controller.js b/ecomp-portal-FE-common/client/app/views/header/header.controller.js index 961362a5..33cb8454 100644 --- a/ecomp-portal-FE-common/client/app/views/header/header.controller.js +++ b/ecomp-portal-FE-common/client/app/views/header/header.controller.js @@ -1,449 +1,558 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; -(function () { - class HeaderCtrl { - constructor($log, $window, userProfileService, menusService, $scope, ECOMP_URL_REGEX, $cookies, $state,auditLogService,notificationService) { - this.firstName = ''; - this.lastName = ''; - this.$log = $log; - this.menusService = menusService; - this.$scope = $scope; - this.favoritesMenuItems = ''; - $scope.favoriteItemsCount = 0; - $scope.favoritesMenuItems = ''; - $scope.showFavorites = false; - $scope.emptyFavorites = false; - $scope.favoritesWindow = false; - $scope.notificationCount=0; - $scope.showNotification = true; - - $scope.hideMenus = false; - - $scope.menuItems = []; - $scope.activeClickSubMenu = { - x: '' - }; - $scope.activeClickMenu = { - x: '' - }; - $scope.megaMenuDataObject =[]; - $scope.notificationCount= notificationService.notificationCount; - this.isLoading = true; - this.ECOMP_URL_REGEX = ECOMP_URL_REGEX; - - var unflatten = function( array, parent, tree ){ - - tree = typeof tree !== 'undefined' ? tree : []; - parent = typeof parent !== 'undefined' ? parent : { menuId: null }; - var children = _.filter( array, function(child){ return child.parentMenuId == parent.menuId; }); - - if( !_.isEmpty( children ) ){ - if( parent.menuId === null ){ - tree = children; - }else{ - parent['children'] = children - } - _.each( children, function( child ){ unflatten( array, child ) } ); - } - - return tree; - } - - userProfileService.getFunctionalMenuStaticInfo() - .then(res=> { - // $log.debug('HeaderCtrl::getFunctionalMenuStaticInfo: getting Functional Menu Static Info init'); - if(res==null || res.firstName==null || res.firstName=='' || res.lastName==null || res.lastName=='' ){ - // $log.info('HeaderCtrl::getFunctionalMenuStaticInfo: failed getting userinfo from shared context.. '); - $log.info('HeaderCtrl: failed to get all required data, trying user profile'); - userProfileService.getUserProfile() - .then(profile=> { - // $log.debug('HeaderCtrl:: getting userinfo from session success'); - this.firstName = profile.firstName; - this.lastName = profile.lastName; - // $log.debug('HeaderCtrl::getFunctionalMenuStaticInfo: user has the following roles: ' + profile.roles); - }).catch(err=> { - $log.error('Header Controller:: getUserProfile() failed: ' + err); - }); - } else { - // $log.debug('HeaderCtrl: fetched Functional Menu Static Info successfully',res); - this.firstName = res.firstName; - this.lastName = res.lastName; - } - - menusService.GetFunctionalMenuForUser() - .then(jsonHeaderMenu=> { - $scope.menuItems = unflatten( jsonHeaderMenu ); - $scope.megaMenuDataObject = $scope.menuItems; - }).catch(err=> { - $log.error('HeaderCtrl::GetFunctionalMenuForUser: HeaderCtrl json returned: ' + err); - }); - - }).catch(err=> { - $log.error('HeaderCtrl::getFunctionalMenuStaticInfo failed: ' + err); - }); - - //store audit log - $scope.auditLog = function(app,type) { - var comment = 'type: '+type+ ',title: '+app.text+",url: "+app.url; - auditLogService.storeAudit(app.appid,'functional',comment); - }; - - $scope.loadFavorites = function () { - $scope.hideMenus = false; - // $log.debug('HeaderCtrl::loadFavorites: loadFavorites has happened.'); - if ($scope.favoritesMenuItems == '') { - generateFavoriteItems(); - // $log.debug('HeaderCtrl::loadFavorites: loadFavorites is calling generateFavoriteItems()'); - } else { - // $log.debug('HeaderCtrl::loadFavorites: loadFavorites is NOT calling generateFavoriteItems()'); - } - } - - $scope.goToUrl = (item) => { - // $log.error('HeaderCtrl::goToUrl has started',item); - let url = item.url; - let restrictedApp = item.restrictedApp; - if (!url) { - $log.warn('HeaderCtrl::goToUrl: No url found for this application, doing nothing..'); - return; - } - if (restrictedApp) { - $window.open(url, '_blank'); - } else { - if(item.url=="getAccess" || item.url=="contactUs"){ - // if (url = window.location.href) - $state.go("root."+url); - } else { - var tabContent = { id: new Date(), title: item.text, url: item.url,appId:item.appid }; - $cookies.putObject('addTab', tabContent ); - } - // $log.debug('HeaderCtrl::goToUrl: url = ', url); - } - $scope.hideMenus = true; - } - - - - $scope.submenuLevelAction = function(index, column) { - if ($scope.favoritesMenuItems == '') { - generateFavoriteItems(); - // $log.debug('HeaderCtrl::submenuLevelAction: submenuLevelAction is calling generateFavoriteItems()'); - } else { - // $log.debug('submenuLevelAction is NOT calling generateFavoriteItems()'); - } - // $log.debug('item hovered: ' + index + '; column = ' + column); - // if (column == 2) { // 2 is Design - // // This is an admitted hack. See aw3218 for reasons why - // $log.debug('submenuLevelAction column == 2'); - // $scope.favoritesWindow = false; - // $scope.showFavorites = false; - // $scope.emptyFavorites = false; - // } - if (index=='Favorites' && $scope.favoriteItemsCount != 0) { - // $log.debug('HeaderCtrl::submenuLevelAction: Showing Favorites window'); - // generateFavoriteItems(); - $scope.favoritesWindow = true; - $scope.showFavorites = true; - $scope.emptyFavorites = false; - } - if (index=='Favorites' && $scope.favoriteItemsCount == 0) { - // $log.debug('HeaderCtrl::submenuLevelAction: Hiding Favorites window in favor of No Favorites Window'); - // generateFavoriteItems(); - $scope.favoritesWindow = true; - $scope.showFavorites = false; - $scope.emptyFavorites = true; - } - if (index!='Favorites' ) { - $scope.favoritesWindow = false; - $scope.showFavorites = false; - $scope.emptyFavorites = false; - } - - }; - - $scope.hideFavoritesWindow = function() { - $scope.showFavorites = false; - $scope.emptyFavorites = false; - // $scope.thirdFourthMenus = true; - } - - $scope.isUrlFavorite = function (menuId) { - // $log.debug('array objects in menu favorites = ' + $scope.favoriteItemsCount + '; menuId=' + menuId); - var jsonMenu = JSON.stringify($scope.favoritesMenuItems); - var isMenuFavorite = jsonMenu.indexOf('menuId\":' + menuId); - // $log.debug('jsonMenu.indexOf(menuId:' + jsonMenu.indexOf('menuId\":'+menuId)); - // $log.debug('isMenuFavorite= ' + isMenuFavorite); - if (isMenuFavorite==-1) { - return false; - } else { - return true; - } - - } - - let generateFavoriteItems = () => { - menusService.getFavoriteItems() - .then(favorites=> { - // $log.debug('HeaderCtrl.getFavoriteItems:: ' + JSON.stringify(favorites)); - $scope.favoritesMenuItems = favorites; - $scope.favoriteItemsCount = Object.keys(favorites).length; - // $log.info('HeaderCtrl.getFavoriteItems:: number of favorite menus: ' + $scope.favoriteItemsCount); - }).catch(err=> { - $log.error('HeaderCtrl.getFavoriteItems:: Error retrieving Favorites menus: ' + err); - }); - } - - $scope.setAsFavoriteItem = function(event, menuId){ - var jsonMenuID = angular.toJson({'menuId': + menuId }); - // $log.debug('HeaderCtrl::setFavoriteItems: ' + jsonMenuID + " - " + event.target.id); - - menusService.setFavoriteItem(jsonMenuID) - .then(() => { - // var elementId = '#'+ event.currentTarget.id; - angular.element('#' + event.target.id).css('color', '#fbb313'); - generateFavoriteItems(); - }).catch(err=> { - $log.error('HeaderCtrl::setFavoriteItems:: API setFavoriteItem error: ' + err); - }); - }; - - $scope.removeAsFavoriteItem = function(event, menuId){ - // $log.debug('-----------------------------removeAsFavoriteItem: ' + menuId + " - " + event.target.id); - menusService.removeFavoriteItem(menuId) - .then(() => { - angular.element('#' + event.target.id).css('color', '#666666'); - generateFavoriteItems(); - }).catch(err=> { - $log.error('HeaderCtrl::removeAsFavoriteItem: API removeFavoriteItem error: ' + err); - }); - }; - - $scope.goToPortal = (headerText, url) => { - if (!url) { - $log.warn('HeaderCtrl::goToPortal: No url found for this application, doing nothing..'); - return; - } - if (!ECOMP_URL_REGEX.test(url)) { - url = 'http://' + url; - } - - if(headerText.startsWith("vUSP")) { - window.open(url, '_blank');//, '_self' - } - else { - var tabContent = { id: new Date(), title: headerText, url: url }; - $cookies.putObject('addTab', tabContent ); - } - }; - - } - } - class LoginSnippetCtrl { - constructor($log, $scope, $cookies, $timeout, userProfileService, sessionService) { - $scope.firstName=""; - $scope.lastName=""; - $scope.displayUserAppRoles=false; - $scope.allAppsLogout = function(){ - - var cookieTabs = $cookies.getObject('visInVisCookieTabs'); - if(cookieTabs!=null){ - for(var t in cookieTabs){ - - var url = cookieTabs[t].content; - if(url != "") { - sessionService.logout(url); - } - } - } - // wait for individual applications to log out before the portal logout - $timeout(function() { - window.location = "logout.htm"; - }, 2000); - } - - - try { - userProfileService.getFunctionalMenuStaticInfo() - .then(res=> { - // $log.info('HeaderCtrl::LoginSnippetCtrl: Login information: ' + JSON.stringify(res)); - $scope.firstName = res.firstName; - $scope.lastName = res.lastName; - $scope.loginSnippetEmail = res.email; - $scope.loginSnippetUserid = res.userId; - $scope.lastLogin = res.last_login; - }).catch(err=> { - $log.error('HeaderCtrl::LoginSnippetCtrl: failed in getFunctionalMenuStaticInfo: ' + err); - }); - } catch (err) { - $log.error('HeaderCtrl::LoginSnippetCtrl caught exception: ' + err); - } - - $scope.getUserApplicationRoles= function(){ - $scope.userapproles = []; - if($scope.displayUserAppRoles) - $scope.displayUserAppRoles = false; - else - $scope.displayUserAppRoles = true; - - userProfileService.getUserAppRoles($scope.loginSnippetUserid) - .then(res=>{ - - for(var i=0;i { - notificationService.decrementRefreshCount(); - var count = notificationService.getRefreshCount(); - if (res==null || res.data==null || res.data.message!='success') { - $log.error('NotificationCtrl::updateNotifications: failed to get notifications'); - if (intervalPromise != null) - $interval.cancel(intervalPromise); - } else if(count<=0){ - if (intervalPromise != null) - $interval.cancel(intervalPromise); - } else { - $scope.notifications = []; - notificationService.setNotificationCount(res.data.response.length); - for(var i=0;i { - $log.error('NotificationCtrl::getNotification: caught exception: ' + err); - if (intervalPromise != null) - $interval.cancel(intervalPromise); - }); - } - $scope.getNotification(); - function updateNotifications() { - $scope.getNotification(); - } - $scope.start = function(rate) { - // stops any running interval to avoid two intervals running at the same time - $scope.stop(); - // store the interval promise - intervalPromise = $interval(updateNotifications, rate); - }; - - $scope.stop = function() { - $interval.cancel(intervalPromise); - }; - - - $scope.showDetailedJsonMessage=function (selectedAdminNotification) { - if (selectedAdminNotification.source!=='EP'){ - var messageObject=JSON.parse(selectedAdminNotification.message); - var html=""; - html+='

'+'Message Source'+' : '+selectedAdminNotification.source+'

'; - html+='

'+'Message Title'+' : '+selectedAdminNotification.title+'

'; - for(var field in messageObject){ - if(field=='eventDate'||field=='lastModifiedDate'){ - html+='

'+field+' : '+new Date(+messageObject[field])+'

'; - - }else{ - html+='

'+field+' : '+messageObject[field]+'

'; - - } - } - - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html', - controller: 'userNotificationCtrl', - resolve: { - message: function () { - var message = { - title: '', - text: html - - }; - return message; - }, - - } - }); - - } - }; - - notificationService.getNotificationRate().then(res=> { - if (res == null || res.response == null) { - $log.error('NotificationCtrl: failed to notification update rate or duration, check system.properties file.'); - } else { - var rate = parseInt(res.response.updateRate); - var duration = parseInt(res.response.updateDuration); - notificationService.setMaxRefreshCount(parseInt(duration/rate)+1); - notificationService.setRefreshCount(notificationService.maxCount); - if (rate != NaN && duration != NaN) { - $scope.updateRate=rate; - $scope.start($scope.updateRate); - } - } - }).catch(err=> { - $log.error('NotificationCtrl: getNotificationRate() failed: ' + err); - }); - - $scope.deleteNotification = function(index){ - if ($scope.notifications[index].id == null || $scope.notifications[index].id == '') { - $log.error('NotificationCtrl: failed to delete Notification.'); - return; - } - notificationService.setNotificationRead($scope.notifications[index].id); - $scope.notifications.splice(index,1); - notificationService.setNotificationCount($scope.notifications.length); - } - } - } - NotificationCtrl.$inject = ['$log', '$scope', '$cookies', '$timeout', 'sessionService','notificationService','$interval','ngDialog']; - LoginSnippetCtrl.$inject = ['$log', '$scope', '$cookies', '$timeout','userProfileService', 'sessionService']; - HeaderCtrl.$inject = ['$log', '$window', 'userProfileService', 'menusService', '$scope', 'ECOMP_URL_REGEX','$cookies','$state','auditLogService','notificationService']; - angular.module('ecompApp').controller('HeaderCtrl', HeaderCtrl); - angular.module('ecompApp').controller('loginSnippetCtrl', LoginSnippetCtrl); - angular.module('ecompApp').controller('notificationCtrl', NotificationCtrl); - -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; +(function () { + class HeaderCtrl { + constructor($log, $window, userProfileService, menusService, $scope, ECOMP_URL_REGEX, $cookies, $state,auditLogService,notificationService,recommendationService,ngDialog) { + this.firstName = ''; + this.lastName = ''; + this.$log = $log; + this.menusService = menusService; + this.$scope = $scope; + this.favoritesMenuItems = ''; + $scope.favoriteItemsCount = 0; + $scope.favoritesMenuItems = ''; + $scope.showFavorites = false; + $scope.emptyFavorites = false; + $scope.favoritesWindow = false; + $scope.notificationCount=0; + $scope.recommendationCount=0; + $scope.showNotification = true; + + $scope.hideMenus = false; + + $scope.menuItems = []; + $scope.activeClickSubMenu = { + x: '' + }; + $scope.activeClickMenu = { + x: '' + }; + $scope.megaMenuDataObject =[]; + $scope.notificationCount= notificationService.notificationCount; + $scope.recommendationCount= recommendationService.recommendationCount; + this.isLoading = true; + this.ECOMP_URL_REGEX = ECOMP_URL_REGEX; + + var unflatten = function( array, parent, tree ){ + + tree = typeof tree !== 'undefined' ? tree : []; + parent = typeof parent !== 'undefined' ? parent : { menuId: null }; + var children = _.filter( array, function(child){ return child.parentMenuId == parent.menuId; }); + + if( !_.isEmpty( children ) ){ + if( parent.menuId === null ){ + tree = children; + }else{ + parent['children'] = children + } + _.each( children, function( child ){ unflatten( array, child ) } ); + } + + return tree; + } + + userProfileService.getFunctionalMenuStaticInfo() + .then(res=> { + // $log.debug('HeaderCtrl::getFunctionalMenuStaticInfo: getting Functional Menu Static Info init'); + if(res==null || res.firstName==null || res.firstName=='' || res.lastName==null || res.lastName=='' ){ + // $log.info('HeaderCtrl::getFunctionalMenuStaticInfo: failed getting userinfo from shared context.. '); + $log.info('HeaderCtrl: failed to get all required data, trying user profile'); + userProfileService.getUserProfile() + .then(profile=> { + // $log.debug('HeaderCtrl:: getting userinfo from session success'); + this.firstName = profile.firstName; + this.lastName = profile.lastName; + // $log.debug('HeaderCtrl::getFunctionalMenuStaticInfo: user has the following roles: ' + profile.roles); + }).catch(err=> { + $log.error('Header Controller:: getUserProfile() failed: ' + err); + }); + } else { + // $log.debug('HeaderCtrl: fetched Functional Menu Static Info successfully',res); + this.firstName = res.firstName; + this.lastName = res.lastName; + } + + menusService.GetFunctionalMenuForUser() + .then(jsonHeaderMenu=> { + $scope.menuItems = unflatten( jsonHeaderMenu ); + $scope.megaMenuDataObject = $scope.menuItems; + }).catch(err=> { + $log.error('HeaderCtrl::GetFunctionalMenuForUser: HeaderCtrl json returned: ' + err); + }); + + }).catch(err=> { + $log.error('HeaderCtrl::getFunctionalMenuStaticInfo failed: ' + err); + }); + + //store audit log + $scope.auditLog = function(app,type) { + var comment = 'type: '+type+ ',title: '+app.text+",url: "+app.url; + auditLogService.storeAudit(app.appid,'functional',comment); + }; + + $scope.loadFavorites = function () { + $scope.hideMenus = false; + // $log.debug('HeaderCtrl::loadFavorites: loadFavorites has happened.'); + if ($scope.favoritesMenuItems == '') { + generateFavoriteItems(); + // $log.debug('HeaderCtrl::loadFavorites: loadFavorites is calling generateFavoriteItems()'); + } else { + // $log.debug('HeaderCtrl::loadFavorites: loadFavorites is NOT calling generateFavoriteItems()'); + } + } + + $scope.goToUrl = (item) => { + // $log.error('HeaderCtrl::goToUrl has started',item); + let url = item.url; + let restrictedApp = item.restrictedApp; + if (!url) { + $log.warn('HeaderCtrl::goToUrl: No url found for this application, doing nothing..'); + return; + } + if (restrictedApp) { + $window.open(url, '_blank'); + } else { + if(item.url=="getAccess" || item.url=="contactUs"){ + // if (url = window.location.href) + $state.go("root."+url); + } else { + var tabContent = { id: new Date(), title: item.text, url: item.url,appId:item.appid }; + $cookies.putObject('addTab', tabContent ); + } + // $log.debug('HeaderCtrl::goToUrl: url = ', url); + } + $scope.hideMenus = true; + } + + + + $scope.submenuLevelAction = function(index, column) { + if ($scope.favoritesMenuItems == '') { + generateFavoriteItems(); + // $log.debug('HeaderCtrl::submenuLevelAction: submenuLevelAction is calling generateFavoriteItems()'); + } else { + // $log.debug('submenuLevelAction is NOT calling generateFavoriteItems()'); + } + // $log.debug('item hovered: ' + index + '; column = ' + column); + // if (column == 2) { // 2 is Design + // // This is an admitted hack. See aw3218 for reasons why + // $log.debug('submenuLevelAction column == 2'); + // $scope.favoritesWindow = false; + // $scope.showFavorites = false; + // $scope.emptyFavorites = false; + // } + if (index=='Favorites' && $scope.favoriteItemsCount != 0) { + // $log.debug('HeaderCtrl::submenuLevelAction: Showing Favorites window'); + // generateFavoriteItems(); + $scope.favoritesWindow = true; + $scope.showFavorites = true; + $scope.emptyFavorites = false; + } + if (index=='Favorites' && $scope.favoriteItemsCount == 0) { + // $log.debug('HeaderCtrl::submenuLevelAction: Hiding Favorites window in favor of No Favorites Window'); + // generateFavoriteItems(); + $scope.favoritesWindow = true; + $scope.showFavorites = false; + $scope.emptyFavorites = true; + } + if (index!='Favorites' ) { + $scope.favoritesWindow = false; + $scope.showFavorites = false; + $scope.emptyFavorites = false; + } + + }; + + $scope.hideFavoritesWindow = function() { + $scope.showFavorites = false; + $scope.emptyFavorites = false; + // $scope.thirdFourthMenus = true; + } + + $scope.isUrlFavorite = function (menuId) { + // $log.debug('array objects in menu favorites = ' + $scope.favoriteItemsCount + '; menuId=' + menuId); + var jsonMenu = JSON.stringify($scope.favoritesMenuItems); + var isMenuFavorite = jsonMenu.indexOf('menuId\":' + menuId); + // $log.debug('jsonMenu.indexOf(menuId:' + jsonMenu.indexOf('menuId\":'+menuId)); + // $log.debug('isMenuFavorite= ' + isMenuFavorite); + if (isMenuFavorite==-1) { + return false; + } else { + return true; + } + + } + + /*Getting Ecomp portal Title*/ + + let getEcompPortalTitle = () => { + menusService.getEcompPortalTitle() + .then(title=> { + $scope.ecompTitle = title.response; + }).catch(err=> { + $log.error('HeaderCtrl.getEcompPortalTitle:: Error retrieving ECMOP portal title: ' + err); + }); + } + getEcompPortalTitle(); + + let generateFavoriteItems = () => { + menusService.getFavoriteItems() + .then(favorites=> { + // $log.debug('HeaderCtrl.getFavoriteItems:: ' + JSON.stringify(favorites)); + $scope.favoritesMenuItems = favorites; + $scope.favoriteItemsCount = Object.keys(favorites).length; + // $log.info('HeaderCtrl.getFavoriteItems:: number of favorite menus: ' + $scope.favoriteItemsCount); + }).catch(err=> { + $log.error('HeaderCtrl.getFavoriteItems:: Error retrieving Favorites menus: ' + err); + }); + } + + $scope.setAsFavoriteItem = function(event, menuId){ + var jsonMenuID = angular.toJson({'menuId': + menuId }); + // $log.debug('HeaderCtrl::setFavoriteItems: ' + jsonMenuID + " - " + event.target.id); + + menusService.setFavoriteItem(jsonMenuID) + .then(() => { + // var elementId = '#'+ event.currentTarget.id; + angular.element('#' + event.target.id).css('color', '#fbb313'); + generateFavoriteItems(); + }).catch(err=> { + $log.error('HeaderCtrl::setFavoriteItems:: API setFavoriteItem error: ' + err); + }); + }; + + $scope.removeAsFavoriteItem = function(event, menuId){ + // $log.debug('-----------------------------removeAsFavoriteItem: ' + menuId + " - " + event.target.id); + menusService.removeFavoriteItem(menuId) + .then(() => { + angular.element('#' + event.target.id).css('color', '#666666'); + generateFavoriteItems(); + }).catch(err=> { + $log.error('HeaderCtrl::removeAsFavoriteItem: API removeFavoriteItem error: ' + err); + }); + }; + + $scope.goToPortal = (headerText, url) => { + if (!url) { + $log.warn('HeaderCtrl::goToPortal: No url found for this application, doing nothing..'); + return; + } + if (!ECOMP_URL_REGEX.test(url)) { + url = 'http://' + url; + } + + if(headerText.startsWith("vUSP")) { + window.open(url, '_blank');//, '_self' + } + else { + var tabContent = { id: new Date(), title: headerText, url: url }; + $cookies.putObject('addTab', tabContent ); + } + }; + + $scope.editProfile = () => { + let data = null; + + ngDialog.open({ + templateUrl: 'app/views/header/profile-edit-dialogs/profile-edit.modal.html', + controller: 'EditProfileModalCtrl', + controllerAs: 'profileDetail', + data: '' + }).closePromise.then(needUpdate => { + if(needUpdate.value === true){ + // $log.debug('AdminsCtrl:openAddNewAdminModal:: updating table data...'); + updateTableData(); + } + }); + }; + } + } + class LoginSnippetCtrl { + constructor($log, $scope, $cookies, $timeout, userProfileService, sessionService) { + $scope.firstName=""; + $scope.lastName=""; + $scope.displayUserAppRoles=false; + $scope.allAppsLogout = function(){ + + var cookieTabs = $cookies.getObject('visInVisCookieTabs'); + if(cookieTabs!=null){ + for(var t in cookieTabs){ + + var url = cookieTabs[t].content; + if(url != "") { + sessionService.logout(url); + } + } + } + // wait for individual applications to log out before the portal logout + $timeout(function() { + window.location = "logout.htm"; + }, 2000); + } + + + try { + userProfileService.getFunctionalMenuStaticInfo() + .then(res=> { + // $log.info('HeaderCtrl::LoginSnippetCtrl: Login information: ' + JSON.stringify(res)); + $scope.firstName = res.firstName; + $scope.lastName = res.lastName; + $scope.loginSnippetEmail = res.email; + $scope.loginSnippetUserid = res.userId; + $scope.lastLogin = res.last_login; + }).catch(err=> { + $log.error('HeaderCtrl::LoginSnippetCtrl: failed in getFunctionalMenuStaticInfo: ' + err); + }); + } catch (err) { + $log.error('HeaderCtrl::LoginSnippetCtrl caught exception: ' + err); + } + + $scope.getUserApplicationRoles= function(){ + $scope.userapproles = []; + if($scope.displayUserAppRoles) + $scope.displayUserAppRoles = false; + else + $scope.displayUserAppRoles = true; + + userProfileService.getUserAppRoles($scope.loginSnippetUserid) + .then(res=>{ + + for(var i=0;i { + notificationService.decrementRefreshCount(); + var count = notificationService.getRefreshCount(); + if (res==null || res.data==null || res.data.message!='success') { + $log.error('NotificationCtrl::updateNotifications: failed to get notifications'); + if (intervalPromise != null) + $interval.cancel(intervalPromise); + } else if(count<=0){ + if (intervalPromise != null) + $interval.cancel(intervalPromise); + } else { + $scope.notifications = []; + notificationService.setNotificationCount(res.data.response.length); + for(var i=0;i { + $log.error('NotificationCtrl::getNotification: caught exception: ' + err); + if (intervalPromise != null) + $interval.cancel(intervalPromise); + }); + } + $scope.getNotification(); + function updateNotifications() { + $scope.getNotification(); + } + $scope.start = function(rate) { + // stops any running interval to avoid two intervals running at the same time + $scope.stop(); + // store the interval promise + intervalPromise = $interval(updateNotifications, rate); + }; + + $scope.stop = function() { + $interval.cancel(intervalPromise); + }; + + $scope.showDetailedJsonMessage=function (selectedAdminNotification) { + notificationService.getMessageRecipients(selectedAdminNotification.id).then(res =>{ + $scope.messageRecipients = res; + var messageObject=JSON.parse(selectedAdminNotification.message); + var html=""; + html+='

'+'Message Source'+' : '+selectedAdminNotification.source+'

'; + html+='

'+'Message Title'+' : '+selectedAdminNotification.title+'

'; + html+='

'+'Message Recipient'+' : '+$scope.messageRecipients+'

'; + + for(var field in messageObject){ + if(field=='eventDate'||field=='lastModifiedDate'){ + html+='

'+field+' : '+new Date(+messageObject[field])+'

'; + + }else{ + html+='

'+field+' : '+messageObject[field]+'

'; + + } + } + + var modalInstance = ngDialog.open({ + templateUrl: 'app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html', + controller: 'userNotificationCtrl', + resolve: { + message: function () { + var message = { + title: '', + text: html + + }; + return message; + }, + + } + }); + + }).catch(err => { + $log.error('userNotificationsCtrl:getMessageRecipients:: error ', err); + $scope.isLoadingTable = false; + }); + }; + + notificationService.getNotificationRate().then(res=> { + if (res == null || res.response == null) { + $log.error('NotificationCtrl: failed to notification update rate or duration, check system.properties file.'); + } else { + var rate = parseInt(res.response.updateRate); + var duration = parseInt(res.response.updateDuration); + notificationService.setMaxRefreshCount(parseInt(duration/rate)+1); + notificationService.setRefreshCount(notificationService.maxCount); + if (rate != NaN && duration != NaN) { + $scope.updateRate=rate; + $scope.start($scope.updateRate); + } + } + }).catch(err=> { + $log.error('NotificationCtrl: getNotificationRate() failed: ' + err); + }); + + $scope.deleteNotification = function(index){ + if ($scope.notifications[index].id == null || $scope.notifications[index].id == '') { + $log.error('NotificationCtrl: failed to delete Notification.'); + return; + } + notificationService.setNotificationRead($scope.notifications[index].id); + $scope.notifications.splice(index,1); + notificationService.setNotificationCount($scope.notifications.length); + } + } + } + + class RecommendationCtrl{ + constructor($log, $scope, $cookies, $timeout, sessionService,recommendationService,notificationService,$interval,ngDialog) { + $scope.recommendations=[]; + var intervalPromise = null; + $scope.recommendationCount= recommendationService.recommendationCount; + console.log("$",$); + $scope.getRecommendations = function(){ + $("#recommendation-bulb").removeClass('icon-misc-bulbL').addClass('icon-misc-bulb') + recommendationService.getRecommendations() + + .then(res=> { + $("#recommendation-bulb").removeClass('icon-misc-bulb').addClass('icon-misc-bulbL') + recommendationService.decrementRefreshCount(); + var count = recommendationService.getRefreshCount(); + if ( res.data==null) { + $log.error('RecommendationCtrl::update Recommendation: failed to get recommendation'); + if (intervalPromise != null) + $interval.cancel(intervalPromise); + } else if(count>=0){ + if (intervalPromise != null) + $interval.cancel(intervalPromise); + } else { + $scope.recommendations = []; + recommendationService.setRecommendationCount(res.data.recommendations.length); + for(var i=0;i { + $log.error('RecommendationCtrl::gatRecommendations: caught exception: ' + err); + if (intervalPromise != null) + $interval.cancel(intervalPromise); + }); + } + $scope.getRecommendations(); + + function updateRecommendations() { + $scope.getRecommendations(); + } + + notificationService.getNotificationRate().then(res=> { + if (res == null || res.response == null) { + $log.error('NotificationCtrl: failed to notification update rate or duration, check system.properties file.'); + } else { + var rate = parseInt(res.response.updateRate); + var duration = parseInt(res.response.updateDuration); + notificationService.setMaxRefreshCount(parseInt(duration/rate)+1); + notificationService.setRefreshCount(notificationService.maxCount); + if (rate != NaN && duration != NaN) { + $scope.updateRate=rate; + setInterval(function(){$scope.getRecommendations();},rate); + + } + } + }).catch(err=> { + $log.error('NotificationCtrl: getNotificationRate() failed: ' + err); + }); + $scope.deleteRecommendation = function(index){ + if ($scope.recommendations[index] == null || $scope.recommendations[index] == '') { + $log.error('RecommendationCtrl: failed to delete Recommendation.'); + return; + } + $scope.recommendations.splice(index,1); + recommendationService.setRecommendationCount($scope.recommendations.length); + } + } + } + NotificationCtrl.$inject = ['$log', '$scope', '$cookies', '$timeout', 'sessionService','notificationService','$interval','ngDialog']; + RecommendationCtrl.$inject = ['$log', '$scope', '$cookies', '$timeout', 'sessionService','recommendationService','notificationService','$interval','ngDialog']; + LoginSnippetCtrl.$inject = ['$log', '$scope', '$cookies', '$timeout','userProfileService', 'sessionService']; + HeaderCtrl.$inject = ['$log', '$window', 'userProfileService', 'menusService', '$scope', 'ECOMP_URL_REGEX','$cookies','$state','auditLogService','notificationService','recommendationService','ngDialog']; + angular.module('ecompApp').controller('HeaderCtrl', HeaderCtrl); + angular.module('ecompApp').controller('loginSnippetCtrl', LoginSnippetCtrl); + angular.module('ecompApp').controller('notificationCtrl', NotificationCtrl); + angular.module('ecompApp').controller('recommendationCtrl', RecommendationCtrl); + +})(); diff --git a/ecomp-portal-FE-common/client/app/views/header/header.controller.spec.js b/ecomp-portal-FE-common/client/app/views/header/header.controller.spec.js index 3841a2b3..32cc3a1f 100644 --- a/ecomp-portal-FE-common/client/app/views/header/header.controller.spec.js +++ b/ecomp-portal-FE-common/client/app/views/header/header.controller.spec.js @@ -1,19 +1,19 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ diff --git a/ecomp-portal-FE-common/client/app/views/header/header.less b/ecomp-portal-FE-common/client/app/views/header/header.less index ec57812c..b553cebb 100644 --- a/ecomp-portal-FE-common/client/app/views/header/header.less +++ b/ecomp-portal-FE-common/client/app/views/header/header.less @@ -197,6 +197,21 @@ width: 16px; } + .recommendations-count + { + .border-radius(50%); + background:#db3434; + color: @colorWhite; + font-size: 10px; + padding-top: 2px; + height: 16px; + position: absolute; + right: -7px; + text-align: center; + top: -8px; + width: 16px; + } + .notification-header{ border-bottom: 1px solid #b4b4b4; padding: 10px 40px 0px 40px; @@ -291,7 +306,7 @@ .normal { .border-radius(50%); - background: @colorPeterRiver; + background: steelblue; content: ''; height: 8px; width: 8px; @@ -324,7 +339,7 @@ .button-dismiss { - color: @colorSilver; + color: black; font-size: 15px; &:hover, @@ -399,7 +414,7 @@ } .b2b-header-tabs .header__items{ - width:90%; + width:98%; } .b2b-header-tabs .header-secondary, .b2b-header-tabs .header-tertiary{ @@ -407,6 +422,12 @@ } +.b2b-header-tabs .header__item.profile{ + margin-right:70px; + float:right; + position: static; +} + .third-level-menu{ column-count: 4; line-height: 12px; @@ -426,10 +447,11 @@ column-count: 4; .b2b-header-tabs .third-level-menu li a { color: #333; - display: inline-grid; + display: inline-flex; padding: 7px 15px; - max-width: 228px; font-family:"Omnes-ECOMP-W02", Arial; + margin-top:5px; + margin-bottom:5px; } .b2b-header-tabs .third-level-menu li{ @@ -491,6 +513,24 @@ column-count: 4; width:100%; } -.display-userAppRoles-label span{ +.display-userAppRoles-label{ font-family:"Omnes-ECOMP-W02", Arial; -} \ No newline at end of file + white-space:nowrap; +} + +.profile-detail-extension{ + display:inline-block; +} + +.logout-btn-div{ + display:inline-block; + padding-top: 8px; + +} + +.onap-title-logo{ + position: relative; + top: 7px; + width: 126.8px; + height: 28px; +} diff --git a/ecomp-portal-FE-common/client/app/views/header/header.tpl.html b/ecomp-portal-FE-common/client/app/views/header/header.tpl.html index 65a34ed1..3d1d3305 100644 --- a/ecomp-portal-FE-common/client/app/views/header/header.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/header/header.tpl.html @@ -1,266 +1,330 @@ - -
-
- -
-
+ +
+
+ +
+
diff --git a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html index a8b20739..40b6fb30 100644 --- a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html +++ b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.html @@ -1,205 +1,211 @@ - -
-
microservice Details
- -
-
-
-
-
microservice Name
- - -
-
- Microservice - Name is required Microservice - Name must be letters, numbers, or underscore -
-
- -
- Name not available - choose different - name -
-
- -
-
microservice Description
- -
- Microservice Description is required -
-
- - - -
-
Client Widgets
-
{{widget.name}}
-
- -
-
Application Name
-
-
- -
-
- -
- Please select microservice - Application -
-
- -
-
microservice Endpoint URL
- - -
- Microservice Endpoint URL is required -
-
- -
-
Security Type
-
-
- -
-
-
- -
-
Username
- -
- -
-
Password
- -
- - -
-
-
Test Microservice
-
-
-
Test
-
-
- -
-
JSON output
- -
- -
-
Add User Parameter
-
-
-
-
- Parameter Key
-
- Parameter Default Value
- -
- -
- -
-
- -
- -
-
- -
- -
Active
-
- -
- -
-
- - -
-
-
- - -
-
+ +
+
Microservice Details
+ +
+
+
+
+
Microservice Name
+ + +
+
+ Microservice + Name is required Microservice + Name must be letters, numbers, or underscore +
+
+ +
+ Name not available - choose different + name +
+
+ +
+
Microservice Description
+ +
+ Microservice Description is required +
+
+ + + +
+
Client Widgets
+
{{widget.name}}
+
+ +
+
Application Name
+
+
+ +
+
+ +
+ Please select microservice + Application +
+
+ +
+
Microservice Endpoint URL
+ + +
+ Microservice Endpoint URL is required +
+
+ +
+
Security Type
+
+
+ +
+
+
+ +
+
Username
+ +
+ +
+
Password
+ +
+ + +
+
+
Test Microservice
+
+
+
Test
+
+
+ +
+
JSON output
+ +
+ +
+
Add User Parameter
+
+
+
+
+ Parameter Key
+
+ Parameter Default Value
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
Active
+
+ +
+ +
+
+ + +
+
+
+ + +
+
+ + diff --git a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.js b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.js index f6123349..8ce9be64 100644 --- a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.js +++ b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-add-details/microservice-add-details.js @@ -1,336 +1,337 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; -(function () { - class MicroserviceAddDetailsCtrl { - constructor($scope, $log, $interval, widgetsCatalogService, applicationsService, adminsService, microserviceService, errorMessageByCode, ECOMP_URL_REGEX, $window,userProfileService, confirmBoxService, $cookies) { - - - let getAvailableApps = () => { - applicationsService.getAppsForSuperAdminAndAccountAdmin().then(apps => { - this.availableApps=[]; - apps.unshift({ - id: 1, - name: "ECOMP Portal" - }); - for(var i = 0; i < apps.length; i++) { - this.availableApps.push({ - id: apps[i].id, - name: apps[i].name - }); - if(this.isEditMode == true && this.service.appId == apps[i].id){ - this.service.application = this.availableApps[i]; - } - } - }).catch(err => { - $log.error(err); - }); - }; - - let getAvailableWidgets = () => { - microserviceService.getWidgetListByService(this.service.id).then(widgets =>{ - this.availableWidgets = []; - for(var i = 0; i < widgets.length; i++){ - this.availableWidgets.push({ - name: widgets[i] - }) - } - }).catch(err => { - $log.error(err); - }); - }; - - - let getAvailableSecurityTypes = () => { - this.availableSecurityTypes = []; - this.availableSecurityTypes.push({ - id: 0, - name: 'No Authentication' - }); - this.availableSecurityTypes.push({ - id: 1, - name: 'Basic Authentication' - }); - this.availableSecurityTypes.push({ - id: 2, - name: 'Cookie based Authentication' - }); - } - - let init = () => { - $log.info('MicroserviceAddDetailsCtrl::init'); - this.service = []; - this.service.parameterList = []; - this.service.active = true; - this.emptyServiceName = false; - this.emptyServiceDesc = false; - this.emptyServiceURL = false; - this.emptyServiceApp = false; - this.dupliateName = false; - this.serviceList = $scope.ngDialogData.list; - - if ($scope.ngDialogData && $scope.ngDialogData.service) { - - this.isEditMode = true; - this.service = _.clone($scope.ngDialogData.service); - - console.log(this.service); - if(this.service.active == 'Y') - this.service.active = true; - else - this.service.active = false; - } else { - this.isEditMode = false; - } - getAvailableApps(); - getAvailableSecurityTypes(); - //getAvailableWidgets(); - - /** - * 0: Basic Authentication - * - * TODO: change the structure - */ - if(this.service.securityType == "No Authentication"){ - this.service.security = this.availableSecurityTypes[0]; - }else if(this.service.securityType == "Basic Authentication"){ - this.service.security = this.availableSecurityTypes[1]; - }else if(this.service.securityType == "Cookie based Authentication"){ - this.service.security = this.availableSecurityTypes[2]; - } - }; - - this.ECOMP_URL_REGEX = ECOMP_URL_REGEX; - this.conflictMessages = {}; - this.scrollApi = {}; - - let resetConflict = fieldName => { - delete this.conflictMessages[fieldName]; - if($scope.widgetForm[fieldName]){ - $scope.widgetForm[fieldName].$setValidity('conflict', true); - } - }; - - this.addParameter = () => { - document.getElementById('microservice-scroll-end').scrollIntoView(); - this.service.parameterList.push({}); - } - - this.closeThisDialog = () => { - $scope.closeThisDialog(true); - } - - this.removeParamItem = (parameter) => { - microserviceService.getUserParameterById(parameter.id).then((res) => { - if(res.length > 0){ - var message = res.length + " users have their own widget parameters. Are you sure you want to delete?"; - confirmBoxService.editItem(message).then(isConfirmed => { - if(isConfirmed){ - microserviceService.deleteUserParameterById(parameter.id).then((res) => { - for(var i = 0; i < this.service.parameterList.length; i++){ - if(this.service.parameterList[i].para_key == parameter.para_key - && this.service.parameterList[i].para_value == parameter.para_value){ - this.service.parameterList.splice(i, 1); - return; - } - } - }); - } - }); - } - else{ - for(var i = 0; i < this.service.parameterList.length; i++){ - if(this.service.parameterList[i].para_key == parameter.para_key - && this.service.parameterList[i].para_value == parameter.para_value){ - this.service.parameterList.splice(i, 1); - return; - } - } - } - }); - - - } - - this.updateServiceName = () => { - this.dupliateName = false; - for(var i = 0; i < this.serviceList.length; i++){ - if(this.serviceList[i].name == this.service.name){ - this.dupliateName = true; - return; - } - } - } - - this.updateDesc = () => { - this.emptyServiceDesc = false; - } - - this.updateURL = () => { - this.emptyServiceURL = false; - } - - this.updateApp = () => { - this.emptyServiceApp = false; - } - - //This is a fix for dropdown selection, due to b2b dropdown only update value field - $scope.$watch('microserviceAddDetails.service.application.name', (newVal, oldVal) => { - for(var i=0;i<$scope.microserviceAddDetails.availableApps.length;i++){ - if($scope.microserviceAddDetails.availableApps[i].name==newVal){ - $scope.microserviceAddDetails.service.application=angular.copy($scope.microserviceAddDetails.availableApps[i]); - } - } - }); - $scope.$watch('microserviceAddDetails.service.security.name', (newVal, oldVal) => { - for(var i=0;i<$scope.microserviceAddDetails.availableSecurityTypes.length;i++){ - if($scope.microserviceAddDetails.availableSecurityTypes[i].name==newVal){ - $scope.microserviceAddDetails.service.security=angular.copy($scope.microserviceAddDetails.availableSecurityTypes[i]); - } - } - }); - - let emptyCookies = () => { - userProfileService.getUserProfile() - .then(profile=> { - $log.info('AppDetailsModalCtrl::emptyCookies profile: ', profile); - $scope.attuid = profile.attuid; - $log.info('user has the following attuid: ' + profile.attuid); - if ($cookies.getObject($scope.attuid + '_widget') != undefined && $cookies.getObject($scope.attuid + '_widget') != null) { - $cookies.remove($scope.attuid + '_widget'); - } - }); - }; - - this.testServiceURL = () =>{ - //console.log(this.service.id); - widgetsCatalogService.getServiceJSON(this.service.id).then(res => { - document.getElementById("microservice-details-input-json").innerHTML = (JSON.stringify(res)); - }); - } - - this.saveChanges = () => { - /* TODO: add form validation */ - - var isValid = true; - this.updateServiceName(); - - if(this.service.name == '' - || this.service.name == undefined){ - this.emptyServiceName = true; - isValid = false; - } - - if(this.dupliateName == true - && this.isEditMode == false){ - isValid = false; - } - - - if(this.service.desc == '' - || this.service.desc == undefined){ - this.emptyServiceDesc = true; - isValid = false; - } - - if(this.service.url == '' - || this.service.url == undefined){ - this.emptyServiceURL = true; - isValid = false; - } - - if(this.service.application == undefined - || this.service.application == null){ - this.emptyServiceApp = true; - isValid = false; - } - - if(!isValid) - return; - - /* - * Check the parameter list, delete those parameters that don't - * have key - */ - for(var i = 0; i < this.service.parameterList.length; i++){ - if(this.service.parameterList[i].para_key == undefined - || this.service.parameterList[i].para_key == null - || this.service.parameterList[i].para_key == ""){ - this.service.parameterList.splice(i, 1); - i--; - } - } - - var securityType; - var username; - var password; - if(this.service.security == undefined || - this.service.security == null) - securityType = "No Authentication"; - else{ - securityType = this.service.security.name; - username = this.service.username; - password = this.service.password; - } - - var active = 'N'; - if(this.service.active == true) - active = 'Y'; - - var newService = { - name: this.service.name, - desc: this.service.desc, - appId: this.service.application.id, - url: this.service.url, - securityType: securityType, - username: username, - password: password, - active: active, - parameterList: this.service.parameterList - }; - - if(this.isEditMode){ - // console.log(this.service.parameterList); - var message = "Are you sure you want to change '" + this.service.name + "'?" - confirmBoxService.editItem(message).then(isConfirmed => { - if(isConfirmed){ - microserviceService.updateService(this.service.id, newService).then(() => { - // TODO: result validation check - this.closeThisDialog(); - }); - } - }); - }else{ - microserviceService.createService(newService).then(() => { - // TODO: result validation check - $scope.closeThisDialog(true); - }); - } - - }; - init(); - $scope.$on('$stateChangeStart', e => { - e.preventDefault(); - }); - } - } - MicroserviceAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'widgetsCatalogService', 'applicationsService', 'adminsService', 'microserviceService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window','userProfileService', 'confirmBoxService', '$cookies']; - angular.module('ecompApp').controller('MicroserviceAddDetailsCtrl', MicroserviceAddDetailsCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; +(function () { + class MicroserviceAddDetailsCtrl { + constructor($scope, $log, $interval, widgetsCatalogService, applicationsService, adminsService, microserviceService, errorMessageByCode, ECOMP_URL_REGEX, $window,userProfileService, confirmBoxService, $cookies) { + + + let getAvailableApps = () => { + applicationsService.getAppsForSuperAdminAndAccountAdmin().then(apps => { + this.availableApps=[]; + apps.unshift({ + id: 1, + name: "ECOMP Portal" + }); + for(var i = 0; i < apps.length; i++) { + this.availableApps.push({ + id: apps[i].id, + name: apps[i].name + }); + if(this.isEditMode == true && this.service.appId == apps[i].id){ + this.service.application = this.availableApps[i]; + } + } + }).catch(err => { + $log.error(err); + }); + }; + + let getAvailableWidgets = () => { + microserviceService.getWidgetListByService(this.service.id).then(widgets =>{ + this.availableWidgets = []; + for(var i = 0; i < widgets.length; i++){ + this.availableWidgets.push({ + name: widgets[i] + }) + } + }).catch(err => { + $log.error(err); + }); + }; + + + let getAvailableSecurityTypes = () => { + this.availableSecurityTypes = []; + this.availableSecurityTypes.push({ + id: 0, + name: 'No Authentication' + }); + this.availableSecurityTypes.push({ + id: 1, + name: 'Basic Authentication' + }); + this.availableSecurityTypes.push({ + id: 2, + name: 'Cookie based Authentication' + }); + } + + let init = () => { + $log.info('MicroserviceAddDetailsCtrl::init'); + this.service = []; + this.availableApps=[]; + this.service.parameterList = []; + this.service.active = true; + this.emptyServiceName = false; + this.emptyServiceDesc = false; + this.emptyServiceURL = false; + this.emptyServiceApp = false; + this.dupliateName = false; + this.serviceList = $scope.ngDialogData.list; + + if ($scope.ngDialogData && $scope.ngDialogData.service) { + + this.isEditMode = true; + this.service = _.clone($scope.ngDialogData.service); + + this.originalName = this.service.name; + if(this.service.active == 'Y') + this.service.active = true; + else + this.service.active = false; + } else { + this.isEditMode = false; + } + getAvailableApps(); + getAvailableSecurityTypes(); + //getAvailableWidgets(); + + /** + * 0: Basic Authentication + * + * TODO: change the structure + */ + if(this.service.securityType == "No Authentication"){ + this.service.security = this.availableSecurityTypes[0]; + }else if(this.service.securityType == "Basic Authentication"){ + this.service.security = this.availableSecurityTypes[1]; + }else if(this.service.securityType == "Cookie based Authentication"){ + this.service.security = this.availableSecurityTypes[2]; + } + }; + + this.ECOMP_URL_REGEX = ECOMP_URL_REGEX; + this.conflictMessages = {}; + this.scrollApi = {}; + + let resetConflict = fieldName => { + delete this.conflictMessages[fieldName]; + if($scope.widgetForm[fieldName]){ + $scope.widgetForm[fieldName].$setValidity('conflict', true); + } + }; + + this.addParameter = () => { + document.getElementById('microservice-scroll-end').scrollIntoView(); + this.service.parameterList.push({}); + } + + this.closeThisDialog = () => { + $scope.closeThisDialog(true); + } + + this.removeParamItem = (parameter) => { + microserviceService.getUserParameterById(parameter.id).then((res) => { + if(res.length > 0){ + var message = res.length + " users have their own widget parameters. Are you sure you want to delete?"; + confirmBoxService.editItem(message).then(isConfirmed => { + if(isConfirmed){ + microserviceService.deleteUserParameterById(parameter.id).then((res) => { + for(var i = 0; i < this.service.parameterList.length; i++){ + if(this.service.parameterList[i].para_key == parameter.para_key + && this.service.parameterList[i].para_value == parameter.para_value){ + this.service.parameterList.splice(i, 1); + return; + } + } + }); + } + }); + } + else{ + for(var i = 0; i < this.service.parameterList.length; i++){ + if(this.service.parameterList[i].para_key == parameter.para_key + && this.service.parameterList[i].para_value == parameter.para_value){ + this.service.parameterList.splice(i, 1); + return; + } + } + } + }); + + + } + + this.updateServiceName = () => { + this.dupliateName = false; + for(var i = 0; i < this.serviceList.length; i++){ + if(this.serviceList[i].name == this.service.name){ + if(this.isEditMode && this.service.name == this.originalName) + continue; + this.dupliateName = true; + return; + } + } + } + + this.updateDesc = () => { + this.emptyServiceDesc = false; + } + + this.updateURL = () => { + this.emptyServiceURL = false; + } + + this.updateApp = () => { + this.emptyServiceApp = false; + } + + //This is a fix for dropdown selection, due to b2b dropdown only update value field + $scope.$watch('microserviceAddDetails.service.application.name', (newVal, oldVal) => { + for(var i=0;i<$scope.microserviceAddDetails.availableApps.length;i++){ + if($scope.microserviceAddDetails.availableApps[i].name==newVal){ + $scope.microserviceAddDetails.service.application=angular.copy($scope.microserviceAddDetails.availableApps[i]); + } + } + }); + $scope.$watch('microserviceAddDetails.service.security.name', (newVal, oldVal) => { + for(var i=0;i<$scope.microserviceAddDetails.availableSecurityTypes.length;i++){ + if($scope.microserviceAddDetails.availableSecurityTypes[i].name==newVal){ + $scope.microserviceAddDetails.service.security=angular.copy($scope.microserviceAddDetails.availableSecurityTypes[i]); + } + } + }); + + let emptyCookies = () => { + userProfileService.getUserProfile() + .then(profile=> { + $log.info('AppDetailsModalCtrl::emptyCookies profile: ', profile); + $scope.attuid = profile.attuid; + $log.info('user has the following attuid: ' + profile.attuid); + if ($cookies.getObject($scope.attuid + '_widget') != undefined && $cookies.getObject($scope.attuid + '_widget') != null) { + $cookies.remove($scope.attuid + '_widget'); + } + }); + }; + + this.testServiceURL = () =>{ + widgetsCatalogService.getServiceJSON(this.service.id).then(res => { + document.getElementById("microservice-details-input-json").innerHTML = (JSON.stringify(res)); + }); + } + + this.saveChanges = () => { + /* TODO: add form validation */ + + var isValid = true; + this.updateServiceName(); + + if(this.service.name == '' + || this.service.name == undefined){ + this.emptyServiceName = true; + isValid = false; + } + + if(this.dupliateName == true){ + isValid = false; + } + + + if(this.service.desc == '' + || this.service.desc == undefined){ + this.emptyServiceDesc = true; + isValid = false; + } + + if(this.service.url == '' + || this.service.url == undefined){ + this.emptyServiceURL = true; + isValid = false; + } + + if(this.service.application == undefined + || this.service.application == null){ + this.emptyServiceApp = true; + isValid = false; + } + + if(!isValid) + return; + + /* + * Check the parameter list, delete those parameters that don't + * have key + */ + for(var i = 0; i < this.service.parameterList.length; i++){ + if(this.service.parameterList[i].para_key == undefined + || this.service.parameterList[i].para_key == null + || this.service.parameterList[i].para_key == ""){ + this.service.parameterList.splice(i, 1); + i--; + } + } + + var securityType; + var username; + var password; + if(this.service.security == undefined || + this.service.security == null) + securityType = "No Authentication"; + else{ + securityType = this.service.security.name; + username = this.service.username; + password = this.service.password; + } + + var active = 'N'; + if(this.service.active == true) + active = 'Y'; + + var newService = { + name: this.service.name, + desc: this.service.desc, + appId: this.service.application.id, + url: this.service.url, + securityType: securityType, + username: username, + password: password, + active: active, + parameterList: this.service.parameterList + }; + + if(this.isEditMode){ + // console.log(this.service.parameterList); + var message = "Are you sure you want to change '" + this.service.name + "'?" + confirmBoxService.editItem(message).then(isConfirmed => { + if(isConfirmed){ + microserviceService.updateService(this.service.id, newService).then(() => { + // TODO: result validation check + this.closeThisDialog(); + }); + } + }); + }else{ + microserviceService.createService(newService).then(() => { + // TODO: result validation check + $scope.closeThisDialog(true); + }); + } + + }; + init(); + $scope.$on('$stateChangeStart', e => { + e.preventDefault(); + }); + } + } + MicroserviceAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'widgetsCatalogService', 'applicationsService', 'adminsService', 'microserviceService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window','userProfileService', 'confirmBoxService', '$cookies']; + angular.module('ecompApp').controller('MicroserviceAddDetailsCtrl', MicroserviceAddDetailsCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.less b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.less index 7565b432..74b1b6ae 100644 --- a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.less +++ b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.less @@ -1,14 +1,14 @@ .microservice-onboarding{ - //.bg_portalWhite;//white for 1702 - .bg_portalGray; // gray for 1610 - position: @page-main-position; - top: @page-main-top; - left: @page-main-left; - right: @page-main-right; - bottom: @page-main-bottom; - padding-top: @padding-top; - overflow-y: @page-main-overflow-y; - padding-left: @padding-left-side; + .bg_portalWhite;//white for 1702 + //.bg_portalGray; // gray for 1610 + position: @page-main-position; + top: @page-main-top; + left: @page-main-left; + right: @page-main-right; + bottom: @page-main-bottom; + padding-top: @padding-top; + overflow-y: @page-main-overflow-y; + padding-left: @padding-left-side; .microservices-table { width: @table-width; diff --git a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.tpl.html b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.tpl.html index e3b3128a..ecda542d 100644 --- a/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/microservice-onboarding/microservice-onboarding.tpl.html @@ -1,75 +1,75 @@ - -
-
-
-
Microservice Onboarding
-
-
-
- -
-
-
- - - - - - - - - - - - - - - -
{{header.name}}Delete
-
- 		-
-
-
-
-
-
-
-
-
+ +
+
+
+
Microservice Onboarding
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + +
{{header.name}}Delete
+
+ 		+
+
+
+
+
+
+
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.controller.js b/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.controller.js index 609dba38..a5ea9041 100644 --- a/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.controller.js +++ b/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.controller.js @@ -1,83 +1,91 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; - -(function () { - - class notificationHistoryCtrl { - constructor( $scope, $log,notificationService, confirmBoxService, $modal, ngDialog, $state) { - - var priorityItems={"1":"Normal","2":"Important"}; - $scope.priorityItems=priorityItems; - $scope.externalNotification="External System"; - $scope.isLoadingTable = false; - $scope.searchString = ''; - $scope.notificationHistory = []; - let getNotificationHistory = () => { - $scope.isLoadingTable = true; - notificationService.getNotificationHistory().then(res => { - $scope.notificationHistory = res.data; - $scope.isLoadingTable = false; - }).catch(err => { - $log.error('notificationHistoryCtlr:notifSvc.getNotifHist failed: ', err); - $scope.isLoadingTable = false; - }); - } - - getNotificationHistory(); - - $scope.showDetailedJsonMessage=function (selectedAdminNotification) { - var messageObject=JSON.parse(selectedAdminNotification.msgDescription); - var html=""; - html+='

'+'Message Source'+' : '+selectedAdminNotification.msgSource+'

'; - html+='

'+'Message Title'+' : '+selectedAdminNotification.msgHeader+'

'; - for(var field in messageObject){ - if(field=='eventDate'||field=='lastModifiedDate'){ - html+='

'+field+' : '+new Date(+messageObject[field])+'

'; - - }else{ - html+='

'+field+' : '+messageObject[field]+'

'; - - } - } - - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html', - controller: 'userNotificationCtrl', - resolve: { - message: function () { - var message = { - title: '', - text: html - - }; - return message; - }, - - } - }); - - - }; - } - } - notificationHistoryCtrl.$inject = ['$scope', '$log', 'notificationService', 'confirmBoxService', '$modal', 'ngDialog', '$state']; - angular.module('ecompApp').controller('notificationHistoryCtrl', notificationHistoryCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; + +(function () { + + class notificationHistoryCtrl { + constructor( $scope, $log,notificationService, confirmBoxService, $modal, ngDialog, $state) { + + var priorityItems={"1":"Normal","2":"Important"}; + $scope.priorityItems=priorityItems; + $scope.externalNotification="External System"; + $scope.isLoadingTable = false; + $scope.searchString = ''; + $scope.notificationHistory = []; + let getNotificationHistory = () => { + $scope.isLoadingTable = true; + notificationService.getNotificationHistory().then(res => { + $scope.notificationHistory = res.data; + $scope.isLoadingTable = false; + }).catch(err => { + $log.error('notificationHistoryCtlr:notifSvc.getNotifHist failed: ', err); + $scope.isLoadingTable = false; + }); + } + + getNotificationHistory(); + + $scope.showDetailedJsonMessage=function (selectedAdminNotification) { + notificationService.getMessageRecipients(selectedAdminNotification.notificationId).then(res =>{ + $scope.messageRecipients = res; + var messageObject=JSON.parse(selectedAdminNotification.msgDescription); + var html=""; + html+='

'+'Message Source'+' : '+selectedAdminNotification.msgSource+'

'; + html+='

'+'Message Title'+' : '+selectedAdminNotification.msgHeader+'

'; + html+='

'+'Message Recipient'+' : '+$scope.messageRecipients+'

'; + + for(var field in messageObject){ + if(field=='eventDate'||field=='lastModifiedDate'){ + html+='

'+field+' : '+new Date(+messageObject[field])+'

'; + + }else{ + html+='

'+field+' : '+messageObject[field]+'

'; + + } + } + + var modalInstance = ngDialog.open({ + templateUrl: 'app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html', + controller: 'userNotificationCtrl', + resolve: { + message: function () { + var message = { + title: '', + text: html + + }; + return message; + }, + + } + }); + + }).catch(err => { + $log.error('userNotificationsCtrl:getMessageRecipients:: error ', err); + $scope.isLoadingTable = false; + }); + + }; + } + } + notificationHistoryCtrl.$inject = ['$scope', '$log', 'notificationService', 'confirmBoxService', '$modal', 'ngDialog', '$state']; + angular.module('ecompApp').controller('notificationHistoryCtrl', notificationHistoryCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.tpl.html b/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.tpl.html index 5cd56e97..f5d0b292 100644 --- a/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/notification-history/notificationhistory.tpl.html @@ -1,100 +1,100 @@ - -
-
-
-

Recent Notifications

-
-
- -
-
This table shows - notifications published in the last 30 days.
-
- -
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - -
Message SourceMessageStart Date (Local Time)End Date (Local Time)PriorityCreated ByCreated Time
-
{{rowData.msgSource}}
- 		-
-
-
- 		-
- 		-
- 		-
- 		-
- 		-
-
-
-
-
-
+ +
+
+
+

Recent Notifications

+
+
+ +
+
This table shows + notifications published in the last 30 days.
+
+ +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
Message SourceMessageStart Date (Local Time)End Date (Local Time)PriorityCreated ByCreated Time
+
{{rowData.msgSource}}
+ 		+
+
+
+ 		+
+ 		+
+ 		+
+ 		+
+ 		+
+
+
+
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.js b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.js index 54575d39..466998a3 100644 --- a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.js +++ b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.js @@ -1,95 +1,95 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -/** - * Created by nnaffar on 12/8/15. - */ -'use strict'; -(function () { - class NewPortalAdminModalCtrl { - constructor($log, portalAdminsService, $scope, confirmBoxService) { - - let init = () => { - this.isSaving = false; - /* istanbul ignore if */ - if($scope.ngDialogData && $scope.ngDialogData.selectedUser && $scope.ngDialogData.dialogState){ - this.selectedUser = $scope.ngDialogData.selectedUser; - this.dialogState = $scope.ngDialogData.dialogState; - }else{ - this.selectedUser = null; - this.dialogState = 1; - } - //this.searchUsersInProgress = false; - //this.showNewAdminAppDropdown = false; - $log.info('NewPortalAdminModalCtrl:: initiated'); - }; - - this.addNewPortalAdmin = () => { - confirmBoxService.makeAdminChanges('Are you sure you want to add "' + this.selectedUser.firstName + ' ' + this.selectedUser.lastName + '" as a Portal Admin?') - .then(isConfirmed => { - if(isConfirmed) { - if (!this.selectedUser || !this.selectedUser.orgUserId) { - $log.error('NewPortalAdminModalCtrl::makeAdminChanges: No portal admin or ID... cannot add'); - return; - } - portalAdminsService.addPortalAdmin(this.selectedUser.orgUserId) - .then(() => { - $log.debug("NewPortalAdminModalCtrl::addNewPortalAdmin: portal admin added successfully"); - $scope.closeThisDialog(true); - }).catch(err => { - if(err.status === 409) { //Conflict - confirmBoxService.showInformation('This user already exists as a portal admin!').then(function (isConfirmed) { - $scope.closeThisDialog(true); - }); - } else { - confirmBoxService.showInformation('There was a unknown problem adding the portal admin. ' + 'Please try again later. Error Status: '+ err.status).then(function (isConfirmed) { - $scope.closeThisDialog(true); - }); - } - }); - } - }).catch(err => { - confirmBoxService.showInformation('There was a unknown problem adding the portal admin. ' + 'Please try again later. Error Status: '+ err.status).then(function (isConfirmed) { - $scope.closeThisDialog(true); - }); - $log.error('portalAdminsService.addPortalAdmin error status: '+ err.status); - }); - }; - - /** - * this function set the selected user - * @param user: selected user object - */ - this.setSelectedUser = (user) => { - $log.debug('NewPortalAdminModalCtrl::setSelectedUser: selected user: ', user); - this.selectedUser = user; - }; - - init(); - - $scope.$on('$stateChangeStart', e => { - //Disable navigation when modal is opened - //**Nabil - note: this will cause the history back state to be replaced with current state - e.preventDefault(); - }); - } - } - NewPortalAdminModalCtrl.$inject = ['$log', 'portalAdminsService', '$scope', 'confirmBoxService']; - angular.module('ecompApp').controller('NewPortalAdminModalCtrl', NewPortalAdminModalCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +/** + * Created by nnaffar on 12/8/15. + */ +'use strict'; +(function () { + class NewPortalAdminModalCtrl { + constructor($log, portalAdminsService, $scope, confirmBoxService) { + + let init = () => { + this.isSaving = false; + /* istanbul ignore if */ + if($scope.ngDialogData && $scope.ngDialogData.selectedUser && $scope.ngDialogData.dialogState){ + this.selectedUser = $scope.ngDialogData.selectedUser; + this.dialogState = $scope.ngDialogData.dialogState; + }else{ + this.selectedUser = null; + this.dialogState = 1; + } + //this.searchUsersInProgress = false; + //this.showNewAdminAppDropdown = false; + $log.info('NewPortalAdminModalCtrl:: initiated'); + }; + + this.addNewPortalAdmin = () => { + confirmBoxService.makeAdminChanges('Are you sure you want to add "' + this.selectedUser.firstName + ' ' + this.selectedUser.lastName + '" as a Portal Admin?') + .then(isConfirmed => { + if(isConfirmed) { + if (!this.selectedUser || !this.selectedUser.orgUserId) { + $log.error('NewPortalAdminModalCtrl::makeAdminChanges: No portal admin or ID... cannot add'); + return; + } + portalAdminsService.addPortalAdmin(this.selectedUser.orgUserId) + .then(() => { + $log.debug("NewPortalAdminModalCtrl::addNewPortalAdmin: portal admin added successfully"); + $scope.closeThisDialog(true); + }).catch(err => { + if(err.status === 409) { //Conflict + confirmBoxService.showInformation('This user already exists as a portal admin!').then(function (isConfirmed) { + $scope.closeThisDialog(true); + }); + } else { + confirmBoxService.showInformation('There was a unknown problem adding the portal admin. ' + 'Please try again later. Error Status: '+ err.status).then(function (isConfirmed) { + $scope.closeThisDialog(true); + }); + } + }); + } + }).catch(err => { + confirmBoxService.showInformation('There was a unknown problem adding the portal admin. ' + 'Please try again later. Error Status: '+ err.status).then(function (isConfirmed) { + $scope.closeThisDialog(true); + }); + $log.error('portalAdminsService.addPortalAdmin error status: '+ err.status); + }); + }; + + /** + * this function set the selected user + * @param user: selected user object + */ + this.setSelectedUser = (user) => { + $log.debug('NewPortalAdminModalCtrl::setSelectedUser: selected user: ', user); + this.selectedUser = user; + }; + + init(); + + $scope.$on('$stateChangeStart', e => { + //Disable navigation when modal is opened + //**Nabil - note: this will cause the history back state to be replaced with current state + e.preventDefault(); + }); + } + } + NewPortalAdminModalCtrl.$inject = ['$log', 'portalAdminsService', '$scope', 'confirmBoxService']; + angular.module('ecompApp').controller('NewPortalAdminModalCtrl', NewPortalAdminModalCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.spec.js b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.spec.js index 3841a2b3..32cc3a1f 100644 --- a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.spec.js +++ b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.controller.spec.js @@ -1,19 +1,19 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html index d328db82..206dc168 100644 --- a/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html +++ b/ecomp-portal-FE-common/client/app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html @@ -1,36 +1,42 @@ - -
- -
- - - -
- - - -
-
-
+ +
+ +
+ + + +
+ + + +
+
+
+ + diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin-controller.js b/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin-controller.js index 0051e708..89f6d0ae 100644 --- a/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin-controller.js +++ b/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin-controller.js @@ -1,110 +1,110 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; -(function () { - class PortalAdminsCtrl { - constructor($log, portalAdminsService, ngDialog, confirmBoxService) { - - let updateTableData = () => { - this.isLoadingTable = true; - portalAdminsService.getPortalAdmins().then(result=> { - $log.debug('PortalAdminsCtrl::updateTableData: result: ' + JSON.stringify(result)); - if (!result || !result.length) { - $log.info('PortalAdminsCtrl::updateTableData: no Portal Admins err handling'); - this.portalAdminsTableData = []; - return; - } - this.portalAdminsTableData = result; - }).catch(err=> { - $log.error('PortalAdminsCtrl::updateTableData error :',err); - confirmBoxService.showInformation('There was a problem retrieving the portal admins. ' + - 'Please try again later. Error: ' + err.status).then(isConfirmed => {}); - - }).finally(() => { - this.isLoadingTable = false; - }); - }; - - let init = () => { - $log.info('portalAdminsService.getPortalAdmins::initializing...'); - this.isLoadingTable = false; - - /*Table general configuration params*/ - this.searchString= ''; - /*Table data*/ - this.portalAdminsTableHeaders = ['First Name', 'Last Name', 'User ID', 'Delete']; - this.portalAdminsTableData = []; - updateTableData(); - }; - - init(); - - this.removePortalAdmin = pAdmin => { - $log.debug('PortalAdminsCtrl::removePortalAdmin: pAdmin = ' + JSON.stringify(pAdmin)); - confirmBoxService.deleteItem(pAdmin.firstName + ' ' + pAdmin.lastName ) - .then(isConfirmed => { - if(isConfirmed){ - if(!pAdmin || !pAdmin.userId){ - $log.error('PortalAdminsCtrl::removePortalAdmin No portal admin or ID... cannot delete'); - return; - } - portalAdminsService.removePortalAdmin(pAdmin.userId,pAdmin.loginId).then(() => { - $log.info("PortalAdminsCtrl::removePortalAdmin removed admin"); - init(); - }).catch(err => { - $log.error('PortalAdminsCtrl::removePortalAdmin.deleteItem error: '+ err); - confirmBoxService.showInformation('There was a problem deleting this portal admins. ' + - 'Please try again later. Error: ' + err.status).then(isConfirmed => {}); - }); - } - }).catch(err => { - $log.error('PortalAdminsCtrl::removePortalAdmin.deleteItem error: '+ err); - }); - }; - - this.openAddNewPortalAdminModal = (user) => { - let data = null; - if(user){ - data = { - dialogState: 2, - selectedUser:{ - orgUserId: user.orgUserId, - firstName: user.firstName, - lastName: user.lastName - } - } - } - ngDialog.open({ - templateUrl: 'app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html', - controller: 'NewPortalAdminModalCtrl', - controllerAs: 'newPortalAdmin', - data: data - }).closePromise.then(needUpdate => { - if(needUpdate.value === true){ - $log.debug('PortalAdminsCtrl::openAddNewPortalAdminModal: updating Portal Admin table data...'); - updateTableData(); - } - }); - }; - } - } - PortalAdminsCtrl.$inject = ['$log', 'portalAdminsService', 'ngDialog', 'confirmBoxService']; - angular.module('ecompApp').controller('PortalAdminsCtrl', PortalAdminsCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; +(function () { + class PortalAdminsCtrl { + constructor($log, portalAdminsService, ngDialog, confirmBoxService) { + + let updateTableData = () => { + this.isLoadingTable = true; + portalAdminsService.getPortalAdmins().then(result=> { + $log.debug('PortalAdminsCtrl::updateTableData: result: ' + JSON.stringify(result)); + if (!result || !result.length) { + $log.info('PortalAdminsCtrl::updateTableData: no Portal Admins err handling'); + this.portalAdminsTableData = []; + return; + } + this.portalAdminsTableData = result; + }).catch(err=> { + $log.error('PortalAdminsCtrl::updateTableData error :',err); + confirmBoxService.showInformation('There was a problem retrieving the portal admins. ' + + 'Please try again later. Error: ' + err.status).then(isConfirmed => {}); + + }).finally(() => { + this.isLoadingTable = false; + }); + }; + + let init = () => { + $log.info('portalAdminsService.getPortalAdmins::initializing...'); + this.isLoadingTable = false; + + /*Table general configuration params*/ + this.searchString= ''; + /*Table data*/ + this.portalAdminsTableHeaders = ['First Name', 'Last Name', 'User ID', 'Delete']; + this.portalAdminsTableData = []; + updateTableData(); + }; + + init(); + + this.removePortalAdmin = pAdmin => { + $log.debug('PortalAdminsCtrl::removePortalAdmin: pAdmin = ' + JSON.stringify(pAdmin)); + confirmBoxService.deleteItem(pAdmin.firstName + ' ' + pAdmin.lastName ) + .then(isConfirmed => { + if(isConfirmed){ + if(!pAdmin || !pAdmin.userId){ + $log.error('PortalAdminsCtrl::removePortalAdmin No portal admin or ID... cannot delete'); + return; + } + portalAdminsService.removePortalAdmin(pAdmin.userId,pAdmin.loginId).then(() => { + $log.info("PortalAdminsCtrl::removePortalAdmin removed admin"); + init(); + }).catch(err => { + $log.error('PortalAdminsCtrl::removePortalAdmin.deleteItem error: '+ err); + confirmBoxService.showInformation('There was a problem deleting this portal admins. ' + + 'Please try again later. Error: ' + err.status).then(isConfirmed => {}); + }); + } + }).catch(err => { + $log.error('PortalAdminsCtrl::removePortalAdmin.deleteItem error: '+ err); + }); + }; + + this.openAddNewPortalAdminModal = (user) => { + let data = null; + if(user){ + data = { + dialogState: 2, + selectedUser:{ + orgUserId: user.orgUserId, + firstName: user.firstName, + lastName: user.lastName + } + } + } + ngDialog.open({ + templateUrl: 'app/views/portal-admin/new-portal-admin/new-portal-admin.modal.html', + controller: 'NewPortalAdminModalCtrl', + controllerAs: 'newPortalAdmin', + data: data + }).closePromise.then(needUpdate => { + if(needUpdate.value === true){ + $log.debug('PortalAdminsCtrl::openAddNewPortalAdminModal: updating Portal Admin table data...'); + updateTableData(); + } + }); + }; + } + } + PortalAdminsCtrl.$inject = ['$log', 'portalAdminsService', 'ngDialog', 'confirmBoxService']; + angular.module('ecompApp').controller('PortalAdminsCtrl', PortalAdminsCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin.tpl.html b/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin.tpl.html index 43f830cc..33268efb 100644 --- a/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/portal-admin/portal-admin.tpl.html @@ -1,64 +1,64 @@ - -
-
-
-
-

Portal Admins

-
-
-
-
- -
-
- -
-
- - - -
- - - - - - - - - - - - - - - - - -
First NameLast NameUser IDDelete
- -
-
-
-
-
- -
+ +
+
+
+
+

Portal Admins

+
+
+
+
+ +
+
+ +
+
+ + + +
+ + + + + + + + + + + + + + + + + +
First NameLast NameUser IDDelete
+ +
+
+
+
+
+ +
diff --git a/ecomp-portal-FE-common/client/app/views/role/popup_modal_rolefunction.html b/ecomp-portal-FE-common/client/app/views/role/popup_modal_rolefunction.html index 3970960d..c5673da8 100644 --- a/ecomp-portal-FE-common/client/app/views/role/popup_modal_rolefunction.html +++ b/ecomp-portal-FE-common/client/app/views/role/popup_modal_rolefunction.html @@ -1,55 +1,59 @@ - - -
-
-
- -
-
- *Name:
- -
Name is Required -
-
-
-
-
- *Code: -
- -
Code is Required -
-
- - - -
- - - -
Cancel
-
-
-
- - + + +
+
+
+ +
+
+ *Name:
+ +
Name is Required +
+
+
+
+
+ *Code: +
+ +
Code is Required +
+
+ + + +
+ + + +
Cancel
+
+
+
+ + diff --git a/ecomp-portal-FE-common/client/app/views/role/role-controller.js b/ecomp-portal-FE-common/client/app/views/role/role-controller.js index c5c7c97c..2bd522a4 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role-controller.js +++ b/ecomp-portal-FE-common/client/app/views/role/role-controller.js @@ -1,219 +1,219 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ - -app.controller('roleController', function ($scope, $http, confirmBoxService, ngDialog, RoleService, conf, $stateParams){ - //$scope.role=${role}; - - $( "#dialogRoleFunction" ).hide(); - $( "#dialogChildRole" ).hide(); - - //$scope.ociavailableRoleFunctions=${availableRoleFunctions}; - $scope.fetchRoles = function() { - - RoleService.getRole($stateParams.roleId).then(function(data){ - - var j = data; - $scope.data = JSON.parse(j.data); - - $scope.role =JSON.parse($scope.data.role); - - $scope.ociavailableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions); - $scope.availableRoleFunctions=[]; - - if($scope.ociavailableRoleFunctions) - $.each($scope.ociavailableRoleFunctions, function(i, a){ - var availableRoleFunction = a; - availableRoleFunction.selected = false; - $.each($scope.role.roleFunctions, function(j, b){ - if(a.code === b.code) { - availableRoleFunction.selected = true; - } - }); - $scope.availableRoleFunctions.push(availableRoleFunction); - }); - - - $scope.ociavailableRoles=JSON.parse($scope.data.availableRoles); - $scope.availableRoles=[]; - - if($scope.ociavailableRoles) - $.each($scope.ociavailableRoles, function(i, a){ - var availableRole = a; - availableRole.selected = false; - if($scope.role.childRoles){ - $.each($scope.role.childRoles, function(j, b){ - if(a.id === b.id) { - availableRole.selected = true; - } - }); - }; - $scope.availableRoles.push(availableRole); - }); - - - },function(error){ - console.log("RoleService.getRole failed", error); - //reloadPageOnce(); - }); - } - - $scope.fetchRoles(); - - $scope.saveRole = function() { - var exists = false,x; - for(x in $scope.availableRoles){ - if($scope.availableRoles[x].name==$scope.role.name){ - exists = true; - //$modalInstance.close({availableRoleFunctions:message.availableRoleFunctions}); - } - } - if (exists) { - confirmBoxService.showInformation( "Role already exists."); - } - else { - var uuu = conf.api.saveRole + "?role_id="+$stateParams.roleId; - var postData = { - role: $scope.role, - childRoles: $scope.role.childRoles, - roleFunctions : $scope.role.roleFunctions - }; - $http.post(uuu, JSON.stringify(postData)).then(function(res) { - // console.log('roleController::saveRole: ' + JSON.stringify(res)); - if (res && res.data && res.data.role) - confirmBoxService.showInformation("Update Successful."); - else - confirmBoxService.showInformation('Failed to create role: ' + res.data.error) - }, - function(res){ - console.log('post failed', res.data); - confirmBoxService.showInformation("Error while saving."); - } - ); - } - }; - - $scope.addNewRoleFunctionModalPopup = function() { - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/role/role_functions_popup.html', - controller: 'rolepopupController', - - resolve: { - roleId: function () { - return $stateParams.roleId; - }, - role: function () { - return $scope.role; - }, - availableRoles: function () { - return $scope.ociavailableRoles; - }, - availableRoleFunctions: function () { - return $scope.ociavailableRoleFunctions; - }, - } - }); - modalInstance.closePromise.then(response => { - if($stateParams.roleId === '0'){ - return $scope.role; - }else{ - $scope.fetchRoles(); - } - // $scope.role=response.role; - }); - }; - - $scope.addNewChildRoleModalPopup = function() { - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/role/role_childrole_popup.html', - controller: 'rolepopupController', - - resolve: { - roleId: function () { - return $stateParams.roleId; - }, - role: function () { - return $scope.role; - }, - availableRoles: function () { - return $scope.ociavailableRoles; - }, - availableRoleFunctions: function () { - return $scope.ociavailableRoleFunctions; - }, - } - }).closePromise.then(function(response){ - if($stateParams.roleId === '0'){ - return $scope.role; - }else{ - $scope.fetchRoles(); - } - //$scope.role=response.role; - }); - }; - - $scope.removeRoleFunction = function(roleFunction) { - confirmBoxService.confirm("You are about to remove the role function "+roleFunction.name+" from the role for "+$scope.role.name+". Do you want to continue?").then( - function(confirmed){ - var uuu = conf.api.toggleRoleRoleFunction + "?role_id=" + $stateParams.roleId; - var postData={roleFunction:roleFunction}; - if(confirmed) { - $http.post(uuu, postData).then( - function(response) { - $scope.role= response.data.role; - $.each($scope.availableRoleFunctions, function(k, c){ - if(c.code === roleFunction.code) { - c.selected = false; - } - }); - }, - function(response) { - confirmBoxService.showInformation("Error while saving."); - } - ); - } - - }); - - }; - - $scope.removeChildRole = function(childRole) { - confirmBoxService.confirm("You are about to remove the child role "+childRole.name+" from the role for "+$scope.role.name+". Do you want to continue?").then( - function(confirmed){ - var uuu = conf.api.toggleRoleChildRole + "?role_id=" + $stateParams.roleId; - var postData={childRole:childRole}; - if(confirmed) { - $http.post(uuu,postData).then( function(response) { - $scope.role=response.data.role; - $.each($scope.availableRoles, function(k, c){ - if(c.id === childRole.id) { - c.selected = false; - } - }); - }, - - function(data) { - confirmBoxService.showInformation("Error while saving."); - }); - } - }); - - }; - -}); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ + +app.controller('roleController', function ($scope, $http, confirmBoxService, ngDialog, RoleService, conf, $stateParams){ + //$scope.role=${role}; + + $( "#dialogRoleFunction" ).hide(); + $( "#dialogChildRole" ).hide(); + + //$scope.ociavailableRoleFunctions=${availableRoleFunctions}; + $scope.fetchRoles = function() { + + RoleService.getRole($stateParams.roleId).then(function(data){ + + var j = data; + $scope.data = JSON.parse(j.data); + + $scope.role =JSON.parse($scope.data.role); + + $scope.ociavailableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions); + $scope.availableRoleFunctions=[]; + + if($scope.ociavailableRoleFunctions) + $.each($scope.ociavailableRoleFunctions, function(i, a){ + var availableRoleFunction = a; + availableRoleFunction.selected = false; + $.each($scope.role.roleFunctions, function(j, b){ + if(a.code === b.code) { + availableRoleFunction.selected = true; + } + }); + $scope.availableRoleFunctions.push(availableRoleFunction); + }); + + + $scope.ociavailableRoles=JSON.parse($scope.data.availableRoles); + $scope.availableRoles=[]; + + if($scope.ociavailableRoles) + $.each($scope.ociavailableRoles, function(i, a){ + var availableRole = a; + availableRole.selected = false; + if($scope.role.childRoles){ + $.each($scope.role.childRoles, function(j, b){ + if(a.id === b.id) { + availableRole.selected = true; + } + }); + }; + $scope.availableRoles.push(availableRole); + }); + + + },function(error){ + console.log("RoleService.getRole failed", error); + //reloadPageOnce(); + }); + } + + $scope.fetchRoles(); + + $scope.saveRole = function() { + var exists = false,x; + for(x in $scope.availableRoles){ + if($scope.availableRoles[x].name==$scope.role.name){ + exists = true; + //$modalInstance.close({availableRoleFunctions:message.availableRoleFunctions}); + } + } + if (exists) { + confirmBoxService.showInformation( "Role already exists."); + } + else { + var uuu = conf.api.saveRole + "?role_id="+$stateParams.roleId; + var postData = { + role: $scope.role, + childRoles: $scope.role.childRoles, + roleFunctions : $scope.role.roleFunctions + }; + $http.post(uuu, JSON.stringify(postData)).then(function(res) { + // console.log('roleController::saveRole: ' + JSON.stringify(res)); + if (res && res.data && res.data.role) + confirmBoxService.showInformation("Update Successful."); + else + confirmBoxService.showInformation('Failed to create role: ' + res.data.error) + }, + function(res){ + console.log('post failed', res.data); + confirmBoxService.showInformation("Error while saving."); + } + ); + } + }; + + $scope.addNewRoleFunctionModalPopup = function() { + var modalInstance = ngDialog.open({ + templateUrl: 'app/views/role/role_functions_popup.html', + controller: 'rolepopupController', + + resolve: { + roleId: function () { + return $stateParams.roleId; + }, + role: function () { + return $scope.role; + }, + availableRoles: function () { + return $scope.ociavailableRoles; + }, + availableRoleFunctions: function () { + return $scope.ociavailableRoleFunctions; + }, + } + }); + modalInstance.closePromise.then(response => { + if($stateParams.roleId === '0'){ + return $scope.role; + }else{ + $scope.fetchRoles(); + } + // $scope.role=response.role; + }); + }; + + $scope.addNewChildRoleModalPopup = function() { + var modalInstance = ngDialog.open({ + templateUrl: 'app/views/role/role_childrole_popup.html', + controller: 'rolepopupController', + + resolve: { + roleId: function () { + return $stateParams.roleId; + }, + role: function () { + return $scope.role; + }, + availableRoles: function () { + return $scope.ociavailableRoles; + }, + availableRoleFunctions: function () { + return $scope.ociavailableRoleFunctions; + }, + } + }).closePromise.then(function(response){ + if($stateParams.roleId === '0'){ + return $scope.role; + }else{ + $scope.fetchRoles(); + } + //$scope.role=response.role; + }); + }; + + $scope.removeRoleFunction = function(roleFunction) { + confirmBoxService.confirm("You are about to remove the role function "+roleFunction.name+" from the role for "+$scope.role.name+". Do you want to continue?").then( + function(confirmed){ + var uuu = conf.api.toggleRoleRoleFunction + "?role_id=" + $stateParams.roleId; + var postData={roleFunction:roleFunction}; + if(confirmed) { + $http.post(uuu, postData).then( + function(response) { + $scope.role= response.data.role; + $.each($scope.availableRoleFunctions, function(k, c){ + if(c.code === roleFunction.code) { + c.selected = false; + } + }); + }, + function(response) { + confirmBoxService.showInformation("Error while saving."); + } + ); + } + + }); + + }; + + $scope.removeChildRole = function(childRole) { + confirmBoxService.confirm("You are about to remove the child role "+childRole.name+" from the role for "+$scope.role.name+". Do you want to continue?").then( + function(confirmed){ + var uuu = conf.api.toggleRoleChildRole + "?role_id=" + $stateParams.roleId; + var postData={childRole:childRole}; + if(confirmed) { + $http.post(uuu,postData).then( function(response) { + $scope.role=response.data.role; + $.each($scope.availableRoles, function(k, c){ + if(c.id === childRole.id) { + c.selected = false; + } + }); + }, + + function(data) { + confirmBoxService.showInformation("Error while saving."); + }); + } + }); + + }; + +}); diff --git a/ecomp-portal-FE-common/client/app/views/role/role-function-list-controller.js b/ecomp-portal-FE-common/client/app/views/role/role-function-list-controller.js index c7a1bfd8..e7195996 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role-function-list-controller.js +++ b/ecomp-portal-FE-common/client/app/views/role/role-function-list-controller.js @@ -1,160 +1,160 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -app.controller('roleFunctionListController', function ($scope,RoleService,$http,$state,conf,confirmBoxService, ngDialog){ - $( "#dialog" ).hide(); - - RoleService.getRoleFunctionList().then(function(data){ - - var j = data; - $scope.data = JSON.parse(j.data); - $scope.availableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions); - - //$scope.resetMenu(); - - },function(error){ - console.log("failed"); - //reloadPageOnce(); - }); - - $scope.editRoleFunction = null; - var dialog = null; - $scope.editRoleFunctionPopup = function(availableRoleFunction) { - $scope.editRoleFunction = availableRoleFunction; - $( "#dialog" ).dialog({ - modal: true - }); - }; - - $scope.editRoleFunctionModalPopup = function(availableRoleFunction) { - $scope.editRoleFunction = availableRoleFunction; - $scope.availableRoleFunctionsTemp=$scope.availableRoleFunctions; - //$scope.availableRoleFunctions={}; - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/role/popup_modal_rolefunction.html', - controller: 'rolefunctionpopupController', - resolve: { - message: function () { - var message = { - availableRoleFunction: $scope.editRoleFunction, - availableRoleFunctions: $scope.availableRoleFunctionsTemp - }; - return message; - }, - isEditing: function () { - return true; - } - } - }); - modalInstance.closePromise.then(response =>{ - if(response.value!=null){ - if(response.value.result){ - $scope.availableRoleFunctions=response.value.availableRoleFunctions; - } - } - /*else - $scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp; - */ - }); - }; - - $scope.addNewRoleFunctionModalPopup = function(availableRoleFunction) { - - $scope.editRoleFunction = null; - $scope.availableRoleFunctionsTemp=$scope.availableRoleFunctions; - //$scope.availableRoleFunctions={}; - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/role/popup_modal_rolefunction.html', - controller: 'rolefunctionpopupController', - resolve: { - message: function () { - var message = { - availableRoleFunction: $scope.editRoleFunction, - availableRoleFunctions: $scope.availableRoleFunctionsTemp - }; - return message; - }, - isEditing: function () { - return false; - } - } - }); - modalInstance.closePromise.then(response => { - if(response.value!=null){ - if(response.value.result){ - $scope.availableRoleFunctions=response.value.availableRoleFunctions; - } - } - /* if(response.availableRoleFunctions != undefined) - $scope.availableRoleFunctions=response.availableRoleFunctions; - else - $scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp; - */ - }); - }; - - $scope.addNewRoleFunctionPopup = function() { - $scope.editRoleFunction = null; - $( "#dialog" ).dialog({ - modal: true - }); - }; - - $scope.saveRoleFunction = function(availableRoleFunction) { - var uuu = conf.api.saveRoleFuncion; - var postData={availableRoleFunction: availableRoleFunction}; - $http.post(uuu,postData).then(function(response) { - var data = response.data; - $scope.availableRoleFunctions=data.availableRoleFunctions; - $scope.editRoleFunction = null; - }, - function() { - - confirmBoxService.showInformation("Error while saving"); - } - ); - }; - - - $scope.removeRole = function(availableRoleFunction) { - confirmBoxService.confirm("You are about to delete the role function "+availableRoleFunction.name+". Do you want to continue?").then( - function(confirmed){ - if(confirmed){ - $scope.availableRoleFunctionsTemp=$scope.availableRoleFunctions; - //$scope.availableRoleFunctions={}; - var uuu = conf.api.removeRoleFunction; - var postData={availableRoleFunction: availableRoleFunction}; - $http.post(uuu,postData).then(function(response) { - var data = response.data; - if(data.availableRoleFunctions == undefined) - confirmBoxService.showInformation("Error while deleting: "+ data); - else - $scope.availableRoleFunctions=data.availableRoleFunctions; - }, - function() { - $scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp; - confirmBoxService.showInformation("Error while deleting: "+ data.responseText); - } - ); - } - }); - - }; - -}); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +app.controller('roleFunctionListController', function ($scope,RoleService,$http,$state,conf,confirmBoxService, ngDialog){ + $( "#dialog" ).hide(); + + RoleService.getRoleFunctionList().then(function(data){ + + var j = data; + $scope.data = JSON.parse(j.data); + $scope.availableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions); + + //$scope.resetMenu(); + + },function(error){ + console.log("failed"); + //reloadPageOnce(); + }); + + $scope.editRoleFunction = null; + var dialog = null; + $scope.editRoleFunctionPopup = function(availableRoleFunction) { + $scope.editRoleFunction = availableRoleFunction; + $( "#dialog" ).dialog({ + modal: true + }); + }; + + $scope.editRoleFunctionModalPopup = function(availableRoleFunction) { + $scope.editRoleFunction = availableRoleFunction; + $scope.availableRoleFunctionsTemp=$scope.availableRoleFunctions; + //$scope.availableRoleFunctions={}; + var modalInstance = ngDialog.open({ + templateUrl: 'app/views/role/popup_modal_rolefunction.html', + controller: 'rolefunctionpopupController', + resolve: { + message: function () { + var message = { + availableRoleFunction: $scope.editRoleFunction, + availableRoleFunctions: $scope.availableRoleFunctionsTemp + }; + return message; + }, + isEditing: function () { + return true; + } + } + }); + modalInstance.closePromise.then(response =>{ + if(response.value!=null){ + if(response.value.result){ + $scope.availableRoleFunctions=response.value.availableRoleFunctions; + } + } + /*else + $scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp; + */ + }); + }; + + $scope.addNewRoleFunctionModalPopup = function(availableRoleFunction) { + + $scope.editRoleFunction = null; + $scope.availableRoleFunctionsTemp=$scope.availableRoleFunctions; + //$scope.availableRoleFunctions={}; + var modalInstance = ngDialog.open({ + templateUrl: 'app/views/role/popup_modal_rolefunction.html', + controller: 'rolefunctionpopupController', + resolve: { + message: function () { + var message = { + availableRoleFunction: $scope.editRoleFunction, + availableRoleFunctions: $scope.availableRoleFunctionsTemp + }; + return message; + }, + isEditing: function () { + return false; + } + } + }); + modalInstance.closePromise.then(response => { + if(response.value!=null){ + if(response.value.result){ + $scope.availableRoleFunctions=response.value.availableRoleFunctions; + } + } + /* if(response.availableRoleFunctions != undefined) + $scope.availableRoleFunctions=response.availableRoleFunctions; + else + $scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp; + */ + }); + }; + + $scope.addNewRoleFunctionPopup = function() { + $scope.editRoleFunction = null; + $( "#dialog" ).dialog({ + modal: true + }); + }; + + $scope.saveRoleFunction = function(availableRoleFunction) { + var uuu = conf.api.saveRoleFuncion; + var postData={availableRoleFunction: availableRoleFunction}; + $http.post(uuu,postData).then(function(response) { + var data = response.data; + $scope.availableRoleFunctions=data.availableRoleFunctions; + $scope.editRoleFunction = null; + }, + function() { + + confirmBoxService.showInformation("Error while saving"); + } + ); + }; + + + $scope.removeRole = function(availableRoleFunction) { + confirmBoxService.confirm("You are about to delete the role function "+availableRoleFunction.name+". Do you want to continue?").then( + function(confirmed){ + if(confirmed){ + $scope.availableRoleFunctionsTemp=$scope.availableRoleFunctions; + //$scope.availableRoleFunctions={}; + var uuu = conf.api.removeRoleFunction; + var postData={availableRoleFunction: availableRoleFunction}; + $http.post(uuu,postData).then(function(response) { + var data = response.data; + if(data.availableRoleFunctions == undefined) + confirmBoxService.showInformation("Error while deleting: "+ data); + else + $scope.availableRoleFunctions=data.availableRoleFunctions; + }, + function() { + $scope.availableRoleFunctions=$scope.availableRoleFunctionsTemp; + confirmBoxService.showInformation("Error while deleting: "+ data.responseText); + } + ); + } + }); + + }; + +}); diff --git a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js index 5ef37165..2e1acf37 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js +++ b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js @@ -1,147 +1,147 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -app.controller('roleListController', function ($scope,RoleService,confirmBoxService,conf,$state,$http){ - $scope.showSpinner = true; - - RoleService.getRoles().then(function(data){ - $scope.showSpinner = true; - var j = data; - $scope.data = JSON.parse(j.data); - $scope.availableRoles =JSON.parse($scope.data.availableRoles); - $scope.showSpinner = false; - //$scope.resetMenu(); - - },function(error){ - console.log("failed"); - //reloadPageOnce(); - }); - - - $scope.goToUrl = function(roleIdVal) { - $state.go("root.role", {"roleId":roleIdVal}); - } - //console.log($scope.availableRoles); - $scope.toggleRole = function(selected,availableRole) { - //alert('toggleRole: '+selected); - var toggleType = null; - if(selected) { - toggleType = "activate"; - } else { - toggleType = "inactivate"; - } - - confirmBoxService.confirm("You are about to "+toggleType+" the role "+availableRole.name+". Do you want to continue?").then( - function(confirmed){ - - if(confirmed) { - var uuu = conf.api.toggleRole; - - var postData={role:availableRole}; - $http.post(uuu, postData).then(function(response) { - var data = response.data; - if (typeof data === 'object') { - console.log(data); - $scope.availableRoles=data.availableRoles; - console.log($scope.availableRoles); - } else { - // - } - - }, function(response) { - console.log(response.data); - availableRole.active=!availableRole.active; - confirmBoxService.showInformation("Error while saving."); - }); - - /* - $.ajax({ - type : 'POST', - url : uuu, - dataType: 'json', - contentType: 'application/json', - data: JSON.stringify(postData), - success : function(data){ - console.log(data); - $scope.$apply(function(){$scope.availableRoles=data.availableRoles;}); - console.log($scope.availableRoles); - }, - error : function(data){ - console.log(data); - availableRole.active=!availableRole.active; - confirmBoxService.showInformation("Error while saving."); - } - }); - */ - } - else { - availableRole.active=!availableRole.active; - } - - }); - //, - //function(){ - // availableRole.active=!availableRole.active; - //}) - - - }; - - $scope.removeRole = function(role) { - - confirmBoxService.confirm("You are about to delete the role "+role.name+". Do you want to continue?").then( - function(confirmed){ - var uuu = conf.api.removeRole; - var postData={role:role}; - /* $.ajax({ - type : 'POST', - url : uuu, - dataType: 'json', - contentType: 'application/json', - data: JSON.stringify(postData), - success : function(data){ - $scope.$apply(function(){$scope.availableRoles=data.availableRoles;}); - }, - error : function(data){ - console.log(data); - confirmBoxService.showInformation("Error while deleting: "+ data.responseText); - } - }); */ - - - $http.post(uuu, postData).then(function(response) { - var data = response.data; - if (typeof data === 'object') { - $scope.availableRoles=data.availableRoles; - } else { - // - } - - }, function(response) { - console.log(response.data); - confirmBoxService.showInformation("Error while deleting: "+ data.responseText); - }); - - }); - - - }; - - -}); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +app.controller('roleListController', function ($scope,RoleService,confirmBoxService,conf,$state,$http){ + $scope.showSpinner = true; + + RoleService.getRoles().then(function(data){ + $scope.showSpinner = true; + var j = data; + $scope.data = JSON.parse(j.data); + $scope.availableRoles =JSON.parse($scope.data.availableRoles); + $scope.showSpinner = false; + //$scope.resetMenu(); + + },function(error){ + console.log("failed"); + //reloadPageOnce(); + }); + + + $scope.goToUrl = function(roleIdVal) { + $state.go("root.role", {"roleId":roleIdVal}); + } + //console.log($scope.availableRoles); + $scope.toggleRole = function(selected,availableRole) { + //alert('toggleRole: '+selected); + var toggleType = null; + if(selected) { + toggleType = "activate"; + } else { + toggleType = "inactivate"; + } + + confirmBoxService.confirm("You are about to "+toggleType+" the role "+availableRole.name+". Do you want to continue?").then( + function(confirmed){ + + if(confirmed) { + var uuu = conf.api.toggleRole; + + var postData={role:availableRole}; + $http.post(uuu, postData).then(function(response) { + var data = response.data; + if (typeof data === 'object') { + console.log(data); + $scope.availableRoles=data.availableRoles; + console.log($scope.availableRoles); + } else { + // + } + + }, function(response) { + console.log(response.data); + availableRole.active=!availableRole.active; + confirmBoxService.showInformation("Error while saving."); + }); + + /* + $.ajax({ + type : 'POST', + url : uuu, + dataType: 'json', + contentType: 'application/json', + data: JSON.stringify(postData), + success : function(data){ + console.log(data); + $scope.$apply(function(){$scope.availableRoles=data.availableRoles;}); + console.log($scope.availableRoles); + }, + error : function(data){ + console.log(data); + availableRole.active=!availableRole.active; + confirmBoxService.showInformation("Error while saving."); + } + }); + */ + } + else { + availableRole.active=!availableRole.active; + } + + }); + //, + //function(){ + // availableRole.active=!availableRole.active; + //}) + + + }; + + $scope.removeRole = function(role) { + + confirmBoxService.confirm("You are about to delete the role "+role.name+". Do you want to continue?").then( + function(confirmed){ + var uuu = conf.api.removeRole; + var postData={role:role}; + /* $.ajax({ + type : 'POST', + url : uuu, + dataType: 'json', + contentType: 'application/json', + data: JSON.stringify(postData), + success : function(data){ + $scope.$apply(function(){$scope.availableRoles=data.availableRoles;}); + }, + error : function(data){ + console.log(data); + confirmBoxService.showInformation("Error while deleting: "+ data.responseText); + } + }); */ + + + $http.post(uuu, postData).then(function(response) { + var data = response.data; + if (typeof data === 'object') { + $scope.availableRoles=data.availableRoles; + } else { + // + } + + }, function(response) { + console.log(response.data); + confirmBoxService.showInformation("Error while deleting: "+ data.responseText); + }); + + }); + + + }; + + +}); diff --git a/ecomp-portal-FE-common/client/app/views/role/role.html b/ecomp-portal-FE-common/client/app/views/role/role.html index 42793eee..2356058d 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role.html +++ b/ecomp-portal-FE-common/client/app/views/role/role.html @@ -1,96 +1,96 @@ - -
-
-
-

Role

-
-
-
-
-

Please edit the role details below: 


- -
- - -
- - -
-
-
- -
- -
-
- - -
- -
- - - - - - - - - - - - - -
NameRemove
-
-
-
- - Manage Role Functions

- -
- - -
- -
- - - - - - - - - - - - - -
NameRemove
-
-
-
-
- -
-
-
+ +
+
+
+

Role

+
+
+
+
+

Please edit the role details below: 


+ +
+ + +
+ + +
+
+
+ +
+ +
+
+ + +
+ +
+ + + + + + + + + + + + + +
NameRemove
+
+
+
+ + Manage Role Functions

+ +
+ + +
+ +
+ + + + + + + + + + + + + +
NameRemove
+
+
+
+
+ +
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/role/role.less b/ecomp-portal-FE-common/client/app/views/role/role.less index 42311e64..71d240dc 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role.less +++ b/ecomp-portal-FE-common/client/app/views/role/role.less @@ -1,50 +1,50 @@ -.p-info { - font-size: 18px; -} - -.input-field { - width: 250px !important; -} - -.scrolling-table { - width: 548px; - margin-left: 16px; - height:575px; - overflow:auto; -} - -.scrolling-table .scroll-viewport { - height: 200px !important; - width: 99.5% !important; - background-color: white; -} - -.scrolling-table .scroll-overview { - margin-top: -14px !important; -} - -.scrolling-table .scroll-viewport:hover { - background-color: white; -} - -.scrolling-table #portal-scroll-table-content { - height: 200px; - position: absolute !important; - width: 548px; - padding-left: 0px; - padding-top: 0px; - padding-bottom: 0px; - padding-right: 5px; -} - -.vertical .scroll-thumb { - width: 13px !important; -} - -.vertical .scroll-bar { - width: 15px !important; -} - -.scroll-bar { - border-radius: 0px !important; +.p-info { + font-size: 18px; +} + +.input-field { + width: 250px !important; +} + +.scrolling-table { + width: 548px; + margin-left: 16px; + height:575px; + overflow:auto; +} + +.scrolling-table .scroll-viewport { + height: 200px !important; + width: 99.5% !important; + background-color: white; +} + +.scrolling-table .scroll-overview { + margin-top: -14px !important; +} + +.scrolling-table .scroll-viewport:hover { + background-color: white; +} + +.scrolling-table #portal-scroll-table-content { + height: 200px; + position: absolute !important; + width: 548px; + padding-left: 0px; + padding-top: 0px; + padding-bottom: 0px; + padding-right: 5px; +} + +.vertical .scroll-thumb { + width: 13px !important; +} + +.vertical .scroll-bar { + width: 15px !important; +} + +.scroll-bar { + border-radius: 0px !important; } \ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/role/role_childrole_popup.html b/ecomp-portal-FE-common/client/app/views/role/role_childrole_popup.html index 278ef2cd..e96fb062 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role_childrole_popup.html +++ b/ecomp-portal-FE-common/client/app/views/role/role_childrole_popup.html @@ -1,51 +1,55 @@ - - -
-
Select Role Functions
-
- -
- - - - - - - - - - - - - - -
Name
- -
-
-
-
- -
-
- + + +
+
Select Role Functions
+
+ +
+ + + + + + + + + + + + + + +
Name
+ +
+
+
+
+ +
+
+ diff --git a/ecomp-portal-FE-common/client/app/views/role/role_function_list.html b/ecomp-portal-FE-common/client/app/views/role/role_function_list.html index c015ee56..7c50a5ac 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role_function_list.html +++ b/ecomp-portal-FE-common/client/app/views/role/role_function_list.html @@ -1,107 +1,107 @@ - - -
-
-
-

Role Functions

-
- - -
- -
- - -
- -
- -
- -
- -
- - - - - - - - - - - - - - - - - -
NameCodeEdit?Delete?
- -
- 		- -
-
-
- - - -
- - -
- -
-
- -
-
-
-
- -
-
- - -
- -
-
+ + +
+
+
+

Role Functions

+
+ + +
+ +
+ + +
+ +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + +
NameCodeEdit?Delete?
+ +
+ 		+ +
+
+
+ + + +
+ + +
+ +
+
+ +
+
+
+
+ +
+
+ + +
+ +
+
diff --git a/ecomp-portal-FE-common/client/app/views/role/role_functions_popup.html b/ecomp-portal-FE-common/client/app/views/role/role_functions_popup.html index 7d80d81e..52c4cb3a 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role_functions_popup.html +++ b/ecomp-portal-FE-common/client/app/views/role/role_functions_popup.html @@ -1,49 +1,55 @@ - - -
-
Select Role Functions
-
-
- - - - - - - - - - - - - - -
Name
- -
-
-
-
- -
-
+ + +
+
Select Role Functions
+
+
+ + + + + + + + + + + + + + +
Name
+ +
+
+
+
+ +
+
+ + diff --git a/ecomp-portal-FE-common/client/app/views/role/role_list.html b/ecomp-portal-FE-common/client/app/views/role/role_list.html index e8d56cab..74de7c23 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role_list.html +++ b/ecomp-portal-FE-common/client/app/views/role/role_list.html @@ -1,55 +1,57 @@ - -
-
-
-

Roles

-
-
-
- -
-
- - - - - - - - - - - - - - - -
NamePriorityActive
-
- -
-
-
-
-
-
+ +
+
+
+

Roles

+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + +
NamePriorityActiveEdit
+
+ +
+
+
+
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js b/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js index 6275c760..db5bb1b6 100644 --- a/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js +++ b/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js @@ -1,95 +1,95 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -app.controller('rolefunctionpopupController', function ($scope, confirmBoxService, message, $http,RoleService, conf, isEditing){ - if(message.availableRoleFunction==null) { - $scope.label='Add Role Function'; - var tempText = ""; - } - else{ - $scope.label='Edit Role Function' - $scope.disableCd=true; - var tempText = new String(message.availableRoleFunction.name); - $scope.editRoleFunction = angular.copy(message.availableRoleFunction); - } - - $scope.tempText = tempText; - $scope.isEditing = isEditing; - - $scope.saveRoleFunction = function(availableRoleFunction) { - var uuu = conf.api.saveRoleFunction; - var postData={availableRoleFunction: availableRoleFunction}; - - if(availableRoleFunction==null){ - confirmBoxService.showInformation("Please enter valid role function details."); - } - var exists = false,x; - for(x in message.availableRoleFunctions){ - console.log(message.availableRoleFunctions[x].name); - if(message.availableRoleFunctions[x].name==availableRoleFunction.name){ - confirmBoxService.showInformation("Role Function already exists."); - exists = true; - availableRoleFunction.name = $scope.tempText; - break; - } - if(!isEditing){ - if (message.availableRoleFunctions[x].code == availableRoleFunction.code) { - confirmBoxService.showInformation("Code already exists. Please create a role function with a different code to proceed."); - exists = true; - availableRoleFunction.name = $scope.tempText; - break; - } - } - } - - if(!exists && availableRoleFunction.name.trim() != '' && availableRoleFunction.code.trim() != ''){ - $http.post(uuu, JSON.stringify(postData)).then(function(res){ - console.log("data"); -// console.log(res.data); -// $scope.availableRoleFunctionsTemp = res.data.availableRoleFunctions; - RoleService.getRoleFunctionList().then(function(data){ - - var j = data; - $scope.data = JSON.parse(j.data); - $scope.availableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions); - - //$scope.resetMenu(); - $scope.closeThisDialog({result: true, availableRoleFunctions: $scope.availableRoleFunctions }); - },function(error){ - console.log("failed"); - //reloadPageOnce(); - $scope.closeThisDialog(true); - }); - - - }); - - - - - } - }; - - - - $scope.close = function() { - this.closeThisDialog(true); - }; -} -); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +app.controller('rolefunctionpopupController', function ($scope, confirmBoxService, message, $http,RoleService, conf, isEditing){ + if(message.availableRoleFunction==null) { + $scope.label='Add Role Function'; + var tempText = ""; + } + else{ + $scope.label='Edit Role Function' + $scope.disableCd=true; + var tempText = new String(message.availableRoleFunction.name); + $scope.editRoleFunction = angular.copy(message.availableRoleFunction); + } + + $scope.tempText = tempText; + $scope.isEditing = isEditing; + + $scope.saveRoleFunction = function(availableRoleFunction) { + var uuu = conf.api.saveRoleFunction; + var postData={availableRoleFunction: availableRoleFunction}; + + if(availableRoleFunction==null){ + confirmBoxService.showInformation("Please enter valid role function details."); + } + var exists = false,x; + for(x in message.availableRoleFunctions){ + console.log(message.availableRoleFunctions[x].name); + if(message.availableRoleFunctions[x].name==availableRoleFunction.name){ + confirmBoxService.showInformation("Role Function already exists."); + exists = true; + availableRoleFunction.name = $scope.tempText; + break; + } + if(!isEditing){ + if (message.availableRoleFunctions[x].code == availableRoleFunction.code) { + confirmBoxService.showInformation("Code already exists. Please create a role function with a different code to proceed."); + exists = true; + availableRoleFunction.name = $scope.tempText; + break; + } + } + } + + if(!exists && availableRoleFunction.name.trim() != '' && availableRoleFunction.code.trim() != ''){ + $http.post(uuu, JSON.stringify(postData)).then(function(res){ + console.log("data"); +// console.log(res.data); +// $scope.availableRoleFunctionsTemp = res.data.availableRoleFunctions; + RoleService.getRoleFunctionList().then(function(data){ + + var j = data; + $scope.data = JSON.parse(j.data); + $scope.availableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions); + + //$scope.resetMenu(); + $scope.closeThisDialog({result: true, availableRoleFunctions: $scope.availableRoleFunctions }); + },function(error){ + console.log("failed"); + //reloadPageOnce(); + $scope.closeThisDialog(true); + }); + + + }); + + + + + } + }; + + + + $scope.close = function() { + this.closeThisDialog(true); + }; +} +); diff --git a/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js b/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js index 7feb7f2f..1176e50a 100644 --- a/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js +++ b/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js @@ -1,251 +1,251 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -app.controller('rolepopupController', function ($scope, role, roleId, confirmBoxService, $http, $state, availableRoles, conf, availableRoleFunctions,ngDialog){ - - $scope.role = role; - console.log($scope.role); - if($scope.role.childRoles==null){ - $scope.role.childRoles=[]; - } - - $scope.ociavailableRoles=availableRoles; - console.log($scope.ociavailableRoles); - - $scope.availableRoles=[]; - if($scope.ociavailableRoles) - $.each($scope.ociavailableRoles, function(i, a){ - var availableRole = a; - availableRole.selected = false; - if($scope.role.childRoles){ - $.each($scope.role.childRoles, function(j, b){ - if(a.id === b.id) { - availableRole.selected = true; - } - }); - }; - $scope.availableRoles.push(availableRole); - }); - - $scope.ociavailableRoleFunctions = availableRoleFunctions; - console.log($scope.ociavailableRoleFunctions); - $scope.availableRoleFunctions = []; - if($scope.ociavailableRoleFunctions) - $.each($scope.ociavailableRoleFunctions, function(i, a){ - var availableRoleFunction = a; - availableRoleFunction.selected = false; - $.each($scope.role.roleFunctions, function(j, b){ - if(a.code === b.code) { - availableRoleFunction.selected = true; - } - }); - $scope.availableRoleFunctions.push(availableRoleFunction); - }); - //$scope.resetMenu(); - - $scope.toggleRoleFunction = function(selected,availableRoleFunction) { - //alert('toggleRole: '+selected); - - if(!selected) { - //remove role function - if(role.id==null){ - var index = $scope.role.roleFunctions.indexOf(availableRoleFunction); - if(index>=0) - $scope.role.roleFunctions.splice(index, 1); - return; - } - var uuu = conf.api.toggleRoleRoleFunction + "?role_id=" + roleId; - confirmBoxService.confirm("You are about to remove the role function "+availableRoleFunction.name+" from the role for "+$scope.role.name+". Do you want to continue?").then( - function(confirmed){ - if(confirmed) { - var postData={roleFunction:availableRoleFunction}; - $http.post(uuu, postData).then( - function(response) { - $scope.role= response.data.role; - }, - function(response) { - confirmBoxService.showInformation("Error while saving."); - } - ); - - - - - } - else { - availableRoleFunction.selected=!availableRoleFunction.selected; - } - /* - $.ajax({ - type : 'POST', - url : uuu, - dataType: 'json', - contentType: 'application/json', - data: JSON.stringify(postData), - success : function(data){ - $scope.$apply(function(){$scope.role=data.role;}); - }, - error : function(data){ - modalService.showFailure("Fail","Error while saving."); - } - }); - */ - }); - - } else { - //add role function - if(role.id==null){ - $scope.role.roleFunctions.push(availableRoleFunction); - return; - } - var uuu = conf.api.addRoleRoleFunction + "?role_id=" + roleId; - - confirmBoxService.confirm("You are about to add the role function "+availableRoleFunction.name+" to the role for "+$scope.role.name+". Do you want to continue?").then( - function(confirmed){ - if(confirmed) { - var postData={roleFunction:availableRoleFunction}; - $http.post(uuu,postData).then( function(response) { - $scope.role=response.data.role; - }, - - function(data) { - confirmBoxService.showInformation("Error while saving."); - }); - } else { - availableRoleFunction.selected=!availableRoleFunction.selected; - } - /* - $.ajax({ - type : 'POST', - url : uuu, - dataType: 'json', - contentType: 'application/json', - data: JSON.stringify(postData), - success : function(data){ - $scope.$apply(function(){$scope.role=data.role;}); - }, - error : function(data){ - modalService.showFailure("Fail","Error while saving."); - } - }); - - - }, - function(){ - availableRoleFunction.selected=!availableRoleFunction.selected; - })*/ - }); - - - } - }; - - $scope.toggleChildRole = function(selected,availableRole) { - //alert('toggleRole: '+selected); - - if(!selected) { - //remove role - if(role.id==null){ - var index = $scope.role.childRoles.indexOf(availableRole); - if(index>=0) - $scope.role.childRoles.splice(index, 1); - return; - } - var uuu = conf.api.toggleRoleChildRole +"?role_id=" + roleId; - - confirmBoxService.confirm("You are about to remove the child role "+availableRole.name+" from the role for "+$scope.role.name+". Do you want to continue?").then( - function(confirmed){ - if(confirmed) { - - var postData={childRole:availableRole}; - $http.post(uuu,postData).then(function(response) { - $scope.role=response.data.role; - }, - function(data) { - confirmBoxService.showInformation("Error while saving."); - }); - } else { - availableRole.selected=false; - } - }); - /* $.ajax({ - type : 'POST', - url : uuu, - dataType: 'json', - contentType: 'application/json', - data: JSON.stringify(postData), - success : function(data){ - console.log('role',data.role); - $scope.$apply(function(){$scope.role=data.role;}); - }, - error : function(data){ - modalService.showFailure("Fail","Error while saving."); - } - }); - */ - - - } else { - //add role - if(role.id==null){ - $scope.role.childRoles.push(availableRole); - return; - } - var uuu = conf.api.addRoleChildRole +"?role_id=" + roleId; - - confirmBoxService.confirm("You are about to add the child role "+availableRole.name+" to the role for "+$scope.role.name+". Do you want to continue?").then( - function(confirmed){ - if(confirmed) { - var postData={childRole:availableRole}; - $http.post(uuu,postData).then(function(response) { - $scope.role=response.data.role; - }, - function(data) { - confirmBoxService.showInformation("Error while saving."); - }); - } else { - availableRole.selected=false; - } - /* $.ajax({ - type : 'POST', - url : uuu, - dataType: 'json', - contentType: 'application/json', - data: JSON.stringify(postData), - success : function(data){ - $scope.$apply(function(){$scope.role=data.role;}); - }, - error : function(data){ - modalService.showFailure("Fail","Error while saving."); - } - });*/ - - }); - - - } - }; - - $scope.close = function() { - console.log('role', $scope.role); - //$modalInstance.close({role:$scope.role}); - this.closeThisDialog(true); - }; - -}); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +app.controller('rolepopupController', function ($scope, role, roleId, confirmBoxService, $http, $state, availableRoles, conf, availableRoleFunctions,ngDialog){ + + $scope.role = role; + console.log($scope.role); + if($scope.role.childRoles==null){ + $scope.role.childRoles=[]; + } + + $scope.ociavailableRoles=availableRoles; + console.log($scope.ociavailableRoles); + + $scope.availableRoles=[]; + if($scope.ociavailableRoles) + $.each($scope.ociavailableRoles, function(i, a){ + var availableRole = a; + availableRole.selected = false; + if($scope.role.childRoles){ + $.each($scope.role.childRoles, function(j, b){ + if(a.id === b.id) { + availableRole.selected = true; + } + }); + }; + $scope.availableRoles.push(availableRole); + }); + + $scope.ociavailableRoleFunctions = availableRoleFunctions; + console.log($scope.ociavailableRoleFunctions); + $scope.availableRoleFunctions = []; + if($scope.ociavailableRoleFunctions) + $.each($scope.ociavailableRoleFunctions, function(i, a){ + var availableRoleFunction = a; + availableRoleFunction.selected = false; + $.each($scope.role.roleFunctions, function(j, b){ + if(a.code === b.code) { + availableRoleFunction.selected = true; + } + }); + $scope.availableRoleFunctions.push(availableRoleFunction); + }); + //$scope.resetMenu(); + + $scope.toggleRoleFunction = function(selected,availableRoleFunction) { + //alert('toggleRole: '+selected); + + if(!selected) { + //remove role function + if(role.id==null){ + var index = $scope.role.roleFunctions.indexOf(availableRoleFunction); + if(index>=0) + $scope.role.roleFunctions.splice(index, 1); + return; + } + var uuu = conf.api.toggleRoleRoleFunction + "?role_id=" + roleId; + confirmBoxService.confirm("You are about to remove the role function "+availableRoleFunction.name+" from the role for "+$scope.role.name+". Do you want to continue?").then( + function(confirmed){ + if(confirmed) { + var postData={roleFunction:availableRoleFunction}; + $http.post(uuu, postData).then( + function(response) { + $scope.role= response.data.role; + }, + function(response) { + confirmBoxService.showInformation("Error while saving."); + } + ); + + + + + } + else { + availableRoleFunction.selected=!availableRoleFunction.selected; + } + /* + $.ajax({ + type : 'POST', + url : uuu, + dataType: 'json', + contentType: 'application/json', + data: JSON.stringify(postData), + success : function(data){ + $scope.$apply(function(){$scope.role=data.role;}); + }, + error : function(data){ + modalService.showFailure("Fail","Error while saving."); + } + }); + */ + }); + + } else { + //add role function + if(role.id==null){ + $scope.role.roleFunctions.push(availableRoleFunction); + return; + } + var uuu = conf.api.addRoleRoleFunction + "?role_id=" + roleId; + + confirmBoxService.confirm("You are about to add the role function "+availableRoleFunction.name+" to the role for "+$scope.role.name+". Do you want to continue?").then( + function(confirmed){ + if(confirmed) { + var postData={roleFunction:availableRoleFunction}; + $http.post(uuu,postData).then( function(response) { + $scope.role=response.data.role; + }, + + function(data) { + confirmBoxService.showInformation("Error while saving."); + }); + } else { + availableRoleFunction.selected=!availableRoleFunction.selected; + } + /* + $.ajax({ + type : 'POST', + url : uuu, + dataType: 'json', + contentType: 'application/json', + data: JSON.stringify(postData), + success : function(data){ + $scope.$apply(function(){$scope.role=data.role;}); + }, + error : function(data){ + modalService.showFailure("Fail","Error while saving."); + } + }); + + + }, + function(){ + availableRoleFunction.selected=!availableRoleFunction.selected; + })*/ + }); + + + } + }; + + $scope.toggleChildRole = function(selected,availableRole) { + //alert('toggleRole: '+selected); + + if(!selected) { + //remove role + if(role.id==null){ + var index = $scope.role.childRoles.indexOf(availableRole); + if(index>=0) + $scope.role.childRoles.splice(index, 1); + return; + } + var uuu = conf.api.toggleRoleChildRole +"?role_id=" + roleId; + + confirmBoxService.confirm("You are about to remove the child role "+availableRole.name+" from the role for "+$scope.role.name+". Do you want to continue?").then( + function(confirmed){ + if(confirmed) { + + var postData={childRole:availableRole}; + $http.post(uuu,postData).then(function(response) { + $scope.role=response.data.role; + }, + function(data) { + confirmBoxService.showInformation("Error while saving."); + }); + } else { + availableRole.selected=false; + } + }); + /* $.ajax({ + type : 'POST', + url : uuu, + dataType: 'json', + contentType: 'application/json', + data: JSON.stringify(postData), + success : function(data){ + console.log('role',data.role); + $scope.$apply(function(){$scope.role=data.role;}); + }, + error : function(data){ + modalService.showFailure("Fail","Error while saving."); + } + }); + */ + + + } else { + //add role + if(role.id==null){ + $scope.role.childRoles.push(availableRole); + return; + } + var uuu = conf.api.addRoleChildRole +"?role_id=" + roleId; + + confirmBoxService.confirm("You are about to add the child role "+availableRole.name+" to the role for "+$scope.role.name+". Do you want to continue?").then( + function(confirmed){ + if(confirmed) { + var postData={childRole:availableRole}; + $http.post(uuu,postData).then(function(response) { + $scope.role=response.data.role; + }, + function(data) { + confirmBoxService.showInformation("Error while saving."); + }); + } else { + availableRole.selected=false; + } + /* $.ajax({ + type : 'POST', + url : uuu, + dataType: 'json', + contentType: 'application/json', + data: JSON.stringify(postData), + success : function(data){ + $scope.$apply(function(){$scope.role=data.role;}); + }, + error : function(data){ + modalService.showFailure("Fail","Error while saving."); + } + });*/ + + }); + + + } + }; + + $scope.close = function() { + console.log('role', $scope.role); + //$modalInstance.close({role:$scope.role}); + this.closeThisDialog(true); + }; + +}); diff --git a/ecomp-portal-FE-common/client/app/views/sidebar/sidebar.controller.js b/ecomp-portal-FE-common/client/app/views/sidebar/sidebar.controller.js index 6d0f2d1e..63a3abb7 100644 --- a/ecomp-portal-FE-common/client/app/views/sidebar/sidebar.controller.js +++ b/ecomp-portal-FE-common/client/app/views/sidebar/sidebar.controller.js @@ -1,63 +1,63 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; -(function () { - class SidebarCtrl { - constructor(applicationsService,userProfileService, $log, $rootScope) { - this.$log = $log; - this.userProfileService = userProfileService; - this.$rootScope = $rootScope; - $rootScope.isAdminPortalAdmin = false; - - - //if (bowser.msie || bowser.msedge) - // $log.debug('SidebarCtrl::init: Browser is: Internet Explorer or Edge'); - // else - // $log.debug('SidebarCtrl::init: Browser is: ' + bowser.name + ': ' + bowser.version); - - //note: this model should be retrieved from BE via sidebar specific service - userProfileService.getUserProfile() - .then(profile=> { - - if (profile.roles.indexOf('System Administrator') > -1) { - $rootScope.isAdminPortalAdmin = true; - } else { - this.$log.debug('SidebarCtrl::getUserProfile: user is not superAdmin nor admin'); - } - }); - // $log.debug('SidebarCtrl::getUserProfile: profile.roles.indexOf(superAdmin) = ' + profile.roles.indexOf('superAdmin')); - // $log.debug('SidebarCtrl::getUserProfile: profile.roles.indexOf(admin) = ' + profile.roles.indexOf('admin')); - applicationsService - .getLeftMenuItems() - .then(res=> - { - //console.log("Menu items is "+JSON.stringify(res)); - this.sidebarModel = res; - }).catch(err => { - //confirmBoxService.showInformation('There was a problem creating the menu. ' + - // 'Please try again later. Error Status: '+ err.status).then(isConfirmed => {}); - $log.error('SidebarCtrl::getUserProfile: User Profile error occurred: ' + err); - }); - - } - } - SidebarCtrl.$inject = ['applicationsService','userProfileService', '$log', '$rootScope']; - angular.module('ecompApp').controller('SidebarCtrl', SidebarCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; +(function () { + class SidebarCtrl { + constructor(applicationsService,userProfileService, $log, $rootScope) { + this.$log = $log; + this.userProfileService = userProfileService; + this.$rootScope = $rootScope; + $rootScope.isAdminPortalAdmin = false; + + + //if (bowser.msie || bowser.msedge) + // $log.debug('SidebarCtrl::init: Browser is: Internet Explorer or Edge'); + // else + // $log.debug('SidebarCtrl::init: Browser is: ' + bowser.name + ': ' + bowser.version); + + //note: this model should be retrieved from BE via sidebar specific service + userProfileService.getUserProfile() + .then(profile=> { + + if (profile.roles.indexOf('System Administrator') > -1) { + $rootScope.isAdminPortalAdmin = true; + } else { + this.$log.debug('SidebarCtrl::getUserProfile: user is not superAdmin nor admin'); + } + }); + // $log.debug('SidebarCtrl::getUserProfile: profile.roles.indexOf(superAdmin) = ' + profile.roles.indexOf('superAdmin')); + // $log.debug('SidebarCtrl::getUserProfile: profile.roles.indexOf(admin) = ' + profile.roles.indexOf('admin')); + applicationsService + .getLeftMenuItems() + .then(res=> + { + //console.log("Menu items is "+JSON.stringify(res)); + this.sidebarModel = res; + }).catch(err => { + //confirmBoxService.showInformation('There was a problem creating the menu. ' + + // 'Please try again later. Error Status: '+ err.status).then(isConfirmed => {}); + $log.error('SidebarCtrl::getUserProfile: User Profile error occurred: ' + err); + }); + + } + } + SidebarCtrl.$inject = ['applicationsService','userProfileService', '$log', '$rootScope']; + angular.module('ecompApp').controller('SidebarCtrl', SidebarCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/sidebar/sidebar.less b/ecomp-portal-FE-common/client/app/views/sidebar/sidebar.less index f86b5afd..97650fed 100644 --- a/ecomp-portal-FE-common/client/app/views/sidebar/sidebar.less +++ b/ecomp-portal-FE-common/client/app/views/sidebar/sidebar.less @@ -1,37 +1,37 @@ -/*- - * ================================================================================ - * eCOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ - .w-ecomp-sidebar { - position: relative; - left: 0; - right: 0; - top: 5px; - padding-left: 0; -} - - @media screen and (-webkit-min-device-pixel-ratio:0) -{ - .w-ecomp-sidebar { - position: relative; - left: 0; - right: 0; - top: -5px; - padding-left: 0; - } +/*- + * ================================================================================ + * eCOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ + .w-ecomp-sidebar { + position: relative; + left: 0; + right: 0; + top: 5px; + padding-left: 0; +} + + @media screen and (-webkit-min-device-pixel-ratio:0) +{ + .w-ecomp-sidebar { + position: relative; + left: 0; + right: 0; + top: -5px; + padding-left: 0; + } } \ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/sidebar/sidebar.tpl.html b/ecomp-portal-FE-common/client/app/views/sidebar/sidebar.tpl.html index 95492ed1..a5cbf8ff 100644 --- a/ecomp-portal-FE-common/client/app/views/sidebar/sidebar.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/sidebar/sidebar.tpl.html @@ -1,20 +1,20 @@ - - + + diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.js b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.js index 8413382e..8c76abc2 100644 --- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.js +++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.js @@ -1,202 +1,202 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; - -(function () { - class ContactUsManageController { - constructor($scope,$log, message, $q, $http, conf,contactUsService,confirmBoxService) { - $scope.contactUsList=[]; - $scope.contactUsAllAppList=[]; - $scope.errMsg=''; - $scope.newContactUs ={ - app:'', - name:'', - email:'', - url:'', - desc:'' - }; - /*Get the existing contact us first, then based on the existing, filter from all apps*/ - $scope.getContactUsList = function(){ - contactUsService.getContactUs().then(res=> { - // $log.info('getting getContactUs',res.response); - if(res!=null && res.response!=null){ - for(var i=0; i { - var tableData=[]; - $scope.contactUsAllAppListTemp=[]; - // $log.info('contactUsService::getListOfApp: getting res'); - var result = (typeof(res.data) != "undefined" && res.data!=null)?res.data:null; - // $log.info('contactUsService::getListOfApp: result',result); - var res1 = result; - var realAppIndex = 0; - $scope.contactUsAllAppList.length=0; - for (var i = 1; i <= res1.length; i++) { - if (!res1[i - 1].restrictedApp) { - var okToAdd = true; - for(var j =0; j<$scope.contactUsList.length;j++){ - if(res1[i - 1].title==$scope.contactUsList[j].appName) - okToAdd=false; - } - // not allowed to add(duplicate) another entry if the app is already available in the table - if(okToAdd){ - if(res1[i - 1].title){ - $scope.contactUsAllAppList.push({ - index: realAppIndex, - title: res1[i - 1].title, - value: res1[i - 1].index - }); - } - realAppIndex = realAppIndex + 1; - } - } else { - // $log.debug('contactUsService:getAvailableApps:: Restricted/URL only App will not be used = ' + res1[i - 1].title); - } - } - }).catch(err=> { - $log.error('contactUsService:error:: ', err); - - - }).finally(() => { - //this.isLoadingTable = false; - }); - }); - } - - $scope.getContactUsList(); - - $scope.closeDialog = function(){ - $scope.closeThisDialog( $scope.widgetData); - } - - /*Add new Contact Us*/ - $scope.newContactUsFun = function(){ - if($scope.newContactUs.app.title==null || $scope.newContactUs.app.title=='' ){ - confirmBoxService.showInformation('Please select an App to add').then(isConfirmed => { - return; - }); - } - - if($scope.newContactUs.url !=null && $scope.newContactUs.url != '' && !validateUrl($scope.newContactUs.url)){ - var warningMsg = "Please enter a valid URL"; - confirmBoxService.showInformation(warningMsg).then(isConfirmed => {return;}); - return; - } - - contactUsService.addContactUs($scope.newContactUs).then(res=> { - // $log.info('contactUsService: add ContactUs successfully'); - $scope.contactUsList.length=0; - // $log.info('contactUsService: refreshing the Contact US table'); - $scope.getContactUsList(); - $scope.errMsg=''; - /* confirmBoxService.showInformation('You have added a new Contact Us item').then(isConfirmed => { });*/ - var defaultSel={ - index: 0, - title: '', - value: '' - } - $scope.newContactUs ={ - app:defaultSel, - name:'', - email:'', - url:'', - desc:'' - }; - - }).catch(err=> { - $log.error('contactUsService: addContactUs error:: ', err); - // $scope.errMsg=err; - confirmBoxService.showInformation('Add Contact Us list failed: ' + err); - - }).finally(() => { - //this.isLoadingTable = false; - }); - } - /* Edit Contact Us*/ - $scope.editContactUsFun = function(contactObj){ - // $log.info('contactUsService: edit ContactUs save successfully', contactObj); - var contactUsObj={ - appId:contactObj.appId, - appName:contactObj.appName, - description:contactObj.description, - contactName:contactObj.contactName, - contactEmail:contactObj.contactEmail, - url:contactObj.url, - }; - - contactUsService.modifyContactUs(contactUsObj).then(res=> { - // $log.info('contactUsService: edit ContactUs successfully'); - // confirmBoxService.showInformation('You have saved the changes').then(isConfirmed => {}); - $scope.errMsg=''; - - }).catch(err=> { - $log.error('contactUsService: editContactUs error:: ', err); - confirmBoxService.showInformation('Edit Contact Us list failed: ' + err); - // $scope.errMsg=err; - }).finally(() => { - //this.isLoadingTable = false; - }); - - } - - $scope.$watch('newContactUs.app.value', (newVal, oldVal) => { - for(var i=0;i<$scope.contactUsAllAppList.length;i++){ - if($scope.contactUsAllAppList[i].value==newVal){ - $scope.newContactUs.app=angular.copy($scope.contactUsAllAppList[i]);; - } - } - }); - /*del Contact Us*/ - $scope.delContactUsFun = function(appObj){ - var confirmMsg = 'Are you sure you want to delete '+appObj.appName +' from the list?' + ' Press OK to delete.'; - confirmBoxService.confirm(confirmMsg).then(function (confirmed) { - if (confirmed == true) { - contactUsService.removeContactUs(appObj.appId).then(res=> { - // $log.info('delContactUsFun: delete ContactUs successfully',res); - $scope.errMsg=''; - $scope.contactUsList.length=0; - $scope.getContactUsList(); - confirmBoxService.showInformation('Item has been deleted').then(isConfirmed => {}); - }).catch(err=> { - $log.error('contactUsService: addContactUs error:: ', err); - confirmBoxService.showInformation('Deletion failed: ' + err); - // $scope.errMsg=err; - }).finally(() => { - //this.isLoadingTable = false; - }); - } - }); - - } - - } - } - ContactUsManageController.$inject = ['$scope','$log', 'message', '$q', '$http', 'conf','contactUsService','confirmBoxService']; - angular.module('ecompApp').controller('ContactUsManageController', ContactUsManageController); - - -})(); -function validateUrl(value){ - return /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value); - } +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; + +(function () { + class ContactUsManageController { + constructor($scope,$log, message, $q, $http, conf,contactUsService,confirmBoxService) { + $scope.contactUsList=[]; + $scope.contactUsAllAppList=[]; + $scope.errMsg=''; + $scope.newContactUs ={ + app:'', + name:'', + email:'', + url:'', + desc:'' + }; + /*Get the existing contact us first, then based on the existing, filter from all apps*/ + $scope.getContactUsList = function(){ + contactUsService.getContactUs().then(res=> { + // $log.info('getting getContactUs',res.response); + if(res!=null && res.response!=null){ + for(var i=0; i { + var tableData=[]; + $scope.contactUsAllAppListTemp=[]; + // $log.info('contactUsService::getListOfApp: getting res'); + var result = (typeof(res.data) != "undefined" && res.data!=null)?res.data:null; + // $log.info('contactUsService::getListOfApp: result',result); + var res1 = result; + var realAppIndex = 0; + $scope.contactUsAllAppList.length=0; + for (var i = 1; i <= res1.length; i++) { + if (!res1[i - 1].restrictedApp) { + var okToAdd = true; + for(var j =0; j<$scope.contactUsList.length;j++){ + if(res1[i - 1].title==$scope.contactUsList[j].appName) + okToAdd=false; + } + // not allowed to add(duplicate) another entry if the app is already available in the table + if(okToAdd){ + if(res1[i - 1].title){ + $scope.contactUsAllAppList.push({ + index: realAppIndex, + title: res1[i - 1].title, + value: res1[i - 1].index + }); + } + realAppIndex = realAppIndex + 1; + } + } else { + // $log.debug('contactUsService:getAvailableApps:: Restricted/URL only App will not be used = ' + res1[i - 1].title); + } + } + }).catch(err=> { + $log.error('contactUsService:error:: ', err); + + + }).finally(() => { + //this.isLoadingTable = false; + }); + }); + } + + $scope.getContactUsList(); + + $scope.closeDialog = function(){ + $scope.closeThisDialog( $scope.widgetData); + } + + /*Add new Contact Us*/ + $scope.newContactUsFun = function(){ + if($scope.newContactUs.app.title==null || $scope.newContactUs.app.title=='' ){ + confirmBoxService.showInformation('Please select an App to add').then(isConfirmed => { + return; + }); + } + + if($scope.newContactUs.url !=null && $scope.newContactUs.url != '' && !validateUrl($scope.newContactUs.url)){ + var warningMsg = "Please enter a valid URL"; + confirmBoxService.showInformation(warningMsg).then(isConfirmed => {return;}); + return; + } + + contactUsService.addContactUs($scope.newContactUs).then(res=> { + // $log.info('contactUsService: add ContactUs successfully'); + $scope.contactUsList.length=0; + // $log.info('contactUsService: refreshing the Contact US table'); + $scope.getContactUsList(); + $scope.errMsg=''; + /* confirmBoxService.showInformation('You have added a new Contact Us item').then(isConfirmed => { });*/ + var defaultSel={ + index: 0, + title: '', + value: '' + } + $scope.newContactUs ={ + app:defaultSel, + name:'', + email:'', + url:'', + desc:'' + }; + + }).catch(err=> { + $log.error('contactUsService: addContactUs error:: ', err); + // $scope.errMsg=err; + confirmBoxService.showInformation('Add Contact Us list failed: ' + err); + + }).finally(() => { + //this.isLoadingTable = false; + }); + } + /* Edit Contact Us*/ + $scope.editContactUsFun = function(contactObj){ + // $log.info('contactUsService: edit ContactUs save successfully', contactObj); + var contactUsObj={ + appId:contactObj.appId, + appName:contactObj.appName, + description:contactObj.description, + contactName:contactObj.contactName, + contactEmail:contactObj.contactEmail, + url:contactObj.url, + }; + + contactUsService.modifyContactUs(contactUsObj).then(res=> { + // $log.info('contactUsService: edit ContactUs successfully'); + // confirmBoxService.showInformation('You have saved the changes').then(isConfirmed => {}); + $scope.errMsg=''; + + }).catch(err=> { + $log.error('contactUsService: editContactUs error:: ', err); + confirmBoxService.showInformation('Edit Contact Us list failed: ' + err); + // $scope.errMsg=err; + }).finally(() => { + //this.isLoadingTable = false; + }); + + } + + $scope.$watch('newContactUs.app.value', (newVal, oldVal) => { + for(var i=0;i<$scope.contactUsAllAppList.length;i++){ + if($scope.contactUsAllAppList[i].value==newVal){ + $scope.newContactUs.app=angular.copy($scope.contactUsAllAppList[i]);; + } + } + }); + /*del Contact Us*/ + $scope.delContactUsFun = function(appObj){ + var confirmMsg = 'Are you sure you want to delete '+appObj.appName +' from the list?' + ' Press OK to delete.'; + confirmBoxService.confirm(confirmMsg).then(function (confirmed) { + if (confirmed == true) { + contactUsService.removeContactUs(appObj.appId).then(res=> { + // $log.info('delContactUsFun: delete ContactUs successfully',res); + $scope.errMsg=''; + $scope.contactUsList.length=0; + $scope.getContactUsList(); + confirmBoxService.showInformation('Item has been deleted').then(isConfirmed => {}); + }).catch(err=> { + $log.error('contactUsService: addContactUs error:: ', err); + confirmBoxService.showInformation('Deletion failed: ' + err); + // $scope.errMsg=err; + }).finally(() => { + //this.isLoadingTable = false; + }); + } + }); + + } + + } + } + ContactUsManageController.$inject = ['$scope','$log', 'message', '$q', '$http', 'conf','contactUsService','confirmBoxService']; + angular.module('ecompApp').controller('ContactUsManageController', ContactUsManageController); + + +})(); +function validateUrl(value){ + return /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value); + } diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.less b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.less index 905f9faa..2625f32c 100644 --- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.less +++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.controller.less @@ -138,6 +138,24 @@ background-color: transparent; border-color: slategrey !important; width:100%; } + .mandatory-categories{ + color: #cf2a2a; + font-size: 11px; + position:absolute; + + } + .error-container{ + position: absolute; + width: 220px; + display: block; + height: 12px; + line-height: 12px; + + .err-message{ + color: @funcRed; + font-size: 10px; + } + } .glyphicon { position: relative !important; line-height: 0 !important; diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.html b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.html index c619a18a..4c8f6dee 100644 --- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.html +++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us-manage/contact-us-manage.html @@ -1,180 +1,181 @@ - -
-
- -
-
Manage - Contact Us
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
App NameContact NameContact EmailContact URLDescriptionEditDelete
-
- 		-
- 		-
- 		-
- 		-
- 		-
- -
Save - - 		-
- -
-
-
- -
-
-
-

Add Application Contact - Information

- -
-
-
-
-
App - Name
- -
-
-
-
Contact - Name
- -
-
-
Contact - Email
- -
-
-
Contact - URL
- -
-
-
Description
- -
-
-
- Add - New -
-
- -
- Close -
- -
- -
- -
-
-
-
- - + +
+
+ +
+
Manage + Contact Us
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
App NameContact NameContact EmailContact URLDescriptionEditDelete
+
+ 		+
+ 		+
+ 		+
+ 		+
+ 		+
+ +
Save + + 		+
+ +
+
+
+ +
+
+
+

Add Application Contact + Information

+ +
+
+
+
+
*App Name
+ +
+ App Name is Required +
+
+
+
+
Contact + Name
+ +
+
+
Contact + Email
+ +
+
+
Contact + URL
+ +
+
+
Description
+ +
+
+
+ Add + New +
+
+ +
+ Close +
+ +
+ +
+ +
+
+
+
+ + diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.js b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.js index 0d39a653..eddde0d9 100644 --- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.js +++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.js @@ -1,171 +1,171 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; - -(function () { - - class ContactUsCtrl { - constructor($log, contactUsService, applicationsService, $modal, ngDialog, $state,$anchorScroll,$location) { - - contactUsService.getContactUSPortalDetails().then(res => { - // $log.info('ContactUsCtrl:: contactUsService getContactUSPortalDetails res',res); - // $log.info('getting res',res); - var result = (typeof(res.response) != "undefined" && res.response!=null)?res.response:null; - // $log.info('result',result); - // $log.info('done'); - var source = JSON.parse(result); - // $log.info(source); - this.ush_TicketInfoUrl = source.ush_ticket_url; - this.portalInfo_Address = source.feedback_email_address; - this.feedback_Url = source.portal_info_url; - }).catch(err=> { - $log.error('ContactUsCtrl:error:: ', err); - }).finally(() => { - }); - - let init = () => { - // $log.info('ecomp app::contact-us-controller::initializing...'); - this.appTable=[]; - this.functionalTableData=[]; - }; - init(); - - let updateContactUsTable = () => { - contactUsService.getAppsAndContacts().then(res=> { - // $log.info('ContactUsCtrl:: contactUsService getAppsAndContacts res',res); - var tableData=[]; - // $log.info('getting res',res); - var result = (typeof(res.response) != "undefined" && res.response!=null)?res.response:null; - // $log.info('result',result); - // $log.info('done'); - var source = result; - // $log.info(source); - // Drop Portal app, empty name entries - for(var i=0;i { - $log.error('ContactUsCtrl.updateContactUsTable:error:: ', err); - }) - }; - - contactUsService.getAppCategoryFunctions().then(res=> { - // $log.info('ContactUsCtrl:: contactUsService getAppCategoryFunctionsthen res',res); - var tablefunctionalData=[]; - // $log.info('getting res',res); - var result = (typeof(res.response) != "undefined" && res.response!=null)?res.response:null; - // $log.info('result',result); - // $log.info('done'); - var source = result; - // $log.info(source); - for(var i=0;i { - $log.error('ContactUsCtrl:error:: ', err); - }) - - updateContactUsTable(); - this.editContactUsModalPopup = () => { - // $log.debug('ContactUsCtrl::editContactUsModalPopup updating table data...'); - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/support/contact-us/contact-us-manage/contact-us-manage.html', - controller: 'ContactUsManageController', - resolve: { - message: function message() { - var message = { - type: 'Contact', - }; - return message; - } - } - }).closePromise.then(needUpdate => { - updateContactUsTable(); - }); - }; - - this.goToSection = (id) => { - - var targetDiv = document.getElementById(id); - - var offSetHeight = 0; - for(var i=0;i d.showFlag = false); - // let index = this.appTable.findIndex(a => a.app_Id == id); - var index =-1; - for(var i=0; i -1) { - // setting the showFlag to true based on index comparing with the app_Id - this.appTable[index].showFlag = true; - $location.hash('appId'+index); - $anchorScroll(); - /* $('#contentId').animate({ - scrollTop: targetDiv.offsetTop-offSetHeight - }, 'fast');*/ - } - - }; - - // Take the user to the application on the get access page. - this.goGetAccess = (appName) => { - // $log.debug('ContactUsCtrl::goGetAccess received name ' + appName); - applicationsService.goGetAccessAppName = appName; - $state.go('root.getAccess'); - }; - - } - } - ContactUsCtrl.$inject = ['$log','contactUsService', 'applicationsService', '$modal', 'ngDialog', '$state','$anchorScroll','$location']; - angular.module('ecompApp').controller('ContactUsCtrl', ContactUsCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; + +(function () { + + class ContactUsCtrl { + constructor($log, contactUsService, applicationsService, $modal, ngDialog, $state,$anchorScroll,$location) { + + contactUsService.getContactUSPortalDetails().then(res => { + // $log.info('ContactUsCtrl:: contactUsService getContactUSPortalDetails res',res); + // $log.info('getting res',res); + var result = (typeof(res.response) != "undefined" && res.response!=null)?res.response:null; + // $log.info('result',result); + // $log.info('done'); + var source = JSON.parse(result); + // $log.info(source); + this.ush_TicketInfoUrl = source.ush_ticket_url; + this.portalInfo_Address = source.feedback_email_address; + this.feedback_Url = source.portal_info_url; + }).catch(err=> { + $log.error('ContactUsCtrl:error:: ', err); + }).finally(() => { + }); + + let init = () => { + // $log.info('ecomp app::contact-us-controller::initializing...'); + this.appTable=[]; + this.functionalTableData=[]; + }; + init(); + + let updateContactUsTable = () => { + contactUsService.getAppsAndContacts().then(res=> { + // $log.info('ContactUsCtrl:: contactUsService getAppsAndContacts res',res); + var tableData=[]; + // $log.info('getting res',res); + var result = (typeof(res.response) != "undefined" && res.response!=null)?res.response:null; + // $log.info('result',result); + // $log.info('done'); + var source = result; + // $log.info(source); + // Drop Portal app, empty name entries + for(var i=0;i { + $log.error('ContactUsCtrl.updateContactUsTable:error:: ', err); + }) + }; + + contactUsService.getAppCategoryFunctions().then(res=> { + // $log.info('ContactUsCtrl:: contactUsService getAppCategoryFunctionsthen res',res); + var tablefunctionalData=[]; + // $log.info('getting res',res); + var result = (typeof(res.response) != "undefined" && res.response!=null)?res.response:null; + // $log.info('result',result); + // $log.info('done'); + var source = result; + // $log.info(source); + for(var i=0;i { + $log.error('ContactUsCtrl:error:: ', err); + }) + + updateContactUsTable(); + this.editContactUsModalPopup = () => { + // $log.debug('ContactUsCtrl::editContactUsModalPopup updating table data...'); + var modalInstance = ngDialog.open({ + templateUrl: 'app/views/support/contact-us/contact-us-manage/contact-us-manage.html', + controller: 'ContactUsManageController', + resolve: { + message: function message() { + var message = { + type: 'Contact', + }; + return message; + } + } + }).closePromise.then(needUpdate => { + updateContactUsTable(); + }); + }; + + this.goToSection = (id) => { + + var targetDiv = document.getElementById(id); + + var offSetHeight = 0; + for(var i=0;i d.showFlag = false); + // let index = this.appTable.findIndex(a => a.app_Id == id); + var index =-1; + for(var i=0; i -1) { + // setting the showFlag to true based on index comparing with the app_Id + this.appTable[index].showFlag = true; + $location.hash('appId'+index); + $anchorScroll(); + /* $('#contentId').animate({ + scrollTop: targetDiv.offsetTop-offSetHeight + }, 'fast');*/ + } + + }; + + // Take the user to the application on the get access page. + this.goGetAccess = (appName) => { + // $log.debug('ContactUsCtrl::goGetAccess received name ' + appName); + applicationsService.goGetAccessAppName = appName; + $state.go('root.getAccess'); + }; + + } + } + ContactUsCtrl.$inject = ['$log','contactUsService', 'applicationsService', '$modal', 'ngDialog', '$state','$anchorScroll','$location']; + angular.module('ecompApp').controller('ContactUsCtrl', ContactUsCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.spec.js b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.spec.js index 3841a2b3..32cc3a1f 100644 --- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.spec.js +++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.controller.spec.js @@ -1,19 +1,19 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ diff --git a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.tpl.html b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.tpl.html index 9e96b441..444a9820 100644 --- a/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/support/contact-us/contact-us.tpl.html @@ -1,126 +1,124 @@ - -
-
-
-
-

Contact Us

- - -
- -
- -
Application Functions -
- - - - - - - - - - - - - - - - - -
CategoryECOMP FunctionsECOMP Application
-
-
- 		-
- 		- {{rowData.app_Name}} -
-
-
-
- -
-
All Applications -
-
-
-
-
-
- - - - Expand app contact section - App contact section - -
- -
-
- No application information is available. Please use the links above to contact the ECOMP Portal team. -
-
- - - - - - - - - - - - - - - - - - - - - -
Contact:{{rowData.contact_name}}
Email:{{rowData.contact_email}}
Info URL:{{rowData.url_Info}}
Description:{{rowData.desc}}
Get access:Click for application and role information
-
-
- -
-
-
-
-
- -
-
-
+ +
+
+
+
+

Contact Us

+ + +
+ +
+ +
Application Functions +
+ + + + + + + + + + + + + + + + + +
CategoryECOMP FunctionsECOMP Application
+
+
+ 		+
+ 		+ {{rowData.app_Name}} +
+
+
+
+ +
+
All Applications +
+
+
+
+
+
+ + + + + + +
+ +
+
+ No application information is available. Please use the links above to contact the ECOMP Portal team. +
+
+ + + + + + + + + + + + + + + + + + + + + +
Contact:{{rowData.contact_name}}
Email:{{rowData.contact_email}}
Info URL:{{rowData.url_Info}}
Description:{{rowData.desc}}
Get access:Click for application and role information
+
+
+ +
+
+
+
+
+ +
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.controller.js b/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.controller.js index 74b5ba4e..c93d8643 100644 --- a/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.controller.js +++ b/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.controller.js @@ -1,123 +1,125 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; -(function () { - class GetAccessCtrl { - constructor($log, $scope, $stateParams, getAccessService, userProfileService, ExternalRequestAccessService, applicationsService, ngDialog) { - // $log.debug('GetAccessCtrl: appService param is: ' + applicationsService.goGetAccessAppName); - var resultAccessValue = null; - - $scope.openAppRoleModal = (itemData) => { - if(resultAccessValue){ - let data = null; - data = { - dialogState: 2, - selectedUser:{ - attuid: $scope.attuid, - firstName: $scope.firstName, - lastName: $scope.lastName, - headerText: itemData.app_name - } - } - ngDialog.open({ - templateUrl: 'app/views/catalog/add-catalog-dialogs/new-catalog.modal.html', - controller: 'NewCatalogModalCtrl', - controllerAs: 'userInfo', - data: data - }); - } - } - - userProfileService.getUserProfile().then( - function(profile) { - $scope.attuid = profile.orgUserId; - $scope.firstName = profile.firstName; - $scope.lastName = profile.lastName; - }); - - this.updateAppsList = () => { - ExternalRequestAccessService.getExternalRequestAccessServiceInfo().then( - function(property) { - resultAccessValue = property.accessValue; - }).catch(err => { - $log.error('GetAccessCtrl: failed getExternalRequestAccessServiceInfo: ' + JSON.Stringify(err)); - }); - getAccessService.getListOfApp().then(res=> { - var tableData=[]; - // $log.info('GetAccessCtrl::updateAppsList: getting res'); - var result = (typeof(res.data) != "undefined" && res.data!=null)?res.data:null; - // $log.info('GetAccessCtrl::updateAppsList: result',result); - // $log.info('GetAccessCtrl::updateAppsList: done'); - var source = result; - // $log.info('GetAccessCtrl::updateAppsList source: ', source); - for(var i=0;i { - $log.error('GetAccessCtrl:error:: ', err); - }).finally(() => { - this.isLoadingTable = false; - }); - }; - - this.updateTable = (num) => { - this.startIndex=this.viewPerPage*(num-1); - this.currentPage = num; - }; - let init = () => { - // $log.info('GetAccessCtrl:: initializing...'); - this.searchString = ''; - this.getAccessTableHeaders = ['ECOMP Function', 'Application Name', 'Role Name', 'Current Role', 'Request Status']; - this.appTable=[]; - this.updateAppsList(); - this.viewPerPage=20; - this.startIndex=0; - this.currentPage = 1; - this.totalPage=0; - }; - init(); - } - } - GetAccessCtrl.$inject = ['$log', '$scope', '$stateParams', 'getAccessService', 'userProfileService', 'ExternalRequestAccessService','applicationsService', 'ngDialog']; - angular.module('ecompApp').controller('GetAccessCtrl', GetAccessCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; +(function () { + class GetAccessCtrl { + constructor($log, $scope, $stateParams, getAccessService, userProfileService, ExternalRequestAccessService, applicationsService, ngDialog) { + // $log.debug('GetAccessCtrl: appService param is: ' + applicationsService.goGetAccessAppName); + var resultAccessValue = null; + var externalRequest = true; + + $scope.openAppRoleModal = (itemData) => { + if(resultAccessValue){ + let data = null; + data = { + dialogState: 2, + selectedUser:{ + attuid: $scope.attuid, + firstName: $scope.firstName, + lastName: $scope.lastName, + headerText: itemData.app_name, + extReqValue : externalRequest + } + } + ngDialog.open({ + templateUrl: 'app/views/catalog/add-catalog-dialogs/new-catalog.modal.html', + controller: 'NewCatalogModalCtrl', + controllerAs: 'userInfo', + data: data + }); + } + } + + userProfileService.getUserProfile().then( + function(profile) { + $scope.attuid = profile.orgUserId; + $scope.firstName = profile.firstName; + $scope.lastName = profile.lastName; + }); + + this.updateAppsList = () => { + ExternalRequestAccessService.getExternalRequestAccessServiceInfo().then( + function(property) { + resultAccessValue = property.accessValue; + }).catch(err => { + $log.error('GetAccessCtrl: failed getExternalRequestAccessServiceInfo: ' + JSON.Stringify(err)); + }); + getAccessService.getListOfApp().then(res=> { + var tableData=[]; + // $log.info('GetAccessCtrl::updateAppsList: getting res'); + var result = (typeof(res.data) != "undefined" && res.data!=null)?res.data:null; + // $log.info('GetAccessCtrl::updateAppsList: result',result); + // $log.info('GetAccessCtrl::updateAppsList: done'); + var source = result; + // $log.info('GetAccessCtrl::updateAppsList source: ', source); + for(var i=0;i { + $log.error('GetAccessCtrl:error:: ', err); + }).finally(() => { + this.isLoadingTable = false; + }); + }; + + this.updateTable = (num) => { + this.startIndex=this.viewPerPage*(num-1); + this.currentPage = num; + }; + let init = () => { + // $log.info('GetAccessCtrl:: initializing...'); + this.searchString = ''; + this.getAccessTableHeaders = ['ECOMP Function', 'Application Name', 'Role Name', 'Current Role', 'Request Status']; + this.appTable=[]; + this.updateAppsList(); + this.viewPerPage=20; + this.startIndex=0; + this.currentPage = 1; + this.totalPage=0; + }; + init(); + } + } + GetAccessCtrl.$inject = ['$log', '$scope', '$stateParams', 'getAccessService', 'userProfileService', 'ExternalRequestAccessService','applicationsService', 'ngDialog']; + angular.module('ecompApp').controller('GetAccessCtrl', GetAccessCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.controller.spec.js b/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.controller.spec.js index 3841a2b3..32cc3a1f 100644 --- a/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.controller.spec.js +++ b/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.controller.spec.js @@ -1,19 +1,19 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ diff --git a/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.tpl.html b/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.tpl.html index 7f6770ea..08ccbf48 100644 --- a/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.tpl.html @@ -1,102 +1,102 @@ - -
-
-
-
-

Get Access

-
-
-
-
- -
- - - - - - - - - - - - - - - - - - - -
{{access.getAccessTableHeaders[0]}}{{access.getAccessTableHeaders[1]}}{{access.getAccessTableHeaders[2]}}{{access.getAccessTableHeaders[3]}}{{access.getAccessTableHeaders[4]}}
-
-
- 		-
- 		-
- 		-
- -
- 		-
-
-
-
-
-
-
-
-
- - + +
+
+
+
+

Get Access

+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + +
{{access.getAccessTableHeaders[0]}}{{access.getAccessTableHeaders[1]}}{{access.getAccessTableHeaders[2]}}{{access.getAccessTableHeaders[3]}}{{access.getAccessTableHeaders[4]}}
+
+
+ 		+
+ 		+
+ 		+
+ +
+ 		+
+
+
+
+
+
+
+
+
+ + diff --git a/ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js b/ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js index 5a5b7e49..bab9ba5c 100644 --- a/ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js +++ b/ecomp-portal-FE-common/client/app/views/tabs/tabs.controller.js @@ -33,6 +33,12 @@ $rootScope.showFooter = ""; $cookies.putObject('show_app_header', false,{domain: cookieDomain, path : '/'}); + let getCookieDomain = function() { + return window.location.hostname; + } + let getContextPath=function() { + return window.location.pathname.substring( 0, window.location.pathname.lastIndexOf( '/' ) + 1 ); + } let noRefresh = function () { window.onbeforeunload = function(e) { @@ -72,8 +78,9 @@ if ($scope.tabs.length > 1) { noRefresh(); } - $cookies.putObject('cookieTabs', $scope.tabs,{domain: cookieDomain, path : '/'}); - $cookies.putObject('visInVisCookieTabs', $scope.tabs,{domain: cookieDomain, path : '/'}); + $cookies.putObject('cookieTabs', $scope.tabs,{domain: getCookieDomain(), path : getContextPath()}); + $cookies.putObject('visInVisCookieTabs', $scope.tabs,{domain: getCookieDomain(), path : getContextPath()}); + } }; @@ -92,8 +99,8 @@ if ($scope.tabs.length > 1) { noRefresh(); } - $cookies.putObject('cookieTabs', $scope.tabs,{domain: cookieDomain, path : '/'}); - $cookies.putObject('visInVisCookieTabs', $scope.tabs,{domain: cookieDomain, path : '/'}); + $cookies.putObject('cookieTabs', $scope.tabs,{domain: getCookieDomain(), path : getContextPath()}); + $cookies.putObject('visInVisCookieTabs', $scope.tabs,{domain: getCookieDomain(), path : getContextPath()}); } }; @@ -124,7 +131,7 @@ event.preventDefault(); event.stopPropagation(); $scope.tabs.splice(index, 1); - $cookies.putObject('cookieTabs', $scope.tabs,{domain: cookieDomain, path : '/'}); + $cookies.putObject('cookieTabs', $scope.tabs,{domain: getCookieDomain(), path : getContextPath()}); }; //adjust height of the tab due to the search popup being hidden diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.controller.js b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.controller.js index dd11c60d..5fc2d894 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.controller.js +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.controller.js @@ -1,36 +1,36 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; - -(function () { - - class userNotificationCtrl { - constructor($scope, message, ngDialog) { - $scope.messageData=message.text; - //alert("message.text" + $scope.messageData); - } - } - userNotificationCtrl.$inject = ['$scope', 'message', 'ngDialog']; - angular.module('ecompApp').controller('userNotificationCtrl', userNotificationCtrl); -})(); - - - - +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; + +(function () { + + class userNotificationCtrl { + constructor($scope, message, ngDialog) { + $scope.messageData=message.text; + //alert("message.text" + $scope.messageData); + } + } + userNotificationCtrl.$inject = ['$scope', 'message', 'ngDialog']; + angular.module('ecompApp').controller('userNotificationCtrl', userNotificationCtrl); +})(); + + + + diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html index 2c22751b..5e5c55db 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html @@ -1,48 +1,48 @@ - -
-
-
-
Message Notification Details
- - -
- -
-
- -
- - -
- -
- -
-
- - + +
+
+
+
Message Notification Details
+ + +
+ +
+
+ +
+ + +
+ +
+ +
+
+ + diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.controller.js b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.controller.js index 51c7bb7c..4207bc6e 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.controller.js +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.controller.js @@ -1,196 +1,196 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; - -(function () { - - class userNotificationsCtrl { - constructor($scope, $log, notificationService, confirmBoxService, $modal, ngDialog, $state) { - - var priorityItems={"1":"Normal","2":"Important"}; - $scope.priorityItems=priorityItems; - $scope.searchString=''; - $scope.externalNotification="External System"; - $scope.itemExpired={"background-color":"silver "}; - $scope.showInput = true; - $scope.totalPages1 = 0; - $scope.viewPerPage1 = 15; - $scope.currentPage1 = 1; - $scope.showLoader = false; - $scope.firstPlay = true; - // Start with empty list to silence error in console - $scope.tableData = []; - $scope.tableAdminNotifItems = []; - let getAdminNotifications = () => { - $scope.isLoadingTable = true; - notificationService.getAdminNotification().then(res => { - $scope.adminNotifications = res.data; - $scope.isLoadingTable = false; - $scope.tableData = res.data; - var totalItems = $scope.tableData.length; - $scope.totalPages1 = Math.ceil(totalItems / $scope.viewPerPage1); - $scope.showLoader = false; - $scope.currentPage1=1; - var endIndex = 1 * $scope.viewPerPage1; - var startIndex = endIndex - $scope.viewPerPage1; - $scope.tableAdminNotifItems = $scope.tableData.slice(startIndex, endIndex); - }).catch(err => { - $log.error('userNotificationsCtrl:getAdminNotifications:: error ', err); - $scope.isLoadingTable = false; - }); - } - - getAdminNotifications(); - - $scope.customPageHandler = function(num) { - $scope.currentPage1=num; - var endIndex = num * $scope.viewPerPage1; - var startIndex = endIndex - $scope.viewPerPage1; - $scope.tableAdminNotifItems = $scope.tableData.slice(startIndex, endIndex); - }; - - - - - - $scope.removeUserNotification = function (selectedAdminNotification) { - selectedAdminNotification.activeYn = 'N'; - confirmBoxService.deleteItem(selectedAdminNotification.msgHeader) - .then(isConfirmed => { - if (isConfirmed) { - notificationService.updateAdminNotification(selectedAdminNotification) - .then(() => { - getAdminNotifications(); - }).catch(err => { - switch (err.status) { - case '409': // Conflict - // handleConflictErrors(err); - break; - case '500': // Internal Server - // Error - confirmBoxService.showInformation('There was a problem updating the notification. ' + - 'Please try again later. Error: ' + err.status).then(isConfirmed => { }); - break; - case '403': // Forbidden... - // possible - // webjunction error - // to try again - confirmBoxService.showInformation('There was a problem updating the notification. ' + - 'Please try again. If the problem persists, then try again later. Error: ' + err.status).then(isConfirmed => { }); - break; - default: - confirmBoxService.showInformation('There was a problem updating the notification. ' + - 'Please try again. If the problem persists, then try again later. Error: ' + err.status).then(isConfirmed => { }); - } - $log.error('UserNotifCtlr::updateAdminNOtif failed: ' + JSON.stringify(err)); - }).finally(() => { - var objOffsetVersion = objAgent.indexOf("MSIE"); - if (objOffsetVersion != -1) { - $window.location.reload(); - } - }); - } - }).catch(err => { - $log.error('UserNotifCtlr::deleteItem error: ' + err); - }); - } - - - - $scope.showDetailedJsonMessage=function (selectedAdminNotification) { - notificationService.getMessageRecipients(selectedAdminNotification.notificationId).then(res =>{ - $scope.messageRecipients = res; - var messageObject=JSON.parse(selectedAdminNotification.msgDescription); - var html=""; - html+='

'+'Message Source'+' : '+selectedAdminNotification.msgSource+'

'; - html+='

'+'Message Title'+' : '+selectedAdminNotification.msgHeader+'

'; - html+='

'+'Message Recipient'+' : '+$scope.messageRecipients+'

'; - - for(var field in messageObject){ - if(field=='eventDate'||field=='lastModifiedDate'){ - html+='

'+field+' : '+new Date(+messageObject[field])+'

'; - - }else{ - html+='

'+field+' : '+messageObject[field]+'

'; - - } - } - - var modalInstance = ngDialog.open({ - templateUrl: 'app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html', - controller: 'userNotificationCtrl', - resolve: { - message: function () { - var message = { - title: '', - text: html - - }; - return message; - }, - - } - }); - - }).catch(err => { - $log.error('userNotificationsCtrl:getMessageRecipients:: error ', err); - $scope.isLoadingTable = false; - }); - - }; - - - $scope.editUserNotificationModal = function (selectedAdminNotification) { - - // retrieve roleIds here - selectedAdminNotification.roleIds = null; - notificationService.getNotificationRoles(selectedAdminNotification.notificationId) - .then(res => { - selectedAdminNotification.roleIds = res.data; - - $scope.openUserNotificationModal(selectedAdminNotification); - }).catch(err => { - $log.error('UserNotifCtlr:getNotificationRoles:: error ', err); - - }); - } - - $scope.openUserNotificationModal = function (selectedAdminNotification) { - let data = null; - if (selectedAdminNotification) { - data = { - notif: selectedAdminNotification - } - } - ngDialog.open({ - templateUrl: 'app/views/user-notifications-admin/user.notifications.modal.page.html', - controller: 'userNotificationsModalCtrl', - controllerAs: 'userNotifModal', - data: data - }).closePromise.then(function (needUpdate) { - getAdminNotifications(); - }); - } - - } - } - userNotificationsCtrl.$inject = ['$scope', '$log', 'notificationService', 'confirmBoxService', '$modal', 'ngDialog', '$state']; - angular.module('ecompApp').controller('userNotificationsCtrl', userNotificationsCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; + +(function () { + + class userNotificationsCtrl { + constructor($scope, $log, notificationService, confirmBoxService, $modal, ngDialog, $state) { + + var priorityItems={"1":"Normal","2":"Important"}; + $scope.priorityItems=priorityItems; + $scope.searchString=''; + $scope.externalNotification="External System"; + $scope.itemExpired={"background-color":"silver "}; + $scope.showInput = true; + $scope.totalPages1 = 0; + $scope.viewPerPage1 = 15; + $scope.currentPage1 = 1; + $scope.showLoader = false; + $scope.firstPlay = true; + // Start with empty list to silence error in console + $scope.tableData = []; + $scope.tableAdminNotifItems = []; + let getAdminNotifications = () => { + $scope.isLoadingTable = true; + notificationService.getAdminNotification().then(res => { + $scope.adminNotifications = res.data; + $scope.isLoadingTable = false; + $scope.tableData = res.data; + var totalItems = $scope.tableData.length; + $scope.totalPages1 = Math.ceil(totalItems / $scope.viewPerPage1); + $scope.showLoader = false; + $scope.currentPage1=1; + var endIndex = 1 * $scope.viewPerPage1; + var startIndex = endIndex - $scope.viewPerPage1; + $scope.tableAdminNotifItems = $scope.tableData.slice(startIndex, endIndex); + }).catch(err => { + $log.error('userNotificationsCtrl:getAdminNotifications:: error ', err); + $scope.isLoadingTable = false; + }); + } + + getAdminNotifications(); + + $scope.customPageHandler = function(num) { + $scope.currentPage1=num; + var endIndex = num * $scope.viewPerPage1; + var startIndex = endIndex - $scope.viewPerPage1; + $scope.tableAdminNotifItems = $scope.tableData.slice(startIndex, endIndex); + }; + + + + + + $scope.removeUserNotification = function (selectedAdminNotification) { + selectedAdminNotification.activeYn = 'N'; + confirmBoxService.deleteItem(selectedAdminNotification.msgHeader) + .then(isConfirmed => { + if (isConfirmed) { + notificationService.updateAdminNotification(selectedAdminNotification) + .then(() => { + getAdminNotifications(); + }).catch(err => { + switch (err.status) { + case '409': // Conflict + // handleConflictErrors(err); + break; + case '500': // Internal Server + // Error + confirmBoxService.showInformation('There was a problem updating the notification. ' + + 'Please try again later. Error: ' + err.status).then(isConfirmed => { }); + break; + case '403': // Forbidden... + // possible + // webjunction error + // to try again + confirmBoxService.showInformation('There was a problem updating the notification. ' + + 'Please try again. If the problem persists, then try again later. Error: ' + err.status).then(isConfirmed => { }); + break; + default: + confirmBoxService.showInformation('There was a problem updating the notification. ' + + 'Please try again. If the problem persists, then try again later. Error: ' + err.status).then(isConfirmed => { }); + } + $log.error('UserNotifCtlr::updateAdminNOtif failed: ' + JSON.stringify(err)); + }).finally(() => { + var objOffsetVersion = objAgent.indexOf("MSIE"); + if (objOffsetVersion != -1) { + $window.location.reload(); + } + }); + } + }).catch(err => { + $log.error('UserNotifCtlr::deleteItem error: ' + err); + }); + } + + + + $scope.showDetailedJsonMessage=function (selectedAdminNotification) { + notificationService.getMessageRecipients(selectedAdminNotification.notificationId).then(res =>{ + $scope.messageRecipients = res; + var messageObject=JSON.parse(selectedAdminNotification.msgDescription); + var html=""; + html+='

'+'Message Source'+' : '+selectedAdminNotification.msgSource+'

'; + html+='

'+'Message Title'+' : '+selectedAdminNotification.msgHeader+'

'; + html+='

'+'Message Recipient'+' : '+$scope.messageRecipients+'

'; + + for(var field in messageObject){ + if(field=='eventDate'||field=='lastModifiedDate'){ + html+='

'+field+' : '+new Date(+messageObject[field])+'

'; + + }else{ + html+='

'+field+' : '+messageObject[field]+'

'; + + } + } + + var modalInstance = ngDialog.open({ + templateUrl: 'app/views/user-notifications-admin/user.notifications.Json.details.modal.page.html', + controller: 'userNotificationCtrl', + resolve: { + message: function () { + var message = { + title: '', + text: html + + }; + return message; + }, + + } + }); + + }).catch(err => { + $log.error('userNotificationsCtrl:getMessageRecipients:: error ', err); + $scope.isLoadingTable = false; + }); + + }; + + + $scope.editUserNotificationModal = function (selectedAdminNotification) { + + // retrieve roleIds here + selectedAdminNotification.roleIds = null; + notificationService.getNotificationRoles(selectedAdminNotification.notificationId) + .then(res => { + selectedAdminNotification.roleIds = res.data; + + $scope.openUserNotificationModal(selectedAdminNotification); + }).catch(err => { + $log.error('UserNotifCtlr:getNotificationRoles:: error ', err); + + }); + } + + $scope.openUserNotificationModal = function (selectedAdminNotification) { + let data = null; + if (selectedAdminNotification) { + data = { + notif: selectedAdminNotification + } + } + ngDialog.open({ + templateUrl: 'app/views/user-notifications-admin/user.notifications.modal.page.html', + controller: 'userNotificationsModalCtrl', + controllerAs: 'userNotifModal', + data: data + }).closePromise.then(function (needUpdate) { + getAdminNotifications(); + }); + } + + } + } + userNotificationsCtrl.$inject = ['$scope', '$log', 'notificationService', 'confirmBoxService', '$modal', 'ngDialog', '$state']; + angular.module('ecompApp').controller('userNotificationsCtrl', userNotificationsCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.json.details.modal.page.less b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.json.details.modal.page.less index ebf48075..e17ec46f 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.json.details.modal.page.less +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.json.details.modal.page.less @@ -1,48 +1,48 @@ - -.w-ecomp-user-json-notification-details-admin { - .bg_portalWhite;//white for 1702 - //.bg_portalGray; // gray for 1610 - position: relative; - top: 20px; - left: -200px; - right: @page-main-right; - bottom: @page-main-bottom; - padding-top: @padding-top; - padding-left: @padding-left-side; - height: 345px; - width: 96%; - margin-left: 220px; - .w-ecomp-main-json-view-title { - //.n18r; - .dGray18r; //AT&T Dark Gray - border-bottom: @portalDBlue 3px solid; - width:100%; - } - - .notifications-properties-main{ - padding-top: 16px; - font-size: 14px; - overflow-y: scroll; - max-height: 285px; - - } -input:not([type="button"]) { - height: 22px; } - .widget-properties-main { - padding: 16px; - height: 460px; - overflow-y: auto; - - - - - } - -.dialog-control-close { - position: absolute; - bottom: -60px; - right: 16px; -} - - + +.w-ecomp-user-json-notification-details-admin { + .bg_portalWhite;//white for 1702 + //.bg_portalGray; // gray for 1610 + position: relative; + top: 20px; + left: -200px; + right: @page-main-right; + bottom: @page-main-bottom; + padding-top: @padding-top; + padding-left: @padding-left-side; + height: 345px; + width: 96%; + margin-left: 220px; + .w-ecomp-main-json-view-title { + //.n18r; + .dGray18r; //AT&T Dark Gray + border-bottom: @portalDBlue 3px solid; + width:100%; + } + + .notifications-properties-main{ + padding-top: 16px; + font-size: 14px; + overflow-y: scroll; + max-height: 285px; + + } +input:not([type="button"]) { + height: 22px; } + .widget-properties-main { + padding: 16px; + height: 460px; + overflow-y: auto; + + + + + } + +.dialog-control-close { + position: absolute; + bottom: -60px; + right: 16px; +} + + } \ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.controller.js b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.controller.js index ebd2f93d..7821e070 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.controller.js +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.controller.js @@ -1,747 +1,747 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; - -(function () { - - class userNotificationsModalCtrl { - constructor($scope, $log, functionalMenuService, confirmBoxService, notificationService, $modal, ngDialog, $state, $filter) { - - let newNotifModel = { - 'isOnlineUsersOnly': null, - 'isForAllRolesOptions': null, - 'selectedPriority': null, - 'isActive': null, - 'startTime': null, - 'endTime': null, - 'msgHeader': null, - 'msgDescription': null, - 'roleIds': null, - 'roleObj': {notificationRoleIds:null} - }; - - $scope.notificationId = null; - $scope.selectedCat = null; - $scope.selectedEcompFunc = null; - this.YN_index_mapping = { - "Y": 0, - "N": 1 - } - - $scope.onlineAllUsersOptions = [ - { "index": 0, "value": "Y", "title": "Online Users Only" }, - { "index": 1, "value": "N", "title": "Online & Offline Users" } - - ]; - - $scope.isForAllRolesOptions = [ - { "index": 0, "value": "Y", "title": "Yes" }, - { "index": 1, "value": "N", "title": "No" } - ]; - - $scope.priorityOptions = [ - { "index": 0, "value": 1, "title": "Normal" }, - { "index": 1, "value": 2, "title": "Important" } - ]; - - $scope.isActiveOptions = [ - { "index": 0, "value": "Y", "title": "Yes" }, - { "index": 1, "value": "N", "title": "No" } - ]; - $scope.isActive = $scope.isActiveOptions[0]; - $scope.selectPriority = $scope.priorityOptions[0]; - $scope.isOnlineUsersOnly = $scope.onlineAllUsersOptions[1]; - $scope.isForAllRoles=$scope.isForAllRolesOptions[0].value; - $scope.isFunctionalMenu ="Y"; - - $scope.selectedPriority=$scope.priorityOptions[0].value; - - // $scope.notificationRoleIds = []; - $scope.msgHeader = ''; - $scope.msgDescription = ''; - $scope.treeTitle="Functional Menu"; - $scope.notifObj= {isCategoriesFunctionalMenu:true}; - - let init = () => { - // $log.info('userNotificationsModalCtrl::init'); - this.isSaving = false; - var today = new Date(); - $scope.minDate = today.toISOString().substring(0, 10); - var threeMonthsFromNow = new Date(); - threeMonthsFromNow.setMonth(threeMonthsFromNow.getMonth() + 3); - $scope.maxDate = threeMonthsFromNow.toISOString().substring(0, 10); - if ($scope.ngDialogData && $scope.ngDialogData.notif) { - // $log.debug('userNotificationsModalCtrl:init:: Edit - // notification mode for', $scope.ngDialogData.notif); - $scope.isEditMode = true; - $scope.editModeObj = {isEditMode: true}; - this.notif = _.clone($scope.ngDialogData.notif); - $scope.modalPgTitle = 'View Notification' - $scope.isOnlineUsersOnly = $scope.onlineAllUsersOptions[this.YN_index_mapping[this.notif.isForOnlineUsers]]; - $scope.isForAllRoles = $scope.isForAllRolesOptions[this.YN_index_mapping[this.notif.isForAllRoles]].value; - $scope.isActive = $scope.isActiveOptions[this.YN_index_mapping[this.notif.activeYn]]; - $scope.selectedPriority = $scope.priorityOptions[this.notif.priority - 1].value; - $scope.startTime = new Date(this.notif.startTime); - $scope.endTime = new Date(this.notif.endTime); - $scope.msgHeader = this.notif.msgHeader; - $scope.msgDescription = this.notif.msgDescription; - $scope.notificationId = this.notif.notificationId; - $scope.notificationRoleIds = this.notif.roleIds; - $scope.roleObj = {notificationRoleIds:this.notif.roleIds}; - } else { - // $log.debug('AppDetailsModalCtrl:init:: New app mode'); - $scope.isEditMode = false; - $scope.editModeObj = {isEditMode: false}; - $scope.modalPgTitle = 'Add a New Notification' - this.notif = _.clone(newNotifModel); - $scope.roleObj = {notificationRoleIds:null}; - } - }; - this.conflictMessages = {}; - this.scrollApi = {}; - let handleConflictErrors = err => { - if(!err.data){ - return; - } - if(!err.data.length){ // support objects - err.data = [err.data] - } - _.forEach(err.data, item => { - _.forEach(item.fields, field => { - // set conflict message - this.conflictMessages[field.name] = errorMessageByCode[item.errorCode]; - // set field as invalid - $scope.appForm[field.name].$setValidity('conflict', false); - // set watch once to clear error after user correction - watchOnce[field.name](); - }); - }); - this.scrollApi.scrollTop(); - }; - - let resetConflict = fieldName => { - delete this.conflictMessages[fieldName]; - if($scope.appForm[fieldName]){ - $scope.appForm[fieldName].$setValidity('conflict', true); - } - }; - $scope.addUserNotificationValidation = function () { - // // pre-processing - if (!($scope.isEditMode)) { - var validation=false; - - if($scope.startTime && $scope.endTime && $scope.msgHeader != '' && $scope.msgDescription != '' && ($scope.startTime<$scope.endTime)){ - validation=true; - if( $scope.isForAllRoles=='N'){ - validation = $scope.checkBoxObj.isAnyRoleSelected; - } - } - else{ - validation=false; - } - - - return !validation; - } - } - - /* format the value for viewing a notification */ - $scope.formatStartDate = function () { - if ($scope.startTime) { - $scope.startTime = $filter('date')($scope.startTime, 'medium'); - } - } - - /* format the value for viewing a notification */ - $scope.formatEndDate = function () { - if($scope.endTime){ - $scope.endTime = $filter('date')($scope.endTime, 'medium'); - } - } - - $scope.addUserNotification = function () { - $scope.notificationRoleIds = []; - // pre-processing - for (var key in $scope.checkboxIdDict) { - if ($scope.checkboxIdDict[key].is_box_checked && ($scope.checkboxIdDict[key].role_id != null)) { - var role_ids = $scope.checkboxIdDict[key].role_id; - for (var i in role_ids) { - if (!($scope.notificationRoleIds.indexOf(role_ids[i]) > -1)) { - $scope.notificationRoleIds.push(role_ids[i]); - } - } - } - } - - $scope.notificationRoleIds.sort(); - if (($scope.isOnlineUsersOnly) && ($scope.isForAllRoles) && ($scope.selectedPriority) && ($scope.isActive) - && ($scope.startTime) && ($scope.endTime) && ($scope.msgHeader != '') && ($scope.msgDescription != '')) { - this.newUserNotification = - { - 'notificationId':$scope.notificationId, - 'isForOnlineUsers': $scope.isOnlineUsersOnly.value, - 'isForAllRoles': $scope.isForAllRoles, - 'priority': $scope.selectedPriority, - 'activeYn': $scope.isActive.value, - 'startTime': $scope.startTime, - 'endTime': $scope.endTime, - 'msgHeader': $scope.msgHeader, - 'msgDescription': $scope.msgDescription, - 'roleIds': $scope.notificationRoleIds, - 'createdDate': new Date() - }; - - // POST ajax call here; - if ($scope.isEditMode) { - notificationService.updateAdminNotification(this.newUserNotification) - .then(() => { - //$log.debug('NotificationService:updateAdminNotification:: Admin notification update succeeded!'); - $scope.closeThisDialog(true); - // emptyCookies(); - }).catch(err => { - $log.error('notificationService.updateAdminNotfication failed: ' + JSON.stringify(err)); - switch (err.status) { - case '409': // Conflict - // handleConflictErrors(err); - break; - case '500': // Internal Server Error - confirmBoxService.showInformation('There was a problem updating the notification. ' + - 'Please try again later. Error: ' + err.status).then(isConfirmed => { }); - break; - case '403': // Forbidden... possible - // webjunction error to - // try again - confirmBoxService.showInformation('There was a problem updating the notification. ' + - 'Please try again. If the problem persists, then try again later. Error: ' + err.status).then(isConfirmed => { }); - break; - default: - confirmBoxService.showInformation('There was a problem updating the notification. ' + - 'Please try again. If the problem persists, then try again later. Error: ' + err.status).then(isConfirmed => { }); - } - }).finally(() => { - // for bug in IE 11 - var objOffsetVersion = objAgent.indexOf("MSIE"); - if (objOffsetVersion != -1) { - $log.debug('AppDetailsModalCtrl:updateOnboardingApp:: Browser is IE, forcing Refresh'); - $window.location.reload(); - } - // for bug in IE 11 - }); - - } else { - notificationService.addAdminNotification(this.newUserNotification) - .then((res) => { - $log.debug('notificationService:addAdminNotification:: Admin notification creation succeeded!,',res); - if(res.status=='ERROR'){ - confirmBoxService.showInformation('There was a problem adding the notification. ' + - ' Error: ' + res.response).then(isConfirmed => { }); - - - } - else{ - $scope.closeThisDialog(true); - } - - // emptyCookies(); - }).catch(err => { - switch (err.status) { - case '409': // Conflict - // handleConflictErrors(err); - break; - case '500': // Internal Server Error - confirmBoxService.showInformation('There was a problem adding the notification. ' + - 'Please try again later. Error: ' + err.status).then(isConfirmed => { }); - break; - default: - confirmBoxService.showInformation('There was a problem adding the notification. ' + - 'Please try again. If the problem persists, then try again later. Error: ' + - err.status).then(isConfirmed => { }); - } - $log.error('notificationService:addAdminNotification error:: ' + JSON.stringify(err)); - }) - } - - - } else { - $log.warn('please fill in all required fields'); - confirmBoxService.showInformation('Please fill in all required fields').then(isConfirmed => { }); - } - } - // Populate the category list for category dropdown list - let getFunctionalMenu = () => { - this.isLoadingTable = true; - $scope.notifObj= {isCategoriesFunctionalMenu:true}; - functionalMenuService.getFunctionalMenuRole().then(role_res => { - var menu_role_dict = {}; - for (var i in role_res) { - // if first time appear in menu_role_dict - if (!(role_res[i].menuId in menu_role_dict)) { - menu_role_dict[role_res[i].menuId] = [role_res[i].roleId]; - } else { - menu_role_dict[role_res[i].menuId].push(role_res[i].roleId); - } - } - functionalMenuService.getManagedFunctionalMenuForNotificationTree().then(res => { - let actualData = []; - var exclude_list = ['Favorites'] - // Adding children and label attribute to all objects in - $scope.checkboxIdDict = {}; - $scope.checkBoxObj = {isAnyRoleSelected:false}; - for (let i = 0; i < res.length; i++) { - res[i].children = []; - res[i].label = res[i].text; - res[i].id = res[i].text; - // res[i].is_box_checked = false; - res[i].can_check = true; - res[i].roleId = menu_role_dict[res[i].menuId]; - $scope.checkboxIdDict[res[i].id] = { 'is_box_checked': false, 'role_id': res[i].roleId }; - } - - // Adding actual child items to children array in res - // objects - $scope.parentChildDict ={}; - $scope.parentChildRoleIdDict ={}; - for (let i = 0; i < res.length; i++) { - let parentId = res[i].menuId; - $scope.parentChildDict[parentId] = []; - $scope.parentChildRoleIdDict[parentId]=[]; - for (let j = 0; j < res.length; j++) { - let childId = res[j].parentMenuId; - if (parentId === childId) { - res[i].children.push(res[j]); - $scope.parentChildDict[parentId].push(res[j].menuId); - //if res[j].roleId is defined - if (res[j].roleId) { - for (let k in res[j].roleId) { - $scope.parentChildRoleIdDict[parentId].push(res[j].roleId[k]); - } - - } - } - } - } - - //check if grand children exist - for (var key in $scope.parentChildDict){ - var children = $scope.parentChildDict[key]; - var isGrandParent = false; - if (children.length>0) { - for (var i in children) { - if ($scope.parentChildDict[children[i]].length>0){ - isGrandParent = true; - break; - } - } - } - if (isGrandParent) { - for (var i in children) { - // if the child has children - if ($scope.parentChildDict[children[i]].length>0) { - for (var j in $scope.parentChildRoleIdDict[children[i]]) { - - if ($scope.parentChildRoleIdDict[key].indexOf($scope.parentChildRoleIdDict[children[i]][j]) === -1) { - $scope.parentChildRoleIdDict[key].push($scope.parentChildRoleIdDict[children[i]][j]); - } - } - } else { - - } - } - } - - }; - - - var ListMenuIdToRemove = []; - //$scope.parentObj = {ListMenuIdToRemove : []}; - //get the list of menuId that needs to be removed - for (let i = 0; i < res.length; i++) { - if ((res[i].children.length==0)&&(!res[i].roleId)) { - var menuIdToRemove = res[i].menuId; - if (ListMenuIdToRemove.indexOf(menuIdToRemove) === -1){ - ListMenuIdToRemove.push(menuIdToRemove); - } - } - } - - // a scope variable that marks whether each functional menu item should be displayed. - $scope.toShowItemDict = {}; - for (let i = 0; i < res.length; i++) { - if (res[i].roleId==null) { - if (res[i].children.length==0) { - $scope.toShowItemDict[res[i].menuId]=false; - } else if(res[i].children.length>0){ - if($scope.parentChildDict[res[i].menuId].length === _.intersection($scope.parentChildDict[res[i].menuId], ListMenuIdToRemove).length){ - $scope.toShowItemDict[res[i].menuId]=false; - } else { - $scope.toShowItemDict[res[i].menuId]=true; - } - } - } else { - $scope.toShowItemDict[res[i].menuId]=true; - } - } - - // Sort the top-level menu items in order based on the - // column - res.sort(function (a, b) { - return a.column - b.column; - }); - - // Sort all the children in order based on the column - for (let i = 0; i < res.length; i++) { - res[i].children.sort(function (a, b) { - return a.column - b.column; - }); - } - - // Forming actual parent items - for (let i = 0; i < res.length; i++) { - let parentId = res[i].parentMenuId; - if (parentId === null) { - actualData.push(res[i]); - } - } - - // $scope.treedata = actualData; - var treedata = actualData[0].children; - $scope.treedata = []; - for (var i in treedata) { - if (!(treedata[i].label.indexOf(exclude_list) > -1)) { - $scope.treedata.push(treedata[i]) - } - } - - }).catch(err => { - $log.error('FunctionalMenuCtrl:getFunctionalMenu:: error ', err); - }).finally(() => { - this.isLoadingTable = false; - }) - - }).catch(err => { - $log.error('FunctionalMenuCtrl:getFunctionalMenu:: error ', err); - }) - ; - } - - - let getAppRoleIds = () => { - $scope.notifObj= {isCategoriesFunctionalMenu:false}; - notificationService.getAppRoleIds().then(res => { - - res = res.data; - let actualData = []; - // var exclude_list = ['Favorites'] - var app_id_name_list = {}; - $scope.checkboxIdDict = {}; - $scope.checkBoxObj = {isAnyRoleSelected:false}; - - for (let i = 0; i < res.length; i++) { - if (!(res[i].appId in app_id_name_list)) { - app_id_name_list[res[i].appId] = res[i].appName; - } - - res[i].children = []; - res[i].label = res[i].roleName; - res[i].id = res[i].roleId; - res[i].menuId = res[i].roleId; - res[i].parentMenuId = res[i].appId; - res[i].can_check = true; - res[i].roleId = [res[i].roleId]; - $scope.checkboxIdDict[res[i].id] = { 'is_box_checked': false, 'role_id': res[i].roleId}; - } - - for (var app_id in app_id_name_list) { - var new_res = {}; - new_res.children = []; - new_res.label = app_id_name_list[app_id]; - new_res.id = app_id; - new_res.menuId = app_id; - new_res.parentMenuId = null; - new_res.appId = null; - new_res.can_check = true; - new_res.roleId = null; - $scope.checkboxIdDict[new_res.id]= { 'is_box_checked': false, 'role_id': new_res.roleId }; - res.push(new_res); - } - $scope.parentChildRoleIdDict ={}; - //Adding actual child items to children array in res objects - for (let i = 0; i < res.length; i++) { - let parentId = res[i].menuId; - $scope.parentChildRoleIdDict[parentId]=[]; - for (let j = 0; j < res.length; j++) { - let childId = res[j].parentMenuId; - if (parentId == childId) { - res[i].children.push(res[j]); - if (res[j].roleId) { - for (let k in res[j].roleId) { - $scope.parentChildRoleIdDict[parentId].push(res[j].roleId[k]); - } - - } - } - } - } - //Forming actual parent items - for (let i = 0; i < res.length; i++) { - let parentId = res[i].parentMenuId; - if (parentId === null) { - actualData.push(res[i]); - } - } - - $scope.treedata = actualData; - }).catch(err => { - $log.error('FunctionalMenuCtrl:getFunctionalMenu:: error ', err); - }).finally(() => { - this.isLoadingTable = false; - }) - } - $scope.getFunctionalMenu= function() { - $scope.treeTitle="Functional Menu"; - getFunctionalMenu(); - } - $scope.getAppRoleIds = function() { - $scope.treeTitle="Applications/Roles"; - getAppRoleIds(); - } - - init(); - getFunctionalMenu(); - - } - - } - - userNotificationsModalCtrl.$inject = ['$scope', '$log', 'functionalMenuService', 'confirmBoxService', 'notificationService', '$modal', 'ngDialog', '$state', '$filter']; - angular.module('ecompApp').controller('userNotificationsModalCtrl', userNotificationsModalCtrl); - - angular.module('ecompApp').directive('attDatepickerCustom', ['$log', function($log) { - return { - restrict: 'A', - require: 'ngModel', - scope: {}, - - controller: ['$scope', '$element', '$attrs', '$compile', 'datepickerConfig', 'datepickerService', function($scope, $element, $attrs, $compile, datepickerConfig, datepickerService) { - var dateFormatString = angular.isDefined($attrs.dateFormat) ? $scope.$parent.$eval($attrs.dateFormat) : datepickerConfig.dateFormat; - var selectedDateMessage = '
the date you selected is {{$parent.current | date : \'' + dateFormatString + '\'}}
'; - $element.removeAttr('att-datepicker-custom'); - $element.removeAttr('ng-model'); - $element.attr('ng-value', '$parent.current | date:"EEEE, MMMM d, y"'); - $element.attr('aria-describedby', 'datepicker'); - - $element.attr('maxlength', 10); - - var wrapperElement = angular.element('
'); - wrapperElement.attr('datepicker-popup', ''); - wrapperElement.attr('current', 'current'); - - datepickerService.setAttributes($attrs, wrapperElement); - datepickerService.bindScope($attrs, $scope); - - wrapperElement.html(''); - wrapperElement.append($element.prop('outerHTML')); - if (navigator.userAgent.match(/MSIE 8/) === null) { - wrapperElement.append(selectedDateMessage); - } - var elm = wrapperElement.prop('outerHTML'); - elm = $compile(elm)($scope); - $element.replaceWith(elm); - }], - link: function(scope, elem, attr, ctrl) { - if (!ctrl) { - // do nothing if no ng-model - $log.error("ng-model is required."); - return; - } - - scope.$watch('current', function(value) { - ctrl.$setViewValue(value); - }); - ctrl.$render = function() { - scope.current = ctrl.$viewValue; - }; - - } - }; - }]); - - angular.module('ecompApp').directive('jqTreeUserNotif', ['functionalMenuService', '$log', 'confirmBoxService', '$compile', function (functionalMenuService, $log, confirmBoxService, $compile) { - return { - scope: true, - templateUrl: 'jq-tree-tmpl-user-notif.html', - link: function (scope, el, attrs) { - - var $jqTree = el.find('#jqTreeUserNotif').tree({ - data: scope.treedata, - autoOpen: scope.editModeObj.isEditMode, - dragAndDrop: false, - onCreateLi: function (node, $li) { - node.is_checked = false; - if (node.roleId&&scope.roleObj.notificationRoleIds) { - node.is_checked = (node.roleId.length === _.intersection(node.roleId, scope.roleObj.notificationRoleIds).length); - } - if (typeof node.id =="string"){ - $li.attr('id', node.id.replace(/\s+/g, '_')); - } - var isChecked = ''; - if (node.is_checked) { - isChecked = 'checked="checked"'; - } - if (node.can_check) { - var toShow = true; - if (scope.notifObj.isCategoriesFunctionalMenu) { - toShow = scope.toShowItemDict[node.menuId]; - } - var isDisabled = ""; - if (scope.editModeObj.isEditMode) { - isDisabled = " disabled" - - //if node is a parent/grandparent node - if (node.children.length>0){ - //whether to show node first - if (_.intersection(scope.parentChildRoleIdDict[node.menuId], scope.roleObj.notificationRoleIds).length) { - toShow=true; - if (scope.parentChildRoleIdDict[node.menuId].length==_.intersection(scope.parentChildRoleIdDict[node.menuId], scope.roleObj.notificationRoleIds).length) { - isChecked = 'checked="checked"'; - } - } else { - toShow=false; - } - } - //if node is a child node - else { - if (node.is_checked) { - toShow=true; - } else { - toShow=false; - } - } - - } - - - - var template = '' - - var templateEl = angular.element(template); - var $jqCheckbox = $compile(templateEl)(scope); - if (toShow){ - $li.find('.jqtree-element').prepend($jqCheckbox); - } else { - $li.find('.jqtree-element').remove(); - } - } - } - }); - - scope.thisCheckboxClicked = function (e) { - - var nodeId = e.target.attributes[4].value; - - - - var sBrowser, sUsrAg = window.navigator.userAgent; - //if (sUsrAg.indexOf("Firefox") > -1) { - - if (sUsrAg.indexOf("Trident") > -1) { - nodeId = e.target.attributes[5].value; - } - -// if (sUsrAg.indexOf("MSIE") > 1) { -// alert("hELLO tHIS IS IE10"); -// nodeId = e.target.attributes[3].value; -// alert('nodeId 26 of IE 45 : '+nodeId); -// } -// - var version = navigator.userAgent.match(/Firefox\/(.*)$/); - - if(version && version.length > 1){ - if(parseInt(version[1]) >= 50){ - nodeId = e.target.attributes[3].value; - } else if(parseInt(version[1]) >= 45){ - - nodeId = e.target.attributes[2].value; - } - } - var thisNode = el.find('#jqTreeUserNotif').tree('getNodeById', nodeId); - var isChecked = e.target.checked; - scope.checkboxIdDict[nodeId]['is_box_checked'] = isChecked; - - thisNode = angular.element(thisNode); - if (thisNode[0].hasOwnProperty('children') && thisNode[0].children.length > 0) { - var jsNodeCheckList = angular.element(e.target).parent().next().find('.js-node-check') - // check/uncheck children items - jsNodeCheckList.prop('checked', isChecked); - - for (var i in jsNodeCheckList) { - var singlediv = jsNodeCheckList[i]; - if (typeof singlediv == 'object' & (!singlediv.length)) { - - var tempNodeId = angular.element(singlediv)[0].attributes[4].value; - - - - if (sUsrAg.indexOf("Trident") > -1) { - - var tempNodeId = angular.element(singlediv)[0].attributes[5].value; - - - } - -// if (sUsrAg.indexOf("MSIE") > 0) { -// var tempNodeId = angular.element(singlediv)[0].attributes[3].value; -// alert('tempNodeId 2 FF 45 : '+tempNodeId); -// } - if(version && version.length > 1){ - if(parseInt(version[1]) >= 50){ - tempNodeId = angular.element(singlediv)[0].attributes[3].value; - } - else if(parseInt(version[1]) >= 45){ - tempNodeId = angular.element(singlediv)[0].attributes[2].value; - } - } - scope.checkboxIdDict[tempNodeId]['is_box_checked'] = isChecked; - } - } - } - - scope.checkBoxObj.isAnyRoleSelected = false; - for (var key in scope.checkboxIdDict) { - if (scope.checkboxIdDict[key]['is_box_checked']&&scope.checkboxIdDict[key]['role_id']) { - scope.checkBoxObj.isAnyRoleSelected = true; - break; - } - } - } - - - - scope.$watch('treedata', function (oldValue, newValue) { - if (oldValue !== newValue) { - $jqTree.tree('loadData', scope.treedata); - $jqTree.tree('reload', function () { - }); - } - }); - } - }; - }]); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; + +(function () { + + class userNotificationsModalCtrl { + constructor($scope, $log, functionalMenuService, confirmBoxService, notificationService, $modal, ngDialog, $state, $filter) { + + let newNotifModel = { + 'isOnlineUsersOnly': null, + 'isForAllRolesOptions': null, + 'selectedPriority': null, + 'isActive': null, + 'startTime': null, + 'endTime': null, + 'msgHeader': null, + 'msgDescription': null, + 'roleIds': null, + 'roleObj': {notificationRoleIds:null} + }; + + $scope.notificationId = null; + $scope.selectedCat = null; + $scope.selectedEcompFunc = null; + this.YN_index_mapping = { + "Y": 0, + "N": 1 + } + + $scope.onlineAllUsersOptions = [ + { "index": 0, "value": "Y", "title": "Online Users Only" }, + { "index": 1, "value": "N", "title": "Online & Offline Users" } + + ]; + + $scope.isForAllRolesOptions = [ + { "index": 0, "value": "Y", "title": "Yes" }, + { "index": 1, "value": "N", "title": "No" } + ]; + + $scope.priorityOptions = [ + { "index": 0, "value": 1, "title": "Normal" }, + { "index": 1, "value": 2, "title": "Important" } + ]; + + $scope.isActiveOptions = [ + { "index": 0, "value": "Y", "title": "Yes" }, + { "index": 1, "value": "N", "title": "No" } + ]; + $scope.isActive = $scope.isActiveOptions[0]; + $scope.selectPriority = $scope.priorityOptions[0]; + $scope.isOnlineUsersOnly = $scope.onlineAllUsersOptions[1]; + $scope.isForAllRoles=$scope.isForAllRolesOptions[0].value; + $scope.isFunctionalMenu ="Y"; + + $scope.selectedPriority=$scope.priorityOptions[0].value; + + // $scope.notificationRoleIds = []; + $scope.msgHeader = ''; + $scope.msgDescription = ''; + $scope.treeTitle="Functional Menu"; + $scope.notifObj= {isCategoriesFunctionalMenu:true}; + + let init = () => { + // $log.info('userNotificationsModalCtrl::init'); + this.isSaving = false; + var today = new Date(); + $scope.minDate = today.toISOString().substring(0, 10); + var threeMonthsFromNow = new Date(); + threeMonthsFromNow.setMonth(threeMonthsFromNow.getMonth() + 3); + $scope.maxDate = threeMonthsFromNow.toISOString().substring(0, 10); + if ($scope.ngDialogData && $scope.ngDialogData.notif) { + // $log.debug('userNotificationsModalCtrl:init:: Edit + // notification mode for', $scope.ngDialogData.notif); + $scope.isEditMode = true; + $scope.editModeObj = {isEditMode: true}; + this.notif = _.clone($scope.ngDialogData.notif); + $scope.modalPgTitle = 'View Notification' + $scope.isOnlineUsersOnly = $scope.onlineAllUsersOptions[this.YN_index_mapping[this.notif.isForOnlineUsers]]; + $scope.isForAllRoles = $scope.isForAllRolesOptions[this.YN_index_mapping[this.notif.isForAllRoles]].value; + $scope.isActive = $scope.isActiveOptions[this.YN_index_mapping[this.notif.activeYn]]; + $scope.selectedPriority = $scope.priorityOptions[this.notif.priority - 1].value; + $scope.startTime = new Date(this.notif.startTime); + $scope.endTime = new Date(this.notif.endTime); + $scope.msgHeader = this.notif.msgHeader; + $scope.msgDescription = this.notif.msgDescription; + $scope.notificationId = this.notif.notificationId; + $scope.notificationRoleIds = this.notif.roleIds; + $scope.roleObj = {notificationRoleIds:this.notif.roleIds}; + } else { + // $log.debug('AppDetailsModalCtrl:init:: New app mode'); + $scope.isEditMode = false; + $scope.editModeObj = {isEditMode: false}; + $scope.modalPgTitle = 'Add a New Notification' + this.notif = _.clone(newNotifModel); + $scope.roleObj = {notificationRoleIds:null}; + } + }; + this.conflictMessages = {}; + this.scrollApi = {}; + let handleConflictErrors = err => { + if(!err.data){ + return; + } + if(!err.data.length){ // support objects + err.data = [err.data] + } + _.forEach(err.data, item => { + _.forEach(item.fields, field => { + // set conflict message + this.conflictMessages[field.name] = errorMessageByCode[item.errorCode]; + // set field as invalid + $scope.appForm[field.name].$setValidity('conflict', false); + // set watch once to clear error after user correction + watchOnce[field.name](); + }); + }); + this.scrollApi.scrollTop(); + }; + + let resetConflict = fieldName => { + delete this.conflictMessages[fieldName]; + if($scope.appForm[fieldName]){ + $scope.appForm[fieldName].$setValidity('conflict', true); + } + }; + $scope.addUserNotificationValidation = function () { + // // pre-processing + if (!($scope.isEditMode)) { + var validation=false; + + if($scope.startTime && $scope.endTime && $scope.msgHeader != '' && $scope.msgDescription != '' && ($scope.startTime<$scope.endTime)){ + validation=true; + if( $scope.isForAllRoles=='N'){ + validation = $scope.checkBoxObj.isAnyRoleSelected; + } + } + else{ + validation=false; + } + + + return !validation; + } + } + + /* format the value for viewing a notification */ + $scope.formatStartDate = function () { + if ($scope.startTime) { + $scope.startTime = $filter('date')($scope.startTime, 'medium'); + } + } + + /* format the value for viewing a notification */ + $scope.formatEndDate = function () { + if($scope.endTime){ + $scope.endTime = $filter('date')($scope.endTime, 'medium'); + } + } + + $scope.addUserNotification = function () { + $scope.notificationRoleIds = []; + // pre-processing + for (var key in $scope.checkboxIdDict) { + if ($scope.checkboxIdDict[key].is_box_checked && ($scope.checkboxIdDict[key].role_id != null)) { + var role_ids = $scope.checkboxIdDict[key].role_id; + for (var i in role_ids) { + if (!($scope.notificationRoleIds.indexOf(role_ids[i]) > -1)) { + $scope.notificationRoleIds.push(role_ids[i]); + } + } + } + } + + $scope.notificationRoleIds.sort(); + if (($scope.isOnlineUsersOnly) && ($scope.isForAllRoles) && ($scope.selectedPriority) && ($scope.isActive) + && ($scope.startTime) && ($scope.endTime) && ($scope.msgHeader != '') && ($scope.msgDescription != '')) { + this.newUserNotification = + { + 'notificationId':$scope.notificationId, + 'isForOnlineUsers': $scope.isOnlineUsersOnly.value, + 'isForAllRoles': $scope.isForAllRoles, + 'priority': $scope.selectedPriority, + 'activeYn': $scope.isActive.value, + 'startTime': $scope.startTime, + 'endTime': $scope.endTime, + 'msgHeader': $scope.msgHeader, + 'msgDescription': $scope.msgDescription, + 'roleIds': $scope.notificationRoleIds, + 'createdDate': new Date() + }; + + // POST ajax call here; + if ($scope.isEditMode) { + notificationService.updateAdminNotification(this.newUserNotification) + .then(() => { + //$log.debug('NotificationService:updateAdminNotification:: Admin notification update succeeded!'); + $scope.closeThisDialog(true); + // emptyCookies(); + }).catch(err => { + $log.error('notificationService.updateAdminNotfication failed: ' + JSON.stringify(err)); + switch (err.status) { + case '409': // Conflict + // handleConflictErrors(err); + break; + case '500': // Internal Server Error + confirmBoxService.showInformation('There was a problem updating the notification. ' + + 'Please try again later. Error: ' + err.status).then(isConfirmed => { }); + break; + case '403': // Forbidden... possible + // webjunction error to + // try again + confirmBoxService.showInformation('There was a problem updating the notification. ' + + 'Please try again. If the problem persists, then try again later. Error: ' + err.status).then(isConfirmed => { }); + break; + default: + confirmBoxService.showInformation('There was a problem updating the notification. ' + + 'Please try again. If the problem persists, then try again later. Error: ' + err.status).then(isConfirmed => { }); + } + }).finally(() => { + // for bug in IE 11 + var objOffsetVersion = objAgent.indexOf("MSIE"); + if (objOffsetVersion != -1) { + $log.debug('AppDetailsModalCtrl:updateOnboardingApp:: Browser is IE, forcing Refresh'); + $window.location.reload(); + } + // for bug in IE 11 + }); + + } else { + notificationService.addAdminNotification(this.newUserNotification) + .then((res) => { + $log.debug('notificationService:addAdminNotification:: Admin notification creation succeeded!,',res); + if(res.status=='ERROR'){ + confirmBoxService.showInformation('There was a problem adding the notification. ' + + ' Error: ' + res.response).then(isConfirmed => { }); + + + } + else{ + $scope.closeThisDialog(true); + } + + // emptyCookies(); + }).catch(err => { + switch (err.status) { + case '409': // Conflict + // handleConflictErrors(err); + break; + case '500': // Internal Server Error + confirmBoxService.showInformation('There was a problem adding the notification. ' + + 'Please try again later. Error: ' + err.status).then(isConfirmed => { }); + break; + default: + confirmBoxService.showInformation('There was a problem adding the notification. ' + + 'Please try again. If the problem persists, then try again later. Error: ' + + err.status).then(isConfirmed => { }); + } + $log.error('notificationService:addAdminNotification error:: ' + JSON.stringify(err)); + }) + } + + + } else { + $log.warn('please fill in all required fields'); + confirmBoxService.showInformation('Please fill in all required fields').then(isConfirmed => { }); + } + } + // Populate the category list for category dropdown list + let getFunctionalMenu = () => { + this.isLoadingTable = true; + $scope.notifObj= {isCategoriesFunctionalMenu:true}; + functionalMenuService.getFunctionalMenuRole().then(role_res => { + var menu_role_dict = {}; + for (var i in role_res) { + // if first time appear in menu_role_dict + if (!(role_res[i].menuId in menu_role_dict)) { + menu_role_dict[role_res[i].menuId] = [role_res[i].roleId]; + } else { + menu_role_dict[role_res[i].menuId].push(role_res[i].roleId); + } + } + functionalMenuService.getManagedFunctionalMenuForNotificationTree().then(res => { + let actualData = []; + var exclude_list = ['Favorites'] + // Adding children and label attribute to all objects in + $scope.checkboxIdDict = {}; + $scope.checkBoxObj = {isAnyRoleSelected:false}; + for (let i = 0; i < res.length; i++) { + res[i].children = []; + res[i].label = res[i].text; + res[i].id = res[i].text; + // res[i].is_box_checked = false; + res[i].can_check = true; + res[i].roleId = menu_role_dict[res[i].menuId]; + $scope.checkboxIdDict[res[i].id] = { 'is_box_checked': false, 'role_id': res[i].roleId }; + } + + // Adding actual child items to children array in res + // objects + $scope.parentChildDict ={}; + $scope.parentChildRoleIdDict ={}; + for (let i = 0; i < res.length; i++) { + let parentId = res[i].menuId; + $scope.parentChildDict[parentId] = []; + $scope.parentChildRoleIdDict[parentId]=[]; + for (let j = 0; j < res.length; j++) { + let childId = res[j].parentMenuId; + if (parentId === childId) { + res[i].children.push(res[j]); + $scope.parentChildDict[parentId].push(res[j].menuId); + //if res[j].roleId is defined + if (res[j].roleId) { + for (let k in res[j].roleId) { + $scope.parentChildRoleIdDict[parentId].push(res[j].roleId[k]); + } + + } + } + } + } + + //check if grand children exist + for (var key in $scope.parentChildDict){ + var children = $scope.parentChildDict[key]; + var isGrandParent = false; + if (children.length>0) { + for (var i in children) { + if ($scope.parentChildDict[children[i]].length>0){ + isGrandParent = true; + break; + } + } + } + if (isGrandParent) { + for (var i in children) { + // if the child has children + if ($scope.parentChildDict[children[i]].length>0) { + for (var j in $scope.parentChildRoleIdDict[children[i]]) { + + if ($scope.parentChildRoleIdDict[key].indexOf($scope.parentChildRoleIdDict[children[i]][j]) === -1) { + $scope.parentChildRoleIdDict[key].push($scope.parentChildRoleIdDict[children[i]][j]); + } + } + } else { + + } + } + } + + }; + + + var ListMenuIdToRemove = []; + //$scope.parentObj = {ListMenuIdToRemove : []}; + //get the list of menuId that needs to be removed + for (let i = 0; i < res.length; i++) { + if ((res[i].children.length==0)&&(!res[i].roleId)) { + var menuIdToRemove = res[i].menuId; + if (ListMenuIdToRemove.indexOf(menuIdToRemove) === -1){ + ListMenuIdToRemove.push(menuIdToRemove); + } + } + } + + // a scope variable that marks whether each functional menu item should be displayed. + $scope.toShowItemDict = {}; + for (let i = 0; i < res.length; i++) { + if (res[i].roleId==null) { + if (res[i].children.length==0) { + $scope.toShowItemDict[res[i].menuId]=false; + } else if(res[i].children.length>0){ + if($scope.parentChildDict[res[i].menuId].length === _.intersection($scope.parentChildDict[res[i].menuId], ListMenuIdToRemove).length){ + $scope.toShowItemDict[res[i].menuId]=false; + } else { + $scope.toShowItemDict[res[i].menuId]=true; + } + } + } else { + $scope.toShowItemDict[res[i].menuId]=true; + } + } + + // Sort the top-level menu items in order based on the + // column + res.sort(function (a, b) { + return a.column - b.column; + }); + + // Sort all the children in order based on the column + for (let i = 0; i < res.length; i++) { + res[i].children.sort(function (a, b) { + return a.column - b.column; + }); + } + + // Forming actual parent items + for (let i = 0; i < res.length; i++) { + let parentId = res[i].parentMenuId; + if (parentId === null) { + actualData.push(res[i]); + } + } + + // $scope.treedata = actualData; + var treedata = actualData[0].children; + $scope.treedata = []; + for (var i in treedata) { + if (!(treedata[i].label.indexOf(exclude_list) > -1)) { + $scope.treedata.push(treedata[i]) + } + } + + }).catch(err => { + $log.error('FunctionalMenuCtrl:getFunctionalMenu:: error ', err); + }).finally(() => { + this.isLoadingTable = false; + }) + + }).catch(err => { + $log.error('FunctionalMenuCtrl:getFunctionalMenu:: error ', err); + }) + ; + } + + + let getAppRoleIds = () => { + $scope.notifObj= {isCategoriesFunctionalMenu:false}; + notificationService.getAppRoleIds().then(res => { + + res = res.data; + let actualData = []; + // var exclude_list = ['Favorites'] + var app_id_name_list = {}; + $scope.checkboxIdDict = {}; + $scope.checkBoxObj = {isAnyRoleSelected:false}; + + for (let i = 0; i < res.length; i++) { + if (!(res[i].appId in app_id_name_list)) { + app_id_name_list[res[i].appId] = res[i].appName; + } + + res[i].children = []; + res[i].label = res[i].roleName; + res[i].id = res[i].roleId; + res[i].menuId = res[i].roleId; + res[i].parentMenuId = res[i].appId; + res[i].can_check = true; + res[i].roleId = [res[i].roleId]; + $scope.checkboxIdDict[res[i].id] = { 'is_box_checked': false, 'role_id': res[i].roleId}; + } + + for (var app_id in app_id_name_list) { + var new_res = {}; + new_res.children = []; + new_res.label = app_id_name_list[app_id]; + new_res.id = app_id; + new_res.menuId = app_id; + new_res.parentMenuId = null; + new_res.appId = null; + new_res.can_check = true; + new_res.roleId = null; + $scope.checkboxIdDict[new_res.id]= { 'is_box_checked': false, 'role_id': new_res.roleId }; + res.push(new_res); + } + $scope.parentChildRoleIdDict ={}; + //Adding actual child items to children array in res objects + for (let i = 0; i < res.length; i++) { + let parentId = res[i].menuId; + $scope.parentChildRoleIdDict[parentId]=[]; + for (let j = 0; j < res.length; j++) { + let childId = res[j].parentMenuId; + if (parentId == childId) { + res[i].children.push(res[j]); + if (res[j].roleId) { + for (let k in res[j].roleId) { + $scope.parentChildRoleIdDict[parentId].push(res[j].roleId[k]); + } + + } + } + } + } + //Forming actual parent items + for (let i = 0; i < res.length; i++) { + let parentId = res[i].parentMenuId; + if (parentId === null) { + actualData.push(res[i]); + } + } + + $scope.treedata = actualData; + }).catch(err => { + $log.error('FunctionalMenuCtrl:getFunctionalMenu:: error ', err); + }).finally(() => { + this.isLoadingTable = false; + }) + } + $scope.getFunctionalMenu= function() { + $scope.treeTitle="Functional Menu"; + getFunctionalMenu(); + } + $scope.getAppRoleIds = function() { + $scope.treeTitle="Applications/Roles"; + getAppRoleIds(); + } + + init(); + getFunctionalMenu(); + + } + + } + + userNotificationsModalCtrl.$inject = ['$scope', '$log', 'functionalMenuService', 'confirmBoxService', 'notificationService', '$modal', 'ngDialog', '$state', '$filter']; + angular.module('ecompApp').controller('userNotificationsModalCtrl', userNotificationsModalCtrl); + + angular.module('ecompApp').directive('attDatepickerCustom', ['$log', function($log) { + return { + restrict: 'A', + require: 'ngModel', + scope: {}, + + controller: ['$scope', '$element', '$attrs', '$compile', 'datepickerConfig', 'datepickerService', function($scope, $element, $attrs, $compile, datepickerConfig, datepickerService) { + var dateFormatString = angular.isDefined($attrs.dateFormat) ? $scope.$parent.$eval($attrs.dateFormat) : datepickerConfig.dateFormat; + var selectedDateMessage = '
the date you selected is {{$parent.current | date : \'' + dateFormatString + '\'}}
'; + $element.removeAttr('att-datepicker-custom'); + $element.removeAttr('ng-model'); + $element.attr('ng-value', '$parent.current | date:"EEEE, MMMM d, y"'); + $element.attr('aria-describedby', 'datepicker'); + + $element.attr('maxlength', 10); + + var wrapperElement = angular.element('
'); + wrapperElement.attr('datepicker-popup', ''); + wrapperElement.attr('current', 'current'); + + datepickerService.setAttributes($attrs, wrapperElement); + datepickerService.bindScope($attrs, $scope); + + wrapperElement.html(''); + wrapperElement.append($element.prop('outerHTML')); + if (navigator.userAgent.match(/MSIE 8/) === null) { + wrapperElement.append(selectedDateMessage); + } + var elm = wrapperElement.prop('outerHTML'); + elm = $compile(elm)($scope); + $element.replaceWith(elm); + }], + link: function(scope, elem, attr, ctrl) { + if (!ctrl) { + // do nothing if no ng-model + $log.error("ng-model is required."); + return; + } + + scope.$watch('current', function(value) { + ctrl.$setViewValue(value); + }); + ctrl.$render = function() { + scope.current = ctrl.$viewValue; + }; + + } + }; + }]); + + angular.module('ecompApp').directive('jqTreeUserNotif', ['functionalMenuService', '$log', 'confirmBoxService', '$compile', function (functionalMenuService, $log, confirmBoxService, $compile) { + return { + scope: true, + templateUrl: 'jq-tree-tmpl-user-notif.html', + link: function (scope, el, attrs) { + + var $jqTree = el.find('#jqTreeUserNotif').tree({ + data: scope.treedata, + autoOpen: scope.editModeObj.isEditMode, + dragAndDrop: false, + onCreateLi: function (node, $li) { + node.is_checked = false; + if (node.roleId&&scope.roleObj.notificationRoleIds) { + node.is_checked = (node.roleId.length === _.intersection(node.roleId, scope.roleObj.notificationRoleIds).length); + } + if (typeof node.id =="string"){ + $li.attr('id', node.id.replace(/\s+/g, '_')); + } + var isChecked = ''; + if (node.is_checked) { + isChecked = 'checked="checked"'; + } + if (node.can_check) { + var toShow = true; + if (scope.notifObj.isCategoriesFunctionalMenu) { + toShow = scope.toShowItemDict[node.menuId]; + } + var isDisabled = ""; + if (scope.editModeObj.isEditMode) { + isDisabled = " disabled" + + //if node is a parent/grandparent node + if (node.children.length>0){ + //whether to show node first + if (_.intersection(scope.parentChildRoleIdDict[node.menuId], scope.roleObj.notificationRoleIds).length) { + toShow=true; + if (scope.parentChildRoleIdDict[node.menuId].length==_.intersection(scope.parentChildRoleIdDict[node.menuId], scope.roleObj.notificationRoleIds).length) { + isChecked = 'checked="checked"'; + } + } else { + toShow=false; + } + } + //if node is a child node + else { + if (node.is_checked) { + toShow=true; + } else { + toShow=false; + } + } + + } + + + + var template = '' + + var templateEl = angular.element(template); + var $jqCheckbox = $compile(templateEl)(scope); + if (toShow){ + $li.find('.jqtree-element').prepend($jqCheckbox); + } else { + $li.find('.jqtree-element').remove(); + } + } + } + }); + + scope.thisCheckboxClicked = function (e) { + + var nodeId = e.target.attributes[4].value; + + + + var sBrowser, sUsrAg = window.navigator.userAgent; + //if (sUsrAg.indexOf("Firefox") > -1) { + + if (sUsrAg.indexOf("Trident") > -1) { + nodeId = e.target.attributes[5].value; + } + +// if (sUsrAg.indexOf("MSIE") > 1) { +// alert("hELLO tHIS IS IE10"); +// nodeId = e.target.attributes[3].value; +// alert('nodeId 26 of IE 45 : '+nodeId); +// } +// + var version = navigator.userAgent.match(/Firefox\/(.*)$/); + + if(version && version.length > 1){ + if(parseInt(version[1]) >= 50){ + nodeId = e.target.attributes[3].value; + } else if(parseInt(version[1]) >= 45){ + + nodeId = e.target.attributes[2].value; + } + } + var thisNode = el.find('#jqTreeUserNotif').tree('getNodeById', nodeId); + var isChecked = e.target.checked; + scope.checkboxIdDict[nodeId]['is_box_checked'] = isChecked; + + thisNode = angular.element(thisNode); + if (thisNode[0].hasOwnProperty('children') && thisNode[0].children.length > 0) { + var jsNodeCheckList = angular.element(e.target).parent().next().find('.js-node-check') + // check/uncheck children items + jsNodeCheckList.prop('checked', isChecked); + + for (var i in jsNodeCheckList) { + var singlediv = jsNodeCheckList[i]; + if (typeof singlediv == 'object' & (!singlediv.length)) { + + var tempNodeId = angular.element(singlediv)[0].attributes[4].value; + + + + if (sUsrAg.indexOf("Trident") > -1) { + + var tempNodeId = angular.element(singlediv)[0].attributes[5].value; + + + } + +// if (sUsrAg.indexOf("MSIE") > 0) { +// var tempNodeId = angular.element(singlediv)[0].attributes[3].value; +// alert('tempNodeId 2 FF 45 : '+tempNodeId); +// } + if(version && version.length > 1){ + if(parseInt(version[1]) >= 50){ + tempNodeId = angular.element(singlediv)[0].attributes[3].value; + } + else if(parseInt(version[1]) >= 45){ + tempNodeId = angular.element(singlediv)[0].attributes[2].value; + } + } + scope.checkboxIdDict[tempNodeId]['is_box_checked'] = isChecked; + } + } + } + + scope.checkBoxObj.isAnyRoleSelected = false; + for (var key in scope.checkboxIdDict) { + if (scope.checkboxIdDict[key]['is_box_checked']&&scope.checkboxIdDict[key]['role_id']) { + scope.checkBoxObj.isAnyRoleSelected = true; + break; + } + } + } + + + + scope.$watch('treedata', function (oldValue, newValue) { + if (oldValue !== newValue) { + $jqTree.tree('loadData', scope.treedata); + $jqTree.tree('reload', function () { + }); + } + }); + } + }; + }]); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.page.html b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.page.html index e342692a..ac7f4895 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.page.html +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.page.html @@ -1,161 +1,167 @@ - -
- -
{{modalPgTitle}}
-
-
-
-
Broadcast to All Categories
- -
-
-
- * - Categories -
-
- -
- - -
- -
- - - At least - one category is required - -
-
- -
- -
-
-
-
- - - - -
-
- -
-
Priority
- -
-
-
-
- -
-
-
- * - Start Date (Local Time) -
- -
- Start Date is Required -
-
-
-
- -
-
- * End Date (Local Time) -
- -
- End Date is Required -
-
- End Date must be greater than start Date -
-
-
- -
-
- * Title -
- -
- Title is Required -
-
- -
-
- * Message -
- -
- Message is Required -
-
- -
- - - -
- -
-
-
+ +
+ +
{{modalPgTitle}}
+
+
+
+
Broadcast to All Categories
+ +
+
+
+ * + Categories +
+
+ +
+ + +
+ +
+ + + At least + one category is required + +
+
+ +
+ +
+
+
+
+ + + + +
+
+ +
+
Priority
+ +
+
+
+
+ +
+
+
+ * + Start Date (Local Time) +
+ +
+ Start Date is Required +
+
+
+
+ +
+
+ * End Date (Local Time) +
+ +
+ End Date is Required +
+
+ End Date must be greater than start Date +
+
+
+ +
+
+ * Title +
+ +
+ Title is Required +
+
+ +
+
+ * Message +
+ +
+ Message is Required +
+
+ +
+ + + +
+ +
+
+
+ + diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.tpl.html b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.tpl.html index 742946f2..72c92c21 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.tpl.html @@ -1,117 +1,117 @@ - -
-
-
-
-

User Notifications

-
-
- -
- -
-
- -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Message SourceMessageStart Date (Local Time)End Date (Local Time)PriorityCreated ByCreated TimeAll Users (Roles)?View/Delete
-
{{rowData.msgSource}}
- 		-
{{rowData.msgHeader}}
-
-
- 		-
{{rowData.startTime | - date:'medium'}}
- 		-
{{rowData.endTime | - date:'medium'}}
- 		-
{{priorityItems[rowData.priority]}}
- 		-
{{!rowData.loginId ?externalNotification: rowData.loginId}}
- 		-
{{rowData.createdDate | - date:'medium'}}
- 		-
{{rowData.isForAllRoles}}
- 		- -

/

-

/

-

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

User Notifications

+
+
+ +
+ +
+
+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Message SourceMessageStart Date (Local Time)End Date (Local Time)PriorityCreated ByCreated TimeAll Users (Roles)?View/Delete
+
{{rowData.msgSource}}
+ 		+
{{rowData.msgHeader}}
+
+
+ 		+
{{rowData.startTime | + date:'medium'}}
+ 		+
{{rowData.endTime | + date:'medium'}}
+ 		+
{{priorityItems[rowData.priority]}}
+ 		+
{{!rowData.loginId ?externalNotification: rowData.loginId}}
+ 		+
{{rowData.createdDate | + date:'medium'}}
+ 		+
{{rowData.isForAllRoles}}
+ 		+ +

/

+

/

+

+ + +
+ +
+
+ + +
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.ack.html b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.ack.html index 9527c750..e3bcf0a4 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.ack.html +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.ack.html @@ -1,32 +1,32 @@ - -
-
-
Bulk User Upload Acknowledgement
-
-

The valid entries have been uploaded.

- -
-
OK
-
-
-
-
+ +
+
+
Bulk User Upload Acknowledgement
+
+

The valid entries have been uploaded.

+ +
+
OK
+
+
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.confirm.html b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.confirm.html index a3c0b534..6df7d240 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.confirm.html +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.confirm.html @@ -1,83 +1,83 @@ - -
-
Bulk User Upload Confirmation
-
- - -
- {{progressMsg}} -
-
- -
- -
-
- Click OK to upload the valid requests. - Invalid requests will be ignored.
-
- - - - - - - - - - - - - - - - - - -
LineOrg User ID - App - RoleStatus
-
- 		-
- 		-
- 		-
-
-
- -
-
- - - -
-
-
+ +
+
Bulk User Upload Confirmation
+
+ + +
+ {{progressMsg}} +
+
+ +
+ +
+
+ Click OK to upload the valid requests. + Invalid requests will be ignored.
+
+ + + + + + + + + + + + + + + + + + +
LineOrg User ID + App + RoleStatus
+
+ 		+
+ 		+
+ 		+
+
+
+ +
+
+ + + +
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js index e3046b86..e73fe290 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.controller.js @@ -1,577 +1,577 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -/** - * bulk user upload controller - */ -'use strict'; -(function () { - class BulkUserModalCtrl { - constructor($scope, $log, $filter, $q, usersService, applicationsService, confirmBoxService, functionalMenuService, ngDialog) { - - // Set to true for copious console output - var debug = false; - // Roles fetched from app service - var appRolesResult = []; - // Users fetched from user service - var userCheckResult = []; - // Requests for user-role assignment built by validator - var appUserRolesRequest = []; - - let init = () => { - if (debug) - $log.debug('BulkUserModalCtrl::init'); - // Angular insists on this. - $scope.fileModel = {}; - // Model for drop-down - $scope.adminApps = []; - // Enable modal controls - this.step1 = true; - this.fileSelected = false; - - // Flag that indicates background work is proceeding - $scope.isProcessing = true; - - // Load user's admin applications - applicationsService.getAdminApps().promise().then(apps => { - if (debug) - $log.debug('BulkUserModalCtrl::init: getAdminApps returned' + JSON.stringify(apps)); - if (!apps || typeof(apps) != 'object') { - $log.error('BulkUserModalCtrl::init: getAdminApps returned unexpected data'); - } - else { - if (debug) - $log.debug('BulkUserModalCtrl::init: admin apps length is ', apps.length); - - // Sort app names and populate the drop-down model - let sortedApps = apps.sort(getSortOrder('name', true)); - for (let i = 0; i < sortedApps.length; ++i) { - $scope.adminApps.push({ - index: i, - id: sortedApps[i].id, - value: sortedApps[i].name, - title: sortedApps[i].name - }); - } - // Pick the first one in the list - $scope.selectedApplication = $scope.adminApps[0]; - } - $scope.isProcessing = false; - }).catch(err => { - $log.error('BulkUserModalCtrl::init: getAdminApps threw', err); - $scope.isProcessing = false; - }); - - }; // init - - // Answers a function that compares properties with the specified name. - let getSortOrder = (prop, foldCase) => { - return function(a, b) { - let aProp = foldCase ? a[prop].toLowerCase() : a[prop]; - let bProp = foldCase ? b[prop].toLowerCase() : b[prop]; - if (aProp > bProp) - return 1; - else if (aProp < bProp) - return -1; - else - return 0; - } - } - - //This is a fix for dropdown selection, due to b2b dropdown only update value field - $scope.$watch('selectedApplication.value', (newVal, oldVal) => { - for(var i=0;i<$scope.adminApps.length;i++){ - if($scope.adminApps[i].value==newVal){ - $scope.selectedApplication=angular.copy($scope.adminApps[i]);; - } - } - }); - - // Invoked when user picks an app on the drop-down. - $scope.appSelected = () => { - if (debug) - $log.debug('BulkUserModalCtrl::appSelected: selectedApplication.id is ' + $scope.selectedApplication.id); - this.appSelected = true; - } - - // Caches the file name supplied by the event handler. - $scope.fileChangeHandler = (event, files) => { - this.fileSelected = true; - this.fileToRead = files[0]; - if (debug) - $log.debug("BulkUserModalCtrl::fileChangeHandler: file is ", this.fileToRead); - }; // file change handler - - /** - * Reads the contents of the file, calls portal endpoints - * to validate roles, userIds and existing role assignments; - * ultimately builds array of requests to be sent. - * Creates scope variable with input file contents for - * communication with functions. - * - * This function performs a synchronous step-by-step process - * using asynchronous promises. The code could all be inline - * here but the nesting becomes unwieldy. - */ - $scope.readValidateFile = () => { - $scope.isProcessing = true; - $scope.progressMsg = 'Reading upload file..'; - var reader = new FileReader(); - reader.onload = function(event) { - $scope.uploadFile = $filter('csvToObj')(reader.result); - if (debug) - $log.debug('BulkUserModalCtrl::readValidateFile onload: data length is ' + $scope.uploadFile.length); - // sort input by orgUserId - $scope.uploadFile.sort(getSortOrder('orgUserId', true)); - - let appid = $scope.selectedApplication.id; - $scope.progressMsg = 'Fetching application roles..'; - functionalMenuService.getManagedRolesMenu(appid).then(function (rolesObj) { - if (debug) - $log.debug("BulkUserModalCtrl::readValidateFile: managedRolesMenu returned " + JSON.stringify(rolesObj)); - appRolesResult = rolesObj; - $scope.progressMsg = 'Validating application roles..'; - $scope.verifyRoles(); - - let userPromises = $scope.buildUserChecks(); - if (debug) - $log.debug('BulkUserModalCtrl::readValidateFile: userPromises length is ' + userPromises.length); - $scope.progressMsg = 'Validating Org Users..'; - $q.all(userPromises).then(function() { - if (debug) - $log.debug('BulkUserModalCtrl::readValidateFile: userCheckResult length is ' + userCheckResult.length); - $scope.evalUserCheckResults(); - - let appPromises = $scope.buildAppRoleChecks(); - if (debug) - $log.debug('BulkUserModalCtrl::readValidateFile: appPromises length is ' + appPromises.length); - $scope.progressMsg = 'Querying application for user roles..'; - $q.all(appPromises).then( function() { - if (debug) - $log.debug('BulkUserModalCtrl::readValidateFile: appUserRolesRequest length is ' + appUserRolesRequest.length); - $scope.evalAppRoleCheckResults(); - - // Re sort by line for the confirmation dialog - $scope.uploadFile.sort(getSortOrder('line', false)); - // We're done, confirm box may show the table - if (debug) - $log.debug('BulkUserModalCtrl::readValidateFile inner-then ends'); - $scope.progressMsg = 'Done.'; - $scope.isProcessing = false; - }, - function(error) { - $log.error('BulkUserModalCtrl::readValidateFile: failed retrieving user-app roles'); - $scope.isProcessing = false; - } - ); // then of app promises - }, - function(error) { - $log.error('BulkUserModalCtrl::readValidateFile: failed retrieving user info'); - $scope.isProcessing = false; - } - ); // then of user promises - }, - function(error) { - $log.error('BulkUserModalCtrl::readValidateFile: failed retrieving app role info'); - $scope.isProcessing = false; - } - ); // then of role promise - - } // onload - - // Invoke the reader on the selected file - reader.readAsText(this.fileToRead); - }; - - /** - * Evaluates the result set returned by the app role service. - * Sets an uploadFile array element status if a role is not defined. - * Reads and writes scope variable uploadFile. - * Reads closure variable appRolesResult. - */ - $scope.verifyRoles = () => { - if (debug) - $log.debug('BulkUserModalCtrl::verifyRoles: appRoles is ' + JSON.stringify(appRolesResult)); - // check roles in upload file against defined app roles - $scope.uploadFile.forEach( function (uploadRow) { - // skip rows that already have a defined status: headers etc. - if (uploadRow.status) { - if (debug) - $log.debug('BulkUserModalCtrl::verifyRoles: skip row ' + uploadRow.line); - return; - } - uploadRow.role = uploadRow.role.trim(); - var foundRole=false; - for (var i=0; i < appRolesResult.length; i++) { - if (uploadRow.role.toUpperCase() === appRolesResult[i].rolename.trim().toUpperCase()) { - if (debug) - $log.debug('BulkUserModalCtrl::verifyRoles: match on role ' + uploadRow.role); - foundRole=true; - break; - } - }; - if (!foundRole) { - if (debug) - $log.debug('BulkUserModalCtrl::verifyRoles: NO match on role ' + uploadRow.role); - uploadRow.status = 'Invalid role'; - }; - }); // foreach - }; // verifyRoles - - /** - * Builds and returns an array of promises to invoke the - * searchUsers service for each unique Org User UID in the input. - * Reads and writes scope variable uploadFile, which must be sorted by Org User UID. - * The promise function writes to closure variable userCheckResult - */ - $scope.buildUserChecks = () => { - if (debug) - $log.debug('BulkUserModalCtrl::buildUserChecks: uploadFile length is ' + $scope.uploadFile.length); - userCheckResult = []; - let promises = []; - let prevRow = null; - $scope.uploadFile.forEach(function (uploadRow) { - if (uploadRow.status) { - if (debug) - $log.debug('BulkUserModalCtrl::buildUserChecks: skip row ' + uploadRow.line); - return; - }; - // detect repeated UIDs - if (prevRow == null || prevRow.orgUserId.toLowerCase() !== uploadRow.orgUserId.toLowerCase()) { - if (debug) - $log.debug('BulkUserModalCtrl::buildUserChecks: create request for orgUserId ' + uploadRow.orgUserId); - let userPromise = usersService.searchUsers(uploadRow.orgUserId).promise().then( (usersList) => { - if (typeof usersList[0] !== "undefined") { - userCheckResult.push({ - orgUserId: usersList[0].orgUserId, - firstName: usersList[0].firstName, - lastName: usersList[0].lastName, - jobTitle: usersList[0].jobTitle - }); - } - else { - // User not found. - if (debug) - $log.debug('BulkUserModalCtrl::buildUserChecks: searchUsers returned null'); - } - }, function(error){ - $log.error('BulkUserModalCtrl::buildUserChecks: searchUsers failed ' + JSON.stringify(error)); - }); - promises.push(userPromise); - } - else { - if (debug) - $log.debug('BulkUserModalCtrl::buildUserChecks: skip repeated orgUserId ' + uploadRow.orgUserId); - } - prevRow = uploadRow; - }); // foreach - return promises; - }; // buildUserChecks - - /** - * Evaluates the result set returned by the user service to set - * the uploadFile array element status if the user was not found. - * Reads and writes scope variable uploadFile. - * Reads closure variable userCheckResult. - */ - $scope.evalUserCheckResults = () => { - if (debug) - $log.debug('BulkUserModalCtrl::evalUserCheckResult: uploadFile length is ' + $scope.uploadFile.length); - $scope.uploadFile.forEach(function (uploadRow) { - if (uploadRow.status) { - if (debug) - $log.debug('BulkUserModalCtrl::evalUserCheckResults: skip row ' + uploadRow.line); - return; - }; - let foundorgUserId = false; - userCheckResult.forEach(function(userItem) { - if (uploadRow.orgUserId.toLowerCase() === userItem.orgUserId.toLowerCase()) { - if (debug) - $log.debug('BulkUserModalCtrl::evalUserCheckResults: found orgUserId ' + uploadRow.orgUserId); - foundorgUserId=true; - }; - }); - if (!foundorgUserId) { - if (debug) - $log.debug('BulkUserModalCtrl::evalUserCheckResults: NO match on orgUserId ' + uploadRow.orgUserId); - uploadRow.status = 'Invalid orgUserId'; - } - }); // foreach - }; // evalUserCheckResults - - /** - * Builds and returns an array of promises to invoke the getUserAppRoles - * service for each unique Org User in the input file. - * Each promise creates an update to be sent to the remote application - * with all role names. - * Reads scope variable uploadFile, which must be sorted by Org User. - * The promise function writes to closure variable appUserRolesRequest - */ - $scope.buildAppRoleChecks = () => { - if (debug) - $log.debug('BulkUserModalCtrl::buildAppRoleChecks: uploadFile length is ' + $scope.uploadFile.length); - appUserRolesRequest = []; - let appId = $scope.selectedApplication.id; - let promises = []; - let prevRow = null; - $scope.uploadFile.forEach( function (uploadRow) { - if (uploadRow.status) { - if (debug) - $log.debug('BulkUserModalCtrl::buildAppRoleChecks: skip row ' + uploadRow.line); - return; - } - // Because the input is sorted, generate only one request for each Org User - if (prevRow == null || prevRow.orgUserId.toLowerCase() !== uploadRow.orgUserId.toLowerCase()) { - if (debug) - $log.debug('BulkUserModalCtrl::buildAppRoleChecks: create request for orgUserId ' + uploadRow.orgUserId); - let appPromise = usersService.getUserAppRoles(appId, uploadRow.orgUserId).promise().then( (userAppRolesResult) => { - // Reply for unknown user has all defined roles with isApplied=false on each. - if (typeof userAppRolesResult[0] !== "undefined") { - if (debug) - $log.debug('BulkUserModalCtrl::buildAppRoleChecks: adding result ' - + JSON.stringify(userAppRolesResult)); - appUserRolesRequest.push({ - orgUserId: uploadRow.orgUserId, - userAppRoles: userAppRolesResult - }); - } else { - $log.error('BulkUserModalCtrl::buildAppRoleChecks: getUserAppRoles returned ' + JSON.stringify(userAppRolesResult)); - }; - }, function(error){ - $log.error('BulkUserModalCtrl::buildAppRoleChecks: getUserAppRoles failed ', error); - }); - promises.push(appPromise); - } else { - if (debug) - $log.debug('BulkUserModalCtrl::buildAppRoleChecks: duplicate orgUserId, skip: '+ uploadRow.orgUserId); - } - prevRow = uploadRow; - }); // foreach - return promises; - }; // buildAppRoleChecks - - /** - * Evaluates the result set returned by the app service and adjusts - * the list of updates to be sent to the remote application by setting - * isApplied=true for each role name found in the upload file. - * Reads and writes scope variable uploadFile. - * Reads closure variable appUserRolesRequest. - */ - $scope.evalAppRoleCheckResults = () => { - if (debug) - $log.debug('BulkUserModalCtrl::evalAppRoleCheckResults: uploadFile length is ' + $scope.uploadFile.length); - $scope.uploadFile.forEach(function (uploadRow) { - if (uploadRow.status) { - if (debug) - $log.debug('BulkUserModalCtrl::evalAppRoleCheckResults: skip row ' + uploadRow.line); - return; - } - // Search for the match in the app-user-roles array - appUserRolesRequest.forEach( function (appUserRoleObj) { - if (uploadRow.orgUserId.toLowerCase() === appUserRoleObj.orgUserId.toLowerCase()) { - if (debug) - $log.debug('BulkUserModalCtrl::evalAppRoleCheckResults: match on orgUserId ' + uploadRow.orgUserId); - let roles = appUserRoleObj.userAppRoles; - roles.forEach(function (appRoleItem) { - //if (debug) - // $log.debug('BulkUserModalCtrl::evalAppRoleCheckResults: checking uploadRow.role=' - // + uploadRow.role + ', appRoleItem.roleName= ' + appRoleItem.roleName); - if (uploadRow.role === appRoleItem.roleName) { - if (appRoleItem.isApplied) { - if (debug) - $log.debug('BulkUserModalCtrl::evalAppRoleCheckResults: existing role ' - + appRoleItem.roleName); - uploadRow.status = 'Role exists'; - } - else { - if (debug) - $log.debug('BulkUserModalCtrl::evalAppRoleCheckResults: new role ' - + appRoleItem.roleName); - // After much back-and-forth I decided a clear indicator - // is better than blank in the table status column. - uploadRow.status = 'OK'; - appRoleItem.isApplied = true; - } - // This count is not especially interesting. - // numberUserRolesSucceeded++; - } - }); // for each role - } - }); // for each result - }); // for each row - }; // evalAppRoleCheckResults - - /** - * Sends requests to Portal requesting user role assignment. - * That endpoint handles creation of the user at the remote app if necessary. - * Reads closure variable appUserRolesRequest. - * Invoked by the Next button on the confirmation dialog. - */ - $scope.updateDB = () => { - $scope.isProcessing = true; - $scope.progressMsg = 'Sending requests to application..'; - if (debug) - $log.debug('BulkUserModalCtrl::updateDB: request length is ' + appUserRolesRequest.length); - var numberUsersSucceeded = 0; - let promises = []; - appUserRolesRequest.forEach(function(appUserRoleObj) { - if (debug) - $log.debug('BulkUserModalCtrl::updateDB: appUserRoleObj is ' + JSON.stringify(appUserRoleObj)); - let updateRequest = { - orgUserId: appUserRoleObj.orgUserId, - appId: $scope.selectedApplication.id, - appRoles: appUserRoleObj.userAppRoles - }; - if (debug) - $log.debug('BulkUserModalCtrl::updateDB: updateRequest is ' + JSON.stringify(updateRequest)); - let updatePromise = usersService.updateUserAppRoles(updateRequest).promise().then(res => { - if (debug) - $log.debug('BulkUserModalCtrl::updateDB: updated successfully: ' + JSON.stringify(res)); - numberUsersSucceeded++; - }).catch(err => { - // What to do if one of many fails?? - $log.error('BulkUserModalCtrl::updateDB failed: ', err); - confirmBoxService.showInformation( - 'Failed to update the user application roles. ' + - 'Error: ' + err.status).then(isConfirmed => { }); - }).finally( () => { - // $log.debug('BulkUserModalCtrl::updateDB: finally()'); - }); - promises.push(updatePromise); - }); // for each - - // Run all the promises - $q.all(promises).then(function(){ - $scope.isProcessing = false; - confirmBoxService.showInformation('Processed ' + numberUsersSucceeded + ' users.').then(isConfirmed => { - // Close the upload-confirm dialog - ngDialog.close(); - }); - }); - }; // updateDb - - // Sets the variable that hides/reveals the user controls - $scope.step2 = () => { - this.fileSelected = false; - $scope.selectedFile = null; - $scope.fileModel = null; - this.step1 = false; - } - - // Navigate between dialog screens using step number: 1,2,... - $scope.navigateBack = () => { - this.step1 = true; - this.fileSelected = false; - }; - - // Opens a dialog to show the data to be uploaded. - // Invoked by the upload button on the bulk user dialog. - $scope.confirmUpload = () => { - // Start the process - $scope.readValidateFile(); - // Dialog shows progress - ngDialog.open({ - templateUrl: 'app/views/users/new-user-dialogs/bulk-user.confirm.html', - scope: $scope - }); - }; - - // Invoked by the Cancel button on the confirmation dialog. - $scope.cancelUpload = () => { - ngDialog.close(); - }; - - init(); - } // constructor - } // class - BulkUserModalCtrl.$inject = ['$scope', '$log', '$filter', '$q', 'usersService', 'applicationsService', 'confirmBoxService', 'functionalMenuService', 'ngDialog']; - angular.module('ecompApp').controller('BulkUserModalCtrl', BulkUserModalCtrl); - - angular.module('ecompApp').directive('fileChange', ['$parse', function($parse){ - return { - require: 'ngModel', - restrict: 'A', - link : function($scope, element, attrs, ngModel) { - var attrHandler = $parse(attrs['fileChange']); - var handler=function(e) { - $scope.$apply(function() { - attrHandler($scope, { $event:e, files:e.target.files } ); - $scope.selectedFile = e.target.files[0].name; - }); - }; - element[0].addEventListener('change',handler,false); - } - } - }]); - - angular.module('ecompApp').filter('csvToObj',function() { - return function(input) { - var result = []; - var len, i, line, o; - var lines = input.split('\n'); - // Need 1-based index below - for (len = lines.length, i = 1; i <= len; ++i) { - // Use 0-based index for array - line = lines[i - 1].trim(); - if (line.length == 0) { - // console.log("Skipping blank line"); - result.push({ - line: i, - orgUserId: '', - role: '', - status: 'Blank line' - }); - continue; - } - o = line.split(','); - if (o.length !== 2) { - // other lengths not valid for upload - result.push({ - line: i, - orgUserId: line, - role: '', - status: 'Failed to find 2 comma-separated values' - }); - } - else { - // console.log("Valid line: ", val); - let entry = { - line: i, - orgUserId: o[0], - role: o[1] - // leave status undefined, this could be valid. - }; - if (o[0].toLowerCase() === 'orgUserId') { - // not valid for upload, so set status - entry.status = 'Header'; - } - else if (o[0].trim() == '' || o[1].trim() == '') { - // defend against line with only a single comma etc. - entry.status = 'Failed to find 2 non-empty values'; - } - result.push(entry); - } // len 2 - } // for - return result; - }; - }); - - - -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +/** + * bulk user upload controller + */ +'use strict'; +(function () { + class BulkUserModalCtrl { + constructor($scope, $log, $filter, $q, usersService, applicationsService, confirmBoxService, functionalMenuService, ngDialog) { + + // Set to true for copious console output + var debug = false; + // Roles fetched from app service + var appRolesResult = []; + // Users fetched from user service + var userCheckResult = []; + // Requests for user-role assignment built by validator + var appUserRolesRequest = []; + + let init = () => { + if (debug) + $log.debug('BulkUserModalCtrl::init'); + // Angular insists on this. + $scope.fileModel = {}; + // Model for drop-down + $scope.adminApps = []; + // Enable modal controls + this.step1 = true; + this.fileSelected = false; + + // Flag that indicates background work is proceeding + $scope.isProcessing = true; + + // Load user's admin applications + applicationsService.getAdminApps().promise().then(apps => { + if (debug) + $log.debug('BulkUserModalCtrl::init: getAdminApps returned' + JSON.stringify(apps)); + if (!apps || typeof(apps) != 'object') { + $log.error('BulkUserModalCtrl::init: getAdminApps returned unexpected data'); + } + else { + if (debug) + $log.debug('BulkUserModalCtrl::init: admin apps length is ', apps.length); + + // Sort app names and populate the drop-down model + let sortedApps = apps.sort(getSortOrder('name', true)); + for (let i = 0; i < sortedApps.length; ++i) { + $scope.adminApps.push({ + index: i, + id: sortedApps[i].id, + value: sortedApps[i].name, + title: sortedApps[i].name + }); + } + // Pick the first one in the list + $scope.selectedApplication = $scope.adminApps[0]; + } + $scope.isProcessing = false; + }).catch(err => { + $log.error('BulkUserModalCtrl::init: getAdminApps threw', err); + $scope.isProcessing = false; + }); + + }; // init + + // Answers a function that compares properties with the specified name. + let getSortOrder = (prop, foldCase) => { + return function(a, b) { + let aProp = foldCase ? a[prop].toLowerCase() : a[prop]; + let bProp = foldCase ? b[prop].toLowerCase() : b[prop]; + if (aProp > bProp) + return 1; + else if (aProp < bProp) + return -1; + else + return 0; + } + } + + //This is a fix for dropdown selection, due to b2b dropdown only update value field + $scope.$watch('selectedApplication.value', (newVal, oldVal) => { + for(var i=0;i<$scope.adminApps.length;i++){ + if($scope.adminApps[i].value==newVal){ + $scope.selectedApplication=angular.copy($scope.adminApps[i]);; + } + } + }); + + // Invoked when user picks an app on the drop-down. + $scope.appSelected = () => { + if (debug) + $log.debug('BulkUserModalCtrl::appSelected: selectedApplication.id is ' + $scope.selectedApplication.id); + this.appSelected = true; + } + + // Caches the file name supplied by the event handler. + $scope.fileChangeHandler = (event, files) => { + this.fileSelected = true; + this.fileToRead = files[0]; + if (debug) + $log.debug("BulkUserModalCtrl::fileChangeHandler: file is ", this.fileToRead); + }; // file change handler + + /** + * Reads the contents of the file, calls portal endpoints + * to validate roles, userIds and existing role assignments; + * ultimately builds array of requests to be sent. + * Creates scope variable with input file contents for + * communication with functions. + * + * This function performs a synchronous step-by-step process + * using asynchronous promises. The code could all be inline + * here but the nesting becomes unwieldy. + */ + $scope.readValidateFile = () => { + $scope.isProcessing = true; + $scope.progressMsg = 'Reading upload file..'; + var reader = new FileReader(); + reader.onload = function(event) { + $scope.uploadFile = $filter('csvToObj')(reader.result); + if (debug) + $log.debug('BulkUserModalCtrl::readValidateFile onload: data length is ' + $scope.uploadFile.length); + // sort input by orgUserId + $scope.uploadFile.sort(getSortOrder('orgUserId', true)); + + let appid = $scope.selectedApplication.id; + $scope.progressMsg = 'Fetching application roles..'; + functionalMenuService.getManagedRolesMenu(appid).then(function (rolesObj) { + if (debug) + $log.debug("BulkUserModalCtrl::readValidateFile: managedRolesMenu returned " + JSON.stringify(rolesObj)); + appRolesResult = rolesObj; + $scope.progressMsg = 'Validating application roles..'; + $scope.verifyRoles(); + + let userPromises = $scope.buildUserChecks(); + if (debug) + $log.debug('BulkUserModalCtrl::readValidateFile: userPromises length is ' + userPromises.length); + $scope.progressMsg = 'Validating Org Users..'; + $q.all(userPromises).then(function() { + if (debug) + $log.debug('BulkUserModalCtrl::readValidateFile: userCheckResult length is ' + userCheckResult.length); + $scope.evalUserCheckResults(); + + let appPromises = $scope.buildAppRoleChecks(); + if (debug) + $log.debug('BulkUserModalCtrl::readValidateFile: appPromises length is ' + appPromises.length); + $scope.progressMsg = 'Querying application for user roles..'; + $q.all(appPromises).then( function() { + if (debug) + $log.debug('BulkUserModalCtrl::readValidateFile: appUserRolesRequest length is ' + appUserRolesRequest.length); + $scope.evalAppRoleCheckResults(); + + // Re sort by line for the confirmation dialog + $scope.uploadFile.sort(getSortOrder('line', false)); + // We're done, confirm box may show the table + if (debug) + $log.debug('BulkUserModalCtrl::readValidateFile inner-then ends'); + $scope.progressMsg = 'Done.'; + $scope.isProcessing = false; + }, + function(error) { + $log.error('BulkUserModalCtrl::readValidateFile: failed retrieving user-app roles'); + $scope.isProcessing = false; + } + ); // then of app promises + }, + function(error) { + $log.error('BulkUserModalCtrl::readValidateFile: failed retrieving user info'); + $scope.isProcessing = false; + } + ); // then of user promises + }, + function(error) { + $log.error('BulkUserModalCtrl::readValidateFile: failed retrieving app role info'); + $scope.isProcessing = false; + } + ); // then of role promise + + } // onload + + // Invoke the reader on the selected file + reader.readAsText(this.fileToRead); + }; + + /** + * Evaluates the result set returned by the app role service. + * Sets an uploadFile array element status if a role is not defined. + * Reads and writes scope variable uploadFile. + * Reads closure variable appRolesResult. + */ + $scope.verifyRoles = () => { + if (debug) + $log.debug('BulkUserModalCtrl::verifyRoles: appRoles is ' + JSON.stringify(appRolesResult)); + // check roles in upload file against defined app roles + $scope.uploadFile.forEach( function (uploadRow) { + // skip rows that already have a defined status: headers etc. + if (uploadRow.status) { + if (debug) + $log.debug('BulkUserModalCtrl::verifyRoles: skip row ' + uploadRow.line); + return; + } + uploadRow.role = uploadRow.role.trim(); + var foundRole=false; + for (var i=0; i < appRolesResult.length; i++) { + if (uploadRow.role.toUpperCase() === appRolesResult[i].rolename.trim().toUpperCase()) { + if (debug) + $log.debug('BulkUserModalCtrl::verifyRoles: match on role ' + uploadRow.role); + foundRole=true; + break; + } + }; + if (!foundRole) { + if (debug) + $log.debug('BulkUserModalCtrl::verifyRoles: NO match on role ' + uploadRow.role); + uploadRow.status = 'Invalid role'; + }; + }); // foreach + }; // verifyRoles + + /** + * Builds and returns an array of promises to invoke the + * searchUsers service for each unique Org User UID in the input. + * Reads and writes scope variable uploadFile, which must be sorted by Org User UID. + * The promise function writes to closure variable userCheckResult + */ + $scope.buildUserChecks = () => { + if (debug) + $log.debug('BulkUserModalCtrl::buildUserChecks: uploadFile length is ' + $scope.uploadFile.length); + userCheckResult = []; + let promises = []; + let prevRow = null; + $scope.uploadFile.forEach(function (uploadRow) { + if (uploadRow.status) { + if (debug) + $log.debug('BulkUserModalCtrl::buildUserChecks: skip row ' + uploadRow.line); + return; + }; + // detect repeated UIDs + if (prevRow == null || prevRow.orgUserId.toLowerCase() !== uploadRow.orgUserId.toLowerCase()) { + if (debug) + $log.debug('BulkUserModalCtrl::buildUserChecks: create request for orgUserId ' + uploadRow.orgUserId); + let userPromise = usersService.searchUsers(uploadRow.orgUserId).promise().then( (usersList) => { + if (typeof usersList[0] !== "undefined") { + userCheckResult.push({ + orgUserId: usersList[0].orgUserId, + firstName: usersList[0].firstName, + lastName: usersList[0].lastName, + jobTitle: usersList[0].jobTitle + }); + } + else { + // User not found. + if (debug) + $log.debug('BulkUserModalCtrl::buildUserChecks: searchUsers returned null'); + } + }, function(error){ + $log.error('BulkUserModalCtrl::buildUserChecks: searchUsers failed ' + JSON.stringify(error)); + }); + promises.push(userPromise); + } + else { + if (debug) + $log.debug('BulkUserModalCtrl::buildUserChecks: skip repeated orgUserId ' + uploadRow.orgUserId); + } + prevRow = uploadRow; + }); // foreach + return promises; + }; // buildUserChecks + + /** + * Evaluates the result set returned by the user service to set + * the uploadFile array element status if the user was not found. + * Reads and writes scope variable uploadFile. + * Reads closure variable userCheckResult. + */ + $scope.evalUserCheckResults = () => { + if (debug) + $log.debug('BulkUserModalCtrl::evalUserCheckResult: uploadFile length is ' + $scope.uploadFile.length); + $scope.uploadFile.forEach(function (uploadRow) { + if (uploadRow.status) { + if (debug) + $log.debug('BulkUserModalCtrl::evalUserCheckResults: skip row ' + uploadRow.line); + return; + }; + let foundorgUserId = false; + userCheckResult.forEach(function(userItem) { + if (uploadRow.orgUserId.toLowerCase() === userItem.orgUserId.toLowerCase()) { + if (debug) + $log.debug('BulkUserModalCtrl::evalUserCheckResults: found orgUserId ' + uploadRow.orgUserId); + foundorgUserId=true; + }; + }); + if (!foundorgUserId) { + if (debug) + $log.debug('BulkUserModalCtrl::evalUserCheckResults: NO match on orgUserId ' + uploadRow.orgUserId); + uploadRow.status = 'Invalid orgUserId'; + } + }); // foreach + }; // evalUserCheckResults + + /** + * Builds and returns an array of promises to invoke the getUserAppRoles + * service for each unique Org User in the input file. + * Each promise creates an update to be sent to the remote application + * with all role names. + * Reads scope variable uploadFile, which must be sorted by Org User. + * The promise function writes to closure variable appUserRolesRequest + */ + $scope.buildAppRoleChecks = () => { + if (debug) + $log.debug('BulkUserModalCtrl::buildAppRoleChecks: uploadFile length is ' + $scope.uploadFile.length); + appUserRolesRequest = []; + let appId = $scope.selectedApplication.id; + let promises = []; + let prevRow = null; + $scope.uploadFile.forEach( function (uploadRow) { + if (uploadRow.status) { + if (debug) + $log.debug('BulkUserModalCtrl::buildAppRoleChecks: skip row ' + uploadRow.line); + return; + } + // Because the input is sorted, generate only one request for each Org User + if (prevRow == null || prevRow.orgUserId.toLowerCase() !== uploadRow.orgUserId.toLowerCase()) { + if (debug) + $log.debug('BulkUserModalCtrl::buildAppRoleChecks: create request for orgUserId ' + uploadRow.orgUserId); + let appPromise = usersService.getUserAppRoles(appId, uploadRow.orgUserId).promise().then( (userAppRolesResult) => { + // Reply for unknown user has all defined roles with isApplied=false on each. + if (typeof userAppRolesResult[0] !== "undefined") { + if (debug) + $log.debug('BulkUserModalCtrl::buildAppRoleChecks: adding result ' + + JSON.stringify(userAppRolesResult)); + appUserRolesRequest.push({ + orgUserId: uploadRow.orgUserId, + userAppRoles: userAppRolesResult + }); + } else { + $log.error('BulkUserModalCtrl::buildAppRoleChecks: getUserAppRoles returned ' + JSON.stringify(userAppRolesResult)); + }; + }, function(error){ + $log.error('BulkUserModalCtrl::buildAppRoleChecks: getUserAppRoles failed ', error); + }); + promises.push(appPromise); + } else { + if (debug) + $log.debug('BulkUserModalCtrl::buildAppRoleChecks: duplicate orgUserId, skip: '+ uploadRow.orgUserId); + } + prevRow = uploadRow; + }); // foreach + return promises; + }; // buildAppRoleChecks + + /** + * Evaluates the result set returned by the app service and adjusts + * the list of updates to be sent to the remote application by setting + * isApplied=true for each role name found in the upload file. + * Reads and writes scope variable uploadFile. + * Reads closure variable appUserRolesRequest. + */ + $scope.evalAppRoleCheckResults = () => { + if (debug) + $log.debug('BulkUserModalCtrl::evalAppRoleCheckResults: uploadFile length is ' + $scope.uploadFile.length); + $scope.uploadFile.forEach(function (uploadRow) { + if (uploadRow.status) { + if (debug) + $log.debug('BulkUserModalCtrl::evalAppRoleCheckResults: skip row ' + uploadRow.line); + return; + } + // Search for the match in the app-user-roles array + appUserRolesRequest.forEach( function (appUserRoleObj) { + if (uploadRow.orgUserId.toLowerCase() === appUserRoleObj.orgUserId.toLowerCase()) { + if (debug) + $log.debug('BulkUserModalCtrl::evalAppRoleCheckResults: match on orgUserId ' + uploadRow.orgUserId); + let roles = appUserRoleObj.userAppRoles; + roles.forEach(function (appRoleItem) { + //if (debug) + // $log.debug('BulkUserModalCtrl::evalAppRoleCheckResults: checking uploadRow.role=' + // + uploadRow.role + ', appRoleItem.roleName= ' + appRoleItem.roleName); + if (uploadRow.role === appRoleItem.roleName) { + if (appRoleItem.isApplied) { + if (debug) + $log.debug('BulkUserModalCtrl::evalAppRoleCheckResults: existing role ' + + appRoleItem.roleName); + uploadRow.status = 'Role exists'; + } + else { + if (debug) + $log.debug('BulkUserModalCtrl::evalAppRoleCheckResults: new role ' + + appRoleItem.roleName); + // After much back-and-forth I decided a clear indicator + // is better than blank in the table status column. + uploadRow.status = 'OK'; + appRoleItem.isApplied = true; + } + // This count is not especially interesting. + // numberUserRolesSucceeded++; + } + }); // for each role + } + }); // for each result + }); // for each row + }; // evalAppRoleCheckResults + + /** + * Sends requests to Portal requesting user role assignment. + * That endpoint handles creation of the user at the remote app if necessary. + * Reads closure variable appUserRolesRequest. + * Invoked by the Next button on the confirmation dialog. + */ + $scope.updateDB = () => { + $scope.isProcessing = true; + $scope.progressMsg = 'Sending requests to application..'; + if (debug) + $log.debug('BulkUserModalCtrl::updateDB: request length is ' + appUserRolesRequest.length); + var numberUsersSucceeded = 0; + let promises = []; + appUserRolesRequest.forEach(function(appUserRoleObj) { + if (debug) + $log.debug('BulkUserModalCtrl::updateDB: appUserRoleObj is ' + JSON.stringify(appUserRoleObj)); + let updateRequest = { + orgUserId: appUserRoleObj.orgUserId, + appId: $scope.selectedApplication.id, + appRoles: appUserRoleObj.userAppRoles + }; + if (debug) + $log.debug('BulkUserModalCtrl::updateDB: updateRequest is ' + JSON.stringify(updateRequest)); + let updatePromise = usersService.updateUserAppRoles(updateRequest).promise().then(res => { + if (debug) + $log.debug('BulkUserModalCtrl::updateDB: updated successfully: ' + JSON.stringify(res)); + numberUsersSucceeded++; + }).catch(err => { + // What to do if one of many fails?? + $log.error('BulkUserModalCtrl::updateDB failed: ', err); + confirmBoxService.showInformation( + 'Failed to update the user application roles. ' + + 'Error: ' + err.status).then(isConfirmed => { }); + }).finally( () => { + // $log.debug('BulkUserModalCtrl::updateDB: finally()'); + }); + promises.push(updatePromise); + }); // for each + + // Run all the promises + $q.all(promises).then(function(){ + $scope.isProcessing = false; + confirmBoxService.showInformation('Processed ' + numberUsersSucceeded + ' users.').then(isConfirmed => { + // Close the upload-confirm dialog + ngDialog.close(); + }); + }); + }; // updateDb + + // Sets the variable that hides/reveals the user controls + $scope.step2 = () => { + this.fileSelected = false; + $scope.selectedFile = null; + $scope.fileModel = null; + this.step1 = false; + } + + // Navigate between dialog screens using step number: 1,2,... + $scope.navigateBack = () => { + this.step1 = true; + this.fileSelected = false; + }; + + // Opens a dialog to show the data to be uploaded. + // Invoked by the upload button on the bulk user dialog. + $scope.confirmUpload = () => { + // Start the process + $scope.readValidateFile(); + // Dialog shows progress + ngDialog.open({ + templateUrl: 'app/views/users/new-user-dialogs/bulk-user.confirm.html', + scope: $scope + }); + }; + + // Invoked by the Cancel button on the confirmation dialog. + $scope.cancelUpload = () => { + ngDialog.close(); + }; + + init(); + } // constructor + } // class + BulkUserModalCtrl.$inject = ['$scope', '$log', '$filter', '$q', 'usersService', 'applicationsService', 'confirmBoxService', 'functionalMenuService', 'ngDialog']; + angular.module('ecompApp').controller('BulkUserModalCtrl', BulkUserModalCtrl); + + angular.module('ecompApp').directive('fileChange', ['$parse', function($parse){ + return { + require: 'ngModel', + restrict: 'A', + link : function($scope, element, attrs, ngModel) { + var attrHandler = $parse(attrs['fileChange']); + var handler=function(e) { + $scope.$apply(function() { + attrHandler($scope, { $event:e, files:e.target.files } ); + $scope.selectedFile = e.target.files[0].name; + }); + }; + element[0].addEventListener('change',handler,false); + } + } + }]); + + angular.module('ecompApp').filter('csvToObj',function() { + return function(input) { + var result = []; + var len, i, line, o; + var lines = input.split('\n'); + // Need 1-based index below + for (len = lines.length, i = 1; i <= len; ++i) { + // Use 0-based index for array + line = lines[i - 1].trim(); + if (line.length == 0) { + // console.log("Skipping blank line"); + result.push({ + line: i, + orgUserId: '', + role: '', + status: 'Blank line' + }); + continue; + } + o = line.split(','); + if (o.length !== 2) { + // other lengths not valid for upload + result.push({ + line: i, + orgUserId: line, + role: '', + status: 'Failed to find 2 comma-separated values' + }); + } + else { + // console.log("Valid line: ", val); + let entry = { + line: i, + orgUserId: o[0], + role: o[1] + // leave status undefined, this could be valid. + }; + if (o[0].toLowerCase() === 'orgUserId') { + // not valid for upload, so set status + entry.status = 'Header'; + } + else if (o[0].trim() == '' || o[1].trim() == '') { + // defend against line with only a single comma etc. + entry.status = 'Failed to find 2 non-empty values'; + } + result.push(entry); + } // len 2 + } // for + return result; + }; + }); + + + +})(); diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.html b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.html index 3d479cb9..7945e54a 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.html +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/bulk-user.modal.html @@ -1,70 +1,76 @@ - -
-
Bulk User Upload
-
-
-
Select Application:
-
- - - -
-
- -
-
Select Upload File:
- - - {{selectedFile}} -
File must have one entry per line with this format: - 
orgUserId, role name
-
-
- - -
- -
- -
- - - - - -
-
-
+ +
+
Bulk User Upload
+
+
+
Select Application:
+
+ + + +
+
+ +
+
Select Upload File:
+ + + {{selectedFile}} +
File must have one entry per line with this format: + 
orgUserId, role name
+
+
+ + +
+ +
+ +
+ + + + + +
+
+
+ + diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js index 882f1e8f..6550a1ee 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js @@ -1,216 +1,217 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -/** - * Created by nnaffar on 12/20/15. - */ -'use strict'; -(function () { - class NewUserModalCtrl { - constructor($scope, $log, usersService, applicationsService, confirmBoxService) { - let init = () => { - //$log.info('NewUserModalCtrl::init'); - this.isSaving = false; - this.anyChanges = false; - this.adminApps = []; - this.isGettingAdminApps = false; - if($scope.ngDialogData && $scope.ngDialogData.selectedUser && $scope.ngDialogData.dialogState){ - this.selectedUser = $scope.ngDialogData.selectedUser; - this.dialogState = $scope.ngDialogData.dialogState; - this.isShowBack = false; - if(this.dialogState === 3){ - this.getUserAppsRoles(); - } - }else{ - this.isShowBack = true; - this.selectedUser = null; - this.dialogState = 1; - } - }; - - this.appChanged = (index) => { - let myApp = this.adminApps[index]; - //$log.debug('NewUserModalCtrl::appChanged: index: ', index, '; app id: ', myApp.id, 'app name: ',myApp.name); - myApp.isChanged = true; - this.anyChanges = true; - } - - this.deleteApp = (app) => { - let appMessage = this.selectedUser.firstName + ' ' + this.selectedUser.lastName; - confirmBoxService.deleteItem(appMessage).then(isConfirmed => { - if(isConfirmed){ - this.anyChanges = true; - app.isChanged = true; - app.isDeleted = true; // use this to hide the app in the display - app.appRoles.forEach(function(role){ - role.isApplied = false; - }); - } - }).catch(err => { - $log.error('NewUserModalCtrl::deleteApp error: ',err); - confirmBoxService.showInformation('There was a problem deleting the the applications. ' + - 'Please try again later. Error: ' + err.status).then(isConfirmed => {}); - }); - }; - - this.getUserAppsRoles = () => { - if (!this.selectedUser || !this.selectedUser.orgUserId) { - $log.error('NewUserModalCtrl::getUserAppsRoles error: No user is selected'); - this.dialogState = 1; - return; - } - //$log.debug('NewUserModalCtrl::getUserAppsRoles: about to call getAdminAppsSimpler'); - this.isGettingAdminApps = true; - applicationsService.getAdminAppsSimpler().then((apps) => { - //$log.debug('NewUserModalCtrl::getUserAppsRoles: beginning of then for getAdminAppsSimpler'); - this.isGettingAdminApps = false; - if (!apps || !apps.length) { - $log.error('NewUserModalCtrl::getUserAppsRoles error: no admin apps found'); - return null; - } - //$log.debug('NewUserModalCtrl::getUserAppsRoles: then for getAdminAppsSimpler: step 2'); - //$log.debug('NewUserModalCtrl::getUserAppsRoles: admin apps: ', apps); - this.adminApps = apps; - this.dialogState = 3; - this.userAppRoles = {}; - this.numberAppsProcessed = 0; - this.isLoading = true; - apps.forEach(app => { - //$log.debug('NewUserModalCtrl::getUserAppsRoles: app: id: ', app.id, 'name: ',app.name); - // Keep track of which app has changed, so we know which apps to update using a BE API - app.isChanged = false; - // Each of these specifies a state, which corresponds to a different message and style that gets displayed - app.isLoading = true; - app.isError = false; - app.isDeleted = false; - app.printNoChanges = false; - app.isUpdating = false; - app.isErrorUpdating = false; - app.isDoneUpdating = false; - app.errorMessage = ""; - usersService.getUserAppRoles(app.id, this.selectedUser.orgUserId).promise().then((userAppRolesResult) => { - //$log.debug('NewUserModalCtrl::getUserAppsRoles: got a result for app: ',app.id,': ',app.name,': ',userAppRolesResult); - app.appRoles = userAppRolesResult; - app.isLoading = false; - - }).catch(err => { - $log.error(err); - app.isError = true; - app.isLoading = false; - app.errorMessage = err.headers('FEErrorString'); - //$log.debug('NewUserModalCtrl::getUserAppsRoles: in new-user.controller: response header: '+err.headers('FEErrorString')); - }).finally(()=>{ - this.numberAppsProcessed++; - if (this.numberAppsProcessed === this.adminApps.length) { - this.isLoading = false; - } - }); - }) - return; - }).catch(err => { - $log.error(err); - }) - - } - - /** - * Update the selected user apps with the new roles. - * If no roles remain, set the user to inactive. - */ - this.updateUserAppsRoles = () => { - // $log.debug('NewUserModalCtrl::updateUserAppsRoles: entering updateUserAppsRoles'); - if(!this.selectedUser || !this.selectedUser.orgUserId || !this.adminApps){ - $log.error('NewUserModalCtrl::updateUserAppsRoles: mmissing arguments'); - return; - } - this.isSaving = true; - //$log.debug('NewUserModalCtrl::updateUserAppsRoles: going to update user: ' + this.selectedUser.orgUserId); - this.numberAppsProcessed = 0; - this.numberAppsSucceeded = 0; - this.adminApps.forEach(app => { - if (app.isChanged) { - //$log.debug('NewUserModalCtrl::updateUserAppsRoles: app roles have changed; going to update: id: ', app.id, '; name: ', app.name); - app.isUpdating = true; - var newUserAppRoles = { - orgUserId: this.selectedUser.orgUserId, - appId: app.id, - appRoles: app.appRoles, - appName: app.name - }; - usersService.updateUserAppRoles(newUserAppRoles).promise() - .then(res => { - //$log.debug('NewUserModalCtrl::updateUserAppsRoles: User app roles updated successfully on app: ',app.id); - app.isUpdating = false; - app.isDoneUpdating = true; - this.numberAppsSucceeded++; - }).catch(err => { - $log.error(err); - app.isErrorUpdating = true; - confirmBoxService.showInformation( - 'Failed to update the user application roles: ' + err.status) - .then(isConfirmed => {}); - }).finally(()=>{ - this.numberAppsProcessed++; - if (this.numberAppsProcessed === this.adminApps.length) { - this.isSaving = false; // hide the spinner - } - if (this.numberAppsSucceeded === this.adminApps.length) { - $scope.closeThisDialog(true);//close and resolve dialog promise with true (to update the table) - } - }) - } else { - //$log.debug('NewUserModalCtrl::updateUserAppsRoles: app roles have NOT changed; NOT going to update: id: ', app.id, '; name: ', app.name); - app.noChanges = true; - app.isError = false; //remove the error message; just show the No Changes messages - this.numberAppsProcessed++; - this.numberAppsSucceeded++; - if (this.numberAppsProcessed === this.adminApps.length) { - this.isSaving = false; // hide the spinner - } - if (this.numberAppsSucceeded === this.adminApps.length) { - $scope.closeThisDialog(true);//close and resolve dialog promise with true (to update the table) - } - } - }); - }; - - /** - * Navigate between dialog screens using step number: 1,2,... - */ - this.navigateBack = () => { - if (this.dialogState === 1) { - //back from 1st screen? - } - if (this.dialogState === 3) { - this.dialogState = 1; - } - }; - - init(); - - $scope.$on('$stateChangeStart', e => { - //Disable navigation when modal is opened - //**Nabil - note: this will cause the history back state to be replaced with current state - e.preventDefault(); - }); - } - } - NewUserModalCtrl.$inject = ['$scope', '$log', 'usersService', 'applicationsService', 'confirmBoxService']; - angular.module('ecompApp').controller('NewUserModalCtrl', NewUserModalCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +/** + * Created by nnaffar on 12/20/15. + */ +'use strict'; +(function () { + class NewUserModalCtrl { + constructor($scope, $log, usersService, applicationsService, confirmBoxService) { + var extRequestValue = false; + let init = () => { + //$log.info('NewUserModalCtrl::init'); + this.isSaving = false; + this.anyChanges = false; + this.adminApps = []; + this.isGettingAdminApps = false; + if($scope.ngDialogData && $scope.ngDialogData.selectedUser && $scope.ngDialogData.dialogState){ + this.selectedUser = $scope.ngDialogData.selectedUser; + this.dialogState = $scope.ngDialogData.dialogState; + this.isShowBack = false; + if(this.dialogState === 3){ + this.getUserAppsRoles(); + } + }else{ + this.isShowBack = true; + this.selectedUser = null; + this.dialogState = 1; + } + }; + + this.appChanged = (index) => { + let myApp = this.adminApps[index]; + //$log.debug('NewUserModalCtrl::appChanged: index: ', index, '; app id: ', myApp.id, 'app name: ',myApp.name); + myApp.isChanged = true; + this.anyChanges = true; + } + + this.deleteApp = (app) => { + let appMessage = this.selectedUser.firstName + ' ' + this.selectedUser.lastName; + confirmBoxService.deleteItem(appMessage).then(isConfirmed => { + if(isConfirmed){ + this.anyChanges = true; + app.isChanged = true; + app.isDeleted = true; // use this to hide the app in the display + app.appRoles.forEach(function(role){ + role.isApplied = false; + }); + } + }).catch(err => { + $log.error('NewUserModalCtrl::deleteApp error: ',err); + confirmBoxService.showInformation('There was a problem deleting the the applications. ' + + 'Please try again later. Error: ' + err.status).then(isConfirmed => {}); + }); + }; + + this.getUserAppsRoles = () => { + if (!this.selectedUser || !this.selectedUser.orgUserId) { + $log.error('NewUserModalCtrl::getUserAppsRoles error: No user is selected'); + this.dialogState = 1; + return; + } + //$log.debug('NewUserModalCtrl::getUserAppsRoles: about to call getAdminAppsSimpler'); + this.isGettingAdminApps = true; + applicationsService.getAdminAppsSimpler().then((apps) => { + //$log.debug('NewUserModalCtrl::getUserAppsRoles: beginning of then for getAdminAppsSimpler'); + this.isGettingAdminApps = false; + if (!apps || !apps.length) { + $log.error('NewUserModalCtrl::getUserAppsRoles error: no admin apps found'); + return null; + } + //$log.debug('NewUserModalCtrl::getUserAppsRoles: then for getAdminAppsSimpler: step 2'); + //$log.debug('NewUserModalCtrl::getUserAppsRoles: admin apps: ', apps); + this.adminApps = apps; + this.dialogState = 3; + this.userAppRoles = {}; + this.numberAppsProcessed = 0; + this.isLoading = true; + apps.forEach(app => { + //$log.debug('NewUserModalCtrl::getUserAppsRoles: app: id: ', app.id, 'name: ',app.name); + // Keep track of which app has changed, so we know which apps to update using a BE API + app.isChanged = false; + // Each of these specifies a state, which corresponds to a different message and style that gets displayed + app.isLoading = true; + app.isError = false; + app.isDeleted = false; + app.printNoChanges = false; + app.isUpdating = false; + app.isErrorUpdating = false; + app.isDoneUpdating = false; + app.errorMessage = ""; + usersService.getUserAppRoles(app.id, this.selectedUser.orgUserId, extRequestValue).promise().then((userAppRolesResult) => { + //$log.debug('NewUserModalCtrl::getUserAppsRoles: got a result for app: ',app.id,': ',app.name,': ',userAppRolesResult); + app.appRoles = userAppRolesResult; + app.isLoading = false; + + }).catch(err => { + $log.error(err); + app.isError = true; + app.isLoading = false; + app.errorMessage = err.headers('FEErrorString'); + //$log.debug('NewUserModalCtrl::getUserAppsRoles: in new-user.controller: response header: '+err.headers('FEErrorString')); + }).finally(()=>{ + this.numberAppsProcessed++; + if (this.numberAppsProcessed === this.adminApps.length) { + this.isLoading = false; + } + }); + }) + return; + }).catch(err => { + $log.error(err); + }) + + } + + /** + * Update the selected user apps with the new roles. + * If no roles remain, set the user to inactive. + */ + this.updateUserAppsRoles = () => { + // $log.debug('NewUserModalCtrl::updateUserAppsRoles: entering updateUserAppsRoles'); + if(!this.selectedUser || !this.selectedUser.orgUserId || !this.adminApps){ + $log.error('NewUserModalCtrl::updateUserAppsRoles: mmissing arguments'); + return; + } + this.isSaving = true; + //$log.debug('NewUserModalCtrl::updateUserAppsRoles: going to update user: ' + this.selectedUser.orgUserId); + this.numberAppsProcessed = 0; + this.numberAppsSucceeded = 0; + this.adminApps.forEach(app => { + if (app.isChanged) { + //$log.debug('NewUserModalCtrl::updateUserAppsRoles: app roles have changed; going to update: id: ', app.id, '; name: ', app.name); + app.isUpdating = true; + var newUserAppRoles = { + orgUserId: this.selectedUser.orgUserId, + appId: app.id, + appRoles: app.appRoles, + appName: app.name + }; + usersService.updateUserAppRoles(newUserAppRoles).promise() + .then(res => { + //$log.debug('NewUserModalCtrl::updateUserAppsRoles: User app roles updated successfully on app: ',app.id); + app.isUpdating = false; + app.isDoneUpdating = true; + this.numberAppsSucceeded++; + }).catch(err => { + $log.error(err); + app.isErrorUpdating = true; + confirmBoxService.showInformation( + 'Failed to update the user application roles: ' + err.status) + .then(isConfirmed => {}); + }).finally(()=>{ + this.numberAppsProcessed++; + if (this.numberAppsProcessed === this.adminApps.length) { + this.isSaving = false; // hide the spinner + } + if (this.numberAppsSucceeded === this.adminApps.length) { + $scope.closeThisDialog(true);//close and resolve dialog promise with true (to update the table) + } + }) + } else { + //$log.debug('NewUserModalCtrl::updateUserAppsRoles: app roles have NOT changed; NOT going to update: id: ', app.id, '; name: ', app.name); + app.noChanges = true; + app.isError = false; //remove the error message; just show the No Changes messages + this.numberAppsProcessed++; + this.numberAppsSucceeded++; + if (this.numberAppsProcessed === this.adminApps.length) { + this.isSaving = false; // hide the spinner + } + if (this.numberAppsSucceeded === this.adminApps.length) { + $scope.closeThisDialog(true);//close and resolve dialog promise with true (to update the table) + } + } + }); + }; + + /** + * Navigate between dialog screens using step number: 1,2,... + */ + this.navigateBack = () => { + if (this.dialogState === 1) { + //back from 1st screen? + } + if (this.dialogState === 3) { + this.dialogState = 1; + } + }; + + init(); + + $scope.$on('$stateChangeStart', e => { + //Disable navigation when modal is opened + //**Nabil - note: this will cause the history back state to be replaced with current state + e.preventDefault(); + }); + } + } + NewUserModalCtrl.$inject = ['$scope', '$log', 'usersService', 'applicationsService', 'confirmBoxService']; + angular.module('ecompApp').controller('NewUserModalCtrl', NewUserModalCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.spec.js b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.spec.js index 8d5ac749..bdc29583 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.spec.js +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.spec.js @@ -1,255 +1,255 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -/** - * Created by nnaffar on 12/20/15. - */ -'use strict'; - -describe('Controller: NewUserModalCtrl ', () => { - beforeEach(module('testUtils')); - beforeEach(module('ecompApp')); - - let promisesTestUtils; - //destroy $http default cache before starting to prevent the error 'default cache already exists' - //_promisesTestUtils_ comes from testUtils for promises resolve/reject - beforeEach(inject((_CacheFactory_, _promisesTestUtils_)=> { - _CacheFactory_.destroyAll(); - promisesTestUtils = _promisesTestUtils_; - })); - - let newUser, $controller, $q, $rootScope, $log, $scope; - - let applicationsServiceMock, usersServiceMock, confirmBoxServiceMock; - let deferredAdminApps, deferredUsersAccounts, deferredUsersAppRoles, deferredUsersAppRoleUpdate; - - beforeEach(inject((_$controller_, _$q_, _$rootScope_, _$log_)=> { - $rootScope = _$rootScope_; - $q = _$q_; - $controller = _$controller_; - $log = _$log_; - })); - - beforeEach(()=> { - [deferredAdminApps, deferredUsersAccounts, deferredUsersAppRoles, deferredUsersAppRoleUpdate] = [$q.defer(),$q.defer(), $q.defer(), $q.defer()]; - - /*applicationsServiceMock = { - getAdminApps: () => { - var promise = () => {return deferredAdminApps.promise}; - var cancel = jasmine.createSpy(); - return { - promise: promise, - cancel: cancel - } - } - };*/ - - confirmBoxServiceMock = { - deleteItem: () => { - var promise = () => {return deferredAdminApps.promise}; - var cancel = jasmine.createSpy(); - return { - promise: promise, - cancel: cancel - } - } - }; - - applicationsServiceMock = jasmine.createSpyObj('applicationsServiceMock', ['getAdminAppsSimpler']); - applicationsServiceMock.getAdminAppsSimpler.and.returnValue(deferredAdminApps.promise); - - usersServiceMock = jasmine.createSpyObj('usersServiceMock', ['getAccountUsers','getUserAppRoles','updateUserAppsRoles']); - - //applicationsServiceMock.getAdminApps().promise().and.returnValue(deferredAdminApps.promise); - usersServiceMock.getAccountUsers.and.returnValue(deferredUsersAccounts.promise); - usersServiceMock.getUserAppRoles.and.returnValue(deferredUsersAppRoles.promise); - usersServiceMock.updateUserAppsRoles.and.returnValue(deferredUsersAppRoleUpdate.promise); - - $scope = $rootScope.$new(); - newUser = $controller('NewUserModalCtrl', { - $scope: $scope, - $log: $log, - usersService: usersServiceMock, - applicationsService: applicationsServiceMock, - confirmBoxService: confirmBoxServiceMock - }); - //$scope.users = users; - }); - - /*beforeEach(()=> { - scope = $rootScope.$new(); - newUser = $controller('NewUserModalCtrl', { - $scope: scope, - $log: $log, - usersService: usersService, - applicationsService: applicationsService, - confirmBoxService: confirmBoxService - }); - });*/ - - - it('should open modal window without user when no user is selected', ()=> { - expect(newUser.selectedUser).toBe(null); - }); - - it('should open modal window with selectedUser apps roles when user is selected', ()=> { - let roles = {apps: [{id: 1, appRoles: [{id: 3, isApplied: true}]}]}; - let someUser = {orgUserId: 'asdfjl'}; - - deferredUsersAppRoles.resolve(roles); - deferredAdminApps.resolve(roles.apps); - - $scope.ngDialogData = { - selectedUser: someUser, - dialogState: 2 - }; - - //inject ngDialogData to the scope controller - newUser = $controller('NewUserModalCtrl', { - $scope: $scope, - $log: $log, - usersService: usersServiceMock, - applicationsService: applicationsServiceMock, - confirmBoxService: confirmBoxServiceMock - }); - - newUser.getUserAppsRoles(); - $scope.$apply(); - - expect(newUser.selectedUser).toBe(someUser); - expect(newUser.adminApps).toEqual(roles.apps); - }); - - it('should push to apps order list only apps that has applied roles when initializing', () => { - let roles = {apps: [{appId: 13, appRoles: [{id: 3, isApplied: true}]},{appId: 20, appRoles: [{id: 3, isApplied: false}]}]}; - let someUser = {orgUserId: 'asdfjl'}; - - deferredUsersAppRoles.resolve(roles); - //deferredAdminApps.resolve(roles.apps); - - $scope.ngDialogData = { - selectedUser: someUser, - dialogState: 2 - }; - - //inject ngDialogData to the scope controller - newUser = $controller('NewUserModalCtrl', { - $scope: $scope, - $log: $log, - usersService: usersServiceMock, - applicationsService: applicationsServiceMock, - confirmBoxService: confirmBoxServiceMock - }); - - $scope.$apply(); - - // expect(newUser.appsOrder).toEqual([13]); - }); - - it('should push app to apps order list when applying at least one role to user from app', () => { - let roles = {apps: [{appId: 13, appRoles: [{id: 3, isApplied: true}]},{appId: 20, appRoles: [{id: 3, isApplied: false}]}]}; - let someUser = {orgUserId: 'asdfjl'}; - - // promisesTestUtils.resolvePromise(usersService, 'getUserAppsRoles', roles); - deferredUsersAppRoles.resolve(roles); - - $scope.ngDialogData = { - selectedUser: someUser, - dialogState: 2 - }; - - //inject ngDialogData to the scope controller - newUser = $controller('NewUserModalCtrl', { - $scope: $scope, - $log: $log, - usersService: usersServiceMock, - applicationsService: applicationsServiceMock, - confirmBoxService: confirmBoxServiceMock - }); - - //$scope.$apply(); - //newUser.updateAppsOrder({appId: 39, appRoles: [{id: 13, isApplied: true}]}); - $scope.$apply(); - - // expect(newUser.appsOrder).toEqual([13, 39]); - }); - - - it('should remove app from list when removing all user roles in it', () => { - let roles = {apps: [{appName: 'aaa', appId: 13, appRoles: [{id: 3, isApplied: true}]},{appName: 'vvv', appId: 20, appRoles: [{id: 3, isApplied: true}]}]}; - let someUser = {orgUserId: 'asdfjl'}; - - // promisesTestUtils.resolvePromise(usersService, 'getUserAppsRoles', roles); - promisesTestUtils.resolvePromise(confirmBoxServiceMock, 'deleteItem', true); - - deferredUsersAppRoles.resolve(roles); - - $scope.ngDialogData = { - selectedUser: someUser, - dialogState: 2 - }; - - //inject ngDialogData to the scope controller - newUser = $controller('NewUserModalCtrl', { - $scope: $scope, - $log: $log, - usersService: usersServiceMock, - applicationsService: applicationsServiceMock, - confirmBoxService: confirmBoxServiceMock - }); - - $scope.$apply(); - newUser.deleteApp(roles.apps[0]); - $scope.$apply(); - - // expect(newUser.appsOrder).toEqual([20]); - }); - - it('should close the modal when update changes succeeded', () => { - let roles = {apps: [{appName: 'aaa', appId: 13, appRoles: [{id: 3, isApplied: true}]},{appName: 'vvv', appId: 20, appRoles: [{id: 3, isApplied: true}]}]}; - let someUser = {orgUserId: 'asdfjl'}; - //promisesTestUtils.resolvePromise(usersServiceMock, 'getUserAppsRoles', roles); - //promisesTestUtils.resolvePromise(usersServiceMock, 'updateUserAppsRoles'); - deferredUsersAppRoles.resolve(roles); - deferredUsersAppRoleUpdate.resolve(); - deferredAdminApps.resolve(roles.apps); - - $scope.ngDialogData = { - selectedUser: someUser, - dialogState: 2 - }; - - //inject ngDialogData to the scope controller - newUser = $controller('NewUserModalCtrl', { - $scope: $scope, - $log: $log, - usersService: usersServiceMock, - applicationsService: applicationsServiceMock, - confirmBoxService: confirmBoxServiceMock - }); - $scope.closeThisDialog = function(){}; - spyOn($scope, 'closeThisDialog'); - - newUser.getUserAppsRoles(); - $scope.$apply(); - newUser.updateUserAppsRoles(); - $scope.$apply(); - expect($scope.closeThisDialog).toHaveBeenCalledWith(true); - }); - }); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +/** + * Created by nnaffar on 12/20/15. + */ +'use strict'; + +describe('Controller: NewUserModalCtrl ', () => { + beforeEach(module('testUtils')); + beforeEach(module('ecompApp')); + + let promisesTestUtils; + //destroy $http default cache before starting to prevent the error 'default cache already exists' + //_promisesTestUtils_ comes from testUtils for promises resolve/reject + beforeEach(inject((_CacheFactory_, _promisesTestUtils_)=> { + _CacheFactory_.destroyAll(); + promisesTestUtils = _promisesTestUtils_; + })); + + let newUser, $controller, $q, $rootScope, $log, $scope; + + let applicationsServiceMock, usersServiceMock, confirmBoxServiceMock; + let deferredAdminApps, deferredUsersAccounts, deferredUsersAppRoles, deferredUsersAppRoleUpdate; + + beforeEach(inject((_$controller_, _$q_, _$rootScope_, _$log_)=> { + $rootScope = _$rootScope_; + $q = _$q_; + $controller = _$controller_; + $log = _$log_; + })); + + beforeEach(()=> { + [deferredAdminApps, deferredUsersAccounts, deferredUsersAppRoles, deferredUsersAppRoleUpdate] = [$q.defer(),$q.defer(), $q.defer(), $q.defer()]; + + /*applicationsServiceMock = { + getAdminApps: () => { + var promise = () => {return deferredAdminApps.promise}; + var cancel = jasmine.createSpy(); + return { + promise: promise, + cancel: cancel + } + } + };*/ + + confirmBoxServiceMock = { + deleteItem: () => { + var promise = () => {return deferredAdminApps.promise}; + var cancel = jasmine.createSpy(); + return { + promise: promise, + cancel: cancel + } + } + }; + + applicationsServiceMock = jasmine.createSpyObj('applicationsServiceMock', ['getAdminAppsSimpler']); + applicationsServiceMock.getAdminAppsSimpler.and.returnValue(deferredAdminApps.promise); + + usersServiceMock = jasmine.createSpyObj('usersServiceMock', ['getAccountUsers','getUserAppRoles','updateUserAppsRoles']); + + //applicationsServiceMock.getAdminApps().promise().and.returnValue(deferredAdminApps.promise); + usersServiceMock.getAccountUsers.and.returnValue(deferredUsersAccounts.promise); + usersServiceMock.getUserAppRoles.and.returnValue(deferredUsersAppRoles.promise); + usersServiceMock.updateUserAppsRoles.and.returnValue(deferredUsersAppRoleUpdate.promise); + + $scope = $rootScope.$new(); + newUser = $controller('NewUserModalCtrl', { + $scope: $scope, + $log: $log, + usersService: usersServiceMock, + applicationsService: applicationsServiceMock, + confirmBoxService: confirmBoxServiceMock + }); + //$scope.users = users; + }); + + /*beforeEach(()=> { + scope = $rootScope.$new(); + newUser = $controller('NewUserModalCtrl', { + $scope: scope, + $log: $log, + usersService: usersService, + applicationsService: applicationsService, + confirmBoxService: confirmBoxService + }); + });*/ + + + it('should open modal window without user when no user is selected', ()=> { + expect(newUser.selectedUser).toBe(null); + }); + + it('should open modal window with selectedUser apps roles when user is selected', ()=> { + let roles = {apps: [{id: 1, appRoles: [{id: 3, isApplied: true}]}]}; + let someUser = {orgUserId: 'asdfjl'}; + + deferredUsersAppRoles.resolve(roles); + deferredAdminApps.resolve(roles.apps); + + $scope.ngDialogData = { + selectedUser: someUser, + dialogState: 2 + }; + + //inject ngDialogData to the scope controller + newUser = $controller('NewUserModalCtrl', { + $scope: $scope, + $log: $log, + usersService: usersServiceMock, + applicationsService: applicationsServiceMock, + confirmBoxService: confirmBoxServiceMock + }); + + newUser.getUserAppsRoles(); + $scope.$apply(); + + expect(newUser.selectedUser).toBe(someUser); + expect(newUser.adminApps).toEqual(roles.apps); + }); + + it('should push to apps order list only apps that has applied roles when initializing', () => { + let roles = {apps: [{appId: 13, appRoles: [{id: 3, isApplied: true}]},{appId: 20, appRoles: [{id: 3, isApplied: false}]}]}; + let someUser = {orgUserId: 'asdfjl'}; + + deferredUsersAppRoles.resolve(roles); + //deferredAdminApps.resolve(roles.apps); + + $scope.ngDialogData = { + selectedUser: someUser, + dialogState: 2 + }; + + //inject ngDialogData to the scope controller + newUser = $controller('NewUserModalCtrl', { + $scope: $scope, + $log: $log, + usersService: usersServiceMock, + applicationsService: applicationsServiceMock, + confirmBoxService: confirmBoxServiceMock + }); + + $scope.$apply(); + + // expect(newUser.appsOrder).toEqual([13]); + }); + + it('should push app to apps order list when applying at least one role to user from app', () => { + let roles = {apps: [{appId: 13, appRoles: [{id: 3, isApplied: true}]},{appId: 20, appRoles: [{id: 3, isApplied: false}]}]}; + let someUser = {orgUserId: 'asdfjl'}; + + // promisesTestUtils.resolvePromise(usersService, 'getUserAppsRoles', roles); + deferredUsersAppRoles.resolve(roles); + + $scope.ngDialogData = { + selectedUser: someUser, + dialogState: 2 + }; + + //inject ngDialogData to the scope controller + newUser = $controller('NewUserModalCtrl', { + $scope: $scope, + $log: $log, + usersService: usersServiceMock, + applicationsService: applicationsServiceMock, + confirmBoxService: confirmBoxServiceMock + }); + + //$scope.$apply(); + //newUser.updateAppsOrder({appId: 39, appRoles: [{id: 13, isApplied: true}]}); + $scope.$apply(); + + // expect(newUser.appsOrder).toEqual([13, 39]); + }); + + + it('should remove app from list when removing all user roles in it', () => { + let roles = {apps: [{appName: 'aaa', appId: 13, appRoles: [{id: 3, isApplied: true}]},{appName: 'vvv', appId: 20, appRoles: [{id: 3, isApplied: true}]}]}; + let someUser = {orgUserId: 'asdfjl'}; + + // promisesTestUtils.resolvePromise(usersService, 'getUserAppsRoles', roles); + promisesTestUtils.resolvePromise(confirmBoxServiceMock, 'deleteItem', true); + + deferredUsersAppRoles.resolve(roles); + + $scope.ngDialogData = { + selectedUser: someUser, + dialogState: 2 + }; + + //inject ngDialogData to the scope controller + newUser = $controller('NewUserModalCtrl', { + $scope: $scope, + $log: $log, + usersService: usersServiceMock, + applicationsService: applicationsServiceMock, + confirmBoxService: confirmBoxServiceMock + }); + + $scope.$apply(); + newUser.deleteApp(roles.apps[0]); + $scope.$apply(); + + // expect(newUser.appsOrder).toEqual([20]); + }); + + it('should close the modal when update changes succeeded', () => { + let roles = {apps: [{appName: 'aaa', appId: 13, appRoles: [{id: 3, isApplied: true}]},{appName: 'vvv', appId: 20, appRoles: [{id: 3, isApplied: true}]}]}; + let someUser = {orgUserId: 'asdfjl'}; + //promisesTestUtils.resolvePromise(usersServiceMock, 'getUserAppsRoles', roles); + //promisesTestUtils.resolvePromise(usersServiceMock, 'updateUserAppsRoles'); + deferredUsersAppRoles.resolve(roles); + deferredUsersAppRoleUpdate.resolve(); + deferredAdminApps.resolve(roles.apps); + + $scope.ngDialogData = { + selectedUser: someUser, + dialogState: 2 + }; + + //inject ngDialogData to the scope controller + newUser = $controller('NewUserModalCtrl', { + $scope: $scope, + $log: $log, + usersService: usersServiceMock, + applicationsService: applicationsServiceMock, + confirmBoxService: confirmBoxServiceMock + }); + $scope.closeThisDialog = function(){}; + spyOn($scope, 'closeThisDialog'); + + newUser.getUserAppsRoles(); + $scope.$apply(); + newUser.updateUserAppsRoles(); + $scope.$apply(); + expect($scope.closeThisDialog).toHaveBeenCalledWith(true); + }); + }); diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html index 5f26152b..5fec021a 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.modal.html @@ -1,84 +1,90 @@ - -
- -
- - - -
- - - -
-
- -
-
- - -
-
- Access and roles: -
- -
-
-
{{app.name | elipsis: 27}}
-
- -
-
{{app.errorMessage}}
-
Contacting application...
-
No changes
-
Updating application...
-
Finished updating application
-
Could not update application...
-
- -
-
- -
- - - - -
- -
- -
- - - -
+ +
+ +
+ + + +
+ + + +
+
+ +
+
+ + +
+
+ Access and roles: +
+ +
+
+
{{app.name | elipsis: 27}}
+
+ +
+
{{app.errorMessage}}
+
Contacting application...
+
No changes
+
Updating application...
+
Finished updating application
+
Could not update application...
+
+ +
+
+ +
+ + + + +
+ +
+ +
+ + + +
+ + diff --git a/ecomp-portal-FE-common/client/app/views/users/users.controller.js b/ecomp-portal-FE-common/client/app/views/users/users.controller.js index 1aa67601..ac223ed6 100644 --- a/ecomp-portal-FE-common/client/app/views/users/users.controller.js +++ b/ecomp-portal-FE-common/client/app/views/users/users.controller.js @@ -1,243 +1,244 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; -(function () { - class UsersCtrl { - constructor($log, applicationsService, usersService, confirmBoxService, $scope, ngDialog) { - this.$log = $log; - $scope.adminAppsIsNull = false; - $scope.appsIsDown = false; - $scope.noUsersInApp = false; - $scope.multiAppAdmin = false; - - $log.info('UsersCtrl:: initializing...'); - /** - * Handle all active HTTP requests - * activeRequests @type {Array[requests with cancel option]} - */ - let activeRequests = []; - let clearReq = (req) => { - activeRequests.splice(activeRequests.indexOf(req), 1); - }; - - let init = () => { - this.isLoadingTable = false; - this.selectedApp = null; - this.isAppSelectDisabled = false; - this.selectApp = 'Select application'; - this.adminApps = [{index: 0, id: 0, value: this.selectApp, title: this.selectApp}]; - getAdminApps(); - - /*Table general configuration params*/ - this.searchString = ''; - /*Table data*/ - this.usersTableHeaders = ['First Name', 'Last Name', 'User ID', 'Roles']; - this.accountUsers = []; - }; - - let getAdminApps = () => { - $log.debug('UsersCtrl::getAdminApps: - Starting getAdminApps'); - try { - this.isLoadingTable = true; - let adminAppsReq = applicationsService.getAdminApps(); - adminAppsReq.promise().then(apps => { - if (!apps || !apps.length) { - $log.error('UsersCtrl::getAdminApps: - no apps found'); - return null; - } - $log.debug('UsersCtrl::getAdminApps: Apps for this user are: ' + JSON.stringify(apps)); - if (apps.length >= 2) { - $log.info('UsersCtrl::getAdminApps: - more than one app for this admin:', apps.length, ' apps'); - $scope.multiAppAdmin = true; - } else { - this.adminApps = [] ; - } - let sortedApps = apps.sort(getSortOrder("name")); - let realAppIndex = 1; - for(let i=1; i<=sortedApps.length; i++){ - this.adminApps.push({ - index: realAppIndex, - id: sortedApps[i - 1].id, - value: sortedApps[i - 1].name, - title: sortedApps[i - 1].name - }); - realAppIndex = realAppIndex + 1; - } - - $log.debug('UsersCtrl::getAdminApps: Apps for this user are: ' + JSON.stringify(this.adminApps)); - - this.selectedApp = this.adminApps[0]; - clearReq(adminAppsReq); - $scope.adminAppsIsNull = false; - }).catch(e => { - $scope.adminAppsIsNull = true; - $log.error('UsersCtrl::getAdminApps: - getAdminApps() failed = '+ e.message); - clearReq(adminAppsReq); - confirmBoxService.showInformation('There was a problem retrieving the applications. ' + - 'Please try again later.').then(isConfirmed => {}); - - }).finally(() => { - this.isLoadingTable = false; - }); - } catch (e) { - $scope.adminAppsIsNull = true; - $log.error('UsersCtrl::getAdminApps: - getAdminApps() failed!'); - this.isLoadingTable = false; - } - }; - - let getSortOrder = (prop) => { - return function(a, b) { - if (a[prop] > b[prop]) { - return 1; - } else if (a[prop] < b[prop]) { - return -1; - } - return 0; - } - } - - this.updateUsersList = () => { - $scope.appsIsDown = false; - $scope.noUsersInApp = false; - // $log.debug('UsersCtrl::updateUsersList: Starting updateUsersList'); - //reset search string - this.searchString = ''; - //should i disable this too in case of moving between tabs? - this.isAppSelectDisabled = true; - //activate spinner - this.isLoadingTable = true; - - if(this.adminApps!=null && this.selectedApp!=null){ - var tempSelected = null; - for(let i=0; i<=this.adminApps.length; i++){ - if(typeof this.adminApps[i] != 'undefined' && this.selectedApp.value==this.adminApps[i].value){ - tempSelected=_.clone(this.adminApps[i]); - } - } - if(tempSelected!=null){ - this.selectedApp= tempSelected; - } - } - - if (this.selectedApp.title != this.selectApp) { // 'Select Application' - usersService.getAccountUsers(this.selectedApp.id) - .then(accountUsers => { - $log.debug('UsersCtrl::updateUsersList accountUsers: '+ accountUsers); - if (angular.isObject(accountUsers)===false) { - $log.error('UsersCtrl::updateUsersList accountUsers: App is down!'); - $scope.appsIsDown = true; - } - $log.debug('UsersCtrl::updateUsersList length: '+ Object.keys(accountUsers).length); - this.isAppSelectDisabled = false; - this.accountUsers = accountUsers; - if (angular.isObject(accountUsers) && Object.keys(accountUsers).length === 0) { - $log.debug('UsersCtrl::updateUsersList accountUsers: App has no users.'); - $scope.noUsersInApp = true; - } - }).catch(err => { - this.isAppSelectDisabled = false; - $log.error('UsersCtrl::updateUsersList error: ' + err); - confirmBoxService.showInformation('There was a problem updating the users List. ' + - 'Please try again later.').then(isConfirmed => {}); - $scope.appsIsDown = true; - }).finally(() => { - this.isLoadingTable = false; - $scope.noAppSelected = false; - }); - } else { - // this.selectedApp = this.adminApps[0]; - this.isAppSelectDisabled = false; - this.isLoadingTable = false; - $scope.noUsersInApp = false; - $scope.noAppSelected = true; - } - }; - - - this.openAddNewUserModal = (user) => { - let data = null; - if (user) { - data = { - dialogState: 3, - selectedUser: { - orgUserId: user.orgUserId, - firstName: user.firstName, - lastName: user.lastName - } - } - } - ngDialog.open({ - templateUrl: 'app/views/users/new-user-dialogs/new-user.modal.html', - controller: 'NewUserModalCtrl', - controllerAs: 'newUser', - data: data - }).closePromise.then(needUpdate => { - if (needUpdate.value === true) { - $log.debug('UsersCtrl::openAddNewUserModal updating table data...'); - this.updateUsersList(); - } - }); - }; - - this.openBulkUserUploadModal = (adminApps) => { - let data = null; - if (adminApps) { - data = { - dialogState: 3, - selectedApplication: { - appid: adminApps[0].appid, - appName: adminApps[0].appName - } - } - } - ngDialog.open({ - templateUrl: 'app/views/users/new-user-dialogs/bulk-user.modal.html', - controller: 'BulkUserModalCtrl', - controllerAs: 'bulkUser', - data: data - }).closePromise.then(needUpdate => { - this.updateUsersList(); - }); - }; - - - $scope.$watch('users.selectedApp.value', (newVal, oldVal) => { - if (!newVal || _.isEqual(newVal, oldVal)) { - return; - } - $log.debug('UsersCtrl::openAddNewUserModal:$watch selectedApp -> Fire with: ', newVal); - this.accountUsers = []; //reset table and show swirl here - this.updateUsersList(); - }); - - $scope.$on('$destroy', () => { - //cancel all active requests when closing the modal - activeRequests.forEach(req => { - req.cancel(); - }); - }); - - init(); - } - } - UsersCtrl.$inject = ['$log', 'applicationsService', 'usersService', 'confirmBoxService', '$scope', 'ngDialog']; - angular.module('ecompApp').controller('UsersCtrl', UsersCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; +(function () { + class UsersCtrl { + constructor($log, applicationsService, usersService, confirmBoxService, $scope, ngDialog) { + this.$log = $log; + $scope.adminAppsIsNull = false; + $scope.appsIsDown = false; + $scope.noUsersInApp = false; + $scope.multiAppAdmin = false; + + $log.info('UsersCtrl:: initializing...'); + /** + * Handle all active HTTP requests + * activeRequests @type {Array[requests with cancel option]} + */ + let activeRequests = []; + let clearReq = (req) => { + activeRequests.splice(activeRequests.indexOf(req), 1); + }; + + let init = () => { + this.isLoadingTable = false; + this.selectedApp = null; + this.isAppSelectDisabled = false; + this.selectApp = 'Select application'; + this.adminApps = [{index: 0, id: 0, value: this.selectApp, title: this.selectApp}]; + getAdminApps(); + + /*Table general configuration params*/ + this.searchString = ''; + /*Table data*/ + this.usersTableHeaders = ['First Name', 'Last Name', 'User ID', 'Roles']; + this.accountUsers = []; + }; + + let getAdminApps = () => { + $log.debug('UsersCtrl::getAdminApps: - Starting getAdminApps'); + try { + this.isLoadingTable = true; + let adminAppsReq = applicationsService.getAdminApps(); + adminAppsReq.promise().then(apps => { + if (!apps || !apps.length) { + $log.error('UsersCtrl::getAdminApps: - no apps found'); + return null; + } + $log.debug('UsersCtrl::getAdminApps: Apps for this user are: ' + JSON.stringify(apps)); + if (apps.length >= 2) { + $log.info('UsersCtrl::getAdminApps: - more than one app for this admin:', apps.length, ' apps'); + $scope.multiAppAdmin = true; + } else { + this.adminApps = [] ; + } + let sortedApps = apps.sort(getSortOrder("name")); + let realAppIndex = 1; + for(let i=1; i<=sortedApps.length; i++){ + this.adminApps.push({ + index: realAppIndex, + id: sortedApps[i - 1].id, + value: sortedApps[i - 1].name, + title: sortedApps[i - 1].name + }); + realAppIndex = realAppIndex + 1; + } + + $log.debug('UsersCtrl::getAdminApps: Apps for this user are: ' + JSON.stringify(this.adminApps)); + + this.selectedApp = this.adminApps[0]; + clearReq(adminAppsReq); + $scope.adminAppsIsNull = false; + }).catch(e => { + $scope.adminAppsIsNull = true; + $log.error('UsersCtrl::getAdminApps: - getAdminApps() failed = '+ e.message); + clearReq(adminAppsReq); + confirmBoxService.showInformation('There was a problem retrieving the applications. ' + + 'Please try again later.').then(isConfirmed => {}); + + }).finally(() => { + this.isLoadingTable = false; + }); + } catch (e) { + $scope.adminAppsIsNull = true; + $log.error('UsersCtrl::getAdminApps: - getAdminApps() failed!'); + this.isLoadingTable = false; + } + }; + + let getSortOrder = (prop) => { + return function(a, b) { + if (a[prop] > b[prop]) { + return 1; + } else if (a[prop] < b[prop]) { + return -1; + } + return 0; + } + } + + this.updateUsersList = () => { + $scope.appsIsDown = false; + $scope.noUsersInApp = false; + // $log.debug('UsersCtrl::updateUsersList: Starting updateUsersList'); + //reset search string + this.searchString = ''; + //should i disable this too in case of moving between tabs? + this.isAppSelectDisabled = true; + //activate spinner + this.isLoadingTable = true; + + if(this.adminApps!=null && this.selectedApp!=null){ + var tempSelected = null; + for(let i=0; i<=this.adminApps.length; i++){ + if(typeof this.adminApps[i] != 'undefined' && this.selectedApp.value==this.adminApps[i].value){ + tempSelected=_.clone(this.adminApps[i]); + } + } + if(tempSelected!=null){ + this.selectedApp= tempSelected; + } + } + + if (this.selectedApp.title != this.selectApp) { // 'Select Application' + usersService.getAccountUsers(this.selectedApp.id) + .then(accountUsers => { + $log.debug('UsersCtrl::updateUsersList accountUsers: '+ accountUsers); + if (angular.isObject(accountUsers)===false) { + $log.error('UsersCtrl::updateUsersList accountUsers: App is down!'); + $scope.appsIsDown = true; + } + $log.debug('UsersCtrl::updateUsersList length: '+ Object.keys(accountUsers).length); + this.isAppSelectDisabled = false; + this.accountUsers = accountUsers; + if (angular.isObject(accountUsers) && Object.keys(accountUsers).length === 0) { + $log.debug('UsersCtrl::updateUsersList accountUsers: App has no users.'); + $scope.noUsersInApp = true; + } + }).catch(err => { + this.isAppSelectDisabled = false; + $log.error('UsersCtrl::updateUsersList error: ' + err); + confirmBoxService.showInformation('There was a problem updating the users List. ' + + 'Please try again later.').then(isConfirmed => {}); + $scope.appsIsDown = true; + }).finally(() => { + this.isLoadingTable = false; + $scope.noAppSelected = false; + }); + } else { + // this.selectedApp = this.adminApps[0]; + this.isAppSelectDisabled = false; + this.isLoadingTable = false; + $scope.noUsersInApp = false; + $scope.noAppSelected = true; + } + }; + + + this.openAddNewUserModal = (user) => { + let data = null; + if (user) { + data = { + dialogState: 3, + selectedUser: { + orgUserId: user.orgUserId, + firstName: user.firstName, + lastName: user.lastName, + + } + } + } + ngDialog.open({ + templateUrl: 'app/views/users/new-user-dialogs/new-user.modal.html', + controller: 'NewUserModalCtrl', + controllerAs: 'newUser', + data: data + }).closePromise.then(needUpdate => { + if (needUpdate.value === true) { + $log.debug('UsersCtrl::openAddNewUserModal updating table data...'); + this.updateUsersList(); + } + }); + }; + + this.openBulkUserUploadModal = (adminApps) => { + let data = null; + if (adminApps) { + data = { + dialogState: 3, + selectedApplication: { + appid: adminApps[0].appid, + appName: adminApps[0].appName + } + } + } + ngDialog.open({ + templateUrl: 'app/views/users/new-user-dialogs/bulk-user.modal.html', + controller: 'BulkUserModalCtrl', + controllerAs: 'bulkUser', + data: data + }).closePromise.then(needUpdate => { + this.updateUsersList(); + }); + }; + + + $scope.$watch('users.selectedApp.value', (newVal, oldVal) => { + if (!newVal || _.isEqual(newVal, oldVal)) { + return; + } + $log.debug('UsersCtrl::openAddNewUserModal:$watch selectedApp -> Fire with: ', newVal); + this.accountUsers = []; //reset table and show swirl here + this.updateUsersList(); + }); + + $scope.$on('$destroy', () => { + //cancel all active requests when closing the modal + activeRequests.forEach(req => { + req.cancel(); + }); + }); + + init(); + } + } + UsersCtrl.$inject = ['$log', 'applicationsService', 'usersService', 'confirmBoxService', '$scope', 'ngDialog']; + angular.module('ecompApp').controller('UsersCtrl', UsersCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/users/users.controller.spec.js b/ecomp-portal-FE-common/client/app/views/users/users.controller.spec.js index 96231163..0b3c0110 100644 --- a/ecomp-portal-FE-common/client/app/views/users/users.controller.spec.js +++ b/ecomp-portal-FE-common/client/app/views/users/users.controller.spec.js @@ -1,141 +1,141 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -// /** -// * Created by nnaffar on 12/17/15. -// */ -// 'use strict'; -// -// describe('Controller: UsersCtrl ', () => { -// beforeEach(module('ecompApp')); -// -// //destroy $http default cache before starting to prevent the error 'default cache already exists' -// beforeEach(inject((_CacheFactory_)=> { -// _CacheFactory_.destroyAll(); -// })); -// -// let users, $controller, $q, $rootScope, $log, $scope; -// -// beforeEach(inject((_$controller_, _$q_, _$rootScope_, _$log_)=> { -// [$controller, $q, $rootScope, $log] = [_$controller_, _$q_, _$rootScope_, _$log_]; -// })); -// -// let applicationsServiceMock, usersServiceMock; -// let deferredAdminApps, deferredUsersAccounts; -// beforeEach(()=> { -// [deferredAdminApps, deferredUsersAccounts] = [$q.defer(), $q.defer()]; -// -// applicationsServiceMock = { -// getAdminApps: () => { -// var promise = () => {return deferredAdminApps.promise}; -// var cancel = jasmine.createSpy(); -// return { -// promise: promise, -// cancel: cancel -// } -// } -// }; -// -// usersServiceMock = jasmine.createSpyObj('usersServiceMock', ['getAccountUsers']); -// -// //applicationsServiceMock.getAdminApps().promise().and.returnValue(deferredAdminApps.promise); -// usersServiceMock.getAccountUsers.and.returnValue(deferredUsersAccounts.promise); -// -// $scope = $rootScope.$new(); -// users = $controller('UsersCtrl', { -// $log: $log, -// applicationsService: applicationsServiceMock, -// usersService: usersServiceMock, -// $scope: $scope -// }); -// $scope.users = users; -// }); -// -// //MOCKS -// let appsListMock = [ -// {value: 'SSP', title: 'SSP', id: 3}, -// {value: 'ASDC', title: 'ASDC', id: 23}, -// {value: 'Formation', title: 'Formation', id: 223} -// ]; -// -// let usersListMock = [ -// { -// "orgUserId": "nn605g", -// "firstName": "Nabil", -// "lastName": "Naffar", -// "roles": [ -// { -// "roleId": 1, -// "roleName": "Standard user" -// }, -// { -// "roleId": 9, -// "roleName": "Super standard user" -// }, -// { -// "roleId": 2, -// "roleName": "Super duper standard user" -// } -// ] -// }]; -// let secondUsersListMock = [ -// { -// "orgUserId": "sadf7", -// "firstName": "John", -// "lastName": "Hall", -// "roles": [ -// { -// "roleId": 1, -// "roleName": "Standard user" -// }, -// { -// "roleId": 2, -// "roleName": "Super duper standard user" -// } -// ] -// }]; -// -// it('should get all user\'s administrated applications when initializing the view', ()=> { -// deferredAdminApps.resolve(appsListMock); -// deferredUsersAccounts.resolve(usersListMock); -// $scope.$apply(); -// expect(users.adminApps).toEqual(appsListMock); -// expect(users.selectedApp).toEqual(appsListMock[0]); -// }); -// -// it('should get first application users by default when initializing the view', () => { -// $scope.$apply(); -// deferredAdminApps.resolve(appsListMock); -// deferredUsersAccounts.resolve(usersListMock); -// $scope.$apply(); -// expect(users.accountUsers).toEqual(usersListMock); -// }); -// -// it('should get application users when changing application', () => { -// $scope.$apply(); -// deferredAdminApps.resolve(appsListMock); -// $scope.$apply(); -// -// users.selectedApp = appsListMock[1]; -// deferredUsersAccounts.resolve(secondUsersListMock); -// $scope.$apply('users');//change app -// -// expect(users.accountUsers).toEqual(secondUsersListMock); -// }); -// }); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +// /** +// * Created by nnaffar on 12/17/15. +// */ +// 'use strict'; +// +// describe('Controller: UsersCtrl ', () => { +// beforeEach(module('ecompApp')); +// +// //destroy $http default cache before starting to prevent the error 'default cache already exists' +// beforeEach(inject((_CacheFactory_)=> { +// _CacheFactory_.destroyAll(); +// })); +// +// let users, $controller, $q, $rootScope, $log, $scope; +// +// beforeEach(inject((_$controller_, _$q_, _$rootScope_, _$log_)=> { +// [$controller, $q, $rootScope, $log] = [_$controller_, _$q_, _$rootScope_, _$log_]; +// })); +// +// let applicationsServiceMock, usersServiceMock; +// let deferredAdminApps, deferredUsersAccounts; +// beforeEach(()=> { +// [deferredAdminApps, deferredUsersAccounts] = [$q.defer(), $q.defer()]; +// +// applicationsServiceMock = { +// getAdminApps: () => { +// var promise = () => {return deferredAdminApps.promise}; +// var cancel = jasmine.createSpy(); +// return { +// promise: promise, +// cancel: cancel +// } +// } +// }; +// +// usersServiceMock = jasmine.createSpyObj('usersServiceMock', ['getAccountUsers']); +// +// //applicationsServiceMock.getAdminApps().promise().and.returnValue(deferredAdminApps.promise); +// usersServiceMock.getAccountUsers.and.returnValue(deferredUsersAccounts.promise); +// +// $scope = $rootScope.$new(); +// users = $controller('UsersCtrl', { +// $log: $log, +// applicationsService: applicationsServiceMock, +// usersService: usersServiceMock, +// $scope: $scope +// }); +// $scope.users = users; +// }); +// +// //MOCKS +// let appsListMock = [ +// {value: 'SSP', title: 'SSP', id: 3}, +// {value: 'ASDC', title: 'ASDC', id: 23}, +// {value: 'Formation', title: 'Formation', id: 223} +// ]; +// +// let usersListMock = [ +// { +// "orgUserId": "nn605g", +// "firstName": "Nabil", +// "lastName": "Naffar", +// "roles": [ +// { +// "roleId": 1, +// "roleName": "Standard user" +// }, +// { +// "roleId": 9, +// "roleName": "Super standard user" +// }, +// { +// "roleId": 2, +// "roleName": "Super duper standard user" +// } +// ] +// }]; +// let secondUsersListMock = [ +// { +// "orgUserId": "sadf7", +// "firstName": "John", +// "lastName": "Hall", +// "roles": [ +// { +// "roleId": 1, +// "roleName": "Standard user" +// }, +// { +// "roleId": 2, +// "roleName": "Super duper standard user" +// } +// ] +// }]; +// +// it('should get all user\'s administrated applications when initializing the view', ()=> { +// deferredAdminApps.resolve(appsListMock); +// deferredUsersAccounts.resolve(usersListMock); +// $scope.$apply(); +// expect(users.adminApps).toEqual(appsListMock); +// expect(users.selectedApp).toEqual(appsListMock[0]); +// }); +// +// it('should get first application users by default when initializing the view', () => { +// $scope.$apply(); +// deferredAdminApps.resolve(appsListMock); +// deferredUsersAccounts.resolve(usersListMock); +// $scope.$apply(); +// expect(users.accountUsers).toEqual(usersListMock); +// }); +// +// it('should get application users when changing application', () => { +// $scope.$apply(); +// deferredAdminApps.resolve(appsListMock); +// $scope.$apply(); +// +// users.selectedApp = appsListMock[1]; +// deferredUsersAccounts.resolve(secondUsersListMock); +// $scope.$apply('users');//change app +// +// expect(users.accountUsers).toEqual(secondUsersListMock); +// }); +// }); diff --git a/ecomp-portal-FE-common/client/app/views/users/users.less b/ecomp-portal-FE-common/client/app/views/users/users.less index 7a0e9ebb..4c38b33c 100644 --- a/ecomp-portal-FE-common/client/app/views/users/users.less +++ b/ecomp-portal-FE-common/client/app/views/users/users.less @@ -1,25 +1,30 @@ .users-page-main{ - .bg_portalWhite;//white for 1702 - //.bg_portalGray; // gray for 1610 - position: @page-main-position; - top: @page-main-top; - left: @page-main-left; - right: @page-main-right; - bottom: @page-main-bottom; - padding-top: @padding-top; - overflow-y: @page-main-overflow-y; - padding-left: @padding-left-side; -#input-table-search::-webkit-input-placeholder, -{ -font-style: italic; - color: #D7D7D7; -} + .bg_portalWhite;//white for 1702 + //.bg_portalGray; // gray for 1610 + position: @page-main-position; + top: @page-main-top; + left: @page-main-left; + right: @page-main-right; + bottom: @page-main-bottom; + padding-top: @padding-top; + overflow-y: @page-main-overflow-y; + padding-left: @padding-left-side; + #input-table-search::-webkit-input-placeholder, + { + font-style: italic; + color: #D7D7D7; + } .users-table { - width: @table-width; - //margin-left: @table-margin-left; - margin: 0 auto; - + width: @table-width; + //margin-left: @table-margin-left; + margin: 0 auto; } + + .table-users-div{ + width:15px; + font-size:23px; + cursor: pointer; + } .error-text { width: 1170px; diff --git a/ecomp-portal-FE-common/client/app/views/users/users.tpl.html b/ecomp-portal-FE-common/client/app/views/users/users.tpl.html index ff3edde0..606ced6e 100644 --- a/ecomp-portal-FE-common/client/app/views/users/users.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/users/users.tpl.html @@ -1,98 +1,98 @@ - -
-
-
-
-

Users

-
-
-
-
-
- -
-
- -
- - -
-
-
-
-

Use the 'Select application' dropdown to see users.

-
-
-

 

-

- No users found. Select "Add User" to add a User to the application. -

-
-
-

 

-

- Failed to communicate with the application. - Please try again later or contact a system administrator. -

-
-
- -
- - - - - - - - - - - - - - - - - -
First NameLast NameUser IDRoles
-
-
-
-
-
-

Attention:

-

 

-

It appears that you have not been added as an admin yet to an application.

-

 

-

Click on the Admins link to the left and check and see if you are listed as an admin for an application. - If not, you can add yourself to the appropriate application.

-
-
-
- -
+ +
+
+
+
+

Users

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

Use the 'Select application' dropdown to see users.

+
+
+

 

+

+ No users found. Select "Add User" to add a User to the application. +

+
+
+

 

+

+ Failed to communicate with the application. + Please try again later or contact a system administrator. +

+
+
+ +
+ + + + + + + + + + + + + + + + + +
First NameLast NameUser IDRoles
+
+
+
+
+
+

Attention:

+

 

+

It appears that you have not been added as an admin yet to an application.

+

 

+

Click on the Admins link to the left and check and see if you are listed as an admin for an application. + If not, you can add yourself to the appropriate application.

+
+
+
+ +
diff --git a/ecomp-portal-FE-common/client/app/views/widget-catalog/widget-catalog.controller.js b/ecomp-portal-FE-common/client/app/views/widget-catalog/widget-catalog.controller.js index 2b0cc5cf..859b9a8e 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-catalog/widget-catalog.controller.js +++ b/ecomp-portal-FE-common/client/app/views/widget-catalog/widget-catalog.controller.js @@ -1,350 +1,350 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; -(function () { - - class WidgetCatalogCtrl { - constructor(widgetsService, $log, $cookies, $scope, conf, beReaderService, widgetsCatalogService, userProfileService,dashboardService,$compile, ngDialog) { - - $scope.editWidgetModalPopup = function(availableData, resourceType) { - $scope.editData = JSON.stringify(availableData); - $scope.availableDataTemp = $scope.availableData; - ngDialog.open({ - templateUrl : 'app/views/dashboard/dashboard-widget-manage.html', - controller : 'CommonWidgetController', - resolve : { - message : function message() { - var message = { - type : resourceType, - availableData : $scope.editData - }; - return message; - } - } - }).closePromise.then(needUpdate => { - if(resourceType=='NEWS'){ - $scope.updateNews(); - }else if(resourceType=='EVENTS'){ - $scope.updateEvents(); - }else if(resourceType=='IMPORTANTRESOURCES'){ - $scope.updateImportRes(); - } - }); - }; - - $scope.WidgetCatView = []; - $scope.applyPresentationDetailsToWidgetsCatalog = function(widgetsReturned){ - var rowNo = 0; - for (var i = 0; i < widgetsReturned.length; i++) { - $scope.WidgetCatView[i] = { - sizeX : 2, - sizeY : 2, - headerText:'', - widgetIdentifier : '', - url : '', - widgetid: '', - attrb:'', - select: false, - }; - $scope.WidgetCatView[i].widgetid = widgetsReturned[i].id; - $scope.WidgetCatView[i].headerText = widgetsReturned[i].headerName; - - if(widgetsReturned[i].headerName === 'widget-news'){ - $scope.WidgetCatView[i].widgetIdentifier = 'NEWS'; - } - else - if(widgetsReturned[i].headerName === 'widget-resources'){ - $scope.WidgetCatView[i].widgetIdentifier = 'IMPORTANTRESOURCES'; - } - else - if(widgetsReturned[i].headerName === 'widget-events'){ - $scope.WidgetCatView[i].widgetIdentifier = 'EVENTS'; - } - - $scope.WidgetCatView[i].url = widgetsReturned[i].url; - $scope.WidgetCatView[i].attrb = widgetsReturned[i].attrs; - $scope.WidgetCatView[i].select = widgetsReturned[i].select; - } - - $scope.widgetViewData = $scope.WidgetCatView; - - } - - /** Widget code starts */ - let getUserWidgets = (loginName) => { - - this.isCommError = false; - var conf = this.conf; - widgetsCatalogService.getUserWidgets(loginName).then(res => { - - if(!(res instanceof Array)){ - this.isCommError = true; - return; - } - for(var i = 0; i < res.length; i++){ - var widget_id = res[i][0]; - var widget_name = res[i][1]; - let url = this.conf.api.widgetCommon + "/" + widget_id + "/framework.js"; - $scope.widgetsList.push({ - id: widget_id, - name: widget_name, - headerName: widget_name, - url: url, - attrs: [{attr: 'data-' + widget_id, value: ''}], - status: res[i][4], - select: (res[i][4] == 'S' || res[i][4] === null) ? true : false - }); - var script = document - .createElement('script'); - script.src = url; - script.async = true; - var entry = document - .getElementsByTagName('script')[0]; - entry.parentNode - .insertBefore(script, entry); - } - $scope.applyPresentationDetailsToWidgetsCatalog($scope.widgetsList); - }).catch(err => { - $log.error('WidgetCatalogCtrl::getUserWidgets caught error', err); - }).finally(()=> { - - }); - }; - - let init = () => { - userProfileService.getUserProfile() - .then(profile=> { - // $log.info('WidgetCatalogCtrl::getUserProfile: ', - // profile); - $scope.orgUserId = profile.orgUserId; - $scope.widgetsViewData = []; - $scope.widgetsView = []; - getUserWidgets($scope.orgUserId); - }); - this.conf = conf; - $scope.widgetsList = []; - }; - - /** Widget code ends */ - - $scope.activateThis = function(ele){ - $compile(ele.contents())($scope); - $scope.$apply(); - }; - $scope.setCommonWidget = function() { - /* News Events Resources */ - var widgetLength = ($scope.widgetsViewData==null || $scope.widgetsViewData.length==0) ? 0:$scope.widgetsViewData.length; - $scope.widgetsViewData[widgetLength] = { - sizeX: 2, - sizeY: 2, - headerText: 'News', - width: '', - height: '', - url: '', - selected:true - }; - $scope.widgetsViewData[widgetLength+1] = { - sizeX: 2, - sizeY: 2, - headerText: 'Calendar Events', - width: '', - height: '', - url: '', - selected:true - }; - $scope.widgetsViewData[widgetLength+2] = { - sizeX: 2, - sizeY: 2, - headerText: 'Resources', - width: '', - height: '', - url: '', - selected:true - }; - - /* Setting News data */ - $scope.newsData = []; - $scope.updateNews = function() { - $scope.newsData.length=0; - dashboardService.getCommonWidgetData('NEWS').then(function(res) { - // $log.info(res.message); - var newsDataJsonArray = res.response.items; - for (var i = 0; i < newsDataJsonArray.length; i++) { - $scope.newsData.push(newsDataJsonArray[i]); - } - })['catch'](function(err) { - $log.error('dashboard controller: failed to get news list', err); - }); - } - $scope.updateNews(); - /* Setting Events data */ - - $scope.eventData = []; - - $scope.updateEvents = function() { - $scope.eventData.length=0; - dashboardService.getCommonWidgetData('EVENTS').then(function(res) { - var eventDataJsonArray = res.response.items; - for (var i = 0; i < eventDataJsonArray.length; i++) { - if(eventDataJsonArray[i].eventDate !=null) { - // yyyy-mm-dd - eventDataJsonArray[i].year = eventDataJsonArray[i].eventDate.substring(2,4); - eventDataJsonArray[i].mon = eventDataJsonArray[i].eventDate.substring(5,7); - eventDataJsonArray[i].day = eventDataJsonArray[i].eventDate.substring(8,10); - } - $scope.eventData.push(eventDataJsonArray[i]); - } - })['catch'](function(err) { - $log.error('dashboard controller: failed to get Events list', err); - }); - } - $scope.updateEvents(); - /* Setting Important Resources data */ - - $scope.importResData = []; - $scope.updateImportRes = function() { - $scope.importResData.length=0; - dashboardService.getCommonWidgetData('IMPORTANTRESOURCES').then( - function(res) { - // $log.info(res); - var importResDataJSONArray = res.response.items; - for (var i = 0; i < importResDataJSONArray.length; i++) { - $scope.importResData.push(importResDataJSONArray[i]); - } - })['catch'](function(err) { - $log.error('dashboard controller: failed to get resources list...', err); - }); - } - $scope.updateImportRes(); - - /** ******End hardcoded news events and resources*************** */ - - } - - $scope.newsGridsterItem = { - headerText : 'Test', - subHeaderText : '' - }; - - $scope.newsGridsterItem = { - headerText : 'News', - subHeaderText : '' - }; - - $scope.eventsGridsterItem = { - headerText : 'Events', - subHeaderText : '' - }; - - $scope.impoResGridsterItem = { - headerText : 'Resources', - subHeaderText : '' - }; - - this.gridsterOpts = { - columns: 6, - colWidth: 190, - rowHeight: 190, - margins: [20, 20], - outerMargin: true, - pushing: true, - floating: true, - swapping: true, - draggable: { - handle: '.icon-content-gridguide' - } - }; - - // Run this function when user clicks on checkbox. - $scope.storeSelection = function(widget) { - - // not needed as only 'SHOW' and 'HIDE' status_cd is expected from the micro service now - /*var pendingFlag = false; - if(widget.access) - pendingFlag = false; - else - pendingFlag = widget.pending; */ - - var appData = { - widgetId: widget.widgetid, - select : widget.select, - // pending : pendingFlag - }; - - widgetsCatalogService.updateWidgetCatalog(appData).then( - function(result) { - // $log.debug('CatalogCtrl:storeSelection result is ', result); - })['catch'](function(err) { - $log.error('CatalogCtrl:storeSelection: exception: ', err); - }); - }; - - init(); - } - } - - - - WidgetCatalogCtrl.$inject = ['widgetsService', '$log', '$cookies', '$scope', 'conf', 'beReaderService', 'widgetsCatalogService', 'userProfileService','dashboardService','$compile','ngDialog']; - angular.module('ecompApp').controller('WidgetCatalogCtrl', WidgetCatalogCtrl); - - angular.module('ecompApp').constant('refreshInterval', '30000'); - - angular.module('ecompApp').directive('refreshIframe', ['$interval', 'refreshInterval', function ($interval, refreshInterval) { - - function link(scope, element, attrs) { - var timeoutId; - - function updateIframe() { - if(attrs.isEnlarged == "false") - { - element.attr('src', element.attr('src')); - } - } - - element.on('$destroy', function () { - $interval.cancel(timeoutId); - }); - - // start the UI update process; save the timeoutId for cancelling - /* - * timeoutId = $interval(function () { updateIframe(); // update DOM }, - * refreshInterval); - */ - } - - return { - link: link - }; - } ]); - -})(); - - -app.directive('dynAttr', function() { - return { - scope: { list: '=dynAttr' }, - link: function(scope, elem, attrs){ - for(var attr in scope.list){ - elem.attr(scope.list[attr].attr, scope.list[attr].value); - } - } - }; -}); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; +(function () { + + class WidgetCatalogCtrl { + constructor(widgetsService, $log, $cookies, $scope, conf, beReaderService, widgetsCatalogService, userProfileService,dashboardService,$compile, ngDialog) { + + $scope.editWidgetModalPopup = function(availableData, resourceType) { + $scope.editData = JSON.stringify(availableData); + $scope.availableDataTemp = $scope.availableData; + ngDialog.open({ + templateUrl : 'app/views/dashboard/dashboard-widget-manage.html', + controller : 'CommonWidgetController', + resolve : { + message : function message() { + var message = { + type : resourceType, + availableData : $scope.editData + }; + return message; + } + } + }).closePromise.then(needUpdate => { + if(resourceType=='NEWS'){ + $scope.updateNews(); + }else if(resourceType=='EVENTS'){ + $scope.updateEvents(); + }else if(resourceType=='IMPORTANTRESOURCES'){ + $scope.updateImportRes(); + } + }); + }; + + $scope.WidgetCatView = []; + $scope.applyPresentationDetailsToWidgetsCatalog = function(widgetsReturned){ + var rowNo = 0; + for (var i = 0; i < widgetsReturned.length; i++) { + $scope.WidgetCatView[i] = { + sizeX : 2, + sizeY : 2, + headerText:'', + widgetIdentifier : '', + url : '', + widgetid: '', + attrb:'', + select: false, + }; + $scope.WidgetCatView[i].widgetid = widgetsReturned[i].id; + $scope.WidgetCatView[i].headerText = widgetsReturned[i].headerName; + + if(widgetsReturned[i].headerName === 'widget-news'){ + $scope.WidgetCatView[i].widgetIdentifier = 'NEWS'; + } + else + if(widgetsReturned[i].headerName === 'widget-resources'){ + $scope.WidgetCatView[i].widgetIdentifier = 'IMPORTANTRESOURCES'; + } + else + if(widgetsReturned[i].headerName === 'widget-events'){ + $scope.WidgetCatView[i].widgetIdentifier = 'EVENTS'; + } + + $scope.WidgetCatView[i].url = widgetsReturned[i].url; + $scope.WidgetCatView[i].attrb = widgetsReturned[i].attrs; + $scope.WidgetCatView[i].select = widgetsReturned[i].select; + } + + $scope.widgetViewData = $scope.WidgetCatView; + + } + + /** Widget code starts */ + let getUserWidgets = (loginName) => { + + this.isCommError = false; + var conf = this.conf; + widgetsCatalogService.getUserWidgets(loginName).then(res => { + + if(!(res instanceof Array)){ + this.isCommError = true; + return; + } + for(var i = 0; i < res.length; i++){ + var widget_id = res[i][0]; + var widget_name = res[i][1]; + let url = this.conf.api.widgetCommon + "/" + widget_id + "/framework.js"; + $scope.widgetsList.push({ + id: widget_id, + name: widget_name, + headerName: widget_name, + url: url, + attrs: [{attr: 'data-' + widget_id, value: ''}], + status: res[i][4], + select: (res[i][4] == 'S' || res[i][4] === null) ? true : false + }); + var script = document + .createElement('script'); + script.src = url; + script.async = true; + var entry = document + .getElementsByTagName('script')[0]; + entry.parentNode + .insertBefore(script, entry); + } + $scope.applyPresentationDetailsToWidgetsCatalog($scope.widgetsList); + }).catch(err => { + $log.error('WidgetCatalogCtrl::getUserWidgets caught error', err); + }).finally(()=> { + + }); + }; + + let init = () => { + userProfileService.getUserProfile() + .then(profile=> { + // $log.info('WidgetCatalogCtrl::getUserProfile: ', + // profile); + $scope.orgUserId = profile.orgUserId; + $scope.widgetsViewData = []; + $scope.widgetsView = []; + getUserWidgets($scope.orgUserId); + }); + this.conf = conf; + $scope.widgetsList = []; + }; + + /** Widget code ends */ + + $scope.activateThis = function(ele){ + $compile(ele.contents())($scope); + $scope.$apply(); + }; + $scope.setCommonWidget = function() { + /* News Events Resources */ + var widgetLength = ($scope.widgetsViewData==null || $scope.widgetsViewData.length==0) ? 0:$scope.widgetsViewData.length; + $scope.widgetsViewData[widgetLength] = { + sizeX: 2, + sizeY: 2, + headerText: 'News', + width: '', + height: '', + url: '', + selected:true + }; + $scope.widgetsViewData[widgetLength+1] = { + sizeX: 2, + sizeY: 2, + headerText: 'Calendar Events', + width: '', + height: '', + url: '', + selected:true + }; + $scope.widgetsViewData[widgetLength+2] = { + sizeX: 2, + sizeY: 2, + headerText: 'Resources', + width: '', + height: '', + url: '', + selected:true + }; + + /* Setting News data */ + $scope.newsData = []; + $scope.updateNews = function() { + $scope.newsData.length=0; + dashboardService.getCommonWidgetData('NEWS').then(function(res) { + // $log.info(res.message); + var newsDataJsonArray = res.response.items; + for (var i = 0; i < newsDataJsonArray.length; i++) { + $scope.newsData.push(newsDataJsonArray[i]); + } + })['catch'](function(err) { + $log.error('dashboard controller: failed to get news list', err); + }); + } + $scope.updateNews(); + /* Setting Events data */ + + $scope.eventData = []; + + $scope.updateEvents = function() { + $scope.eventData.length=0; + dashboardService.getCommonWidgetData('EVENTS').then(function(res) { + var eventDataJsonArray = res.response.items; + for (var i = 0; i < eventDataJsonArray.length; i++) { + if(eventDataJsonArray[i].eventDate !=null) { + // yyyy-mm-dd + eventDataJsonArray[i].year = eventDataJsonArray[i].eventDate.substring(2,4); + eventDataJsonArray[i].mon = eventDataJsonArray[i].eventDate.substring(5,7); + eventDataJsonArray[i].day = eventDataJsonArray[i].eventDate.substring(8,10); + } + $scope.eventData.push(eventDataJsonArray[i]); + } + })['catch'](function(err) { + $log.error('dashboard controller: failed to get Events list', err); + }); + } + $scope.updateEvents(); + /* Setting Important Resources data */ + + $scope.importResData = []; + $scope.updateImportRes = function() { + $scope.importResData.length=0; + dashboardService.getCommonWidgetData('IMPORTANTRESOURCES').then( + function(res) { + // $log.info(res); + var importResDataJSONArray = res.response.items; + for (var i = 0; i < importResDataJSONArray.length; i++) { + $scope.importResData.push(importResDataJSONArray[i]); + } + })['catch'](function(err) { + $log.error('dashboard controller: failed to get resources list...', err); + }); + } + $scope.updateImportRes(); + + /** ******End hardcoded news events and resources*************** */ + + } + + $scope.newsGridsterItem = { + headerText : 'Test', + subHeaderText : '' + }; + + $scope.newsGridsterItem = { + headerText : 'News', + subHeaderText : '' + }; + + $scope.eventsGridsterItem = { + headerText : 'Events', + subHeaderText : '' + }; + + $scope.impoResGridsterItem = { + headerText : 'Resources', + subHeaderText : '' + }; + + this.gridsterOpts = { + columns: 6, + colWidth: 190, + rowHeight: 190, + margins: [20, 20], + outerMargin: true, + pushing: true, + floating: true, + swapping: true, + draggable: { + handle: '.icon-content-gridguide' + } + }; + + // Run this function when user clicks on checkbox. + $scope.storeSelection = function(widget) { + + // not needed as only 'SHOW' and 'HIDE' status_cd is expected from the micro service now + /*var pendingFlag = false; + if(widget.access) + pendingFlag = false; + else + pendingFlag = widget.pending; */ + + var appData = { + widgetId: widget.widgetid, + select : widget.select, + // pending : pendingFlag + }; + + widgetsCatalogService.updateWidgetCatalog(appData).then( + function(result) { + // $log.debug('CatalogCtrl:storeSelection result is ', result); + })['catch'](function(err) { + $log.error('CatalogCtrl:storeSelection: exception: ', err); + }); + }; + + init(); + } + } + + + + WidgetCatalogCtrl.$inject = ['widgetsService', '$log', '$cookies', '$scope', 'conf', 'beReaderService', 'widgetsCatalogService', 'userProfileService','dashboardService','$compile','ngDialog']; + angular.module('ecompApp').controller('WidgetCatalogCtrl', WidgetCatalogCtrl); + + angular.module('ecompApp').constant('refreshInterval', '30000'); + + angular.module('ecompApp').directive('refreshIframe', ['$interval', 'refreshInterval', function ($interval, refreshInterval) { + + function link(scope, element, attrs) { + var timeoutId; + + function updateIframe() { + if(attrs.isEnlarged == "false") + { + element.attr('src', element.attr('src')); + } + } + + element.on('$destroy', function () { + $interval.cancel(timeoutId); + }); + + // start the UI update process; save the timeoutId for cancelling + /* + * timeoutId = $interval(function () { updateIframe(); // update DOM }, + * refreshInterval); + */ + } + + return { + link: link + }; + } ]); + +})(); + + +app.directive('dynAttr', function() { + return { + scope: { list: '=dynAttr' }, + link: function(scope, elem, attrs){ + for(var attr in scope.list){ + elem.attr(scope.list[attr].attr, scope.list[attr].value); + } + } + }; +}); diff --git a/ecomp-portal-FE-common/client/app/views/widget-catalog/widget-catalog.controller.spec.js b/ecomp-portal-FE-common/client/app/views/widget-catalog/widget-catalog.controller.spec.js index 77659d93..5c42f4ce 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-catalog/widget-catalog.controller.spec.js +++ b/ecomp-portal-FE-common/client/app/views/widget-catalog/widget-catalog.controller.spec.js @@ -1,20 +1,20 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ - +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ + diff --git a/ecomp-portal-FE-common/client/app/views/widget-catalog/widget-catalog.tpl.html b/ecomp-portal-FE-common/client/app/views/widget-catalog/widget-catalog.tpl.html index 1b77a28c..84bf0f57 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-catalog/widget-catalog.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/widget-catalog/widget-catalog.tpl.html @@ -1,76 +1,76 @@ - -
-
-
-
-

Widget Catalog

-
-
-
-
Failed to - communicate with the widget microservice.
-
-
-
-
    -
  • -
    -
    - -

    {{ widget.headerText}}

    -
    - -
    -
    -
    -
    -
    -
    -
    • -
-
-
-
-
-
X
- -
-
-
- -
- To request access to an application widget, please visit the Get Access page. -
-
-
-
+ +
+
+
+
+

Widget Catalog

+
+
+
+
Failed to + communicate with the widget microservice.
+
+
+
+
    +
  • +
    +
    + +

    {{ widget.headerText}}

    +
    + +
    +
    +
    +
    +
    +
    +
    • +
+
+
+
+
+
X
+ +
+
+
+ +
+ To request access to an application widget, please visit the Get Access page. +
+
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.controller.js b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.controller.js index 0a9dd12c..ad88c02b 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.controller.js +++ b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.controller.js @@ -1,381 +1,381 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; -(function () { - class WidgetOnboardingDetailsModalCtrl { - constructor($scope, $log, $interval, applicationsService, adminsService, microserviceService, widgetsCatalogService, errorMessageByCode, ECOMP_URL_REGEX, $window,userProfileService, confirmBoxService, $cookies) { - - this.appUpdate = function(){ - this.hasSelectedApp = false; - this.appCounter = 0; - for(var i = 0; i < this.availableApps.length; i++){ - if(this.availableApps[i].isSelected){ - this.appCounter++; - if(!this.hasSelectedApp) - this.hasSelectedApp = true; - } - if(this.availableApps[i].isSelected - && this.availableApps[i].roles.length == 0){ - var index = i; - this.availableRoles = []; - adminsService.getRolesByApp(this.availableApps[i].id).then(roles => { - for(var i = 0; i < roles.length; i++){ - this.availableRoles.push({ - id: roles[i].id, - name: roles[i].name, - isSelected: false, - }); - } - this.availableApps[index].roles = this.availableRoles; - }); - } - } - this.allRoleSelected = true; - this.checkRoleSelected(); - } - - this.roleUpdate = function(app){ - this.allRoleSelected = true; - for(var i = 0; i < app.roles.length; i++){ - if(app.roles[i].isSelected){ - app.roleSelected = true; - this.checkRoleSelected(); - return; - } - } - app.roleSelected = false; - this.checkRoleSelected(); - } - - this.checkRoleSelected = function(){ - for(var i = 0; i < this.availableApps.length; i++){ - if(this.availableApps[i].isSelected - && !this.availableApps[i].roleSelected){ - this.allRoleSelected = false; - return; - } - } - } - - this.getAppName = function(appId){ - for(var i = 0; i < this.availableApps.length; i++){ - if(this.availableApps[i].id == appId){ - return this.availableApps[i].name; - } - } - } - - let newWidgetModel = { - name: null, - roleId: null, - roleName: null, - appId: null, - appName: null, - url: null, - showAppOptions: false, - showRoleOptions: false, - hasSelectedApp: false - }; - - let getAvailableApps = () => { - - if(this.isEditMode == false){ - applicationsService.getAppsForSuperAdminAndAccountAdmin().then(apps => { - this.availableApps=[]; - for(var i=0;i { - $log.error(err); - }); - } - else if(this.isEditMode == true){ - if(this.widget.allowAllUser == "Y") - this.widget.allUser = true; - applicationsService.getAppsForSuperAdminAndAccountAdmin().then(apps => { - this.availableApps=[]; - let selectedApps = {}; - var availableApps = this.availableApps; - this.allRoleSelected = true; - for(var i=0; i < this.widget.widgetRoles.length; i++){ - if(selectedApps[this.widget.widgetRoles[i].app.appId] != undefined) - selectedApps[this.widget.widgetRoles[i].app.appId] += this.widget.widgetRoles[i].roleId + ";" + this.widget.widgetRoles[i].roleName + ";"; - else{ - selectedApps[this.widget.widgetRoles[i].app.appId] = this.widget.widgetRoles[i].roleId + ";" + this.widget.widgetRoles[i].roleName + ";"; - this.appCounter++; - } - } - apps.forEach(function(app, index){ - availableApps.push({ - id: app.id, - name: app.name, - roles: [], - roleSelected: false, - isSelected: false, - }); - if(selectedApps[app.id] != undefined){ - adminsService.getRolesByApp(app.id).then(roles => { - var role = selectedApps[app.id].split(';'); - var selectedRoles = []; - var n = 0; - while((n+1) < role.length){ - selectedRoles.push({ - id: role[n++], - name: role[n++], - isSelected: true, - }); - } - for(var m = 0; m < roles.length; m++){ - var hasSelected = true; - for(var n = 0; n < selectedRoles.length; n++){ - if(selectedRoles[n].id == roles[m].id){ - hasSelected = false; - break; - } - } - if(hasSelected){ - selectedRoles.push({ - id: roles[m].id, - name: roles[m].name, - isSelected: false, - }); - } - } - availableApps[index].roleSelected = true; - availableApps[index].isSelected = true; - availableApps[index].roles = selectedRoles; - }); - } - }) - }) - } - }; - - let getAvailableServices = () =>{ - microserviceService.getServiceList().then(services => { - this.availableServices = []; - for(var i = 0; i < services.length; i++){ - this.availableServices.push({ - id: services[i].id, - name: services[i].name, - option: services[i].name + ": " + services[i].url - }); - - if(this.widget.service != null && this.widget.service.id == services[i].id){ - this.widget.serviceURL = this.availableServices[i]; - } - } - }).catch(err => { - $log.error(err); - }); - } - - - let init = () => { - $log.info('WidgetOnboardingDetailsModalCtrl::init'); - this.widgetsList = []; - this.duplicatedName = true; - this.allRoleSelected = false; - this.appCounter = 0; - this.isSaving = false; - this.allUser = false; - this.emptyWidgetName = false; - - if ($scope.ngDialogData && $scope.ngDialogData.widget) { - this.isEditMode = true; - this.allRoleSelected = true; - this.widget = _.clone($scope.ngDialogData.widget); - } else { - this.isEditMode = false; - this.widget = _.clone(newWidgetModel); - } - - widgetsCatalogService.getManagedWidgets().then(res => { - for(var i = 0; i < res.length; i++){ - this.widgetsList.push(res[i].name); - } - }).catch(err => { - $log.error('WidgetOnboardingDetailsModalCtrl::init error: ' + err); - }).finally(()=> { - this.isLoadingTable = false; - }); - getAvailableApps(); - getAvailableServices(); - }; - this.ECOMP_URL_REGEX = ECOMP_URL_REGEX; - this.conflictMessages = {}; - this.scrollApi = {}; - - let resetConflict = fieldName => { - delete this.conflictMessages[fieldName]; - if($scope.widgetForm[fieldName]){ - $scope.widgetForm[fieldName].$setValidity('conflict', true); - } - }; - - this.updateSelectedRole = () => { - if (!this.selectedRole) { - return; - } - this.widget.RoleId = this.selectedRole.id; - this.widget.RoleName = this.selectedRole.name; - }; - - let emptyCookies = () => { - userProfileService.getUserProfile() - .then(profile=> { - $log.info('AppDetailsModalCtrl::emptyCookies profile: ', profile); - $scope.orgUserId = profile.orgUserId; - $log.info('user has the following orgUserId: ' + profile.orgUserId); - if ($cookies.getObject($scope.orgUserId + '_widget') != undefined && $cookies.getObject($scope.orgUserId + '_widget') != null) { - $cookies.remove($scope.orgUserId + '_widget'); - } - }); - }; - - this.updateWidgetName = () => { - for(var i = 0; i < this.widgetsList.length; i++){ - if(this.widget.name.toUpperCase() == this.widgetsList[i].toUpperCase()){ - this.duplicatedName = false; - return; - } - } - this.duplicatedName = true; - }; - - this.saveChanges = () => { - - if(!this.isEditMode) - this.updateWidgetName(); - - if(this.duplicatedName == false - || this.widget.name == '' - || this.widget.name == undefined){ - this.emptyWidgetName = true; - return; - } - - if((this.widget.file == undefined && !this.isEditMode) || - (!this.widget.allUser && this.appCounter == 0) || - this.widget.name == null || - (!this.widget.allUser && !this.allRoleSelected) || - this.widget.saving == true) - return; - - - this.widget.saving = true; - var selectedRoles = []; - if(!this.widget.allUser){ - for(var i = 0; i < this.availableApps.length; i++){ - if(this.availableApps[i].isSelected){ - for(var n = 0; n < this.availableApps[i].roles.length; n++) { - if(this.availableApps[i].roles[n].isSelected){ - var role = { - app: { - appId: this.availableApps[i].id - }, - roleId: this.availableApps[i].roles[n].id, - roleName: this.availableApps[i].roles[n].name, - }; - selectedRoles.push(role); - } - } - } - } - } - - var allowAllUser = 0; - if(this.widget.allUser) - allowAllUser = 1; - - var serviceId = null; - if(this.widget.serviceURL != null && - this.widget.serviceURL != undefined){ - serviceId = this.widget.serviceURL.id; - } - - - var file_loc = this.widget.name + ".zip"; - var newWidget = { - name: this.widget.name, - desc: this.widget.desc, - widgetRoles: selectedRoles, - fileLocation: file_loc, - allowAllUser: allowAllUser, - serviceId: serviceId - }; - - if(this.isEditMode){ - - if(this.widget.file != undefined){ - widgetsCatalogService.updateWidgetWithFile(this.widget.file, this.widget.id, newWidget).then(res => { - if(!res.valid){ - if(!res.error){ - confirmBoxService.showInformation("Could not save. Please retry."); - this.widget.saving = false; - return; - } - confirmBoxService.showInformation(res.error); - this.widget.saving = false; - return; - } - $scope.closeThisDialog(true); - this.widget.saving = false; - }); - } - else{ - widgetsCatalogService.updateWidget(this.widget.id, newWidget) - .then(() => { - $scope.closeThisDialog(true); - }); - } - } - else{ - widgetsCatalogService.createWidget(newWidget, this.widget.file).then(res => { - if(!res.valid){ - if(!res.error) - confirmBoxService.showInformation("Could not save. Please retry."); - else - confirmBoxService.showInformation(res.error); - this.widget.saving = false; - return; - } - $scope.closeThisDialog(true); - this.widget.saving = false; - }); - } - }; - init(); - $scope.$on('$stateChangeStart', e => { - e.preventDefault(); - }); - } - } - WidgetOnboardingDetailsModalCtrl.$inject = ['$scope', '$log', '$interval', 'applicationsService', 'adminsService', 'microserviceService', 'widgetsCatalogService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window','userProfileService', 'confirmBoxService', '$cookies']; - angular.module('ecompApp').controller('WidgetOnboardingDetailsModalCtrl', WidgetOnboardingDetailsModalCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; +(function () { + class WidgetOnboardingDetailsModalCtrl { + constructor($scope, $log, $interval, applicationsService, adminsService, microserviceService, widgetsCatalogService, errorMessageByCode, ECOMP_URL_REGEX, $window,userProfileService, confirmBoxService, $cookies) { + + this.appUpdate = function(){ + this.hasSelectedApp = false; + this.appCounter = 0; + for(var i = 0; i < this.availableApps.length; i++){ + if(this.availableApps[i].isSelected){ + this.appCounter++; + if(!this.hasSelectedApp) + this.hasSelectedApp = true; + } + if(this.availableApps[i].isSelected + && this.availableApps[i].roles.length == 0){ + var index = i; + this.availableRoles = []; + adminsService.getRolesByApp(this.availableApps[i].id).then(roles => { + for(var i = 0; i < roles.length; i++){ + this.availableRoles.push({ + id: roles[i].id, + name: roles[i].name, + isSelected: false, + }); + } + this.availableApps[index].roles = this.availableRoles; + }); + } + } + this.allRoleSelected = true; + this.checkRoleSelected(); + } + + this.roleUpdate = function(app){ + this.allRoleSelected = true; + for(var i = 0; i < app.roles.length; i++){ + if(app.roles[i].isSelected){ + app.roleSelected = true; + this.checkRoleSelected(); + return; + } + } + app.roleSelected = false; + this.checkRoleSelected(); + } + + this.checkRoleSelected = function(){ + for(var i = 0; i < this.availableApps.length; i++){ + if(this.availableApps[i].isSelected + && !this.availableApps[i].roleSelected){ + this.allRoleSelected = false; + return; + } + } + } + + this.getAppName = function(appId){ + for(var i = 0; i < this.availableApps.length; i++){ + if(this.availableApps[i].id == appId){ + return this.availableApps[i].name; + } + } + } + + let newWidgetModel = { + name: null, + roleId: null, + roleName: null, + appId: null, + appName: null, + url: null, + showAppOptions: false, + showRoleOptions: false, + hasSelectedApp: false + }; + + let getAvailableApps = () => { + + if(this.isEditMode == false){ + applicationsService.getAppsForSuperAdminAndAccountAdmin().then(apps => { + this.availableApps=[]; + for(var i=0;i { + $log.error(err); + }); + } + else if(this.isEditMode == true){ + if(this.widget.allowAllUser == "Y") + this.widget.allUser = true; + applicationsService.getAppsForSuperAdminAndAccountAdmin().then(apps => { + this.availableApps=[]; + let selectedApps = {}; + var availableApps = this.availableApps; + this.allRoleSelected = true; + for(var i=0; i < this.widget.widgetRoles.length; i++){ + if(selectedApps[this.widget.widgetRoles[i].app.appId] != undefined) + selectedApps[this.widget.widgetRoles[i].app.appId] += this.widget.widgetRoles[i].roleId + ";" + this.widget.widgetRoles[i].roleName + ";"; + else{ + selectedApps[this.widget.widgetRoles[i].app.appId] = this.widget.widgetRoles[i].roleId + ";" + this.widget.widgetRoles[i].roleName + ";"; + this.appCounter++; + } + } + apps.forEach(function(app, index){ + availableApps.push({ + id: app.id, + name: app.name, + roles: [], + roleSelected: false, + isSelected: false, + }); + if(selectedApps[app.id] != undefined){ + adminsService.getRolesByApp(app.id).then(roles => { + var role = selectedApps[app.id].split(';'); + var selectedRoles = []; + var n = 0; + while((n+1) < role.length){ + selectedRoles.push({ + id: role[n++], + name: role[n++], + isSelected: true, + }); + } + for(var m = 0; m < roles.length; m++){ + var hasSelected = true; + for(var n = 0; n < selectedRoles.length; n++){ + if(selectedRoles[n].id == roles[m].id){ + hasSelected = false; + break; + } + } + if(hasSelected){ + selectedRoles.push({ + id: roles[m].id, + name: roles[m].name, + isSelected: false, + }); + } + } + availableApps[index].roleSelected = true; + availableApps[index].isSelected = true; + availableApps[index].roles = selectedRoles; + }); + } + }) + }) + } + }; + + let getAvailableServices = () =>{ + microserviceService.getServiceList().then(services => { + this.availableServices = []; + for(var i = 0; i < services.length; i++){ + this.availableServices.push({ + id: services[i].id, + name: services[i].name, + option: services[i].name + ": " + services[i].url + }); + + if(this.widget.serviceId != null && this.widget.serviceId == services[i].id){ + this.widget.serviceURL = this.availableServices[i]; + } + } + }).catch(err => { + $log.error(err); + }); + } + + + let init = () => { + $log.info('WidgetOnboardingDetailsModalCtrl::init'); + this.widgetsList = []; + this.duplicatedName = true; + this.allRoleSelected = false; + this.appCounter = 0; + this.isSaving = false; + this.allUser = false; + this.emptyWidgetName = false; + + if ($scope.ngDialogData && $scope.ngDialogData.widget) { + this.isEditMode = true; + this.allRoleSelected = true; + this.widget = _.clone($scope.ngDialogData.widget); + } else { + this.isEditMode = false; + this.widget = _.clone(newWidgetModel); + } + + widgetsCatalogService.getManagedWidgets().then(res => { + for(var i = 0; i < res.length; i++){ + this.widgetsList.push(res[i].name); + } + }).catch(err => { + $log.error('WidgetOnboardingDetailsModalCtrl::init error: ' + err); + }).finally(()=> { + this.isLoadingTable = false; + }); + getAvailableApps(); + getAvailableServices(); + }; + this.ECOMP_URL_REGEX = ECOMP_URL_REGEX; + this.conflictMessages = {}; + this.scrollApi = {}; + + let resetConflict = fieldName => { + delete this.conflictMessages[fieldName]; + if($scope.widgetForm[fieldName]){ + $scope.widgetForm[fieldName].$setValidity('conflict', true); + } + }; + + this.updateSelectedRole = () => { + if (!this.selectedRole) { + return; + } + this.widget.RoleId = this.selectedRole.id; + this.widget.RoleName = this.selectedRole.name; + }; + + let emptyCookies = () => { + userProfileService.getUserProfile() + .then(profile=> { + $log.info('AppDetailsModalCtrl::emptyCookies profile: ', profile); + $scope.orgUserId = profile.orgUserId; + $log.info('user has the following orgUserId: ' + profile.orgUserId); + if ($cookies.getObject($scope.orgUserId + '_widget') != undefined && $cookies.getObject($scope.orgUserId + '_widget') != null) { + $cookies.remove($scope.orgUserId + '_widget'); + } + }); + }; + + this.updateWidgetName = () => { + for(var i = 0; i < this.widgetsList.length; i++){ + if(this.widget.name.toUpperCase() == this.widgetsList[i].toUpperCase()){ + this.duplicatedName = false; + return; + } + } + this.duplicatedName = true; + }; + + this.saveChanges = () => { + + if(!this.isEditMode) + this.updateWidgetName(); + + if(this.duplicatedName == false + || this.widget.name == '' + || this.widget.name == undefined){ + this.emptyWidgetName = true; + return; + } + + if((this.widget.file == undefined && !this.isEditMode) || + (!this.widget.allUser && this.appCounter == 0) || + this.widget.name == null || + (!this.widget.allUser && !this.allRoleSelected) || + this.widget.saving == true) + return; + + + this.widget.saving = true; + var selectedRoles = []; + if(!this.widget.allUser){ + for(var i = 0; i < this.availableApps.length; i++){ + if(this.availableApps[i].isSelected){ + for(var n = 0; n < this.availableApps[i].roles.length; n++) { + if(this.availableApps[i].roles[n].isSelected){ + var role = { + app: { + appId: this.availableApps[i].id + }, + roleId: this.availableApps[i].roles[n].id, + roleName: this.availableApps[i].roles[n].name, + }; + selectedRoles.push(role); + } + } + } + } + } + + var allowAllUser = 0; + if(this.widget.allUser) + allowAllUser = 1; + + var serviceId = null; + if(this.widget.serviceURL != null && + this.widget.serviceURL != undefined){ + serviceId = this.widget.serviceURL.id; + } + + + var file_loc = this.widget.name + ".zip"; + var newWidget = { + name: this.widget.name, + desc: this.widget.desc, + widgetRoles: selectedRoles, + fileLocation: file_loc, + allowAllUser: allowAllUser, + serviceId: serviceId + }; + + if(this.isEditMode){ + + if(this.widget.file != undefined){ + widgetsCatalogService.updateWidgetWithFile(this.widget.file, this.widget.id, newWidget).then(res => { + if(!res.valid){ + if(!res.error){ + confirmBoxService.showInformation("Could not save. Please retry."); + this.widget.saving = false; + return; + } + confirmBoxService.showInformation(res.error); + this.widget.saving = false; + return; + } + $scope.closeThisDialog(true); + this.widget.saving = false; + }); + } + else{ + widgetsCatalogService.updateWidget(this.widget.id, newWidget) + .then(() => { + $scope.closeThisDialog(true); + }); + } + } + else{ + widgetsCatalogService.createWidget(newWidget, this.widget.file).then(res => { + if(!res.valid){ + if(!res.error) + confirmBoxService.showInformation("Could not save. Please retry."); + else + confirmBoxService.showInformation(res.error); + this.widget.saving = false; + return; + } + $scope.closeThisDialog(true); + this.widget.saving = false; + }); + } + }; + init(); + $scope.$on('$stateChangeStart', e => { + e.preventDefault(); + }); + } + } + WidgetOnboardingDetailsModalCtrl.$inject = ['$scope', '$log', '$interval', 'applicationsService', 'adminsService', 'microserviceService', 'widgetsCatalogService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window','userProfileService', 'confirmBoxService', '$cookies']; + angular.module('ecompApp').controller('WidgetOnboardingDetailsModalCtrl', WidgetOnboardingDetailsModalCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.controller.spec.js b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.controller.spec.js index 1762fadb..927836ae 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.controller.spec.js +++ b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.controller.spec.js @@ -1,154 +1,154 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -// 'use strict'; -// describe('Controller: WidgetDetailsModalCtrl', ()=> { -// /** -// * INITIALIZATION -// */ -// beforeEach(module('testUtils')); -// beforeEach(module('ecompApp')); -// -// let promisesTestUtils; -// //destroy $http default cache before starting to prevent the error 'default cache already exists' -// //_promisesTestUtils_ comes from testUtils for promises resolve/reject -// beforeEach(inject((_CacheFactory_, _promisesTestUtils_)=> { -// _CacheFactory_.destroyAll(); -// promisesTestUtils = _promisesTestUtils_; -// })); -// -// let widgetDetails, scope, $controller, $q, $rootScope, $log, widgetsService, errorMessageByCode, ECOMP_URL_REGEX; -// let deferredAdminApps, deferredUserProfile; -// let applicationsServiceMock, widgetsServiceMock, userProfileServiceMock; -// beforeEach(inject((_$controller_, _$q_, _$rootScope_, _$log_)=> { -// [$controller, $q, $rootScope, $log] = [_$controller_, _$q_, _$rootScope_, _$log_]; -// -// deferredAdminApps = $q.defer(); -// deferredUserProfile = $q.defer(); -// /*applicationsServiceMock = { -// getAppsForSuperAdminAndAccountAdmin: () => { -// var promise = () => {return deferredAdminApps.promise}; -// var cancel = jasmine.createSpy(); -// return { -// promise: promise, -// cancel: cancel -// } -// } -// };*/ -// -// widgetsServiceMock = { -// updateWidget: () => { -// var promise = () => {return deferredAdminApps.promise}; -// var cancel = jasmine.createSpy(); -// return { -// promise: promise, -// cancel: cancel -// } -// }, -// createWidget: () => { -// var promise = () => {return deferredAdminApps.promise}; -// var cancel = jasmine.createSpy(); -// return { -// promise: promise, -// cancel: cancel -// } -// } -// }; -// -// userProfileServiceMock = jasmine.createSpyObj('userProfileServiceMock',['getUserProfile']); -// userProfileServiceMock.getUserProfile.and.returnValue(deferredUserProfile.promise); -// -// applicationsServiceMock = jasmine.createSpyObj('applicationsServiceMock',['getAppsForSuperAdminAndAccountAdmin']); -// applicationsServiceMock.getAppsForSuperAdminAndAccountAdmin.and.returnValue(deferredAdminApps.promise); -// -// })); -// -// beforeEach(()=> { -// errorMessageByCode = []; -// ECOMP_URL_REGEX = ""; -// scope = $rootScope.$new(); -// createController(scope); -// }); -// -// let createController = scopeObj => { -// widgetDetails = $controller('WidgetDetailsModalCtrl', { -// $scope: scope, -// $log: $log, -// applicationsService: applicationsServiceMock, -// widgetsService: widgetsServiceMock, -// errorMessageByCode: errorMessageByCode, -// ECOMP_URL_REGEX: ECOMP_URL_REGEX, -// userProfileService: userProfileServiceMock -// }); -// }; -// -// /** -// * MOCK DATA -// */ -// let newWidgetModel = { -// name: null, -// appId: null, -// appName: null, -// width: 360, -// height: 300, -// url: null -// }; -// let exsistingWidget = { -// name: 'some widget', -// appId: 1, -// appName: 'APP NAME', -// width: 360, -// height: 300, -// url: 'http://a.com' -// }; -// let adminApps = [{id: 1, name: 'a'}, {id: 2, name: 'b'}]; -// -// /** -// * TEST CASES -// */ -// it('should initialize controller with new widget mode when opening the modal without selected widget', ()=> { -// expect(widgetDetails.widget).toEqual(newWidgetModel); -// }); -// -// it('should initialize controller with exsisting widget details when opening the modal with selected widget', ()=> { -// scope.ngDialogData = { -// widget: exsistingWidget -// }; -// createController(scope); -// expect(widgetDetails.widget).toEqual(exsistingWidget); -// }); -// -// it('should populate widget selected app name and id when initializing controller with widget', () =>{ -// deferredAdminApps.resolve(adminApps); -// scope.ngDialogData = { -// widget: exsistingWidget -// }; -// createController(scope); -// scope.$apply(); -// expect(widgetDetails.widget.appId).toEqual(adminApps[0].id); -// expect(widgetDetails.widget.appName).toEqual(adminApps[0].name); -// }); -// -// //TODO: -// //save changes fail - conflict handling -// //save changes success -// -// -// -// }); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +// 'use strict'; +// describe('Controller: WidgetDetailsModalCtrl', ()=> { +// /** +// * INITIALIZATION +// */ +// beforeEach(module('testUtils')); +// beforeEach(module('ecompApp')); +// +// let promisesTestUtils; +// //destroy $http default cache before starting to prevent the error 'default cache already exists' +// //_promisesTestUtils_ comes from testUtils for promises resolve/reject +// beforeEach(inject((_CacheFactory_, _promisesTestUtils_)=> { +// _CacheFactory_.destroyAll(); +// promisesTestUtils = _promisesTestUtils_; +// })); +// +// let widgetDetails, scope, $controller, $q, $rootScope, $log, widgetsService, errorMessageByCode, ECOMP_URL_REGEX; +// let deferredAdminApps, deferredUserProfile; +// let applicationsServiceMock, widgetsServiceMock, userProfileServiceMock; +// beforeEach(inject((_$controller_, _$q_, _$rootScope_, _$log_)=> { +// [$controller, $q, $rootScope, $log] = [_$controller_, _$q_, _$rootScope_, _$log_]; +// +// deferredAdminApps = $q.defer(); +// deferredUserProfile = $q.defer(); +// /*applicationsServiceMock = { +// getAppsForSuperAdminAndAccountAdmin: () => { +// var promise = () => {return deferredAdminApps.promise}; +// var cancel = jasmine.createSpy(); +// return { +// promise: promise, +// cancel: cancel +// } +// } +// };*/ +// +// widgetsServiceMock = { +// updateWidget: () => { +// var promise = () => {return deferredAdminApps.promise}; +// var cancel = jasmine.createSpy(); +// return { +// promise: promise, +// cancel: cancel +// } +// }, +// createWidget: () => { +// var promise = () => {return deferredAdminApps.promise}; +// var cancel = jasmine.createSpy(); +// return { +// promise: promise, +// cancel: cancel +// } +// } +// }; +// +// userProfileServiceMock = jasmine.createSpyObj('userProfileServiceMock',['getUserProfile']); +// userProfileServiceMock.getUserProfile.and.returnValue(deferredUserProfile.promise); +// +// applicationsServiceMock = jasmine.createSpyObj('applicationsServiceMock',['getAppsForSuperAdminAndAccountAdmin']); +// applicationsServiceMock.getAppsForSuperAdminAndAccountAdmin.and.returnValue(deferredAdminApps.promise); +// +// })); +// +// beforeEach(()=> { +// errorMessageByCode = []; +// ECOMP_URL_REGEX = ""; +// scope = $rootScope.$new(); +// createController(scope); +// }); +// +// let createController = scopeObj => { +// widgetDetails = $controller('WidgetDetailsModalCtrl', { +// $scope: scope, +// $log: $log, +// applicationsService: applicationsServiceMock, +// widgetsService: widgetsServiceMock, +// errorMessageByCode: errorMessageByCode, +// ECOMP_URL_REGEX: ECOMP_URL_REGEX, +// userProfileService: userProfileServiceMock +// }); +// }; +// +// /** +// * MOCK DATA +// */ +// let newWidgetModel = { +// name: null, +// appId: null, +// appName: null, +// width: 360, +// height: 300, +// url: null +// }; +// let exsistingWidget = { +// name: 'some widget', +// appId: 1, +// appName: 'APP NAME', +// width: 360, +// height: 300, +// url: 'http://a.com' +// }; +// let adminApps = [{id: 1, name: 'a'}, {id: 2, name: 'b'}]; +// +// /** +// * TEST CASES +// */ +// it('should initialize controller with new widget mode when opening the modal without selected widget', ()=> { +// expect(widgetDetails.widget).toEqual(newWidgetModel); +// }); +// +// it('should initialize controller with exsisting widget details when opening the modal with selected widget', ()=> { +// scope.ngDialogData = { +// widget: exsistingWidget +// }; +// createController(scope); +// expect(widgetDetails.widget).toEqual(exsistingWidget); +// }); +// +// it('should populate widget selected app name and id when initializing controller with widget', () =>{ +// deferredAdminApps.resolve(adminApps); +// scope.ngDialogData = { +// widget: exsistingWidget +// }; +// createController(scope); +// scope.$apply(); +// expect(widgetDetails.widget.appId).toEqual(adminApps[0].id); +// expect(widgetDetails.widget.appName).toEqual(adminApps[0].name); +// }); +// +// //TODO: +// //save changes fail - conflict handling +// //save changes success +// +// +// +// }); diff --git a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.modal.html b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.modal.html index 2fa56443..9e1c1696 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.modal.html +++ b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-details-dialog/widget-details.modal.html @@ -1,156 +1,156 @@ - -
-
Widget Details
- -
-
- -
-
Widget Name
- - -
-
Name - not available - choose different name
-
- -
-
- Widget Name is - required Widget Name must - be letters, numbers, or underscore -
-
-
- - -
-
Widget Description
- -
- -
- -
Allow all user - access
-
- - -
-
Service Endpoint
-
- -
-
- -
-
Application Name
-
- -
-
-
Please - select at least one Application
-
-
- -
-
User Role Name
-
-
-
{{appRoles.name}}
-
- -
-
Please select at least one role
-
-
-
-
-
- -
-
Upload Widget
-
- - - -
-
Please upload your widget (.zip)
-
-
-
-
-
- -
- - - - -
- - - -
+ +
+
Widget Details
+ +
+
+ +
+
Widget Name
+ + +
+
Name + not available - choose different name
+
+ +
+
+ Widget Name is + required Widget Name must + be letters, numbers, space, dash or underscore +
+
+
+ + +
+
Widget Description
+ +
+ +
+
Service Endpoint
+
+ +
+
+ +
+ +
Allow all user + access
+
+ +
+
Application Name
+
+ +
+
+
Please + select at least one Application
+
+
+ +
+
User Role Name
+
+
+
{{appRoles.name}}
+
+ +
+
Please select at least one role
+
+
+
+
+
+ +
+
Upload Widget
+
+ + + +
+
Please upload your widget (.zip)
+
+
+
+
+
+ +
+ + + + +
+ + + +
diff --git a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.js b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.js index a9e5c416..661c63a3 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.js +++ b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.js @@ -1,204 +1,204 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; -(function () { - class WidgetOnboardingCtrl { - constructor($log, applicationsService, widgetsCatalogService, ngDialog, confirmBoxService, - userProfileService, $cookies, $scope) { - $scope.infoMessage = true; - - let populateAvailableApps = widgets => { - let allPortalsFilterObject = {index: 0, title: 'All applications', value: ''}; - this.availableApps = [allPortalsFilterObject]; - this.filterByApp = this.availableApps[0]; - applicationsService.getAppsForSuperAdminAndAccountAdmin().then(myApps => { - var reSortedApp = myApps.sort(getSortOrder("name")); - var realAppIndex = 1; - for (let i = 1; i <= reSortedApp.length; i++) { - if (!reSortedApp[i-1].restrictedApp) { - this.availableApps.push({ - index: realAppIndex, - title: reSortedApp[i - 1].name, - value: reSortedApp[i - 1].name - }) - realAppIndex = realAppIndex + 1; - } - } - }).catch(err => { - $log.error('WidgetOnboardingCtrl:getAppsForSuperAdmin failed', err); - }); - }; - - let getOnboardingWidgets = () => { - this.isLoadingTable = true; - this.isCommError = false; - widgetsCatalogService.getManagedWidgets().then(res => { - if(!(res instanceof Array)){ - this.isCommError = true; - return; - } - - var reSortedWidget = res.sort(getSortOrder("name")); - $scope.widgetsList = reSortedWidget; - for(var i = 0; i < $scope.widgetsList.length; i++){ - let set = new Set(); - var info = ""; - var appContent = []; - var appName = []; - for(var n = 0; n < $scope.widgetsList[i].widgetRoles.length; n++){ - set.add($scope.widgetsList[i].widgetRoles[n].app.appName); - } - if($scope.widgetsList[i].allowAllUser == "Y"){ - info = "All Applications"; - appContent.push("All Applications"); - appName.push("All Applications"); - } - - set.forEach(function (item) { - info = item.toString() + " - "; - for(var n = 0; n < $scope.widgetsList[i].widgetRoles.length; n++){ - if(item.toString() == $scope.widgetsList[i].widgetRoles[n].app.appName){ - info += $scope.widgetsList[i].widgetRoles[n].roleName + "; "; - } - } - appContent.push(info); - appName.push(item.toString()); - }); - $scope.widgetsList[i].appContent = appContent; - $scope.widgetsList[i].appName = appName; - } - populateAvailableApps(reSortedWidget); - }).catch(err => { - // Land here when the micro service is down - $log.error('WidgetOnboardingCtrl::getOnboardingWidgets caught error', err); - }).finally(()=> { - this.isLoadingTable = false; - }); - - }; - - - // Refactor this into a directive - let getSortOrder = (prop) => { - return function(a, b) { - if (a[prop].toLowerCase() > b[prop].toLowerCase()) { - return 1; - } else if (a[prop].toLowerCase() < b[prop].toLowerCase()) { - return -1; - } - return 0; - } - } - - $scope.hideMe = function () { - $scope.infoMessage = false; - } - - let init = () => { - this.isLoadingTable = false; - getOnboardingWidgets(); - this.searchString = ''; - this.widgetsTableHeaders = [ - {name: 'Widget Name', value: 'name', isSortable: false} - ]; - $scope.widgetsList = []; - }; - - this.filterByDropdownValue = item => { - if(this.filterByApp.value === '') - return true; - - for(var i = 0; i < item.appName.length; i++){ - if(item.appName[i] == this.filterByApp.value - || item.appName[i] == 'All Applications'){ - return true; - } - } - return false; - }; - - this.openWidgetCatalogDetailsModal = (selectedWidget) => { - let data = null; - if(selectedWidget){ - if(!selectedWidget.id){ - $log.error('WidgetOnboardingCtrl:openWidgetCatalogDetailModal: widget id not found'); - return; - } - data = { - widget: selectedWidget - } - } - ngDialog.open({ - templateUrl: 'app/views/widget-onboarding/widget-details-dialog/widget-details.modal.html', - controller: 'WidgetOnboardingDetailsModalCtrl', - controllerAs: 'widgetOnboardingDetails', - data: data - }).closePromise.then(needUpdate => { - if(needUpdate.value === true){ - getOnboardingWidgets(); - } - }); - }; - - this.deleteWidget = widget => { - - confirmBoxService.deleteItem(widget.name).then(isConfirmed => { - if(isConfirmed){ - if(!widget || !widget.id){ - $log.error('WidgetOnboardingCtrl::deleteWidget: No widget or ID... cannot delete'); - return; - } - widgetsCatalogService.deleteWidget(widget.id).then(() => { - $scope.widgetsList.splice($scope.widgetsList.indexOf(widget), 1); - }).catch(err => { - $log.error('WidgetOnboardingCtrl::deleteWidget error:',err); - }); - } - }).catch(err => { - $log.error('WidgetOnboardingCtrl::deleteWidget error:',err); - }); - - }; - - - this.downloadWidget = widget => { - widgetsCatalogService.downloadWidgetFile(widget.id).then(res => { - var data = res; - var filename = widget.name + ".zip"; - - if (data == undefined || data == null){ - confirmBoxService.showInformation("Could not download. Please retry."); - return; - } - var a = document.createElement('a'); - var blob = new Blob([data], {type: 'application/octet-stream'}); - a.href = URL.createObjectURL(blob); - a.download = filename; - a.click(); - }); - }; - - init(); - } - } - WidgetOnboardingCtrl.$inject = ['$log', 'applicationsService', 'widgetsCatalogService', 'ngDialog', 'confirmBoxService', - 'userProfileService','$cookies', '$scope']; - angular.module('ecompApp').controller('WidgetOnboardingCtrl', WidgetOnboardingCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; +(function () { + class WidgetOnboardingCtrl { + constructor($log, applicationsService, widgetsCatalogService, ngDialog, confirmBoxService, + userProfileService, $cookies, $scope) { + $scope.infoMessage = true; + + let populateAvailableApps = widgets => { + let allPortalsFilterObject = {index: 0, title: 'All applications', value: ''}; + this.availableApps = [allPortalsFilterObject]; + this.filterByApp = this.availableApps[0]; + applicationsService.getAppsForSuperAdminAndAccountAdmin().then(myApps => { + var reSortedApp = myApps.sort(getSortOrder("name")); + var realAppIndex = 1; + for (let i = 1; i <= reSortedApp.length; i++) { + if (!reSortedApp[i-1].restrictedApp) { + this.availableApps.push({ + index: realAppIndex, + title: reSortedApp[i - 1].name, + value: reSortedApp[i - 1].name + }) + realAppIndex = realAppIndex + 1; + } + } + }).catch(err => { + $log.error('WidgetOnboardingCtrl:getAppsForSuperAdmin failed', err); + }); + }; + + let getOnboardingWidgets = () => { + this.isLoadingTable = true; + this.isCommError = false; + widgetsCatalogService.getManagedWidgets().then(res => { + if(!(res instanceof Array)){ + this.isCommError = true; + return; + } + + var reSortedWidget = res.sort(getSortOrder("name")); + $scope.widgetsList = reSortedWidget; + for(var i = 0; i < $scope.widgetsList.length; i++){ + let set = new Set(); + var info = ""; + var appContent = []; + var appName = []; + for(var n = 0; n < $scope.widgetsList[i].widgetRoles.length; n++){ + set.add($scope.widgetsList[i].widgetRoles[n].app.appName); + } + if($scope.widgetsList[i].allowAllUser == "Y"){ + info = "All Applications"; + appContent.push("All Applications"); + appName.push("All Applications"); + } + + set.forEach(function (item) { + info = item.toString() + " - "; + for(var n = 0; n < $scope.widgetsList[i].widgetRoles.length; n++){ + if(item.toString() == $scope.widgetsList[i].widgetRoles[n].app.appName){ + info += $scope.widgetsList[i].widgetRoles[n].roleName + "; "; + } + } + appContent.push(info); + appName.push(item.toString()); + }); + $scope.widgetsList[i].appContent = appContent; + $scope.widgetsList[i].appName = appName; + } + populateAvailableApps(reSortedWidget); + }).catch(err => { + // Land here when the micro service is down + $log.error('WidgetOnboardingCtrl::getOnboardingWidgets caught error', err); + }).finally(()=> { + this.isLoadingTable = false; + }); + + }; + + + // Refactor this into a directive + let getSortOrder = (prop) => { + return function(a, b) { + if (a[prop].toLowerCase() > b[prop].toLowerCase()) { + return 1; + } else if (a[prop].toLowerCase() < b[prop].toLowerCase()) { + return -1; + } + return 0; + } + } + + $scope.hideMe = function () { + $scope.infoMessage = false; + } + + let init = () => { + this.isLoadingTable = false; + getOnboardingWidgets(); + this.searchString = ''; + this.widgetsTableHeaders = [ + {name: 'Widget Name', value: 'name', isSortable: false} + ]; + $scope.widgetsList = []; + }; + + this.filterByDropdownValue = item => { + if(this.filterByApp.value === '') + return true; + + for(var i = 0; i < item.appName.length; i++){ + if(item.appName[i] == this.filterByApp.value + || item.appName[i] == 'All Applications'){ + return true; + } + } + return false; + }; + + this.openWidgetCatalogDetailsModal = (selectedWidget) => { + let data = null; + if(selectedWidget){ + if(!selectedWidget.id){ + $log.error('WidgetOnboardingCtrl:openWidgetCatalogDetailModal: widget id not found'); + return; + } + data = { + widget: selectedWidget + } + } + ngDialog.open({ + templateUrl: 'app/views/widget-onboarding/widget-details-dialog/widget-details.modal.html', + controller: 'WidgetOnboardingDetailsModalCtrl', + controllerAs: 'widgetOnboardingDetails', + data: data + }).closePromise.then(needUpdate => { + if(needUpdate.value === true){ + getOnboardingWidgets(); + } + }); + }; + + this.deleteWidget = widget => { + + confirmBoxService.deleteItem(widget.name).then(isConfirmed => { + if(isConfirmed){ + if(!widget || !widget.id){ + $log.error('WidgetOnboardingCtrl::deleteWidget: No widget or ID... cannot delete'); + return; + } + widgetsCatalogService.deleteWidget(widget.id).then(() => { + $scope.widgetsList.splice($scope.widgetsList.indexOf(widget), 1); + }).catch(err => { + $log.error('WidgetOnboardingCtrl::deleteWidget error:',err); + }); + } + }).catch(err => { + $log.error('WidgetOnboardingCtrl::deleteWidget error:',err); + }); + + }; + + + this.downloadWidget = widget => { + widgetsCatalogService.downloadWidgetFile(widget.id).then(res => { + var data = res; + var filename = widget.name + ".zip"; + + if (data == undefined || data == null){ + confirmBoxService.showInformation("Could not download. Please retry."); + return; + } + var a = document.createElement('a'); + var blob = new Blob([data], {type: 'application/octet-stream'}); + a.href = URL.createObjectURL(blob); + a.download = filename; + a.click(); + }); + }; + + init(); + } + } + WidgetOnboardingCtrl.$inject = ['$log', 'applicationsService', 'widgetsCatalogService', 'ngDialog', 'confirmBoxService', + 'userProfileService','$cookies', '$scope']; + angular.module('ecompApp').controller('WidgetOnboardingCtrl', WidgetOnboardingCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.spec.js b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.spec.js index 77659d93..5c42f4ce 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.spec.js +++ b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.controller.spec.js @@ -1,20 +1,20 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ - +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ + diff --git a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.less b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.less index f832b8f9..6085a908 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.less +++ b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.less @@ -24,9 +24,15 @@ font-style: italic; .ico_trash_default; } .c-ecomp-abs-select{ + height: 25px; width: 440px; display: inline-block; margin-right: 10px; } +#widget-onboarding-button-add +{ +margin-bottom: 8px; +} + } diff --git a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.tpl.html b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.tpl.html index 808deb8c..aae0fd7c 100644 --- a/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/widget-onboarding/widget-onboarding.tpl.html @@ -1,113 +1,115 @@ - -
-
-
-
-

Widget Onboarding

-
-
-
-
-
- -
-
- - - - -
Failed to communicate - with the widget microservice.
- -
-
- - - - - - - - - - - - - - - - - - - - - - -
{{header.name}}ApplicationDownloadDelete
-
- 		-
-
-
- 		-
- 		-
-
-
-
-
-
-
-
-
-
+ +
+
+
+
+

Widget Onboarding

+
+
+
+
+
+ +
+
+ + + + +
Failed to communicate + with the widget microservice.
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
{{header.name}}ApplicationDownloadDelete
+
+ 		+
+
+
+ 		+
+ 		+
+
+
+
+
+
+
+
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.controller.js b/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.controller.js index eb628b4f..a7c29043 100644 --- a/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.controller.js +++ b/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.controller.js @@ -1,226 +1,226 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -/** - * Created by nnaffar on 12/20/15. - */ -'use strict'; -(function () { - class WidgetDetailsModalCtrl { - constructor($scope, $log, applicationsService, widgetsService, errorMessageByCode, - ECOMP_URL_REGEX, $window, userProfileService, $cookies, $rootScope) { - - let newWidgetModel = { - name: null, - appId: null, - appName: null, - width: 360, - height: 300, - url: null - }; - - let getAvailableApps = () => { - applicationsService.getAppsForSuperAdminAndAccountAdmin().then(apps => { - this.availableApps=[]; - for(var i=0;i { - confirmBoxService.showInformation('There was a problem retrieving the Widgets. ' + - 'Please try again later.').then(isConfirmed => {}); - $log.error('WidgetDetailsModalCtrl::getAvailableApps error: '+ err); - }); - }; - /**/ - - let init = () => { - this.isSaving = false; - if ($scope.ngDialogData && $scope.ngDialogData.widget) { - $log.debug('WidgetDetailsModalCtrl::getAvailableApps: Edit widget mode for', $scope.ngDialogData.widget); - this.isEditMode = true; - this.widget = _.clone($scope.ngDialogData.widget); - } else { - $log.debug('WidgetDetailsModalCtrl::init: New app mode'); - this.isEditMode = false; - this.widget = _.clone(newWidgetModel); - } - getAvailableApps(); - }; - - this.ECOMP_URL_REGEX = ECOMP_URL_REGEX; - - //This part handles conflict errors (409) - this.conflictMessages = {}; - this.scrollApi = {}; - let handleConflictErrors = err => { - if(!err.data){ - return; - } - if(!err.data.length){ //support objects - err.data = [err.data] - } - _.forEach(err.data, item => { - _.forEach(item.fields, field => { - //set conflict message - this.conflictMessages[field.name] = errorMessageByCode[item.errorCode]; - //set field as invalid - $scope.widgetForm[field.name].$setValidity('conflict', false); - //set watch once to clear error after user correction - watchOnce[field.name](); - }); - }); - this.scrollApi.scrollTop(); - }; - - let resetConflict = fieldName => { - delete this.conflictMessages[fieldName]; - if($scope.widgetForm[fieldName]){ - $scope.widgetForm[fieldName].$setValidity('conflict', true); - } - }; - - let watchOnce = { - name: () => { - let unregisterName = $scope.$watchGroup(['widgetDetails.selectedApp','widgetDetails.widget.name'], (newVal, oldVal) => { - if(newVal.toLowerCase() !== oldVal.toLowerCase()){ - resetConflict('name'); - unregisterName(); - } - }); - }, - url: () => { - let unregisterUrl = $scope.$watch('widgetDetails.widget.url', (newVal, oldVal) => { - if(newVal.toLowerCase() !== oldVal.toLowerCase()) { - resetConflict('url'); - unregisterUrl(); - } - }); - } - }; - //*************************** - - this.updateSelectedApp = () => { - if (!this.selectedApp) { - return; - } - this.widget.appId = this.selectedApp.id; - this.widget.appName = this.selectedApp.name; - }; - - let emptyCookies = () => { - userProfileService.getUserProfile() - .then(profile=> { - $scope.orgUserId = profile.orgUserId; - if ($cookies.getObject($scope.orgUserId + '_widget') != undefined && $cookies.getObject($scope.orgUserId + '_widget') != null) { - $cookies.remove($scope.orgUserId + '_widget'); - } - }).catch(err => { - $log.error('WidgetDetailsModalCtrl::emptyCookies: There was a problem emptying the cookies! No user error presented though.'); - }); - }; - - this.saveChanges = () => { - if($scope.widgetForm.$invalid){ - return; - } - this.isSaving = true; - if(this.isEditMode){ - widgetsService.updateWidget(this.widget.id, this.widget) - .then(() => { - $log.debug('WidgetDetailsModalCtrl::saveChanges: Widget update succeeded!'); - $scope.closeThisDialog(true); - emptyCookies(); - }).catch(err => { - if(err.status === 409){//Conflict - handleConflictErrors(err); - } else { - confirmBoxService.showInformation('There was a problem saving the Widget. ' + - 'Please try again later. Error Status: ' + err.status).then(isConfirmed => {}); - } - $log.error('WidgetDetailsModalCtrl::saveChanges error: ', err); - }).finally(()=>{ - this.isSaving = false; - // for bug in IE 11 - var objOffsetVersion = objAgent.indexOf("MSIE"); - if (objOffsetVersion != -1) { - $log.debug('WidgetDetailsModalCtrl::saveChanges: Browser is IE, forcing Refresh'); - $window.location.reload(); // for bug in IE 11 - } - // for bug in IE 11 - }); - } else { - widgetsService.createWidget(this.widget) - .then(() => { - $log.debug('WidgetDetailsModalCtrl::createWidget: Widget creation succeeded!'); - $scope.closeThisDialog(true); - emptyCookies(); - $rootScope.noWidgets = false; - }).catch(err => { - if(err.status === 409){//Conflict - handleConflictErrors(err); - } else { - confirmBoxService.showInformation('There was a problem creating the Widget. ' + - 'Please try again later. Error Status: ' + err.status).then(isConfirmed => {}); - } - $log.error('WidgetDetailsModalCtrl::createWidget error: ',err); - }).finally(()=>{ - this.isSaving = false; - // for bug in IE 11 - var objOffsetVersion = objAgent.indexOf("MSIE"); - if (objOffsetVersion != -1) { - $log.debug('WidgetDetailsModalCtrl::createWidget: Browser is IE, forcing Refresh'); - $window.location.reload(); // for bug in IE 11 - } - // for bug in IE 11 - }); - } - }; - - init(); - - $scope.$on('$stateChangeStart', e => { - //Disable navigation when modal is opened - e.preventDefault(); - }); - } - } - WidgetDetailsModalCtrl.$inject = ['$scope', '$log', 'applicationsService', 'widgetsService', 'errorMessageByCode', - 'ECOMP_URL_REGEX', '$window','userProfileService','$cookies', '$rootScope']; - angular.module('ecompApp').controller('WidgetDetailsModalCtrl', WidgetDetailsModalCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +/** + * Created by nnaffar on 12/20/15. + */ +'use strict'; +(function () { + class WidgetDetailsModalCtrl { + constructor($scope, $log, applicationsService, widgetsService, errorMessageByCode, + ECOMP_URL_REGEX, $window, userProfileService, $cookies, $rootScope) { + + let newWidgetModel = { + name: null, + appId: null, + appName: null, + width: 360, + height: 300, + url: null + }; + + let getAvailableApps = () => { + applicationsService.getAppsForSuperAdminAndAccountAdmin().then(apps => { + this.availableApps=[]; + for(var i=0;i { + confirmBoxService.showInformation('There was a problem retrieving the Widgets. ' + + 'Please try again later.').then(isConfirmed => {}); + $log.error('WidgetDetailsModalCtrl::getAvailableApps error: '+ err); + }); + }; + /**/ + + let init = () => { + this.isSaving = false; + if ($scope.ngDialogData && $scope.ngDialogData.widget) { + $log.debug('WidgetDetailsModalCtrl::getAvailableApps: Edit widget mode for', $scope.ngDialogData.widget); + this.isEditMode = true; + this.widget = _.clone($scope.ngDialogData.widget); + } else { + $log.debug('WidgetDetailsModalCtrl::init: New app mode'); + this.isEditMode = false; + this.widget = _.clone(newWidgetModel); + } + getAvailableApps(); + }; + + this.ECOMP_URL_REGEX = ECOMP_URL_REGEX; + + //This part handles conflict errors (409) + this.conflictMessages = {}; + this.scrollApi = {}; + let handleConflictErrors = err => { + if(!err.data){ + return; + } + if(!err.data.length){ //support objects + err.data = [err.data] + } + _.forEach(err.data, item => { + _.forEach(item.fields, field => { + //set conflict message + this.conflictMessages[field.name] = errorMessageByCode[item.errorCode]; + //set field as invalid + $scope.widgetForm[field.name].$setValidity('conflict', false); + //set watch once to clear error after user correction + watchOnce[field.name](); + }); + }); + this.scrollApi.scrollTop(); + }; + + let resetConflict = fieldName => { + delete this.conflictMessages[fieldName]; + if($scope.widgetForm[fieldName]){ + $scope.widgetForm[fieldName].$setValidity('conflict', true); + } + }; + + let watchOnce = { + name: () => { + let unregisterName = $scope.$watchGroup(['widgetDetails.selectedApp','widgetDetails.widget.name'], (newVal, oldVal) => { + if(newVal.toLowerCase() !== oldVal.toLowerCase()){ + resetConflict('name'); + unregisterName(); + } + }); + }, + url: () => { + let unregisterUrl = $scope.$watch('widgetDetails.widget.url', (newVal, oldVal) => { + if(newVal.toLowerCase() !== oldVal.toLowerCase()) { + resetConflict('url'); + unregisterUrl(); + } + }); + } + }; + //*************************** + + this.updateSelectedApp = () => { + if (!this.selectedApp) { + return; + } + this.widget.appId = this.selectedApp.id; + this.widget.appName = this.selectedApp.name; + }; + + let emptyCookies = () => { + userProfileService.getUserProfile() + .then(profile=> { + $scope.orgUserId = profile.orgUserId; + if ($cookies.getObject($scope.orgUserId + '_widget') != undefined && $cookies.getObject($scope.orgUserId + '_widget') != null) { + $cookies.remove($scope.orgUserId + '_widget'); + } + }).catch(err => { + $log.error('WidgetDetailsModalCtrl::emptyCookies: There was a problem emptying the cookies! No user error presented though.'); + }); + }; + + this.saveChanges = () => { + if($scope.widgetForm.$invalid){ + return; + } + this.isSaving = true; + if(this.isEditMode){ + widgetsService.updateWidget(this.widget.id, this.widget) + .then(() => { + $log.debug('WidgetDetailsModalCtrl::saveChanges: Widget update succeeded!'); + $scope.closeThisDialog(true); + emptyCookies(); + }).catch(err => { + if(err.status === 409){//Conflict + handleConflictErrors(err); + } else { + confirmBoxService.showInformation('There was a problem saving the Widget. ' + + 'Please try again later. Error Status: ' + err.status).then(isConfirmed => {}); + } + $log.error('WidgetDetailsModalCtrl::saveChanges error: ', err); + }).finally(()=>{ + this.isSaving = false; + // for bug in IE 11 + var objOffsetVersion = objAgent.indexOf("MSIE"); + if (objOffsetVersion != -1) { + $log.debug('WidgetDetailsModalCtrl::saveChanges: Browser is IE, forcing Refresh'); + $window.location.reload(); // for bug in IE 11 + } + // for bug in IE 11 + }); + } else { + widgetsService.createWidget(this.widget) + .then(() => { + $log.debug('WidgetDetailsModalCtrl::createWidget: Widget creation succeeded!'); + $scope.closeThisDialog(true); + emptyCookies(); + $rootScope.noWidgets = false; + }).catch(err => { + if(err.status === 409){//Conflict + handleConflictErrors(err); + } else { + confirmBoxService.showInformation('There was a problem creating the Widget. ' + + 'Please try again later. Error Status: ' + err.status).then(isConfirmed => {}); + } + $log.error('WidgetDetailsModalCtrl::createWidget error: ',err); + }).finally(()=>{ + this.isSaving = false; + // for bug in IE 11 + var objOffsetVersion = objAgent.indexOf("MSIE"); + if (objOffsetVersion != -1) { + $log.debug('WidgetDetailsModalCtrl::createWidget: Browser is IE, forcing Refresh'); + $window.location.reload(); // for bug in IE 11 + } + // for bug in IE 11 + }); + } + }; + + init(); + + $scope.$on('$stateChangeStart', e => { + //Disable navigation when modal is opened + e.preventDefault(); + }); + } + } + WidgetDetailsModalCtrl.$inject = ['$scope', '$log', 'applicationsService', 'widgetsService', 'errorMessageByCode', + 'ECOMP_URL_REGEX', '$window','userProfileService','$cookies', '$rootScope']; + angular.module('ecompApp').controller('WidgetDetailsModalCtrl', WidgetDetailsModalCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.controller.spec.js b/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.controller.spec.js index 1762fadb..927836ae 100644 --- a/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.controller.spec.js +++ b/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.controller.spec.js @@ -1,154 +1,154 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -// 'use strict'; -// describe('Controller: WidgetDetailsModalCtrl', ()=> { -// /** -// * INITIALIZATION -// */ -// beforeEach(module('testUtils')); -// beforeEach(module('ecompApp')); -// -// let promisesTestUtils; -// //destroy $http default cache before starting to prevent the error 'default cache already exists' -// //_promisesTestUtils_ comes from testUtils for promises resolve/reject -// beforeEach(inject((_CacheFactory_, _promisesTestUtils_)=> { -// _CacheFactory_.destroyAll(); -// promisesTestUtils = _promisesTestUtils_; -// })); -// -// let widgetDetails, scope, $controller, $q, $rootScope, $log, widgetsService, errorMessageByCode, ECOMP_URL_REGEX; -// let deferredAdminApps, deferredUserProfile; -// let applicationsServiceMock, widgetsServiceMock, userProfileServiceMock; -// beforeEach(inject((_$controller_, _$q_, _$rootScope_, _$log_)=> { -// [$controller, $q, $rootScope, $log] = [_$controller_, _$q_, _$rootScope_, _$log_]; -// -// deferredAdminApps = $q.defer(); -// deferredUserProfile = $q.defer(); -// /*applicationsServiceMock = { -// getAppsForSuperAdminAndAccountAdmin: () => { -// var promise = () => {return deferredAdminApps.promise}; -// var cancel = jasmine.createSpy(); -// return { -// promise: promise, -// cancel: cancel -// } -// } -// };*/ -// -// widgetsServiceMock = { -// updateWidget: () => { -// var promise = () => {return deferredAdminApps.promise}; -// var cancel = jasmine.createSpy(); -// return { -// promise: promise, -// cancel: cancel -// } -// }, -// createWidget: () => { -// var promise = () => {return deferredAdminApps.promise}; -// var cancel = jasmine.createSpy(); -// return { -// promise: promise, -// cancel: cancel -// } -// } -// }; -// -// userProfileServiceMock = jasmine.createSpyObj('userProfileServiceMock',['getUserProfile']); -// userProfileServiceMock.getUserProfile.and.returnValue(deferredUserProfile.promise); -// -// applicationsServiceMock = jasmine.createSpyObj('applicationsServiceMock',['getAppsForSuperAdminAndAccountAdmin']); -// applicationsServiceMock.getAppsForSuperAdminAndAccountAdmin.and.returnValue(deferredAdminApps.promise); -// -// })); -// -// beforeEach(()=> { -// errorMessageByCode = []; -// ECOMP_URL_REGEX = ""; -// scope = $rootScope.$new(); -// createController(scope); -// }); -// -// let createController = scopeObj => { -// widgetDetails = $controller('WidgetDetailsModalCtrl', { -// $scope: scope, -// $log: $log, -// applicationsService: applicationsServiceMock, -// widgetsService: widgetsServiceMock, -// errorMessageByCode: errorMessageByCode, -// ECOMP_URL_REGEX: ECOMP_URL_REGEX, -// userProfileService: userProfileServiceMock -// }); -// }; -// -// /** -// * MOCK DATA -// */ -// let newWidgetModel = { -// name: null, -// appId: null, -// appName: null, -// width: 360, -// height: 300, -// url: null -// }; -// let exsistingWidget = { -// name: 'some widget', -// appId: 1, -// appName: 'APP NAME', -// width: 360, -// height: 300, -// url: 'http://a.com' -// }; -// let adminApps = [{id: 1, name: 'a'}, {id: 2, name: 'b'}]; -// -// /** -// * TEST CASES -// */ -// it('should initialize controller with new widget mode when opening the modal without selected widget', ()=> { -// expect(widgetDetails.widget).toEqual(newWidgetModel); -// }); -// -// it('should initialize controller with exsisting widget details when opening the modal with selected widget', ()=> { -// scope.ngDialogData = { -// widget: exsistingWidget -// }; -// createController(scope); -// expect(widgetDetails.widget).toEqual(exsistingWidget); -// }); -// -// it('should populate widget selected app name and id when initializing controller with widget', () =>{ -// deferredAdminApps.resolve(adminApps); -// scope.ngDialogData = { -// widget: exsistingWidget -// }; -// createController(scope); -// scope.$apply(); -// expect(widgetDetails.widget.appId).toEqual(adminApps[0].id); -// expect(widgetDetails.widget.appName).toEqual(adminApps[0].name); -// }); -// -// //TODO: -// //save changes fail - conflict handling -// //save changes success -// -// -// -// }); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +// 'use strict'; +// describe('Controller: WidgetDetailsModalCtrl', ()=> { +// /** +// * INITIALIZATION +// */ +// beforeEach(module('testUtils')); +// beforeEach(module('ecompApp')); +// +// let promisesTestUtils; +// //destroy $http default cache before starting to prevent the error 'default cache already exists' +// //_promisesTestUtils_ comes from testUtils for promises resolve/reject +// beforeEach(inject((_CacheFactory_, _promisesTestUtils_)=> { +// _CacheFactory_.destroyAll(); +// promisesTestUtils = _promisesTestUtils_; +// })); +// +// let widgetDetails, scope, $controller, $q, $rootScope, $log, widgetsService, errorMessageByCode, ECOMP_URL_REGEX; +// let deferredAdminApps, deferredUserProfile; +// let applicationsServiceMock, widgetsServiceMock, userProfileServiceMock; +// beforeEach(inject((_$controller_, _$q_, _$rootScope_, _$log_)=> { +// [$controller, $q, $rootScope, $log] = [_$controller_, _$q_, _$rootScope_, _$log_]; +// +// deferredAdminApps = $q.defer(); +// deferredUserProfile = $q.defer(); +// /*applicationsServiceMock = { +// getAppsForSuperAdminAndAccountAdmin: () => { +// var promise = () => {return deferredAdminApps.promise}; +// var cancel = jasmine.createSpy(); +// return { +// promise: promise, +// cancel: cancel +// } +// } +// };*/ +// +// widgetsServiceMock = { +// updateWidget: () => { +// var promise = () => {return deferredAdminApps.promise}; +// var cancel = jasmine.createSpy(); +// return { +// promise: promise, +// cancel: cancel +// } +// }, +// createWidget: () => { +// var promise = () => {return deferredAdminApps.promise}; +// var cancel = jasmine.createSpy(); +// return { +// promise: promise, +// cancel: cancel +// } +// } +// }; +// +// userProfileServiceMock = jasmine.createSpyObj('userProfileServiceMock',['getUserProfile']); +// userProfileServiceMock.getUserProfile.and.returnValue(deferredUserProfile.promise); +// +// applicationsServiceMock = jasmine.createSpyObj('applicationsServiceMock',['getAppsForSuperAdminAndAccountAdmin']); +// applicationsServiceMock.getAppsForSuperAdminAndAccountAdmin.and.returnValue(deferredAdminApps.promise); +// +// })); +// +// beforeEach(()=> { +// errorMessageByCode = []; +// ECOMP_URL_REGEX = ""; +// scope = $rootScope.$new(); +// createController(scope); +// }); +// +// let createController = scopeObj => { +// widgetDetails = $controller('WidgetDetailsModalCtrl', { +// $scope: scope, +// $log: $log, +// applicationsService: applicationsServiceMock, +// widgetsService: widgetsServiceMock, +// errorMessageByCode: errorMessageByCode, +// ECOMP_URL_REGEX: ECOMP_URL_REGEX, +// userProfileService: userProfileServiceMock +// }); +// }; +// +// /** +// * MOCK DATA +// */ +// let newWidgetModel = { +// name: null, +// appId: null, +// appName: null, +// width: 360, +// height: 300, +// url: null +// }; +// let exsistingWidget = { +// name: 'some widget', +// appId: 1, +// appName: 'APP NAME', +// width: 360, +// height: 300, +// url: 'http://a.com' +// }; +// let adminApps = [{id: 1, name: 'a'}, {id: 2, name: 'b'}]; +// +// /** +// * TEST CASES +// */ +// it('should initialize controller with new widget mode when opening the modal without selected widget', ()=> { +// expect(widgetDetails.widget).toEqual(newWidgetModel); +// }); +// +// it('should initialize controller with exsisting widget details when opening the modal with selected widget', ()=> { +// scope.ngDialogData = { +// widget: exsistingWidget +// }; +// createController(scope); +// expect(widgetDetails.widget).toEqual(exsistingWidget); +// }); +// +// it('should populate widget selected app name and id when initializing controller with widget', () =>{ +// deferredAdminApps.resolve(adminApps); +// scope.ngDialogData = { +// widget: exsistingWidget +// }; +// createController(scope); +// scope.$apply(); +// expect(widgetDetails.widget.appId).toEqual(adminApps[0].id); +// expect(widgetDetails.widget.appName).toEqual(adminApps[0].name); +// }); +// +// //TODO: +// //save changes fail - conflict handling +// //save changes success +// +// +// +// }); diff --git a/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.modal.html b/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.modal.html index 46a5b1c7..0f77ef63 100644 --- a/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.modal.html +++ b/ecomp-portal-FE-common/client/app/views/widgets/widget-details-dialog/widget-details.modal.html @@ -1,152 +1,152 @@ - -
-
Widget Details
- -
-
- - -
-
Application Name
-
- -
-
-
- Application is required -
-
-
-
-
Widget Name
- - -
- -
-
-
- Widget Name is required - Widget Name must be letters, numbers, or underscore -
-
-
-
-
-
Width
- - -
-
- Widget width is required - Minimum width is 300 -
-
-
-
-
Height
- - -
-
- Widget height is required - Minimum height is 200 -
-
-
-
-
-
URL
- - - - -
- -
-
-
- Widget URL is required - Incorrect URL pattern -
- -
- -
-
-
-
- -
Save
-
Cancel
-
-
+ +
+
Widget Details
+ +
+
+ + +
+
Application Name
+
+ +
+
+
+ Application is required +
+
+
+
+
Widget Name
+ + +
+ +
+
+
+ Widget Name is required + Widget Name must be letters, numbers, or underscore +
+
+
+
+
+
Width
+ + +
+
+ Widget width is required + Minimum width is 300 +
+
+
+
+
Height
+ + +
+
+ Widget height is required + Minimum height is 200 +
+
+
+
+
+
URL
+ + + + +
+ +
+
+
+ Widget URL is required + Incorrect URL pattern +
+ +
+ +
+
+
+
+ +
Save
+
Cancel
+
+
diff --git a/ecomp-portal-FE-common/client/app/views/widgets/widgets.controller.js b/ecomp-portal-FE-common/client/app/views/widgets/widgets.controller.js index e46f1ce5..1998d6d1 100644 --- a/ecomp-portal-FE-common/client/app/views/widgets/widgets.controller.js +++ b/ecomp-portal-FE-common/client/app/views/widgets/widgets.controller.js @@ -1,168 +1,168 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ -'use strict'; -(function () { - class WidgetsCtrl { - constructor($log, applicationsService, widgetsService, ngDialog, confirmBoxService, - userProfileService, $cookies, $scope, $rootScope) { - //$log.info('WidgetsCtrl::init: Starting Up'); - $scope.infoMessage = true; - $rootScope.noWidgets = false; - - let populateAvailableApps = widgets => { - let allPortalsFilterObject = {index: 0, title: 'All applications', value: ''}; - this.availableApps = [allPortalsFilterObject]; - this.filterByApp = this.availableApps[0]; - applicationsService.getAppsForSuperAdminAndAccountAdmin().then(myApps => { - var reSortedApp = myApps.sort(getSortOrder("name")); - var realAppIndex = 1; - for (let i = 1; i <= reSortedApp.length; i++) { - if (!reSortedApp[i-1].restrictedApp) { - $log.debug('WidgetsCtrl::populateAvailableApps: pushing {index: ', realAppIndex, 'title: ', reSortedApp[i - 1].name, - 'value: ', reSortedApp[i - 1].name, '}'); - this.availableApps.push({ - index: realAppIndex, - title: reSortedApp[i - 1].name, - value: reSortedApp[i - 1].name - }) - realAppIndex = realAppIndex + 1; - } - } - }).catch(err => { - $log.error(err); - }); - }; - - let getOnboardingWidgets = () => { - this.isLoadingTable = true; - widgetsService.getManagedWidgets().then(res => { - $log.debug('WidgetsCtrl.getOnboardingWidgets:: ' + JSON.stringify(res)); - // if (JSON.stringify(res) === '[]') { - // confirmBoxService.showInformation('There are currently no Widgets. ').then(isConfirmed => {}); - // } - var reSortedWidget = res.sort(getSortOrder("name")); - this.widgetsList = reSortedWidget; - populateAvailableApps(reSortedWidget); - // $log.info('WidgetsHomeCtrl::getUserWidgets count : ' + $scope.widgetsList.length); - if (Object.keys(res).length === 0 ) { - $rootScope.noWidgets = true; - $scope.isLoadingTable = false; - $log.info('WidgetsHomeCtrl::getUserWidgets: There are no available Widgets'); - } - }).catch(err => { - confirmBoxService.showInformation('There was a problem retrieving the Widgets. ' + - 'Please try again later.').then(isConfirmed => {}); - $log.error('WidgetsCtrl::getOnboardingWidgets error: ' + err); - }).finally(()=> { - this.isLoadingTable = false; - }); - }; - - // Refactor this into a directive - let getSortOrder = (prop) => { - return function(a, b) { - // $log.debug('a = ' + JSON.stringify(a) + "| b = " + JSON.stringify(b)); - if (a[prop].toLowerCase() > b[prop].toLowerCase()) { - return 1; - } else if (a[prop].toLowerCase() < b[prop].toLowerCase()) { - return -1; - } - return 0; - } - } - - $scope.hideMe = function () { - $scope.infoMessage = false; - } - - let init = () => { - this.isLoadingTable = false; - getOnboardingWidgets(); - - /*Table general configuration params*/ - this.searchString = ''; - /*Table data*/ - this.widgetsTableHeaders = [ - {name: 'Widget Name', value: 'name', isSortable: false}, - {name: 'Application', value: 'appName', isSortable: true}, - {name: 'Width', value: 'width', isSortable: false}, - {name: 'Height', value: 'height', isSortable: false} - ]; - this.widgetsList = []; - }; - - this.filterByDropdownValue = item => { - if(this.filterByApp.value === ''){ - return true; - } - return item.appName === this.filterByApp.value; - }; - - this.openWidgetDetailsModal = (selectedWidget) => { - let data = null; - if(selectedWidget){ - if(!selectedWidget.id){ - $log.error('Widget id not found'); - return; - } - data = { - widget: selectedWidget - } - } - ngDialog.open({ - templateUrl: 'app/views/widgets/widget-details-dialog/widget-details.modal.html', - controller: 'WidgetDetailsModalCtrl', - controllerAs: 'widgetDetails', - data: data - }).closePromise.then(needUpdate => { - if(needUpdate.value === true){ - $log.debug('WidgetsCtrl::openWidgetDetailsModal: updating table data...'); - getOnboardingWidgets(); - } - }); - }; - - this.deleteWidget = widget => { - confirmBoxService.deleteItem(widget.name).then(isConfirmed => { - if(isConfirmed){ - if(!widget || !widget.id){ - $log.error('WidgetsCtrl::deleteWidget: No widget or ID... cannot delete'); - return; - } - widgetsService.deleteWidget(widget.id).then(() => { - this.widgetsList.splice(this.widgetsList.indexOf(widget), 1); - }).catch(err => { - $log.error('WidgetsCtrl::deleteWidget error:',err); - confirmBoxService.showInformation('There was a problem deleting the Widget. ' + - 'Please try again later.').then(isConfirmed => {}); - }); - } - }).catch(err => { - $log.error('WidgetsCtrl::deleteWidget error:',err); - }); - }; - - init(); - } - } - WidgetsCtrl.$inject = ['$log', 'applicationsService', 'widgetsService', 'ngDialog', 'confirmBoxService', - 'userProfileService','$cookies', '$scope', '$rootScope']; - angular.module('ecompApp').controller('WidgetsCtrl', WidgetsCtrl); -})(); +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ +'use strict'; +(function () { + class WidgetsCtrl { + constructor($log, applicationsService, widgetsService, ngDialog, confirmBoxService, + userProfileService, $cookies, $scope, $rootScope) { + //$log.info('WidgetsCtrl::init: Starting Up'); + $scope.infoMessage = true; + $rootScope.noWidgets = false; + + let populateAvailableApps = widgets => { + let allPortalsFilterObject = {index: 0, title: 'All applications', value: ''}; + this.availableApps = [allPortalsFilterObject]; + this.filterByApp = this.availableApps[0]; + applicationsService.getAppsForSuperAdminAndAccountAdmin().then(myApps => { + var reSortedApp = myApps.sort(getSortOrder("name")); + var realAppIndex = 1; + for (let i = 1; i <= reSortedApp.length; i++) { + if (!reSortedApp[i-1].restrictedApp) { + $log.debug('WidgetsCtrl::populateAvailableApps: pushing {index: ', realAppIndex, 'title: ', reSortedApp[i - 1].name, + 'value: ', reSortedApp[i - 1].name, '}'); + this.availableApps.push({ + index: realAppIndex, + title: reSortedApp[i - 1].name, + value: reSortedApp[i - 1].name + }) + realAppIndex = realAppIndex + 1; + } + } + }).catch(err => { + $log.error(err); + }); + }; + + let getOnboardingWidgets = () => { + this.isLoadingTable = true; + widgetsService.getManagedWidgets().then(res => { + $log.debug('WidgetsCtrl.getOnboardingWidgets:: ' + JSON.stringify(res)); + // if (JSON.stringify(res) === '[]') { + // confirmBoxService.showInformation('There are currently no Widgets. ').then(isConfirmed => {}); + // } + var reSortedWidget = res.sort(getSortOrder("name")); + this.widgetsList = reSortedWidget; + populateAvailableApps(reSortedWidget); + // $log.info('WidgetsHomeCtrl::getUserWidgets count : ' + $scope.widgetsList.length); + if (Object.keys(res).length === 0 ) { + $rootScope.noWidgets = true; + $scope.isLoadingTable = false; + $log.info('WidgetsHomeCtrl::getUserWidgets: There are no available Widgets'); + } + }).catch(err => { + confirmBoxService.showInformation('There was a problem retrieving the Widgets. ' + + 'Please try again later.').then(isConfirmed => {}); + $log.error('WidgetsCtrl::getOnboardingWidgets error: ' + err); + }).finally(()=> { + this.isLoadingTable = false; + }); + }; + + // Refactor this into a directive + let getSortOrder = (prop) => { + return function(a, b) { + // $log.debug('a = ' + JSON.stringify(a) + "| b = " + JSON.stringify(b)); + if (a[prop].toLowerCase() > b[prop].toLowerCase()) { + return 1; + } else if (a[prop].toLowerCase() < b[prop].toLowerCase()) { + return -1; + } + return 0; + } + } + + $scope.hideMe = function () { + $scope.infoMessage = false; + } + + let init = () => { + this.isLoadingTable = false; + getOnboardingWidgets(); + + /*Table general configuration params*/ + this.searchString = ''; + /*Table data*/ + this.widgetsTableHeaders = [ + {name: 'Widget Name', value: 'name', isSortable: false}, + {name: 'Application', value: 'appName', isSortable: true}, + {name: 'Width', value: 'width', isSortable: false}, + {name: 'Height', value: 'height', isSortable: false} + ]; + this.widgetsList = []; + }; + + this.filterByDropdownValue = item => { + if(this.filterByApp.value === ''){ + return true; + } + return item.appName === this.filterByApp.value; + }; + + this.openWidgetDetailsModal = (selectedWidget) => { + let data = null; + if(selectedWidget){ + if(!selectedWidget.id){ + $log.error('Widget id not found'); + return; + } + data = { + widget: selectedWidget + } + } + ngDialog.open({ + templateUrl: 'app/views/widgets/widget-details-dialog/widget-details.modal.html', + controller: 'WidgetDetailsModalCtrl', + controllerAs: 'widgetDetails', + data: data + }).closePromise.then(needUpdate => { + if(needUpdate.value === true){ + $log.debug('WidgetsCtrl::openWidgetDetailsModal: updating table data...'); + getOnboardingWidgets(); + } + }); + }; + + this.deleteWidget = widget => { + confirmBoxService.deleteItem(widget.name).then(isConfirmed => { + if(isConfirmed){ + if(!widget || !widget.id){ + $log.error('WidgetsCtrl::deleteWidget: No widget or ID... cannot delete'); + return; + } + widgetsService.deleteWidget(widget.id).then(() => { + this.widgetsList.splice(this.widgetsList.indexOf(widget), 1); + }).catch(err => { + $log.error('WidgetsCtrl::deleteWidget error:',err); + confirmBoxService.showInformation('There was a problem deleting the Widget. ' + + 'Please try again later.').then(isConfirmed => {}); + }); + } + }).catch(err => { + $log.error('WidgetsCtrl::deleteWidget error:',err); + }); + }; + + init(); + } + } + WidgetsCtrl.$inject = ['$log', 'applicationsService', 'widgetsService', 'ngDialog', 'confirmBoxService', + 'userProfileService','$cookies', '$scope', '$rootScope']; + angular.module('ecompApp').controller('WidgetsCtrl', WidgetsCtrl); +})(); diff --git a/ecomp-portal-FE-common/client/app/views/widgets/widgets.controller.spec.js b/ecomp-portal-FE-common/client/app/views/widgets/widgets.controller.spec.js index 3841a2b3..32cc3a1f 100644 --- a/ecomp-portal-FE-common/client/app/views/widgets/widgets.controller.spec.js +++ b/ecomp-portal-FE-common/client/app/views/widgets/widgets.controller.spec.js @@ -1,19 +1,19 @@ -/*- - * ================================================================================ - * ECOMP Portal - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ================================================================================ - */ +/*- + * ================================================================================ + * ECOMP Portal + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ================================================================================ + */ diff --git a/ecomp-portal-FE-common/client/app/views/widgets/widgets.tpl.html b/ecomp-portal-FE-common/client/app/views/widgets/widgets.tpl.html index 8afb8267..9d6f66f8 100644 --- a/ecomp-portal-FE-common/client/app/views/widgets/widgets.tpl.html +++ b/ecomp-portal-FE-common/client/app/views/widgets/widgets.tpl.html @@ -1,81 +1,81 @@ - -
-
-
-
Widget Onboarding
-
-
-
-
-
- - -
Add Widget
-
-
- Only widgets for active applications are displayed. - -
-
- There are currently no widgets available. -
- - -
- - - - - - - - - - - - - - - -
{{header.name}}URLDelete
-
- 		-
- 		-
-
-
-
-
-
- -
+ +
+
+
+
Widget Onboarding
+
+
+
+
+
+ + +
Add Widget
+
+
+ Only widgets for active applications are displayed. + +
+
+ There are currently no widgets available. +
+ + +
+ + + + + + + + + + + + + + + +
{{header.name}}URLDelete
+
+ 		+
+ 		+
+
+
+
+
+
+ +
-- cgit 1.2.3-korg