@internetarchive/collection-browser 3.5.2-webdev-8178.0 → 3.5.3-alpha-webdev8156.0

package/src/collection-browser.ts

@@ -1643,7 +1643,6 @@ export class CollectionBrowser
     dataSource: CollectionBrowserDataSourceInterface,
     queryState: CollectionBrowserQueryState,
   ): Promise<void> {
-    log('Installing data source & query state in CB:', dataSource, queryState);
     if (this.dataSource) this.removeController(this.dataSource);
     this.dataSource = dataSource;
     this.addController(this.dataSource);
@@ -1660,6 +1659,11 @@ export class CollectionBrowser
     this.sortDirection = queryState.sortDirection;
     this.selectedTitleFilter = queryState.selectedTitleFilter;
     this.selectedCreatorFilter = queryState.selectedCreatorFilter;
+    
+    if (queryState.defaultSortField)
+      this.defaultSortField = queryState.defaultSortField;
+    if (queryState.defaultSortDirection)
+      this.defaultSortDirection = queryState.defaultSortDirection;
 
     this.pagesToRender = this.initialPageNumber;
 
@@ -2103,6 +2107,8 @@ export class CollectionBrowser
           maxSelectedDate: this.maxSelectedDate,
           selectedSort: this.selectedSort,
           sortDirection: this.sortDirection,
+          defaultSortField: this.defaultSortField,
+          defaultSortDirection: this.defaultSortDirection,
           selectedTitleFilter: this.selectedTitleFilter,
           selectedCreatorFilter: this.selectedCreatorFilter,
         },
@@ -2259,12 +2265,8 @@ export class CollectionBrowser
     this.displayMode = restorationState.displayMode;
     if (!this.suppressURLSinParam && restorationState.searchType != null)
       this.searchType = restorationState.searchType;
-    this.selectedSort =
-      restorationState.selectedSort ??
-      this.defaultSortField ??
-      SortField.default;
-    this.sortDirection =
-      restorationState.sortDirection ?? this.defaultSortDirection ?? null;
+    this.selectedSort = restorationState.selectedSort ?? SortField.default;
+    this.sortDirection = restorationState.sortDirection ?? null;
     this.selectedTitleFilter = restorationState.selectedTitleFilter ?? null;
     this.selectedCreatorFilter = restorationState.selectedCreatorFilter ?? null;
     this.selectedFacets = restorationState.selectedFacets;

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

