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: constants resolving after initial editor load

Browse source
This commit is contained in:
arpitnath 2024-05-24 13:36:31 +05:30
parent 41e6a234c0
commit f21450fc5e
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/Editor/Editor.jsx
View file

@ -527,7 +527,6 @@ const EditorComponent = (props) => {
props.setEditorOrViewer('editor'); props.setEditorOrViewer('editor');
await runForInitialLoad(); await runForInitialLoad();
await fetchOrgEnvironmentVariables(); await fetchOrgEnvironmentVariables();
await fetchOrgEnvironmentConstants();
initComponentVersioning(); initComponentVersioning();
initRealtimeSave(); initRealtimeSave();
initEventListeners(); initEventListeners();
@ -750,7 +749,7 @@ const EditorComponent = (props) => {
setWindowTitle({ page: pageTitles.EDITOR, appName }); setWindowTitle({ page: pageTitles.EDITOR, appName });
useAppVersionStore.getState().actions.updateEditingVersion(editing_version); useAppVersionStore.getState().actions.updateEditingVersion(editing_version);
current_version_id && useAppVersionStore.getState().actions.updateReleasedVersionId(current_version_id); current_version_id && useAppVersionStore.getState().actions.updateReleasedVersionId(current_version_id);
await fetchOrgEnvironmentConstants();
updateState({ updateState({
slug, slug,
isMaintenanceOn, isMaintenanceOn,

18
frontend/src/_stores/resolverStore.js
View file

@ -98,8 +98,22 @@ export const useResolveStore = create(
const { suggestionList, hintsMap, resolvedRefs } = createReferencesLookup(partialRefState); const { suggestionList, hintsMap, resolvedRefs } = createReferencesLookup(partialRefState);
const lookupHintsMap = new Map([...get().lookupTable.hints]); const _hintsMap = get().lookupTable.hints;
const lookupResolvedRefs = new Map([...get().lookupTable.resolvedRefs]); const resolvedRefsMap = get().lookupTable.resolvedRefs;
let lookupHintsMap, lookupResolvedRefs;
if (_hintsMap.size > 0) {
lookupHintsMap = new Map([..._hintsMap]);
} else {
lookupHintsMap = new Map();
}
if (resolvedRefsMap.size > 0) {
lookupResolvedRefs = new Map([...resolvedRefsMap]);
} else {
lookupResolvedRefs = new Map();
}
const newUpdatedrefs = []; const newUpdatedrefs = [];