From 8c59ab7aa5e074c406aa7142a0aecb8cb8268aee Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@carberry.com>
Date: Sun, 13 Aug 2023 16:45:41 +0000
Subject: [PATCH] fix: change dashboard route `/settings/deployment` to
 `/deployment`

It felt unnecessary to nest this.
---
 site/src/AppRouter.tsx                                       | 5 +----
 site/src/components/Navbar/NavbarView.test.tsx               | 2 +-
 site/src/components/Navbar/NavbarView.tsx                    | 2 +-
 .../LicensesSettingsPage/AddNewLicensePage.tsx               | 4 ++--
 .../LicensesSettingsPage/AddNewLicensePageView.tsx           | 2 +-
 .../LicensesSettingsPage/LicensesSettingsPageView.tsx        | 2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
index 449d4925febb3..c1f222d90c334 100644
--- a/site/src/AppRouter.tsx
+++ b/site/src/AppRouter.tsx
@@ -272,10 +272,7 @@ export const AppRouter: FC = () => {
 
               <Route path="/audit" element={<AuditPage />} />
 
-              <Route
-                path="/settings/deployment"
-                element={<DeploySettingsLayout />}
-              >
+              <Route path="/deployment" element={<DeploySettingsLayout />}>
                 <Route path="general" element={<GeneralSettingsPage />} />
                 <Route path="licenses" element={<LicensesSettingsPage />} />
                 <Route path="licenses/add" element={<AddNewLicensePage />} />
diff --git a/site/src/components/Navbar/NavbarView.test.tsx b/site/src/components/Navbar/NavbarView.test.tsx
index 307670708cc72..2ba0abc8e0ab4 100644
--- a/site/src/components/Navbar/NavbarView.test.tsx
+++ b/site/src/components/Navbar/NavbarView.test.tsx
@@ -154,7 +154,7 @@ describe("NavbarView", () => {
     )
     const auditLink = await screen.findByText(navLanguage.deployment)
     expect((auditLink as HTMLAnchorElement).href).toContain(
-      "/settings/deployment/general",
+      "/deployment/general",
     )
   })
 
diff --git a/site/src/components/Navbar/NavbarView.tsx b/site/src/components/Navbar/NavbarView.tsx
index e90c23e7654e0..780cbd98deb81 100644
--- a/site/src/components/Navbar/NavbarView.tsx
+++ b/site/src/components/Navbar/NavbarView.tsx
@@ -93,7 +93,7 @@ const NavItems: React.FC<
       )}
       {canViewDeployment && (
         <ListItem button className={styles.item}>
-          <NavLink className={styles.link} to="/settings/deployment/general">
+          <NavLink className={styles.link} to="/deployment/general">
             {Language.deployment}
           </NavLink>
         </ListItem>
diff --git a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePage.tsx b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePage.tsx
index 7c75dca3713c0..3d60005a5e87f 100644
--- a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePage.tsx
+++ b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePage.tsx
@@ -17,7 +17,7 @@ const AddNewLicensePage: FC = () => {
   } = useMutation(createLicense, {
     onSuccess: () => {
       displaySuccess("You have successfully added a license")
-      navigate("/settings/deployment/licenses?success=true")
+      navigate("/deployment/licenses?success=true")
     },
     onError: () => displayError("Failed to save license key"),
   })
@@ -28,7 +28,7 @@ const AddNewLicensePage: FC = () => {
       {
         onSuccess: () => {
           displaySuccess("You have successfully added a license")
-          navigate("/settings/deployment/licenses?success=true")
+          navigate("/deployment/licenses?success=true")
         },
         onError: () => displayError("Failed to save license key"),
       },
diff --git a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePageView.tsx b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePageView.tsx
index 48d0bb992b71a..a7a2fbc346718 100644
--- a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePageView.tsx
+++ b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePageView.tsx
@@ -60,7 +60,7 @@ export const AddNewLicensePageView: FC<AddNewLicenseProps> = ({
         <Button
           component={RouterLink}
           startIcon={<KeyboardArrowLeft />}
-          to="/settings/deployment/licenses"
+          to="/deployment/licenses"
         >
           All Licenses
         </Button>
diff --git a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx
index b1f5c678ac630..fe3286eab8c8c 100644
--- a/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx
+++ b/site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx
@@ -57,7 +57,7 @@ const LicensesSettingsPageView: FC<Props> = ({
 
         <Button
           component={Link}
-          to="/settings/deployment/licenses/add"
+          to="/deployment/licenses/add"
           startIcon={<AddIcon />}
         >
           Add a license