@internetarchive/collection-browser 0.4.3-alpha.4 → 0.4.3-alpha.6

package/dist/src/collection-browser.d.ts

@@ -21,11 +21,11 @@ export declare class CollectionBrowser extends LitElement implements InfiniteScr
     searchType: SearchType;
     baseQuery?: string;
     displayMode?: CollectionDisplayMode;
-    sortParam?: SortParam;
-    sortDirection?: SortDirection;
+    sortParam: SortParam | null;
     selectedSort: SortField;
-    selectedTitleFilter?: string;
-    selectedCreatorFilter?: string;
+    selectedTitleFilter: string | null;
+    selectedCreatorFilter: string | null;
+    sortDirection: SortDirection | null;
     pageSize: number;
     resizeObserver?: SharedResizeObserverInterface;
     titleQuery?: string;

package/dist/src/collection-browser.js

@@ -22,7 +22,11 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         super(...arguments);
         this.baseImageUrl = 'https://archive.org';
         this.searchType = SearchType.METADATA;
+        this.sortParam = null;
         this.selectedSort = SortField.relevance;
+        this.selectedTitleFilter = null;
+        this.selectedCreatorFilter = null;
+        this.sortDirection = null;
         this.pageSize = 50;
         this.showHistogramDatePicker = false;
         /** describes where this component is being used */
