## 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>
174 lines
3.7 KiB
TypeScript
174 lines
3.7 KiB
TypeScript
import type { CanvasStructure } from "reducers/uiReducers/pageCanvasStructureReducer";
|
|
import { compareAndGenerateImmutableCanvasStructure } from "./canvasStructureHelpers";
|
|
const canvasStructure: CanvasStructure = {
|
|
widgetId: "x",
|
|
widgetName: "x",
|
|
type: "CONTAINER_WIDGET",
|
|
children: [
|
|
{
|
|
widgetId: "y",
|
|
widgetName: "y",
|
|
type: "CONTAINER_WIDGET",
|
|
children: [
|
|
{
|
|
widgetId: "z",
|
|
widgetName: "z",
|
|
type: "CONTAINER_WIDGET",
|
|
},
|
|
],
|
|
},
|
|
{
|
|
widgetId: "m",
|
|
widgetName: "m",
|
|
type: "CONTAINER_WIDGET",
|
|
children: [
|
|
{
|
|
widgetId: "n",
|
|
widgetName: "n",
|
|
type: "CONTAINER_WIDGET",
|
|
children: [
|
|
{
|
|
widgetId: "o",
|
|
widgetName: "o",
|
|
type: "CONTAINER_WIDGET",
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
};
|
|
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const simpleDSL: any = {
|
|
widgetId: "x",
|
|
widgetName: "x",
|
|
type: "CONTAINER_WIDGET",
|
|
children: [
|
|
{
|
|
widgetId: "y",
|
|
widgetName: "y",
|
|
type: "CONTAINER_WIDGET",
|
|
|
|
children: [
|
|
{
|
|
widgetId: "z",
|
|
widgetName: "z",
|
|
type: "CONTAINER_WIDGET",
|
|
},
|
|
],
|
|
},
|
|
{
|
|
widgetId: "m",
|
|
widgetName: "m",
|
|
type: "CONTAINER_WIDGET",
|
|
|
|
children: [
|
|
{
|
|
widgetId: "n",
|
|
widgetName: "n",
|
|
type: "CONTAINER_WIDGET",
|
|
|
|
children: [
|
|
{
|
|
widgetId: "o",
|
|
widgetName: "o",
|
|
type: "CONTAINER_WIDGET",
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
};
|
|
|
|
describe("Immutable Canvas structures", () => {
|
|
it("generates the same object if it is run with the same dsl", () => {
|
|
const nextState = compareAndGenerateImmutableCanvasStructure(
|
|
canvasStructure,
|
|
simpleDSL,
|
|
);
|
|
|
|
expect(nextState).toBe(canvasStructure);
|
|
});
|
|
it("updates the diff appropriately", () => {
|
|
// TODO: Fix this the next time the file is edited
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
const dsl: any = {
|
|
widgetId: "x",
|
|
widgetName: "x",
|
|
children: [
|
|
{
|
|
widgetId: "y",
|
|
widgetName: "y",
|
|
children: [
|
|
{
|
|
widgetId: "z",
|
|
widgetName: "z",
|
|
},
|
|
],
|
|
},
|
|
{
|
|
widgetId: "m",
|
|
widgetName: "newName",
|
|
children: [
|
|
{
|
|
widgetId: "n",
|
|
widgetName: "n",
|
|
children: [
|
|
{
|
|
widgetId: "o",
|
|
widgetName: "o",
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
};
|
|
const expectedCanvasStructure = {
|
|
widgetId: "x",
|
|
widgetName: "x",
|
|
children: [
|
|
{
|
|
widgetId: "y",
|
|
widgetName: "y",
|
|
children: [
|
|
{
|
|
widgetId: "z",
|
|
widgetName: "z",
|
|
},
|
|
],
|
|
},
|
|
{
|
|
widgetId: "m",
|
|
widgetName: "newName",
|
|
children: [
|
|
{
|
|
widgetId: "n",
|
|
widgetName: "n",
|
|
children: [
|
|
{
|
|
widgetId: "o",
|
|
widgetName: "o",
|
|
},
|
|
],
|
|
},
|
|
],
|
|
},
|
|
],
|
|
};
|
|
|
|
const nextState = compareAndGenerateImmutableCanvasStructure(
|
|
canvasStructure,
|
|
dsl,
|
|
);
|
|
|
|
expect(nextState).not.toBe(expectedCanvasStructure);
|
|
expect(JSON.stringify(nextState)).toBe(
|
|
JSON.stringify(expectedCanvasStructure),
|
|
);
|
|
});
|
|
});
|