Merge remote-tracking branch '4scienceGithub/DURACOM-191' into DURACOM-191

src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts

@@ -23,6 +23,7 @@ import {
   createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component';
 import { FileValueAccessorDirective } from '../../shared/utils/file-value-accessor.directive';
 import { FileValidator } from '../../shared/utils/require-file.validator';
 import { MetadataImportPageComponent } from './metadata-import-page.component';
@@ -67,7 +68,13 @@ describe('MetadataImportPageComponent', () => {
         { provide: Location, useValue: locationStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(MetadataImportPageComponent, {
+        remove: {
+          imports: [FileDropzoneNoUploaderComponent],
+        },
+      })
+      .compileComponents();
   }));
 
   beforeEach(() => {

src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts

@@ -2,12 +2,14 @@ import {
   ComponentFixture,
   TestBed,
 } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { buildPaginatedList } from '../../core/data/paginated-list.model';
 import { SearchService } from '../../core/shared/search/search.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
 import { AdminNotifyMessage } from './models/admin-notify-message.model';
 import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model';
@@ -40,7 +42,10 @@ describe('AdminNotifyDashboardComponent', () => {
 
     await TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NgbNavModule, AdminNotifyDashboardComponent],
-      providers: [{ provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } }],
+      providers: [
+        { provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } },
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
+      ],
     })
       .compileComponents();
 

src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts

@@ -6,6 +6,7 @@ import { ActivatedRoute } from '@angular/router';
 import { provideMockStore } from '@ngrx/store/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { APP_DATA_SERVICES_MAP } from '../../../../../config/app-config.interface';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { RequestService } from '../../../../core/data/request.service';
 import { RouteService } from '../../../../core/services/route.service';
@@ -44,6 +45,7 @@ describe('AdminNotifyIncomingComponent', () => {
         { provide: HALEndpointService, useValue: halService },
         { provide: RequestService, useValue: requestService },
         { provide: RemoteDataBuildService, useValue: rdbService },
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
         provideMockStore({}),
       ],
     })

src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts

@@ -21,8 +21,7 @@ describe('AdminNotifyMetricsComponent', () => {
 
 
     await TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
+      imports: [TranslateModule.forRoot(), AdminNotifyMetricsComponent],
-      declarations: [AdminNotifyMetricsComponent],
       providers: [{ provide: Router, useValue: router }],
     })
       .compileComponents();

src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts

@@ -13,6 +13,7 @@ import {
   of,
 } from 'rxjs';
 
+import { APP_DATA_SERVICES_MAP } from '../../../../config/app-config.interface';
 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RequestService } from '../../../core/data/request.service';
@@ -23,6 +24,8 @@ import { SearchConfigurationService } from '../../../core/shared/search/search-c
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
 import { routeServiceStub } from '../../../shared/testing/route-service.stub';
 import { RouterStub } from '../../../shared/testing/router.stub';
+import { TruncatableComponent } from '../../../shared/truncatable/truncatable.component';
+import { TruncatablePartComponent } from '../../../shared/truncatable/truncatable-part/truncatable-part.component';
 import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
 import { AdminNotifyMessage } from '../models/admin-notify-message.model';
 import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
@@ -128,8 +131,7 @@ describe('AdminNotifySearchResultComponent', () => {
 
 
     await TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
+      imports: [TranslateModule.forRoot(), AdminNotifySearchResultComponent, AdminNotifyDetailModalComponent],
-      declarations: [AdminNotifySearchResultComponent, AdminNotifyDetailModalComponent],
       providers: [
         { provide: AdminNotifyMessagesService, useValue: adminNotifyMessageService },
         { provide: RouteService, useValue: routeServiceStub },
@@ -139,9 +141,18 @@ describe('AdminNotifySearchResultComponent', () => {
         { provide: RequestService, useValue: requestService },
         { provide: RemoteDataBuildService, useValue: rdbService },
         { provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService },
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
         DatePipe,
       ],
       schemas: [NO_ERRORS_SCHEMA],
+    })
+      .overrideComponent(AdminNotifySearchResultComponent, {
+        remove: {
+          imports: [
+            TruncatableComponent,
+            TruncatablePartComponent,
+          ],
+        },
       })
       .compileComponents();
 

src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts

@@ -18,6 +18,7 @@ import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mo
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { JournalIssueSearchResultGridElementComponent } from '../search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component';
 import { JournalIssueGridElementComponent } from './journal-issue-grid-element.component';
 
 
@@ -64,6 +65,9 @@ describe('JournalIssueGridElementComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalIssueGridElementComponent, {
       add: { changeDetection: ChangeDetectionStrategy.Default },
+      remove: {
+        imports: [JournalIssueSearchResultGridElementComponent],
+      },
     }).compileComponents();
   }));
 

