## Description
Replaces the old boring action selector dropdown with a much more
sophisticated UI that is capable of going above and beyond. Users with
an aversion to code can now build their more complex workflows with a
click of a few buttons.
Consider this code snippet
```javascript
Api1.run(() => {
showAlert("Hello");
navigateTo('Page1', {}, 'SAME_WINDOW');
}, () => {
removeValue("test");
});
```
|**Old action selector** |**New action selector**|
|:-:|:-:|
|<img width="250" alt="Screenshot 2023-03-29 at 16 54 14"
src="https://user-images.githubusercontent.com/32433245/228520661-a639b580-8986-4aec-a0f5-e2786d1a0f56.png">|
<img width="250" alt="Screenshot 2023-03-29 at 16 55 15"
src="https://user-images.githubusercontent.com/32433245/228521043-5025aa42-af95-4574-b586-bc4c721240bc.png">|
**Click on an action block to edit its parameters.**
<img width="500" alt="Screenshot 2023-03-29 at 17 01 18"
src="https://user-images.githubusercontent.com/32433245/228522479-493769d0-9d2c-4b67-b493-a79e3bb9c947.png">
**Switch to JS mode to get the raw code**
<img width="273" alt="Screenshot 2023-03-29 at 17 05 51"
src="https://user-images.githubusercontent.com/32433245/228523458-13bc0302-4c94-4176-b5aa-3ec208122f57.png">
### Code changes
**New UI components**
- ActionCreator component splits the code into block statements.
- Each block statement is represented by ActionTree.tsx UI component.
- ActionTree.tsx represents an action and its chains.
- ActionCard.tsx is the block that represents the individual action on
the UI.
- ActionSelector.tsx component is popover that contains the form for
editing individual action.
- TabView, TextView, SelectorView, ActionSelectorView and KeyValueView
are components that represent configurable fields in ActionSelector
form.
**AST methods**
- Added methods to get/set function names, expressions, arguments.
- Added methods to get/set then/catch blocks to allow chaining of
actions.
- Added methods to check if code is convertible to UI.
Fixes #10160
Fixes #21588
Fixes #21392
Fixes #21393
Fixes #7903
Fixes #15895
Fixes #17765
Fixes #14562
Depends on https://github.com/appsmithorg/design-system/pull/306
## Type of change
- New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
- Manual
- Jest
- Cypress
### Test Plan
https://github.com/appsmithorg/TestSmith/issues/2296
### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
## Checklist:
### Dev activity
- [x] My code follows the style guidelines of this project
- [ ] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag
### QA activity:
- [x] Test plan has been approved by relevant developers
- [x] Test plan has been peer reviewed by QA
- [x] Cypress test cases have been added and approved by either SDET or
manual QA
- [x] Organized project review call with relevant stakeholders after
Round 1/2 of QA
- [x] Added Test Plan Approved label after reveiwing all Cypress test
---------
Co-authored-by: Rimil Dey <rimil@appsmith.com>
Co-authored-by: arunvjn <arun@appsmith.com>
Co-authored-by: Aishwarya UR <aishwarya@appsmith.com>
Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
423 lines
13 KiB
JavaScript
423 lines
13 KiB
JavaScript
/* eslint-disable cypress/no-unnecessary-waiting */
|
|
/* eslint-disable cypress/no-assigning-return-values */
|
|
|
|
require("cy-verify-downloads").addCustomCommand();
|
|
require("cypress-file-upload");
|
|
import ApiEditor from "../locators/ApiEditor";
|
|
const pages = require("../locators/Pages.json");
|
|
const commonlocators = require("../locators/commonlocators.json");
|
|
const apiwidget = require("../locators/apiWidgetslocator.json");
|
|
const explorer = require("../locators/explorerlocators.json");
|
|
|
|
export const initLocalstorage = () => {
|
|
cy.window().then((window) => {
|
|
window.localStorage.setItem("ShowCommentsButtonToolTip", "");
|
|
window.localStorage.setItem("updateDismissed", "true");
|
|
});
|
|
};
|
|
|
|
Cypress.Commands.add("enterDatasourceAndPath", (datasource, path) => {
|
|
cy.enterDatasource(datasource + path);
|
|
});
|
|
|
|
Cypress.Commands.add("enterDatasource", (datasource) => {
|
|
cy.get(apiwidget.resourceUrl)
|
|
.first()
|
|
.click({ force: true })
|
|
.type(datasource, { parseSpecialCharSequences: false });
|
|
//.type("{esc}}");
|
|
cy.wait(2000);
|
|
cy.assertPageSave();
|
|
});
|
|
|
|
Cypress.Commands.add("ResponseStatusCheck", (statusCode) => {
|
|
cy.xpath(apiwidget.responseStatus).should("be.visible");
|
|
cy.xpath(apiwidget.responseStatus).contains(statusCode);
|
|
});
|
|
|
|
Cypress.Commands.add("ResponseCheck", () => {
|
|
//Explicit assert
|
|
cy.get(apiwidget.responseText).should("be.visible");
|
|
});
|
|
|
|
Cypress.Commands.add("ResponseTextCheck", (textTocheck) => {
|
|
cy.ResponseCheck();
|
|
cy.get(apiwidget.responseText).contains(textTocheck);
|
|
});
|
|
|
|
Cypress.Commands.add("NavigateToAPI_Panel", () => {
|
|
cy.get(pages.addEntityAPI).last().should("be.visible").click({ force: true });
|
|
cy.get(pages.integrationCreateNew)
|
|
.should("be.visible")
|
|
.click({ force: true });
|
|
cy.get("#loading").should("not.exist");
|
|
});
|
|
|
|
Cypress.Commands.add("CreateAPI", (apiname) => {
|
|
cy.get(explorer.createNew).click({ force: true });
|
|
cy.get(explorer.blankAPI).click({ force: true });
|
|
cy.wait("@createNewApi");
|
|
cy.get(apiwidget.resourceUrl).should("be.visible");
|
|
if (apiname) {
|
|
cy.renameWithInPane(apiname);
|
|
cy.WaitAutoSave();
|
|
}
|
|
// Added because api name edit takes some time to
|
|
// reflect in api sidebar after the call passes.
|
|
// eslint-disable-next-line cypress/no-unnecessary-waiting
|
|
cy.wait(2000);
|
|
});
|
|
|
|
Cypress.Commands.add("CreateSubsequentAPI", (apiname) => {
|
|
cy.get(apiwidget.createApiOnSideBar).first().click({ force: true });
|
|
cy.get(apiwidget.resourceUrl).should("be.visible");
|
|
// cy.get(ApiEditor.nameOfApi)
|
|
cy.get(apiwidget.apiTxt).clear().type(apiname).should("have.value", apiname);
|
|
cy.WaitAutoSave();
|
|
});
|
|
|
|
Cypress.Commands.add("EditApiName", (apiname) => {
|
|
cy.get(apiwidget.ApiName).click({ force: true });
|
|
cy.get(apiwidget.apiTxt)
|
|
.clear()
|
|
.type(apiname, { force: true })
|
|
.should("have.value", apiname);
|
|
});
|
|
|
|
Cypress.Commands.add("EditApiNameFromExplorer", (apiname) => {
|
|
/*
|
|
cy.xpath(apiwidget.popover)
|
|
.last()
|
|
.click({ force: true });
|
|
cy.get(apiwidget.editName).click({ force: true });
|
|
*/
|
|
cy.get(explorer.editNameField)
|
|
.clear()
|
|
.type(apiname, { force: true })
|
|
.should("have.value", apiname)
|
|
.blur();
|
|
// eslint-disable-next-line cypress/no-unnecessary-waiting
|
|
cy.wait(3000);
|
|
});
|
|
|
|
Cypress.Commands.add("RunAPI", () => {
|
|
cy.get(ApiEditor.ApiRunBtn).click({ force: true });
|
|
cy.wait("@postExecute");
|
|
});
|
|
|
|
Cypress.Commands.add("RunAPIWithoutWaitingForResolution", () => {
|
|
cy.get(ApiEditor.ApiRunBtn).click({ force: true });
|
|
});
|
|
|
|
Cypress.Commands.add("SaveAndRunAPI", () => {
|
|
cy.WaitAutoSave();
|
|
cy.RunAPI();
|
|
});
|
|
|
|
Cypress.Commands.add(
|
|
"validateRequest",
|
|
(apiName, baseurl, path, verb, error = false) => {
|
|
cy.get(".react-tabs__tab").contains("Logs").click();
|
|
cy.get("[data-cy=t--debugger-search]").clear().type(apiName);
|
|
|
|
if (!error) {
|
|
cy.get(".object-key").last().contains("request").click();
|
|
}
|
|
cy.get(".string-value").contains(baseurl.concat(path));
|
|
cy.get(".string-value").contains(verb);
|
|
cy.get("[data-cy=t--tab-response]").first().click({ force: true });
|
|
},
|
|
);
|
|
|
|
Cypress.Commands.add(
|
|
"EnterSourceDetailsWithHeader",
|
|
(baseUrl, v1method, hKey, hValue) => {
|
|
cy.enterDatasourceAndPath(baseUrl, v1method);
|
|
cy.get(apiwidget.headerKey)
|
|
.first()
|
|
.click({ force: true })
|
|
.type(hKey, { parseSpecialCharSequences: true });
|
|
cy.get(apiwidget.headerValue)
|
|
.first()
|
|
.click({ force: true })
|
|
.type(hValue, { parseSpecialCharSequences: true });
|
|
cy.WaitAutoSave();
|
|
},
|
|
);
|
|
|
|
Cypress.Commands.add("EditSourceDetail", (baseUrl, v1method) => {
|
|
cy.get(apiwidget.editResourceUrl)
|
|
.first()
|
|
.click({ force: true })
|
|
.clear()
|
|
.type(`{backspace}${baseUrl}`);
|
|
cy.xpath(apiwidget.autoSuggest).first().click({ force: true });
|
|
cy.get(ApiEditor.ApiRunBtn).scrollIntoView();
|
|
cy.get(apiwidget.editResourceUrl)
|
|
.first()
|
|
.focus()
|
|
.type(v1method)
|
|
.should("have.value", v1method);
|
|
cy.WaitAutoSave();
|
|
});
|
|
|
|
Cypress.Commands.add("switchToAPIInputTab", () => {
|
|
cy.get(apiwidget.apiInputTab).first().click({ force: true });
|
|
});
|
|
|
|
Cypress.Commands.add("enterUrl", (baseUrl, url, value) => {
|
|
cy.get(url).first().type(baseUrl.concat(value), {
|
|
force: true,
|
|
parseSpecialCharSequences: false,
|
|
});
|
|
});
|
|
|
|
Cypress.Commands.add(
|
|
"EnterSourceDetailsWithQueryParam",
|
|
(baseUrl, v1method, hKey, hValue, qKey, qValue) => {
|
|
cy.enterDatasourceAndPath(baseUrl, v1method);
|
|
cy.get(apiwidget.headerKey)
|
|
.first()
|
|
.click({ force: true })
|
|
.type(hKey, { parseSpecialCharSequences: true });
|
|
cy.get(apiwidget.headerValue)
|
|
.first()
|
|
.click({ force: true })
|
|
.type(hValue, { parseSpecialCharSequences: true });
|
|
cy.get(apiwidget.queryKey)
|
|
.first()
|
|
.click({ force: true })
|
|
.type(qKey, { force: true })
|
|
.should("have.value", qKey);
|
|
cy.get(apiwidget.queryValue)
|
|
.first()
|
|
.click({ force: true })
|
|
.type(qValue, { force: true })
|
|
.should("have.value", qValue);
|
|
cy.WaitAutoSave();
|
|
},
|
|
);
|
|
|
|
Cypress.Commands.add("EnterSourceDetailsWithbody", (baseUrl, v1method) => {
|
|
cy.enterDatasourceAndPath(baseUrl, v1method);
|
|
cy.get(apiwidget.addHeader).first().click({ first: true });
|
|
});
|
|
|
|
Cypress.Commands.add("CreationOfUniqueAPIcheck", (apiname) => {
|
|
cy.get(pages.addEntityAPI).click();
|
|
cy.get(pages.integrationCreateNew)
|
|
.should("be.visible")
|
|
.click({ force: true });
|
|
cy.get(apiwidget.createapi).click({ force: true });
|
|
cy.wait("@createNewApi");
|
|
// cy.wait("@getUser");
|
|
cy.get(apiwidget.resourceUrl).should("be.visible");
|
|
cy.get(apiwidget.ApiName).click({ force: true });
|
|
cy.get(apiwidget.apiTxt)
|
|
.clear()
|
|
.focus()
|
|
.type(apiname, { force: true, delay: 500 })
|
|
.should("have.value", apiname);
|
|
cy.get(".t--action-name-edit-error").should(($x) => {
|
|
expect($x).contain(
|
|
apiname.concat(" is already being used or is a restricted keyword."),
|
|
);
|
|
});
|
|
cy.get(apiwidget.apiTxt).blur();
|
|
});
|
|
|
|
Cypress.Commands.add("MoveAPIToHome", () => {
|
|
cy.xpath(apiwidget.popover).last().click({ force: true });
|
|
cy.get(apiwidget.copyTo).click({ force: true });
|
|
cy.get(apiwidget.home).click({ force: true });
|
|
cy.wait("@createNewApi").should(
|
|
"have.nested.property",
|
|
"response.body.responseMeta.status",
|
|
201,
|
|
);
|
|
});
|
|
|
|
Cypress.Commands.add("MoveAPIToPage", (pageName) => {
|
|
cy.xpath(apiwidget.popover).last().click({ force: true });
|
|
cy.get(apiwidget.moveTo).click({ force: true });
|
|
cy.get(apiwidget.page).contains(pageName).click({ force: true });
|
|
cy.wait("@moveAction").should(
|
|
"have.nested.property",
|
|
"response.body.responseMeta.status",
|
|
200,
|
|
);
|
|
});
|
|
|
|
Cypress.Commands.add("copyEntityToPage", (pageName) => {
|
|
cy.xpath(apiwidget.popover).last().click({ force: true });
|
|
cy.get(apiwidget.copyTo).click({ force: true });
|
|
cy.get(apiwidget.page).contains(pageName).click({ force: true });
|
|
cy.wait("@createNewApi").should(
|
|
"have.nested.property",
|
|
"response.body.responseMeta.status",
|
|
201,
|
|
);
|
|
});
|
|
|
|
Cypress.Commands.add("CopyAPIToHome", () => {
|
|
cy.xpath(apiwidget.popover).last().click({ force: true });
|
|
cy.get(apiwidget.copyTo).click({ force: true });
|
|
cy.get(apiwidget.home).click({ force: true });
|
|
cy.wait("@createNewApi").should(
|
|
"have.nested.property",
|
|
"response.body.responseMeta.status",
|
|
201,
|
|
);
|
|
});
|
|
|
|
Cypress.Commands.add("RenameEntity", (value, selectFirst) => {
|
|
if (selectFirst) {
|
|
cy.xpath(apiwidget.popover).first().click({ force: true });
|
|
} else {
|
|
cy.xpath(apiwidget.popover).last().click({ force: true });
|
|
}
|
|
|
|
cy.get(apiwidget.renameEntity).click({ force: true });
|
|
// eslint-disable-next-line cypress/no-unnecessary-waiting
|
|
cy.wait(2000);
|
|
cy.get(explorer.editEntity).last().type(value, { force: true });
|
|
// eslint-disable-next-line cypress/no-unnecessary-waiting
|
|
cy.wait(3000);
|
|
});
|
|
|
|
Cypress.Commands.add("CreateApiAndValidateUniqueEntityName", (apiname) => {
|
|
cy.get(apiwidget.createapi).click({ force: true });
|
|
cy.wait("@createNewApi");
|
|
cy.get(apiwidget.resourceUrl).should("be.visible");
|
|
cy.get(apiwidget.ApiName).click({ force: true });
|
|
cy.get(apiwidget.apiTxt)
|
|
.clear()
|
|
.type(apiname, { force: true })
|
|
.should("have.value", apiname);
|
|
cy.get(".t--action-name-edit-error").should(($x) => {
|
|
expect($x).contain(
|
|
apiname.concat(" is already being used or is a restricted keyword."),
|
|
);
|
|
});
|
|
});
|
|
|
|
Cypress.Commands.add("validateMessage", (value) => {
|
|
cy.get(".bp3-popover-content").should(($x) => {
|
|
expect($x).contain(value.concat(" is already being used."));
|
|
});
|
|
});
|
|
|
|
Cypress.Commands.add(
|
|
"VerifyPopOverMessage",
|
|
(msgAbsenceToVerify, presence = false) => {
|
|
// Give this element 3 seconds to appear
|
|
let shouldCondition = "not.exist";
|
|
if (presence) shouldCondition = "exist";
|
|
cy.xpath(
|
|
"//div[@class='bp3-popover-content'][contains(text(),'" +
|
|
msgAbsenceToVerify +
|
|
"')]",
|
|
{ timeout: 3000 },
|
|
).should(shouldCondition);
|
|
},
|
|
);
|
|
|
|
Cypress.Commands.add("DeleteAPIFromSideBar", () => {
|
|
cy.deleteEntity();
|
|
cy.wait("@deleteAction").should(
|
|
"have.nested.property",
|
|
"response.body.responseMeta.status",
|
|
200,
|
|
);
|
|
});
|
|
|
|
Cypress.Commands.add("DeleteWidgetFromSideBar", () => {
|
|
cy.xpath(apiwidget.popover).last().click({ force: true });
|
|
cy.get(apiwidget.delete).click({ force: true });
|
|
cy.wait("@updateLayout").should(
|
|
"have.nested.property",
|
|
"response.body.responseMeta.status",
|
|
200,
|
|
);
|
|
});
|
|
|
|
Cypress.Commands.add("deleteEntity", () => {
|
|
cy.xpath(apiwidget.popover).last().click({ force: true });
|
|
cy.get(apiwidget.delete).click({ force: true });
|
|
cy.get(apiwidget.deleteConfirm).click({ force: true });
|
|
});
|
|
|
|
Cypress.Commands.add("deleteEntityWithoutConfirmation", () => {
|
|
cy.xpath(apiwidget.popover).last().click({ force: true });
|
|
cy.get(apiwidget.delete).click({ force: true });
|
|
});
|
|
|
|
Cypress.Commands.add("DeleteAPI", () => {
|
|
cy.get(ApiEditor.ApiActionMenu).click({ multiple: true });
|
|
cy.get(apiwidget.deleteAPI).first().click({ force: true });
|
|
cy.get(apiwidget.deleteAPI).first().click({ force: true });
|
|
cy.wait("@deleteAction").should(
|
|
"have.nested.property",
|
|
"response.body.responseMeta.status",
|
|
200,
|
|
);
|
|
});
|
|
|
|
Cypress.Commands.add("NavigateToApiEditor", () => {
|
|
cy.get(explorer.addEntityAPI).click({ force: true });
|
|
});
|
|
|
|
Cypress.Commands.add("testCreateApiButton", () => {
|
|
cy.get(ApiEditor.createBlankApiCard).click({ force: true });
|
|
cy.wait("@createNewApi").should(
|
|
"have.nested.property",
|
|
"response.body.responseMeta.status",
|
|
201,
|
|
);
|
|
});
|
|
|
|
Cypress.Commands.add("createAndFillApi", (url, parameters) => {
|
|
cy.NavigateToApiEditor();
|
|
cy.get(pages.integrationCreateNew)
|
|
.should("be.visible")
|
|
.click({ force: true });
|
|
cy.testCreateApiButton();
|
|
cy.get("@createNewApi").then((response) => {
|
|
cy.get(ApiEditor.ApiNameField).should("be.visible");
|
|
expect(response.response.body.responseMeta.success).to.eq(true);
|
|
cy.get(ApiEditor.ApiNameField)
|
|
.click()
|
|
.invoke("text")
|
|
.then((text) => {
|
|
const someText = text;
|
|
expect(someText).to.equal(response.response.body.data.name);
|
|
});
|
|
});
|
|
cy.get(apiwidget.editResourceUrl)
|
|
.first()
|
|
.click({ force: true })
|
|
.type(
|
|
url + parameters,
|
|
{ parseSpecialCharSequences: false },
|
|
{ force: true },
|
|
);
|
|
cy.WaitAutoSave();
|
|
cy.get(ApiEditor.formActionButtons).should("be.visible");
|
|
cy.get(ApiEditor.ApiRunBtn).should("not.be.disabled");
|
|
});
|
|
|
|
// Cypress.Commands.add("callApi", (apiname) => {
|
|
// cy.get(commonlocators.callApi).first().click({ force: true });
|
|
// cy.get(commonlocators.singleSelectMenuItem)
|
|
// .contains("Execute a query")
|
|
// .click({ force: true });
|
|
// cy.get(commonlocators.selectMenuItem)
|
|
// .contains(apiname)
|
|
// .click({ force: true });
|
|
// });
|
|
|
|
Cypress.Commands.add("checkIfApiPaneIsVisible", () => {
|
|
cy.get(ApiEditor.datasourcesRightPane).should("exist");
|
|
cy.get(ApiEditor.datasourcesRightPane).should("be.visible");
|
|
});
|