Merge pull request #437 from NeurodataWithoutBorders/update-cleanup-name

Update Cleanup Name
NeurodataWithoutBorders · Oct 13, 2023 · c2c147b · c2c147b
2 parents 9774cd9 + 937cb91
commit c2c147b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/schemas/json/dandi/upload.json b/schemas/json/dandi/upload.json
@@ -6,6 +6,7 @@
         },
         "cleanup": {
             "type": "boolean",
+            "title": "Delete Local Files After Upload",
             "default": false
         }
     },

diff --git a/src/renderer/src/stories/JSONSchemaForm.js b/src/renderer/src/stories/JSONSchemaForm.js
@@ -349,9 +349,9 @@ export class JSONSchemaForm extends LitElement {
         return true;
     };
 
-    #get = (path, object = this.resolved) => {
+    #get = (path, object = this.resolved, omitted = []) => {
         // path = path.slice(this.base.length); // Correct for base path
-        return path.reduce((acc, curr) => (acc = acc[curr]), object);
+        return path.reduce((acc, curr) => (acc = acc[curr] ?? acc?.[omitted.find((str) => acc[str])]?.[curr]), object);
     };
 
     #checkRequiredAfterChange = async (localPath) => {
@@ -375,7 +375,7 @@ export class JSONSchemaForm extends LitElement {
             if (indexOf !== -1) path = path.slice(indexOf + 1);
         }
 
-        const resolved = this.#get(path, schema);
+        const resolved = this.#get(path, schema, ["properties"]);
         if (resolved["$ref"]) return this.getSchema(resolved["$ref"].split("/").slice(1)); // NOTE: This assumes reference to the root of the schema
 
         return resolved;
@@ -432,7 +432,7 @@ export class JSONSchemaForm extends LitElement {
                     ? "conditional"
                     : ""}"
             >
-                <label class="guided--form-label">${header(name)}</label>
+                <label class="guided--form-label">${info.title ?? header(name)}</label>
                 ${interactiveInput}
                 <div class="errors"></div>
                 <div class="warnings"></div>
@@ -619,7 +619,13 @@ export class JSONSchemaForm extends LitElement {
         } else {
             // For non-links, throw a basic requirement error if the property is required
             if (!errors.length && isRequired && !parent[name]) {
-                errors.push({ message: `${name} is a required property.`, type: "error", missing: true }); // Throw at least a basic error if the property is required
+                const schema = this.getSchema(localPath);
+                console.log(schema);
+                errors.push({
+                    message: `${schema.title ?? header(name)} is a required property.`,
+                    type: "error",
+                    missing: true,
+                }); // Throw at least a basic error if the property is required
             }
         }