mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 18:14:17 +00:00
Merge remote-tracking branch 'upstream/main' into fix-ngonchanges-not-working-for-themed-components_contribute-main
# Conflicts: # src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts # src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html # src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts # src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts # src/app/shared/shared.module.ts # src/app/shared/theme-support/themed.component.ts # src/themes/custom/lazy-theme.module.ts
This commit is contained in:
Alexandre Vryghem
@@ -50,17 +50,14 @@ import { BrowseBySwitcherComponent } from './app/browse-by/browse-by-switcher/br
|
||||
import { CommunityListPageComponent } from './app/community-list-page/community-list-page.component';
|
||||
import { SearchPageComponent } from './app/search-page/search-page.component';
|
||||
import { ConfigurationSearchPageComponent } from './app/search-page/configuration-search-page.component';
|
||||
import { SearchFormComponent } from './app/shared/search-form/search-form.component';
|
||||
import { EndUserAgreementComponent } from './app/info/end-user-agreement/end-user-agreement.component';
|
||||
import { PageNotFoundComponent } from './app/pagenotfound/pagenotfound.component';
|
||||
import { ObjectNotFoundComponent } from './app/lookup-by-id/objectnotfound/objectnotfound.component';
|
||||
import { ForbiddenComponent } from './app/forbidden/forbidden.component';
|
||||
import { PrivacyComponent } from './app/info/privacy/privacy.component';
|
||||
import {
|
||||
CollectionStatisticsPageComponent
|
||||
} from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
|
||||
import {
|
||||
CommunityStatisticsPageComponent
|
||||
} from './app/statistics-page/community-statistics-page/community-statistics-page.component';
|
||||
import { CollectionStatisticsPageComponent } from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
|
||||
import { CommunityStatisticsPageComponent } from './app/statistics-page/community-statistics-page/community-statistics-page.component';
|
||||
import { ItemStatisticsPageComponent } from './app/statistics-page/item-statistics-page/item-statistics-page.component';
|
||||
import { SiteStatisticsPageComponent } from './app/statistics-page/site-statistics-page/site-statistics-page.component';
|
||||
import { CommunityPageComponent } from './app/community-page/community-page.component';
|
||||
@@ -76,15 +73,10 @@ import { ProfilePageComponent } from './app/profile-page/profile-page.component'
|
||||
import { RegisterEmailComponent } from './app/register-page/register-email/register-email.component';
|
||||
import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component';
|
||||
import { SubmissionEditComponent } from './app/submission/edit/submission-edit.component';
|
||||
import {
|
||||
SubmissionImportExternalComponent
|
||||
} from './app/submission/import-external/submission-import-external.component';
|
||||
import { SubmissionImportExternalComponent } from './app/submission/import-external/submission-import-external.component';
|
||||
import { SubmissionSubmitComponent } from './app/submission/submit/submission-submit.component';
|
||||
import { WorkflowItemDeleteComponent
|
||||
} from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
|
||||
import {
|
||||
WorkflowItemSendBackComponent
|
||||
} from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
|
||||
import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
|
||||
import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
|
||||
import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
|
||||
import { FeedbackComponent } from './app/info/feedback/feedback.component';
|
||||
import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component';
|
||||
@@ -94,7 +86,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';
|
||||
@@ -103,17 +94,52 @@ import { SearchResultsComponent } from './app/shared/search/search-results/searc
|
||||
import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
|
||||
import { ComcolPageBrowseByComponent } from './app/shared/comcol-page-browse-by/comcol-page-browse-by.component';
|
||||
import { SearchSettingsComponent } from './app/shared/search/search-settings/search-settings.component';
|
||||
import {
|
||||
CommunityPageSubCommunityListComponent
|
||||
} from './app/community-page/sub-community-list/community-page-sub-community-list.component';
|
||||
import {
|
||||
CommunityPageSubCollectionListComponent
|
||||
} from './app/community-page/sub-collection-list/community-page-sub-collection-list.component';
|
||||
import { CommunityPageSubCommunityListComponent } from './app/community-page/sub-community-list/community-page-sub-community-list.component';
|
||||
import { CommunityPageSubCollectionListComponent } from './app/community-page/sub-collection-list/community-page-sub-collection-list.component';
|
||||
import { ObjectListComponent } from './app/shared/object-list/object-list.component';
|
||||
|
||||
import { BrowseByMetadataPageComponent } from './app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component';
|
||||
import { BrowseByDatePageComponent } from './app/browse-by/browse-by-date-page/browse-by-date-page.component';
|
||||
import { BrowseByTitlePageComponent } from './app/browse-by/browse-by-title-page/browse-by-title-page.component';
|
||||
import {
|
||||
ExternalSourceEntryImportModalComponent
|
||||
} from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
|
||||
import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
|
||||
import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
|
||||
import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
|
||||
import { ItemSharedModule } from '../../app/item-page/item-shared.module';
|
||||
import { SearchFiltersComponent } from './app/shared/search/search-filters/search-filters.component';
|
||||
import { SearchSidebarComponent } from './app/shared/search/search-sidebar/search-sidebar.component';
|
||||
import { MyDSpaceStatusBadgeComponent } from './app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
|
||||
import { TypeBadgeComponent } from './app/shared/object-collection/shared/badges/type-badge/type-badge.component';
|
||||
import { StatusBadgeComponent } from './app/shared/object-collection/shared/badges/status-badge/status-badge.component';
|
||||
import { BadgesComponent } from './app/shared/object-collection/shared/badges/badges.component';
|
||||
import { AccessStatusBadgeComponent } from './app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component';
|
||||
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';
|
||||
import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
|
||||
import { ItemAlertsComponent } from './app/item-page/alerts/item-alerts.component';
|
||||
import {
|
||||
FullFileSectionComponent
|
||||
} from './app/item-page/full/field-components/file-section/full-file-section.component';
|
||||
import { MetadataRepresentationListComponent } from './app/item-page/simple/metadata-representation-list/metadata-representation-list.component';
|
||||
import { DsDynamicLookupRelationSearchTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
|
||||
import { DsDynamicLookupRelationExternalSourceTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
|
||||
import { FeedbackFormComponent } from './app/info/feedback/feedback-form/feedback-form.component';
|
||||
import {
|
||||
ItemPageTitleFieldComponent
|
||||
} from './app/item-page/simple/field-components/specific-field/title/item-page-title-field.component';
|
||||
import { MediaViewerComponent } from './app/item-page/media-viewer/media-viewer.component';
|
||||
import {
|
||||
MediaViewerImageComponent
|
||||
} from './app/item-page/media-viewer/media-viewer-image/media-viewer-image.component';
|
||||
import {
|
||||
MediaViewerVideoComponent
|
||||
} from './app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
|
||||
import { NgxGalleryModule } from '@kolkov/ngx-gallery';
|
||||
import { WorkspaceItemsDeletePageComponent } from './app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component';
|
||||
import { ThumbnailComponent } from './app/thumbnail/thumbnail.component';
|
||||
|
||||
const DECLARATIONS = [
|
||||
@@ -124,6 +150,7 @@ const DECLARATIONS = [
|
||||
CommunityListPageComponent,
|
||||
SearchPageComponent,
|
||||
ConfigurationSearchPageComponent,
|
||||
SearchFormComponent,
|
||||
EndUserAgreementComponent,
|
||||
PageNotFoundComponent,
|
||||
ObjectNotFoundComponent,
|
||||
@@ -154,11 +181,11 @@ const DECLARATIONS = [
|
||||
WorkflowItemSendBackComponent,
|
||||
BreadcrumbsComponent,
|
||||
FeedbackComponent,
|
||||
FeedbackFormComponent,
|
||||
CommunityListComponent,
|
||||
ComcolPageHandleComponent,
|
||||
AuthNavMenuComponent,
|
||||
ExpandableNavbarSectionComponent,
|
||||
ItemMetadataComponent,
|
||||
EditItemTemplatePageComponent,
|
||||
LoadingComponent,
|
||||
SearchResultsComponent,
|
||||
@@ -169,6 +196,26 @@ const DECLARATIONS = [
|
||||
BrowseByMetadataPageComponent,
|
||||
BrowseByDatePageComponent,
|
||||
BrowseByTitlePageComponent,
|
||||
ExternalSourceEntryImportModalComponent,
|
||||
SearchFiltersComponent,
|
||||
SearchSidebarComponent,
|
||||
BadgesComponent,
|
||||
StatusBadgeComponent,
|
||||
TypeBadgeComponent,
|
||||
MyDSpaceStatusBadgeComponent,
|
||||
AccessStatusBadgeComponent,
|
||||
ResultsBackButtonComponent,
|
||||
DsoEditMetadataComponent,
|
||||
ItemAlertsComponent,
|
||||
FullFileSectionComponent,
|
||||
MetadataRepresentationListComponent,
|
||||
DsDynamicLookupRelationSearchTabComponent,
|
||||
DsDynamicLookupRelationExternalSourceTabComponent,
|
||||
ItemPageTitleFieldComponent,
|
||||
MediaViewerComponent,
|
||||
MediaViewerImageComponent,
|
||||
MediaViewerVideoComponent,
|
||||
WorkspaceItemsDeletePageComponent,
|
||||
ThumbnailComponent,
|
||||
];
|
||||
|
||||
@@ -189,8 +236,10 @@ const DECLARATIONS = [
|
||||
CommunityPageModule,
|
||||
CoreModule,
|
||||
DragDropModule,
|
||||
ItemSharedModule,
|
||||
ItemPageModule,
|
||||
EditItemPageModule,
|
||||
ItemVersionsModule,
|
||||
FormsModule,
|
||||
HomePageModule,
|
||||
HttpClientModule,
|
||||
@@ -198,6 +247,7 @@ const DECLARATIONS = [
|
||||
InfoModule,
|
||||
JournalEntitiesModule,
|
||||
MenuModule,
|
||||
DsoPageModule,
|
||||
MyDspaceSearchModule,
|
||||
NavbarModule,
|
||||
NgbModule,
|
||||
@@ -208,6 +258,8 @@ const DECLARATIONS = [
|
||||
ScrollToModule,
|
||||
SearchPageModule,
|
||||
SharedModule,
|
||||
SharedBrowseByModule,
|
||||
ResultsBackButtonModule,
|
||||
StatisticsModule,
|
||||
StatisticsPageModule,
|
||||
StoreModule,
|
||||
@@ -220,6 +272,9 @@ const DECLARATIONS = [
|
||||
FormsModule,
|
||||
ResourcePoliciesModule,
|
||||
ComcolModule,
|
||||
DsoSharedModule,
|
||||
SystemWideAlertModule,
|
||||
NgxGalleryModule,
|
||||
],
|
||||
declarations: DECLARATIONS,
|
||||
exports: [
|
||||
|
||||
Reference in New Issue
Block a user