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

Web: PortalSettings: fix customization fields

Browse Source
This commit is contained in:
Elyor Djalilov 2023-02-20 20:17:51 +05:00
parent b533569a7d
commit 2ab948e50c
6 changed files with 45 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
View File

@ -81,6 +81,7 @@ class LanguageAndTimeZone extends React.Component {
const {
i18n,
language,
timezone,
rawTimezones,
portalTimeZoneId,
isLoaded,
@ -147,27 +148,17 @@ class LanguageAndTimeZone extends React.Component {
});
}
settingNames.forEach((settingName) => {
const valueFromSessionStorage = getFromSessionStorage(settingName);
if (
valueFromSessionStorage &&
!this.settingIsEqualInitialValue(settingName, valueFromSessionStorage)
) {
const defaultValue = this.state[settingName + "Default"];
this.setState({ [settingName]: defaultValue });
saveToSessionStorage(settingName, "");
}
});
if (!languageDefault) {
this.setState({
languageDefault: language,
});
}
if (timezoneDefault && languageDefault) {
if (timezoneDefault || timezone) {
this.checkChanges();
}
if (languageDefault || language) {
this.checkChanges();
}
}
@ -341,14 +332,14 @@ class LanguageAndTimeZone extends React.Component {
onCancelClick = () => {
settingNames.forEach((settingName) => {
const valueFromSessionStorage = getFromSessionStorage(settingName);
if (
valueFromSessionStorage &&
valueFromSessionStorage !== "none" &&
valueFromSessionStorage !== null &&
!this.settingIsEqualInitialValue(settingName, valueFromSessionStorage)
) {
const defaultValue = this.state[settingName + "Default"];
this.setState({ [settingName]: defaultValue });
this.setState({ [settingName]: defaultValue || null });
saveToSessionStorage(settingName, "");
}
});

6
packages/client/src/pages/PortalSettings/categories/common/Customization/portal-renaming.js
View File

@ -19,6 +19,7 @@ import { saveToSessionStorage, getFromSessionStorage } from "../../../utils";
import { setDocumentTitle } from "SRC_DIR/helpers/utils";
import LoaderCustomization from "../sub-components/loaderCustomization";
import withLoading from "SRC_DIR/HOCs/withLoading";
const PortalRenaming = (props) => {
const {
t,
@ -75,11 +76,6 @@ const PortalRenaming = (props) => {
const [domainValidator, setDomainValidator] = useState(null);
useEffect(() => {
if (portalNameFromSessionStorage !== portalNameDefaultFromSessionStorage) {
setPortalName(portalNameDefault);
saveToSessionStorage("portalName", "none");
setErrorValue(null);
}
getAllSettings().then((res) => {
setDomainValidator(res.domainValidator);
});

14
packages/client/src/pages/PortalSettings/categories/common/Customization/welcome-page-settings.js
View File

@ -70,8 +70,6 @@ class WelcomePageSettings extends React.Component {
tReady,
initSettings,
setIsLoaded,
restoreGreetingTitle,
greetingSettings,
} = this.props;
const { greetingTitleDefault, greetingTitle } = this.state;
@ -87,18 +85,6 @@ class WelcomePageSettings extends React.Component {
if (greetingTitleDefault || greetingTitle) {
this.checkChanges();
}
if (greetingTitleDefaultFromSessionStorage !== greetingTitleFromSessionStorage) {
restoreGreetingTitle().then(() => {
this.setState({
greetingTitle: greetingSettings,
greetingTitleDefault: greetingSettings,
showReminder: false,
});
saveToSessionStorage("greetingTitle", "none");
saveToSessionStorage("greetingTitleDefault", "none");
});
}
}
componentDidUpdate(prevProps, prevState) {

5
packages/client/src/pages/PortalSettings/categories/security/index.js
View File

@ -12,6 +12,7 @@ import LoginHistory from "./login-history/index.js";
import MobileSecurityLoader from "./sub-components/loaders/mobile-security-loader";
import AccessLoader from "./sub-components/loaders/access-loader";
import AuditTrail from "./audit-trail/index.js";
import { resetSessionStorage } from "./../../utils";
import { isMobile } from "react-device-detect";
@ -43,6 +44,10 @@ const SecurityWrapper = (props) => {
setIsLoading(true);
};
useEffect(() => {
resetSessionStorage();
}, []);
useEffect(() => {
const path = location.pathname;
const currentTab = data.findIndex((item) => path.includes(item.id));

1
packages/client/src/pages/PortalSettings/utils/index.js
View File

@ -11,3 +11,4 @@ export { getSettingsIndex } from "./getSettingsIndex";
export { getFromLocalStorage } from "./getFromLocalStorage.js";
export { saveToLocalStorage } from "./saveToLocalStorage.js";
export { removeLocalStorage } from "./removeLocalStorage.js";
export { resetSessionStorage } from "./resetSessionStorage";

29
packages/client/src/pages/PortalSettings/utils/resetSessionStorage.js Normal file
View File

@ -0,0 +1,29 @@
import { saveToSessionStorage, getFromSessionStorage } from "../utils";
export const resetSessionStorage = () => {
const portalNameFromSessionStorage = getFromSessionStorage("portalName");
const portalNameDefaultFromSessionStorage = getFromSessionStorage("portalNameDefault");
const greetingTitleFromSessionStorage = getFromSessionStorage("greetingTitle");
const greetingTitleDefaultFromSessionStorage = getFromSessionStorage("greetingTitleDefault");
const languageFromSessionStorage = getFromSessionStorage("language");
const languageDefaultFromSessionStorage = getFromSessionStorage("languageDefault");
const timezoneFromSessionStorage = getFromSessionStorage("timezone");
const timezoneDefaultFromSessionStorage = getFromSessionStorage("timezoneDefault");
if (portalNameFromSessionStorage !== portalNameDefaultFromSessionStorage) {
saveToSessionStorage("portalName", "none");
saveToSessionStorage("errorValue", null);
}
if (greetingTitleFromSessionStorage !== greetingTitleDefaultFromSessionStorage) {
saveToSessionStorage("greetingTitle", "none");
saveToSessionStorage("greetingTitleDefault", "none");
}
if (languageFromSessionStorage !== languageDefaultFromSessionStorage) {
saveToSessionStorage("language", "");
}
if (timezoneFromSessionStorage !== timezoneDefaultFromSessionStorage) {
saveToSessionStorage("timezone", "");
}
};