Merge pull request #8392 from ToolJet/release/marketplace-1.6

Release: Marketplace 1.6 - v2.30.0
ToolJet · Feb 16, 2024 · 97b022b · 97b022b
2 parents a010fba + 320f5ba
commit 97b022b
Show file tree

Hide file tree

Showing 351 changed files with 31,432 additions and 13,551 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.29.0
+2.30.0
diff --git a/cypress-tests/cypress/constants/texts/postgreSql.js b/cypress-tests/cypress/constants/texts/postgreSql.js
@@ -3,14 +3,14 @@ export const postgreSqlText = {
  labelAddDataSource: "+ add data source",
 
  allDataSources: () => {
- return process.env.NODE_ENV === "development"
- ? "All data sources (41)"
- : "All data sources (43)";
+ return Cypress.env("marketplace_action")
+ ? "All data sources (43)"
+ : "All data sources (41)";
  },
  allDatabase: () => {
- return process.env.NODE_ENV === "development"
- ? "Databases (17)"
- : "Databases (19)";
+ return Cypress.env("marketplace_action")
+ ? "Databases (19)"
+ : "Databases (17)";
  },
  allApis: "APIs (20)",
  allCloudStorage: "Cloud Storages (4)",

diff --git a/...tests/cypress/e2e/database/database.cy.js → .../cypress/e2e/database/database.cy.skip.js b/...tests/cypress/e2e/database/database.cy.js → .../cypress/e2e/database/database.cy.skip.js
diff --git a/cypress-tests/cypress/e2e/editor/data-source/azureBlobStorageHappyPath.cy.js b/cypress-tests/cypress/e2e/editor/data-source/azureBlobStorageHappyPath.cy.js
@@ -13,13 +13,15 @@ import { dataSourceSelector } from "Selectors/dataSource";
 import { closeDSModal, deleteDatasource } from "Support/utils/dataSource";
 
 const data = {};
-data.lastName = fake.lastName.toLowerCase().replaceAll("[^A-Za-z]", "");
 data.customText = fake.randomSentence;
 
 describe("Data source Azure Blob Storage", () => {
  beforeEach(() => {
  cy.appUILogin();
  cy.intercept("GET", "/api/v2/data_sources");
+ data.dataSourceName = fake.lastName
+ .toLowerCase()
+ .replaceAll("[^A-Za-z]", "");
  });
 
  it("Should verify elements on Azure Blob Storage connection form", () => {
@@ -48,7 +50,7 @@ describe("Data source Azure Blob Storage", () => {
  selectAndAddDataSource(
  "cloudstorage",
  azureBlobStorageText.azureBlobStorage,
- data.lastName
+ data.dataSourceName
  );
 
  // cy.get("[data-cy*='data-source-']")
@@ -97,7 +99,7 @@ describe("Data source Azure Blob Storage", () => {
  "have.text",
  "Cannot read properties of undefined (reading 'startsWith')"
  );
- deleteDatasource(`cypress-${data.lastName}-azure-blob-storage`);
+ deleteDatasource(`cypress-${data.dataSourceName}-azure-blob-storage`);
  });
 
  it("Should verify the functionality of Azure Blob Storage connection form.", () => {
@@ -110,7 +112,7 @@ describe("Data source Azure Blob Storage", () => {
  selectAndAddDataSource(
  "cloudstorage",
  azureBlobStorageText.azureBlobStorage,
- data.lastName
+ data.dataSourceName
  );
 
  fillDataSourceTextField(
@@ -155,12 +157,12 @@ describe("Data source Azure Blob Storage", () => {
 
  cy.get(commonSelectors.globalDataSourceIcon).click();
  cy.get(
- `[data-cy="cypress-${data.lastName}-azure-blob-storage-button"]`
+ `[data-cy="cypress-${data.dataSourceName}-azure-blob-storage-button"]`
  ).verifyVisibleElement(
  "have.text",
- `cypress-${data.lastName}-azure-blob-storage`
+ `cypress-${data.dataSourceName}-azure-blob-storage`
  );
 
- deleteDatasource(`cypress-${data.lastName}-azure-blob-storage`);
+ deleteDatasource(`cypress-${data.dataSourceName}-azure-blob-storage`);
  });
 });
diff --git a/cypress-tests/cypress/e2e/editor/data-source/bigqueryHappyPath.cy.js b/cypress-tests/cypress/e2e/editor/data-source/bigqueryHappyPath.cy.js
@@ -12,12 +12,14 @@ import { commonText } from "Texts/common";
 import { closeDSModal, deleteDatasource } from "Support/utils/dataSource";
 
 const data = {};
-data.lastName = fake.lastName.toLowerCase().replaceAll("[^A-Za-z]", "");
 
 describe("Data source BigQuery", () => {
  beforeEach(() => {
  cy.appUILogin();
  cy.intercept("GET", "/api/v2/data_sources");
+ data.dataSourceName = fake.lastName
+ .toLowerCase()
+ .replaceAll("[^A-Za-z]", "");
  });
 
  it("Should verify elements on BigQuery connection form", () => {
@@ -44,7 +46,11 @@ describe("Data source BigQuery", () => {
  postgreSqlText.allCloudStorage
  );
 
- selectAndAddDataSource("databases", bigqueryText.bigQuery, data.lastName);
+ selectAndAddDataSource(
+ "databases",
+ bigqueryText.bigQuery,
+ data.dataSourceName
+ );
 
  cy.get('[data-cy="label-private-key"]').verifyVisibleElement(
  "have.text",
@@ -83,14 +89,18 @@ describe("Data source BigQuery", () => {
  bigqueryText.errorInvalidEmailId
  );
  deleteDatasource(
- `cypress-${String(data.lastName).toLowerCase()}-${String(
+ `cypress-${String(data.dataSourceName).toLowerCase()}-${String(
  bigqueryText.bigQuery
  ).toLowerCase()}`
  );
  });
 
  it("Should verify the functionality of BigQuery connection form.", () => {
- selectAndAddDataSource("databases", bigqueryText.bigQuery, data.lastName);
+ selectAndAddDataSource(
+ "databases",
+ bigqueryText.bigQuery,
+ data.dataSourceName
+ );
 
  fillDataSourceTextField(
  firestoreText.privateKey,
@@ -112,9 +122,12 @@ describe("Data source BigQuery", () => {
 
  cy.get(commonSelectors.globalDataSourceIcon).click();
  cy.get(
- `[data-cy="cypress-${data.lastName}-bigquery-button"]`
- ).verifyVisibleElement("have.text", `cypress-${data.lastName}-bigquery`);
+ `[data-cy="cypress-${data.dataSourceName}-bigquery-button"]`
+ ).verifyVisibleElement(
+ "have.text",
+ `cypress-${data.dataSourceName}-bigquery`
+ );
 
- deleteDatasource(`cypress-${data.lastName}-bigquery`);
+ deleteDatasource(`cypress-${data.dataSourceName}-bigquery`);
  });
 });
diff --git a/cypress-tests/cypress/e2e/editor/data-source/clickHouseHappyPath.cy.js b/cypress-tests/cypress/e2e/editor/data-source/clickHouseHappyPath.cy.js
@@ -17,11 +17,13 @@ import {
 } from "Support/utils/postgreSql";
 
 const data = {};
-data.lastName = fake.lastName.toLowerCase().replaceAll("[^A-Za-z]", "");
 
 describe("Data sources", () => {
  beforeEach(() => {
  cy.appUILogin();
+ data.dataSourceName = fake.lastName
+ .toLowerCase()
+ .replaceAll("[^A-Za-z]", "");
  });
 
  it("Should verify elements on connection form", () => {
@@ -45,7 +47,7 @@ describe("Data sources", () => {
  postgreSqlText.allCloudStorage
  );
 
- selectAndAddDataSource("databases", "ClickHouse", data.lastName);
+ selectAndAddDataSource("databases", "ClickHouse", data.dataSourceName);
 
  // cy.get(postgreSqlSelector.dataSourceNameInputField).should(
  // //username,password,host,port,protocol,dbname,usepost, trimquery,gzip,debug,raw
@@ -122,11 +124,11 @@ describe("Data sources", () => {
  cy.get('[data-cy="connection-alert-text"]', { timeout: 60000 })
  .scrollIntoView()
  .verifyVisibleElement("have.text", "getaddrinfo ENOTFOUND undefined");
- deleteDatasource(`cypress-${data.lastName}-clickhouse`);
+ deleteDatasource(`cypress-${data.dataSourceName}-clickhouse`);
  });
 
  it("Should verify the functionality of PostgreSQL connection form.", () => {
- selectAndAddDataSource("databases", "ClickHouse", data.lastName);
+ selectAndAddDataSource("databases", "ClickHouse", data.dataSourceName);
 
  fillDataSourceTextField(
  postgreSqlText.labelHost,
@@ -162,8 +164,11 @@ describe("Data sources", () => {
  );
 
  cy.get(
- `[data-cy="cypress-${data.lastName}-clickhouse-button"]`
- ).verifyVisibleElement("have.text", `cypress-${data.lastName}-clickhouse`);
- deleteDatasource(`cypress-${data.lastName}-clickhouse`);
+ `[data-cy="cypress-${data.dataSourceName}-clickhouse-button"]`
+ ).verifyVisibleElement(
+ "have.text",
+ `cypress-${data.dataSourceName}-clickhouse`
+ );
+ deleteDatasource(`cypress-${data.dataSourceName}-clickhouse`);
  });
 });
diff --git a/cypress-tests/cypress/e2e/editor/data-source/cosmosDbHappyPath.cy.js b/cypress-tests/cypress/e2e/editor/data-source/cosmosDbHappyPath.cy.js
@@ -17,11 +17,13 @@ import {
 } from "Support/utils/postgreSql";
 
 const data = {};
-data.lastName = fake.lastName.toLowerCase().replaceAll("[^A-Za-z]", "");
 
 describe("Data sources", () => {
  beforeEach(() => {
  cy.appUILogin();
+ data.dataSourceName = fake.lastName
+ .toLowerCase()
+ .replaceAll("[^A-Za-z]", "");
  });
 
  it("Should verify elements on connection form", () => {
@@ -44,7 +46,7 @@ describe("Data sources", () => {
  "have.text",
  postgreSqlText.allCloudStorage
  );
- selectAndAddDataSource("databases", "CosmosDB", data.lastName);
+ selectAndAddDataSource("databases", "CosmosDB", data.dataSourceName);
 
  cy.get('[data-cy="label-end-point"]').verifyVisibleElement(
  "have.text",
@@ -83,11 +85,11 @@ describe("Data sources", () => {
  "have.text",
  "Invalid URL"
  );
- deleteDatasource(`cypress-${data.lastName}-cosmosdb`);
+ deleteDatasource(`cypress-${data.dataSourceName}-cosmosdb`);
  });
 
  it.only("Should verify the functionality of CosmosDB connection form.", () => {
- selectAndAddDataSource("databases", "CosmosDB", data.lastName);
+ selectAndAddDataSource("databases", "CosmosDB", data.dataSourceName);
 
  fillDataSourceTextField(
  "End point",
@@ -112,8 +114,11 @@ describe("Data sources", () => {
  );
 
  cy.get(
- `[data-cy="cypress-${data.lastName}-cosmosdb-button"]`
- ).verifyVisibleElement("have.text", `cypress-${data.lastName}-cosmosdb`);
- deleteDatasource(`cypress-${data.lastName}-cosmosdb`);
+ `[data-cy="cypress-${data.dataSourceName}-cosmosdb-button"]`
+ ).verifyVisibleElement(
+ "have.text",
+ `cypress-${data.dataSourceName}-cosmosdb`
+ );
+ deleteDatasource(`cypress-${data.dataSourceName}-cosmosdb`);
  });
 });
diff --git a/cypress-tests/cypress/e2e/editor/data-source/couchDbHappyPath.cy.js b/cypress-tests/cypress/e2e/editor/data-source/couchDbHappyPath.cy.js
@@ -18,11 +18,13 @@ import {
 } from "Support/utils/postgreSql";
 
 const data = {};
-data.lastName = fake.lastName.toLowerCase().replaceAll("[^A-Za-z]", "");
 
 describe("Data sources", () => {
  beforeEach(() => {
  cy.appUILogin();
+ data.dataSourceName = fake.lastName
+ .toLowerCase()
+ .replaceAll("[^A-Za-z]", "");
  });
 
  it("Should verify elements on CouchDB connection form", () => {
@@ -46,7 +48,7 @@ describe("Data sources", () => {
  postgreSqlText.allCloudStorage
  );
 
- selectAndAddDataSource("databases", "CouchDB", data.lastName);
+ selectAndAddDataSource("databases", "CouchDB", data.dataSourceName);
 
  cy.get(postgreSqlSelector.labelHost).verifyVisibleElement(
  "have.text",
@@ -104,11 +106,11 @@ describe("Data sources", () => {
  "have.text",
  "Invalid URL"
  );
- deleteDatasource(`cypress-${data.lastName}-couchdb`);
+ deleteDatasource(`cypress-${data.dataSourceName}-couchdb`);
  });
 
  it("Should verify the functionality of CouchDB connection form.", () => {
- selectAndAddDataSource("databases", "CouchDB", data.lastName);
+ selectAndAddDataSource("databases", "CouchDB", data.dataSourceName);
 
  fillDataSourceTextField(
  postgreSqlText.labelHost,
@@ -145,8 +147,11 @@ describe("Data sources", () => {
  );
 
  cy.get(
- `[data-cy="cypress-${data.lastName}-couchdb-button"]`
- ).verifyVisibleElement("have.text", `cypress-${data.lastName}-couchdb`);
- deleteDatasource(`cypress-${data.lastName}-couchdb`);
+ `[data-cy="cypress-${data.dataSourceName}-couchdb-button"]`
+ ).verifyVisibleElement(
+ "have.text",
+ `cypress-${data.dataSourceName}-couchdb`
+ );
+ deleteDatasource(`cypress-${data.dataSourceName}-couchdb`);
  });
 });
diff --git a/cypress-tests/cypress/e2e/editor/data-source/dynamoDbHappyPath.cy.js b/cypress-tests/cypress/e2e/editor/data-source/dynamoDbHappyPath.cy.js
@@ -16,11 +16,13 @@ import {
 } from "Support/utils/dataSource";
 
 const data = {};
-data.lastName = fake.lastName.toLowerCase().replaceAll("[^A-Za-z]", "");
 
 describe("Data source DynamoDB", () => {
  beforeEach(() => {
  cy.appUILogin();
+ data.dataSourceName = fake.lastName
+ .toLowerCase()
+ .replaceAll("[^A-Za-z]", "");
  });
 
  it("Should verify elements on DynamoDB connection form", () => {
@@ -44,7 +46,11 @@ describe("Data source DynamoDB", () => {
  postgreSqlText.allCloudStorage
  );
 
- selectAndAddDataSource("databases", dynamoDbText.dynamoDb, data.lastName);
+ selectAndAddDataSource(
+ "databases",
+ dynamoDbText.dynamoDb,
+ data.dataSourceName
+ );
 
  cy.get('[data-cy="label-region"]').verifyVisibleElement(
  "have.text",
@@ -90,11 +96,15 @@ describe("Data source DynamoDB", () => {
  "have.text",
  dynamoDbText.errorMissingRegion
  );
- deleteDatasource(`cypress-${data.lastName}-dynamodb`);
+ deleteDatasource(`cypress-${data.dataSourceName}-dynamodb`);
  });
 
  it("Should verify the functionality of DynamoDB connection form.", () => {
- selectAndAddDataSource("databases", dynamoDbText.dynamoDb, data.lastName);
+ selectAndAddDataSource(
+ "databases",
+ dynamoDbText.dynamoDb,
+ data.dataSourceName
+ );
 
  cy.get('[data-cy="label-region"]')
  .parent()
@@ -147,9 +157,12 @@ describe("Data source DynamoDB", () => {
  );
 
  cy.get(
- `[data-cy="cypress-${data.lastName}-dynamodb-button"]`
- ).verifyVisibleElement("have.text", `cypress-${data.lastName}-dynamodb`);
+ `[data-cy="cypress-${data.dataSourceName}-dynamodb-button"]`
+ ).verifyVisibleElement(
+ "have.text",
+ `cypress-${data.dataSourceName}-dynamodb`
+ );
 
- deleteDatasource(`cypress-${data.lastName}-dynamodb`);
+ deleteDatasource(`cypress-${data.dataSourceName}-dynamodb`);
  });
 });
diff --git a/cypress-tests/cypress/e2e/editor/data-source/elasticsearchHappyPath.cy.js b/cypress-tests/cypress/e2e/editor/data-source/elasticsearchHappyPath.cy.js
@@ -15,11 +15,10 @@ import {
 } from "Support/utils/dataSource";
 
 const data = {};
-data.lastName = fake.lastName.toLowerCase().replaceAll("[^A-Za-z]", "");
-
 describe("Data source Elasticsearch", () => {
  beforeEach(() => {
  cy.appUILogin();
+ data.lastName = fake.lastName.toLowerCase().replaceAll("[^A-Za-z]", "");
  });
 
  it("Should verify elements on Elasticsearch connection form", () => {