awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 07:26:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

improvement: update navbars ordering

Browse Source
This commit is contained in:
Scott Wilson
2025-10-15 18:16:27 -07:00
parent 4af3f6fc3f
commit 713d10bb96
7 changed files with 94 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/layouts/AdminLayout/AdminNavBar.tsx
+11 -14
View File
@@ -22,6 +22,16 @@ const generalTabs = [
icon: faCog, icon: faCog,
link: "/admin/" link: "/admin/"
}, },
{
label: "Resource Overview",
icon: faBuilding,
link: "/admin/resources/overview"
},
{
label: "Access Control",
icon: faUserTie,
link: "/admin/access-management"
},
{ {
label: "Encryption", label: "Encryption",
icon: faLock, icon: faLock,
@@ -49,19 +59,6 @@ const generalTabs = [
} }
]; ];
const othersTabs = [
{
label: "Access Controls",
icon: faUserTie,
link: "/admin/access-management"
},
{
label: "Resource Overview",
icon: faBuilding,
link: "/admin/resources/overview"
}
];
export const AdminNavBar = () => { export const AdminNavBar = () => {
const matchRoute = useMatchRoute(); const matchRoute = useMatchRoute();
@@ -83,7 +80,7 @@ export const AdminNavBar = () => {
<FontAwesomeIcon icon={faArrowLeft} /> <FontAwesomeIcon icon={faArrowLeft} />
</Tab> </Tab>
</Link> </Link>
{[...generalTabs, ...othersTabs].map((tab) => { {generalTabs.map((tab) => {
const isActive = matchRoute({ to: tab.link, fuzzy: false }); const isActive = matchRoute({ to: tab.link, fuzzy: false });
return ( return (
<Link key={tab.link} to={tab.link}> <Link key={tab.link} to={tab.link}>
frontend/src/layouts/KmsLayout/KmsLayout.tsx
+8 -8
View File
@@ -50,14 +50,6 @@ export const KmsLayout = () => {
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>KMIP</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>KMIP</Tab>}
</Link> </Link>
<Link
to="/projects/kms/$projectId/audit-logs"
params={{
projectId: currentProject.id
}}
>
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link>
<Link <Link
to="/projects/kms/$projectId/access-management" to="/projects/kms/$projectId/access-management"
params={{ params={{
@@ -77,6 +69,14 @@ export const KmsLayout = () => {
</Tab> </Tab>
)} )}
</Link> </Link>
<Link
to="/projects/kms/$projectId/audit-logs"
params={{
projectId: currentProject.id
}}
>
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link>
<Link <Link
to="/projects/kms/$projectId/settings" to="/projects/kms/$projectId/settings"
params={{ params={{
frontend/src/layouts/OrganizationLayout/components/OrgNavBar/OrgNavBar.tsx
+24 -24
View File
@@ -36,6 +36,27 @@ export const OrgNavBar = ({ isHidden }: Props) => {
</Tab> </Tab>
)} )}
</Link> </Link>
<Link to="/organization/app-connections">
{({ isActive }) => (
<Tab variant="org" value={isActive ? "selected" : ""}>
App Connections
</Tab>
)}
</Link>
<Link to="/organization/networking">
{({ isActive }) => (
<Tab variant="org" value={isActive ? "selected" : ""}>
Networking
</Tab>
)}
</Link>
<Link to="/organization/secret-sharing">
{({ isActive }) => (
<Tab value={isActive ? "selected" : ""} variant="org">
Secret Sharing
</Tab>
)}
</Link>
<Link to="/organization/access-management"> <Link to="/organization/access-management">
{({ isActive }) => ( {({ isActive }) => (
<Tab <Tab
@@ -53,20 +74,6 @@ export const OrgNavBar = ({ isHidden }: Props) => {
</Tab> </Tab>
)} )}
</Link> </Link>
<Link to="/organization/app-connections">
{({ isActive }) => (
<Tab variant="org" value={isActive ? "selected" : ""}>
App Connections
</Tab>
)}
</Link>
<Link to="/organization/networking">
{({ isActive }) => (
<Tab variant="org" value={isActive ? "selected" : ""}>
Networking
</Tab>
)}
</Link>
<Link to="/organization/audit-logs"> <Link to="/organization/audit-logs">
{({ isActive }) => ( {({ isActive }) => (
<Tab variant="org" value={isActive ? "selected" : ""}> <Tab variant="org" value={isActive ? "selected" : ""}>
@@ -74,13 +81,6 @@ export const OrgNavBar = ({ isHidden }: Props) => {
</Tab> </Tab>
)} )}
</Link> </Link>
<Link to="/organization/settings">
{({ isActive }) => (
<Tab variant="org" value={isActive ? "selected" : ""}>
Settings
</Tab>
)}
</Link>
<Link to="/organization/billing"> <Link to="/organization/billing">
{({ isActive }) => ( {({ isActive }) => (
<Tab variant="org" value={isActive ? "selected" : ""}> <Tab variant="org" value={isActive ? "selected" : ""}>
@@ -88,10 +88,10 @@ export const OrgNavBar = ({ isHidden }: Props) => {
</Tab> </Tab>
)} )}
</Link> </Link>
<Link className="mr-auto" to="/organization/secret-sharing"> <Link to="/organization/settings">
{({ isActive }) => ( {({ isActive }) => (
<Tab value={isActive ? "selected" : ""} variant="org"> <Tab variant="org" value={isActive ? "selected" : ""}>
Secret Sharing Settings
</Tab> </Tab>
)} )}
</Link> </Link>
frontend/src/layouts/PkiManagerLayout/PkiManagerLayout.tsx
+8 -8
View File
@@ -110,14 +110,6 @@ export const PkiManagerLayout = () => {
<Tab value={isActive ? "selected" : ""}>App Connections</Tab> <Tab value={isActive ? "selected" : ""}>App Connections</Tab>
)} )}
</Link> </Link>
<Link
to="/projects/cert-management/$projectId/audit-logs"
params={{
projectId: currentProject.id
}}
>
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link>
<Link <Link
to="/projects/cert-management/$projectId/access-management" to="/projects/cert-management/$projectId/access-management"
params={{ params={{
@@ -137,6 +129,14 @@ export const PkiManagerLayout = () => {
</Tab> </Tab>
)} )}
</Link> </Link>
<Link
to="/projects/cert-management/$projectId/audit-logs"
params={{
projectId: currentProject.id
}}
>
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link>
<Link <Link
to="/projects/cert-management/$projectId/settings" to="/projects/cert-management/$projectId/settings"
params={{ params={{
frontend/src/layouts/SecretManagerLayout/SecretManagerLayout.tsx
+27 -27
View File
@@ -82,6 +82,25 @@ export const SecretManagerLayout = () => {
</Tab> </Tab>
)} )}
</Link> </Link>
<Link
to="/projects/secret-management/$projectId/approval"
params={{
projectId: currentProject.id
}}
>
{({ isActive }) => (
<Tab value={isActive ? "selected" : ""}>
Approvals
{Boolean(
secretApprovalReqCount?.open || accessApprovalRequestCount?.pendingCount
) && (
<Badge variant="primary" className="ml-1.5">
{pendingRequestsCount}
</Badge>
)}
</Tab>
)}
</Link>
<Link <Link
to="/projects/secret-management/$projectId/integrations" to="/projects/secret-management/$projectId/integrations"
params={{ params={{
@@ -112,33 +131,6 @@ export const SecretManagerLayout = () => {
<Tab value={isActive ? "selected" : ""}>App Connections</Tab> <Tab value={isActive ? "selected" : ""}>App Connections</Tab>
)} )}
</Link> </Link>
<Link
to="/projects/secret-management/$projectId/approval"
params={{
projectId: currentProject.id
}}
>
{({ isActive }) => (
<Tab value={isActive ? "selected" : ""}>
Approvals
{Boolean(
secretApprovalReqCount?.open || accessApprovalRequestCount?.pendingCount
) && (
<Badge variant="primary" className="ml-1.5">
{pendingRequestsCount}
</Badge>
)}
</Tab>
)}
</Link>
<Link
to="/projects/secret-management/$projectId/audit-logs"
params={{
projectId: currentProject.id
}}
>
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link>
<Link <Link
to="/projects/secret-management/$projectId/access-management" to="/projects/secret-management/$projectId/access-management"
params={{ params={{
@@ -158,6 +150,14 @@ export const SecretManagerLayout = () => {
</Tab> </Tab>
)} )}
</Link> </Link>
<Link
to="/projects/secret-management/$projectId/audit-logs"
params={{
projectId: currentProject.id
}}
>
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link>
<Link <Link
to="/projects/secret-management/$projectId/settings" to="/projects/secret-management/$projectId/settings"
params={{ params={{
frontend/src/layouts/SecretScanningLayout/SecretScanningLayout.tsx
+8 -9
View File
@@ -89,15 +89,6 @@ export const SecretScanningLayout = () => {
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>App Connections</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>App Connections</Tab>}
</Link> </Link>
<Link
to="/projects/secret-scanning/$projectId/audit-logs"
params={{
projectId: currentProject.id
}}
>
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link>
<Link <Link
to="/projects/secret-scanning/$projectId/access-management" to="/projects/secret-scanning/$projectId/access-management"
params={{ params={{
@@ -117,6 +108,14 @@ export const SecretScanningLayout = () => {
</Tab> </Tab>
)} )}
</Link> </Link>
<Link
to="/projects/secret-scanning/$projectId/audit-logs"
params={{
projectId: currentProject.id
}}
>
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link>
<Link <Link
to="/projects/secret-scanning/$projectId/settings" to="/projects/secret-scanning/$projectId/settings"
params={{ params={{
frontend/src/layouts/SshLayout/SshLayout.tsx
+8 -8
View File
@@ -78,14 +78,6 @@ export const SshLayout = () => {
) )
} }
</ProjectPermissionCan> </ProjectPermissionCan>
<Link
to="/projects/ssh/$projectId/audit-logs"
params={{
projectId: currentProject.id
}}
>
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link>
<Link <Link
to="/projects/ssh/$projectId/access-management" to="/projects/ssh/$projectId/access-management"
params={{ params={{
@@ -105,6 +97,14 @@ export const SshLayout = () => {
</Tab> </Tab>
)} )}
</Link> </Link>
<Link
to="/projects/ssh/$projectId/audit-logs"
params={{
projectId: currentProject.id
}}
>
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link>
<Link <Link
to="/projects/ssh/$projectId/settings" to="/projects/ssh/$projectId/settings"
params={{ params={{