Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

fix: refactor workflow API and update link type handling

Marc Seitz4b494bc42a07
diff --git a/app/(ee)/api/workflows/[workflowId]/route.ts b/app/(ee)/api/workflows/[workflowId]/route.ts
index 93a9ff8a..1cb03c2c 100644
--- a/app/(ee)/api/workflows/[workflowId]/route.ts
+++ b/app/(ee)/api/workflows/[workflowId]/route.ts
@@ -34,16 +34,15 @@ export async function GET(
}
// Validate IDs format
- const idsValidation = z.object({
- workflowId: z.string().cuid(),
- teamId: z.string().cuid(),
- }).safeParse({ workflowId, teamId });
+ const idsValidation = z
+ .object({
+ workflowId: z.string().cuid(),
+ teamId: z.string().cuid(),
+ })
+ .safeParse({ workflowId, teamId });
if (!idsValidation.success) {
- return NextResponse.json(
- { error: "Invalid ID format" },
- { status: 400 },
- );
+ return NextResponse.json({ error: "Invalid ID format" }, { status: 400 });
}
const userId = (session.user as CustomUser).id;
@@ -98,11 +97,8 @@ export async function GET(
? `https://${workflow.entryLink.domainSlug}/${workflow.entryLink.slug}`
: `${process.env.NEXT_PUBLIC_MARKETING_URL}/view/${workflow.entryLink.id}`;
- // Remove team data from response
- const { team, ...workflowData } = workflow;
-
return NextResponse.json({
- ...workflowData,
+ ...workflow,
entryUrl,
});
} catch (error) {
@@ -137,16 +133,15 @@ export async function PATCH(
}
// Validate IDs format
- const idsValidation = z.object({
- workflowId: z.string().cuid(),
- teamId: z.string().cuid(),
- }).safeParse({ workflowId, teamId });
+ const idsValidation = z
+ .object({
+ workflowId: z.string().cuid(),
+ teamId: z.string().cuid(),
+ })
+ .safeParse({ workflowId, teamId });
if (!idsValidation.success) {
- return NextResponse.json(
- { error: "Invalid ID format" },
- { status: 400 },
- );
+ return NextResponse.json({ error: "Invalid ID format" }, { status: 400 });
}
const userId = (session.user as CustomUser).id;
@@ -248,16 +243,15 @@ export async function DELETE(
}
// Validate IDs format
- const idsValidation = z.object({
- workflowId: z.string().cuid(),
- teamId: z.string().cuid(),
- }).safeParse({ workflowId, teamId });
+ const idsValidation = z
+ .object({
+ workflowId: z.string().cuid(),
+ teamId: z.string().cuid(),
+ })
+ .safeParse({ workflowId, teamId });
if (!idsValidation.success) {
- return NextResponse.json(
- { error: "Invalid ID format" },
- { status: 400 },
- );
+ return NextResponse.json({ error: "Invalid ID format" }, { status: 400 });
}
const userId = (session.user as CustomUser).id;
diff --git a/ee/features/workflows/lib/engine.ts b/ee/features/workflows/lib/engine.ts
index 5ac0ad8b..cffea686 100644
--- a/ee/features/workflows/lib/engine.ts
+++ b/ee/features/workflows/lib/engine.ts
@@ -83,7 +83,7 @@ export class WorkflowEngine {
context,
);
- let actionsResult = null;
+ let actionsResult: (Action & { routed: boolean }) | undefined;
// If conditions matched, execute the route action
if (conditionsMatched && actions.length > 0) {
@@ -92,7 +92,7 @@ export class WorkflowEngine {
targetLinkId = routeAction.targetLinkId;
targetDocumentId = routeAction.targetDocumentId;
targetDataroomId = routeAction.targetDataroomId;
- actionsResult = { routed: true, targetLinkId };
+ actionsResult = { ...routeAction, routed: true };
}
}
@@ -103,7 +103,7 @@ export class WorkflowEngine {
workflowStepId: step.id,
conditionsMatched,
conditionResults: conditions,
- actionsExecuted: actionsResult ? [actionsResult] : null,
+ ...(actionsResult ? { actionsExecuted: [actionsResult] } : {}),
duration: Date.now() - startTime,
},
});
diff --git a/lib/zod/schemas/webhooks.ts b/lib/zod/schemas/webhooks.ts
index 35e2f88b..14272f28 100644
--- a/lib/zod/schemas/webhooks.ts
+++ b/lib/zod/schemas/webhooks.ts
@@ -68,7 +68,7 @@ const linkEventSchema = z.object({
dataroomId: z.string().nullable(),
groupId: z.string().nullable(),
- linkType: z.enum(["DOCUMENT_LINK", "DATAROOM_LINK"]),
+ linkType: z.enum(["DOCUMENT_LINK", "DATAROOM_LINK", "WORKFLOW_LINK"]),
teamId: z.string(),
createdAt: z.string().datetime(),
updatedAt: z.string().datetime(),
diff --git a/pages/view/[linkId]/embed.tsx b/pages/view/[linkId]/embed.tsx
index 4295a143..79cca5c9 100644
--- a/pages/view/[linkId]/embed.tsx
+++ b/pages/view/[linkId]/embed.tsx
@@ -4,12 +4,12 @@ import { useEffect, useState } from "react";
import NotFound from "@/pages/404";
+import { useAnalytics } from "@/lib/analytics";
+
import LoadingSpinner from "@/components/ui/loading-spinner";
import DataroomView from "@/components/view/dataroom/dataroom-view";
import DocumentView from "@/components/view/document-view";
-import { useAnalytics } from "@/lib/analytics";
-
import { ViewPageProps } from "./index";
// Reuse the same getStaticProps and getStaticPaths from the main view page
@@ -71,10 +71,11 @@ export default function EmbedPage(props: ViewPageProps) {
d: string;
previewToken?: string;
};
- const { linkType, link, brand } = props.linkData;
+ const { linkType, brand } = props.linkData;
// Render the document view for DOCUMENT_LINK
if (linkType === "DOCUMENT_LINK") {
+ const { link } = props.linkData;
if (!props.linkData || router.isFallback) {
return (
<div className="flex h-screen items-center justify-center">
@@ -129,6 +130,7 @@ export default function EmbedPage(props: ViewPageProps) {
// Render the dataroom view for DATAROOM_LINK
if (linkType === "DATAROOM_LINK") {
+ const { link } = props.linkData;
if (!link || router.isFallback) {
return (
<div className="flex h-screen items-center justify-center">
diff --git a/pages/view/[linkId]/index.tsx b/pages/view/[linkId]/index.tsx
index 75287447..adc332aa 100644
--- a/pages/view/[linkId]/index.tsx
+++ b/pages/view/[linkId]/index.tsx
@@ -5,7 +5,7 @@ import { useEffect, useState } from "react";
import WorkflowAccessView from "@/ee/features/workflows/components/workflow-access-view";
import NotFound from "@/pages/404";
-import { Brand, DataroomBrand } from "@prisma/client";
+import { Brand, DataroomBrand, DataroomDocument } from "@prisma/client";
import Cookies from "js-cookie";
import { useSession } from "next-auth/react";
import { ExtendedRecordMap } from "notion-types";
@@ -242,12 +242,15 @@ export const getStaticProps = async (context: GetStaticPropsContext) => {
const dataroomIndexEnabled = featureFlags.dataroomIndex;
const annotationsEnabled = featureFlags.annotations;
- const lastUpdatedAt = link.dataroom.documents.reduce((max, doc) => {
- return Math.max(
- max,
- new Date(doc.document.versions[0].updatedAt).getTime(),
- );
- }, new Date(link.dataroom.createdAt).getTime());
+ const lastUpdatedAt = link.dataroom.documents.reduce(
+ (max: number, doc: any) => {
+ return Math.max(
+ max,
+ new Date(doc.document.versions[0].updatedAt).getTime(),
+ );
+ },
+ new Date(link.dataroom.createdAt).getTime(),
+ );
return {
props: {
diff --git a/pages/view/domains/[domain]/[slug]/index.tsx b/pages/view/domains/[domain]/[slug]/index.tsx
index 79d72400..533d4d9c 100644
--- a/pages/view/domains/[domain]/[slug]/index.tsx
+++ b/pages/view/domains/[domain]/[slug]/index.tsx
@@ -221,12 +221,15 @@ export const getStaticProps = async (context: GetStaticPropsContext) => {
const featureFlags = await getFeatureFlags({ teamId });
const dataroomIndexEnabled = featureFlags.dataroomIndex;
- const lastUpdatedAt = link.dataroom.documents.reduce((max, doc) => {
- return Math.max(
- max,
- new Date(doc.document.versions[0].updatedAt).getTime(),
- );
- }, new Date(link.dataroom.createdAt).getTime());
+ const lastUpdatedAt = link.dataroom.documents.reduce(
+ (max: number, doc: any) => {
+ return Math.max(
+ max,
+ new Date(doc.document.versions[0].updatedAt).getTime(),
+ );
+ },
+ new Date(link.dataroom.createdAt).getTime(),
+ );
return {
props: {