@internetarchive/collection-browser 0.0.1-alpha.2 → 0.0.1-alpha.22

package/dist/src/collection-browser.js

@@ -2,21 +2,34 @@ import { __decorate } from "tslib";
 /* eslint-disable import/no-duplicates */
 import { html, css, LitElement, nothing, } from 'lit';
 import { customElement, property, query, state } from 'lit/decorators.js';
+import { ifDefined } from 'lit/directives/if-defined.js';
 import { SearchParams, } from '@internetarchive/search-service';
-import { AggregateSearchParams, } from '@internetarchive/search-service/dist/src/search-params';
+import { AggregateSearchParams, SortParam, } from '@internetarchive/search-service';
 import '@internetarchive/infinite-scroller';
-import '@internetarchive/histogram-date-range';
 import './tiles/tile-dispatcher';
 import './tiles/loading-tile';
 import './sort-filter-bar/sort-filter-bar';
 import './collection-facets';
 import './circular-activity-indicator';
+import './sort-filter-bar/sort-filter-bar';
+import { SortField, SortFieldToMetadataField, defaultSelectedFacets, } from './models';
+import { RestorationStateHandler, } from './restoration-state-handler';
+import chevronIcon from './assets/img/icons/chevron';
 let CollectionBrowser = class CollectionBrowser extends LitElement {
     constructor() {
         super(...arguments);
         this.showDeleteButtons = false;
-        this.displayMode = 'grid';
+        this.sortParam = null;
+        this.selectedSort = SortField.relevance;
+        this.selectedTitleFilter = null;
+        this.selectedCreatorFilter = null;
+        this.sortDirection = null;
         this.pageSize = 50;
+        this.pageContext = 'search';
+        this.restorationStateHandler = new RestorationStateHandler({
+            context: this.pageContext,
+        });
+        this.mobileBreakpoint = 530;
         /**
          * The page that the consumer wants to load.
          */
@@ -29,9 +42,10 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
          */
         this.pagesToRender = this.initialPageNumber;
         this.searchResultsLoading = false;
-        this.selectedFacets = {};
         this.facetsLoading = false;
         this.fullYearAggregationLoading = false;
+        this.mobileView = false;
+        this.mobileFacetsVisible = false;
         /**
          * When we're animated scrolling to the page, we don't want to fetch
          * all of the pages as it scrolls so this lets us know if we're scrolling
@@ -74,6 +88,10 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         }
         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
@@ -87,9 +105,9 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         return Object.keys(this.dataSource).reduce((acc, page) => acc + this.dataSource[page].length, 0);
     }
     /**
+     * Go to the given page of results
      *
      * @param pageNumber
-     * @param scroll
      */
     goToPage(pageNumber) {
         this.initialPageNumber = pageNumber;
@@ -97,36 +115,72 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         this.scrollToPage(pageNumber);
     }
     render() {
-        var _a, _b;
         return html `
-      <h1>Collection Browser</h1>
-
-      <div id="query">
-        <ul>
-          <li>Base Query: ${this.baseQuery}</li>
-          <li>Facet Query: ${this.facetQuery}</li>
-          <li>Additional Query: ${this.additionalQueryClause}</li>
-          <li>Date Range Query: ${this.dateRangeQueryClause}</li>
-          <li>Sort: ${(_a = this.sortParam) === null || _a === void 0 ? void 0 : _a.field} ${(_b = this.sortParam) === null || _b === void 0 ? void 0 : _b.direction}</li>
-          <li>Full Query: ${this.fullQuery}</li>
-        </ul>
-      </div>
-
-      <div id="content-container">
-        <div id="left-column">
-          <div id="histogram-container">${this.histogramTemplate}</div>
-          <div id="facets-container">
-            ${this.facetsLoading ? this.loadingTemplate : nothing}
-            <collection-facets
-              @facetsChanged=${this.facetsChanged}
-              .aggregations=${this.aggregations}
-            ></collection-facets>
+      <div id="content-container" class=${this.mobileView ? 'mobile' : ''}>
+        <div id="left-column" class="column">
+          <div id="mobile-header-container">
+            ${this.mobileView
+            ? html `
+                  <div id="mobile-filter-collapse">
+                    <h1
+                      @click=${() => {
+                this.mobileFacetsVisible = !this.mobileFacetsVisible;
+            }}
+                      @keyup=${() => {
+                this.mobileFacetsVisible = !this.mobileFacetsVisible;
+            }}
+                    >
+                      <span
+                        class="collapser ${this.mobileFacetsVisible
+                ? 'open'
+                : ''}"
+                      >
+                        ${chevronIcon}
+                      </span>
+                      Filters
+                    </h1>
+                  </div>
+                `
+            : nothing}
+            <div id="results-total">
+              <span id="big-results-count"
+                >${this.totalResults
+            ? this.totalResults.toLocaleString()
+            : '-'}</span
+              >
+              <span id="big-results-label">Results</span>
+            </div>
+          </div>
+          <div
+            id="facets-container"
+            class=${!this.mobileView || this.mobileFacetsVisible
+            ? 'expanded'
+            : ''}
+          >
+            ${this.facetsTemplate}
           </div>
         </div>
-        <div id="right-column">
+        <div id="right-column" class="column">
           ${this.searchResultsLoading ? this.loadingTemplate : nothing}
+          <sort-filter-bar
+            .selectedSort=${this.selectedSort}
+            .sortDirection=${this.sortDirection}
+            .displayMode=${this.displayMode}
+            .selectedTitleFilter=${this.selectedTitleFilter}
+            .selectedCreatorFilter=${this.selectedCreatorFilter}
+            .resizeObserver=${this.resizeObserver}
+            @sortChanged=${this.userChangedSort}
+            @displayModeChanged=${this.displayModeChanged}
+            @titleLetterChanged=${this.titleLetterSelected}
+            @creatorLetterChanged=${this.creatorLetterSelected}
+          ></sort-filter-bar>
+
+          ${this.displayMode === `list-compact`
+            ? this.listHeaderTemplate
+            : nothing}
+
           <infinite-scroller
-            class="${this.displayMode}"
+            class="${ifDefined(this.displayMode)}"
             .cellProvider=${this}
             .placeholderCellTemplate=${this.placeholderCellTemplate}
             @scrollThresholdReached=${this.scrollThresholdReached}
@@ -137,6 +191,66 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
       </div>
     `;
     }
+    userChangedSort(e) {
+        var _a;
+        const { selectedSort, sortDirection } = e.detail;
+        this.selectedSort = selectedSort;
+        this.sortDirection = sortDirection;
+        if (((_a = this.currentPage) !== null && _a !== void 0 ? _a : 1) > 1) {
+            this.goToPage(1);
+        }
+        this.currentPage = 1;
+    }
+    selectedSortChanged() {
+        if (this.selectedSort === 'relevance' || this.sortDirection === null) {
+            this.sortParam = null;
+            return;
+        }
+        const sortField = SortFieldToMetadataField[this.selectedSort];
+        if (!sortField)
+            return;
+        this.sortParam = new SortParam(sortField, this.sortDirection);
+    }
+    displayModeChanged(e) {
+        this.displayMode = e.detail.displayMode;
+    }
+    selectedTitleLetterChanged() {
+        this.titleQuery = this.selectedTitleFilter
+            ? `firstTitle:${this.selectedTitleFilter}`
+            : undefined;
+    }
+    selectedCreatorLetterChanged() {
+        this.creatorQuery = this.selectedCreatorFilter
+            ? `firstCreator:${this.selectedCreatorFilter}`
+            : undefined;
+    }
+    titleLetterSelected(e) {
+        this.selectedTitleFilter = e.detail.selectedLetter;
+    }
+    creatorLetterSelected(e) {
+        this.selectedCreatorFilter = e.detail.selectedLetter;
+    }
+    get facetDataLoading() {
+        return this.facetsLoading || this.fullYearAggregationLoading;
+    }
+    get facetsTemplate() {
+        return html `
+      ${this.facetsLoading ? this.loadingTemplate : nothing}
+      <collection-facets
+        @facetsChanged=${this.facetsChanged}
+        @histogramDateRangeUpdated=${this.histogramDateRangeUpdated}
+        .aggregations=${this.aggregations}
+        .fullYearsHistogramAggregation=${this.fullYearsHistogramAggregation}
+        .minSelectedDate=${this.minSelectedDate}
+        .maxSelectedDate=${this.maxSelectedDate}
+        .selectedFacets=${this.selectedFacets}
+        .collectionNameCache=${this.collectionNameCache}
+        ?collapsableFacets=${this.mobileView}
+        ?facetsLoading=${this.facetDataLoading}
+        ?fullYearAggregationLoading=${this.fullYearAggregationLoading}
+      ></collection-facets>
+    `;
+    }
     get loadingTemplate() {
         return html `
       <div class="loading-cover">
@@ -144,53 +258,102 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
       </div>
     `;
     }
-    get currentYearsHistogramAggregation() {
-        var _a;
-        return (_a = this.aggregations) === null || _a === void 0 ? void 0 : _a.year_histogram;
-    }
-    get histogramDataLoading() {
-        return this.facetsLoading || this.fullYearAggregationLoading;
+    get listHeaderTemplate() {
+        return html `
+      <div id="list-header">
+        <tile-dispatcher
+          .displayMode=${'list-header'}
+          .resizeObserver=${this.resizeObserver}
+          .sortParam=${this.sortParam}
+        >
+        </tile-dispatcher>
+      </div>
+    `;
     }
-    get histogramTemplate() {
-        const { currentYearsHistogramAggregation, fullYearsHistogramAggregation } = this;
+    get queryDebuggingTemplate() {
+        var _a, _b;
         return html `
-      <histogram-date-range
-        .minDate=${fullYearsHistogramAggregation === null || fullYearsHistogramAggregation === void 0 ? void 0 : fullYearsHistogramAggregation.first_bucket_key}
-        .maxDate=${fullYearsHistogramAggregation === null || fullYearsHistogramAggregation === void 0 ? void 0 : fullYearsHistogramAggregation.last_bucket_key}
-        .minSelectedDate=${currentYearsHistogramAggregation === null || currentYearsHistogramAggregation === void 0 ? void 0 : currentYearsHistogramAggregation.first_bucket_key}
-        .maxSelectedDate=${currentYearsHistogramAggregation === null || currentYearsHistogramAggregation === void 0 ? void 0 : currentYearsHistogramAggregation.last_bucket_key}
-        .updateDelay=${100}
-        missingDataMessage="..."
-        ?loading=${this.histogramDataLoading}
-        .width=${150}
-        .bins=${fullYearsHistogramAggregation === null || fullYearsHistogramAggregation === void 0 ? void 0 : fullYearsHistogramAggregation.buckets}
-        @histogramDateRangeUpdated=${this.histogramDateRangeUpdated}
-      ></histogram-date-range>
+      <div>
+        <ul>
+          <li>Base Query: ${this.baseQuery}</li>
+          <li>Facet Query: ${this.facetQuery}</li>
+          <li>Sort Filter Query: ${this.sortFilterQueries}</li>
+          <li>Date Range Query: ${this.dateRangeQueryClause}</li>
+          <li>Sort: ${(_a = this.sortParam) === null || _a === void 0 ? void 0 : _a.field} ${(_b = this.sortParam) === null || _b === void 0 ? void 0 : _b.direction}</li>
+          <li>Full Query: ${this.fullQuery}</li>
+        </ul>
+      </div>
     `;
     }
     histogramDateRangeUpdated(e) {
         const { minDate, maxDate } = e.detail;
         this.dateRangeQueryClause = `year:[${minDate} TO ${maxDate}]`;
     }
+    firstUpdated() {
+        this.restoreState();
+    }
     updated(changed) {
         if (changed.has('displayMode') ||
             changed.has('showDeleteButtons') ||
             changed.has('baseNavigationUrl')) {
             this.infiniteScroller.reload();
         }
+        if (changed.has('currentPage') || changed.has('displayMode')) {
+            this.persistState();
+        }
         if (changed.has('baseQuery') ||
-            changed.has('additionalQueryClause') ||
+            changed.has('titleQuery') ||
+            changed.has('creatorQuery') ||
             changed.has('dateRangeQueryClause') ||
             changed.has('sortParam') ||
             changed.has('selectedFacets') ||
             changed.has('searchService')) {
             this.handleQueryChange();
         }
+        if (changed.has('selectedSort') || changed.has('sortDirection')) {
+            this.selectedSortChanged();
+        }
+        if (changed.has('selectedTitleFilter')) {
+            this.selectedTitleLetterChanged();
+        }
+        if (changed.has('selectedCreatorFilter')) {
+            this.selectedCreatorLetterChanged();
+        }
         if (changed.has('pagesToRender')) {
             if (!this.endOfDataReached) {
                 this.infiniteScroller.itemCount = this.estimatedTileCount;
             }
         }
+        if (changed.has('resizeObserver')) {
+            const oldObserver = changed.get('resizeObserver');
+            if (oldObserver)
+                this.disconnectResizeObserver(oldObserver);
+            this.setupResizeObserver();
+        }
+    }
+    disconnectedCallback() {
+        if (this.resizeObserver) {
+            this.disconnectResizeObserver(this.resizeObserver);
+        }
+    }
+    handleResize(entry) {
+        if (entry.target === this.contentContainer) {
+            this.mobileView = entry.contentRect.width < 600;
+        }
+    }
+    disconnectResizeObserver(resizeObserver) {
+        resizeObserver.removeObserver({
+            target: this.contentContainer,
+            handler: this,
+        });
+    }
+    setupResizeObserver() {
+        if (!this.resizeObserver)
+            return;
+        this.resizeObserver.addObserver({
+            target: this.contentContainer,
+            handler: this,
+        });
     }
     /**
      * When the visible cells change from the infinite scroller, we want to emit
@@ -207,6 +370,9 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             return;
         const lastVisibleCellIndex = visibleCellIndices[visibleCellIndices.length - 1];
         const lastVisibleCellPage = Math.floor(lastVisibleCellIndex / this.pageSize) + 1;
+        if (this.currentPage !== lastVisibleCellPage) {
+            this.currentPage = lastVisibleCellPage;
+        }
         const event = new CustomEvent('visiblePageChanged', {
             detail: {
                 pageNumber: lastVisibleCellPage,
@@ -216,7 +382,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     }
     async handleQueryChange() {
         // only reset if the query has actually changed
-        if (this.pageFetchQueryKey === this.previousQueryKey)
+        if (!this.searchService || this.pageFetchQueryKey === this.previousQueryKey)
             return;
         this.previousQueryKey = this.pageFetchQueryKey;
         this.dataSource = {};
@@ -227,12 +393,54 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             this.scrollToPage(this.initialPageNumber);
         }
         this.initialQueryChangeHappened = true;
+        this.persistState();
         await Promise.all([
             this.doInitialPageFetch(),
             this.fetchFacets(),
             this.fetchFullYearHistogram(),
         ]);
     }
+    restoreState() {
+        var _a, _b, _c, _d, _e, _f;
+        const restorationState = this.restorationStateHandler.getRestorationState();
+        this.displayMode = restorationState.displayMode;
+        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.selectedFacets = restorationState.selectedFacets;
+        this.baseQuery = restorationState.baseQuery;
+        this.titleQuery = restorationState.titleQuery;
+        this.creatorQuery = restorationState.creatorQuery;
+        this.dateRangeQueryClause = restorationState.dateRangeQueryClause;
+        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) {
+            this.goToPage(this.currentPage);
+        }
+    }
+    persistState() {
+        var _a, _b, _c, _d, _e;
+        const restorationState = {
+            displayMode: this.displayMode,
+            sortParam: (_a = this.sortParam) !== null && _a !== void 0 ? _a : undefined,
+            selectedSort: this.selectedSort,
+            sortDirection: (_b = this.sortDirection) !== null && _b !== void 0 ? _b : undefined,
+            selectedFacets: (_c = this.selectedFacets) !== null && _c !== void 0 ? _c : defaultSelectedFacets,
+            baseQuery: this.baseQuery,
+            currentPage: this.currentPage,
+            dateRangeQueryClause: this.dateRangeQueryClause,
+            titleQuery: this.titleQuery,
+            creatorQuery: this.creatorQuery,
+            minSelectedDate: this.minSelectedDate,
+            maxSelectedDate: this.maxSelectedDate,
+            selectedTitleFilter: (_d = this.selectedTitleFilter) !== null && _d !== void 0 ? _d : undefined,
+            selectedCreatorFilter: (_e = this.selectedCreatorFilter) !== null && _e !== void 0 ? _e : undefined,
+        };
+        this.restorationStateHandler.persistState(restorationState);
+    }
     async doInitialPageFetch() {
         this.searchResultsLoading = true;
         await this.fetchPage(this.initialPageNumber);
@@ -250,24 +458,35 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         if (!this.baseQuery)
             return undefined;
         let fullQuery = this.baseQuery;
-        const { facetQuery, additionalQueryClause } = this;
+        const { facetQuery, sortFilterQueries } = this;
         if (facetQuery) {
             fullQuery += ` AND ${facetQuery}`;
         }
-        if (additionalQueryClause) {
-            fullQuery += ` AND ${additionalQueryClause}`;
+        if (sortFilterQueries) {
+            fullQuery += ` AND ${sortFilterQueries}`;
         }
         return fullQuery;
     }
+    /**
+     * Generates a query string for the given facets
+     *
+     * Example: `mediatype:("collection" OR "audio" OR -"etree") AND year:("2000" OR "2001")`
+     */
     get facetQuery() {
+        if (!this.selectedFacets)
+            return undefined;
         const facetQuery = [];
-        for (const [facetName, selectedValues] of Object.entries(this.selectedFacets)) {
-            const values = [];
-            for (const value of selectedValues) {
-                values.push(`${facetName}:"${value}"`);
+        for (const [facetName, facetValues] of Object.entries(this.selectedFacets)) {
+            const facetEntries = Object.entries(facetValues);
+            // eslint-disable-next-line no-continue
+            if (facetEntries.length === 0)
+                continue;
+            const facetValuesArray = [];
+            for (const [key, facetState] of facetEntries) {
+                facetValuesArray.push(`${facetState === 'hidden' ? '-' : ''}"${key}"`);
             }
-            const valueQuery = values.join(' OR ');
-            facetQuery.push(`(${valueQuery})`);
+            const valueQuery = facetValuesArray.join(` OR `);
+            facetQuery.push(`${facetName}:(${valueQuery})`);
         }
         return facetQuery.length > 0 ? `(${facetQuery.join(' AND ')})` : undefined;
     }
@@ -403,23 +622,25 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         const params = new SearchParams({
             query: this.fullQuery,
             fields: [
+                'addeddate',
+                'avg_rating',
+                'collections_raw',
+                'creator',
+                'date',
+                'description',
+                'downloads',
                 'identifier',
-                'title',
+                'issue',
+                'item_count',
                 'mediatype',
-                'downloads',
-                'avg_rating',
                 'num_favorites',
                 'num_reviews',
-                'item_count',
-                'description',
-                'date',
-                'addeddate',
                 'publicdate',
                 'reviewdate',
-                'creator',
-                'subject',
                 'source',
-                'collection',
+                'subject',
+                'title',
+                'volume',
             ],
             page: pageNumber,
             rows: this.pageSize,
@@ -429,6 +650,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         const success = results === null || results === void 0 ? void 0 : results.success;
         if (!success)
             return;
+        this.totalResults = success.response.numFound;
         // 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
@@ -439,6 +661,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             return;
         const { docs } = success.response;
         if (docs && docs.length > 0) {
+            this.preloadCollectionNames(docs);
             this.updateDataSource(pageNumber, docs);
         }
         if (docs.length < this.pageSize) {
@@ -449,6 +672,12 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         (_d = this.pageFetchesInProgress[pageFetchQueryKey]) === null || _d === void 0 ? void 0 : _d.delete(pageNumber);
         this.searchResultsLoading = false;
     }
+    preloadCollectionNames(docs) {
+        var _a;
+        const collectionIds = docs.map(doc => { var _a; return (_a = doc.collections_raw) === 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);
+    }
     /**
      * This is useful for determining whether we need to reload the scroller.
      *
@@ -477,27 +706,30 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         const datasource = { ...this.dataSource };
         const tiles = [];
         docs === null || docs === void 0 ? void 0 : docs.forEach(doc => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+            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;
             if (!doc.identifier)
                 return;
             tiles.push({
-                identifier: doc.identifier,
-                title: this.etreeTitle((_a = doc.title) === null || _a === void 0 ? void 0 : _a.value, (_b = doc.mediatype) === null || _b === void 0 ? void 0 : _b.value),
-                mediatype: (_d = (_c = doc.mediatype) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : 'data',
-                viewCount: (_f = (_e = doc.downloads) === null || _e === void 0 ? void 0 : _e.value) !== null && _f !== void 0 ? _f : 0,
-                favCount: (_h = (_g = doc.num_favorites) === null || _g === void 0 ? void 0 : _g.value) !== null && _h !== void 0 ? _h : 0,
-                commentCount: (_k = (_j = doc.num_reviews) === null || _j === void 0 ? void 0 : _j.value) !== null && _k !== void 0 ? _k : 0,
-                itemCount: (_m = (_l = doc.item_count) === null || _l === void 0 ? void 0 : _l.value) !== null && _m !== void 0 ? _m : 0,
+                averageRating: (_a = doc.avg_rating) === null || _a === void 0 ? void 0 : _a.value,
+                collections: (_c = (_b = doc.collections_raw) === null || _b === void 0 ? void 0 : _b.values) !== null && _c !== void 0 ? _c : [],
+                commentCount: (_e = (_d = doc.num_reviews) === null || _d === void 0 ? void 0 : _d.value) !== null && _e !== void 0 ? _e : 0,
+                creator: (_f = doc.creator) === null || _f === void 0 ? void 0 : _f.value,
+                creators: (_h = (_g = doc.creator) === null || _g === void 0 ? void 0 : _g.values) !== null && _h !== void 0 ? _h : [],
+                dateAdded: (_j = doc.addeddate) === null || _j === void 0 ? void 0 : _j.value,
+                dateArchived: (_k = doc.publicdate) === null || _k === void 0 ? void 0 : _k.value,
+                datePublished: (_l = doc.date) === null || _l === void 0 ? void 0 : _l.value,
+                dateReviewed: (_m = doc.reviewdate) === null || _m === void 0 ? void 0 : _m.value,
                 description: (_o = doc.description) === null || _o === void 0 ? void 0 : _o.value,
-                dateAdded: (_p = doc.addeddate) === null || _p === void 0 ? void 0 : _p.value,
-                dateArchived: (_q = doc.publicdate) === null || _q === void 0 ? void 0 : _q.value,
-                dateReviewed: (_r = doc.reviewdate) === null || _r === void 0 ? void 0 : _r.value,
-                datePublished: (_s = doc.date) === null || _s === void 0 ? void 0 : _s.value,
-                creator: (_t = doc.creator) === null || _t === void 0 ? void 0 : _t.value,
-                averageRating: (_u = doc.avg_rating) === null || _u === void 0 ? void 0 : _u.value,
-                subject: (_v = doc.subject) === null || _v === void 0 ? void 0 : _v.value,
+                favCount: (_q = (_p = doc.num_favorites) === null || _p === void 0 ? void 0 : _p.value) !== null && _q !== void 0 ? _q : 0,
+                identifier: doc.identifier,
+                issue: (_r = doc.issue) === null || _r === void 0 ? void 0 : _r.value,
+                itemCount: (_t = (_s = doc.item_count) === null || _s === void 0 ? void 0 : _s.value) !== null && _t !== void 0 ? _t : 0,
+                mediatype: (_v = (_u = doc.mediatype) === null || _u === void 0 ? void 0 : _u.value) !== null && _v !== void 0 ? _v : 'data',
                 source: (_w = doc.source) === null || _w === void 0 ? void 0 : _w.value,
-                collection: (_y = (_x = doc.collection) === null || _x === void 0 ? void 0 : _x.values) !== null && _y !== void 0 ? _y : [],
+                subjects: (_y = (_x = doc.subject) === null || _x === void 0 ? void 0 : _x.values) !== null && _y !== void 0 ? _y : [],
+                title: this.etreeTitle((_z = doc.title) === null || _z === void 0 ? void 0 : _z.value, (_0 = doc.mediatype) === null || _0 === void 0 ? void 0 : _0.value, (_1 = doc.collection) === null || _1 === void 0 ? void 0 : _1.values),
+                volume: (_2 = doc.volume) === null || _2 === void 0 ? void 0 : _2.value,
+                viewCount: (_4 = (_3 = doc.downloads) === null || _3 === void 0 ? void 0 : _3.value) !== null && _4 !== void 0 ? _4 : 0,
             });
         });
         datasource[pageNumber] = tiles;
@@ -515,9 +747,8 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
      * Todo: Check collection(s) for etree, need to get as array.
      * Current search-service only returns first collection as string.
      */
-    etreeTitle(title, mediatype) {
-        if (mediatype === 'etree') {
-            // || collections.includes('etree')) {
+    etreeTitle(title, mediatype, collections) {
+        if (mediatype === 'etree' || (collections === null || collections === void 0 ? void 0 : collections.includes('etree'))) {
             const regex = /^(.*) Live at (.*) on (\d\d\d\d-\d\d-\d\d)$/;
             const newTitle = title === null || title === void 0 ? void 0 : title.replace(regex, '$3: $2');
             if (newTitle) {
@@ -536,6 +767,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
       .displayMode=${this.displayMode}
       .resizeObserver=${this.resizeObserver}
       .sortParam=${this.sortParam}
+      .collectionNameCache=${this.collectionNameCache}
       ?showDeleteButton=${this.showDeleteButtons}
     ></tile-dispatcher>`;
     }
@@ -557,17 +789,99 @@ CollectionBrowser.styles = css `
       display: flex;
     }
 
+    .collapser {
+      display: inline-block;
+    }
+
+    .collapser svg {
+      width: 10px;
+      height: 10px;
+      transition: transform 0.2s ease-out;
+    }
+
+    .collapser.open svg {
+      transform: rotate(90deg);
+    }
+
+    #mobile-filter-collapse h1 {
+      cursor: pointer;
+    }
+
+    #content-container.mobile {
+      display: block;
+    }
+
+    .column {
+      padding-top: 2rem;
+    }
+
     #right-column {
       flex: 1;
       position: relative;
+      border-left: 1px solid rgb(232, 232, 232);
+      padding-left: 1rem;
+    }
+
+    .mobile #right-column {
+      border-left: none;
+      padding: 0;
     }
 
     #left-column {
-      width: 15rem;
+      width: 18rem;
+      padding-right: 12px;
+      padding-right: 1rem;
+    }
+
+    .mobile #left-column {
+      width: 100%;
+      padding: 0;
+    }
+
+    #mobile-header-container {
+      display: flex;
+      justify-content: space-between;
     }
 
     #facets-container {
       position: relative;
+      max-height: 0;
+      transition: max-height 0.2s ease-in-out;
+      z-index: 1;
+    }
+
+    .mobile #facets-container {
+      overflow: hidden;
+    }
+
+    #facets-container.expanded {
+      max-height: 2000px;
+    }
+
+    #results-total {
+      display: flex;
+      align-items: center;
+      margin-bottom: 5rem;
+    }
+
+    .mobile #results-total {
+      margin-bottom: 0;
+    }
+
+    #big-results-count {
+      font-size: 2.4rem;
+      font-weight: 500;
+      margin-right: 5px;
+    }
+
+    #big-results-label {
+      font-size: 1rem;
+      font-weight: 200;
+      text-transform: uppercase;
+    }
+
+    #list-header {
+      max-height: 3rem;
     }
 
     .loading-cover {
@@ -576,7 +890,6 @@ CollectionBrowser.styles = css `
       left: 0;
       width: 100%;
       height: 100%;
-      background-color: rgba(255, 255, 255, 0.75);
       display: flex;
       justify-content: center;
       z-index: 1;
@@ -588,6 +901,11 @@ CollectionBrowser.styles = css `
       height: 30px;
     }
 
