From 55574cd2de438e0f8f4146bb3141894779c41594 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Tue, 16 Jun 2020 18:21:38 +0300 Subject: [PATCH 1/5] Web: Files: Home: Fixed first select, added closing menu after operations --- products/ASC.Files/Client/src/components/pages/Home/index.js | 1 + products/ASC.Files/Client/src/store/files/actions.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/products/ASC.Files/Client/src/components/pages/Home/index.js b/products/ASC.Files/Client/src/components/pages/Home/index.js index 2881f8b1a2..1a2b7a19f3 100644 --- a/products/ASC.Files/Client/src/components/pages/Home/index.js +++ b/products/ASC.Files/Client/src/components/pages/Home/index.js @@ -410,6 +410,7 @@ class PureHome extends React.Component { err && toastr.error(err); this.onLoading(false); this.setProgressVisible(false, timeout); + this.onClose(); }; setNewFilter = () => { diff --git a/products/ASC.Files/Client/src/store/files/actions.js b/products/ASC.Files/Client/src/store/files/actions.js index 0c659ea197..692a3183df 100644 --- a/products/ASC.Files/Client/src/store/files/actions.js +++ b/products/ASC.Files/Client/src/store/files/actions.js @@ -164,7 +164,7 @@ export function fetchFiles(folderId, filter, dispatch) { dispatch(setFilesFilter(filterData)); dispatch(setFolders(data.folders)); dispatch(setFiles(data.files)); - dispatch(setSelected("close")); + //dispatch(setSelected("close")); //TODO: need close but it`s crash first select, need new logic return dispatch(setSelectedFolder({ folders: data.folders, ...data.current, pathParts: data.pathParts })); }) } From 42f4b01dbfd64b46633521b6baf83018688e1177 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Tue, 16 Jun 2020 19:26:54 +0300 Subject: [PATCH 2/5] Web: Files: DocEditor: Fixed height after change router --- .../Client/src/components/pages/DocEditor/index.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/products/ASC.Files/Client/src/components/pages/DocEditor/index.js b/products/ASC.Files/Client/src/components/pages/DocEditor/index.js index f87dc17ec4..3c26535a7f 100644 --- a/products/ASC.Files/Client/src/components/pages/DocEditor/index.js +++ b/products/ASC.Files/Client/src/components/pages/DocEditor/index.js @@ -29,18 +29,21 @@ class PureEditor extends React.Component { const urlParams = getObjectByLocation(window.location); const fileId = urlParams.fileId || null; + const wrapperStyle = { + height: '100vh' + } files.openEdit(fileId) .then(config => { - if (window.innerWidth < 600) { + if (window.innerWidth < 720) { config.type = 'mobile'; } - window.DocsAPI.DocEditor("editor", config) + window.DocsAPI.DocEditor("editor", config); }); return ( - <> +
- +
); } } From 2bdbb60545d1deaa19df527be7512058488e1695 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Tue, 16 Jun 2020 19:28:09 +0300 Subject: [PATCH 3/5] Web: Files: App: Use Studio layout only if we need it --- products/ASC.Files/Client/src/App.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/products/ASC.Files/Client/src/App.js b/products/ASC.Files/Client/src/App.js index 7e215294b3..5b7f44d5b8 100644 --- a/products/ASC.Files/Client/src/App.js +++ b/products/ASC.Files/Client/src/App.js @@ -6,24 +6,25 @@ import Home from "./components/pages/Home"; import DocEditor from "./components/pages/DocEditor"; import { history, PrivateRoute, PublicRoute, Login, Error404, StudioLayout, Offline } from "asc-web-common"; +const withStudioLayout = Component => props => ; + const App = ({ settings }) => { const { homepage } = settings; + return ( navigator.onLine ? - } > - + - + - : ); From 53bb74f26f5994d50d30514565db14c27a3be1ff Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Wed, 17 Jun 2020 10:50:30 +0300 Subject: [PATCH 4/5] Web: Files: Replaced icons in FolderTree --- .../components/Article/Body/TreeFolders.js | 47 +++++++++++++++---- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js b/products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js index b429fa079d..bb97dd464c 100644 --- a/products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js +++ b/products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js @@ -11,6 +11,27 @@ class TreeFolders extends React.Component { this.state = { treeData, expandedKeys: props.expandedKeys, loaded: true }; } + getFolderIcon = key => { + switch (key) { + case "0-0": + return ; + + case "0-1": + return ; + + case "0-2": + return ( + + ); + + case "0-3": + return ; + + default: + return ; + } + }; + getItems = data => { return data.map(item => { if (item.folders && item.folders.length > 0) { @@ -19,9 +40,7 @@ class TreeFolders extends React.Component { id={item.id} key={item.id} title={item.title} - icon={ - - } + icon={this.getFolderIcon(item.key)} > {this.getItems(item.folders)} @@ -33,7 +52,7 @@ class TreeFolders extends React.Component { key={item.id} title={item.title} isLeaf={item.foldersCount ? false : true} - icon={} + icon={this.getFolderIcon(item.key)} /> ); }); @@ -147,12 +166,12 @@ class TreeFolders extends React.Component { }; onExpand = (data, treeNode) => { - if(treeNode.node && !treeNode.node.props.children) { - if(treeNode.expanded) { + if (treeNode.node && !treeNode.node.props.children) { + if (treeNode.expanded) { this.onLoadData(treeNode.node); } } - if(this.props.needUpdate) { + if (this.props.needUpdate) { const newFilter = this.props.filter.clone(); newFilter.treeFolders = data; this.props.setFilter(newFilter); @@ -163,7 +182,11 @@ class TreeFolders extends React.Component { componentDidUpdate(prevProps) { const { expandedKeys, data, needUpdate } = this.props; - if (needUpdate && expandedKeys && this.state.expandedKeys.length !== expandedKeys.length) { + if ( + needUpdate && + expandedKeys && + this.state.expandedKeys.length !== expandedKeys.length + ) { this.setState({ expandedKeys }); } @@ -173,7 +196,13 @@ class TreeFolders extends React.Component { } render() { - const { selectedKeys, fakeNewDocuments, isLoading, onSelect, needUpdate } = this.props; + const { + selectedKeys, + fakeNewDocuments, + isLoading, + onSelect, + needUpdate + } = this.props; const { treeData, expandedKeys, loaded } = this.state; const loadProp = loaded && needUpdate ? { loadData: this.onLoadData } : {}; From 51d7984c913a9158d0ecdbafa517cb3a0a333f85 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Wed, 17 Jun 2020 11:26:18 +0300 Subject: [PATCH 5/5] Web: Fixed header icons width to 17px --- .../src/components/pages/Home/Section/Header/index.js | 8 ++++---- .../components/pages/GroupAction/Section/Header/index.js | 2 +- .../src/components/pages/Home/Section/Header/index.js | 4 ++-- .../src/components/pages/Import/Section/Header/index.js | 2 +- .../src/components/pages/Profile/Section/Header/index.js | 4 ++-- .../pages/ProfileAction/Section/Header/index.js | 2 +- .../src/components/pages/Reassign/Section/Header/index.js | 4 ++-- 7 files changed, 13 insertions(+), 13 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 9c840ba76d..e32530f176 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 @@ -439,7 +439,7 @@ class SectionHeaderContent extends React.Component { {folder && ( { directionX="right" title={t("Actions")} iconName="VerticalDotsIcon" - size={16} + size={17} color="#A3A9AE" getData={getContextOptionsGroup} isDisabled={false} @@ -423,7 +423,7 @@ const SectionHeaderContent = props => { directionX="right" title={t("Actions")} iconName="PlusIcon" - size={16} + size={17} color="#657077" getData={getContextOptionsPlus} isDisabled={false} diff --git a/products/ASC.People/Client/src/components/pages/Import/Section/Header/index.js b/products/ASC.People/Client/src/components/pages/Import/Section/Header/index.js index 879b374d3c..dc99bd5adf 100644 --- a/products/ASC.People/Client/src/components/pages/Import/Section/Header/index.js +++ b/products/ASC.People/Client/src/components/pages/Import/Section/Header/index.js @@ -37,7 +37,7 @@ const SectionHeaderContent = props => { { { return ( -
+