Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/conf_extlinks.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"guide-issues": ("https://github.com/NeurodataWithoutBorders/nwb-guide/issues/%s", "%s"),
"request-format-support": ("https://github.com/catalystneuro/neuroconv/issues/new?assignees=&labels=enhancement%%2Cdata+interfaces&projects=&template=format_request.yml&title=%%5BNew+Format%%5D%%3A+%s", "%s"),
"path-expansion-guide": ("https://neuroconv.readthedocs.io/en/main/user_guide/expand_path.html%s", "%s"),
"dandi-staging": ("https://gui-staging.dandiarchive.org/%s", "%s"),
"dandi-sandbox": ("https://gui-sandbox.dandiarchive.org/%s", "%s"),
"dandi-archive": ("https://dandiarchive.org/%s", "%s"),
"conda-install": (
"https://docs.conda.io/projects/conda/en/latest/user-guide/install/index.html#regular-installation%s",
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/electron/frontend/core/components/Table.js
Original file line number Diff line number Diff line change
Expand Up @@ -670,11 +670,11 @@ export class Table extends LitElement {
let message = "";
let theme = "";
if (warnings.length) {
(theme = "warning"), (message = warnings.map((error) => error.message).join("\n"));
((theme = "warning"), (message = warnings.map((error) => error.message).join("\n")));
} else cell.removeAttribute("warning");

if (errors.length) {
(theme = "error"), (message = errors.map((error) => error.message).join("\n")); // Class switching handled automatically
((theme = "error"), (message = errors.map((error) => error.message).join("\n"))); // Class switching handled automatically
} else cell.removeAttribute("error");

if (theme) cell.setAttribute(theme, "");
Expand Down
2 changes: 1 addition & 1 deletion src/electron/frontend/core/validation/dandi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const validateDANDIApiKey = async (apiKey: string, staging = false) => {

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 <a href='https://${staging ? 'gui-staging.' : ''}dandiarchive.org' target='_blank'>${staging ? 'staging' : 'main'} archive</a>.`}
const authFailedError = {type: 'error', message: `Authorization failed. Make sure you're providing an API key for the <a href='https://${staging ? 'gui-sandbox.' : ''}dandiarchive.org' target='_blank'>${staging ? 'sandbox' : 'main'} archive</a>.`}

const isValid = validateToken({ token: apiKey, type: staging ? 'staging' : undefined }).catch(e => false)
if (!isValid) return [ authFailedError ]
Expand Down
4 changes: 2 additions & 2 deletions src/schemas/json/dandi/create.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"archive": {
"type": "string",
"enumLabels": {
"staging": "Development Server",
"staging": "Sandbox Server",
"main": "Main Archive"
},
"enum": ["main", "staging"],
"description": "Which DANDI server to upload to. <br><small><b>Note:</b> The Development Server is recommended for developers, or users learning to use DANDI</small>",
"description": "Which DANDI server to upload to. <br><small><b>Note:</b> The Sandbox Server is recommended for developers, or users learning to use DANDI</small>",
"strict": true
},

Expand Down
4 changes: 2 additions & 2 deletions src/schemas/json/dandi/global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"description": "Log in to DANDI, click on your user initials in the top-right corner, and copy your API key from the resulting pop-up. <br/><small><b>Note:</b> <a href='https://dandiarchive.org' target='_blank'>The main archive</a> and <a href='https://gui-staging.dandiarchive.org' target='_blank'>the development server</a> have different API keys.</small>",
"description": "Log in to DANDI, click on your user initials in the top-right corner, and copy your API key from the resulting pop-up. <br/><small><b>Note:</b> <a href='https://dandiarchive.org' target='_blank'>The main archive</a> and <a href='https://gui-sandbox.dandiarchive.org' target='_blank'>the sandbox server</a> have different API keys.</small>",
"properties": {
"api_keys": {
"properties": {
Expand All @@ -11,7 +11,7 @@
"development_api_key": {
"type": "string",
"format": "password",
"description": "Your DANDI API key from the <a href='https://gui-staging.dandiarchive.org' target='_blank'>development server</a>"
"description": "Your DANDI API key from the <a href='https://gui-sandbox.dandiarchive.org' target='_blank'>sandbox server</a>"
}
},
"additionalProperties": false,
Expand Down