refactor(catalog): Remove onCardNavigate from Catalog, use new 'to' p…

…roperty
NASA-IMPACT · Jan 14, 2025 · bc20466 · bc20466
1 parent 4b3105b
commit bc20466
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/app/scripts/components/common/catalog/catalog-card.tsx b/app/scripts/components/common/catalog/catalog-card.tsx
@@ -17,6 +17,7 @@ import {
   getTaxonomy
 } from '$utils/veda-data/taxonomies';
 import { Pill } from '$styles/pill';
+import { DATASETS_PATH } from '$utils/routes';
 
 interface CatalogCardProps {
   dataset: DatasetData;
@@ -115,14 +116,18 @@ export const CatalogCard = (props: CatalogCardProps) => {
     }
   };
 
+  const interactionProps = selectable
+    ? { onClick: handleClick }
+    : { to: `${DATASETS_PATH}/${dataset.id}` };
+
   return (
     <CardSelectable
       cardType='horizontal-info'
       checked={selectable ? selected : undefined}
       selectable={selectable}
       tagLabels={allTaxonomyValues}
       linkLabel='View dataset'
-      onClick={handleClick}
+      {...interactionProps}
       title={
         <TextHighlight value={searchTerm} disabled={searchTerm.length < 3}>
           {title}

diff --git a/app/scripts/components/common/catalog/catalog-content.tsx b/app/scripts/components/common/catalog/catalog-content.tsx
@@ -35,7 +35,6 @@ export interface CatalogContentProps {
   search: string;
   taxonomies: Record<string, string[]>;
   onAction: (action: FilterActions, value?: any) => void;
-  onCardNavigate?: (path: string) => void;
 }
 
 const DEFAULT_SORT_OPTION = 'asc';
@@ -72,7 +71,6 @@ function CatalogContent({
   search,
   taxonomies,
   onAction,
-  onCardNavigate
 }: CatalogContentProps) {
   const [exclusiveSourceSelected, setExclusiveSourceSelected] = useState<string | null>(null);
   const isSelectable = selectedIds !== undefined;
@@ -278,7 +276,6 @@ function CatalogContent({
                   <CatalogCard
                     dataset={d}
                     searchTerm={search}
-                    {...(onCardNavigate && {onDatasetClick: () => onCardNavigate(getDatasetPath(d, pathname))})}
                   />
                 </li>
               ))}

diff --git a/app/scripts/components/common/catalog/index.tsx b/app/scripts/components/common/catalog/index.tsx
@@ -41,13 +41,11 @@ export interface CatalogViewProps {
     taxonomies: Record<string, string[]> | Record<string, never>,
     onAction: () => void,
   } | any;
-  onCardNavigate?: (path: string) => void;
 }
 
 function CatalogView({
   datasets,
   onFilterChanges,
-  onCardNavigate
 }: CatalogViewProps) {
 
   const { headerHeight } = useSlidingStickyHeaderProps();
@@ -70,7 +68,6 @@ function CatalogView({
         search={search}
         taxonomies={taxonomies}
         onAction={onAction}
-        onCardNavigate={onCardNavigate}
       />
     </CatalogWrapper>
   );

diff --git a/app/scripts/components/data-catalog/container.tsx b/app/scripts/components/data-catalog/container.tsx
@@ -20,11 +20,6 @@ import { useFiltersWithQS } from '$components/common/catalog/controls/hooks/use-
 export default function DataCatalogContainer() {
   const allDatasets = getAllDatasetsProps(veda_faux_module_datasets);
   const controlVars = useFiltersWithQS();
-  const navigate = useNavigate();
-
-  const handleCardNavigation = (path: string) => {
-    navigate(path);
-  };
 
   return (
     <PageMainContent>
@@ -40,7 +35,6 @@ export default function DataCatalogContainer() {
       <CatalogView
         datasets={allDatasets}
         onFilterChanges={() => controlVars}
-        onCardNavigate={handleCardNavigation}
       />
     </PageMainContent>
   );