Merge pull request #487 from ONLYOFFICE/bugfix/conversion-dialog-in-sorted-folders

Bugfix/conversion dialog in sorted folders
This commit is contained in:
Nikita Gopienko 2022-01-13 11:21:47 +03:00 committed by GitHub
commit fcf9d40518
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 208 additions and 79 deletions

View File

@ -4,5 +4,6 @@
"ConversionTitle": "Sənədin yüklənməsi",
"ConvertAndOpenTitle": "Açıq sənədi konvertasiya et",
"HideMessage": "Bu bildirişi bir daha göstərmə",
"SaveOriginalFormatMessage": "Faylın nüsxəsini orijinal formatda yadda saxla"
}
"SaveOriginalFormatMessage": "Faylın nüsxəsini orijinal formatda yadda saxla",
"ConvertedFileDestination": "Faylın nüsxəsi <strong>{{folderTitle}}</strong> qovluğunda yaradılacaq"
}

View File

@ -4,5 +4,6 @@
"ConnectionUrl": "Свързващ url",
"ConnectMakeShared": "Сподели и постави в папка 'Често срещани'",
"Login": "Вписване",
"Reconnect": "Повторно свързване"
}
"Reconnect": "Повторно свързване",
"ConvertedFileDestination": "Копие на файла ще бъде създадено в папката <strong>{{folderTitle}}</strong>"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Качване на документ",
"ConvertAndOpenTitle": "Конвертирай и отвори документ",
"HideMessage": "Не показвай това съобщение отново",
"SaveOriginalFormatMessage": "Запази копието на файла в оригиналния формат"
}
"SaveOriginalFormatMessage": "Запази копието на файла в оригиналния формат",
"ConvertedFileDestination": "Копие на файла ще бъде създадено в папката <strong>{{folderTitle}}</strong>",
"InfoCreateFileIn": "Новият файл '{{fileTitle}}' се създава в '{{folderTitle}}'"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Nahrávání dokumentů",
"ConvertAndOpenTitle": "Převést a otevřít dokument",
"HideMessage": "Tuto zprávu již nezobrazovat",
"SaveOriginalFormatMessage": "Uložit kopii souboru v původním formátu"
}
"SaveOriginalFormatMessage": "Uložit kopii souboru v původním formátu",
"ConvertedFileDestination": "Kopie souboru bude vytvořena v <strong>{{folderTitle}}</strong>složce",
"InfoCreateFileIn": "Nový '{{fileTitle}}' soubor je vytvořen v '{{folderTitle}}'"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Das Dokument wird hochgeladen",
"ConvertAndOpenTitle": "Dokument umwandeln und öffnen",
"HideMessage": "Diese Nachricht nicht mehr anzeigen.",
"SaveOriginalFormatMessage": "Kopie dieser Datei im Originalformat speichern"
"SaveOriginalFormatMessage": "Kopie dieser Datei im Originalformat speichern",
"ConvertedFileDestination": "Die Dateikopie wird im Ordner <strong>{{folderTitle}}</strong> erstellt",
"InfoCreateFileIn": "Die neue Datei '{{fileTitle}}' wurde in '{{folderTitle}}' erstellt"
}

View File

