Improve batch operations flow

libs/data-access/admin-api-hooks/src/index.ts

@@ -6,4 +6,5 @@ export {
   useBatchKillInvocations,
   useBatchPauseInvocations,
   useBatchResumeInvocations,
+  useBatchRestateAsNewInvocations,
 } from './lib/batchHooks';

libs/data-access/admin-api-hooks/src/lib/batchHooks.ts

@@ -125,6 +125,17 @@ function useIsPaused() {
   }, []);
 
   return {
+    cancel: (id: string) => {
+      globalThis.batchOperationPromises?.[id]?.reject?.(true);
+      globalThis.batchOperationPromises = {
+        ...globalThis.batchOperationPromises,
+        [id]: null,
+      };
+      setIsPaused((old) => {
+        delete old[id];
+        return old;
+      });
+    },
     isPaused: (id: string) => isPaused[id] === true,
     pause(id: string) {
       globalThis.batchOperationPromises = {
@@ -179,7 +190,7 @@ export function useBatchCancelInvocations(
     },
   );
 
-  const { pause, resume, isPaused } = useIsPaused();
+  const { pause, resume, isPaused, cancel } = useIsPaused();
   const { mutationFn } = toBatchMutationFn(
     batchSize,
     mutationOptions.mutationFn,
@@ -212,6 +223,7 @@ export function useBatchCancelInvocations(
     pause,
     resume,
     isPaused,
+    cancel,
   };
 }
 
@@ -244,7 +256,73 @@ export function useBatchPurgeInvocations(
     },
   );
 
-  const { pause, resume, isPaused } = useIsPaused();
+  const { pause, resume, isPaused, cancel } = useIsPaused();
+  const { mutationFn } = toBatchMutationFn(
+    batchSize,
+    mutationOptions.mutationFn,
+    onProgress,
+  );
+
+  const result = useMutation({
+    ...mutationOptions,
+    ...restOptions,
+    mutationFn,
+    onSuccess(data, variables, context, meta) {
+      queryClient.invalidateQueries({
+        queryKey: ['/query/invocations'],
+      });
+
+      onSuccess?.(data, variables, context, meta);
+    },
+    onError(error, variables, onMutateResult, context) {
+      onError?.(error, variables, onMutateResult, context);
+    },
+    onSettled(data, error, variables, onMutateResult, context) {
+      onSettled?.(data, error, variables, onMutateResult, context);
+    },
+    onMutate(variables, context) {
+      onMutate?.(variables, context);
+    },
+  });
+  return {
+    ...result,
+    pause,
+    resume,
+    isPaused,
+    cancel,
+  };
+}
+
+export function useBatchRestateAsNewInvocations(
+  batchSize: number,
+  options?: Omit<
+    HookMutationOptions<'/query/invocations/restart-as-new', 'post'>,
+    'mutationFn'
+  > & {
+    onProgress?: (response: BatchInvocationsResponse) => void;
+  },
+) {
+  const baseUrl = useAdminBaseUrl();
+  const queryClient = useQueryClient();
+  const {
+    onProgress,
+    onError,
+    onMutate,
+    onSettled,
+    onSuccess,
+    ...restOptions
+  } = options ?? {};
+
+  const mutationOptions = adminApi(
+    'mutate',
+    '/query/invocations/restart-as-new',
+    'post',
+    {
+      baseUrl,
+    },
+  );
+
+  const { pause, resume, isPaused, cancel } = useIsPaused();
   const { mutationFn } = toBatchMutationFn(
     batchSize,
     mutationOptions.mutationFn,
@@ -277,6 +355,7 @@ export function useBatchPurgeInvocations(
     pause,
     resume,
     isPaused,
+    cancel,
   };
 }
 
@@ -309,7 +388,7 @@ export function useBatchKillInvocations(
     },
   );
 
