Raptor UI Changes, user profile, folder restructure

Issue-ID: PORTAL-902
Change-Id: Ib76bb3fce7efe55504b75d2fc4764bafb9f8e908
Signed-off-by: mravula <mr257h@att.com>

4 files changed, 11 insertions, 24 deletions

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts
index 57554de5..1d7b9ba6 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/admin.module.ts
@@ -2,32 +2,31 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { AdminComponent } from './admin.component';
 import {CacheAdminComponent} from './cache-admin/cache-admin.component';
-import {MenusModule} from './menus/menus.module';
-import {UsageModule} from './usage/usage.module';
+import {UsageComponent} from './usage/usage.component';
 import {FormsModule} from '@angular/forms';
+import {MatSortModule} from '@angular/material/sort';
 import {
     MatExpansionModule,
     MatFormFieldModule,
     MatPaginatorModule,
     MatRadioModule,
     MatSlideToggleModule,
-    MatTableModule,
-    MatInputModule
+    MatTableModule
 } from '@angular/material';
 import {RdpModule} from 'portalsdk-tag-lib';
 import {AdminRouting} from './admin-routing.module';
 import {RoleFunctionsComponent} from './role-functions/role-functions.component';
 import {RolesComponent} from './roles/roles.component';
-import {NewRoleComponent} from './roles/new-role/new-role.component'
-import { UserService } from '../shared/services/user/user.service';
+import {NewRoleComponent} from './roles/new-role/new-role.component';
+import {MenusComponent} from './menus/menus.component';
+import {NewMenuComponent} from './menus/new-menu/new-menu.component';
+import {NewRoleFunctionComponent} from './role-functions/new-role-function/new-role-function.component';
 import { InformationModalComponent } from '../modals/information-modal/information-modal.component';
 
 @NgModule({
-  declarations: [AdminComponent, CacheAdminComponent, RoleFunctionsComponent, RolesComponent, NewRoleComponent, InformationModalComponent],
+    declarations: [AdminComponent, CacheAdminComponent, RoleFunctionsComponent, RolesComponent, NewRoleComponent, MenusComponent, NewMenuComponent, NewRoleFunctionComponent, UsageComponent, InformationModalComponent],
     imports: [
         CommonModule,
-        MenusModule,
-        UsageModule,
         FormsModule,
         MatRadioModule,
         RdpModule, 
@@ -37,11 +36,8 @@ import { InformationModalComponent } from '../modals/information-modal/informati
         MatTableModule, 
         MatSlideToggleModule, 
         MatPaginatorModule,
-        MatInputModule
+        MatSortModule
     ],
-    entryComponents: [NewRoleComponent, InformationModalComponent],
-    exports: [
-    ],
-    providers: [UserService]
+    entryComponents: [NewRoleComponent, InformationModalComponent]
 })
 export class AdminModule { }
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/role-functions/new-role-function/new-role-function.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/role-functions/new-role-function/new-role-function.component.ts
index d0be5145..ce894fe9 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/role-functions/new-role-function/new-role-function.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/role-functions/new-role-function/new-role-function.component.ts
@@ -136,11 +136,9 @@ export class NewRoleFunctionComponent implements OnInit {
         
         if (!exists && this.roleFunction.name.trim() != '' && this.roleFunction.code.trim() != '') {
           var postData = this.roleFunction;
-          //console.log("saveRoleFunction post data :: ",postData);
           this.adminService.saveRoleFunction(JSON.stringify(postData))
           .subscribe(_data => {
             this.showSpinner = false;
-            //console.log("saveRoleFunction response",_data);
             if (this.editRoleFunction) {
               this.editRoleFunction.name = this.roleFunction.name;
               this.passBackRoleFunctionPopup.emit(this.editRoleFunction);
@@ -153,7 +151,6 @@ export class NewRoleFunctionComponent implements OnInit {
               this.openConfirmationModal('Success', "Role function created successfully.");
             }  
           }, error =>{
-            //console.log(error);
             this.showSpinner = false;
             this.openConfirmationModal('Error', error.message);
           });
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/role-functions/role-functions.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/role-functions/role-functions.component.ts
index 3b97be51..6b836ebb 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/role-functions/role-functions.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/role-functions/role-functions.component.ts
@@ -38,7 +38,7 @@
 
 import { Component, OnInit, Directive, Input, Output, EventEmitter, ViewChildren, QueryList, PipeTransform, ViewChild } from '@angular/core';
 import { AdminService } from '../admin.service';
-import {UserService} from '../../shared/services/user/user.service'
+import {UserService} from '../../shared/services/user/user.service';
 import { User } from 'src/app/shared/services/user/user';
 import { of, Observable } from 'rxjs';
 import { RoleFunction } from './role-function';
@@ -105,7 +105,6 @@ export class RoleFunctionsComponent implements OnInit {
       this.result = JSON.parse(response.data);
       this.availableRoleFunctions = this.result.availableRoleFunctions;
       this.tableData = JSON.parse(this.result.availableRoleFunctions);
-      //console.log("Table data : ", this.tableData);
       this.columns.push(new Column("name", "Name", ColumnTypes.TEXT, true, null));
       this.columns.push(new Column("code", "Code", ColumnTypes.TEXT, true, null));
       this.columns.push(new Column("type", "Type", ColumnTypes.RADIO, true, this.typeOptions));
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/role-functions/role-functions.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/role-functions/role-functions.service.ts
index bd44a63d..38c6708c 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/role-functions/role-functions.service.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/admin/role-functions/role-functions.service.ts
@@ -21,14 +21,12 @@ export class RoleFunctionsService implements RdpCrudInterface {
   constructor(private adminService: AdminService) { }
 
   add(data: any) {
-    //console.log("Add method is getting called from RoleFunctionService data:: ", data);
   }
 
 
   update(data: any): any {
     console.log("Update method is getting called from RoleFunctionService data:: ", data);
     return this.adminService.saveRoleFunction(data).subscribe(response => {
-      //console.log("Success Response ", response);
       this.statusResponse.next("200");
     }, error => {
       console.log("Error ", error);
@@ -36,9 +34,7 @@ export class RoleFunctionsService implements RdpCrudInterface {
   }
 
   delete(data: any) {
-    //console.log("Delete method is getting called from RoleFunctionService data::>> " + JSON.stringify(data));
     this.adminService.deleteRoleFunction(data).subscribe(response => {
-      //console.log("Repsonse : ", response);
       this.statusResponse.next("200");
 
     })
@@ -50,7 +46,6 @@ export class RoleFunctionsService implements RdpCrudInterface {
     response.subscribe(res => {
       editedData = res;
       let data = JSON.parse(JSON.parse(editedData.data).availableRoleFunctions);
-      //console.log("Get Method called : ", data);
       this.updatedData.next(data);
     })
   }