@shipfox/client-integrations 4.0.0 → 5.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shipfox/client-integrations",
   "license": "MIT",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ShipfoxHQ/shipfox.git",
@@ -31,16 +31,16 @@
   "dependencies": {
     "@swc/helpers": "^0.5.17",
     "@tanstack/react-form": "^1.32.0",
-    "@shipfox/api-integration-core-dto": "6.0.0",
-    "@shipfox/api-integration-gitea-dto": "6.0.0",
-    "@shipfox/api-integration-github-dto": "6.0.0",
-    "@shipfox/api-integration-linear-dto": "6.0.0",
-    "@shipfox/api-integration-slack-dto": "6.0.0",
-    "@shipfox/api-integration-sentry-dto": "6.0.0",
-    "@shipfox/api-integration-webhook-dto": "6.0.0",
+    "@shipfox/api-integration-core-dto": "8.0.0",
+    "@shipfox/api-integration-gitea-dto": "8.0.0",
+    "@shipfox/api-integration-github-dto": "8.0.0",
+    "@shipfox/api-integration-linear-dto": "8.0.0",
+    "@shipfox/api-integration-slack-dto": "8.0.0",
+    "@shipfox/api-integration-sentry-dto": "8.0.0",
+    "@shipfox/api-integration-webhook-dto": "8.0.0",
     "@shipfox/client-api": "4.0.0",
-    "@shipfox/client-auth": "4.0.0",
-    "@shipfox/client-shell": "4.0.0",
+    "@shipfox/client-auth": "5.0.0",
+    "@shipfox/client-shell": "5.0.0",
     "@shipfox/client-ui": "4.0.0",
     "@shipfox/react-ui": "0.3.5"
   },

package/src/feature.ts

@@ -53,5 +53,19 @@ export const integrationsFeature = defineClientFeature({
       parent: 'workspaceLayout',
       impl: '@shipfox/client-integrations/routes/slack',
     },
+    {
+      path: '/workspaces/$wid/settings/integrations',
+      parent: 'workspaceSettings',
+      impl: '@shipfox/client-integrations/routes/integrations-settings',
+    },
+  ],
+  settingsSections: [
+    {
+      id: 'settings.integrations',
+      pathSegment: 'integrations',
+      label: 'Integrations',
+      icon: 'plugLine',
+      order: 700,
+    },
   ],
 });

package/src/hooks/api/integrations.ts

@@ -33,7 +33,14 @@ import type {
   SlackCallbackResponseDto,
 } from '@shipfox/api-integration-slack-dto';
 import {apiRequest} from '@shipfox/client-api';
-import {useInfiniteQuery, useMutation, useQuery, useQueryClient} from '@tanstack/react-query';
+import {
+  type FetchQueryOptions,
+  queryOptions,
+  useInfiniteQuery,
+  useMutation,
+  useQuery,
+  useQueryClient,
+} from '@tanstack/react-query';
 import {serializeLinearCallbackQuery} from '#linear-callback.js';
 import {serializeSlackCallbackQuery} from '#slack-callback.js';
 
@@ -54,6 +61,17 @@ export const integrationsQueryKeys = {
     [...integrationsQueryKeys.all, 'repositories', connectionId, search] as const,
 };
 
