Removed old resources (for third-party-move dialog)

This commit is contained in:
Alexey Safronov 2023-01-11 19:17:04 +03:00
parent eb9ff03634
commit ce21c86a87
36 changed files with 1 additions and 755 deletions

View File

@ -103196,359 +103196,6 @@
</concept_node>
</children>
</file_node>
<file_node>
<name>ThirdPartyMoveDialog</name>
<children>
<concept_node>
<name>MoveConfirmation</name>
<description/>
<comment/>
<default_text/>
<translations>
<translation>
<language>az-Latn-AZ</language>
<approved>false</approved>
</translation>
<translation>
<language>bg-BG</language>
<approved>false</approved>
</translation>
<translation>
<language>cs-CZ</language>
<approved>false</approved>
</translation>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>el-GR</language>
<approved>false</approved>
</translation>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fi-FI</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>hy-AM</language>
<approved>false</approved>
</translation>
<translation>
<language>it-IT</language>
<approved>false</approved>
</translation>
<translation>
<language>ja-JP</language>
<approved>false</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>false</approved>
</translation>
<translation>
<language>lo-LA</language>
<approved>false</approved>
</translation>
<translation>
<language>lv-LV</language>
<approved>false</approved>
</translation>
<translation>
<language>nl-NL</language>
<approved>false</approved>
</translation>
<translation>
<language>pl-PL</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-PT</language>
<approved>false</approved>
</translation>
<translation>
<language>ro-RO</language>
<approved>false</approved>
</translation>
<translation>
<language>ru-RU</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>sl-SI</language>
<approved>false</approved>
</translation>
<translation>
<language>tr-TR</language>
<approved>false</approved>
</translation>
<translation>
<language>uk-UA</language>
<approved>false</approved>
</translation>
<translation>
<language>vi-VN</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CN</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>MoveConfirmationAlert</name>
<description/>
<comment/>
<default_text/>
<translations>
<translation>
<language>az-Latn-AZ</language>
<approved>false</approved>
</translation>
<translation>
<language>bg-BG</language>
<approved>false</approved>
</translation>
<translation>
<language>cs-CZ</language>
<approved>false</approved>
</translation>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>el-GR</language>
<approved>false</approved>
</translation>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fi-FI</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>hy-AM</language>
<approved>false</approved>
</translation>
<translation>
<language>it-IT</language>
<approved>false</approved>
</translation>
<translation>
<language>ja-JP</language>
<approved>false</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>false</approved>
</translation>
<translation>
<language>lo-LA</language>
<approved>false</approved>
</translation>
<translation>
<language>lv-LV</language>
<approved>false</approved>
</translation>
<translation>
<language>nl-NL</language>
<approved>false</approved>
</translation>
<translation>
<language>pl-PL</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-PT</language>
<approved>false</approved>
</translation>
<translation>
<language>ro-RO</language>
<approved>false</approved>
</translation>
<translation>
<language>ru-RU</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>sl-SI</language>
<approved>false</approved>
</translation>
<translation>
<language>tr-TR</language>
<approved>false</approved>
</translation>
<translation>
<language>uk-UA</language>
<approved>false</approved>
</translation>
<translation>
<language>vi-VN</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CN</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>MoveFileOption</name>
<description/>
<comment/>
<default_text/>
<translations>
<translation>
<language>az-Latn-AZ</language>
<approved>false</approved>
</translation>
<translation>
<language>bg-BG</language>
<approved>false</approved>
</translation>
<translation>
<language>cs-CZ</language>
<approved>false</approved>
</translation>
<translation>
<language>de-DE</language>
<approved>false</approved>
</translation>
<translation>
<language>el-GR</language>
<approved>false</approved>
</translation>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-ES</language>
<approved>false</approved>
</translation>
<translation>
<language>fi-FI</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-FR</language>
<approved>false</approved>
</translation>
<translation>
<language>hy-AM</language>
<approved>false</approved>
</translation>
<translation>
<language>it-IT</language>
<approved>false</approved>
</translation>
<translation>
<language>ja-JP</language>
<approved>false</approved>
</translation>
<translation>
<language>ko-KR</language>
<approved>false</approved>
</translation>
<translation>
<language>lo-LA</language>
<approved>false</approved>
</translation>
<translation>
<language>lv-LV</language>
<approved>false</approved>
</translation>
<translation>
<language>nl-NL</language>
<approved>false</approved>
</translation>
<translation>
<language>pl-PL</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-BR</language>
<approved>false</approved>
</translation>
<translation>
<language>pt-PT</language>
<approved>false</approved>
</translation>
<translation>
<language>ro-RO</language>
<approved>false</approved>
</translation>
<translation>
<language>ru-RU</language>
<approved>false</approved>
</translation>
<translation>
<language>sk-SK</language>
<approved>false</approved>
</translation>
<translation>
<language>sl-SI</language>
<approved>false</approved>
</translation>
<translation>
<language>tr-TR</language>
<approved>false</approved>
</translation>
<translation>
<language>uk-UA</language>
<approved>false</approved>
</translation>
<translation>
<language>vi-VN</language>
<approved>false</approved>
</translation>
<translation>
<language>zh-CN</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
</children>
</file_node>
<file_node>
<name>Translations</name>
<children>

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "Yerdəyişmənin təsdiqi"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "Потвърждение за преместване"
}

