Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update button property text #38758

Merged
merged 14 commits into from
Jan 21, 2025
Merged

fix: Update button property text #38758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
137156f
fix: Rename 'Disabled invalid forms' to 'Disable when form is invalid…
devin-ai-integration[bot] Jan 20, 2025
f222ddd
chore: trigger CI
devin-ai-integration[bot] Jan 20, 2025
b36cfe3
chore: trigger CI with correct tag format
devin-ai-integration[bot] Jan 20, 2025
4c6c2a9
chore: trigger CI with correct tag format and order
devin-ai-integration[bot] Jan 20, 2025
ea05360
chore: trigger CI with example format
devin-ai-integration[bot] Jan 20, 2025
8b749c8
chore: trigger CI with exact spacing
devin-ai-integration[bot] Jan 20, 2025
123e048
chore: trigger CI with minimal format
devin-ai-integration[bot] Jan 20, 2025
e3d2171
chore: trigger CI with unquoted tag
devin-ai-integration[bot] Jan 20, 2025
292046a
chore: trigger CI with example format
devin-ai-integration[bot] Jan 20, 2025
8cd68b9
chore: trigger CI with double quotes
devin-ai-integration[bot] Jan 20, 2025
c6c0ecc
chore: trigger CI with both tags
devin-ai-integration[bot] Jan 20, 2025
d94ad7b
chore: trigger CI with only @tag.All
devin-ai-integration[bot] Jan 20, 2025
37c3956
fix: update property name for form settings in ListV2 widget tests
rahulbarwal Jan 20, 2025
644a6c8
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
rahulbarwal Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/client/cypress/e2e/Regression/ClientSide/Widgets/Button/Button2_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ describe(
"Form1",
]);
// disable form validation
propPane.TogglePropertyState("Disabled invalid forms", "Off");
propPane.TogglePropertyState("Disable when form is invalid", "Off");
// set invalid text
agHelper.TypeText(clocators.inputField, fakerHelper.GetRandomNumber());
// assert submit button us enabled since disabled invalid form is off
Expand Down
2 changes: 1 addition & 1 deletion ...client/cypress/e2e/Regression/ClientSide/Widgets/JSONForm/JSONForm_FormProperties_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe(
deployMode.NavigateBacktoEditor();
});

it("2. Disabled Invalid Forms - disables the submit button when form has invalid field(s)", () => {
it("2. Disable when form is invalid - disables the submit button when form has invalid field(s)", () => {
EditorNavigation.SelectEntityByName("JSONForm1", EntityType.Widget);

cy.get("button")
Expand Down
2 changes: 1 addition & 1 deletion ...cypress/e2e/Regression/ClientSide/Widgets/ListV2/Listv2_WithButtonGroupIconWidget_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe(
const generalProperties1 = ["visible", "disabled", "animateloading"];

const formSettingsProperties = [
"disabledinvalidforms",
"disablewhenformisinvalid",
"resetformonsuccess",
];

Expand Down
10 changes: 5 additions & 5 deletions app/client/packages/dsl/src/migrate/helpers/widget-configs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3530,7 +3530,7 @@
{
"helpText": "Disabled if the form is invalid, if this widget exists directly within a Form widget.",
"propertyName": "disabledWhenInvalid",
"label": "Disabled invalid forms",
"label": "Disable when form is invalid",
"controlType": "SWITCH",
"isJSConvertible": true,
"isBindProperty": true,
Expand Down Expand Up @@ -46238,7 +46238,7 @@
{
"propertyName": "disabledWhenInvalid",
"helpText": "Disables the submit button when the parent form has a required widget that is not filled",
"label": "Disabled invalid forms",
"label": "Disable when form is invalid",
"controlType": "SWITCH",
"isJSConvertible": true,
"isBindProperty": true,
Expand Down Expand Up @@ -54511,7 +54511,7 @@
{
"helpText": "Disabled if the form is invalid, if this widget exists directly within a Form widget.",
"propertyName": "disabledWhenInvalid",
"label": "Disabled invalid forms",
"label": "Disable when form is invalid",
"controlType": "SWITCH",
"isJSConvertible": true,
"isBindProperty": true,
Expand Down Expand Up @@ -60391,7 +60391,7 @@
{
"helpText": "Disabled if the form is invalid, if this widget exists directly within a Form widget.",
"propertyName": "disabledWhenInvalid",
"label": "Disabled invalid forms",
"label": "Disable when form is invalid",
"controlType": "SWITCH",
"isJSConvertible": true,
"isBindProperty": true,
Expand Down Expand Up @@ -60697,7 +60697,7 @@
{
"helpText": "Disabled if the form is invalid, if this widget exists directly within a Form widget.",
"propertyName": "disabledWhenInvalid",
"label": "Disabled invalid forms",
"label": "Disable when form is invalid",
"controlType": "SWITCH",
"isJSConvertible": true,
"isBindProperty": true,
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/widgets/ButtonGroupWidget/widget/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ class ButtonGroupWidget extends BaseWidget<
children: [
{
propertyName: "disabledWhenInvalid",
label: "Disabled invalid forms",
label: "Disable when form is invalid",
helpText:
"Disables this button if the form is invalid, if this button exists directly within a Form widget",
controlType: "SWITCH",
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/widgets/ButtonWidget/widget/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ class ButtonWidget extends BaseWidget<ButtonWidgetProps, ButtonWidgetState> {
helpText:
"Disabled if the form is invalid, if this widget exists directly within a Form widget.",
propertyName: "disabledWhenInvalid",
label: "Disabled invalid forms",
label: "Disable when form is invalid",
controlType: "SWITCH",
isJSConvertible: true,
isBindProperty: true,
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/widgets/JSONFormWidget/widget/propertyConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ export const contentConfig = [
propertyName: "disabledWhenInvalid",
helpText:
"Disables the submit button when the parent form has a required widget that is not filled",
label: "Disabled invalid forms",
label: "Disable when form is invalid",
controlType: "SWITCH",
isJSConvertible: true,
isBindProperty: true,
Expand Down
Loading