@aws-amplify/ui-react-storage 3.9.0 → 3.9.1

package/dist/browser.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var createAmplifyAuthAdapter = require('./createAmplifyAuthAdapter-BcuxpEzi.js');
+var createAmplifyAuthAdapter = require('./createAmplifyAuthAdapter-Cf4yJo1e.js');
 var internals = require('@aws-amplify/storage/internals');
 require('@aws-amplify/ui');
 require('aws-amplify/storage');

package/dist/{createAmplifyAuthAdapter-BcuxpEzi.js → createAmplifyAuthAdapter-Cf4yJo1e.js}

@@ -32,7 +32,7 @@ function _interopNamespace(e) {
 
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
-const VERSION = '3.9.0';
+const VERSION = '3.9.1';
 
 const constructBucket = ({ bucket: bucketName, region, }) => ({ bucketName, region });
 const parseAccessGrantLocation = (location) => {
@@ -2540,7 +2540,7 @@ const getProgressHeader = (label) => ({
     type: 'sort',
     content: { label },
 });
-const getActionViewTableData = ({ tasks, displayText, isProcessing, locationKey, shouldDisplayProgress = false, onTaskRemove, }) => {
+const getActionViewTableData = ({ tasks, displayText, getFolderText, isProcessing, shouldDisplayProgress = false, onTaskRemove, }) => {
     const headers = [
         ...getDefaultActionViewHeaders({
             displayText,
@@ -2571,22 +2571,8 @@ const getActionViewTableData = ({ tasks, displayText, isProcessing, locationKey,
                         };
                     }
                     case 'folder': {
-                        if (locationKey) {
-                            return { key, type: 'text', content: { text: locationKey } };
-                        }
-                        if (isFileItem(data)) {
-                            const { webkitRelativePath } = data.file;
-                            return {
-                                key,
-                                type: 'text',
-                                content: {
-                                    text: webkitRelativePath
-                                        ? webkitRelativePath.slice(0, webkitRelativePath.lastIndexOf('/') + 1)
-                                        : '-',
-                                },
-                            };
-                        }
-                        return { key, type: 'text', content: { text: '/' } };
+                        const text = getFolderText?.(task) ?? '/';
+                        return { key, type: 'text', content: { text } };
                     }
                     case 'type': {
                         return {
@@ -2661,6 +2647,10 @@ const getActionViewTableData = ({ tasks, displayText, isProcessing, locationKey,
     return { headers, rows };
 };
 
+const getFolderText$2 = ({ data: { file: { webkitRelativePath }, }, }) => webkitRelativePath
+    ? webkitRelativePath.slice(0, webkitRelativePath.lastIndexOf('/') + 1)
+    : '-';
+
 function UploadViewProvider({ children, ...props }) {
     const { UploadView: displayText } = useDisplayText();
     const { actionCancelLabel, actionDestinationLabel, actionExitLabel, actionStartLabel, addFilesLabel, addFolderLabel, statusDisplayCanceledLabel, statusDisplayCompletedLabel, statusDisplayFailedLabel, statusDisplayQueuedLabel, overwriteToggleLabel, title, getActionCompleteMessage, getFilesValidationMessage, } = displayText;
@@ -2702,6 +2692,7 @@ function UploadViewProvider({ children, ...props }) {
             statusDisplayFailedLabel,
             statusDisplayQueuedLabel,
             tableData: getActionViewTableData({
+                getFolderText: getFolderText$2,
                 tasks,
                 shouldDisplayProgress: true,
                 displayText,
@@ -3485,15 +3476,16 @@ const FoldersTableControl = () => {
 };
 FoldersTableControl.displayName = 'FoldersTable';
 
+const getFolderText$1 = ({ data: { fileKey, sourceKey }, }) => sourceKey.slice(0, -fileKey.length);
+
 function CopyViewProvider({ children, ...props }) {
     const { CopyView: displayText } = useDisplayText();
-    const { actionCancelLabel, actionDestinationLabel, actionExitLabel, actionStartLabel, getActionCompleteMessage, overwriteWarningMessage, searchPlaceholder, searchSubmitLabel, searchClearLabel, statusDisplayCanceledLabel, statusDisplayCompletedLabel, statusDisplayFailedLabel, statusDisplayQueuedLabel, } = displayText;
-    const { destination, folders, isProcessing, isProcessingComplete, location, statusCounts, tasks, onActionCancel, onActionExit, onActionStart, onSelectDestination, onTaskRemove, } = props;
+    const { actionCancelLabel, actionDestinationLabel, actionExitLabel, actionStartLabel, getActionCompleteMessage, overwriteWarningMessage, searchPlaceholder, searchSubmitLabel, searchClearLabel, statusDisplayCanceledLabel, statusDisplayCompletedLabel, statusDisplayFailedLabel, statusDisplayQueuedLabel, title, } = displayText;
+    const { destination, folders, isProcessing, isProcessingComplete, statusCounts, tasks, onActionCancel, onActionExit, onActionStart, onSelectDestination, onTaskRemove, } = props;
     const { hasNextPage, highestPageVisited, hasError: hasFoldersError, message: foldersErrorMessage, query, hasExhaustedSearch, isLoading, page, pageItems, onPaginate, onQuery, onSearchClear, onSearch, onSelectFolder, } = folders;
-    const { key: locationKey } = location ?? {};
     const tableData = getActionViewTableData({
+        getFolderText: getFolderText$1,
         tasks,
-        locationKey,
         isProcessing,
         displayText,
         onTaskRemove,
@@ -3528,6 +3520,7 @@ function CopyViewProvider({ children, ...props }) {
             statusDisplayFailedLabel,
             statusDisplayQueuedLabel,
             tableData,
+            title,
         }, onActionCancel: onActionCancel, onActionExit: onActionExit, onActionStart: onActionStart, onSearch: onSearch, onSearchClear: onSearchClear, onSearchQueryChange: onQuery, onSelectDestination: onSelectDestination },
         React__namespace["default"].createElement(FoldersPaginationProvider, { hasNextPage: hasNextPage, highestPageVisited: highestPageVisited, page: page, onPaginate: onPaginate },
             React__namespace["default"].createElement(FoldersTableProvider, { destination: destination, folders: pageItems, onSelectFolder: onSelectFolder },
@@ -3793,18 +3786,20 @@ CopyView.Statuses = StatusDisplayControl;
 CopyView.TasksTable = DataTableControl;
 CopyView.Title = TitleControl;
 
+const getFolderText = ({ data: { fileKey, key }, }) => key.slice(0, -fileKey.length);
+
 function DeleteViewProvider({ children, ...props }) {
     const { DeleteView: displayText } = useDisplayText();
     const { actionCancelLabel, actionExitLabel, actionStartLabel, title, statusDisplayCanceledLabel, statusDisplayCompletedLabel, statusDisplayFailedLabel, statusDisplayQueuedLabel, getActionCompleteMessage, } = displayText;
-    const { isProcessing, isProcessingComplete, location, statusCounts, tasks, onActionCancel, onActionStart, onActionExit, onTaskRemove, } = props;
+    const { isProcessing, isProcessingComplete, statusCounts, tasks, onActionCancel, onActionStart, onActionExit, onTaskRemove, } = props;
     const message = isProcessingComplete
         ? getActionCompleteMessage({ counts: statusCounts })
         : undefined;
     const tableData = getActionViewTableData({
         tasks,
-        locationKey: location.key,
         isProcessing,
         displayText,
+        getFolderText,
         onTaskRemove,
     });
     return (React__namespace["default"].createElement(ControlsContextProvider, { data: {
@@ -3825,18 +3820,14 @@ function DeleteViewProvider({ children, ...props }) {
         }, onActionStart: onActionStart, onActionExit: onActionExit, onActionCancel: onActionCancel }, children));
 }
 
+// assign to constant to ensure referential equality
+const EMPTY_ITEMS = [];
 const useDeleteView = (options) => {
     const { onExit: _onExit } = options ?? {};
     const [{ location, locationItems }, dispatchStoreAction] = useStore();
-    const { fileDataItems } = locationItems;
-    const { current, key } = location;
-    const data = React__namespace["default"].useMemo(() => !fileDataItems
-        ? []
-        : fileDataItems.map((item) => ({
-            ...item,
-            key: `${key}${item.fileKey}`,
-        })), [fileDataItems, key]);
-    const [processState, handleProcess] = useAction('delete', { items: data });
+    const { current } = location;
+    const { fileDataItems: items = EMPTY_ITEMS } = locationItems;
+    const [processState, handleProcess] = useAction('delete', { items });
     const { isProcessing, isProcessingComplete, statusCounts, tasks } = processState;
     const onActionStart = () => {
         if (!current)

package/dist/esm/components/StorageBrowser/views/LocationActionView/CopyView/CopyViewProvider.mjs

@@ -6,16 +6,16 @@ import { getActionViewTableData } from '../getActionViewTableData.mjs';
 import { FoldersMessageProvider } from './FoldersMessageControl.mjs';
 import { FoldersPaginationProvider } from './FoldersPaginationControl.mjs';
 import { FoldersTableProvider } from './FoldersTableControl.mjs';
+import { getFolderText } from './utils.mjs';
 
 function CopyViewProvider({ children, ...props }) {
     const { CopyView: displayText } = useDisplayText();
-    const { actionCancelLabel, actionDestinationLabel, actionExitLabel, actionStartLabel, getActionCompleteMessage, overwriteWarningMessage, searchPlaceholder, searchSubmitLabel, searchClearLabel, statusDisplayCanceledLabel, statusDisplayCompletedLabel, statusDisplayFailedLabel, statusDisplayQueuedLabel, } = displayText;
-    const { destination, folders, isProcessing, isProcessingComplete, location, statusCounts, tasks, onActionCancel, onActionExit, onActionStart, onSelectDestination, onTaskRemove, } = props;
+    const { actionCancelLabel, actionDestinationLabel, actionExitLabel, actionStartLabel, getActionCompleteMessage, overwriteWarningMessage, searchPlaceholder, searchSubmitLabel, searchClearLabel, statusDisplayCanceledLabel, statusDisplayCompletedLabel, statusDisplayFailedLabel, statusDisplayQueuedLabel, title, } = displayText;
+    const { destination, folders, isProcessing, isProcessingComplete, statusCounts, tasks, onActionCancel, onActionExit, onActionStart, onSelectDestination, onTaskRemove, } = props;
     const { hasNextPage, highestPageVisited, hasError: hasFoldersError, message: foldersErrorMessage, query, hasExhaustedSearch, isLoading, page, pageItems, onPaginate, onQuery, onSearchClear, onSearch, onSelectFolder, } = folders;
-    const { key: locationKey } = location ?? {};
     const tableData = getActionViewTableData({
+        getFolderText,
         tasks,
-        locationKey,
         isProcessing,
         displayText,
         onTaskRemove,
@@ -50,6 +50,7 @@ function CopyViewProvider({ children, ...props }) {
             statusDisplayFailedLabel,
             statusDisplayQueuedLabel,
             tableData,
+            title,
         }, onActionCancel: onActionCancel, onActionExit: onActionExit, onActionStart: onActionStart, onSearch: onSearch, onSearchClear: onSearchClear, onSearchQueryChange: onQuery, onSelectDestination: onSelectDestination },
         React__default.createElement(FoldersPaginationProvider, { hasNextPage: hasNextPage, highestPageVisited: highestPageVisited, page: page, onPaginate: onPaginate },
             React__default.createElement(FoldersTableProvider, { destination: destination, folders: pageItems, onSelectFolder: onSelectFolder },

package/dist/esm/components/StorageBrowser/views/LocationActionView/CopyView/utils.mjs

@@ -0,0 +1,3 @@
+const getFolderText = ({ data: { fileKey, sourceKey }, }) => sourceKey.slice(0, -fileKey.length);
+
+export { getFolderText };

package/dist/esm/components/StorageBrowser/views/LocationActionView/DeleteView/DeleteViewProvider.mjs

@@ -3,19 +3,20 @@ import { ControlsContextProvider } from '../../../controls/context.mjs';
 import { useDisplayText } from '../../../displayText/context.mjs';
 import '@aws-amplify/ui';
 import { getActionViewTableData } from '../getActionViewTableData.mjs';
+import { getFolderText } from './utils.mjs';
 
 function DeleteViewProvider({ children, ...props }) {
     const { DeleteView: displayText } = useDisplayText();
     const { actionCancelLabel, actionExitLabel, actionStartLabel, title, statusDisplayCanceledLabel, statusDisplayCompletedLabel, statusDisplayFailedLabel, statusDisplayQueuedLabel, getActionCompleteMessage, } = displayText;
-    const { isProcessing, isProcessingComplete, location, statusCounts, tasks, onActionCancel, onActionStart, onActionExit, onTaskRemove, } = props;
+    const { isProcessing, isProcessingComplete, statusCounts, tasks, onActionCancel, onActionStart, onActionExit, onTaskRemove, } = props;
     const message = isProcessingComplete
         ? getActionCompleteMessage({ counts: statusCounts })
         : undefined;
     const tableData = getActionViewTableData({
         tasks,
-        locationKey: location.key,
         isProcessing,
         displayText,
+        getFolderText,
         onTaskRemove,
     });
     return (React__default.createElement(ControlsContextProvider, { data: {

package/dist/esm/components/StorageBrowser/views/LocationActionView/DeleteView/useDeleteView.mjs

@@ -15,18 +15,14 @@ import '@aws-amplify/storage/internals';
 import 'aws-amplify/storage';
 import '../../../actions/configs/context.mjs';
 
+// assign to constant to ensure referential equality
+const EMPTY_ITEMS = [];
 const useDeleteView = (options) => {
     const { onExit: _onExit } = options ?? {};
     const [{ location, locationItems }, dispatchStoreAction] = useStore();
-    const { fileDataItems } = locationItems;
-    const { current, key } = location;
-    const data = React__default.useMemo(() => !fileDataItems
-        ? []
-        : fileDataItems.map((item) => ({
-            ...item,
-            key: `${key}${item.fileKey}`,
-        })), [fileDataItems, key]);
-    const [processState, handleProcess] = useAction('delete', { items: data });
+    const { current } = location;
+    const { fileDataItems: items = EMPTY_ITEMS } = locationItems;
+    const [processState, handleProcess] = useAction('delete', { items });
     const { isProcessing, isProcessingComplete, statusCounts, tasks } = processState;
     const onActionStart = () => {
         if (!current)

package/dist/esm/components/StorageBrowser/views/LocationActionView/DeleteView/utils.mjs

@@ -0,0 +1,3 @@
+const getFolderText = ({ data: { fileKey, key }, }) => key.slice(0, -fileKey.length);
+
+export { getFolderText };

package/dist/esm/components/StorageBrowser/views/LocationActionView/UploadView/UploadViewProvider.mjs

@@ -3,6 +3,7 @@ import { ControlsContextProvider } from '../../../controls/context.mjs';
 import { useDisplayText } from '../../../displayText/context.mjs';
 import '@aws-amplify/ui';
 import { getActionViewTableData } from '../getActionViewTableData.mjs';
+import { getFolderText } from './utils.mjs';
 
 function UploadViewProvider({ children, ...props }) {
     const { UploadView: displayText } = useDisplayText();
@@ -45,6 +46,7 @@ function UploadViewProvider({ children, ...props }) {
             statusDisplayFailedLabel,
             statusDisplayQueuedLabel,
             tableData: getActionViewTableData({
+                getFolderText,
                 tasks,
                 shouldDisplayProgress: true,
                 displayText,

package/dist/esm/components/StorageBrowser/views/LocationActionView/UploadView/utils.mjs

@@ -0,0 +1,5 @@
+const getFolderText = ({ data: { file: { webkitRelativePath }, }, }) => webkitRelativePath
+    ? webkitRelativePath.slice(0, webkitRelativePath.lastIndexOf('/') + 1)
+    : '-';
+
+export { getFolderText };

package/dist/esm/components/StorageBrowser/views/LocationActionView/getActionViewTableData.mjs

@@ -31,7 +31,7 @@ const getProgressHeader = (label) => ({
     type: 'sort',
     content: { label },
 });
-const getActionViewTableData = ({ tasks, displayText, isProcessing, locationKey, shouldDisplayProgress = false, onTaskRemove, }) => {
+const getActionViewTableData = ({ tasks, displayText, getFolderText, isProcessing, shouldDisplayProgress = false, onTaskRemove, }) => {
     const headers = [
         ...getDefaultActionViewHeaders({
             displayText,
@@ -62,22 +62,8 @@ const getActionViewTableData = ({ tasks, displayText, isProcessing, locationKey,
                         };
                     }
                     case 'folder': {
-                        if (locationKey) {
-                            return { key, type: 'text', content: { text: locationKey } };
-                        }
-                        if (isFileItem(data)) {
-                            const { webkitRelativePath } = data.file;
-                            return {
-                                key,
-                                type: 'text',
-                                content: {
-                                    text: webkitRelativePath
-                                        ? webkitRelativePath.slice(0, webkitRelativePath.lastIndexOf('/') + 1)
-                                        : '-',
-                                },
-                            };
-                        }
-                        return { key, type: 'text', content: { text: '/' } };
+                        const text = getFolderText?.(task) ?? '/';
+                        return { key, type: 'text', content: { text } };
                     }
                     case 'type': {
                         return {

package/dist/esm/version.mjs

@@ -1,3 +1,3 @@
-const VERSION = '3.9.0';
+const VERSION = '3.9.1';
 
 export { VERSION };

package/dist/index.js

@@ -9,7 +9,7 @@ var uiReactCore = require('@aws-amplify/ui-react-core');
 var auth = require('aws-amplify/auth');
 var storage = require('aws-amplify/storage');
 var internal = require('@aws-amplify/ui-react/internal');
-var createAmplifyAuthAdapter = require('./createAmplifyAuthAdapter-BcuxpEzi.js');
+var createAmplifyAuthAdapter = require('./createAmplifyAuthAdapter-Cf4yJo1e.js');
 require('@aws-amplify/storage/internals');
 require('@aws-amplify/ui-react-core/elements');
 require('aws-amplify');

package/dist/types/components/StorageBrowser/views/LocationActionView/CopyView/utils.d.ts

@@ -0,0 +1,3 @@
+import { CopyHandlerData } from '../../../actions';
+import { Task } from '../../../tasks';
+export declare const getFolderText: ({ data: { fileKey, sourceKey }, }: Task<CopyHandlerData>) => string;

package/dist/types/components/StorageBrowser/views/LocationActionView/DeleteView/utils.d.ts

@@ -0,0 +1,3 @@
+import { DeleteHandlerData } from '../../../actions';
+import { Task } from '../../../tasks';
+export declare const getFolderText: ({ data: { fileKey, key }, }: Task<DeleteHandlerData>) => string;

package/dist/types/components/StorageBrowser/views/LocationActionView/UploadView/utils.d.ts

@@ -0,0 +1,3 @@
+import { UploadHandlerData } from '../../../actions';
+import { Task } from '../../../tasks';
+export declare const getFolderText: ({ data: { file: { webkitRelativePath }, }, }: Task<UploadHandlerData>) => string;

package/dist/types/components/StorageBrowser/views/LocationActionView/getActionViewTableData.d.ts

@@ -2,11 +2,11 @@ import { DataTableProps } from '../../composables/DataTable';
 import { Task } from '../../tasks';
 import { TaskData } from '../../actions';
 import { DefaultActionViewDisplayText } from '../../displayText/types';
-export declare const getActionViewTableData: <T extends TaskData = TaskData>({ tasks, displayText, isProcessing, locationKey, shouldDisplayProgress, onTaskRemove, }: {
+export declare const getActionViewTableData: <T extends TaskData = TaskData>({ tasks, displayText, getFolderText, isProcessing, shouldDisplayProgress, onTaskRemove, }: {
     tasks: Task<T, any>[];
     isProcessing: boolean;
-    locationKey?: string | undefined;
     shouldDisplayProgress?: boolean | undefined;
+    getFolderText?: ((task: Task<T, any>) => string) | undefined;
     displayText: Omit<DefaultActionViewDisplayText, 'getActionCompleteMessage'> & {
         tableStatusOverwritePreventedLabel?: string;
     };

package/dist/types/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "3.9.0";
+export declare const VERSION = "3.9.1";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-react-storage",
-  "version": "3.9.0",
+  "version": "3.9.1",
   "main": "dist/index.js",
   "module": "dist/esm/index.mjs",
   "exports": {
@@ -46,8 +46,8 @@
   },
   "dependencies": {
     "@aws-amplify/ui": "6.9.1",
-    "@aws-amplify/ui-react": "6.9.4",
-    "@aws-amplify/ui-react-core": "3.3.4",
+    "@aws-amplify/ui-react": "6.9.5",
+    "@aws-amplify/ui-react-core": "3.3.5",
     "tslib": "^2.5.2"
   },
   "peerDependencies": {