fix(json-schema): do not replace expression properties if required fi… (

#2839) Co-authored-by: Daniel Pohl <daniel.pohl@maximago.de> Co-authored-by: Abdellatif Ait boudad <a.aitboudad@gmail.com>
ngx-formly · May 16, 2021 · 56ee55c · 56ee55c
1 parent 103c04a
commit 56ee55c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/core/json-schema/src/formly-json-schema.service.spec.ts b/src/core/json-schema/src/formly-json-schema.service.spec.ts
@@ -387,6 +387,32 @@ describe('Service: FormlyJsonschema', () => {
           fixture.detectChanges();
           expect(childField.templateOptions.required).toBeTruthy();
         });
+
+        it('should not kill other expressionProperties', () => {
+          const {field} = renderComponent(JSON.parse(`{
+            "schema": {
+              "type": "object",
+              "required": [
+                "name"
+              ],
+              "properties": {
+                "name": {
+                  "type": "string",
+                  "widget": {
+                    "formlyConfig": {
+                      "expressionProperties": {
+                        "templateOptions.readonly": "model.readonly"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }`));
+
+          const childField = field.fieldGroup[0];
+          expect(childField.expressionProperties['templateOptions.readonly']).toEqual('model.readonly');
+        });
       });
 
       describe('dependencies', () => {

diff --git a/src/core/json-schema/src/formly-json-schema.service.ts b/src/core/json-schema/src/formly-json-schema.service.ts
@@ -154,7 +154,8 @@ export class FormlyJsonschema {
             (Array.isArray(schema.required) && schema.required.indexOf(property) !== -1)
             || propDeps[property]
           ) {
-            f.expressionProperties = {
+            f.expressionProperties =  {
+              ...(f.expressionProperties || {}),
               'templateOptions.required': (m, s, f) => {
                 const { model, templateOptions: { required } } = f.parent ? f.parent : { templateOptions: {} } as any;
                 if (!model && !required) {