jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-27 03:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Process expandable initial data also for none required expandables (#24733)

Browse Source 
* Process expandable initial data also for none required expandables

* Update compute-initial-ha-form-data.ts

* check required fields of sections too when submitting
This commit is contained in:
Bram Kragten 2025-03-24 16:31:06 +01:00 committed by GitHub
parent 586a137037
commit bbe549fa86
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/ha-form/compute-initial-ha-form-data.ts
View File

@ -13,6 +13,12 @@ export const computeInitialHaFormData = (
data[field.name] = field.description.suggested_value;
} else if ("default" in field) {
data[field.name] = field.default;
} else if (field.type === "expandable") {
const expandableData = computeInitialHaFormData(field.schema);
if (field.required || Object.keys(expandableData).length) {
// Only add expandable data if it's required or any of its children have initial values.
data[field.name] = expandableData;
}
} else if (!field.required) {
// Do nothing.
} else if (field.type === "boolean") {
@ -36,8 +42,6 @@ export const computeInitialHaFormData = (
minutes: 0,
seconds: 0,
};
} else if (field.type === "expandable") {
data[field.name] = computeInitialHaFormData(field.schema);
} else if ("selector" in field) {
const selector: Selector = field.selector;

19
src/dialogs/config-flow/step-flow-form.ts
View File

@ -144,17 +144,24 @@ class StepFlowForm extends LitElement {
private async _submitStep(): Promise<void> {
const stepData = this._stepData || {};
const checkAllRequiredFields = (
schema: readonly HaFormSchema[],
data: Record<string, any>
) =>
schema.every(
(field) =>
(!field.required || !["", undefined].includes(data[field.name])) &&
(field.type !== "expandable" ||
(!field.required && data[field.name] === undefined) ||
checkAllRequiredFields(field.schema, data[field.name]))
);
const allRequiredInfoFilledIn =
stepData === undefined
? // If no data filled in, just check that any field is required
this.step.data_schema.find((field) => field.required) === undefined
: // If data is filled in, make sure all required fields are
stepData &&
this.step.data_schema.every(
(field) =>
!field.required ||
!["", undefined].includes(stepData![field.name])
);
checkAllRequiredFields(this.step.data_schema, stepData);
if (!allRequiredInfoFilledIn) {
this._errorMsg = this.hass.localize(