-  const { pause, resume, isPaused } = useIsPaused();
+  const { pause, resume, isPaused, cancel } = useIsPaused();
   const { mutationFn } = toBatchMutationFn(
     batchSize,
     mutationOptions.mutationFn,
@@ -342,6 +421,7 @@ export function useBatchKillInvocations(
     pause,
     resume,
     isPaused,
+    cancel,
   };
 }
 
@@ -374,7 +454,7 @@ export function useBatchPauseInvocations(
     },
   );
 
-  const { pause, resume, isPaused } = useIsPaused();
+  const { pause, resume, isPaused, cancel } = useIsPaused();
   const { mutationFn } = toBatchMutationFn(
     batchSize,
     mutationOptions.mutationFn,
@@ -408,6 +488,7 @@ export function useBatchPauseInvocations(
     pause,
     resume,
     isPaused,
+    cancel,
   };
 }
 
@@ -440,7 +521,7 @@ export function useBatchResumeInvocations(
     },
   );
 
-  const { pause, resume, isPaused } = useIsPaused();
+  const { pause, resume, isPaused, cancel } = useIsPaused();
   const { mutationFn } = toBatchMutationFn(
     batchSize,
     mutationOptions.mutationFn,
@@ -474,5 +555,6 @@ export function useBatchResumeInvocations(
     pause,
     resume,
     isPaused,
+    cancel,
   };
 }

libs/data-access/admin-api-hooks/src/lib/hooks.ts

@@ -960,7 +960,7 @@ export function usePauseInvocation(
     String(invocationId),
     {
       refetchOnMount: false,
-      enabled: Boolean(invocationId),
+      enabled: false,
     },
   );
 
@@ -1007,7 +1007,7 @@ export function useResumeInvocation(
   const baseUrl = useAdminBaseUrl();
   const { refetch } = useGetInvocationJournalWithInvocationV2(invocationId, {
     refetchOnMount: false,
-    enabled: Boolean(invocationId),
+    enabled: false,
   });
 
   return useMutation({

libs/data-access/admin-api/src/lib/api/index.d.ts

@@ -546,6 +546,26 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
+  '/query/invocations/restart-as-new': {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get?: never;
+    put?: never;
+    /**
+     * Batch restart-as-new invocations
+     * @description Batch restart-as-new invocations
+     */
+    post: operations['batch_restart_as_new_invocations'];
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
+  };
   '/query/invocations/purge': {
     parameters: {
       query?: never;
@@ -1773,7 +1793,9 @@ export interface components {
           pageSize?: number;
         }
       | {
-          filters: components['schemas']['FilterItem'][];
+          filters: (components['schemas']['FilterItem'] & {
+            isActionImplicitFilter?: boolean;
+          })[];
           pageSize?: number;
           /** Format: date-time */
           createdAfter?: string;
@@ -1789,7 +1811,9 @@ export interface components {
           pageSize?: number;
         }
       | {
-          filters: components['schemas']['FilterItem'][];
+          filters: (components['schemas']['FilterItem'] & {
+            isActionImplicitFilter?: boolean;
+          })[];
           pageSize?: number;
           /** Format: date-time */
           createdAfter?: string;
@@ -4712,6 +4736,78 @@ export interface operations {
       };
     };
   };
+  batch_restart_as_new_invocations: {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody: {
+      content: {
+        'application/json': components['schemas']['BatchInvocationsRequestBody'];
+      };
+    };
+    responses: {
+      /** @description Batch restart as new result */
+      200: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': components['schemas']['BatchInvocationsResponse'];
+        };
+      };
+      400: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': components['schemas']['ErrorDescriptionResponse'];
+        };
+      };
+      403: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': components['schemas']['ErrorDescriptionResponse'];
+        };
+      };
+      404: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': components['schemas']['ErrorDescriptionResponse'];
+        };
+      };
+      409: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': components['schemas']['ErrorDescriptionResponse'];
+        };
+      };
+      500: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': components['schemas']['ErrorDescriptionResponse'];
+        };
+      };
+      503: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': components['schemas']['ErrorDescriptionResponse'];
+        };
+      };
+    };
+  };
   batch_purge_invocations: {
     parameters: {
       query?: never;