mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-12 04:23:04 +00:00
96252: Move MyDSpace components out of SharedModule
Also move ds-metadata-field-wrapper to SharedModule so it can be reused in detail view without importing ItemSharedModule
This commit is contained in:
@@ -17,9 +17,16 @@ import { PoolSearchResultDetailElementComponent } from '../shared/object-detail/
|
|||||||
import { ClaimedApprovedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component';
|
import { ClaimedApprovedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component';
|
||||||
import { ClaimedDeclinedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component';
|
import { ClaimedDeclinedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component';
|
||||||
import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
|
import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
|
||||||
|
import { ItemSubmitterComponent } from '../shared/object-collection/shared/mydspace-item-submitter/item-submitter.component';
|
||||||
|
import { ItemDetailPreviewComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component';
|
||||||
|
import { ItemDetailPreviewFieldComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
|
||||||
|
import { ItemListPreviewComponent } from '../shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
|
||||||
|
import { ThemedItemListPreviewComponent } from '../shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
|
||||||
|
import { MyDSpaceItemStatusComponent } from '../shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component';
|
||||||
|
import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
|
||||||
|
import { MyDSpaceActionsModule } from '../shared/mydspace-actions/mydspace-actions.module';
|
||||||
|
|
||||||
const ENTRY_COMPONENTS = [
|
const ENTRY_COMPONENTS = [
|
||||||
// put only entry components that use custom decorator
|
|
||||||
WorkspaceItemSearchResultListElementComponent,
|
WorkspaceItemSearchResultListElementComponent,
|
||||||
WorkflowItemSearchResultListElementComponent,
|
WorkflowItemSearchResultListElementComponent,
|
||||||
ClaimedSearchResultListElementComponent,
|
ClaimedSearchResultListElementComponent,
|
||||||
@@ -31,7 +38,17 @@ const ENTRY_COMPONENTS = [
|
|||||||
WorkflowItemSearchResultDetailElementComponent,
|
WorkflowItemSearchResultDetailElementComponent,
|
||||||
ClaimedTaskSearchResultDetailElementComponent,
|
ClaimedTaskSearchResultDetailElementComponent,
|
||||||
PoolSearchResultDetailElementComponent,
|
PoolSearchResultDetailElementComponent,
|
||||||
ItemSearchResultListElementSubmissionComponent
|
ItemSearchResultListElementSubmissionComponent,
|
||||||
|
];
|
||||||
|
|
||||||
|
const DECLARATIONS = [
|
||||||
|
...ENTRY_COMPONENTS,
|
||||||
|
ItemSubmitterComponent,
|
||||||
|
ItemDetailPreviewComponent,
|
||||||
|
ItemDetailPreviewFieldComponent,
|
||||||
|
ItemListPreviewComponent,
|
||||||
|
ThemedItemListPreviewComponent,
|
||||||
|
MyDSpaceItemStatusComponent,
|
||||||
];
|
];
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
@@ -39,10 +56,12 @@ const ENTRY_COMPONENTS = [
|
|||||||
CommonModule,
|
CommonModule,
|
||||||
SharedModule,
|
SharedModule,
|
||||||
MyDspacePageRoutingModule,
|
MyDspacePageRoutingModule,
|
||||||
ResearchEntitiesModule.withEntryComponents()
|
MyDSpaceActionsModule,
|
||||||
|
ResearchEntitiesModule.withEntryComponents(),
|
||||||
|
JournalEntitiesModule.withEntryComponents(),
|
||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
...ENTRY_COMPONENTS
|
...DECLARATIONS,
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|
||||||
|
59
src/app/shared/mydspace-actions/mydspace-actions.module.ts
Normal file
59
src/app/shared/mydspace-actions/mydspace-actions.module.ts
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
/**
|
||||||
|
* 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 { NgModule } from '@angular/core';
|
||||||
|
import { CommonModule } from '@angular/common';
|
||||||
|
import { SharedModule } from '../shared.module';
|
||||||
|
import { ClaimedTaskActionsApproveComponent } from './claimed-task/approve/claimed-task-actions-approve.component';
|
||||||
|
import { ClaimedTaskActionsRejectComponent } from './claimed-task/reject/claimed-task-actions-reject.component';
|
||||||
|
import { ClaimedTaskActionsReturnToPoolComponent } from './claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
|
||||||
|
import { ClaimedTaskActionsEditMetadataComponent } from './claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
|
||||||
|
import { ClaimedTaskActionsComponent } from './claimed-task/claimed-task-actions.component';
|
||||||
|
import { ClaimedTaskActionsLoaderComponent } from './claimed-task/switcher/claimed-task-actions-loader.component';
|
||||||
|
import { ItemActionsComponent } from './item/item-actions.component';
|
||||||
|
import { PoolTaskActionsComponent } from './pool-task/pool-task-actions.component';
|
||||||
|
import { WorkflowitemActionsComponent } from './workflowitem/workflowitem-actions.component';
|
||||||
|
import { WorkspaceitemActionsComponent } from './workspaceitem/workspaceitem-actions.component';
|
||||||
|
|
||||||
|
const ENTRY_COMPONENTS = [
|
||||||
|
ClaimedTaskActionsApproveComponent,
|
||||||
|
ClaimedTaskActionsRejectComponent,
|
||||||
|
ClaimedTaskActionsReturnToPoolComponent,
|
||||||
|
ClaimedTaskActionsEditMetadataComponent,
|
||||||
|
];
|
||||||
|
|
||||||
|
const DECLARATIONS = [
|
||||||
|
...ENTRY_COMPONENTS,
|
||||||
|
ClaimedTaskActionsComponent,
|
||||||
|
ClaimedTaskActionsLoaderComponent,
|
||||||
|
ItemActionsComponent,
|
||||||
|
PoolTaskActionsComponent,
|
||||||
|
WorkflowitemActionsComponent,
|
||||||
|
WorkspaceitemActionsComponent,
|
||||||
|
];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This module contains Item actions used in MyDSpace
|
||||||
|
*/
|
||||||
|
@NgModule({
|
||||||
|
imports: [
|
||||||
|
CommonModule,
|
||||||
|
SharedModule,
|
||||||
|
],
|
||||||
|
declarations: [
|
||||||
|
...DECLARATIONS,
|
||||||
|
],
|
||||||
|
providers: [
|
||||||
|
...ENTRY_COMPONENTS,
|
||||||
|
],
|
||||||
|
exports: [
|
||||||
|
...DECLARATIONS,
|
||||||
|
],
|
||||||
|
})
|
||||||
|
export class MyDSpaceActionsModule {
|
||||||
|
|
||||||
|
}
|
@@ -76,25 +76,7 @@ import { AlertComponent } from './alert/alert.component';
|
|||||||
import {
|
import {
|
||||||
SearchResultDetailElementComponent
|
SearchResultDetailElementComponent
|
||||||
} from './object-detail/my-dspace-result-detail-element/search-result-detail-element.component';
|
} from './object-detail/my-dspace-result-detail-element/search-result-detail-element.component';
|
||||||
import { ClaimedTaskActionsComponent } from './mydspace-actions/claimed-task/claimed-task-actions.component';
|
|
||||||
import { PoolTaskActionsComponent } from './mydspace-actions/pool-task/pool-task-actions.component';
|
|
||||||
import { ObjectDetailComponent } from './object-detail/object-detail.component';
|
import { ObjectDetailComponent } from './object-detail/object-detail.component';
|
||||||
import {
|
|
||||||
ItemDetailPreviewComponent
|
|
||||||
} from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component';
|
|
||||||
import {
|
|
||||||
MyDSpaceItemStatusComponent
|
|
||||||
} from './object-collection/shared/mydspace-item-status/my-dspace-item-status.component';
|
|
||||||
import { WorkspaceitemActionsComponent } from './mydspace-actions/workspaceitem/workspaceitem-actions.component';
|
|
||||||
import { WorkflowitemActionsComponent } from './mydspace-actions/workflowitem/workflowitem-actions.component';
|
|
||||||
import { ItemSubmitterComponent } from './object-collection/shared/mydspace-item-submitter/item-submitter.component';
|
|
||||||
import { ItemActionsComponent } from './mydspace-actions/item/item-actions.component';
|
|
||||||
import {
|
|
||||||
ClaimedTaskActionsApproveComponent
|
|
||||||
} from './mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component';
|
|
||||||
import {
|
|
||||||
ClaimedTaskActionsRejectComponent
|
|
||||||
} from './mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component';
|
|
||||||
import { ObjNgFor } from './utils/object-ngfor.pipe';
|
import { ObjNgFor } from './utils/object-ngfor.pipe';
|
||||||
import { BrowseByComponent } from './browse-by/browse-by.component';
|
import { BrowseByComponent } from './browse-by/browse-by.component';
|
||||||
import {
|
import {
|
||||||
@@ -164,21 +146,8 @@ import {
|
|||||||
import {
|
import {
|
||||||
ThemedEditCollectionSelectorComponent
|
ThemedEditCollectionSelectorComponent
|
||||||
} from './dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
|
} from './dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
|
||||||
import {
|
|
||||||
ItemListPreviewComponent
|
|
||||||
} from './object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
|
|
||||||
import {
|
|
||||||
MetadataFieldWrapperComponent
|
|
||||||
} from '../item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component';
|
|
||||||
import { MetadataValuesComponent } from '../item-page/field-components/metadata-values/metadata-values.component';
|
|
||||||
import { RoleDirective } from './roles/role.directive';
|
import { RoleDirective } from './roles/role.directive';
|
||||||
import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component';
|
import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component';
|
||||||
import {
|
|
||||||
ClaimedTaskActionsReturnToPoolComponent
|
|
||||||
} from './mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
|
|
||||||
import {
|
|
||||||
ItemDetailPreviewFieldComponent
|
|
||||||
} from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
|
|
||||||
import {
|
import {
|
||||||
CollectionSearchResultGridElementComponent
|
CollectionSearchResultGridElementComponent
|
||||||
} from './object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
|
} from './object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
|
||||||
@@ -236,13 +205,7 @@ import { FileValueAccessorDirective } from './utils/file-value-accessor.directiv
|
|||||||
import {
|
import {
|
||||||
ModifyItemOverviewComponent
|
ModifyItemOverviewComponent
|
||||||
} from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
|
} from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
|
||||||
import {
|
|
||||||
ClaimedTaskActionsLoaderComponent
|
|
||||||
} from './mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component';
|
|
||||||
import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive';
|
import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive';
|
||||||
import {
|
|
||||||
ClaimedTaskActionsEditMetadataComponent
|
|
||||||
} from './mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
|
|
||||||
import { ImpersonateNavbarComponent } from './impersonate-navbar/impersonate-navbar.component';
|
import { ImpersonateNavbarComponent } from './impersonate-navbar/impersonate-navbar.component';
|
||||||
import { NgForTrackByIdDirective } from './ng-for-track-by-id.directive';
|
import { NgForTrackByIdDirective } from './ng-for-track-by-id.directive';
|
||||||
import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component';
|
import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component';
|
||||||
@@ -277,7 +240,6 @@ import { ThemedSearchNavbarComponent } from '../search-navbar/themed-search-navb
|
|||||||
import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
|
import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
|
||||||
import { DsSelectComponent } from './ds-select/ds-select.component';
|
import { DsSelectComponent } from './ds-select/ds-select.component';
|
||||||
import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
|
import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
|
||||||
import { ThemedItemListPreviewComponent } from './object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
|
|
||||||
import { RSSComponent } from './rss-feed/rss.component';
|
import { RSSComponent } from './rss-feed/rss.component';
|
||||||
import { LogInOrcidComponent } from './log-in/methods/orcid/log-in-orcid.component';
|
import { LogInOrcidComponent } from './log-in/methods/orcid/log-in-orcid.component';
|
||||||
import { BrowserOnlyPipe } from './utils/browser-only.pipe';
|
import { BrowserOnlyPipe } from './utils/browser-only.pipe';
|
||||||
@@ -289,6 +251,7 @@ import {
|
|||||||
import { MarkdownPipe } from './utils/markdown.pipe';
|
import { MarkdownPipe } from './utils/markdown.pipe';
|
||||||
import { GoogleRecaptchaModule } from '../core/google-recaptcha/google-recaptcha.module';
|
import { GoogleRecaptchaModule } from '../core/google-recaptcha/google-recaptcha.module';
|
||||||
import { MenuModule } from './menu/menu.module';
|
import { MenuModule } from './menu/menu.module';
|
||||||
|
import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
|
||||||
|
|
||||||
const MODULES = [
|
const MODULES = [
|
||||||
CommonModule,
|
CommonModule,
|
||||||
@@ -362,18 +325,6 @@ const COMPONENTS = [
|
|||||||
SidebarFilterComponent,
|
SidebarFilterComponent,
|
||||||
SidebarFilterSelectedOptionComponent,
|
SidebarFilterSelectedOptionComponent,
|
||||||
ThumbnailComponent,
|
ThumbnailComponent,
|
||||||
ItemListPreviewComponent,
|
|
||||||
ThemedItemListPreviewComponent,
|
|
||||||
MyDSpaceItemStatusComponent,
|
|
||||||
ItemSubmitterComponent,
|
|
||||||
ItemDetailPreviewComponent,
|
|
||||||
ItemDetailPreviewFieldComponent,
|
|
||||||
ClaimedTaskActionsComponent,
|
|
||||||
ClaimedTaskActionsLoaderComponent,
|
|
||||||
ItemActionsComponent,
|
|
||||||
PoolTaskActionsComponent,
|
|
||||||
WorkflowitemActionsComponent,
|
|
||||||
WorkspaceitemActionsComponent,
|
|
||||||
ViewModeSwitchComponent,
|
ViewModeSwitchComponent,
|
||||||
TruncatableComponent,
|
TruncatableComponent,
|
||||||
TruncatablePartComponent,
|
TruncatablePartComponent,
|
||||||
@@ -451,11 +402,6 @@ const ENTRY_COMPONENTS = [
|
|||||||
LogInShibbolethComponent,
|
LogInShibbolethComponent,
|
||||||
LogInOidcComponent,
|
LogInOidcComponent,
|
||||||
LogInOrcidComponent,
|
LogInOrcidComponent,
|
||||||
BundleListElementComponent,
|
|
||||||
ClaimedTaskActionsApproveComponent,
|
|
||||||
ClaimedTaskActionsRejectComponent,
|
|
||||||
ClaimedTaskActionsReturnToPoolComponent,
|
|
||||||
ClaimedTaskActionsEditMetadataComponent,
|
|
||||||
CollectionDropdownComponent,
|
CollectionDropdownComponent,
|
||||||
FileDownloadLinkComponent,
|
FileDownloadLinkComponent,
|
||||||
CurationFormComponent,
|
CurationFormComponent,
|
||||||
|
Reference in New Issue
Block a user