[TLC-277] Fixing module and component importing

DSpace · Jan 18, 2023 · 8b8c630 · 8b8c630
1 parent 97e9419
commit 8b8c630
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 11 deletions.
diff --git a/src/app/my-dspace-page/my-dspace-search.module.ts b/src/app/my-dspace-page/my-dspace-search.module.ts
@@ -20,11 +20,17 @@ import { ResearchEntitiesModule } from '../entity-groups/research-entities/resea
 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 { 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';
+import {
+  ThemedItemListPreviewComponent
+} from '../shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
+import {
+  ItemListPreviewComponent
+} from '../shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
 
 const ENTRY_COMPONENTS = [
   WorkspaceItemSearchResultListElementComponent,
@@ -39,6 +45,8 @@ const ENTRY_COMPONENTS = [
   ClaimedTaskSearchResultDetailElementComponent,
   PoolSearchResultDetailElementComponent,
   ItemSearchResultListElementSubmissionComponent,
+  //ItemListPreviewComponent,
+  //ThemedItemListPreviewComponent,
 ];
 
 const DECLARATIONS = [
@@ -62,7 +70,10 @@ const DECLARATIONS = [
   ],
   declarations: [
     ...DECLARATIONS,
-  ]
+  ],
+  exports: [
+    ...DECLARATIONS,
+      ]
 })
 
 /**

diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
@@ -244,6 +244,15 @@ import {
 import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
 import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
 import { LogInExternalProviderComponent } from './log-in/methods/log-in-external-provider/log-in-external-provider.component';
+import {
+  ThemedItemListPreviewComponent
+} from './object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
+import {
+  ItemListPreviewComponent
+} from './object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
+import {
+  MyDSpaceItemStatusComponent
+} from './object-collection/shared/mydspace-item-status/my-dspace-item-status.component';
 
 
 const MODULES = [
@@ -346,6 +355,9 @@ const COMPONENTS = [
   ListableNotificationObjectComponent,
   DsoPageEditButtonComponent,
   MetadataFieldWrapperComponent,
+//  ItemListPreviewComponent,
+//  ThemedItemListPreviewComponent,
+  //MyDSpaceItemStatusComponent,
 ];
 
 const ENTRY_COMPONENTS = [

diff --git a/src/app/submission/sections/detect-duplicate/duplicate-match/duplicate-match.component.html b/src/app/submission/sections/detect-duplicate/duplicate-match/duplicate-match.component.html
@@ -1,8 +1,6 @@
-<ds-item-list-preview
+<ds-themed-item-list-preview
   [item]="item"
-  [object]="object"
-  [metadataList]="metadataList"
-></ds-item-list-preview>
+></ds-themed-item-list-preview>
 
 <div *ngIf="isWorkFlow" class="mt-2">
   <form>

diff --git a/src/app/submission/sections/detect-duplicate/section-detect-duplicate.component.html b/src/app/submission/sections/detect-duplicate/section-detect-duplicate.component.html
@@ -16,8 +16,7 @@
     [retainScrollPosition]="true">
 
     <ul class="list-unstyled" *ngVar="(config$ | async) as config">
-      <li *ngFor="let item of (sectionData$ | async)?.matches | dsObjNgFor
-    | paginate: {id: config.id, itemsPerPage: config.pageSize, currentPage: config.currentPage}; let i = index; let l = last"
+      <li *ngFor="let item of (sectionData$ | async)?.matches | dsObjNgFor; let i = index; let l = last"
           class="mt-4 mb-4"
           [class.border-bottom]="!l">
         <ds-duplicate-match

diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
@@ -68,7 +68,12 @@ import {
   MetadataInformationComponent
 } from './sections/sherpa-policies/metadata-information/metadata-information.component';
 import { SectionFormOperationsService } from './sections/form/section-form-operations.service';
-
+import { MyDspaceSearchModule } from '../my-dspace-page/my-dspace-search.module';
+/*
+import {
+  ThemedItemListPreviewComponent
+} from '../shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
+*/
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
   SubmissionSectionUploadComponent,
@@ -114,6 +119,7 @@ const DECLARATIONS = [
     CommonModule,
     CoreModule.forRoot(),
     SharedModule,
+    MyDspaceSearchModule,
     StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
     EffectsModule.forFeature(submissionEffects),
     JournalEntitiesModule.withEntryComponents(),
@@ -135,7 +141,7 @@ const DECLARATIONS = [
     SubmissionUploadsConfigDataService,
     SubmissionAccessesConfigDataService,
     SectionAccessesService,
-    DetectDuplicateService
+    DetectDuplicateService,
     SectionFormOperationsService,
   ]
 })