Merge branch 'main' into improve_validation

NeurodataWithoutBorders · Jun 12, 2024 · 6f7f3c5 · 6f7f3c5
2 parents 9617231 + 1bab832
commit 6f7f3c5
Show file tree

Hide file tree

Showing 14 changed files with 188 additions and 196 deletions.
diff --git a/.github/workflows/testing_pipelines.yml b/.github/workflows/testing_pipelines.yml
@@ -17,8 +17,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
-            label: environments/environment-Linux.yml
+# Fails randomly on daily tests
+#          - os: ubuntu-latest
+#            label: environments/environment-Linux.yml
 
           - os: macos-latest  # Mac arm64 runner
             label: environments/environment-MAC-apple-silicon.yml

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -145,7 +145,7 @@
     "@vitest/coverage-v8": "^1.6.0",
     "chokidar": "^3.5.3",
     "concurrently": "^7.6.0",
-    "dandi": "^0.0.4",
+    "dandi": "^0.0.6",
     "find-free-port": "^2.0.0",
     "fomantic-ui": "^2.8.8",
     "fs-extra": "^10.0.0",

diff --git a/src/electron/frontend/core/components/DandiResults.js b/src/electron/frontend/core/components/DandiResults.js
@@ -1,7 +1,7 @@
 import { LitElement, css, html } from "lit";
 
 import { get } from "dandi";