@@ -27,6 +27,8 @@ export interface CollectionBrowserQueryState {
   selectedCreatorFilter: string | null;
   selectedSort?: SortField;
   sortDirection: SortDirection | null;
+  defaultSortField?: Exclude<SortField, SortField.default>;
+  defaultSortDirection?: SortDirection | null;
 }
 
 /**
@@ -38,7 +40,6 @@ export interface CollectionBrowserSearchInterface
   searchService?: SearchServiceInterface;
   isTVCollection: boolean;
   readonly sortParam: SortParam | null;
-  readonly defaultSortField: SortField | null;
   readonly facetLoadStrategy: FacetLoadStrategy;
   readonly initialPageNumber: number;
   readonly maxPagesToManage: number;

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

@@ -1,163 +1,163 @@
-import { css, CSSResultGroup, html, nothing, TemplateResult } from 'lit';
-import { customElement, property } from 'lit/decorators.js';
-import { msg } from '@lit/localize';
-import { collectionIcon } from '../../assets/img/icons/mediatype/collection';
-import { formatUnitSize } from '../../utils/format-unit-size';
-import { baseTileStyles } from './styles/tile-grid-shared-styles';
-import { BaseTileComponent } from '../base-tile-component';
-import '../image-block';
-
-@customElement('collection-tile')
-export class CollectionTile extends BaseTileComponent {
-  /*
-   * Reactive properties inherited from BaseTileComponent:
-   *  - model?: TileModel;
-   *  - currentWidth?: number;
-   *  - currentHeight?: number;
-   *  - baseNavigationUrl?: string;
-   *  - baseImageUrl?: string;
-   *  - collectionPagePath?: string;
-   *  - sortParam: SortParam | null = null;
-   *  - creatorFilter?: string;
-   *  - mobileBreakpoint?: number;
-   *  - loggedIn = false;
-   *  - suppressBlurring = false;
-   *  - useLocalTime = false;
-   */
-
-  @property({ type: Boolean }) showInfoButton = false;
-
-  render() {
-    return html`
-      <div class="container">
-        ${this.infoButtonTemplate}
-        <div class="tile-details">
-          <div class="item-info">
-            ${this.getImageBlockTemplate} ${this.getTitleTemplate}
-          </div>
-        </div>
-
-        ${this.getTileStatsTemplate}
-      </div>
-    `;
-  }
-
-  private get getImageBlockTemplate(): TemplateResult {
-    return html`
-      <image-block
-        .model=${this.model}
-        .baseImageUrl=${this.baseImageUrl}
-        .viewSize=${'grid'}
-        .suppressBlurring=${this.suppressBlurring}
-      >
-      </image-block>
-    `;
-  }
-
-  private get getTitleTemplate() {
-    return html`<div id="title">
-      <h3 class="truncated">${this.model?.title}</h3>
-    </div>`;
-  }
-
-  private get getTileStatsTemplate() {
-    return html`
-      <div id="item-stats">
-        <div id="item-mediatype">${collectionIcon}</div>
-
-        <div id="stats-row">
-          ${this.getItemsTemplate} ${this.getSizeTemplate}
-        </div>
-      </div>
-    `;
-  }
-
-  private get getItemsTemplate() {
-    const collectionItems = this.model?.itemCount?.toLocaleString();
-
-    return html`<span id="item-count"
-      >${collectionItems} item${Number(collectionItems) !== 1 ? 's' : ''}</span
-    >`;
-  }
-
-  private get getSizeTemplate() {
-    const collectionSize = this.model?.collectionSize ?? 0;
-
-    return collectionSize
-      ? html`<span id="item-size">${formatUnitSize(collectionSize, 1)}</span>`
-      : ``;
-  }
-
-  private get infoButtonTemplate(): TemplateResult | typeof nothing {
-    // &#9432; is an information icon
-    return this.showInfoButton
-      ? html`<button class="info-button" @click=${this.infoButtonPressed}>
-          &#9432;
-          <span class="sr-only">${msg('More info')}</span>
-        </button>`
-      : nothing;
-  }
-
-  private infoButtonPressed(e: PointerEvent) {
-    e.preventDefault();
-    const event = new CustomEvent<{ x: number; y: number }>(
-      'infoButtonPressed',
-      { detail: { x: e.clientX, y: e.clientY } },
-    );
-    this.dispatchEvent(event);
-  }
-
-  static get styles(): CSSResultGroup {
-    const tileBorderColor = css`var(--tileBorderColor, #555555)`;
-    const tileBackgroundColor = css`var(--tileBackgroundColor, #666666)`;
-    const whiteColor = css`#fff`;
-
-    return [
-      baseTileStyles,
-      css`
-        .container {
-          background-color: ${tileBackgroundColor};
-          border: 1px solid ${tileBorderColor};
-        }
-
-        .item-info {
-          flex-grow: initial;
-        }
-
-        h4.truncated,
-        h3.truncated {
-          color: ${whiteColor};
-        }
-
-        #item-mediatype svg {
-          filter: invert(100%);
-          height: 2.5rem;
-          align-items: baseline;
-        }
-
-        .container:hover > #title {
-          text-decoration: underline;
-        }
-
-        /* this is a workaround for Safari 15 where the hover effects are not working */
-        image-block:hover > #title {
-          text-decoration: underline;
-        }
-
-        #item-stats {
-          display: flex;
-          padding: 0 5px 5px;
-          align-items: center;
-        }
-
-        #stats-row {
-          display: flex;
-          align-items: baseline;
-          color: ${whiteColor};
-          flex-direction: column;
-          margin-left: 10px;
-        }
-      `,
-    ];
-  }
-}
+import { css, CSSResultGroup, html, nothing, TemplateResult } from 'lit';
+import { customElement, property } from 'lit/decorators.js';
+import { msg } from '@lit/localize';
+import { collectionIcon } from '../../assets/img/icons/mediatype/collection';
+import { formatUnitSize } from '../../utils/format-unit-size';
+import { baseTileStyles } from './styles/tile-grid-shared-styles';
+import { BaseTileComponent } from '../base-tile-component';
+import '../image-block';
+
+@customElement('collection-tile')
+export class CollectionTile extends BaseTileComponent {
+  /*
+   * Reactive properties inherited from BaseTileComponent:
+   *  - model?: TileModel;
+   *  - currentWidth?: number;
+   *  - currentHeight?: number;
+   *  - baseNavigationUrl?: string;
+   *  - baseImageUrl?: string;
+   *  - collectionPagePath?: string;
+   *  - sortParam: SortParam | null = null;
+   *  - creatorFilter?: string;
+   *  - mobileBreakpoint?: number;
+   *  - loggedIn = false;
+   *  - suppressBlurring = false;
+   *  - useLocalTime = false;
+   */
+
+  @property({ type: Boolean }) showInfoButton = false;
+
+  render() {
+    return html`
+      <div class="container">
+        ${this.infoButtonTemplate}
+        <div class="tile-details">
+          <div class="item-info">
+            ${this.getImageBlockTemplate} ${this.getTitleTemplate}
+          </div>
+        </div>
+
+        ${this.getTileStatsTemplate}
+      </div>
+    `;
+  }
+
+  private get getImageBlockTemplate(): TemplateResult {
+    return html`
+      <image-block
+        .model=${this.model}
+        .baseImageUrl=${this.baseImageUrl}
+        .viewSize=${'grid'}
+        .suppressBlurring=${this.suppressBlurring}
+      >
+      </image-block>
+    `;
+  }
+
+  private get getTitleTemplate() {
+    return html`<div id="title">
+      <h3 class="truncated">${this.model?.title}</h3>
+    </div>`;
+  }
+
+  private get getTileStatsTemplate() {
+    return html`
+      <div id="item-stats">
+        <div id="item-mediatype">${collectionIcon}</div>
+
+        <div id="stats-row">
+          ${this.getItemsTemplate} ${this.getSizeTemplate}
+        </div>
+      </div>
+    `;
+  }
+
+  private get getItemsTemplate() {
+    const collectionItems = this.model?.itemCount?.toLocaleString();
+
+    return html`<span id="item-count"
+      >${collectionItems} item${Number(collectionItems) !== 1 ? 's' : ''}</span
+    >`;
+  }
+
+  private get getSizeTemplate() {
+    const collectionSize = this.model?.collectionSize ?? 0;
+
+    return collectionSize
+      ? html`<span id="item-size">${formatUnitSize(collectionSize, 1)}</span>`
+      : ``;
+  }
+
+  private get infoButtonTemplate(): TemplateResult | typeof nothing {
+    // &#9432; is an information icon
+    return this.showInfoButton
+      ? html`<button class="info-button" @click=${this.infoButtonPressed}>
+          &#9432;
+          <span class="sr-only">${msg('More info')}</span>
+        </button>`
+      : nothing;
+  }
+
+  private infoButtonPressed(e: PointerEvent) {
+    e.preventDefault();
+    const event = new CustomEvent<{ x: number; y: number }>(
+      'infoButtonPressed',
+      { detail: { x: e.clientX, y: e.clientY } },
+    );
+    this.dispatchEvent(event);
+  }
+
+  static get styles(): CSSResultGroup {
+    const tileBorderColor = css`var(--tileBorderColor, #555555)`;
+    const tileBackgroundColor = css`var(--tileBackgroundColor, #666666)`;
+    const whiteColor = css`#fff`;
+
+    return [
+      baseTileStyles,
+      css`
+        .container {
+          background-color: ${tileBackgroundColor};
+          border: 1px solid ${tileBorderColor};
+        }
+
+        .item-info {
+          flex-grow: initial;
+        }
+
+        h4.truncated,
+        h3.truncated {
+          color: ${whiteColor};
+        }
+
+        #item-mediatype svg {
+          filter: invert(100%);
+          height: 2.5rem;
+          align-items: baseline;
+        }
+
+        .container:hover > #title {
+          text-decoration: underline;
+        }
+
+        /* this is a workaround for Safari 15 where the hover effects are not working */
+        image-block:hover > #title {
+          text-decoration: underline;
+        }
+
+        #item-stats {
+          display: flex;
+          padding: 0 5px 5px;
+          align-items: center;
+        }
+
+        #stats-row {
+          display: flex;
+          align-items: baseline;
+          color: ${whiteColor};
+          flex-direction: column;
+          margin-left: 10px;
+        }
+      `,
+    ];
+  }
+}