Merged PR 3050: routing & highlighting tree navigation bugs

- setting isTabChanged variable to avoid overriding activeTab from url - highlighting node in tree correctly
dqops · Sep 28, 2024 · 3c95426 · 3c95426
2 parents 8442415 + afdf1d1
commit 3c95426
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/dqops/src/main/frontend/src/components/ConnectionLayout/index.tsx b/dqops/src/main/frontend/src/components/ConnectionLayout/index.tsx
@@ -37,7 +37,7 @@ import TableMonthlyPartitionedChecksView from '../../pages/TableMonthlyPartition
 import TablePartitionedChecksUIFilterView from '../../pages/TablePartitionedChecksUIFilterView';
 import TableProfilingChecksUIFilterView from '../../pages/TableProfilingChecksUIFilterView';
 import TableProfilingChecksView from '../../pages/TableProfilingChecksView';
-import { setJobAllert } from '../../redux/actions/job.actions';
+import { setIsTabChanged, setJobAllert } from '../../redux/actions/job.actions';
 import {
  getFirstLevelActiveTab,
  getFirstLevelState
@@ -56,10 +56,10 @@ const ConnectionLayout = ({ route }: ConnectionLayoutProps) => {
  checkTypes: CheckTypes;
  } = useDecodedParams();
  const { objectNotFound, setObjectNotFound, setActiveTab } = useTree();
- const [isTabChanged, setIsTabChanged] = React.useState(false);
  const { tabs: pageTabs, activeTab } = useSelector(
  (state: IRootState) => state.source[checkTypes || CheckTypes.SOURCES]
  );
+ const { isTabChanged } = useSelector((state: IRootState) => state.job);
  const {
  dailyMonitoring,
  monthlyMonitoring,
@@ -86,7 +86,7 @@ const ConnectionLayout = ({ route }: ConnectionLayoutProps) => {
  setActiveTab(undefined);
  history.push(`/${checkTypes}`);
  }
- setIsTabChanged(true);
+ dispatch(setIsTabChanged(true));
  dispatch(closeFirstLevelTab(checkTypes, value));
  };
 
@@ -185,6 +185,7 @@ const ConnectionLayout = ({ route }: ConnectionLayoutProps) => {
  newRoute = newRoute.replace(`:${key}`, String(value));
  routeWithoutTab = routeWithoutTab.replace(`:${key}`, String(value));
  });
+
  dispatch(
  addFirstLevelTab(checkTypes, {
  url: newRoute,
@@ -193,7 +194,6 @@ const ConnectionLayout = ({ route }: ConnectionLayoutProps) => {
  routeWithoutTab.split('/')[routeWithoutTab.split('/').length - 1]
  })
  );
- setActiveTab(newRoute);
  }
  }
  }, [location.pathname, isTabChanged]);

diff --git a/dqops/src/main/frontend/src/components/Header/index.tsx b/dqops/src/main/frontend/src/components/Header/index.tsx
@@ -8,6 +8,7 @@ import { useActionDispatch } from '../../hooks/useActionDispatch';
 import {
  setAdvisorJobId,
  setAdvisorObject,
+ setIsTabChanged,
  setJobAllert,
  toggleAdvisor
 } from '../../redux/actions/job.actions';
@@ -67,6 +68,7 @@ const Header = () => {
  const { isAdvisorOpen, job_dictionary_state, advisorJobId, job_allert } =
  useSelector((state: IRootState) => state.job);
  const onClick = (newCheckTypes: CheckTypes) => () => {
+ dispatch(setIsTabChanged(true));
  dispatch(setJobAllert({}));
  let url = '';
  let value = '';
@@ -140,6 +142,7 @@ const Header = () => {
  column
  );
  }
+ console.log('url', url);
  if (!url) {
  url = `/` + newCheckTypes;
  history.push(url);

diff --git a/dqops/src/main/frontend/src/redux/actions/job.actions.ts b/dqops/src/main/frontend/src/redux/actions/job.actions.ts
@@ -165,3 +165,8 @@ export const setJobAllert = (job_allert: IJobAllert) => ({
  type: JOB_ACTION.SET_JOB_ALLERT,
  job_allert
 });
+
+export const setIsTabChanged = (isTabChanged: boolean) => ({
+ type: JOB_ACTION.SET_IS_TAB_CHANGED,
+ isTabChanged
+});
diff --git a/dqops/src/main/frontend/src/redux/reducers/job.reducer.ts b/dqops/src/main/frontend/src/redux/reducers/job.reducer.ts
@@ -57,6 +57,7 @@ export interface IJobsState {
  notificationCount: number;
  newNotification: boolean;
  job_allert: IJobAllert;
+ isTabChanged: boolean;
 }
 
 const initialState: IJobsState = {
@@ -80,7 +81,8 @@ const initialState: IJobsState = {
  isErrorModalOpen: false,
  notificationCount: 0,
  newNotification: false,
- job_allert: {}
+ job_allert: {},
+ isTabChanged: false
 };
 
 const schemaReducer = (state = initialState, action: any) => {
@@ -357,6 +359,12 @@ const schemaReducer = (state = initialState, action: any) => {
  job_allert: action.job_allert
  };
  }
+ case JOB_ACTION.SET_IS_TAB_CHANGED: {
+ return {
+ ...state,
+ isTabChanged: action.isTabChanged
+ };
+ }
  default:
  return state;
  }

diff --git a/dqops/src/main/frontend/src/redux/types/job.types.ts b/dqops/src/main/frontend/src/redux/types/job.types.ts
@@ -41,5 +41,6 @@ export enum JOB_ACTION {
  SET_NOTIFICATION_COUNT = 'JOB_ACTION/SET_NOTIFICATION_COUNT',
  SET_NEW_NOTIFIACTION = 'JOB_ACTION/SET_NEW_NOTIFIACTION',
 
- SET_JOB_ALLERT = 'JOB_ACTION/SET_JOB_ALLERT'
+ SET_JOB_ALLERT = 'JOB_ACTION/SET_JOB_ALLERT',
+ SET_IS_TAB_CHANGED = 'JOB_ACTION/SET_IS_TAB_CHANGED'
 }