Merge branch 'fix-default-sort-and-alignment-issue-7.6' into fix-defa…

…ult-sort-and-alignment-issue-main
atmire · Jan 22, 2025 · 94045f0 · 94045f0
2 parents b08edf1 + 6199301
commit 94045f0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/src/app/core/shared/search/search-configuration.service.spec.ts b/src/app/core/shared/search/search-configuration.service.spec.ts
@@ -155,7 +155,7 @@ describe('SearchConfigurationService', () => {
       service.getCurrentSort(defaults.pagination.id, {} as any);
     });
     it('should call getCurrentSort on the paginationService with the provided id and sort options', () => {
-      expect((service as any).paginationService.getCurrentSort).toHaveBeenCalledWith(defaults.pagination.id, {});
+      expect((service as any).paginationService.getCurrentSort).toHaveBeenCalledWith(defaults.pagination.id, {}, true);
     });
   });
 

diff --git a/src/app/core/shared/search/search-configuration.service.ts b/src/app/core/shared/search/search-configuration.service.ts
@@ -207,7 +207,7 @@ export class SearchConfigurationService implements OnDestroy {
    * @returns {Observable<string>} Emits the current sorting settings
    */
   getCurrentSort(paginationId: string, defaultSort: SortOptions): Observable<SortOptions> {
-    return this.paginationService.getCurrentSort(paginationId, defaultSort);
+    return this.paginationService.getCurrentSort(paginationId, defaultSort, true);
   }
 
   /**

diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts
@@ -125,7 +125,7 @@ describe('MyDSpaceConfigurationService', () => {
       service.getCurrentSort('page-id', defaults.sort);
     });
     it('should call getCurrentSort on the paginationService with the provided id and sort options', () => {
-      expect((service as any).paginationService.getCurrentSort).toHaveBeenCalledWith('page-id', defaults.sort);
+      expect((service as any).paginationService.getCurrentSort).toHaveBeenCalledWith('page-id', defaults.sort, true);
     });
   });
 

diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -5,12 +5,12 @@ <h2 class="comcol-browse-label">{{'browse.comcol.head' | translate}}</h2>
     <div class="list-group list-group-horizontal" role="tablist">
       <a *ngFor="let option of allOptions"
          [attr.aria-current]="(currentOption$ | async)?.id === option.id"
-         class="list-group-item"
+         class="d-flex list-group-item"
          role="tab"
          [routerLink]="option.routerLink"
          [queryParams]="option.params"
          [class.active]="(currentOption$ | async)?.id === option.id">
-        {{ option.label | translate }}
+        <span class="my-auto">{{ option.label | translate }}</span>
       </a>
     </div>
   </div>

diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
@@ -197,7 +197,7 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
     getConfigurationSearchConfig: observableOf(searchConfig),
     getCurrentConfiguration: observableOf('default'),
     getCurrentScope: observableOf('test-id'),
-    getCurrentSort: observableOf(sortOptionsList[0]),
+    getCurrentSort: observableOf(sortOptionsList[1]),
     updateFixedFilter: jasmine.createSpy('updateFixedFilter'),
     setPaginationId: jasmine.createSpy('setPaginationId'),
   });
@@ -297,13 +297,13 @@ describe('SearchComponent', () => {
     const expectedSearchOptions = Object.assign(paginatedSearchOptions$.value, {
       configuration: 'default',
       scope: '',
-      sort: sortOptionsList[0],
+      sort: sortOptionsList[1],
     });
     expect(comp.currentConfiguration$).toBeObservable(cold('b', {
       b: 'default',
     }));
     expect(comp.currentSortOptions$).toBeObservable(cold('b', {
-      b: sortOptionsList[0],
+      b: sortOptionsList[1],
     }));
     expect(comp.sortOptionsList$).toBeObservable(cold('b', {
       b: sortOptionsList,

diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
@@ -387,14 +387,15 @@ export class SearchComponent implements OnDestroy, OnInit {
       map((searchConfig: SearchConfig) => this.searchConfigService.getConfigurationSortOptions(searchConfig)),
       distinctUntilChanged(),
     );
-    const sortOption$: Observable<SortOptions> = searchSortOptions$.pipe(
-      switchMap((searchSortOptions: SortOptions[]) => {
-        const defaultSort: SortOptions = searchSortOptions[0];
-        return this.searchConfigService.getCurrentSort(this.paginationId, defaultSort);
+    const searchOptions$: Observable<PaginatedSearchOptions> = this.getSearchOptions().pipe(distinctUntilChanged());
+
+    const sortOption$: Observable<SortOptions> = combineLatest([searchSortOptions$, searchOptions$]).pipe(
+      switchMap(([searchSortOptions, searchOptions]: [SortOptions[], PaginatedSearchOptions]) => {
+        const defaultSortOption = hasValue(searchOptions.sort?.field) && hasValue(searchOptions.sort?.field) ? searchOptions.sort : searchSortOptions[0];
+        return this.searchConfigService.getCurrentSort(this.paginationId, defaultSortOption);
       }),
       distinctUntilChanged(),
     );
-    const searchOptions$: Observable<PaginatedSearchOptions> = this.getSearchOptions().pipe(distinctUntilChanged());
 
     this.subs.push(combineLatest([configuration$, searchSortOptions$, searchOptions$, sortOption$, this.currentScope$]).pipe(
       filter(([configuration, searchSortOptions, searchOptions, sortOption, scope]: [string, SortOptions[], PaginatedSearchOptions, SortOptions, string]) => {