@aws-amplify/ui-react-storage 2.3.2 → 3.0.0
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 +31 -1
- package/dist/esm/components/StorageManager/StorageManager.mjs +168 -1
- package/dist/esm/components/StorageManager/hooks/useStorageManager/actions.mjs +49 -1
- package/dist/esm/components/StorageManager/hooks/useStorageManager/reducer.mjs +130 -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/resolveFile.mjs +22 -1
- package/dist/esm/components/StorageManager/hooks/useUploadFiles/useUploadFiles.mjs +64 -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 +14 -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/humanFileSize.mjs +29 -1
- package/dist/esm/components/StorageManager/utils/uploadFile.mjs +29 -1
- package/dist/esm/index.mjs +2 -1
- package/dist/esm/version.mjs +3 -0
- package/dist/index.js +782 -1
- package/dist/styles.css +298 -684
- package/dist/types/components/StorageImage/StorageImage.d.ts +1 -1
- package/dist/types/components/StorageImage/types.d.ts +3 -2
- package/dist/types/components/StorageManager/hooks/useStorageManager/actions.d.ts +2 -2
- package/dist/types/components/StorageManager/hooks/useStorageManager/types.d.ts +2 -2
- package/dist/types/components/StorageManager/hooks/useStorageManager/useStorageManager.d.ts +2 -2
- package/dist/types/components/StorageManager/hooks/useUploadFiles/useUploadFiles.d.ts +2 -2
- package/dist/types/components/StorageManager/types.d.ts +4 -8
- package/dist/types/components/StorageManager/ui/FileList/types.d.ts +8 -8
- 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/index.d.ts +1 -1
- package/dist/types/components/StorageManager/utils/uploadFile.d.ts +4 -10
- package/dist/types/version.d.ts +1 -0
- package/package.json +8 -39
- package/dist/types/components/StorageImage/_tests_/StorageImage.test.d.ts +0 -1
|
@@ -1 +1,31 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { isUndefined, classNames, ComponentClassName } from '@aws-amplify/ui';
|
|
3
|
+
import { Image } from '@aws-amplify/ui-react';
|
|
4
|
+
import { useStorageURL } from '@aws-amplify/ui-react/internal';
|
|
5
|
+
import { useSetUserAgent } from '@aws-amplify/ui-react-core';
|
|
6
|
+
import { VERSION } from '../../version.mjs';
|
|
7
|
+
|
|
8
|
+
const StorageImage = ({ accessLevel, className, fallbackSrc, identityId, imgKey, onStorageGetError, validateObjectExistence, ...rest }) => {
|
|
9
|
+
const resolvedValidateObjectExistence = isUndefined(validateObjectExistence)
|
|
10
|
+
? true
|
|
11
|
+
: validateObjectExistence;
|
|
12
|
+
const options = React.useMemo(() => ({
|
|
13
|
+
accessLevel,
|
|
14
|
+
identityId,
|
|
15
|
+
validateObjectExistence: resolvedValidateObjectExistence,
|
|
16
|
+
}), [accessLevel, identityId, resolvedValidateObjectExistence]);
|
|
17
|
+
useSetUserAgent({
|
|
18
|
+
componentName: 'StorageImage',
|
|
19
|
+
packageName: 'react-storage',
|
|
20
|
+
version: VERSION,
|
|
21
|
+
});
|
|
22
|
+
const url = useStorageURL({
|
|
23
|
+
key: imgKey,
|
|
24
|
+
options,
|
|
25
|
+
fallbackURL: fallbackSrc,
|
|
26
|
+
onStorageGetError,
|
|
27
|
+
});
|
|
28
|
+
return (React.createElement(Image, { ...rest, className: classNames(ComponentClassName.StorageImage, className), src: url }));
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
export { StorageImage };
|
|
@@ -1 +1,168 @@
|
|
|
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 { 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/storage';
|
|
19
|
+
import { VERSION } from '../../version.mjs';
|
|
20
|
+
|
|
21
|
+
const logger = getLogger('Storage');
|
|
22
|
+
function StorageManagerBase({ acceptedFileTypes = [], accessLevel, autoUpload = true, defaultFiles, displayText: overrideDisplayText, isResumable = false, maxFileCount, maxFileSize, onUploadError, onUploadSuccess, onFileRemove, onUploadStart, showThumbnails = true, processFile, components, path, }, ref) {
|
|
23
|
+
if (!accessLevel || !maxFileCount) {
|
|
24
|
+
logger.warn('StorageManager requires accessLevel and maxFileCount props');
|
|
25
|
+
}
|
|
26
|
+
const Components = {
|
|
27
|
+
Container,
|
|
28
|
+
DropZone,
|
|
29
|
+
FileList,
|
|
30
|
+
FilePicker,
|
|
31
|
+
FileListHeader,
|
|
32
|
+
FileListFooter,
|
|
33
|
+
...components,
|
|
34
|
+
};
|
|
35
|
+
const allowMultipleFiles = maxFileCount === undefined ||
|
|
36
|
+
(typeof maxFileCount === 'number' && maxFileCount > 1);
|
|
37
|
+
const displayText = {
|
|
38
|
+
...defaultStorageManagerDisplayText,
|
|
39
|
+
...overrideDisplayText,
|
|
40
|
+
};
|
|
41
|
+
const { getFileSizeErrorText } = displayText;
|
|
42
|
+
const getMaxFileSizeErrorMessage = (file) => {
|
|
43
|
+
return checkMaxFileSize({
|
|
44
|
+
file,
|
|
45
|
+
maxFileSize,
|
|
46
|
+
getFileSizeErrorText,
|
|
47
|
+
});
|
|
48
|
+
};
|
|
49
|
+
const { addFiles, clearFiles, files, removeUpload, queueFiles, setUploadingFile, setUploadPaused, setUploadProgress, setUploadSuccess, setUploadResumed, } = useStorageManager(defaultFiles);
|
|
50
|
+
React.useImperativeHandle(ref, () => ({ clearFiles }));
|
|
51
|
+
const { dragState, ...dropZoneProps } = useDropZone({
|
|
52
|
+
acceptedFileTypes,
|
|
53
|
+
onDropComplete: ({ acceptedFiles, rejectedFiles }) => {
|
|
54
|
+
if (rejectedFiles && rejectedFiles.length > 0) {
|
|
55
|
+
logger.warn('Rejected files: ', rejectedFiles);
|
|
56
|
+
}
|
|
57
|
+
// We need to filter out files by extension here,
|
|
58
|
+
// we don't get filenames on the drag event, only on drop
|
|
59
|
+
const _acceptedFiles = filterAllowedFiles(acceptedFiles, acceptedFileTypes);
|
|
60
|
+
addFiles({
|
|
61
|
+
files: _acceptedFiles,
|
|
62
|
+
status: autoUpload ? FileStatus.QUEUED : FileStatus.ADDED,
|
|
63
|
+
getFileErrorMessage: getMaxFileSizeErrorMessage,
|
|
64
|
+
});
|
|
65
|
+
},
|
|
66
|
+
});
|
|
67
|
+
useUploadFiles({
|
|
68
|
+
accessLevel,
|
|
69
|
+
files,
|
|
70
|
+
isResumable,
|
|
71
|
+
maxFileCount,
|
|
72
|
+
onUploadError,
|
|
73
|
+
onUploadSuccess,
|
|
74
|
+
onUploadStart,
|
|
75
|
+
setUploadingFile,
|
|
76
|
+
setUploadProgress,
|
|
77
|
+
setUploadSuccess,
|
|
78
|
+
processFile,
|
|
79
|
+
path,
|
|
80
|
+
});
|
|
81
|
+
const onFilePickerChange = (event) => {
|
|
82
|
+
const { files } = event.target;
|
|
83
|
+
if (!files || files.length === 0) {
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
addFiles({
|
|
87
|
+
files: Array.from(files),
|
|
88
|
+
status: autoUpload ? FileStatus.QUEUED : FileStatus.ADDED,
|
|
89
|
+
getFileErrorMessage: getMaxFileSizeErrorMessage,
|
|
90
|
+
});
|
|
91
|
+
};
|
|
92
|
+
const onClearAll = () => {
|
|
93
|
+
clearFiles();
|
|
94
|
+
};
|
|
95
|
+
const onUploadAll = () => {
|
|
96
|
+
queueFiles();
|
|
97
|
+
};
|
|
98
|
+
const onPauseUpload = ({ id, uploadTask, }) => {
|
|
99
|
+
uploadTask.pause();
|
|
100
|
+
setUploadPaused({ id });
|
|
101
|
+
};
|
|
102
|
+
const onResumeUpload = ({ id, uploadTask, }) => {
|
|
103
|
+
uploadTask.resume();
|
|
104
|
+
setUploadResumed({ id });
|
|
105
|
+
};
|
|
106
|
+
const onCancelUpload = ({ id, uploadTask, }) => {
|
|
107
|
+
// At this time we don't know if the delete
|
|
108
|
+
// permissions are enabled (required to cancel upload),
|
|
109
|
+
// so we do a pause instead and remove from files
|
|
110
|
+
uploadTask.pause();
|
|
111
|
+
removeUpload({ id });
|
|
112
|
+
};
|
|
113
|
+
const onDeleteUpload = ({ id }) => {
|
|
114
|
+
// At this time we don't know if the delete
|
|
115
|
+
// permissions are enabled, so we do a soft delete
|
|
116
|
+
// from file list, but don't remove from storage
|
|
117
|
+
removeUpload({ id });
|
|
118
|
+
if (typeof onFileRemove === 'function') {
|
|
119
|
+
const file = files.find((file) => file.id === id);
|
|
120
|
+
if (file) {
|
|
121
|
+
onFileRemove({ key: file.key });
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
};
|
|
125
|
+
// checks if all downloads completed to 100%
|
|
126
|
+
const allUploadsSuccessful = files.length === 0
|
|
127
|
+
? false
|
|
128
|
+
: files.every((file) => file?.status === FileStatus.UPLOADED);
|
|
129
|
+
// Displays if over max files
|
|
130
|
+
const hasMaxFilesError = files.filter((file) => file.progress < 100).length > maxFileCount;
|
|
131
|
+
const uploadedFilesLength = files.filter((file) => file?.status === FileStatus.UPLOADED).length;
|
|
132
|
+
const remainingFilesCount = files.length - uploadedFilesLength;
|
|
133
|
+
// number of files selected for upload when autoUpload is turned off
|
|
134
|
+
const selectedFilesCount = autoUpload ? 0 : remainingFilesCount;
|
|
135
|
+
const hasFiles = files.length > 0;
|
|
136
|
+
const hasUploadActions = !autoUpload && remainingFilesCount > 0;
|
|
137
|
+
const hiddenInput = React.useRef(null);
|
|
138
|
+
function handleClick() {
|
|
139
|
+
if (hiddenInput.current) {
|
|
140
|
+
hiddenInput.current.click();
|
|
141
|
+
hiddenInput.current.value = '';
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
useSetUserAgent({
|
|
145
|
+
componentName: 'StorageManager',
|
|
146
|
+
packageName: 'react-storage',
|
|
147
|
+
version: VERSION,
|
|
148
|
+
});
|
|
149
|
+
return (React.createElement(Components.Container, { className: `${ComponentClassName.StorageManager} ${hasFiles ? ComponentClassName.StorageManagerPreviewer : ''}` },
|
|
150
|
+
React.createElement(Components.DropZone, { inDropZone: dragState !== 'inactive', ...dropZoneProps, displayText: displayText },
|
|
151
|
+
React.createElement(React.Fragment, null,
|
|
152
|
+
React.createElement(Components.FilePicker, { onClick: handleClick }, displayText.browseFilesText),
|
|
153
|
+
React.createElement(VisuallyHidden, null,
|
|
154
|
+
React.createElement("input", { type: "file", tabIndex: -1, ref: hiddenInput, onChange: onFilePickerChange, multiple: allowMultipleFiles, accept: acceptedFileTypes.join(',') })))),
|
|
155
|
+
hasFiles ? (React.createElement(Components.FileListHeader, { allUploadsSuccessful: allUploadsSuccessful, displayText: displayText, fileCount: files.length, remainingFilesCount: remainingFilesCount, selectedFilesCount: selectedFilesCount })) : null,
|
|
156
|
+
React.createElement(Components.FileList, { displayText: displayText, files: files, isResumable: isResumable, onCancelUpload: onCancelUpload, onDeleteUpload: onDeleteUpload, onResume: onResumeUpload, onPause: onPauseUpload, showThumbnails: showThumbnails, hasMaxFilesError: hasMaxFilesError, maxFileCount: maxFileCount }),
|
|
157
|
+
hasUploadActions ? (React.createElement(Components.FileListFooter, { displayText: displayText, remainingFilesCount: remainingFilesCount, onClearAll: onClearAll, onUploadAll: onUploadAll })) : null));
|
|
158
|
+
}
|
|
159
|
+
const StorageManager = Object.assign(React.forwardRef(StorageManagerBase), {
|
|
160
|
+
Container,
|
|
161
|
+
DropZone,
|
|
162
|
+
FileList,
|
|
163
|
+
FileListHeader,
|
|
164
|
+
FileListFooter,
|
|
165
|
+
FilePicker,
|
|
166
|
+
});
|
|
167
|
+
|
|
168
|
+
export { StorageManager };
|
|
@@ -1 +1,49 @@
|
|
|
1
|
-
import{StorageManagerActionTypes
|
|
1
|
+
import { StorageManagerActionTypes } from './types.mjs';
|
|
2
|
+
|
|
3
|
+
const addFilesAction = ({ files, status, getFileErrorMessage, }) => {
|
|
4
|
+
return {
|
|
5
|
+
type: StorageManagerActionTypes.ADD_FILES,
|
|
6
|
+
files,
|
|
7
|
+
status,
|
|
8
|
+
getFileErrorMessage,
|
|
9
|
+
};
|
|
10
|
+
};
|
|
11
|
+
const clearFilesAction = () => {
|
|
12
|
+
return {
|
|
13
|
+
type: StorageManagerActionTypes.CLEAR_FILES,
|
|
14
|
+
};
|
|
15
|
+
};
|
|
16
|
+
const queueFilesAction = () => {
|
|
17
|
+
return {
|
|
18
|
+
type: StorageManagerActionTypes.QUEUE_FILES,
|
|
19
|
+
};
|
|
20
|
+
};
|
|
21
|
+
const setUploadingFileAction = ({ id, uploadTask, }) => {
|
|
22
|
+
return {
|
|
23
|
+
type: StorageManagerActionTypes.SET_STATUS_UPLOADING,
|
|
24
|
+
id,
|
|
25
|
+
uploadTask,
|
|
26
|
+
};
|
|
27
|
+
};
|
|
28
|
+
const setUploadProgressAction = ({ id, progress, }) => {
|
|
29
|
+
return {
|
|
30
|
+
type: StorageManagerActionTypes.SET_UPLOAD_PROGRESS,
|
|
31
|
+
id,
|
|
32
|
+
progress,
|
|
33
|
+
};
|
|
34
|
+
};
|
|
35
|
+
const setUploadStatusAction = ({ id, status, }) => {
|
|
36
|
+
return {
|
|
37
|
+
type: StorageManagerActionTypes.SET_STATUS,
|
|
38
|
+
id,
|
|
39
|
+
status,
|
|
40
|
+
};
|
|
41
|
+
};
|
|
42
|
+
const removeUploadAction = ({ id }) => {
|
|
43
|
+
return {
|
|
44
|
+
type: StorageManagerActionTypes.REMOVE_UPLOAD,
|
|
45
|
+
id,
|
|
46
|
+
};
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
export { addFilesAction, clearFilesAction, queueFilesAction, removeUploadAction, setUploadProgressAction, setUploadStatusAction, setUploadingFileAction };
|
|
@@ -1 +1,130 @@
|
|
|
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
|
+
status: FileStatus.QUEUED,
|
|
42
|
+
},
|
|
43
|
+
];
|
|
44
|
+
}, []);
|
|
45
|
+
return {
|
|
46
|
+
...state,
|
|
47
|
+
files: newFiles,
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
case StorageManagerActionTypes.SET_STATUS_UPLOADING: {
|
|
51
|
+
const { id, uploadTask } = action;
|
|
52
|
+
const { files } = state;
|
|
53
|
+
const newFiles = files.reduce((files, currentFile) => {
|
|
54
|
+
if (currentFile.id === id) {
|
|
55
|
+
return [
|
|
56
|
+
...files,
|
|
57
|
+
{
|
|
58
|
+
...currentFile,
|
|
59
|
+
status: FileStatus.UPLOADING,
|
|
60
|
+
progress: 0,
|
|
61
|
+
uploadTask: uploadTask ? uploadTask : undefined,
|
|
62
|
+
},
|
|
63
|
+
];
|
|
64
|
+
}
|
|
65
|
+
return [...files, currentFile];
|
|
66
|
+
}, []);
|
|
67
|
+
return {
|
|
68
|
+
...state,
|
|
69
|
+
files: newFiles,
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
case StorageManagerActionTypes.SET_UPLOAD_PROGRESS: {
|
|
73
|
+
const { id, progress } = action;
|
|
74
|
+
const { files } = state;
|
|
75
|
+
const newFiles = files.reduce((files, currentFile) => {
|
|
76
|
+
if (currentFile.id === id) {
|
|
77
|
+
return [
|
|
78
|
+
...files,
|
|
79
|
+
{
|
|
80
|
+
...currentFile,
|
|
81
|
+
progress,
|
|
82
|
+
},
|
|
83
|
+
];
|
|
84
|
+
}
|
|
85
|
+
return [...files, currentFile];
|
|
86
|
+
}, []);
|
|
87
|
+
return {
|
|
88
|
+
...state,
|
|
89
|
+
files: newFiles,
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
case StorageManagerActionTypes.SET_STATUS: {
|
|
93
|
+
const { id, status } = action;
|
|
94
|
+
const { files } = state;
|
|
95
|
+
const newFiles = files.reduce((files, currentFile) => {
|
|
96
|
+
if (currentFile.id === id) {
|
|
97
|
+
return [
|
|
98
|
+
...files,
|
|
99
|
+
{
|
|
100
|
+
...currentFile,
|
|
101
|
+
status,
|
|
102
|
+
},
|
|
103
|
+
];
|
|
104
|
+
}
|
|
105
|
+
return [...files, currentFile];
|
|
106
|
+
}, []);
|
|
107
|
+
return {
|
|
108
|
+
...state,
|
|
109
|
+
files: newFiles,
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
case StorageManagerActionTypes.REMOVE_UPLOAD: {
|
|
113
|
+
const { id } = action;
|
|
114
|
+
const { files } = state;
|
|
115
|
+
const newFiles = files.reduce((files, currentFile) => {
|
|
116
|
+
if (currentFile.id === id) {
|
|
117
|
+
// remove by not returning currentFile
|
|
118
|
+
return [...files];
|
|
119
|
+
}
|
|
120
|
+
return [...files, currentFile];
|
|
121
|
+
}, []);
|
|
122
|
+
return {
|
|
123
|
+
...state,
|
|
124
|
+
files: newFiles,
|
|
125
|
+
};
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
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,22 @@
|
|
|
1
|
-
import{isFunction
|
|
1
|
+
import { isFunction } from '@aws-amplify/ui';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Utility function that takes the processFile prop, along with a file a key
|
|
5
|
+
* and returns a Promise that resolves to { file, key, ..rest }
|
|
6
|
+
* regardless if processFile is defined and if it is sync or async
|
|
7
|
+
*/
|
|
8
|
+
const resolveFile = ({ processFile, file, key, }) => {
|
|
9
|
+
return new Promise((resolve, reject) => {
|
|
10
|
+
const result = isFunction(processFile)
|
|
11
|
+
? processFile({ file, key })
|
|
12
|
+
: { file, key };
|
|
13
|
+
if (result instanceof Promise) {
|
|
14
|
+
result.then(resolve).catch(reject);
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
resolve(result);
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
};
|
|
21
|
+
|
|
22
|
+
export { resolveFile };
|
|
@@ -1 +1,64 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { uploadFile } from '../../utils/uploadFile.mjs';
|
|
3
|
+
import { FileStatus } from '../../types.mjs';
|
|
4
|
+
import { resolveFile } from './resolveFile.mjs';
|
|
5
|
+
|
|
6
|
+
function useUploadFiles({ files, accessLevel, isResumable, setUploadProgress, setUploadingFile, setUploadSuccess, onUploadError, onUploadSuccess, onUploadStart, maxFileCount, processFile, path = '', }) {
|
|
7
|
+
React.useEffect(() => {
|
|
8
|
+
const filesReadyToUpload = files.filter((file) => file.status === FileStatus.QUEUED);
|
|
9
|
+
if (filesReadyToUpload.length > maxFileCount) {
|
|
10
|
+
return;
|
|
11
|
+
}
|
|
12
|
+
for (const { file, key, id } of filesReadyToUpload) {
|
|
13
|
+
const onComplete = (event) => {
|
|
14
|
+
onUploadSuccess?.(event);
|
|
15
|
+
setUploadSuccess({ id });
|
|
16
|
+
};
|
|
17
|
+
const onProgress = (event) => {
|
|
18
|
+
/**
|
|
19
|
+
* When a file is zero bytes, the progress.total will equal zero.
|
|
20
|
+
* Therefore, this will prevent a divide by zero error.
|
|
21
|
+
*/
|
|
22
|
+
const progressPercentage = event.totalBytes === undefined || event.totalBytes === 0
|
|
23
|
+
? 100
|
|
24
|
+
: Math.floor((event.transferredBytes / event.totalBytes) * 100);
|
|
25
|
+
setUploadProgress({ id, progress: progressPercentage });
|
|
26
|
+
};
|
|
27
|
+
const onError = (error) => {
|
|
28
|
+
onUploadError?.(error, { key });
|
|
29
|
+
};
|
|
30
|
+
if (file) {
|
|
31
|
+
resolveFile({ processFile, file, key }).then(({ key: processedKey, ...rest }) => {
|
|
32
|
+
onUploadStart?.({ key: processedKey });
|
|
33
|
+
const uploadTask = uploadFile({
|
|
34
|
+
...rest,
|
|
35
|
+
key: processedKey,
|
|
36
|
+
level: accessLevel,
|
|
37
|
+
progressCallback: onProgress,
|
|
38
|
+
errorCallback: onError,
|
|
39
|
+
completeCallback: onComplete,
|
|
40
|
+
});
|
|
41
|
+
setUploadingFile({
|
|
42
|
+
id,
|
|
43
|
+
uploadTask,
|
|
44
|
+
});
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
}, [
|
|
49
|
+
files,
|
|
50
|
+
accessLevel,
|
|
51
|
+
isResumable,
|
|
52
|
+
setUploadProgress,
|
|
53
|
+
setUploadingFile,
|
|
54
|
+
onUploadError,
|
|
55
|
+
onUploadSuccess,
|
|
56
|
+
onUploadStart,
|
|
57
|
+
maxFileCount,
|
|
58
|
+
setUploadSuccess,
|
|
59
|
+
processFile,
|
|
60
|
+
path,
|
|
61
|
+
]);
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
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 };
|
|
@@ -1 +1,14 @@
|
|
|
1
|
-
import
|
|
1
|
+
import React__default from 'react';
|
|
2
|
+
import { ComponentClassName } from '@aws-amplify/ui';
|
|
3
|
+
import { View, Text } from '@aws-amplify/ui-react';
|
|
4
|
+
import { humanFileSize } from '../../utils/humanFileSize.mjs';
|
|
5
|
+
import 'aws-amplify/storage';
|
|
6
|
+
|
|
7
|
+
const UploadDetails = ({ displayName, fileSize, }) => {
|
|
8
|
+
return (React__default.createElement(React__default.Fragment, null,
|
|
9
|
+
React__default.createElement(View, { className: ComponentClassName.StorageManagerFileMain },
|
|
10
|
+
React__default.createElement(Text, { className: ComponentClassName.StorageManagerFileName }, displayName)),
|
|
11
|
+
React__default.createElement(Text, { as: "span", className: ComponentClassName.StorageManagerFileSize }, fileSize ? humanFileSize(fileSize, true) : '')));
|
|
12
|
+
};
|
|
13
|
+
|
|
14
|
+
export { UploadDetails };
|