@internetarchive/collection-browser 1.7.1-alpha.0 → 1.9.0

package/dist/src/collection-browser.js

@@ -11,7 +11,7 @@ import './sort-filter-bar/sort-filter-bar';
 import './collection-facets';
 import './circular-activity-indicator';
 import './sort-filter-bar/sort-filter-bar';
-import { SortField, SortFieldToMetadataField, getDefaultSelectedFacets, prefixFilterAggregationKeys, MetadataFieldToSortField, } from './models';
+import { SortField, getDefaultSelectedFacets, prefixFilterAggregationKeys, sortOptionFromAPIString, SORT_OPTIONS, } from './models';
 import { RestorationStateHandler, } from './restoration-state-handler';
 import chevronIcon from './assets/img/icons/chevron';
 import './empty-placeholder';
@@ -442,13 +442,19 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         });
     }
     selectedSortChanged() {
-        if ([SortField.default, SortField.relevance].includes(this.selectedSort)) {
+        var _a;
+        const sortOption = SORT_OPTIONS[this.selectedSort];
+        if (!sortOption.handledBySearchService) {
             this.sortParam = null;
             return;
         }
-        const sortField = SortFieldToMetadataField[this.selectedSort];
+        // If the sort option specified in the URL is unrecognized, we just use it as-is
+        const urlSortParam = new URL(window.location.href).searchParams.get('sort');
+        const sortField = (_a = sortOption.searchServiceKey) !== null && _a !== void 0 ? _a : urlSortParam === null || urlSortParam === void 0 ? void 0 : urlSortParam.replace(/^-/, '');
+        // If the sort direction is still null at this point, then we assume ascending
+        // (i.e., it was unrecognized and had no directional flag)
         if (!this.sortDirection)
-            this.sortDirection = 'desc';
+            this.sortDirection = 'asc';
         if (!sortField)
             return;
         this.sortParam = { field: sortField, direction: this.sortDirection };
@@ -567,6 +573,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         @facetsChanged=${this.facetsChanged}
         @histogramDateRangeUpdated=${this.histogramDateRangeUpdated}
         .collectionPagePath=${this.collectionPagePath}
+        .withinCollection=${this.withinCollection}
         .searchService=${this.searchService}
         .featureFeedbackService=${this.featureFeedbackService}
         .recaptchaManager=${this.recaptchaManager}
@@ -952,22 +959,21 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         }
     }
     persistState() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const restorationState = {
             displayMode: this.displayMode,
             searchType: this.searchType,
-            sortParam: (_a = this.sortParam) !== null && _a !== void 0 ? _a : undefined,
             selectedSort: this.selectedSort,
-            sortDirection: (_b = this.sortDirection) !== null && _b !== void 0 ? _b : undefined,
-            selectedFacets: (_c = this.selectedFacets) !== null && _c !== void 0 ? _c : getDefaultSelectedFacets(),
+            sortDirection: (_a = this.sortDirection) !== null && _a !== void 0 ? _a : undefined,
+            selectedFacets: (_b = this.selectedFacets) !== null && _b !== void 0 ? _b : getDefaultSelectedFacets(),
             baseQuery: this.baseQuery,
             currentPage: this.currentPage,
             titleQuery: this.titleQuery,
             creatorQuery: this.creatorQuery,
             minSelectedDate: this.minSelectedDate,
             maxSelectedDate: this.maxSelectedDate,
-            selectedTitleFilter: (_d = this.selectedTitleFilter) !== null && _d !== void 0 ? _d : undefined,
-            selectedCreatorFilter: (_e = this.selectedCreatorFilter) !== null && _e !== void 0 ? _e : undefined,
+            selectedTitleFilter: (_c = this.selectedTitleFilter) !== null && _c !== void 0 ? _c : undefined,
+            selectedCreatorFilter: (_d = this.selectedCreatorFilter) !== null && _d !== void 0 ? _d : undefined,
         };
         this.restorationStateHandler.persistState(restorationState);
     }
@@ -1428,7 +1434,8 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         else if (!['asc', 'desc'].includes(dir)) {
             dir = 'asc';
         }
-        const sortField = MetadataFieldToSortField[field];
+        const sortOption = sortOptionFromAPIString(field);
+        const sortField = sortOption.field;
         if (sortField && sortField !== SortField.default) {
             this.defaultSortField = sortField;
             this.defaultSortDirection = dir;