@ -1,8 +1,8 @@
{
"ConversionFileMessage": "Το αρχείο θα μετατραπεί σε OOXML (docx, xlsx ή pptx) για ταχύτερη προβολή και επεξεργασία.",
"ConversionMessage": "Όλα τα έγγραφα που ανεβάζετε θα μετατραπούν σε μορφή Office με ανοιχτή μορφή XML (docx, xlsx ή pptx) για ταχύτερη επεξεργασία.",
"ConversionTitle": "Μεταφόρτωση εγγράφων",
"ConvertAndOpenTitle": "Μετατροπή και άνοιγμα εγγράφου",
"HideMessage": "Να μην εμφανιστεί ξανά αυτό το μήνυμα",
"SaveOriginalFormatMessage": "Αποθηκεύστε το αντίγραφο του αρχείου στην αρχική μορφή"
"ConversionFileMessage": "Το αρχείο θα μετατραπεί σε OOXML (docx, xlsx ή pptx) για ταχύτερη προβολή και επεξεργασία.",
"ConversionMessage": "Όλα τα έγγραφα που ανεβάζετε θα μετατραπούν σε μορφή Office με ανοιχτή μορφή XML (docx, xlsx ή pptx) για ταχύτερη επεξεργασία.",
"ConversionTitle": "Μεταφόρτωση εγγράφων",
"ConvertAndOpenTitle": "Μετατροπή και άνοιγμα εγγράφου",
"HideMessage": "Να μην εμφανιστεί ξανά αυτό το μήνυμα",
"SaveOriginalFormatMessage": "Αποθηκεύστε το αντίγραφο του αρχείου στην αρχική μορφή"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Document uploading",
"ConvertAndOpenTitle": "Convert and open document",
"HideMessage": "Do not show this message again",
"SaveOriginalFormatMessage": "Save the file copy in the original format"
"SaveOriginalFormatMessage": "Save the file copy in the original format",
"ConvertedFileDestination": "The file copy will be created in the <strong>{{folderTitle}}</strong> folder",
"InfoCreateFileIn": "The new '{{fileTitle}}' file is created in '{{folderTitle}}'"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Carga de dodocumentos",
"ConvertAndOpenTitle": "Convertir y abrir documento",
"HideMessage": "No volver a mostrar este mensaje",
"SaveOriginalFormatMessage": "Guardar la copia del archivo en el formato original"
"SaveOriginalFormatMessage": "Guardar la copia del archivo en el formato original",
"ConvertedFileDestination": "La copia del archivo se creará en la carpeta <strong>{{folderTitle}}</strong>",
"InfoCreateFileIn": "Un archivo nuevo'{{fileTitle}}' ha sido creado en '{{folderTitle}}'"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Asiakirjaa ladataan",
"ConvertAndOpenTitle": "Muunna ja avaa asiakirja",
"HideMessage": "Älä näytä tätä viestiä enää",
"SaveOriginalFormatMessage": "Tallenna kopio tiedostosta alkuperäisessä muodossa"
}
"SaveOriginalFormatMessage": "Tallenna kopio tiedostosta alkuperäisessä muodossa",
"ConvertedFileDestination": "Tiedoston kopio luodaan <strong>{{folderTitle}}</strong> kansioon",
"InfoCreateFileIn": "Uusi tiedosto '{{fileTitle}}' on luotu kohteeseen '{{folderTitle}}'"
}

View File

@ -5,4 +5,4 @@
"ConnectMakeShared": "Partager et mettre dans le dossier \"commun\".",
"Login": "Identifiant",
"Reconnect": "Reconnexion"
}
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Téléversement du document",
"ConvertAndOpenTitle": "Convertir et ouvrir le document",
"HideMessage": "Ne plus afficher ce message",
"SaveOriginalFormatMessage": "Enregistrer la copie du fichier dans le format original"
"SaveOriginalFormatMessage": "Enregistrer la copie du fichier dans le format original",
"ConvertedFileDestination": "La copie du fichier sera créée dans le dossier <strong>{{folderTitle}}</strong>",
"InfoCreateFileIn": "Le nouveau fichier '{{fileTitle}}' est créé dans '{{folderTitle}}'"
}

View File

@ -5,4 +5,4 @@
"ConnectMakeShared": "Condividi e metti nella cartella \"Comune\"",
"Login": "Accedi",
"Reconnect": "Riconnetti"
}
}

View File

@ -1,8 +1,10 @@
{
"ConversionFileMessage": "Il file viene convertito in OOXML (docx, xlsx o pptx) per una visualizzazione e modifica più rapida.",
"ConversionMessage": "Tutti i documenti caricati verranno convertiti nel formato Office Open XML (docx, xlsx o pptx) per modifica più rapida.",
"ConversionTitle": "Caricamento documento in corso",
"ConvertAndOpenTitle": "Convertire e aprire documento",
"HideMessage": "Non mostrare nuovamente questo messaggio",
"SaveOriginalFormatMessage": "Salva una copia del file in formato originale"
"ConversionFileMessage": "Il file viene convertito in OOXML (docx, xlsx o pptx) per una visualizzazione e modifica più rapida.",
"ConversionMessage": "Tutti i documenti caricati verranno convertiti nel formato Office Open XML (docx, xlsx o pptx) per modifica più rapida.",
"ConversionTitle": "Caricamento documento in corso",
"ConvertAndOpenTitle": "Convertire e aprire documento",
"HideMessage": "Non mostrare nuovamente questo messaggio",
"SaveOriginalFormatMessage": "Salva una copia del file in formato originale",
"InfoCreateFileIn": "Il nuovo file '{{fileTitle}}' è creato in '{{folderTitle}}'",
"ConvertedFileDestination": "La copia di file viene creata nella cartella <strong>{{folderTitle}}</strong>"
}

