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

Merge pull request #245 from ONLYOFFICE/bugfix/convert-password

Browse Source 
Bugfix/convert password
This commit is contained in:
Alexey Safronov 2024-02-14 15:44:20 +04:00 committed by GitHub
commit 669c5ac3d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,8 +319,13 @@ class UploadDataStore {
if (!this.filesToConversion.length) {
this.filesToConversion.push(file);
if (!secondConvertingWithPassword && !conversionPositionIndex)
if (secondConvertingWithPassword && conversionPositionIndex) {
this.uploadedFilesHistory[file.index].error = null; //reset error to show loader for convert with password
} else {
this.uploadedFilesHistory.push(file);
}
this.startConversion(t, isOpen);
} else {
this.filesToConversion.push(file);
@ -567,7 +572,10 @@ class UploadDataStore {
}
});
storeOriginalFiles && fileInfo && this.refreshFiles(file);
storeOriginalFiles &&
fileInfo &&
fileInfo !== "password" &&
this.refreshFiles(file);
if (fileInfo && fileInfo !== "password") {
file.fileInfo = fileInfo;
@ -1343,7 +1351,7 @@ class UploadDataStore {
relativePath,
file.encrypted,
file.lastModifiedDate,
createNewIfExist
createNewIfExist,
)
.then((res) => {
const location = res.data.location;