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

Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces

Browse Source
This commit is contained in:
Nikita Gopienko 2021-03-10 16:44:35 +03:00
commit b88d1d989c
1 changed files with 40 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
View File

@ -104,7 +104,6 @@ class Customization extends React.Component {
setDocumentTitle(t("Customization")); setDocumentTitle(t("Customization"));
this.state = { this.state = {
isLoadedData: false,
isLoading: false, isLoading: false,
timezones, timezones,
timezone: findSelectedItemByKey( timezone: findSelectedItemByKey(
@ -129,7 +128,7 @@ class Customization extends React.Component {
t, t,
getPortalTimezones, getPortalTimezones,
} = this.props; } = this.props;
const { timezones, languages, isLoadedData } = this.state; const { timezones, languages } = this.state;
if (!timezones.length && !languages.length) { if (!timezones.length && !languages.length) {
let languages; let languages;
@ -148,19 +147,11 @@ class Customization extends React.Component {
this.setState({ languages, language, timezones, timezone }); this.setState({ languages, language, timezones, timezone });
}); });
} }
if (timezones.length && languages.length && !isLoadedData) {
this.setState({ isLoadedData: true });
}
} }
componentDidUpdate(prevProps, prevState) { componentDidUpdate(prevProps) {
const { timezones, languages } = this.state;
const { i18n, language, nameSchemaId, getCurrentCustomSchema } = this.props; const { i18n, language, nameSchemaId, getCurrentCustomSchema } = this.props;
if (timezones.length && languages.length && !prevState.isLoadedData) {
this.setState({ isLoadedData: true });
}
if (language !== prevProps.language) { if (language !== prevProps.language) {
changeLanguage(i18n) changeLanguage(i18n)
.then((t) => { .then((t) => {
@ -211,51 +202,47 @@ class Customization extends React.Component {
render() { render() {
const { t } = this.props; const { t } = this.props;
const { isLoadedData, language, timezone } = this.state; const { language, timezone } = this.state;
return !isLoadedData ? ( return (
<Loader className="pageLoader" type="rombs" size="40px" /> <StyledComponent>
) : ( <div className="category-item-wrapper">
<> <div className="category-item-heading">
<StyledComponent> <Link
<div className="category-item-wrapper"> className="inherit-title-link header"
<div className="category-item-heading"> onClick={this.onClickLink}
<Link truncate={true}
className="inherit-title-link header" href="/settings/common/customization/language-and-time-zone"
onClick={this.onClickLink} >
truncate={true} {t("StudioTimeLanguageSettings")}
href="/settings/common/customization/language-and-time-zone" </Link>
> <StyledArrowRightIcon size="small" color="#333333" />
{t("StudioTimeLanguageSettings")}
</Link>
<StyledArrowRightIcon size="small" color="#333333" />
</div>
{language && language.label && timezone && timezone.label && (
<Text className="category-item-subheader" truncate={true}>
{`${language.label} / ${timezone.label}`}
</Text>
)}
<Text className="category-item-description">
{t("LanguageAndTimeZoneSettingsDescription")}
</Text>
</div> </div>
<div className="category-item-wrapper"> {language && language.label && timezone && timezone.label && (
<div className="category-item-heading"> <Text className="category-item-subheader" truncate={true}>
<Link {`${language.label} / ${timezone.label}`}
truncate={true}
className="inherit-title-link header"
onClick={this.onClickLink}
href="/settings/common/customization/custom-titles"
>
{t("CustomTitles")}
</Link>
<StyledArrowRightIcon size="small" color="#333333" />
</div>
<Text className="category-item-description">
{t("CustomTitlesSettingsDescription")}
</Text> </Text>
)}
<Text className="category-item-description">
{t("LanguageAndTimeZoneSettingsDescription")}
</Text>
</div>
<div className="category-item-wrapper">
<div className="category-item-heading">
<Link
truncate={true}
className="inherit-title-link header"
onClick={this.onClickLink}
href="/settings/common/customization/custom-titles"
>
{t("CustomTitles")}
</Link>
<StyledArrowRightIcon size="small" color="#333333" />
</div> </div>
</StyledComponent> <Text className="category-item-description">
</> {t("CustomTitlesSettingsDescription")}
</Text>
</div>
</StyledComponent>
); );
} }
} }