diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts index 2910f948a2..85e4aa55c8 100644 --- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts +++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts @@ -16,7 +16,7 @@ import { MenuService } from '../../../shared/menu/menu.service'; import { MenuID } from '../../../shared/menu/menu-id.model'; import { LinkMenuItemModel } from '../../../shared/menu/menu-item/models/link.model'; import { MenuSection } from '../../../shared/menu/menu-section.model'; -import { MenuSectionComponent } from '../../../shared/menu/menu-section/menu-section.component'; +import { AbstractMenuSectionComponent } from '../../../shared/menu/menu-section/abstract-menu-section.component'; import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe'; /** @@ -30,7 +30,7 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe'; imports: [NgClass, RouterLink, TranslateModule, BrowserOnlyPipe], }) -export class AdminSidebarSectionComponent extends MenuSectionComponent implements OnInit { +export class AdminSidebarSectionComponent extends AbstractMenuSectionComponent implements OnInit { /** * This section resides in the Admin Sidebar @@ -44,16 +44,17 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement isDisabled: boolean; constructor( - @Inject('sectionDataProvider') menuSection: MenuSection, + @Inject('sectionDataProvider') protected section: MenuSection, protected menuService: MenuService, protected injector: Injector, protected router: Router, ) { - super(menuSection, menuService, injector); - this.itemModel = menuSection.model as LinkMenuItemModel; + super(menuService, injector); + this.itemModel = section.model as LinkMenuItemModel; } ngOnInit(): void { + // todo: should support all menu entries? this.isDisabled = this.itemModel?.disabled || isEmpty(this.itemModel?.link); super.ngOnInit(); } diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html index d051136921..3555a62787 100644 --- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html +++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html @@ -1,5 +1,6 @@ -
@@ -15,7 +16,7 @@ href="javascript:void(0);" >
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts index 1da92611c0..0ec0307427 100644 --- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts +++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.spec.ts @@ -11,6 +11,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { of as observableOf } from 'rxjs'; import { MenuService } from '../../../shared/menu/menu.service'; +import { MenuItemModels } from '../../../shared/menu/menu-section.model'; import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service'; import { CSSVariableServiceStub } from '../../../shared/testing/css-variable-service.stub'; import { MenuServiceStub } from '../../../shared/testing/menu-service.stub'; @@ -22,47 +23,92 @@ describe('ExpandableAdminSidebarSectionComponent', () => { let fixture: ComponentFixture; const menuService = new MenuServiceStub(); const iconString = 'test'; - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [NoopAnimationsModule, TranslateModule.forRoot(), ExpandableAdminSidebarSectionComponent, TestComponent], - providers: [ - { provide: 'sectionDataProvider', useValue: { icon: iconString, model: {} } }, - { provide: MenuService, useValue: menuService }, - { provide: CSSVariableService, useClass: CSSVariableServiceStub }, - { provide: Router, useValue: new RouterStub() }, - ], - }).compileComponents(); - })); - beforeEach(() => { - spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([])); - fixture = TestBed.createComponent(ExpandableAdminSidebarSectionComponent); - component = fixture.componentInstance; - spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent); - fixture.detectChanges(); - }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + describe('when there are subsections', () => { + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [NoopAnimationsModule, TranslateModule.forRoot(), ExpandableAdminSidebarSectionComponent, TestComponent], + providers: [ + { provide: 'sectionDataProvider', useValue: { icon: iconString, model: {} } }, + { provide: MenuService, useValue: menuService }, + { provide: CSSVariableService, useClass: CSSVariableServiceStub }, + { provide: Router, useValue: new RouterStub() }, + ], + }).compileComponents(); + })); - it('should set the right icon', () => { - const icon = fixture.debugElement.query(By.css('[data-test="sidebar-section-icon"] > i.fas')); - expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString); - }); - - describe('when the header text is clicked', () => { beforeEach(() => { - spyOn(menuService, 'toggleActiveSection'); - const sidebarToggler = fixture.debugElement.query(By.css('a.sidebar-section-wrapper')); - sidebarToggler.triggerEventHandler('click', { - preventDefault: () => {/**/ - }, - }); + spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([{ + id: 'test', + visible: true, + model: {} as MenuItemModels, + }])); + fixture = TestBed.createComponent(ExpandableAdminSidebarSectionComponent); + component = fixture.componentInstance; + spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent); + fixture.detectChanges(); }); - it('should call toggleActiveSection on the menuService', () => { - expect(menuService.toggleActiveSection).toHaveBeenCalled(); + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should set the right icon', () => { + const icon = fixture.debugElement.query(By.css('[data-test="sidebar-section-icon"] > i.fas')); + expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString); + }); + + describe('when the header text is clicked', () => { + beforeEach(() => { + spyOn(menuService, 'toggleActiveSection'); + const sidebarToggler = fixture.debugElement.query(By.css('a.sidebar-section-wrapper')); + sidebarToggler.triggerEventHandler('click', { + preventDefault: () => {/**/ + }, + }); + }); + + it('should call toggleActiveSection on the menuService', () => { + expect(menuService.toggleActiveSection).toHaveBeenCalled(); + }); + }); + }); + + + describe('when there are no subsections', () => { + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [NoopAnimationsModule, TranslateModule.forRoot()], + declarations: [ExpandableAdminSidebarSectionComponent, TestComponent], + providers: [ + { provide: 'sectionDataProvider', useValue: { icon: iconString, model: {} } }, + { provide: MenuService, useValue: menuService }, + { provide: CSSVariableService, useClass: CSSVariableServiceStub }, + { provide: Router, useValue: new RouterStub() }, + ], + }).overrideComponent(ExpandableAdminSidebarSectionComponent, { + }) + .compileComponents(); + })); + + beforeEach(() => { + spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([])); + fixture = TestBed.createComponent(ExpandableAdminSidebarSectionComponent); + component = fixture.componentInstance; + spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + it('should not contain a section', () => { + const icon = fixture.debugElement.query(By.css('.shortcut-icon')); + expect(icon).toBeNull(); + const sidebarToggler = fixture.debugElement.query(By.css('.sidebar-section')); + expect(sidebarToggler).toBeNull(); }); }); }); diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts index 37a4d0c30f..28aeabf7e6 100644 --- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts +++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts @@ -22,8 +22,10 @@ import { map } from 'rxjs/operators'; import { bgColor } from '../../../shared/animations/bgColor'; import { rotate } from '../../../shared/animations/rotate'; import { slide } from '../../../shared/animations/slide'; +import { isNotEmpty } from '../../../shared/empty.util'; import { MenuService } from '../../../shared/menu/menu.service'; import { MenuID } from '../../../shared/menu/menu-id.model'; +import { MenuSection } from '../../../shared/menu/menu-section.model'; import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service'; import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe'; import { AdminSidebarSectionComponent } from '../admin-sidebar-section/admin-sidebar-section.component'; @@ -67,14 +69,20 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC */ isExpanded$: Observable; + /** + * Emits true when the top section has subsections, else emits false + */ + hasSubSections$: Observable; + + constructor( - @Inject('sectionDataProvider') menuSection, + @Inject('sectionDataProvider') protected section: MenuSection, protected menuService: MenuService, private variableService: CSSVariableService, protected injector: Injector, protected router: Router, ) { - super(menuSection, menuService, injector, router); + super(section, menuService, injector, router); } /** @@ -82,6 +90,9 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC */ ngOnInit(): void { super.ngOnInit(); + this.hasSubSections$ = this.subSections$.pipe( + map((subSections) => isNotEmpty(subSections)), + ); this.sidebarActiveBg$ = this.variableService.getVariable('--ds-admin-sidebar-active-bg'); this.isSidebarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID); this.isSidebarPreviewCollapsed$ = this.menuService.isMenuPreviewCollapsed(this.menuID); diff --git a/src/app/app.menus.ts b/src/app/app.menus.ts new file mode 100644 index 0000000000..b5bf4f167f --- /dev/null +++ b/src/app/app.menus.ts @@ -0,0 +1,79 @@ +/** + * The contents of this file are subject to the license and copyright + * detailed in the LICENSE and NOTICE files at the root of the source + * tree and available online at + * + * http://www.dspace.org/license/ + */ +import { buildMenuStructure } from './shared/menu/menu.structure'; +import { MenuID } from './shared/menu/menu-id.model'; +import { MenuRoute } from './shared/menu/menu-route.model'; +import { AccessControlMenuProvider } from './shared/menu/providers/access-control.menu'; +import { AdminSearchMenuProvider } from './shared/menu/providers/admin-search.menu'; +import { BrowseMenuProvider } from './shared/menu/providers/browse.menu'; +import { SubscribeMenuProvider } from './shared/menu/providers/comcol-subscribe.menu'; +import { CommunityListMenuProvider } from './shared/menu/providers/community-list.menu'; +import { CurationMenuProvider } from './shared/menu/providers/curation.menu'; +import { DSpaceObjectEditMenuProvider } from './shared/menu/providers/dso-edit.menu'; +import { DsoOptionMenuProvider } from './shared/menu/providers/dso-option.menu'; +import { EditMenuProvider } from './shared/menu/providers/edit.menu'; +import { ExportMenuProvider } from './shared/menu/providers/export.menu'; +import { HealthMenuProvider } from './shared/menu/providers/health.menu'; +import { ImportMenuProvider } from './shared/menu/providers/import.menu'; +import { ClaimMenuProvider } from './shared/menu/providers/item-claim.menu'; +import { OrcidMenuProvider } from './shared/menu/providers/item-orcid.menu'; +import { VersioningMenuProvider } from './shared/menu/providers/item-versioning.menu'; +import { NewMenuProvider } from './shared/menu/providers/new.menu'; +import { ProcessesMenuProvider } from './shared/menu/providers/processes.menu'; +import { RegistriesMenuProvider } from './shared/menu/providers/registries.menu'; +import { StatisticsMenuProvider } from './shared/menu/providers/statistics.menu'; +import { SystemWideAlertMenuProvider } from './shared/menu/providers/system-wide-alert.menu'; +import { WorkflowMenuProvider } from './shared/menu/providers/workflow.menu'; + +export const MENUS = buildMenuStructure({ + [MenuID.PUBLIC]: [ + CommunityListMenuProvider, + BrowseMenuProvider, + StatisticsMenuProvider, + ], + [MenuID.ADMIN]: [ + NewMenuProvider, + EditMenuProvider, + ImportMenuProvider, + ExportMenuProvider, + AccessControlMenuProvider, + AdminSearchMenuProvider, + RegistriesMenuProvider, + CurationMenuProvider, + ProcessesMenuProvider, + WorkflowMenuProvider, + HealthMenuProvider, + SystemWideAlertMenuProvider, + ], + [MenuID.DSO_EDIT]: [ + DsoOptionMenuProvider.withSubs([ + SubscribeMenuProvider.onRoute( + MenuRoute.SIMPLE_COMMUNITY_PAGE, + MenuRoute.SIMPLE_COLLECTION_PAGE, + ), + DSpaceObjectEditMenuProvider.onRoute( + MenuRoute.SIMPLE_COMMUNITY_PAGE, + MenuRoute.SIMPLE_COLLECTION_PAGE, + MenuRoute.SIMPLE_ITEM_PAGE, + MenuRoute.FULL_ITEM_PAGE, + ), + VersioningMenuProvider.onRoute( + MenuRoute.SIMPLE_ITEM_PAGE, + MenuRoute.FULL_ITEM_PAGE, + ), + OrcidMenuProvider.onRoute( + MenuRoute.SIMPLE_ITEM_PAGE, + MenuRoute.FULL_ITEM_PAGE, + ), + ClaimMenuProvider.onRoute( + MenuRoute.SIMPLE_ITEM_PAGE, + MenuRoute.FULL_ITEM_PAGE, + ), + ]), + ], +}); diff --git a/src/app/init.service.ts b/src/app/init.service.ts index 789aa2e03d..e40563fab3 100644 --- a/src/app/init.service.ts +++ b/src/app/init.service.ts @@ -42,10 +42,10 @@ import { HeadTagService } from './core/metadata/head-tag.service'; import { CorrelationIdService } from './correlation-id/correlation-id.service'; import { dsDynamicFormControlMapFn } from './shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-map-fn'; import { MenuService } from './shared/menu/menu.service'; +import { MenuProviderService } from './shared/menu/menu-provider.service'; import { ThemeService } from './shared/theme-support/theme.service'; import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider'; - /** * Performs the initialization of the app. * @@ -74,6 +74,7 @@ export abstract class InitService { protected breadcrumbsService: BreadcrumbsService, protected themeService: ThemeService, protected menuService: MenuService, + protected menuProviderService: MenuProviderService, ) { } @@ -216,7 +217,7 @@ export abstract class InitService { this.headTagService.listenForRouteChange(); this.breadcrumbsService.listenForRouteChanges(); this.themeService.listenForRouteChanges(); - this.menuService.listenForRouteChanges(); + this.menuProviderService.listenForRouteChanges(); } /** diff --git a/src/app/item-page/item-page-routing-paths.ts b/src/app/item-page/item-page-routing-paths.ts index cded1dd74e..5102339d11 100644 --- a/src/app/item-page/item-page-routing-paths.ts +++ b/src/app/item-page/item-page-routing-paths.ts @@ -8,6 +8,8 @@ export function getItemModuleRoute() { return `/${ITEM_MODULE_PATH}`; } +export const ENTITY_MODULE_PATH = 'entities'; + /** * Get the route to an item's page * Depending on the item's entity type, the route will either start with /items or /entities diff --git a/src/app/menu-resolver.service.ts b/src/app/menu-resolver.service.ts deleted file mode 100644 index 683111b32a..0000000000 --- a/src/app/menu-resolver.service.ts +++ /dev/null @@ -1,857 +0,0 @@ -import { Injectable } from '@angular/core'; -import { - ActivatedRouteSnapshot, - RouterStateSnapshot, -} from '@angular/router'; -import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; -import { - combineLatest, - combineLatest as observableCombineLatest, - mergeMap, - Observable, - of as observableOf, -} from 'rxjs'; -import { - filter, - find, - map, - take, -} from 'rxjs/operators'; - -import { PUBLICATION_CLAIMS_PATH } from './admin/admin-notifications/admin-notifications-routing-paths'; -import { AuthService } from './core/auth/auth.service'; -import { BrowseService } from './core/browse/browse.service'; -import { ConfigurationDataService } from './core/data/configuration-data.service'; -import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from './core/data/feature-authorization/feature-id'; -import { PaginatedList } from './core/data/paginated-list.model'; -import { - METADATA_EXPORT_SCRIPT_NAME, - METADATA_IMPORT_SCRIPT_NAME, - ScriptDataService, -} from './core/data/processes/script-data.service'; -import { RemoteData } from './core/data/remote-data'; -import { BrowseDefinition } from './core/shared/browse-definition.model'; -import { ConfigurationProperty } from './core/shared/configuration-property.model'; -import { getFirstCompletedRemoteData } from './core/shared/operators'; -import { ThemedCreateCollectionParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component'; -import { ThemedCreateCommunityParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component'; -import { ThemedCreateItemParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component'; -import { ThemedEditCollectionSelectorComponent } from './shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component'; -import { ThemedEditCommunitySelectorComponent } from './shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component'; -import { ThemedEditItemSelectorComponent } from './shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component'; -import { ExportBatchSelectorComponent } from './shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component'; -import { ExportMetadataSelectorComponent } from './shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component'; -import { hasValue } from './shared/empty.util'; -import { MenuService } from './shared/menu/menu.service'; -import { MenuID } from './shared/menu/menu-id.model'; -import { LinkMenuItemModel } from './shared/menu/menu-item/models/link.model'; -import { OnClickMenuItemModel } from './shared/menu/menu-item/models/onclick.model'; -import { TextMenuItemModel } from './shared/menu/menu-item/models/text.model'; -import { MenuItemType } from './shared/menu/menu-item-type.model'; -import { MenuState } from './shared/menu/menu-state.model'; - -/** - * Creates all of the app's menus - */ -@Injectable({ - providedIn: 'root', -}) -export class MenuResolverService { - constructor( - protected menuService: MenuService, - protected browseService: BrowseService, - protected authorizationService: AuthorizationDataService, - protected modalService: NgbModal, - protected scriptDataService: ScriptDataService, - protected configurationDataService: ConfigurationDataService, - protected authService: AuthService, - ) { - } - - /** - * Initialize all menus - */ - resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { - return combineLatest([ - this.createPublicMenu$(), - this.createAdminMenuIfLoggedIn$(), - ]).pipe( - map((menusDone: boolean[]) => menusDone.every(Boolean)), - ); - } - - /** - * Wait for a specific menu to appear - * @param id the ID of the menu to wait for - * @return an Observable that emits true as soon as the menu is created - */ - protected waitForMenu$(id: MenuID): Observable { - return this.menuService.getMenu(id).pipe( - find((menu: MenuState) => hasValue(menu)), - map(() => true), - ); - } - - /** - * Initialize all menu sections and items for {@link MenuID.PUBLIC} - */ - createPublicMenu$(): Observable { - const menuList: any[] = [ - /* Communities & Collections tree */ - { - id: `browse_global_communities_and_collections`, - active: false, - visible: true, - index: 0, - model: { - type: MenuItemType.LINK, - text: `menu.section.browse_global_communities_and_collections`, - link: `/community-list`, - } as LinkMenuItemModel, - }, - ]; - // Read the different Browse-By types from config and add them to the browse menu - this.browseService.getBrowseDefinitions() - .pipe(getFirstCompletedRemoteData>()) - .subscribe((browseDefListRD: RemoteData>) => { - if (browseDefListRD.hasSucceeded) { - browseDefListRD.payload.page.forEach((browseDef: BrowseDefinition) => { - menuList.push({ - id: `browse_global_by_${browseDef.id}`, - parentID: 'browse_global', - active: false, - visible: true, - model: { - type: MenuItemType.LINK, - text: `menu.section.browse_global_by_${browseDef.id}`, - link: `/browse/${browseDef.id}`, - } as LinkMenuItemModel, - }); - }); - menuList.push( - /* Browse */ - { - id: 'browse_global', - active: false, - visible: true, - index: 1, - model: { - type: MenuItemType.TEXT, - text: 'menu.section.browse_global', - } as TextMenuItemModel, - }, - ); - } - menuList.forEach((menuSection) => this.menuService.addSection(MenuID.PUBLIC, Object.assign(menuSection, { - shouldPersistOnRouteChange: true, - }))); - }); - - return this.waitForMenu$(MenuID.PUBLIC); - } - - /** - * Initialize all menu sections and items for {@link MenuID.ADMIN}, only if the user is logged in. - */ - createAdminMenuIfLoggedIn$() { - return this.authService.isAuthenticated().pipe( - mergeMap((isAuthenticated) => isAuthenticated ? this.createAdminMenu$() : observableOf(true)), - ); - } - - /** - * Initialize all menu sections and items for {@link MenuID.ADMIN} - */ - createAdminMenu$() { - this.createMainMenuSections(); - this.createSiteAdministratorMenuSections(); - this.createExportMenuSections(); - this.createImportMenuSections(); - this.createAccessControlMenuSections(); - return this.waitForMenu$(MenuID.ADMIN); - } - - /** - * Initialize the main menu sections. - * edit_community / edit_collection is only included if the current user is a Community or Collection admin - */ - createMainMenuSections() { - combineLatest([ - this.authorizationService.isAuthorized(FeatureID.IsCollectionAdmin), - this.authorizationService.isAuthorized(FeatureID.IsCommunityAdmin), - this.authorizationService.isAuthorized(FeatureID.AdministratorOf), - this.authorizationService.isAuthorized(FeatureID.CanSubmit), - this.authorizationService.isAuthorized(FeatureID.CanEditItem), - this.authorizationService.isAuthorized(FeatureID.CanSeeQA), - this.authorizationService.isAuthorized(FeatureID.CoarNotifyEnabled), - ]).subscribe(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin, canSubmit, canEditItem, canSeeQa, isCoarNotifyEnabled]) => { - const newSubMenuList = [ - { - id: 'new_community', - parentID: 'new', - active: false, - visible: isCommunityAdmin, - model: { - type: MenuItemType.ONCLICK, - text: 'menu.section.new_community', - function: () => { - this.modalService.open(ThemedCreateCommunityParentSelectorComponent); - }, - } as OnClickMenuItemModel, - }, - { - id: 'new_collection', - parentID: 'new', - active: false, - visible: isCommunityAdmin, - model: { - type: MenuItemType.ONCLICK, - text: 'menu.section.new_collection', - function: () => { - this.modalService.open(ThemedCreateCollectionParentSelectorComponent); - }, - } as OnClickMenuItemModel, - }, - { - id: 'new_item', - parentID: 'new', - active: false, - visible: canSubmit, - model: { - type: MenuItemType.ONCLICK, - text: 'menu.section.new_item', - function: () => { - this.modalService.open(ThemedCreateItemParentSelectorComponent); - }, - } as OnClickMenuItemModel, - }, - { - id: 'new_process', - parentID: 'new', - active: false, - visible: isSiteAdmin, - model: { - type: MenuItemType.LINK, - text: 'menu.section.new_process', - link: '/processes/new', - } as LinkMenuItemModel, - },/* ldn_services */ - { - id: 'ldn_services_new', - parentID: 'new', - active: false, - visible: isSiteAdmin && isCoarNotifyEnabled, - model: { - type: MenuItemType.LINK, - text: 'menu.section.services_new', - link: '/admin/ldn/services/new', - } as LinkMenuItemModel, - icon: '', - }, - ]; - const editSubMenuList = [ - /* Edit */ - { - id: 'edit_community', - parentID: 'edit', - active: false, - visible: isCommunityAdmin, - model: { - type: MenuItemType.ONCLICK, - text: 'menu.section.edit_community', - function: () => { - this.modalService.open(ThemedEditCommunitySelectorComponent); - }, - } as OnClickMenuItemModel, - }, - { - id: 'edit_collection', - parentID: 'edit', - active: false, - visible: isCollectionAdmin, - model: { - type: MenuItemType.ONCLICK, - text: 'menu.section.edit_collection', - function: () => { - this.modalService.open(ThemedEditCollectionSelectorComponent); - }, - } as OnClickMenuItemModel, - }, - { - id: 'edit_item', - parentID: 'edit', - active: false, - visible: canEditItem, - model: { - type: MenuItemType.ONCLICK, - text: 'menu.section.edit_item', - function: () => { - this.modalService.open(ThemedEditItemSelectorComponent); - }, - } as OnClickMenuItemModel, - }, - ]; - const newSubMenu = { - id: 'new', - active: false, - visible: newSubMenuList.some(subMenu => subMenu.visible), - model: { - type: MenuItemType.TEXT, - text: 'menu.section.new', - } as TextMenuItemModel, - icon: 'plus', - index: 0, - }; - const editSubMenu = { - id: 'edit', - active: false, - visible: editSubMenuList.some(subMenu => subMenu.visible), - model: { - type: MenuItemType.TEXT, - text: 'menu.section.edit', - } as TextMenuItemModel, - icon: 'pencil-alt', - index: 1, - }; - - const menuList = [ - ...newSubMenuList, - newSubMenu, - ...editSubMenuList, - editSubMenu, - // TODO: enable this menu item once the feature has been implemented - // { - // id: 'new_item_version', - // parentID: 'new', - // active: false, - // visible: true, - // model: { - // type: MenuItemType.LINK, - // text: 'menu.section.new_item_version', - // link: '' - // } as LinkMenuItemModel, - // }, - - /* Statistics */ - // TODO: enable this menu item once the feature has been implemented - // { - // id: 'statistics_task', - // active: false, - // visible: true, - // model: { - // type: MenuItemType.LINK, - // text: 'menu.section.statistics_task', - // link: '' - // } as LinkMenuItemModel, - // icon: 'chart-bar', - // index: 8 - // }, - - /* Control Panel */ - // TODO: enable this menu item once the feature has been implemented - // { - // id: 'control_panel', - // active: false, - // visible: isSiteAdmin, - // model: { - // type: MenuItemType.LINK, - // text: 'menu.section.control_panel', - // link: '' - // } as LinkMenuItemModel, - // icon: 'cogs', - // index: 9 - // }, - - /* Processes */ - { - id: 'processes', - active: false, - visible: isSiteAdmin, - model: { - type: MenuItemType.LINK, - text: 'menu.section.processes', - link: '/processes', - } as LinkMenuItemModel, - icon: 'terminal', - index: 10, - }, - /* COAR Notify section */ - { - id: 'coar_notify', - active: false, - visible: isSiteAdmin && isCoarNotifyEnabled, - model: { - type: MenuItemType.TEXT, - text: 'menu.section.coar_notify', - } as TextMenuItemModel, - icon: 'inbox', - index: 13, - }, - { - id: 'notify_dashboard', - active: false, - parentID: 'coar_notify', - visible: isSiteAdmin && isCoarNotifyEnabled, - model: { - type: MenuItemType.LINK, - text: 'menu.section.notify_dashboard', - link: '/admin/notify-dashboard', - } as LinkMenuItemModel, - }, - /* LDN Services */ - { - id: 'ldn_services', - active: false, - parentID: 'coar_notify', - visible: isSiteAdmin && isCoarNotifyEnabled, - model: { - type: MenuItemType.LINK, - text: 'menu.section.services', - link: '/admin/ldn/services', - } as LinkMenuItemModel, - }, - { - id: 'health', - active: false, - visible: isSiteAdmin, - model: { - type: MenuItemType.LINK, - text: 'menu.section.health', - link: '/health', - } as LinkMenuItemModel, - icon: 'heartbeat', - index: 11, - }, - /* Notifications */ - { - id: 'notifications', - active: false, - visible: canSeeQa || isSiteAdmin, - model: { - type: MenuItemType.TEXT, - text: 'menu.section.notifications', - } as TextMenuItemModel, - icon: 'bell', - index: 4, - }, - { - id: 'notifications_quality-assurance', - parentID: 'notifications', - active: false, - visible: canSeeQa, - model: { - type: MenuItemType.LINK, - text: 'menu.section.quality-assurance', - link: '/notifications/quality-assurance', - } as LinkMenuItemModel, - }, - { - id: 'notifications_publication-claim', - parentID: 'notifications', - active: false, - visible: isSiteAdmin, - model: { - type: MenuItemType.LINK, - text: 'menu.section.notifications_publication-claim', - link: '/admin/notifications/' + PUBLICATION_CLAIMS_PATH, - } as LinkMenuItemModel, - }, - /* Admin Search */ - ]; - menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, { - shouldPersistOnRouteChange: true, - }))); - }); - } - - /** - * Create menu sections dependent on whether or not the current user is a site administrator and on whether or not - * the export scripts exist and the current user is allowed to execute them - */ - createExportMenuSections() { - const menuList = [ - // TODO: enable this menu item once the feature has been implemented - // { - // id: 'export_community', - // parentID: 'export', - // active: false, - // visible: true, - // model: { - // type: MenuItemType.LINK, - // text: 'menu.section.export_community', - // link: '' - // } as LinkMenuItemModel, - // shouldPersistOnRouteChange: true - // }, - // TODO: enable this menu item once the feature has been implemented - // { - // id: 'export_collection', - // parentID: 'export', - // active: false, - // visible: true, - // model: { - // type: MenuItemType.LINK, - // text: 'menu.section.export_collection', - // link: '' - // } as LinkMenuItemModel, - // shouldPersistOnRouteChange: true - // }, - // TODO: enable this menu item once the feature has been implemented - // { - // id: 'export_item', - // parentID: 'export', - // active: false, - // visible: true, - // model: { - // type: MenuItemType.LINK, - // text: 'menu.section.export_item', - // link: '' - // } as LinkMenuItemModel, - // shouldPersistOnRouteChange: true - // }, - ]; - menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, menuSection)); - - observableCombineLatest([ - this.authorizationService.isAuthorized(FeatureID.AdministratorOf), - this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME), - ]).pipe( - filter(([authorized, metadataExportScriptExists]: boolean[]) => authorized && metadataExportScriptExists), - take(1), - ).subscribe(() => { - // Hides the export menu for unauthorised people - // If in the future more sub-menus are added, - // it should be reviewed if they need to be in this subscribe - this.menuService.addSection(MenuID.ADMIN, { - id: 'export', - active: false, - visible: true, - model: { - type: MenuItemType.TEXT, - text: 'menu.section.export', - } as TextMenuItemModel, - icon: 'file-export', - index: 3, - shouldPersistOnRouteChange: true, - }); - this.menuService.addSection(MenuID.ADMIN, { - id: 'export_metadata', - parentID: 'export', - active: true, - visible: true, - model: { - type: MenuItemType.ONCLICK, - text: 'menu.section.export_metadata', - function: () => { - this.modalService.open(ExportMetadataSelectorComponent); - }, - } as OnClickMenuItemModel, - shouldPersistOnRouteChange: true, - }); - this.menuService.addSection(MenuID.ADMIN, { - id: 'export_batch', - parentID: 'export', - active: false, - visible: true, - model: { - type: MenuItemType.ONCLICK, - text: 'menu.section.export_batch', - function: () => { - this.modalService.open(ExportBatchSelectorComponent); - }, - } as OnClickMenuItemModel, - shouldPersistOnRouteChange: true, - }); - }); - } - - /** - * Create menu sections dependent on whether or not the current user is a site administrator and on whether or not - * the import scripts exist and the current user is allowed to execute them - */ - createImportMenuSections() { - const menuList = []; - menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, menuSection)); - - observableCombineLatest([ - this.authorizationService.isAuthorized(FeatureID.AdministratorOf), - this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_IMPORT_SCRIPT_NAME), - ]).pipe( - filter(([authorized, metadataImportScriptExists]: boolean[]) => authorized && metadataImportScriptExists), - take(1), - ).subscribe(() => { - // Hides the import menu for unauthorised people - // If in the future more sub-menus are added, - // it should be reviewed if they need to be in this subscribe - this.menuService.addSection(MenuID.ADMIN, { - id: 'import', - active: false, - visible: true, - model: { - type: MenuItemType.TEXT, - text: 'menu.section.import', - } as TextMenuItemModel, - icon: 'file-import', - index: 2, - shouldPersistOnRouteChange: true, - }); - this.menuService.addSection(MenuID.ADMIN, { - id: 'import_metadata', - parentID: 'import', - active: true, - visible: true, - model: { - type: MenuItemType.LINK, - text: 'menu.section.import_metadata', - link: '/admin/metadata-import', - } as LinkMenuItemModel, - shouldPersistOnRouteChange: true, - }); - this.menuService.addSection(MenuID.ADMIN, { - id: 'import_batch', - parentID: 'import', - active: false, - visible: true, - model: { - type: MenuItemType.LINK, - text: 'menu.section.import_batch', - link: '/admin/batch-import', - } as LinkMenuItemModel, - shouldPersistOnRouteChange: true, - }); - }); - } - - /** - * Create menu sections dependent on whether or not the current user is a site administrator - */ - createSiteAdministratorMenuSections() { - this.authorizationService.isAuthorized(FeatureID.AdministratorOf) - .subscribe((authorized) => { - const menuList = [ - { - id: 'admin_search', - active: false, - visible: authorized, - model: { - type: MenuItemType.LINK, - text: 'menu.section.admin_search', - link: '/admin/search', - } as LinkMenuItemModel, - icon: 'search', - index: 5, - }, - /* Registries */ - { - id: 'registries', - active: false, - visible: authorized, - model: { - type: MenuItemType.TEXT, - text: 'menu.section.registries', - } as TextMenuItemModel, - icon: 'list', - index: 6, - }, - { - id: 'registries_metadata', - parentID: 'registries', - active: false, - visible: authorized, - model: { - type: MenuItemType.LINK, - text: 'menu.section.registries_metadata', - link: 'admin/registries/metadata', - } as LinkMenuItemModel, - }, - { - id: 'registries_format', - parentID: 'registries', - active: false, - visible: authorized, - model: { - type: MenuItemType.LINK, - text: 'menu.section.registries_format', - link: 'admin/registries/bitstream-formats', - } as LinkMenuItemModel, - }, - - /* Curation tasks */ - { - id: 'curation_tasks', - active: false, - visible: authorized, - model: { - type: MenuItemType.LINK, - text: 'menu.section.curation_task', - link: 'admin/curation-tasks', - } as LinkMenuItemModel, - icon: 'filter', - index: 7, - }, - - /* Workflow */ - { - id: 'workflow', - active: false, - visible: authorized, - model: { - type: MenuItemType.LINK, - text: 'menu.section.workflow', - link: '/admin/workflow', - } as LinkMenuItemModel, - icon: 'user-check', - index: 11, - }, - { - id: 'system_wide_alert', - active: false, - visible: authorized, - model: { - type: MenuItemType.LINK, - text: 'menu.section.system-wide-alert', - link: '/admin/system-wide-alert', - } as LinkMenuItemModel, - icon: 'exclamation-circle', - index: 12, - }, - ]; - - menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, { - shouldPersistOnRouteChange: true, - }))); - }); - } - - /** - * Create menu sections dependent on whether or not the current user can manage access control groups - */ - createAccessControlMenuSections() { - observableCombineLatest([ - this.authorizationService.isAuthorized(FeatureID.AdministratorOf), - this.authorizationService.isAuthorized(FeatureID.CanManageGroups), - ]).subscribe(([isSiteAdmin, canManageGroups]) => { - const menuList = [ - /* Access Control */ - { - id: 'access_control_people', - parentID: 'access_control', - active: false, - visible: isSiteAdmin, - model: { - type: MenuItemType.LINK, - text: 'menu.section.access_control_people', - link: '/access-control/epeople', - } as LinkMenuItemModel, - }, - { - id: 'access_control_groups', - parentID: 'access_control', - active: false, - visible: canManageGroups, - model: { - type: MenuItemType.LINK, - text: 'menu.section.access_control_groups', - link: '/access-control/groups', - } as LinkMenuItemModel, - }, - { - id: 'access_control_bulk', - parentID: 'access_control', - active: false, - visible: isSiteAdmin, - model: { - type: MenuItemType.LINK, - text: 'menu.section.access_control_bulk', - link: '/access-control/bulk-access', - } as LinkMenuItemModel, - }, - // TODO: enable this menu item once the feature has been implemented - // { - // id: 'access_control_authorizations', - // parentID: 'access_control', - // active: false, - // visible: authorized, - // model: { - // type: MenuItemType.LINK, - // text: 'menu.section.access_control_authorizations', - // link: '' - // } as LinkMenuItemModel, - // }, - { - id: 'access_control', - active: false, - visible: canManageGroups || isSiteAdmin, - model: { - type: MenuItemType.TEXT, - text: 'menu.section.access_control', - } as TextMenuItemModel, - icon: 'key', - index: 4, - }, - ]; - - menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, { - shouldPersistOnRouteChange: true, - }))); - }); - } - - /** - * Create menu sections dependent on whether or not the current user is a site administrator - */ - createReportMenuSections() { - observableCombineLatest([ - this.configurationDataService.findByPropertyName('contentreport.enable').pipe( - getFirstCompletedRemoteData(), - map((res: RemoteData) => res.hasSucceeded && res.payload && res.payload.values[0] === 'true'), - ), - this.authorizationService.isAuthorized(FeatureID.AdministratorOf), - ]).subscribe(([isSiteAdmin]) => { - const menuList = [ - { - id: 'reports', - active: false, - visible: isSiteAdmin, - model: { - type: MenuItemType.TEXT, - text: 'menu.section.reports', - } as TextMenuItemModel, - icon: 'file-alt', - index: 5, - }, - /* Collections Report */ - { - id: 'reports_collections', - parentID: 'reports', - active: false, - visible: isSiteAdmin, - model: { - type: MenuItemType.LINK, - text: 'menu.section.reports.collections', - link: '/admin/reports/collections', - } as LinkMenuItemModel, - icon: 'user-check', - }, - /* Queries Report */ - { - id: 'reports_queries', - parentID: 'reports', - active: false, - visible: isSiteAdmin, - model: { - type: MenuItemType.LINK, - text: 'menu.section.reports.queries', - link: '/admin/reports/queries', - } as LinkMenuItemModel, - icon: 'user-check', - }, - ]; - - menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, { - shouldPersistOnRouteChange: true, - }))); - }); - } -} diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts deleted file mode 100644 index 720c071104..0000000000 --- a/src/app/menu.resolver.spec.ts +++ /dev/null @@ -1,440 +0,0 @@ -import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { - TestBed, - waitForAsync, -} from '@angular/core/testing'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { RouterTestingModule } from '@angular/router/testing'; -import { - NgbModal, - NgbModalRef, -} from '@ng-bootstrap/ng-bootstrap'; -import { TranslateModule } from '@ngx-translate/core'; -import { cold } from 'jasmine-marbles'; -import { of as observableOf } from 'rxjs'; - -import { AdminSidebarComponent } from './admin/admin-sidebar/admin-sidebar.component'; -import { BrowseService } from './core/browse/browse.service'; -import { ConfigurationDataService } from './core/data/configuration-data.service'; -import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service'; -import { FeatureID } from './core/data/feature-authorization/feature-id'; -import { ScriptDataService } from './core/data/processes/script-data.service'; -import { MenuService } from './shared/menu/menu.service'; -import { MenuID } from './shared/menu/menu-id.model'; -import { createSuccessfulRemoteDataObject$ } from './shared/remote-data.utils'; -import { ConfigurationDataServiceStub } from './shared/testing/configuration-data.service.stub'; -import { MenuServiceStub } from './shared/testing/menu-service.stub'; -import { createPaginatedList } from './shared/testing/utils.test'; -import createSpy = jasmine.createSpy; -import { AuthService } from './core/auth/auth.service'; -import { MenuResolverService } from './menu-resolver.service'; -import { AuthServiceStub } from './shared/testing/auth-service.stub'; - -const BOOLEAN = { t: true, f: false }; -const MENU_STATE = { - id: 'some menu', -}; -const BROWSE_DEFINITIONS = [ - { id: 'definition1' }, - { id: 'definition2' }, - { id: 'definition3' }, -]; - -describe('menuResolver', () => { - let resolver: MenuResolverService; - - let menuService; - let browseService; - let authorizationService; - let scriptService; - let mockNgbModal; - let configurationDataService; - - beforeEach(waitForAsync(() => { - menuService = new MenuServiceStub(); - spyOn(menuService, 'getMenu').and.returnValue(observableOf(MENU_STATE)); - spyOn(menuService, 'addSection'); - - browseService = jasmine.createSpyObj('browseService', { - getBrowseDefinitions: createSuccessfulRemoteDataObject$(createPaginatedList(BROWSE_DEFINITIONS)), - }); - authorizationService = jasmine.createSpyObj('authorizationService', { - isAuthorized: observableOf(true), - }); - scriptService = jasmine.createSpyObj('scriptService', { - scriptWithNameExistsAndCanExecute: observableOf(true), - }); - mockNgbModal = { - open: jasmine.createSpy('open').and.returnValue( - { componentInstance: {}, closed: observableOf({}) } as NgbModalRef, - ), - }; - - configurationDataService = new ConfigurationDataServiceStub(); - spyOn(configurationDataService, 'findByPropertyName').and.returnValue(observableOf(true)); - - TestBed.configureTestingModule({ - imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule, AdminSidebarComponent], - providers: [ - { provide: MenuService, useValue: menuService }, - { provide: BrowseService, useValue: browseService }, - { provide: AuthorizationDataService, useValue: authorizationService }, - { provide: ScriptDataService, useValue: scriptService }, - { provide: ConfigurationDataService, useValue: configurationDataService }, - { provide: NgbModal, useValue: mockNgbModal }, - { provide: AuthService, useValue: AuthServiceStub }, - MenuResolverService, - ], - schemas: [NO_ERRORS_SCHEMA], - }); - resolver = TestBed.inject(MenuResolverService); - })); - - it('should be created', () => { - expect(resolver).toBeTruthy(); - }); - - describe('resolve', () => { - it('should create all menus', (done) => { - spyOn(resolver, 'createPublicMenu$').and.returnValue(observableOf(true)); - spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(observableOf(true)); - - resolver.resolve(null, null).subscribe(resolved => { - expect(resolved).toBeTrue(); - expect(resolver.createPublicMenu$).toHaveBeenCalled(); - expect(resolver.createAdminMenuIfLoggedIn$).toHaveBeenCalled(); - done(); - }); - }); - - it('should return an Observable that emits true as soon as all menus are created', () => { - spyOn(resolver, 'createPublicMenu$').and.returnValue(cold('--(t|)', BOOLEAN)); - spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(cold('----(t|)', BOOLEAN)); - - expect(resolver.resolve(null, null)).toBeObservable(cold('----(t|)', BOOLEAN)); - }); - }); - - describe('createPublicMenu$', () => { - it('should retrieve the menu by ID return an Observable that emits true as soon as it is created', () => { - (menuService as any).getMenu.and.returnValue(cold('--u--m--', { - u: undefined, - m: MENU_STATE, - })); - - expect(resolver.createPublicMenu$()).toBeObservable(cold('-----(t|)', BOOLEAN)); - expect(menuService.getMenu).toHaveBeenCalledOnceWith(MenuID.PUBLIC); - }); - - describe('contents', () => { - beforeEach((done) => { - resolver.createPublicMenu$().subscribe((_) => { - done(); - }); - }); - - it('should include community list link', () => { - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({ - id: 'browse_global_communities_and_collections', visible: true, - })); - }); - - it('should include browse dropdown', () => { - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({ - id: 'browse_global_by_definition1', parentID: 'browse_global', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({ - id: 'browse_global_by_definition2', parentID: 'browse_global', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({ - id: 'browse_global_by_definition3', parentID: 'browse_global', visible: true, - })); - - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, jasmine.objectContaining({ - id: 'browse_global', visible: true, - })); - }); - }); - }); - - describe('createAdminMenu$', () => { - const dontShowAdminSections = () => { - it('should not show site admin section', () => { - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'admin_search', visible: false, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'registries', visible: false, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - parentID: 'registries', visible: false, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'curation_tasks', visible: false, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'workflow', visible: false, - })); - }); - - it('should not show access control section', () => { - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'access_control', visible: false, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - parentID: 'access_control', visible: false, - })); - }); - - // We check that the menu section has not been called with visible set to true - // The reason why we don't check if it has been called with visible set to false - // Is because the function does not get called unless a user is authorised - it('should not show the import section', () => { - expect(menuService.addSection).not.toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'import', visible: true, - })); - }); - - // We check that the menu section has not been called with visible set to true - // The reason why we don't check if it has been called with visible set to false - // Is because the function does not get called unless a user is authorised - it('should not show the export section', () => { - expect(menuService.addSection).not.toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'export', visible: true, - })); - }); - }; - - const dontShowNewSection = () => { - it('should not show the "New" section', () => { - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'new_community', visible: false, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'new_collection', visible: false, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'new_item', visible: false, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'new', visible: false, - })); - }); - }; - - const dontShowEditSection = () => { - it('should not show the "Edit" section', () => { - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'edit_community', visible: false, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'edit_collection', visible: false, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'edit_item', visible: false, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'edit', visible: false, - })); - }); - }; - - it('should retrieve the menu by ID return an Observable that emits true as soon as it is created', () => { - (menuService as any).getMenu.and.returnValue(cold('--u--m', { - u: undefined, - m: MENU_STATE, - })); - - expect(resolver.createAdminMenu$()).toBeObservable(cold('-----(t|)', BOOLEAN)); - expect(menuService.getMenu).toHaveBeenCalledOnceWith(MenuID.ADMIN); - }); - - describe('for regular user', () => { - beforeEach(() => { - authorizationService.isAuthorized = createSpy('isAuthorized').and.callFake((featureID) => { - return observableOf(false); - }); - }); - - beforeEach((done) => { - resolver.createAdminMenu$().subscribe((_) => { - done(); - }); - }); - - dontShowAdminSections(); - dontShowNewSection(); - dontShowEditSection(); - }); - - describe('regular user who can submit', () => { - beforeEach(() => { - authorizationService.isAuthorized = createSpy('isAuthorized') - .and.callFake((featureID: FeatureID) => { - return observableOf(featureID === FeatureID.CanSubmit); - }); - }); - - beforeEach((done) => { - resolver.createAdminMenu$().subscribe((_) => { - done(); - }); - }); - - it('should show "New Item" section', () => { - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'new_item', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'new', visible: true, - })); - }); - - dontShowAdminSections(); - dontShowEditSection(); - }); - - describe('regular user who can edit items', () => { - beforeEach(() => { - authorizationService.isAuthorized = createSpy('isAuthorized') - .and.callFake((featureID: FeatureID) => { - return observableOf(featureID === FeatureID.CanEditItem); - }); - }); - - beforeEach((done) => { - resolver.createAdminMenu$().subscribe((_) => { - done(); - }); - }); - - it('should show "Edit Item" section', () => { - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'edit_item', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'edit', visible: true, - })); - }); - - dontShowAdminSections(); - dontShowNewSection(); - }); - - describe('for site admin', () => { - beforeEach(() => { - authorizationService.isAuthorized = createSpy('isAuthorized').and.callFake((featureID: FeatureID) => { - return observableOf(featureID === FeatureID.AdministratorOf); - }); - }); - - beforeEach((done) => { - resolver.createAdminMenu$().subscribe((_) => { - done(); - }); - }); - - it('should show new_process', () => { - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'new_process', visible: true, - })); - }); - - it('should contain site admin section', () => { - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'admin_search', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'registries', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - parentID: 'registries', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'curation_tasks', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'workflow', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'workflow', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'import', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'import_batch', parentID: 'import', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'export', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'export_batch', parentID: 'export', visible: true, - })); - }); - }); - - describe('for community admin', () => { - beforeEach(() => { - authorizationService.isAuthorized = createSpy('isAuthorized').and.callFake((featureID: FeatureID) => { - return observableOf(featureID === FeatureID.IsCommunityAdmin); - }); - }); - - beforeEach((done) => { - resolver.createAdminMenu$().subscribe((_) => { - done(); - }); - }); - - it('should show edit_community', () => { - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'edit_community', visible: true, - })); - }); - }); - - describe('for collection admin', () => { - beforeEach(() => { - authorizationService.isAuthorized = createSpy('isAuthorized').and.callFake((featureID: FeatureID) => { - return observableOf(featureID === FeatureID.IsCollectionAdmin); - }); - }); - - beforeEach((done) => { - resolver.createAdminMenu$().subscribe((_) => { - done(); - }); - }); - - it('should show edit_collection', () => { - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'edit_collection', visible: true, - })); - }); - }); - - describe('for group admin', () => { - beforeEach(() => { - authorizationService.isAuthorized = createSpy('isAuthorized').and.callFake((featureID: FeatureID) => { - return observableOf(featureID === FeatureID.CanManageGroups); - }); - }); - - beforeEach((done) => { - resolver.createAdminMenu$().subscribe((_) => { - done(); - }); - }); - - it('should show access control section', () => { - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - id: 'access_control', visible: true, - })); - expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({ - parentID: 'access_control', visible: true, - })); - }); - }); - }); -}); diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html index 0af5c706b7..17102289e9 100644 --- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html +++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html @@ -1,37 +1,39 @@ -
- - - - - - -