122064: fetch configured sort option of browse definition before first call so default sort option isn't ignored

Author: Jens Vannerum

src/app/browse-by/browse-by-date/browse-by-date.component.ts

@@ -102,26 +102,29 @@ export class BrowseByDateComponent extends BrowseByMetadataComponent implements
   }
 
   ngOnInit(): void {
-    const sortConfig = new SortOptions('default', SortDirection.ASC);
+    this.browseId = this.route.snapshot.params.id;
     this.startsWithType = StartsWithType.date;
-    // 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.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.route.data,
-        this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, scope, data, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams, data), 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.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
+            })));
+        })).subscribe(({ params, currentPage, currentSort }) => {
         const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
-        this.browseId = params.id || this.defaultBrowseId;
         this.startsWith = +params.startsWith || params.startsWith;
-        const searchOptions = browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, this.fetchThumbnails);
+        const searchOptions = browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails);
         this.updatePageWithItems(searchOptions, this.value, undefined);
+        this.updateParent(params.scope);
+        this.updateLogo();
         this.updateStartsWithOptions(this.browseId, metadataKeys, params.scope);
-      }));
+      })
+    );
   }
 
   /**

src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts

@@ -210,18 +210,18 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
 
 
   ngOnInit(): void {
-
-    const sortConfig = new SortOptions('default', SortDirection.ASC);
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
-    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.browseId = params.id || this.defaultBrowseId;
+      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.authority = params.authority;
 
         if (typeof params.value === 'string') {
@@ -241,11 +241,10 @@ 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 {
-          this.updatePage(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, false));
+          is.updatePage(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, false));
         }
+        this.updateStartsWithTextOptions();
       }));
-    this.updateStartsWithTextOptions();
-
   }
 
   ngOnChanges(): void {

src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts

@@ -127,6 +127,31 @@ export class BrowseService {
     return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$);
   }
 
+  /*
+   * Get the sort direction for a browse index based on its unique id
+   * @param browseId     The unique id of the browse index
+   * @param defaultDirection  The default sort direction to return if the browse index has no sort direction configured
+   * @returns {Observable<SortDirection>} The sort direction of the browse index
+   */
+  getConfiguredSortDirection(browseId: string, defaultDirection: SortDirection): Observable<SortDirection> {
+    return this.getBrowseDefinitions().pipe(
+      getRemoteDataPayload(),
+      getPaginatedListPayload(),
+      map((browseDefinitions: BrowseDefinition[]) => browseDefinitions
+        .find((def: BrowseDefinition) => def.id === browseId)
+      ),
+      map((browseDef: BrowseDefinition) => {
+        console.log('comparing for browseDef', browseDef);
+        if (browseDef.order === SortDirection.ASC || browseDef.order === SortDirection.DESC) {
+          console.log('returning browseDef.order', browseDef.order);
+          return browseDef.order;
+        } else {
+          return defaultDirection;
+        }
+      }),
+    );
+  }
+
   /**
    * Get all items linked to a certain metadata value
    * @param {string} filterValue      metadata value to filter by (e.g. author's name)

src/app/core/browse/browse.service.ts

@@ -11,6 +11,9 @@ export abstract class BrowseDefinition extends CacheableObject {
   @autoserialize
   id: string;
 
+  @autoserialize
+  order: string;
+
   /**
    * Get the render type of the BrowseDefinition model
    */