diff --git a/i18next/client.babel b/i18next/client.babel index 79878c27b7..83535aeeaf 100644 --- a/i18next/client.babel +++ b/i18next/client.babel @@ -103196,359 +103196,6 @@ - - ThirdPartyMoveDialog - - - MoveConfirmation - - - - - - az-Latn-AZ - false - - - bg-BG - false - - - cs-CZ - false - - - de-DE - false - - - el-GR - false - - - en-US - false - - - es-ES - false - - - fi-FI - false - - - fr-FR - false - - - hy-AM - false - - - it-IT - false - - - ja-JP - false - - - ko-KR - false - - - lo-LA - false - - - lv-LV - false - - - nl-NL - false - - - pl-PL - false - - - pt-BR - false - - - pt-PT - false - - - ro-RO - false - - - ru-RU - false - - - sk-SK - false - - - sl-SI - false - - - tr-TR - false - - - uk-UA - false - - - vi-VN - false - - - zh-CN - false - - - - - MoveConfirmationAlert - - - - - - az-Latn-AZ - false - - - bg-BG - false - - - cs-CZ - false - - - de-DE - false - - - el-GR - false - - - en-US - false - - - es-ES - false - - - fi-FI - false - - - fr-FR - false - - - hy-AM - false - - - it-IT - false - - - ja-JP - false - - - ko-KR - false - - - lo-LA - false - - - lv-LV - false - - - nl-NL - false - - - pl-PL - false - - - pt-BR - false - - - pt-PT - false - - - ro-RO - false - - - ru-RU - false - - - sk-SK - false - - - sl-SI - false - - - tr-TR - false - - - uk-UA - false - - - vi-VN - false - - - zh-CN - false - - - - - MoveFileOption - - - - - - az-Latn-AZ - false - - - bg-BG - false - - - cs-CZ - false - - - de-DE - false - - - el-GR - false - - - en-US - false - - - es-ES - false - - - fi-FI - false - - - fr-FR - false - - - hy-AM - false - - - it-IT - false - - - ja-JP - false - - - ko-KR - false - - - lo-LA - false - - - lv-LV - false - - - nl-NL - false - - - pl-PL - false - - - pt-BR - false - - - pt-PT - false - - - ro-RO - false - - - ru-RU - false - - - sk-SK - false - - - sl-SI - false - - - tr-TR - false - - - uk-UA - false - - - vi-VN - false - - - zh-CN - false - - - - - Translations diff --git a/packages/client/public/locales/az/ThirdPartyMoveDialog.json b/packages/client/public/locales/az/ThirdPartyMoveDialog.json deleted file mode 100644 index 35da6731a2..0000000000 --- a/packages/client/public/locales/az/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "Yerdəyişmənin təsdiqi" -} diff --git a/packages/client/public/locales/bg/ThirdPartyMoveDialog.json b/packages/client/public/locales/bg/ThirdPartyMoveDialog.json deleted file mode 100644 index 7dc65fbc0f..0000000000 --- a/packages/client/public/locales/bg/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "Потвърждение за преместване" -} diff --git a/packages/client/public/locales/cs/ThirdPartyMoveDialog.json b/packages/client/public/locales/cs/ThirdPartyMoveDialog.json deleted file mode 100644 index abd49c3ebd..0000000000 --- a/packages/client/public/locales/cs/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "MoveConfirmation": "Potvrzení přesunu", - "MoveFileOption": "Přesunout soubor" -} diff --git a/packages/client/public/locales/de/ThirdPartyMoveDialog.json b/packages/client/public/locales/de/ThirdPartyMoveDialog.json deleted file mode 100644 index f08c07dc14..0000000000 --- a/packages/client/public/locales/de/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "MoveConfirmation": "Verschiebung bestätigen", - "MoveConfirmationAlert": "Sie verschieben Elemente aus dem Ordner {{provider}}. Dann werden diese aus dem Konto {{provider}} entfernt und für andere Benutzer unverfügbar, wenn diese Elemente früher freigegeben wurden.", - "MoveFileOption": "Datei verschieben" -} diff --git a/packages/client/public/locales/el-GR/ThirdPartyMoveDialog.json b/packages/client/public/locales/el-GR/ThirdPartyMoveDialog.json deleted file mode 100644 index 9f718c408f..0000000000 --- a/packages/client/public/locales/el-GR/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "Επιβεβαίωση μετακίνησης" -} diff --git a/packages/client/public/locales/en/ThirdPartyMoveDialog.json b/packages/client/public/locales/en/ThirdPartyMoveDialog.json deleted file mode 100644 index 16d5769857..0000000000 --- a/packages/client/public/locales/en/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "MoveConfirmation": "Move confirmation", - "MoveConfirmationAlert": "You are about to move elements from the {{provider}} directory. In such a case, they will be deleted from your {{provider}} account and will no longer be accessible to other users, in case these elements have previously been shared.", - "MoveFileOption": "Move file" -} diff --git a/packages/client/public/locales/es/ThirdPartyMoveDialog.json b/packages/client/public/locales/es/ThirdPartyMoveDialog.json deleted file mode 100644 index 35e92bca78..0000000000 --- a/packages/client/public/locales/es/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "MoveConfirmation": "Confirmación de movimiento", - "MoveFileOption": "Mover el archivo" -} diff --git a/packages/client/public/locales/fi/ThirdPartyMoveDialog.json b/packages/client/public/locales/fi/ThirdPartyMoveDialog.json deleted file mode 100644 index 0a00907a51..0000000000 --- a/packages/client/public/locales/fi/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "Siirron vahvistus" -} diff --git a/packages/client/public/locales/fr/ThirdPartyMoveDialog.json b/packages/client/public/locales/fr/ThirdPartyMoveDialog.json deleted file mode 100644 index 7b367a6baf..0000000000 --- a/packages/client/public/locales/fr/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "MoveConfirmation": "Confirmation de déplacement", - "MoveConfirmationAlert": "Vous êtes sur le point de déplacer des éléments du répertoire {{provider}}. Dans ce cas, ils seront supprimés de votre compte {{provider}} et ne seront plus accessibles aux autres utilisateurs, au cas où ces élément auraient été partagés auparavant.", - "MoveFileOption": "Déplacer le fichier" -} diff --git a/packages/client/public/locales/hy-AM/ThirdPartyMoveDialog.json b/packages/client/public/locales/hy-AM/ThirdPartyMoveDialog.json deleted file mode 100644 index de3168d0d4..0000000000 --- a/packages/client/public/locales/hy-AM/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "Տեղափոխել հաստատումը" -} diff --git a/packages/client/public/locales/it/ThirdPartyMoveDialog.json b/packages/client/public/locales/it/ThirdPartyMoveDialog.json deleted file mode 100644 index fa16100577..0000000000 --- a/packages/client/public/locales/it/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "MoveConfirmation": "Conferma di spostamento", - "MoveConfirmationAlert": "Stai per spostare elementi dalla directory {{provider}}. In tal caso, verranno eliminati dal tuo account {{provider}} e non saranno più accessibili ad altri utenti, nel caso in cui questi elementi siano stati condivisi in precedenza.", - "MoveFileOption": "Spostare il file" -} diff --git a/packages/client/public/locales/ja-JP/ThirdPartyMoveDialog.json b/packages/client/public/locales/ja-JP/ThirdPartyMoveDialog.json deleted file mode 100644 index 34d6c2ea60..0000000000 --- a/packages/client/public/locales/ja-JP/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "MoveConfirmation": "移動確認", - "MoveConfirmationAlert": "{{provider}}のディレクトリから要素を移動しようとしています。この場合、これらの要素は{{provider}}アカウントから削除され、以前共有されていた場合、他のユーザがアクセスできなくなります。", - "MoveFileOption": "ファイルの移動" -} diff --git a/packages/client/public/locales/ko-KR/ThirdPartyMoveDialog.json b/packages/client/public/locales/ko-KR/ThirdPartyMoveDialog.json deleted file mode 100644 index ddf44cf231..0000000000 --- a/packages/client/public/locales/ko-KR/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "이동 확인" -} diff --git a/packages/client/public/locales/lo-LA/ThirdPartyMoveDialog.json b/packages/client/public/locales/lo-LA/ThirdPartyMoveDialog.json deleted file mode 100644 index fcfb812416..0000000000 --- a/packages/client/public/locales/lo-LA/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "ຍ້າຍການຢືນຢັນ" -} diff --git a/packages/client/public/locales/lv/ThirdPartyMoveDialog.json b/packages/client/public/locales/lv/ThirdPartyMoveDialog.json deleted file mode 100644 index 9ee36ea298..0000000000 --- a/packages/client/public/locales/lv/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "Pārvietošanas apstiprinājums" -} diff --git a/packages/client/public/locales/nl/ThirdPartyMoveDialog.json b/packages/client/public/locales/nl/ThirdPartyMoveDialog.json deleted file mode 100644 index 7f43df6b46..0000000000 --- a/packages/client/public/locales/nl/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "Bevestigen van verplaatsen" -} diff --git a/packages/client/public/locales/pl/ThirdPartyMoveDialog.json b/packages/client/public/locales/pl/ThirdPartyMoveDialog.json deleted file mode 100644 index 1e8321f5e1..0000000000 --- a/packages/client/public/locales/pl/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "Potwierdzenie przeniesienia" -} diff --git a/packages/client/public/locales/pt-BR/ThirdPartyMoveDialog.json b/packages/client/public/locales/pt-BR/ThirdPartyMoveDialog.json deleted file mode 100644 index e13f7bc27b..0000000000 --- a/packages/client/public/locales/pt-BR/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "MoveConfirmation": "Mover confirmação", - "MoveFileOption": "Mover arquivo" -} diff --git a/packages/client/public/locales/pt/ThirdPartyMoveDialog.json b/packages/client/public/locales/pt/ThirdPartyMoveDialog.json deleted file mode 100644 index 4f69c77473..0000000000 --- a/packages/client/public/locales/pt/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "MoveConfirmation": "Mover confirmação", - "MoveFileOption": "Mover ficheiro" -} diff --git a/packages/client/public/locales/ro/ThirdPartyMoveDialog.json b/packages/client/public/locales/ro/ThirdPartyMoveDialog.json deleted file mode 100644 index 5f73fff407..0000000000 --- a/packages/client/public/locales/ro/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "Mutarea confirmării" -} diff --git a/packages/client/public/locales/ru/ThirdPartyMoveDialog.json b/packages/client/public/locales/ru/ThirdPartyMoveDialog.json deleted file mode 100644 index 0c9fec93ab..0000000000 --- a/packages/client/public/locales/ru/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "MoveConfirmation": "Подтверждение перемещения", - "MoveConfirmationAlert": "Вы собираетесь переместить элементы из каталога {{provider}}. В этом случае они будут удалены из вашего аккаунта {{provider}} и больше не будут доступны для других пользователей, если ранее к этим элементам был предоставлен доступ.", - "MoveFileOption": "Переместить файл" -} diff --git a/packages/client/public/locales/sk/ThirdPartyMoveDialog.json b/packages/client/public/locales/sk/ThirdPartyMoveDialog.json deleted file mode 100644 index 48c5eada83..0000000000 --- a/packages/client/public/locales/sk/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "MoveConfirmation": "Potvrdenie presunu", - "MoveFileOption": "Presunúť súbor" -} diff --git a/packages/client/public/locales/sl/ThirdPartyMoveDialog.json b/packages/client/public/locales/sl/ThirdPartyMoveDialog.json deleted file mode 100644 index 95c175de27..0000000000 --- a/packages/client/public/locales/sl/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "Potrditev premika" -} diff --git a/packages/client/public/locales/tr/ThirdPartyMoveDialog.json b/packages/client/public/locales/tr/ThirdPartyMoveDialog.json deleted file mode 100644 index 8dec9ef6af..0000000000 --- a/packages/client/public/locales/tr/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "Taşıma onayı" -} diff --git a/packages/client/public/locales/uk-UA/ThirdPartyMoveDialog.json b/packages/client/public/locales/uk-UA/ThirdPartyMoveDialog.json deleted file mode 100644 index 8f3203caf8..0000000000 --- a/packages/client/public/locales/uk-UA/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "Підтвердження переміщення" -} diff --git a/packages/client/public/locales/vi/ThirdPartyMoveDialog.json b/packages/client/public/locales/vi/ThirdPartyMoveDialog.json deleted file mode 100644 index f7e7969ab8..0000000000 --- a/packages/client/public/locales/vi/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "MoveConfirmation": "Xác nhận di chuyển " -} diff --git a/packages/client/public/locales/zh-CN/ThirdPartyMoveDialog.json b/packages/client/public/locales/zh-CN/ThirdPartyMoveDialog.json deleted file mode 100644 index 21e5c79526..0000000000 --- a/packages/client/public/locales/zh-CN/ThirdPartyMoveDialog.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "MoveConfirmation": "移动确认", - "MoveConfirmationAlert": "您即将从{{provider}}目录中移动元件。在这种情况下，该元件将从您的{{provider}}账户中被删除。如果这些元件之前被共享的话，他人不再能访问它们。", - "MoveFileOption": "移动文件" -} diff --git a/packages/client/src/components/FilesPanels/index.js b/packages/client/src/components/FilesPanels/index.js index 41590a68f5..10fb261d22 100644 --- a/packages/client/src/components/FilesPanels/index.js +++ b/packages/client/src/components/FilesPanels/index.js @@ -13,7 +13,6 @@ import { InvitePanel, } from "../panels"; import { - ThirdPartyMoveDialog, ConnectDialog, DeleteThirdPartyDialog, EmptyTrashDialog, @@ -78,9 +77,6 @@ const Panels = (props) => { isRestore={restoreAllPanelVisible} /> ), - thirdPartyMoveDialogVisible && ( - - ), connectDialogVisible && , deleteThirdPartyDialogVisible && ( diff --git a/packages/client/src/components/dialogs/ConflictResolveDialog/index.js b/packages/client/src/components/dialogs/ConflictResolveDialog/index.js index dc52ba59d8..bc5dc0ad60 100644 --- a/packages/client/src/components/dialogs/ConflictResolveDialog/index.js +++ b/packages/client/src/components/dialogs/ConflictResolveDialog/index.js @@ -66,8 +66,6 @@ const ConflictResolveDialog = (props) => { setActiveFiles, setMoveToPanelVisible, setCopyPanelVisible, - setThirdPartyMoveDialogVisible, - theme, } = props; const { @@ -88,7 +86,6 @@ const ConflictResolveDialog = (props) => { setConflictResolveDialogVisible(false); setMoveToPanelVisible(false); setCopyPanelVisible(false); - setThirdPartyMoveDialogVisible(false); }; const onCloseDialog = () => { let newActiveFiles = activeFiles; @@ -262,7 +259,6 @@ export default inject(({ auth, dialogsStore, uploadDataStore, filesStore }) => { conflictResolveDialogItems: items, setMoveToPanelVisible, setCopyPanelVisible, - setThirdPartyMoveDialogVisible, } = dialogsStore; const { itemOperationToFolder } = uploadDataStore; @@ -280,7 +276,6 @@ export default inject(({ auth, dialogsStore, uploadDataStore, filesStore }) => { setActiveFiles, setMoveToPanelVisible, setCopyPanelVisible, - setThirdPartyMoveDialogVisible, }; })( withRouter( diff --git a/packages/client/src/components/dialogs/ThirdPartyMoveDialog/index.js b/packages/client/src/components/dialogs/ThirdPartyMoveDialog/index.js deleted file mode 100644 index bd4303a66b..0000000000 --- a/packages/client/src/components/dialogs/ThirdPartyMoveDialog/index.js +++ /dev/null @@ -1,264 +0,0 @@ -import React, { useState } from "react"; -import styled from "styled-components"; - -import { withTranslation } from "react-i18next"; -import ModalDialog from "@docspace/components/modal-dialog"; -import Text from "@docspace/components/text"; -import Button from "@docspace/components/button"; -import { inject, observer } from "mobx-react"; -import toastr from "@docspace/components/toast/toastr"; -import { connectedCloudsTypeTitleTranslation } from "@docspace/client/src/helpers/filesUtils"; -import RadioButtonGroup from "@docspace/components/radio-button-group"; - -const StyledOperationDialog = styled(ModalDialog)` - .operation-button { - margin-right: 8px; - } - - .select-action-wrapper { - margin-top: 16px; - - .select-action { - margin-bottom: 12px; - } - - .conflict-resolve-radio-button { - label { - display: flex; - align-items: center; - &:not(:last-child) { - margin-bottom: 12px; - } - } - - svg { - overflow: visible; - margin-right: 8px; - } - - span { - display: flex; - align-items: center; - .radio-option-title { - font-weight: 600; - font-size: 14px; - line-height: 16px; - } - } - } - } - .third-party-move-radio-button { - margin-top: 12px; - label:not(:last-child) { - margin-bottom: 12px; - } - } - .modal-dialog-modal-footer { - border-top: ${(props) => props.theme.button.border.baseDisabled}; - margin-left: -12px; - margin-right: -12px; - padding-left: 12px; - padding-right: 12px; - padding-top: 12px; - .operation-button { - margin-right: 8px; - } - } - .modal-dialog-aside-footer { - border-top: ${(props) => props.theme.button.border.baseDisabled}; - margin-left: -16px; - margin-right: -16px; - padding-left: 16px; - padding-right: 16px; - padding-top: 16px; - - display: grid; - grid-template-columns: 1fr 1fr; - grid-gap: 10px; - width: 100%; - } - .third-party-move-dialog-text { - margin-top: 16px; - } -`; - -const PureThirdPartyMoveContainer = ({ - t, - tReady, - visible, - provider, - selection, - destFolderId, - setDestFolderId, - checkFileConflicts, - setConflictDialogData, - setThirdPartyMoveDialogVisible, - setBufferSelection, - itemOperationToFolder, - setMoveToPanelVisible, - conflictResolveDialogVisible, -}) => { - const zIndex = 310; - const deleteAfter = false; // TODO: get from settings - - const [isLoading, setIsLoading] = useState(false); - - const onClosePanels = () => { - setDestFolderId(false); - setThirdPartyMoveDialogVisible(false); - setMoveToPanelVisible(false); - setBufferSelection(null); - }; - const onClose = () => setThirdPartyMoveDialogVisible(false); - - const providerTitle = connectedCloudsTypeTitleTranslation(provider, t); - - const [resolveType, setResolveType] = useState("move"); - const onSelectResolveType = (e) => setResolveType(e.target.value); - - const radioOptions = [ - { - label: {t("MoveFileOption")}, - value: "move", - }, - { - label: ( - {t("Common:CreateFileCopy")} - ), - value: "copy", - }, - ]; - - const startOperation = (e) => { - const isCopy = resolveType === "copy"; - const folderIds = []; - const fileIds = []; - - console.log(isCopy); - - for (let item of selection) { - if (item.fileExst) { - fileIds.push(item.id); - } else { - folderIds.push(item.id); - } - } - - const data = { - destFolderId, - folderIds, - fileIds, - deleteAfter, - isCopy, - }; - - setIsLoading(true); - checkFileConflicts(destFolderId, folderIds, fileIds) - .then(async (conflicts) => { - if (conflicts.length) { - setConflictDialogData(conflicts, data); - setIsLoading(false); - } else { - setIsLoading(false); - onClosePanels(); - await itemOperationToFolder(data); - } - }) - .catch((err) => toastr.error(err)) - .finally(() => { - setIsLoading(false); - }); - }; - - return ( - - {t("MoveConfirmation")} - - {t("MoveConfirmationAlert", { provider: providerTitle })} - -
- - {t("ConflictResolveDialog:ConflictResolveSelectAction")} - - -
- - - -