Merge pull request #220 from fractal-analytics-platform/show_custom_property_key_as_title

Show custom property key as title and enable different descriptions for siblings properties.

Author: rkpasia

src/lib/components/common/jschema/ArrayProperty.svelte

@@ -30,8 +30,8 @@
 {#if schemaProperty }
   <div class='d-flex flex-column p-2'>
     <div class='property-metadata d-flex flex-column w-100'>
-      <span class='fs-5 {schemaProperty.isRequired() ? "fw-bold" : ""}'>{ schemaProperty.title }</span>
-      <span class='small'>{schemaProperty.description }</span>
+      <span class='fs-5 {schemaProperty.isRequired() ? "fw-bold" : ""}'>{ schemaProperty.title || "" }</span>
+      <span class='small'>{schemaProperty.description || "" }</span>
     </div>
     <div class='array-items my-2'>
 

src/lib/components/common/jschema/ObjectProperty.svelte

@@ -38,7 +38,7 @@
   <div class='d-flex flex-column p-2'>
     <div class='property-metadata d-flex flex-column w-100'>
       <span class='fs-5 {objectSchema.isRequired() ? "fw-bold" : ""}'>{ objectSchema.title }</span>
-      <span class='small'>{ objectSchema.description }</span>
+      <span class='small'>{ objectSchema.description || "" }</span>
     </div>
     <div class='object-properties my-2'>
       <div class='accordion' id='{accordionParentKey}'>

src/lib/components/common/jschema/schema_management.js

@@ -154,7 +154,8 @@ export class SchemaProperty {
 		if (this.type === undefined && this.$ref !== undefined) {
 			const resolvedSchema = resolveSchemaReference(this.$ref, this.globalSchema);
 			Object.keys(resolvedSchema).forEach(schemaKey => {
-				this[schemaKey] = resolvedSchema[schemaKey];
+				if (this[schemaKey] === undefined)
+					this[schemaKey] = resolvedSchema[schemaKey];
 			});
 		}
 
@@ -254,7 +255,8 @@ export class SchemaProperty {
 			}
 
 			// This should resolve the reference to the inner schema within the global schema
-			this.properties[namedKey] = this.referenceSchema.additionalProperties;
+			this.properties[namedKey] = JSON.parse(JSON.stringify(this.referenceSchema.additionalProperties));
+			this.properties[namedKey].title = namedKey;
 			this.properties[namedKey].value = propertyValue;
 		}
 	}