Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-06 06:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

showModal handler won't crash when no modalId (#973)

Browse source 
* showModal handler won't crash when no modalId

* Fix empty modalId check
This commit is contained in:
Dainius Lukša 2021-10-12 12:44:42 +03:00 committed by GitHub
parent 32fdac513c
commit b6c55cc6dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,6 +98,11 @@ async function copyToClipboard(text) {
}
function showModal(_ref, modalId, show) {
if (_.isEmpty(modalId)) {
console.log('No modal is associated with this event.');
return Promise.resolve();
}
const modalMeta = _ref.state.appDefinition.components[modalId];
const newState = {
@ -115,9 +120,7 @@ function showModal(_ref, modalId, show) {
_ref.setState(newState);
return new Promise(function (resolve, reject) {
resolve();
});
return Promise.resolve();
}
function executeAction(_ref, event, mode) {
@ -126,9 +129,7 @@ function executeAction(_ref, event, mode) {
case 'show-alert': {
const message = resolveReferences(event.message, _ref.state.currentState);
toast(message, { hideProgressBar: true, type: event.alertType });
return new Promise(function (resolve, reject) {
resolve();
});
return Promise.resolve();
}
case 'run-query': {
@ -139,9 +140,7 @@ function executeAction(_ref, event, mode) {
case 'open-webpage': {
const url = resolveReferences(event.url, _ref.state.currentState);
window.open(url, '_blank');
return new Promise(function (resolve, reject) {
resolve();
});
return Promise.resolve();
}
case 'go-to-app': {
@ -174,9 +173,7 @@ function executeAction(_ref, event, mode) {
window.open(url, '_blank');
}
}
return new Promise(function (resolve, reject) {
resolve();
});
return Promise.resolve();
}
case 'show-modal':
@ -189,9 +186,7 @@ function executeAction(_ref, event, mode) {
const contentToCopy = resolveReferences(event.contentToCopy, _ref.state.currentState);
copyToClipboard(contentToCopy);
return new Promise(function (resolve, reject) {
resolve();
});
return Promise.resolve();
}
}
}