dc79ebb918
Part of #33724. We have a lot of fixture files in our Cypress tests with DSLs of various kinds. They are used to update the DSL using the `/api/v1/layouts/{layoutId}/pages/{pageId}?applicationId={applicationId}`. This API, is [in this line in `LayoutControllerCE`](c4e5d5e6c8/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/LayoutControllerCE.java (L71)), and the request body is parsed as [objects of `LayoutUpdateDTO` record](71bc84fc76/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/LayoutUpdateDTO.java (L6)). This `record`, accepts _only_ the `dsl` field, and nothing else. List of potential files that have this problem was identified with this command: ```sh cd app/client/cypress rg -Io 'AddDsl\(".+?\)' \ | cut -d\" -f2 \ | sort -u \ | while read line; do if rg -q '"(layoutOnLoadActions|layoutOnLoadActionErrors|userPermissions|new)":' fixtures/"$line".json; then echo $line fi done ``` (For reference, and to use on EE repo, after this is merged). **/test all** <!-- This is an auto-generated comment: Cypress test results --> > [!CAUTION] > 🔴 🔴 🔴 Some tests have failed. > Workflow run: <https://github.com/appsmithorg/appsmith/actions/runs/9633990737> > Commit: 9e848f1ed0c3332177d2e6c4a75e2483f045395f > <a href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=9633990737&attempt=1&selectiontype=test&testsstatus=failed&specsstatus=fail" target="_blank">Cypress dashboard</a>. > Tags: `` > The following are new failures, please fix them before merging the PR: <ol> > <li>cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor3_spec.ts > <li>cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_1_spec.js > <li>cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js </ol> > <a href="https://internal.appsmith.com/app/cypress-dashboard/identified-flaky-tests-65890b3c81d7400d08fa9ee3?branch=master" target="_blank">List of identified flaky tests</a>. <!-- end of auto-generated comment: Cypress test results --> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Bug Fixes** - Corrected the file path for loading DSL configuration in the nested list widget scenario. - **Chores** - Streamlined multiple JSON files by removing deprecated `layoutOnLoadActions` arrays and other obsolete fields, resulting in cleaner and more manageable configurations. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
506 lines
16 KiB
JSON
506 lines
16 KiB
JSON
{
|
|
"dsl": {
|
|
"widgetName": "MainContainer",
|
|
"backgroundColor": "none",
|
|
"rightColumn": 1224,
|
|
"snapColumns": 16,
|
|
"detachFromLayout": true,
|
|
"widgetId": "0",
|
|
"topRow": 0,
|
|
"bottomRow": 1292,
|
|
"containerStyle": "none",
|
|
"snapRows": 33,
|
|
"parentRowSpace": 1,
|
|
"type": "CANVAS_WIDGET",
|
|
"canExtend": true,
|
|
"dynamicBindingPathList": [],
|
|
"version": 3,
|
|
"minHeight": 1292,
|
|
"parentColumnSpace": 1,
|
|
"leftColumn": 0,
|
|
"children": [
|
|
{
|
|
"backgroundColor": "#C0C0C0",
|
|
"widgetName": "Aditya",
|
|
"rightColumn": 8,
|
|
"orientation": "VERTICAL",
|
|
"snapColumns": 16,
|
|
"widgetId": "gmm48aishv",
|
|
"containerStyle": "card",
|
|
"topRow": 0,
|
|
"bottomRow": 9,
|
|
"parentRowSpace": 38,
|
|
"isVisible": true,
|
|
"type": "CONTAINER_WIDGET",
|
|
"dynamicBindingPathList": [],
|
|
"isLoading": false,
|
|
"shouldScrollContents": true,
|
|
"parentColumnSpace": 75.25,
|
|
"leftColumn": 0,
|
|
"children": [
|
|
{
|
|
"backgroundColor": "#FFFFFF",
|
|
"widgetName": "jmwwbtgjry",
|
|
"rightColumn": 602,
|
|
"orientation": "VERTICAL",
|
|
"snapColumns": 16,
|
|
"detachFromLayout": true,
|
|
"widgetId": "hjiybwqair",
|
|
"containerStyle": "none",
|
|
"topRow": 0,
|
|
"bottomRow": 342,
|
|
"parentRowSpace": 1,
|
|
"isVisible": true,
|
|
"type": "CANVAS_WIDGET",
|
|
"canExtend": false,
|
|
"isLoading": false,
|
|
"parentColumnSpace": 1,
|
|
"leftColumn": 0,
|
|
"children": [
|
|
{
|
|
"onTextChanged": "",
|
|
"widgetName": "input",
|
|
"rightColumn": 11,
|
|
"widgetId": "oudih5fvwa",
|
|
"topRow": 6,
|
|
"bottomRow": 7,
|
|
"isValid": "{{input.isRequired ? input.text && descriptionInput.text.length > 0 ? input.regex ? new RegExp(input.regex).test(input.text) : true : input.regex ? new RegExp(input.regex).test(input.text) : true}}",
|
|
"parentRowSpace": 38,
|
|
"isVisible": true,
|
|
"label": "Test Input Label",
|
|
"type": "INPUT_WIDGET_V2",
|
|
"dynamicBindingPathList": [],
|
|
"parentId": "iw4o07jvik",
|
|
"isLoading": false,
|
|
"parentColumnSpace": 34.6875,
|
|
"leftColumn": 6,
|
|
"dynamicTriggerPathList": [
|
|
{
|
|
"key": "onTextChange"
|
|
}
|
|
],
|
|
"inputType": "",
|
|
"placeholderText": "",
|
|
"defaultText": ""
|
|
},
|
|
{
|
|
"widgetName": "TestTextBox",
|
|
"rightColumn": 5,
|
|
"widgetId": "4d8d2eh4xg",
|
|
"dynamicPropertyPathList": [],
|
|
"topRow": 2,
|
|
"bottomRow": 3,
|
|
"parentRowSpace": 38,
|
|
"isVisible": true,
|
|
"type": "TEXT_WIDGET",
|
|
"dynamicBindingPathList": [],
|
|
"shouldScroll": true,
|
|
"parentId": "hjiybwqair",
|
|
"isLoading": false,
|
|
"parentColumnSpace": 34.6875,
|
|
"leftColumn": 1,
|
|
"text": "Test text",
|
|
"textStyle": "HEADING"
|
|
},
|
|
{
|
|
"widgetName": "Submitbutton",
|
|
"rightColumn": 12,
|
|
"onClick": "{{showModal()}}",
|
|
"isDefaultClickDisabled": true,
|
|
"widgetId": "3p92qmlzfl",
|
|
"buttonStyle": "PRIMARY_BUTTON",
|
|
"topRow": 1,
|
|
"bottomRow": 2,
|
|
"parentRowSpace": 38,
|
|
"isVisible": true,
|
|
"type": "BUTTON_WIDGET",
|
|
"dynamicBindingPathList": [],
|
|
"parentId": "hjiybwqair",
|
|
"isLoading": false,
|
|
"parentColumnSpace": 34.6875,
|
|
"leftColumn": 10,
|
|
"dynamicTriggerPathList": [{
|
|
"key": "onClick"
|
|
}],
|
|
"text": "Test Button Text",
|
|
"isDisabled": false
|
|
}
|
|
]
|
|
}
|
|
],
|
|
"text": "n TexttuTest Button Text"
|
|
},
|
|
{
|
|
"backgroundColor": "#FFFFFF",
|
|
"widgetName": "Container3",
|
|
"rightColumn": 16,
|
|
"orientation": "VERTICAL",
|
|
"snapColumns": 16,
|
|
"widgetId": "28hfrtdb1a",
|
|
"containerStyle": "card",
|
|
"topRow": 9,
|
|
"bottomRow": 23,
|
|
"parentRowSpace": 38,
|
|
"isVisible": true,
|
|
"type": "CONTAINER_WIDGET",
|
|
"dynamicBindingPathList": [],
|
|
"isLoading": false,
|
|
"parentColumnSpace": 75.25,
|
|
"leftColumn": 0,
|
|
"children": [
|
|
{
|
|
"backgroundColor": "#FFFFFF",
|
|
"widgetName": "lvl7ajf1rn",
|
|
"rightColumn": 1204,
|
|
"orientation": "VERTICAL",
|
|
"snapColumns": 16,
|
|
"detachFromLayout": true,
|
|
"widgetId": "ac4kpozgg3",
|
|
"containerStyle": "none",
|
|
"topRow": 0,
|
|
"bottomRow": 532,
|
|
"parentRowSpace": 1,
|
|
"isVisible": true,
|
|
"type": "CANVAS_WIDGET",
|
|
"canExtend": false,
|
|
"isLoading": false,
|
|
"parentColumnSpace": 1,
|
|
"leftColumn": 0,
|
|
"children": [
|
|
{
|
|
"widgetName": "Table1",
|
|
"rightColumn": 11,
|
|
"widgetId": "yum9t90tb2",
|
|
"topRow": 1,
|
|
"bottomRow": 8,
|
|
"parentRowSpace": 38,
|
|
"tableData": "{{UsersApi.data}}",
|
|
"isVisible": true,
|
|
"label": "Data",
|
|
"type": "TABLE_WIDGET",
|
|
"dynamicBindingPathList": [
|
|
{
|
|
"key": "tableData"
|
|
}
|
|
],
|
|
"isLoading": false,
|
|
"parentColumnSpace": 71.75,
|
|
"leftColumn": 1,
|
|
"dynamicTriggerPathList": [{
|
|
"key": "onRowSelected"
|
|
}],
|
|
"onRowSelected": "{{navigateTo()}}",
|
|
"selectedRow": "{{Table1.tableData[Table1.selectedRowIndex]}}"
|
|
}
|
|
]
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"backgroundColor": "#FFFFFF",
|
|
"widgetName": "Container4",
|
|
"rightColumn": 16,
|
|
"orientation": "VERTICAL",
|
|
"snapColumns": 16,
|
|
"widgetId": "ii6dnhfrba",
|
|
"containerStyle": "card",
|
|
"topRow": 0,
|
|
"bottomRow": 9,
|
|
"parentRowSpace": 38,
|
|
"isVisible": true,
|
|
"type": "CONTAINER_WIDGET",
|
|
"dynamicBindingPathList": [],
|
|
"isLoading": false,
|
|
"parentColumnSpace": 75.25,
|
|
"leftColumn": 8,
|
|
"children": [
|
|
{
|
|
"backgroundColor": "#FFFFFF",
|
|
"widgetName": "rnz3m8xrzc",
|
|
"rightColumn": 602,
|
|
"orientation": "VERTICAL",
|
|
"snapColumns": 16,
|
|
"detachFromLayout": true,
|
|
"widgetId": "iw4o07jvik",
|
|
"containerStyle": "none",
|
|
"topRow": 0,
|
|
"bottomRow": 342,
|
|
"parentRowSpace": 1,
|
|
"isVisible": true,
|
|
"type": "CANVAS_WIDGET",
|
|
"canExtend": false,
|
|
"isLoading": false,
|
|
"parentColumnSpace": 1,
|
|
"leftColumn": 0,
|
|
"children": []
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"widgetName": "TestModal",
|
|
"rightColumn": 0,
|
|
"detachFromLayout": true,
|
|
"widgetId": "s8mtp5krfz",
|
|
"topRow": 0,
|
|
"bottomRow": 0,
|
|
"parentRowSpace": 1,
|
|
"isVisible": false,
|
|
"canOutsideClickClose": true,
|
|
"type": "MODAL_WIDGET",
|
|
"canEscapeKeyClose": true,
|
|
"dynamicBindingPathList": [],
|
|
"parentId": "0",
|
|
"shouldScrollContents": true,
|
|
"blueprint": {
|
|
"view": [
|
|
{
|
|
"position": {
|
|
"top": 0,
|
|
"left": 0
|
|
},
|
|
"type": "CANVAS_WIDGET",
|
|
"props": {
|
|
"shouldScrollContents": false,
|
|
"blueprint": {
|
|
"view": [
|
|
{
|
|
"size": {
|
|
"rows": 1,
|
|
"cols": 1
|
|
},
|
|
"position": {
|
|
"top": 0,
|
|
"left": 15
|
|
},
|
|
"type": "ICON_WIDGET",
|
|
"props": {
|
|
"color": "#040627",
|
|
"iconName": "cross",
|
|
"iconSize": 24
|
|
}
|
|
},
|
|
{
|
|
"size": {
|
|
"rows": 1,
|
|
"cols": 15
|
|
},
|
|
"position": {
|
|
"top": 0,
|
|
"left": 0
|
|
},
|
|
"type": "TEXT_WIDGET",
|
|
"props": {
|
|
"text": "Modal Title",
|
|
"textStyle": "HEADING"
|
|
}
|
|
},
|
|
{
|
|
"size": {
|
|
"rows": 1,
|
|
"cols": 3
|
|
},
|
|
"position": {
|
|
"top": 4,
|
|
"left": 10
|
|
},
|
|
"type": "BUTTON_WIDGET",
|
|
"props": {
|
|
"buttonStyle": "SECONDARY_BUTTON",
|
|
"text": "Cancel"
|
|
}
|
|
},
|
|
{
|
|
"size": {
|
|
"rows": 1,
|
|
"cols": 3
|
|
},
|
|
"position": {
|
|
"top": 4,
|
|
"left": 13
|
|
},
|
|
"type": "BUTTON_WIDGET",
|
|
"props": {
|
|
"buttonStyle": "PRIMARY_BUTTON",
|
|
"text": "Confirm"
|
|
}
|
|
}
|
|
],
|
|
"operations": [
|
|
{
|
|
"type": "MODIFY_PROPS"
|
|
}
|
|
]
|
|
},
|
|
"detachFromLayout": true,
|
|
"children": [],
|
|
"isVisible": true,
|
|
"isDisabled": false,
|
|
"canExtend": true
|
|
}
|
|
}
|
|
]
|
|
},
|
|
"isLoading": false,
|
|
"parentColumnSpace": 1,
|
|
"size": "MODAL_SMALL",
|
|
"leftColumn": 0,
|
|
"children": [
|
|
{
|
|
"widgetName": "Canvas1",
|
|
"rightColumn": 0,
|
|
"detachFromLayout": true,
|
|
"widgetId": "dma7flgdrm",
|
|
"topRow": 0,
|
|
"bottomRow": 0,
|
|
"parentRowSpace": 1,
|
|
"isVisible": true,
|
|
"canExtend": true,
|
|
"type": "CANVAS_WIDGET",
|
|
"parentId": "s8mtp5krfz",
|
|
"shouldScrollContents": false,
|
|
"blueprint": {
|
|
"view": [
|
|
{
|
|
"size": {
|
|
"rows": 1,
|
|
"cols": 1
|
|
},
|
|
"position": {
|
|
"top": 0,
|
|
"left": 15
|
|
},
|
|
"type": "ICON_WIDGET",
|
|
"props": {
|
|
"color": "#040627",
|
|
"iconName": "cross",
|
|
"iconSize": 24
|
|
}
|
|
},
|
|
{
|
|
"size": {
|
|
"rows": 1,
|
|
"cols": 15
|
|
},
|
|
"position": {
|
|
"top": 0,
|
|
"left": 0
|
|
},
|
|
"type": "TEXT_WIDGET",
|
|
"props": {
|
|
"text": "Modal Title",
|
|
"textStyle": "HEADING"
|
|
}
|
|
},
|
|
{
|
|
"size": {
|
|
"rows": 1,
|
|
"cols": 3
|
|
},
|
|
"position": {
|
|
"top": 4,
|
|
"left": 10
|
|
},
|
|
"type": "BUTTON_WIDGET",
|
|
"props": {
|
|
"buttonStyle": "SECONDARY_BUTTON",
|
|
"text": "Cancel"
|
|
}
|
|
},
|
|
{
|
|
"size": {
|
|
"rows": 1,
|
|
"cols": 3
|
|
},
|
|
"position": {
|
|
"top": 4,
|
|
"left": 13
|
|
},
|
|
"type": "BUTTON_WIDGET",
|
|
"props": {
|
|
"buttonStyle": "PRIMARY_BUTTON",
|
|
"text": "Confirm"
|
|
}
|
|
}
|
|
],
|
|
"operations": [
|
|
{
|
|
"type": "MODIFY_PROPS"
|
|
}
|
|
]
|
|
},
|
|
"minHeight": 0,
|
|
"isLoading": false,
|
|
"parentColumnSpace": 1,
|
|
"leftColumn": 0,
|
|
"children": [
|
|
{
|
|
"widgetName": "Icon1",
|
|
"rightColumn": 16,
|
|
"onClick": "{{closeModal(TestModal.name)}}",
|
|
"color": "#040627",
|
|
"iconName": "cross",
|
|
"widgetId": "n5fc0ven2a",
|
|
"topRow": 0,
|
|
"bottomRow": 1,
|
|
"isVisible": true,
|
|
"type": "ICON_WIDGET",
|
|
"parentId": "dma7flgdrm",
|
|
"isLoading": false,
|
|
"leftColumn": 15,
|
|
"iconSize": 24
|
|
},
|
|
{
|
|
"isLoading": false,
|
|
"widgetName": "Text1",
|
|
"rightColumn": 15,
|
|
"leftColumn": 0,
|
|
"widgetId": "s818l5hhvq",
|
|
"topRow": 0,
|
|
"bottomRow": 1,
|
|
"isVisible": true,
|
|
"text": "Modal Title",
|
|
"textStyle": "HEADING",
|
|
"type": "TEXT_WIDGET",
|
|
"parentId": "dma7flgdrm"
|
|
},
|
|
{
|
|
"widgetName": "Button1",
|
|
"rightColumn": 13,
|
|
"isDefaultClickDisabled": true,
|
|
"widgetId": "io777lh7bc",
|
|
"buttonStyle": "SECONDARY_BUTTON",
|
|
"topRow": 4,
|
|
"bottomRow": 5,
|
|
"isVisible": true,
|
|
"type": "BUTTON_WIDGET",
|
|
"parentId": "dma7flgdrm",
|
|
"isLoading": false,
|
|
"leftColumn": 10,
|
|
"text": "Cancel",
|
|
"isDisabled": false
|
|
},
|
|
{
|
|
"widgetName": "Button2",
|
|
"rightColumn": 16,
|
|
"isDefaultClickDisabled": true,
|
|
"widgetId": "gexp49bfyb",
|
|
"buttonStyle": "PRIMARY_BUTTON",
|
|
"topRow": 4,
|
|
"bottomRow": 5,
|
|
"isVisible": true,
|
|
"type": "BUTTON_WIDGET",
|
|
"parentId": "dma7flgdrm",
|
|
"isLoading": false,
|
|
"leftColumn": 13,
|
|
"text": "Confirm",
|
|
"isDisabled": false
|
|
}
|
|
],
|
|
"isDisabled": false
|
|
}
|
|
]
|
|
}
|
|
]
|
|
}
|
|
}
|