diff options
author | Christopher Lott (cl778h) <clott@research.att.com> | 2017-10-04 14:14:36 -0400 |
---|---|---|
committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-10-04 15:53:41 -0400 |
commit | b6079b39fc1193a32223933f7d93c08a63809689 (patch) | |
tree | 679384195495dfa64953d6f6aea253b58bfe78c9 /ecomp-portal-FE-common/client/app | |
parent | 88c674e9f243ee7bfacfca847383ea01b482c1c1 (diff) |
Repair widget-ms problem; adjust sonar in poms
Using OParent again; override some Sonar configuration and tasks.
Repair display & fetch of users from remote apps.
Use EPSDK version 1710 database scripts.
Issue: PORTAL-50, PORTAL-59, PORTAL-86
Change-Id: I05eaea3680b0422236cc86cdd0ad5847c2731e54
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-portal-FE-common/client/app')
-rw-r--r-- | ecomp-portal-FE-common/client/app/views/dashboard/dashboard-widget-parameter-manage.html | 2 | ||||
-rw-r--r-- | ecomp-portal-FE-common/client/app/views/users/users.controller.spec.js | 141 |
2 files changed, 1 insertions, 142 deletions
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 a19826f5..fbe255a9 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 @@ -50,7 +50,7 @@ <div class="widgets-popup-margin"> <div class="get-access-table"> <div class="table-control manage-widget-parameters-table"> - <div class="c-ecomp-att-abs-table manage-widget-parameters-table-details"> + <div class="manage-widget-parameters-table-details"> <table b2b-table id="table-main" table-data="ignoredTableData" current-page="ignoredCurrentPage" ng-show="isLoadingTable"> <thead b2b-table-row type="header"> 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 deleted file mode 100644 index 0b3c0110..00000000 --- a/ecomp-portal-FE-common/client/app/views/users/users.controller.spec.js +++ /dev/null @@ -1,141 +0,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. - * ================================================================================ - */ -// /** -// * 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); -// }); -// }); |