refact(discovery): clear dataset selection

bento-platform · Sep 12, 2024 · 86789b2 · 86789b2
1 parent 4a8ea8e
commit 86789b2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/js/components/Scope/DatasetScopePicker.tsx b/src/js/components/Scope/DatasetScopePicker.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { List, Avatar, Space, Typography } from 'antd';
-import { useTranslationCustom, useTranslationDefault } from '@/hooks';
+import { useAppSelector, useTranslationCustom, useTranslationDefault } from '@/hooks';
 import { Link, useLocation } from 'react-router-dom';
 import { FaDatabase } from 'react-icons/fa';
 import { getCurrentPage } from '@/utils/router';
@@ -16,27 +16,31 @@ const DatasetScopePicker = ({ parentProject, isSingleProject }: DatasetScopePick
   const location = useLocation();
   const baseURL = '/' + location.pathname.split('/')[1];
   const page = getCurrentPage();
+
+  const selectedScope = useAppSelector((state) => state.metadata.selectedScope);
   return (
     <Space direction="vertical" style={{ display: 'flex' }}>
       <Space align="baseline" size="large">
         <Typography.Title level={4} className="no-margin-top">
           {td('Project')}: {t(parentProject.title)}
         </Typography.Title>
-        {isSingleProject ? (
-          // give clear scope option in single project mode
-          <Link to={baseURL}>
-            <Typography.Link>{td('Clear')}</Typography.Link>
-          </Link>
-        ) : (
+        {!isSingleProject && (
           <Link to={`${baseURL}/p/${parentProject.identifier}/${page}`} key="3">
             <Typography.Link>{td('Select')}</Typography.Link>
           </Link>
         )}
       </Space>
       <Typography.Text>{t(parentProject.description)}</Typography.Text>
-      <Typography.Title level={5} className="no-margin-top">
-        {td('Datasets')}
-      </Typography.Title>
+      <Space align="baseline" size="large">
+        <Typography.Title level={5} className="no-margin-top">
+          {td('Datasets')}
+        </Typography.Title>
+        {selectedScope?.dataset && (
+          <Link to={`${baseURL}/p/${parentProject.identifier}/${page}`} >
+            <Typography.Link>{td('Clear selection')}</Typography.Link>
+          </Link>
+        )}
+      </Space>
       <List
         dataSource={parentProject.datasets}
         bordered

diff --git a/src/js/components/SiteHeader.tsx b/src/js/components/SiteHeader.tsx
@@ -14,7 +14,7 @@ import { scopeToUrl } from '@/utils/router';
 import { DEFAULT_TRANSLATION, LNG_CHANGE, LNGS_FULL_NAMES } from '@/constants/configConstants';
 import { CLIENT_NAME, PORTAL_URL, TRANSLATED } from '@/config';
 
-import { ScopePickerModal } from './Scope/ScopePickerModal';
+import ScopePickerModal from './Scope/ScopePickerModal';
 
 const { Header } = Layout;