src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts

@@ -18,11 +18,15 @@ import { Item } from '../../../../../core/shared/item.model';
 import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
 import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
+import { ThemedBadgesComponent } from '../../../../../shared/object-collection/shared/badges/themed-badges.component';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub';
 import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableComponent } from '../../../../../shared/truncatable/truncatable.component';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { TruncatablePartComponent } from '../../../../../shared/truncatable/truncatable-part/truncatable-part.component';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { ThumbnailComponent } from '../../../../../thumbnail/thumbnail.component';
 import { JournalIssueSearchResultListElementComponent } from './journal-issue-search-result-list-element.component';
 
 let journalIssueListElementComponent: JournalIssueSearchResultListElementComponent;
@@ -102,7 +106,10 @@ describe('JournalIssueSearchResultListElementComponent', () => {
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalIssueSearchResultListElementComponent, {
-      add: { changeDetection: ChangeDetectionStrategy.Default } },
+      add: { changeDetection: ChangeDetectionStrategy.Default } ,
+      remove: {
+        imports: [ThumbnailComponent, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent],
+      } },
     ).compileComponents();
   }));
 

src/app/item-page/simple/item-types/publication/publication.component.spec.ts

@@ -22,7 +22,10 @@ import {
   of,
 } from 'rxjs';
 
-import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import {
+  APP_CONFIG,
+  APP_DATA_SERVICES_MAP,
+} from '../../../../../config/app-config.interface';
 import { environment } from '../../../../../environments/environment.test';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
