@shipfox/client-integrations 12.0.1 → 13.0.0

package/src/provider-catalog.test.ts

@@ -4,20 +4,20 @@ describe('PROVIDER_CATALOG', () => {
   test('contains route entries for github, sentry, and gitea', () => {
     expect(PROVIDER_CATALOG.github).toMatchObject({
       kind: 'redirect-install',
-      setupPath: '/workspaces/$wid/integrations/github',
+      setupPath: '/w/$workspaceSlug/integrations/github',
     });
     expect(PROVIDER_CATALOG.sentry).toMatchObject({
       kind: 'redirect-install',
-      setupPath: '/workspaces/$wid/integrations/sentry',
+      setupPath: '/w/$workspaceSlug/integrations/sentry',
     });
     expect(PROVIDER_CATALOG.linear).toMatchObject({
       kind: 'redirect-install',
       iconName: 'linear',
-      setupPath: '/workspaces/$wid/integrations/linear',
+      setupPath: '/w/$workspaceSlug/integrations/linear',
     });
     expect(PROVIDER_CATALOG.gitea).toMatchObject({
       kind: 'direct-connect',
-      setupPath: '/workspaces/$wid/integrations/gitea',
+      setupPath: '/w/$workspaceSlug/integrations/gitea',
     });
   });
 

package/src/provider-catalog.ts

@@ -4,11 +4,11 @@ import type {IconName} from '@shipfox/react-ui/icon';
 // Literal union (not string) so `<Link to={catalog.setupPath}>` stays typed
 // against TanStack Router's route tree.
 export type ProviderSetupPath =
-  | '/workspaces/$wid/integrations/github'
-  | '/workspaces/$wid/integrations/gitea'
-  | '/workspaces/$wid/integrations/sentry'
-  | '/workspaces/$wid/integrations/linear'
-  | '/workspaces/$wid/integrations/slack';
+  | '/w/$workspaceSlug/integrations/github'
+  | '/w/$workspaceSlug/integrations/gitea'
+  | '/w/$workspaceSlug/integrations/sentry'
+  | '/w/$workspaceSlug/integrations/linear'
+  | '/w/$workspaceSlug/integrations/slack';
 
 interface RouteProviderCatalogEntry {
   kind: 'redirect-install' | 'direct-connect';
@@ -27,27 +27,27 @@ export const PROVIDER_CATALOG: Record<string, ProviderCatalogEntry> = {
   github: {
     kind: 'redirect-install',
     iconName: PROVIDER_ICONS.github,
-    setupPath: '/workspaces/$wid/integrations/github',
+    setupPath: '/w/$workspaceSlug/integrations/github',
   },
   sentry: {
     kind: 'redirect-install',
     iconName: PROVIDER_ICONS.sentry,
-    setupPath: '/workspaces/$wid/integrations/sentry',
+    setupPath: '/w/$workspaceSlug/integrations/sentry',
   },
   linear: {
     kind: 'redirect-install',
     iconName: PROVIDER_ICONS.linear,
-    setupPath: '/workspaces/$wid/integrations/linear',
+    setupPath: '/w/$workspaceSlug/integrations/linear',
   },
   slack: {
     kind: 'redirect-install',
     iconName: PROVIDER_ICONS.slack,
-    setupPath: '/workspaces/$wid/integrations/slack',
+    setupPath: '/w/$workspaceSlug/integrations/slack',
   },
   gitea: {
     kind: 'direct-connect',
     iconName: PROVIDER_ICONS.gitea,
-    setupPath: '/workspaces/$wid/integrations/gitea',
+    setupPath: '/w/$workspaceSlug/integrations/gitea',
   },
   webhook: {
     kind: 'modal-connect',

package/src/sentry-callback.ts

@@ -20,7 +20,7 @@ const sentryInstallWorkspaceStorageKey = {
 } satisfies BrowserStorageKey<string>;
 
 // Storage helpers swallow failures (quota, private mode, disabled storage):
-// the handoff is an optimization, never a requirement — the callback always
+// the handoff is an optimization, never a requirement: the callback always
 // asks for explicit confirmation and only uses the stored id to pre-select.
 export function saveSentryInstallWorkspace(storage: WorkspaceStorage, workspaceId: string): void {
   installWorkspaceStorage(storage).write(workspaceId);
@@ -67,7 +67,7 @@ export type SentryWorkspacePreselection =
   | {kind: 'none'};
 
 // Sentry's redirect carries no state token, so the callback can never prove it
-// belongs to an install the user started — installation always requires an
+// belongs to an install the user started. Installation always requires an
 // explicit click. The stored id (and a sole workspace) only pre-select.
 export function preselectSentryWorkspace(
   storedId: string | undefined,

package/src/workspace-navigation.test.ts

@@ -0,0 +1,43 @@
+import {configureApiClient} from '@shipfox/client-api';
+import {userWorkspacesQueryKey} from '@shipfox/client-shell/runtime';
+import {QueryClient} from '@tanstack/react-query';
+import {resolveWorkspaceSlug} from './workspace-navigation.js';
+
+function jsonResponse(body: unknown, init: ResponseInit = {}): Response {
+  return new Response(JSON.stringify(body), {
+    headers: {'content-type': 'application/json'},
+    status: 200,
+    ...init,
+  });
+}
+
+describe('resolveWorkspaceSlug', () => {
+  beforeEach(() => {
+    configureApiClient({baseUrl: 'https://api.example.test', fetchImpl: undefined});
+  });
+
+  test('uses refreshed cached memberships when the follow-up list request fails', async () => {
+    configureApiClient({
+      fetchImpl: vi
+        .fn()
+        .mockResolvedValue(
+          jsonResponse(
+            {code: 'server-error', message: 'Workspace list unavailable'},
+            {status: 500},
+          ),
+        ),
+    });
+    const queryClient = new QueryClient();
+    queryClient.setQueryData(userWorkspacesQueryKey, {
+      memberships: [{id: 'response-workspace', slug: 'response-workspace'}],
+    });
+
+    await expect(
+      resolveWorkspaceSlug({
+        workspaceId: 'response-workspace',
+        fallbackWorkspaces: [{id: 'response-workspace', slug: 'old-slug'}],
+        queryClient,
+      }),
+    ).resolves.toBe('response-workspace');
+  });
+});

package/src/workspace-navigation.ts

@@ -0,0 +1,38 @@
+import {listUserWorkspaces, userWorkspacesQueryKey} from '@shipfox/client-shell/runtime';
+import type {QueryClient} from '@tanstack/react-query';
+
+interface WorkspaceSlugCandidate {
+  id: string;
+  slug: string;
+}
+
+interface UserWorkspacesQueryData {
+  memberships: WorkspaceSlugCandidate[];
+}
+
+export function rememberCallbackKey(keys: Set<string>, key: string, maxSize = 32): void {
+  keys.delete(key);
+  keys.add(key);
+  if (keys.size <= maxSize) return;
+  const oldest = keys.values().next().value;
+  if (typeof oldest === 'string') keys.delete(oldest);
+}
+
+export async function resolveWorkspaceSlug({
+  workspaceId,
+  fallbackWorkspaces,
+  queryClient,
+}: {
+  workspaceId: string;
+  fallbackWorkspaces: readonly WorkspaceSlugCandidate[];
+  queryClient: QueryClient;
+}): Promise<string | undefined> {
+  const currentWorkspaces = await listUserWorkspaces()
+    .then(({memberships}) => memberships)
+    .catch(() => {
+      const refreshedWorkspaces =
+        queryClient.getQueryData<UserWorkspacesQueryData>(userWorkspacesQueryKey);
+      return refreshedWorkspaces?.memberships ?? fallbackWorkspaces;
+    });
+  return currentWorkspaces.find(({id}) => id === workspaceId)?.slug;
+}

package/test/render.tsx

@@ -19,11 +19,12 @@ export const INTEGRATIONS_TEST_WID = '11111111-1111-4111-8111-111111111111';
 export interface TestWorkspace {
   id: string;
   name: string;
+  slug: string;
   membershipId: string;
 }
 
 export function testWorkspace(overrides: Partial<TestWorkspace> = {}): TestWorkspace {
-  return {id: INTEGRATIONS_TEST_WID, name: 'Acme', membershipId: 'm-1', ...overrides};
+  return {id: INTEGRATIONS_TEST_WID, name: 'Acme', slug: 'acme', membershipId: 'm-1', ...overrides};
 }
 
 export function jsonResponse(body: unknown, init: ResponseInit = {}) {