@internetarchive/collection-browser 1.14.17-alpha.22 → 1.14.17-alpha.24

package/src/collection-browser.ts

@@ -134,6 +134,8 @@ export class CollectionBrowser
 
   @property({ type: Boolean }) suppressFacets = false;
 
+  @property({ type: Boolean }) suppressSortBar = false;
+
   @property({ type: Boolean }) clearResultsOnEmptyQuery = false;
 
   @property({ type: String }) collectionPagePath: string = '/details/';
@@ -260,7 +262,7 @@ export class CollectionBrowser
      * 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) {
+    if (!model && !this.isScrollingToCell && this.dataSource.queryInitialized) {
       const pageNumber = Math.floor(offsetIndex / this.pageSize) + 1;
       this.dataSource.fetchPage(pageNumber);
     }
@@ -606,7 +608,9 @@ export class CollectionBrowser
     });
   }
 
-  private get sortFilterBarTemplate() {
+  private get sortFilterBarTemplate(): TemplateResult | typeof nothing {
+    if (this.suppressSortBar) return nothing;
+
     return html`
       <sort-filter-bar
         .defaultSortField=${this.defaultSortField}
@@ -1415,7 +1419,7 @@ export class CollectionBrowser
     this.historyPopOccurred = false;
 
     // Fire the initial page and facets requests
-    //await this.dataSource.handleQueryChange();
+    // await this.dataSource.handleQueryChange();
   }
 
   private setupStateRestorationObserver() {
@@ -1703,7 +1707,7 @@ export class CollectionBrowser
    * increase the number of pages to render and start fetching data for the new page
    */
   private scrollThresholdReached() {
-    if (!this.dataSource.endOfDataReached) {
+    if (!this.dataSource.endOfDataReached && this.dataSource.queryInitialized) {
       this.pagesToRender += 1;
       this.dataSource.fetchPage(this.pagesToRender);
     }

package/src/data-source/collection-browser-data-source.ts

@@ -48,6 +48,12 @@ export interface CollectionBrowserDataSourceInterface
    */
   readonly endOfDataReached: boolean;
 
+  /**
+   * True if the initial work for a new query state has been completed (i.e., firing initial
+   * page/facet requests). False otherwise.
+   */
+  readonly queryInitialized: boolean;
+
   /**
    * A string key compactly representing the current full search state, which can
    * be used to determine, e.g., when a new search is required or whether an arriving
@@ -273,6 +279,11 @@ export class CollectionBrowserDataSource
    */
   endOfDataReached = false;
 
+  /**
+   * @inheritdoc
+   */
+  queryInitialized = false;
+
   /**
    * @inheritdoc
    */
@@ -364,7 +375,8 @@ export class CollectionBrowserDataSource
     // We should only reset if either:
     //  (a) our state permits a valid search, or
     //  (b) we have a blank query that we want to show empty results for
-    const shouldShowEmptyQueryResults = this.host.clearResultsOnEmptyQuery && this.host.baseQuery === '';
+    const shouldShowEmptyQueryResults =
+      this.host.clearResultsOnEmptyQuery && this.host.baseQuery === '';
     if (!(this.canPerformSearch || shouldShowEmptyQueryResults)) return;
 
     this.handleQueryChange();
@@ -393,6 +405,7 @@ export class CollectionBrowserDataSource
     this.numTileModels = 0;
     this.totalResults = 0;
     this.endOfDataReached = false;
+    this.queryInitialized = false;
 
     this.host.requestUpdate();
   }
@@ -463,6 +476,7 @@ export class CollectionBrowserDataSource
     });
 
     // Fire the initial page & facet requests
+    this.queryInitialized = true;
     await Promise.all([
       this.doInitialPageFetch(),
       this.host.suppressFacets ? null : this.fetchFacets(),
@@ -942,7 +956,11 @@ export class CollectionBrowserDataSource
     const queryChangedSinceFetch =
       facetFetchQueryKey !== this.facetFetchQueryKey;
     if (queryChangedSinceFetch) {
-      console.log('facet query has changed since fetch, returning. new/old:', this.facetFetchQueryKey, facetFetchQueryKey);
+      console.log(
+        'facet query has changed since fetch, returning. new/old:',
+        this.facetFetchQueryKey,
+        facetFetchQueryKey
+      );
       return;
     }
 
@@ -1014,12 +1032,8 @@ export class CollectionBrowserDataSource
     const { pageFetchQueryKey } = this;
     const pageFetches =
       this.pageFetchesInProgress[pageFetchQueryKey] ?? new Set();
-    if (pageFetches.has(pageNumber)) {
-      console.log(
-        `Skipping fetch for page ${pageNumber} because one is already in progress`
-      );
-      return;
-    }
+    if (pageFetches.has(pageNumber)) return;
+
     for (let i = 0; i < numPages; i += 1) {
       pageFetches.add(pageNumber + i);
     }

package/src/data-source/models.ts

@@ -66,7 +66,7 @@ export interface CollectionBrowserSearchInterface
   readonly initialPageNumber: number;
   readonly currentVisiblePageNumbers: number[];
   readonly clearResultsOnEmptyQuery?: boolean;
-  readonly dataSource: CollectionBrowserDataSourceInterface;
+  readonly dataSource?: CollectionBrowserDataSourceInterface;
 
   getSessionId(): Promise<string>;
   setSearchResultsLoading(loading: boolean): void;

package/src/tiles/grid/item-tile.ts

@@ -4,7 +4,7 @@ import { customElement, property } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { msg } from '@lit/localize';
 
-import { map } from 'lit/directives/map';
+import { map } from 'lit/directives/map.js';
 import { DateFormat, formatDate } from '../../utils/format-date';
 import { isFirstMillisecondOfUTCYear } from '../../utils/local-date-from-utc';
 import { BaseTileComponent } from '../base-tile-component';

package/test/collection-browser.test.ts

@@ -917,7 +917,7 @@ describe('Collection Browser', () => {
     el.sortDirection = 'asc';
     el.selectedCreatorFilter = 'X';
     await el.updateComplete;
-    await el.initialSearchComplete;
+    await nextTick();
 
     expect(searchService.searchParams?.query).to.equal('first-creator');
     expect(searchService.searchParams?.filters?.firstCreator?.X).to.equal(
@@ -926,7 +926,7 @@ describe('Collection Browser', () => {
 
     el.baseQuery = 'collection:foo';
     await el.updateComplete;
-    await el.initialSearchComplete;
+    await nextTick();
 
     expect(searchService.searchParams?.query).to.equal('collection:foo');
     expect(searchService.searchParams?.filters?.firstCreator).not.to.exist;
@@ -1446,9 +1446,6 @@ describe('Collection Browser', () => {
       </collection-browser>`
     );
 
-    await el.initialSearchComplete;
-    await el.updateComplete;
-
     el.baseQuery = 'bar';
     await el.updateComplete;
 
@@ -1484,9 +1481,6 @@ describe('Collection Browser', () => {
       </collection-browser>`
     );
 
-    await el.initialSearchComplete;
-    await el.updateComplete;
-
     el.withinCollection = 'bar';
     await el.updateComplete;