IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1572 from ONLYOFFICE/bugfix/fix-move-copy-toast

Browse Source 
bugfix/fix-move-copy-toast
This commit is contained in:
Alexey Safronov 2023-07-26 19:33:19 +04:00 committed by GitHub
commit 0e0e359368
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/src/components/FilesSelector/FilesSelector.types.ts
View File

@ -149,4 +149,5 @@ export type FilesSelectorProps = {
footerCheckboxLabel?: string;
descriptionText?: string;
setSelectedItems: () => void;
};

7
packages/client/src/components/FilesSelector/index.tsx
View File

@ -81,6 +81,7 @@ const FilesSelector = ({
footerCheckboxLabel,
descriptionText,
setSelectedItems,
}: FilesSelectorProps) => {
const { t } = useTranslation(["Files", "Common", "Translations"]);
@ -329,7 +330,7 @@ const FilesSelector = ({
};
setIsRequestRunning(true);
setSelectedItems();
checkFileConflicts(selectedItemId, folderIds, fileIds)
.then(async (conflicts: any) => {
if (conflicts.length) {
@ -509,7 +510,8 @@ export default inject(
) => {
const { id: selectedId, parentId, rootFolderType } = selectedFolderStore;
const { setConflictDialogData, checkFileConflicts } = filesActionsStore;
const { setConflictDialogData, checkFileConflicts, setSelectedItems } =
filesActionsStore;
const { itemOperationToFolder, clearActiveOperations } = uploadDataStore;
const sessionPath = window.sessionStorage.getItem("filesSelectorPath");
@ -593,6 +595,7 @@ export default inject(
setCopyPanelVisible,
setRestoreAllPanelVisible,
setIsFolderActions,
setSelectedItems,
};
}
)(observer(FilesSelector));