Make first tab open

eea · Mar 1, 2023 · e578106 · e578106
1 parent 792aeec
commit e578106
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/src/components/ItemView/Datasets.jsx b/src/components/ItemView/Datasets.jsx
@@ -272,7 +272,7 @@ const Datasets = (props) => {
   const { item, appConfig } = props;
   const { children } = item?.raw_value?.raw || {};
 
-  const [activeIndex, setActiveIndex] = React.useState(-1);
+  const [activeIndex, setActiveIndex] = React.useState(0);
 
   function handleClick(e, titleProps) {
     const { index } = titleProps;
@@ -318,7 +318,9 @@ const Datasets = (props) => {
 
   const panes = (groupedDatasets || []).map((item, i) => ({
     menuItem: (
-      <Menu.Item>{item.date ? <span>{item.date}</span> : 'No date'}</Menu.Item>
+      <Menu.Item key={i}>
+        {item.date ? <span>{item.date}</span> : 'No date'}
+      </Menu.Item>
     ),
     render: () => (
       <Tab.Pane>

diff --git a/src/components/ItemView/ItemView.jsx b/src/components/ItemView/ItemView.jsx
@@ -107,15 +107,7 @@ function ItemView(props) {
           <Banner>
             <Banner.Content>
               <Banner.Subtitle>
-                <Link
-                  to={
-                    location?.state
-                      ? { pathname: fromPathname, search: fromSearch }
-                      : {
-                          pathname: '/en/datahub/',
-                        }
-                  }
-                >
+                <Link to={appConfig.landingPageURL}>
                   <Icon className="arrow left" />
                   Datahub overview
                 </Link>

diff --git a/src/components/Result/DatahubCardItem.jsx b/src/components/Result/DatahubCardItem.jsx
@@ -13,18 +13,10 @@ const DatahubCardItem = (props) => {
   // if (metaType.length === 0) {
   //   metaType = 'Others';
   // }
+
   const item = {
     title: (
-      <Link
-        to={{
-          pathname: result.href,
-          state: {
-            fromPathname: window.location.pathname,
-            fromSearch: window.location.search,
-          },
-        }}
-        title={result.title}
-      >
+      <Link to={result.href} title={result.title}>
         {result.title}
       </Link>
     ),