Merge branch 'backport-themed-AuthorizedCollectionSelectorComponent-7.6' into w2p-130443_combined-themed-components

Author: Wout-atmire

src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.spec.ts

@@ -14,6 +14,7 @@ import { buildPaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { SearchService } from '../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { ThemedDSOSelectorComponent } from '../../shared/dso-selector/dso-selector/themed-dso-selector.component';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { FacetValue } from '../../shared/search/models/facet-value.model';
 import { FilterType } from '../../shared/search/models/filter-type.model';
@@ -91,6 +92,9 @@ describe('BrowseByGeospatialDataComponent', () => {
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
+      .overrideComponent(BrowseByGeospatialDataComponent, {
+        remove: { imports: [ThemedDSOSelectorComponent] },
+      })
       .compileComponents();
   }));
 

src/app/core/data/collection-data.service.ts

@@ -125,15 +125,20 @@ export class CollectionDataService extends ComColDataService<Collection> {
   /**
    * Get all collections the user is authorized to submit to, by community
    *
+   * TODO This method should be replaced with `getAuthorizedCollection` and the `options` parameter `scopeID` should be
+   *  supported instead in `BaseDataService#buildHrefFromFindOptions`
+   *
    * @param communityId The community id
    * @param query limit the returned collection to those with metadata values matching the query terms.
    * @param options The [[FindListOptions]] object
-   * @param reRequestOnStale Whether or not the request should automatically be re-
-   *                         requested after the response becomes stale
-   * @return Observable<RemoteData<PaginatedList<Collection>>>
-   *    collection list
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's no valid-cached
+   * version. Defaults to true
+   * @param reRequestOnStale Whether or not the request should automatically be re-requested after the response become
+   * s stale
+   * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically
+   * resolved
    */
-  getAuthorizedCollectionByCommunity(communityId: string, query: string, options: FindListOptions = {}, reRequestOnStale = true): Observable<RemoteData<PaginatedList<Collection>>> {
+  getAuthorizedCollectionByCommunity(communityId: string, query: string, options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Collection>[]): Observable<RemoteData<PaginatedList<Collection>>> {
     const searchHref = 'findSubmitAuthorizedByCommunity';
     options = Object.assign({}, options, {
       searchParams: [
@@ -142,10 +147,11 @@ export class CollectionDataService extends ComColDataService<Collection> {
       ],
     });
 
-    return this.searchBy(searchHref, options, reRequestOnStale).pipe(
+    return this.searchBy(searchHref, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
       getAllCompletedRemoteData(),
     );
   }
+
   /**
    * Get all collections the user is authorized to submit to, by community and has the metadata
    *

src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts

@@ -19,7 +19,7 @@ import { RequestService } from '../../../core/data/request.service';
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchService } from '../../../core/shared/search/search.service';
-import { AuthorizedCollectionSelectorComponent } from '../../../shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
+import { ThemedAuthorizedCollectionSelectorComponent } from '../../../shared/dso-selector/dso-selector/authorized-collection-selector/themed-authorized-collection-selector.component';
 import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
@@ -114,7 +114,7 @@ describe('ItemMoveComponent', () => {
     })
       .overrideComponent(ItemMoveComponent, {
         remove: {
-          imports: [AuthorizedCollectionSelectorComponent],
+          imports: [ThemedAuthorizedCollectionSelectorComponent],
         },
       })
       .compileComponents();

src/app/item-page/edit-item-page/item-move/item-move.component.ts

@@ -35,7 +35,7 @@ import {
 } from '../../../core/shared/operators';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
-import { AuthorizedCollectionSelectorComponent } from '../../../shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
+import { ThemedAuthorizedCollectionSelectorComponent } from '../../../shared/dso-selector/dso-selector/authorized-collection-selector/themed-authorized-collection-selector.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import {
@@ -52,7 +52,7 @@ import {
     FormsModule,
     RouterLink,
     AsyncPipe,
-    AuthorizedCollectionSelectorComponent,
+    ThemedAuthorizedCollectionSelectorComponent,
     BtnDisabledDirective,
   ],
   standalone: true,

src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts

@@ -16,7 +16,7 @@ import { of as observableOf } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
 import { RouterMock } from '../../../../shared/mocks/router.mock';
 import { VarDirective } from '../../../../shared/utils/var.directive';
-import { RelatedEntitiesSearchComponent } from '../related-entities-search/related-entities-search.component';
+import { ThemedRelatedEntitiesSearchComponent } from '../related-entities-search/themed-related-entities-search.component';
 import { TabbedRelatedEntitiesSearchComponent } from './tabbed-related-entities-search.component';
 
 describe('TabbedRelatedEntitiesSearchComponent', () => {
@@ -53,7 +53,7 @@ describe('TabbedRelatedEntitiesSearchComponent', () => {
       .overrideComponent(TabbedRelatedEntitiesSearchComponent, {
         remove: {
           imports: [
-            RelatedEntitiesSearchComponent,
+            ThemedRelatedEntitiesSearchComponent,
           ],
         },
       })

src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts

@@ -41,7 +41,7 @@ import { followLink } from '../../../utils/follow-link-config.model';
 import { DSOSelectorComponent } from '../dso-selector.component';
 
 @Component({
-  selector: 'ds-authorized-collection-selector',
+  selector: 'ds-base-authorized-collection-selector',
   styleUrls: ['../dso-selector.component.scss'],
   templateUrl: '../dso-selector.component.html',
   standalone: true,
@@ -59,11 +59,11 @@ export class AuthorizedCollectionSelectorComponent extends DSOSelectorComponent
   constructor(
     protected searchService: SearchService,
     protected collectionDataService: CollectionDataService,
-    protected notifcationsService: NotificationsService,
+    protected notificationService: NotificationsService,
     protected translate: TranslateService,
     protected dsoNameService: DSONameService,
   ) {
-    super(searchService, notifcationsService, translate, dsoNameService);
+    super(searchService, notificationService, translate, dsoNameService);
   }
 
   /**

src/app/shared/dso-selector/dso-selector/authorized-collection-selector/themed-authorized-collection-selector.component.ts

@@ -0,0 +1,55 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import { SortOptions } from '../../../../core/cache/models/sort-options.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import { ThemedComponent } from '../../../theme-support/themed.component';
+import { AuthorizedCollectionSelectorComponent } from './authorized-collection-selector.component';
+
+/**
+ * Themed wrapper for {@link AuthorizedCollectionSelectorComponent}
+ */
+@Component({
+  selector: 'ds-authorized-collection-selector',
+  templateUrl: '../../../theme-support/themed.component.html',
+  standalone: true,
+  imports: [AuthorizedCollectionSelectorComponent],
+})
+export class ThemedAuthorizedCollectionSelectorComponent extends ThemedComponent<AuthorizedCollectionSelectorComponent> {
+
+  @Input() currentDSOId: string;
+
+  @Input() types: DSpaceObjectType[];
+
+  @Input() sort: SortOptions;
+
+  @Input() entityType: string;
+
+  @Output() onSelect: EventEmitter<DSpaceObject> = new EventEmitter();
+
+  protected inAndOutputNames: (keyof AuthorizedCollectionSelectorComponent & keyof this)[] = [
+    'currentDSOId',
+    'types',
+    'sort',
+    'entityType',
+    'onSelect',
+  ];
+
+  protected getComponentName(): string {
+    return 'AuthorizedCollectionSelectorComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./authorized-collection-selector.component');
+  }
+
+}

src/app/shared/dso-selector/dso-selector/dso-selector.component.ts

@@ -73,7 +73,7 @@ import { PaginatedSearchOptions } from '../../search/models/paginated-search-opt
 import { SearchResult } from '../../search/models/search-result.model';
 
 @Component({
-  selector: 'ds-dso-selector',
+  selector: 'ds-base-dso-selector',
   styleUrls: ['./dso-selector.component.scss'],
   templateUrl: './dso-selector.component.html',
   standalone: true,
@@ -183,7 +183,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
 
   constructor(
     protected searchService: SearchService,
-    protected notifcationsService: NotificationsService,
+    protected notificationService: NotificationsService,
     protected translate: TranslateService,
     protected dsoNameService: DSONameService,
   ) {
@@ -230,7 +230,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
                 ...rd.payload.page.filter((result) => isNotEmpty(query) || result.indexableObject.id !== this.currentDSOId),
               ];
             } else if (rd.hasFailed) {
-              this.notifcationsService.error(this.translate.instant('dso-selector.error.title', { type: this.typesString }), rd.errorMessage);
+              this.notificationService.error(this.translate.instant('dso-selector.error.title', { type: this.typesString }), rd.errorMessage);
             }
             return rd;
           }),

src/app/shared/dso-selector/dso-selector/themed-dso-selector.component.ts

@@ -0,0 +1,56 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import { Context } from '../../../core/shared/context.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import { ThemedComponent } from '../../theme-support/themed.component';
+import { DSOSelectorComponent } from './dso-selector.component';
+
+/**
+ * Themed wrapper for {@link DSOSelectorComponent}
+ */
+@Component({
+  selector: 'ds-dso-selector',
+  templateUrl: '../../theme-support/themed.component.html',
+  imports: [DSOSelectorComponent],
+  standalone: true,
+})
+export class ThemedDSOSelectorComponent extends ThemedComponent<DSOSelectorComponent> {
+
+  @Input() context: Context;
+
+  @Input() currentDSOId: string;
+
+  @Input() types: DSpaceObjectType[];
+
+  @Input() sort: SortOptions;
+
+  @Output() onSelect: EventEmitter<DSpaceObject> = new EventEmitter();
+
+  protected inAndOutputNames: (keyof DSOSelectorComponent & keyof this)[] = [
+    'context',
+    'currentDSOId',
+    'types',
+    'sort',
+    'onSelect',
+  ];
+
+  protected getComponentName(): string {
+    return 'DSOSelectorComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/shared/dso-selector/dso-selector/dso-selector.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./dso-selector.component');
+  }
+
+}

src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts

@@ -18,7 +18,7 @@ import { Community } from '../../../../core/shared/community.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { RouterStub } from '../../../testing/router.stub';
-import { DSOSelectorComponent } from '../../dso-selector/dso-selector.component';
+import { ThemedDSOSelectorComponent } from '../../dso-selector/themed-dso-selector.component';
 import { CreateCollectionParentSelectorComponent } from './create-collection-parent-selector.component';
 
 describe('CreateCollectionParentSelectorComponent', () => {
@@ -64,7 +64,7 @@ describe('CreateCollectionParentSelectorComponent', () => {
       schemas: [NO_ERRORS_SCHEMA],
     })
       .overrideComponent(CreateCollectionParentSelectorComponent, {
-        remove: { imports: [DSOSelectorComponent] },
+        remove: { imports: [ThemedDSOSelectorComponent] },
       })
       .compileComponents();