Merge branch 'main' into selectively-validate-empty-values

NeurodataWithoutBorders · Nov 2, 2023 · 03a8d8c · 03a8d8c
2 parents 6c031eb + 13db3c4
commit 03a8d8c
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 13 deletions.
diff --git a/schemas/base-metadata.schema.ts b/schemas/base-metadata.schema.ts
@@ -5,6 +5,14 @@ export const preprocessMetadataSchema = (schema: any = baseMetadataSchema) => {
     // Add unit to weight
     schema.properties.Subject.properties.weight.unit = 'kg'
 
+    schema.properties.Subject.properties.sex.enumLabels = {
+        M: 'Male',
+        F: 'Female',
+        U: 'Unknown',
+        O: 'Other'
+    }
+
+
     // Override description of keywords
     schema.properties.NWBFile.properties.keywords.description = 'Terms to describe your dataset (e.g. Neural circuits, V1, etc.)' // Add description to keywords
     return schema

diff --git a/src/renderer/src/stories/JSONSchemaInput.js b/src/renderer/src/stories/JSONSchemaInput.js
@@ -333,7 +333,10 @@ export class JSONSchemaInput extends LitElement {
                 >
                     <option disabled selected value>${info.placeholder ?? "Select an option"}</option>
                     ${info.enum.map(
-                        (item, i) => html`<option value=${i} ?selected=${this.value === item}>${item}</option>`
+                        (item, i) =>
+                            html`<option value=${i} ?selected=${this.value === item}>
+                                ${info.enumLabels?.[item] ?? item}
+                            </option>`
                     )}
                 </select>
             `;

diff --git a/src/renderer/src/stories/Table.js b/src/renderer/src/stories/Table.js
@@ -227,7 +227,7 @@ export class Table extends LitElement {
 
             // Enumerate Possible Values
             if (colInfo.enum) {
-                info.source = colInfo.enum;
+                info.source = colInfo.enumLabels ? Object.values(colInfo.enumLabels) : colInfo.enum;
                 if (colInfo.strict === false) info.type = "autocomplete";
                 else info.type = "dropdown";
             }
@@ -270,11 +270,14 @@ export class Table extends LitElement {
             const isRequired = this.isRequired(k);
 
             const validator = async function (value, callback) {
+
                 const validateEmptyCells = ogThis.validateEmptyCells;
                 const willValidate =
                     validateEmptyCells === true ||
                     (Array.isArray(validateEmptyCells) && validateEmptyCells.includes(k));
 
+                value = ogThis.#getValue(value, colInfo);
+
                 // Clear empty values if not validated
                 if (!value && !willValidate) {
                     ogThis.#handleValidationResult(
@@ -404,8 +407,10 @@ export class Table extends LitElement {
 
         if (this.table) this.table.destroy();
 
+        console.log("Rendered data", this.#getRenderedData(data));
+
         const table = new Handsontable(div, {
-            data,
+            data: this.#getRenderedData(data),
             // rowHeaders: rowHeaders.map(v => `sub-${v}`),
             colHeaders: displayHeaders,
             columns,
@@ -449,17 +454,18 @@ export class Table extends LitElement {
 
             const isUserUpdate = initialCellsToUpdate <= validated;
 
+            value = this.#getValue(value, entries[header]);
+
             // Transfer data to object (if valid)
-            if (isValid) {
-                if (header === this.keyColumn) {
-                    if (value && value !== rowName) {
-                        const old = target[rowName] ?? {};
-                        this.data[value] = old;
-                        delete target[rowName];
-                        delete unresolved[row];
-                        rowHeaders[row] = value;
-                    }
+            if (header === this.keyColumn) {
+                if (isValid && value && value !== rowName) {
+                    const old = target[rowName] ?? {};
+                    this.data[value] = old;
+                    delete target[rowName];
+                    delete unresolved[row];
+                    rowHeaders[row] = value;
                 }
+
             }
 
             // Update data on passed object
@@ -522,8 +528,31 @@ export class Table extends LitElement {
         data.forEach((row, i) => this.#setRow(i, row));
     }
 
+    #getRenderedValue = (value, colInfo) => {
+        // Handle enums
+        if (colInfo.enumLabels) return colInfo.enumLabels[value] ?? value;
+        return value;
+    };
+
+    #getRenderedData = (data) => {
+        return Object.values(data).map((row) =>
+            row.map((value, j) => this.#getRenderedValue(value, this.schema.properties[this.colHeaders[j]]))
+        );
+    };
+
+    #getValue = (value, colInfo) => {
+        // Handle enums
+        if (colInfo.enumLabels)
+            return Object.keys(colInfo.enumLabels).find((k) => colInfo.enumLabels[k] === value) ?? value;
+
+        return value;
+    };
+
     #setRow(row, data) {
-        data.forEach((value, j) => this.table.setDataAtCell(row, j, value));
+        data.forEach((value, j) => {
+            value = this.#getRenderedValue(value, this.schema.properties[this.colHeaders[j]]);
+            this.table.setDataAtCell(row, j, value);
+        });
     }
 
     #handleValidationResult = (result, row, prop) => {