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

2025-10-07 01:54:15 +00:00 · 2024-03-13 14:52:11 +01:00
parent 8c435be8c0 98b15658b0
commit 08aef91a0a
9 changed files with 35 additions and 32 deletions
--- a/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
@@ -28,6 +28,14 @@ import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.serv
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { Community } from '../../core/shared/community.model';
 import { Item } from '../../core/shared/item.model';
+import { BrowseByComponent } from '../../shared/browse-by/browse-by.component';
+import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component';
+import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
+import { ComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/comcol-page-content.component';
+import { ThemedComcolPageHandleComponent } from '../../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
+import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-header/comcol-page-header.component';
+import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
+import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { RouterMock } from '../../shared/mocks/router.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
@@ -98,13 +106,15 @@ describe('BrowseByDateComponent', () => {

  beforeEach(waitForAsync(() => {
    TestBed.configureTestingModule({
-      imports: [CommonModule,
+      imports: [
+        CommonModule,
        RouterTestingModule.withRoutes([]),
        TranslateModule.forRoot(),
        NgbModule,
        BrowseByDateComponent,
        EnumKeysPipe,
-        VarDirective],
+        VarDirective,
+      ],
      providers: [
        { provide: ActivatedRoute, useValue: activatedRouteStub },
        { provide: BrowseService, useValue: mockBrowseService },
@@ -116,7 +126,22 @@ describe('BrowseByDateComponent', () => {
        { provide: APP_CONFIG, useValue: environment },
      ],
      schemas: [NO_ERRORS_SCHEMA],
-    }).compileComponents();
+    })
+      .overrideComponent(BrowseByDateComponent, {
+        remove: {
+          imports: [
+            ComcolPageHeaderComponent,
+            ComcolPageLogoComponent,
+            ThemedComcolPageHandleComponent,
+            ComcolPageContentComponent,
+            ThemedComcolPageBrowseByComponent,
+            BrowseByComponent,
+            ThemedLoadingComponent,
+            ThemedBrowseByComponent,
+          ],
+        },
+      })
+      .compileComponents();
  }));

  beforeEach(() => {
--- a/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts
+++ b/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts
@@ -13,11 +13,9 @@ import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { ThemeService } from '../../shared/theme-support/theme.service';
 import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
-import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 import { BrowseBySwitcherComponent } from '../browse-by-switcher/browse-by-switcher.component';
 import { BrowseByPageComponent } from './browse-by-page.component';

-@rendersBrowseBy('BrowseByPageComponent' as BrowseByDataType)
@Component({
  // eslint-disable-next-line @angular-eslint/component-selector
  selector: '',
--- a/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts
@@ -1,13 +1,13 @@
 import { BrowseByDataType } from './browse-by-data-type';
-import { rendersBrowseBy } from './browse-by-decorator';
+import { BROWSE_BY_DECORATOR_MAP } from './browse-by-decorator';

 describe('BrowseByDecorator', () => {
-  const titleDecorator = rendersBrowseBy(BrowseByDataType.Title);
-  const dateDecorator = rendersBrowseBy(BrowseByDataType.Date);
-  const metadataDecorator = rendersBrowseBy(BrowseByDataType.Metadata);
+  const titleDecorator = BROWSE_BY_DECORATOR_MAP.get(BrowseByDataType.Title);
+  const dateDecorator = BROWSE_BY_DECORATOR_MAP.get(BrowseByDataType.Date);
+  const metadataDecorator = BROWSE_BY_DECORATOR_MAP.get(BrowseByDataType.Metadata);
  it('should have a decorator for all types', () => {
-    expect(titleDecorator.length).not.toEqual(0);
-    expect(dateDecorator.length).not.toEqual(0);
-    expect(metadataDecorator.length).not.toEqual(0);
+    expect(titleDecorator).toBeTruthy();
+    expect(dateDecorator).toBeTruthy();
+    expect(metadataDecorator).toBeTruthy();
  });
 });
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
@@ -15,10 +15,8 @@ import { DynamicComponentLoaderDirective } from '../../shared/abstract-component
 import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
 import { ThemeService } from '../../shared/theme-support/theme.service';
 import { BrowseByDataType } from './browse-by-data-type';
-import { rendersBrowseBy } from './browse-by-decorator';
 import { BrowseBySwitcherComponent } from './browse-by-switcher.component';

-@rendersBrowseBy('BrowseBySwitcherComponent' as BrowseByDataType)
@Component({
  // eslint-disable-next-line @angular-eslint/component-selector
  selector: '',
--- a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts
+++ b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts
@@ -8,7 +8,6 @@ import { By } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';

 import { BrowseByDataType } from '../../../../browse-by/browse-by-switcher/browse-by-data-type';
-import { rendersBrowseBy } from '../../../../browse-by/browse-by-switcher/browse-by-decorator';
 import { BrowseBySwitcherComponent } from '../../../../browse-by/browse-by-switcher/browse-by-switcher.component';
 import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
 import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive';
@@ -17,7 +16,6 @@ import { ActivatedRouteStub } from '../../../testing/active-router.stub';
 import { ThemeService } from '../../../theme-support/theme.service';
 import { ComcolBrowseByComponent } from './comcol-browse-by.component';

-@rendersBrowseBy('ComcolBrowseByComponent' as BrowseByDataType)
@Component({
  // eslint-disable-next-line @angular-eslint/component-selector
  selector: '',
--- a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -6,9 +6,6 @@ import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';

 import { BrowseByDateComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-date/browse-by-date.component';
-import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type';
-import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator';
-import { Context } from '../../../../../app/core/shared/context.model';
 import { BrowseByComponent } from '../../../../../app/shared/browse-by/browse-by.component';
 import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
 import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
@@ -43,6 +40,5 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
    ThemedBrowseByComponent,
  ],
 })
-@rendersBrowseBy(BrowseByDataType.Date, Context.Any, 'custom')
 export class BrowseByDateComponent extends BaseComponent {
 }
--- a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -6,9 +6,6 @@ import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';

 import { BrowseByMetadataComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component';
-import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type';
-import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator';
-import { Context } from '../../../../../app/core/shared/context.model';
 import { BrowseByComponent } from '../../../../../app/shared/browse-by/browse-by.component';
 import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
 import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
@@ -43,6 +40,5 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
    ThemedBrowseByComponent,
  ],
 })
-@rendersBrowseBy(BrowseByDataType.Metadata, Context.Any, 'custom')
 export class BrowseByMetadataComponent extends BaseComponent {
 }
--- a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
@@ -6,10 +6,7 @@ import { Component } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';

-import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type';
-import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator';
 import { BrowseByTaxonomyComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component';
-import { Context } from '../../../../../app/core/shared/context.model';
 import { BrowseByComponent } from '../../../../../app/shared/browse-by/browse-by.component';
 import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
 import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
@@ -47,6 +44,5 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
    ThemedBrowseByComponent,
  ],
 })
-@rendersBrowseBy(BrowseByDataType.Hierarchy, Context.Any, 'custom')
 export class BrowseByTaxonomyComponent extends BaseComponent {
 }
--- a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -5,10 +5,7 @@ import {
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';

-import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type';
-import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator';
 import { BrowseByTitleComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-title/browse-by-title.component';
-import { Context } from '../../../../../app/core/shared/context.model';
 import { BrowseByComponent } from '../../../../../app/shared/browse-by/browse-by.component';
 import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
 import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
@@ -43,6 +40,5 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
    ThemedBrowseByComponent,
  ],
 })
-@rendersBrowseBy(BrowseByDataType.Title, Context.Any, 'custom')
 export class BrowseByTitleComponent extends BaseComponent {
 }