+    sort-filter-bar {
+      display: block;
+      margin-bottom: 4rem;
+    }
+
     infinite-scroller {
       display: block;
       --infiniteScrollerRowGap: var(--collectionBrowserRowGap, 1.7rem);
@@ -599,14 +917,9 @@ CollectionBrowser.styles = css `
         --collectionBrowserCellMinWidth,
         100%
       );
-      --infiniteScrollerCellMinHeight: var(
-        --collectionBrowserCellMinHeight,
-        2rem
-      );
-      --infiniteScrollerCellMaxHeight: var(
-        --collectionBrowserCellMaxHeight,
-        2rem
-      );
+      --infiniteScrollerCellMinHeight: 34px; /* override infinite scroller component */
+      --infiniteScrollerCellMaxHeight: 56px;
+      --infiniteScrollerRowGap: 0px;
     }
 
     infinite-scroller.list-detail {
@@ -618,6 +931,8 @@ CollectionBrowser.styles = css `
         --collectionBrowserCellMinHeight,
         5rem
       );
+      /* 30px, but compensating for a -5px margin */
+      --infiniteScrollerRowGap: 35px;
     }
 
     infinite-scroller.grid {
@@ -656,7 +971,16 @@ __decorate([
 ], CollectionBrowser.prototype, "sortParam", void 0);
 __decorate([
     property({ type: String })
-], CollectionBrowser.prototype, "additionalQueryClause", void 0);
+], CollectionBrowser.prototype, "selectedSort", void 0);
+__decorate([
+    property({ type: String })
+], CollectionBrowser.prototype, "selectedTitleFilter", void 0);
+__decorate([
+    property({ type: String })
+], CollectionBrowser.prototype, "selectedCreatorFilter", void 0);
+__decorate([
+    property({ type: String })
+], CollectionBrowser.prototype, "sortDirection", void 0);
 __decorate([
     property({ type: String })
 ], CollectionBrowser.prototype, "dateRangeQueryClause", void 0);
