From 978dbcf0a196acbafad72fe1e2478ec0e384f02f Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Wed, 23 Aug 2017 18:27:19 -0400 Subject: Deliver centralized role management feature Repair multiple defects also. Revise deployment to use docker-compose. Remove all zip archives. Issue: PORTAL-21, PORTAL-25, PORTAL-28, PORTAL-52, PORTAL-69, PORTAL-74, PORTAL-76, PORTAL-80, PORTAL-82 Change-Id: Ie72fec7d35ba78beb162bba6ed27b2caee340c61 Signed-off-by: Christopher Lott (cl778h) --- .../client/assets/images/onap-logo.png | Bin 29116 -> 52523 bytes .../ionicons-2.0.1/css/ecomp-ionicons.css | 27 +- ecomp-portal-FE-os/client/index.html | 6 +- ecomp-portal-FE-os/client/src/app.less | 17 +- .../src/directives/search-users/search-users.less | 2 +- .../directives/search-users/search-users.tpl.html | 4 +- ecomp-portal-FE-os/client/src/router.js | 9 + .../services/userProfile/userProfile.service.js | 4 +- ecomp-portal-FE-os/client/src/styles/att-abs.less | 132 ------- .../client/src/styles/ecomp-abs.less | 132 +++++++ .../application-details.controller.js | 31 +- .../application-details.modal.html | 78 +++- .../views/applications/applications.controller.js | 34 +- .../src/views/applications/applications.tpl.html | 6 +- .../menu-details.controller.js | 415 --------------------- .../functionalMenu-dialog/menu-details.modal.html | 103 ----- .../functionalMenu/functionalMenu.controller.js | 52 ++- ecomp-portal-FE-os/pom.xml | 2 +- 18 files changed, 330 insertions(+), 724 deletions(-) delete mode 100644 ecomp-portal-FE-os/client/src/styles/att-abs.less create mode 100644 ecomp-portal-FE-os/client/src/styles/ecomp-abs.less delete mode 100644 ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu-dialog/menu-details.controller.js delete mode 100644 ecomp-portal-FE-os/client/src/views/functionalMenu/functionalMenu-dialog/menu-details.modal.html (limited to 'ecomp-portal-FE-os') diff --git a/ecomp-portal-FE-os/client/assets/images/onap-logo.png b/ecomp-portal-FE-os/client/assets/images/onap-logo.png index 32320322..8d601009 100644 Binary files a/ecomp-portal-FE-os/client/assets/images/onap-logo.png and b/ecomp-portal-FE-os/client/assets/images/onap-logo.png differ diff --git a/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css b/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css index 8e747af3..708a4a65 100644 --- a/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css +++ b/ecomp-portal-FE-os/client/bower_components_external/ionicons-2.0.1/css/ecomp-ionicons.css @@ -1,6 +1,7 @@ @charset "UTF-8"; @font-face { font-family: "Ionicons"; src: url("../fonts/ionicons.eot?v=2.0.0"); src: url("../fonts/ionicons.eot?v=2.0.0#iefix") format("embedded-opentype"), url("../fonts/ionicons.ttf?v=2.0.0") format("truetype"), url("../fonts/ionicons.woff?v=2.0.0") format("woff"), url("../fonts/ionicons.svg?v=2.0.0#Ionicons") format("svg"); font-weight: normal; font-style: normal; } + .ionicons, .icon-controls-upPRIMARY, .icon-arrows-download:before, @@ -56,7 +57,14 @@ .icon-misc-trash:before, .icon-misc-pen:before, .ion-navicon:before, -.icon-primary-close:before, .close:before, .reset-field:before, +.icon-primary-down:before, +.icon-primary-left:before, +.icon-primary-right:before, +.icon-primary-check:before, +.icon-primary-calendar:before, +.icon-primary-close:before, +.close:before, +.reset-field:before, .icon-datanetwork-softwareasaservice:before, .icon-datanetwork-messaging2:before, .icon-controls-moreapplications:before, @@ -75,7 +83,6 @@ } - .icoSecurityalerts-alert:before { content: "\f100"; } .icon-arrows-download:before { content: "\f41f"; } @@ -178,16 +185,26 @@ .icon-misc-pen:before { content: "\f2bf"; } +.icon-primary-down:before { content: "\f123" !important;} + +.icon-primary-left:before { content: "\f124" !important; transform: rotate(0deg) !important;} + +.icon-primary-right:before { content: "\f125" !important; transform: rotate(0deg) !important; } + +.icon-primary-check:before, .checkbox input:checked + .skin:after {content: "\f121" !important; font-family: "Ionicons" !important;} + +.icon-primary-calendar:before {content: "\f3f4" !important;} + +.icon-primary-close:before, .close:before, .reset-field:before {content: "\f2d7" !important; font-family: "Ionicons" !important;} + .ion-navicon:before { content: "\f20e"; } .icon-building-home:before { content: "\f144"; } .icon-content-star:before { content: "\f24e"; } -.icon-primary-close:before, .close:before, .reset-field:before { content: "\f129"; } - .icon-datanetwork-softwareasaservice:before { content: "\f40c"; } .icon-datanetwork-messaging2:before { content: "\f132"; } -.icon-controls-moreapplications:before { content: "\f20b"; } \ No newline at end of file +.icon-controls-moreapplications:before { content: "\f20b"; } diff --git a/ecomp-portal-FE-os/client/index.html b/ecomp-portal-FE-os/client/index.html index 16eba088..35715497 100644 --- a/ecomp-portal-FE-os/client/index.html +++ b/ecomp-portal-FE-os/client/index.html @@ -131,6 +131,7 @@
+
@@ -204,6 +205,7 @@ + @@ -241,7 +243,6 @@ - @@ -255,6 +256,7 @@ + @@ -271,8 +273,8 @@ - + diff --git a/ecomp-portal-FE-os/client/src/app.less b/ecomp-portal-FE-os/client/src/app.less index 1c99e063..6e7df2a4 100644 --- a/ecomp-portal-FE-os/client/src/app.less +++ b/ecomp-portal-FE-os/client/src/app.less @@ -3,7 +3,7 @@ @import 'directives/multiple-select/multiple-select.less'; @import 'directives/right-menu/right-menu.less'; @import 'directives/search-users/search-users.less'; -@import 'styles/att-abs.less'; +@import 'styles/ecomp-abs.less'; @import 'styles/buttons.less'; @import 'styles/ecomp-general.less'; @import 'styles/fonts.less'; @@ -15,6 +15,7 @@ @import 'styles/spinner.less'; @import 'styles/sprites.less'; @import 'styles/variables.less'; +@import 'styles/appDS2.less'; @import 'views/admins/add-admin-dialogs/new-admin.modal.less'; @import 'views/admins/admins.less'; @import 'views/applications/application-details-dialog/application-details.modal.less'; @@ -54,7 +55,7 @@ html { height: 100%; overflow-y: hidden;} * { box-sizing: border-box; } body { - font: normal 12px Omnes-ECOMP-W02, Arial; + font: normal 12px Omnes-ECOMP-W02, Arial;-ms-overflow-style: scrollbar; } /* Responsive: Portrait tablets and up */ @@ -80,3 +81,15 @@ body { .checkbox-field-openSRC{ height: 15px !important; } + + .loadingLayer{ + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + background: none repeat scroll 0 0 black; + z-index: 100; + display: none; + opacity: 0; +} \ No newline at end of file diff --git a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.less b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.less index 32ea9caa..605abfc8 100644 --- a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.less +++ b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.less @@ -20,7 +20,7 @@ .search-users-directive{ .title { //.n18r; - .dGray18r; //AT&T Dark Gray + .dGray18r; border-bottom: @blue-active 3px solid; } diff --git a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.tpl.html b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.tpl.html index ef659920..5ac0cb9a 100644 --- a/ecomp-portal-FE-os/client/src/directives/search-users/search-users.tpl.html +++ b/ecomp-portal-FE-os/client/src/directives/search-users/search-users.tpl.html @@ -21,7 +21,7 @@
-
+
Enter first name, last name or User ID
-
+
*First Name
diff --git a/ecomp-portal-FE-os/client/src/router.js b/ecomp-portal-FE-os/client/src/router.js index 88afa39b..1b9cb5c5 100644 --- a/ecomp-portal-FE-os/client/src/router.js +++ b/ecomp-portal-FE-os/client/src/router.js @@ -150,6 +150,15 @@ angular.module('ecompApp') controllerAs: 'widgetOnboarding' } } + }).state('root.accountOnboarding', { + url: '/accountOnboarding', + views: { + 'content@': { + templateUrl: 'app/views/account-onboarding/account-onboarding.tpl.html', + controller: 'AccountOnboardingCtrl', + controllerAs: 'accountOnboarding' + } + } }).state('root.functionalMenu', { url: '/functionalMenu', views: { diff --git a/ecomp-portal-FE-os/client/src/services/userProfile/userProfile.service.js b/ecomp-portal-FE-os/client/src/services/userProfile/userProfile.service.js index 2cc7c329..76a778f3 100644 --- a/ecomp-portal-FE-os/client/src/services/userProfile/userProfile.service.js +++ b/ecomp-portal-FE-os/client/src/services/userProfile/userProfile.service.js @@ -195,7 +195,9 @@ return deferred.promise; } - + + + } UserProfileService.$inject = ['$q', '$log', '$http', 'conf', 'uuid4', 'utilsService']; angular.module('ecompApp').service('userProfileService', UserProfileService) diff --git a/ecomp-portal-FE-os/client/src/styles/att-abs.less b/ecomp-portal-FE-os/client/src/styles/att-abs.less deleted file mode 100644 index 1562375c..00000000 --- a/ecomp-portal-FE-os/client/src/styles/att-abs.less +++ /dev/null @@ -1,132 +0,0 @@ -//portal abs table component -.c-ecomp-portal-abs-table{ - width: 100%; - height: 600px; - overflow-x: auto; - overflow-y: auto; - background-color: @portalLightGray; - - .tablesorter-default { - //border: 1px solid @q; - - th, - thead td { - .dGray16m; - color: #333333; - background-color: @portalLightGray; - border-collapse: collapse; - //border-top-style: none; - border: 1px solid @q; - padding: 0; - font-weight: 700; - height: 38px; - } - - tbody tr td { - .dGray16m; - border-left: 1px solid @portalLGray; - background-color: @portalWhite; - border-bottom: 1px solid @portalLGray; - height: 32px; - div { - line-height: 32px; - } - } - - .td-first { - border-left: none; - } - - .tablesorter-search-highlight { - font-weight: bold; - } - - - tr:first-child { - border-bottom: 1px solid @portalLGray; - } - - th:first-child{ - border-right: 1px solid @portalLGray; - } - th:nth-child(2){ - border-right: 1px solid @portalLGray; - } - th:nth-child(3){ - border-right: 1px solid @portalLGray; - } - - tr:last-child { - td { - border-bottom-style: none; - } - } - - - } -} - -//portal abs select component -.c-ecomp-portal-abs-select{ - width: @select-width; - display: inline-block; - margin-right: 10px; - .select2-chosen{ - width: @select-width; - line-height: 20px; - } - .select2-container .select2-choice { - width: @select-width; - border-radius: 6px; - border-color: @portalLGray; - } - - .select2-results { - width: @select-width; - background-color: @portalWhite; - } - - .form-field, .form-field-input-container { - width: @select-width; - } -} - -// styles needed on Edit Functional Menu jqtree template -.dropdown-menu{ - position:absolute; - top:100%; - left:0; - z-index:1000; - display:none; - float:left; - min-width:160px; - padding:5px 0; - margin:2px 0 0; - list-style:none; - font-size:14px; - background-color:#fff; - border:1px solid #ccc; - border:1px solid rgba(0,0,0,.15); - border-radius:6px; - -webkit-box-shadow:0 6px 12px rgba(0,0,0,.175); - box-shadow:0 6px 12px rgba(0,0,0,.175); - background-clip:padding-box -} - -.dropdown-menu .divider { - height: 1px; - margin: 9px 0; - overflow: hidden; - background-color: #e5e5e5; -} - -.dropdown-menu>li>a { - display: block; - padding: 3px 20px; - clear: both; - font-weight: 400; - line-height: 1.428571429; - color: #333; - white-space: nowrap; -} - diff --git a/ecomp-portal-FE-os/client/src/styles/ecomp-abs.less b/ecomp-portal-FE-os/client/src/styles/ecomp-abs.less new file mode 100644 index 00000000..1562375c --- /dev/null +++ b/ecomp-portal-FE-os/client/src/styles/ecomp-abs.less @@ -0,0 +1,132 @@ +//portal abs table component +.c-ecomp-portal-abs-table{ + width: 100%; + height: 600px; + overflow-x: auto; + overflow-y: auto; + background-color: @portalLightGray; + + .tablesorter-default { + //border: 1px solid @q; + + th, + thead td { + .dGray16m; + color: #333333; + background-color: @portalLightGray; + border-collapse: collapse; + //border-top-style: none; + border: 1px solid @q; + padding: 0; + font-weight: 700; + height: 38px; + } + + tbody tr td { + .dGray16m; + border-left: 1px solid @portalLGray; + background-color: @portalWhite; + border-bottom: 1px solid @portalLGray; + height: 32px; + div { + line-height: 32px; + } + } + + .td-first { + border-left: none; + } + + .tablesorter-search-highlight { + font-weight: bold; + } + + + tr:first-child { + border-bottom: 1px solid @portalLGray; + } + + th:first-child{ + border-right: 1px solid @portalLGray; + } + th:nth-child(2){ + border-right: 1px solid @portalLGray; + } + th:nth-child(3){ + border-right: 1px solid @portalLGray; + } + + tr:last-child { + td { + border-bottom-style: none; + } + } + + + } +} + +//portal abs select component +.c-ecomp-portal-abs-select{ + width: @select-width; + display: inline-block; + margin-right: 10px; + .select2-chosen{ + width: @select-width; + line-height: 20px; + } + .select2-container .select2-choice { + width: @select-width; + border-radius: 6px; + border-color: @portalLGray; + } + + .select2-results { + width: @select-width; + background-color: @portalWhite; + } + + .form-field, .form-field-input-container { + width: @select-width; + } +} + +// styles needed on Edit Functional Menu jqtree template +.dropdown-menu{ + position:absolute; + top:100%; + left:0; + z-index:1000; + display:none; + float:left; + min-width:160px; + padding:5px 0; + margin:2px 0 0; + list-style:none; + font-size:14px; + background-color:#fff; + border:1px solid #ccc; + border:1px solid rgba(0,0,0,.15); + border-radius:6px; + -webkit-box-shadow:0 6px 12px rgba(0,0,0,.175); + box-shadow:0 6px 12px rgba(0,0,0,.175); + background-clip:padding-box +} + +.dropdown-menu .divider { + height: 1px; + margin: 9px 0; + overflow: hidden; + background-color: #e5e5e5; +} + +.dropdown-menu>li>a { + display: block; + padding: 3px 20px; + clear: both; + font-weight: 400; + line-height: 1.428571429; + color: #333; + white-space: nowrap; +} + diff --git a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.js b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.js index da7cd4a4..550b9faf 100644 --- a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.js +++ b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.controller.js @@ -21,12 +21,12 @@ (function () { class AppDetailsModalCtrl { constructor($scope, $log, applicationsService, errorMessageByCode, - ECOMP_URL_REGEX,userProfileService, $cookies, confirmBoxService) { + ECOMP_URL_REGEX,userProfileService, $cookies, confirmBoxService,items) { // let emptyImg = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='; // empty image should really be empty, or it causes problems for the back end let emptyImg = null; this.emptyImgForPreview = 'data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=='; - + $scope.ngDialogData=items; let newAppModel = { 'id': null, 'name': null, @@ -41,7 +41,9 @@ 'appPassword': null, 'thumbnail': emptyImg, 'isEnabled': true, - 'restrictedApp': false + 'restrictedApp': false, + 'nameSpace': null, + 'isCentralAuth': false }; let init = () => { @@ -71,6 +73,7 @@ this.app.thumbnail = emptyImg; this.originalImage = null; this.app.imageUrl = null; + this.app.imageLink = null; } }).catch(err => { $log.error('AppDetailsModalCtrl:removeImage error:: ',err); @@ -152,9 +155,14 @@ this.saveChanges = () => { //if valid.. - if($scope.appForm.$invalid){ - return; - } + if(((angular.isUndefined(this.app.name) || !this.app.name)&&(angular.isUndefined(this.app.url) || !this.app.url) + &&(angular.isUndefined(this.app.username) || !this.app.username)&&(angular.isUndefined(this.app.appPassword) || !this.app.appPassword))) { + confirmBoxService.showInformation('Please fill in all required fields').then(isConfirmed => {}); + return; + }else if(!((angular.isUndefined(this.app.name) || !!this.app.name)&&(angular.isUndefined(this.app.url) || !!this.app.url))){ + confirmBoxService.showInformation('Please fill in all required fields').then(isConfirmed => {}); + return; + } this.isSaving = true; // For a restricted app, null out all irrelevant fields if (this.app.restrictedApp) { @@ -167,10 +175,12 @@ this.app.uebSecret = null; } if(this.isEditMode){ + if (this.app.nameSpace=="") {this.app.nameSpace = null;} applicationsService.updateOnboardingApp(this.app) .then(() => { $log.debug('AppDetailsModalCtrl:updateOnboardingApp:: App update succeeded!'); - $scope.closeThisDialog(true); + // $scope.closeThisDialog(true); + $scope.$dismiss('cancel'); emptyCookies(); }).catch(err => { switch (err.status) { @@ -204,7 +214,8 @@ applicationsService.addOnboardingApp(this.app) .then(() => { $log.debug('App creation succeeded!'); - $scope.closeThisDialog(true); + //$scope.closeThisDialog(true); + $scope.$dismiss('cancel'); emptyCookies(); }).catch(err => { switch (err.status) { @@ -232,6 +243,7 @@ // for bug in IE 11 }); } + }; @@ -252,6 +264,7 @@ if(!(_.isEqual(newVal, oldVal))){ $log.debug('applicationsService:$scope.$watch:: thumbnail updated!'); this.app.imageUrl = null; + this.app.imageLink = null; this.app.thumbnail = newVal.resized.dataURL; } }); @@ -263,6 +276,6 @@ } } AppDetailsModalCtrl.$inject = ['$scope', '$log', 'applicationsService', 'errorMessageByCode', - 'ECOMP_URL_REGEX','userProfileService','$cookies', 'confirmBoxService']; + 'ECOMP_URL_REGEX','userProfileService','$cookies', 'confirmBoxService','items']; angular.module('ecompApp').controller('AppDetailsModalCtrl', AppDetailsModalCtrl); })(); \ No newline at end of file diff --git a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.modal.html b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.modal.html index ad659aa8..d90c35ec 100644 --- a/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.modal.html +++ b/ecomp-portal-FE-os/client/src/views/applications/application-details-dialog/application-details.modal.html @@ -18,20 +18,32 @@ ================================================================================ -->
-
Application Details
+
+ + +
+ +
+
+ +
- - -->
-
- -
Hyperlink only application
-
+
+ +
Application Name
My Logins App Password is required
+ +
+
Name Space
+ +
@@ -173,12 +193,25 @@
- -
Allow guest access
+
- -
Active
+ +

+
+
@@ -186,14 +219,25 @@
+
+ +
+
+
+ + + + + +
+
+ + + -
- - - -
+