## 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>
241 lines
4.8 KiB
TypeScript
241 lines
4.8 KiB
TypeScript
import { RenderModes } from "constants/WidgetConstants";
|
|
import type { WidgetProps } from "widgets/BaseWidget";
|
|
import {
|
|
getCanvasBottomRow,
|
|
getCanvasWidgetHeightsToUpdate,
|
|
} from "./WidgetSizeUtils";
|
|
|
|
const DUMMY_WIDGET: WidgetProps = {
|
|
bottomRow: 0,
|
|
isLoading: false,
|
|
leftColumn: 0,
|
|
parentColumnSpace: 0,
|
|
parentRowSpace: 0,
|
|
renderMode: RenderModes.CANVAS,
|
|
rightColumn: 0,
|
|
topRow: 0,
|
|
type: "SKELETON_WIDGET",
|
|
version: 2,
|
|
widgetId: "",
|
|
widgetName: "",
|
|
};
|
|
|
|
it("Computes the bottomRow of the canvas within a container correctly", () => {
|
|
const canvasWidgets = {
|
|
x: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "x",
|
|
bottomRow: 20,
|
|
topRow: 10,
|
|
type: "CONTAINER_WIDGET",
|
|
children: ["m"],
|
|
},
|
|
m: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "m",
|
|
parentId: "x",
|
|
children: ["n", "o"],
|
|
type: "CANVAS_WIDGET",
|
|
},
|
|
n: {
|
|
...DUMMY_WIDGET,
|
|
bottomRow: 30,
|
|
},
|
|
o: {
|
|
...DUMMY_WIDGET,
|
|
bottomRow: 5,
|
|
},
|
|
};
|
|
|
|
const result = getCanvasBottomRow("m", canvasWidgets);
|
|
|
|
expect(result).toBe(300);
|
|
});
|
|
|
|
it("Computes the bottomRow of the canvas within a Modal correctly", () => {
|
|
const canvasWidgets = {
|
|
x: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "x",
|
|
bottomRow: 20,
|
|
topRow: 10,
|
|
height: 200,
|
|
type: "MODAL_WIDGET",
|
|
children: ["m"],
|
|
},
|
|
m: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "m",
|
|
parentId: "x",
|
|
children: ["n", "o"],
|
|
type: "CANVAS_WIDGET",
|
|
},
|
|
n: {
|
|
...DUMMY_WIDGET,
|
|
parentId: "m",
|
|
bottomRow: 30,
|
|
},
|
|
o: {
|
|
...DUMMY_WIDGET,
|
|
parentId: "m",
|
|
bottomRow: 5,
|
|
},
|
|
};
|
|
|
|
const result = getCanvasBottomRow("m", canvasWidgets);
|
|
|
|
expect(result).toBe(300);
|
|
});
|
|
|
|
it("Ignores the detached children of the canvas correctly", () => {
|
|
const canvasWidgets = {
|
|
x: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "x",
|
|
bottomRow: 20,
|
|
topRow: 10,
|
|
type: "CANVAS_WIDGET",
|
|
children: ["m"],
|
|
},
|
|
m: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "m",
|
|
parentId: "x",
|
|
children: ["n", "o"],
|
|
type: "CANVAS_WIDGET",
|
|
},
|
|
n: {
|
|
...DUMMY_WIDGET,
|
|
detachFromLayout: true,
|
|
parentId: "m",
|
|
bottomRow: 30,
|
|
},
|
|
o: {
|
|
...DUMMY_WIDGET,
|
|
parentId: "m",
|
|
bottomRow: 5,
|
|
},
|
|
};
|
|
|
|
const result = getCanvasBottomRow("m", canvasWidgets);
|
|
|
|
expect(result).toBe(100);
|
|
});
|
|
|
|
it("Computes the bottomRow of the canvas within a Modal correctly", () => {
|
|
const canvasWidgets = {
|
|
x: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "x",
|
|
bottomRow: 20,
|
|
topRow: 10,
|
|
height: 500,
|
|
type: "MODAL_WIDGET",
|
|
children: ["m"],
|
|
},
|
|
m: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "m",
|
|
parentId: "x",
|
|
children: ["n", "o"],
|
|
type: "CANVAS_WIDGET",
|
|
},
|
|
n: {
|
|
...DUMMY_WIDGET,
|
|
bottomRow: 30,
|
|
},
|
|
o: {
|
|
...DUMMY_WIDGET,
|
|
bottomRow: 5,
|
|
},
|
|
};
|
|
|
|
const result = getCanvasBottomRow("m", canvasWidgets);
|
|
|
|
expect(result).toBe(500);
|
|
});
|
|
|
|
it("Computes the bottomRow of the canvas within a Container when the container has larger height correctly", () => {
|
|
// The Container widget has a height of 10 rows, while the lowest widget is at 6 rows, so, the canvas should take this into account
|
|
// and return 10 * Row height == 100
|
|
const canvasWidgets = {
|
|
x: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "x",
|
|
bottomRow: 20,
|
|
topRow: 10,
|
|
type: "CONTAINER_WIDGET",
|
|
children: ["m"],
|
|
},
|
|
m: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "m",
|
|
parentId: "x",
|
|
children: ["n", "o"],
|
|
type: "CANVAS_WIDGET",
|
|
},
|
|
n: {
|
|
...DUMMY_WIDGET,
|
|
bottomRow: 6,
|
|
},
|
|
o: {
|
|
...DUMMY_WIDGET,
|
|
bottomRow: 5,
|
|
},
|
|
};
|
|
|
|
const result = getCanvasBottomRow("m", canvasWidgets);
|
|
|
|
expect(result).toBe(100);
|
|
});
|
|
|
|
it("Computes all the effected canvases for the changed widgets", () => {
|
|
const canvasWidgets = {
|
|
x: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "x",
|
|
bottomRow: 20,
|
|
topRow: 10,
|
|
type: "CONTAINER_WIDGET",
|
|
children: ["m"],
|
|
},
|
|
m: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "m",
|
|
parentId: "x",
|
|
children: ["n", "o", "p"],
|
|
type: "CANVAS_WIDGET",
|
|
},
|
|
n: {
|
|
...DUMMY_WIDGET,
|
|
bottomRow: 6,
|
|
},
|
|
o: {
|
|
...DUMMY_WIDGET,
|
|
bottomRow: 5,
|
|
},
|
|
p: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "p",
|
|
bottomRow: 20,
|
|
topRow: 10,
|
|
type: "CONTAINER_WIDGET",
|
|
children: ["q"],
|
|
parentId: "m",
|
|
},
|
|
q: {
|
|
...DUMMY_WIDGET,
|
|
widgetId: "q",
|
|
parentId: "p",
|
|
children: [],
|
|
type: "CANVAS_WIDGET",
|
|
},
|
|
};
|
|
|
|
// Since the container p has changed, it will effect the parent m and the child q
|
|
|
|
const result = getCanvasWidgetHeightsToUpdate(["p"], canvasWidgets);
|
|
|
|
expect(result).toStrictEqual({ q: 100, m: 200 });
|
|
});
|