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

fixes: page load events for viewer

Browse source
This commit is contained in:
arpitnath 2023-09-24 22:49:55 +05:30
parent aa632e3070
commit f3452bbbbb
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
frontend/src/Editor/Viewer.jsx
View file

@ -196,7 +196,7 @@ class ViewerComponent extends React.Component {
dataQueries: dataQueries,
currentPageId: currentPage.id,
homepage: appDefData?.pages?.[this.state.appDefinition?.homePageId]?.handle,
event: data.events ?? [],
events: data.events ?? [],
},
() => {
const components = appDefData?.pages[currentPageId]?.components || {};
@ -205,11 +205,14 @@ class ViewerComponent extends React.Component {
this.setState({ initialComputationOfStateDone: true, defaultComponentStateComputed: true });
console.log('Default component state computed and set');
this.runQueries(dataQueries);
// eslint-disable-next-line no-unsafe-optional-chaining
// const { events } = this.state.appDefinition?.pages[this.state.currentPageId];
// for (const event of events ?? []) {
// await this.handleEvent(event.eventId, event);
// }
const currentPageEvents = this.state.events.filter(
(event) => event.target === 'page' && event.sourceId === this.state.currentPageId
);
for (const currentEvent of currentPageEvents ?? []) {
await this.handleEvent(currentEvent.name, currentPageEvents);
}
});
}
);
@ -477,17 +480,9 @@ class ViewerComponent extends React.Component {
const currentPageEvents = this.state.events.filter(
(event) => event.target === 'page' && event.sourceId === this.state.currentPageId
);
const viewerRef = {
appDefinition: this.state.appDefinition,
queryConfirmationList: this.state.queryConfirmationList,
updateQueryConfirmationList: null,
navigate: this.props.navigate,
switchPage: this.switchPage,
currentPageId: currentPageId,
};
for (const currentEvent of currentPageEvents ?? []) {
await this.handleEvent(viewerRef, event.eventId, currentEvent.name, currentPageEvents);
await this.handleEvent(currentEvent.name, currentPageEvents);
}
});
}
@ -552,7 +547,7 @@ class ViewerComponent extends React.Component {
);
};
handleEvent = (eventName, event, options) => {
handleEvent = (eventName, events, options) => {
const { appDefinition, queryConfirmationList, currentPageId } = this.state;
const viewerRef = {
appDefinition: appDefinition,
@ -563,7 +558,7 @@ class ViewerComponent extends React.Component {
currentPageId: currentPageId,
};
onEvent(viewerRef, eventName, event, options, 'view');
onEvent(viewerRef, eventName, events, options, 'view');
};
computeCanvasMaxWidth = () => {