Web: Files: added hideConfirmConvert setting

This commit is contained in:
Nikita Gopienko 2021-06-11 15:49:32 +03:00
parent e0d076a7bc
commit ef59a2ac47
5 changed files with 31 additions and 4 deletions

View File

@ -734,3 +734,11 @@ export function setRecentSetting(set) {
data: { set },
});
}
export function hideConfirmConvert(save) {
return request({
method: "put",
url: "/files/hideconfirmconvert.json",
data: { save },
});
}

View File

@ -17,6 +17,7 @@ const ConvertDialogComponent = (props) => {
convertFile,
convertItem,
setStoreOriginal,
hideConfirmConvert,
storeOriginalFiles,
convertUploadedFiles,
setConvertDialogVisible,
@ -42,6 +43,7 @@ const ConvertDialogComponent = (props) => {
item.fileInfo = convertItem;
convertFile(item);
} else {
hideMessage && hideConfirmConvert();
convertUploadedFiles(t);
}
};
@ -122,7 +124,11 @@ export default inject(
}) => {
const { setTreeFolders } = treeFoldersStore;
const { convertUploadedFiles, convertFile } = uploadDataStore;
const { storeOriginalFiles, setStoreOriginal } = settingsStore;
const {
storeOriginalFiles,
setStoreOriginal,
hideConfirmConvert,
} = settingsStore;
const { id: folderId } = selectedFolderStore;
const {
convertDialogVisible: visible,
@ -137,6 +143,7 @@ export default inject(
convertItem,
setTreeFolders,
setStoreOriginal,
hideConfirmConvert,
storeOriginalFiles,
convertUploadedFiles,
setConvertDialogVisible,

View File

@ -22,6 +22,7 @@ class SettingsStore {
updateIfExist = null;
favoritesSection = null;
recentSection = null;
hideConfirmConvertSave = null;
settingsIsLoaded = false;
@ -176,6 +177,11 @@ class SettingsStore {
this.updateRootTreeFolders(set, index, FolderType.Recent);
});
};
hideConfirmConvert = async (save = true) => {
const hideConfirmConvertSave = await api.files.hideConfirmConvert(save);
this.hideConfirmConvertSave = hideConfirmConvertSave;
};
}
export default SettingsStore;

View File

@ -28,6 +28,7 @@ class UploadDataStore {
secondaryProgressDataStore;
primaryProgressDataStore;
dialogsStore;
settingsStore;
files = [];
filesSize = 0;
@ -50,7 +51,8 @@ class UploadDataStore {
filesStore,
secondaryProgressDataStore,
primaryProgressDataStore,
dialogsStore
dialogsStore,
settingsStore
) {
makeAutoObservable(this);
this.formatsStore = formatsStore;
@ -60,6 +62,7 @@ class UploadDataStore {
this.secondaryProgressDataStore = secondaryProgressDataStore;
this.primaryProgressDataStore = primaryProgressDataStore;
this.dialogsStore = dialogsStore;
this.settingsStore = settingsStore;
}
selectUploadedFile = (file) => {
@ -426,7 +429,9 @@ class UploadDataStore {
//console.log("this.tempConversionFiles", this.tempConversionFiles);
if (this.tempConversionFiles.length)
this.dialogsStore.setConvertDialogVisible(true);
this.settingsStore.hideConfirmConvertSave
? this.convertUploadedFiles(t)
: this.dialogsStore.setConvertDialogVisible(true);
const newUploadData = {
files: newFiles,

View File

@ -51,7 +51,8 @@ const uploadDataStore = new UploadDataStore(
filesStore,
secondaryProgressDataStore,
primaryProgressDataStore,
dialogsStore
dialogsStore,
settingsStore
);
const filesActionsStore = new FilesActionsStore(
store.auth,