@shipfox/client-workspace-settings 4.0.0 → 6.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/client-workspace-settings",
   "license": "MIT",
-  "version": "4.0.0",
+  "version": "6.0.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -10,10 +10,6 @@
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "imports": {
-    "#*": "./dist/*",
-    "#test/*": "./test/*"
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -31,17 +27,12 @@
   "dependencies": {
     "@swc/helpers": "^0.5.17",
     "@tanstack/react-form": "^1.32.0",
-    "@shipfox/api-workspaces-dto": "6.0.0",
-    "@shipfox/client-agent": "4.0.0",
-    "@shipfox/client-api": "4.0.0",
-    "@shipfox/client-auth": "4.0.0",
-    "@shipfox/client-integrations": "4.0.0",
-    "@shipfox/client-runners": "4.0.0",
-    "@shipfox/client-shell": "4.0.0",
-    "@shipfox/client-secrets": "4.0.0",
-    "@shipfox/client-triggers": "4.0.0",
-    "@shipfox/client-ui": "4.0.0",
-    "@shipfox/react-ui": "0.3.5"
+    "@shipfox/api-workspaces-dto": "9.0.1",
+    "@shipfox/client-auth": "6.0.1",
+    "@shipfox/client-ui": "6.0.1",
+    "@shipfox/client-shell": "6.0.1",
+    "@shipfox/client-api": "6.0.1",
+    "@shipfox/react-ui": "0.3.6"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.101.0",
@@ -49,6 +40,9 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
+  "imports": {
+    "#*": "./dist/*"
+  },
   "scripts": {
     "build": "shipfox-swc",
     "check": "shipfox-biome-check",

package/src/components/members/form-errors.test.ts

@@ -1,5 +1,5 @@
 import {ApiError} from '@shipfox/client-api';
-import {invitationErrorToFormError} from './form-errors.js';
+import {invitationErrorToFormError, memberRemovalErrorMessage} from './form-errors.js';
 
 describe('invitationErrorToFormError', () => {
   test('routes open-invitation-exists to the email field', () => {
@@ -18,23 +18,76 @@ describe('invitationErrorToFormError', () => {
     });
   });
 
-  test('routes other ApiError codes to a form-level alert with the server message', () => {
+  test('maps rate-limited errors to feature-owned form copy', () => {
     const error = new ApiError({code: 'rate-limited', message: 'Try later', status: 429});
 
     const result = invitationErrorToFormError(error);
 
-    expect(result).toEqual({kind: 'form', message: 'Try later'});
+    expect(result).toEqual({
+      kind: 'form',
+      message: 'Too many invitations were sent. Try again shortly.',
+    });
   });
 
-  test('routes non-ApiError to a form-level alert with the error message', () => {
+  test('uses the fallback message for unexpected errors', () => {
     const result = invitationErrorToFormError(new Error('boom'));
 
     expect(result).toEqual({kind: 'form', message: 'boom'});
   });
 
+  test('uses an unclassified API error message as the fallback', () => {
+    const result = invitationErrorToFormError(
+      new ApiError({code: 'forbidden', message: 'You need the workspace admin role.', status: 403}),
+    );
+
+    expect(result).toEqual({kind: 'form', message: 'You need the workspace admin role.'});
+  });
+
   test('falls back to generic copy for non-Error throwables', () => {
     const result = invitationErrorToFormError('weird');
 
     expect(result).toEqual({kind: 'form', message: 'Could not send invitation.'});
   });
 });
+
+describe('memberRemovalErrorMessage', () => {
+  test('maps self-removal-not-allowed to feature-owned copy', () => {
+    const error = new ApiError({code: 'self-removal-not-allowed', message: 'ignored', status: 403});
+
+    const result = memberRemovalErrorMessage(error);
+
+    expect(result).toBe("You can't remove yourself.");
+  });
+
+  test('maps last-member to feature-owned copy', () => {
+    const error = new ApiError({code: 'last-member', message: 'ignored', status: 409});
+
+    const result = memberRemovalErrorMessage(error);
+
+    expect(result).toBe('Cannot remove the last member.');
+  });
+
+  test('uses the fallback message for unexpected errors', () => {
+    const result = memberRemovalErrorMessage(new Error('boom'));
+
+    expect(result).toBe('boom');
+  });
+
+  test('uses an unclassified API error message as the fallback', () => {
+    const result = memberRemovalErrorMessage(
+      new ApiError({
+        code: 'workspace-inactive',
+        message: 'This workspace is not active.',
+        status: 409,
+      }),
+    );
+
+    expect(result).toBe('This workspace is not active.');
+  });
+
+  test('falls back to generic copy for non-Error throwables', () => {
+    const result = memberRemovalErrorMessage('weird');
+
+    expect(result).toBe('Could not remove member.');
+  });
+});

package/src/components/members/form-errors.ts

@@ -7,18 +7,29 @@ export type InvitationFormErrorMapping =
   | {kind: 'form'; message: string};
 
 export function invitationErrorToFormError(error: unknown): InvitationFormErrorMapping {
-  if (error instanceof ApiError && error.code === 'open-invitation-exists') {
-    return {
-      kind: 'field',
-      field: 'email',
-      message: 'An open invitation already exists for this email.',
-    };
-  }
   if (error instanceof ApiError) {
+    if (error.code === 'open-invitation-exists') {
+      return {
+        kind: 'field',
+        field: 'email',
+        message: 'An open invitation already exists for this email.',
+      };
+    }
+    if (error.code === 'rate-limited') {
+      return {kind: 'form', message: 'Too many invitations were sent. Try again shortly.'};
+    }
     return {kind: 'form', message: error.message};
   }
-  if (error instanceof Error) {
-    return {kind: 'form', message: error.message};
-  }
+  if (error instanceof Error) return {kind: 'form', message: error.message};
   return {kind: 'form', message: 'Could not send invitation.'};
 }
+
+export function memberRemovalErrorMessage(error: unknown): string {
+  if (error instanceof ApiError) {
+    if (error.code === 'self-removal-not-allowed') return "You can't remove yourself.";
+    if (error.code === 'last-member') return 'Cannot remove the last member.';
+    return error.message;
+  }
+  if (error instanceof Error) return error.message;
+  return 'Could not remove member.';
+}

package/src/components/members/workspace-members-section.tsx

@@ -1,5 +1,4 @@
-import {createInvitationBodySchema, type MembershipWithUserDto} from '@shipfox/api-workspaces-dto';
-import {ApiError} from '@shipfox/client-api';
+import {createInvitationBodySchema} from '@shipfox/api-workspaces-dto';
 import {useAuthState} from '@shipfox/client-auth';
 import {QueryLoadError} from '@shipfox/client-ui';
 import {Badge} from '@shipfox/react-ui/badge';
@@ -31,15 +30,19 @@ import {Code, Header, Text} from '@shipfox/react-ui/typography';
 import {formatDate} from '@shipfox/react-ui/utils';
 import {useForm} from '@tanstack/react-form';
 import {useState} from 'react';
-import type {Invitation} from '#core/invitation.js';
+import {
+  getInvitationExpiry,
+  getMemberRemovalRestriction,
+  memberCount,
+  type PendingInvitation,
+  type WorkspaceMember,
+} from '#core/membership.js';
 import {useCreateInvitation} from '#hooks/api/create-invitation.js';
 import {useListInvitations} from '#hooks/api/list-invitations.js';
 import {useListMembers} from '#hooks/api/list-members.js';
 import {useRemoveMember} from '#hooks/api/remove-member.js';
 import {useRevokeInvitation} from '#hooks/api/revoke-invitation.js';
-import {invitationErrorToFormError} from './form-errors.js';
-
-const EXPIRES_SOON_MS = 24 * 60 * 60 * 1000;
+import {invitationErrorToFormError, memberRemovalErrorMessage} from './form-errors.js';
 
 export function WorkspaceMembersSettingsSection({
   workspaceId,
@@ -65,7 +68,7 @@ function MembersSection({
 }) {
   const auth = useAuthState();
   const query = useListMembers(workspaceId);
-  const members = query.data?.members ?? [];
+  const members = query.data ?? [];
 
   return (
     <section className="flex flex-col gap-16">
@@ -74,7 +77,7 @@ function MembersSection({
         <Text size="sm" className="text-foreground-neutral-muted">
           {query.isPending
             ? 'Loading members…'
-            : `${members.length} ${members.length === 1 ? 'member' : 'members'}`}
+            : `${memberCount(members)} ${memberCount(members) === 1 ? 'member' : 'members'}`}
         </Text>
       </div>
 
@@ -99,7 +102,8 @@ function MembersSection({
               <MemberRow
                 key={member.id}
                 member={member}
-                isSelf={member.user_id === auth.user?.id}
+                members={members}
+                currentUserId={auth.user?.id}
                 workspaceId={workspaceId}
                 workspaceName={workspaceName}
               />
@@ -113,35 +117,38 @@ function MembersSection({
 
 function MemberRow({
   member,
-  isSelf,
+  members,
+  currentUserId,
   workspaceId,
   workspaceName,
 }: {
-  member: MembershipWithUserDto;
-  isSelf: boolean;
+  member: WorkspaceMember;
+  members: readonly WorkspaceMember[];
+  currentUserId: string | undefined;
   workspaceId: string;
   workspaceName: string;
 }) {
   const [open, setOpen] = useState(false);
   const remove = useRemoveMember(workspaceId);
+  const restriction = getMemberRemovalRestriction({member, members, currentUserId});
 
   async function handleRemove() {
     try {
-      await remove.mutateAsync(member.user_id);
-      toast.success(`Removed ${member.user_email} from ${workspaceName}.`);
+      await remove.mutateAsync({userId: member.userId});
+      toast.success(`Removed ${member.email} from ${workspaceName}.`);
       setOpen(false);
     } catch (error) {
-      toast.error(removeMemberErrorMessage(error));
+      toast.error(memberRemovalErrorMessage(error));
     }
   }
 
   return (
     <TableRow className={remove.isPending ? 'opacity-60' : undefined}>
-      <TableCell className="font-medium">{member.user_name ?? '—'}</TableCell>
+      <TableCell className="font-medium">{member.name ?? '—'}</TableCell>
       <TableCell>
-        <Code variant="paragraph">{member.user_email}</Code>
+        <Code variant="paragraph">{member.email}</Code>
       </TableCell>
-      <TableCell>{formatDate(member.created_at)}</TableCell>
+      <TableCell>{formatDate(member.joinedAt)}</TableCell>
       <TableCell className="text-right">
         <Modal open={open} onOpenChange={setOpen}>
           <ModalTrigger asChild>
@@ -149,7 +156,7 @@ function MemberRow({
               size="sm"
               variant="transparentMuted"
               aria-label="Remove member"
-              disabled={isSelf}
+              disabled={restriction !== undefined}
               isLoading={remove.isPending}
               className={
                 remove.isPending
@@ -164,7 +171,7 @@ function MemberRow({
             <ModalTitle className="sr-only">Remove member</ModalTitle>
             <ModalHeader>
               <Text size="lg">
-                Remove {member.user_name ?? member.user_email} from {workspaceName}?
+                Remove {member.name ?? member.email} from {workspaceName}?
               </Text>
             </ModalHeader>
             <ModalBody>
@@ -250,15 +257,20 @@ function PendingInvitationsSection({
   );
 }
 
-function InvitationRow({invitation, workspaceId}: {invitation: Invitation; workspaceId: string}) {
+function InvitationRow({
+  invitation,
+  workspaceId,
+}: {
+  invitation: PendingInvitation;
+  workspaceId: string;
+}) {
   const [open, setOpen] = useState(false);
   const revoke = useRevokeInvitation(workspaceId);
-  const expiresAt = new Date(invitation.expiresAt);
-  const expiresSoon = expiresAt.getTime() - Date.now() < EXPIRES_SOON_MS;
+  const expiry = getInvitationExpiry(invitation);
 
   async function handleRevoke() {
     try {
-      await revoke.mutateAsync(invitation.id);
+      await revoke.mutateAsync({invitationId: invitation.id});
       toast.success(`Invitation to ${invitation.email} revoked.`);
       setOpen(false);
     } catch {
@@ -275,7 +287,8 @@ function InvitationRow({invitation, workspaceId}: {invitation: Invitation; works
       <TableCell>
         <div className="flex items-center gap-8">
           <Text size="sm">{formatDate(invitation.expiresAt)}</Text>
-          {expiresSoon ? <Badge variant="warning">Soon</Badge> : null}
+          {expiry === 'expires-soon' ? <Badge variant="warning">Soon</Badge> : null}
+          {expiry === 'expired' ? <Badge variant="error">Expired</Badge> : null}
         </div>
       </TableCell>
       <TableCell className="text-right">
@@ -459,13 +472,3 @@ function TableSkeleton({rows, cols}: {rows: number; cols: number}) {
     </div>
   );
 }
-
-function removeMemberErrorMessage(error: unknown): string {
-  if (error instanceof ApiError) {
-    if (error.code === 'self-removal-not-allowed') return "You can't remove yourself.";
-    if (error.code === 'last-member') return 'Cannot remove the last member.';
-    return error.message;
-  }
-  if (error instanceof Error) return error.message;
-  return 'Could not remove member.';
-}

package/src/core/membership.test.ts

@@ -0,0 +1,69 @@
+import {
+  getInvitationExpiry,
+  getMemberRemovalRestriction,
+  memberCount,
+  type WorkspaceMember,
+} from './membership.js';
+
+const member: WorkspaceMember = {
+  id: 'membership-1',
+  userId: 'user-1',
+  workspaceId: 'workspace-1',
+  email: 'member@example.com',
+  name: 'Member',
+  role: 'admin',
+  joinedAt: '2026-07-22T12:00:00.000Z',
+  updatedAt: '2026-07-22T12:00:00.000Z',
+};
+
+describe('getInvitationExpiry', () => {
+  const now = Date.parse('2026-07-22T12:00:00.000Z');
+
+  it.each([
+    ['active', '2026-07-24T12:00:00.000Z'],
+    ['expires-soon', '2026-07-23T11:59:59.999Z'],
+    ['expired', '2026-07-22T12:00:00.000Z'],
+  ] as const)('classifies a %s invitation', (expected, expiresAt) => {
+    const result = getInvitationExpiry({expiresAt}, now);
+
+    expect(result).toBe(expected);
+  });
+});
+
+describe('getMemberRemovalRestriction', () => {
+  it('forbids self-removal before evaluating the member count', () => {
+    const result = getMemberRemovalRestriction({
+      member,
+      currentUserId: member.userId,
+      members: [member],
+    });
+
+    expect(result).toBe('self');
+  });
+
+  it('forbids removing the final member', () => {
+    const result = getMemberRemovalRestriction({
+      member,
+      currentUserId: 'another-user',
+      members: [member],
+    });
+
+    expect(result).toBe('last-member');
+  });
+
+  it('allows removal when another member remains', () => {
+    const result = getMemberRemovalRestriction({
+      member,
+      currentUserId: 'another-user',
+      members: [member, {...member, id: 'membership-2', userId: 'user-2'}],
+    });
+
+    expect(result).toBeUndefined();
+  });
+});
+
+test('counts workspace members', () => {
+  const result = memberCount([member, {...member, id: 'membership-2'}]);
+
+  expect(result).toBe(2);
+});

package/src/core/membership.ts

@@ -0,0 +1,64 @@
+export type WorkspaceMemberRole = 'admin';
+
+export interface WorkspaceMember {
+  id: string;
+  userId: string;
+  workspaceId: string;
+  email: string;
+  name: string | null;
+  role: WorkspaceMemberRole;
+  joinedAt: string;
+  updatedAt: string;
+}
+
+export interface PendingInvitation {
+  id: string;
+  workspaceId: string;
+  email: string;
+  expiresAt: string;
+  acceptedAt: string | null;
+  invitedByUserId: string;
+  invitedByDisplay: string | null;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface CreateInvitationCommand {
+  email: string;
+}
+
+export interface RevokeInvitationCommand {
+  invitationId: string;
+}
+
+export interface RemoveWorkspaceMemberCommand {
+  userId: string;
+}
+
+export type InvitationExpiry = 'active' | 'expires-soon' | 'expired';
+
+export function getInvitationExpiry(
+  invitation: Pick<PendingInvitation, 'expiresAt'>,
+  now = Date.now(),
+): InvitationExpiry {
+  const expiresAt = Date.parse(invitation.expiresAt);
+  if (expiresAt <= now) return 'expired';
+  if (expiresAt - now < 24 * 60 * 60 * 1000) return 'expires-soon';
+  return 'active';
+}
+
+export function memberCount(members: readonly WorkspaceMember[]): number {
+  return members.length;
+}
+
+export type MemberRemovalRestriction = 'self' | 'last-member';
+
+export function getMemberRemovalRestriction(params: {
+  member: Pick<WorkspaceMember, 'userId'>;
+  currentUserId: string | undefined;
+  members: readonly WorkspaceMember[];
+}): MemberRemovalRestriction | undefined {
+  if (params.member.userId === params.currentUserId) return 'self';
+  if (memberCount(params.members) <= 1) return 'last-member';
+  return undefined;
+}

package/src/feature.ts

@@ -1,5 +1,28 @@
-import {defineClientFeature} from '@shipfox/client-shell';
-import type {IconName} from '@shipfox/react-ui/icon';
+import {
+  defineClientFeature,
+  type NavTabEntry,
+  type SettingsSectionEntry,
+} from '@shipfox/client-shell';
+
+export const workspaceSettingsNavigation = [
+  {
+    id: 'nav.settings',
+    scope: 'workspace',
+    label: 'Settings',
+    to: '/workspaces/$wid/settings',
+    order: 200,
+  },
+] as const satisfies readonly NavTabEntry[];
+
+export const workspaceSettingsSections = [
+  {
+    id: 'settings.members',
+    pathSegment: 'members',
+    label: 'Members',
+    icon: 'userLine',
+    order: 100,
+  },
+] as const satisfies readonly SettingsSectionEntry[];
 
 export const workspaceSettingsFeature = defineClientFeature({
   id: 'shipfox.workspace-settings',
@@ -14,107 +37,7 @@ export const workspaceSettingsFeature = defineClientFeature({
       parent: 'workspaceSettings',
       impl: '@shipfox/client-workspace-settings/routes/members',
     },
-    {
-      path: '/workspaces/$wid/settings/runners',
-      parent: 'workspaceSettings',
-      impl: '@shipfox/client-workspace-settings/routes/runners',
-    },
-    {
-      path: '/workspaces/$wid/settings/provisioners',
-      parent: 'workspaceSettings',
-      impl: '@shipfox/client-workspace-settings/routes/provisioners',
-    },
-    {
-      path: '/workspaces/$wid/settings/agents',
-      parent: 'workspaceSettings',
-      impl: '@shipfox/client-workspace-settings/routes/agents',
-    },
-    {
-      path: '/workspaces/$wid/settings/secrets',
-      parent: 'workspaceSettings',
-      impl: '@shipfox/client-workspace-settings/routes/secrets',
-    },
-    {
-      path: '/workspaces/$wid/settings/variables',
-      parent: 'workspaceSettings',
-      impl: '@shipfox/client-workspace-settings/routes/variables',
-    },
-    {
-      path: '/workspaces/$wid/settings/integrations',
-      parent: 'workspaceSettings',
-      impl: '@shipfox/client-workspace-settings/routes/integrations',
-    },
-    {
-      path: '/workspaces/$wid/settings/events',
-      parent: 'workspaceSettings',
-      impl: '@shipfox/client-workspace-settings/routes/events',
-    },
-  ],
-  navigation: [
-    {
-      id: 'nav.settings',
-      scope: 'workspace',
-      label: 'Settings',
-      to: '/workspaces/$wid/settings',
-      order: 200,
-    },
-  ],
-  settingsSections: [
-    {
-      id: 'settings.members',
-      pathSegment: 'members',
-      label: 'Members',
-      icon: 'userLine' as IconName,
-      order: 100,
-    },
-    {
-      id: 'settings.runners',
-      pathSegment: 'runners',
-      label: 'Runners',
-      icon: 'settings3Line' as IconName,
-      order: 200,
-    },
-    {
-      id: 'settings.provisioners',
-      pathSegment: 'provisioners',
-      label: 'Runner provisioners',
-      icon: 'serverLine' as IconName,
-      order: 300,
-    },
-    {
-      id: 'settings.agents',
-      pathSegment: 'agents',
-      label: 'Agents',
-      icon: 'robot2Line' as IconName,
-      order: 400,
-    },
-    {
-      id: 'settings.secrets',
-      pathSegment: 'secrets',
-      label: 'Secrets',
-      icon: 'keyLine' as IconName,
-      order: 500,
-    },
-    {
-      id: 'settings.variables',
-      pathSegment: 'variables',
-      label: 'Variables',
-      icon: 'bracesLine' as IconName,
-      order: 600,
-    },
-    {
-      id: 'settings.integrations',
-      pathSegment: 'integrations',
-      label: 'Integrations',
-      icon: 'plugLine' as IconName,
-      order: 700,
-    },
-    {
-      id: 'settings.events',
-      pathSegment: 'events',
-      label: 'Events',
-      icon: 'pulseLine' as IconName,
-      order: 800,
-    },
   ],
+  navigation: workspaceSettingsNavigation,
+  settingsSections: workspaceSettingsSections,
 });

package/src/hooks/api/create-invitation.ts

@@ -1,25 +1,29 @@
-import {invitationDtoSchema} from '@shipfox/api-workspaces-dto';
+import {type CreateInvitationBodyDto, invitationDtoSchema} from '@shipfox/api-workspaces-dto';
 import {checkedApiRequest} from '@shipfox/client-api';
 import {useMutation, useQueryClient} from '@tanstack/react-query';
-import type {CreateInvitationCommand, Invitation} from '#core/invitation.js';
+import type {CreateInvitationCommand, PendingInvitation} from '#core/membership.js';
 import {toInvitation} from './invitation-mapper.js';
 import {listInvitationsQueryOptions} from './list-invitations.js';
 
 async function createInvitation(params: {
   workspaceId: string;
   command: CreateInvitationCommand;
-}): Promise<Invitation> {
+}): Promise<PendingInvitation> {
   const response = await checkedApiRequest(
     invitationDtoSchema,
     `/workspaces/${params.workspaceId}/invitations`,
     {
       method: 'POST',
-      body: {email: params.command.email},
+      body: toCreateInvitationBody(params.command),
     },
   );
   return toInvitation(response);
 }
 
+export function toCreateInvitationBody(command: CreateInvitationCommand): CreateInvitationBodyDto {
+  return {email: command.email};
+}
+
 export function useCreateInvitation(workspaceId: string) {
   const queryClient = useQueryClient();
   return useMutation({

package/src/hooks/api/invitation-mapper.ts

@@ -1,7 +1,7 @@
 import type {InvitationDto} from '@shipfox/api-workspaces-dto';
-import type {Invitation} from '#core/invitation.js';
+import type {PendingInvitation} from '#core/membership.js';
 
-export function toInvitation(dto: InvitationDto): Invitation {
+export function toInvitation(dto: InvitationDto): PendingInvitation {
   return {
     id: dto.id,
     workspaceId: dto.workspace_id,