Merge pull request #377 from guillotinaweb/fix_373_schemaprocessor_2.4.x

fix #373: missing schemaprocessor implementation
guillotinaweb · Dec 14, 2020 · 8fd6851 · 8fd6851
2 parents cd952a9 + c1e818b
commit 8fd6851
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 2.4.12 (2020-12-03)
+- fix #373: missing schemaprocessor implementation
+
 # 2.4.11 (2020-12-03)
 - fix #373: add support for array items with different schema definitions
 

diff --git a/projects/schema-form/package.json b/projects/schema-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-schema-form",
-  "version": "2.4.11",
+  "version": "2.4.12",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/guillotinaweb/ngx-schema-form"

diff --git a/projects/schema-form/src/lib/model/schemapreprocessor.ts b/projects/schema-form/src/lib/model/schemapreprocessor.ts
@@ -134,7 +134,16 @@ export class SchemaPreprocessor {
         }
       }
     } else if (jsonSchema.type === 'array') {
-      SchemaPreprocessor.preprocess(jsonSchema.items, path + '*/');
+      if (Array.isArray(jsonSchema.items || {})) {
+        for (let i = 0; i < jsonSchema.items.length; i++) {
+          SchemaPreprocessor.preprocess(jsonSchema.items[i], path + '*/');
+        }
+      } else {
+        SchemaPreprocessor.preprocess(jsonSchema.items, path + '*/');
+      }
+      if (jsonSchema.additionalItems) {
+        SchemaPreprocessor.preprocess(jsonSchema.additionalItems, path + '*/');
+      }
     }
   }