Adding hashes to system tab URLs

clients/admin-ui/cypress/e2e/systems-plus.cy.ts

@@ -460,4 +460,36 @@ describe("System management with Plus features", () => {
       });
     });
   });
+
+  describe("tab navigation", () => {
+    it("updates URL hash when switching tabs", () => {
+      cy.visit(`${SYSTEM_ROUTE}/configure/demo_analytics_system#information`);
+      cy.location("hash").should("eq", "#information");
+
+      cy.getByTestId("tab-Data uses").click();
+      cy.location("hash").should("eq", "#data-uses");
+
+      cy.getByTestId("tab-Data flow").click();
+      cy.location("hash").should("eq", "#data-flow");
+
+      cy.getByTestId("tab-Integrations").click();
+      cy.location("hash").should("eq", "#integrations");
+
+      cy.getByTestId("tab-History").click();
+      cy.location("hash").should("eq", "#history");
+    });
+
+    it("loads correct tab directly based on URL hash", () => {
+      // Visit page with specific hash
+      cy.visit(`${SYSTEM_ROUTE}/configure/demo_analytics_system#data-uses`);
+
+      // Verify correct tab is active
+      cy.getByTestId("tab-Data uses").should(
+        "have.attr",
+        "aria-selected",
+        "true",
+      );
+      cy.location("hash").should("eq", "#data-uses");
+    });
+  });
 });

clients/admin-ui/src/features/system/hooks/useSystemFormTabs.tsx

@@ -13,7 +13,11 @@ import {
 } from "~/features/common/hooks/useIsAnyFormDirty";
 import { useSystemOrDatamapRoute } from "~/features/common/hooks/useSystemOrDatamapRoute";
 import { INTEGRATION_MANAGEMENT_ROUTE } from "~/features/common/nav/v2/routes";
-import { DEFAULT_TOAST_PARAMS } from "~/features/common/toast";
+import {
+  DEFAULT_TOAST_PARAMS,
+  errorToastParams,
+  successToastParams,
+} from "~/features/common/toast";
 import ToastLink from "~/features/common/ToastLink";
 import ConnectionForm from "~/features/datastore-connections/system_portal_config/ConnectionForm";
 import { ConsentAutomationForm } from "~/features/datastore-connections/system_portal_config/ConsentAutomationForm";
