Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes: global settings updates

Browse source
This commit is contained in:
arpitnath 2023-08-07 01:57:53 +05:30
parent 690bd8f260
commit e556715e5f
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
frontend/src/Editor/EditorFunc.jsx
View file

@ -602,21 +602,28 @@ const EditorComponent = (props) => {
const handleEditorMarginLeftChange = (value) => setEditorMarginLeft(value);
const globalSettingsChanged = (key, value) => {
if (value?.[1]?.a == undefined) appDefinition.globalSettings[key] = value;
const copyOfAppDefinition = JSON.parse(JSON.stringify(appDefinition));
const newAppDefinition = _.cloneDeep(copyOfAppDefinition);
if (value?.[1]?.a == undefined) newAppDefinition.globalSettings[key] = value;
else {
const hexCode = `${value?.[0]}${decimalToHex(value?.[1]?.a)}`;
appDefinition.globalSettings[key] = hexCode;
newAppDefinition.globalSettings[key] = hexCode;
}
updateEditorState({
isSaving: true,
appDefinition,
// appDefinition,
});
props.ymap?.set('appDef', {
newDefinition: appDefinition,
editingVersionId: props.editingVersion?.id,
appDefinitionChanged(newAppDefinition, {
globalSettings: true,
});
// props.ymap?.set('appDef', {
// newDefinition: appDefinition,
// editingVersionId: props.editingVersion?.id,
// });
// autoSave();
};
@ -747,7 +754,7 @@ const EditorComponent = (props) => {
updatedAppDefinition.homePageId = newDefinition.homePageId;
}
if (opts?.generalAppDefinitionChanged) {
if (opts?.generalAppDefinitionChanged || opts?.globalSettings) {
updatedAppDefinition = newDefinition;
}
@ -768,6 +775,10 @@ const EditorComponent = (props) => {
});
updateAppDefinitionDiff(diffPatches);
computeComponentState(updatedAppDefinition.pages[currentPageId]?.components);
props.ymap?.set('appDef', {
newDefinition: updatedAppDefinition,
editingVersionId: props.editingVersion?.id,
});
}
};