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

Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces

Browse Source
This commit is contained in:
TatianaLopaeva 2021-03-15 17:08:47 +03:00
commit 3a381b48e6
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/asc-web-components/drop-down/index.js
View File

@ -179,9 +179,7 @@ class DropDownContainer extends React.Component {
};
render() {
const { withBackdrop = true, open } = this.props;
const eventTypesProp = isMobile
? { eventTypes: ["click", "touchend"] }
: {};
const eventTypesProp = isMobile ? { eventTypes: ["touchend"] } : {};
return (
<>

14
products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
View File

@ -85,8 +85,18 @@ const DeleteThirdPartyDialog = withTranslation("DeleteThirdPartyDialog")(
);
export default inject(
({ filesStore, thirdParty, treeFoldersStore, selectedFolderStore }) => {
const { providers, setThirdPartyProviders, deleteThirdParty } = thirdParty;
({
filesStore,
settingsStore,
dialogsStore,
treeFoldersStore,
selectedFolderStore,
}) => {
const {
providers,
setThirdPartyProviders,
deleteThirdParty,
} = settingsStore.thirdPartyStore;
const { fetchFiles } = filesStore;
const {

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

@ -85,7 +85,7 @@ const SimpleFilesRow = (props) => {
setSharingPanelVisible,
setChangeOwnerPanelVisible,
showDeleteThirdPartyDialog,
setDeleteThirdPartyDialogVisible,
setRemoveItem,
setMoveToPanelVisible,
setCopyPanelVisible,
@ -252,7 +252,7 @@ const SimpleFilesRow = (props) => {
if (isThirdPartyFolder) {
const splitItem = id.split("-");
setRemoveItem({ id: splitItem[splitItem.length - 1], title });
showDeleteThirdPartyDialog(true);
setDeleteThirdPartyDialogVisible(true);
return;
}
@ -546,7 +546,7 @@ export default inject(
setSharingPanelVisible,
setChangeOwnerPanelVisible,
setRemoveItem,
showDeleteThirdPartyDialog,
setDeleteThirdPartyDialogVisible,
setMoveToPanelVisible,
setCopyPanelVisible,
setShareItem,
@ -611,7 +611,7 @@ export default inject(
setShareItem,
setChangeOwnerPanelVisible,
setRemoveItem,
showDeleteThirdPartyDialog,
setDeleteThirdPartyDialogVisible,
setMoveToPanelVisible,
setCopyPanelVisible,
openDocEditor,