Fixed possible NPE in FormField testId generation

CR with Anselm
xh · Jan 18, 2024 · 3128b31 · 3128b31
1 parent 76105ed
commit 3128b31
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/desktop/cmp/form/FormField.ts b/desktop/cmp/form/FormField.ts
@@ -163,7 +163,7 @@ export const [FormField, formField] = hoistCmp.withFactory<FormFieldProps>({
         if (disabled) classes.push('xh-form-field-disabled');
         if (displayNotValid) classes.push('xh-form-field-invalid');
 
-        const testId = getFormFieldTestId(props, formContext, model.name);
+        const testId = getFormFieldTestId(props, formContext, model?.name);
         useOnMount(() => instanceManager.registerModelWithTestId(testId, model));
         useOnUnmount(() => instanceManager.unregisterModelWithTestId(testId));
 
@@ -369,5 +369,8 @@ function getFormFieldTestId(
     formContext: FormContextType,
     fieldName: string
 ): string {
-    return props.testId ?? (formContext.testId ? `${formContext.testId}-${fieldName}` : undefined);
+    return (
+        props.testId ??
+        (formContext.testId && fieldName ? `${formContext.testId}-${fieldName}` : undefined)
+    );
 }