## 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>
66 lines
1.9 KiB
TypeScript
66 lines
1.9 KiB
TypeScript
import { getCanvasWidgets } from "ee/selectors/entitiesSelector";
|
|
import { GridDefaults, type RenderModes } from "constants/WidgetConstants";
|
|
import { getLayoutSystem } from "layoutSystems/withLayoutSystemWidgetHOC";
|
|
import type {
|
|
CanvasWidgetsReduxState,
|
|
FlattenedWidgetProps,
|
|
} from "reducers/entityReducers/canvasWidgetsReducer";
|
|
import { createSelector } from "reselect";
|
|
import { getRenderMode } from "./editorSelectors";
|
|
import { getIsMobileBreakPoint } from "sagas/selectors";
|
|
import type { AppState } from "ee/reducers";
|
|
import type { LayoutSystemTypes } from "layoutSystems/types";
|
|
import { getLayoutSystemType } from "./layoutSystemSelectors";
|
|
|
|
function buildFlattenedChildCanvasWidgets(
|
|
canvasWidgets: CanvasWidgetsReduxState,
|
|
renderMode: RenderModes,
|
|
layoutSystemType: LayoutSystemTypes,
|
|
isMobile: boolean,
|
|
parentWidgetId: string,
|
|
flattenedChildCanvasWidgets: Record<string, FlattenedWidgetProps> = {},
|
|
) {
|
|
const parentWidget = canvasWidgets[parentWidgetId];
|
|
const {
|
|
widgetSystem: { propertyEnhancer },
|
|
} = getLayoutSystem(renderMode, layoutSystemType);
|
|
|
|
parentWidget?.children?.forEach((childId) => {
|
|
const childWidget = canvasWidgets[childId];
|
|
let parentRowSpace =
|
|
childWidget.parentRowSpace ?? GridDefaults.DEFAULT_GRID_ROW_HEIGHT;
|
|
|
|
if (childWidget.type === "CANVAS_WIDGET") {
|
|
parentRowSpace = 1;
|
|
}
|
|
|
|
flattenedChildCanvasWidgets[childId] = propertyEnhancer({
|
|
...childWidget,
|
|
isMobile,
|
|
parentRowSpace,
|
|
});
|
|
|
|
buildFlattenedChildCanvasWidgets(
|
|
canvasWidgets,
|
|
renderMode,
|
|
layoutSystemType,
|
|
isMobile,
|
|
childId,
|
|
flattenedChildCanvasWidgets,
|
|
);
|
|
});
|
|
|
|
return flattenedChildCanvasWidgets;
|
|
}
|
|
|
|
export const getFlattenedChildCanvasWidgets = createSelector(
|
|
[
|
|
getCanvasWidgets,
|
|
getRenderMode,
|
|
getLayoutSystemType,
|
|
getIsMobileBreakPoint,
|
|
(_state: AppState, parentWidgetId: string) => parentWidgetId,
|
|
],
|
|
buildFlattenedChildCanvasWidgets,
|
|
);
|