View File

@ -5,4 +5,4 @@
"ConnectMakeShared": "共有し、'Common' フォルダに入れます。",
"Login": "ログイン",
"Reconnect": "再接続"
}
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "ドキュメントのアップロード",
"ConvertAndOpenTitle": "ドキュメントを変換して開く",
"HideMessage": "このメッセージを再度表示しない",
"SaveOriginalFormatMessage": "コピーしたファイルを元のフォーマットで保存する"
}
"SaveOriginalFormatMessage": "コピーしたファイルを元のフォーマットで保存する",
"ConvertedFileDestination": "ファイルコピーは<strong>{{folderTitle}}</strong>フォルダに作成されます",
"InfoCreateFileIn": "新しい'{{fileTitle}}'ファイルが'{{folderTitle}}'に作成された"
}

View File

@ -4,5 +4,6 @@
"ConversionTitle": "문서 업로드 중",
"ConvertAndOpenTitle": "문서 변환 후 열기",
"HideMessage": "이 메시지 다시 표시 안함",
"SaveOriginalFormatMessage": "파일 복사본을 원본 형식으로 저장"
}
"SaveOriginalFormatMessage": "파일 복사본을 원본 형식으로 저장",
"ConvertedFileDestination": "파일 복사가 <strong>{{folderTitle}}</strong> 폴더에 생성됩니다"
}

View File

@ -5,4 +5,4 @@
"ConnectMakeShared": "Kopīgojiet un ievietojiet mapē Kopēji",
"Login": "Piesakieties",
"Reconnect": "Atkārtoti izveidojiet savienojumu"
}
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Dokumenta augšupielāde",
"ConvertAndOpenTitle": "Konvertējiet un atveriet dokumentu",
"HideMessage": "Nerādīt šo ziņojumu vēlreiz",
"SaveOriginalFormatMessage": "Saglabājiet faila kopiju sākotnējā formātā"
}
"SaveOriginalFormatMessage": "Saglabājiet faila kopiju sākotnējā formātā",
"ConvertedFileDestination": "Faila kopija tiks izveidota mapē <strong>{{folderTitle}}</strong>",
"InfoCreateFileIn": "Jauns '{{fileTitle}}' fails ir izveidots '{{folderTitle}}'"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Documenten aan het uploaden",
"ConvertAndOpenTitle": "Converteren en document openen",
"HideMessage": "Laat dit bericht niet meer zien",
"SaveOriginalFormatMessage": "Bewaar de bestandskopie in het oorspronkelijke formaat"
}
"SaveOriginalFormatMessage": "Bewaar de bestandskopie in het oorspronkelijke formaat",
"ConvertedFileDestination": "De kopie van het bestand zal worden aangemaakt in de <strong>{{folderTitle}}</strong>",
"InfoCreateFileIn": "Het nieuwe bestand '{{fileTitle}}' is aangemaakt in '{{folderTitle}}'"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Wgrywanie dokumentu",
"ConvertAndOpenTitle": "Przekonwertuj i otwórz dokument",
"HideMessage": "Nie wyświetlaj więcej tego komunikatu",
"SaveOriginalFormatMessage": "Zapisz kopię pliku w oryginalnym formacie"
}
"SaveOriginalFormatMessage": "Zapisz kopię pliku w oryginalnym formacie",
"ConvertedFileDestination": "Kopia pliku zostanie umieszczona w folderze <strong>{{folderTitle}}</strong>",
"InfoCreateFileIn": "Nowy '{{fileTitle}}' plik zostanie utworzony w '{{folderTitle}}'"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Carregando documento",
"ConvertAndOpenTitle": "Converter e abrir documento",
"HideMessage": "Não mostre esta mensagem novamente",
"SaveOriginalFormatMessage": "Salvar a cópia do arquivo no formato original"
"SaveOriginalFormatMessage": "Salvar a cópia do arquivo no formato original",
"ConvertedFileDestination": "A cópia do arquivo será criada na pasta <strong>{{folderTitle}}</strong>",
"InfoCreateFileIn": "O novo arquivo '{{fileTitle}}' foi criado em '{{folderTitle}}'"
}

View File

