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

package/src/collection-browser.ts

@@ -63,7 +63,6 @@ import {
   RestorationState,
 } from './restoration-state-handler';
 import chevronIcon from './assets/img/icons/chevron';
-import { LanguageCodeHandler } from './language-code-handler/language-code-handler';
 import type { PlaceholderType } from './empty-placeholder';
 import './empty-placeholder';
 
@@ -195,8 +194,6 @@ export class CollectionBrowser
 
   @query('#content-container') private contentContainer!: HTMLDivElement;
 
-  private languageCodeHandler = new LanguageCodeHandler();
-
   @property({ type: Object, attribute: false })
   private analyticsHandler?: AnalyticsManagerInterface;
 
@@ -569,7 +566,6 @@ export class CollectionBrowser
         .maxSelectedDate=${this.maxSelectedDate}
         .selectedFacets=${this.selectedFacets}
         .collectionNameCache=${this.collectionNameCache}
-        .languageCodeHandler=${this.languageCodeHandler}
         .showHistogramDatePicker=${this.showHistogramDatePicker}
         .query=${this.filteredQuery}
         .filterMap=${this.filterMap}
@@ -936,24 +932,6 @@ export class CollectionBrowser
     }
 
     const filterMap = builder.build();
-
-    // TEMP: At present, the backend search engine incorrectly returns 0 results if
-    // the _first_ language filter contains a space, so let's try to avoid that if possible.
-    if (filterMap.language) {
-      for (const [value, constraint] of Object.entries(filterMap.language)) {
-        if (value.includes(' ')) {
-          // Delete and re-add this filter to make it the last one on the parent object
-          // (Technically this isn't in the standard, but most browser impls output
-          // object keys in the order they were added.)
-          delete filterMap.language[value];
-          filterMap.language[value] = constraint;
-        } else {
-          // As soon as we reach one without a space, we're done
-          break;
-        }
-      }
-    }
-
     return filterMap;
   }
 
@@ -1064,6 +1042,7 @@ export class CollectionBrowser
     facetName: string,
     facetValues: Record<string, FacetBucket>
   ): { name: string; values: Record<string, FacetBucket> } {
+    // eslint-disable-next-line prefer-const
     let [normalizedName, normalizedValues] = [facetName, facetValues];
 
     // The full "search engine" name of the lending field is "lending___status"
@@ -1071,18 +1050,6 @@ export class CollectionBrowser
       normalizedName = 'lending___status';
     }
 
-    // Language codes like "en-US|en-GB|en" need to be broken apart into individual values
-    if (facetName === 'language') {
-      normalizedValues = {};
-      for (const [facetValue, facetData] of Object.entries(facetValues)) {
-        const languages =
-          this.languageCodeHandler.getCodeArrayFromCodeString(facetValue);
-        for (const lang of languages) {
-          normalizedValues[lang] = { ...facetData };
-        }
-      }
-    }
-
     return {
       name: normalizedName,
       values: normalizedValues,
@@ -1358,11 +1325,7 @@ export class CollectionBrowser
         snippets: result.highlight?.values ?? [],
         source: result.source?.value,
         subjects: result.subject?.values ?? [],
-        title: this.etreeTitle(
-          result.title?.value,
-          result.mediatype?.value,
-          result.collection?.values
-        ),
+        title: result.title?.value ?? '',
         volume: result.volume?.value,
         viewCount: result.downloads?.value ?? 0,
         weeklyViewCount: result.week?.value,
@@ -1446,28 +1409,6 @@ export class CollectionBrowser
     this.updatePrefixFiltersForCurrentSort();
   }
 
-  /*
-   * Convert etree titles
-   * "[Creator] Live at [Place] on [Date]" => "[Date]: [Place]"
-   *
-   * Todo: Check collection(s) for etree, need to get as array.
-   * Current search-service only returns first collection as string.
-   */
-  private etreeTitle(
-    title: string | undefined,
-    mediatype: string | undefined,
-    collections: string[] | undefined
-  ): string {
-    if (mediatype === 'etree' || collections?.includes('etree')) {
-      const regex = /^(.*) Live at (.*) on (\d\d\d\d-\d\d-\d\d)$/;
-      const newTitle = title?.replace(regex, '$3: $2');
-      if (newTitle) {
-        return `${newTitle}`;
-      }
-    }
-    return title ?? '';
-  }
-
   /**
    * Callback when a result is selected
    */

package/src/collection-facets/more-facets-content.ts

@@ -30,7 +30,6 @@ import {
   facetTitles,
   suppressedCollections,
 } from '../models';
-import type { LanguageCodeHandlerInterface } from '../language-code-handler/language-code-handler';
 import '@internetarchive/ia-activity-indicator/ia-activity-indicator';
 import './more-facets-pagination';
 import './facets-template';
