@internetarchive/collection-browser 0.4.16-alpha.15 → 0.4.16-alpha.16

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

@@ -30,6 +30,8 @@ export declare class CollectionBrowser extends LitElement implements InfiniteScr
     sortDirection: SortDirection | null;
     pageSize: number;
     resizeObserver?: SharedResizeObserverInterface;
+    titleQuery?: string;
+    creatorQuery?: string;
     currentPage?: number;
     minSelectedDate?: string;
     maxSelectedDate?: string;
@@ -138,16 +140,16 @@ export declare class CollectionBrowser extends LitElement implements InfiniteScr
     private sendSortByAnalytics;
     private selectedSortChanged;
     private displayModeChanged;
-    private get titleQuery();
-    private get creatorQuery();
     /** Send Analytics when sorting by title's first letter
      * labels: 'start-<ToLetter>' | 'clear-<FromLetter>' | '<FromLetter>-<ToLetter>'
      * */
     private sendFilterByTitleAnalytics;
+    private selectedTitleLetterChanged;
     /** Send Analytics when filtering by creator's first letter
      * labels: 'start-<ToLetter>' | 'clear-<FromLetter>' | '<FromLetter>-<ToLetter>'
      * */
     private sendFilterByCreatorAnalytics;
+    private selectedCreatorLetterChanged;
     private titleLetterSelected;
     private creatorLetterSelected;
     private get mobileFacetsTemplate();
@@ -183,8 +185,12 @@ export declare class CollectionBrowser extends LitElement implements InfiniteScr
     private persistState;
     private doInitialPageFetch;
     private get filterMap();
+    /** The base query joined with any title/creator letter filters */
+    private get filteredQuery();
     /** The full query, including year facets and date range clauses */
     private get fullQuery();
+    /** The full query without any title/creator letter filters */
+    private get fullQueryWithoutAlphaFilters();
     /**
      * Generates a query string for the given facets
      *

package/dist/src/collection-browser.js

@@ -150,6 +150,8 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         if (letterFilters) {
             this.selectedTitleFilter = null;
             this.selectedCreatorFilter = null;
+            this.titleQuery = undefined;
+            this.creatorQuery = undefined;
         }
         if (sort) {
             this.sortParam = null;
@@ -191,8 +193,8 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         if (!((_a = this.baseQuery) === null || _a === void 0 ? void 0 : _a.trim())) {
             this.placeholderType = 'empty-query';
         }
-        else if (!this.searchResultsLoading &&
-            (this.totalResults === 0 || !this.searchService)) {
+        if ((!this.searchResultsLoading && this.totalResults === 0) ||
+            !this.searchService) {
             this.placeholderType = 'null-result';
         }
         if (this.queryErrorMessage) {
@@ -327,16 +329,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             });
         }
     }
-    get titleQuery() {
-        return this.selectedTitleFilter
-            ? `firstTitle:${this.selectedTitleFilter}`
-            : undefined;
-    }
-    get creatorQuery() {
-        return this.selectedCreatorFilter
-            ? `firstCreator:${this.selectedCreatorFilter}`
-            : undefined;
-    }
     /** Send Analytics when sorting by title's first letter
      * labels: 'start-<ToLetter>' | 'clear-<FromLetter>' | '<FromLetter>-<ToLetter>'
      * */
@@ -354,6 +346,11 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
                 : `${prevSelectedLetter || 'start'}-${this.selectedTitleFilter}`,
         });
     }
+    selectedTitleLetterChanged() {
+        this.titleQuery = this.selectedTitleFilter
+            ? `firstTitle:${this.selectedTitleFilter}`
+            : undefined;
+    }
     /** Send Analytics when filtering by creator's first letter
      * labels: 'start-<ToLetter>' | 'clear-<FromLetter>' | '<FromLetter>-<ToLetter>'
      * */
@@ -371,13 +368,20 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
                 : `${prevSelectedLetter || 'start'}-${this.selectedCreatorFilter}`,
         });
     }
