Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions site/src/AppRouter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 />} />
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/Navbar/NavbarView.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ describe("NavbarView", () => {
)
const auditLink = await screen.findByText(navLanguage.deployment)
expect((auditLink as HTMLAnchorElement).href).toContain(
"/settings/deployment/general",
"/deployment/general",
)
})

Expand Down
2 changes: 1 addition & 1 deletion site/src/components/Navbar/NavbarView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
})
Expand All @@ -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"),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const AddNewLicensePageView: FC<AddNewLicenseProps> = ({
<Button
component={RouterLink}
startIcon={<KeyboardArrowLeft />}
to="/settings/deployment/licenses"
to="/deployment/licenses"
>
All Licenses
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down