feat(api): Require either subject or body for in-app

Author: desiprisg

apps/dashboard/src/components/workflow-editor/steps/in-app/in-app-body.tsx

@@ -31,7 +31,6 @@ export const InAppBody = () => {
                 onChange={field.onChange}
                 variables={variables}
                 isAllowedVariable={isAllowedVariable}
-                autoFocus
                 multiline
               />
             </InputRoot>

apps/dashboard/src/components/workflow-editor/steps/in-app/in-app-subject.tsx

@@ -31,6 +31,7 @@ export const InAppSubject = () => {
                 onChange={field.onChange}
                 variables={variables}
                 isAllowedVariable={isAllowedVariable}
+                autoFocus
               />
             </InputRoot>
           </FormControl>

apps/dashboard/src/routes/protected-route.tsx

@@ -1,6 +1,5 @@
-import { RedirectToSignIn, SignedIn, SignedOut } from '@clerk/clerk-react';
-import { ROUTES } from '@/utils/routes';
 import { EnvironmentProvider } from '@/context/environment/environment-provider';
+import { RedirectToSignIn, SignedIn, SignedOut } from '@clerk/clerk-react';
 
 export const ProtectedRoute = ({ children }: { children: React.ReactNode }) => {
   return (

libs/application-generic/src/schemas/control/in-app-control.schema.ts

@@ -23,7 +23,7 @@ const redirectUrlRegex =
 
 const redirectZodSchema = z.object({
   url: z.string().regex(redirectUrlRegex),
-  target: z.enum(['_self', '_blank', '_parent', '_top', '_unfencedTop']).default('_blank'),
+  target: z.enum(['_self', '_blank', '_parent', '_top', '_unfencedTop']),
 });
 
 const actionZodSchema = z
@@ -33,18 +33,31 @@ const actionZodSchema = z
   })
   .optional();
 
-export const inAppControlZodSchema = z.object({
+const commonInAppProperties = {
   skip: skipZodSchema,
   disableOutputSanitization: z.boolean().optional(),
-  subject: z.string().optional(),
-  body: z.string(),
   avatar: z.string().regex(redirectUrlRegex).optional(),
   primaryAction: actionZodSchema,
   secondaryAction: actionZodSchema,
   data: z.object({}).catchall(z.unknown()).optional(),
   redirect: redirectZodSchema.optional(),
+};
+
+const subjectRequiredSchema = z.object({
+  subject: z.string(),
+  body: z.string().optional(),
+  ...commonInAppProperties,
 });
 
+const bodyRequiredSchema = z.object({
+  subject: z.string().optional(),
+  body: z.string(),
+  ...commonInAppProperties,
+});
+
+// Write it this way because of how translation from zod to json schema works
+export const inAppControlZodSchema = z.union([subjectRequiredSchema, bodyRequiredSchema]);
+
 export type InAppRedirectType = z.infer<typeof redirectZodSchema>;
 export type InAppActionType = z.infer<typeof actionZodSchema>;
 export type InAppControlType = z.infer<typeof inAppControlZodSchema>;