1 files changed, 10 insertions, 14 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 { }