Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Update page.tsx

Kiran K37e317f9c8fc
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page.tsx
index 18f4b0c07a..a825278545 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/integrations/[integrationSlug]/page.tsx
@@ -8,59 +8,62 @@ export const revalidate = 0;
export default async function IntegrationPage(props: {
params: Promise<{ slug: string; integrationSlug: string }>;
}) {
- const params = await props.params;
- const integration = await prisma.integration.findUnique({
- where: {
- slug: params.integrationSlug,
- },
- include: {
- installations: {
- where: {
- project: {
- slug: params.slug,
- },
+ const { slug: workspaceSlug, integrationSlug } = await props.params;
+
+ // Being extra safe, we are fetching the integration and the installed integration separately
+ const [integration, installedIntegration] = await Promise.all([
+ prisma.integration.findUnique({
+ where: {
+ slug: integrationSlug,
+ },
+ }),
+
+ prisma.installedIntegration.findFirst({
+ where: {
+ integration: {
+ slug: integrationSlug,
+ },
+ project: {
+ slug: workspaceSlug,
},
- include: {
- user: {
- select: {
- id: true,
- name: true,
- email: true,
- image: true,
- },
+ },
+ select: {
+ id: true,
+ integrationId: true,
+ userId: true,
+ settings: true,
+ createdAt: true,
+ user: {
+ select: {
+ id: true,
+ name: true,
+ email: true,
+ image: true,
},
- webhooks: {
- select: {
- id: true,
- },
+ },
+ webhooks: {
+ select: {
+ id: true,
},
},
},
- },
- });
+ }),
+ ]);
if (!integration || integration.comingSoon) {
- redirect(`/${params.slug}/settings/integrations`);
+ redirect(`/${workspaceSlug}/settings/integrations`);
}
if (integration.guideUrl && integration.id !== APPSFLYER_INTEGRATION_ID) {
redirect(integration.guideUrl);
}
- const installed = integration.installations.length > 0;
-
- const credentials = installed
- ? integration.installations[0]?.credentials
- : undefined;
-
- const settings = installed
- ? integration.installations[0]?.settings
+ const settings = installedIntegration
+ ? installedIntegration.settings
: undefined;
- // TODO:
- // Fix this, we only displaying the first webhook only
- const webhookId = installed
- ? integration.installations[0]?.webhooks[0]?.id
+ const webhookId = installedIntegration
+ ? installedIntegration.webhooks[0]?.id
: undefined;
return (
@@ -68,19 +71,19 @@ export default async function IntegrationPage(props: {
integration={{
...integration,
screenshots: integration.screenshots as string[],
- installed: installed
+ installed: installedIntegration
? {
- id: integration.installations[0].id,
+ id: installedIntegration.id,
+ createdAt: installedIntegration.createdAt,
by: {
- id: integration.installations[0].userId,
- name: integration.installations[0].user.name,
- email: integration.installations[0].user.email,
- image: integration.installations[0].user.image,
+ id: installedIntegration.userId,
+ name: installedIntegration.user.name,
+ email: installedIntegration.user.email,
+ image: installedIntegration.user.image,
},
- createdAt: integration.installations[0].createdAt,
}
: null,
- credentials,
+ credentials: {}, // TODO: Fix this
settings,
webhookId,
}}