1 files changed, 9 insertions, 127 deletions
diff --git a/catalog-ui/src/app/view-models/admin-dashboard/user-management/user-management-view-model.ts b/catalog-ui/src/app/view-models/admin-dashboard/user-management/user-management-view-model.ts
index 45232b7a61..43ae75e048 100644
--- a/catalog-ui/src/app/view-models/admin-dashboard/user-management/user-management-view-model.ts
+++ b/catalog-ui/src/app/view-models/admin-dashboard/user-management/user-management-view-model.ts
@@ -20,55 +20,40 @@
 
 'use strict';
 import * as _ from "lodash";
-import {ModalsHandler} from "app/utils";
-import {User, IUserProperties, IUser, IAppConfigurtaion} from "app/models";
-import {UserService} from "../../../ng2/services/user.service";
+import { User, IUserProperties, IUser, IAppConfigurtaion } from "app/models";
+import { UserService } from "../../../ng2/services/user.service";
+import { SdcUiCommon, SdcUiServices, SdcUiComponents } from "onap-ui-angular";
+import { AuthenticationService } from "app/ng2/services/authentication.service";
 
 interface IUserManagementViewModelScope extends ng.IScope {
-    sdcConfig:IAppConfigurtaion;
     usersList:Array<IUserProperties>;
     isLoading:boolean;
-    isNewUser:boolean;
     sortBy:string;
     reverse:boolean;
     tableHeadersList:any;
-    roles:Array<string>;
-    newUser:IUser;
-    currentUser:IUserProperties;
-    userIdValidationPattern:RegExp;
-    editForm:ng.IFormController;
     getAllUsers():void;
-    editUserRole(user:IUserProperties);
     sort(sortBy:string):void;
-    createUser():void;
-    deleteUser(userId:string):void;
-    onEditUserPressed(user:IUserProperties):void;
-    saveUserChanges(user:IUserProperties):void;
     getTitle(role:string):string;
-    clearForm():void;
-
 }
 
 
 export class UserManagementViewModel {
     static '$inject' = [
         '$scope',
-        'sdcConfig',
         'UserServiceNg2',
-        'UserIdValidationPattern',
+        'AuthenticationServiceNg2',
         '$filter',
-        'ModalsHandler'
+        'ModalServiceSdcUI'
     ];
 
     constructor(private $scope:IUserManagementViewModelScope,
-                private sdcConfig:IAppConfigurtaion,
                 private userService:UserService,
-                private UserIdValidationPattern:RegExp,
+                private authService:AuthenticationService,
                 private $filter:ng.IFilterService,
-                private ModalsHandler:ModalsHandler) {
+                private modalService:SdcUiServices.ModalService) {
 
-        this.initScope();
 
+        setTimeout(this.initScope, 1000);
     }
 
 
@@ -89,13 +74,8 @@ export class UserManagementViewModel {
         this.userService.getAllUsers().subscribe(onSuccess, onError);
     };
 
-    private updateUserFilterTerm = (user:IUserProperties):void => {
-        user.filterTerm = user.firstName + ' ' + user.lastName + ' ' + user.userId + ' ' + user.email + ' ' + user.role + ' ' + this.$filter('date')(user.lastLoginTime, "MM/dd/yyyy");
-    };
-
     private initScope = ():void => {
         let self = this;
-
         this.$scope.tableHeadersList = [{title: "First Name", property: 'firstName'}, {
             title: "Last Name",
             property: 'lastName'
@@ -107,116 +87,18 @@ export class UserManagementViewModel {
                 title: "Last Active",
                 property: 'lastLoginTime'
             }];
-        this.$scope.userIdValidationPattern = this.UserIdValidationPattern;
         this.$scope.sortBy = 'lastLoginTime';
         this.$scope.reverse = false;
-        this.$scope.roles = this.sdcConfig.roles;
-        this.$scope.isNewUser = false;
-        this.$scope.currentUser = this.userService.getLoggedinUser();
         this.getAllUsers();
 
-        let userInfo:IUserProperties = <IUserProperties>{};
-        this.$scope.newUser = new User(userInfo);
-
         this.$scope.sort = (sortBy:string):void => {//default sort by descending last update. default for alphabetical = ascending
-            this.$scope.isNewUser = false;
             this.$scope.reverse = (this.$scope.sortBy === sortBy) ? ( !this.$scope.reverse) : this.$scope.reverse = false;
             this.$scope.sortBy = sortBy;
         };
 
-        this.$scope.createUser = ():void => {
-
-            let onError = (response) => {
-                this.$scope.isLoading = false;
-                console.info('onFaild', response);
-            };
-
-            let onSuccess = (response:IUserProperties) => {
-                this.$scope.newUser.userInfo.lastLoginTime = "0";
-                this.$scope.newUser.userInfo.status = response.status;
-                this.updateUserFilterTerm(this.$scope.newUser.userInfo);
-                this.$scope.usersList.push(this.$scope.newUser.userInfo);
-                this.$scope.isNewUser = true;
-                this.$scope.sortBy = null;
-                this.$scope.reverse = true;
-                this.$scope.isLoading = false;
-                this.$scope.newUser = new User(null);
-                this.$scope.editForm.$setPristine();
-                let _self = this;
-                setTimeout(function () {
-                    _self.$scope.isNewUser = false;
-                }, 7000);
-            };
-            this.userService.createUser({
-                userId: this.$scope.newUser.userInfo.userId,
-                role: this.$scope.newUser.userInfo.role
-            }).subscribe(onSuccess, onError);
-        };
-
-
-        this.$scope.onEditUserPressed = (user:IUserProperties):void => {
-            user.isInEditMode = true;
-            user.tempRole = user.role;
-        };
-
-        this.$scope.editUserRole = (user:IUserProperties):void => {
-            let roleBeforeUpdate:string = user.role;
-            user.role = user.tempRole;
-
-            let onError = (response) => {
-                this.$scope.isLoading = false;
-                user.role = roleBeforeUpdate;
-                console.info('onFaild', response);
-            };
-            let onSuccess = (response:any) => {
-                this.$scope.isLoading = false;
-                user.tempRole = user.role;
-                this.updateUserFilterTerm(user);
-            };
-
-            this.userService.editUserRole(user.userId, user.role).subscribe(onSuccess, onError);
-        };
-
-        this.$scope.saveUserChanges = (user:IUserProperties):void => {
-            if (user.tempRole != user.role) {
-                this.$scope.editUserRole(user)
-            }
-            user.isInEditMode = false;
-        };
-
-        this.$scope.deleteUser = (userId:string):void => {
-
-            let onOk = ():void => {
-                this.$scope.isLoading = true;
-
-                let onError = (response):void => {
-                    this.$scope.isLoading = false;
-                    console.info('onFaild', response);
-                };
-
-                let onSuccess = (response:any):void => {
-                    _.remove(this.$scope.usersList, {userId: userId});
-                    this.$scope.isLoading = false;
-                };
-                this.userService.deleteUser(userId).subscribe(onSuccess, onError);
-            };
-
-            let title:string = this.$filter('translate')("USER_MANAGEMENT_VIEW_DELETE_MODAL_TITLE");
-            let message:string = this.$filter('translate')("USER_MANAGEMENT_VIEW_DELETE_MODAL_TEXT");
-            this.ModalsHandler.openConfirmationModal(title, message, false).then(onOk);
-        };
-
         this.$scope.getTitle = (role:string):string => {
             return role.toLowerCase().replace('governor', 'governance_Rep').replace('_', ' ');
         };
 
-        this.$scope.clearForm = ():void => {
-            if (!this.$scope.editForm['contactId'].$viewValue && !this.$scope.editForm['role'].$viewValue) {
-                this.$scope.editForm.$setPristine();
-            }
-            //if(this.$scope.editForm['contactId'].$viewValue === '' && this.$scope.editForm['role'].$viewValue){
-            //    this.$scope.editForm.$setPristine();
-            //}
-        };
     }
 }