@aws-amplify/ui-react-storage 0.0.0-studio-console-80bb2e2-20230921222703 → 0.0.0-theming-v2-c5d1f72-20240709163904
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/esm/components/StorageImage/StorageImage.mjs +57 -1
- package/dist/esm/components/StorageManager/StorageManager.mjs +181 -1
- package/dist/esm/components/StorageManager/hooks/useStorageManager/actions.mjs +35 -1
- package/dist/esm/components/StorageManager/hooks/useStorageManager/reducer.mjs +132 -1
- package/dist/esm/components/StorageManager/hooks/useStorageManager/types.mjs +12 -1
- package/dist/esm/components/StorageManager/hooks/useStorageManager/useStorageManager.mjs +58 -1
- package/dist/esm/components/StorageManager/hooks/useUploadFiles/useUploadFiles.mjs +74 -1
- package/dist/esm/components/StorageManager/types.mjs +11 -1
- package/dist/esm/components/StorageManager/ui/Container/Container.mjs +8 -1
- package/dist/esm/components/StorageManager/ui/DropZone/DropZone.mjs +16 -1
- package/dist/esm/components/StorageManager/ui/FileList/FileControl.mjs +23 -1
- package/dist/esm/components/StorageManager/ui/FileList/FileDetails.mjs +15 -1
- package/dist/esm/components/StorageManager/ui/FileList/FileList.mjs +44 -1
- package/dist/esm/components/StorageManager/ui/FileList/FileRemoveButton.mjs +12 -1
- package/dist/esm/components/StorageManager/ui/FileList/FileStatusMessage.mjs +28 -1
- package/dist/esm/components/StorageManager/ui/FileList/FileThumbnail.mjs +12 -1
- package/dist/esm/components/StorageManager/ui/FileListFooter/FileListFooter.mjs +13 -1
- package/dist/esm/components/StorageManager/ui/FileListHeader/FileListHeader.mjs +14 -1
- package/dist/esm/components/StorageManager/ui/FilePicker/FilePicker.mjs +9 -1
- package/dist/esm/components/StorageManager/utils/checkMaxFileSize.mjs +12 -1
- package/dist/esm/components/StorageManager/utils/displayText.mjs +39 -1
- package/dist/esm/components/StorageManager/utils/filterAllowedFiles.mjs +27 -1
- package/dist/esm/components/StorageManager/utils/getInput.mjs +25 -0
- package/dist/esm/components/StorageManager/utils/humanFileSize.mjs +29 -1
- package/dist/esm/components/StorageManager/utils/resolveFile.mjs +20 -0
- package/dist/esm/components/StorageManager/utils/uploadFile.mjs +26 -1
- package/dist/esm/index.mjs +2 -1
- package/dist/esm/version.mjs +3 -0
- package/dist/index.js +832 -1
- package/dist/styles.css +462 -370
- package/dist/types/components/StorageImage/StorageImage.d.ts +6 -2
- package/dist/types/components/StorageImage/types.d.ts +33 -2
- package/dist/types/components/StorageManager/StorageManager.d.ts +5 -2
- package/dist/types/components/StorageManager/hooks/useStorageManager/actions.d.ts +2 -5
- package/dist/types/components/StorageManager/hooks/useStorageManager/types.d.ts +1 -1
- package/dist/types/components/StorageManager/hooks/useStorageManager/useStorageManager.d.ts +2 -5
- package/dist/types/components/StorageManager/hooks/useUploadFiles/useUploadFiles.d.ts +5 -2
- package/dist/types/components/StorageManager/types.d.ts +17 -11
- package/dist/types/components/StorageManager/ui/FileList/types.d.ts +7 -17
- package/dist/types/components/StorageManager/ui/FileListFooter/FileListFooter.d.ts +2 -2
- package/dist/types/components/StorageManager/ui/FileListHeader/FileListHeader.d.ts +2 -2
- package/dist/types/components/StorageManager/utils/displayText.d.ts +22 -20
- package/dist/types/components/StorageManager/utils/getInput.d.ts +13 -0
- package/dist/types/components/StorageManager/utils/index.d.ts +3 -2
- package/dist/types/components/StorageManager/utils/resolveFile.d.ts +9 -0
- package/dist/types/components/StorageManager/utils/uploadFile.d.ts +30 -17
- package/dist/types/version.d.ts +1 -0
- package/package.json +9 -40
- package/dist/esm/components/StorageManager/hooks/useUploadFiles/resolveFile.mjs +0 -1
- package/dist/types/components/StorageImage/_tests_/StorageImage.test.d.ts +0 -1
- package/dist/types/components/StorageManager/hooks/useUploadFiles/resolveFile.d.ts +0 -10
|
@@ -1 +1,57 @@
|
|
|
1
|
-
import*
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { classNames, ComponentClassName } from '@aws-amplify/ui';
|
|
3
|
+
import { Image } from '@aws-amplify/ui-react';
|
|
4
|
+
import { useDeprecationWarning } from '@aws-amplify/ui-react/internal';
|
|
5
|
+
import { useSetUserAgent, useGetUrl } from '@aws-amplify/ui-react-core';
|
|
6
|
+
import { VERSION } from '../../version.mjs';
|
|
7
|
+
|
|
8
|
+
const MISSING_REQUIRED_PROP_MESSAGE = '`StorageImage` requires either an `imgKey` or `path` prop.';
|
|
9
|
+
const HAS_DEPRECATED_PROPS_MESSAGE = '`imgKey`, `accessLevel`, and `identityId` will be replaced with `path` in a future major version. See https://ui.docs.amplify.aws/react/connected-components/storage/storageimage#props';
|
|
10
|
+
const HAS_PATH_AND_KEY_MESSAGE = '`imgKey` is ignored when both `imgKey` and `path` props are provided.';
|
|
11
|
+
const HAS_PATH_AND_UNSUPPORTED_OPTIONS_MESSAGE = '`accessLevel` and `identityId` are ignored when the `path` prop is provided.';
|
|
12
|
+
const getDeprecationMessage = ({ hasImgkey, hasPath, hasDeprecatedOptions, }) => {
|
|
13
|
+
let message = '';
|
|
14
|
+
if (hasPath && hasImgkey) {
|
|
15
|
+
message = HAS_PATH_AND_KEY_MESSAGE;
|
|
16
|
+
}
|
|
17
|
+
else if (hasPath && hasDeprecatedOptions) {
|
|
18
|
+
message = HAS_PATH_AND_UNSUPPORTED_OPTIONS_MESSAGE;
|
|
19
|
+
}
|
|
20
|
+
else if (hasImgkey) {
|
|
21
|
+
message = HAS_DEPRECATED_PROPS_MESSAGE;
|
|
22
|
+
}
|
|
23
|
+
return message;
|
|
24
|
+
};
|
|
25
|
+
const StorageImage = ({ accessLevel, className, fallbackSrc, identityId, imgKey, path, onStorageGetError, onGetUrlError, validateObjectExistence = true, ...rest }) => {
|
|
26
|
+
const hasImgkey = !!imgKey;
|
|
27
|
+
const hasPath = !!path;
|
|
28
|
+
const hasDeprecatedOptions = !!accessLevel || !!identityId;
|
|
29
|
+
const message = getDeprecationMessage({
|
|
30
|
+
hasDeprecatedOptions,
|
|
31
|
+
hasImgkey,
|
|
32
|
+
hasPath,
|
|
33
|
+
});
|
|
34
|
+
useDeprecationWarning({ message, shouldWarn: !!message });
|
|
35
|
+
if (!hasImgkey && !hasPath) {
|
|
36
|
+
throw new Error(MISSING_REQUIRED_PROP_MESSAGE);
|
|
37
|
+
}
|
|
38
|
+
useSetUserAgent({
|
|
39
|
+
componentName: 'StorageImage',
|
|
40
|
+
packageName: 'react-storage',
|
|
41
|
+
version: VERSION,
|
|
42
|
+
});
|
|
43
|
+
const onError = onGetUrlError ?? onStorageGetError;
|
|
44
|
+
const input = React.useMemo(() => ({
|
|
45
|
+
...(path ? { path } : { key: imgKey }),
|
|
46
|
+
onError,
|
|
47
|
+
options: {
|
|
48
|
+
accessLevel,
|
|
49
|
+
targetIdentityId: identityId,
|
|
50
|
+
validateObjectExistence,
|
|
51
|
+
},
|
|
52
|
+
}), [accessLevel, imgKey, identityId, onError, path, validateObjectExistence]);
|
|
53
|
+
const { url } = useGetUrl(input);
|
|
54
|
+
return (React.createElement(Image, { ...rest, className: classNames(ComponentClassName.StorageImage, className), src: url?.toString() ?? fallbackSrc }));
|
|
55
|
+
};
|
|
56
|
+
|
|
57
|
+
export { HAS_DEPRECATED_PROPS_MESSAGE, HAS_PATH_AND_KEY_MESSAGE, HAS_PATH_AND_UNSUPPORTED_OPTIONS_MESSAGE, MISSING_REQUIRED_PROP_MESSAGE, StorageImage };
|
|
@@ -1 +1,181 @@
|
|
|
1
|
-
import*
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { getLogger, ComponentClassName } from '@aws-amplify/ui';
|
|
3
|
+
import { VisuallyHidden } from '@aws-amplify/ui-react';
|
|
4
|
+
import { useDeprecationWarning, useSetUserAgent } from '@aws-amplify/ui-react-core';
|
|
5
|
+
import { useDropZone } from '@aws-amplify/ui-react/internal';
|
|
6
|
+
import { useStorageManager } from './hooks/useStorageManager/useStorageManager.mjs';
|
|
7
|
+
import { useUploadFiles } from './hooks/useUploadFiles/useUploadFiles.mjs';
|
|
8
|
+
import { FileStatus } from './types.mjs';
|
|
9
|
+
import { Container } from './ui/Container/Container.mjs';
|
|
10
|
+
import { DropZone } from './ui/DropZone/DropZone.mjs';
|
|
11
|
+
import { FileList } from './ui/FileList/FileList.mjs';
|
|
12
|
+
import { FileListHeader } from './ui/FileListHeader/FileListHeader.mjs';
|
|
13
|
+
import { FileListFooter } from './ui/FileListFooter/FileListFooter.mjs';
|
|
14
|
+
import { FilePicker } from './ui/FilePicker/FilePicker.mjs';
|
|
15
|
+
import { checkMaxFileSize } from './utils/checkMaxFileSize.mjs';
|
|
16
|
+
import { defaultStorageManagerDisplayText } from './utils/displayText.mjs';
|
|
17
|
+
import { filterAllowedFiles } from './utils/filterAllowedFiles.mjs';
|
|
18
|
+
import 'aws-amplify/auth';
|
|
19
|
+
import 'aws-amplify/storage';
|
|
20
|
+
import { VERSION } from '../../version.mjs';
|
|
21
|
+
|
|
22
|
+
const logger = getLogger('Storage');
|
|
23
|
+
const MISSING_REQUIRED_PROPS_MESSAGE = '`StorageManager` requires a `maxFileCount` prop to be provided.';
|
|
24
|
+
const ACCESS_LEVEL_WITH_PATH_CALLBACK_MESSAGE = '`StorageManager` does not allow usage of a `path` callback prop with an `accessLevel` prop.';
|
|
25
|
+
const ACCESS_LEVEL_DEPRECATION_MESSAGE = '`accessLevel` has been deprecated and will be removed in a future major version. See migration notes at https://ui.docs.amplify.aws/react/connected-components/storage/storagemanager';
|
|
26
|
+
const StorageManagerBase = React.forwardRef(function StorageManager({ acceptedFileTypes = [], accessLevel, autoUpload = true, components, defaultFiles, displayText: overrideDisplayText, isResumable = false, maxFileCount, maxFileSize, onFileRemove, onUploadError, onUploadStart, onUploadSuccess, path, processFile, showThumbnails = true, }, ref) {
|
|
27
|
+
if (!maxFileCount) {
|
|
28
|
+
// eslint-disable-next-line no-console
|
|
29
|
+
console.warn(MISSING_REQUIRED_PROPS_MESSAGE);
|
|
30
|
+
}
|
|
31
|
+
if (accessLevel && typeof path === 'function') {
|
|
32
|
+
throw new Error(ACCESS_LEVEL_WITH_PATH_CALLBACK_MESSAGE);
|
|
33
|
+
}
|
|
34
|
+
useDeprecationWarning({
|
|
35
|
+
message: ACCESS_LEVEL_DEPRECATION_MESSAGE,
|
|
36
|
+
shouldWarn: !!accessLevel,
|
|
37
|
+
});
|
|
38
|
+
const Components = {
|
|
39
|
+
Container,
|
|
40
|
+
DropZone,
|
|
41
|
+
FileList,
|
|
42
|
+
FilePicker,
|
|
43
|
+
FileListHeader,
|
|
44
|
+
FileListFooter,
|
|
45
|
+
...components,
|
|
46
|
+
};
|
|
47
|
+
const allowMultipleFiles = maxFileCount === undefined ||
|
|
48
|
+
(typeof maxFileCount === 'number' && maxFileCount > 1);
|
|
49
|
+
const displayText = {
|
|
50
|
+
...defaultStorageManagerDisplayText,
|
|
51
|
+
...overrideDisplayText,
|
|
52
|
+
};
|
|
53
|
+
const { getFileSizeErrorText } = displayText;
|
|
54
|
+
const getMaxFileSizeErrorMessage = (file) => {
|
|
55
|
+
return checkMaxFileSize({
|
|
56
|
+
file,
|
|
57
|
+
maxFileSize,
|
|
58
|
+
getFileSizeErrorText,
|
|
59
|
+
});
|
|
60
|
+
};
|
|
61
|
+
const { addFiles, clearFiles, files, removeUpload, queueFiles, setUploadingFile, setUploadPaused, setUploadProgress, setUploadSuccess, setUploadResumed, } = useStorageManager(defaultFiles);
|
|
62
|
+
React.useImperativeHandle(ref, () => ({ clearFiles }));
|
|
63
|
+
const { dragState, ...dropZoneProps } = useDropZone({
|
|
64
|
+
acceptedFileTypes,
|
|
65
|
+
onDropComplete: ({ acceptedFiles, rejectedFiles }) => {
|
|
66
|
+
if (rejectedFiles && rejectedFiles.length > 0) {
|
|
67
|
+
logger.warn('Rejected files: ', rejectedFiles);
|
|
68
|
+
}
|
|
69
|
+
// We need to filter out files by extension here,
|
|
70
|
+
// we don't get filenames on the drag event, only on drop
|
|
71
|
+
const _acceptedFiles = filterAllowedFiles(acceptedFiles, acceptedFileTypes);
|
|
72
|
+
addFiles({
|
|
73
|
+
files: _acceptedFiles,
|
|
74
|
+
status: autoUpload ? FileStatus.QUEUED : FileStatus.ADDED,
|
|
75
|
+
getFileErrorMessage: getMaxFileSizeErrorMessage,
|
|
76
|
+
});
|
|
77
|
+
},
|
|
78
|
+
});
|
|
79
|
+
useUploadFiles({
|
|
80
|
+
accessLevel,
|
|
81
|
+
files,
|
|
82
|
+
isResumable,
|
|
83
|
+
maxFileCount,
|
|
84
|
+
onUploadError,
|
|
85
|
+
onUploadSuccess,
|
|
86
|
+
onUploadStart,
|
|
87
|
+
setUploadingFile,
|
|
88
|
+
setUploadProgress,
|
|
89
|
+
setUploadSuccess,
|
|
90
|
+
processFile,
|
|
91
|
+
path,
|
|
92
|
+
});
|
|
93
|
+
const onFilePickerChange = (event) => {
|
|
94
|
+
const { files } = event.target;
|
|
95
|
+
if (!files || files.length === 0) {
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
addFiles({
|
|
99
|
+
files: Array.from(files),
|
|
100
|
+
status: autoUpload ? FileStatus.QUEUED : FileStatus.ADDED,
|
|
101
|
+
getFileErrorMessage: getMaxFileSizeErrorMessage,
|
|
102
|
+
});
|
|
103
|
+
};
|
|
104
|
+
const onClearAll = () => {
|
|
105
|
+
clearFiles();
|
|
106
|
+
};
|
|
107
|
+
const onUploadAll = () => {
|
|
108
|
+
queueFiles();
|
|
109
|
+
};
|
|
110
|
+
const onPauseUpload = ({ id, uploadTask }) => {
|
|
111
|
+
uploadTask.pause();
|
|
112
|
+
setUploadPaused({ id });
|
|
113
|
+
};
|
|
114
|
+
const onResumeUpload = ({ id, uploadTask }) => {
|
|
115
|
+
uploadTask.resume();
|
|
116
|
+
setUploadResumed({ id });
|
|
117
|
+
};
|
|
118
|
+
const onCancelUpload = ({ id, uploadTask }) => {
|
|
119
|
+
// At this time we don't know if the delete
|
|
120
|
+
// permissions are enabled (required to cancel upload),
|
|
121
|
+
// so we do a pause instead and remove from files
|
|
122
|
+
uploadTask.pause();
|
|
123
|
+
removeUpload({ id });
|
|
124
|
+
};
|
|
125
|
+
const onDeleteUpload = ({ id }) => {
|
|
126
|
+
// At this time we don't know if the delete
|
|
127
|
+
// permissions are enabled, so we do a soft delete
|
|
128
|
+
// from file list, but don't remove from storage
|
|
129
|
+
removeUpload({ id });
|
|
130
|
+
if (typeof onFileRemove === 'function') {
|
|
131
|
+
const file = files.find((file) => file.id === id);
|
|
132
|
+
if (file) {
|
|
133
|
+
onFileRemove({ key: file.key });
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
};
|
|
137
|
+
// checks if all downloads completed to 100%
|
|
138
|
+
const allUploadsSuccessful = files.length === 0
|
|
139
|
+
? false
|
|
140
|
+
: files.every((file) => file?.status === FileStatus.UPLOADED);
|
|
141
|
+
// Displays if over max files
|
|
142
|
+
const hasMaxFilesError = files.filter((file) => file.progress < 100).length > maxFileCount;
|
|
143
|
+
const uploadedFilesLength = files.filter((file) => file?.status === FileStatus.UPLOADED).length;
|
|
144
|
+
const remainingFilesCount = files.length - uploadedFilesLength;
|
|
145
|
+
// number of files selected for upload when autoUpload is turned off
|
|
146
|
+
const selectedFilesCount = autoUpload ? 0 : remainingFilesCount;
|
|
147
|
+
const hasFiles = files.length > 0;
|
|
148
|
+
const hasUploadActions = !autoUpload && remainingFilesCount > 0;
|
|
149
|
+
const hiddenInput = React.useRef(null);
|
|
150
|
+
function handleClick() {
|
|
151
|
+
if (hiddenInput.current) {
|
|
152
|
+
hiddenInput.current.click();
|
|
153
|
+
hiddenInput.current.value = '';
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
useSetUserAgent({
|
|
157
|
+
componentName: 'StorageManager',
|
|
158
|
+
packageName: 'react-storage',
|
|
159
|
+
version: VERSION,
|
|
160
|
+
});
|
|
161
|
+
return (React.createElement(Components.Container, { className: `${ComponentClassName.StorageManager} ${hasFiles ? ComponentClassName.StorageManagerPreviewer : ''}` },
|
|
162
|
+
React.createElement(Components.DropZone, { inDropZone: dragState !== 'inactive', ...dropZoneProps, displayText: displayText },
|
|
163
|
+
React.createElement(React.Fragment, null,
|
|
164
|
+
React.createElement(Components.FilePicker, { onClick: handleClick }, displayText.browseFilesText),
|
|
165
|
+
React.createElement(VisuallyHidden, null,
|
|
166
|
+
React.createElement("input", { type: "file", tabIndex: -1, ref: hiddenInput, onChange: onFilePickerChange, multiple: allowMultipleFiles, accept: acceptedFileTypes.join(',') })))),
|
|
167
|
+
hasFiles ? (React.createElement(Components.FileListHeader, { allUploadsSuccessful: allUploadsSuccessful, displayText: displayText, fileCount: files.length, remainingFilesCount: remainingFilesCount, selectedFilesCount: selectedFilesCount })) : null,
|
|
168
|
+
React.createElement(Components.FileList, { displayText: displayText, files: files, isResumable: isResumable, onCancelUpload: onCancelUpload, onDeleteUpload: onDeleteUpload, onResume: onResumeUpload, onPause: onPauseUpload, showThumbnails: showThumbnails, hasMaxFilesError: hasMaxFilesError, maxFileCount: maxFileCount }),
|
|
169
|
+
hasUploadActions ? (React.createElement(Components.FileListFooter, { displayText: displayText, remainingFilesCount: remainingFilesCount, onClearAll: onClearAll, onUploadAll: onUploadAll })) : null));
|
|
170
|
+
});
|
|
171
|
+
// pass an empty object as first param to avoid destructive action on `StorageManagerBase`
|
|
172
|
+
const StorageManager = Object.assign({}, StorageManagerBase, {
|
|
173
|
+
Container,
|
|
174
|
+
DropZone,
|
|
175
|
+
FileList,
|
|
176
|
+
FileListHeader,
|
|
177
|
+
FileListFooter,
|
|
178
|
+
FilePicker,
|
|
179
|
+
});
|
|
180
|
+
|
|
181
|
+
export { ACCESS_LEVEL_DEPRECATION_MESSAGE, ACCESS_LEVEL_WITH_PATH_CALLBACK_MESSAGE, MISSING_REQUIRED_PROPS_MESSAGE, StorageManager };
|
|
@@ -1 +1,35 @@
|
|
|
1
|
-
import{StorageManagerActionTypes
|
|
1
|
+
import { StorageManagerActionTypes } from './types.mjs';
|
|
2
|
+
|
|
3
|
+
const addFilesAction = ({ files, status, getFileErrorMessage, }) => ({
|
|
4
|
+
type: StorageManagerActionTypes.ADD_FILES,
|
|
5
|
+
files,
|
|
6
|
+
status,
|
|
7
|
+
getFileErrorMessage,
|
|
8
|
+
});
|
|
9
|
+
const clearFilesAction = () => ({
|
|
10
|
+
type: StorageManagerActionTypes.CLEAR_FILES,
|
|
11
|
+
});
|
|
12
|
+
const queueFilesAction = () => ({
|
|
13
|
+
type: StorageManagerActionTypes.QUEUE_FILES,
|
|
14
|
+
});
|
|
15
|
+
const setUploadingFileAction = ({ id, uploadTask, }) => ({
|
|
16
|
+
type: StorageManagerActionTypes.SET_STATUS_UPLOADING,
|
|
17
|
+
id,
|
|
18
|
+
uploadTask,
|
|
19
|
+
});
|
|
20
|
+
const setUploadProgressAction = ({ id, progress, }) => ({
|
|
21
|
+
type: StorageManagerActionTypes.SET_UPLOAD_PROGRESS,
|
|
22
|
+
id,
|
|
23
|
+
progress,
|
|
24
|
+
});
|
|
25
|
+
const setUploadStatusAction = ({ id, status, }) => ({
|
|
26
|
+
type: StorageManagerActionTypes.SET_STATUS,
|
|
27
|
+
id,
|
|
28
|
+
status,
|
|
29
|
+
});
|
|
30
|
+
const removeUploadAction = ({ id }) => ({
|
|
31
|
+
type: StorageManagerActionTypes.REMOVE_UPLOAD,
|
|
32
|
+
id,
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
export { addFilesAction, clearFilesAction, queueFilesAction, removeUploadAction, setUploadProgressAction, setUploadStatusAction, setUploadingFileAction };
|
|
@@ -1 +1,132 @@
|
|
|
1
|
-
import{FileStatus
|
|
1
|
+
import { FileStatus } from '../../types.mjs';
|
|
2
|
+
import { StorageManagerActionTypes } from './types.mjs';
|
|
3
|
+
|
|
4
|
+
function storageManagerStateReducer(state, action) {
|
|
5
|
+
switch (action.type) {
|
|
6
|
+
case StorageManagerActionTypes.ADD_FILES: {
|
|
7
|
+
const { files, status } = action;
|
|
8
|
+
const newUploads = files.map((file) => {
|
|
9
|
+
const errorText = action.getFileErrorMessage(file);
|
|
10
|
+
return {
|
|
11
|
+
// make sure id is unique,
|
|
12
|
+
// we only use it internally and don't send it to Storage
|
|
13
|
+
id: `${Date.now()}-${file.name}`,
|
|
14
|
+
file,
|
|
15
|
+
error: errorText,
|
|
16
|
+
key: file.name,
|
|
17
|
+
status: errorText ? FileStatus.ERROR : status,
|
|
18
|
+
isImage: file.type.startsWith('image/'),
|
|
19
|
+
progress: -1,
|
|
20
|
+
};
|
|
21
|
+
});
|
|
22
|
+
const newFiles = [...state.files, ...newUploads];
|
|
23
|
+
return {
|
|
24
|
+
...state,
|
|
25
|
+
files: newFiles,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
case StorageManagerActionTypes.CLEAR_FILES: {
|
|
29
|
+
return {
|
|
30
|
+
...state,
|
|
31
|
+
files: [],
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
case StorageManagerActionTypes.QUEUE_FILES: {
|
|
35
|
+
const { files } = state;
|
|
36
|
+
const newFiles = files.reduce((files, currentFile) => {
|
|
37
|
+
return [
|
|
38
|
+
...files,
|
|
39
|
+
{
|
|
40
|
+
...currentFile,
|
|
41
|
+
...(currentFile.status === FileStatus.ADDED
|
|
42
|
+
? { status: FileStatus.QUEUED }
|
|
43
|
+
: {}),
|
|
44
|
+
},
|
|
45
|
+
];
|
|
46
|
+
}, []);
|
|
47
|
+
return {
|
|
48
|
+
...state,
|
|
49
|
+
files: newFiles,
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
case StorageManagerActionTypes.SET_STATUS_UPLOADING: {
|
|
53
|
+
const { id, uploadTask } = action;
|
|
54
|
+
const { files } = state;
|
|
55
|
+
const newFiles = files.reduce((files, currentFile) => {
|
|
56
|
+
if (currentFile.id === id) {
|
|
57
|
+
return [
|
|
58
|
+
...files,
|
|
59
|
+
{
|
|
60
|
+
...currentFile,
|
|
61
|
+
status: FileStatus.UPLOADING,
|
|
62
|
+
progress: 0,
|
|
63
|
+
uploadTask,
|
|
64
|
+
},
|
|
65
|
+
];
|
|
66
|
+
}
|
|
67
|
+
return [...files, currentFile];
|
|
68
|
+
}, []);
|
|
69
|
+
return {
|
|
70
|
+
...state,
|
|
71
|
+
files: newFiles,
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
case StorageManagerActionTypes.SET_UPLOAD_PROGRESS: {
|
|
75
|
+
const { id, progress } = action;
|
|
76
|
+
const { files } = state;
|
|
77
|
+
const newFiles = files.reduce((files, currentFile) => {
|
|
78
|
+
if (currentFile.id === id) {
|
|
79
|
+
return [
|
|
80
|
+
...files,
|
|
81
|
+
{
|
|
82
|
+
...currentFile,
|
|
83
|
+
progress,
|
|
84
|
+
},
|
|
85
|
+
];
|
|
86
|
+
}
|
|
87
|
+
return [...files, currentFile];
|
|
88
|
+
}, []);
|
|
89
|
+
return {
|
|
90
|
+
...state,
|
|
91
|
+
files: newFiles,
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
case StorageManagerActionTypes.SET_STATUS: {
|
|
95
|
+
const { id, status } = action;
|
|
96
|
+
const { files } = state;
|
|
97
|
+
const newFiles = files.reduce((files, currentFile) => {
|
|
98
|
+
if (currentFile.id === id) {
|
|
99
|
+
return [
|
|
100
|
+
...files,
|
|
101
|
+
{
|
|
102
|
+
...currentFile,
|
|
103
|
+
status,
|
|
104
|
+
},
|
|
105
|
+
];
|
|
106
|
+
}
|
|
107
|
+
return [...files, currentFile];
|
|
108
|
+
}, []);
|
|
109
|
+
return {
|
|
110
|
+
...state,
|
|
111
|
+
files: newFiles,
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
case StorageManagerActionTypes.REMOVE_UPLOAD: {
|
|
115
|
+
const { id } = action;
|
|
116
|
+
const { files } = state;
|
|
117
|
+
const newFiles = files.reduce((files, currentFile) => {
|
|
118
|
+
if (currentFile.id === id) {
|
|
119
|
+
// remove by not returning currentFile
|
|
120
|
+
return [...files];
|
|
121
|
+
}
|
|
122
|
+
return [...files, currentFile];
|
|
123
|
+
}, []);
|
|
124
|
+
return {
|
|
125
|
+
...state,
|
|
126
|
+
files: newFiles,
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
export { storageManagerStateReducer };
|
|
@@ -1 +1,12 @@
|
|
|
1
|
-
var
|
|
1
|
+
var StorageManagerActionTypes;
|
|
2
|
+
(function (StorageManagerActionTypes) {
|
|
3
|
+
StorageManagerActionTypes["ADD_FILES"] = "ADD_FILES";
|
|
4
|
+
StorageManagerActionTypes["CLEAR_FILES"] = "CLEAR_FILES";
|
|
5
|
+
StorageManagerActionTypes["QUEUE_FILES"] = "QUEUE_FILES";
|
|
6
|
+
StorageManagerActionTypes["SET_STATUS"] = "SET_STATUS";
|
|
7
|
+
StorageManagerActionTypes["SET_STATUS_UPLOADING"] = "SET_STATUS_UPLOADING";
|
|
8
|
+
StorageManagerActionTypes["SET_UPLOAD_PROGRESS"] = "SET_UPLOAD_PROGRESS";
|
|
9
|
+
StorageManagerActionTypes["REMOVE_UPLOAD"] = "REMOVE_UPLOAD";
|
|
10
|
+
})(StorageManagerActionTypes || (StorageManagerActionTypes = {}));
|
|
11
|
+
|
|
12
|
+
export { StorageManagerActionTypes };
|
|
@@ -1 +1,58 @@
|
|
|
1
|
-
import
|
|
1
|
+
import React__default from 'react';
|
|
2
|
+
import { isObject } from '@aws-amplify/ui';
|
|
3
|
+
import { FileStatus } from '../../types.mjs';
|
|
4
|
+
import { storageManagerStateReducer } from './reducer.mjs';
|
|
5
|
+
import { addFilesAction, clearFilesAction, queueFilesAction, setUploadingFileAction, setUploadProgressAction, setUploadStatusAction, removeUploadAction } from './actions.mjs';
|
|
6
|
+
|
|
7
|
+
const isDefaultFile = (file) => !!(isObject(file) && file.key);
|
|
8
|
+
const createFileFromDefault = (file) => isDefaultFile(file)
|
|
9
|
+
? { ...file, id: file.key, status: FileStatus.UPLOADED }
|
|
10
|
+
: undefined;
|
|
11
|
+
function useStorageManager(defaultFiles = []) {
|
|
12
|
+
const [{ files }, dispatch] = React__default.useReducer(storageManagerStateReducer, {
|
|
13
|
+
files: (Array.isArray(defaultFiles)
|
|
14
|
+
? defaultFiles.map(createFileFromDefault).filter((file) => !!file)
|
|
15
|
+
: []),
|
|
16
|
+
});
|
|
17
|
+
const addFiles = ({ files, status, getFileErrorMessage, }) => {
|
|
18
|
+
dispatch(addFilesAction({ files, status, getFileErrorMessage }));
|
|
19
|
+
};
|
|
20
|
+
const clearFiles = () => {
|
|
21
|
+
dispatch(clearFilesAction());
|
|
22
|
+
};
|
|
23
|
+
const queueFiles = () => {
|
|
24
|
+
dispatch(queueFilesAction());
|
|
25
|
+
};
|
|
26
|
+
const setUploadingFile = ({ uploadTask, id, }) => {
|
|
27
|
+
dispatch(setUploadingFileAction({ id, uploadTask }));
|
|
28
|
+
};
|
|
29
|
+
const setUploadProgress = ({ progress, id, }) => {
|
|
30
|
+
dispatch(setUploadProgressAction({ id, progress }));
|
|
31
|
+
};
|
|
32
|
+
const setUploadSuccess = ({ id }) => {
|
|
33
|
+
dispatch(setUploadStatusAction({ id, status: FileStatus.UPLOADED }));
|
|
34
|
+
};
|
|
35
|
+
const setUploadPaused = ({ id }) => {
|
|
36
|
+
dispatch(setUploadStatusAction({ id, status: FileStatus.PAUSED }));
|
|
37
|
+
};
|
|
38
|
+
const setUploadResumed = ({ id }) => {
|
|
39
|
+
dispatch(setUploadStatusAction({ id, status: FileStatus.UPLOADING }));
|
|
40
|
+
};
|
|
41
|
+
const removeUpload = ({ id }) => {
|
|
42
|
+
dispatch(removeUploadAction({ id }));
|
|
43
|
+
};
|
|
44
|
+
return {
|
|
45
|
+
removeUpload,
|
|
46
|
+
setUploadPaused,
|
|
47
|
+
setUploadProgress,
|
|
48
|
+
setUploadResumed,
|
|
49
|
+
setUploadSuccess,
|
|
50
|
+
setUploadingFile,
|
|
51
|
+
queueFiles,
|
|
52
|
+
addFiles,
|
|
53
|
+
clearFiles,
|
|
54
|
+
files,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
export { useStorageManager };
|
|
@@ -1 +1,74 @@
|
|
|
1
|
-
import*
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { isFunction } from '@aws-amplify/ui';
|
|
3
|
+
import { getInput } from '../../utils/getInput.mjs';
|
|
4
|
+
import { uploadFile } from '../../utils/uploadFile.mjs';
|
|
5
|
+
import { FileStatus } from '../../types.mjs';
|
|
6
|
+
|
|
7
|
+
function useUploadFiles({ files, accessLevel, isResumable, setUploadProgress, setUploadingFile, setUploadSuccess, onUploadError, onUploadSuccess, onUploadStart, maxFileCount, processFile, path, }) {
|
|
8
|
+
React.useEffect(() => {
|
|
9
|
+
const filesReadyToUpload = files.filter((file) => file.status === FileStatus.QUEUED);
|
|
10
|
+
if (filesReadyToUpload.length > maxFileCount) {
|
|
11
|
+
return;
|
|
12
|
+
}
|
|
13
|
+
for (const { file, key, id } of filesReadyToUpload) {
|
|
14
|
+
const onProgress = (event) => {
|
|
15
|
+
/**
|
|
16
|
+
* When a file is zero bytes, the progress.total will equal zero.
|
|
17
|
+
* Therefore, this will prevent a divide by zero error.
|
|
18
|
+
*/
|
|
19
|
+
const progress = event.totalBytes === undefined || event.totalBytes === 0
|
|
20
|
+
? 100
|
|
21
|
+
: Math.floor((event.transferredBytes / event.totalBytes) * 100);
|
|
22
|
+
setUploadProgress({ id, progress });
|
|
23
|
+
};
|
|
24
|
+
if (file) {
|
|
25
|
+
const input = getInput({
|
|
26
|
+
accessLevel,
|
|
27
|
+
file,
|
|
28
|
+
key,
|
|
29
|
+
onProgress,
|
|
30
|
+
path,
|
|
31
|
+
processFile,
|
|
32
|
+
});
|
|
33
|
+
uploadFile({
|
|
34
|
+
input,
|
|
35
|
+
onComplete: (event) => {
|
|
36
|
+
if (isFunction(onUploadSuccess)) {
|
|
37
|
+
onUploadSuccess({
|
|
38
|
+
key: event.key ??
|
|
39
|
+
event.path,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
setUploadSuccess({ id });
|
|
43
|
+
},
|
|
44
|
+
onError: ({ key, error }) => {
|
|
45
|
+
if (isFunction(onUploadError)) {
|
|
46
|
+
onUploadError(error.message, { key });
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
onStart: ({ key, uploadTask }) => {
|
|
50
|
+
if (isFunction(onUploadStart)) {
|
|
51
|
+
onUploadStart({ key });
|
|
52
|
+
}
|
|
53
|
+
setUploadingFile({ id, uploadTask });
|
|
54
|
+
},
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}, [
|
|
59
|
+
files,
|
|
60
|
+
accessLevel,
|
|
61
|
+
isResumable,
|
|
62
|
+
setUploadProgress,
|
|
63
|
+
setUploadingFile,
|
|
64
|
+
onUploadError,
|
|
65
|
+
onUploadSuccess,
|
|
66
|
+
onUploadStart,
|
|
67
|
+
maxFileCount,
|
|
68
|
+
setUploadSuccess,
|
|
69
|
+
processFile,
|
|
70
|
+
path,
|
|
71
|
+
]);
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
export { useUploadFiles };
|
|
@@ -1 +1,11 @@
|
|
|
1
|
-
var
|
|
1
|
+
var FileStatus;
|
|
2
|
+
(function (FileStatus) {
|
|
3
|
+
FileStatus["ADDED"] = "added";
|
|
4
|
+
FileStatus["QUEUED"] = "queued";
|
|
5
|
+
FileStatus["UPLOADING"] = "uploading";
|
|
6
|
+
FileStatus["PAUSED"] = "paused";
|
|
7
|
+
FileStatus["ERROR"] = "error";
|
|
8
|
+
FileStatus["UPLOADED"] = "uploaded";
|
|
9
|
+
})(FileStatus || (FileStatus = {}));
|
|
10
|
+
|
|
11
|
+
export { FileStatus };
|
|
@@ -1 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import React__default from 'react';
|
|
2
|
+
import { View } from '@aws-amplify/ui-react';
|
|
3
|
+
|
|
4
|
+
function Container({ children, className, }) {
|
|
5
|
+
return React__default.createElement(View, { className: className }, children);
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
export { Container };
|
|
@@ -1 +1,16 @@
|
|
|
1
|
-
import
|
|
1
|
+
import React__default from 'react';
|
|
2
|
+
import { classNames, classNameModifier, ComponentClassName } from '@aws-amplify/ui';
|
|
3
|
+
import { View, Text } from '@aws-amplify/ui-react';
|
|
4
|
+
import { useIcons, IconUpload } from '@aws-amplify/ui-react/internal';
|
|
5
|
+
|
|
6
|
+
function DropZone({ children, displayText, inDropZone, onDragEnter, onDragLeave, onDragOver, onDragStart, onDrop, testId, }) {
|
|
7
|
+
const { dropFilesText } = displayText;
|
|
8
|
+
const icons = useIcons('storageManager');
|
|
9
|
+
return (React__default.createElement(View, { className: classNames(inDropZone &&
|
|
10
|
+
classNameModifier(ComponentClassName.StorageManagerDropZone, 'active'), ComponentClassName.StorageManagerDropZone), "data-testid": testId, onDragStart: onDragStart, onDragEnter: onDragEnter, onDragLeave: onDragLeave, onDrop: onDrop, onDragOver: onDragOver },
|
|
11
|
+
React__default.createElement(View, { as: "span", "aria-hidden": true, className: ComponentClassName.StorageManagerDropZoneIcon }, icons?.upload ?? React__default.createElement(IconUpload, null)),
|
|
12
|
+
React__default.createElement(Text, { className: ComponentClassName.StorageManagerDropZoneText }, dropFilesText),
|
|
13
|
+
children));
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export { DropZone };
|
|
@@ -1 +1,23 @@
|
|
|
1
|
-
import
|
|
1
|
+
import React__default from 'react';
|
|
2
|
+
import { ComponentClassName } from '@aws-amplify/ui';
|
|
3
|
+
import { View, Loader, Button } from '@aws-amplify/ui-react';
|
|
4
|
+
import { FileStatus } from '../../types.mjs';
|
|
5
|
+
import { FileStatusMessage } from './FileStatusMessage.mjs';
|
|
6
|
+
import { FileRemoveButton } from './FileRemoveButton.mjs';
|
|
7
|
+
import { UploadDetails } from './FileDetails.mjs';
|
|
8
|
+
import { FileThumbnail } from './FileThumbnail.mjs';
|
|
9
|
+
|
|
10
|
+
function FileControl({ onPause, onResume, displayName, errorMessage, isImage, isResumable, loaderIsDeterminate, onRemove, progress, showThumbnails = true, size, status, displayText, thumbnailUrl, }) {
|
|
11
|
+
const { getPausedText, getUploadingText, uploadSuccessfulText, pauseButtonText, resumeButtonText, } = displayText;
|
|
12
|
+
return (React__default.createElement(View, { className: ComponentClassName.StorageManagerFile },
|
|
13
|
+
React__default.createElement(View, { className: ComponentClassName.StorageManagerFileWrapper },
|
|
14
|
+
showThumbnails ? (React__default.createElement(FileThumbnail, { isImage: isImage, fileName: displayName, url: thumbnailUrl })) : null,
|
|
15
|
+
React__default.createElement(UploadDetails, { displayName: displayName, fileSize: size }),
|
|
16
|
+
status === FileStatus.UPLOADING ? (React__default.createElement(Loader, { className: ComponentClassName.StorageManagerLoader, variation: "linear", percentage: progress, isDeterminate: loaderIsDeterminate, isPercentageTextHidden: true })) : null,
|
|
17
|
+
isResumable &&
|
|
18
|
+
(status === FileStatus.UPLOADING || status === FileStatus.PAUSED) ? (status === FileStatus.PAUSED ? (React__default.createElement(Button, { onClick: onResume, size: "small", variation: "link" }, resumeButtonText)) : (React__default.createElement(Button, { onClick: onPause, size: "small", variation: "link" }, pauseButtonText))) : null,
|
|
19
|
+
React__default.createElement(FileRemoveButton, { altText: `Remove file ${displayName}`, onClick: onRemove })),
|
|
20
|
+
React__default.createElement(FileStatusMessage, { uploadSuccessfulText: uploadSuccessfulText, getUploadingText: getUploadingText, getPausedText: getPausedText, status: status, errorMessage: errorMessage, percentage: progress })));
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
export { FileControl };
|