@ -4,5 +4,6 @@
"ConversionTitle": "Envio de documento",
"ConvertAndOpenTitle": "Converter e abrir documento",
"HideMessage": "Não mostre esta mensagem novamente",
"SaveOriginalFormatMessage": "Guardar a cópia do ficheiro no formato original"
}
"SaveOriginalFormatMessage": "Guardar a cópia do ficheiro no formato original",
"ConvertedFileDestination": "A copia do ficheiro será criada na pasta <strong>{{folderTitle}}</strong>"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Загрузка документа",
"ConvertAndOpenTitle": "Конвертация и открытие документа",
"HideMessage": "Больше не показывать это сообщение",
"SaveOriginalFormatMessage": "Сохранить также копию файла в исходном формате"
"SaveOriginalFormatMessage": "Сохранить также копию файла в исходном формате",
"ConvertedFileDestination": "Копия файла будет создана в папке <strong>{{folderTitle}}</strong>",
"InfoCreateFileIn": "Новый файл '{{fileTitle}}' создан в '{{folderTitle}}'"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Nahrávanie dokumentu",
"ConvertAndOpenTitle": "Konvertovať a otvoriť dokument",
"HideMessage": "Túto správu viac nezobrazovať",
"SaveOriginalFormatMessage": "Uložiť kópiu súboru v pôvodnom formáte"
}
"SaveOriginalFormatMessage": "Uložiť kópiu súboru v pôvodnom formáte",
"ConvertedFileDestination": "Kópia súboru sa vytvorí v priečinku <strong>{{folderTitle}}</strong>",
"InfoCreateFileIn": "Nový '{{fileTitle}}' súbor je vytvorený v '{{folderTitle}}'"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Nalaganje dokumenta",
"ConvertAndOpenTitle": "Konverzija in odpiranje dokumenta",
"HideMessage": "Ne prikazuj več tega sporočila",
"SaveOriginalFormatMessage": "Shranite kopijo datoteke v izvirni obliki"
}
"SaveOriginalFormatMessage": "Shranite kopijo datoteke v izvirni obliki",
"ConvertedFileDestination": "Kopija datoteke bo ustvarjena v mapi <strong>{{folderTitle}}</strong>",
"InfoCreateFileIn": "Nova '{{fileTitle}}' datoteka je ustvarjena v '{{folderTitle}}'"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Belge yükleme",
"ConvertAndOpenTitle": "Belgeyi dönüştür ve aç",
"HideMessage": "Bu mesajı tekrar gösterme",
"SaveOriginalFormatMessage": "Dosya kopyasını orijinal türünde kaydet"
}
"SaveOriginalFormatMessage": "Dosya kopyasını orijinal türünde kaydet",
"ConvertedFileDestination": "Dosya kopyası <strong>{{folderTitle}}</strong> klasöründe oluşturulacaktır",
"InfoCreateFileIn": "Yeni '{{fileTitle}}' dosyası '{{folderTitle}}''da oluşturuldu"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "Передавання документів",
"ConvertAndOpenTitle": "Конвертувати та відкрити документ",
"HideMessage": "Більше не показувати це повідомлення",
"SaveOriginalFormatMessage": "Зберегти копію файлу в оригінальному форматі"
}
"SaveOriginalFormatMessage": "Зберегти копію файлу в оригінальному форматі",
"ConvertedFileDestination": "Копію файлу буде створено у папці <strong>{{folderTitle}}</strong>",
"InfoCreateFileIn": "Новий файл '{{fileTitle}}' створено в '{{folderTitle}}'"
}

View File

@ -1,8 +1,10 @@
{
"ConversionFileMessage": "Tệp sẽ được chuyển đổi thành OOXML (docx, xlsx hoặc pptx) để xem và chỉnh sửa nhanh hơn.",
"ConversionMessage": "Tất cả tài liệu bạn tải lên sẽ được chuyển đổi sang định dạng Office Open XML (docx, xlsx hoặc pptx) để chỉnh sửa nhanh hơn.",
"ConversionTitle": "Đang tải tài liệu lên",
"ConvertAndOpenTitle": "Chuyển đổi và mở tài liệu",
"HideMessage": "Không hiển thị lại thông báo này",
"SaveOriginalFormatMessage": "Lưu bản sao tệp ở định dạng gốc"
"ConversionFileMessage": "Tệp sẽ được chuyển đổi thành OOXML (docx, xlsx hoặc pptx) để xem và chỉnh sửa nhanh hơn.",
"ConversionMessage": "Tất cả tài liệu bạn tải lên sẽ được chuyển đổi sang định dạng Office Open XML (docx, xlsx hoặc pptx) để chỉnh sửa nhanh hơn.",
"ConversionTitle": "Đang tải tài liệu lên",
"ConvertAndOpenTitle": "Chuyển đổi và mở tài liệu",
"HideMessage": "Không hiển thị lại thông báo này",
"SaveOriginalFormatMessage": "Lưu bản sao tệp ở định dạng gốc",
"ConvertedFileDestination": "Bản sao của file sẽ được tạo trong thư mục <strong>{{folderTitle}}</strong>",
"InfoCreateFileIn": "File '{{fileTitle}}' được tạo trong '{{folderTitle}}'"
}

