Merge branch 'feat/secrets-management-ui' into dev

ui/src/components/CompanySettingsSidebar.tsx

@@ -60,6 +60,7 @@ export function CompanySettingsSidebar() {
             icon={MonitorCog}
             end
           />
+          <SidebarNavItem to="/company/settings/secrets" label="Secrets" icon={KeyRound} end />
           <SidebarNavItem
             to="/company/settings/access"
             label="Access"
@@ -68,7 +69,6 @@ export function CompanySettingsSidebar() {
             end
           />
           <SidebarNavItem to="/company/settings/invites" label="Invites" icon={MailPlus} end />
-          <SidebarNavItem to="/company/settings/secrets" label="Secrets" icon={KeyRound} end />
         </div>
       </nav>
     </aside>

ui/src/components/access/CompanySettingsNav.test.tsx

@@ -80,9 +80,9 @@ describe("CompanySettingsNav", () => {
         items: [
           { value: "general", label: "General" },
           { value: "environments", label: "Environments" },
+          { value: "secrets", label: "Secrets" },
           { value: "access", label: "Access" },
           { value: "invites", label: "Invites" },
-          { value: "secrets", label: "Secrets" },
         ],
       }),
     );

ui/src/components/access/CompanySettingsNav.tsx

@@ -5,9 +5,9 @@ import { useLocation, useNavigate } from "@/lib/router";
 const items = [
   { value: "general", label: "General", href: "/company/settings" },
   { value: "environments", label: "Environments", href: "/company/settings/environments" },
+  { value: "secrets", label: "Secrets", href: "/company/settings/secrets" },
   { value: "access", label: "Access", href: "/company/settings/access" },
   { value: "invites", label: "Invites", href: "/company/settings/invites" },
-  { value: "secrets", label: "Secrets", href: "/company/settings/secrets" },
 ] as const;
 
 type CompanySettingsTab = (typeof items)[number]["value"];