@internetarchive/collection-browser 1.14.14-alpha.1 → 1.14.16-alpha.1

package/dist/src/collection-browser.js

@@ -4,7 +4,7 @@ import { html, css, LitElement, nothing, } from 'lit';
 import { customElement, property, query, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { msg } from '@lit/localize';
-import { FilterConstraint, FilterMapBuilder, SearchType, } from '@internetarchive/search-service';
+import { SearchType, } from '@internetarchive/search-service';
 import '@internetarchive/infinite-scroller';
 import './tiles/tile-dispatcher';
 import './tiles/collection-browser-loading-tile';
@@ -12,8 +12,9 @@ import './sort-filter-bar/sort-filter-bar';
 import './manage/manage-bar';
 import './collection-facets';
 import './circular-activity-indicator';
-import { SortField, getDefaultSelectedFacets, prefixFilterAggregationKeys, sortOptionFromAPIString, SORT_OPTIONS, } from './models';
+import { SortField, getDefaultSelectedFacets, sortOptionFromAPIString, SORT_OPTIONS, } from './models';
 import { RestorationStateHandler, } from './restoration-state-handler';
+import { CollectionBrowserDataSource, } from './data-source/collection-browser-data-source';
 import chevronIcon from './assets/img/icons/chevron';
 import './empty-placeholder';
 import { analyticsActions, analyticsCategories, } from './utils/analytics-events';
@@ -25,7 +26,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         super(...arguments);
         this.baseImageUrl = 'https://archive.org';
         this.searchType = SearchType.METADATA;
-        this.sortParam = null;
         this.defaultSortParam = null;
         this.selectedSort = SortField.default;
         this.selectedTitleFilter = null;
@@ -53,6 +53,14 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
          */
         this.isManageView = false;
         this.isLoansTab = false;
+        /**
+         * The results per page so we can paginate.
+         *
+         * This allows us to start in the middle of the search results and
+         * fetch data before or after the current page. If we don't have a key
+         * for the previous/next page, we'll fetch the next/previous page to populate it
+         */
+        this.dataSource = new CollectionBrowserDataSource(this, this.pageSize);
         /**
          * The page that the consumer wants to load.
          */
@@ -69,7 +77,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
          */
         this.searchResultsLoading = false;
         this.facetsLoading = false;
-        this.fullYearAggregationLoading = false;
         this.mobileView = false;
         this.mobileFacetsVisible = false;
         this.defaultSortField = SortField.relevance;
@@ -91,14 +98,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
          */
         this.isResizeToMobile = false;
         this.placeholderCellTemplate = html `<collection-browser-loading-tile></collection-browser-loading-tile>`;
-        /**
-         * The results per page so we can paginate.
-         *
-         * This allows us to start in the middle of the search results and
-         * fetch data before or after the current page. If we don't have a key
-         * for the previous/next page, we'll fetch the next/previous page to populate it
-         */
-        this.dataSource = {};
         /**
          * How many tiles to offset the data source by, to account for any removed tiles.
          */
@@ -137,32 +136,24 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         this._initialSearchCompletePromise = new Promise(res => {
             this._initialSearchCompleteResolver = res;
         });
-        // this maps the query to the pages being fetched for that query
-        this.pageFetchesInProgress = {};
     }
     tileModelAtCellIndex(index) {
-        var _a;
         const offsetIndex = index + this.tileModelOffset;
-        const pageNumber = Math.floor(offsetIndex / this.pageSize) + 1;
-        const itemIndex = offsetIndex % this.pageSize;
-        const model = (_a = this.dataSource[pageNumber]) === null || _a === void 0 ? void 0 : _a[itemIndex];
+        const model = this.dataSource.getTileModelAt(offsetIndex);
         /**
          * If we encounter a model we don't have yet and we're not in the middle of an
          * automated scroll, fetch the page and just return undefined.
          * The datasource will be updated once the page is loaded and the cell will be rendered.
          *
-         * We disable it during the automated scroll since we may fetch pages for cells the
+         * We disable it during the automated scroll since we don't want to fetch pages for intervening cells the
          * user may never see.
          */
         if (!model && !this.isScrollingToCell) {
-            this.fetchPage(pageNumber);
+            const pageNumber = Math.floor(offsetIndex / this.pageSize) + 1;
+            this.dataSource.fetchPage(pageNumber);
         }
         return model;
     }
-    get sortFilterQueries() {
-        const queries = [this.titleQuery, this.creatorQuery];
-        return queries.filter(q => q).join(' AND ');
-    }
     // this is the total number of tiles we expect if
     // the data returned is a full page worth
     // this is useful for putting in placeholders for the expected number of tiles
@@ -205,6 +196,12 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         this.pagesToRender = pageNumber;
         return this.scrollToPage(pageNumber);
     }
