fix(app): preserve explicit alert schedule resets

packages/app/src/DBSearchPageAlertModal.tsx

@@ -96,7 +96,12 @@ const AlertForm = ({
 }) => {
   const { data: source } = useSource({ id: sourceId });
 
-  const { control, handleSubmit, setValue } = useForm<Alert>({
+  const {
+    control,
+    handleSubmit,
+    setValue,
+    formState: { dirtyFields },
+  } = useForm<Alert>({
     defaultValues: defaultValues
       ? {
           ...defaultValues,
@@ -137,7 +142,14 @@ const AlertForm = ({
   return (
     <form
       onSubmit={handleSubmit(data =>
-        onSubmit(normalizeNoOpAlertScheduleFields(data, defaultValues)),
+        onSubmit(
+          normalizeNoOpAlertScheduleFields(data, defaultValues, {
+            preserveExplicitScheduleOffsetMinutes:
+              dirtyFields.scheduleOffsetMinutes === true,
+            preserveExplicitScheduleStartAt:
+              dirtyFields.scheduleStartAt === true,
+          }),
+        ),
       )}
     >
       <Stack gap="xs">

packages/app/src/components/DBEditTimeChartForm.tsx

@@ -88,6 +88,7 @@ import {
 } from '@/hooks/useFetchMetricResourceAttrs';
 import SearchInputV2 from '@/SearchInputV2';
 import { getFirstTimestampValueExpression, useSource } from '@/source';
+import { AlertWithCreatedBy } from '@/types';
 import {
   getMetricTableName,
   optionsToSelectData,
@@ -564,6 +565,9 @@ export type SavedChartConfigWithSelectArray = Omit<
 };
 
 type SavedChartConfigWithSeries = SavedChartConfig & {
+  alert?: SavedChartConfig['alert'] & {
+    createdBy?: AlertWithCreatedBy['createdBy'];
+  };
   series: SavedChartConfigWithSelectArray['select'];
 };
 
@@ -622,7 +626,7 @@ export default function EditTimeChartForm({
     register,
     setError,
     clearErrors,
-    formState: { errors, isDirty },
+    formState: { errors, isDirty, dirtyFields },
   } = useForm<SavedChartConfigWithSeries>({
     defaultValues: configWithSeries,
     values: configWithSeries,
@@ -782,6 +786,12 @@ export default function EditTimeChartForm({
         alert: normalizeNoOpAlertScheduleFields(
           config.alert,
           chartConfig.alert,
+          {
+            preserveExplicitScheduleOffsetMinutes:
+              dirtyFields.alert?.scheduleOffsetMinutes === true,
+            preserveExplicitScheduleStartAt:
+              dirtyFields.alert?.scheduleStartAt === true,
+          },
         ),
       };
 
@@ -813,6 +823,8 @@ export default function EditTimeChartForm({
     })();
   }, [
     chartConfig.alert,
+    dirtyFields.alert?.scheduleOffsetMinutes,
+    dirtyFields.alert?.scheduleStartAt,
     handleSubmit,
     setChartConfig,
     setQueriedConfigAndSource,
@@ -867,6 +879,12 @@ export default function EditTimeChartForm({
           alert: normalizeNoOpAlertScheduleFields(
             withoutSeries.alert,
             chartConfig.alert,
+            {
+              preserveExplicitScheduleOffsetMinutes:
+                dirtyFields.alert?.scheduleOffsetMinutes === true,
+              preserveExplicitScheduleStartAt:
+                dirtyFields.alert?.scheduleStartAt === true,
+            },
           ),
         };
         const normalizedChartConfig = normalizeChartConfig(
@@ -878,7 +896,15 @@ export default function EditTimeChartForm({
         onSave?.(normalizedChartConfig);
       }
     },
-    [onSave, displayType, tableSource, setError, chartConfig.alert],
+    [
+      onSave,
+      displayType,
+      tableSource,
+      setError,
+      chartConfig.alert,
+      dirtyFields.alert?.scheduleOffsetMinutes,
+      dirtyFields.alert?.scheduleStartAt,
+    ],
   );
 
   // Track previous values for detecting changes
@@ -1378,11 +1404,9 @@ export default function EditTimeChartForm({
                     control={control}
                   />
                 </Group>
-                {(alert as any)?.createdBy && (
+                {alert?.createdBy && (
                   <Text size="xs" opacity={0.6}>
-                    Created by{' '}
-                    {(alert as any).createdBy?.name ||
-                      (alert as any).createdBy?.email}
+                    Created by {alert.createdBy.name || alert.createdBy.email}
                   </Text>
                 )}
               </Group>

packages/app/src/utils/__tests__/alerts.test.ts

@@ -60,4 +60,36 @@ describe('normalizeNoOpAlertScheduleFields', () => {
       scheduleStartAt: '2024-01-01T00:00:00.000Z',
     });
   });
+
+  it('keeps an explicit offset reset when requested', () => {
+    const normalized = normalizeNoOpAlertScheduleFields(
+      {
+        scheduleOffsetMinutes: 0,
+      },
+      undefined,
+      {
+        preserveExplicitScheduleOffsetMinutes: true,
+      },
+    );
+
+    expect(normalized).toEqual({
+      scheduleOffsetMinutes: 0,
+    });
+  });
+
+  it('keeps an explicit start-at clear when requested', () => {
+    const normalized = normalizeNoOpAlertScheduleFields(
+      {
+        scheduleStartAt: null,
+      },
+      undefined,
+      {
+        preserveExplicitScheduleStartAt: true,
+      },
+    );
+
+    expect(normalized).toEqual({
+      scheduleStartAt: null,
+    });
+  });
 });

packages/app/src/utils/alerts.ts

@@ -152,13 +152,22 @@ type AlertScheduleFields = {
   scheduleStartAt?: string | null;
 };
 
+type NormalizeAlertScheduleOptions = {
+  preserveExplicitScheduleOffsetMinutes?: boolean;
+  preserveExplicitScheduleStartAt?: boolean;
+};
+
 /**
  * Keep alert documents backward-compatible by avoiding no-op writes for
  * scheduling fields on pre-migration alerts that never had these keys.
  */
 export function normalizeNoOpAlertScheduleFields<
   T extends AlertScheduleFields | undefined,
->(alert: T, previousAlert?: AlertScheduleFields | null): T {
+>(
+  alert: T,
+  previousAlert?: AlertScheduleFields | null,
+  options: NormalizeAlertScheduleOptions = {},
+): T {
   if (alert == null) {
     return alert;
   }
@@ -173,12 +182,17 @@ export function normalizeNoOpAlertScheduleFields<
 
   if (
     (normalizedAlert.scheduleOffsetMinutes ?? 0) === 0 &&
-    !previousHadOffset
+    !previousHadOffset &&
+    !options.preserveExplicitScheduleOffsetMinutes
   ) {
     delete normalizedAlert.scheduleOffsetMinutes;
   }
 
-  if (normalizedAlert.scheduleStartAt == null && !previousHadStartAt) {
+  if (
+    normalizedAlert.scheduleStartAt == null &&
+    !previousHadStartAt &&
+    !options.preserveExplicitScheduleStartAt
+  ) {
     delete normalizedAlert.scheduleStartAt;
   }