fix:JSONForm > Switch Field: label position has no effect, label wrap… #34298
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| import { | ||
| agHelper, | ||
| draggableWidgets, | ||
| entityExplorer, | ||
| propPane, | ||
| } from "../../../../../support/Objects/ObjectsCore"; | ||
|
|
||
| const commonlocators = require("../../../../../locators/commonlocators.json"); | ||
| const widgetsPage = require("../../../../../locators/Widgets.json"); | ||
|
|
||
| // this spec will have a json form with two textinput fields and one is updated to switch field | ||
| // We will check the position property by clicking on the left and right position buttons | ||
| // here only alignment changes and the fields order in the dom changes so no assertions were added | ||
|
|
||
| describe( | ||
| "JSON Form Widget Custom Field", | ||
| { tags: ["@tag.Widget", "@tag.JSONForm"] }, | ||
| () => { | ||
| const schema = { | ||
| name: "John", | ||
| education: "1", | ||
| }; | ||
|
|
||
| it("verifies the label position and alignment", () => { | ||
| entityExplorer.DragDropWidgetNVerify(draggableWidgets.JSONFORM, 300, 100); | ||
| propPane.EnterJSContext( | ||
| "sourcedata", | ||
| JSON.stringify(schema), | ||
| true, | ||
| false, | ||
| ); | ||
| propPane.ChangeJsonFormFieldType("Education", "Switch"); | ||
| agHelper.AssertClassExists( | ||
| widgetsPage.switchlabel, | ||
| widgetsPage.switchAlignRight, | ||
| ); | ||
| agHelper | ||
| .GetNClick(commonlocators.optionposition) | ||
| .last() | ||
| .click({ force: true }); | ||
| agHelper.GetNClick(widgetsPage.rightAlign).first().click({ force: true }); | ||
| agHelper.AssertClassExists( | ||
| widgetsPage.switchlabel, | ||
| widgetsPage.switchAlignLeft, | ||
| ); | ||
| agHelper | ||
| .GetNClick(commonlocators.optionpositionL) | ||
| .last() | ||
| .click({ force: true }); | ||
| agHelper.AssertClassExists( | ||
|
Contributor
There was a problem hiding this comment. @Harshithazemoso Do we need only class assert here? Just want to clarify this case is need from cypress side or unit testing can also help here. |
||
| widgetsPage.switchlabel, | ||
| widgetsPage.switchAlignRight, | ||
| ); | ||
| propPane.NavigateBackToPropertyPane(); | ||
| }); | ||
rahulbarwal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }, | ||
| ); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| import type { DSLWidget, WidgetProps } from "../types"; | ||
| import { traverseDSLAndMigrate } from "../utils"; | ||
|
|
||
| export const migrateJsonFormWidgetLabelPositonAndAlignment = ( | ||
| currentDSL: DSLWidget, | ||
| ) => { | ||
| return traverseDSLAndMigrate(currentDSL, (widget: WidgetProps) => { | ||
| if (widget.type == "JSON_FORM_WIDGET") { | ||
| const jsonFormWidgetProps = widget; | ||
| Object.keys(jsonFormWidgetProps.schema).forEach((key) => { | ||
| const field = jsonFormWidgetProps.schema[key]; | ||
rahulbarwal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if (field.children) { | ||
| Object.keys(field.children).forEach((childKey) => { | ||
| const childField = field.children[childKey]; | ||
rahulbarwal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| if ( | ||
| childField.fieldType === "Switch" && | ||
| childField.alignWidget === "RIGHT" | ||
| ) { | ||
| childField.alignWidget = "LEFT"; | ||
| } | ||
|
|
||
| if ( | ||
| childField.fieldType === "Checkbox" && | ||
| childField.alignWidget === "LEFT" | ||
| ) { | ||
| field.children[childKey] = { | ||
| ...childField, | ||
| labelPosition: "Right", | ||
| }; | ||
rahulbarwal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| if ( | ||
| childField.fieldType === "Checkbox" && | ||
| childField.alignWidget === "RIGHT" | ||
| ) { | ||
| childField.alignWidget = "LEFT"; | ||
| field.children[childKey] = { | ||
| ...childField, | ||
| labelPosition: "Left", | ||
| }; | ||
| } | ||
| }); | ||
| } | ||
| }); | ||
| } | ||
| }); | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,235 @@ | ||
| import { migrateJsonFormWidgetLabelPositonAndAlignment } from "../migrations/089-migrate-jsonformwidget-labelposition-and-alignment"; | ||
| import type { DSLWidget } from "../types"; | ||
|
|
||
| const inputDsl: DSLWidget = { | ||
| widgetName: "MainContainer", | ||
| backgroundColor: "none", | ||
| rightColumn: 1118, | ||
| snapColumns: 16, | ||
| detachFromLayout: true, | ||
| widgetId: "0", | ||
| topRow: 0, | ||
| bottomRow: 1280, | ||
| containerStyle: "none", | ||
| snapRows: 33, | ||
| parentRowSpace: 1, | ||
| type: "CANVAS_WIDGET", | ||
| canExtend: true, | ||
| version: 15, | ||
| minHeight: 1292, | ||
| parentColumnSpace: 1, | ||
| dynamicTriggerPathList: [], | ||
| dynamicBindingPathList: [], | ||
| leftColumn: 0, | ||
| isLoading: false, | ||
| parentId: "", | ||
| renderMode: "CANVAS", | ||
| children: [ | ||
| { | ||
| widgetName: "JSONForm1", | ||
| type: "JSON_FORM_WIDGET", | ||
| schema: { | ||
| field1: { | ||
| fieldType: "OBJECT", | ||
| children: { | ||
| switchField: { | ||
| accessor: "Test Switch", | ||
| accentColor: "#553DE9", | ||
| alignWidget: "RIGHT", | ||
| boxShadow: "none", | ||
| children: {}, | ||
| dataType: "STRING", | ||
| defaultValue: "", | ||
| fieldType: "Switch", | ||
| identifier: "TEST_IDENTIFIER", | ||
| isCustomField: false, | ||
| isDisabled: false, | ||
| isRequired: false, | ||
| isVisible: true, | ||
| label: "Test Switch", | ||
| labelPosition: "Right", | ||
| labelStyle: "", | ||
| labelTextColor: "", | ||
| labelTextSize: "0.875rem", | ||
| originalIdentifier: "Test Switch", | ||
| position: 0, | ||
| sourceData: "har", | ||
| tooltip: "", | ||
| }, | ||
| checkboxField1: { | ||
| accessor: "Test Checkbox 1", | ||
| accentColor: "#553DE9", | ||
| alignWidget: "LEFT", | ||
| boxShadow: "none", | ||
| children: {}, | ||
| dataType: "STRING", | ||
| defaultValue: "", | ||
| fieldType: "Checkbox", | ||
| identifier: "TEST_IDENTIFIER_1", | ||
| isCustomField: false, | ||
| isDisabled: false, | ||
| isRequired: false, | ||
| isVisible: true, | ||
| label: "Test Checkbox 1", | ||
| labelPosition: "Left", | ||
| labelStyle: "", | ||
| labelTextColor: "", | ||
| labelTextSize: "0.875rem", | ||
| originalIdentifier: "Test Checkbox 1", | ||
| position: 1, | ||
| sourceData: "har", | ||
| tooltip: "", | ||
| }, | ||
| checkboxField2: { | ||
| accessor: "Test Checkbox 2", | ||
| accentColor: "#553DE9", | ||
| alignWidget: "RIGHT", | ||
| boxShadow: "none", | ||
| children: {}, | ||
| dataType: "STRING", | ||
| defaultValue: "", | ||
| fieldType: "Checkbox", | ||
| identifier: "TEST_IDENTIFIER_2", | ||
| isCustomField: false, | ||
| isDisabled: false, | ||
| isRequired: false, | ||
| isVisible: true, | ||
| label: "Test Checkbox 2", | ||
| labelPosition: "Left", | ||
| labelStyle: "", | ||
| labelTextColor: "", | ||
| labelTextSize: "0.875rem", | ||
| originalIdentifier: "Test Checkbox 2", | ||
| position: 2, | ||
| sourceData: "har", | ||
| tooltip: "", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| widgetId: "jsonForm1", | ||
| dynamicBindingPathList: [], | ||
| renderMode: "CANVAS", | ||
| }, | ||
| ], | ||
| }; | ||
|
|
||
| const outputDsl: DSLWidget = { | ||
| widgetName: "MainContainer", | ||
| backgroundColor: "none", | ||
| rightColumn: 1118, | ||
| snapColumns: 16, | ||
| detachFromLayout: true, | ||
| widgetId: "0", | ||
| topRow: 0, | ||
| bottomRow: 1280, | ||
| containerStyle: "none", | ||
| snapRows: 33, | ||
| parentRowSpace: 1, | ||
| type: "CANVAS_WIDGET", | ||
| canExtend: true, | ||
| version: 15, | ||
| minHeight: 1292, | ||
| parentColumnSpace: 1, | ||
| dynamicTriggerPathList: [], | ||
| dynamicBindingPathList: [], | ||
| leftColumn: 0, | ||
| isLoading: false, | ||
| parentId: "", | ||
| renderMode: "CANVAS", | ||
| children: [ | ||
| { | ||
| widgetName: "JSONForm1", | ||
| type: "JSON_FORM_WIDGET", | ||
| schema: { | ||
| field1: { | ||
| fieldType: "OBJECT", | ||
| children: { | ||
| switchField: { | ||
| accessor: "Test Switch", | ||
| accentColor: "#553DE9", | ||
| alignWidget: "LEFT", | ||
| boxShadow: "none", | ||
| children: {}, | ||
| dataType: "STRING", | ||
| defaultValue: "", | ||
| fieldType: "Switch", | ||
| identifier: "TEST_IDENTIFIER", | ||
| isCustomField: false, | ||
| isDisabled: false, | ||
| isRequired: false, | ||
| isVisible: true, | ||
| label: "Test Switch", | ||
| labelPosition: "Right", | ||
| labelStyle: "", | ||
| labelTextColor: "", | ||
| labelTextSize: "0.875rem", | ||
| originalIdentifier: "Test Switch", | ||
| position: 0, | ||
| sourceData: "har", | ||
| tooltip: "", | ||
| }, | ||
| checkboxField1: { | ||
| accessor: "Test Checkbox 1", | ||
| accentColor: "#553DE9", | ||
| alignWidget: "LEFT", | ||
| boxShadow: "none", | ||
| children: {}, | ||
| dataType: "STRING", | ||
| defaultValue: "", | ||
| fieldType: "Checkbox", | ||
| identifier: "TEST_IDENTIFIER_1", | ||
| isCustomField: false, | ||
| isDisabled: false, | ||
| isRequired: false, | ||
| isVisible: true, | ||
| label: "Test Checkbox 1", | ||
| labelPosition: "Right", | ||
| labelStyle: "", | ||
| labelTextColor: "", | ||
| labelTextSize: "0.875rem", | ||
| originalIdentifier: "Test Checkbox 1", | ||
| position: 1, | ||
| sourceData: "har", | ||
| tooltip: "", | ||
| }, | ||
| checkboxField2: { | ||
| accessor: "Test Checkbox 2", | ||
| accentColor: "#553DE9", | ||
| alignWidget: "LEFT", | ||
| boxShadow: "none", | ||
| children: {}, | ||
| dataType: "STRING", | ||
| defaultValue: "", | ||
| fieldType: "Checkbox", | ||
| identifier: "TEST_IDENTIFIER_2", | ||
| isCustomField: false, | ||
| isDisabled: false, | ||
| isRequired: false, | ||
| isVisible: true, | ||
| label: "Test Checkbox 2", | ||
| labelPosition: "Left", | ||
| labelStyle: "", | ||
| labelTextColor: "", | ||
| labelTextSize: "0.875rem", | ||
| originalIdentifier: "Test Checkbox 2", | ||
| position: 2, | ||
| sourceData: "har", | ||
| tooltip: "", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| widgetId: "jsonForm1", | ||
| dynamicBindingPathList: [], | ||
| renderMode: "CANVAS", | ||
| }, | ||
| ], | ||
| }; | ||
|
|
||
| describe("JSON Form Widget Property Migration", () => { | ||
| it("should migrate JSON Form widget properties correctly", () => { | ||
| const newDsl = migrateJsonFormWidgetLabelPositonAndAlignment(inputDsl); | ||
| expect(JSON.stringify(newDsl)).toBe(JSON.stringify(outputDsl)); | ||
rahulbarwal marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| }); | ||
| }); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.