@internetarchive/collection-browser 0.4.9 → 0.4.10-alpha.1

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

@@ -35,6 +35,10 @@ export class ItemTile extends LitElement {
 
   render() {
     const itemTitle = this.model?.title;
+    const viewCount =
+      this.sortParam?.field === 'week'
+        ? this.model?.weeklyViewCount // weekly views
+        : this.model?.viewCount; // all-time views
 
     return html`
       <div class="container">
@@ -58,7 +62,7 @@ export class ItemTile extends LitElement {
 
           <tile-stats
             .mediatype=${this.model?.mediatype}
-            .viewCount=${this.model?.viewCount}
+            .viewCount=${viewCount}
             .favCount=${this.model?.favCount}
             .commentCount=${this.model?.commentCount}
           >

package/test/collection-facets.test.ts

@@ -11,10 +11,6 @@ import type { CollectionFacets } from '../src/collection-facets';
 import '@internetarchive/modal-manager';
 import '../src/collection-facets';
 import type { FacetOption, SelectedFacets } from '../src/models';
-import {
-  LanguageCodeHandler,
-  LanguageCodeHandlerInterface,
-} from '../src/language-code-handler/language-code-handler';
 import { MockAnalyticsHandler } from './mocks/mock-analytics-handler';
 
 describe('Collection Facets', () => {
@@ -259,69 +255,6 @@ describe('Collection Facets', () => {
     expect(collectionLink).to.exist;
   });
 
-  it('renders language facets with their human-readable names', async () => {
-    const el = await fixture<CollectionFacets>(
-      html`<collection-facets></collection-facets>`
-    );
-
-    const languageCodeHandler: LanguageCodeHandlerInterface =
-      new LanguageCodeHandler();
-
-    const aggs: Record<string, Aggregation> = {
-      language: new Aggregation({
-        buckets: [
-          {
-            key: 'English',
-            doc_count: 3,
-          },
-        ],
-      }),
-    };
-
-    el.languageCodeHandler = languageCodeHandler;
-    el.aggregations = aggs;
-    await el.updateComplete;
-
-    const facetsTemplate = el.shadowRoot?.querySelector('facets-template');
-    const languageTitle =
-      facetsTemplate?.shadowRoot?.querySelector('.facet-title');
-    expect(languageTitle?.textContent?.trim()).to.equal('English');
-  });
-
-  it('renders selected/negative language facets with human-readable names', async () => {
-    const el = await fixture<CollectionFacets>(
-      html`<collection-facets></collection-facets>`
-    );
-
-    const languageCodeHandler: LanguageCodeHandlerInterface =
-      new LanguageCodeHandler();
-
-    const selectedFacets: SelectedFacets = {
-      subject: {},
-      lending: {},
-      mediatype: {},
-      language: {
-        en: {
-          key: 'en',
-          count: 5,
-          state: 'selected',
-        },
-      },
-      creator: {},
-      collection: {},
-      year: {},
-    };
-
-    el.languageCodeHandler = languageCodeHandler;
-    el.selectedFacets = selectedFacets;
-    await el.updateComplete;
-
-    const facetsTemplate = el.shadowRoot?.querySelector('facets-template');
-    const languageTitle =
-      facetsTemplate?.shadowRoot?.querySelector('.facet-title');
-    expect(languageTitle?.textContent?.trim()).to.equal('English');
-  });
-
   it('renders lending facets with human-readable names', async () => {
     const el = await fixture<CollectionFacets>(
       html`<collection-facets></collection-facets>`

package/test/sort-filter-bar/sort-filter-bar.test.ts

@@ -1,6 +1,7 @@
 /* eslint-disable import/no-duplicates */
 import { expect, fixture } from '@open-wc/testing';
 import { html } from 'lit';
+import type { IaDropdown } from '@internetarchive/ia-dropdown';
 import type { SortFilterBar } from '../../src/sort-filter-bar/sort-filter-bar';
 import type { SortField } from '../../src/models';
 
@@ -44,81 +45,97 @@ describe('Sort selector default buttons', async () => {
     <sort-filter-bar> </sort-filter-bar>
   `);
   const sortSelectorContainer = el.shadowRoot?.querySelector(
+    '#sort-selector-container'
+  );
+  const desktopSortSelector = sortSelectorContainer?.querySelector(
     '#desktop-sort-selector'
   );
 
+  it('should render basic component', async () => {
+    expect(sortSelectorContainer).to.exist;
+    expect(desktopSortSelector).to.exist;
+  });
+
   it('should render sort-by label', async () => {
-    expect(sortSelectorContainer?.children.item(0)?.textContent).to.equal(
-      'Sort By'
+    const sortByLabel = sortSelectorContainer?.querySelector('#sort-by-text');
+    expect(sortByLabel).to.exist;
+    expect(sortByLabel?.textContent?.trim()).to.equal('Sort by');
+  });
+
+  it('should render sort direction buttons', async () => {
+    const sortDirections = sortSelectorContainer?.querySelector(
+      '#sort-direction-container'
     );
+    expect(sortDirections).to.exist;
+    expect(sortDirections?.querySelectorAll('.sort-button').length).to.equal(2);
   });
 
   it('should render default relevance-sort selector', async () => {
-    const defaultSortSelector = sortSelectorContainer?.children
-      .item(1)
-      ?.querySelector('a');
+    const defaultSortSelector = desktopSortSelector?.querySelector('a');
     expect(defaultSortSelector?.textContent).to.contain('Relevance');
     expect(defaultSortSelector?.getAttribute('class')).to.equal('selected');
   });
 
   it('should render default view-sort selector', async () => {
-    const defaultSortSelector = sortSelectorContainer?.children
-      .item(2)
-      ?.querySelector('a');
-    expect(defaultSortSelector?.textContent).to.contain('Weekly Views');
+    const defaultSortSelector = desktopSortSelector?.children
+      .item(1)
+      ?.querySelector('ia-dropdown');
+    expect(defaultSortSelector?.textContent).to.contain('Weekly views');
   });
 
   it('should render active view-sort selectors', async () => {
     el.selectedSort = 'alltimeview' as SortField;
     await el.updateComplete;
 
-    const defaultSortSelector =
-      sortSelectorContainer?.querySelector('a.selected');
-    expect(defaultSortSelector?.textContent).to.contain('All-time Views');
+    const defaultSortSelector = desktopSortSelector?.querySelector(
+      'ia-dropdown.selected'
+    );
+    expect(defaultSortSelector?.textContent).to.contain('All-time views');
   });
 
   it('should render default title-sort selector', async () => {
-    const defaultSortSelector = sortSelectorContainer?.children
-      .item(3)
+    const defaultSortSelector = desktopSortSelector?.children
+      .item(2)
       ?.querySelector('a');
     expect(defaultSortSelector?.textContent).to.contain('Title');
   });
 
   it('should render default date-sort selector', async () => {
-    const defaultSortSelector = sortSelectorContainer?.children
-      .item(4)
-      ?.querySelector('a');
-    expect(defaultSortSelector?.textContent).to.contain('Date Published');
+    const defaultSortSelector = desktopSortSelector?.children
+      .item(3)
+      ?.querySelector('ia-dropdown');
+    expect(defaultSortSelector?.textContent).to.contain('Date published');
   });
 
   it('should render active date-sort selectors', async () => {
     el.selectedSort = 'datereviewed' as SortField;
     await el.updateComplete;
 
-    const defaultSortSelector =
-      sortSelectorContainer?.querySelector('a.selected');
-    expect(defaultSortSelector?.textContent).to.contain('Date Reviewed');
+    const defaultSortSelector = desktopSortSelector?.querySelector(
+      'ia-dropdown.selected'
+    );
+    expect(defaultSortSelector?.textContent).to.contain('Date reviewed');
   });
 
   it('should render default creator-sort selector', async () => {
-    const defaultSortSelector = sortSelectorContainer?.children
-      .item(5)
+    const defaultSortSelector = desktopSortSelector?.children
+      .item(4)
       ?.querySelector('a');
     expect(defaultSortSelector?.textContent).to.contain('Creator');
   });
 
   it('click event on view-sort selector', async () => {
-    const defaultSortSelector = sortSelectorContainer?.children
-      .item(2)
-      ?.querySelector('a');
+    const defaultSortSelector = desktopSortSelector?.children
+      .item(1)
+      ?.querySelector('ia-dropdown') as IaDropdown;
 
     await defaultSortSelector?.click();
     expect(el.selectedSort).to.equal('weeklyview');
   });
 
   it('click event on title selector', async () => {
-    const defaultSortSelector = sortSelectorContainer?.children
-      .item(3)
+    const defaultSortSelector = desktopSortSelector?.children
+      .item(2)
       ?.querySelector('a');
 
     await defaultSortSelector?.click();
@@ -126,17 +143,17 @@ describe('Sort selector default buttons', async () => {
   });
 
   it('click event on date-sort selector', async () => {
-    const defaultSortSelector = sortSelectorContainer?.children
-      .item(4)
-      ?.querySelector('a');
+    const defaultSortSelector = desktopSortSelector?.children
+      .item(3)
+      ?.querySelector('ia-dropdown') as IaDropdown;
 
     await defaultSortSelector?.click();
     expect(el.selectedSort).to.equal('date');
   });
 
   it('click event on creator selector', async () => {
-    const defaultSortSelector = sortSelectorContainer?.children
-      .item(5)
+    const defaultSortSelector = desktopSortSelector?.children
+      .item(4)
       ?.querySelector('a');
 
     await defaultSortSelector?.click();
@@ -246,15 +263,15 @@ describe('Sort/filter bar mobile view', () => {
       <sort-filter-bar></sort-filter-bar>
     `);
 
-    const mobileSortSelector = el.shadowRoot?.querySelector(
-      '#mobile-sort-selector'
+    const mobileSortContainer = el.shadowRoot?.querySelector(
+      '#mobile-sort-container'
     );
-    const desktopSortSelector = el.shadowRoot?.querySelector(
-      '#desktop-sort-selector'
+    const desktopSortContainer = el.shadowRoot?.querySelector(
+      '#desktop-sort-container'
     );
 
-    expect(mobileSortSelector?.classList?.contains('visible')).to.be.true;
-    expect(desktopSortSelector?.classList?.contains('hidden')).to.be.true;
+    expect(mobileSortContainer?.classList?.contains('visible')).to.be.true;
+    expect(desktopSortContainer?.classList?.contains('hidden')).to.be.true;
   });
 
   it('changes selected sort in mobile view', async () => {

package/tsconfig.json

@@ -1,21 +1,21 @@
-{
-  "compilerOptions": {
-    "target": "es2018",
-    "module": "esnext",
-    "moduleResolution": "node",
-    "noEmitOnError": true,
-    "lib": ["es2017", "dom"],
-    "strict": true,
-    "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
-    "experimentalDecorators": true,
-    "importHelpers": true,
-    "outDir": "dist",
-    "sourceMap": true,
-    "inlineSources": true,
-    "rootDir": "./",
-    "declaration": true,
-    "importsNotUsedAsValues": "error"
-  },
-  "include": ["src", "test", "index.ts", "types"],
-}
+{
+  "compilerOptions": {
+    "target": "es2018",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "noEmitOnError": true,
+    "lib": ["es2017", "dom"],
+    "strict": true,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "outDir": "dist",
+    "sourceMap": true,
+    "inlineSources": true,
+    "rootDir": "./",
+    "declaration": true,
+    "importsNotUsedAsValues": "error"
+  },
+  "include": ["src", "test", "index.ts", "types"],
+}

package/web-dev-server.config.mjs

@@ -1,30 +1,30 @@
-// import { hmrPlugin, presets } from '@open-wc/dev-server-hmr';
-
-/** Use Hot Module replacement by adding --hmr to the start command */
-const hmr = process.argv.includes('--hmr');
-
-export default /** @type {import('@web/dev-server').DevServerConfig} */ ({
-  nodeResolve: true,
-  open: '/',
-  watch: !hmr,
-
-  /** Compile JS for older browsers. Requires @web/dev-server-esbuild plugin */
-  // esbuildTarget: 'auto'
-
-  /** Set appIndex to enable SPA routing */
-  // appIndex: 'demo/index.html',
-
-  /** Confgure bare import resolve plugin */
-  // nodeResolve: {
-  //   exportConditions: ['browser', 'development']
-  // },
-
-  plugins: [
-    /** Use Hot Module Replacement by uncommenting. Requires @open-wc/dev-server-hmr plugin */
-    // hmr && hmrPlugin({ exclude: ['**/*/node_modules/**/*'], presets: [presets.litElement] }),
-  ],
-
-  http2: true,
-  sslCert: './local.archive.org.cert',
-  sslKey: './local.archive.org.key',
-});
+// import { hmrPlugin, presets } from '@open-wc/dev-server-hmr';
+
+/** Use Hot Module replacement by adding --hmr to the start command */
+const hmr = process.argv.includes('--hmr');
+
+export default /** @type {import('@web/dev-server').DevServerConfig} */ ({
+  nodeResolve: true,
+  open: '/',
+  watch: !hmr,
+
+  /** Compile JS for older browsers. Requires @web/dev-server-esbuild plugin */
+  // esbuildTarget: 'auto'
+
+  /** Set appIndex to enable SPA routing */
+  // appIndex: 'demo/index.html',
+
+  /** Confgure bare import resolve plugin */
+  // nodeResolve: {
+  //   exportConditions: ['browser', 'development']
+  // },
+
+  plugins: [
+    /** Use Hot Module Replacement by uncommenting. Requires @open-wc/dev-server-hmr plugin */
+    // hmr && hmrPlugin({ exclude: ['**/*/node_modules/**/*'], presets: [presets.litElement] }),
+  ],
+
+  http2: true,
+  sslCert: './local.archive.org.cert',
+  sslKey: './local.archive.org.key',
+});

package/web-test-runner.config.mjs

@@ -1,41 +1,41 @@
-// import { playwrightLauncher } from '@web/test-runner-playwright';
-
-const filteredLogs = ['Running in dev mode', 'lit-html is in dev mode'];
-
-export default /** @type {import("@web/test-runner").TestRunnerConfig} */ ({
-  /** Test files to run */
-  files: 'dist/test/**/*.test.js',
-
-  /** Resolve bare module imports */
-  nodeResolve: {
-    exportConditions: ['browser', 'development'],
-  },
-
-  /** Filter out lit dev mode logs */
-  filterBrowserLogs(log) {
-    for (const arg of log.args) {
-      if (typeof arg === 'string' && filteredLogs.some(l => arg.includes(l))) {
-        return false;
-      }
-    }
-    return true;
-  },
-
-  /** Compile JS for older browsers. Requires @web/dev-server-esbuild plugin */
-  // esbuildTarget: 'auto',
-
-  /** Amount of browsers to run concurrently */
-  // concurrentBrowsers: 2,
-
-  /** Amount of test files per browser to test concurrently */
-  // concurrency: 1,
-
-  /** Browsers to run tests on */
-  // browsers: [
-  //   playwrightLauncher({ product: 'chromium' }),
-  //   playwrightLauncher({ product: 'firefox' }),
-  //   playwrightLauncher({ product: 'webkit' }),
-  // ],
-
-  // See documentation for all available options
-});
+// import { playwrightLauncher } from '@web/test-runner-playwright';
+
+const filteredLogs = ['Running in dev mode', 'lit-html is in dev mode'];
+
+export default /** @type {import("@web/test-runner").TestRunnerConfig} */ ({
+  /** Test files to run */
+  files: 'dist/test/**/*.test.js',
+
+  /** Resolve bare module imports */
+  nodeResolve: {
+    exportConditions: ['browser', 'development'],
+  },
+
+  /** Filter out lit dev mode logs */
+  filterBrowserLogs(log) {
+    for (const arg of log.args) {
+      if (typeof arg === 'string' && filteredLogs.some(l => arg.includes(l))) {
+        return false;
+      }
+    }
+    return true;
+  },
+
+  /** Compile JS for older browsers. Requires @web/dev-server-esbuild plugin */
+  // esbuildTarget: 'auto',
+
+  /** Amount of browsers to run concurrently */
+  // concurrentBrowsers: 2,
+
+  /** Amount of test files per browser to test concurrently */
+  // concurrency: 1,
+
+  /** Browsers to run tests on */
+  // browsers: [
+  //   playwrightLauncher({ product: 'chromium' }),
+  //   playwrightLauncher({ product: 'firefox' }),
+  //   playwrightLauncher({ product: 'webkit' }),
+  // ],
+
+  // See documentation for all available options
+});