Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8b9763d

Browse files
authored
fix: ensure active Deployment Page nav links are highlighted (#16092)
## Changes made- Updated links in the deployment settings page to ensure that they'rehighlighted properly- Updated comment about previous PR to make sure it's clear why weneeded a workaround.
1 parent8c44cd3 commit8b9763d

File tree

2 files changed

+26
-16
lines changed

2 files changed

+26
-16
lines changed

‎site/src/components/Sidebar/Sidebar.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ export const SettingsSidebarNavItem: FC<SettingsSidebarNavItemProps> = ({
6161
href,
6262
end,
6363
})=>{
64-
// useMatch is necessary to verify if the current path matches the href on the initial render of the route
64+
// 2025-01-10: useMatch is a workaround for a bug we encountered when you
65+
// pass a render function to NavLink's className prop, and try to access
66+
// NavLinks's isActive state value for the conditional styling. isActive
67+
// wasn't always evaluating to true when it should be, but useMatch worked
6568
constmatchResult=useMatch(href);
66-
6769
return(
6870
<NavLink
6971
end={end}

‎site/src/modules/management/DeploymentSidebarView.tsx

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,57 +56,65 @@ const DeploymentSettingsNavigation: FC<DeploymentSettingsNavigationProps> = ({
5656
<div>
5757
<divclassName="flex flex-col gap-1">
5858
{permissions.viewDeploymentValues&&(
59-
<SidebarNavItemhref="general">General</SidebarNavItem>
59+
<SidebarNavItemhref="/deployment/general">General</SidebarNavItem>
6060
)}
6161
{permissions.viewAllLicenses&&(
62-
<SidebarNavItemhref="licenses">Licenses</SidebarNavItem>
62+
<SidebarNavItemhref="/deployment/licenses">Licenses</SidebarNavItem>
6363
)}
6464
{permissions.editDeploymentValues&&(
65-
<SidebarNavItemhref="appearance">Appearance</SidebarNavItem>
65+
<SidebarNavItemhref="/deployment/appearance">
66+
Appearance
67+
</SidebarNavItem>
6668
)}
6769
{permissions.viewDeploymentValues&&(
68-
<SidebarNavItemhref="userauth">User Authentication</SidebarNavItem>
70+
<SidebarNavItemhref="/deployment/userauth">
71+
User Authentication
72+
</SidebarNavItem>
6973
)}
7074
{permissions.viewDeploymentValues&&(
71-
<SidebarNavItemhref="external-auth">
75+
<SidebarNavItemhref="/deployment/external-auth">
7276
External Authentication
7377
</SidebarNavItem>
7478
)}
7579
{/* Not exposing this yet since token exchange is not finished yet.
76-
<SidebarNavItem href="oauth2-provider/ap>
80+
<SidebarNavItem href="oauth2-provider/ap">
7781
OAuth2 Applications
7882
</SidebarNavItem>*/}
7983
{permissions.viewDeploymentValues&&(
80-
<SidebarNavItemhref="network">Network</SidebarNavItem>
84+
<SidebarNavItemhref="/deployment/network">Network</SidebarNavItem>
8185
)}
8286
{permissions.readWorkspaceProxies&&(
83-
<SidebarNavItemhref="workspace-proxies">
87+
<SidebarNavItemhref="/deployment/workspace-proxies">
8488
Workspace Proxies
8589
</SidebarNavItem>
8690
)}
8791
{permissions.viewDeploymentValues&&(
88-
<SidebarNavItemhref="security">Security</SidebarNavItem>
92+
<SidebarNavItemhref="/deployment/security">Security</SidebarNavItem>
8993
)}
9094
{permissions.viewDeploymentValues&&(
91-
<SidebarNavItemhref="observability">Observability</SidebarNavItem>
95+
<SidebarNavItemhref="/deployment/observability">
96+
Observability
97+
</SidebarNavItem>
9298
)}
9399
{permissions.viewAllUsers&&(
94-
<SidebarNavItemhref="users">Users</SidebarNavItem>
100+
<SidebarNavItemhref="/deployment/users">Users</SidebarNavItem>
95101
)}
96102
{permissions.viewNotificationTemplate&&(
97-
<SidebarNavItemhref="notifications">
103+
<SidebarNavItemhref="/deployment/notifications">
98104
<divclassName="flex flex-row items-center gap-2">
99105
<span>Notifications</span>
100106
<FeatureStageBadgecontentType="beta"size="sm"/>
101107
</div>
102108
</SidebarNavItem>
103109
)}
104110
{permissions.viewOrganizationIDPSyncSettings&&(
105-
<SidebarNavItemhref="idp-org-sync">
111+
<SidebarNavItemhref="/deployment/idp-org-sync">
106112
IdP Organization Sync
107113
</SidebarNavItem>
108114
)}
109-
{!isPremium&&<SidebarNavItemhref="premium">Premium</SidebarNavItem>}
115+
{!isPremium&&(
116+
<SidebarNavItemhref="/deployment/premium">Premium</SidebarNavItem>
117+
)}
110118
</div>
111119
</div>
112120
);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp