Fix custom schema validation

nwb-guide.spec

@@ -17,6 +17,8 @@ hiddenimports = [ 'email_validator', *collect_submodules('scipy.special.cython_s
 datas += collect_data_files('jsonschema_specifications')
 tmp_ret = collect_all('dandi')
 datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
+tmp_ret = collect_all('pydantic')
+datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
 tmp_ret = collect_all('keyrings')
 datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
 tmp_ret = collect_all('unittest')

package.json

@@ -20,7 +20,7 @@
     "build:mac": "npm run build && npm run build:flask && npm run build:electron:mac",
     "build:linux": "npm run build && npm run build:flask && npm run build:electron:linux",
     "build:flask": "python -m PyInstaller nwb-guide.spec --log-level DEBUG --clean --noconfirm --distpath ./build/flask",
-    "build:flask:spec:base": "pyi-makespec --name nwb-guide --onedir --collect-data jsonschema_specifications --collect-all dandi --collect-all keyrings --collect-all unittest --collect-all nwbinspector --collect-all neuroconv --collect-all pynwb --collect-all hdmf --collect-all hdmf_zarr --collect-all ndx_dandi_icephys --collect-all sklearn --collect-all ci_info ./pyflask/app.py",
+    "build:flask:spec:base": "pyi-makespec --name nwb-guide --onedir --collect-data jsonschema_specifications --collect-all dandi --collect-all pydantic --collect-all keyrings --collect-all unittest --collect-all nwbinspector --collect-all neuroconv --collect-all pynwb --collect-all hdmf --collect-all hdmf_zarr --collect-all ndx_dandi_icephys --collect-all sklearn --collect-all ci_info ./pyflask/app.py",
     "build:flask:spec": "npm run build:flask:spec:base && python prepare_pyinstaller_spec.py",
     "build:electron:win": "electron-builder build --win --publish never",
     "build:electron:mac": "electron-builder build --mac --publish never",

src/renderer/src/stories/JSONSchemaForm.js

@@ -428,10 +428,10 @@ export class JSONSchemaForm extends LitElement {
 
                 const isRow = typeof rowName === "number";
 
-                const resolvedValue = e.path.reduce((acc, token) => acc[token], resolved);
+                const resolvedValue = e.instance; // Get offending value
+                const schema = e.schema; // Get offending schema
 
                 // ------------ Exclude Certain Errors ------------
-
                 // Allow for constructing types from object types
                 if (e.message.includes("is not of a type(s)") && "properties" in schema && schema.type === "string")
                     return;

src/renderer/src/stories/Search.js

@@ -455,7 +455,8 @@ export class Search extends LitElement {
       }}
 
       @blur=${(blurEvent) => {
-          if (blurEvent.relatedTarget.classList.contains("option")) return;
+          const relatedTarget = blurEvent.relatedTarget;
+          if (relatedTarget && relatedTarget.classList.contains("option")) return;
           this.submit();
       }}