+    setSearchResultsLoading(loading) {
+        this.searchResultsLoading = loading;
+    }
+    setFacetsLoading(loading) {
+        this.facetsLoading = loading;
+    }
     /**
      * Clears all selected/negated facets, date ranges, and letter filters.
      *
@@ -230,7 +227,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             this.selectedCreatorFilter = null;
         }
         if (sort) {
-            this.sortParam = null;
             this.sortDirection = null;
             this.selectedSort = SortField.default;
         }
@@ -452,7 +448,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         .displayMode=${this.displayMode}
         .selectedTitleFilter=${this.selectedTitleFilter}
         .selectedCreatorFilter=${this.selectedCreatorFilter}
-        .prefixFilterCountMap=${this.prefixFilterCountMap}
+        .prefixFilterCountMap=${this.dataSource.prefixFilterCountMap}
         .resizeObserver=${this.resizeObserver}
         @sortChanged=${this.userChangedSort}
         @displayModeChanged=${this.displayModeChanged}
@@ -476,11 +472,11 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         showSelectAll
         showUnselectAll
         @removeItems=${this.handleRemoveItems}
-        @selectAll=${this.checkAllTiles}
-        @unselectAll=${this.uncheckAllTiles}
+        @selectAll=${this.dataSource.checkAllTiles}
+        @unselectAll=${this.dataSource.uncheckAllTiles}
         @cancel=${() => {
             this.isManageView = false;
-            this.uncheckAllTiles();
+            this.dataSource.uncheckAllTiles();
         }}
       ></manage-bar>
     `;
@@ -492,7 +488,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     handleRemoveItems() {
         this.dispatchEvent(new CustomEvent('itemRemovalRequested', {
             detail: {
-                items: this.checkedTileModels.map(model => ({
+                items: this.dataSource.checkedTileModels.map(model => ({
                     ...model,
                     date: formatDate(model.datePublished, 'long'),
                 })),
@@ -504,95 +500,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
      * of the data source to account for any new gaps in the data.
      */
     removeCheckedTiles() {
-        // To make sure our data source remains page-aligned, we will offset our data source by
-        // the number of removed tiles, so that we can just add the offset when the infinite
-        // scroller queries for cell contents.
-        // This only matters while we're still viewing the same set of results. If the user changes
-        // their query/filters/sort, then the data source is overwritten and the offset cleared.
-        const { checkedTileModels, uncheckedTileModels } = this;
-        const numChecked = checkedTileModels.length;
-        if (numChecked === 0)
-            return;
-        this.tileModelOffset += numChecked;
-        const newDataSource = {};
-        // Which page the remaining tile models start on, post-offset
-        let offsetPageNumber = Math.floor(this.tileModelOffset / this.pageSize) + 1;
-        let indexOnPage = this.tileModelOffset % this.pageSize;
-        // Fill the pages up to that point with empty models
-        for (let page = 1; page <= offsetPageNumber; page += 1) {
-            const remainingHidden = this.tileModelOffset - this.pageSize * (page - 1);
-            const offsetCellsOnPage = Math.min(this.pageSize, remainingHidden);
-            newDataSource[page] = Array(offsetCellsOnPage).fill(undefined);
-        }
-        // Shift all the remaining tiles into their new positions in the data source
-        for (const model of uncheckedTileModels) {
-            if (!newDataSource[offsetPageNumber])
-                newDataSource[offsetPageNumber] = [];
-            newDataSource[offsetPageNumber].push(model);
-            indexOnPage += 1;
-            if (indexOnPage >= this.pageSize) {
-                offsetPageNumber += 1;
-                indexOnPage = 0;
-            }
-        }
-        // Swap in the new data source and update the infinite scroller
-        this.dataSource = newDataSource;
-        if (this.totalResults)
-            this.totalResults -= numChecked;
-        if (this.infiniteScroller) {
-            this.infiniteScroller.itemCount -= numChecked;
-            this.infiniteScroller.refreshAllVisibleCells();
-        }
-    }
-    /**
-     * Checks every tile's management checkbox
-     */
-    checkAllTiles() {
-        this.mapDataSource(model => ({ ...model, checked: true }));
-    }
-    /**
-     * Unchecks every tile's management checkbox
-     */
-    uncheckAllTiles() {
-        this.mapDataSource(model => ({ ...model, checked: false }));
-    }
-    /**
-     * Applies the given map function to all of the tile models in every page of the data
-     * source. This method updates the data source object in immutable fashion.
-     *
-     * @param mapFn A callback function to apply on each tile model, as with Array.map
-     */
-    mapDataSource(mapFn) {
-        var _a;
-        this.dataSource = Object.fromEntries(Object.entries(this.dataSource).map(([page, tileModels]) => [
-            page,
-            tileModels.map((model, index, array) => model ? mapFn(model, index, array) : model),
-        ]));
-        (_a = this.infiniteScroller) === null || _a === void 0 ? void 0 : _a.refreshAllVisibleCells();
-    }
-    /**
-     * An array of all the tile models whose management checkboxes are checked
-     */
-    get checkedTileModels() {
-        return this.getFilteredTileModels(model => model.checked);
-    }
-    /**
-     * An array of all the tile models whose management checkboxes are unchecked
-     */
-    get uncheckedTileModels() {
-        return this.getFilteredTileModels(model => !model.checked);
-    }
-    /**
-     * Returns a flattened, filtered array of all the tile models in the data source
-     * for which the given predicate returns a truthy value.
-     *
-     * @param predicate A callback function to apply on each tile model, as with Array.filter
-     * @returns A filtered array of tile models satisfying the predicate
-     */
-    getFilteredTileModels(predicate) {
-        return Object.values(this.dataSource)
-            .flat()
-            .filter((model, index, array) => model ? predicate(model, index, array) : false);
+        this.dataSource.removeCheckedTiles();
     }
     userChangedSort(e) {
         var _a;
@@ -614,11 +522,14 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         });
     }
     selectedSortChanged() {
+        // Lazy-load the alphabet counts for title/creator sort bar as needed
+        this.updatePrefixFiltersForCurrentSort();
+    }
+    get sortParam() {
         var _a;
         const sortOption = SORT_OPTIONS[this.selectedSort];
-        if (!sortOption.handledBySearchService) {
-            this.sortParam = null;
-            return;
+        if (!(sortOption === null || sortOption === void 0 ? void 0 : sortOption.handledBySearchService)) {
+            return null;
         }
         // 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');
@@ -628,10 +539,8 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         if (!this.sortDirection)
             this.sortDirection = 'asc';
         if (!sortField)
-            return;
-        this.sortParam = { field: sortField, direction: this.sortDirection };
-        // Lazy-load the alphabet counts for title/creator sort bar as needed
-        this.updatePrefixFiltersForCurrentSort();
+            return null;
+        return { field: sortField, direction: this.sortDirection };
     }
     displayModeChanged(e) {
         var _a;
@@ -740,12 +649,13 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
      * The template for the facets component alone, without any surrounding wrappers.
      */
     get facetsTemplate() {
-        if (this.suppressFacets)
+        if (this.suppressFacets) {
             return html `
         <p class="facets-message">
           ${msg('Facets are temporarily unavailable.')}
         </p>
       `;
+        }
         return html `
       <collection-facets
         @facetsChanged=${this.facetsChanged}
@@ -758,18 +668,19 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         .recaptchaManager=${this.recaptchaManager}
         .resizeObserver=${this.resizeObserver}
         .searchType=${this.searchType}
-        .aggregations=${this.aggregations}
-        .fullYearsHistogramAggregation=${this.fullYearsHistogramAggregation}
+        .aggregations=${this.dataSource.aggregations}
+        .fullYearsHistogramAggregation=${this.dataSource
+            .yearHistogramAggregation}
         .minSelectedDate=${this.minSelectedDate}
         .maxSelectedDate=${this.maxSelectedDate}
         .selectedFacets=${this.selectedFacets}
         .baseNavigationUrl=${this.baseNavigationUrl}
-        .collectionNameCache=${this.collectionNameCache}
+        .collectionTitles=${this.dataSource.collectionTitles}
         .showHistogramDatePicker=${this.showHistogramDatePicker}
         .allowExpandingDatePicker=${!this.mobileView}
         .contentWidth=${this.contentWidth}
         .query=${this.baseQuery}
-        .filterMap=${this.filterMap}
+        .filterMap=${this.dataSource.filterMap}
         .isManageView=${this.isManageView}
         .modalManager=${this.modalManager}
         ?collapsableFacets=${this.mobileView}
@@ -931,7 +842,8 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             changed.has('selectedCreatorFilter') ||
             changed.has('minSelectedDate') ||
             changed.has('maxSelectedDate') ||
-            changed.has('sortParam') ||
+            changed.has('selectedSort') ||
+            changed.has('sortDirection') ||
             changed.has('selectedFacets') ||
             changed.has('searchService') ||
             changed.has('withinCollection')) {
@@ -1090,19 +1002,16 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     async handleQueryChange() {
         var _a;
         // only reset if the query has actually changed
-        if (!this.searchService || this.pageFetchQueryKey === this.previousQueryKey)
+        if (!this.searchService ||
+            this.dataSource.pageFetchQueryKey === this.previousQueryKey)
             return;
         // If the new state prevents us from updating the search results, don't reset
-        if (!this.canPerformSearch &&
+        if (!this.dataSource.canPerformSearch &&
             !(this.clearResultsOnEmptyQuery && this.baseQuery === ''))
             return;
-        this.previousQueryKey = this.pageFetchQueryKey;
-        this.dataSource = {};
+        this.previousQueryKey = this.dataSource.pageFetchQueryKey;
         this.tileModelOffset = 0;
         this.totalResults = undefined;
-        this.aggregations = undefined;
-        this.fullYearsHistogramAggregation = undefined;
-        this.pageFetchesInProgress = {};
         this.endOfDataReached = false;
         this.pagesToRender =
             this.initialPageNumber === 1
@@ -1134,10 +1043,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             this._initialSearchCompleteResolver = res;
         });
         // Fire the initial page and facets requests
-        await Promise.all([
-            this.doInitialPageFetch(),
-            this.suppressFacets ? null : this.fetchFacets(),
-        ]);
+        await this.dataSource.handleQueryChange();
         // Resolve the `initialSearchComplete` promise for this search
         this._initialSearchCompleteResolver(true);
     }
@@ -1190,12 +1096,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         };
         this.restorationStateHandler.persistState(restorationState);
     }
-    async doInitialPageFetch() {
-        this.searchResultsLoading = true;
-        // Try to batch 2 initial page requests when possible
-        await this.fetchPage(this.initialPageNumber, 2);
-        this.searchResultsLoading = false;
-    }
     emitSearchResultsLoadingChanged() {
         this.dispatchEvent(new CustomEvent('searchResultsLoadingChanged', {
             detail: {
@@ -1203,159 +1103,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             },
         }));
     }
-    /**
-     * Produces a compact unique ID for a search request that can help with debugging
-     * on the backend by making related requests easier to trace through different services.
-     * (e.g., tying the hits/aggregations requests for the same page back to a single hash).
-     *
-     * @param params The search service parameters for the request
-     * @param kind The kind of request (hits-only, aggregations-only, or both)
-     * @returns A Promise resolving to the uid to apply to the request
-     */
-    async requestUID(params, kind) {
-        var _a;
-        const paramsToHash = JSON.stringify({
-            pageType: params.pageType,
-            pageTarget: params.pageTarget,
-            query: params.query,
-            fields: params.fields,
-            filters: params.filters,
-            sort: params.sort,
-            searchType: this.searchType,
-        });
-        const fullQueryHash = (await sha1(paramsToHash)).slice(0, 20); // First 80 bits of SHA-1 are plenty for this
-        const sessionId = (await this.getSessionId()).slice(0, 20); // Likewise
-        const page = (_a = params.page) !== null && _a !== void 0 ? _a : 0;
-        const kindPrefix = kind.charAt(0); // f = full, h = hits, a = aggregations
-        const currentTime = Date.now();
-        return `R:${fullQueryHash}-S:${sessionId}-P:${page}-K:${kindPrefix}-T:${currentTime}`;
-    }
-    /**
-     * Constructs a search service FilterMap object from the combination of
-     * all the currently-applied filters. This includes any facets, letter
-     * filters, and date range.
-     */
-    get filterMap() {
-        const builder = new FilterMapBuilder();
-        // Add the date range, if applicable
-        if (this.minSelectedDate) {
-            builder.addFilter('year', this.minSelectedDate, FilterConstraint.GREATER_OR_EQUAL);
-        }
-        if (this.maxSelectedDate) {
-            builder.addFilter('year', this.maxSelectedDate, FilterConstraint.LESS_OR_EQUAL);
-        }
-        // Add any selected facets
-        if (this.selectedFacets) {
-            for (const [facetName, facetValues] of Object.entries(this.selectedFacets)) {
-                const { name, values } = this.prepareFacetForFetch(facetName, facetValues);
-                for (const [value, bucket] of Object.entries(values)) {
-                    let constraint;
-                    if (bucket.state === 'selected') {
-                        constraint = FilterConstraint.INCLUDE;
-                    }
-                    else if (bucket.state === 'hidden') {
-                        constraint = FilterConstraint.EXCLUDE;
-                    }
-                    if (constraint) {
-                        builder.addFilter(name, value, constraint);
-                    }
-                }
-            }
-        }
-        // 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 full query, including year facets and date range clauses */
-    get fullQuery() {
-        var _a, _b;
-        let fullQuery = (_b = (_a = this.baseQuery) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : '';
-        const { facetQuery, dateRangeQueryClause, sortFilterQueries } = this;
-        if (facetQuery) {
-            fullQuery += ` AND ${facetQuery}`;
-        }
-        if (dateRangeQueryClause) {
-            fullQuery += ` AND ${dateRangeQueryClause}`;
-        }
-        if (sortFilterQueries) {
-            fullQuery += ` AND ${sortFilterQueries}`;
-        }
-        return fullQuery.trim();
-    }
-    /**
-     * Generates a query string for the given facets
-     *
-     * Example: `mediatype:("collection" OR "audio" OR -"etree") AND year:("2000" OR "2001")`
-     */
-    get facetQuery() {
-        var _a;
-        if (!this.selectedFacets)
-            return undefined;
-        const facetClauses = [];
-        for (const [facetName, facetValues] of Object.entries(this.selectedFacets)) {
-            facetClauses.push(this.buildFacetClause(facetName, facetValues));
-        }
-        return (_a = this.joinFacetClauses(facetClauses)) === null || _a === void 0 ? void 0 : _a.trim();
-    }
-    /**
-     * Builds an OR-joined facet clause for the given facet name and values.
-     *
-     * E.g., for name `subject` and values
-     * `{ foo: { state: 'selected' }, bar: { state: 'hidden' } }`
-     * this will produce the clause
-     * `subject:("foo" OR -"bar")`.
-     *
-     * @param facetName The facet type (e.g., 'collection')
-     * @param facetValues The facet buckets, mapped by their keys
-     */
-    buildFacetClause(facetName, facetValues) {
-        const { name: facetQueryName, values } = this.prepareFacetForFetch(facetName, facetValues);
-        const facetEntries = Object.entries(values);
-        if (facetEntries.length === 0)
-            return '';
-        const facetValuesArray = [];
-        for (const [key, facetData] of facetEntries) {
-            const plusMinusPrefix = facetData.state === 'hidden' ? '-' : '';
-            facetValuesArray.push(`${plusMinusPrefix}"${key}"`);
-        }
-        const valueQuery = facetValuesArray.join(` OR `);
-        return `${facetQueryName}:(${valueQuery})`;
-    }
-    /**
-     * Handles some special pre-request normalization steps for certain facet types
-     * that require them.
-     *
-     * @param facetName The name of the facet type (e.g., 'language')
-     * @param facetValues An array of values for that facet type
-     */
-    prepareFacetForFetch(facetName, facetValues) {
-        // eslint-disable-next-line prefer-const
-        let [normalizedName, normalizedValues] = [facetName, facetValues];
-        // The full "search engine" name of the lending field is "lending___status"
-        if (facetName === 'lending') {
-            normalizedName = 'lending___status';
-        }
-        return {
-            name: normalizedName,
-            values: normalizedValues,
-        };
-    }
-    /**
-     * Takes an array of facet clauses, and combines them into a
-     * full AND-joined facet query string. Empty clauses are ignored.
-     */
-    joinFacetClauses(facetClauses) {
-        const nonEmptyFacetClauses = facetClauses.filter(clause => clause.length > 0);
-        return nonEmptyFacetClauses.length > 0
-            ? `(${nonEmptyFacetClauses.join(' AND ')})`
-            : undefined;
-    }
     facetsChanged(e) {
         this.selectedFacets = e.detail;
     }
@@ -1380,54 +1127,6 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             label: facetType,
         });
     }
-    async fetchFacets() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        const trimmedQuery = (_a = this.baseQuery) === null || _a === void 0 ? void 0 : _a.trim();
-        if (!this.canPerformSearch)
-            return;
-        const { facetFetchQueryKey } = this;
-        const sortParams = this.sortParam ? [this.sortParam] : [];
-        const params = {
-            ...this.collectionParams,
-            query: trimmedQuery || '',
-            rows: 0,
-            filters: this.filterMap,
-            // Fetch a few extra buckets beyond the 6 we show, in case some get suppressed
-            aggregationsSize: 10,
-            // Note: we don't need an aggregations param to fetch the default aggregations from the PPS.
-            // The default aggregations for the search_results page type should be what we need here.
-        };
-        params.uid = await this.requestUID({ ...params, sort: sortParams }, 'aggregations');
-        this.facetsLoading = true;
-        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 this set of aggregations because they are
-        // likely no longer valid for the newer query.
-        const queryChangedSinceFetch = facetFetchQueryKey !== this.facetFetchQueryKey;
-        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;
-            if (!errorMsg && !detailMsg) {
-                // @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, 'Missing or malformed facet response from backend', 'error');
-            }
-            return;
-        }
-        const { aggregations, collectionTitles } = success.response;
-        this.aggregations = aggregations;
-        if (collectionTitles) {
-            (_h = this.collectionNameCache) === null || _h === void 0 ? void 0 : _h.addKnownTitles(collectionTitles);
-        }
-        else if ((_j = this.aggregations) === null || _j === void 0 ? void 0 : _j.collection) {
-            (_k = this.collectionNameCache) === null || _k === void 0 ? void 0 : _k.preloadIdentifiers(this.aggregations.collection.buckets.map(bucket => { var _a; return (_a = bucket.key) === null || _a === void 0 ? void 0 : _a.toString(); }));
-        }
-        this.fullYearsHistogramAggregation =
-            (_m = (_l = success === null || success === void 0 ? void 0 : success.response) === null || _l === void 0 ? void 0 : _l.aggregations) === null || _m === void 0 ? void 0 : _m.year_histogram;
-        this.facetsLoading = false;
-    }
     scrollToPage(pageNumber) {
         return new Promise(resolve => {
             const cellIndexToScrollTo = this.pageSize * (pageNumber - 1);
@@ -1458,177 +1157,11 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         var _a;
         return !!((_a = this.baseQuery) === null || _a === void 0 ? void 0 : _a.trim());
     }
-    /**
-     * Whether a search may be performed in the current state of the component.
-     * This is only true if the search service is defined, and either
-     *   (a) a non-empty query is set, or
-     *   (b) we are on a collection page in metadata search mode.
-     */
-    get canPerformSearch() {
-        var _a;
-        if (!this.searchService)
-            return false;
-        const trimmedQuery = (_a = this.baseQuery) === null || _a === void 0 ? void 0 : _a.trim();
-        const hasNonEmptyQuery = !!trimmedQuery;
-        const isCollectionSearch = !!this.withinCollection;
-        const isMetadataSearch = this.searchType === SearchType.METADATA;
-        // Metadata searches within a collection are allowed to have no query.
-        // Otherwise, a non-empty query must be set.
-        return hasNonEmptyQuery || (isCollectionSearch && isMetadataSearch);
-    }
-    /**
-     * Additional params to pass to the search service if targeting a collection page,
-     * or null otherwise.
-     */
-    get collectionParams() {
-        return this.withinCollection
-            ? { pageType: 'collection_details', pageTarget: this.withinCollection }
-            : null;
-    }
-    /**
-     * The query key is a string that uniquely identifies the current search.
-     * It consists of:
-     *  - The current base query
-     *  - The current collection
-     *  - The current search type
-     *  - Any currently-applied facets
-     *  - Any currently-applied date range
-     *  - Any currently-applied prefix filters
-     *  - The current sort options
-     *
-     * This lets us keep track of queries so we don't persist data that's
-     * no longer relevant.
-     */
-    get pageFetchQueryKey() {
-        var _a, _b, _c, _d;
-        const sortField = (_b = (_a = this.sortParam) === null || _a === void 0 ? void 0 : _a.field) !== null && _b !== void 0 ? _b : 'none';
-        const sortDirection = (_d = (_c = this.sortParam) === null || _c === void 0 ? void 0 : _c.direction) !== null && _d !== void 0 ? _d : 'none';
-        return `${this.fullQuery}-${this.withinCollection}-${this.searchType}-${sortField}-${sortDirection}`;
-    }
-    /**
-     * Similar to `pageFetchQueryKey` above, but excludes sort fields since they
-     * are not relevant in determining aggregation queries.
-     */
-    get facetFetchQueryKey() {
-        return `${this.fullQuery}-${this.withinCollection}-${this.searchType}`;
-    }
-    /**
-     * Fetches one or more pages of results and updates the data source.
-     *
-     * @param pageNumber The page number to fetch
-     * @param numInitialPages If this is an initial page fetch (`pageNumber = 1`),
-     *  specifies how many pages to batch together in one request. Ignored
-     *  if `pageNumber != 1`, defaulting to a single page.
-     */
-    async fetchPage(pageNumber, numInitialPages = 1) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-        const trimmedQuery = (_a = this.baseQuery) === null || _a === void 0 ? void 0 : _a.trim();
-        if (!this.canPerformSearch)
-            return;
-        // if we already have data, don't fetch again
-        if (this.dataSource[pageNumber])
-            return;
-        if (this.endOfDataReached)
-            return;
-        // Batch multiple initial page requests together if needed (e.g., can request
-        // pages 1 and 2 together in a single request).
-        const numPages = pageNumber === 1 ? numInitialPages : 1;
-        const numRows = this.pageSize * numPages;
-        // 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();
-        if (pageFetches.has(pageNumber))
-            return;
-        for (let i = 0; i < numPages; i += 1) {
-            pageFetches.add(pageNumber + i);
-        }
-        this.pageFetchesInProgress[pageFetchQueryKey] = pageFetches;
-        const sortParams = this.sortParam ? [this.sortParam] : [];
-        const params = {
-            ...this.collectionParams,
-            query: trimmedQuery || '',
-            page: pageNumber,
-            rows: numRows,
-            sort: sortParams,
-            filters: this.filterMap,
-            aggregations: { omit: true },
-        };
-        params.uid = await this.requestUID(params, 'hits');
-        const searchResponse = await ((_c = this.searchService) === null || _c === void 0 ? void 0 : _c.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 = (_d = searchResponse === null || searchResponse === void 0 ? void 0 : searchResponse.error) === null || _d === void 0 ? void 0 : _d.message;
-            const detailMsg = (_f = (_e = searchResponse === null || searchResponse === void 0 ? void 0 : searchResponse.error) === null || _e === void 0 ? void 0 : _e.details) === null || _f === void 0 ? void 0 : _f.message;
-            this.queryErrorMessage = `${errorMsg !== null && errorMsg !== void 0 ? errorMsg : ''}${detailMsg ? `; ${detailMsg}` : ''}`;
-            if (!this.queryErrorMessage) {
-                this.queryErrorMessage = 'Missing or malformed response from backend';
-                // @ts-ignore: Property 'Sentry' does not exist on type 'Window & typeof globalThis'
-                (_h = (_g = window === null || window === void 0 ? void 0 : window.Sentry) === null || _g === void 0 ? void 0 : _g.captureMessage) === null || _h === void 0 ? void 0 : _h.call(_g, this.queryErrorMessage, 'error');
-            }
-            for (let i = 0; i < numPages; i += 1) {
-                (_j = this.pageFetchesInProgress[pageFetchQueryKey]) === null || _j === void 0 ? void 0 : _j.delete(pageNumber + i);
-            }
-            this.searchResultsLoading = false;
-            return;
-        }
-        this.totalResults = success.response.totalResults - this.tileModelOffset;
-        // display event to offshoot when result count is zero.
-        if (this.totalResults === 0) {
-            this.emitEmptyResults();
-        }
-        if (this.withinCollection) {
-            this.collectionInfo = success.response.collectionExtraInfo;
-            // For collections, we want the UI to respect the default sort option
-            // which can be specified in metadata, or otherwise assumed to be week:desc
-            this.applyDefaultCollectionSort(this.collectionInfo);
-            if (this.collectionInfo) {
-                this.parentCollections = [].concat((_l = (_k = this.collectionInfo.public_metadata) === null || _k === void 0 ? void 0 : _k.collection) !== null && _l !== void 0 ? _l : []);
-            }
-        }
-        const { results, collectionTitles } = success.response;
-        if (results && results.length > 0) {
-            // Load any collection titles present on the response into the cache,
-            // or queue up preload fetches for them if none were present.
-            if (collectionTitles) {
-                (_m = this.collectionNameCache) === null || _m === void 0 ? void 0 : _m.addKnownTitles(collectionTitles);
-            }
-            else {
-                this.preloadCollectionNames(results);
-            }
-            // Update the data source for each returned page
-            for (let i = 0; i < numPages; i += 1) {
-                const pageStartIndex = this.pageSize * i;
-                this.updateDataSource(pageNumber + i, results.slice(pageStartIndex, pageStartIndex + this.pageSize));
-            }
-        }
-        // When we reach the end of the data, we can set the infinite scroller's
-        // item count to the real total number of results (rather than the
-        // temporary estimates based on pages rendered so far).
-        const resultCountDiscrepancy = numRows - results.length;
-        if (resultCountDiscrepancy > 0) {
-            this.endOfDataReached = true;
-            if (this.infiniteScroller) {
-                this.infiniteScroller.itemCount = this.totalResults;
-            }
-        }
-        for (let i = 0; i < numPages; i += 1) {
-            (_o = this.pageFetchesInProgress[pageFetchQueryKey]) === null || _o === void 0 ? void 0 : _o.delete(pageNumber + i);
+    setTotalResultCount(count) {
+        if (this.infiniteScroller) {
+            this.infiniteScroller.itemCount = count;
         }
     }
-    preloadCollectionNames(results) {
-        var _a;
-        const collectionIds = results
-            .map(result => { var _a; return (_a = result.collection) === null || _a === void 0 ? void 0 : _a.values; })
-            .flat();
-        const collectionIdsArray = Array.from(new Set(collectionIds));
-        (_a = this.collectionNameCache) === null || _a === void 0 ? void 0 : _a.preloadIdentifiers(collectionIdsArray);
-    }
     /**
      * Applies any default sort option for the current collection, by checking
      * for one in the collection's metadata. If none is found, defaults to sorting
@@ -1691,147 +1224,11 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         return Array.from(visiblePages);
     }
     /**
-     * Update the datasource from the fetch response
-     *
-     * @param pageNumber
-     * @param results
+     * Refreshes all visible result cells in the infinite scroller.
      */
-    updateDataSource(pageNumber, results) {
+    refreshVisibleResults() {
         var _a;
-        // copy our existing datasource so when we set it below, it gets set
-        // instead of modifying the existing dataSource since object changes
-        // don't trigger a re-render
-        const datasource = { ...this.dataSource };
-        const tiles = [];
-        results === null || results === void 0 ? void 0 : results.forEach(result => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13;
-            if (!result.identifier)
-                return;
-            let loginRequired = false;
-            let contentWarning = false;
-            // Check if item and item in "modifying" collection, setting above flags
-            if (((_a = result.collection) === null || _a === void 0 ? void 0 : _a.values.length) &&
-                ((_b = result.mediatype) === null || _b === void 0 ? void 0 : _b.value) !== 'collection') {
-                for (const collection of (_d = (_c = result.collection) === null || _c === void 0 ? void 0 : _c.values) !== null && _d !== void 0 ? _d : []) {
-                    if (collection === 'loggedin') {
-                        loginRequired = true;
-                        if (contentWarning)
-                            break;
-                    }
-                    if (collection === 'no-preview') {
-                        contentWarning = true;
-                        if (loginRequired)
-                            break;
-                    }
-                }
-            }
-            tiles.push({
-                averageRating: (_e = result.avg_rating) === null || _e === void 0 ? void 0 : _e.value,
-                checked: false,
-                collections: (_g = (_f = result.collection) === null || _f === void 0 ? void 0 : _f.values) !== null && _g !== void 0 ? _g : [],
-                collectionFilesCount: (_j = (_h = result.collection_files_count) === null || _h === void 0 ? void 0 : _h.value) !== null && _j !== void 0 ? _j : 0,
-                collectionSize: (_l = (_k = result.collection_size) === null || _k === void 0 ? void 0 : _k.value) !== null && _l !== void 0 ? _l : 0,
-                commentCount: (_o = (_m = result.num_reviews) === null || _m === void 0 ? void 0 : _m.value) !== null && _o !== void 0 ? _o : 0,
-                creator: (_p = result.creator) === null || _p === void 0 ? void 0 : _p.value,
-                creators: (_r = (_q = result.creator) === null || _q === void 0 ? void 0 : _q.values) !== null && _r !== void 0 ? _r : [],
-                dateAdded: (_s = result.addeddate) === null || _s === void 0 ? void 0 : _s.value,
-                dateArchived: (_t = result.publicdate) === null || _t === void 0 ? void 0 : _t.value,
-                datePublished: (_u = result.date) === null || _u === void 0 ? void 0 : _u.value,
-                dateReviewed: (_v = result.reviewdate) === null || _v === void 0 ? void 0 : _v.value,
-                description: (_w = result.description) === null || _w === void 0 ? void 0 : _w.values.join('\n'),
-                favCount: (_y = (_x = result.num_favorites) === null || _x === void 0 ? void 0 : _x.value) !== null && _y !== void 0 ? _y : 0,
-                href: this.collapseRepeatedQuotes((_z = result.__href__) === null || _z === void 0 ? void 0 : _z.value),
-                identifier: result.identifier,
-                issue: (_0 = result.issue) === null || _0 === void 0 ? void 0 : _0.value,
-                itemCount: (_2 = (_1 = result.item_count) === null || _1 === void 0 ? void 0 : _1.value) !== null && _2 !== void 0 ? _2 : 0,
-                mediatype: this.getMediatype(result),
-                snippets: (_4 = (_3 = result.highlight) === null || _3 === void 0 ? void 0 : _3.values) !== null && _4 !== void 0 ? _4 : [],
-                source: (_5 = result.source) === null || _5 === void 0 ? void 0 : _5.value,
-                subjects: (_7 = (_6 = result.subject) === null || _6 === void 0 ? void 0 : _6.values) !== null && _7 !== void 0 ? _7 : [],
-                title: (_9 = (_8 = result.title) === null || _8 === void 0 ? void 0 : _8.value) !== null && _9 !== void 0 ? _9 : '',
-                volume: (_10 = result.volume) === null || _10 === void 0 ? void 0 : _10.value,
-                viewCount: (_12 = (_11 = result.downloads) === null || _11 === void 0 ? void 0 : _11.value) !== null && _12 !== void 0 ? _12 : 0,
-                weeklyViewCount: (_13 = result.week) === null || _13 === void 0 ? void 0 : _13.value,
-                loginRequired,
-                contentWarning,
-            });
-        });
-        datasource[pageNumber] = tiles;
-        this.dataSource = datasource;
-        const visiblePages = this.currentVisiblePageNumbers;
-        const needsReload = visiblePages.includes(pageNumber);
-        if (needsReload) {
-            (_a = this.infiniteScroller) === null || _a === void 0 ? void 0 : _a.refreshAllVisibleCells();
-        }
-    }
-    getMediatype(result) {
-        var _a, _b, _c;
-        /**
-         * hit_type == 'favorited_search' is basically a new hit_type
-         * - we are getting from PPS.
-         * - which gives response for fav- collection
-         * - having favorited items like account/collection/item etc..
-         * - as user can also favorite a search result (a search page)
-         * - so we need to have response (having fav- items and fav- search results)
-         *
-         * if backend hit_type == 'favorited_search'
-         * - let's assume a "search" as new mediatype
-         */
-        if (((_a = result === null || result === void 0 ? void 0 : result.rawMetadata) === null || _a === void 0 ? void 0 : _a.hit_type) === 'favorited_search') {
-            return 'search';
-        }
-        return (_c = (_b = result.mediatype) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : 'data';
-    }
-    /**
-     * Returns the input string, but removing one set of quotes from all instances of
-     * ""clauses wrapped in two sets of quotes"". This assumes the quotes are already
-     * URL-encoded.
-     *
-     * This should be a temporary measure to address the fact that the __href__ field
-     * sometimes acquires extra quotation marks during query rewriting. Once there is a
-     * full Lucene parser in place that handles quoted queries correctly, this can likely
-     * be removed.
-     */
-    collapseRepeatedQuotes(str) {
-        return str === null || str === void 0 ? void 0 : str.replace(/%22%22(?!%22%22)(.+?)%22%22/g, '%22$1%22');
-    }
-    /** 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 (!this.canPerformSearch)
-            return [];
-        const filterAggregationKey = prefixFilterAggregationKeys[filterType];
-        const sortParams = this.sortParam ? [this.sortParam] : [];
-        const params = {
-            ...this.collectionParams,
-            query: trimmedQuery || '',
-            rows: 0,
-            filters: this.filterMap,
-            // Only fetch the firstTitle or firstCreator aggregation
-            aggregations: { simpleParams: [filterAggregationKey] },
-            // Fetch all 26 letter buckets
-            aggregationsSize: 26,
-        };
-        params.uid = await this.requestUID({ ...params, sort: sortParams }, 'aggregations');
-        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 : []);
-    }
-    /** 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) => {
-            acc[bucket.key.toUpperCase()] = bucket.doc_count;
-            return acc;
-        }, {});
+        (_a = this.infiniteScroller) === null || _a === void 0 ? void 0 : _a.refreshAllVisibleCells();
     }
     /**
      * Fetches and caches the prefix filter counts for the current sort type,
@@ -1841,7 +1238,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         if (['title', 'creator'].includes(this.selectedSort)) {
             const filterType = this.selectedSort;
             if (!this.prefixFilterCountMap[filterType]) {
-                this.updatePrefixFilterCounts(filterType);
+                this.dataSource.updatePrefixFilterCounts(filterType);
             }
         }
     }
@@ -1895,7 +1292,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         .model=${model}
         .tileDisplayMode=${this.displayMode}
         .resizeObserver=${this.resizeObserver}
-        .collectionNameCache=${this.collectionNameCache}
+        .collectionTitles=${this.dataSource.collectionTitles}
         .sortParam=${this.sortParam}
         .defaultSortParam=${this.defaultSortParam}
         .creatorFilter=${this.selectedCreatorFilter}
@@ -1915,7 +1312,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     scrollThresholdReached() {
         if (!this.endOfDataReached) {
             this.pagesToRender += 1;
-            this.fetchPage(this.pagesToRender);
+            this.dataSource.fetchPage(this.pagesToRender);
         }
     }
     static get styles() {
@@ -2086,8 +1483,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         }
 
         .facets-message {
-          text-align: center;
-          font-size: 1.2rem;
+          font-size: 1.4rem;
         }
 
         .desktop #left-column-scroll-sentinel {
@@ -2321,9 +1717,6 @@ __decorate([
 __decorate([
     property({ type: String })
 ], CollectionBrowser.prototype, "displayMode", void 0);
-__decorate([
-    property({ type: Object })
-], CollectionBrowser.prototype, "sortParam", void 0);
 __decorate([
     property({ type: Object })
 ], CollectionBrowser.prototype, "defaultSortParam", void 0);
@@ -2342,9 +1735,6 @@ __decorate([
 __decorate([
     property({ type: Number })
 ], CollectionBrowser.prototype, "pageSize", void 0);
-__decorate([
-    property({ type: Object })
-], CollectionBrowser.prototype, "resizeObserver", void 0);
 __decorate([
     property({ type: Number })
 ], CollectionBrowser.prototype, "currentPage", void 0);
@@ -2384,9 +1774,6 @@ __decorate([
 __decorate([
     property({ type: String, reflect: true })
 ], CollectionBrowser.prototype, "searchContext", void 0);
-__decorate([
-    property({ type: Object })
-], CollectionBrowser.prototype, "collectionNameCache", void 0);
 __decorate([
     property({ type: String })
 ], CollectionBrowser.prototype, "pageContext", void 0);
@@ -2399,6 +1786,9 @@ __decorate([
 __decorate([
     property({ type: Boolean })
 ], CollectionBrowser.prototype, "loggedIn", void 0);
+__decorate([
+    property({ type: Object })
+], CollectionBrowser.prototype, "resizeObserver", void 0);
 __decorate([
     property({ type: Object })
 ], CollectionBrowser.prototype, "modalManager", void 0);
@@ -2414,6 +1804,12 @@ __decorate([
 __decorate([
     property({ type: Boolean })
 ], CollectionBrowser.prototype, "isLoansTab", void 0);
+__decorate([
+    property({ type: String })
+], CollectionBrowser.prototype, "queryErrorMessage", void 0);
+__decorate([
+    property({ type: Object })
+], CollectionBrowser.prototype, "dataSource", void 0);
 __decorate([
     state()
 ], CollectionBrowser.prototype, "pagesToRender", void 0);
@@ -2423,21 +1819,9 @@ __decorate([
 __decorate([
     state()
 ], CollectionBrowser.prototype, "facetsLoading", void 0);
-__decorate([
-    state()
-], CollectionBrowser.prototype, "fullYearAggregationLoading", void 0);
-__decorate([
-    state()
-], CollectionBrowser.prototype, "aggregations", void 0);
-__decorate([
-    state()
-], CollectionBrowser.prototype, "fullYearsHistogramAggregation", void 0);
 __decorate([
     state()
 ], CollectionBrowser.prototype, "totalResults", void 0);
-__decorate([
-    state()
-], CollectionBrowser.prototype, "queryErrorMessage", void 0);
 __decorate([
     state()
 ], CollectionBrowser.prototype, "mobileView", void 0);