Merged PR 2819: 12453 not refetching data when firstActiveLevelTab is changed, fixed closing Delete...

not refetching data when firstActiveLevelTab is changed, fixed closing DeleteData in userhome popup

Author: Aleksy Lisowski

dqops/src/main/frontend/src/components/Connection/ConnectionView/ConnectionDetail.tsx

@@ -76,7 +76,7 @@ const ConnectionDetail = () => {
 
   useEffect(() => {
     dispatch(getConnectionBasic(checkTypes, activeTab, connection));
-  }, [checkTypes, activeTab, connection]);
+  }, [checkTypes, connection]);
 
   const onChange = (obj: any) => {
     dispatch(

dqops/src/main/frontend/src/components/Connection/TableView/TableDetails.tsx

@@ -81,6 +81,7 @@ const TableDetails = () => {
   const firstLevelActiveTab = useSelector(getFirstLevelActiveTab(checkTypes));
   const { userProfile } = useSelector((state: IRootState) => state.job || {});
   useEffect(() => {
+    console.log(checkTypes, firstLevelActiveTab, connection, schema, table);
     dispatch(
       getTableBasic(checkTypes, firstLevelActiveTab, connection, schema, table)
     );
@@ -90,7 +91,7 @@ const TableDetails = () => {
       );
     };
     getConnectionBasic();
-  }, [checkTypes, firstLevelActiveTab, connection, schema, table]);
+  }, [checkTypes, connection, schema, table]);
 
   const handleChange = (obj: any) => {
     dispatch(

dqops/src/main/frontend/src/components/ConnectionLayout/index.tsx

@@ -199,14 +199,12 @@ const ConnectionLayout = ({ route }: ConnectionLayoutProps) => {
         open={objectNotFound}
         onConfirm={() =>
           new Promise(() => {
-            dispatch(closeFirstLevelTab(checkTypes, firstLevelActiveTab)),
-              setObjectNotFound(false);
+            setObjectNotFound(false), closeTab(firstLevelActiveTab);
           })
         }
         isCancelExcluded={true}
         onClose={() => {
-          dispatch(closeFirstLevelTab(checkTypes, firstLevelActiveTab)),
-            setObjectNotFound(false);
+          setObjectNotFound(false), closeTab(firstLevelActiveTab);
         }}
         message="The definition of this object was deleted in the DQOps user home. The tab will be closed."
       />

dqops/src/main/frontend/src/pages/ColumnView/ColumnDetails.tsx

@@ -71,14 +71,7 @@ const TableDetails = ({
         columnName
       )
     );
-  }, [
-    checkTypes,
-    firstLevelActiveTab,
-    connectionName,
-    schemaName,
-    columnName,
-    tableName
-  ]);
+  }, [checkTypes, connectionName, schemaName, columnName, tableName]);
 
   const onUpdate = async () => {
     if (!columnBasic) {

dqops/src/main/frontend/src/redux/reducers/source.reducer.ts

@@ -207,15 +207,16 @@ const connectionReducer = (state = initialState, action: Action) => {
         (item) => item.value === action.data
       );
       let activeTab = state[action.checkType].activeTab;
-
       if (state[action.checkType].activeTab === action.data) {
         if (index > 0) {
           activeTab = state[action.checkType]?.tabs[index - 1].value;
         } else if (index < state[action.checkType]?.tabs.length - 1) {
           activeTab = state[action.checkType]?.tabs[index + 1].value;
         }
+        if (index === 0 && state[action.checkType]?.tabs.length === 1) {
+          activeTab = undefined;
+        }
       }
-
       return {
         ...state,
         [action.checkType]: {