diff options
| author |   Lorraine Welch <lb2391@att.com> | 2020-06-15 15:12:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-06-15 15:12:44 +0000 |
| commit | 9656487a7b645453c53c2eeed4743e9f24943289 (patch) | |
| tree | f92b6578261a83d4e70c486f6e46be53ca204dcb /ecomp-sdk/epsdk-app-overlay/src/main | |
| parent | 7aed64ed6d96b5f47267f9da13e98a230512ba32 (diff) | |
| parent | 3f63deb7bed0e861bafdde5d1f9aceca8ed6bca9 (diff) | |
Merge "Modification in two components"
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main')
2 files changed, 2 insertions, 10 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.spec.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.spec.ts index eb8b63dd..a32b2e3e 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.spec.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.spec.ts @@ -56,11 +56,6 @@ describe('MenusComponent', () => { expect(component).toBeTruthy(); }); - // it('should test getFnMenuItems method inside getMenus',()=>{ - // let spy=spyOn(adminService,'getFnMenuItems').and.returnValue(Observable.of(stubData)) - // component.getMenus(); - // expect(spy).toHaveBeenCalled(); - // }) describe('test getMenus',()=>{ it('should test getMenus',()=>{ let spy=spyOn(adminService,'getParentData').and.returnValue(Observable.of('you object')) diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.ts index 5d996964..84d5b8ac 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/menus/menus.component.ts @@ -41,11 +41,8 @@ import { MatTableDataSource } from '@angular/material/table'; import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { AdminService } from '../admin.service'; -import { NgbModal, ModalDismissReasons, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; -import { InformationModalComponent } from 'src/app/modals/information-modal/information-modal.component'; -import { NewMenuComponent } from './new-menu/new-menu.component'; -import { Column, DataTableSettings, RdpCrudInterface , ColumnTypes} from 'portalsdk-tag-lib'; -import { element } from '@angular/core/src/render3'; +import { NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import { Column, DataTableSettings, ColumnTypes} from 'portalsdk-tag-lib'; import { MenusService } from './menus.service'; @Component({ |