add Browse results processing

folio-org · Oct 18, 2024 · 58e6ed5 · 58e6ed5
1 parent 92262f8
commit 58e6ed5
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 34 deletions.
diff --git a/src/common/helpers/search/formatters/authorities.ts b/src/common/helpers/search/formatters/authorities.ts
@@ -4,28 +4,31 @@ export const formatAuthorityItem = (
   authoritiesList: AuthorityAsSearchResultDTO[],
   sourceData?: SourceDataDTO,
 ): SearchResultsTableRow[] =>
-  authoritiesList?.map(({ id, authRefType, headingRef, headingType, sourceFileId }) => {
-    const sourceLabel = sourceData?.find(({ id: sourceId }) => sourceId === sourceFileId)?.name ?? sourceFileId;
+  authoritiesList?.map(
+    ({ id = '', authRefType = '', headingRef = '', headingType = '', sourceFileId = '', isAnchor = false }) => {
+      const sourceLabel = sourceData?.find(({ id: sourceId }) => sourceId === sourceFileId)?.name ?? sourceFileId;
 
-    return {
-      __meta: {
-        id,
-        key: uuidv4(),
-      },
-      authorized: {
-        label: authRefType,
-      },
-      title: {
-        label: headingRef,
-        className: 'title',
-      },
-      subclass: {
-        label: headingType,
-        className: 'heading-type',
-      },
-      authoritySource: {
-        label: sourceLabel,
-        className: 'authority-source',
-      },
-    };
-  });
+      return {
+        __meta: {
+          id,
+          key: uuidv4(),
+          isAnchor,
+        },
+        authorized: {
+          label: authRefType,
+        },
+        title: {
+          label: headingRef,
+          className: 'title',
+        },
+        subclass: {
+          label: headingType,
+          className: 'heading-type',
+        },
+        authoritySource: {
+          label: sourceLabel,
+          className: 'authority-source',
+        },
+      };
+    },
+  );
diff --git a/src/common/hooks/useSearch.ts b/src/common/hooks/useSearch.ts
@@ -117,7 +117,7 @@ export const useSearch = () => {
               query: generatedQuery,
               offset: offset?.toString(),
               limit: searchResultsLimit?.toString(),
-              resultsContainer: searchResultsContainer,
+              resultsContainer: searchResultsContainer?.[selectedNavigationSegment as SearchSegmentValue],
             })
           : await getByIdentifier({
               endpointUrl: currentEndpointUrl ?? endpointUrl,

diff --git a/src/common/i18n/messages.ts b/src/common/i18n/messages.ts
@@ -183,7 +183,8 @@ export const BASE_LOCALE = {
   'ld.fetchingExternalResourceById': 'Fetching external resource id {resourceId}...',
   'ld.lastUpdated': 'Last updated',
   'ld.marcAuthorityRecord': 'MARC authority record',
-  'ld.selectBrowseOption': 'Select a browse option'
+  'ld.selectBrowseOption': 'Select a browse option',
+  'ld.searchQueryWouldBeHere': '{query} would be here'
 };
 
 export const i18nMessages = {

diff --git a/src/common/styles/common.scss b/src/common/styles/common.scss
@@ -17,6 +17,7 @@ $disabled-input-bg-color: #ebebe4;
 $disabled-input-color: #777;
 $buttonHighlighted: #1960a4;
 $buttonActive: rgba(37, 118, 195, 0.3);
+$error: #990000;
 
 $btn-hover-drop-shadow: 0px 10px 10px -6px rgba(0, 0, 0, 0.37);
 $highlighted-focusable-outline-box-shadow:

diff --git a/src/components/CommonStatus/CommonStatus.scss b/src/components/CommonStatus/CommonStatus.scss
@@ -1,3 +1,5 @@
+@import '@common/styles/common.scss';
+
 .common-status {
   position: fixed;
   bottom: 1.75rem;
@@ -61,13 +63,13 @@
   }
 
   &.error {
-    border-color: #990000;
-    color: #990000;
+    border-color: $error;
+    color: $error;
     background-color: #ead2d0;
 
     .status-message-icon path,
     .status-message-close path {
-      fill: #990000;
+      fill: $error;
     }
   }
 }

diff --git a/src/components/ComplexLookupField/ModalComplexLookup.scss b/src/components/ComplexLookupField/ModalComplexLookup.scss
@@ -108,6 +108,14 @@
             text-decoration: underline;
           }
         }