@@ -667,17 +991,41 @@ __decorate([
     property({ type: Object })
 ], CollectionBrowser.prototype, "resizeObserver", void 0);
 __decorate([
-    query('collection-facets')
-], CollectionBrowser.prototype, "collectionFacets", void 0);
+    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);
+__decorate([
+    property({ type: String })
+], CollectionBrowser.prototype, "minSelectedDate", void 0);
+__decorate([
+    property({ type: String })
+], CollectionBrowser.prototype, "maxSelectedDate", void 0);
+__decorate([
+    property({ type: Object })
+], CollectionBrowser.prototype, "selectedFacets", void 0);
+__decorate([
+    property({ type: Object })
+], CollectionBrowser.prototype, "collectionNameCache", void 0);
+__decorate([
+    property({ type: String })
+], CollectionBrowser.prototype, "pageContext", void 0);
+__decorate([
+    property({ type: Object })
+], CollectionBrowser.prototype, "restorationStateHandler", void 0);
+__decorate([
+    property({ type: Number })
+], CollectionBrowser.prototype, "mobileBreakpoint", void 0);
 __decorate([
     state()
 ], CollectionBrowser.prototype, "pagesToRender", void 0);
 __decorate([
     state()
 ], CollectionBrowser.prototype, "searchResultsLoading", void 0);
-__decorate([
-    state()
-], CollectionBrowser.prototype, "selectedFacets", void 0);
 __decorate([
     state()
 ], CollectionBrowser.prototype, "facetsLoading", void 0);
@@ -690,6 +1038,18 @@ __decorate([
 __decorate([
     state()
 ], CollectionBrowser.prototype, "fullYearsHistogramAggregation", void 0);
+__decorate([
+    state()
+], CollectionBrowser.prototype, "totalResults", void 0);
+__decorate([
+    state()
+], CollectionBrowser.prototype, "mobileView", void 0);
+__decorate([
+    state()
+], CollectionBrowser.prototype, "mobileFacetsVisible", void 0);
+__decorate([
+    query('#content-container')
+], CollectionBrowser.prototype, "contentContainer", void 0);
 __decorate([
     query('infinite-scroller')
 ], CollectionBrowser.prototype, "infiniteScroller", void 0);