Skip to content

Commit 9e73190

Browse files
committed
96252: Move menu support code to MenuModule
1 parent db3e8f9 commit 9e73190

2 files changed

Lines changed: 10 additions & 11 deletions

File tree

src/app/shared/menu/menu.module.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@ import { ExternalLinkMenuItemComponent } from './menu-item/external-link-menu-it
1212
const COMPONENTS = [
1313
MenuSectionComponent,
1414
MenuComponent,
15-
LinkMenuItemComponent,
15+
];
16+
17+
const ENTRY_COMPONENTS = [
1618
TextMenuItemComponent,
19+
LinkMenuItemComponent,
1720
OnClickMenuItemComponent,
1821
ExternalLinkMenuItemComponent,
1922
];
@@ -32,10 +35,12 @@ const PROVIDERS = [
3235
...MODULES
3336
],
3437
declarations: [
35-
...COMPONENTS
38+
...COMPONENTS,
39+
...ENTRY_COMPONENTS,
3640
],
3741
providers: [
38-
...PROVIDERS
42+
...PROVIDERS,
43+
...ENTRY_COMPONENTS,
3944
],
4045
exports: [
4146
...COMPONENTS

src/app/shared/shared.module.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,6 @@ import {
285285
MetadataRepresentationListComponent
286286
} from '../item-page/simple/metadata-representation-list/metadata-representation-list.component';
287287
import { RelatedItemsComponent } from '../item-page/simple/related-items/related-items-component';
288-
import { LinkMenuItemComponent } from './menu/menu-item/link-menu-item.component';
289-
import { OnClickMenuItemComponent } from './menu/menu-item/onclick-menu-item.component';
290-
import { TextMenuItemComponent } from './menu/menu-item/text-menu-item.component';
291288
import { SearchNavbarComponent } from '../search-navbar/search-navbar.component';
292289
import { ThemedSearchNavbarComponent } from '../search-navbar/themed-search-navbar.component';
293290
import {
@@ -304,7 +301,6 @@ import { DsSelectComponent } from './ds-select/ds-select.component';
304301
import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
305302
import { ThemedItemListPreviewComponent } from './object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
306303
import { RSSComponent } from './rss-feed/rss.component';
307-
import { ExternalLinkMenuItemComponent } from './menu/menu-item/external-link-menu-item.component';
308304
import { DsoPageOrcidButtonComponent } from './dso-page/dso-page-orcid-button/dso-page-orcid-button.component';
309305
import { LogInOrcidComponent } from './log-in/methods/orcid/log-in-orcid.component';
310306
import { BrowserOnlyPipe } from './utils/browser-only.pipe';
@@ -316,6 +312,7 @@ import {
316312
} from '../item-page/simple/field-components/specific-field/title/item-page-title-field.component';
317313
import { MarkdownPipe } from './utils/markdown.pipe';
318314
import { GoogleRecaptchaModule } from '../core/google-recaptcha/google-recaptcha.module';
315+
import { MenuModule } from './menu/menu.module';
319316

320317
const MODULES = [
321318
CommonModule,
@@ -336,6 +333,7 @@ const MODULES = [
336333
DragDropModule,
337334
CdkTreeModule,
338335
GoogleRecaptchaModule,
336+
MenuModule,
339337
];
340338

341339
const ROOT_MODULES = [
@@ -557,11 +555,7 @@ const ENTRY_COMPONENTS = [
557555
PublicationSidebarSearchListElementComponent,
558556
CollectionSidebarSearchListElementComponent,
559557
CommunitySidebarSearchListElementComponent,
560-
LinkMenuItemComponent,
561-
OnClickMenuItemComponent,
562-
TextMenuItemComponent,
563558
ScopeSelectorModalComponent,
564-
ExternalLinkMenuItemComponent
565559
];
566560

567561
const SHARED_ITEM_PAGE_COMPONENTS = [

0 commit comments

Comments
 (0)