[9.1] [ResponseOps][MW][Reporting] Fix recurrent schedule for Daily recurrence (#244571) (#244968)

# Backport

This will backport the following commits from `main` to `9.1`:
- [[ResponseOps][MW][Reporting] Fix recurrent schedule for Daily
recurrence (#244571)](#244571)

<!--- Backport version: 10.2.0 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Janki
Salvi","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-12-02T15:29:09Z","message":"[ResponseOps][MW][Reporting]
Fix recurrent schedule for Daily recurrence (#244571)\n\n##
Summary\n\nFixes
https://github.com/elastic/kibana/issues/230056\n\n\n### Checklist\n\n-
[x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common
scenarios","sha":"330f4f678510e42be1c079947b488b117fdc299f","branchLabelMapping":{"^v9.3.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["bug","release_note:skip","Team:ResponseOps","Feature:Reporting:Framework","backport:version","Feature:Maintenance
Window","v9.3.0","v9.2.2"],"title":"[ResponseOps][MW][Reporting] Fix
recurrent schedule for Daily
recurrence","number":244571,"url":"https://github.com/elastic/kibana/pull/244571","mergeCommit":{"message":"[ResponseOps][MW][Reporting]
Fix recurrent schedule for Daily recurrence (#244571)\n\n##
Summary\n\nFixes
https://github.com/elastic/kibana/issues/230056\n\n\n### Checklist\n\n-
[x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common
scenarios","sha":"330f4f678510e42be1c079947b488b117fdc299f"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.3.0","branchLabelMappingKey":"^v9.3.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/244571","number":244571,"mergeCommit":{"message":"[ResponseOps][MW][Reporting]
Fix recurrent schedule for Daily recurrence (#244571)\n\n##
Summary\n\nFixes
https://github.com/elastic/kibana/issues/230056\n\n\n### Checklist\n\n-
[x] [Unit or
functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere
updated or added to match the most common
scenarios","sha":"330f4f678510e42be1c079947b488b117fdc299f"}},{"branch":"9.2","label":"v9.2.2","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/244964","number":244964,"state":"OPEN"}]}]
BACKPORT-->

---------

Co-authored-by: kibanamachine <[email protected]>

Author: js-jankisalvi

src/platform/packages/shared/response-ops/recurring-schedule-form/components/recurring_schedule_form_fields.test.tsx

@@ -90,7 +90,7 @@ describe('RecurringScheduleForm', () => {
     expect(await screen.findByTestId('count-field')).toBeInTheDocument();
   });
 
-  it('renders custom schedule if frequency = daily', async () => {
+  it('does not render custom schedule if frequency = daily', async () => {
     render(
       <TestWrapper
         iv={{ recurringSchedule: { frequency: Frequency.DAILY, ends: RecurrenceEnd.NEVER } }}
@@ -99,9 +99,33 @@ describe('RecurringScheduleForm', () => {
       </TestWrapper>
     );
 
+    expect(
+      screen.queryByTestId('customRecurringScheduleByWeekdayButtonGroup')
+    ).not.toBeInTheDocument();
+    expect(await screen.findByText('Repeats every day')).toBeInTheDocument();
+  });
+
+  it('renders schedule with frequency = daily and weekdays', async () => {
+    const recurringSchedule: RecurringSchedule = {
+      frequency: Frequency.DAILY as any,
+      ends: RecurrenceEnd.NEVER,
+      byweekday: { 1: true, 5: true },
+      interval: 1,
+    };
+    render(
+      <TestWrapper
+        iv={{
+          recurringSchedule,
+        }}
+      >
+        <RecurringScheduleFormFields {...baseProps} initialRecurringSchedule={recurringSchedule} />
+      </TestWrapper>
+    );
+
     expect(
       await screen.findByTestId('customRecurringScheduleByWeekdayButtonGroup')
     ).toBeInTheDocument();
+    expect(await screen.findByText('Repeats every Monday, Friday')).toBeInTheDocument();
   });
 
   it('renders custom schedule if frequency = custom', async () => {

src/platform/packages/shared/response-ops/recurring-schedule-form/components/recurring_schedule_form_fields.tsx

@@ -59,6 +59,7 @@ export interface RecurringScheduleFieldsProps {
   showTimeInSummary?: boolean;
   readOnly?: boolean;
   compressed?: boolean;
+  initialRecurringSchedule?: RecurringSchedule;
 }
 
 /**
@@ -76,6 +77,7 @@ export const RecurringScheduleFormFields = memo(
     showTimeInSummary = false,
     readOnly = false,
     compressed = false,
+    initialRecurringSchedule,
   }: RecurringScheduleFieldsProps) => {
     const [formData] = useFormData<{ recurringSchedule: RecurringSchedule }>({
       watch: [
@@ -92,6 +94,14 @@ export const RecurringScheduleFormFields = memo(
 
     const [today] = useState<Moment>(moment());
 
+    const recurringSchedule = useMemo(
+      () => ({
+        ...initialRecurringSchedule,
+        ...formData.recurringSchedule,
+      }),
+      [initialRecurringSchedule, formData.recurringSchedule]
+    );
+
     const { options, presets } = useMemo(() => {
       let _options: Array<EuiSelectOption & { 'data-test-subj'?: string }> =
         DEFAULT_FREQUENCY_OPTIONS;
@@ -141,7 +151,7 @@ export const RecurringScheduleFormFields = memo(
       };
     }, [minFrequency, startDate]);
 
-    const parsedSchedule = useMemo(() => parseSchedule(formData.recurringSchedule), [formData]);
+    const parsedSchedule = useMemo(() => parseSchedule(recurringSchedule), [recurringSchedule]);
 
     return (
       <EuiSplitPanel.Outer hasShadow={false} hasBorder={true} data-test-subj="recurring-form">
@@ -158,7 +168,7 @@ export const RecurringScheduleFormFields = memo(
               },
             }}
           />
-          {(parsedSchedule?.frequency === Frequency.DAILY ||
+          {((parsedSchedule?.frequency === Frequency.DAILY && parsedSchedule?.byweekday) ||
             parsedSchedule?.frequency === 'CUSTOM') && (
             <CustomRecurringSchedule
               startDate={startDate}

x-pack/platform/plugins/private/reporting/public/management/components/scheduled_report_flyout_content.tsx

@@ -389,6 +389,7 @@ export const ScheduledReportFlyoutContent = ({
                     minFrequency={Frequency.MONTHLY}
                     showTimeInSummary
                     compressed
+                    initialRecurringSchedule={scheduledReport.recurringSchedule}
                   />
                 </>
               )}

x-pack/platform/plugins/private/reporting/public/management/utils.test.ts

@@ -59,13 +59,33 @@ describe('transformScheduledReport', () => {
     );
   });
 
-  it('marks as custom when freq=DAILY and no weekdays', () => {
+  it('handles freq=DAILY and no weekdays', () => {
     const report = {
       ...baseReport,
-      schedule: { rrule: { freq: Frequency.DAILY, tzid: 'UTC' } },
+      schedule: { rrule: { freq: Frequency.DAILY, tzid: 'UTC', interval: 1 } },
     } as ScheduledReportApiJSON;
     expect(transformScheduledReport(report).recurringSchedule).toEqual(
-      expect.objectContaining({ frequency: 'CUSTOM', customFrequency: Frequency.DAILY })
+      expect.objectContaining({ ends: 'never', frequency: Frequency.DAILY, interval: 1 })
+    );
+  });
+
+  it('handles freq=DAILY and weekdays', () => {
+    const report = {
+      ...baseReport,
+      schedule: {
+        rrule: { freq: Frequency.DAILY, tzid: 'UTC', byweekday: ['MO', 'TU'], interval: 1 },
+      },
+    } as ScheduledReportApiJSON;
+    expect(transformScheduledReport(report).recurringSchedule).toEqual(
+      expect.objectContaining({
+        byweekday: {
+          '1': true,
+          '2': true,
+        },
+        ends: 'never',
+        frequency: 3,
+        interval: 1,
+      })
     );
   });
 

x-pack/platform/plugins/private/reporting/public/management/utils.ts

@@ -67,10 +67,6 @@ const isCustomRrule = (rRule: Rrule) => {
   if (rRule.interval && rRule.interval > 1) {
     return true;
   }
-  // frequency is daily and no weekdays are selected
-  if (freq && freq === Frequency.DAILY && !rRule.byweekday) {
-    return true;
-  }
   // frequency is weekly and there are multiple weekdays selected
   if (freq && freq === Frequency.WEEKLY && rRule.byweekday && rRule.byweekday.length > 1) {
     return true;

x-pack/platform/plugins/shared/alerting/public/pages/maintenance_windows/components/create_maintenance_windows_form.tsx

@@ -420,6 +420,7 @@ export const CreateMaintenanceWindowForm = React.memo<CreateMaintenanceWindowFor
               startDate={startDate}
               endDate={endDate}
               timezone={timezone}
+              initialRecurringSchedule={initialValue?.recurringSchedule}
             />
           </EuiFlexItem>
         )}

x-pack/platform/plugins/shared/alerting/public/pages/maintenance_windows/helpers/convert_from_maintenance_window_to_form.test.ts

@@ -220,7 +220,7 @@ describe('convertFromMaintenanceWindowToForm', () => {
     });
   });
 
-  test('should convert a maintenance window that is recurring on a custom daily schedule', () => {
+  test('should not convert a maintenance window that is recurring on a daily schedule', () => {
     const maintenanceWindow = convertFromMaintenanceWindowToForm({
       title,
       duration,
@@ -239,15 +239,42 @@ describe('convertFromMaintenanceWindowToForm', () => {
       timezone: ['UTC'],
       recurring: true,
       recurringSchedule: {
-        customFrequency: Frequency.DAILY,
         ends: 'never',
-        frequency: 'CUSTOM',
+        frequency: Frequency.DAILY,
         interval: 1,
       },
       solutionId: undefined,
     });
   });
 
+  test('should handle a maintenance window with recurring on a daily schedule and weekdays', () => {
+    const maintenanceWindow = convertFromMaintenanceWindowToForm({
+      title,
+      duration,
+      rRule: {
+        dtstart: startDate.toISOString(),
+        tzid: 'UTC',
+        freq: Frequency.DAILY,
+        interval: 1,
+        byweekday: ['MO', 'TU', 'WE', 'TH', 'FR'],
+      },
+    } as MaintenanceWindow);
+
+    expect(maintenanceWindow).toEqual({
+      title,
+      startDate: startDate.toISOString(),
+      endDate: endDate.toISOString(),
+      timezone: ['UTC'],
+      recurring: true,
+      recurringSchedule: {
+        ends: 'never',
+        frequency: Frequency.DAILY,
+        interval: 1,
+        byweekday: { 1: true, 2: true, 3: true, 4: true, 5: true, 6: false, 7: false },
+      },
+    });
+  });
+
   test('should convert a maintenance window that is recurring on a custom weekly schedule', () => {
     const maintenanceWindow = convertFromMaintenanceWindowToForm({
       title,

x-pack/platform/plugins/shared/alerting/public/pages/maintenance_windows/helpers/convert_from_maintenance_window_to_form.ts

@@ -78,6 +78,13 @@ export const convertFromMaintenanceWindowToForm = (
     }
   }
 
+  if (frequency === Frequency.DAILY && rRule.byweekday) {
+    recurringSchedule.byweekday = getInitialByWeekday(
+      rRule.byweekday as string[],
+      moment(startDate)
+    );
+  }
+
   form.recurringSchedule = recurringSchedule;
 
   return form;
@@ -89,10 +96,6 @@ const isCustom = (rRule: RRuleParams) => {
   if (rRule.interval && rRule.interval > 1) {
     return true;
   }
-  // frequency is daily and no weekdays are selected
-  if (freq && freq === Frequency.DAILY && !rRule.byweekday) {
-    return true;
-  }
   // frequency is weekly and there are multiple weekdays selected
   if (freq && freq === Frequency.WEEKLY && rRule.byweekday && rRule.byweekday.length > 1) {
     return true;