@@ -58,9 +57,6 @@ export class MoreFacetsContent extends LitElement {
   @property({ type: Object })
   collectionNameCache?: CollectionNameCacheInterface;
 
-  @property({ type: Object })
-  languageCodeHandler?: LanguageCodeHandlerInterface;
-
   @property({ type: Object }) selectedFacets?: SelectedFacets;
 
   @property({ type: String }) sortedBy: 'count' | 'alpha' = 'count';
@@ -222,15 +218,7 @@ export class MoreFacetsContent extends LitElement {
 
         const buckets: FacetBucket[] = Object.entries(selectedFacets).map(
           ([value, data]) => {
-            let displayText: string = value;
-            // for selected languages, we store the language code instead of the
-            // display name, so look up the name from the mapping
-            if (option === 'language') {
-              displayText =
-                this.languageCodeHandler?.getLanguageNameFromCodeString(
-                  value
-                ) ?? value;
-            }
+            const displayText: string = value;
             return {
               displayText,
               key: value,
@@ -294,15 +282,7 @@ export class MoreFacetsContent extends LitElement {
       );
 
       const facetBucket: FacetBucket[] = bucketsMaxSix.map(bucket => {
-        let bucketKey = bucket.key;
-        // for languages, we need to search by language code instead of the
-        // display name, which is what we get from the search engine result
-        if (option === 'language') {
-          bucketKey =
-            this.languageCodeHandler?.getCodeStringFromLanguageName(
-              `${bucket.key}`
-            ) ?? bucket.key;
-        }
+        const bucketKey = bucket.key;
         return {
           displayText: `${bucket.key}`,
           key: `${bucketKey}`,

package/src/collection-facets.ts

@@ -41,7 +41,6 @@ import {
   LendingFacetKey,
   suppressedCollections,
 } from './models';
-import type { LanguageCodeHandlerInterface } from './language-code-handler/language-code-handler';
 import './collection-facets/more-facets-content';
 import './collection-facets/facets-template';
 import './collection-facets/facet-tombstone-row';
@@ -95,9 +94,6 @@ export class CollectionFacets extends LitElement {
   @property({ type: Object, attribute: false })
   analyticsHandler?: AnalyticsManagerInterface;
 
-  @property({ type: Object, attribute: false })
-  languageCodeHandler?: LanguageCodeHandlerInterface;
-
   @property({ type: Object, attribute: false })
   collectionNameCache?: CollectionNameCacheInterface;
 
@@ -292,14 +288,6 @@ export class CollectionFacets extends LitElement {
         const buckets: FacetBucket[] = Object.entries(selectedFacets).map(
           ([value, facetData]) => {
             let displayText: string = value;
-            // for selected languages, we store the language code instead of the
-            // display name, so look up the name from the mapping
-            if (option === 'language') {
-              displayText =
-                this.languageCodeHandler?.getLanguageNameFromCodeString(
-                  value
-                ) ?? value;
-            }
             // for lending facets, convert the key to a readable format
             if (option === 'lending') {
               displayText =
@@ -351,18 +339,8 @@ export class CollectionFacets extends LitElement {
       }
 
       const facetBuckets: FacetBucket[] = castedBuckets.map(bucket => {
-        let bucketKey = bucket.key;
+        const bucketKey = bucket.key;
         let displayText = `${bucket.key}`;
-        // for languages, we need to search by language code instead of the
-        // display name, which is what we get from the search engine result
-        if (option === 'language') {
-          // const languageCodeKey = languageToCodeMap[bucket.key];
-          bucketKey =
-            this.languageCodeHandler?.getCodeStringFromLanguageName(
-              `${bucket.key}`
-            ) ?? bucket.key;
-          // bucketKey = languageCodeKey ?? bucket.key;
-        }
         // for lending facets, convert the bucket key to a readable format
         if (option === 'lending') {
           displayText =
@@ -499,7 +477,6 @@ export class CollectionFacets extends LitElement {
         .searchService=${this.searchService}
         .searchType=${this.searchType}
         .collectionNameCache=${this.collectionNameCache}
-        .languageCodeHandler=${this.languageCodeHandler}
         .selectedFacets=${this.selectedFacets}
         .sortedBy=${sortedBy}
         @facetsChanged=${(e: CustomEvent) => {

package/src/models.ts

@@ -79,13 +79,13 @@ export const SortFieldDisplayName: {
   [key in SortField]: string;
 } = {
   relevance: 'Relevance',
-  alltimeview: 'All-time Views',
-  weeklyview: 'Weekly Views',
+  alltimeview: 'All-time views',
+  weeklyview: 'Weekly views',
   title: 'Title',
-  datearchived: 'Date Archived',
-  date: 'Date Published',
-  datereviewed: 'Date Reviewed',
-  dateadded: 'Date Added',
+  datearchived: 'Date archived',
+  date: 'Date published',
+  datereviewed: 'Date reviewed',
+  dateadded: 'Date added',
   creator: 'Creator',
 };