From ce7647ac5fc6611655f90e68afb3a9f8f8937179 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Mon, 5 Apr 2021 16:42:01 +0300 Subject: [PATCH 1/6] Web: Files: fixed Trans, hidden duplicate --- .../Home/Section/Body/EmptyContainer/RootFolderContainer.js | 2 +- products/ASC.Files/Client/src/store/FilesStore.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/EmptyContainer/RootFolderContainer.js b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/EmptyContainer/RootFolderContainer.js index 0df1914900..aeba3f351b 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/EmptyContainer/RootFolderContainer.js +++ b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/EmptyContainer/RootFolderContainer.js @@ -110,7 +110,7 @@ const RootFolderContainer = (props) => { {!isDesktop && ( - + Work in Private Room is available via {{ organizationName }} desktop app.{" "} diff --git a/products/ASC.Files/Client/src/store/FilesStore.js b/products/ASC.Files/Client/src/store/FilesStore.js index b7e011a3af..2d976db2de 100644 --- a/products/ASC.Files/Client/src/store/FilesStore.js +++ b/products/ASC.Files/Client/src/store/FilesStore.js @@ -444,9 +444,9 @@ class FilesStore { !isThirdPartyFolder && this.userAccess && options.push("move"); options.push("copy"); - if (isFile) { - options.push("duplicate"); - } + // if (isFile) { + // options.push("duplicate"); + // } this.userAccess && options.push("rename"); isThirdPartyFolder && From 018f3fad334f117e2bb3bbd48cbab95a93dc682b Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Mon, 5 Apr 2021 16:44:55 +0300 Subject: [PATCH 2/6] Web: Files: Added data-api for new ContextMenu --- packages/asc-web-components/context-menu/index.js | 1 + .../pages/Home/Section/Body/FilesRow/SimpleFilesRow.js | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/asc-web-components/context-menu/index.js b/packages/asc-web-components/context-menu/index.js index 7f8444ee62..d79876ad35 100644 --- a/packages/asc-web-components/context-menu/index.js +++ b/packages/asc-web-components/context-menu/index.js @@ -45,6 +45,7 @@ class ContextMenuSub extends Component { if (item.onClick) { item.onClick({ originalEvent: e, + action: item.action, }); } diff --git a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js index 23431c3d44..e02677ae83 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js +++ b/products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js @@ -201,7 +201,9 @@ const SimpleFilesRow = (props) => { finalizeVersionAction(id).catch((err) => toastr.error(err)); const onClickFavorite = (e) => { - const { action } = e.currentTarget.dataset; + const data = (e.currentTarget && e.currentTarget.dataset) || e; + const { action } = data; + setFavoriteAction(action, id) .then(() => action === "mark" @@ -324,6 +326,7 @@ const SimpleFilesRow = (props) => { onClick: onClickFavorite, disabled: false, "data-action": "mark", + action: "mark", }; case "block-unblock-version": return { @@ -452,6 +455,7 @@ const SimpleFilesRow = (props) => { onClick: onClickFavorite, disabled: false, "data-action": "remove", + action: "remove", }; default: break; From 4e7e795046de55edf64b8ae47b79419ce8415fe8 Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Mon, 5 Apr 2021 16:54:28 +0300 Subject: [PATCH 3/6] Web: Files: fixed scroll in upload panel --- .../Client/src/components/panels/UploadPanel/index.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/products/ASC.Files/Client/src/components/panels/UploadPanel/index.js b/products/ASC.Files/Client/src/components/panels/UploadPanel/index.js index c01db5f571..e48834fbc1 100644 --- a/products/ASC.Files/Client/src/components/panels/UploadPanel/index.js +++ b/products/ASC.Files/Client/src/components/panels/UploadPanel/index.js @@ -14,8 +14,6 @@ import { import FileList from "./FileList"; import { inject, observer } from "mobx-react"; -const DownloadBodyStyle = { height: `calc(100vh - 62px)` }; - class UploadPanelComponent extends React.Component { constructor(props) { super(props); @@ -60,6 +58,7 @@ class UploadPanelComponent extends React.Component { t, uploadPanelVisible, /* sharingPanelVisible, */ uploaded, + uploadDataFiles, } = this.props; const visible = uploadPanelVisible; @@ -111,7 +110,11 @@ class UploadPanelComponent extends React.Component { 15 + ? { height: `100vh` } + : { height: `calc(100vh - 130px)` } + } > @@ -134,6 +137,7 @@ export default inject(({ dialogsStore, uploadDataStore }) => { cancelUpload, uploadPanelVisible, setUploadPanelVisible, + files, } = uploadDataStore; return { @@ -144,5 +148,6 @@ export default inject(({ dialogsStore, uploadDataStore }) => { setUploadPanelVisible, clearUploadData, cancelUpload, + uploadDataFiles: files, }; })(observer(UploadPanel)); From 7f0e24dc2b3a23a5678650e1ae806899dc37e40d Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Mon, 5 Apr 2021 17:10:04 +0300 Subject: [PATCH 4/6] Web: Files: Header: Fixed plus icon path --- .../Client/src/components/pages/Home/Section/Header/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js b/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js index 2fc751fa16..c3a1a806c4 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js +++ b/products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js @@ -504,7 +504,7 @@ class SectionHeaderContent extends React.Component { Date: Mon, 5 Apr 2021 17:34:58 +0300 Subject: [PATCH 5/6] Web: Client: Fix --- .../integration/sub-components/consumerModalDialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js index a6f685bc6d..865783b3e4 100644 --- a/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js +++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js @@ -96,7 +96,7 @@ class ConsumerModalDialog extends React.Component { @@ -117,7 +117,7 @@ class ConsumerModalDialog extends React.Component { ); bottomDescription = ( - + If you still have some questions on how to connect this service or need technical assistance, please feel free to contact our{" "} Date: Mon, 5 Apr 2021 17:49:22 +0300 Subject: [PATCH 6/6] Web: components: Fixed styles of icons. --- .../sub-components/avatar-editor-body.js | 5 ++--- .../sub-components/styled-avatar-editor-body.js | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js b/packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js index 343d523a50..482369826f 100644 --- a/packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js +++ b/packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js @@ -399,18 +399,17 @@ class AvatarEditorBody extends React.Component { isClickable={true} color="#FFFFFF" className="editor-button" - style={{padding: 8}} /> diff --git a/packages/asc-web-components/avatar-editor/sub-components/styled-avatar-editor-body.js b/packages/asc-web-components/avatar-editor/sub-components/styled-avatar-editor-body.js index 86a3bb8800..cd0341d743 100644 --- a/packages/asc-web-components/avatar-editor/sub-components/styled-avatar-editor-body.js +++ b/packages/asc-web-components/avatar-editor/sub-components/styled-avatar-editor-body.js @@ -216,6 +216,9 @@ const mobileStyles = css` props.theme.avatarEditorBody.container.button.height}; border-radius: ${(props) => props.theme.avatarEditorBody.container.button.borderRadius}; + + display: flex; + align-items: center; } } @@ -224,6 +227,10 @@ const mobileStyles = css` props.theme.avatarEditorBody.container.zoom.mobileHeight}; margin-top: ${(props) => props.theme.avatarEditorBody.container.zoom.marginTop}; + .zoom-container-svg_zoom-minus, + .zoom-container-svg_zoom-plus { + margin: auto 0; + } } } } @@ -299,6 +306,9 @@ const StyledAvatarContainer = styled.div` background: ${(props) => props.theme.avatarEditorBody.container.buttons.background}; justify-items: center; + .editor-button { + margin: auto 0; + } } .zoom-container { @@ -307,6 +317,10 @@ const StyledAvatarContainer = styled.div` display: grid; grid-template-columns: min-content 1fr min-content; grid-column-gap: 12px; + .zoom-container-svg_zoom-minus, + .zoom-container-svg_zoom-plus { + margin: auto 0; + } } } }