@@ -31,6 +35,38 @@ import {
 import SystemInformationForm from "~/features/system/SystemInformationForm";
 import { SystemResponse } from "~/types/api";
 
+const SYSTEM_TABS = {
+  INFORMATION: {
+    index: 0,
+    hash: "#information",
+  },
+  DATA_USES: {
+    index: 1,
+    hash: "#data-uses",
+  },
+  DATA_FLOW: {
+    index: 2,
+    hash: "#data-flow",
+  },
+  INTEGRATIONS: {
+    index: 3,
+    hash: "#integrations",
+  },
+  HISTORY: {
+    index: 4,
+    hash: "#history",
+  },
+} as const;
+
+const getTabFromHash = (hash: string) => {
+  const normalizedHash = hash.startsWith("#") ? hash : `#${hash}`;
+  return Object.values(SYSTEM_TABS).find((tab) => tab.hash === normalizedHash);
+};
+
+const getTabFromIndex = (index: number) => {
+  return Object.values(SYSTEM_TABS).find((tab) => tab.index === index);
+};
+
 // The toast doesn't seem to handle next links well, so use buttons with onClick
 // handlers instead
 const ToastMessage = ({
@@ -56,16 +92,25 @@ const ToastMessage = ({
 
 const useSystemFormTabs = ({
   isCreate,
-  initialTabIndex,
 }: {
   initialTabIndex?: number;
   /** If true, then some editing features will not be enabled */
   isCreate?: boolean;
 }) => {
-  const [tabIndex, setTabIndex] = useState(initialTabIndex);
+  const router = useRouter();
+
+  // Get initial tab index based on URL hash
+  const getInitialTabIndex = (): number => {
+    const hash: string = router.asPath.split("#")[1];
+    return hash
+      ? (getTabFromHash(hash)?.index ?? SYSTEM_TABS.INFORMATION.index)
+      : SYSTEM_TABS.INFORMATION.index;
+  };
+
+  const [tabIndex, setTabIndex] = useState(getInitialTabIndex());
+
   const [showSaveMessage, setShowSaveMessage] = useState(false);
   const { systemOrDatamapRoute } = useSystemOrDatamapRoute();
-  const router = useRouter();
   const toast = useToast();
   const dispatch = useAppDispatch();
   const activeSystem = useAppSelector(selectActiveSystem) as SystemResponse;
@@ -145,13 +190,49 @@ const useSystemFormTabs = ({
     (index: number) => {
       attemptAction().then((modalConfirmed: boolean) => {
         if (modalConfirmed) {
+          const { status } = router.query;
+          if (status) {
+            if (status === "succeeded") {
+              toast(successToastParams(`Integration successfully authorized.`));
+            } else {
+              toast(errorToastParams(`Failed to authorize integration.`));
+            }
+          }
+
+          // Update local state first
           setTabIndex(index);
+
+          // Update URL if router is ready
+          if (router.isReady) {
+            const tab = getTabFromIndex(index);
+            if (tab) {
+              const newQuery = { ...router.query };
+              delete newQuery.status;
+
+              router.replace(
+                {
+                  pathname: router.pathname,
+                  query: newQuery,
+                  hash: tab.hash,
+                },
+                undefined,
+                { shallow: true },
+              );
+            }
+          }
         }
       });
     },
-    [attemptAction],
+    [attemptAction, router, toast],
   );
 
+  useEffect(() => {
+    const { status } = router.query;
+    if (status) {
+      onTabChange(SYSTEM_TABS.INTEGRATIONS.index);
+    }
+  }, [router.query, onTabChange]);
+
   const showNewIntegrationNotice = hasPlus && dataDiscoveryAndDetection;
 
   const tabData: TabData[] = [

clients/admin-ui/src/pages/systems/configure/[id].tsx

@@ -1,7 +1,7 @@
-import { AntButton as Button, Box, Text, useToast, VStack } from "fidesui";
+import { AntButton as Button, Box, Text, VStack } from "fidesui";
 import type { NextPage } from "next";
 import { useRouter } from "next/router";
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
 
 import { useAppDispatch, useAppSelector } from "~/app/hooks";
 import DataTabsContent from "~/features/common/DataTabsContent";
@@ -16,7 +16,6 @@ import {
   SYSTEM_ROUTE,
 } from "~/features/common/nav/v2/routes";
 import PageHeader from "~/features/common/PageHeader";
-import { errorToastParams, successToastParams } from "~/features/common/toast";
 import { useGetAllDictionaryEntriesQuery } from "~/features/plus/plus.slice";
 import {
   setActiveSystem,
@@ -29,13 +28,9 @@ import {
 import GVLNotice from "~/features/system/GVLNotice";
 import useSystemFormTabs from "~/features/system/hooks/useSystemFormTabs";
 
-const INTEGRATION_TAB_INDEX = 3; // this needs to be updated if the order of the tabs changes
-
 const ConfigureSystem: NextPage = () => {
-  const toast = useToast();
   const router = useRouter();
   const dispatch = useAppDispatch();
-  const [initialTabIndex, setInitialTabIndex] = useState(0);
 
   let systemId = "";
   if (router.query.id) {
@@ -70,33 +65,8 @@ const ConfigureSystem: NextPage = () => {
     }
   }, [system, dispatch, isTCFEnabled]);
 
-  useEffect(() => {
-    const { status } = router.query;
-
-    if (status) {
-      if (status === "succeeded") {
-        toast(successToastParams(`Integration successfully authorized.`));
-      } else {
-        toast(errorToastParams(`Failed to authorize integration.`));
-      }
-      // create a new url without the status query param
-      const newQuery = { ...router.query };
-      delete newQuery.status;
-      const newUrl = {
-        pathname: router.pathname,
-        query: newQuery,
-      };
-
-      // replace the current history entry
-      router.replace(newUrl, undefined, { shallow: true });
-
-      setInitialTabIndex(INTEGRATION_TAB_INDEX);
-    }
-  }, [router, toast]);
-
   const { tabData, tabIndex, onTabChange } = useSystemFormTabs({
     isCreate: false,
-    initialTabIndex,
   });
 
   if ((isLoading || isDictionaryLoading) && !dictionaryError) {

clients/admin-ui/src/pages/systems/index.tsx

@@ -129,6 +129,7 @@ const Systems: NextPage = () => {
         query: {
           id: system.fides_key,
         },
+        hash: "#information",
       });
     },
     [dispatch, router],