@@ -115,6 +118,7 @@ describe('PublicationComponent', () => {
         { provide: RouteService, useValue: mockRouteService },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
         { provide: APP_CONFIG, useValue: environment },
+        { provide: APP_DATA_SERVICES_MAP, useValue: {}  },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PublicationComponent, {

src/app/item-page/simple/item-types/shared/item.component.spec.ts

@@ -69,6 +69,7 @@ import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail.component';
 import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
 import { ThemedItemPageTitleFieldComponent } from '../../field-components/specific-field/title/themed-item-page-field.component';
+import { ThemedMetadataRepresentationListComponent } from '../../metadata-representation-list/themed-metadata-representation-list.component';
 import { TabbedRelatedEntitiesSearchComponent } from '../../related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
 import { RelatedItemsComponent } from '../../related-items/related-items-component';
 import { ItemComponent } from './item.component';
@@ -198,6 +199,7 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
               ThemedThumbnailComponent,
               RelatedItemsComponent,
               TabbedRelatedEntitiesSearchComponent,
+              ThemedMetadataRepresentationListComponent,
             ],
           },
           add: { changeDetection: ChangeDetectionStrategy.Default },

src/app/my-dspace-page/my-dspace-page.component.spec.ts

@@ -28,6 +28,8 @@ import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-
 import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission/my-dspace-new-submission.component';
 import { MyDSpacePageComponent } from './my-dspace-page.component';
 import SpyObj = jasmine.SpyObj;
+import { SuggestionsNotificationComponent } from '../notifications/suggestions-notification/suggestions-notification.component';
+import { MyDspaceQaEventsNotificationsComponent } from './my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component';
 
 describe('MyDSpacePageComponent', () => {
   let comp: MyDSpacePageComponent;
@@ -97,7 +99,12 @@ describe('MyDSpacePageComponent', () => {
       })
       .overrideComponent(MyDSpacePageComponent, {
         remove: {
-          imports: [ThemedSearchComponent, MyDSpaceNewSubmissionComponent],
+          imports: [
+            ThemedSearchComponent,
+            MyDSpaceNewSubmissionComponent,
+            SuggestionsNotificationComponent,
+            MyDspaceQaEventsNotificationsComponent,
+          ],
         },
       })
       .compileComponents();

src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts

@@ -9,8 +9,11 @@ import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 
+import { ItemSearchResultListElementComponent } from '../../../themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { Item } from '../../core/shared/item.model';
 import { mockSuggestionPublicationOne } from '../../shared/mocks/publication-claim.mock';
+import { SuggestionActionsComponent } from '../suggestion-actions/suggestion-actions.component';
+import { SuggestionEvidencesComponent } from './suggestion-evidences/suggestion-evidences.component';
 import { SuggestionListElementComponent } from './suggestion-list-element.component';
 
 describe('SuggestionListElementComponent', () => {
@@ -29,7 +32,17 @@ describe('SuggestionListElementComponent', () => {
         NgbModal,
       ],
       schemas: [NO_ERRORS_SCHEMA],
-    }).compileComponents().then();
+    })
+      .overrideComponent(SuggestionListElementComponent, {
+        remove: {
+          imports: [
+            ItemSearchResultListElementComponent,
+            SuggestionActionsComponent,
+            SuggestionEvidencesComponent,
+          ],
+        },
+      })
+      .compileComponents().then();
   }));
 
   beforeEach(() => {

src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts

@@ -4,10 +4,12 @@ import {
   ComponentFixture,
   TestBed,
 } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
 import { mockSuggestionTargetsObjectOne } from '../../shared/mocks/publication-claim-targets.mock';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { SuggestionTargetsStateService } from '../suggestion-targets/suggestion-targets.state.service';
 import { SuggestionsService } from '../suggestions.service';
 import { SuggestionsPopupComponent } from './suggestions-popup.component';
@@ -35,6 +37,7 @@ describe('SuggestionsPopupComponent', () => {
       providers: [
         { provide: SuggestionTargetsStateService, useValue: suggestionStateService },
         { provide: SuggestionsService, useValue: suggestionService },
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })

src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts

@@ -9,6 +9,7 @@ import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { AdminNotificationsPublicationClaimPageComponent } from '../../admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component';
+import { PublicationClaimComponent } from '../../notifications/suggestion-targets/publication-claim/publication-claim.component';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { NotificationsSuggestionTargetsPageComponent } from './notifications-suggestion-targets-page.component';
 
@@ -28,6 +29,11 @@ describe('NotificationsSuggestionTargetsPageComponent', () => {
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
       ],
       schemas: [NO_ERRORS_SCHEMA],
+    })
+      .overrideComponent(NotificationsSuggestionTargetsPageComponent, {
+        remove: {
+          providers: [PublicationClaimComponent],
+        },
       })
       .compileComponents();
   }));

src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.spec.ts

@@ -6,6 +6,7 @@ import { ActivatedRoute } from '@angular/router';
 
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { environment } from '../../../../../environments/environment.test';
+import { ThemedSearchComponent } from '../../../search/themed-search.component';
 import { ActivatedRouteStub } from '../../../testing/active-router.stub';
 import { ComcolSearchSectionComponent } from './comcol-search-section.component';
 
@@ -24,7 +25,13 @@ describe('ComcolSearchSectionComponent', () => {
         { provide: APP_CONFIG, useValue: environment },
         { provide: ActivatedRoute, useValue: route },
       ],
-    }).compileComponents();
+    })
+      .overrideComponent(ComcolSearchSectionComponent, {
+        remove: {
+          imports: [ThemedSearchComponent],
+        },
+      })
+      .compileComponents();
 
     fixture = TestBed.createComponent(ComcolSearchSectionComponent);
     component = fixture.componentInstance;

