122064: fix issues after cherry-picking changes to latest main

Jens Vannerum · Jens Vannerum · commit f779bbe813e0 · 2024-12-11T11:35:03.000+01:00
diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -10,15 +10,17 @@ import {
 } from '@angular/core';
 import {
   ActivatedRoute,
-  Params,
   Router,
 } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import {
   combineLatest as observableCombineLatest,
   Observable,
 } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
 import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component';
 
 import {
@@ -47,13 +49,11 @@ import {
   isNotEmpty,
 } from '../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { StartsWithType } from '../../shared/starts-with/starts-with-type';
 import { VarDirective } from '../../shared/utils/var.directive';
 import {
   BrowseByMetadataComponent,
   browseParamsToOptions,
-  getBrowseSearchOptions,
 } from '../browse-by-metadata/browse-by-metadata.component';
 
 @Component({
@@ -111,19 +111,18 @@ export class BrowseByDateComponent extends BrowseByMetadataComponent implements
         switchMap((sortConfig) => {
           this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
           this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig, false);
-          return observableCombineLatest([this.route.params, this.route.queryParams, this.route.data, this.currentPagination$, this.currentSort$]).pipe(
-            map(([routeParams, queryParams, data, currentPage, currentSort]) => ({
-              params: Object.assign({}, routeParams, queryParams, data), currentPage, currentSort
+          return observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.route.data, this.currentPagination$, this.currentSort$]).pipe(
+            map(([routeParams, queryParams, scope, data, currentPage, currentSort]) => ({
+              params: Object.assign({}, routeParams, queryParams, data), scope, currentPage, currentSort,
             })));
-        })).subscribe(({ params, currentPage, currentSort }) => {
+        })).subscribe(({ params, scope, currentPage, currentSort }) => {
         const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
         this.startsWith = +params.startsWith || params.startsWith;
         this.browseId = params.id || this.defaultBrowseId;
-        const searchOptions = browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails);
+        const searchOptions = browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, this.fetchThumbnails);
         this.updatePageWithItems(searchOptions, this.value, undefined);
         this.updateStartsWithOptions(this.browseId, metadataKeys, params.scope);
-      })
-    );
+      }));
   }
 
   /**
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -12,7 +12,6 @@ import {
 } from '@angular/core';
 import {
   ActivatedRoute,
-  Params,
   Router,
 } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +22,10 @@ import {
   of as observableOf,
   Subscription,
 } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
 import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component';
 
 import {
@@ -219,7 +221,7 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
           this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
           return observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
             map(([routeParams, queryParams, scope, currentPage, currentSort]) => ({
-              params: Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort
+              params: Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort,
             })));
         })).subscribe(({ params, scope, currentPage, currentSort }) => {
         this.authority = params.authority;
@@ -241,7 +243,7 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
         if (isNotEmpty(this.value)) {
           this.updatePageWithItems(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, this.fetchThumbnails), this.value, this.authority);
         } else {
-          is.updatePage(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, false));
+          this.updatePage(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, false));
         }
         this.updateStartsWithTextOptions();
       }));
diff --git a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
@@ -20,6 +20,7 @@ import { of as observableOf } from 'rxjs';
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
 import { BrowseService } from '../../core/browse/browse.service';
+import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
@@ -41,7 +42,6 @@ import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { toRemoteData } from '../browse-by-metadata/browse-by-metadata.component.spec';
 import { BrowseByTitleComponent } from './browse-by-title.component';
-import { SortDirection } from '../../core/cache/models/sort-options.model';
 
 describe('BrowseByTitleComponent', () => {
   let comp: BrowseByTitleComponent;
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -6,10 +6,12 @@ import {
   Component,
   OnInit,
 } from '@angular/core';
-import { Params } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { combineLatest as observableCombineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
 import {
   SortDirection,
@@ -23,12 +25,10 @@ import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-heade
 import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
 import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { VarDirective } from '../../shared/utils/var.directive';
 import {
   BrowseByMetadataComponent,
   browseParamsToOptions,
-  getBrowseSearchOptions,
 } from '../browse-by-metadata/browse-by-metadata.component';
 
 @Component({
@@ -57,22 +57,23 @@ import {
 export class BrowseByTitleComponent extends BrowseByMetadataComponent implements OnInit {
 
   ngOnInit(): void {
-    const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
-    this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
-    this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    this.browseId = this.route.snapshot.params.id;
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
-        }),
-      ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
+      this.browseService.getConfiguredSortDirection(this.browseId, SortDirection.ASC).pipe(
+        map((sortDir) => new SortOptions(this.browseId, sortDir)),
+        switchMap((sortConfig) => {
+          this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig, false);
+          this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
+          return observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
+            map(([routeParams, queryParams, scope, currentPage, currentSort]) => ({
+              params: Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort,
+            })),
+          );
+        })).subscribe(({ params, scope, currentPage, currentSort }) => {
         this.startsWith = +params.startsWith || params.startsWith;
-        this.browseId = params.id || this.defaultBrowseId;
         this.updatePageWithItems(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, this.fetchThumbnails), undefined, undefined);
+        this.updateStartsWithTextOptions();
       }));
-    this.updateStartsWithTextOptions();
   }
 
 }
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
@@ -138,7 +138,7 @@ export class BrowseService {
       getRemoteDataPayload(),
       getPaginatedListPayload(),
       map((browseDefinitions: BrowseDefinition[]) => browseDefinitions
-        .find((def: BrowseDefinition) => def.id === browseId)
+        .find((def: BrowseDefinition) => def.id === browseId),
       ),
       map((browseDef: BrowseDefinition) => {
         if (browseDef.order === SortDirection.ASC || browseDef.order === SortDirection.DESC) {
diff --git a/src/app/core/shared/browse-definition.model.ts b/src/app/core/shared/browse-definition.model.ts
@@ -2,6 +2,7 @@ import { autoserialize } from 'cerialize';
 
 import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
 import { CacheableObject } from '../cache/cacheable-object.model';
+import { SortDirection } from '../cache/models/sort-options.model';
 
 /**
  * Base class for BrowseDefinition models
@@ -12,7 +13,7 @@ export abstract class BrowseDefinition extends CacheableObject {
   id: string;
 
   @autoserialize
-  order: string;
+  order: SortDirection;
 
   /**
    * Get the render type of the BrowseDefinition model