@@ -133,20 +137,19 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     }
     clearFilters() {
         this.selectedFacets = defaultSelectedFacets;
-        this.sortParam = undefined;
-        this.sortDirection = undefined;
-        this.selectedTitleFilter = undefined;
-        this.selectedCreatorFilter = undefined;
+        this.sortParam = null;
+        this.selectedTitleFilter = null;
+        this.selectedCreatorFilter = null;
         this.titleQuery = undefined;
         this.creatorQuery = undefined;
         this.selectedSort = SortField.relevance;
+        this.sortDirection = null;
     }
     /**
      * Manually requests to perform a search, which will only be executed if one of
      * the query, the search type, or the sort has changed.
      */
     requestSearch() {
-        console.log('handling query change by request');
         this.handleQueryChange();
     }
     render() {
@@ -264,17 +267,14 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         });
     }
     selectedSortChanged() {
-        if (this.selectedSort === 'relevance') {
-            this.sortParam = undefined;
+        if (this.selectedSort === 'relevance' || this.sortDirection === null) {
+            this.sortParam = null;
             return;
         }
         const sortField = SortFieldToMetadataField[this.selectedSort];
-        if (!this.sortDirection)
-            this.sortDirection = 'desc';
         if (!sortField)
             return;
         this.sortParam = { field: sortField, direction: this.sortDirection };
-        this.requestUpdate();
         // Lazy-load the alphabet counts for title/creator sort bar as needed
         this.updatePrefixFiltersForCurrentSort();
     }
@@ -297,7 +297,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         if (!prevSelectedLetter && !this.selectedTitleFilter) {
             return;
         }
-        const cleared = prevSelectedLetter && !this.selectedTitleFilter;
+        const cleared = prevSelectedLetter && this.selectedTitleFilter === null;
         (_a = this.analyticsHandler) === null || _a === void 0 ? void 0 : _a.sendEvent({
             category: this.searchContext,
             action: analyticsActions.filterByTitle,
@@ -319,7 +319,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         if (!prevSelectedLetter && !this.selectedCreatorFilter) {
             return;
         }
-        const cleared = prevSelectedLetter && !this.selectedCreatorFilter;
+        const cleared = prevSelectedLetter && this.selectedCreatorFilter === null;
         (_a = this.analyticsHandler) === null || _a === void 0 ? void 0 : _a.sendEvent({
             category: this.searchContext,
             action: analyticsActions.filterByCreator,
@@ -334,11 +334,11 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             : undefined;
     }
     titleLetterSelected(e) {
-        this.selectedCreatorFilter = undefined;
+        this.selectedCreatorFilter = null;
         this.selectedTitleFilter = e.detail.selectedLetter;
     }
     creatorLetterSelected(e) {
-        this.selectedTitleFilter = undefined;
+        this.selectedTitleFilter = null;
         this.selectedCreatorFilter = e.detail.selectedLetter;
     }
     get facetDataLoading() {
@@ -432,12 +432,10 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     }
     firstUpdated() {
         this.setupStateRestorationObserver();
-        console.log('first updated - restoring state');
         this.restoreState();
     }
     updated(changed) {
         var _a;
-        console.log('updated', changed);
         if (changed.has('displayMode') ||
             changed.has('baseNavigationUrl') ||
             changed.has('baseImageUrl') ||
@@ -445,15 +443,12 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             (_a = this.infiniteScroller) === null || _a === void 0 ? void 0 : _a.reload();
         }
         if (changed.has('baseQuery')) {
-            console.log('base query changed', changed.get('baseQuery'), this.baseQuery);
             this.emitBaseQueryChanged();
         }
         if (changed.has('searchType')) {
-            console.log('search type changed', changed.get('searchType'), this.searchType);
             this.emitSearchTypeChanged();
         }
         if (changed.has('currentPage') || changed.has('displayMode')) {
-            console.log('current page or display mode changed', changed.get('currentPage'), this.currentPage, changed.get('displayMode'), this.displayMode);
             this.persistState();
         }
         if (changed.has('baseQuery') ||
@@ -464,7 +459,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             changed.has('sortParam') ||
             changed.has('selectedFacets') ||
             changed.has('searchService')) {
-            console.log('handling query change', changed, this.baseQuery, this.sortParam);
             this.handleQueryChange();
         }
         if (changed.has('baseQuery') ||
@@ -569,7 +563,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     }
     async handleQueryChange() {
         var _a;
-        console.log('handleQueryChange', this.pageFetchQueryKey, this.previousQueryKey);
         // only reset if the query has actually changed
         if (!this.searchService || this.pageFetchQueryKey === this.previousQueryKey)
             return;
@@ -613,21 +606,21 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         this.restoreState();
     }
     restoreState() {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         const restorationState = this.restorationStateHandler.getRestorationState();
         this.displayMode = restorationState.displayMode;
         if (restorationState.searchType != null)
             this.searchType = restorationState.searchType;
         this.selectedSort = (_a = restorationState.selectedSort) !== null && _a !== void 0 ? _a : SortField.relevance;
-        this.sortDirection = restorationState.sortDirection;
-        this.selectedTitleFilter = restorationState.selectedTitleFilter;
-        this.selectedCreatorFilter = restorationState.selectedCreatorFilter;
+        this.sortDirection = (_b = restorationState.sortDirection) !== null && _b !== void 0 ? _b : null;
+        this.selectedTitleFilter = (_c = restorationState.selectedTitleFilter) !== null && _c !== void 0 ? _c : null;
+        this.selectedCreatorFilter = (_d = restorationState.selectedCreatorFilter) !== null && _d !== void 0 ? _d : null;
         this.selectedFacets = restorationState.selectedFacets;
         this.baseQuery = restorationState.baseQuery;
         this.titleQuery = restorationState.titleQuery;
         this.creatorQuery = restorationState.creatorQuery;
-        this.sortParam = restorationState.sortParam;
-        this.currentPage = (_b = restorationState.currentPage) !== null && _b !== void 0 ? _b : 1;
+        this.sortParam = (_e = restorationState.sortParam) !== null && _e !== void 0 ? _e : null;
+        this.currentPage = (_f = restorationState.currentPage) !== null && _f !== void 0 ? _f : 1;
         this.minSelectedDate = restorationState.minSelectedDate;
         this.maxSelectedDate = restorationState.maxSelectedDate;
         if (this.currentPage > 1) {
@@ -655,7 +648,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         this.restorationStateHandler.persistState(restorationState);
     }
     async doInitialPageFetch() {
-        console.log('doInitialPageFetch');
         this.searchResultsLoading = true;
         await this.fetchPage(this.initialPageNumber);
         this.searchResultsLoading = false;
@@ -881,10 +873,8 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     }
     async fetchFacets() {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-        console.log('maybe fetch facets', this.filteredQuery);
         if (!this.filteredQuery)
             return;
-        console.log('fetching facets');
         const params = {
             query: this.filteredQuery,
             rows: 0,
@@ -993,7 +983,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     }
     async fetchPage(pageNumber) {
         var _a, _b, _c, _d, _e;
-        console.log('maybe fetch page', pageNumber, this.filteredQuery);
         if (!this.filteredQuery)
             return;
         // if we already have data, don't fetch again
@@ -1008,7 +997,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             return;
         pageFetches.add(pageNumber);
         this.pageFetchesInProgress[pageFetchQueryKey] = pageFetches;
-        console.log('fetching page', pageNumber);
         const sortParams = this.sortParam ? [this.sortParam] : [];
         const params = {
             query: this.filteredQuery,
@@ -1467,14 +1455,6 @@ CollectionBrowser.styles = css `
         18rem
       );
       --infiniteScrollerCellMaxWidth: var(--collectionBrowserCellMaxWidth, 1fr);
-      --infiniteScrollerCellMinHeight: var(
-        --collectionBrowserCellMinHeight,
-        29rem
-      );
-      --infiniteScrollerCellMaxHeight: var(
-        --collectionBrowserCellMaxHeight,
-        29rem
-      );
     }
   `;
 __decorate([
@@ -1498,9 +1478,6 @@ __decorate([
 __decorate([
     property({ type: Object })
 ], CollectionBrowser.prototype, "sortParam", void 0);
-__decorate([
-    property({ type: String })
-], CollectionBrowser.prototype, "sortDirection", void 0);
 __decorate([
     property({ type: String })
 ], CollectionBrowser.prototype, "selectedSort", void 0);
@@ -1510,6 +1487,9 @@ __decorate([
 __decorate([
     property({ type: String })
 ], CollectionBrowser.prototype, "selectedCreatorFilter", void 0);
+__decorate([
+    property({ type: String })
+], CollectionBrowser.prototype, "sortDirection", void 0);
 __decorate([
     property({ type: Number })
 ], CollectionBrowser.prototype, "pageSize", void 0);