src/app/shared/notification-box/notification-box.component.spec.ts

@@ -22,8 +22,7 @@ describe('NotificationBoxComponent', () => {
     };
 
     await TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
+      imports: [TranslateModule.forRoot(), NotificationBoxComponent],
-      declarations: [NotificationBoxComponent],
     })
       .compileComponents();
 

src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts

@@ -23,9 +23,11 @@ import { WorkflowItem } from '../../../../core/submission/models/workflowitem.mo
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { getMockLinkService } from '../../../mocks/link-service.mock';
+import { PoolTaskActionsComponent } from '../../../mydspace-actions/pool-task/pool-task-actions.component';
 import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { VarDirective } from '../../../utils/var.directive';
+import { ItemDetailPreviewComponent } from '../item-detail-preview/item-detail-preview.component';
 import { PoolSearchResultDetailElementComponent } from './pool-search-result-detail-element.component';
 
 let component: PoolSearchResultDetailElementComponent;
@@ -88,6 +90,9 @@ describe('PoolSearchResultDetailElementComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PoolSearchResultDetailElementComponent, {
       add: { changeDetection: ChangeDetectionStrategy.Default },
+      remove: {
+        imports: [ItemDetailPreviewComponent, PoolTaskActionsComponent],
+      },
     }).compileComponents();
   }));
 

src/app/submission/sections/duplicates/section-duplicates.component.spec.ts

@@ -31,6 +31,7 @@ import { MetadataValue } from '../../../core/shared/metadata.models';
 import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormService } from '../../../shared/form/form.service';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
 import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
 import {
@@ -168,7 +169,7 @@ describe('SubmissionSectionDuplicatesComponent test suite', () => {
         { provide: 'submissionIdProvider', useValue: submissionId },
         { provide: PaginationService, useValue: paginationService },
         ChangeDetectorRef,
-        FormBuilderService,
+        { provide: FormBuilderService, useValue: getMockFormBuilderService() },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();

src/app/submission/sections/duplicates/section-duplicates.component.ts

@@ -28,8 +28,6 @@ import { SubmissionService } from '../../submission.service';
 import { SectionModelComponent } from '../models/section.model';
 import { SectionDataObject } from '../models/section-data.model';
 import { SectionsService } from '../sections.service';
-import { renderSectionFor } from '../sections-decorator';
-import { SectionsType } from '../sections-type';
 
 /**
  * Detect duplicates step
@@ -50,7 +48,6 @@ import { SectionsType } from '../sections-type';
   standalone: true,
 })
 
-@renderSectionFor(SectionsType.Duplicates)
 export class SubmissionSectionDuplicatesComponent extends SectionModelComponent {
   protected readonly Metadata = Metadata;
   /**

src/app/submission/sections/sections-decorator.ts

@@ -1,5 +1,6 @@
 import { SubmissionSectionAccessesComponent } from './accesses/section-accesses.component';
 import { SubmissionSectionCcLicensesComponent } from './cc-license/submission-section-cc-licenses.component';
+import { SubmissionSectionDuplicatesComponent } from './duplicates/section-duplicates.component';
 import { SubmissionSectionFormComponent } from './form/section-form.component';
 import { SubmissionSectionIdentifiersComponent } from './identifiers/section-identifiers.component';
 import { SubmissionSectionLicenseComponent } from './license/section-license.component';
@@ -18,6 +19,7 @@ submissionSectionsMap.set(SectionsType.Upload, SubmissionSectionUploadComponent)
 submissionSectionsMap.set(SectionsType.SubmissionForm, SubmissionSectionFormComponent);
 submissionSectionsMap.set(SectionsType.Identifiers, SubmissionSectionIdentifiersComponent);
 submissionSectionsMap.set(SectionsType.CoarNotify, SubmissionSectionCoarNotifyComponent);
+submissionSectionsMap.set(SectionsType.Duplicates, SubmissionSectionDuplicatesComponent);
 
 /**
  * @deprecated