+type SourceConnectionsQueryKey =
+  | ReturnType<typeof integrationsQueryKeys.sourceConnections>
+  | readonly ['integrations', 'source-connections'];
+
+type SourceConnectionsQueryOptions = FetchQueryOptions<
+  ListIntegrationConnectionsResponseDto,
+  Error,
+  ListIntegrationConnectionsResponseDto,
+  SourceConnectionsQueryKey
+>;
+
 export async function listIntegrationProviders({
   capability,
   signal,
@@ -108,6 +126,18 @@ export async function listSourceConnections({
   };
 }
 
+export function sourceConnectionsQueryOptions(
+  workspaceId: string | undefined,
+): SourceConnectionsQueryOptions {
+  return queryOptions({
+    queryKey: workspaceId
+      ? integrationsQueryKeys.sourceConnections(workspaceId)
+      : ([...integrationsQueryKeys.all, 'source-connections'] as const),
+    enabled: Boolean(workspaceId),
+    queryFn: ({signal}) => listSourceConnections({workspaceId: workspaceId ?? '', signal}),
+  });
+}
+
 export async function createGiteaConnection(body: CreateGiteaConnectionBodyDto) {
   return await apiRequest<CreateGiteaConnectionResponseDto>('/integrations/gitea/connections', {
     method: 'POST',
@@ -228,13 +258,7 @@ export function useIntegrationProvidersQuery(params?: {capability?: IntegrationC
 }
 
 export function useSourceConnectionsQuery(workspaceId: string | undefined) {
-  return useQuery({
-    queryKey: workspaceId
-      ? integrationsQueryKeys.sourceConnections(workspaceId)
-      : [...integrationsQueryKeys.all, 'source-connections'],
-    enabled: Boolean(workspaceId),
-    queryFn: ({signal}) => listSourceConnections({workspaceId: workspaceId ?? '', signal}),
-  });
+  return useQuery(sourceConnectionsQueryOptions(workspaceId));
 }
 
 export function useIntegrationConnectionsQuery(workspaceId: string | undefined) {

package/src/pages/linear-callback-page.test.tsx

@@ -13,7 +13,7 @@ vi.mock('@shipfox/client-auth', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@shipfox/client-auth')>();
   return {
     ...actual,
-    useRefreshAuth: () => () => Promise.resolve({token: 'test-token'}),
+    useRefreshAuth: () => () => Promise.resolve({accessToken: 'test-token'}),
   };
 });
 

package/src/pages/linear-callback-page.tsx

@@ -50,7 +50,8 @@ export function LinearCallbackPage() {
       key,
       async () =>
         await refreshAuth().then(
-          async (session) => await completeLinearCallback({query: params, token: session.token}),
+          async (session) =>
+            await completeLinearCallback({query: params, token: session.accessToken}),
         ),
     );
 

package/src/pages/sentry-callback-page.test.tsx

@@ -13,7 +13,7 @@ vi.mock('@shipfox/client-auth', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@shipfox/client-auth')>();
   return {
     ...actual,
-    useRefreshAuth: () => () => Promise.resolve({token: 'test-token'}),
+    useRefreshAuth: () => () => Promise.resolve({accessToken: 'test-token'}),
   };
 });
 

package/src/pages/sentry-callback-page.tsx

@@ -108,7 +108,7 @@ export function SentryCallbackPage() {
               code: params.code,
               installation_id: params.installationId,
             },
-            token: session.token,
+            token: session.accessToken,
           }),
         ),
     );

package/src/pages/slack-callback-page.tsx

@@ -44,7 +44,8 @@ export function SlackCallbackPage() {
       key,
       async () =>
         await refreshAuth().then(
-          async (session) => await completeSlackCallback({query: params, token: session.token}),
+          async (session) =>
+            await completeSlackCallback({query: params, token: session.accessToken}),
         ),
     );
     request.then(

package/src/routes/github-callback.tsx

@@ -48,7 +48,7 @@ function GithubCallbackRoute() {
       async () =>
         await refreshAuth().then(async (session) => {
           await apiRequest(`/integrations/github/callback/api?${key}`, {
-            headers: {authorization: `Bearer ${session.token}`},
+            headers: {authorization: `Bearer ${session.accessToken}`},
           });
         }),
     );

package/src/routes/integrations-settings.tsx

@@ -0,0 +1,4 @@
+import {defineRoute} from '@shipfox/client-shell/runtime';
+import {IntegrationGallery} from '#index.js';
+
+export default defineRoute({component: IntegrationGallery});

package/test/render.tsx

@@ -41,11 +41,7 @@ function authState(workspaces: TestWorkspace[]): AuthState {
     user: {
       id: '22222222-2222-4222-8222-222222222222',
       email: 'user@example.com',
-      name: null,
-      email_verified_at: new Date().toISOString(),
-      status: 'active',
-      created_at: new Date().toISOString(),
-      updated_at: new Date().toISOString(),
+      emailVerifiedAt: new Date().toISOString(),
     },
     workspaces,
   };