SystemAccess -> FleetAccess, remove message for now

Author: david-crespo

app/api/__tests__/safety.spec.ts

@@ -45,7 +45,7 @@ it('mock-api is only referenced in test files', () => {
       "test/e2e/profile.e2e.ts",
       "test/e2e/project-access.e2e.ts",
       "test/e2e/silo-access.e2e.ts",
-      "test/e2e/system-access.e2e.ts",
+      "test/e2e/fleet-access.e2e.ts",
       "tsconfig.json",
     ]
   `)

app/forms/system-access.tsx app/forms/fleet-access.tsxapp/forms/system-access.tsx renamed to app/forms/fleet-access.tsx

@@ -30,7 +30,7 @@ import {
   type EditRoleModalProps,
 } from './access-util'
 
-export function SystemAccessAddUserSideModal({
+export function FleetAccessAddUserSideModal({
   onDismiss,
   policy,
 }: AddRoleModalProps<FleetRole>) {
@@ -82,7 +82,7 @@ export function SystemAccessAddUserSideModal({
   )
 }
 
-export function SystemAccessEditUserSideModal({
+export function FleetAccessEditUserSideModal({
   onDismiss,
   name,
   identityId,

app/layouts/SystemLayout.tsx

@@ -56,7 +56,7 @@ export default function SystemLayout() {
       { value: 'Inventory', path: pb.sledInventory() },
       { value: 'IP Pools', path: pb.ipPools() },
       { value: 'System Update', path: pb.systemUpdate() },
-      { value: 'Fleet Access', path: pb.systemAccess() },
+      { value: 'Fleet Access', path: pb.fleetAccess() },
     ]
       // filter out the entry for the path we're currently on
       .filter((i) => i.path !== pathname)
@@ -103,7 +103,7 @@ export default function SystemLayout() {
           <NavLinkItem to={pb.systemUpdate()}>
             <SoftwareUpdate16Icon /> System Update
           </NavLinkItem>
-          <NavLinkItem to={pb.systemAccess()}>
+          <NavLinkItem to={pb.fleetAccess()}>
             <Access16Icon /> Fleet Access
           </NavLinkItem>
         </Sidebar.Nav>

app/pages/system/SystemAccessPage.tsx app/pages/system/FleetAccessPage.tsxapp/pages/system/SystemAccessPage.tsx renamed to app/pages/system/FleetAccessPage.tsx

@@ -27,17 +27,16 @@ import { Badge } from '@oxide/design-system/ui'
 import { DocsPopover } from '~/components/DocsPopover'
 import { HL } from '~/components/HL'
 import {
-  SystemAccessAddUserSideModal,
-  SystemAccessEditUserSideModal,
-} from '~/forms/system-access'
+  FleetAccessAddUserSideModal,
+  FleetAccessEditUserSideModal,
+} from '~/forms/fleet-access'
 import { useCurrentUser } from '~/hooks/use-current-user'
 import { confirmDelete } from '~/stores/confirm-delete'
 import { addToast } from '~/stores/toast'
 import { getActionsCol } from '~/table/columns/action-col'
 import { Table } from '~/table/Table'
 import { CreateButton } from '~/ui/lib/CreateButton'
 import { EmptyMessage } from '~/ui/lib/EmptyMessage'
-import { Message } from '~/ui/lib/Message'
 import { PageHeader, PageTitle } from '~/ui/lib/PageHeader'
 import { TableActions, TableEmptyBox } from '~/ui/lib/Table'
 import { identityTypeLabel, roleColor } from '~/util/access'
@@ -89,7 +88,7 @@ type UserRow = {
 
 const colHelper = createColumnHelper<UserRow>()
 
-export default function SystemAccessPage() {
+export default function FleetAccessPage() {
   const [addModalOpen, setAddModalOpen] = useState(false)
   const [editingUserRow, setEditingUserRow] = useState<UserRow | null>(null)
 
@@ -179,32 +178,17 @@ export default function SystemAccessPage() {
         />
       </PageHeader>
 
-      {rows.length >= 0 && (
-        <div className="pb-4">
-          <Message
-            variant="info"
-            className="mb-6"
-            content={
-              <>
-                Silos can also be configured with <code>mapped_fleet_roles</code>, which
-                grant fleet-level roles to users based on their silo-level roles. Check each
-                silo’s Fleet Roles tab for more.
-              </>
-            }
-          />
-        </div>
-      )}
       <TableActions>
         <CreateButton onClick={() => setAddModalOpen(true)}>Add user or group</CreateButton>
       </TableActions>
       {addModalOpen && (
-        <SystemAccessAddUserSideModal
+        <FleetAccessAddUserSideModal
           onDismiss={() => setAddModalOpen(false)}
           policy={fleetPolicy}
         />
       )}
       {editingUserRow && (
-        <SystemAccessEditUserSideModal
+        <FleetAccessEditUserSideModal
           onDismiss={() => setEditingUserRow(null)}
           policy={fleetPolicy}
           name={editingUserRow.name}

app/routes.tsx

@@ -236,7 +236,7 @@ export const routes = createRoutesFromElements(
         />
         <Route
           path="access"
-          lazy={() => import('./pages/system/SystemAccessPage').then(convert)}
+          lazy={() => import('./pages/system/FleetAccessPage').then(convert)}
         />
       </Route>
 

app/util/__snapshots__/path-builder.spec.ts.snap

@@ -129,6 +129,12 @@ exports[`breadcrumbs 2`] = `
       "path": "/projects/p/disks",
     },
   ],
+  "fleetAccess (/system/access)": [
+    {
+      "label": "Fleet Access",
+      "path": "/system/access",
+    },
+  ],
   "floatingIpEdit (/projects/p/floating-ips/f/edit)": [
     {
       "label": "Projects",
@@ -789,12 +795,6 @@ exports[`breadcrumbs 2`] = `
       "path": "/settings/ssh-keys",
     },
   ],
-  "systemAccess (/system/access)": [
-    {
-      "label": "Fleet Access",
-      "path": "/system/access",
-    },
-  ],
   "systemUpdate (/system/update)": [
     {
       "label": "System Update",

app/util/path-builder.spec.ts

@@ -52,6 +52,7 @@ test('path builder', () => {
         "diskInventory": "/system/inventory/disks",
         "disks": "/projects/p/disks",
         "disksNew": "/projects/p/disks-new",
+        "fleetAccess": "/system/access",
         "floatingIpEdit": "/projects/p/floating-ips/f/edit",
         "floatingIps": "/projects/p/floating-ips",
         "floatingIpsNew": "/projects/p/floating-ips-new",
@@ -102,7 +103,6 @@ test('path builder', () => {
         "sshKeyEdit": "/settings/ssh-keys/ss/edit",
         "sshKeys": "/settings/ssh-keys",
         "sshKeysNew": "/settings/ssh-keys-new",
-        "systemAccess": "/system/access",
         "systemUpdate": "/system/update",
         "systemUtilization": "/system/utilization",
         "vpc": "/projects/p/vpcs/v/firewall-rules",

app/util/path-builder.ts

@@ -110,7 +110,7 @@ export const pb = {
   siloImages: () => '/images',
   siloImageEdit: (params: PP.SiloImage) => `${pb.siloImages()}/${params.image}/edit`,
 
-  systemAccess: () => '/system/access',
+  fleetAccess: () => '/system/access',
   systemUtilization: () => '/system/utilization',
 
   ipPools: () => '/system/networking/ip-pools',