@internetarchive/collection-browser 1.1.0 → 1.1.1-alpha.2

package/src/tiles/list/tile-list-compact-header.ts

@@ -1,8 +1,8 @@
 import { css, html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import type { SortParam } from '@internetarchive/search-service';
-import { dateLabel } from './date-label';
-import type { TileModel } from '../../models';
+import { dateLabel } from './date-label.js';
+import type { TileModel } from '../../models.js';
 
 @customElement('tile-list-compact-header')
 export class TileListCompactHeader extends LitElement {

package/src/tiles/list/tile-list-compact.ts

@@ -2,12 +2,12 @@ import { css, html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import DOMPurify from 'dompurify';
 import type { SortParam } from '@internetarchive/search-service';
-import type { TileModel } from '../../models';
+import type { TileModel } from '../../models.js';
 
-import { formatCount, NumberFormat } from '../../utils/format-count';
-import { formatDate, DateFormat } from '../../utils/format-date';
-import { isFirstMillisecondOfUTCYear } from '../../utils/local-date-from-utc';
-import { accountLabel } from './account-label';
+import { formatCount, NumberFormat } from '../../utils/format-count.js';
+import { formatDate, DateFormat } from '../../utils/format-date.js';
+import { isFirstMillisecondOfUTCYear } from '../../utils/local-date-from-utc.js';
+import { accountLabel } from './account-label.js';
 
 import '../image-block';
 import '../mediatype-icon';

package/src/tiles/list/tile-list.ts

@@ -15,13 +15,13 @@ import DOMPurify from 'dompurify';
 
 import type { CollectionNameCacheInterface } from '@internetarchive/collection-name-cache';
 import type { SortParam } from '@internetarchive/search-service';
-import { suppressedCollections, TileModel } from '../../models';
+import { suppressedCollections, TileModel } from '../../models.js';
 
-import { dateLabel } from './date-label';
-import { accountLabel } from './account-label';
-import { formatCount, NumberFormat } from '../../utils/format-count';
-import { formatDate, DateFormat } from '../../utils/format-date';
-import { isFirstMillisecondOfUTCYear } from '../../utils/local-date-from-utc';
+import { dateLabel } from './date-label.js';
+import { accountLabel } from './account-label.js';
+import { formatCount, NumberFormat } from '../../utils/format-count.js';
+import { formatDate, DateFormat } from '../../utils/format-date.js';
+import { isFirstMillisecondOfUTCYear } from '../../utils/local-date-from-utc.js';
 
 import '../image-block';
 import '../mediatype-icon';

package/src/tiles/mediatype-icon.ts

@@ -1,7 +1,7 @@
 import { css, CSSResultGroup, html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 
-import { mediatypeConfig } from '../mediatype/mediatype-config';
+import { mediatypeConfig } from '../mediatype/mediatype-config.js';
 
 @customElement('mediatype-icon')
 export class MediatypeIcon extends LitElement {

package/src/tiles/overlay/icon-overlay.ts

@@ -1,8 +1,8 @@
 import { css, CSSResultGroup, html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 
-import { restrictedIcon } from '../../assets/img/icons/restricted';
-import { loginRequiredIcon } from '../../assets/img/icons/login-required';
+import { restrictedIcon } from '../../assets/img/icons/restricted.js';
+import { loginRequiredIcon } from '../../assets/img/icons/login-required.js';
 
 @customElement('icon-overlay')
 export class IconOverlay extends LitElement {

package/src/tiles/overlay/icon-text-overlay.ts

@@ -1,7 +1,7 @@
 import { css, CSSResultGroup, html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import { loginRequiredIcon } from '../../assets/img/icons/login-required';
-import { restrictedIcon } from '../../assets/img/icons/restricted';
+import { loginRequiredIcon } from '../../assets/img/icons/login-required.js';
+import { restrictedIcon } from '../../assets/img/icons/restricted.js';
 
 @customElement('icon-text-overlay')
 export class IconTextOverlay extends LitElement {

package/src/tiles/overlay/text-overlay.ts

@@ -1,7 +1,7 @@
 import { css, CSSResultGroup, html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import { loginRequiredIcon } from '../../assets/img/icons/login-required';
-import { restrictedIcon } from '../../assets/img/icons/restricted';
+import { loginRequiredIcon } from '../../assets/img/icons/login-required.js';
+import { restrictedIcon } from '../../assets/img/icons/restricted.js';
 
 @customElement('text-overlay')
 export class TextOverlay extends LitElement {

package/src/tiles/tile-dispatcher.ts

@@ -7,7 +7,7 @@ import type {
 } from '@internetarchive/shared-resize-observer';
 import type { CollectionNameCacheInterface } from '@internetarchive/collection-name-cache';
 import type { SortParam } from '@internetarchive/search-service';
-import type { TileDisplayMode, TileModel } from '../models';
+import type { TileDisplayMode, TileModel } from '../models.js';
 import './grid/collection-tile';
 import './grid/item-tile';
 import './grid/account-tile';
@@ -15,13 +15,13 @@ import './hover/tile-hover-pane';
 import './list/tile-list';
 import './list/tile-list-compact';
 import './list/tile-list-compact-header';
-import type { TileHoverPane } from './hover/tile-hover-pane';
+import type { TileHoverPane } from './hover/tile-hover-pane.js';
 import {
   HoverPaneController,
   HoverPaneControllerInterface,
   HoverPaneProperties,
   HoverPaneProviderInterface,
-} from './hover/hover-pane-controller';
+} from './hover/hover-pane-controller.js';
 
 @customElement('tile-dispatcher')
 export class TileDispatcher
@@ -56,6 +56,8 @@ export class TileDispatcher
   /** Whether this tile should include a hover pane at all (for applicable tile modes) */
   @property({ type: Boolean }) enableHoverPane = false;
 
+  @property({ type: Boolean }) prerender = false;
+
   private hoverPaneController?: HoverPaneControllerInterface;
 
   @query('#container')
@@ -158,6 +160,7 @@ export class TileDispatcher
   }
 
   private get isHoverEnabled(): boolean {
+    if (this.prerender) return false;
     return window.matchMedia('(hover: hover)').matches;
   }
 

package/test/restoration-state-handler.test.ts

@@ -183,6 +183,32 @@ describe('Restoration state handler', () => {
     );
   });
 
+  it('should restore selected facets with numbers in the square brackets', async () => {
+    const handler = new RestorationStateHandler({ context: 'search' });
+
+    const url = new URL(window.location.href);
+    url.search = '?and[12]=subject:"foo"';
+    window.history.replaceState({ path: url.href }, '', url.href);
+
+    const restorationState = handler.getRestorationState();
+    expect(restorationState.selectedFacets.subject.foo.state).to.equal(
+      'selected'
+    );
+  });
+
+  it('should restore negative facets with numbers in the square brackets', async () => {
+    const handler = new RestorationStateHandler({ context: 'search' });
+
+    const url = new URL(window.location.href);
+    url.search = '?not[12]=year:2018';
+    window.history.replaceState({ path: url.href }, '', url.href);
+
+    const restorationState = handler.getRestorationState();
+    expect(restorationState.selectedFacets.year['2018'].state).to.equal(
+      'hidden'
+    );
+  });
+
   it('should restore sort from URL (space format)', async () => {
     const handler = new RestorationStateHandler({ context: 'search' });
 
@@ -270,4 +296,22 @@ describe('Restoration state handler', () => {
     handler.persistState({ selectedFacets: getDefaultSelectedFacets() });
     expect(window.location.search).to.equal('');
   });
+
+  it('round trip load/persist should erase numbers in square brackets', async () => {
+    const handler = new RestorationStateHandler({ context: 'search' });
+
+    const url = new URL(window.location.href);
+    url.search = '?and[0]=subject:"foo"';
+    window.history.replaceState({ path: url.href }, '', url.href);
+
+    // Load state from the URL and immediately persist it back to the URL
+    const restorationState = handler.getRestorationState();
+    handler.persistState(restorationState);
+
+    // Ensure the new URL includes the "normalized" facet parameter and not the numbered one
+    expect(decodeURIComponent(window.location.search)).to.include(
+      'and[]=subject:"foo"'
+    );
+    expect(new URL(window.location.href).searchParams.get('and[0]')).to.be.null;
+  });
 });