## Description Added ESLint rule to force blank lines between statements. Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ ## Automation /ok-to-test tags="@tag.All" ### 🔍 Cypress test results <!-- This is an auto-generated comment: Cypress test results --> > [!CAUTION] > 🔴 🔴 🔴 Some tests have failed. > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/10924926728> > Commit: 34f57714a1575ee04e94e03cbcaf95e57a96c86c > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=10924926728&attempt=1&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank">Cypress dashboard</a>. > Tags: @tag.All > Spec: > The following are new failures, please fix them before merging the PR: <ol> > <li>cypress/e2e/Regression/ClientSide/Anvil/AnvilModal_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCheckboxGroupWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilCurrencyInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilIconButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInlineButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilParagraphWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilPhoneInputWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilStatsWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchGroupWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilSwitchWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilTableWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilToolbarButtonWidgetSnapshot_spec.ts > <li>cypress/e2e/Regression/ClientSide/Anvil/Widgets/AnvilZoneSectionWidgetSnapshot_spec.ts</ol> > <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">List of identified flaky tests</a>. > <hr>Wed, 18 Sep 2024 16:33:36 UTC <!-- end of auto-generated comment: Cypress test results --> ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No --------- Co-authored-by: Valera Melnikov <valera@appsmith.com>
290 lines
8.3 KiB
TypeScript
290 lines
8.3 KiB
TypeScript
import type { Action } from "entities/Action";
|
|
import { PluginType } from "entities/Action";
|
|
import equal from "fast-deep-equal/es6";
|
|
import {
|
|
combineDynamicBindings,
|
|
getDynamicBindings,
|
|
getPropertyPath,
|
|
} from "./DynamicBindingUtils";
|
|
import {
|
|
EVAL_VALUE_PATH,
|
|
getDynamicBindingsChangesSaga,
|
|
getDynamicStringSegments,
|
|
getEvalValuePath,
|
|
isChildPropertyPath,
|
|
} from "./DynamicBindingUtils";
|
|
|
|
describe.each([
|
|
["{{A}}", ["{{A}}"]],
|
|
["A {{B}}", ["A ", "{{B}}"]],
|
|
[
|
|
"Hello {{Customer.Name}}, the status for your order id {{orderId}} is {{status}}",
|
|
[
|
|
"Hello ",
|
|
"{{Customer.Name}}",
|
|
", the status for your order id ",
|
|
"{{orderId}}",
|
|
" is ",
|
|
"{{status}}",
|
|
],
|
|
],
|
|
[
|
|
"{{data.map(datum => {return {id: datum}})}}",
|
|
["{{data.map(datum => {return {id: datum}})}}"],
|
|
],
|
|
["{{}}{{}}}", ["{{}}", "{{}}", "}"]],
|
|
["{{{}}", ["{{{}}"]],
|
|
["{{ {{", ["{{ {{"]],
|
|
["}} }}", ["}} }}"]],
|
|
["}} {{", ["}} {{"]],
|
|
])("Parse the dynamic string(%s, %j)", (dynamicString, expected) => {
|
|
test(`returns ${expected}`, () => {
|
|
expect(getDynamicStringSegments(dynamicString as string)).toStrictEqual(
|
|
expected,
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("isChildPropertyPath function", () => {
|
|
it("works", () => {
|
|
const cases: Array<[string, string, boolean]> = [
|
|
["Table1.selectedRow", "Table1.selectedRow", true],
|
|
["Table1.selectedRow", "Table1.selectedRows", false],
|
|
["Table1.selectedRow", "Table1.selectedRow.email", true],
|
|
["Table1.selectedRow", "1Table1.selectedRow", false],
|
|
["Table1.selectedRow", "Table11selectedRow", false],
|
|
["Table1.selectedRow", "Table1.selectedRow", true],
|
|
["Dropdown1.options", "Dropdown1.options[1]", true],
|
|
["Dropdown1.options[1]", "Dropdown1.options[1].value", true],
|
|
["Dropdown1", "Dropdown1.options[1].value", true],
|
|
];
|
|
|
|
cases.forEach((testCase) => {
|
|
const result = isChildPropertyPath(testCase[0], testCase[1]);
|
|
|
|
expect(result).toBe(testCase[2]);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("DynamicBindingPathlist", () => {
|
|
it("Properly updates the dynamicBindingPathlist", () => {
|
|
// @ts-expect-error: Action type mismatch
|
|
const action: Action = {
|
|
cacheResponse: "",
|
|
id: "61810f59a0f5113e30ba72ac",
|
|
workspaceId: "61800c6bd504bf710747bf9a",
|
|
pluginType: PluginType.API,
|
|
pluginId: "5ca385dc81b37f0004b4db85",
|
|
name: "Api1",
|
|
datasource: {
|
|
// userPermissions: [],
|
|
name: "DEFAULT_REST_DATASOURCE",
|
|
pluginId: "5ca385dc81b37f0004b4db85",
|
|
workspaceId: "61800c6bd504bf710747bf9a",
|
|
datasourceConfiguration: {
|
|
url: "https://thatcopy.pw",
|
|
},
|
|
invalids: [],
|
|
messages: [],
|
|
isValid: true,
|
|
// new: true,
|
|
},
|
|
pageId: "61800cecd504bf710747bf9d",
|
|
actionConfiguration: {
|
|
// timeoutInMillisecond: 10000,
|
|
// paginationType: "NONE",
|
|
path: "/catapi/rest/",
|
|
headers: [
|
|
{
|
|
key: "content-type",
|
|
value: "application/json",
|
|
},
|
|
],
|
|
encodeParamsToggle: true,
|
|
queryParameters: [
|
|
{
|
|
key: "{{Button1.text}}",
|
|
value: "",
|
|
},
|
|
{
|
|
key: "",
|
|
value: "",
|
|
},
|
|
],
|
|
body: "{{Create_users.data}}",
|
|
httpMethod: "POST",
|
|
pluginSpecifiedTemplates: [
|
|
{
|
|
value: true,
|
|
},
|
|
],
|
|
},
|
|
executeOnLoad: false,
|
|
dynamicBindingPathList: [
|
|
{
|
|
key: "body",
|
|
},
|
|
{
|
|
key: "queryParameters[0].key",
|
|
},
|
|
],
|
|
isValid: true,
|
|
invalids: [],
|
|
messages: [],
|
|
jsonPathKeys: ["Create_users.data", "Button1.text"],
|
|
confirmBeforeExecute: false,
|
|
// userPermissions: ["read:actions", "execute:actions", "manage:actions"],
|
|
// validName: "Api1",
|
|
};
|
|
|
|
const value = [
|
|
{
|
|
key: "{{Button1.text}}",
|
|
value: "",
|
|
},
|
|
{
|
|
key: "",
|
|
value: "",
|
|
},
|
|
];
|
|
const field = "actionConfiguration.queryParameters";
|
|
|
|
const expectedResult = [
|
|
{
|
|
key: "body",
|
|
},
|
|
{
|
|
key: "queryParameters[0].key",
|
|
},
|
|
];
|
|
|
|
const actualResult = getDynamicBindingsChangesSaga(action, value, field);
|
|
|
|
expect(equal(expectedResult, actualResult)).toBeTruthy();
|
|
});
|
|
});
|
|
|
|
describe("getPropertyPath function", () => {
|
|
it("test getPropertyPath", () => {
|
|
const testCases = [
|
|
["Table1.searchText", "searchText"],
|
|
["Table1.selectedRow", "selectedRow"],
|
|
["Table1.meta.searchText", "meta.searchText"],
|
|
["Table1", "Table1"],
|
|
["Table1.", ""],
|
|
];
|
|
|
|
testCases.forEach(([input, expectedResult]) => {
|
|
const actualResult = getPropertyPath(input);
|
|
|
|
expect(actualResult).toStrictEqual(expectedResult);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("getNestedEvalPath", () => {
|
|
it("returns valid nested path", () => {
|
|
const actualUnpopulatedNestedPath = getEvalValuePath(
|
|
"Table1.primaryColumns.state",
|
|
{
|
|
isPopulated: false,
|
|
fullPath: true,
|
|
},
|
|
);
|
|
const actualPopulatedNestedPath = getEvalValuePath(
|
|
"Table1.primaryColumns.state",
|
|
{
|
|
isPopulated: true,
|
|
fullPath: true,
|
|
},
|
|
);
|
|
const expectedUnpopulatedNestedPath = `Table1.${EVAL_VALUE_PATH}.['primaryColumns.state']`;
|
|
const expectedPopulatedNestedPath = `Table1.${EVAL_VALUE_PATH}.primaryColumns.state`;
|
|
|
|
expect(actualPopulatedNestedPath).toEqual(expectedPopulatedNestedPath);
|
|
expect(actualUnpopulatedNestedPath).toEqual(expectedUnpopulatedNestedPath);
|
|
});
|
|
});
|
|
|
|
describe("getDynamicBindings and combineDynamicBindings function", () => {
|
|
const testCases = [
|
|
{
|
|
js: "(function(){return true;})()",
|
|
jsSnippets: ["(function(){return true;})()"],
|
|
propertyValue: "{{(function(){return true;})()}}",
|
|
stringSegments: ["{{(function(){return true;})()}}"],
|
|
},
|
|
{
|
|
js: '"Hello " + (Customer.Name) + ", the status for your order id " + (orderId) + " is " + (status)',
|
|
jsSnippets: ["", "Customer.Name", "", "orderId", "", "status"],
|
|
propertyValue:
|
|
"Hello {{Customer.Name}}, the status for your order id {{orderId}} is {{status}}",
|
|
stringSegments: [
|
|
"Hello ",
|
|
"{{Customer.Name}}",
|
|
", the status for your order id ",
|
|
"{{orderId}}",
|
|
" is ",
|
|
"{{status}}",
|
|
],
|
|
},
|
|
{
|
|
js: "(data.map(datum => {return {id: datum}}))",
|
|
jsSnippets: ["data.map(datum => {return {id: datum}})"],
|
|
propertyValue: "{{data.map(datum => {return {id: datum}})}}",
|
|
stringSegments: ["{{data.map(datum => {return {id: datum}})}}"],
|
|
},
|
|
{
|
|
js: '"{{}}"',
|
|
jsSnippets: [""],
|
|
propertyValue: "{{}}",
|
|
stringSegments: ["{{}}"],
|
|
},
|
|
{
|
|
js: "(Query1.data.splice(1).map((data, ind) => ({...data, ind })))",
|
|
jsSnippets: [
|
|
"Query1.data.splice(1).map((data, ind) => ({...data, ind }))",
|
|
],
|
|
propertyValue:
|
|
"{{Query1.data.splice(1).map((data, ind) => ({...data, ind }))}}",
|
|
stringSegments: [
|
|
"{{Query1.data.splice(1).map((data, ind) => ({...data, ind }))}}",
|
|
],
|
|
},
|
|
{
|
|
js: "(JSObject1.myFun1())",
|
|
jsSnippets: ["JSObject1.myFun1()"],
|
|
propertyValue: "{{JSObject1.myFun1()}}",
|
|
stringSegments: ["{{JSObject1.myFun1()}}"],
|
|
},
|
|
{
|
|
js: "showAlert(currentItem.name + 'Name', '');\nshowAlert(Button1.text, '');",
|
|
jsSnippets: [
|
|
"showAlert(currentItem.name + 'Name', '');\nshowAlert(Button1.text, '');",
|
|
],
|
|
propertyValue:
|
|
"{{showAlert(currentItem.name + 'Name', '');\nshowAlert(Button1.text, '');}}",
|
|
stringSegments: [
|
|
"{{showAlert(currentItem.name + 'Name', '');\nshowAlert(Button1.text, '');}}",
|
|
],
|
|
},
|
|
{
|
|
js: '"code " + ( currentItem.nol || "Blue;")',
|
|
jsSnippets: ["", ' currentItem.nol || "Blue;"'],
|
|
propertyValue: 'code {{ currentItem.nol || "Blue;"}}',
|
|
stringSegments: ["code ", '{{ currentItem.nol || "Blue;"}}'],
|
|
},
|
|
];
|
|
|
|
it("Returns expected js string", () => {
|
|
testCases.forEach(({ js, jsSnippets, propertyValue, stringSegments }) => {
|
|
expect(getDynamicBindings(propertyValue)).toStrictEqual({
|
|
jsSnippets,
|
|
stringSegments,
|
|
});
|
|
expect(combineDynamicBindings(jsSnippets, stringSegments)).toEqual(js);
|
|
});
|
|
});
|
|
});
|