## 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>
334 lines
9.6 KiB
TypeScript
334 lines
9.6 KiB
TypeScript
const updateAndSaveLayoutMock = jest.fn();
|
|
|
|
import {
|
|
setWidgetDynamicPropertySaga,
|
|
removeDynamicBindingProperties,
|
|
handleUpdateWidgetDynamicProperty,
|
|
batchUpdateWidgetDynamicPropertySaga,
|
|
} from "./WidgetOperationSagas";
|
|
|
|
const widget = {
|
|
isVisible: "true",
|
|
dynamicPropertyPathList: [],
|
|
dynamicBindingPathList: [],
|
|
};
|
|
|
|
const widget1 = {
|
|
isVisible: "{{true}}",
|
|
dynamicPropertyPathList: [
|
|
{
|
|
key: "isVisible",
|
|
},
|
|
],
|
|
dynamicBindingPathList: [
|
|
{
|
|
key: "isVisible",
|
|
},
|
|
],
|
|
};
|
|
|
|
jest.mock("redux-saga/effects", () => {
|
|
const originalModule = jest.requireActual("redux-saga/effects");
|
|
|
|
return {
|
|
__esModule: true,
|
|
...originalModule,
|
|
select: jest.fn(),
|
|
call: jest.fn(),
|
|
put: jest.fn(),
|
|
};
|
|
});
|
|
|
|
jest.mock("actions/pageActions", () => {
|
|
const originalModule = jest.requireActual("actions/pageActions");
|
|
|
|
return {
|
|
__esModule: true,
|
|
...originalModule,
|
|
updateAndSaveLayout: updateAndSaveLayoutMock,
|
|
};
|
|
});
|
|
|
|
describe("WidgetOperationSaga - ", () => {
|
|
describe("Should test setWidgetDynamicPropertySaga ", () => {
|
|
it("should update dynamicBindingPathList on js toggle", () => {
|
|
const value = setWidgetDynamicPropertySaga({
|
|
type: "test",
|
|
payload: {
|
|
isDynamic: true,
|
|
propertyPath: "isVisible",
|
|
widgetId: "test",
|
|
},
|
|
});
|
|
|
|
value.next(); // start
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
value.next(widget as any); // yield select
|
|
value.next({
|
|
...widget,
|
|
dynamicPropertyPathList: [
|
|
{
|
|
key: "isVisible",
|
|
},
|
|
],
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
} as any);
|
|
value.next({
|
|
test: widget,
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
} as any); // yield select
|
|
value.next(); //yield put
|
|
expect(updateAndSaveLayoutMock).toHaveBeenCalledWith({
|
|
test: {
|
|
...widget,
|
|
dynamicPropertyPathList: [
|
|
{
|
|
key: "isVisible",
|
|
},
|
|
],
|
|
},
|
|
});
|
|
});
|
|
|
|
it("should remove property from dynamicBindingList on js toggle off", () => {
|
|
const value = setWidgetDynamicPropertySaga({
|
|
type: "test",
|
|
payload: {
|
|
isDynamic: false,
|
|
propertyPath: "isVisible",
|
|
widgetId: "test",
|
|
},
|
|
});
|
|
|
|
value.next(); // start
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
value.next(widget1 as any); // yield select
|
|
value.next({
|
|
...widget1,
|
|
dynamicPropertyPathList: [],
|
|
dynamicBindingPathList: [],
|
|
isVisible: 1,
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
} as any);
|
|
value.next({
|
|
test: widget1,
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
} as any); // yield select
|
|
value.next(); //yield put
|
|
expect(updateAndSaveLayoutMock).toHaveBeenCalledWith({
|
|
test: {
|
|
dynamicPropertyPathList: [],
|
|
dynamicBindingPathList: [],
|
|
isVisible: 1,
|
|
},
|
|
});
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("Should test handleUpdateWidgetDynamicProperty ", () => {
|
|
it("should update dynamicBindingPathList on js toggle and return the widget with dynamicBindingPath", () => {
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const value = handleUpdateWidgetDynamicProperty(widget as any, {
|
|
isDynamic: true,
|
|
propertyPath: "isVisible",
|
|
});
|
|
|
|
value.next(); // start
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
value.next(widget as any); // yield select
|
|
value.next({
|
|
test: widget,
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
} as any); // yield select
|
|
value.return({
|
|
test: {
|
|
...widget,
|
|
dynamicPropertyPathList: [
|
|
{
|
|
key: "isVisible",
|
|
},
|
|
],
|
|
},
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
} as any);
|
|
expect(value.next().done).toEqual(true);
|
|
});
|
|
});
|
|
|
|
describe("Should test batchUpdateWidgetDynamicPropertySaga ", () => {
|
|
it("should update dynamicBindingPathList on js toggle and return the widget with dynamicBindingPath", () => {
|
|
const value = batchUpdateWidgetDynamicPropertySaga({
|
|
type: "test",
|
|
payload: {
|
|
updates: [
|
|
{
|
|
isDynamic: true,
|
|
propertyPath: "isVisible",
|
|
},
|
|
],
|
|
widgetId: "test",
|
|
},
|
|
});
|
|
|
|
value.next(); // start
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
value.next(widget as any); // yield select
|
|
value.next({
|
|
...widget,
|
|
dynamicPropertyPathList: [
|
|
{
|
|
key: "isVisible",
|
|
},
|
|
],
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
} as any);
|
|
value.next({
|
|
test: widget,
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
} as any); // yield select
|
|
value.next(); //yield put
|
|
expect(updateAndSaveLayoutMock).toHaveBeenCalledWith({
|
|
test: {
|
|
...widget,
|
|
dynamicPropertyPathList: [
|
|
{
|
|
key: "isVisible",
|
|
},
|
|
],
|
|
},
|
|
});
|
|
});
|
|
it("should remove property from dynamicBindingList on js toggle off when calling batchUpdateWidgetDynamicPropertySaga", () => {
|
|
const value = batchUpdateWidgetDynamicPropertySaga({
|
|
type: "test",
|
|
payload: {
|
|
updates: [
|
|
{
|
|
isDynamic: false,
|
|
propertyPath: "isVisible",
|
|
},
|
|
],
|
|
widgetId: "test",
|
|
},
|
|
});
|
|
|
|
value.next(); // start
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
value.next(widget1 as any); // yield select
|
|
value.next({
|
|
...widget1,
|
|
dynamicPropertyPathList: [],
|
|
dynamicBindingPathList: [],
|
|
isVisible: 1,
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
} as any);
|
|
value.next({
|
|
test: widget1,
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
} as any); // yield select
|
|
value.next(); //yield put
|
|
expect(updateAndSaveLayoutMock).toHaveBeenCalledWith({
|
|
test: {
|
|
dynamicPropertyPathList: [],
|
|
dynamicBindingPathList: [],
|
|
isVisible: 1,
|
|
},
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("test removeDynamicBindingList", () => {
|
|
it("should remove table derived binding properties", () => {
|
|
// table bindings with derived properties
|
|
const dynamicBindingList = [
|
|
{ key: "primaryColumns.step.computedValue" },
|
|
{ key: "primaryColumns.task.computedValue" },
|
|
{ key: "primaryColumns.status.computedValue" },
|
|
{ key: "primaryColumns.action.computedValue" },
|
|
{ key: "derivedColumns.customColumn1.isCellVisible" },
|
|
{ key: "primaryColumns.customColumn1.isCellVisible" },
|
|
];
|
|
const propertyPath = "primaryColumns.customColumn1.isCellVisible";
|
|
const dynamicProperties = removeDynamicBindingProperties(
|
|
propertyPath,
|
|
dynamicBindingList,
|
|
);
|
|
|
|
// should remove custom and derived properties for customColumn1.isCellVisible
|
|
expect(dynamicProperties).not.toEqual(
|
|
expect.arrayContaining([
|
|
expect.objectContaining({
|
|
key: "derivedColumns.customColumn1.isCellVisible",
|
|
}),
|
|
expect.objectContaining({
|
|
key: "primaryColumns.customColumn1.isCellVisible",
|
|
}),
|
|
]),
|
|
);
|
|
});
|
|
|
|
it("should remove table binding properties", () => {
|
|
// table bindings
|
|
const dynamicBindingList = [
|
|
{ key: "primaryColumns.step.computedValue" },
|
|
{ key: "primaryColumns.task.computedValue" },
|
|
{ key: "primaryColumns.status.computedValue" },
|
|
{ key: "primaryColumns.action.computedValue" },
|
|
{ key: "primaryColumns.action.buttonLabel" },
|
|
];
|
|
|
|
const propertyPath = "primaryColumns.action.buttonLabel";
|
|
|
|
const dynamicProperties = removeDynamicBindingProperties(
|
|
propertyPath,
|
|
dynamicBindingList,
|
|
);
|
|
|
|
// should remove primaryColumns.action.buttonLabel property
|
|
expect(dynamicProperties).not.toEqual(
|
|
expect.arrayContaining([
|
|
expect.objectContaining({
|
|
key: "primaryColumns.action.buttonLabel",
|
|
}),
|
|
]),
|
|
);
|
|
});
|
|
|
|
it("should remove widget properties", () => {
|
|
// button widget binding
|
|
const dynamicBindingList = [{ key: "isVisible" }];
|
|
|
|
const propertyPath = "isVisible";
|
|
const dynamicProperties = removeDynamicBindingProperties(
|
|
propertyPath,
|
|
dynamicBindingList,
|
|
);
|
|
|
|
// should remove the isVisible property
|
|
expect(dynamicProperties).not.toEqual(
|
|
expect.arrayContaining([
|
|
expect.objectContaining({
|
|
key: "isVisible",
|
|
}),
|
|
]),
|
|
);
|
|
});
|
|
});
|