fix: change dashboard route /settings/deployment to /deployment

kylecarbs · kylecarbs · commit 8c59ab7aa5e0 · 2023-08-13T16:48:41.000Z
It felt unnecessary to nest this.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ describe("NavbarView", () => {`
`154`	`154`	`)`
`155`	`155`	`const auditLink = await screen.findByText(navLanguage.deployment)`
`156`	`156`	`expect((auditLink as HTMLAnchorElement).href).toContain(`
`157`		`- "/settings/deployment/general",`
	`157`	`+ "/deployment/general",`
`158`	`158`	`)`
`159`	`159`	`})`
`160`	`160`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ export const AddNewLicensePageView: FC<AddNewLicenseProps> = ({`
`60`	`60`	`<Button`
`61`	`61`	`component={RouterLink}`
`62`	`62`	`startIcon={<KeyboardArrowLeft />}`
`63`		`- to="/settings/deployment/licenses"`
	`63`	`+ to="/deployment/licenses"`
`64`	`64`	`>`
`65`	`65`	`All Licenses`
`66`	`66`	`</Button>`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ const LicensesSettingsPageView: FC<Props> = ({`
`57`	`57`
`58`	`58`	`<Button`
`59`	`59`	`component={Link}`
`60`		`- to="/settings/deployment/licenses/add"`
	`60`	`+ to="/deployment/licenses/add"`
`61`	`61`	`startIcon={<AddIcon />}`
`62`	`62`	`>`
`63`	`63`	`Add a license`