diff options
Diffstat (limited to 'ecomp-portal-FE-os/client/src/views/applications/application-details-dialog')
2 files changed, 83 insertions, 26 deletions
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 @@ ================================================================================ --> <div class="application-details-modal"> - <div id="title" class="title">Application Details</div> + <div class="b2b-modal-header"> + <h2 class="account-details-title" id="application-details-title">Application Details</h2> + + <div class="corner-button in"> + <button type="button" class="close" aria-label="Closhhhe" + ng-click="$dismiss('cancel')"></button> + </div> + </div> + + <div class="b2b-modal-body"> <div class="app-properties-main" scroll-top="appDetails.scrollApi"> <form name="appForm" novalidate autocomplete="off"> - <!-- We can remove this script once we get to AT&T Corporate Firefox version 47 + <!-- We can remove this script once we get to Firefox version 47 autocomplete="off" won't work until v47 --> - <script type="text/javascript"> + <!-- <script type="text/javascript"> document.getElementById("appForm").reset(); - </script> + </script> --> <div id="app-left-container" class="left-container"> - <div class="property"> - <input id="checkbox-app-is-restricted" type="checkbox" class="checkbox-field checkbox-field-openSRC" ng-disabled="appDetails.isEditMode" ng-model="appDetails.app.restrictedApp" ng-checked="appDetails.app.restrictedApp"/> - <div class="property-label checkbox-label">Hyperlink only application</div> - </div> + <div class="property-label checkbox-label"> + <label for="checkbox-app-is-restricted" class="checkbox"> + <input type="checkbox" ng-model="appDetails.app.restrictedApp" id="checkbox-app-is-restricted" ng-disabled="appDetails.isEditMode" ng-checked="appDetails.app.restrictedApp"/> + <i class="skin"></i> + <span>Hyperlink only application</span> + </label> + </div> <div class="property required"> <div class="property-label">Application Name</div> <input id="input-app-name" type="text" @@ -123,6 +135,14 @@ <small id="error-mylogins-password-reqd" class="err-message" ng-message="required">My Logins App Password is required</small> </div> </div> + + <div class="property" ng-show="!appDetails.app.restrictedApp"> + <div id="pwd-property-label" class="property-label">Name Space</div> + <input type="text" id="input-mylogins-auth-namespace" + ng-model="appDetails.app.nameSpace" + name="appAuthNameSpace" + maxlength="256"/> + </div> </div> </div> <div class="right-container"> @@ -173,12 +193,25 @@ </div> <div id="property-guest-access" class="property"> - <input id="checkbox-app-is-open" type="checkbox" class="checkbox-field checkbox-field-openSRC" ng-model="appDetails.app.isOpen" ng-checked="appDetails.app.isOpen || appDetails.app.restrictedApp" ng-disabled="appDetails.app.restrictedApp"/> - <div id="property-guest-checkbox-label" class="property-label checkbox-label">Allow guest access</div> + <label for="checkbox-app-is-open" class="checkbox"> + <input type="checkbox" ng-model="appDetails.app.isOpen" id="checkbox-app-is-open" ng-checked="appDetails.app.isOpen || appDetails.app.restrictedApp" ng-disabled="appDetails.app.restrictedApp"/> + <i class="skin"></i> + <span>Allow guest access</span> + </label> </div> <div id="property-active" class="property"> - <input id="checkbox-app-is-enabled" type="checkbox" class=" checkbox-field checkbox-field-openSRC " ng-model="appDetails.app.isEnabled"/> - <div id="property-active-checkbox-label" class="property-label checkbox-label">Active</div> + <label for="checkbox-app-is-enabled" class="checkbox"> + <input type="checkbox" ng-model="appDetails.app.isEnabled" id="checkbox-app-is-enabled"/> + <i class="skin"></i> + <span>Active</span> + </label> + </div> <br/> + <div id="property-is-central-auth" class="property" ng-show="!appDetails.app.restrictedApp"> + <label for="checkbox-app-is-central-auth" class="checkbox"> + <input type="checkbox" ng-model="appDetails.app.isCentralAuth" id="checkbox-app-is-central-auth"/> + <i class="skin"></i> + <span>Centralized</span> + </label> </div> </div> @@ -186,14 +219,25 @@ </div> </form> </div> + </div> + + <br> + <div class="b2b-modal-footer"> + <div class="dialog-control"> + <span class="ecomp-save-spinner" ng-show="appDetails.isSaving"></span> + <button id="button-save-app" class="btn btn-alt btn-small" ng-class="{disabled: appForm.$invalid}" ng-click="appDetails.saveChanges()">Save</button> + <button id="button-notification-cancel" class="btn btn-alt btn-small" ng-click="$dismiss('cancel')"role="button" tabindex="0">Cancel</button> + + + </div> + </div> + + + - <div class="dialog-control"> - <span class="ecomp-save-spinner" ng-show="appDetails.isSaving"></span> - <button id="button-save-app" class="btn btn-alt btn-small" ng-class="{disabled: appForm.$invalid}" ng-click="appDetails.saveChanges()">Save</button> - <button id="button-app-cancel" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button> - </div> </div> + <script type="application/javascript"> $(document).ready(function(){ $(".ngdialog-content").css("top","-150px") |