Merge branch 'develop' of https://dev.azure.com/imagetemplates/documa…

…ti.io/_git/dqoado into develop
dqops · Jun 28, 2024 · 266c98c · 266c98c
2 parents 44035b1 + 5f9d409
commit 266c98c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/dqops/src/main/frontend/src/components/MainLayout/Tree/index.tsx b/dqops/src/main/frontend/src/components/MainLayout/Tree/index.tsx
@@ -385,7 +385,7 @@ const Tree = () => {
         <div
           style={{
             position: 'absolute',
-            right: '30px',
+            right: '70px',
             top: '-9px',
             borderRadius: '3px'
           }}
@@ -407,7 +407,7 @@ const Tree = () => {
         <div
           style={{
             position: 'absolute',
-            right: '30px',
+            right: '45px',
             top: '-9px',
             borderRadius: '3px'
           }}

diff --git a/dqops/src/main/frontend/src/contexts/treeContext.tsx b/dqops/src/main/frontend/src/contexts/treeContext.tsx
@@ -1656,25 +1656,25 @@ function TreeProvider(props: any) {
         schemaNode?.label ?? '',
         tableNode?.label ?? ''
       );
-      if (firstLevelActiveTab === location.pathname) {
+      const value = ROUTES.TABLE_COLUMNS_VALUE(
+        checkType,
+        connectionNode?.label ?? '',
+        schemaNode?.label ?? '',
+        tableNode?.label ?? ''
+      );
+
+      if (firstLevelActiveTab === url) {
         return;
       }
       dispatch(
         addFirstLevelTab(checkType, {
           url,
-          value: url,
+          value,
           state: {},
           label: node.label
         })
       );
-      history.push(
-        ROUTES.TABLE_COLUMNS(
-          checkType,
-          connectionNode?.label ?? '',
-          schemaNode?.label ?? '',
-          tableNode?.label ?? ''
-        )
-      );
+      history.push(url);
     } else if (node.level === TREE_LEVEL.TABLE_INCIDENTS) {
       const tableNode = findTreeNode(treeData, node.parentId ?? '');
       const schemaNode = findTreeNode(treeData, tableNode?.parentId ?? '');

diff --git a/dqops/src/main/frontend/src/pages/Home/index.tsx b/dqops/src/main/frontend/src/pages/Home/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import Header from '../../components/Header';
@@ -35,6 +35,14 @@ const HomePage = () => {
     history.push(activeTab);
   };
 
+  useEffect(() => {
+    if (!activeTab) {
+      dispatch(setHomeFirstLevelTab('/home'));
+    } else if (activeTab !== history.location.pathname) {
+      history.push(activeTab);
+    }
+  }, [activeTab]);
+
   return (
     <div style={{ height: 'calc(100vh - 200px)' }}>
       <Header />

diff --git a/dqops/src/main/frontend/src/redux/reducers/source.reducer.ts b/dqops/src/main/frontend/src/redux/reducers/source.reducer.ts
@@ -62,7 +62,7 @@ const initialState: ISourceState = {
     tabs: []
   },
   home: {
-    activeTab: window.location.pathname === '/home' ? '/home' : '/tables'
+    activeTab: '/home'
   }
 };