Merge branch 'main' into preload_imports

src/renderer/src/stories/JSONSchemaForm.js

@@ -587,6 +587,15 @@ export class JSONSchemaForm extends LitElement {
         this.#clearMessages(fullPath, "errors");
         this.#clearMessages(fullPath, "warnings");
 
+        const isFunction = typeof valid === "function";
+        const isValid =
+            valid === true ||
+            valid == undefined ||
+            isFunction ||
+            (Array.isArray(valid) && !valid.find((o) => o.type === "error"));
+
+        if (!isValid && errors.length === 0) errors.push({ type: "error", message: "Invalid value detected" });
+
         // Track errors and warnings
         this.#nErrors += errors.length;
         this.#nWarnings += warnings.length;
@@ -595,12 +604,7 @@ export class JSONSchemaForm extends LitElement {
         // Show aggregated errors and warnings (if any)
         warnings.forEach((info) => this.#addMessage(fullPath, info, "warnings"));
 
-        const isFunction = typeof valid === "function";
-
-        if (
-            (valid === true || valid == undefined || isFunction || !valid.find((o) => o.type === "error")) &&
-            errors.length === 0
-        ) {
+        if (isValid && errors.length === 0) {
             element.classList.remove("invalid");
 
             const linkEl = this.#getLinkElement(externalPath);

src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js

@@ -123,7 +123,6 @@ export class GuidedMetadataPage extends ManagedPage {
             },
 
             onUpdate: (...args) => {
-                console.log(...args);
                 this.unsavedUpdates = true;
             },
 

src/renderer/src/stories/pages/settings/SettingsPage.js

@@ -18,6 +18,8 @@ import { merge } from "../utils.js";
 
 import { notyf } from "../../../dependencies/globals.js";
 
+const dandiAPITokenRegex = /^[a-f0-9]{40}$/;
+
 const setUndefinedIfNotDeclared = (schema, resolved) => {
     for (let prop in schema.properties) {
         const propInfo = schema.properties[prop];
@@ -65,6 +67,11 @@ export class SettingsPage extends Page {
             schema,
             mode: "accordion",
             onUpdate: () => (this.unsavedUpdates = true),
+            validateOnChange: (name, parent) => {
+                const value = parent[name];
+                if (name === "api_key") return dandiAPITokenRegex.test(value);
+                return true;
+            },
             onThrow,
         });