Skip to content

Commit c4e4ce3

Browse files
btsghbtsgh
authored
Merge pull request #36985 from appsmithorg/release
21/10 Daily Promotion
2 parents 0a66486 + 631abe8 commit c4e4ce3

File tree

642 files changed

+15932
-13798
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

642 files changed

+15932
-13798
lines changed

‎app/client/cypress/e2e/GSheet/AllAccess_Spec.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ let appName = "gsheet-app";
1717
let spreadSheetName = "test-sheet";
1818
describe.skip(
1919
"GSheet-Functional Tests With All Access",
20-
{ tags: ["@tag.Datasource", "@tag.GSheet"] },
20+
{
21+
tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
22+
},
2123
function () {
2224
before("Setup app and spreadsheet", function () {
2325
//Add a new app and an add new spreadsheet query

‎app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ let appName = "gsheet-app";
2323
let spreadSheetName = "test-sheet";
2424
describe.skip(
2525
"GSheet Miscellaneous Tests",
26-
{ tags: ["@tag.Datasource", "@tag.GSheet"] },
26+
{
27+
tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
28+
},
2729
function () {
2830
const columnHeaders = [
2931
"uniq_id",

‎app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ import {
1313

1414
describe.skip(
1515
"GSheet-Functional Tests With Read/Write Access",
16-
{ tags: ["@tag.Datasource", "@tag.GSheet"] },
16+
{
17+
tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
18+
},
1719
function () {
1820
const workspaceName = "gsheet apps";
1921
const dataSourceName = {

‎app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ import {
1313

1414
describe.skip(
1515
"GSheet-Functional Tests With Read Access",
16-
{ tags: ["@tag.Datasource", "@tag.GSheet"] },
16+
{
17+
tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
18+
},
1719
function () {
1820
const workspaceName = "gsheet apps";
1921
const dataSourceName = {

‎app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ let appName = "gsheet-app";
1717
let spreadSheetName = "test-sheet-automation-selected";
1818
describe(
1919
"GSheet-Functional Tests With Selected Access",
20-
{ tags: ["@tag.Datasource", "@tag.GSheet"] },
20+
{
21+
tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
22+
},
2123
function () {
2224
before("Setup app", function () {
2325
//Setting up app name

‎app/client/cypress/e2e/GSheet/WidgetBinding_AllAccess_Spec.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ let appName = "gsheet-app";
2323
let spreadSheetName = "test-sheet";
2424
describe.skip(
2525
"GSheet-widget binding",
26-
{ tags: ["@tag.Datasource", "@tag.GSheet"] },
26+
{
27+
tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
28+
},
2729
function () {
2830
before("Setup app and spreadsheet", function () {
2931
//Setting up the app name

‎app/client/cypress/e2e/GSheet/WidgetBinding_SelectedAccess_Spec.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ let appName = "gsheet-app";
2323
let spreadSheetName = "test-sheet-automation-selected";
2424
describe(
2525
"GSheet-widget binding for selected sheet access",
26-
{ tags: ["@tag.Datasource", "@tag.GSheet"] },
26+
{
27+
tags: ["@tag.Datasource", "@tag.GSheet", "@tag.Git", "@tag.AccessControl"],
28+
},
2729
function () {
2830
before("Setup app and spreadsheet", function () {
2931
//Setting up the app name

‎app/client/cypress/e2e/Regression/Apps/CommunityIssues_Spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import EditorNavigation, {
1616

1717
describe(
1818
"AForce - Community Issues page validations",
19-
{ tags: ["@tag.Widget", "@tag.Table"] },
19+
{ tags: ["@tag.Widget", "@tag.Table", "@tag.Binding"] },
2020
function () {
2121
before(function () {
2222
agHelper.ClearLocalStorageCache();

‎app/client/cypress/e2e/Regression/Apps/CurrencyInputIssue_Spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const widgetInput = `${wiggetClass} input`;
99
describe("Currency Input Issue", function () {
1010
it(
1111
"1. Import application json &should check that the widget input is not showing any error",
12-
{ tags: ["@tag.Widget", "@tag.CurrencyInput"] },
12+
{ tags: ["@tag.Widget", "@tag.CurrencyInput", "@tag.Binding"] },
1313
function () {
1414
agHelper.VisitNAssert("/applications", "getAllWorkspaces");
1515
homePage.ImportApp("CurrencyInputIssueExport.json");

‎app/client/cypress/e2e/Regression/Apps/EchoApiCMS_spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import EditorNavigation, {
1616

1717
describe(
1818
"Content Management System App",
19-
{ tags: ["@tag.Datasource"] },
19+
{ tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
2020
function () {
2121
before(() => {
2222
homePage.RenameApplication("EchoApiCMSApp");

‎app/client/cypress/e2e/Regression/Apps/ImportExportForkApplication_spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99

1010
describe(
1111
"Import, Export and Fork application and validate data binding",
12-
{ tags: ["@tag.ImportExport", "@tag.Sanity"] },
12+
{ tags: ["@tag.ImportExport", "@tag.Sanity", "@tag.Git"] },
1313
function () {
1414
let workspaceId;
1515
let newWorkspaceName;

‎app/client/cypress/e2e/Regression/Apps/MongoDBShoppingCart_spec.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ import {
1212

1313
describe(
1414
"Shopping cart App",
15-
{ tags: ["@tag.Datasource", "@tag.Sanity"] },
15+
{
16+
tags: ["@tag.Datasource", "@tag.Sanity", "@tag.Git", "@tag.AccessControl"],
17+
},
1618
function () {
1719
let datasourceName: string, repoName: any;
1820

‎app/client/cypress/e2e/Regression/Apps/PgAdmin_spec.js

+87-80
Original file line numberDiff line numberDiff line change
@@ -9,92 +9,99 @@ import {
99
const widgetsPage = require("../../../locators/Widgets.json");
1010
const appPage = require("../../../locators/PgAdminlocators.json");
1111

12-
describe("PgAdmin Clone App", { tags: ["@tag.Datasource"] }, function () {
13-
let datasourceName, tableName;
12+
describe(
13+
"PgAdmin Clone App",
14+
{ tags: ["@tag.Datasource", "@tag.Git", "@tag.AccessControl"] },
15+
function () {
16+
let datasourceName, tableName;
1417

15-
before("Add dsl and create datasource", () => {
16-
agHelper.AddDsl("PgAdmindsl");
17-
dataSources.CreateDataSource("Postgres");
18-
cy.get("@dsName").then(($dsName) => {
19-
datasourceName = $dsName;
18+
before("Add dsl and create datasource", () => {
19+
agHelper.AddDsl("PgAdmindsl");
20+
dataSources.CreateDataSource("Postgres");
21+
cy.get("@dsName").then(($dsName) => {
22+
datasourceName = $dsName;
23+
});
2024
});
21-
});
2225

23-
it("1. Create queries", function () {
24-
// writing query to get all schema
25-
dataSources.CreateQueryAfterDSSaved(
26-
"SELECT schema_name FROM information_schema.schemata;",
27-
"get_schema",
28-
);
29-
// switching off Use Prepared Statement toggle
30-
dataSources.ToggleUsePreparedStatement(false);
31-
dataSources.RunQuery();
26+
it("1. Create queries", function () {
27+
// writing query to get all schema
28+
dataSources.CreateQueryAfterDSSaved(
29+
"SELECT schema_name FROM information_schema.schemata;",
30+
"get_schema",
31+
);
32+
// switching off Use Prepared Statement toggle
33+
dataSources.ToggleUsePreparedStatement(false);
34+
dataSources.RunQuery();
3235

33-
// writing query to get all the tables
34-
dataSources.CreateQueryFromOverlay(
35-
datasourceName,
36-
`select * from pg_catalog.pg_tables where schemaname = {{schema_select.selectedOptionValue || "public"}};`,
37-
"get_tables",
38-
2000,
39-
);
40-
dataSources.RunQuery();
36+
// writing query to get all the tables
37+
dataSources.CreateQueryFromOverlay(
38+
datasourceName,
39+
`select * from pg_catalog.pg_tables where schemaname = {{schema_select.selectedOptionValue || "public"}};`,
40+
"get_tables",
41+
2000,
42+
);
43+
dataSources.RunQuery();
4144

42-
// writing query to get all the columns
43-
dataSources.CreateQueryFromOverlay(
44-
datasourceName,
45-
`SELECT column_name, data_type, table_name, ordinal_position, is_nullable FROM information_schema.COLUMNS`,
46-
"get_columns",
47-
);
48-
dataSources.RunQuery();
45+
// writing query to get all the columns
46+
dataSources.CreateQueryFromOverlay(
47+
datasourceName,
48+
`SELECT column_name, data_type, table_name, ordinal_position, is_nullable FROM information_schema.COLUMNS`,
49+
"get_columns",
50+
);
51+
dataSources.RunQuery();
4952

50-
// writing query to get create table
51-
dataSources.CreateQueryFromOverlay(
52-
datasourceName,
53-
`CREATE TABLE {{schema_select.selectedOptionValue}}.{{nt_name.text.replaceAll(" ","_")}}({{appsmith.store.nt_col.map((c)=> c.name.replaceAll(" ","_") + " " + c.dtype + (c.nnull ? " NOT NULL " : "") + (c.pkey ? " PRIMARY KEY " : "")).join(" , ")}})`,
54-
"create_table",
55-
);
56-
dataSources.ToggleUsePreparedStatement(false);
53+
// writing query to get create table
54+
dataSources.CreateQueryFromOverlay(
55+
datasourceName,
56+
`CREATE TABLE {{schema_select.selectedOptionValue}}.{{nt_name.text.replaceAll(" ","_")}}({{appsmith.store.nt_col.map((c)=> c.name.replaceAll(" ","_") + " " + c.dtype + (c.nnull ? " NOT NULL " : "") + (c.pkey ? " PRIMARY KEY " : "")).join(" , ")}})`,
57+
"create_table",
58+
);
59+
dataSources.ToggleUsePreparedStatement(false);
5760

58-
// writing query to get drop table
59-
dataSources.CreateQueryFromOverlay(
60-
datasourceName,
61-
`DROP TABLE {{schema_select.selectedOptionValue}}.{{nt_name.text.replaceAll(" ","_")}}({{appsmith.store.nt_col.map((c)=>c.name.replaceAll(" ","_") + " " + c.dtype + (c.nnull ? " NOT NULL " : "") + (c.pkey ? " PRIMARY KEY " : "")).join(" , ")}});`,
62-
"drop_table",
63-
);
64-
});
61+
// writing query to get drop table
62+
dataSources.CreateQueryFromOverlay(
63+
datasourceName,
64+
`DROP TABLE {{schema_select.selectedOptionValue}}.{{nt_name.text.replaceAll(" ","_")}}({{appsmith.store.nt_col.map((c)=>c.name.replaceAll(" ","_") + " " + c.dtype + (c.nnull ? " NOT NULL " : "") + (c.pkey ? " PRIMARY KEY " : "")).join(" , ")}});`,
65+
"drop_table",
66+
);
67+
});
6568

66-
it("2. Add new table from app page, View and Delete table", function () {
67-
deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.BUTTON));
68-
// adding new table
69-
agHelper.GetNClick(appPage.addNewtable, 0, true);
70-
agHelper.AssertElementAbsence(appPage.loadButton, 40000); //for CI
71-
agHelper.WaitUntilEleAppear(appPage.addTablename);
72-
cy.generateUUID().then((UUID) => {
73-
cy.xpath(appPage.addTablename).clear().type(`table${UUID}`);
74-
tableName = `table${UUID}`;
69+
it("2. Add new table from app page, View and Delete table", function () {
70+
deployMode.DeployApp(locators._widgetInDeployed(draggableWidgets.BUTTON));
71+
// adding new table
72+
agHelper.GetNClick(appPage.addNewtable, 0, true);
73+
agHelper.AssertElementAbsence(appPage.loadButton, 40000); //for CI
74+
agHelper.WaitUntilEleAppear(appPage.addTablename);
75+
cy.generateUUID().then((UUID) => {
76+
cy.xpath(appPage.addTablename).clear().type(`table${UUID}`);
77+
tableName = `table${UUID}`;
78+
});
79+
// adding column to the table
80+
cy.xpath(appPage.addColumn).click({ force: true });
81+
cy.xpath(appPage.columnNamefield).should("be.visible");
82+
cy.xpath(appPage.datatypefield).should("be.visible");
83+
agHelper.GetNClick(appPage.addColumnName);
84+
agHelper.TypeText(
85+
appPage.addColumnName + " " + locators._inputField,
86+
"ID",
87+
);
88+
agHelper.SelectFromDropDown("Varchar", "", 1);
89+
// switching on the Primary Key toggle
90+
cy.get(widgetsPage.switchWidgetInactive).first().click();
91+
// switching on the Not Null toggle
92+
cy.get(widgetsPage.switchWidgetInactive).last().click();
93+
cy.xpath(appPage.submitButton).click({ force: true });
94+
agHelper.AssertElementVisibility(appPage.addColumn);
95+
cy.xpath(appPage.submitButton).first().click({ force: true });
96+
assertHelper.AssertNetworkStatus("@postExecute");
97+
cy.xpath(appPage.closeButton).click({ force: true });
98+
cy.xpath(appPage.addNewtable).should("be.visible");
99+
// viewing the table's columns by clicking on view button
100+
cy.xpath(appPage.viewButton).first().click({ force: true });
101+
// deleting the table through modal
102+
cy.xpath(appPage.deleteButton).last().click({ force: true });
103+
cy.xpath(appPage.confirmButton).click({ force: true });
104+
cy.xpath(appPage.closeButton).click({ force: true });
75105
});
76-
// adding column to the table
77-
cy.xpath(appPage.addColumn).click({ force: true });
78-
cy.xpath(appPage.columnNamefield).should("be.visible");
79-
cy.xpath(appPage.datatypefield).should("be.visible");
80-
agHelper.GetNClick(appPage.addColumnName);
81-
agHelper.TypeText(appPage.addColumnName + " " + locators._inputField, "ID");
82-
agHelper.SelectFromDropDown("Varchar", "", 1);
83-
// switching on the Primary Key toggle
84-
cy.get(widgetsPage.switchWidgetInactive).first().click();
85-
// switching on the Not Null toggle
86-
cy.get(widgetsPage.switchWidgetInactive).last().click();
87-
cy.xpath(appPage.submitButton).click({ force: true });
88-
agHelper.AssertElementVisibility(appPage.addColumn);
89-
cy.xpath(appPage.submitButton).first().click({ force: true });
90-
assertHelper.AssertNetworkStatus("@postExecute");
91-
cy.xpath(appPage.closeButton).click({ force: true });
92-
cy.xpath(appPage.addNewtable).should("be.visible");
93-
// viewing the table's columns by clicking on view button
94-
cy.xpath(appPage.viewButton).first().click({ force: true });
95-
// deleting the table through modal
96-
cy.xpath(appPage.deleteButton).last().click({ force: true });
97-
cy.xpath(appPage.confirmButton).click({ force: true });
98-
cy.xpath(appPage.closeButton).click({ force: true });
99-
});
100-
});
106+
},
107+
);

‎app/client/cypress/e2e/Regression/Apps/PromisesApp_spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const commonlocators = require("../../../locators/commonlocators.json");
1414

1515
describe(
1616
"Promises App tests",
17-
{ tags: ["@tag.Widget", "@tag.JS"] },
17+
{ tags: ["@tag.Widget", "@tag.JS", "@tag.Binding"] },
1818
function () {
1919
before(() => {
2020
agHelper.AddDsl("promisesStoreValueDsl");

‎app/client/cypress/e2e/Regression/ClientSide/ActionExecution/ActionSelectorCreateShouldBind_spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import EditorNavigation, {
1010

1111
describe(
1212
"Creations via action selector should bind to the property",
13-
{ tags: ["@tag.JS", "@tag.PropertyPane"] },
13+
{ tags: ["@tag.JS", "@tag.PropertyPane", "@tag.Binding"] },
1414
() => {
1515
it.skip("binds newly created query / api to the button onClick", () => {
1616
entityExplorer.DragDropWidgetNVerify(draggableWidgets.BUTTON);

0 commit comments

Comments
 (0)