View File

@ -4,5 +4,7 @@
"ConversionTitle": "文档上传",
"ConvertAndOpenTitle": "转换并打开文档",
"HideMessage": "不要再次显示此消息",
"SaveOriginalFormatMessage": "以原始格式保存文件副本"
}
"SaveOriginalFormatMessage": "以原始格式保存文件副本",
"ConvertedFileDestination": "该文件的副本将在文件夹中创建<strong>{{folderTitle}}</strong>",
"InfoCreateFileIn": "新的文件“{{fileTitle}}”设置为“{{folderTitle}}”"
}

View File

@ -1,13 +1,14 @@
import React, { useState } from "react";
import React, { useState, useEffect } from "react";
import { withRouter } from "react-router";
import ModalDialogContainer from "../ModalDialogContainer";
import ModalDialog from "@appserver/components/modal-dialog";
import Button from "@appserver/components/button";
import Text from "@appserver/components/text";
import Checkbox from "@appserver/components/checkbox";
import { withTranslation } from "react-i18next";
import { withTranslation, Trans } from "react-i18next";
import { inject, observer } from "mobx-react";
import Loaders from "@appserver/common/components/Loaders";
import { FolderType } from "@appserver/common/constants";
const ConvertDialogComponent = (props) => {
const {
@ -22,9 +23,22 @@ const ConvertDialogComponent = (props) => {
storeOriginalFiles,
convertUploadedFiles,
setConvertDialogVisible,
rootFoldersTitles,
isRecentFolder,
isFavoritesFolder,
isShareFolder,
} = props;
let rootFolderTitle = "";
const convertSingleFile = !!convertItem;
const sortedFolder = isRecentFolder || isFavoritesFolder || isShareFolder;
if (convertSingleFile && sortedFolder) {
rootFolderTitle = isShareFolder
? rootFoldersTitles[FolderType.USER]
: rootFoldersTitles[convertItem.rootFolderType];
}
const [hideMessage, setHideMessage] = useState(false);
const onChangeFormat = () =>
@ -42,7 +56,7 @@ const ConvertDialogComponent = (props) => {
action: "convert",
};
item.fileInfo = convertItem;
convertFile(item);
convertFile(item, t);
} else {
hideMessage && hideConfirmConvert();
convertUploadedFiles(t);
@ -77,6 +91,22 @@ const ConvertDialogComponent = (props) => {
isChecked={storeOriginalFiles}
onChange={onChangeFormat}
/>
{convertSingleFile && sortedFolder && (
<div
className={`convert_dialog_file-destination ${
storeOriginalFiles ? "file-destination_visible" : ""
}`}
>
<Trans
t={t}
i18nKey="ConvertedFileDestination"
ns="ConvertDialog"
>
The file copy will be created in the
{{ folderTitle: rootFolderTitle }} folder
</Trans>
</div>
)}
{!convertSingleFile && (
<Checkbox
className="convert_dialog_checkbox"
@ -123,7 +153,13 @@ export default inject(
settingsStore,
selectedFolderStore,
}) => {
const { setTreeFolders } = treeFoldersStore;
const {
setTreeFolders,
rootFoldersTitles,
isRecentFolder,
isFavoritesFolder,
isShareFolder,
} = treeFoldersStore;
const { convertUploadedFiles, convertFile } = uploadDataStore;
const {
storeOriginalFiles,
@ -148,6 +184,10 @@ export default inject(
storeOriginalFiles,
convertUploadedFiles,
setConvertDialogVisible,
rootFoldersTitles,
isRecentFolder,
isFavoritesFolder,
isShareFolder,
};
}
)(withRouter(observer(ConvertDialog)));

View File

@ -111,9 +111,16 @@ const ModalDialogContainer = styled(ModalDialog)`
white-space: normal;
}
.convert_dialog_checkbox {
.convert_dialog_checkbox,
.convert_dialog_file-destination {
padding-top: 16px;
}
.convert_dialog_file-destination {
opacity: 0;
}
.file-destination_visible {
opacity: 1;
}
}
}
.convert_dialog_footer {

View File

@ -10,6 +10,7 @@ class TreeFoldersStore {
selectedTreeNode = [];
expandedKeys = [];
expandedPanelKeys = null;
rootFoldersTitles = {};
constructor(selectedFolderStore) {
makeAutoObservable(this);
@ -18,10 +19,17 @@ class TreeFoldersStore {
fetchTreeFolders = async () => {
const treeFolders = await getFoldersTree();
this.setRootFoldersTitles(treeFolders);
this.setTreeFolders(treeFolders);
return treeFolders;
};
setRootFoldersTitles = (treeFolders) => {
treeFolders.forEach((elem) => {
this.rootFoldersTitles[elem.rootFolderType] = elem.title;
});
};
getFoldersTree = () => getFoldersTree();
setTreeFolders = (treeFolders) => {

View File

@ -17,7 +17,7 @@ import {
moveToFolder,
fileCopyAs,
} from "@appserver/common/api/files";
import toastr from "studio/toastr";
class UploadDataStore {
formatsStore;
treeFoldersStore;
@ -198,7 +198,7 @@ class UploadDataStore {
this.setUploadData(newUploadData);
};
convertFile = (file) => {
convertFile = (file, t) => {
this.dialogsStore.setConvertItem(null);
const alreadyConverting = this.files.some(
@ -218,7 +218,7 @@ class UploadDataStore {
if (!this.filesToConversion.length) {
this.filesToConversion.push(file);
this.startConversion();
this.startConversion(t);
} else {
this.filesToConversion.push(file);
}
@ -276,7 +276,18 @@ class UploadDataStore {
return (fileIndex / length) * 100;
};
startConversion = async () => {
startConversion = async (t) => {
const {
isRecentFolder,
isFavoritesFolder,
isShareFolder,
} = this.treeFoldersStore;
const { storeOriginalFiles } = this.settingsStore;
const isSortedFolder = isRecentFolder || isFavoritesFolder || isShareFolder;
const needToRefreshFilesList = !isSortedFolder || !storeOriginalFiles;
runInAction(() => (this.converted = false));
this.setConversionPercent(0);
@ -332,6 +343,7 @@ class UploadDataStore {
if (progress === 100) {
runInAction(() => {
const file = this.files.find((file) => file.fileId === fileId);
if (file) {
file.convertProgress = progress;
file.inConversion = false;
@ -339,10 +351,28 @@ class UploadDataStore {
}
});
this.settingsStore.storeOriginalFiles && this.refreshFiles(file);
storeOriginalFiles && this.refreshFiles(file);
if (fileInfo) {
file.fileInfo = fileInfo;
this.refreshFiles(file);
needToRefreshFilesList && this.refreshFiles(file);
}
if (file && isSortedFolder) {
const folderId = file.fileInfo?.folderId;
const fileTitle = file.fileInfo?.title;
folderId &&
getFolderInfo(folderId)
.then((folderInfo) =>
toastr.success(
t("InfoCreateFileIn", {
fileTitle,
folderTitle: folderInfo.title,
})
)
)
.catch((error) => toastr.error(error));
}
const percent = this.getConversationPercent(index + 1);
this.setConversionPercent(percent, !!error);
@ -489,12 +519,12 @@ class UploadDataStore {
}
}
if (
if (
newPath[newPath.length - 1] !== this.selectedFolderStore.id &&
path.length
) {
) {
return;
}
}
const addNewFile = () => {
if (folderInfo) {
@ -560,7 +590,7 @@ class UploadDataStore {
const newExpandedKeys = expandedKeys.filter(
(x) => x !== newPath[newPath.length - 1] + ""
);
);
setExpandedKeys(newExpandedKeys);
@ -570,7 +600,7 @@ class UploadDataStore {
this.filesStore.folders.length === 1 ? this.filesStore.folders : [],
this.filesStore.folders.length
);
}
}
}
};
@ -655,7 +685,7 @@ class UploadDataStore {
} else {
if (currentFile.action === "uploaded") {
this.refreshFiles(currentFile);
}
}
return Promise.resolve();
}
};
@ -1038,8 +1068,8 @@ class UploadDataStore {
true,
true
).finally(() => {
this.clearActiveOperations(fileIds, folderIds);
setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
this.clearActiveOperations(fileIds, folderIds);
setTimeout(() => clearSecondaryProgressData(), TIMEOUT);
});
} else {
this.clearActiveOperations(fileIds, folderIds);