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

21
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"));
this.state = {
isLoadedData: false,
isLoading: false,
timezones,
timezone: findSelectedItemByKey(
@ -129,7 +128,7 @@ class Customization extends React.Component {
t,
getPortalTimezones,
} = this.props;
const { timezones, languages, isLoadedData } = this.state;
const { timezones, languages } = this.state;
if (!timezones.length && !languages.length) {
let languages;
@ -148,19 +147,11 @@ class Customization extends React.Component {
this.setState({ languages, language, timezones, timezone });
});
}
if (timezones.length && languages.length && !isLoadedData) {
this.setState({ isLoadedData: true });
}
}
componentDidUpdate(prevProps, prevState) {
const { timezones, languages } = this.state;
componentDidUpdate(prevProps) {
const { i18n, language, nameSchemaId, getCurrentCustomSchema } = this.props;
if (timezones.length && languages.length && !prevState.isLoadedData) {
this.setState({ isLoadedData: true });
}
if (language !== prevProps.language) {
changeLanguage(i18n)
.then((t) => {
@ -211,11 +202,8 @@ class Customization extends React.Component {
render() {
const { t } = this.props;
const { isLoadedData, language, timezone } = this.state;
return !isLoadedData ? (
<Loader className="pageLoader" type="rombs" size="40px" />
) : (
<>
const { language, timezone } = this.state;
return (
<StyledComponent>
<div className="category-item-wrapper">
<div className="category-item-heading">
@ -255,7 +243,6 @@ class Customization extends React.Component {
</Text>
</div>
</StyledComponent>
</>
);
}
}