editor: add ordered property for definitions

* Adds ordered properties for JSONSchema definitions. * Fixes ordered properties for JSONSchema oneOf, anyOf. * Sets horizontal labels only for the long mode editor. Co-Authored-by: Johnny Mariéthoz <Johnny.Mariethoz@rero.ch>
rero · Jul 23, 2020 · 40a3385 · 40a3385
1 parent 7cec461
commit 40a3385
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/projects/rero/ng-core/src/lib/record/editor/editor.component.ts b/projects/rero/ng-core/src/lib/record/editor/editor.component.ts
@@ -328,7 +328,7 @@ export class EditorComponent implements OnInit, OnChanges, OnDestroy {
           }
 
           // Add an horizontal wrapper
-          if (this._horizontalWrapperTypes.some(elem => elem === field.type)) {
+          if (this.longMode && this._horizontalWrapperTypes.some(elem => elem === field.type)) {
             field.wrappers = [
               ...(field.wrappers ? field.wrappers : []),
               'form-field-horizontal'

diff --git a/projects/rero/ng-core/src/lib/record/editor/utils.ts b/projects/rero/ng-core/src/lib/record/editor/utils.ts
@@ -50,16 +50,22 @@ export function orderedJsonSchema(schema: any) {
       orderedJsonSchema(item);
     }
   }
-    // recursion for anyOf
+  // recursion for anyOf
   if (schema.anyOf) {
-    for (const item of schema.oneOf) {
-      orderedJsonSchema(schema.anyOf);
+    for (const item of schema.anyOf) {
+      orderedJsonSchema(item);
     }
   }
   // recursion for allOf
   if (schema.allOf) {
-    for (const item of schema.oneOf) {
-      orderedJsonSchema(schema.allOf);
+    for (const item of schema.allOf) {
+      orderedJsonSchema(item);
+    }
+  }
+  // recursion for definitions
+  if (schema.definitions) {
+    for (const property of Object.keys(schema.definitions)) {
+      orderedJsonSchema(schema.definitions[property]);
     }
   }
   return schema;
@@ -87,7 +93,7 @@ export function resolveRefs(data: any) {
     for (const key of Object.keys(data)) {
       const value = resolveRefs(data[key]);
       if (key === '$ref') {
-        newObject.pid =  extractIdOnRef(value);
+        newObject.pid = extractIdOnRef(value);
       } else {
         newObject[key] = value;
       }