-import { isStaging } from "./pages/uploads/utils";
+import { isStaging, getAPIKey } from "./pages/uploads/utils";
 
 export class DandiResults extends LitElement {
     static get styles() {
@@ -38,8 +38,14 @@ export class DandiResults extends LitElement {
 
         const otherElIds = ["embargo_status"];
 
-        const type = isStaging(this.id) ? "staging" : undefined;
-        const dandiset = await get(this.id, { type });
+        const staging = isStaging(this.id);
+        const type = staging ? "staging" : undefined;
+        const api_key = await getAPIKey.call(this, staging);
+
+        const dandiset = await get(this.id, {
+            type,
+            token: api_key,
+        });
 
         otherElIds.forEach((str) => handleClass(str, dandiset));
         elIds.forEach((str) => handleClass(str, dandiset.draft_version));

diff --git a/src/electron/frontend/core/components/JSONSchemaForm.js b/src/electron/frontend/core/components/JSONSchemaForm.js
@@ -554,7 +554,32 @@ export class JSONSchemaForm extends LitElement {
     };
 
     validate = async (resolved = this.resolved) => {
-        if (this.validateEmptyValues === false) this.validateEmptyValues = true;
+        if (this.validateEmptyValues === false) {
+            this.validateEmptyValues = true;
+            await new Promise((resolve) => setTimeout(resolve, 0)); // Wait for next tick (re-render start)
+            await this.rendered; // Wait for re-render
+        }
+
+        // Validate nested forms (skip disabled)
+        for (let name in this.forms) {
+            const accordion = this.accordions[name];
+            if (!accordion || !accordion.disabled)
+                await this.forms[name].validate(resolved ? resolved[name] : undefined); // Validate nested forms too
+        }
+
+        for (let key in this.tables) {
+            try {
+                this.tables[key].validate(resolved ? resolved[key] : undefined); // Validate nested tables too
+            } catch (error) {
+                const title = this.tables[key].schema.title;
+                const message = error.message.replace(
+                    "this table",
+                    `the <b>${header(title ?? [...this.base, key].join("."))}</b> table`
+                );
+                this.throw(message);
+                break;
+            }
+        }
 
         // Validate against the entire JSON Schema
         const copy = structuredClone(resolved);
@@ -616,27 +641,6 @@ export class JSONSchemaForm extends LitElement {
 
         if (message) this.throw(message);
 
-        // Validate nested forms (skip disabled)
-        for (let name in this.forms) {
-            const accordion = this.accordions[name];
-            if (!accordion || !accordion.disabled)
-                await this.forms[name].validate(resolved ? resolved[name] : undefined); // Validate nested forms too
-        }
-
-        for (let key in this.tables) {
-            try {
-                this.tables[key].validate(resolved ? resolved[key] : undefined); // Validate nested tables too
-            } catch (error) {
-                const title = this.tables[key].schema.title;
-                const message = error.message.replace(
-                    "this table",
-                    `the <b>${header(title ?? [...this.base, key].join("."))}</b> table`
-                );
-                this.throw(message);
-                break;
-            }
-        }
-
         return true;
     };
 
@@ -1007,8 +1011,19 @@ export class JSONSchemaForm extends LitElement {
         const groupEl = this.#getGroupElement(externalPath);
 
         if (groupEl) {
-            groupEl.classList[resolvedErrors.length ? "add" : "remove"]("error");
-            groupEl.classList[warnings.length ? "add" : "remove"]("warning");
+            groupEl.setAttribute(`data-${name}-errors`, updatedErrors.length);
+            groupEl.setAttribute(`data-${name}-warnings`, updatedWarnings.length);
+
+            const allFormSections = groupEl.querySelectorAll(".form-section");
+            const inputs = Array.from(allFormSections).map((section) => section.id);
+            const allErrors = inputs.reduce((acc, id) => acc + parseInt(groupEl.getAttribute(`data-${id}-errors`)), 0);
+            const allWarnings = inputs.reduce(
+                (acc, id) => acc + parseInt(groupEl.getAttribute(`data-${id}-warnings`)),
+                0
+            );
+
+            groupEl.classList[allErrors ? "add" : "remove"]("error");
+            groupEl.classList[allWarnings ? "add" : "remove"]("warning");
         }
 
         const clearAllErrors = isValid && updatedErrors.length === 0;

diff --git a/src/electron/frontend/core/components/Search.js b/src/electron/frontend/core/components/Search.js
@@ -35,7 +35,6 @@ export class Search extends LitElement {
     }
 
     #close = () => {
-        console.log("CLOSING", this.getSelectedOption());
         if (this.listMode === "input" && this.getAttribute("interacted") === "true") {
             this.setAttribute("interacted", false);
             this.#onSelect(this.getSelectedOption());

diff --git a/src/electron/frontend/core/components/pages/guided-mode/options/GuidedUpload.js b/src/electron/frontend/core/components/pages/guided-mode/options/GuidedUpload.js
@@ -182,7 +182,7 @@ export class GuidedUploadPage extends Page {
                     },
                     onUpdate: () => (this.unsavedUpdates = true),
                     onThrow,
-                    validateOnChange: validate,
+                    validateOnChange: (...args) => validate.call(this, ...args),
                 }));
             })
             .catch((error) => html`<p>${error}</p>`);

diff --git a/src/electron/frontend/core/components/pages/uploads/UploadsPage.js b/src/electron/frontend/core/components/pages/uploads/UploadsPage.js
@@ -25,16 +25,13 @@ import { Modal } from "../../Modal";
 import { DandiResults } from "../../DandiResults.js";
 
 import dandiGlobalSchema from "../../../../../../schemas/json/dandi/global.json";
-import { JSONSchemaInput } from "../../JSONSchemaInput.js";
-import { header } from "../../forms/utils";
-
 import { validateDANDIApiKey } from "../../../validation/dandi";
 
 import * as dandi from "dandi";
 
 import keyIcon from "../../../../assets/icons/key.svg?raw";
 
-import { AWARD_VALIDATION_FAIL_MESSAGE, awardNumberValidator, isStaging, validate } from "./utils";
+import { AWARD_VALIDATION_FAIL_MESSAGE, awardNumberValidator, isStaging, validate, getAPIKey } from "./utils";
 import { createFormModal } from "../../forms/GlobalFormModal";
 
 export function createDandiset(results = {}) {
@@ -72,6 +69,7 @@ export function createDandiset(results = {}) {
         schema: dandiCreateSchema,
         results,
         validateEmptyValues: false, // Only show errors after submission
+
         validateOnChange: async (name, parent) => {
             const value = parent[name];
 
@@ -93,6 +91,7 @@ export function createDandiset(results = {}) {
             {
                 name: "Embargo your Data",
                 properties: [["embargo_status"], ["nih_award_number"]],
+                link: true,
             },
         ],
     });
@@ -122,7 +121,8 @@ export function createDandiset(results = {}) {
                     token: api_key,
                     type: staging ? "staging" : undefined,
                 });
-                await api.init();
+
+                await api.authorize();
 
                 const metadata = {
                     description: form.resolved.description,
@@ -173,83 +173,6 @@ export function createDandiset(results = {}) {
     };
 }
 
-async function getAPIKey(staging = false) {
-    const whichAPIKey = staging ? "development_api_key" : "main_api_key";
-    const DANDI = global.data.DANDI;
-    let api_key = DANDI?.api_keys?.[whichAPIKey];
-
-    const errors = await validateDANDIApiKey(api_key, staging);
-
-    const isInvalid = !errors || errors.length;
-
-    if (isInvalid) {
-        const modal = new Modal({
-            header: `${api_key ? "Update" : "Provide"} your ${header(whichAPIKey)}`,
-            open: true,
-            onClose: () => modal.remove(),
-        });
-
-        const input = new JSONSchemaInput({
-            path: [whichAPIKey],
-            schema: dandiGlobalSchema.properties.api_keys.properties[whichAPIKey],
-        });
-
-        input.style.padding = "25px";
-
-        modal.append(input);
-
-        let notification;
-
-        const notify = (message, type) => {
-            if (notification) this.dismiss(notification);
-            return (notification = this.notify(message, type));
-        };
-
-        modal.onClose = async () => notify("The updated DANDI API key was not set", "error");
-
-        api_key = await new Promise((resolve) => {
-            const button = new Button({
-                label: "Save",
-                primary: true,
-                onClick: async () => {
-                    const value = input.value;
-                    if (value) {
-                        const errors = await validateDANDIApiKey(input.value, staging);
-                        if (!errors || !errors.length) {
-                            modal.remove();
-
-                            merge(
-                                {
-                                    DANDI: {
-                                        api_keys: {
-                                            [whichAPIKey]: value,
-                                        },
-                                    },
-                                },
-                                global.data
-                            );
-
-                            global.save();
-                            resolve(value);
-                        } else {
-                            notify(errors[0].message, "error");
-                            return false;
-                        }
-                    } else {
-                        notify("Your DANDI API key was not set", "error");
-                    }
-                },
-            });
-
-            modal.footer = button;
-
-            document.body.append(modal);
-        });
-    }
-
-    return api_key;
-}
-
 export async function uploadToDandi(info, type = "project" in info ? "project" : "") {
     const { dandiset } = info;
 
@@ -435,7 +358,7 @@ export class UploadsPage extends Page {
                             error.message = "Please select at least one file or folder to upload.";
                     },
 
-                    validateOnChange: validate,
+                    validateOnChange: (...args) => validate.call(this, ...args),
                 }));
             })
             .catch((error) => html`<p>${error}</p>`);