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: page switch via validateRoutes

Browse source
This commit is contained in:
arpitnath 2023-10-23 20:25:26 +05:30
parent d9ce23aaf6
commit 908e7dee6c
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -717,7 +717,11 @@ const EditorComponent = (props) => {
}); });
if (versionSwitched) { if (versionSwitched) {
props?.navigate(`/${getWorkspaceId()}/apps/${appId}/${appJson.pages[homePageId]?.handle}`); props?.navigate(`/${getWorkspaceId()}/apps/${appId}/${appJson.pages[homePageId]?.handle}`, {
state: {
isSwitchingPage: true,
},
});
} }
await useDataSourcesStore.getState().actions.fetchGlobalDataSources(data?.organization_id); await useDataSourcesStore.getState().actions.fetchGlobalDataSources(data?.organization_id);
@ -1295,7 +1299,11 @@ const EditorComponent = (props) => {
switchPage: true, switchPage: true,
pageId: newPageId, pageId: newPageId,
}); });
props?.navigate(`/${getWorkspaceId()}/apps/${appId}/${newHandle}`); props?.navigate(`/${getWorkspaceId()}/apps/${appId}/${newHandle}`, {
state: {
isSwitchingPage: true,
},
});
}; };
const switchPage = (pageId, queryParams = []) => { const switchPage = (pageId, queryParams = []) => {
@ -1314,7 +1322,11 @@ const EditorComponent = (props) => {
const copyOfAppDefinition = JSON.parse(JSON.stringify(appDefinition)); const copyOfAppDefinition = JSON.parse(JSON.stringify(appDefinition));
const queryParamsString = queryParams.map(([key, value]) => `${key}=${value}`).join('&'); const queryParamsString = queryParams.map(([key, value]) => `${key}=${value}`).join('&');
props?.navigate(`/${getWorkspaceId()}/apps/${appId}/${handle}?${queryParamsString}`); props?.navigate(`/${getWorkspaceId()}/apps/${appId}/${handle}?${queryParamsString}`, {
state: {
isSwitchingPage: true,
},
});
const { globals: existingGlobals } = currentState; const { globals: existingGlobals } = currentState;