[PORTAL-7] Rebase

This rebasing includes common libraries and common overlays projects
abstraction of components

Change-Id: I9a24a338665c7cd058978e8636bc412d9e2fdce8
Signed-off-by: st782s <statta@research.att.com>

4 files changed, 544 insertions, 0 deletions

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
new file mode 100644
index 00000000..5a164e1a
--- /dev/null
+++ b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.js
@@ -0,0 +1,252 @@
+/*-

+ * ================================================================================

+ * 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);

+})();

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
new file mode 100644
index 00000000..540459ed
--- /dev/null
+++ b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.controller.spec.js
@@ -0,0 +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();

+    });

+});

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
new file mode 100644
index 00000000..1b1b9de8
--- /dev/null
+++ b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.html
@@ -0,0 +1,77 @@
+<!--
+  ================================================================================
+  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.
+  ================================================================================
+  -->
+<div class="new-admin-modal">
+
+    <div class="search-users" ng-show="newAdmin.dialogState===1">
+
+        <search-users search-title="New Admin"
+                      selected-user="newAdmin.selectedUser"></search-users>
+
+        <div class="dialog-control">
+              <button id="search-users-button-next" class="btn btn-alt btn-small" ng-click="newAdmin.selectedUser && newAdmin.getAdminAppsRoles()"
+                 ng-class="{disabled: !newAdmin.selectedUser}">Next
+            </button>
+            <button id="search-users-button-cancel" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button>
+        </div>
+    </div>
+
+
+    <div id="div-admin-app-roles" class="admin-app-roles" ng-show="newAdmin.dialogState===2">
+        <div class="title" id="title"
+             ng-bind="newAdmin.selectedUser.firstName + ' ' + newAdmin.selectedUser.lastName + ' (' + newAdmin.selectedUser.orgUserId + ')'"></div>
+        <div class="app-roles-main">
+            <div id="div-app-roles-main-title" class="app-roles-main-title">
+                <span class="left">Administrates:</span>
+                <!--<span class="right" ng-click="newAdmin.addAdministratedApp()">+Add</span>-->
+            </div>
+
+
+            <div class="select-input custom-select-wrap">
+                <select class="new-administrated-app" id="dropdown-select-app"
+                        ui-select2 ng-model="newAdmin.selectedNewApp"
+                        data-placeholder="Select application"
+                        ng-options="app as app.appName for app in (filteredApps = (newAdmin.adminAppsRoles | filter:{isAdmin:'false'})) track by app.id "
+                        ng-disabled="!filteredApps.length">
+                    <option id="option-select-app" value="" disabled style="display: none;">Select application</option>
+                </select>
+            </div>
+
+
+            <div class="admin-roles-list">
+                <div ng-repeat="app in (newAdmin.adminAppsRoles | orderBy:newAdmin.orderFilter) track by app.id" ng-show="app.isAdmin">
+                    <div id="select-app-{{app.appName.split(' ').join('-')}}" class="administrated-application" ng-bind="app.appName | elipsis: 57"></div>
+                    <i id="i-delete-application" class="icon-misc-trash" ng-click="newAdmin.unadminApp(app)"> </i>
+                </div>
+            </div>
+
+            <div class="dialog-control">
+                <span class="ecomp-save-spinner" ng-show="newAdmin.isSaving"></span>              
+                 <button id="button-back" ng-show="newAdmin.isShowBack" class="btn btn-alt btn-small" ng-click="newAdmin.navigateBack()">Back</button>
+                <button id="div-updateAdminAppsRoles" class="btn btn-alt btn-small" ng-click="newAdmin.updateAdminAppsRoles()"
+                     ng-class="{disabled: false}">Save
+                </button>
+                <button id="div-cancel-button" class="btn btn-alt btn-small" ng-click="closeThisDialog()">Cancel</button>
+            </div>
+
+        </div>
+
+    </div>
+
+</div>
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
new file mode 100644
index 00000000..8b304b43
--- /dev/null
+++ b/ecomp-portal-FE-common/client/app/views/admins/add-admin-dialogs/new-admin.modal.less
@@ -0,0 +1,81 @@
+.new-admin-modal {
+  height: 430px;
+  margin-left: 20px;
+
+  .search-users {
+  }
+
+  .admin-app-roles {
+    .title {
+      //.n18r;
+      .dGray18r;  //AT&T Dark Gray
+      border-bottom: @blue-active 3px solid;
+
+    }
+
+    .app-roles-main {
+      margin-top: 16px;
+      .app-roles-main-title {
+        .dGray14r;
+        margin-bottom: 8px;
+        .left {
+          display: inline-block;
+        }
+        .right {
+          display: inline-block;
+          color: @blue-active;
+          float: right;
+          cursor: pointer;
+        }
+      }
+
+      .select-input{
+        width: 460px;
+      }
+
+      .new-administrated-app {
+        height: 30px;
+        line-height: 30px;
+
+        border: 1px solid @portalGray;
+        margin-bottom: 8px;
+        border-radius: 2px;
+        padding-left: 6px;
+        padding-top: 0;
+        width: 100%;
+        .dGray14r;
+      }
+
+      .admin-roles-list {
+        height: 240px;
+        overflow-y: auto;
+      }
+
+      .administrated-application {
+        width: 460px;
+        height: 30px;
+        border: 1px solid @portalGray;
+        margin-bottom: 8px;
+        border-radius: 2px;
+        padding: 6px;
+        .dGray14r;
+        display: inline-block;
+
+      }
+
+      .delete-application {
+        .ico_trash_default;
+        display: inline-block;
+        vertical-align: 4px;
+        cursor: pointer;
+        position: relative;
+        top: 6px;
+        color: transparent;
+        margin-left: 8px;
+      }
+
+    }
+
+  }
+}
+