fix(api): null issues (#7076)

novuhq · Nov 20, 2024 · 32b983b · 32b983b
1 parent a12756c
commit 32b983b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/apps/api/src/app/workflows-v2/generate-preview.e2e.ts b/apps/api/src/app/workflows-v2/generate-preview.e2e.ts
@@ -546,13 +546,7 @@ function buildInAppControlValuesMissingUrlsAndData() {
         target: RedirectTargetEnum.BLANK,
       },
     },
-    secondaryAction: {
-      label: 'Secondary Action',
-      redirect: {
-        target: RedirectTargetEnum.BLANK,
-        url: '',
-      },
-    },
+    secondaryAction: null,
     redirect: {
       target: RedirectTargetEnum.BLANK,
       url: '   ',

diff --git a/apps/api/src/app/workflows-v2/shared/schemas/in-app-control.schema.ts b/apps/api/src/app/workflows-v2/shared/schemas/in-app-control.schema.ts
@@ -7,24 +7,28 @@ const redirectZodSchema = z
     url: z.string().optional(),
     target: z.enum(['_self', '_blank', '_parent', '_top', '_unfencedTop']).default('_blank'),
   })
-  .strict();
+  .strict()
+  .optional()
+  .nullable();
 
 const actionZodSchema = z
   .object({
     label: z.string().optional(),
     redirect: redirectZodSchema.optional(),
   })
-  .strict();
+  .strict()
+  .optional()
+  .nullable();
 
 export const InAppControlZodSchema = z
   .object({
     subject: z.string().optional(),
     body: z.string(),
     avatar: z.string().optional(),
-    primaryAction: actionZodSchema.optional(),
-    secondaryAction: actionZodSchema.optional(),
+    primaryAction: actionZodSchema,
+    secondaryAction: actionZodSchema,
     data: z.object({}).catchall(z.unknown()).optional(),
-    redirect: redirectZodSchema.optional(),
+    redirect: redirectZodSchema,
   })
   .strict();
 

diff --git a/...ses/validate-content/prepare-and-validate-content/prepare-and-validate-content.usecase.ts b/...ses/validate-content/prepare-and-validate-content/prepare-and-validate-content.usecase.ts
@@ -110,6 +110,9 @@ export class PrepareAndValidateContentUsecase {
     const filteredValues: Record<string, unknown> = {};
 
     for (const [key, value] of Object.entries(controlValues)) {
+      if (value === null) {
+        continue;
+      }
       if (typeof value !== 'string') {
         filteredValues[key] = value;
         continue;