From ef88d29e98e532d6b56a9b84f4892457fa01add1 Mon Sep 17 00:00:00 2001
From: chris <christinapdgn@gmail.com>
Date: Fri, 11 Sep 2026 17:38:17 +0300
Subject: [PATCH 1/2] feat(functions): align cron UI with backend timezone
 contract

Add IANA timezone on cron create/edit, validate schedule in that zone,
and stop dual-writing the pattern into inputs.event.
---
 src/components/functions/ConfigForm.tsx       | 32 ++++++++++---
 .../functions/CreateFunctionForm.tsx          |  2 +-
 src/components/functions/EditFunctionForm.tsx |  3 +-
 src/components/functions/zod.ts               | 45 ++++++++++++++-----
 src/lib/models/functions/schemas.ts           |  1 +
 5 files changed, 62 insertions(+), 21 deletions(-)

diff --git a/src/components/functions/ConfigForm.tsx b/src/components/functions/ConfigForm.tsx
index 48162aec1..2dcf8b518 100644
--- a/src/components/functions/ConfigForm.tsx
+++ b/src/components/functions/ConfigForm.tsx
@@ -44,7 +44,15 @@ export const ConfigForm = ({ middlewares, data }: ConfigFormProps) => {
               <Select
                 onValueChange={value => {
                   field.onChange(value);
-                  form.setValue('options.functionType', value);
+                  if (value === 'cron') {
+                    form.setValue('options', {
+                      functionType: 'cron',
+                      cronString: form.getValues('options.cronString') || '',
+                      timezone: form.getValues('options.timezone') || 'UTC',
+                    });
+                  } else {
+                    form.setValue('options.functionType', value);
+                  }
                 }}
                 value={field.value}
               >
@@ -132,12 +140,22 @@ export const ConfigForm = ({ middlewares, data }: ConfigFormProps) => {
         <InputField fieldName={'options.eventName'} label={'Event Name'} />
       )}
       {form.watch('functionType') === 'cron' && (
-        <InputField
-          fieldName={'options.cronString'}
-          label={'Cron schedule'}
-          placeholder={'*/5 * * * *'}
-          description={'minute hour day month weekday (UTC)'}
-        />
+        <>
+          <InputField
+            fieldName={'options.cronString'}
+            label={'Cron schedule'}
+            placeholder={'*/5 * * * *'}
+            description={'minute hour day month weekday'}
+          />
+          <InputField
+            fieldName={'options.timezone'}
+            label={'Timezone'}
+            placeholder={'UTC'}
+            description={
+              'IANA timezone for the schedule (e.g. UTC, Europe/Athens)'
+            }
+          />
+        </>
       )}
       {(form.watch('functionType') === 'webhook' ||
         form.watch('functionType') === 'request') && (
diff --git a/src/components/functions/CreateFunctionForm.tsx b/src/components/functions/CreateFunctionForm.tsx
index 400280b7c..1aee76aaa 100644
--- a/src/components/functions/CreateFunctionForm.tsx
+++ b/src/components/functions/CreateFunctionForm.tsx
@@ -145,7 +145,7 @@ export const CreateFunctionForm = ({
         timeout: data.timeout,
         inputs: {
           cronPattern: options.cronString,
-          event: options.cronString,
+          timezone: options.timezone?.trim() || 'UTC',
         },
       })
         .then(() => {
diff --git a/src/components/functions/EditFunctionForm.tsx b/src/components/functions/EditFunctionForm.tsx
index d486e6a28..703b5ed02 100644
--- a/src/components/functions/EditFunctionForm.tsx
+++ b/src/components/functions/EditFunctionForm.tsx
@@ -73,6 +73,7 @@ export const EditFunctionForm = ({
                 functionData.inputs?.cronPattern ??
                 functionData.inputs?.event ??
                 '',
+              timezone: functionData.inputs?.timezone?.trim() || 'UTC',
             },
           }
         : {}),
@@ -190,7 +191,7 @@ export const EditFunctionForm = ({
         timeout: data.timeout,
         inputs: {
           cronPattern: options.cronString,
-          event: options.cronString,
+          timezone: options.timezone?.trim() || 'UTC',
         },
       })
         .then(() => {
diff --git a/src/components/functions/zod.ts b/src/components/functions/zod.ts
index 52c8b1188..0418043c1 100644
--- a/src/components/functions/zod.ts
+++ b/src/components/functions/zod.ts
@@ -1,9 +1,18 @@
 import { z } from 'zod';
 import { parseExpression } from 'cron-parser';
 
-function validateCronString(value: string): boolean {
+function validateIanaTimezone(value: string): boolean {
   try {
-    parseExpression(value.trim(), { tz: 'UTC' });
+    Intl.DateTimeFormat('en-US', { timeZone: value.trim() });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function validateCronString(value: string, timezone = 'UTC'): boolean {
+  try {
+    parseExpression(value.trim(), { tz: timezone.trim() || 'UTC' });
     return true;
   } catch {
     return false;
@@ -134,16 +143,28 @@ export const EventOptions = z.object({
   functionType: z.literal('event'),
   eventName: z.string(),
 });
-export const CronOptions = z.object({
-  functionType: z.literal('cron'),
-  cronString: z
-    .string()
-    .min(1, 'Cron schedule is required')
-    .refine(validateCronString, {
-      message:
-        'Invalid cron pattern. Use 5 fields: minute hour day month weekday (UTC). Example: */5 * * * *',
-    }),
-});
+export const CronOptions = z
+  .object({
+    functionType: z.literal('cron'),
+    cronString: z.string().min(1, 'Cron schedule is required'),
+    timezone: z
+      .string()
+      .trim()
+      .default('UTC')
+      .refine(v => v.length > 0 && validateIanaTimezone(v), {
+        message:
+          'Invalid timezone. Use an IANA name (e.g. UTC, Europe/Athens).',
+      }),
+  })
+  .superRefine((data, ctx) => {
+    if (!validateCronString(data.cronString, data.timezone)) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        path: ['cronString'],
+        message: `Invalid cron pattern. Use 5 fields: minute hour day month weekday (${data.timezone}). Example: */5 * * * *`,
+      });
+    }
+  });
 export const SocketOptions = z.object({
   functionType: z.literal('socket'),
 });
diff --git a/src/lib/models/functions/schemas.ts b/src/lib/models/functions/schemas.ts
index cda692c14..2a5e6ff7e 100644
--- a/src/lib/models/functions/schemas.ts
+++ b/src/lib/models/functions/schemas.ts
@@ -2,6 +2,7 @@ interface IWebInputsInterface {
   method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
   event?: string;
   cronPattern?: string;
+  timezone?: string;
   bodyParams?: { [key: string]: any }[];
   urlParams?: { [key: string]: any }[];
   queryParams?: { [key: string]: any }[];

From ab95da285afab3c8e93b62d489d188b61b7fa5fe Mon Sep 17 00:00:00 2001
From: chris <christinapdgn@gmail.com>
Date: Fri, 11 Sep 2026 17:43:30 +0300
Subject: [PATCH 2/2] fix(functions): reset options when switching function
 type

Avoid leaving cron-only options behind when switching away from cron,
which broke request/webhook/event validation after a type change.
---
 src/components/functions/ConfigForm.tsx | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/components/functions/ConfigForm.tsx b/src/components/functions/ConfigForm.tsx
index 2dcf8b518..7a04f2cc9 100644
--- a/src/components/functions/ConfigForm.tsx
+++ b/src/components/functions/ConfigForm.tsx
@@ -50,8 +50,30 @@ export const ConfigForm = ({ middlewares, data }: ConfigFormProps) => {
                       cronString: form.getValues('options.cronString') || '',
                       timezone: form.getValues('options.timezone') || 'UTC',
                     });
+                  } else if (value === 'event') {
+                    form.setValue('options', {
+                      functionType: 'event',
+                      eventName: form.getValues('options.eventName') || '',
+                    });
+                  } else if (value === 'request' || value === 'webhook') {
+                    const verb =
+                      form.getValues('options.verb') ||
+                      form.getValues('options.http.verb') ||
+                      'GET';
+                    form.setValue('options', {
+                      functionType: value,
+                      verb,
+                      middlewares: form.getValues('options.middlewares') || [],
+                      http: {
+                        verb,
+                        queryParams: form.getValues('options.http.queryParams'),
+                        urlParams: form.getValues('options.http.urlParams'),
+                        bodyParams: form.getValues('options.http.bodyParams'),
+                        returnTypes: form.getValues('options.http.returnTypes'),
+                      },
+                    });
                   } else {
-                    form.setValue('options.functionType', value);
+                    form.setValue('options', { functionType: value });
                   }
                 }}
                 value={field.value}