Added 5 new themed Components.

src/app/collection-page/collection-form/collection-form.component.ts

@@ -39,7 +39,7 @@ import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-for
 import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
 import { FormComponent } from '../../shared/form/form.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { UploaderComponent } from '../../shared/upload/uploader/uploader.component';
+import { ThemedUploaderComponent } from '../../shared/upload/uploader/themed-uploader.component';
 import { VarDirective } from '../../shared/utils/var.directive';
 import {
   collectionFormEntityTypeSelectionConfig,
@@ -57,7 +57,7 @@ import {
   imports: [
     FormComponent,
     TranslateModule,
-    UploaderComponent,
+    ThemedUploaderComponent,
     AsyncPipe,
     ComcolPageLogoComponent,
     VarDirective,

src/app/community-page/community-form/community-form.component.ts

@@ -28,7 +28,7 @@ import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-for
 import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
 import { FormComponent } from '../../shared/form/form.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { UploaderComponent } from '../../shared/upload/uploader/uploader.component';
+import { ThemedUploaderComponent } from '../../shared/upload/uploader/themed-uploader.component';
 import { VarDirective } from '../../shared/utils/var.directive';
 
 /**
@@ -42,7 +42,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
   imports: [
     FormComponent,
     TranslateModule,
-    UploaderComponent,
+    ThemedUploaderComponent,
     AsyncPipe,
     ComcolPageLogoComponent,
     VarDirective,

src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts

@@ -34,7 +34,7 @@ import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { UploaderComponent } from '../../../shared/upload/uploader/uploader.component';
+import { ThemedUploaderComponent } from '../../../shared/upload/uploader/themed-uploader.component';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { UploadBitstreamComponent } from './upload-bitstream.component';
 
@@ -315,7 +315,10 @@ describe('UploadBitstreamComponent', () => {
     })
       .overrideComponent(UploadBitstreamComponent, {
         remove: {
-          imports: [UploaderComponent, DsoInputSuggestionsComponent],
+          imports: [
+            DsoInputSuggestionsComponent,
+            ThemedUploaderComponent,
+          ],
         },
       })
       .compileComponents();

src/app/item-page/bitstreams/upload/upload-bitstream.component.ts

@@ -47,6 +47,7 @@ import {
 } from '../../../shared/empty.util';
 import { DsoInputSuggestionsComponent } from '../../../shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ThemedUploaderComponent } from '../../../shared/upload/uploader/themed-uploader.component';
 import { UploaderComponent } from '../../../shared/upload/uploader/uploader.component';
 import { UploaderOptions } from '../../../shared/upload/uploader/uploader-options.model';
 import { VarDirective } from '../../../shared/utils/var.directive';
@@ -61,7 +62,7 @@ import { getEntityEditRoute } from '../../item-page-routing-paths';
     VarDirective,
     DsoInputSuggestionsComponent,
     FormsModule,
-    UploaderComponent,
+    ThemedUploaderComponent,
   ],
   standalone: true,
 })

src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts

@@ -33,7 +33,7 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
  * This component represents the 'Import metadata from external source' dropdown menu
  */
 @Component({
-  selector: 'ds-my-dspace-new-external-dropdown',
+  selector: 'ds-base-my-dspace-new-external-dropdown',
   styleUrls: ['./my-dspace-new-external-dropdown.component.scss'],
   templateUrl: './my-dspace-new-external-dropdown.component.html',
   imports: [

src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/themed-my-dspace-new-external-dropdown.component.ts

@@ -0,0 +1,28 @@
+import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../../../shared/theme-support/themed.component';
+import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-external-dropdown.component';
+
+/**
+ * Themed wrapper for {@link MyDSpaceNewExternalDropdownComponent}
+ */
+@Component({
+  selector: 'ds-my-dspace-new-external-dropdown',
+  templateUrl: './../../../shared/theme-support/themed.component.html',
+  standalone: true,
+  imports : [MyDSpaceNewExternalDropdownComponent],
+})
+export class ThemedMyDSpaceNewExternalDropdownComponent extends ThemedComponent<MyDSpaceNewExternalDropdownComponent> {
+
+  protected getComponentName(): string {
+    return 'MyDSpaceNewExternalDropdownComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./my-dspace-new-external-dropdown.component');
+  }
+}

src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts

@@ -35,7 +35,7 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
  * This component represents the new submission dropdown
  */
 @Component({
-  selector: 'ds-my-dspace-new-submission-dropdown',
+  selector: 'ds-base-my-dspace-new-submission-dropdown',
   styleUrls: ['./my-dspace-new-submission-dropdown.component.scss'],
   templateUrl: './my-dspace-new-submission-dropdown.component.html',
   imports: [

src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/themed-my-dspace-new-submission-dropdown.component.ts

@@ -0,0 +1,28 @@
+import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../../../shared/theme-support/themed.component';
+import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission-dropdown.component';
+
+/**
+ * Themed wrapper for {@link MyDSpaceNewSubmissionDropdownComponent}
+ */
+@Component({
+  selector: 'ds-my-dspace-new-submission-dropdown',
+  templateUrl: './../../../shared/theme-support/themed.component.html',
+  standalone: true,
+  imports: [MyDSpaceNewSubmissionDropdownComponent],
+})
+export class ThemedMyDSpaceNewSubmissionDropdownComponent extends ThemedComponent<MyDSpaceNewSubmissionDropdownComponent> {
+
+  protected getComponentName(): string {
+    return 'MyDSpaceNewSubmissionDropdownComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./my-dspace-new-submission-dropdown.component');
+  }
+}

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

@@ -1,47 +1,39 @@
 import { HttpXsrfTokenExtractor } from '@angular/common/http';
-import {
-  ChangeDetectorRef,
-  Component,
-  NO_ERRORS_SCHEMA,
-} from '@angular/core';
+import { ChangeDetectorRef } from '@angular/core';
 import {
   ComponentFixture,
-  inject,
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { RouterModule } from '@angular/router';
 import {
   NgbModal,
   NgbModule,
 } from '@ng-bootstrap/ng-bootstrap';
-import {
-  TranslateLoader,
-  TranslateModule,
-} from '@ngx-translate/core';
-import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
+import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref';
+import { TranslateModule } from '@ngx-translate/core';
 
 import { AuthService } from '../../core/auth/auth.service';
-import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
 import { DragService } from '../../core/drag.service';
 import { CookieService } from '../../core/services/cookie.service';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { HostWindowService } from '../../shared/host-window.service';
 import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
 import { HttpXsrfTokenExtractorMock } from '../../shared/mocks/http-xsrf-token-extractor.mock';
-import { getMockScrollToService } from '../../shared/mocks/scroll-to-service.mock';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { createTestComponent } from '../../shared/testing/utils.test';
+import { ThemedUploaderComponent } from '../../shared/upload/uploader/themed-uploader.component';
 import { UploaderComponent } from '../../shared/upload/uploader/uploader.component';
+import { ThemedMyDSpaceNewExternalDropdownComponent } from './my-dspace-new-external-dropdown/themed-my-dspace-new-external-dropdown.component';
 import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission.component';
-import { getMockEntityTypeService } from './my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec';
+import { ThemedMyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission-dropdown/themed-my-dspace-new-submission-dropdown.component';
+
+describe('MyDSpaceNewSubmissionComponent', () => {
+  let fixture: ComponentFixture<MyDSpaceNewSubmissionComponent>;
+  let comp: MyDSpaceNewSubmissionComponent;
 
-describe('MyDSpaceNewSubmissionComponent test', () => {
+  let modalService: NgbModal;
 
   const uploader: any = jasmine.createSpyObj('uploader', {
     clearQueue: jasmine.createSpy('clearQueue').and.stub(),
@@ -52,92 +44,48 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock,
-          },
-        }),
+        TranslateModule.forRoot(),
         NgbModule,
-        RouterTestingModule,
+        RouterModule.forRoot([]),
         MyDSpaceNewSubmissionComponent,
-        TestComponent,
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
         { provide: HALEndpointService, useValue: new HALEndpointServiceStub('workspaceitems') },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: ScrollToService, useValue: getMockScrollToService() },
         NgbModal,
         ChangeDetectorRef,
         MyDSpaceNewSubmissionComponent,
         DragService,
         { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock('mock-token') },
         { provide: CookieService, useValue: new CookieServiceMock() },
-        { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
-        { provide: EntityTypeDataService, useValue: getMockEntityTypeService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(MyDSpaceNewSubmissionComponent, {
+      remove: {
+        imports: [
+          ThemedMyDSpaceNewExternalDropdownComponent,
+          ThemedMyDSpaceNewSubmissionDropdownComponent,
+          ThemedUploaderComponent,
+        ],
+      },
     }).compileComponents();
   }));
 
-  describe('', () => {
-    let testComp: TestComponent;
-    let testFixture: ComponentFixture<TestComponent>;
-
-    // synchronous beforeEach
-    beforeEach(() => {
-      const html = `
-        <ds-my-dspace-new-submission (uploadEnd)="reload($event)"></ds-my-dspace-new-submission>`;
-
-      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
-      testComp = testFixture.componentInstance;
-    });
-
-    afterEach(() => {
-      testFixture.destroy();
-    });
-
-    it('should create MyDSpaceNewSubmissionComponent', inject([MyDSpaceNewSubmissionComponent], (app: MyDSpaceNewSubmissionComponent) => {
-
-      expect(app).toBeDefined();
-
-    }));
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MyDSpaceNewSubmissionComponent);
+    comp = fixture.componentInstance;
+    modalService = TestBed.inject(NgbModal);
+    comp.uploadFilesOptions.authToken = 'user-auth-token';
+    comp.uploadFilesOptions.url = 'https://fake.upload-api.url';
+    comp.uploaderComponent = TestBed.createComponent(UploaderComponent).componentInstance;
+    comp.uploaderComponent.uploader = uploader;
   });
 
-  describe('', () => {
-    let fixture: ComponentFixture<MyDSpaceNewSubmissionComponent>;
-    let comp: MyDSpaceNewSubmissionComponent;
+  it('should show a collection selector if only one file are uploaded', () => {
+    spyOn(modalService, 'open').and.returnValue({ result: new Promise((res, rej) => {/****/}) } as NgbModalRef);
 
-    beforeEach(() => {
-      fixture = TestBed.createComponent(MyDSpaceNewSubmissionComponent);
-      comp = fixture.componentInstance;
-      comp.uploadFilesOptions.authToken = 'user-auth-token';
-      comp.uploadFilesOptions.url = 'https://fake.upload-api.url';
-      comp.uploaderComponent = TestBed.createComponent(UploaderComponent).componentInstance;
-      comp.uploaderComponent.uploader = uploader;
-    });
+    comp.afterFileLoaded(['']);
 
-    it('should show a collection selector if only one file are uploaded', (done) => {
-      spyOn((comp as any).modalService, 'open').and.returnValue({ result: new Promise((res, rej) => {/****/}) });
-      comp.afterFileLoaded(['']);
-      expect((comp as any).modalService.open).toHaveBeenCalled();
-      done();
-    });
+    expect(modalService.open).toHaveBeenCalled();
   });
 });
-
-// declare a test component
-@Component({
-  selector: 'ds-test-cmp',
-  template: ``,
-  standalone: true,
-  imports: [NgbModule,
-    RouterTestingModule],
-})
-class TestComponent {
-
-  reload = (event) => {
-    return;
-  };
-}

src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts

@@ -20,24 +20,25 @@ import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
 import { hasValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SearchResult } from '../../shared/search/models/search-result.model';
+import { ThemedUploaderComponent } from '../../shared/upload/uploader/themed-uploader.component';
 import { UploaderComponent } from '../../shared/upload/uploader/uploader.component';
 import { UploaderError } from '../../shared/upload/uploader/uploader-error.model';
 import { UploaderOptions } from '../../shared/upload/uploader/uploader-options.model';
 import { CollectionSelectorComponent } from '../collection-selector/collection-selector.component';
-import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component';
-import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component';
+import { ThemedMyDSpaceNewExternalDropdownComponent } from './my-dspace-new-external-dropdown/themed-my-dspace-new-external-dropdown.component';
+import { ThemedMyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission-dropdown/themed-my-dspace-new-submission-dropdown.component';
 
 /**
  * This component represents the whole mydspace page header
  */
 @Component({
-  selector: 'ds-my-dspace-new-submission',
+  selector: 'ds-base-my-dspace-new-submission',
   styleUrls: ['./my-dspace-new-submission.component.scss'],
   templateUrl: './my-dspace-new-submission.component.html',
   imports: [
-    MyDSpaceNewExternalDropdownComponent,
-    MyDSpaceNewSubmissionDropdownComponent,
-    UploaderComponent,
+    ThemedMyDSpaceNewExternalDropdownComponent,
+    ThemedMyDSpaceNewSubmissionDropdownComponent,
+    ThemedUploaderComponent,
   ],
   standalone: true,
 })

src/app/my-dspace-page/my-dspace-new-submission/themed-my-dspace-new-submission.component.ts

@@ -0,0 +1,40 @@
+import {
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core';
+
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { SearchResult } from '../../shared/search/models/search-result.model';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission.component';
+
+/**
+ * Themed wrapper for {@link MyDSpaceNewSubmissionComponent}
+ */
+@Component({
+  selector: 'ds-my-dspace-new-submission',
+  templateUrl: './../../shared/theme-support/themed.component.html',
+  standalone: true,
+  imports: [MyDSpaceNewSubmissionComponent],
+})
+export class ThemedMyDSpaceNewSubmissionComponent extends ThemedComponent<MyDSpaceNewSubmissionComponent> {
+
+  @Output() uploadEnd: EventEmitter<SearchResult<DSpaceObject>[]> = new EventEmitter();
+
+  protected inAndOutputNames: (keyof MyDSpaceNewSubmissionComponent & keyof this)[] = [
+    'uploadEnd',
+  ];
+
+  protected getComponentName(): string {
+    return 'MyDSpaceNewSubmissionComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./my-dspace-new-submission.component');
+  }
+}