From 155929451eff7c689daf6132708e661c39b0b4c7 Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 27 Oct 2023 12:22:10 -0700 Subject: [PATCH 1/4] Fix global saving when undefined --- schemas/json/dandi/global.json | 2 +- schemas/json/dandi/upload.json | 2 +- .../stories/pages/settings/SettingsPage.js | 23 +++++++++++-------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/schemas/json/dandi/global.json b/schemas/json/dandi/global.json index 0daf4ef16..7b72776b5 100644 --- a/schemas/json/dandi/global.json +++ b/schemas/json/dandi/global.json @@ -11,7 +11,7 @@ "staging_api_key": { "type": "string", "format": "password", - "description": "Your DANDI API key from the staging (testing) server" + "description": "Your DANDI API key from the staging server" } }, "required": ["main_api_key"] diff --git a/schemas/json/dandi/upload.json b/schemas/json/dandi/upload.json index a7cfbb62a..0ee9b1431 100644 --- a/schemas/json/dandi/upload.json +++ b/schemas/json/dandi/upload.json @@ -2,7 +2,7 @@ "properties": { "dandiset_id": { "type": "string", - "description": "The unique identifier for your dandiset. Will automatically determine whether to upload to the main DANDI archive or the development staging server." + "description": "The unique identifier for your dandiset, manually created on the main archive or staging server." }, "cleanup": { "type": "boolean", diff --git a/src/renderer/src/stories/pages/settings/SettingsPage.js b/src/renderer/src/stories/pages/settings/SettingsPage.js index c65617574..6b82481c5 100644 --- a/src/renderer/src/stories/pages/settings/SettingsPage.js +++ b/src/renderer/src/stories/pages/settings/SettingsPage.js @@ -21,9 +21,9 @@ import { header } from "../../forms/utils"; const dandiAPITokenRegex = /^[a-f0-9]{40}$/; -const setUndefinedIfNotDeclared = (schema, resolved) => { - for (let prop in schema.properties) { - const propInfo = schema.properties[prop]; +const setUndefinedIfNotDeclared = (schemaProps, resolved) => { + for (const prop in schemaProps) { + const propInfo = schemaProps[prop]?.properties; if (propInfo) setUndefinedIfNotDeclared(propInfo, resolved[prop]); else if (!(prop in resolved)) resolved[prop] = undefined; } @@ -46,15 +46,18 @@ export class SettingsPage extends Page { return (this.#notification = this.notify(message, type)); }; - beforeSave = () => { + beforeSave = async () => { + + await this.form.validate() + const { resolved } = this.form; - for (let prop in schema.properties) { - const propInfo = schema.properties[prop]; - const res = resolved[prop]; - if (propInfo) setUndefinedIfNotDeclared(propInfo, res); - } + setUndefinedIfNotDeclared(schema.properties, resolved); + + + console.log('Merging', resolved, global.data ) + - merge(this.form.resolved, global.data); + merge(resolved, global.data); global.save(); // Save the changes, even if invalid on the form this.#openNotyf("Global settings changes saved", "success"); From 6470973a818bfd823d01b8c212f1b014ed3eb210 Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 27 Oct 2023 13:21:11 -0700 Subject: [PATCH 2/4] Update DANDI api key presentation and validation --- src/renderer/src/stories/Modal.ts | 10 ++- .../guided-mode/options/GuidedStubPreview.js | 4 + .../guided-mode/results/GuidedResults.js | 2 + .../stories/pages/settings/SettingsPage.js | 13 +--- .../src/stories/pages/uploads/UploadsPage.js | 74 +++++++++++++++++-- .../preview/inspector/InspectorList.js | 5 +- src/renderer/src/validation/dandi.ts | 19 +++++ 7 files changed, 108 insertions(+), 19 deletions(-) create mode 100644 src/renderer/src/validation/dandi.ts diff --git a/src/renderer/src/stories/Modal.ts b/src/renderer/src/stories/Modal.ts index 83363090f..8edc06309 100644 --- a/src/renderer/src/stories/Modal.ts +++ b/src/renderer/src/stories/Modal.ts @@ -12,6 +12,7 @@ export interface ModalProps { showCloseButton?: boolean, width?: string height?: string + closeText?: string } export class Modal extends LitElement { @@ -128,6 +129,10 @@ export class Modal extends LitElement { height: { type: String, reflext: true + }, + closeText: { + type: String, + reflect: true } }; } @@ -141,6 +146,8 @@ export class Modal extends LitElement { declare width: ModalProps['width'] declare height: ModalProps['height'] + declare closeText: ModalProps['closeText'] + constructor(props: ModalProps = {}) { super(); @@ -150,6 +157,7 @@ export class Modal extends LitElement { this.onClose = props.onClose this.onOpen = props.onOpen this.showCloseButton = props.showCloseButton ?? true + this.closeText = props.closeText this.width = props.width this.height = props.height @@ -173,7 +181,7 @@ export class Modal extends LitElement {
${this.header} - ${this.showCloseButton ? html`Close` : ''} + ${this.showCloseButton ? html`${this.closeText ?? 'Close'}` : ''}
No content diff --git a/src/renderer/src/stories/pages/guided-mode/options/GuidedStubPreview.js b/src/renderer/src/stories/pages/guided-mode/options/GuidedStubPreview.js index c3db12784..32acc9e89 100644 --- a/src/renderer/src/stories/pages/guided-mode/options/GuidedStubPreview.js +++ b/src/renderer/src/stories/pages/guided-mode/options/GuidedStubPreview.js @@ -38,10 +38,14 @@ export class GuidedStubPreviewPage extends Page { next: "Run Conversion", onNext: async () => { await this.save(); // Save in case the conversion fails + delete this.info.globalState.conversion; this.info.globalState.conversion = await this.runConversions({}, true, { title: "Running all conversions", }); + + await this.save() // Save the conversion results + this.to(1); }, }; diff --git a/src/renderer/src/stories/pages/guided-mode/results/GuidedResults.js b/src/renderer/src/stories/pages/guided-mode/results/GuidedResults.js index 06665b3b3..748237e4f 100644 --- a/src/renderer/src/stories/pages/guided-mode/results/GuidedResults.js +++ b/src/renderer/src/stories/pages/guided-mode/results/GuidedResults.js @@ -11,6 +11,8 @@ export class GuidedResultsPage extends Page { render() { const { conversion } = this.info.globalState; + console.log(this.info.globalState) + if (!conversion) return html`

Your conversion failed. Please try again.

`; diff --git a/src/renderer/src/stories/pages/settings/SettingsPage.js b/src/renderer/src/stories/pages/settings/SettingsPage.js index 6b82481c5..45e4be00f 100644 --- a/src/renderer/src/stories/pages/settings/SettingsPage.js +++ b/src/renderer/src/stories/pages/settings/SettingsPage.js @@ -5,6 +5,8 @@ import { onThrow } from "../../../errors"; import dandiGlobalSchema from "../../../../../../schemas/json/dandi/global.json"; import projectGlobalSchema from "../../../../../../schemas/json/project/globals.json" assert { type: "json" }; +import { validateDANDIApiKey } from "../../../validation/dandi"; + const schema = { properties: { output_locations: projectGlobalSchema, @@ -17,9 +19,6 @@ import { global } from "../../../progress/index.js"; import { merge } from "../utils.js"; import { notyf } from "../../../dependencies/globals.js"; -import { header } from "../../forms/utils"; - -const dandiAPITokenRegex = /^[a-f0-9]{40}$/; const setUndefinedIfNotDeclared = (schemaProps, resolved) => { for (const prop in schemaProps) { @@ -54,9 +53,6 @@ export class SettingsPage extends Page { setUndefinedIfNotDeclared(schema.properties, resolved); - console.log('Merging', resolved, global.data ) - - merge(resolved, global.data); global.save(); // Save the changes, even if invalid on the form @@ -80,10 +76,9 @@ export class SettingsPage extends Page { schema, mode: "accordion", onUpdate: () => (this.unsavedUpdates = true), - validateOnChange: (name, parent) => { + validateOnChange: async (name, parent) => { const value = parent[name]; - if (value && name.includes("api_key") && !dandiAPITokenRegex.test(value)) - return [{ type: "error", message: `${header(name)} must be a 40 character hexadecimal string` }]; + if (name.includes("api_key")) return await validateDANDIApiKey(value, name.includes('staging')); return true; }, onThrow, diff --git a/src/renderer/src/stories/pages/uploads/UploadsPage.js b/src/renderer/src/stories/pages/uploads/UploadsPage.js index f1dbc213d..22b7bc061 100644 --- a/src/renderer/src/stories/pages/uploads/UploadsPage.js +++ b/src/renderer/src/stories/pages/uploads/UploadsPage.js @@ -13,10 +13,17 @@ import { global } from "../../../progress/index.js"; import { merge } from "../utils.js"; import { run } from "../guided-mode/options/utils.js"; -import Swal from "sweetalert2"; 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"; + + + export const isStaging = (id) => parseInt(id) >= 100000; export async function uploadToDandi(info, type = "project" in info ? "project" : "") { @@ -25,17 +32,68 @@ export async function uploadToDandi(info, type = "project" in info ? "project" : const staging = isStaging(dandiset_id); // Automatically detect staging IDs const whichAPIKey = staging ? "staging_api_key" : "main_api_key"; - const api_key = global.data.DANDI?.api_keys?.[whichAPIKey]; + let api_key = global.data.DANDI?.api_keys?.[whichAPIKey]; if (!api_key) { - await Swal.fire({ - title: `Your DANDI API key (${whichAPIKey}) is not configured.`, - html: "Edit your settings to include this value.", - icon: "warning", - confirmButtonText: "Go to Settings", + + + const modal = new Modal({ + header: `Provide your ${header(whichAPIKey)}`, + open: true }); - return this.to("settings"); + const input = new JSONSchemaInput({ + path: [whichAPIKey], + info: 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("Your 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() + global.data.DANDI.api_keys[whichAPIKey] = value; + 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); + + }) + } const result = await run( diff --git a/src/renderer/src/stories/preview/inspector/InspectorList.js b/src/renderer/src/stories/preview/inspector/InspectorList.js index af071b07b..3b6dddbf4 100644 --- a/src/renderer/src/stories/preview/inspector/InspectorList.js +++ b/src/renderer/src/stories/preview/inspector/InspectorList.js @@ -2,6 +2,9 @@ import { LitElement, css, html } from "lit"; import { List } from "../../List"; import { getMessageType, isErrorImportance } from "../../../validation"; +import { unsafeHTML } from "lit/directives/unsafe-html.js"; + + const sortList = (items) => { return items .sort((a, b) => { @@ -140,7 +143,7 @@ export class InspectorListItem extends LitElement { return html` ${hasMetadata ? html`${hasObjectType ? `${this.object_type}` : ""} ` : ""} - ${hasMetadata ? html`${this.message}` : html`

${this.message}

`} + ${hasMetadata ? html`${unsafeHTML(this.message)}` : html`

${unsafeHTML(this.message)}

`} ${this.file_path ? html`${this.files && this.files.length > 1 diff --git a/src/renderer/src/validation/dandi.ts b/src/renderer/src/validation/dandi.ts new file mode 100644 index 000000000..8dd5ba651 --- /dev/null +++ b/src/renderer/src/validation/dandi.ts @@ -0,0 +1,19 @@ + +const dandiAPITokenRegex = /^[a-f0-9]{40}$/; + + +export const validateDANDIApiKey = async (apiKey: string, staging = false) => { + if (apiKey) { + + if (!dandiAPITokenRegex.test(apiKey)) return [{ type: "error", message: `Invalid API key format. Must be a 40 character hexadecimal string` }]; + + const authFailedError = {type: 'error', message: `Authorization failed. Make sure you're providing an API key for the ${staging ? 'staging' : 'main'} archive.`} + + return fetch(`https://api${staging ? '-staging' : ''}.dandiarchive.org/api/auth/token/`, {headers: {Authorization: `token ${apiKey}`}}) + .then((res) => { + if (!res.ok) return [authFailedError] + return true + }) + .catch(() => [authFailedError]) + } +} \ No newline at end of file From 792dc865c30d545009f37be18bac430c418a66ae Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 27 Oct 2023 13:34:33 -0700 Subject: [PATCH 3/4] Add DANDI info box --- schemas/json/dandi/upload.json | 2 +- .../stories/pages/guided-mode/GuidedStart.js | 2 +- .../pages/guided-mode/options/GuidedUpload.js | 12 ++++++--- .../src/stories/pages/uploads/UploadsPage.js | 25 +++++++++++++++++-- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/schemas/json/dandi/upload.json b/schemas/json/dandi/upload.json index 0ee9b1431..c8507690b 100644 --- a/schemas/json/dandi/upload.json +++ b/schemas/json/dandi/upload.json @@ -2,7 +2,7 @@ "properties": { "dandiset_id": { "type": "string", - "description": "The unique identifier for your dandiset, manually created on the main archive or staging server." + "description": "The unique identifier for your Dandiset, manually created on the main archive or staging server." }, "cleanup": { "type": "boolean", diff --git a/src/renderer/src/stories/pages/guided-mode/GuidedStart.js b/src/renderer/src/stories/pages/guided-mode/GuidedStart.js index 42129a61f..7404e4ab5 100644 --- a/src/renderer/src/stories/pages/guided-mode/GuidedStart.js +++ b/src/renderer/src/stories/pages/guided-mode/GuidedStart.js @@ -92,7 +92,7 @@ export class GuidedStartPage extends Page {

4. Final Review

- Finally, you will upload your conversion to DANDI and review the resulting dandiset. + Finally, you will upload your conversion to DANDI and review the resulting Dandiset.


diff --git a/src/renderer/src/stories/pages/guided-mode/options/GuidedUpload.js b/src/renderer/src/stories/pages/guided-mode/options/GuidedUpload.js index 614a71b0a..1baca1b24 100644 --- a/src/renderer/src/stories/pages/guided-mode/options/GuidedUpload.js +++ b/src/renderer/src/stories/pages/guided-mode/options/GuidedUpload.js @@ -6,7 +6,8 @@ import { onThrow } from "../../../../errors"; import { merge } from "../../utils.js"; import Swal from "sweetalert2"; import dandiUploadSchema from "../../../../../../../schemas/json/dandi/upload.json"; -import { uploadToDandi } from "../../uploads/UploadsPage.js"; +import { dandisetInfoContent, uploadToDandi } from "../../uploads/UploadsPage.js"; +import { InfoBox } from "../../../InfoBox.js"; export class GuidedUploadPage extends Page { constructor(...args) { @@ -19,7 +20,7 @@ export class GuidedUploadPage extends Page { const globalState = this.info.globalState; const isNewDandiset = globalState.upload?.dandiset_id !== this.localState.dandiset_id; merge({ upload: this.localState }, globalState); // Merge the local and global states - if (isNewDandiset) delete globalState.upload.results; // Clear the preview results entirely if a new dandiset + if (isNewDandiset) delete globalState.upload.results; // Clear the preview results entirely if a new Dandiset }; header = { @@ -36,7 +37,7 @@ export class GuidedUploadPage extends Page { const globalState = this.info.globalState; const globalUploadInfo = globalState.upload; - // Catch if dandiset is already uploaded + // Catch if Dandiset is already uploaded if ("results" in globalUploadInfo) { const result = await Swal.fire({ title: "This pipeline has already uploaded to DANDI", @@ -70,7 +71,10 @@ export class GuidedUploadPage extends Page { onThrow, }); - return html` ${this.form} `; + return html`${new InfoBox({ + header: "How do I create a Dandiset?", + content: dandisetInfoContent, + })}

${this.form} `; } } diff --git a/src/renderer/src/stories/pages/uploads/UploadsPage.js b/src/renderer/src/stories/pages/uploads/UploadsPage.js index 22b7bc061..ab00446cb 100644 --- a/src/renderer/src/stories/pages/uploads/UploadsPage.js +++ b/src/renderer/src/stories/pages/uploads/UploadsPage.js @@ -21,11 +21,23 @@ import { JSONSchemaInput } from "../../JSONSchemaInput.js"; import { header } from "../../forms/utils"; import { validateDANDIApiKey } from "../../../validation/dandi"; +import { InfoBox } from "../../InfoBox.js"; export const isStaging = (id) => parseInt(id) >= 100000; +export const dandisetInfoContent = html` + You can create a new Dandiset on the main DANDI archive. This Dandiset can be fully public or embargoed according to NIH policy. When you create a Dandiset, a permanent ID is automatically assigned to it. + +
+ To prevent the production server from being inundated with test Dandisets, we encourage developers + to develop against the development server. Note that the development + server should not be used to stage your data. All data are uploaded as draft and can be adjusted before + publishing on the production server. The development server is primarily used by users learning to use + DANDI or by developers. +` + export async function uploadToDandi(info, type = "project" in info ? "project" : "") { const { dandiset_id } = info; @@ -34,11 +46,14 @@ export async function uploadToDandi(info, type = "project" in info ? "project" : const whichAPIKey = staging ? "staging_api_key" : "main_api_key"; let api_key = global.data.DANDI?.api_keys?.[whichAPIKey]; - if (!api_key) { + const errors = await validateDANDIApiKey(api_key, staging); + + const isInvalid = !errors || errors.length; + if (isInvalid) { const modal = new Modal({ - header: `Provide your ${header(whichAPIKey)}`, + header: `${api_key ? 'Update' : 'Provide'} your ${header(whichAPIKey)}`, open: true }); @@ -175,6 +190,12 @@ export class UploadsPage extends Page { }); return html` + ${new InfoBox({ + header: "How do I create a Dandiset?", + content: dandisetInfoContent, + })} +
+
${this.form}
${button} From e388ef32c8e5fef7acc46e8d7bcd25ae1b7e5cdc Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 20:35:02 +0000 Subject: [PATCH 4/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../guided-mode/options/GuidedStubPreview.js | 2 +- .../pages/guided-mode/options/GuidedUpload.js | 6 +-- .../guided-mode/results/GuidedResults.js | 2 +- .../stories/pages/settings/SettingsPage.js | 8 ++- .../src/stories/pages/uploads/UploadsPage.js | 51 ++++++++----------- .../preview/inspector/InspectorList.js | 5 +- src/renderer/src/validation/dandi.ts | 2 +- 7 files changed, 34 insertions(+), 42 deletions(-) diff --git a/src/renderer/src/stories/pages/guided-mode/options/GuidedStubPreview.js b/src/renderer/src/stories/pages/guided-mode/options/GuidedStubPreview.js index 32acc9e89..7e0a9f78a 100644 --- a/src/renderer/src/stories/pages/guided-mode/options/GuidedStubPreview.js +++ b/src/renderer/src/stories/pages/guided-mode/options/GuidedStubPreview.js @@ -44,7 +44,7 @@ export class GuidedStubPreviewPage extends Page { title: "Running all conversions", }); - await this.save() // Save the conversion results + await this.save(); // Save the conversion results this.to(1); }, diff --git a/src/renderer/src/stories/pages/guided-mode/options/GuidedUpload.js b/src/renderer/src/stories/pages/guided-mode/options/GuidedUpload.js index 1baca1b24..ca4a980c4 100644 --- a/src/renderer/src/stories/pages/guided-mode/options/GuidedUpload.js +++ b/src/renderer/src/stories/pages/guided-mode/options/GuidedUpload.js @@ -72,9 +72,9 @@ export class GuidedUploadPage extends Page { }); return html`${new InfoBox({ - header: "How do I create a Dandiset?", - content: dandisetInfoContent, - })}

${this.form} `; + header: "How do I create a Dandiset?", + content: dandisetInfoContent, + })}

${this.form} `; } } diff --git a/src/renderer/src/stories/pages/guided-mode/results/GuidedResults.js b/src/renderer/src/stories/pages/guided-mode/results/GuidedResults.js index 748237e4f..34f95a16f 100644 --- a/src/renderer/src/stories/pages/guided-mode/results/GuidedResults.js +++ b/src/renderer/src/stories/pages/guided-mode/results/GuidedResults.js @@ -11,7 +11,7 @@ export class GuidedResultsPage extends Page { render() { const { conversion } = this.info.globalState; - console.log(this.info.globalState) + console.log(this.info.globalState); if (!conversion) return html`

Your conversion failed. Please try again.

`; diff --git a/src/renderer/src/stories/pages/settings/SettingsPage.js b/src/renderer/src/stories/pages/settings/SettingsPage.js index 45e4be00f..fb21e4c38 100644 --- a/src/renderer/src/stories/pages/settings/SettingsPage.js +++ b/src/renderer/src/stories/pages/settings/SettingsPage.js @@ -22,7 +22,7 @@ import { notyf } from "../../../dependencies/globals.js"; const setUndefinedIfNotDeclared = (schemaProps, resolved) => { for (const prop in schemaProps) { - const propInfo = schemaProps[prop]?.properties; + const propInfo = schemaProps[prop]?.properties; if (propInfo) setUndefinedIfNotDeclared(propInfo, resolved[prop]); else if (!(prop in resolved)) resolved[prop] = undefined; } @@ -46,13 +46,11 @@ export class SettingsPage extends Page { }; beforeSave = async () => { + await this.form.validate(); - await this.form.validate() - const { resolved } = this.form; setUndefinedIfNotDeclared(schema.properties, resolved); - merge(resolved, global.data); global.save(); // Save the changes, even if invalid on the form @@ -78,7 +76,7 @@ export class SettingsPage extends Page { onUpdate: () => (this.unsavedUpdates = true), validateOnChange: async (name, parent) => { const value = parent[name]; - if (name.includes("api_key")) return await validateDANDIApiKey(value, name.includes('staging')); + if (name.includes("api_key")) return await validateDANDIApiKey(value, name.includes("staging")); return true; }, onThrow, diff --git a/src/renderer/src/stories/pages/uploads/UploadsPage.js b/src/renderer/src/stories/pages/uploads/UploadsPage.js index ab00446cb..6ca0c747b 100644 --- a/src/renderer/src/stories/pages/uploads/UploadsPage.js +++ b/src/renderer/src/stories/pages/uploads/UploadsPage.js @@ -23,20 +23,21 @@ import { header } from "../../forms/utils"; import { validateDANDIApiKey } from "../../../validation/dandi"; import { InfoBox } from "../../InfoBox.js"; - - export const isStaging = (id) => parseInt(id) >= 100000; export const dandisetInfoContent = html` - You can create a new Dandiset on the main DANDI archive. This Dandiset can be fully public or embargoed according to NIH policy. When you create a Dandiset, a permanent ID is automatically assigned to it. + You can create a new Dandiset on the main DANDI archive. + This Dandiset can be fully public or embargoed according to NIH policy. When you create a Dandiset, a permanent + ID is automatically assigned to it. -
- To prevent the production server from being inundated with test Dandisets, we encourage developers - to develop against the development server. Note that the development - server should not be used to stage your data. All data are uploaded as draft and can be adjusted before - publishing on the production server. The development server is primarily used by users learning to use - DANDI or by developers. -` +
+ To prevent the production server from being inundated with test Dandisets, we encourage developers to develop + against the development server. Note that the + development server should not be used to stage your data. All data are uploaded as draft and can be adjusted + before publishing on the production server. The development server is primarily used by users learning to use + DANDI or by developers. `; export async function uploadToDandi(info, type = "project" in info ? "project" : "") { const { dandiset_id } = info; @@ -51,20 +52,18 @@ export async function uploadToDandi(info, type = "project" in info ? "project" : const isInvalid = !errors || errors.length; if (isInvalid) { - - const modal = new Modal({ - header: `${api_key ? 'Update' : 'Provide'} your ${header(whichAPIKey)}`, - open: true + const modal = new Modal({ + header: `${api_key ? "Update" : "Provide"} your ${header(whichAPIKey)}`, + open: true, }); const input = new JSONSchemaInput({ path: [whichAPIKey], - info: dandiGlobalSchema.properties.api_keys.properties[whichAPIKey] - }) + info: dandiGlobalSchema.properties.api_keys.properties[whichAPIKey], + }); input.style.padding = "25px"; - modal.append(input); let notification; @@ -76,7 +75,6 @@ export async function uploadToDandi(info, type = "project" in info ? "project" : modal.onClose = async () => notify("Your DANDI API key was not set", "error"); - api_key = await new Promise((resolve) => { const button = new Button({ label: "Save", @@ -84,19 +82,16 @@ export async function uploadToDandi(info, type = "project" in info ? "project" : onClick: async () => { const value = input.value; if (value) { - const errors = await validateDANDIApiKey(input.value, staging); if (!errors || !errors.length) { - modal.remove() + modal.remove(); global.data.DANDI.api_keys[whichAPIKey] = value; global.save(); - resolve(value) - } - else { + resolve(value); + } else { notify(errors[0].message, "error"); return false; } - } else { notify("Your DANDI API key was not set", "error"); } @@ -106,9 +101,7 @@ export async function uploadToDandi(info, type = "project" in info ? "project" : modal.footer = button; document.body.append(modal); - - }) - + }); } const result = await run( @@ -194,8 +187,8 @@ export class UploadsPage extends Page { header: "How do I create a Dandiset?", content: dandisetInfoContent, })} -
-
+
+
${this.form}
${button} diff --git a/src/renderer/src/stories/preview/inspector/InspectorList.js b/src/renderer/src/stories/preview/inspector/InspectorList.js index 3b6dddbf4..86d0e9e5f 100644 --- a/src/renderer/src/stories/preview/inspector/InspectorList.js +++ b/src/renderer/src/stories/preview/inspector/InspectorList.js @@ -4,7 +4,6 @@ import { getMessageType, isErrorImportance } from "../../../validation"; import { unsafeHTML } from "lit/directives/unsafe-html.js"; - const sortList = (items) => { return items .sort((a, b) => { @@ -143,7 +142,9 @@ export class InspectorListItem extends LitElement { return html` ${hasMetadata ? html`${hasObjectType ? `${this.object_type}` : ""} ` : ""} - ${hasMetadata ? html`${unsafeHTML(this.message)}` : html`

${unsafeHTML(this.message)}

`} + ${hasMetadata + ? html`${unsafeHTML(this.message)}` + : html`

${unsafeHTML(this.message)}

`} ${this.file_path ? html`${this.files && this.files.length > 1 diff --git a/src/renderer/src/validation/dandi.ts b/src/renderer/src/validation/dandi.ts index 8dd5ba651..d64d017d8 100644 --- a/src/renderer/src/validation/dandi.ts +++ b/src/renderer/src/validation/dandi.ts @@ -16,4 +16,4 @@ export const validateDANDIApiKey = async (apiKey: string, staging = false) => { }) .catch(() => [authFailedError]) } -} \ No newline at end of file +}