From db1f88300562a7ea8bf32af9452da65105f96e9c Mon Sep 17 00:00:00 2001 From: AlexeySafronov Date: Mon, 26 Apr 2021 18:59:33 +0300 Subject: [PATCH 01/17] Bump version v0.1.8 --- lerna.json | 2 +- products/ASC.CRM/Client/package.json | 2 +- products/ASC.Files/Client/package.json | 2 +- products/ASC.People/Client/package.json | 2 +- products/ASC.Projects/Client/package.json | 2 +- web/ASC.Web.Client/package.json | 2 +- web/ASC.Web.Editor/package.json | 2 +- web/ASC.Web.Login/package.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lerna.json b/lerna.json index db648d19ac..09653b99f6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.1.7", + "version": "0.1.8", "npmClient": "yarn", "packages": [ "packages/asc-web-components", diff --git a/products/ASC.CRM/Client/package.json b/products/ASC.CRM/Client/package.json index e4955d13a9..ba69f5fce3 100644 --- a/products/ASC.CRM/Client/package.json +++ b/products/ASC.CRM/Client/package.json @@ -1,6 +1,6 @@ { "name": "@appserver/crm", - "version": "0.1.7", + "version": "0.1.8", "private": "true", "homepage": "/products/crm", "title": "ONLYOFFICE", diff --git a/products/ASC.Files/Client/package.json b/products/ASC.Files/Client/package.json index 4760ef355e..e0bb11fc77 100644 --- a/products/ASC.Files/Client/package.json +++ b/products/ASC.Files/Client/package.json @@ -1,6 +1,6 @@ { "name": "@appserver/files", - "version": "0.1.7", + "version": "0.1.8", "private": "true", "homepage": "/products/files", "id": "e67be73d-f9ae-4ce1-8fec-1880cb518cb4", diff --git a/products/ASC.People/Client/package.json b/products/ASC.People/Client/package.json index fd604a25f1..5f9e2806e0 100644 --- a/products/ASC.People/Client/package.json +++ b/products/ASC.People/Client/package.json @@ -1,6 +1,6 @@ { "name": "@appserver/people", - "version": "0.1.7", + "version": "0.1.8", "private": "true", "homepage": "/products/people", "id": "f4d98afd-d336-4332-8778-3c6945c81ea0", diff --git a/products/ASC.Projects/Client/package.json b/products/ASC.Projects/Client/package.json index 150ea56018..f6eac37e4a 100644 --- a/products/ASC.Projects/Client/package.json +++ b/products/ASC.Projects/Client/package.json @@ -1,6 +1,6 @@ { "name": "@appserver/projects", - "version": "0.1.7", + "version": "0.1.8", "private": "true", "homepage": "/products/projects", "id": "1e044602-43b5-4d79-82f3-fd6208a11960", diff --git a/web/ASC.Web.Client/package.json b/web/ASC.Web.Client/package.json index 230a941280..9bee0930b6 100644 --- a/web/ASC.Web.Client/package.json +++ b/web/ASC.Web.Client/package.json @@ -1,6 +1,6 @@ { "name": "@appserver/studio", - "version": "0.1.7", + "version": "0.1.8", "private": "true", "homepage": "", "title": "ONLYOFFICE", diff --git a/web/ASC.Web.Editor/package.json b/web/ASC.Web.Editor/package.json index c333845f93..39ba2a9bf9 100644 --- a/web/ASC.Web.Editor/package.json +++ b/web/ASC.Web.Editor/package.json @@ -1,6 +1,6 @@ { "name": "@appserver/editor", - "version": "0.1.7", + "version": "0.1.8", "private": "true", "homepage": "/products/files/doceditor", "title": "ONLYOFFICE", diff --git a/web/ASC.Web.Login/package.json b/web/ASC.Web.Login/package.json index f1a2d608d5..d4030ca1e9 100644 --- a/web/ASC.Web.Login/package.json +++ b/web/ASC.Web.Login/package.json @@ -1,6 +1,6 @@ { "name": "@appserver/login", - "version": "0.1.7", + "version": "0.1.8", "private": "true", "homepage": "/login", "title": "ONLYOFFICE", From f3610ce7f61fa558a792c4078ef4df3fec8f9b10 Mon Sep 17 00:00:00 2001 From: AlexeySafronov Date: Mon, 26 Apr 2021 19:02:16 +0300 Subject: [PATCH 02/17] Web: Common: Fix openEdit query param --- packages/asc-web-common/package.json | 2 +- packages/asc-web-components/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/asc-web-common/package.json b/packages/asc-web-common/package.json index 173afdb3b9..6814d51dff 100644 --- a/packages/asc-web-common/package.json +++ b/packages/asc-web-common/package.json @@ -1,6 +1,6 @@ { "name": "@appserver/common", - "version": "0.0.2", + "version": "0.0.3", "private": true, "scripts": { "build": "echo 'skip it'", diff --git a/packages/asc-web-components/package.json b/packages/asc-web-components/package.json index 7c62ba355d..b525a5a009 100644 --- a/packages/asc-web-components/package.json +++ b/packages/asc-web-components/package.json @@ -1,6 +1,6 @@ { "name": "@appserver/components", - "version": "0.0.2", + "version": "0.0.3", "private": true, "scripts": { "build": "echo 'skip it'", From a46f8ed04a6723bc18912a3367bff91d6821d80c Mon Sep 17 00:00:00 2001 From: AlexeySafronov Date: Mon, 26 Apr 2021 19:02:40 +0300 Subject: [PATCH 03/17] Web: Common: Fix openEdit query param --- packages/asc-web-common/api/files/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/asc-web-common/api/files/index.js b/packages/asc-web-common/api/files/index.js index 2101c93d8e..8f65a23448 100644 --- a/packages/asc-web-common/api/files/index.js +++ b/packages/asc-web-common/api/files/index.js @@ -12,7 +12,7 @@ export function openEdit(fileId, version, doc) { } if (doc) { - params.push(`version=${version}`); + params.push(`doc=${doc}`); } const paramsString = params.length > 0 ? `?${params.join("&")}` : ""; From 6f330a04e515e76d39af356d44fd0b40abf757c1 Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Mon, 26 Apr 2021 23:49:20 +0300 Subject: [PATCH 04/17] Web: Files: fixed delete operation progress --- .../Client/src/store/FilesActionsStore.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/products/ASC.Files/Client/src/store/FilesActionsStore.js b/products/ASC.Files/Client/src/store/FilesActionsStore.js index 4d8270979d..050f1d74ce 100644 --- a/products/ASC.Files/Client/src/store/FilesActionsStore.js +++ b/products/ASC.Files/Client/src/store/FilesActionsStore.js @@ -71,17 +71,18 @@ class FilesActionStore { } if (folderIds.length || fileIds.length) { - setSecondaryProgressBarData({ - icon: "trash", - visible: true, - label: translations.deleteOperation, - percent: 0, - alert: false, - }); - return removeFiles(folderIds, fileIds, deleteAfter, immediately) .then((res) => { const id = res[0] && res[0].id ? res[0].id : null; + const currentProcess = res.find((x) => x.id === id); + setSecondaryProgressBarData({ + icon: "trash", + visible: true, + label: translations.deleteOperation, + percent: currentProcess.progress, + alert: false, + }); + this.loopDeleteOperation(id, translations); }) .catch((err) => { From 9a06ab8b3bbbf74a0397bee3d59818327c462812 Mon Sep 17 00:00:00 2001 From: Vladislav Makhov Date: Tue, 27 Apr 2021 09:27:24 +0300 Subject: [PATCH 05/17] web: client: fix closing on logo click --- .../src/components/NavMenu/sub-components/nav-logo-item.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-logo-item.js b/web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-logo-item.js index 6f5a608e5e..04c56f4e9c 100644 --- a/web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-logo-item.js +++ b/web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-logo-item.js @@ -1,5 +1,5 @@ import React from "react"; -import { Link } from 'react-router-dom'; +import { Link } from "react-router-dom"; import PropTypes from "prop-types"; import styled from "styled-components"; import { inject, observer } from "mobx-react"; @@ -25,7 +25,7 @@ const NavLogoItem = (props) => { //console.log("NavLogoItem render"); return ( - + From 20ee2a4772231f83fcb3d447949103895efbe090 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Tue, 27 Apr 2021 10:16:36 +0300 Subject: [PATCH 06/17] Web: Client: fixed ConfirmRoute --- web/ASC.Web.Client/src/components/pages/Confirm/index.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/web/ASC.Web.Client/src/components/pages/Confirm/index.js b/web/ASC.Web.Client/src/components/pages/Confirm/index.js index e5b55f39d0..0ba9e020dc 100644 --- a/web/ASC.Web.Client/src/components/pages/Confirm/index.js +++ b/web/ASC.Web.Client/src/components/pages/Confirm/index.js @@ -1,5 +1,5 @@ import React, { lazy } from "react"; -import { Route, Switch } from "react-router-dom"; +import { Switch } from "react-router-dom"; import ConfirmRoute from "../../../helpers/confirmRoute"; const ActivateUserForm = lazy(() => import("./sub-components/activateUser")); @@ -37,7 +37,7 @@ const Confirm = ({ match }) => { path={`${match.path}/EmailChange`} component={ChangeEmailForm} /> - { path={`${match.path}/ProfileRemove`} component={ProfileRemoveForm} /> - { path={`${match.path}/PortalOwnerChange`} component={ChangeOwnerForm} /> - {/* */} ); }; From 218140592da7da6f855f66bc1af89d31e3ace964 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Tue, 27 Apr 2021 10:18:15 +0300 Subject: [PATCH 07/17] Web: Files: fixed display of the lock badge --- products/ASC.Files/Client/src/components/Badges.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/ASC.Files/Client/src/components/Badges.js b/products/ASC.Files/Client/src/components/Badges.js index 6e18e4ea52..80466b3893 100644 --- a/products/ASC.Files/Client/src/components/Badges.js +++ b/products/ASC.Files/Client/src/components/Badges.js @@ -48,7 +48,7 @@ const Badges = ({ hoverColor="#3B72A7" /> )} - {locked && ( + {locked && accessToEdit && ( Date: Tue, 27 Apr 2021 10:18:53 +0300 Subject: [PATCH 08/17] Web: People: fixed GroupAction --- products/ASC.People/Client/src/pages/GroupAction/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/products/ASC.People/Client/src/pages/GroupAction/index.js b/products/ASC.People/Client/src/pages/GroupAction/index.js index 4266ff82fb..7e466b664f 100644 --- a/products/ASC.People/Client/src/pages/GroupAction/index.js +++ b/products/ASC.People/Client/src/pages/GroupAction/index.js @@ -40,7 +40,7 @@ class GroupAction extends React.Component { render() { console.log("GroupAction render"); - const { group, match } = this.props; + const { group, match, tReady } = this.props; return ( <> @@ -63,7 +63,7 @@ class GroupAction extends React.Component { - + ) : ( From 6bd11ae1951195f45f0ff18280b886302c36c2b5 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Tue, 27 Apr 2021 11:08:29 +0300 Subject: [PATCH 09/17] Web: Files: Store: Fixed displaying MoveTo action for share folder --- .../Client/src/pages/Home/Section/Header/index.js | 4 ++++ products/ASC.Files/Client/src/store/FilesStore.js | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js b/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js index 31dddb2b53..5d01672709 100644 --- a/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js +++ b/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js @@ -323,6 +323,7 @@ class SectionHeaderContent extends React.Component { isOnlyFoldersSelected, isFavoritesFolder, isRecentFolder, + isShareFolder, } = this.props; let menu = [ @@ -401,6 +402,7 @@ class SectionHeaderContent extends React.Component { disabled: isFavoritesFolder || isRecentFolder || + isShareFolder || !isAccessedSelected || !selectionCount || isThirdPartySelection, @@ -591,6 +593,7 @@ export default inject( isPrivacyFolder, isFavoritesFolder, isRecentFolder, + isShareFolder, } = treeFoldersStore; const { setAction } = fileActionStore; const { @@ -614,6 +617,7 @@ export default inject( isPrivacy: isPrivacyFolder, isFavoritesFolder, isRecentFolder, + isShareFolder, filter, canCreate, selectionCount: selection.length, diff --git a/products/ASC.Files/Client/src/store/FilesStore.js b/products/ASC.Files/Client/src/store/FilesStore.js index 79cd3e0b35..82a28783ea 100644 --- a/products/ASC.Files/Client/src/store/FilesStore.js +++ b/products/ASC.Files/Client/src/store/FilesStore.js @@ -574,7 +574,7 @@ class FilesStore { ]); } - if (isCommonFolder) + if (isCommonFolder) { if (!this.userAccess) { fileOptions = this.removeOptions(fileOptions, [ "owner-change", @@ -586,6 +586,7 @@ class FilesStore { fileOptions = this.removeOptions(fileOptions, ["separator2"]); } } + } if (withoutShare) { fileOptions = this.removeOptions(fileOptions, [ @@ -604,6 +605,10 @@ class FilesStore { fileOptions = this.removeOptions(fileOptions, ["separator2"]); } + if (isShareFolder) { + fileOptions = this.removeOptions(fileOptions, ["move-to"]); + } + return fileOptions; } else { let folderOptions = [ @@ -630,6 +635,10 @@ class FilesStore { folderOptions = this.removeOptions(folderOptions, ["copy"]); } + if (isShareFolder) { + folderOptions = this.removeOptions(folderOptions, ["move-to"]); + } + if (isRecycleBinFolder) { folderOptions = this.removeOptions(folderOptions, [ "open", From c6a08a50f9c2a26b0bba3ddb4a1d9dcef9566492 Mon Sep 17 00:00:00 2001 From: TatianaLopaeva Date: Tue, 27 Apr 2021 11:39:16 +0300 Subject: [PATCH 10/17] Web: Fixed language for users then not changed language at profile yet. --- packages/asc-web-common/store/AuthStore.js | 13 +++++++++++-- packages/asc-web-common/store/UserStore.js | 5 +---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/asc-web-common/store/AuthStore.js b/packages/asc-web-common/store/AuthStore.js index 2058645f7c..56334a47bf 100644 --- a/packages/asc-web-common/store/AuthStore.js +++ b/packages/asc-web-common/store/AuthStore.js @@ -8,7 +8,7 @@ import UserStore from "./UserStore"; import { logout as logoutDesktop, desktopConstants } from "../desktop"; import { combineUrl, isAdmin } from "../utils"; import isEmpty from "lodash/isEmpty"; -import { AppServerConfig } from "../constants"; +import { AppServerConfig, LANGUAGE } from "../constants"; const { proxyURL } = AppServerConfig; class AuthStore { @@ -43,7 +43,14 @@ class AuthStore { return Promise.all(requests); }; - + setLanguage() { + if (this.userStore.user.cultureName) { + localStorage.getItem(LANGUAGE) !== this.userStore.user.cultureName && + localStorage.setItem(LANGUAGE, this.userStore.user.cultureName); + } else { + localStorage.setItem(LANGUAGE, this.settingsStore.culture || "en-US"); + } + } get isLoaded() { let success = false; if (this.isAuthenticated) { @@ -51,6 +58,8 @@ class AuthStore { this.userStore.isLoaded && this.moduleStore.isLoaded && this.settingsStore.isLoaded; + + success && this.setLanguage(); } else { success = this.settingsStore.isLoaded; } diff --git a/packages/asc-web-common/store/UserStore.js b/packages/asc-web-common/store/UserStore.js index 1749587346..0cfa3edc5f 100644 --- a/packages/asc-web-common/store/UserStore.js +++ b/packages/asc-web-common/store/UserStore.js @@ -1,6 +1,5 @@ import { action, makeObservable, observable } from "mobx"; import api from "../api"; -import { LANGUAGE } from "../constants"; class UserStore { user = null; @@ -21,9 +20,7 @@ class UserStore { getCurrentUser = async () => { const user = await api.people.getUser(); - user.cultureName && - localStorage.getItem(LANGUAGE) !== user.cultureName && - localStorage.setItem(LANGUAGE, user.cultureName); + this.setUser(user); }; From 79ff69fe01f806792c219c72b269de2d6b2cb7f8 Mon Sep 17 00:00:00 2001 From: Vladislav Makhov Date: Tue, 27 Apr 2021 12:55:27 +0300 Subject: [PATCH 11/17] web: client: fix change password crash --- web/ASC.Web.Client/src/components/pages/Confirm/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ASC.Web.Client/src/components/pages/Confirm/index.js b/web/ASC.Web.Client/src/components/pages/Confirm/index.js index e5b55f39d0..e7411647c9 100644 --- a/web/ASC.Web.Client/src/components/pages/Confirm/index.js +++ b/web/ASC.Web.Client/src/components/pages/Confirm/index.js @@ -37,7 +37,7 @@ const Confirm = ({ match }) => { path={`${match.path}/EmailChange`} component={ChangeEmailForm} /> - Date: Tue, 27 Apr 2021 13:48:32 +0300 Subject: [PATCH 12/17] Web: Editor: Fix display additional buttons by doc param --- web/ASC.Web.Editor/src/Editor.jsx | 75 +++++++++++++++++++------------ 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/web/ASC.Web.Editor/src/Editor.jsx b/web/ASC.Web.Editor/src/Editor.jsx index 8b2317f3ce..6378cb7268 100644 --- a/web/ASC.Web.Editor/src/Editor.jsx +++ b/web/ASC.Web.Editor/src/Editor.jsx @@ -93,17 +93,21 @@ const Editor = () => { //showLoader(); const docApiUrl = await getDocServiceUrl(); + const success = await checkIsAuthenticated(); - if (!doc) { - const success = await checkIsAuthenticated(); - - if (!success) { - return tryRedirectTo(combineUrl(AppServerConfig.proxyURL, "/login")); - } else { - setIsAuthenticated(success); - } + if (!doc && !success) { + return tryRedirectTo(combineUrl(AppServerConfig.proxyURL, "/login")); + } + + if (success) { + try { + fileInfo = await getFileInfo(fileId); + } catch (err) { + console.error(err); + } + + setIsAuthenticated(success); } - fileInfo = await getFileInfo(fileId); config = await openEdit(fileId, version, doc); @@ -145,7 +149,8 @@ const Editor = () => { if ( config && config.document.permissions.edit && - config.document.permissions.modifyFilter + config.document.permissions.modifyFilter && + fileInfo ) { const sharingSettings = await SharingDialog.getSharingSettings(fileId); config.document.info = { @@ -249,20 +254,36 @@ const Editor = () => { config.type = "mobile"; } - const filterObj = FilesFilter.getDefault(); - filterObj.folder = fileInfo.folderId; - const urlFilter = filterObj.toUrlParams(); + let goback; - config.editorConfig.customization = { - ...config.editorConfig.customization, - goback: { + if (fileInfo) { + const filterObj = FilesFilter.getDefault(); + filterObj.folder = fileInfo.folderId; + const urlFilter = filterObj.toUrlParams(); + + goback = { blank: true, requestClose: false, text: i18n.t("FileLocation"), url: `${combineUrl(filesUrl, `/filter?${urlFilter}`)}`, - }, + }; + } + + config.editorConfig.customization = { + ...config.editorConfig.customization, + goback, }; + let onRequestSharingSettings; + + if ( + fileInfo && + config.document.permissions.edit && + config.document.permissions.modifyFilter + ) { + onRequestSharingSettings = onSDKRequestSharingSettings; + } + const events = { events: { onAppReady: onSDKAppReady, @@ -272,10 +293,7 @@ const Editor = () => { onInfo: onSDKInfo, onWarning: onSDKWarning, onError: onSDKError, - ...(config.document.permissions.edit && - config.document.permissions.modifyFilter && { - onRequestSharingSettings: onSDKRequestSharingSettings, - }), + onRequestSharingSettings, }, }; @@ -357,13 +375,14 @@ const Editor = () => { {!isLoading ? ( <>
- - + {fileInfo && ( + + )} ) : ( From 14719ed69864a24f1aaf6b857d2a708632825f71 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Tue, 27 Apr 2021 14:31:05 +0300 Subject: [PATCH 13/17] Web: Components: fixed checkbox icons style --- packages/asc-web-components/checkbox/styled-checkbox.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/asc-web-components/checkbox/styled-checkbox.js b/packages/asc-web-components/checkbox/styled-checkbox.js index 1829d70bb4..7214d065e5 100644 --- a/packages/asc-web-components/checkbox/styled-checkbox.js +++ b/packages/asc-web-components/checkbox/styled-checkbox.js @@ -15,6 +15,7 @@ const StyledLabel = styled.label` .checkbox { margin-right: 12px; + overflow: visible; } /* ${(props) => From cc8d628cdbc3ebe98d3951002977fc53dbf6d89b Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Tue, 27 Apr 2021 14:38:47 +0300 Subject: [PATCH 14/17] Web: Files: Store: Fixed displaying "Add account" for third-party accounts for visitors --- .../Client/src/components/Article/Body/TreeSettings.js | 6 +++++- .../ASC.Files/Client/src/components/Article/Body/index.js | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js b/products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js index 2db7a2dbcf..83fd846d09 100644 --- a/products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js +++ b/products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js @@ -81,9 +81,12 @@ const PureTreeSettings = ({ history, setIsLoading, t, + isVisitor, }) => { const { setting } = match.params; + console.log(isVisitor); + useEffect(() => { setIsLoading(true); getFilesSettings().then(() => { @@ -168,7 +171,7 @@ const PureTreeSettings = ({ title={t("TreeSettingsAdminSettings")} /> ) : null} - {enableThirdParty ? ( + {enableThirdParty && !isVisitor ? ( - {enableThirdParty && } + {enableThirdParty && !isVisitor && } ); } @@ -107,6 +108,7 @@ class ArticleBodyContent extends React.Component { export default inject( ({ + auth, filesStore, treeFoldersStore, selectedFolderStore, @@ -129,6 +131,7 @@ export default inject( selectedTreeNode, filter, enableThirdParty: settingsStore.enableThirdParty, + isVisitor: auth.userStore.user.isVisitor, setIsLoading, fetchFiles, From a231d8acf315b6e566cec5b1148a28f83e39e4a9 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Tue, 27 Apr 2021 15:05:43 +0300 Subject: [PATCH 15/17] Web: Files: Article: Removed missing console log --- .../Client/src/components/Article/Body/TreeSettings.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js b/products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js index 83fd846d09..8a0125a8dd 100644 --- a/products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js +++ b/products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js @@ -85,8 +85,6 @@ const PureTreeSettings = ({ }) => { const { setting } = match.params; - console.log(isVisitor); - useEffect(() => { setIsLoading(true); getFilesSettings().then(() => { From 52ade0bcf5c8b207e22ad6509b246b1d0017189c Mon Sep 17 00:00:00 2001 From: Vladislav Makhov Date: Tue, 27 Apr 2021 15:51:35 +0300 Subject: [PATCH 16/17] web: files: fix share button render --- .../src/components/panels/SharingPanel/index.js | 16 ++++++++-------- .../ASC.Files/Client/src/store/FilesStore.js | 5 +++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/products/ASC.Files/Client/src/components/panels/SharingPanel/index.js b/products/ASC.Files/Client/src/components/panels/SharingPanel/index.js index 947f0eb4d7..59c89a8890 100644 --- a/products/ASC.Files/Client/src/components/panels/SharingPanel/index.js +++ b/products/ASC.Files/Client/src/components/panels/SharingPanel/index.js @@ -77,14 +77,10 @@ class SharingPanelComponent extends React.Component { }; updateRowData = (newRowData) => { - const { setFile, setFolder } = this.props; + const { getFileInfo, getFolderInfo } = this.props; for (let item of newRowData) { - if (!item.fileExst) { - setFolder(item); - } else { - setFile(item); - } + !item.fileExst ? getFolderInfo(item.id) : getFileInfo(item.id); } }; @@ -172,8 +168,8 @@ class SharingPanelComponent extends React.Component { ownerId ) .then((res) => { - if (ownerId) { - this.updateRowData(res[0]); + if (!ownerId) { + this.updateRowData(selection); } if (isPrivacy && isDesktop) { if (share.length === 0) return Promise.resolve(); @@ -610,6 +606,8 @@ const SharingPanel = inject( getShareUsers, setShareFiles, setIsLoading, + getFileInfo, + getFolderInfo, isLoading, } = filesStore; const { isPrivacyFolder } = treeFoldersStore; @@ -644,6 +642,8 @@ const SharingPanel = inject( setFolder, getShareUsers, setShareFiles, + getFileInfo, + getFolderInfo, }; } )(observer(withTranslation("SharingPanel")(SharingPanelComponent))); diff --git a/products/ASC.Files/Client/src/store/FilesStore.js b/products/ASC.Files/Client/src/store/FilesStore.js index 82a28783ea..690b9d8d2f 100644 --- a/products/ASC.Files/Client/src/store/FilesStore.js +++ b/products/ASC.Files/Client/src/store/FilesStore.js @@ -1231,6 +1231,11 @@ class FilesStore { this.setFile(fileInfo); }; + getFolderInfo = async (id) => { + const folderInfo = await api.files.getFolderInfo(id); + this.setFolder(folderInfo); + }; + openDocEditor = (id, providerKey = null, tab = null, url = null) => { if (providerKey) { tab From 69c9ee2d0e4e245b9e26dc10d2ff09587078e56d Mon Sep 17 00:00:00 2001 From: TatianaLopaeva Date: Tue, 27 Apr 2021 15:55:38 +0300 Subject: [PATCH 17/17] Web: Fixed changing the language on the page when the user changes it through the settings and has already changed the language in the profile. --- .../common/language-and-time-zone.js | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js index 5faba8676e..1cf3ddccfd 100644 --- a/web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js +++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js @@ -12,6 +12,7 @@ import SaveCancelButtons from "@appserver/components/save-cancel-buttons"; import { saveToSessionStorage, getFromSessionStorage } from "../../utils"; import { setDocumentTitle } from "../../../../../helpers/utils"; import { inject, observer } from "mobx-react"; +import { LANGUAGE } from "@appserver/common/constants"; const mapCulturesToArray = (cultures, t) => { return cultures.map((culture) => { @@ -176,7 +177,13 @@ class LanguageAndTimeZone extends React.Component { timezoneDefault, languageDefault, } = this.state; - const { i18n, language, nameSchemaId, getCurrentCustomSchema } = this.props; + const { + i18n, + language, + nameSchemaId, + getCurrentCustomSchema, + t, + } = this.props; if (timezones.length && languages.length && !prevState.isLoadedData) { this.setState({ isLoadedData: true }); @@ -229,12 +236,20 @@ class LanguageAndTimeZone extends React.Component { }; onSaveLngTZSettings = () => { - const { t, setLanguageAndTime, i18n } = this.props; + const { t, setLanguageAndTime, user, language: lng } = this.props; const { language, timezone } = this.state; + this.setState({ isLoading: true }, function () { setLanguageAndTime(language.key, timezone.key) - .then(() => i18n.changeLanguage(language.key)) + .then( + () => + !user.cultureName && + localStorage.setItem(LANGUAGE, language.key || "en-US") + ) .then(() => toastr.success(t("SuccessfullySaveSettingsMessage"))) + .then( + () => !user.cultureName && lng !== language.key && location.reload() + ) .catch((error) => toastr.error(error)) .finally(() => this.setState({ isLoading: false })); }); @@ -403,9 +418,12 @@ export default inject(({ auth, setup }) => { getCurrentCustomSchema, } = auth.settingsStore; + const { user } = auth.userStore; + const { setLanguageAndTime } = setup; return { + user, portalLanguage: culture, portalTimeZoneId: timezone, language: culture,