Skip to content

Commit 1c7108e

Browse files
ybndybnd
committed
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
1 parent 935e9a4 commit 1c7108e

3 files changed

Lines changed: 83 additions & 59 deletions

File tree

‎src/app/my-dspace-page/my-dspace-search.module.ts‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,16 @@ import { PoolSearchResultDetailElementComponent } from '../shared/object-detail/
1717
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';
1818
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';
1919
import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
20+
import { ItemSubmitterComponent } from '../shared/object-collection/shared/mydspace-item-submitter/item-submitter.component';
21+
import { ItemDetailPreviewComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component';
22+
import { ItemDetailPreviewFieldComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
23+
import { ItemListPreviewComponent } from '../shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
24+
import { ThemedItemListPreviewComponent } from '../shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
25+
import { MyDSpaceItemStatusComponent } from '../shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component';
26+
import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
27+
import { MyDSpaceActionsModule } from '../shared/mydspace-actions/mydspace-actions.module';
2028

2129
const ENTRY_COMPONENTS = [
22-
// put only entry components that use custom decorator
2330
WorkspaceItemSearchResultListElementComponent,
2431
WorkflowItemSearchResultListElementComponent,
2532
ClaimedSearchResultListElementComponent,
@@ -31,18 +38,30 @@ const ENTRY_COMPONENTS = [
3138
WorkflowItemSearchResultDetailElementComponent,
3239
ClaimedTaskSearchResultDetailElementComponent,
3340
PoolSearchResultDetailElementComponent,
34-
ItemSearchResultListElementSubmissionComponent
41+
ItemSearchResultListElementSubmissionComponent,
42+
];
43+
44+
const DECLARATIONS = [
45+
...ENTRY_COMPONENTS,
46+
ItemSubmitterComponent,
47+
ItemDetailPreviewComponent,
48+
ItemDetailPreviewFieldComponent,
49+
ItemListPreviewComponent,
50+
ThemedItemListPreviewComponent,
51+
MyDSpaceItemStatusComponent,
3552
];
3653

3754
@NgModule({
3855
imports: [
3956
CommonModule,
4057
SharedModule,
4158
MyDspacePageRoutingModule,
42-
ResearchEntitiesModule.withEntryComponents()
59+
MyDSpaceActionsModule,
60+
ResearchEntitiesModule.withEntryComponents(),
61+
JournalEntitiesModule.withEntryComponents(),
4362
],
4463
declarations: [
45-
...ENTRY_COMPONENTS
64+
...DECLARATIONS,
4665
]
4766
})
4867

‎src/app/shared/mydspace-actions/mydspace-actions.module.ts‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/**
2+
* The contents of this file are subject to the license and copyright
3+
* detailed in the LICENSE and NOTICE files at the root of the source
4+
* tree and available online at
5+
*
6+
* http://www.dspace.org/license/
7+
*/
8+
import { NgModule } from '@angular/core';
9+
import { CommonModule } from '@angular/common';
10+
import { SharedModule } from '../shared.module';
11+
import { ClaimedTaskActionsApproveComponent } from './claimed-task/approve/claimed-task-actions-approve.component';
12+
import { ClaimedTaskActionsRejectComponent } from './claimed-task/reject/claimed-task-actions-reject.component';
13+
import { ClaimedTaskActionsReturnToPoolComponent } from './claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
14+
import { ClaimedTaskActionsEditMetadataComponent } from './claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
15+
import { ClaimedTaskActionsComponent } from './claimed-task/claimed-task-actions.component';
16+
import { ClaimedTaskActionsLoaderComponent } from './claimed-task/switcher/claimed-task-actions-loader.component';
17+
import { ItemActionsComponent } from './item/item-actions.component';
18+
import { PoolTaskActionsComponent } from './pool-task/pool-task-actions.component';
19+
import { WorkflowitemActionsComponent } from './workflowitem/workflowitem-actions.component';
20+
import { WorkspaceitemActionsComponent } from './workspaceitem/workspaceitem-actions.component';
21+
22+
const ENTRY_COMPONENTS = [
23+
ClaimedTaskActionsApproveComponent,
24+
ClaimedTaskActionsRejectComponent,
25+
ClaimedTaskActionsReturnToPoolComponent,
26+
ClaimedTaskActionsEditMetadataComponent,
27+
];
28+
29+
const DECLARATIONS = [
30+
...ENTRY_COMPONENTS,
31+
ClaimedTaskActionsComponent,
32+
ClaimedTaskActionsLoaderComponent,
33+
ItemActionsComponent,
34+
PoolTaskActionsComponent,
35+
WorkflowitemActionsComponent,
36+
WorkspaceitemActionsComponent,
37+
];
38+
39+
/**
40+
* This module contains Item actions used in MyDSpace
41+
*/
42+
@NgModule({
43+
imports: [
44+
CommonModule,
45+
SharedModule,
46+
],
47+
declarations: [
48+
...DECLARATIONS,
49+
],
50+
providers: [
51+
...ENTRY_COMPONENTS,
52+
],
53+
exports: [
54+
...DECLARATIONS,
55+
],
56+
})
57+
export class MyDSpaceActionsModule {
58+
59+
}

‎src/app/shared/shared.module.ts‎

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -76,25 +76,7 @@ import { AlertComponent } from './alert/alert.component';
7676
import {
7777
SearchResultDetailElementComponent
7878
} from './object-detail/my-dspace-result-detail-element/search-result-detail-element.component';
79-
import { ClaimedTaskActionsComponent } from './mydspace-actions/claimed-task/claimed-task-actions.component';
80-
import { PoolTaskActionsComponent } from './mydspace-actions/pool-task/pool-task-actions.component';
8179
import { ObjectDetailComponent } from './object-detail/object-detail.component';
82-
import {
83-
ItemDetailPreviewComponent
84-
} from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component';
85-
import {
86-
MyDSpaceItemStatusComponent
87-
} from './object-collection/shared/mydspace-item-status/my-dspace-item-status.component';
88-
import { WorkspaceitemActionsComponent } from './mydspace-actions/workspaceitem/workspaceitem-actions.component';
89-
import { WorkflowitemActionsComponent } from './mydspace-actions/workflowitem/workflowitem-actions.component';
90-
import { ItemSubmitterComponent } from './object-collection/shared/mydspace-item-submitter/item-submitter.component';
91-
import { ItemActionsComponent } from './mydspace-actions/item/item-actions.component';
92-
import {
93-
ClaimedTaskActionsApproveComponent
94-
} from './mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component';
95-
import {
96-
ClaimedTaskActionsRejectComponent
97-
} from './mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component';
9880
import { ObjNgFor } from './utils/object-ngfor.pipe';
9981
import { BrowseByComponent } from './browse-by/browse-by.component';
10082
import {
@@ -164,21 +146,8 @@ import {
164146
import {
165147
ThemedEditCollectionSelectorComponent
166148
} from './dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
167-
import {
168-
ItemListPreviewComponent
169-
} from './object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
170-
import {
171-
MetadataFieldWrapperComponent
172-
} from '../item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component';
173-
import { MetadataValuesComponent } from '../item-page/field-components/metadata-values/metadata-values.component';
174149
import { RoleDirective } from './roles/role.directive';
175150
import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component';
176-
import {
177-
ClaimedTaskActionsReturnToPoolComponent
178-
} from './mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
179-
import {
180-
ItemDetailPreviewFieldComponent
181-
} from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
182151
import {
183152
CollectionSearchResultGridElementComponent
184153
} 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
236205
import {
237206
ModifyItemOverviewComponent
238207
} from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
239-
import {
240-
ClaimedTaskActionsLoaderComponent
241-
} from './mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component';
242208
import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive';
243-
import {
244-
ClaimedTaskActionsEditMetadataComponent
245-
} from './mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
246209
import { ImpersonateNavbarComponent } from './impersonate-navbar/impersonate-navbar.component';
247210
import { NgForTrackByIdDirective } from './ng-for-track-by-id.directive';
248211
import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component';
@@ -277,7 +240,6 @@ import { ThemedSearchNavbarComponent } from '../search-navbar/themed-search-navb
277240
import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
278241
import { DsSelectComponent } from './ds-select/ds-select.component';
279242
import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
280-
import { ThemedItemListPreviewComponent } from './object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
281243
import { RSSComponent } from './rss-feed/rss.component';
282244
import { LogInOrcidComponent } from './log-in/methods/orcid/log-in-orcid.component';
283245
import { BrowserOnlyPipe } from './utils/browser-only.pipe';
@@ -289,6 +251,7 @@ import {
289251
import { MarkdownPipe } from './utils/markdown.pipe';
290252
import { GoogleRecaptchaModule } from '../core/google-recaptcha/google-recaptcha.module';
291253
import { MenuModule } from './menu/menu.module';
254+
import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
292255

293256
const MODULES = [
294257
CommonModule,
@@ -362,18 +325,6 @@ const COMPONENTS = [
362325
SidebarFilterComponent,
363326
SidebarFilterSelectedOptionComponent,
364327
ThumbnailComponent,
365-
ItemListPreviewComponent,
366-
ThemedItemListPreviewComponent,
367-
MyDSpaceItemStatusComponent,
368-
ItemSubmitterComponent,
369-
ItemDetailPreviewComponent,
370-
ItemDetailPreviewFieldComponent,
371-
ClaimedTaskActionsComponent,
372-
ClaimedTaskActionsLoaderComponent,
373-
ItemActionsComponent,
374-
PoolTaskActionsComponent,
375-
WorkflowitemActionsComponent,
376-
WorkspaceitemActionsComponent,
377328
ViewModeSwitchComponent,
378329
TruncatableComponent,
379330
TruncatablePartComponent,
@@ -451,11 +402,6 @@ const ENTRY_COMPONENTS = [
451402
LogInShibbolethComponent,
452403
LogInOidcComponent,
453404
LogInOrcidComponent,
454-
BundleListElementComponent,
455-
ClaimedTaskActionsApproveComponent,
456-
ClaimedTaskActionsRejectComponent,
457-
ClaimedTaskActionsReturnToPoolComponent,
458-
ClaimedTaskActionsEditMetadataComponent,
459405
CollectionDropdownComponent,
460406
FileDownloadLinkComponent,
461407
CurationFormComponent,

0 commit comments

Comments
 (0)