IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Files: fixed move operation for thirdparty folders

Browse Source
This commit is contained in:
Nikita Gopienko 2021-01-12 16:35:55 +03:00
parent 9f9a517f92
commit 5a80d1c756
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
View File

@ -37,7 +37,7 @@ class OperationsPanelComponent extends React.Component {
this.state = {
showProviderDialog: false,
operationPanelVisible: props.visible,
provider: "",
providerKey: "",
destFolderId: null,
};
}
@ -47,13 +47,17 @@ class OperationsPanelComponent extends React.Component {
const destFolderId = isNaN(+folder[0]) ? folder[0] : +folder[0];
const provider = selection.find((x) => x.providerKey);
const isProviderFolder = selection.find((x) => !x.providerKey);
if (currentFolderId === destFolderId) {
return onClose();
} else {
provider && !isCopy && !treeNode.node.props.providerKey
provider &&
!isProviderFolder &&
!isCopy &&
treeNode.node.props.providerKey !== provider.providerKey
? this.setState({
provider: provider.providerKey,
providerKey: provider.providerKey,
operationPanelVisible: false,
showProviderDialog: true,
destFolderId,
@ -95,7 +99,12 @@ class OperationsPanelComponent extends React.Component {
if (currentFolderId === destFolderId) {
return onClose();
} else {
for (let item of selection) {
const isProviderFolder = selection.find((x) => !x.providerKey);
const items = isProviderFolder
? selection.filter((x) => !x.providerKey)
: selection;
for (let item of items) {
if (item.fileExst) {
fileIds.push(item.id);
} else if (item.id === destFolderId) {
@ -135,7 +144,11 @@ class OperationsPanelComponent extends React.Component {
operationsFolders,
onClose,
} = this.props;
const { showProviderDialog, operationPanelVisible, provider } = this.state;
const {
showProviderDialog,
operationPanelVisible,
providerKey,
} = this.state;
const zIndex = 310;
const expandedKeys = this.props.expandedKeys.map((item) => item.toString());
@ -148,7 +161,7 @@ class OperationsPanelComponent extends React.Component {
onClose={onClose}
startMoveOperation={this.startMoveOperation}
startCopyOperation={this.startCopyOperation}
provider={provider}
provider={providerKey}
/>
)}