@internetarchive/collection-browser 4.1.1-alpha-webdev8185.1 → 4.1.1

package/src/sort-filter-bar/sort-filter-bar.ts

@@ -13,7 +13,6 @@ import type { SortDirection } from '@internetarchive/search-service';
 import {
   CollectionDisplayMode,
   defaultSortAvailability,
-  type ExplicitSortField,
   PrefixFilterCounts,
   PrefixFilterType,
   SORT_OPTIONS,
@@ -43,8 +42,10 @@ export class SortFilterBar extends LitElement {
   @property({ type: String }) defaultSortDirection: SortDirection | null = null;
 
   /** The default sort field to use if none is set */
-  @property({ type: String }) defaultSortField: ExplicitSortField =
-    SortField.relevance;
+  @property({ type: String }) defaultSortField: Exclude<
+    SortField,
+    SortField.default
+  > = SortField.relevance;
 
   /** The current sort direction (asc/desc), or null if none is set */
   @property({ type: String }) sortDirection: SortDirection | null = null;

package/test/collection-browser.test.ts

@@ -1313,19 +1313,20 @@ describe('Collection Browser', () => {
     );
   });
 
-  it('sets default sort from externally-provided values', async () => {
+  it('sets default sort from collection metadata', async () => {
     const searchService = new MockSearchService();
     const el = await fixture<CollectionBrowser>(
       html`<collection-browser
         .searchService=${searchService}
         .baseNavigationUrl=${''}
-        .withinCollection=${'test-collection'}
-        .defaultSortField=${SortField.title}
-        .defaultSortDirection=${'asc'}
       ></collection-browser>`,
     );
 
+    el.withinCollection = 'default-sort';
+    await el.updateComplete;
+    await el.initialSearchComplete;
     await el.updateComplete;
+    await aTimeout(50);
 
     const sortBar = el.shadowRoot?.querySelector(
       'sort-filter-bar',
@@ -1337,19 +1338,20 @@ describe('Collection Browser', () => {
     expect(sortBar.sortDirection).to.be.null;
   });
 
-  it('reflects updated default sort field/direction on sort bar', async () => {
+  it('sets default sort from collection metadata in "-field" format', async () => {
     const searchService = new MockSearchService();
     const el = await fixture<CollectionBrowser>(
       html`<collection-browser
         .searchService=${searchService}
         .baseNavigationUrl=${''}
-        .withinCollection=${'test-collection'}
-        .defaultSortField=${SortField.dateadded}
-        .defaultSortDirection=${'desc'}
       ></collection-browser>`,
     );
 
+    el.withinCollection = 'default-sort-concise';
+    await el.updateComplete;
+    await el.initialSearchComplete;
     await el.updateComplete;
+    await aTimeout(50);
 
     const sortBar = el.shadowRoot?.querySelector(
       'sort-filter-bar',
@@ -1361,15 +1363,14 @@ describe('Collection Browser', () => {
     expect(sortBar.sortDirection).to.be.null;
   });
 
-  it('uses weekly views as default sort when set externally for profiles', async () => {
+  it('falls back to weekly views default sorting on profiles when tab not set', async () => {
     const el = await fixture<CollectionBrowser>(
       html`<collection-browser
         .withinProfile=${'@foobar'}
-        .defaultSortField=${SortField.weeklyview}
-        .defaultSortDirection=${'desc'}
       ></collection-browser>`,
     );
 
+    el.applyDefaultProfileSort();
     expect(el.defaultSortParam).to.deep.equal({
       field: 'week',
       direction: 'desc',
@@ -1402,19 +1403,20 @@ describe('Collection Browser', () => {
     expect(sortBar.sortDirection).to.be.null;
   });
 
-  it('uses date favorited sort as default when set externally for fav- collection', async () => {
+  it('uses date favorited sort as default when targeting fav- collection', async () => {
     const searchService = new MockSearchService();
     const el = await fixture<CollectionBrowser>(
       html`<collection-browser
         .searchService=${searchService}
         .baseNavigationUrl=${''}
-        .withinCollection=${'fav-sort'}
-        .defaultSortField=${SortField.datefavorited}
-        .defaultSortDirection=${'desc'}
       ></collection-browser>`,
     );
 
+    el.withinCollection = 'fav-sort';
     await el.updateComplete;
+    await el.initialSearchComplete;
+    await el.updateComplete;
+    await aTimeout(50);
 
     const sortBar = el.shadowRoot?.querySelector(
       'sort-filter-bar',