+    selectedCreatorLetterChanged() {
+        this.creatorQuery = this.selectedCreatorFilter
+            ? `firstCreator:${this.selectedCreatorFilter}`
+            : undefined;
+    }
     titleLetterSelected(e) {
         this.selectedCreatorFilter = null;
         this.selectedTitleFilter = e.detail.selectedLetter;
+        this.selectedTitleLetterChanged();
     }
     creatorLetterSelected(e) {
         this.selectedTitleFilter = null;
         this.selectedCreatorFilter = e.detail.selectedLetter;
+        this.selectedCreatorLetterChanged();
     }
     get mobileFacetsTemplate() {
         return html `
@@ -418,7 +422,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         .selectedFacets=${this.selectedFacets}
         .collectionNameCache=${this.collectionNameCache}
         .showHistogramDatePicker=${this.showHistogramDatePicker}
-        .query=${this.baseQuery}
+        .query=${this.filteredQuery}
         .filterMap=${this.filterMap}
         .modalManager=${this.modalManager}
         ?collapsableFacets=${this.mobileView}
@@ -506,8 +510,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         if (changed.has('baseQuery') ||
             changed.has('minSelectedDate') ||
             changed.has('maxSelectedDate') ||
-            changed.has('selectedFacets') ||
-            changed.has('searchService')) {
+            changed.has('selectedFacets')) {
             this.refreshLetterCounts();
         }
         if (changed.has('selectedSort') || changed.has('sortDirection')) {
@@ -517,9 +520,11 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         }
         if (changed.has('selectedTitleFilter')) {
             this.sendFilterByTitleAnalytics(changed.get('selectedTitleFilter'));
+            this.selectedTitleLetterChanged();
         }
         if (changed.has('selectedCreatorFilter')) {
             this.sendFilterByCreatorAnalytics(changed.get('selectedCreatorFilter'));
+            this.selectedCreatorLetterChanged();
         }
         if (changed.has('baseQuery') ||
             changed.has('searchType') ||
@@ -724,16 +729,20 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
                 }
             }
         }
-        // Add any letter filters
-        if (this.selectedTitleFilter) {
-            builder.addFilter('firstTitle', this.selectedTitleFilter, FilterConstraint.INCLUDE);
-        }
-        if (this.selectedCreatorFilter) {
-            builder.addFilter('firstCreator', this.selectedCreatorFilter, FilterConstraint.INCLUDE);
-        }
         const filterMap = builder.build();
         return filterMap;
     }
+    /** The base query joined with any title/creator letter filters */
+    get filteredQuery() {
+        if (!this.baseQuery)
+            return undefined;
+        let filteredQuery = this.baseQuery.trim();
+        const { sortFilterQueries } = this;
+        if (sortFilterQueries) {
+            filteredQuery += ` AND ${sortFilterQueries}`;
+        }
+        return filteredQuery.trim();
+    }
     /** The full query, including year facets and date range clauses */
     get fullQuery() {
         if (!this.baseQuery)
@@ -751,6 +760,20 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         }
         return fullQuery.trim();
     }
+    /** The full query without any title/creator letter filters */
+    get fullQueryWithoutAlphaFilters() {
+        if (!this.baseQuery)
+            return undefined;
+        let fullQuery = this.baseQuery.trim();
+        const { facetQuery, dateRangeQueryClause } = this;
+        if (facetQuery) {
+            fullQuery += ` AND ${facetQuery}`;
+        }
+        if (dateRangeQueryClause) {
+            fullQuery += ` AND ${dateRangeQueryClause}`;
+        }
+        return fullQuery.trim();
+    }
     /**
      * Generates a query string for the given facets
      *
@@ -845,14 +868,10 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     }
     async fetchFacets() {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        const trimmedQuery = (_a = this.baseQuery) === null || _a === void 0 ? void 0 : _a.trim();
-        if (!trimmedQuery)
+        if (!this.filteredQuery)
             return;
-        if (!this.searchService)
-            return;
-        const { facetFetchQueryKey } = this;
         const params = {
-            query: trimmedQuery,
+            query: this.filteredQuery,
             rows: 0,
             filters: this.filterMap,
             // Fetch a few extra buckets beyond the 6 we show, in case some get suppressed
@@ -862,14 +881,9 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             uid: this.facetFetchQueryKey,
         };
         this.facetsLoading = true;
-        const searchResponse = await this.searchService.search(params, this.searchType);
+        const searchResponse = await ((_a = this.searchService) === null || _a === void 0 ? void 0 : _a.search(params, this.searchType));
         const success = searchResponse === null || searchResponse === void 0 ? void 0 : searchResponse.success;
-        // This is checking to see if the query has changed since the data was fetched.
-        // If so, we just want to discard this set of aggregations because they are
-        // likely no longer valid for the newer query.
-        const queryChangedSinceFetch = facetFetchQueryKey !== this.facetFetchQueryKey;
-        if (queryChangedSinceFetch)
-            return;
+        this.facetsLoading = false;
         if (!success) {
             const errorMsg = (_b = searchResponse === null || searchResponse === void 0 ? void 0 : searchResponse.error) === null || _b === void 0 ? void 0 : _b.message;
             const detailMsg = (_d = (_c = searchResponse === null || searchResponse === void 0 ? void 0 : searchResponse.error) === null || _c === void 0 ? void 0 : _c.details) === null || _d === void 0 ? void 0 : _d.message;
@@ -879,10 +893,16 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             }
             return;
         }
+        // This is checking to see if the query has changed since the data was fetched.
+        // If so, we just want to discard this set of aggregations because they are
+        // likely no longer valid for the newer query.
+        const returnedUid = success.request.clientParameters.uid;
+        const queryChangedSinceFetch = returnedUid !== this.facetFetchQueryKey;
+        if (queryChangedSinceFetch)
+            return;
         this.aggregations = success === null || success === void 0 ? void 0 : success.response.aggregations;
         this.fullYearsHistogramAggregation =
             (_h = (_g = success === null || success === void 0 ? void 0 : success.response) === null || _g === void 0 ? void 0 : _g.aggregations) === null || _h === void 0 ? void 0 : _h.year_histogram;
-        this.facetsLoading = false;
     }
     scrollToPage(pageNumber) {
         return new Promise(resolve => {
@@ -933,11 +953,8 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         return `${this.fullQuery}-${this.searchType}`;
     }
     async fetchPage(pageNumber) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-        const trimmedQuery = (_a = this.baseQuery) === null || _a === void 0 ? void 0 : _a.trim();
-        if (!trimmedQuery)
-            return;
-        if (!this.searchService)
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if (!this.filteredQuery)
             return;
         // if we already have data, don't fetch again
         if (this.dataSource[pageNumber])
@@ -946,14 +963,14 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             return;
         // if a fetch is already in progress for this query and page, don't fetch again
         const { pageFetchQueryKey } = this;
-        const pageFetches = (_b = this.pageFetchesInProgress[pageFetchQueryKey]) !== null && _b !== void 0 ? _b : new Set();
+        const pageFetches = (_a = this.pageFetchesInProgress[pageFetchQueryKey]) !== null && _a !== void 0 ? _a : new Set();
         if (pageFetches.has(pageNumber))
             return;
         pageFetches.add(pageNumber);
         this.pageFetchesInProgress[pageFetchQueryKey] = pageFetches;
         const sortParams = this.sortParam ? [this.sortParam] : [];
         const params = {
-            query: trimmedQuery,
+            query: this.filteredQuery,
             page: pageNumber,
             rows: this.pageSize,
             sort: sortParams,
@@ -961,14 +978,8 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             aggregations: { omit: true },
             uid: this.pageFetchQueryKey,
         };
-        const searchResponse = await this.searchService.search(params, this.searchType);
+        const searchResponse = await ((_b = this.searchService) === null || _b === void 0 ? void 0 : _b.search(params, this.searchType));
         const success = searchResponse === null || searchResponse === void 0 ? void 0 : searchResponse.success;
-        // This is checking to see if the query has changed since the data was fetched.
-        // If so, we just want to discard the data since there should be a new query
-        // right behind it.
-        const queryChangedSinceFetch = pageFetchQueryKey !== this.pageFetchQueryKey;
-        if (queryChangedSinceFetch)
-            return;
         if (!success) {
             const errorMsg = (_c = searchResponse === null || searchResponse === void 0 ? void 0 : searchResponse.error) === null || _c === void 0 ? void 0 : _c.message;
             const detailMsg = (_e = (_d = searchResponse === null || searchResponse === void 0 ? void 0 : searchResponse.error) === null || _d === void 0 ? void 0 : _d.details) === null || _e === void 0 ? void 0 : _e.message;
@@ -978,10 +989,15 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
                 // @ts-ignore: Property 'Sentry' does not exist on type 'Window & typeof globalThis'
                 (_g = (_f = window === null || window === void 0 ? void 0 : window.Sentry) === null || _f === void 0 ? void 0 : _f.captureMessage) === null || _g === void 0 ? void 0 : _g.call(_f, this.queryErrorMessage, 'error');
             }
-            (_h = this.pageFetchesInProgress[pageFetchQueryKey]) === null || _h === void 0 ? void 0 : _h.delete(pageNumber);
-            this.searchResultsLoading = false;
             return;
         }
+        // This is checking to see if the query has changed since the data was fetched.
+        // If so, we just want to discard the data since there should be a new query
+        // right behind it.
+        const returnedUid = success.request.clientParameters.uid;
+        const queryChangedSinceFetch = returnedUid !== this.pageFetchQueryKey;
+        if (queryChangedSinceFetch)
+            return;
         this.totalResults = success.response.totalResults;
         const { results } = success.response;
         if (results && results.length > 0) {
@@ -997,7 +1013,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
                 this.infiniteScroller.itemCount = this.totalResults;
             }
         }
-        (_j = this.pageFetchesInProgress[pageFetchQueryKey]) === null || _j === void 0 ? void 0 : _j.delete(pageNumber);
+        (_h = this.pageFetchesInProgress[pageFetchQueryKey]) === null || _h === void 0 ? void 0 : _h.delete(pageNumber);
         this.searchResultsLoading = false;
     }
     preloadCollectionNames(results) {
@@ -1099,32 +1115,24 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     }
     /** Fetches the aggregation buckets for the given prefix filter type. */
     async fetchPrefixFilterBuckets(filterType) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const trimmedQuery = (_a = this.baseQuery) === null || _a === void 0 ? void 0 : _a.trim();
-        if (!trimmedQuery)
+        var _a, _b, _c, _d, _e, _f;
+        if (!this.fullQueryWithoutAlphaFilters)
             return [];
         const filterAggregationKey = prefixFilterAggregationKeys[filterType];
         const params = {
-            query: trimmedQuery,
+            query: this.fullQueryWithoutAlphaFilters,
             rows: 0,
-            filters: this.filterMap,
             // Only fetch the firstTitle or firstCreator aggregation
             aggregations: { simpleParams: [filterAggregationKey] },
             // Fetch all 26 letter buckets
             aggregationsSize: 26,
         };
-        const searchResponse = await ((_b = this.searchService) === null || _b === void 0 ? void 0 : _b.search(params, this.searchType));
-        return ((_g = (_f = (_e = (_d = (_c = searchResponse === null || searchResponse === void 0 ? void 0 : searchResponse.success) === null || _c === void 0 ? void 0 : _c.response) === null || _d === void 0 ? void 0 : _d.aggregations) === null || _e === void 0 ? void 0 : _e[filterAggregationKey]) === null || _f === void 0 ? void 0 : _f.buckets) !== null && _g !== void 0 ? _g : []);
+        const searchResponse = await ((_a = this.searchService) === null || _a === void 0 ? void 0 : _a.search(params, this.searchType));
+        return ((_f = (_e = (_d = (_c = (_b = searchResponse === null || searchResponse === void 0 ? void 0 : searchResponse.success) === null || _b === void 0 ? void 0 : _b.response) === null || _c === void 0 ? void 0 : _c.aggregations) === null || _d === void 0 ? void 0 : _d[filterAggregationKey]) === null || _e === void 0 ? void 0 : _e.buckets) !== null && _f !== void 0 ? _f : []);
     }
     /** Fetches and caches the prefix filter counts for the given filter type. */
     async updatePrefixFilterCounts(filterType) {
-        const { facetFetchQueryKey } = this;
         const buckets = await this.fetchPrefixFilterBuckets(filterType);
-        // Don't update the filter counts for an outdated query (if it has been changed
-        // since we sent the request)
-        const queryChangedSinceFetch = facetFetchQueryKey !== this.facetFetchQueryKey;
-        if (queryChangedSinceFetch)
-            return;
         // Unpack the aggregation buckets into a simple map like { 'A': 50, 'B': 25, ... }
         this.prefixFilterCountMap = { ...this.prefixFilterCountMap }; // Clone the object to trigger an update
         this.prefixFilterCountMap[filterType] = buckets.reduce((acc, bucket) => {
@@ -1152,9 +1160,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
      * Call this whenever the counts are invalidated (e.g., by a query change).
      */
     refreshLetterCounts() {
-        if (Object.keys(this.prefixFilterCountMap).length > 0) {
-            this.prefixFilterCountMap = {};
-        }
+        this.prefixFilterCountMap = {};
         this.updatePrefixFiltersForCurrentSort();
     }
     /**
@@ -1472,6 +1478,12 @@ __decorate([
 __decorate([
     property({ type: Object })
 ], CollectionBrowser.prototype, "resizeObserver", void 0);
+__decorate([
+    property({ type: String })
+], CollectionBrowser.prototype, "titleQuery", void 0);
+__decorate([
+    property({ type: String })
+], CollectionBrowser.prototype, "creatorQuery", void 0);
 __decorate([
     property({ type: Number })
 ], CollectionBrowser.prototype, "currentPage", void 0);