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

Fix Bug 69604 - Files. Fixed description for "Action Required" dialog

Browse Source
This commit is contained in:
Nikita Gopienko 2024-08-07 15:33:43 +03:00
parent 03509c1e99
commit e38f74da5c
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/client/src/components/dialogs/ConflictResolveDialog/index.tsx
View File

@ -337,10 +337,14 @@ export default inject<TStore>(
} = filesStore;
const files = items
? items.filter((f) => (f.fileExst || f.contentLength) && f)
? items.filter((f) => {
if (f.isFile || f.fileExst || f.contentLength) return f;
})
: [];
const folders = items
? items.filter((f) => !f.fileExst && !f.contentLength && f)
? items.filter((f) => {
if (!f.fileExst && !f.contentLength && !f.isFile) return f;
})
: [];
return {

5
packages/client/src/store/UploadDataStore.js
View File

@ -693,7 +693,10 @@ class UploadDataStore {
let conflicts = await checkIsFileExist(toFolderId, filesArray);
const folderInfo = await getFolderInfo(toFolderId);
conflicts = conflicts.map((fileTitle) => ({ title: fileTitle }));
conflicts = conflicts.map((fileTitle) => ({
title: fileTitle,
isFile: true,
}));
if (conflicts.length > 0) {
this.setConflictDialogData(conflicts, {