@internetarchive/collection-browser 1.14.17-alpha.4 → 1.14.17-alpha.41

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export { CollectionBrowser } from './src/collection-browser';
-export { CollectionBrowserDataSource, CollectionBrowserDataSourceInterface, } from './src/data-source/collection-browser-data-source';
-export { CollectionBrowserQueryState } from './src/data-source/models';
+export { CollectionBrowserDataSource } from './src/data-source/collection-browser-data-source';
+export { CollectionBrowserDataSourceInterface } from './src/data-source/collection-browser-data-source-interface';
+export { CollectionBrowserQueryState } from './src/data-source/collection-browser-query-state';
 export { SortFilterBar } from './src/sort-filter-bar/sort-filter-bar';
 export { CollectionDisplayMode, SortField, TileModel } from './src/models';
 export { CollectionBrowserLoadingTile } from './src/tiles/collection-browser-loading-tile';

package/dist/index.js

@@ -1,6 +1,7 @@
 export { CollectionBrowser } from './src/collection-browser';
-export { CollectionBrowserDataSource, } from './src/data-source/collection-browser-data-source';
-export {} from './src/data-source/models';
+export { CollectionBrowserDataSource } from './src/data-source/collection-browser-data-source';
+export {} from './src/data-source/collection-browser-data-source-interface';
+export {} from './src/data-source/collection-browser-query-state';
 export { SortFilterBar } from './src/sort-filter-bar/sort-filter-bar';
 export { SortField, TileModel } from './src/models';
 export { CollectionBrowserLoadingTile } from './src/tiles/collection-browser-loading-tile';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EACL,2BAA2B,GAE5B,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAA+B,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAyB,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC","sourcesContent":["export { CollectionBrowser } from './src/collection-browser';\nexport {\n  CollectionBrowserDataSource,\n  CollectionBrowserDataSourceInterface,\n} from './src/data-source/collection-browser-data-source';\nexport { CollectionBrowserQueryState } from './src/data-source/models';\nexport { SortFilterBar } from './src/sort-filter-bar/sort-filter-bar';\nexport { CollectionDisplayMode, SortField, TileModel } from './src/models';\nexport { CollectionBrowserLoadingTile } from './src/tiles/collection-browser-loading-tile';\nexport { CollectionTile } from './src/tiles/grid/collection-tile';\nexport { AccountTile } from './src/tiles/grid/account-tile';\nexport { ItemTile } from './src/tiles/grid/item-tile';\nexport { TileList } from './src/tiles/list/tile-list';\nexport { TileListCompact } from './src/tiles/list/tile-list-compact';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,2BAA2B,EAAE,MAAM,kDAAkD,CAAC;AAC/F,OAAO,EAAwC,MAAM,4DAA4D,CAAC;AAClH,OAAO,EAA+B,MAAM,kDAAkD,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAyB,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,EAAE,4BAA4B,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC","sourcesContent":["export { CollectionBrowser } from './src/collection-browser';\nexport { CollectionBrowserDataSource } from './src/data-source/collection-browser-data-source';\nexport { CollectionBrowserDataSourceInterface } from './src/data-source/collection-browser-data-source-interface';\nexport { CollectionBrowserQueryState } from './src/data-source/collection-browser-query-state';\nexport { SortFilterBar } from './src/sort-filter-bar/sort-filter-bar';\nexport { CollectionDisplayMode, SortField, TileModel } from './src/models';\nexport { CollectionBrowserLoadingTile } from './src/tiles/collection-browser-loading-tile';\nexport { CollectionTile } from './src/tiles/grid/collection-tile';\nexport { AccountTile } from './src/tiles/grid/account-tile';\nexport { ItemTile } from './src/tiles/grid/item-tile';\nexport { TileList } from './src/tiles/list/tile-list';\nexport { TileListCompact } from './src/tiles/list/tile-list-compact';\n"]}

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

@@ -14,9 +14,9 @@ import './collection-facets';
 import './circular-activity-indicator';
 import { SelectedFacets, SortField, CollectionBrowserContext, TileModel, CollectionDisplayMode, FacetEventDetails } from './models';
 import { RestorationStateHandlerInterface } from './restoration-state-handler';
