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

Merge branch 'bugfix/v0.1.6' of github.com:ONLYOFFICE/AppServer into bugfix/v0.1.6

Browse Source
This commit is contained in:
pavelbannov 2021-04-14 14:51:45 +03:00
commit 176fa7464f
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
View File

@ -111,6 +111,8 @@ const SimpleFilesRow = createSelectable((props) => {
setTooltipPosition,
setDownloadDialogVisible,
downloadAction,
confirmDelete,
setDeleteDialogVisible,
} = props;
const {
@ -270,17 +272,21 @@ const SimpleFilesRow = createSelectable((props) => {
return;
}
const translations = {
deleteOperation: t("DeleteOperation"),
};
if (confirmDelete) {
setDeleteDialogVisible(true);
} else {
const translations = {
deleteOperation: t("DeleteOperation"),
};
fileExst || contentLength
? deleteFileAction(id, folderId, translations)
.then(() => toastr.success(t("FileRemoved")))
.catch((err) => toastr.error(err))
: deleteFolderAction(id, parentId, translations)
.then(() => toastr.success(t("FolderRemoved")))
.catch((err) => toastr.error(err));
fileExst || contentLength
? deleteFileAction(id, folderId, translations)
.then(() => toastr.success(t("FileRemoved")))
.catch((err) => toastr.error(err))
: deleteFolderAction(id, parentId, translations)
.then(() => toastr.success(t("FolderRemoved")))
.catch((err) => toastr.error(err));
}
};
const rowContextClick = () => {
@ -599,6 +605,7 @@ export default inject(
filesActionsStore,
mediaViewerDataStore,
uploadDataStore,
settingsStore,
},
{ item }
) => {
@ -614,6 +621,7 @@ export default inject(
setMoveToPanelVisible,
setCopyPanelVisible,
setDownloadDialogVisible,
setDeleteDialogVisible,
} = dialogsStore;
const {
@ -705,6 +713,8 @@ export default inject(
onSelectItem,
setTooltipPosition,
downloadAction,
confirmDelete: settingsStore.confirmDelete,
setDeleteDialogVisible,
};
}
)(withTranslation("Home")(observer(withRouter(SimpleFilesRow))));

4
products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
View File

@ -200,7 +200,7 @@ class NewFilesPanel extends React.Component {
return (
<Row key={file.id} element={element}>
<Box
onClick={this.onNewFilesClick.bind(this, file)}
onClick={this.onNewFileClick.bind(this, file)}
marginProp="auto 0"
>
<Link
@ -267,7 +267,9 @@ export default inject(
setIsLoading,
isLoading,
updateFileBadge,
updateFilesBadge,
updateFolderBadge,
updateFoldersBadge,
} = filesStore;
const { updateRootBadge } = treeFoldersStore;
const { setMediaViewerData } = mediaViewerDataStore;