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 5

Merge pull request #12721 from ToolJet/fix/run-query-preview-update

Browse source 
Fix/run query preview update
This commit is contained in:
Johnson Cherian 2025-05-07 16:35:09 +05:30 committed by GitHub
commit 80c6029ea5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cypress-tests/cypress/commands/apiCommands.js
View file

@ -689,7 +689,7 @@ Cypress.Commands.add(
name: dataSourceName,
options: [
{ key: "connection_type", value: "manual", encrypted: false },
{ key: "host", value: "35.238.9.114" },
{ key: "host", value: "9.234.17.31" },
{ key: "port", value: 5432 },
{ key: "database", value: "student" },
{ key: "username", value: "postgres" },

5
cypress-tests/cypress/e2e/happyPath/platform/ceTestcases/workspace/workspaceConstants.cy.js
View file

@ -80,8 +80,8 @@ describe("Workspace constants", () => {
addNewconstants("restapiHeaderKey", "customHeader");
addNewconstants("restapiHeaderValue", "key=value");
addNewconstants("deleteConst", "deleteconst");
addNewconstants("gconst", "236");
addNewconstants("gconstUrl", "http://34.66.166.236:4000/");
addNewconstants("gconst", "108");
addNewconstants("gconstUrl", "http://20.29.40.108:4000/");
addNewconstants("gconstEndpoint", "production");
// create secret constants
@ -118,6 +118,7 @@ describe("Workspace constants", () => {
//Verify all static and datasource queries output in components
for (let i = 3; i <= 16; i++) {
cy.log("Verifying textinput" + i);
cy.get(commonWidgetSelector.draggableWidget(`textinput${i}`))
.verifyVisibleElement("have.value", "Production environment testing");
}

15
cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/groups/basicPermissions.cy.js → cypress-tests/cypress/e2e/happyPath/platform/commonTestcases/workspace/groups/basicPermissions.skip.js
View file

@ -78,14 +78,16 @@ describe("Manage Groups", () => {
cy.createApp(data.appName);
cy.verifyToastMessage(
commonSelectors.toastMessage,
commonText.appCreatedToast
commonText.appCreatedToast,
false
);
cy.backToApps();
cy.deleteApp(data.appName);
cy.verifyToastMessage(
commonSelectors.toastMessage,
commonText.appDeletedToast
commonText.appDeletedToast,
false
);
// Folder operations
@ -115,7 +117,8 @@ describe("Manage Groups", () => {
cy.get(commonSelectors.cloneAppButton).click();
cy.verifyToastMessage(
commonSelectors.toastMessage,
dashboardText.appClonedToast
dashboardText.appClonedToast,
false
);
// cy.get(commonSelectors.cancelButton).click();
cy.apiLogout();
@ -177,14 +180,16 @@ describe("Manage Groups", () => {
cy.createApp(data.appName);
cy.verifyToastMessage(
commonSelectors.toastMessage,
commonText.appCreatedToast
commonText.appCreatedToast,
false
);
cy.backToApps();
cy.deleteApp(data.appName);
cy.verifyToastMessage(
commonSelectors.toastMessage,
commonText.appDeletedToast
commonText.appDeletedToast,
false
);
// Folder operations

2
cypress-tests/cypress/fixtures/templates/invalid_app.json
View file

@ -2127,7 +2127,7 @@
"encrypted": false
},
"host": {
"value": "35.238.9.114",
"value": "9.234.17.31",
"encrypted": false
},
"port": {

2
cypress-tests/cypress/fixtures/templates/one_version.json
View file

@ -585,7 +585,7 @@
"encrypted": false
},
"host": {
"value": "35.238.9.114",
"value": "9.234.17.31",
"encrypted": false
},
"port": {

2
cypress-tests/cypress/fixtures/templates/three-versions.json
View file

@ -1862,7 +1862,7 @@
"encrypted": false
},
"host": {
"value": "35.238.9.114",
"value": "9.234.17.31",
"encrypted": false
},
"port": {

12
cypress-tests/cypress/fixtures/templates/workspace_constants.json
View file

@ -2766,7 +2766,7 @@
"name": "restapiStaticUrlG",
"options": {
"method": "get",
"url": "http://34.66.166.236:4000/{{constants.gconstEndpoint}}",
"url": "http://20.29.40.108:4000/{{constants.gconstEndpoint}}",
"url_params": [
[
"",
@ -2814,7 +2814,7 @@
"name": "restapiUrlS",
"options": {
"method": "get",
"url": "http://34.66.166.236:4000/{{secrets.sconstEndpoint}}",
"url": "http://20.29.40.108:4000/{{secrets.sconstEndpoint}}",
"url_params": [
[
"",
@ -2908,7 +2908,7 @@
"name": "restapiUrlGS",
"options": {
"method": "get",
"url": "http://34.66.166.{{constants.gconst}}{{secrets.sconst}}/production",
"url": "http://20.29.40.{{constants.gconst}}{{secrets.sconst}}/production",
"url_params": [
[
"",
@ -3419,7 +3419,7 @@
"environmentId": "dab04b8d-7d1a-468a-b219-b2e1d0169d8c",
"options": {
"url": {
"value": "http://34.66.166.236:4000/{{constants.gconstEndpoint}}",
"value": "http://20.29.40.108:4000/{{constants.gconstEndpoint}}",
"encrypted": false
},
"auth_type": {
@ -3540,7 +3540,7 @@
"environmentId": "dab04b8d-7d1a-468a-b219-b2e1d0169d8c",
"options": {
"url": {
"value": "http://34.66.166.236:4000/{{secrets.sconstEndpoint}}",
"value": "http://20.29.40.108:4000/{{secrets.sconstEndpoint}}",
"encrypted": false
},
"auth_type": {
@ -3782,7 +3782,7 @@
"environmentId": "dab04b8d-7d1a-468a-b219-b2e1d0169d8c",
"options": {
"url": {
"value": "http://34.66.166.{{constants.gconst}}{{secrets.sconst}}/production",
"value": "http://20.29.40.{{constants.gconst}}{{secrets.sconst}}/production",
"encrypted": false
},
"auth_type": {

2
frontend/src/AppBuilder/QueryManager/Components/QueryManagerHeader.jsx
View file

@ -254,7 +254,7 @@ const RunButton = ({ buttonLoadingState }) => {
<ButtonComponent
size="medium"
variant="secondary"
onClick={() => runQuery(selectedQuery?.id, selectedQuery?.name, undefined, 'edit', {}, true)}
onClick={() => runQuery(selectedQuery?.id, selectedQuery?.name, undefined, 'edit', {}, true, undefined, true)}
leadingIcon="play01"
disabled={isInDraft}
isLoading={isLoading}