@internetarchive/collection-browser 0.4.3-alpha.1 → 0.4.3-alpha.2

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 | null;
+    sortParam?: SortParam;
+    sortDirection?: SortDirection;
     selectedSort: SortField;
-    selectedTitleFilter: string | null;
-    selectedCreatorFilter: string | null;
-    sortDirection: SortDirection | null;
+    selectedTitleFilter?: string;
+    selectedCreatorFilter?: string;
     pageSize: number;
     resizeObserver?: SharedResizeObserverInterface;
     titleQuery?: string;

package/dist/src/collection-browser.js

@@ -22,11 +22,7 @@ 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 */
@@ -137,19 +133,20 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     }
     clearFilters() {
         this.selectedFacets = defaultSelectedFacets;
-        this.sortParam = null;
-        this.selectedTitleFilter = null;
-        this.selectedCreatorFilter = null;
+        this.sortParam = undefined;
+        this.sortDirection = undefined;
+        this.selectedTitleFilter = undefined;
+        this.selectedCreatorFilter = undefined;
         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() {
@@ -267,14 +264,17 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         });
     }
     selectedSortChanged() {
-        if (this.selectedSort === 'relevance' || this.sortDirection === null) {
-            this.sortParam = null;
+        if (this.selectedSort === 'relevance') {
+            this.sortParam = undefined;
             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 === null;
+        const cleared = prevSelectedLetter && !this.selectedTitleFilter;
         (_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 === null;
+        const cleared = prevSelectedLetter && !this.selectedCreatorFilter;
         (_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 = null;
+        this.selectedCreatorFilter = undefined;
         this.selectedTitleFilter = e.detail.selectedLetter;
     }
     creatorLetterSelected(e) {
-        this.selectedTitleFilter = null;
+        this.selectedTitleFilter = undefined;
         this.selectedCreatorFilter = e.detail.selectedLetter;
     }
     get facetDataLoading() {
@@ -445,15 +445,15 @@ 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'));
+            console.log('base query changed', changed.get('baseQuery'), this.baseQuery);
             this.emitBaseQueryChanged();
         }
         if (changed.has('searchType')) {
-            console.log('search type changed', changed.get('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'), changed.get('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') ||
@@ -462,9 +462,8 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             changed.has('minSelectedDate') ||
             changed.has('maxSelectedDate') ||
             changed.has('sortParam') ||
-            changed.has('selectedFacets') ||
-            changed.has('searchService')) {
-            console.log('handling query change', changed);
+            changed.has('selectedFacets')) {
+            console.log('handling query change', changed, this.baseQuery, this.sortParam);
             this.handleQueryChange();
         }
         if (changed.has('baseQuery') ||
@@ -613,21 +612,21 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         this.restoreState();
     }
     restoreState() {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b;
         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 = (_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.sortDirection = restorationState.sortDirection;
+        this.selectedTitleFilter = restorationState.selectedTitleFilter;
+        this.selectedCreatorFilter = restorationState.selectedCreatorFilter;
         this.selectedFacets = restorationState.selectedFacets;
         this.baseQuery = restorationState.baseQuery;
         this.titleQuery = restorationState.titleQuery;
         this.creatorQuery = restorationState.creatorQuery;
-        this.sortParam = (_e = restorationState.sortParam) !== null && _e !== void 0 ? _e : null;
-        this.currentPage = (_f = restorationState.currentPage) !== null && _f !== void 0 ? _f : 1;
+        this.sortParam = restorationState.sortParam;
+        this.currentPage = (_b = restorationState.currentPage) !== null && _b !== void 0 ? _b : 1;
         this.minSelectedDate = restorationState.minSelectedDate;
         this.maxSelectedDate = restorationState.maxSelectedDate;
         if (this.currentPage > 1) {
@@ -1495,6 +1494,9 @@ __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);
@@ -1504,9 +1506,6 @@ __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);