Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
This commit is contained in:
commit
de67d004e5
@ -116,6 +116,7 @@ const EditingWrapperComponent = (props) => {
|
||||
onClick={cancelUpdateItem}
|
||||
icon={cancelIcon}
|
||||
data-itemid={itemId}
|
||||
data-action="cancel"
|
||||
onMouseEnter={setIsHoveredCancelHandler}
|
||||
onMouseLeave={setIsHoveredCancelHandler}
|
||||
isHovered={CancelIconIsHovered}
|
||||
|
@ -134,7 +134,10 @@ class FilesRowContent extends React.PureComponent {
|
||||
}
|
||||
|
||||
completeAction = (id) => {
|
||||
this.props.editCompleteAction(id, this.props.item);
|
||||
const isCancel =
|
||||
(id.currentTarget && id.currentTarget.dataset.action === "cancel") ||
|
||||
id.keyCode === 27;
|
||||
this.props.editCompleteAction(id, this.props.item, isCancel);
|
||||
};
|
||||
|
||||
updateItem = () => {
|
||||
@ -144,17 +147,20 @@ class FilesRowContent extends React.PureComponent {
|
||||
item,
|
||||
setIsLoading,
|
||||
fileActionId,
|
||||
editCompleteAction,
|
||||
} = this.props;
|
||||
|
||||
const { itemTitle } = this.state;
|
||||
const originalTitle = getTitleWithoutExst(item);
|
||||
|
||||
setIsLoading(true);
|
||||
if (originalTitle === itemTitle || itemTitle.trim() === "") {
|
||||
const isSameTitle =
|
||||
originalTitle.trim() === itemTitle.trim() || itemTitle.trim() === "";
|
||||
if (isSameTitle) {
|
||||
this.setState({
|
||||
itemTitle: originalTitle,
|
||||
});
|
||||
return this.completeAction(fileActionId);
|
||||
return editCompleteAction(fileActionId, item, isSameTitle);
|
||||
}
|
||||
|
||||
item.fileExst
|
||||
|
@ -225,7 +225,7 @@ class FilesActionStore {
|
||||
});
|
||||
};
|
||||
|
||||
editCompleteAction = (id, selectedItem) => {
|
||||
editCompleteAction = async (id, selectedItem, isCancelled = false) => {
|
||||
const {
|
||||
filter,
|
||||
folders,
|
||||
@ -241,22 +241,21 @@ class FilesActionStore {
|
||||
const item = items.find((o) => o.id === id && !o.fileExst); //TODO: maybe need files find and folders find, not at one function?
|
||||
if (type === FileAction.Create || type === FileAction.Rename) {
|
||||
setIsLoading(true);
|
||||
fetchFiles(this.selectedFolderStore.id, filter)
|
||||
.then((data) => {
|
||||
const newItem = (item && item.id) === -1 ? null : item; //TODO: not add new folders?
|
||||
if (!selectedItem.fileExst) {
|
||||
const path = data.selectedFolder.pathParts;
|
||||
const newTreeFolders = treeFolders;
|
||||
const folders = data.selectedFolder.folders;
|
||||
loopTreeFolders(path, newTreeFolders, folders, null, newItem);
|
||||
setTreeFolders(newTreeFolders);
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
setAction({ type: null, id: null, extension: null });
|
||||
setIsLoading(false);
|
||||
type === FileAction.Rename && this.onSelectItem(selectedItem);
|
||||
});
|
||||
|
||||
if (!isCancelled) {
|
||||
const data = await fetchFiles(this.selectedFolderStore.id, filter);
|
||||
const newItem = (item && item.id) === -1 ? null : item; //TODO: not add new folders?
|
||||
if (!selectedItem.fileExst) {
|
||||
const path = data.selectedFolder.pathParts;
|
||||
const newTreeFolders = treeFolders;
|
||||
const folders = data.selectedFolder.folders;
|
||||
loopTreeFolders(path, newTreeFolders, folders, null, newItem);
|
||||
setTreeFolders(newTreeFolders);
|
||||
}
|
||||
}
|
||||
setAction({ type: null, id: null, extension: null });
|
||||
setIsLoading(false);
|
||||
type === FileAction.Rename && this.onSelectItem(selectedItem);
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -515,7 +515,7 @@ class FilesStore {
|
||||
};
|
||||
|
||||
canShareOwnerChange = (item) => {
|
||||
const userId = this.userStore.user.id;
|
||||
const userId = this.userStore.user && this.userStore.user.id;
|
||||
const isCommonFolder =
|
||||
this.treeFoldersStore.commonFolder &&
|
||||
this.selectedFolderStore.pathParts &&
|
||||
|
Loading…
Reference in New Issue
Block a user