From fd062b7cd652e6a5d930bcd3a0e8913a3083065a Mon Sep 17 00:00:00 2001 From: TimofeyBoyko Date: Tue, 28 Jun 2022 16:36:48 +0300 Subject: [PATCH] Web:Files: change docspace to docSpace --- packages/asc-web-common/store/SettingsStore.js | 4 +++- .../ASC.Files/Client/src/components/Article/Body/Items.js | 8 ++++---- .../ASC.Files/Client/src/components/Article/Body/index.js | 8 ++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/asc-web-common/store/SettingsStore.js b/packages/asc-web-common/store/SettingsStore.js index 9ab0e1d3b9..bdef620d83 100644 --- a/packages/asc-web-common/store/SettingsStore.js +++ b/packages/asc-web-common/store/SettingsStore.js @@ -72,7 +72,7 @@ class SettingsStore { encryptionKeys = null; personal = false; - docspace = true; + = true; roomsMode = false; @@ -171,6 +171,8 @@ class SettingsStore { this.setDefaultPage(dp); } + console.log(newSettings); + Object.keys(newSettings).map((key) => { if (key in this) { this.setValue( diff --git a/products/ASC.Files/Client/src/components/Article/Body/Items.js b/products/ASC.Files/Client/src/components/Article/Body/Items.js index 98dc876eb6..1632b9e3c1 100644 --- a/products/ASC.Files/Client/src/components/Article/Body/Items.js +++ b/products/ASC.Files/Client/src/components/Article/Body/Items.js @@ -139,7 +139,7 @@ const Items = ({ moveDragItems, - docspace, + docSpace, }) => { const isActive = React.useCallback( (item) => { @@ -153,7 +153,7 @@ const Items = ({ ); const getEndOfBlock = React.useCallback( (item) => { - if (docspace) return false; + if (docSpace) return false; switch (item.key) { case "0-3": @@ -164,7 +164,7 @@ const Items = ({ return false; } }, - [docspace] + [docSpace] ); const getFolderIcon = React.useCallback((item) => { @@ -373,7 +373,7 @@ export default inject( isPrivacy: isPrivacyFolder, currentId: id, showText: auth.settingsStore.showText, - docspace: auth.settingsStore.docspace, + docSpace: auth.settingsStore.docSpace, pathParts: selectedFolderStore.pathParts, data: treeFolders, selectedTreeNode, diff --git a/products/ASC.Files/Client/src/components/Article/Body/index.js b/products/ASC.Files/Client/src/components/Article/Body/index.js index 92c7b99cff..4c4ecb6fba 100644 --- a/products/ASC.Files/Client/src/components/Article/Body/index.js +++ b/products/ASC.Files/Client/src/components/Article/Body/index.js @@ -33,7 +33,7 @@ const StyledBlock = styled.div` const ArticleBodyContent = (props) => { const { personal, - docspace, + docSpace, firstLoad, showText, isDesktopClient, @@ -138,7 +138,7 @@ const ArticleBodyContent = (props) => { /> {!personal && !firstLoad && } - {!isDesktopClient && showText && !docspace && ( + {!isDesktopClient && showText && !docSpace && ( {enableThirdParty && !isVisitor && } @@ -184,7 +184,7 @@ export default inject( toggleArticleOpen, personal, - docspace, + docSpace, isDesktopClient, FirebaseHelper, @@ -209,7 +209,7 @@ export default inject( fetchRooms, personal, - docspace, + docSpace, isArticleLoading, setIsLoading,