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

fixes: page switch action via runjs actions (#7762)

Browse source
This commit is contained in:
Arpit 2023-10-11 13:37:18 +05:30 committed by GitHub
parent 1e772c04f7
commit cdd3411e7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1268,14 +1268,12 @@ const EditorComponent = (props) => {
};
const switchPage = (pageId, queryParams = []) => {
// document.getElementById('real-canvas').scrollIntoView();
if (currentPageId === pageId && currentState.page.handle === appDefinition?.pages[pageId]?.handle) {
return;
}
const { name, handle } = appDefinition.pages[pageId];
if (!name || !handle) return;
const copyOfAppDefinition = JSON.parse(JSON.stringify(appDefinition));
const queryParamsString = queryParams.map(([key, value]) => `${key}=${value}`).join('&');

1
frontend/src/_helpers/appUtils.js
View file

@ -585,6 +585,7 @@ function executeActionWithDebounce(_ref, event, mode, customVariables) {
case 'switch-page': {
const { name, disabled } = _ref.appDefinition.pages[event.pageId];
// Don't allow switching to disabled page in editor as well as viewer
if (!disabled) {
_ref.switchPage(event.pageId, resolveReferences(event.queryParams, getCurrentState(), [], customVariables));

2
frontend/src/_helpers/utils.js
View file

@ -743,7 +743,7 @@ export const generateAppActions = (_ref, queryId, mode, isPreview = false) => {
});
return Promise.resolve();
}
const pages = _ref.state.appDefinition.pages;
const pages = _ref.appDefinition.pages;
const pageId = Object.keys(pages).find((key) => pages[key].handle === pageHandle);
if (!pageId) {