Merged PR 2675: incident tabs

- opening incident tab correctly
- getting IncidentsHistograms correctly

Author: Aleksy Lisowski

dqops/src/main/frontend/src/components/IncidentsLayout/IncidentsTree.tsx

@@ -60,22 +60,22 @@ const IncidentsTree = () => {
   };
 
   const openCorrectTabFromUrl = () => {
-    if (
-      window.location.pathname === '/incidents' ||
-      window.location.pathname === '/incidents/'
-    ) {
-      return;
-    }
+    // if (
+    //   window.location.pathname === '/incidents' ||
+    //   window.location.pathname === '/incidents/'
+    // ) {
+    //   return;
+    // }
 
     const path = window.location.pathname.split('/');
     const connection = path[2];
     const selectedConnection = connections.find(
       (x) => x.connection === connection
     );
-
     if (selectedConnection && !path[3]) {
       openFirstLevelTab(selectedConnection);
     } else if (path[3]) {
+      console.log(selectedConnection, path);
       const connection = path[2] || '';
       const year = Number(path[3]);
       const month = Number(path[4]);
@@ -95,13 +95,17 @@ const IncidentsTree = () => {
         })
       );
 
-      dispatch(
-        setActiveFirstLevelTab(
-          ROUTES.INCIDENT_DETAIL(connection, year, month, incidentId)
-        )
-      );
       history.push(ROUTES.INCIDENT_DETAIL(connection, year, month, incidentId));
     }
+    if (
+      activeTab &&
+      activeTab !== window.location.pathname &&
+      (window.location.pathname === '/incidents/' ||
+        window.location.pathname === '/incidents')
+    ) {
+      dispatch(setActiveFirstLevelTab(activeTab));
+      history.push(activeTab);
+    }
   };
 
   useEffect(() => {

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

@@ -47,6 +47,11 @@ const IncidentsLayout = ({ route }: LayoutProps) => {
       history.push(`/incidents`);
       return;
     }
+    if (tabIndex === 0 && pageTabs.length > 1) {
+      history.push(pageTabs[1]?.url);
+      dispatch(setActiveFirstLevelTab(pageTabs[1]?.url));
+      return;
+    }
     history.push(pageTabs[tabIndex - 1]?.url || pageTabs[0]?.url);
     dispatch(
       setActiveFirstLevelTab(pageTabs[tabIndex - 1]?.url || pageTabs[0]?.url)

dqops/src/main/frontend/src/pages/IncidentDetail/HistogramChart.tsx

@@ -8,6 +8,7 @@ import {
   getIncidentsHistograms,
   setIncidentsHistogramFilter
 } from '../../redux/actions/incidents.actions';
+import { IRootState } from '../../redux/reducers';
 import {
   IncidentHistogramFilter,
   IncidentIssueFilter
@@ -44,6 +45,7 @@ export const HistogramChart = ({
     histograms: IncidentIssueHistogramModel;
     histogramFilter: IncidentHistogramFilter;
   } = useSelector(getFirstLevelIncidentsState);
+  const { activeTab } = useSelector((state: IRootState) => state.incidents);
   const dispatch = useActionDispatch();
 
   useEffect(() => {
@@ -60,9 +62,8 @@ export const HistogramChart = ({
 
   useEffect(() => {
     if (!histogramFilter) return;
-
-    dispatch(getIncidentsHistograms(histogramFilter));
-  }, [histogramFilter]);
+    dispatch(getIncidentsHistograms(histogramFilter ?? {}));
+  }, [histogramFilter, activeTab]);
 
   const onChangeFilter = (obj: Partial<IncidentHistogramFilter>) => {
     dispatch(