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

Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.1.0

Browse Source
This commit is contained in:
Maria Sukhova 2023-06-09 19:10:37 +03:00
commit 1b2160e6c8
9 changed files with 111 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/src/pages/Wizard/index.js
View File

@ -67,7 +67,6 @@ const Wizard = (props) => {
hashSettings,
setPortalOwner,
setWizardComplete,
getPortalSettings,
isLicenseRequired,
setLicense,
licenseUpload,
@ -253,7 +252,6 @@ const Wizard = (props) => {
analytics
);
setWizardComplete();
getPortalSettings();
history.push(combineUrl(window.DocSpaceConfig?.proxy?.url, "/"));
} catch (error) {
console.error(error);
@ -488,7 +486,6 @@ export default inject(({ auth, wizard }) => {
timezone,
urlLicense,
hashSettings,
getPortalSettings,
setWizardComplete,
getPortalTimezones,
getPortalPasswordSettings,
@ -522,7 +519,6 @@ export default inject(({ auth, wizard }) => {
machineName,
isLicenseRequired,
licenseUpload,
getPortalSettings,
setWizardComplete,
getPortalPasswordSettings,
getPortalTimezones,

13
packages/common/components/Article/index.js
View File

@ -47,8 +47,10 @@ const Article = ({
...rest
}) => {
const [articleHeaderContent, setArticleHeaderContent] = React.useState(null);
const [articleMainButtonContent, setArticleMainButtonContent] =
React.useState(null);
const [
articleMainButtonContent,
setArticleMainButtonContent,
] = React.useState(null);
const [articleBodyContent, setArticleBodyContent] = React.useState(null);
const [correctTabletHeight, setCorrectTabletHeight] = React.useState(null);
@ -90,6 +92,8 @@ const Article = ({
}, [children]);
const sizeChangeHandler = React.useCallback(() => {
const showArticle = JSON.parse(localStorage.getItem("showArticle"));
if (isMobileOnly || isMobileUtils() || window.innerWidth === 375) {
setShowText(true);
setIsMobileArticle(true);
@ -98,8 +102,11 @@ const Article = ({
((isTabletUtils() && window.innerWidth !== 375) || isMobile) &&
!isMobileOnly
) {
setShowText(false);
setIsMobileArticle(true);
if (showArticle) return;
setShowText(false);
}
if (isDesktopUtils() && !isMobile) {
setShowText(true);

1
packages/common/components/Article/styled-article.js
View File

@ -118,6 +118,7 @@ const StyledArticle = styled.article`
overflow-x: hidden !important;
padding: 0 20px !important;
margin-bottom: 0px !important;
@media ${tablet} {
padding: 0 8px !important;

42
packages/common/components/Article/sub-components/article-header.js
View File

@ -35,29 +35,35 @@ const ArticleHeader = ({
: getLogoFromPath(whiteLabelLogoUrls[0].path.light);
if (isMobileOnly) return <></>;
return (
<StyledArticleHeader showText={showText} {...rest}>
{isTabletView && isBurgerLoading ? (
<Loaders.ArticleHeader height="28px" width="28px" />
) : (
const isLoadingComponent = isTabletView ? (
<Loaders.ArticleHeader height="28px" width={showText ? "100%" : "28px"} />
) : (
<Loaders.ArticleHeader height="28px" width="211px" />
);
const mainComponent = (
<>
{isTabletView && (
<StyledIconBox name="article-burger" showText={showText}>
<img src={burgerLogo} onClick={onLogoClick} />
</StyledIconBox>
)}
<StyledHeading showText={showText} size="large">
{isTabletView ? (
<img className="logo-icon_svg" src={logo} onClick={onLogoClick} />
) : (
<Link to="/">
<img className="logo-icon_svg" src={logo} />
</Link>
)}
</StyledHeading>
</>
);
{!isTabletView && isBurgerLoading ? (
<Loaders.ArticleHeader height="28px" width="211px" />
) : (
<StyledHeading showText={showText} size="large">
{isTabletView ? (
<img className="logo-icon_svg" src={logo} onClick={onLogoClick} />
) : (
<Link to="/">
<img className="logo-icon_svg" src={logo} />
</Link>
)}
</StyledHeading>
)}
return (
<StyledArticleHeader showText={showText} {...rest}>
{isBurgerLoading ? isLoadingComponent : mainComponent}
</StyledArticleHeader>
);
};

54
packages/common/components/Loaders/ArticleFolderLoader/ArticleFolderLoader.js
View File

@ -12,7 +12,6 @@ const ArticleFolderLoader = ({
className,
style,
showText,
isVisitor,
...rest
}) => {
@ -25,27 +24,54 @@ const ArticleFolderLoader = ({
>
{isVisitor ? (
<>
<StyledBlock>
<StyledRectangleLoader {...rest} />
<StyledRectangleLoader {...rest} />
<StyledBlock showText={showText}>
<StyledRectangleLoader
{...rest}
className="article-folder-loader"
/>
<StyledRectangleLoader
{...rest}
className="article-folder-loader"
/>
</StyledBlock>
<StyledBlock>
<StyledRectangleLoader {...rest} />
<StyledBlock showText={showText}>
<StyledRectangleLoader
{...rest}
className="article-folder-loader"
/>
</StyledBlock>
</>
) : (
<>
<StyledBlock>
<StyledRectangleLoader {...rest} />
<StyledRectangleLoader {...rest} />
<StyledRectangleLoader {...rest} />
<StyledBlock showText={showText}>
<StyledRectangleLoader
{...rest}
className="article-folder-loader"
/>
<StyledRectangleLoader
{...rest}
className="article-folder-loader"
/>
<StyledRectangleLoader
{...rest}
className="article-folder-loader"
/>
</StyledBlock>
<StyledBlock>
<StyledRectangleLoader {...rest} />
<StyledRectangleLoader {...rest} />
<StyledRectangleLoader {...rest} />
<StyledBlock showText={showText}>
<StyledRectangleLoader
{...rest}
className="article-folder-loader"
/>
<StyledRectangleLoader
{...rest}
className="article-folder-loader"
/>
<StyledRectangleLoader
{...rest}
className="article-folder-loader"
/>
</StyledBlock>
</>
)}

13
packages/common/components/Loaders/ArticleFolderLoader/StyledArticleFolderLoader.js
View File

@ -51,6 +51,17 @@ const StyledBlock = styled.div`
@media ${tablet} {
margin-bottom: 24px;
}
.article-folder-loader {
@media ${tablet} {
${(props) => (props.showText ? "width: 200px" : "width: 20px")};
}
${isMobile &&
css`
${(props) => (props.showText ? "width: 200px" : "width: 20px")};
`}
}
`;
const StyledRectangleLoader = styled(RectangleLoader)`
@ -60,14 +71,12 @@ const StyledRectangleLoader = styled(RectangleLoader)`
@media ${tablet} {
height: 20px;
width: 20px;
padding: 0 0 24px;
}
${isMobile &&
css`
height: 20px;
width: 20px;
padding: 0 0 24px;
`}

17
packages/common/components/Loaders/ArticleHeaderLoader/ArticleHeaderLoader.js
View File

@ -1,9 +1,11 @@
import React from "react";
import PropTypes from "prop-types";
import { inject, observer } from "mobx-react";
import StyledContainer from "./StyledArticleHeader";
import RectangleLoader from "../RectangleLoader";
const ArticleHeaderLoader = ({ id, className, style, ...rest }) => {
const ArticleHeaderLoader = ({ id, className, style, showText, ...rest }) => {
const {
title,
width,
@ -17,7 +19,12 @@ const ArticleHeaderLoader = ({ id, className, style, ...rest }) => {
animate,
} = rest;
return (
<StyledContainer id={id} className={className} style={style}>
<StyledContainer
id={id}
className={className}
style={style}
showText={showText}
>
<RectangleLoader
title={title}
width={width}
@ -46,4 +53,8 @@ ArticleHeaderLoader.defaultProps = {
style: undefined,
};
export default ArticleHeaderLoader;
export default inject(({ auth }) => {
return {
showText: auth.settingsStore.showText,
};
})(observer(ArticleHeaderLoader));

7
packages/common/components/Loaders/ArticleHeaderLoader/StyledArticleHeader.js
View File

@ -5,12 +5,13 @@ const StyledContainer = styled.div`
max-width: 211px;
margin-left: 1px;
@media ${tablet} {
${isMobile} {
margin-left: 0;
}
${isMobile} {
margin-left: 0;
@media ${tablet} {
${(props) => (props.showText ? "margin-left: 10px" : "margin-left:0")};
}
`;

10
packages/common/store/SettingsStore.js
View File

@ -84,7 +84,7 @@ class SettingsStore {
isHeaderVisible = false;
isTabletView = false;
showText = false;
showText = JSON.parse(localStorage.getItem("showArticle")) ?? false;
articleOpen = false;
isMobileArticle = false;
@ -392,7 +392,7 @@ class SettingsStore {
this.pluginOptions = origSettings.plugins.allow;
}
if (origSettings.tenantAlias) {
if (origSettings?.tenantAlias) {
this.setTenantAlias(origSettings.tenantAlias);
}
};
@ -650,7 +650,11 @@ class SettingsStore {
};
toggleShowText = () => {
this.showText = !this.showText;
const reverseValue = !this.showText;
localStorage.setItem("showArticle", reverseValue);
this.showText = reverseValue;
};
setArticleOpen = (articleOpen) => {