Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2b64e65
feat: git mod - shifting from yarn pkg to monolith (#37865)
Dec 2, 2024
7099113
chore: add postgres db during the startup conditionally (#37605)
AnaghHegde Dec 2, 2024
b5d52e7
Updated Label Config
Nikhil-Nandagopal Dec 2, 2024
46786ae
feat: Enable new toolbar for cypress (#37148)
albinAppsmith Dec 3, 2024
493abee
chore: removed redundant page DB calls from js action creation flow (…
sneha122 Dec 3, 2024
f746c53
fix: Broken UI on JS module instance in the side by side view mode (#…
ankitakinger Dec 3, 2024
008a946
fix: path fix for botton pane cypress (#37911)
albinAppsmith Dec 3, 2024
a2c5caa
chore: Git resource map conversions (#37920)
nidhi-nair Dec 3, 2024
1078a03
feat: added commit changes (#37922)
sondermanish Dec 4, 2024
1f07be3
fix: appsmith ai app git import issue fixed (#37921)
sneha122 Dec 4, 2024
9c669dd
fix: fixing usage pulse for anon user (#37940)
Dec 4, 2024
a64c16d
chore: git detach (#37934)
sondermanish Dec 5, 2024
4de9c51
feat: center align action forms (#37763)
albinAppsmith Dec 5, 2024
80f2000
chore: Git mod - quick action bar control (#37912)
ashit-rath Dec 5, 2024
86d22e5
chore: Added spans to health check (#37980)
nidhi-nair Dec 5, 2024
d03ad6f
chore: Add code split for adding package pull status indicator (#37944)
subrata71 Dec 5, 2024
6d41e77
chore: Skip unnecessary RTS calls to optimise performance (#37949)
subrata71 Dec 5, 2024
a9471f0
chore: git modularisation disconnect modal (#37938)
ashit-rath Dec 6, 2024
ba7c158
fix: Add password based auth for postgres (#37068)
abhvsn Dec 6, 2024
a450226
fix: Leaving editable tab in error state (#37981)
hetunandu Dec 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/config.json

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .github/workflows/ci-test-limited.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,13 @@ jobs:
ports:
# Opens tcp port 6379 on the host and service container
- 6379:6379
postgres:
if: github.base_ref == 'pg' || github.ref_name == 'pg'
image: postgres:14
ports:
- 5432:5432
mongo:
if: github.base_ref == 'release' || github.ref_name == 'release'
image: mongo
ports:
- 27017:27017
Expand Down
2 changes: 1 addition & 1 deletion app/client/cypress/e2e/GSheet/AllAccess_Spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe.skip(

it("1. Add and verify fetch details query", () => {
entityExplorer.CreateNewDsQuery(dataSourceName);
agHelper.RenameWithInPane("Fetch_Details");
agHelper.RenameQuery("Fetch_Details");
dataSources.ValidateNSelectDropdown(
"Operation",
"Fetch Many",
Expand Down
2 changes: 1 addition & 1 deletion app/client/cypress/e2e/GSheet/GsheetMisc_Spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ describe.skip(
it("1. Add query from active ds tab and verify", () => {
dataSources.CreateQueryForDS(dataSourceName);
// entityExplorer.CreateNewDsQuery(dataSourceName);
agHelper.RenameWithInPane("Fetch_Details");
agHelper.RenameQuery("Fetch_Details");
dataSources.ValidateNSelectDropdown(
"Operation",
"Fetch Many",
Expand Down
2 changes: 1 addition & 1 deletion app/client/cypress/e2e/GSheet/ReadNWrite_Access_Spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe.skip(

it("1. Add and verify fetch details query", () => {
entityExplorer.CreateNewDsQuery(dataSourceName.readNWrite);
agHelper.RenameWithInPane("Fetch_Details");
agHelper.RenameQuery("Fetch_Details");
dataSources.ValidateNSelectDropdown(
"Operation",
"Fetch Many",
Expand Down
2 changes: 1 addition & 1 deletion app/client/cypress/e2e/GSheet/ReadOnly_Access_Spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe.skip(

it("1. Add and verify fetch details query", () => {
entityExplorer.CreateNewDsQuery(dataSourceName.readOnly);
agHelper.RenameWithInPane("Fetch_Details");
agHelper.RenameQuery("Fetch_Details");
dataSources.ValidateNSelectDropdown(
"Operation",
"Fetch Many",
Expand Down
2 changes: 1 addition & 1 deletion app/client/cypress/e2e/GSheet/SelectedSheet_Access_Spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe(

it("1. Add and verify fetch details query", () => {
entityExplorer.CreateNewDsQuery(dataSourceName);
agHelper.RenameWithInPane("Fetch_Details");
agHelper.RenameQuery("Fetch_Details");
dataSources.ValidateNSelectDropdown(
"Operation",
"Fetch Many",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as _ from "../../../../support/Objects/ObjectsCore";
import EditorNavigation, {
EntityType,
} from "../../../../support/Pages/EditorNavigation";
import BottomPane from "../../../../support/Pages/IDE/BottomPane";
import BottomTabs from "../../../../support/Pages/IDE/BottomTabs";

let valueToTest: any, jsName: any;

Expand All @@ -19,7 +19,7 @@ describe(
_.dataManager.dsValues[_.dataManager.defaultEnviorment].mockApiUrl,
);
_.apiPage.RunAPI();
BottomPane.response.switchResponseType("JSON");
BottomTabs.response.switchResponseType("JSON");
_.apiPage.ReadApiResponsebyKey("name");
cy.get("@apiResp").then((value) => {
valueToTest = value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import EditorNavigation, {
EntityType,
} from "../../../../support/Pages/EditorNavigation";
import BottomPane from "../../../../support/Pages/IDE/BottomPane";
import BottomTabs from "../../../../support/Pages/IDE/BottomTabs";

let dsName: any;
let queryName: string;
Expand Down Expand Up @@ -44,10 +44,10 @@ describe(

EditorNavigation.SelectEntityByName(queryName, EntityType.Query);

BottomPane.response.switchToResponseTab();
BottomPane.response.openResponseTypeMenu();
BottomTabs.response.switchToResponseTab();
BottomTabs.response.openResponseTypeMenu();
agHelper.AssertElementVisibility(
BottomPane.response.locators.responseTypeMenuItem("TABLE"),
BottomTabs.response.locators.responseTypeMenuItem("TABLE"),
);
});
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const queryLocators = require("../../../../locators/QueryEditor.json");
import {
dataSources,
agHelper,
entityItems,
} from "../../../../support/Objects/ObjectsCore";
import { PluginActionForm } from "../../../../support/Pages/PluginActionForm";

describe(
"Verify setting tab form controls not to have tooltip and tooltip (underline) styles",
Expand All @@ -17,6 +17,7 @@ describe(
},
function () {
let guid, datasourceName;
let pluginActionForm = new PluginActionForm();

before("Creates a new Mongo datasource", () => {
dataSources.CreateDataSource("Mongo");
Expand All @@ -28,7 +29,7 @@ describe(
it("1. We make sure the label in the settings tab does not have any underline styles", function () {
dataSources.CreateQueryForDS(datasourceName);

cy.xpath(queryLocators.querySettingsTab).click();
pluginActionForm.toolbar.toggleSettings();

cy.get(".label-icon-wrapper")
.contains("Run the query on page load")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe(
// because I do not need to fill the datasource form and use the same default data
_.dataSources.CreatePlugIn("PostgreSQL");
dsName = "Postgres" + uid;
_.agHelper.RenameWithInPane(dsName, false);
_.agHelper.RenameDatasource(dsName);
_.dataSources.SaveDatasource();
_.agHelper.Sleep();
_.dataSources.EditDatasource();
Expand All @@ -39,7 +39,7 @@ describe(
// because I do not need to fill the datasource form and use the same default data
_.dataSources.CreatePlugIn("Authenticated API");
dsName = "AuthDS" + uid;
_.agHelper.RenameWithInPane(dsName, false);
_.agHelper.RenameDatasource(dsName);
_.dataSources.FillAuthAPIUrl();
_.dataSources.SaveDatasource();
_.agHelper.Sleep();
Expand All @@ -62,7 +62,7 @@ describe(
// because I do not need to fill the datasource form and use the same default data
_.dataSources.CreatePlugIn("MongoDB");
dsName = "Mongo" + uid;
_.agHelper.RenameWithInPane(dsName, false);
_.agHelper.RenameDatasource(dsName);
_.dataSources.FillMongoDSForm();
_.dataSources.SaveDatasource();
_.agHelper.Sleep();
Expand All @@ -86,7 +86,7 @@ describe(
// because I do not need to fill the datasource form and use the same default data
_.dataSources.CreatePlugIn("MongoDB");
dsName = "Mongo" + uid;
_.agHelper.RenameWithInPane(dsName, false);
_.agHelper.RenameDatasource(dsName);
_.dataSources.FillMongoDSForm();
_.dataSources.SaveDatasource();
_.agHelper.Sleep();
Expand All @@ -110,7 +110,7 @@ describe(
// because I do not need to fill the datasource form and use the same default data
_.dataSources.CreatePlugIn("MongoDB");
dsName = "Mongo" + uid;
_.agHelper.RenameWithInPane(dsName, false);
_.agHelper.RenameDatasource(dsName);
_.dataSources.FillMongoDSForm();
_.dataSources.SaveDatasource();
_.agHelper.Sleep();
Expand All @@ -133,7 +133,7 @@ describe(
// because I do not need to fill the datasource form and use the same default data
_.dataSources.CreatePlugIn("MongoDB");
dsName = "Mongo" + uid;
_.agHelper.RenameWithInPane(dsName, false);
_.agHelper.RenameDatasource(dsName);
_.dataSources.FillMongoDSForm();
_.dataSources.SaveDatasource();
_.agHelper.Sleep();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe(
cy.get("@guid").then((uid) => {
dsName = "AuthAPI " + uid;
_.dataSources.CreatePlugIn("Authenticated API");
_.agHelper.RenameWithInPane(dsName, false);
_.agHelper.RenameDatasource(dsName);
_.dataSources.FillAuthAPIUrl();
_.dataSources.AssertCursorPositionForTextInput(
_.dataSources._urlInputControl,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe(
cy.get("@guid").then((uid) => {
dsName = "AuthAPI " + uid;
dataSources.CreatePlugIn("Authenticated API");
agHelper.RenameWithInPane(dsName, false);
agHelper.RenameDatasource(dsName);
dataSources.FillAuthAPIUrl();
dataSources.SaveDatasource();
apiPage.CreateApi("API" + uid, "GET", true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe(
dataSourceName = "Postgres " + guid;
dataSources.NavigateToDSCreateNew();
dataSources.CreatePlugIn("PostgreSQL");
agHelper.RenameWithInPane(dataSourceName, false);
agHelper.RenameDatasource(dataSourceName);
dataSources.FillPostgresDSForm(
"Production",
false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe(
dataSources.EnterQuery("select * from users");

cy.EvaluateCurrentValue("select * from users");
cy.get(".t--action-name-edit-field").click({ force: true });

cy.get("@saveDatasource").then((httpResponse) => {
datasourceName = httpResponse.response.body.data.name;
PageLeftPane.switchSegment(PagePaneSegment.Queries);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ import {
PagePaneSegment,
} from "../../../../support/Pages/EditorNavigation";

const apiwidget = require("../../../../locators/apiWidgetslocator.json");

import * as _ from "../../../../support/Objects/ObjectsCore";

describe(
Expand All @@ -20,10 +18,6 @@ describe(
it("1. Rename API with table widget name validation test", function () {
cy.log("Login Successful");
cy.CreateApiAndValidateUniqueEntityName(apiName);
cy.get(apiwidget.apiTxt)
.clear()
.type(tableName, { force: true })
.should("have.value", tableName);
//Rename Table widget with api name validation test
PageLeftPane.switchSegment(PagePaneSegment.UI);
PageLeftPane.assertPresence("Table1");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ describe(
datasourceName,
EntityType.Datasource,
);
agHelper.RenameWithInPane(`${datasourceName}new`, false);
agHelper.RenameDatasource(`${datasourceName}new`);
cy.contains(dataSources._datasourceCard, `${datasourceName}new`);

// reverting the name
agHelper.RenameWithInPane(datasourceName, false);
agHelper.RenameDatasource(datasourceName);

// going to the query create page
EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
Expand All @@ -81,7 +81,7 @@ describe(
dataSources.EnterQuery("select * from users");

cy.EvaluateCurrentValue("select * from users");
cy.get(".t--action-name-edit-field").click({ force: true });

entityExplorer.ActionContextMenuByEntityName({
entityNameinLeftSidebar: "Query1",
action: "Show bindings",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,10 @@ describe(
apiPage.ResponseStatusCheck("200 OK");
cy.get("@curlImport").then((response) => {
cy.expect(response.response.body.responseMeta.success).to.eq(true);
cy.get(apiwidget.ApiName)
.invoke("text")
.then((text) => {
const someText = text;
expect(someText).to.equal(response.response.body.data.name);
});
agHelper.GetObjectName().then((text) => {
const someText = text;
expect(someText).to.equal(response.response.body.data.name);
});
});
EditorNavigation.ShowCanvas();
// bind input widgets to the api calls responses
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import ApiEditor from "../../../../locators/ApiEditor";
import reconnectDatasourceModal from "../../../../locators/ReconnectLocators";
import {
agHelper,
Expand Down Expand Up @@ -86,7 +87,7 @@ describe(

//Assert working on url field
cy.updateCodeInput(
".t--dataSourceField",
ApiEditor.dataSourceField,
"http://host.docker.internal:5001/{{ SQL_Query.data }}",
);
agHelper.Sleep();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ import EditorNavigation, {
EntityType,
PagePaneSegment,
} from "../../../../support/Pages/EditorNavigation";
import { PluginActionForm } from "../../../../support/Pages/PluginActionForm";

const apiwidget = require("../../../../locators/apiWidgetslocator.json");
const queryLocators = require("../../../../locators/QueryEditor.json");

describe("Focus Retention of Inputs", { tags: ["@tag.IDE"] }, function () {
let pluginActionForm = new PluginActionForm();

before("Import the test application", () => {
homePage.NavigateToHome();
homePage.ImportApp("ContextSwitching.json");
Expand Down Expand Up @@ -181,16 +184,15 @@ describe("Focus Retention of Inputs", { tags: ["@tag.IDE"] }, function () {
dataSources.ToggleUsePreparedStatement(false);
EditorNavigation.SelectEntityByName("S3_Query", EntityType.Query);

cy.xpath(queryLocators.querySettingsTab).click();
cy.setQueryTimeout(10000);

EditorNavigation.SelectEntityByName("SQL_Query", EntityType.Query);
cy.get(".bp3-editable-text-content").should("contain.text", "SQL_Query");
cy.xpath(queryLocators.querySettingsTab).click();
cy.get(locators._queryName).should("contain.text", "SQL_Query");
pluginActionForm.toolbar.toggleSettings();
agHelper.GetElement(dataSources._usePreparedStatement).should("be.focused");
EditorNavigation.SelectEntityByName("S3_Query", EntityType.Query);
agHelper.Sleep();
cy.xpath(queryLocators.querySettingsTab).click();
pluginActionForm.toolbar.toggleSettings();
cy.xpath(queryLocators.queryTimeout).should("be.focused");
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ describe("JSObject testing", { tags: ["@tag.JS", "@tag.Binding"] }, () => {
toRun: false,
shouldCreateNewJSObj: true,
});
_.agHelper.GetNAssertContains(locators._selectionItem, "getData");
_.agHelper.GetNAssertContains(_.jsEditor._funcDropdownValue, "getData");
_.jsEditor.SelectFunctionDropdown("myFun1");
_.jsEditor.RunJSObj();
EditorNavigation.SelectEntityByName("Text2", EntityType.Widget);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@ describe("Linting", { tags: ["@tag.JS", "@tag.Binding"] }, () => {

it("2. TC 1927 Cont'd - Doesn't show lint errors when Api is renamed", () => {
EditorNavigation.SelectEntityByName("Api1", EntityType.Api);
agHelper.RenameWithInPane("Api2");
agHelper.RenameQuery("Api2");

clickButtonAndAssertLintError(false);

EditorNavigation.SelectEntityByName("Api2", EntityType.Api);
agHelper.RenameWithInPane("Api1");
agHelper.RenameQuery("Api1");

clickButtonAndAssertLintError(false);
});
Expand Down Expand Up @@ -237,13 +237,13 @@ describe("Linting", { tags: ["@tag.JS", "@tag.Binding"] }, () => {

it("6. TC 1928 Cont'd - Shows correct lint error when Query is renamed", () => {
EditorNavigation.SelectEntityByName("Query1", EntityType.Query);
agHelper.RenameWithInPane("Query2");
agHelper.RenameQuery("Query2");

// Assert Absence of lint error
clickButtonAndAssertLintError(false);

EditorNavigation.SelectEntityByName("Query2", EntityType.Query);
agHelper.RenameWithInPane("Query1");
agHelper.RenameQuery("Query1");

// Assert Absence of lint error
clickButtonAndAssertLintError(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ describe(
});
dataSources.NavigateToDSCreateNew();
dataSources.CreatePlugIn("Mongo");
agHelper.RenameWithInPane("myinvalidds", false);
agHelper.RenameDatasource("myinvalidds");

agHelper.ClearNType(dataSources._host(), "127.0.0.1");
agHelper.ClearNType(dataSources._port, "8000");
Expand All @@ -136,7 +136,7 @@ describe(
[1, 2].forEach((I) => {
dataSources.NavigateToDSCreateNew();
dataSources.CreatePlugIn("Mongo");
agHelper.RenameWithInPane(`dummy${I}`, false);
agHelper.RenameDatasource(`dummy${I}`);

agHelper.ClearNType(dataSources._host(), "127.0.0.1");
agHelper.ClearNType(dataSources._port, "8000");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,7 @@ describe("GlobalSearch", { tags: ["@tag.Sanity"] }, function () {
.first()
.click();
cy.wait("@createNewApi");
cy.get(datasourceHomeLocators.apiTxt)
.invoke("val")
.then((title) => expect(title).includes("Api"));
_.agHelper.GetObjectName().then((title) => expect(title).includes("Api"));
});

// since now datasource will only be saved once user clicks on save button explicitly,
Expand Down
Loading
Loading