Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 17:08:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: fixed api call for globals

Browse source
This commit is contained in:
johnsoncherian 2024-10-28 17:04:05 +05:30
parent bf8fd0f861
commit 19c0f41ac8
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/AppBuilder/_hooks/useAppData.js
View file

@ -163,7 +163,7 @@ const useAppData = (appId, moduleId, mode = 'edit', { environmentId, versionId }
}
const constantsResp = isPublicAccess
? await orgEnvironmentConstantService.getConstantsFromPublicApp(slug)
: await orgEnvironmentConstantService.getConstantsFromEnvironment(editorEnvironmentId);
: await orgEnvironmentConstantService.getConstantsFromApp();
const pages = appData.pages.map((page) => {
return page;
@ -190,7 +190,7 @@ const useAppData = (appId, moduleId, mode = 'edit', { environmentId, versionId }
);
setPages(pages, moduleId);
setPageSettings(deepCamelCase(appData?.editing_version?.page_settings || appData?.page_settings));
setPageSettings(deepCamelCase(appData?.editing_version?.page_settings));
// set starting page as homepage initially
let startingPage = appData.pages.find((page) => page.id === homePageId);
@ -236,11 +236,13 @@ const useAppData = (appId, moduleId, mode = 'edit', { environmentId, versionId }
const orgSecrets = {};
constants.map((constant) => {
if (constant.type !== 'Secret') {
orgConstants[constant.name] = constant.value;
orgConstants[constant.name] =
constant.value || constant.values?.find((v) => v.environmentName === 'production').value;
} else {
orgSecrets[constant.name] = constant.value;
}
});
setResolvedConstants(orgConstants);
setSecrets(orgSecrets);
}