improvement: update navbars ordering

frontend/src/layouts/AdminLayout/AdminNavBar.tsx

@@ -22,6 +22,16 @@ const generalTabs = [
     icon: faCog,
     link: "/admin/"
   },
+  {
+    label: "Resource Overview",
+    icon: faBuilding,
+    link: "/admin/resources/overview"
+  },
+  {
+    label: "Access Control",
+    icon: faUserTie,
+    link: "/admin/access-management"
+  },
   {
     label: "Encryption",
     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 = () => {
   const matchRoute = useMatchRoute();
 
@@ -83,7 +80,7 @@ export const AdminNavBar = () => {
                   <FontAwesomeIcon icon={faArrowLeft} />
                 </Tab>
               </Link>
-              {[...generalTabs, ...othersTabs].map((tab) => {
+              {generalTabs.map((tab) => {
                 const isActive = matchRoute({ to: tab.link, fuzzy: false });
                 return (
                   <Link key={tab.link} to={tab.link}>

frontend/src/layouts/KmsLayout/KmsLayout.tsx

@@ -50,14 +50,6 @@ export const KmsLayout = () => {
                 >
                   {({ isActive }) => <Tab value={isActive ? "selected" : ""}>KMIP</Tab>}
                 </Link>
-                <Link
-                  to="/projects/kms/$projectId/audit-logs"
-                  params={{
-                    projectId: currentProject.id
-                  }}
-                >
-                  {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
-                </Link>
                 <Link
                   to="/projects/kms/$projectId/access-management"
                   params={{
@@ -77,6 +69,14 @@ export const KmsLayout = () => {
                     </Tab>
                   )}
                 </Link>
+                <Link
+                  to="/projects/kms/$projectId/audit-logs"
+                  params={{
+                    projectId: currentProject.id
+                  }}
+                >
+                  {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
+                </Link>
                 <Link
                   to="/projects/kms/$projectId/settings"
                   params={{

frontend/src/layouts/OrganizationLayout/components/OrgNavBar/OrgNavBar.tsx

@@ -36,6 +36,27 @@ export const OrgNavBar = ({ isHidden }: Props) => {
                       </Tab>
                     )}
                   </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">
                     {({ isActive }) => (
                       <Tab
@@ -53,20 +74,6 @@ export const OrgNavBar = ({ isHidden }: Props) => {
                       </Tab>
                     )}
                   </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">
                     {({ isActive }) => (
                       <Tab variant="org" value={isActive ? "selected" : ""}>
@@ -74,13 +81,6 @@ export const OrgNavBar = ({ isHidden }: Props) => {
                       </Tab>
                     )}
                   </Link>
-                  <Link to="/organization/settings">
-                    {({ isActive }) => (
-                      <Tab variant="org" value={isActive ? "selected" : ""}>
-                        Settings
-                      </Tab>
-                    )}
-                  </Link>
                   <Link to="/organization/billing">
                     {({ isActive }) => (
                       <Tab variant="org" value={isActive ? "selected" : ""}>
@@ -88,10 +88,10 @@ export const OrgNavBar = ({ isHidden }: Props) => {
                       </Tab>
                     )}
                   </Link>
-                  <Link className="mr-auto" to="/organization/secret-sharing">
+                  <Link to="/organization/settings">
                     {({ isActive }) => (
-                      <Tab value={isActive ? "selected" : ""} variant="org">
+                      <Tab variant="org" value={isActive ? "selected" : ""}>
-                        Secret Sharing
+                        Settings
                       </Tab>
                     )}
                   </Link>

frontend/src/layouts/PkiManagerLayout/PkiManagerLayout.tsx

@@ -110,14 +110,6 @@ export const PkiManagerLayout = () => {
                       <Tab value={isActive ? "selected" : ""}>App Connections</Tab>
                     )}
                   </Link>
-                  <Link
-                    to="/projects/cert-management/$projectId/audit-logs"
-                    params={{
-                      projectId: currentProject.id
-                    }}
-                  >
-                    {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
-                  </Link>
                   <Link
                     to="/projects/cert-management/$projectId/access-management"
                     params={{
@@ -137,6 +129,14 @@ export const PkiManagerLayout = () => {
                       </Tab>
                     )}
                   </Link>
+                  <Link
+                    to="/projects/cert-management/$projectId/audit-logs"
+                    params={{
+                      projectId: currentProject.id
+                    }}
+                  >
+                    {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
+                  </Link>
                   <Link
                     to="/projects/cert-management/$projectId/settings"
                     params={{

frontend/src/layouts/SecretManagerLayout/SecretManagerLayout.tsx

@@ -82,6 +82,25 @@ export const SecretManagerLayout = () => {
                       </Tab>
                     )}
                   </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/integrations"
                     params={{
@@ -112,33 +131,6 @@ export const SecretManagerLayout = () => {
                       <Tab value={isActive ? "selected" : ""}>App Connections</Tab>
                     )}
                   </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
                     to="/projects/secret-management/$projectId/access-management"
                     params={{
@@ -158,6 +150,14 @@ export const SecretManagerLayout = () => {
                       </Tab>
                     )}
                   </Link>
+                  <Link
+                    to="/projects/secret-management/$projectId/audit-logs"
+                    params={{
+                      projectId: currentProject.id
+                    }}
+                  >
+                    {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
+                  </Link>
                   <Link
                     to="/projects/secret-management/$projectId/settings"
                     params={{

frontend/src/layouts/SecretScanningLayout/SecretScanningLayout.tsx

@@ -89,15 +89,6 @@ export const SecretScanningLayout = () => {
                 >
                   {({ isActive }) => <Tab value={isActive ? "selected" : ""}>App Connections</Tab>}
                 </Link>
-
-                <Link
-                  to="/projects/secret-scanning/$projectId/audit-logs"
-                  params={{
-                    projectId: currentProject.id
-                  }}
-                >
-                  {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
-                </Link>
                 <Link
                   to="/projects/secret-scanning/$projectId/access-management"
                   params={{
@@ -117,6 +108,14 @@ export const SecretScanningLayout = () => {
                     </Tab>
                   )}
                 </Link>
+                <Link
+                  to="/projects/secret-scanning/$projectId/audit-logs"
+                  params={{
+                    projectId: currentProject.id
+                  }}
+                >
+                  {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
+                </Link>
                 <Link
                   to="/projects/secret-scanning/$projectId/settings"
                   params={{

frontend/src/layouts/SshLayout/SshLayout.tsx

@@ -78,14 +78,6 @@ export const SshLayout = () => {
                     )
                   }
                 </ProjectPermissionCan>
-                <Link
-                  to="/projects/ssh/$projectId/audit-logs"
-                  params={{
-                    projectId: currentProject.id
-                  }}
-                >
-                  {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
-                </Link>
                 <Link
                   to="/projects/ssh/$projectId/access-management"
                   params={{
@@ -105,6 +97,14 @@ export const SshLayout = () => {
                     </Tab>
                   )}
                 </Link>
+                <Link
+                  to="/projects/ssh/$projectId/audit-logs"
+                  params={{
+                    projectId: currentProject.id
+                  }}
+                >
+                  {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
+                </Link>
                 <Link
                   to="/projects/ssh/$projectId/settings"
                   params={{