-import { CollectionBrowserDataSourceInterface } from './data-source/collection-browser-data-source';
-import type { CollectionBrowserSearchInterface } from './data-source/models';
+import type { CollectionBrowserQueryState, CollectionBrowserSearchInterface } from './data-source/collection-browser-query-state';
 import './empty-placeholder';
+import type { CollectionBrowserDataSourceInterface } from './data-source/collection-browser-data-source-interface';
 export declare class CollectionBrowser extends LitElement implements InfiniteScrollerCellProviderInterface, SharedResizeObserverResizeHandlerInterface, CollectionBrowserSearchInterface {
     baseNavigationUrl?: string;
     baseImageUrl: string;
@@ -42,6 +42,7 @@ export declare class CollectionBrowser extends LitElement implements InfiniteScr
     suppressResultCount: boolean;
     suppressURLQuery: boolean;
     suppressFacets: boolean;
+    suppressSortBar: boolean;
     clearResultsOnEmptyQuery: boolean;
     collectionPagePath: string;
     /** describes where this component is being used */
@@ -59,7 +60,6 @@ export declare class CollectionBrowser extends LitElement implements InfiniteScr
      */
     isManageView: boolean;
     isLoansTab: boolean;
-    queryErrorMessage?: string;
     /**
      * The results per page so we can paginate.
      *
@@ -109,6 +109,7 @@ export declare class CollectionBrowser extends LitElement implements InfiniteScr
     private leftColIntersectionObserver?;
     private facetsIntersectionObserver?;
     private placeholderCellTemplate;
+    constructor();
     private tileModelAtCellIndex;
     private get estimatedTileCount();
     /**
@@ -277,6 +278,7 @@ export declare class CollectionBrowser extends LitElement implements InfiniteScr
      * Emits an event indicating a change in whether the manage mode is shown.
      */
     private emitManageModeChangedEvent;
+    installDataSourceAndQueryState(dataSource: CollectionBrowserDataSourceInterface, queryState: CollectionBrowserQueryState): Promise<void>;
     firstUpdated(): void;
     updated(changed: PropertyValues): void;
     disconnectedCallback(): void;
@@ -304,7 +306,7 @@ export declare class CollectionBrowser extends LitElement implements InfiniteScr
     private updateFacetFadeOut;
     private emitBaseQueryChanged;
     private emitSearchTypeChanged;
-    private emitQueryStateChanged;
+    emitQueryStateChanged(): void;
     emitEmptyResults(): void;
     private disconnectResizeObserver;
     private setupResizeObserver;
@@ -319,15 +321,6 @@ export declare class CollectionBrowser extends LitElement implements InfiniteScr
     private initialQueryChangeHappened;
     private historyPopOccurred;
     private previousQueryKey?;
-    /**
-     * Internal property to store the `resolve` function for the most recent
-     * `initialSearchComplete` promise, allowing us to resolve it at the appropriate time.
-     */
-    private _initialSearchCompleteResolver;
-    /**
-     * Internal property to store the private value backing the `initialSearchComplete` getter.
-     */
-    private _initialSearchCompletePromise;
     /**
      * A Promise which, after each query change, resolves once the fetches for the initial
      * search have completed. Waits for *both* the hits and aggregations fetches to finish.

package/dist/src/collection-browser.js

@@ -14,7 +14,7 @@ import './collection-facets';
 import './circular-activity-indicator';
 import { SortField, getDefaultSelectedFacets, sortOptionFromAPIString, SORT_OPTIONS, } from './models';
 import { RestorationStateHandler, } from './restoration-state-handler';
-import { CollectionBrowserDataSource, } from './data-source/collection-browser-data-source';
+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';
@@ -23,7 +23,7 @@ import { sha1 } from './utils/sha1';
 import { formatDate } from './utils/format-date';
 let CollectionBrowser = class CollectionBrowser extends LitElement {
     constructor() {
-        super(...arguments);
+        super();
         this.baseImageUrl = 'https://archive.org';
         this.searchType = SearchType.METADATA;
         this.defaultSortParam = null;
@@ -37,6 +37,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         this.suppressResultCount = false;
         this.suppressURLQuery = false;
         this.suppressFacets = false;
+        this.suppressSortBar = false;
         this.clearResultsOnEmptyQuery = false;
         this.collectionPagePath = '/details/';
         /** describes where this component is being used */
@@ -126,16 +127,10 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         // so this keeps track of whether we've already set the initial query
         this.initialQueryChangeHappened = false;
         this.historyPopOccurred = false;
-        /**
-         * Internal property to store the private value backing the `initialSearchComplete` getter.
-         */
-        this._initialSearchCompletePromise = new Promise(res => {
-            this._initialSearchCompleteResolver = res;
-        });
+        this.addController(this.dataSource);
     }
     tileModelAtCellIndex(index) {
-        const offsetIndex = index + this.tileModelOffset;
-        const model = this.dataSource.getTileModelAt(offsetIndex);
+        const model = this.dataSource.getTileModelAt(index);
         /**
          * 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.
@@ -144,8 +139,8 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
          * 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) {
-            const pageNumber = Math.floor(offsetIndex / this.pageSize) + 1;
+        if (!model && !this.isScrollingToCell && this.dataSource.queryInitialized) {
+            const pageNumber = Math.floor(index / this.pageSize) + 1;
             this.dataSource.fetchPage(pageNumber);
         }
         return model;
@@ -196,12 +191,14 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
      * Sets the state for whether the initial set of search results is loading in.
      */
     setSearchResultsLoading(loading) {
+        console.log('setting search results loading to', loading);
         this.searchResultsLoading = loading;
     }
     /**
      * Sets the state for whether facet data is loading in
      */
     setFacetsLoading(loading) {
+        console.log('setting facets loading to', loading);
         this.facetsLoading = loading;
     }
     /**
@@ -299,7 +296,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             this.placeholderType =
                 !hasQuery && isCollection ? 'empty-collection' : 'no-results';
         }
-        if (this.queryErrorMessage) {
+        if (this.dataSource.queryErrorMessage) {
             this.placeholderType =
                 !hasQuery && isCollection ? 'collection-error' : 'query-error';
         }
@@ -311,7 +308,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         .placeholderType=${this.placeholderType}
         ?isMobileView=${this.mobileView}
         ?isCollection=${!!this.withinCollection}
-        .detailMessage=${(_a = this.queryErrorMessage) !== null && _a !== void 0 ? _a : ''}
+        .detailMessage=${(_a = this.dataSource.queryErrorMessage) !== null && _a !== void 0 ? _a : ''}
         .baseNavigationUrl=${this.baseNavigationUrl}
       ></empty-placeholder>
       ${this.infiniteScrollerTemplate}
@@ -446,6 +443,8 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
     }
     get sortFilterBarTemplate() {
         var _a;
+        if (this.suppressSortBar)
+            return nothing;
         return html `
       <sort-filter-bar
         .defaultSortField=${this.defaultSortField}
@@ -773,12 +772,40 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             detail: this.isManageView,
         }));
     }
+    async installDataSourceAndQueryState(dataSource, queryState) {
+        var _a;
+        console.log('installing in CB:', dataSource, queryState);
+        if (this.dataSource)
+            this.removeController(this.dataSource);
+        this.dataSource = dataSource;
+        this.addController(this.dataSource);
+        this.baseQuery = queryState.baseQuery;
+        this.profileElement = queryState.profileElement;
+        this.searchType = queryState.searchType;
+        this.selectedFacets = queryState.selectedFacets;
+        this.minSelectedDate = queryState.minSelectedDate;
+        this.maxSelectedDate = queryState.maxSelectedDate;
+        this.selectedSort = (_a = queryState.selectedSort) !== null && _a !== void 0 ? _a : SortField.default;
+        this.sortDirection = queryState.sortDirection;
+        this.selectedTitleFilter = queryState.selectedTitleFilter;
+        this.selectedCreatorFilter = queryState.selectedCreatorFilter;
+        this.requestUpdate();
+        await this.updateComplete;
+        if (!this.searchResultsLoading) {
+            this.setTotalResultCount(this.dataSource.totalResults);
+            this.setTileCount(this.dataSource.size);
+            this.refreshVisibleResults();
+        }
+    }
     firstUpdated() {
         this.setupStateRestorationObserver();
         this.restoreState();
     }
     updated(changed) {
         var _a, _b;
+        console.log('* CB UPDATED\n', [...changed.entries()]
+            .map(([k, v]) => `${String(k)}: ${v} => ${this[k]}`)
+            .join('\n'));
         if (changed.has('placeholderType') && this.placeholderType === null) {
             if (!this.leftColIntersectionObserver) {
                 this.setupLeftColumnScrollListeners();
@@ -960,6 +987,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
         }));
     }
     emitQueryStateChanged() {
+        console.log('emitting query state changed event');
         this.dispatchEvent(new CustomEvent('queryStateChanged', {
             detail: {
                 baseQuery: this.baseQuery,
@@ -1027,11 +1055,16 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
      * one, to ensure you do not await an obsolete promise from the previous update.
      */
     get initialSearchComplete() {
-        return this._initialSearchCompletePromise;
+        return this.dataSource.initialSearchComplete;
     }
     async handleQueryChange() {
         var _a;
-        console.log('CB: handling query change', this.previousQueryKey, this.dataSource.pageFetchQueryKey, this.dataSource.canPerformSearch);
+        // console.log(
+        //   'CB: handling query change',
+        //   this.previousQueryKey,
+        //   this.dataSource.pageFetchQueryKey,
+        //   this.dataSource.canPerformSearch
+        // );
         // only reset if the query has actually changed
         if (!this.searchService ||
             this.dataSource.pageFetchQueryKey === this.previousQueryKey)
@@ -1042,14 +1075,13 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             return;
         console.log('CB will reset', this.baseQuery, JSON.stringify(this.selectedFacets));
         this.previousQueryKey = this.dataSource.pageFetchQueryKey;
-        this.emitQueryStateChanged();
+        // this.emitQueryStateChanged();
         this.tileModelOffset = 0;
         this.totalResults = undefined;
         this.pagesToRender =
             this.initialPageNumber === 1
                 ? 2 // First two pages are batched into one request when starting from page 1
                 : this.initialPageNumber;
-        this.queryErrorMessage = undefined;
         // Reset the infinite scroller's item count, so that it
         // shows tile placeholders until the new query's results load in
         if (this.infiniteScroller) {
@@ -1070,14 +1102,8 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             this.persistState();
         }
         this.historyPopOccurred = false;
-        // Reset the `initialSearchComplete` promise with a new value for the imminent search
-        this._initialSearchCompletePromise = new Promise(res => {
-            this._initialSearchCompleteResolver = res;
-        });
         // Fire the initial page and facets requests
-        await this.dataSource.handleQueryChange();
-        // Resolve the `initialSearchComplete` promise for this search
-        this._initialSearchCompleteResolver(true);
+        // await this.dataSource.handleQueryChange();
     }
     setupStateRestorationObserver() {
         if (this.boundNavigationHandler)
@@ -1302,7 +1328,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
             // this.mapDataSource(model => ({ ...model }));
             const cellIndex = this.dataSource.indexOf(event.detail);
             if (cellIndex >= 0)
-                (_a = this.infiniteScroller) === null || _a === void 0 ? void 0 : _a.refreshCell(cellIndex - this.tileModelOffset);
+                (_a = this.infiniteScroller) === null || _a === void 0 ? void 0 : _a.refreshCell(cellIndex);
         }
         (_b = this.analyticsHandler) === null || _b === void 0 ? void 0 : _b.sendEvent({
             category: this.searchContext,
@@ -1345,7 +1371,7 @@ let CollectionBrowser = class CollectionBrowser extends LitElement {
      * increase the number of pages to render and start fetching data for the new page
      */
     scrollThresholdReached() {
-        if (!this.dataSource.endOfDataReached) {
+        if (!this.dataSource.endOfDataReached && this.dataSource.queryInitialized) {
             this.pagesToRender += 1;
             this.dataSource.fetchPage(this.pagesToRender);
         }
@@ -1803,6 +1829,9 @@ __decorate([
 __decorate([
     property({ type: Boolean })
 ], CollectionBrowser.prototype, "suppressFacets", void 0);
+__decorate([
+    property({ type: Boolean })
+], CollectionBrowser.prototype, "suppressSortBar", void 0);
 __decorate([
     property({ type: Boolean })
 ], CollectionBrowser.prototype, "clearResultsOnEmptyQuery", void 0);
@@ -1842,9 +1871,6 @@ __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);