Merge remote-tracking branch 'upstream/main' into w2p-97425_System-wide-alerts

This commit is contained in:
Yana De Pauw
2023-02-09 11:57:25 +01:00
152 changed files with 5200 additions and 1693 deletions

View File

@@ -94,7 +94,6 @@ import { AuthNavMenuComponent } from './app/shared/auth-nav-menu/auth-nav-menu.c
import {
ExpandableNavbarSectionComponent
} from './app/navbar/expandable-navbar-section/expandable-navbar-section.component';
import { ItemMetadataComponent } from './app/item-page/edit-item-page/item-metadata/item-metadata.component';
import {
EditItemTemplatePageComponent
} from './app/collection-page/edit-item-template-page/edit-item-template-page.component';
@@ -122,6 +121,8 @@ import { ResultsBackButtonModule } from '../../app/shared/results-back-button/re
import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
import { ItemSharedModule } from '../../app/item-page/item-shared.module';
import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
import { DsoEditMetadataComponent } from './app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
import { DsoSharedModule } from '../../app/dso-shared/dso-shared.module';
import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module';
const DECLARATIONS = [
@@ -166,7 +167,6 @@ const DECLARATIONS = [
ComcolPageHandleComponent,
AuthNavMenuComponent,
ExpandableNavbarSectionComponent,
ItemMetadataComponent,
EditItemTemplatePageComponent,
LoadingComponent,
SearchResultsComponent,
@@ -178,8 +178,8 @@ const DECLARATIONS = [
BrowseByDatePageComponent,
BrowseByTitlePageComponent,
ExternalSourceEntryImportModalComponent,
ResultsBackButtonComponent
ResultsBackButtonComponent,
DsoEditMetadataComponent,
];
@NgModule({
@@ -234,6 +234,7 @@ const DECLARATIONS = [
FormsModule,
ResourcePoliciesModule,
ComcolModule,
DsoSharedModule,
SystemWideAlertModule
],
declarations: DECLARATIONS,