fix(storage-browser): move useProcessTasks concurrency option to dispatch handler (#6528)

ashwinkumar6 · calebpollman · web-flow · commit fb4b0e2bcef9 · 2025-04-24T14:41:15.000-07:00
* fix(storage-browser): move useProcessTasks concurrency option to dispatch handler (#6525) * chore: fix publish-hotfix actions (#6527) * Version Packages * chore: bump size limit --------- Co-authored-by: Caleb Pollman <cpollman@amazon.com>
diff --git a/.github/workflows/publish-hotfix.yml b/.github/workflows/publish-hotfix.yml
@@ -30,46 +30,43 @@ jobs:
         uses: ./.github/actions/has-changesets
 
   publish-hotfix:
-    needs: [setup]
+    needs: setup
     uses: ./.github/workflows/reusable-tagged-publish.yml
     with:
       dist-tag: hotfix
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   build-test:
-    runs-on: ubuntu-latest
-    needs: publish-hotfix
-    environment: ci
+    uses: ./.github/workflows/reusable-build-system-test.yml
+    needs:
+      - setup
+      - publish-hotfix
     if: ${{ needs.setup.outputs.has-changesets != 'true' }}
-    steps:
-      - name: Build test v2
-        uses: ./.github/workflows/reusable-build-system-test.yml
-        with:
-          dist-tag: hotfix
-        env:
-          AUTH_E2E_ROLE_ARN: ${{ secrets.AUTH_E2E_ROLE_ARN }}
-          DOMAIN: ${{ secrets.DOMAIN }}
-          PHONE_NUMBER: ${{ secrets.PHONE_NUMBER }}
-          USERNAME: ${{ secrets.USERNAME }}
-          NEW_PASSWORD: ${{ secrets.NEW_PASSWORD }}
-          VALID_PASSWORD: ${{ secrets.VALID_PASSWORD }}
+    with:
+      dist-tag: hotfix
+    secrets:
+      AUTH_E2E_ROLE_ARN: ${{ secrets.AUTH_E2E_ROLE_ARN }}
+      DOMAIN: ${{ secrets.DOMAIN }}
+      PHONE_NUMBER: ${{ secrets.PHONE_NUMBER }}
+      USERNAME: ${{ secrets.USERNAME }}
+      NEW_PASSWORD: ${{ secrets.NEW_PASSWORD }}
+      VALID_PASSWORD: ${{ secrets.VALID_PASSWORD }}
 
   build-test-react-native:
-    runs-on: ubuntu-latest
-    needs: publish-hotfix
-    environment: ci
+    uses: ./.github/workflows/reusable-build-system-test-react-native.yml
+    needs:
+      - setup
+      - publish-hotfix
     if: ${{ needs.setup.outputs.has-changesets != 'true' }}
-    steps:
-      - name: Build test v2 React Native
-        uses: ./.github/workflows/reusable-build-system-test-react-native.yml
-        with:
-          dist-tag: hotfix
+    with:
+      dist-tag: hotfix
 
   publish:
     runs-on: ubuntu-latest
     environment: deployment
     needs:
+      - setup
       - build-test
       - build-test-react-native
     if: ${{ needs.setup.outputs.has-changesets != 'true' }}
diff --git a/.github/workflows/publish-latest.yml b/.github/workflows/publish-latest.yml
@@ -61,6 +61,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: deployment
     needs:
+      - setup
       - build-test
       - build-test-react-native
     if: ${{ needs.setup.outputs.has-changesets != 'true' }}
diff --git a/docs/package.json b/docs/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@aws-amplify/ui-react": "6.11.1",
-    "@aws-amplify/ui-react-storage": "3.10.1",
+    "@aws-amplify/ui-react-storage": "3.10.2",
     "@docsearch/react": "3",
     "@mdx-js/loader": "^2.1.0",
     "@mdx-js/mdx": "^2.1.0",
diff --git a/examples/next-app-router/package.json b/examples/next-app-router/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@aws-amplify/ui-react": "6.11.1",
-    "@aws-amplify/ui-react-storage": "3.10.1",
+    "@aws-amplify/ui-react-storage": "3.10.2",
     "react": "^18.3.0",
     "next": "^14.2.25",
     "react-dom": "^18",
diff --git a/examples/next/package.json b/examples/next/package.json
@@ -15,7 +15,7 @@
     "@aws-amplify/ui-react-geo": "^2.2.8",
     "@aws-amplify/ui-react-liveness": "^3.3.8",
     "@aws-amplify/ui-react-notifications": "^2.2.8",
-    "@aws-amplify/ui-react-storage": "^3.10.1",
+    "@aws-amplify/ui-react-storage": "^3.10.2",
     "@aws-sdk/credential-providers": "^3.370.0",
     "next": "^14.2.25",
     "next-global-css": "^1.1.1",
diff --git a/examples/react-router/package.json b/examples/react-router/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@aws-amplify/ui-react": "6.11.1",
-    "@aws-amplify/ui-react-storage": "3.10.1",
+    "@aws-amplify/ui-react-storage": "3.10.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^7.1.3"
diff --git a/packages/react-storage/CHANGELOG.md b/packages/react-storage/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @aws-amplify/ui-react-storage
 
+## 3.10.2
+
+### Patch Changes
+
+- [`cf63046c171b5dd349121d0d8bbf2282fb71aae4`](https://github.com/aws-amplify/amplify-ui/commit/cf63046c171b5dd349121d0d8bbf2282fb71aae4) Thanks [@calebpollman](https://github.com/calebpollman)! - fix(storage-browser): move useProcessTasks concurrency option to dispatch handler
+
 ## 3.10.1
 
 ### Patch Changes
diff --git a/packages/react-storage/package.json b/packages/react-storage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-react-storage",
-  "version": "3.10.1",
+  "version": "3.10.2",
   "main": "dist/index.js",
   "module": "dist/esm/index.mjs",
   "exports": {
@@ -66,7 +66,7 @@
       "name": "createStorageBrowser",
       "path": "dist/esm/browser.mjs",
       "import": "{ createStorageBrowser }",
-      "limit": "64.13 kB",
+      "limit": "64.19 kB",
       "ignore": [
         "@aws-amplify/storage"
       ]
diff --git a/packages/react-storage/src/components/StorageBrowser/tasks/__tests__/useProcessTasks.spec.ts b/packages/react-storage/src/components/StorageBrowser/tasks/__tests__/useProcessTasks.spec.ts
@@ -91,11 +91,7 @@ describe('useProcessTasks', () => {
 
   it('handles concurrent tasks as expected', async () => {
     const { result } = renderHook(() =>
-      useProcessTasks(action, {
-        concurrency: 2,
-        items,
-        onTaskProgress,
-      })
+      useProcessTasks(action, { items, onTaskProgress })
     );
 
     const processTasks = result.current[1];
@@ -105,7 +101,7 @@ describe('useProcessTasks', () => {
     expect(result.current[0].tasks[2].status).toBe('QUEUED');
 
     act(() => {
-      processTasks({ config });
+      processTasks({ config, options: { concurrency: 2 } });
     });
 
     expect(action).toHaveBeenCalledTimes(2);
@@ -392,13 +388,13 @@ describe('useProcessTasks', () => {
 
   it('returns `error` and `message` for a failed task and provides the expected values to `onTaskError`', async () => {
     const { result } = renderHook(() =>
-      useProcessTasks(action, { concurrency: 2, items, onTaskError })
+      useProcessTasks(action, { items, onTaskError })
     );
 
     const processTasks = result.current[1];
 
     act(() => {
-      processTasks({ config });
+      processTasks({ config, options: { concurrency: 2 } });
     });
 
     expect(result.current[0].tasks[0].status).toBe('PENDING');
diff --git a/packages/react-storage/src/components/StorageBrowser/tasks/types.ts b/packages/react-storage/src/components/StorageBrowser/tasks/types.ts
@@ -3,6 +3,7 @@ import {
   TaskData,
   TaskResult,
   TaskResultStatus,
+  TaskHandlerOptions,
 } from '../actions';
 
 /**
@@ -17,8 +18,6 @@ export type TaskStatus = TaskResultStatus | 'QUEUED' | 'PENDING';
 export type StatusCounts = Record<TaskStatus | 'TOTAL', number>;
 
 export interface ProcessTasksOptions<TTask extends Task, TItems = []> {
-  // has no impact in atomic mode
-  concurrency?: number;
   items?: TItems;
   onTaskCancel?: (task: TTask) => void;
   onTaskComplete?: (task: TTask) => void;
@@ -65,9 +64,19 @@ export type UseProcessTasksState<TTask, TInput> = [
   HandleProcessTasks<TInput>,
 ];
 
+interface HandleTasksOptions extends TaskHandlerOptions {
+  concurrency?: number;
+}
+
+export interface HandleBatchTasksInput<TData extends TaskData>
+  extends Omit<TaskHandlerInput<TData, HandleTasksOptions>, 'data'> {}
+
+export interface HandleSingleTaskInput<TData extends TaskData>
+  extends TaskHandlerInput<TData> {}
+
 export type InferHandleTasksInput<
   TItems,
   TData extends TaskData,
 > = TItems extends NonNullable<TItems>
-  ? Omit<TaskHandlerInput<TData>, 'data'>
-  : TaskHandlerInput<TData>;
+  ? HandleBatchTasksInput<TData>
+  : HandleSingleTaskInput<TData>;
diff --git a/packages/react-storage/src/components/StorageBrowser/tasks/useProcessTasks.ts b/packages/react-storage/src/components/StorageBrowser/tasks/useProcessTasks.ts
@@ -1,10 +1,12 @@
 import React from 'react';
 import { isFunction } from '@aws-amplify/ui';
 
-import { ActionHandler, TaskData, TaskHandlerInput } from '../actions';
+import type { ActionHandler, TaskData } from '../actions';
 
-import {
+import type {
+  HandleBatchTasksInput,
   HandleProcessTasks,
+  HandleSingleTaskInput,
   InferHandleTasksInput,
   Task,
   ProcessTasksOptions,
@@ -23,9 +25,10 @@ const QUEUED_TASK_BASE = {
   status: 'QUEUED' as const,
 };
 
-const isTaskHandlerInput = <T extends TaskData>(
-  input: TaskHandlerInput<T> | Omit<TaskHandlerInput<T>, 'data'>
-): input is TaskHandlerInput<T> => !!(input as TaskHandlerInput<T>).data;
+const isSingleTaskInput = <TData extends TaskData>(
+  input: HandleSingleTaskInput<TData> | HandleBatchTasksInput<TData>
+): input is HandleSingleTaskInput<TData> =>
+  !!(input as HandleSingleTaskInput<TData>).data;
 
 export function useProcessTasks<
   TData,
@@ -38,7 +41,7 @@ export function useProcessTasks<
   handler: ActionHandler<TData, TValue>,
   options?: ProcessTasksOptions<TTask, TItems>
 ): UseProcessTasksState<TTask, TInput> {
-  const { concurrency, items, ...callbacks } = options ?? {};
+  const { items, ...callbacks } = options ?? {};
 
   const callbacksRef = React.useRef(callbacks);
 
@@ -133,14 +136,14 @@ export function useProcessTasks<
     flush();
   }, [createTask, flush, updateTask, items, refreshTaskData]);
 
-  const processNextTask = (_input: TInput) => {
-    const hasInputData = isTaskHandlerInput(_input);
-    if (hasInputData) {
+  const processTask = (_input: TInput) => {
+    const isSingleTask = isSingleTaskInput(_input);
+    if (isSingleTask) {
       createTask(_input.data);
       flush();
     }
 
-    const { data } = hasInputData
+    const { data } = isSingleTask
       ? _input
       : [...tasksRef.current.values()].find(
           ({ status }) => status === 'QUEUED'
@@ -203,10 +206,10 @@ export function useProcessTasks<
         const task = getTask();
         if (task && isFunction(onTaskComplete)) onTaskComplete(task);
 
-        // ignore process next task for single operation inputs
-        if (hasInputData) return;
+        // ignore process next task for single task
+        if (isSingleTask) return;
 
-        processNextTask(_input);
+        processTask(_input);
       });
 
     updateTask(data.id, { cancel, status: 'PENDING' });
@@ -222,14 +225,26 @@ export function useProcessTasks<
       return;
     }
 
+    // if single task, run `processTask` once
+    if (isSingleTaskInput(input)) {
+      processTask(input);
+      return;
+    }
+
+    const { concurrency, ...options } = input.options ?? {};
+
+    // reconstruct `input` without `concurrency`
+    const _input = { ...input, options };
+
+    // for batch tasks, if no `concurrency` process tasks individually
     if (!concurrency) {
-      processNextTask(input);
+      processTask(_input);
       return;
     }
 
     let count = 0;
     while (count < concurrency) {
-      processNextTask(input);
+      processTask(_input);
       count++;
     }
   };
diff --git a/packages/react-storage/src/components/StorageBrowser/useAction/__tests__/useHandler.spec.ts b/packages/react-storage/src/components/StorageBrowser/useAction/__tests__/useHandler.spec.ts
@@ -120,7 +120,10 @@ describe('useHandler', () => {
     dispatch();
 
     expect(mockUseProcessDispatch).toHaveBeenCalledTimes(1);
-    expect(mockUseProcessDispatch).toHaveBeenCalledWith({ config });
+    expect(mockUseProcessDispatch).toHaveBeenCalledWith({
+      config,
+      options: { concurrency: DEFAULT_ACTION_CONCURRENCY },
+    });
   });
 
   it('provides the expected values to `useProcessTasks` when called with `options` that include `items`', () => {
@@ -143,7 +146,6 @@ describe('useHandler', () => {
 
     expect(useProcessTasksMock).toHaveBeenCalledTimes(1);
     expect(useProcessTasksMock).toHaveBeenCalledWith(handler, {
-      concurrency: DEFAULT_ACTION_CONCURRENCY,
       items: input.items,
       onTaskError: input.onTaskError,
       onTaskProgress: input.onTaskProgress,
diff --git a/packages/react-storage/src/components/StorageBrowser/useAction/useHandler.ts b/packages/react-storage/src/components/StorageBrowser/useAction/useHandler.ts
@@ -45,10 +45,7 @@ export function useHandler<
   handler: THandler,
   options?: UseHandlerOptionsWithItems<TTask> | UseHandlerOptions<TTask>
 ): HandleTasksState<TTask> | HandleTaskState<TTask> {
-  const [state, handleProcessing] = useProcessTasks(handler, {
-    ...options,
-    concurrency: DEFAULT_ACTION_CONCURRENCY,
-  });
+  const [state, handleProcessing] = useProcessTasks(handler, options);
   const getConfig = useGetActionInput();
 
   const { reset, isProcessing, tasks, ...rest } = state;
@@ -63,7 +60,10 @@ export function useHandler<
 
       handleProcessing({
         config,
-        ...(hasData ? { data: input.data } : undefined),
+        ...(hasData
+          ? { data: input.data }
+          : // if no `data` provided, provide `concurrency` to `options`
+            { options: { concurrency: DEFAULT_ACTION_CONCURRENCY } }),
       });
     },
     [getConfig, handleProcessing, reset]
diff --git a/packages/react-storage/src/version.ts b/packages/react-storage/src/version.ts
@@ -1 +1 @@
-export const VERSION = '3.10.1';
+export const VERSION = '3.10.2';
diff --git a/packages/test-utils/CHANGELOG.md b/packages/test-utils/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @aws-amplify/ui-test-utils
 
+## 0.0.4
+
+### Patch Changes
+
+- Updated dependencies [[`cf63046c171b5dd349121d0d8bbf2282fb71aae4`](https://github.com/aws-amplify/amplify-ui/commit/cf63046c171b5dd349121d0d8bbf2282fb71aae4)]:
+  - @aws-amplify/ui-react-storage@3.10.2
+
 ## 0.0.3
 
 ### Patch Changes
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@aws-amplify/ui-test-utils",
   "private": true,
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Test utils for Amplify Connected Component e2e tests",
   "exports": {
     "./*": {
@@ -26,7 +26,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@aws-amplify/ui-react-storage": "3.10.1",
+    "@aws-amplify/ui-react-storage": "3.10.2",
     "tslib": "^2.5.2"
   }
 }