View File

@ -1,4 +0,0 @@
{
"MoveConfirmation": "Potvrzení přesunu",
"MoveFileOption": "Přesunout soubor"
}

View File

@ -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"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "Επιβεβαίωση μετακίνησης"
}

View File

@ -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"
}

View File

@ -1,4 +0,0 @@
{
"MoveConfirmation": "Confirmación de movimiento",
"MoveFileOption": "Mover el archivo"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "Siirron vahvistus"
}

View File

@ -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"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "Տեղափոխել հաստատումը"
}

View File

@ -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"
}

View File

@ -1,5 +0,0 @@
{
"MoveConfirmation": "移動確認",
"MoveConfirmationAlert": "{{provider}}のディレクトリから要素を移動しようとしています。この場合、これらの要素は{{provider}}アカウントから削除され、以前共有されていた場合、他のユーザがアクセスできなくなります。",
"MoveFileOption": "ファイルの移動"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "이동 확인"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "ຍ້າຍການຢືນຢັນ"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "Pārvietošanas apstiprinājums"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "Bevestigen van verplaatsen"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "Potwierdzenie przeniesienia"
}

View File

@ -1,4 +0,0 @@
{
"MoveConfirmation": "Mover confirmação",
"MoveFileOption": "Mover arquivo"
}

View File

@ -1,4 +0,0 @@
{
"MoveConfirmation": "Mover confirmação",
"MoveFileOption": "Mover ficheiro"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "Mutarea confirmării"
}

View File

@ -1,5 +0,0 @@
{
"MoveConfirmation": "Подтверждение перемещения",
"MoveConfirmationAlert": "Вы собираетесь переместить элементы из каталога {{provider}}. В этом случае они будут удалены из вашего аккаунта {{provider}} и больше не будут доступны для других пользователей, если ранее к этим элементам был предоставлен доступ.",
"MoveFileOption": "Переместить файл"
}

View File

@ -1,4 +0,0 @@
{
"MoveConfirmation": "Potvrdenie presunu",
"MoveFileOption": "Presunúť súbor"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "Potrditev premika"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "Taşıma onayı"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "Підтвердження переміщення"
}

View File

@ -1,3 +0,0 @@
{
"MoveConfirmation": "Xác nhận di chuyển "
}

View File

@ -1,5 +0,0 @@
{
"MoveConfirmation": "移动确认",
"MoveConfirmationAlert": "您即将从{{provider}}目录中移动元件。在这种情况下,该元件将从您的{{provider}}账户中被删除。如果这些元件之前被共享的话,他人不再能访问它们。",
"MoveFileOption": "移动文件"
}

View File

