address comment

Author: Assem-Uber

src/views/schedule-actions/schedule-actions-modal-content/__tests__/schedule-actions-modal-content.test.tsx

@@ -1,13 +1,10 @@
-import { QueryClient } from '@tanstack/react-query';
 import { HttpResponse } from 'msw';
 
 import { render, screen, userEvent, waitFor } from '@/test-utils/rtl';
 
-import { type DeleteScheduleResponse } from '@/route-handlers/delete-schedule/delete-schedule.types';
 import { type PauseScheduleResponse } from '@/route-handlers/pause-schedule/pause-schedule.types';
 
 import { mockScheduleActionsConfig } from '../../__fixtures__/schedule-actions-config';
-import { type ScheduleAction } from '../../schedule-actions.types';
 import ScheduleActionsModalContent from '../schedule-actions-modal-content';
 
 const mockScheduleParams = {
@@ -26,10 +23,9 @@ jest.mock('baseui/snackbar', () => ({
   }),
 }));
 
-const mockPush = jest.fn();
 jest.mock('next/navigation', () => ({
   ...jest.requireActual('next/navigation'),
-  useRouter: () => ({ push: mockPush }),
+  useRouter: () => ({ push: jest.fn() }),
 }));
 
 describe(ScheduleActionsModalContent.name, () => {
@@ -92,81 +88,9 @@ describe(ScheduleActionsModalContent.name, () => {
     });
     expect(mockOnClose).not.toHaveBeenCalled();
   });
-
-  describe('delete action', () => {
-    it('renders confirmation copy with no form inputs', () => {
-      setup({ actionConfig: mockScheduleActionsConfig[2] });
-
-      expect(screen.getAllByText('Delete schedule').length).toBeGreaterThan(0);
-      expect(
-        screen.getByText(
-          'Deletes the schedule permanently. In-progress workflow runs are not affected.'
-        )
-      ).toBeInTheDocument();
-      expect(screen.queryByRole('textbox')).not.toBeInTheDocument();
-    });
-
-    it('closes without DELETE when Cancel is clicked', async () => {
-      const { user, mockOnClose } = setup({
-        actionConfig: mockScheduleActionsConfig[2],
-      });
-
-      await user.click(screen.getByText('Cancel'));
-      expect(mockOnClose).toHaveBeenCalled();
-      expect(mockEnqueue).not.toHaveBeenCalled();
-    });
-
-    it('DELETEs with no body, navigates to list, and shows snackbar on success', async () => {
-      const { user, mockOnClose, getLatestRequestBody, waitForRequest } = setup(
-        { actionConfig: mockScheduleActionsConfig[2] }
-      );
-
-      await user.click(screen.getByRole('button', { name: 'Delete schedule' }));
-
-      await waitForRequest();
-      expect(getLatestRequestBody()).toBeNull();
-
-      await waitFor(() => {
-        expect(mockPush).toHaveBeenCalledWith(
-          '/domains/mock-domain/mock-cluster/schedules'
-        );
-      });
-      expect(mockEnqueue).toHaveBeenCalledWith(
-        expect.objectContaining({ message: 'Schedule deleted.' })
-      );
-      expect(mockOnClose).toHaveBeenCalled();
-    });
-
-    it('does not invalidate describeSchedule after delete', async () => {
-      const invalidateQueriesSpy = jest.spyOn(
-        QueryClient.prototype,
-        'invalidateQueries'
-      );
-
-      const { user, waitForRequest } = setup({
-        actionConfig: mockScheduleActionsConfig[2],
-      });
-
-      await user.click(screen.getByRole('button', { name: 'Delete schedule' }));
-
-      await waitForRequest();
-
-      expect(invalidateQueriesSpy).not.toHaveBeenCalledWith(
-        expect.objectContaining({
-          queryKey: ['describeSchedule', mockScheduleParams],
-        })
-      );
-    });
-  });
 });
 
-function setup({
-  error,
-  actionConfig,
-}: {
-  error?: boolean;
-  actionConfig?: ScheduleAction<any, any, any>;
-}) {
+function setup({ error }: { error?: boolean }) {
   const user = userEvent.setup();
   const mockOnClose = jest.fn();
   let latestRequestBody: unknown = null;
@@ -177,7 +101,7 @@ function setup({
 
   render(
     <ScheduleActionsModalContent
-      action={actionConfig ?? mockScheduleActionsConfig[0]}
+      action={mockScheduleActionsConfig[0]}
       params={{ ...mockScheduleParams }}
       onCloseModal={mockOnClose}
     />,
@@ -202,18 +126,6 @@ function setup({
             return HttpResponse.json({} satisfies PauseScheduleResponse);
           },
         },
-        {
-          path: '/api/domains/:domain/:cluster/schedules/:scheduleId',
-          httpMethod: 'DELETE',
-          mockOnce: false,
-          httpResolver: async ({ request }) => {
-            const text = await request.text();
-            latestRequestBody = text ? JSON.parse(text) : null;
-            requestPromiseResolve(null);
-
-            return HttpResponse.json({} satisfies DeleteScheduleResponse);
-          },
-        },
       ],
     }
   );

src/views/schedule-actions/schedule-actions-modal-content/schedule-actions-modal-content.tsx

@@ -65,17 +65,13 @@ export default function ScheduleActionsModalContent<
 
         return request(action.apiRoute({ domain, cluster, scheduleId }), {
           method: httpMethod,
-          ...(httpMethod === 'POST'
-            ? { body: JSON.stringify(submissionData ?? {}) }
-            : {}),
+          body: JSON.stringify(submissionData ?? {}),
         }).then((res) => res.json() as Result);
       },
       onSuccess: (result, mutationParams) => {
-        if (action.id !== 'delete') {
-          queryClient.invalidateQueries({
-            queryKey: ['describeSchedule', params],
-          });
-        }
+        queryClient.invalidateQueries({
+          queryKey: ['describeSchedule', params],
+        });
 
         action.onSuccess?.({ queryClient, params, router });
 

src/views/schedule-actions/schedule-actions-modal/schedule-actions-modal.styles.ts

@@ -12,7 +12,7 @@ export const overrides = {
     },
     Dialog: {
       style: (): StyleObject => ({
-        width: '600px',
+        width: '900px',
       }),
     },
   } satisfies ModalOverrides,

src/views/schedule-actions/schedule-actions.types.ts

@@ -86,6 +86,8 @@ export type ScheduleActionModalForm<FormData, SubmissionData> =
       transformFormDataToSubmission?: undefined;
     };
 
+export type ScheduleActionHttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE';
+
 export type ScheduleAction<
   Result,
   FormData = undefined,
@@ -107,7 +109,7 @@ export type ScheduleAction<
     schedule: DescribeScheduleResponse
   ) => ScheduleActionRunnableStatus;
   apiRoute: (params: ScheduleActionInputParams) => string;
-  httpMethod?: 'POST' | 'DELETE';
+  httpMethod?: ScheduleActionHttpMethod;
   getConfirmSubmissionData?: () => SubmissionData;
   renderSuccessMessage: (
     props: ScheduleActionSuccessMessageProps<SubmissionData, Result>