Web:Client:Fix not calling the convert method when clicking the convert button for a single file.

This commit is contained in:
Vlada Gazizova 2023-01-20 18:57:59 +03:00
parent cf4d6b3138
commit 026b96e785
2 changed files with 19 additions and 2 deletions

View File

@ -27,6 +27,7 @@ const ConvertDialogComponent = (props) => {
isRecentFolder,
isFavoritesFolder,
isShareFolder,
setIsConvertSingleFile,
} = props;
let rootFolderTitle = "";
@ -50,6 +51,7 @@ const ConvertDialogComponent = (props) => {
onClose();
if (convertSingleFile) {
setIsConvertSingleFile(true);
const item = {
fileId: convertItem.id,
toFolderId: folderId,
@ -160,7 +162,11 @@ export default inject(
isFavoritesFolder,
isShareFolder,
} = treeFoldersStore;
const { convertUploadedFiles, convertFile } = uploadDataStore;
const {
convertUploadedFiles,
convertFile,
setIsConvertSingleFile,
} = uploadDataStore;
const {
storeOriginalFiles,
setStoreOriginal,
@ -187,6 +193,7 @@ export default inject(
isRecentFolder,
isFavoritesFolder,
isShareFolder,
setIsConvertSingleFile,
};
}
)(withRouter(observer(ConvertDialog)));

View File

@ -45,6 +45,8 @@ class UploadDataStore {
isUploading = false;
isUploadingAndConversion = false;
isConvertSingleFile = false;
constructor(
authStore,
treeFoldersStore,
@ -83,6 +85,10 @@ class UploadDataStore {
}
};
setIsConvertSingleFile = (isConvertSingleFile) => {
this.isConvertSingleFile = isConvertSingleFile;
};
updateUploadedFile = (id, info) => {
const files = this.files.map((file) =>
file.fileId === id ? { ...file, fileInfo: info } : file
@ -230,10 +236,12 @@ class UploadDataStore {
const secondConvertingWithPassword = file.hasOwnProperty("password");
const conversionPositionIndex = file.hasOwnProperty("index");
const alreadyConverting = this.files.some(
let alreadyConverting = this.files.some(
(item) => item.fileId === file.fileId
);
if (this.isConvertSingleFile) alreadyConverting = false;
if (this.converted && !alreadyConverting) {
this.filesToConversion = [];
this.convertFilesSize = 0;
@ -261,6 +269,8 @@ class UploadDataStore {
this.uploadedFilesHistory.push(file);
}
}
this.setIsConvertSingleFile(false);
};
getNewPercent = (uploadedSize, indexOfFile) => {