@ -13,7 +13,6 @@ import {
InvitePanel,
} from "../panels";
import {
ThirdPartyMoveDialog,
ConnectDialog,
DeleteThirdPartyDialog,
EmptyTrashDialog,
@ -78,9 +77,6 @@ const Panels = (props) => {
isRestore={restoreAllPanelVisible}
/>
),
thirdPartyMoveDialogVisible && (
<ThirdPartyMoveDialog key="thirdparty-move-dialog" />
),
connectDialogVisible && <ConnectDialog key="connect-dialog" />,
deleteThirdPartyDialogVisible && (
<DeleteThirdPartyDialog key="thirdparty-delete-dialog" />

View File

@ -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(

View File

@ -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: <Text className="radio-option-title">{t("MoveFileOption")}</Text>,
value: "move",
},
{
label: (
<Text className="radio-option-title">{t("Common:CreateFileCopy")}</Text>
),
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 (
<StyledOperationDialog
isLoading={!tReady}
visible={conflictResolveDialogVisible ? false : visible}
zIndex={zIndex}
onClose={onClose}
displayType="modal"
isLarge
>
<ModalDialog.Header>{t("MoveConfirmation")}</ModalDialog.Header>
<ModalDialog.Body>
<Text>{t("MoveConfirmationAlert", { provider: providerTitle })}</Text>
<div className="select-action-wrapper">
<Text className="select-action">
{t("ConflictResolveDialog:ConflictResolveSelectAction")}
</Text>
<RadioButtonGroup
className="conflict-resolve-radio-button"
orientation="vertical"
fontSize="13px"
fontWeight="400"
name="group"
onClick={onSelectResolveType}
options={radioOptions}
selected="move"
/>
</div>
</ModalDialog.Body>
<ModalDialog.Footer>
<Button
label={t("Common:OKButton")}
size="normal"
primary
onClick={startOperation}
isLoading={isLoading}
isDisabled={isLoading}
/>
<Button
label={t("Common:CancelButton")}
size="normal"
onClick={onClose}
isLoading={isLoading}
isDisabled={isLoading}
/>
</ModalDialog.Footer>
</StyledOperationDialog>
);
};
export default inject(
({ filesStore, dialogsStore, filesActionsStore, uploadDataStore }) => {
const {
thirdPartyMoveDialogVisible: visible,
setThirdPartyMoveDialogVisible,
destFolderId,
setDestFolderId,
setMoveToPanelVisible,
conflictResolveDialogVisible,
} = dialogsStore;
const { bufferSelection, setBufferSelection } = filesStore;
const { checkFileConflicts, setConflictDialogData } = filesActionsStore;
const { itemOperationToFolder } = uploadDataStore;
const selection = filesStore.selection.length
? filesStore.selection
: [bufferSelection];
return {
visible,
setThirdPartyMoveDialogVisible,
destFolderId,
setDestFolderId,
provider: selection[0]?.providerKey,
checkFileConflicts,
selection,
setBufferSelection,
setConflictDialogData,
itemOperationToFolder,
setMoveToPanelVisible,
conflictResolveDialogVisible,
};
}
)(
withTranslation([
"ThirdPartyMoveDialog",
"ConflictResolveDialog",
"Common",
"Translations",
])(observer(PureThirdPartyMoveContainer))
);

View File

@ -4,7 +4,6 @@ import DownloadDialog from "./DownloadDialog";
import ConvertDialog from "./ConvertDialog";
import DeleteThirdPartyDialog from "./DeleteThirdPartyDialog";
import ConnectDialog from "./ConnectDialog";
import ThirdPartyMoveDialog from "./ThirdPartyMoveDialog";
import ConflictResolveDialog from "./ConflictResolveDialog";
import ChangeEmailDialog from "./ChangeEmailDialog";
import ChangePasswordDialog from "./ChangePasswordDialog";
@ -36,7 +35,6 @@ export {
ConvertDialog,
DeleteThirdPartyDialog,
ConnectDialog,
ThirdPartyMoveDialog,
ConflictResolveDialog,
ChangeEmailDialog,
ChangePasswordDialog,

View File

@ -27,8 +27,6 @@ const OperationsPanelComponent = (props) => {
setConflictDialogData,
itemOperationToFolder,
checkFileConflicts,
setThirdPartyMoveDialogVisible,
parentFolderId,
conflictResolveDialogVisible,
clearActiveOperations,
thirdPartyMoveDialogVisible,
@ -65,12 +63,7 @@ const OperationsPanelComponent = (props) => {
if (isCopy) {
startOperation(isCopy, selectedFolder, folderTitle);
} else {
if (provider && providerKey !== provider.providerKey) {
setDestFolderId(selectedFolder);
setThirdPartyMoveDialogVisible(true);
} else {
startOperation(isCopy, selectedFolder, folderTitle);
}
startOperation(isCopy, selectedFolder, folderTitle);
}
};
@ -208,7 +201,6 @@ export default inject(
setCopyPanelVisible,
setMoveToPanelVisible,
setDestFolderId,
setThirdPartyMoveDialogVisible,
setIsFolderActions,
conflictResolveDialogVisible,
thirdPartyMoveDialogVisible,
@ -245,7 +237,6 @@ export default inject(
setRestoreAllPanelVisible,
setDestFolderId,
setIsFolderActions,
setThirdPartyMoveDialogVisible,
setConflictDialogData,
setExpandedPanelKeys,
itemOperationToFolder,

View File

@ -36,7 +36,6 @@ newInstance
"ConnectDialog",
"ConflictResolveDialog",
"DeleteThirdPartyDialog",
"ThirdPartyMoveDialog",
"PortalUnavailable",
"Errors",
],

View File

@ -137,10 +137,6 @@ class DialogsStore {
this.deleteThirdPartyDialogVisible = deleteThirdPartyDialogVisible;
};
setThirdPartyMoveDialogVisible = (thirdPartyMoveDialogVisible) => {
this.thirdPartyMoveDialogVisible = thirdPartyMoveDialogVisible;
};
setDeleteDialogVisible = (deleteDialogVisible) => {
!deleteDialogVisible && this.deselectActiveFiles();
this.deleteDialogVisible = deleteDialogVisible;

View File

@ -1236,18 +1236,6 @@ class FilesActionStore {
isCopy,
};
const {
setThirdPartyMoveDialogVisible,
setDestFolderId,
} = this.dialogsStore;
const provider = selection.find((x) => x.providerKey);
if (provider && providerKey !== provider.providerKey) {
setDestFolderId(destFolderId);
return setThirdPartyMoveDialogVisible(true);
}
for (let item of selection) {
if (!item.isFolder) {
fileIds.push(item.id);