From d2fec0391db7a93c891a3c8e07e50ac81d8c347c Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Thu, 15 Aug 2024 15:37:15 +0300 Subject: [PATCH] Web: Files: renamed uploadEmptyFolders to createFoldersTree --- packages/client/src/HOCs/withFileActions.js | 8 ++++---- .../client/src/components/Article/Body/Items.js | 16 ++++++++-------- .../src/components/Article/MainButton/index.js | 10 +++++----- packages/client/src/pages/Home/Hooks/useFiles.js | 4 ++-- .../src/pages/Home/Section/Header/index.js | 8 ++++---- packages/client/src/pages/Home/index.js | 8 ++++---- packages/client/src/store/FilesActionsStore.js | 4 ++-- packages/client/src/store/HotkeyStore.js | 4 ++-- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/packages/client/src/HOCs/withFileActions.js b/packages/client/src/HOCs/withFileActions.js index 730e08923a..105767bbaa 100644 --- a/packages/client/src/HOCs/withFileActions.js +++ b/packages/client/src/HOCs/withFileActions.js @@ -62,12 +62,12 @@ export default function withFileActions(WrappedFileItem) { }; onDropZoneUpload = (files, uploadToFolder) => { - const { t, dragging, setDragging, startUpload, uploadEmptyFolders } = + const { t, dragging, setDragging, startUpload, createFoldersTree } = this.props; dragging && setDragging(false); - uploadEmptyFolders(files, uploadToFolder).then((f) => { + createFoldersTree(files, uploadToFolder).then((f) => { if (f.length > 0) startUpload(f, null, t); }); }; @@ -364,7 +364,7 @@ export default function withFileActions(WrappedFileItem) { onSelectItem, //setNewBadgeCount, openFileAction, - uploadEmptyFolders, + createFoldersTree, } = filesActionsStore; const { setSharingPanelVisible } = dialogsStore; const { @@ -468,7 +468,7 @@ export default function withFileActions(WrappedFileItem) { dragging, setDragging, startUpload, - uploadEmptyFolders, + createFoldersTree, draggable, setTooltipPosition, setStartDrag, diff --git a/packages/client/src/components/Article/Body/Items.js b/packages/client/src/components/Article/Body/Items.js index 0de7f2ed67..e06439b783 100644 --- a/packages/client/src/components/Article/Body/Items.js +++ b/packages/client/src/components/Article/Body/Items.js @@ -68,7 +68,7 @@ const Item = ({ onBadgeClick, showDragItems, startUpload, - uploadEmptyFolders, + createFoldersTree, setDragging, showBadge, labelBadge, @@ -87,11 +87,11 @@ const Item = ({ (files, uploadToFolder) => { dragging && setDragging(false); - uploadEmptyFolders(files, uploadToFolder).then((f) => { + createFoldersTree(files, uploadToFolder).then((f) => { if (f.length > 0) startUpload(f, null, t); }); }, - [t, dragging, setDragging, startUpload, uploadEmptyFolders], + [t, dragging, setDragging, startUpload, createFoldersTree], ); const onDrop = React.useCallback( @@ -187,7 +187,7 @@ const Items = ({ dragging, setDragging, startUpload, - uploadEmptyFolders, + createFoldersTree, isVisitor, isCollaborator, isAdmin, @@ -320,7 +320,7 @@ const Items = ({ t={t} setDragging={setDragging} startUpload={startUpload} - uploadEmptyFolders={uploadEmptyFolders} + createFoldersTree={createFoldersTree} item={item} setBufferSelection={setBufferSelection} dragging={dragging} @@ -382,7 +382,7 @@ const Items = ({ showText, setDragging, startUpload, - uploadEmptyFolders, + createFoldersTree, trashIsEmpty, isAdmin, isVisitor, @@ -443,7 +443,7 @@ export default inject( const { id, access: folderAccess } = selectedFolderStore; const { moveDragItems, - uploadEmptyFolders, + createFoldersTree, deleteAction, emptyTrashInProgress, } = filesActionsStore; @@ -472,7 +472,7 @@ export default inject( setBufferSelection, deleteAction, startUpload, - uploadEmptyFolders, + createFoldersTree, setEmptyTrashDialogVisible, trashIsEmpty, diff --git a/packages/client/src/components/Article/MainButton/index.js b/packages/client/src/components/Article/MainButton/index.js index 10a03ddb20..a92377d711 100644 --- a/packages/client/src/components/Article/MainButton/index.js +++ b/packages/client/src/components/Article/MainButton/index.js @@ -181,7 +181,7 @@ const ArticleMainButtonContent = (props) => { parentRoomType, isFolder, - uploadEmptyFolders, + createFoldersTree, } = props; const navigate = useNavigate(); @@ -244,7 +244,7 @@ const ArticleMainButtonContent = (props) => { async (e) => { const files = await getFilesFromEvent(e); - uploadEmptyFolders(files).then((f) => { + createFoldersTree(files).then((f) => { if (f.length > 0) startUpload(f, null, t); }); }, @@ -255,7 +255,7 @@ const ArticleMainButtonContent = (props) => { if (isPrivacy) { encryptionUploadDialog((encryptedFile, encrypted) => { encryptedFile.encrypted = encrypted; - startUpload([encryptedFile], null, t); // TODO: uploadEmptyFolders + startUpload([encryptedFile], null, t); // TODO: createFoldersTree }); } else { inputFilesElement.current.click(); @@ -952,7 +952,7 @@ export default inject( const { frameConfig, isFrame } = settingsStore; - const { uploadEmptyFolders } = filesActionsStore; + const { createFoldersTree } = filesActionsStore; return { isGracePeriod, @@ -1006,7 +1006,7 @@ export default inject( isFolder, selectFileFormRoomDialogVisible, setSelectFileFormRoomDialogVisible, - uploadEmptyFolders, + createFoldersTree, }; }, )( diff --git a/packages/client/src/pages/Home/Hooks/useFiles.js b/packages/client/src/pages/Home/Hooks/useFiles.js index ab2a7560c7..f4e4a4baae 100644 --- a/packages/client/src/pages/Home/Hooks/useFiles.js +++ b/packages/client/src/pages/Home/Hooks/useFiles.js @@ -52,7 +52,7 @@ const useFiles = ({ dragging, setDragging, disableDrag, - uploadEmptyFolders, + createFoldersTree, startUpload, fetchFiles, @@ -118,7 +118,7 @@ const useFiles = ({ if (disableDrag) return; - uploadEmptyFolders(files, uploadToFolder).then((f) => { + createFoldersTree(files, uploadToFolder).then((f) => { if (f.length > 0) startUpload(f, null, t); }); }; diff --git a/packages/client/src/pages/Home/Section/Header/index.js b/packages/client/src/pages/Home/Section/Header/index.js index 82e596b32d..9dcf561add 100644 --- a/packages/client/src/pages/Home/Section/Header/index.js +++ b/packages/client/src/pages/Home/Section/Header/index.js @@ -226,7 +226,7 @@ const SectionHeaderContent = (props) => { getHeaderOptions, setBufferSelection, setGroupsBufferSelection, - uploadEmptyFolders, + createFoldersTree, } = props; const location = useLocation(); @@ -244,7 +244,7 @@ const SectionHeaderContent = (props) => { async (e) => { const files = await getFilesFromEvent(e); - uploadEmptyFolders(files).then((f) => { + createFoldersTree(files).then((f) => { if (f.length > 0) startUpload(f, null, t); }); }, @@ -645,7 +645,7 @@ export default inject( moveToRoomsPage, onClickBack, moveToPublicRoom, - uploadEmptyFolders, + createFoldersTree, } = filesActionsStore; const { setIsVisible, isVisible } = infoPanelStore; @@ -809,7 +809,7 @@ export default inject( getHeaderOptions, setBufferSelection, setGroupsBufferSelection, - uploadEmptyFolders, + createFoldersTree, }; }, )( diff --git a/packages/client/src/pages/Home/index.js b/packages/client/src/pages/Home/index.js index 197ad6b00a..d9015a5320 100644 --- a/packages/client/src/pages/Home/index.js +++ b/packages/client/src/pages/Home/index.js @@ -82,7 +82,7 @@ const PureHome = (props) => { startUpload, setDragging, dragging, - uploadEmptyFolders, + createFoldersTree, disableDrag, uploaded, converted, @@ -182,7 +182,7 @@ const PureHome = (props) => { dragging, setDragging, disableDrag, - uploadEmptyFolders, + createFoldersTree, startUpload, fetchFiles, fetchRooms, @@ -543,7 +543,7 @@ export default inject( const { setUploadPanelVisible, startUpload, uploaded, converted } = uploadDataStore; - const { uploadEmptyFolders, onClickBack } = filesActionsStore; + const { createFoldersTree, onClickBack } = filesActionsStore; const selectionLength = isProgressFinished ? selection.length : null; const selectionTitle = isProgressFinished @@ -635,7 +635,7 @@ export default inject( setUploadPanelVisible, startUpload, - uploadEmptyFolders, + createFoldersTree, setToPreviewFile, setIsPreview, diff --git a/packages/client/src/store/FilesActionsStore.js b/packages/client/src/store/FilesActionsStore.js index 9727fe35ae..2626d5a08b 100644 --- a/packages/client/src/store/FilesActionsStore.js +++ b/packages/client/src/store/FilesActionsStore.js @@ -280,8 +280,8 @@ class FilesActionStore { return treeList; }; - uploadEmptyFolders = async (files, folderId) => { - //console.log("uploadEmptyFolders", files, folderId); + createFoldersTree = async (files, folderId) => { + //console.log("createFoldersTree", files, folderId); const { secondaryProgressDataStore } = this.uploadDataStore; const { setSecondaryProgressBarData, clearSecondaryProgressData } = diff --git a/packages/client/src/store/HotkeyStore.js b/packages/client/src/store/HotkeyStore.js index 1d5dc2fc74..559ed6d98d 100644 --- a/packages/client/src/store/HotkeyStore.js +++ b/packages/client/src/store/HotkeyStore.js @@ -683,7 +683,7 @@ class HotkeyStore { }; uploadClipboardFiles = async (t, event) => { - const { uploadEmptyFolders } = this.filesActionsStore; + const { createFoldersTree } = this.filesActionsStore; const { startUpload } = this.uploadDataStore; if (this.filesStore.hotkeysClipboard.length) { @@ -692,7 +692,7 @@ class HotkeyStore { const files = await getFilesFromEvent(event); - uploadEmptyFolders(files, uploadToFolder).then((f) => { + createFoldersTree(files, uploadToFolder).then((f) => { if (f.length > 0) startUpload(f, null, t); }); };