fix: schema.required is not a mandatory property

gravitee-io · Sep 26, 2024 · 4f2a8fa · 4f2a8fa
1 parent 5c91462
commit 4f2a8fa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/lib/schema-form.js b/src/lib/schema-form.js
@@ -39,6 +39,6 @@ function _canInline(schema, key) {
 }
 
 export function canGrid(schema) {
-  const keys = Object.keys(schema.properties);
+  const keys = Object.keys(schema.properties || {});
   return keys.length > 2 && keys.filter((key) => _canInline(schema, key)).length === keys.length;
 }
diff --git a/src/organisms/gv-resources/gv-resources.js b/src/organisms/gv-resources/gv-resources.js
@@ -135,10 +135,11 @@ export class GvResources extends KeyboardElement(LitElement) {
     };
 
     const schema = typeof resourceType.schema === 'string' ? JSON.parse(resourceType.schema) : resourceType.schema;
+    const schemaRequired = schema.required ? schema.required : [];
 
     return {
-      properties: { ...defaultSchema.properties, ...schema.properties },
-      required: [...defaultSchema.required, ...schema.required],
+      properties: { ...defaultSchema.properties, ...schema.properties},
+      required: [...defaultSchema.required, ...schemaRequired],
     };
   }
 

diff --git a/src/organisms/gv-schema-form-control-object/gv-schema-form-control-object.js b/src/organisms/gv-schema-form-control-object/gv-schema-form-control-object.js
@@ -91,7 +91,7 @@ export class GvSchemaFormControlObject extends UpdateAfterBrowser(LitElement) {
   }
 
   render() {
-    const keys = Object.keys(this.schema.properties);
+    const keys = Object.keys(this.schema.properties || {});
     const isGrid = canGrid(this.schema);
     const classes = {
       'form_control-inline': canInline(this.schema),