+
+        .search-results-item-missing-match {
+          font-weight: 700;
+
+          &-query {
+            color: $error;
+          }
+        }
       }
 
       .table-header-contents-wrapper {

diff --git a/src/components/ComplexLookupField/ModalComplexLookup.tsx b/src/components/ComplexLookupField/ModalComplexLookup.tsx
@@ -169,7 +169,7 @@ export const ModalComplexLookup: FC<ModalComplexLookupProps> = memo(
             getSearchFacetsData={getFacetsData}
             fetchSearchResults={getSearchResults}
             searchResultsLimit={api.searchQuery.limit}
-            searchResultsContainer={api.results.container}
+            searchResultsContainer={api.results.containers}
             onAssignRecord={onAssign}
           />
         </div>

diff --git a/src/components/ComplexLookupField/configs/Authorities.tsx b/src/components/ComplexLookupField/configs/Authorities.tsx
@@ -61,7 +61,16 @@ export const authoritiesTableConfig: SearchResultsTableConfig = {
           onTitleClick?.(__meta.id, title.label as string, subclass.label as string);
         };
 
-        return (
+        return __meta.isAnchor ? (
+          <div className='search-results-item-missing-match'>
+            <FormattedMessage
+              id="ld.searchQueryWouldBeHere"
+              values={{
+                query: <span className='search-results-item-missing-match-query'>{row.title.label}</span>,
+              }}
+            />
+          </div>
+        ) : (
           <Button type={ButtonType.Link} className="search-results-item-title" onClick={handleClick}>
             {row.title.label}
           </Button>

diff --git a/src/configs/complexLookup/complexLookup.config.ts b/src/configs/complexLookup/complexLookup.config.ts
@@ -22,7 +22,10 @@ export const COMPLEX_LOOKUPS_CONFIG: ComplexLookupsConfig = {
         limit: 100,
       },
       results: {
-        container: 'authorities',
+        containers: {
+          [SearchSegment.Search]: 'authorities',
+          [SearchSegment.Browse]: 'items',
+        },
       },
     },
     labels: {

diff --git a/src/types/api.d.ts b/src/types/api.d.ts
@@ -55,6 +55,7 @@ type AuthorityAsSearchResultDTO = {
   headingRef?: string;
   headingType?: string;
   sourceFileId?: string;
+  isAnchor?: boolean;
   [key: string]: string | string[];
 };
 

diff --git a/src/types/complexLookup.d.ts b/src/types/complexLookup.d.ts
@@ -43,7 +43,9 @@ type ComplexLookupApiEntryConfig = {
     limit?: number;
   };
   results: {
-    container: string;
+    containers: {
+      [key in SearchSegment]: string;
+    };
   };
 };
 

diff --git a/src/types/search.d.ts b/src/types/search.d.ts
@@ -42,7 +42,9 @@ type SearchParams = {
   getSearchFacetsData?: (facet?: string, isOpen?: boolean) => Promise<void>;
   searchResultsLimit?: number;
   fetchSearchResults?: (params: any) => Promise<SearchResults>;
-  searchResultsContainer?: string;
+  searchResultsContainer?: {
+    [key in SearchSegment]: string;
+  };
   hasMarcPreview?: boolean;
   renderMarcPreview?: () => JSX.Element | null;
   onAssignRecord?: ({ id, title, linkedFieldValue }: ComplexLookupAssignRecordDTO) => void;