Merge remote-tracking branch 'origin/bugfix/ZKUI-206-fix-double-workf…

…low-table' into w/1.5/bugfix/ZKUI-206-fix-double-workflow-table
scality · Jun 29, 2022 · c9afe8f · c9afe8f
2 parents e74e4db + ccc968b
commit c9afe8f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 27 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zenko-ui",
-  "version": "1.5.0-preview.4",
+  "version": "1.5.0-preview.5",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/src/react/databrowser/buckets/BucketDetails.tsx b/src/react/databrowser/buckets/BucketDetails.tsx
@@ -24,34 +24,29 @@ const NotFound = () => (
 function BucketDetails({ bucket, ingestionStates }: Props) {
   const { pathname } = useLocation();
   const query = useQueryParams();
-  const tabName = query.get('tab');
   const queryObject = Object.fromEntries(query.entries());
 
-  const details = () => {
-    if (!bucket) {
-      return <NotFound />;
-    }
-
-    if (tabName === 'workflow') {
-      return <Workflow bucketName={bucket.Name}></Workflow>;
-    } else
-      return <Overview bucket={bucket} ingestionStates={ingestionStates} />;
-  };
-
   return (
     <ContentSection>
-      <CustomTabs>
-        <CustomTabs.Tab label="Overview" path={pathname}>
-          {details()}
-        </CustomTabs.Tab>
-        <CustomTabs.Tab
-          label="Workflow"
-          path={pathname}
-          query={{ ...queryObject, tab: 'workflow' }}
-        >
-          {details()}
-        </CustomTabs.Tab>
-      </CustomTabs>
+      {bucket && (
+        <CustomTabs>
+          <CustomTabs.Tab
+            label="Overview"
+            path={pathname}
+            query={{ ...queryObject, tab: null }}
+          >
+            <Overview bucket={bucket} ingestionStates={ingestionStates} />
+          </CustomTabs.Tab>
+          <CustomTabs.Tab
+            label="Workflow"
+            path={pathname}
+            query={{ ...queryObject, tab: 'workflow' }}
+          >
+            <Workflow bucketName={bucket.Name}></Workflow>
+          </CustomTabs.Tab>
+        </CustomTabs>
+      )}
+      {!bucket && <NotFound />}
     </ContentSection>
   );
 }