NeurodataWithoutBorders · CodyCBakerPhD · Jun 5, 2024 · Jun 5, 2024 · Jun 5, 2024 · Jun 5, 2024
diff --git a/docs/assets/tutorials/dandi/api-token-added.png b/docs/assets/tutorials/dandi/api-token-added.png
diff --git a/docs/assets/tutorials/dandi/api-tokens.png b/docs/assets/tutorials/dandi/api-tokens.png
diff --git a/docs/assets/tutorials/dandi/create-dandiset.png b/docs/assets/tutorials/dandi/create-dandiset.png
diff --git a/docs/assets/tutorials/dandi/dandiset-id.png b/docs/assets/tutorials/dandi/dandiset-id.png
diff --git a/docs/assets/tutorials/dandi/review-page.png b/docs/assets/tutorials/dandi/review-page.png
diff --git a/docs/assets/tutorials/dataset-created.png b/docs/assets/tutorials/dataset-created.png
diff --git a/docs/assets/tutorials/dataset-creation.png b/docs/assets/tutorials/dataset-creation.png
diff --git a/docs/assets/tutorials/home-page.png b/docs/assets/tutorials/home-page.png
diff --git a/docs/assets/tutorials/multiple/all-interfaces-added.png b/docs/assets/tutorials/multiple/all-interfaces-added.png
diff --git a/docs/assets/tutorials/multiple/conversion-results-page.png b/docs/assets/tutorials/multiple/conversion-results-page.png
diff --git a/docs/assets/tutorials/multiple/fail-name.png b/docs/assets/tutorials/multiple/fail-name.png
diff --git a/docs/assets/tutorials/multiple/format-options.png b/docs/assets/tutorials/multiple/format-options.png
diff --git a/docs/assets/tutorials/multiple/formats-page.png b/docs/assets/tutorials/multiple/formats-page.png
diff --git a/docs/assets/tutorials/multiple/home-page-complete.png b/docs/assets/tutorials/multiple/home-page-complete.png
diff --git a/docs/assets/tutorials/multiple/info-page.png b/docs/assets/tutorials/multiple/info-page.png
diff --git a/docs/assets/tutorials/multiple/inspect-page.png b/docs/assets/tutorials/multiple/inspect-page.png
diff --git a/docs/assets/tutorials/multiple/interface-added.png b/docs/assets/tutorials/multiple/interface-added.png
diff --git a/docs/assets/tutorials/multiple/metadata-ecephys.png b/docs/assets/tutorials/multiple/metadata-ecephys.png
diff --git a/docs/assets/tutorials/multiple/metadata-nwbfile.png b/docs/assets/tutorials/multiple/metadata-nwbfile.png
diff --git a/docs/assets/tutorials/multiple/metadata-page.png b/docs/assets/tutorials/multiple/metadata-page.png
diff --git a/docs/assets/tutorials/multiple/metadata-subject-complete.png b/docs/assets/tutorials/multiple/metadata-subject-complete.png
diff --git a/docs/assets/tutorials/multiple/pathexpansion-autocomplete-filled.png b/docs/assets/tutorials/multiple/pathexpansion-autocomplete-filled.png
diff --git a/docs/assets/tutorials/multiple/pathexpansion-autocomplete-open.png b/docs/assets/tutorials/multiple/pathexpansion-autocomplete-open.png
diff --git a/docs/assets/tutorials/multiple/pathexpansion-autocomplete-submitted.png b/docs/assets/tutorials/multiple/pathexpansion-autocomplete-submitted.png
diff --git a/docs/assets/tutorials/multiple/pathexpansion-basepath.png b/docs/assets/tutorials/multiple/pathexpansion-basepath.png
diff --git a/docs/assets/tutorials/multiple/pathexpansion-completed.png b/docs/assets/tutorials/multiple/pathexpansion-completed.png
diff --git a/docs/assets/tutorials/multiple/pathexpansion-page.png b/docs/assets/tutorials/multiple/pathexpansion-page.png
diff --git a/docs/assets/tutorials/multiple/preview-page.png b/docs/assets/tutorials/multiple/preview-page.png
diff --git a/docs/assets/tutorials/multiple/search-behavior.png b/docs/assets/tutorials/multiple/search-behavior.png
diff --git a/docs/assets/tutorials/multiple/sourcedata-page.png b/docs/assets/tutorials/multiple/sourcedata-page.png
diff --git a/docs/assets/tutorials/multiple/subject-complete.png b/docs/assets/tutorials/multiple/subject-complete.png
diff --git a/docs/assets/tutorials/multiple/subject-error.png b/docs/assets/tutorials/multiple/subject-error.png
diff --git a/docs/assets/tutorials/multiple/subject-invalid.png b/docs/assets/tutorials/multiple/subject-invalid.png
diff --git a/docs/assets/tutorials/multiple/subject-page.png b/docs/assets/tutorials/multiple/subject-page.png
diff --git a/docs/assets/tutorials/multiple/valid-name.png b/docs/assets/tutorials/multiple/valid-name.png
diff --git a/docs/assets/tutorials/multiple/workflow-page.png b/docs/assets/tutorials/multiple/workflow-page.png
diff --git a/docs/assets/tutorials/pipelines/created.png b/docs/assets/tutorials/pipelines/created.png
diff --git a/docs/assets/tutorials/pipelines/list.png b/docs/assets/tutorials/pipelines/list.png
diff --git a/docs/assets/tutorials/single/all-interfaces-added.png b/docs/assets/tutorials/single/all-interfaces-added.png
diff --git a/docs/assets/tutorials/single/conversion-results-page.png b/docs/assets/tutorials/single/conversion-results-page.png
diff --git a/docs/assets/tutorials/single/fail-name.png b/docs/assets/tutorials/single/fail-name.png
diff --git a/docs/assets/tutorials/single/format-options.png b/docs/assets/tutorials/single/format-options.png
diff --git a/docs/assets/tutorials/single/formats-page.png b/docs/assets/tutorials/single/formats-page.png
diff --git a/docs/assets/tutorials/single/home-page-complete.png b/docs/assets/tutorials/single/home-page-complete.png
diff --git a/docs/assets/tutorials/single/info-page.png b/docs/assets/tutorials/single/info-page.png
diff --git a/docs/assets/tutorials/single/inspect-page.png b/docs/assets/tutorials/single/inspect-page.png
diff --git a/docs/assets/tutorials/single/interface-added.png b/docs/assets/tutorials/single/interface-added.png
diff --git a/docs/assets/tutorials/single/metadata-ecephys.png b/docs/assets/tutorials/single/metadata-ecephys.png
diff --git a/docs/assets/tutorials/single/metadata-nwbfile.png b/docs/assets/tutorials/single/metadata-nwbfile.png
diff --git a/docs/assets/tutorials/single/metadata-page.png b/docs/assets/tutorials/single/metadata-page.png
diff --git a/docs/assets/tutorials/single/metadata-subject-complete.png b/docs/assets/tutorials/single/metadata-subject-complete.png
diff --git a/docs/assets/tutorials/single/preview-page.png b/docs/assets/tutorials/single/preview-page.png
diff --git a/docs/assets/tutorials/single/search-behavior.png b/docs/assets/tutorials/single/search-behavior.png
diff --git a/docs/assets/tutorials/single/sourcedata-page-specified.png b/docs/assets/tutorials/single/sourcedata-page-specified.png
diff --git a/docs/assets/tutorials/single/sourcedata-page.png b/docs/assets/tutorials/single/sourcedata-page.png
diff --git a/docs/assets/tutorials/single/valid-name.png b/docs/assets/tutorials/single/valid-name.png
diff --git a/docs/assets/tutorials/single/workflow-page.png b/docs/assets/tutorials/single/workflow-page.png
diff --git a/docs/developer_guide.rst b/docs/developer_guide.rst
@@ -215,6 +215,19 @@ To see if someone else has developed a third-party component to fit your needs,
 useful to search for third-party packages (e.g. Handsontable) that implement the feature you need.
 
 
+.. _documentation:
+Documentation
+-------------
+
+Updating Tutorial Screenshots
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Before a release, you'll want to update the tutorial screenshots to reflect the latest changes in the application.
+
+0. To regenerate the dataset, you'll need to change ``regenerateTestData`` in the ``tests/e2e/config.ts`` to ``true``.
+1. Run the End-to-End Tests locally using ``npm test:app``.
+    - This will generate new screenshots in the ``docs/assets/tutorials`` directory.
+2. Review the new screenshots to ensure they are accurate.
+3. If the screenshots are accurate, commit the new screenshots to the repository.
 
 .. _testing:
 

diff --git a/src/electron/frontend/core/components/forms/GlobalFormModal.ts b/src/electron/frontend/core/components/forms/GlobalFormModal.ts
@@ -37,8 +37,10 @@ export function createFormModal ({
     formProps,
     hasInstances = false
 }: BaseFormModalOptions & { onSave: Function }) {
+
     const modal = new Modal({
-        header
+        header,
+        onClose: () => modal.remove()
     })
 
     const content = document.createElement("div")

diff --git a/src/electron/frontend/core/components/pages/guided-mode/data/GuidedPathExpansion.js b/src/electron/frontend/core/components/pages/guided-mode/data/GuidedPathExpansion.js
@@ -45,6 +45,7 @@ export async function autocompleteFormatString(path) {
 
     const modal = new Modal({
         header: `${interfaceName} — Autocomplete Format String`,
+        onClose: () => modal.remove(),
     });
 
     const content = document.createElement("div");

diff --git a/src/electron/frontend/core/components/pages/guided-mode/data/GuidedSourceData.js b/src/electron/frontend/core/components/pages/guided-mode/data/GuidedSourceData.js
@@ -256,7 +256,10 @@ export class GuidedSourceDataPage extends ManagedPage {
 
                         header.append(h2, small);
 
-                        const modal = new Modal({ header });
+                        const modal = new Modal({
+                            header,
+                            onClose: () => modal.remove(),
+                        });
 
                         let alignment;
 

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
@@ -41,6 +41,7 @@ export class GuidedUploadPage extends Page {
                 icon: keyIcon,
                 label: "API Keys",
                 onClick: () => {
+                    document.body.append(this.globalModal);
                     this.globalModal.form.results = structuredClone(global.data.DANDI?.api_keys ?? {});
                     this.globalModal.open = true;
                 },
@@ -61,9 +62,10 @@ export class GuidedUploadPage extends Page {
     connectedCallback() {
         super.connectedCallback();
 
-        const modal = (this.globalModal = createFormModal.call(this, {
+        this.globalModal = createFormModal.call(this, {
             header: "DANDI API Keys",
             schema: dandiGlobalSchema.properties.api_keys,
+            onClose: () => this.globalModal.remove(),
             onSave: async (form) => {
                 const apiKeys = form.resolved;
 
@@ -90,8 +92,7 @@ export class GuidedUploadPage extends Page {
                     if (name.includes("api_key")) return await validateDANDIApiKey(value, name.includes("staging"));
                 },
             },
-        }));
-        document.body.append(modal);
+        });
     }
 
     disconnectedCallback() {
@@ -170,9 +171,11 @@ export class GuidedUploadPage extends Page {
                                 buttonStyles: {
                                     width: "max-content",
                                 },
-                                onClick: async () => {
-                                    await createDandiset.call(this, { title: this.form.resolved.dandiset });
-                                    this.requestUpdate();
+                                onClick: () => {
+                                    const result = createDandiset.call(this, { title: this.form.resolved.dandiset });
+                                    const { modal, done } = result;
+                                    done.then(() => this.requestUpdate());
+                                    return modal;
                                 },
                             }),
                         ],
@@ -187,7 +190,7 @@ export class GuidedUploadPage extends Page {
         // Confirm that one api key exists
         promise.then(() => {
             const api_keys = global.data.DANDI?.api_keys;
-            if (!api_keys || !Object.keys(api_keys).length) this.globalModal.open = true;
+            if (!api_keys || !Object.keys(api_keys).length) this.header.controls[0].onClick(); // Add modal and open it
         });
 
         const untilResult = until(promise, html`Loading form contents...`);

diff --git a/src/electron/frontend/core/components/pages/inspect/InspectPage.js b/src/electron/frontend/core/components/pages/inspect/InspectPage.js
@@ -49,6 +49,13 @@ export class InspectPage extends Page {
         return result;
     };
 
+    #modal;
+
+    disconnectedCallback() {
+        super.disconnectedCallback();
+        if (this.#modal) this.#modal.remove();
+    }
+
     showReport = async (value) => {
         if (!value) {
             const message = "Please provide filesystem entries to inspect.";
@@ -92,10 +99,11 @@ export class InspectPage extends Page {
             },
         });
 
-        const modal = new Modal({
+        this.#modal = new Modal({
             header: value.length === 1 ? value : `Selected Filesystem Entries`,
             controls: [downloadJSONButton, downloadTextButton],
             footer: legend,
+            onClose: () => this.#modal.remove(),
         });
 
         const container = document.createElement("div");
@@ -108,10 +116,9 @@ export class InspectPage extends Page {
 
         container.append(list);
 
-        modal.append(container);
-        document.body.append(modal);
-
-        modal.toggle(true);
+        this.#modal.append(container);
+        document.body.append(this.#modal);
+        this.#modal.toggle(true);
     };
 
     form = new JSONSchemaForm({

diff --git a/src/electron/frontend/core/components/pages/settings/SettingsPage.js b/src/electron/frontend/core/components/pages/settings/SettingsPage.js
@@ -229,6 +229,14 @@ export class SettingsPage extends Page {
 
     #releaseNotesModal;
 
+    disconnectedCallback() {
+        super.disconnectedCallback();
+        if (this.#releaseNotesModal) {
+            this.#releaseNotesModal.remove();
+            this.#releaseNotesModal = null;
+        }
+    }
+
     // Populate the Update Available display
     updated() {
         const updateDiv = this.querySelector("#update-available");
@@ -255,6 +263,7 @@ export class SettingsPage extends Page {
 
                 const modal = (this.#releaseNotesModal = new Modal({
                     header: `Release Notes`,
+                    onClose: () => modal.remove(),
                 }));
 
                 const releaseNotes = document.createElement("div");

diff --git a/src/electron/frontend/core/components/pages/uploads/UploadsPage.js b/src/electron/frontend/core/components/pages/uploads/UploadsPage.js
@@ -37,7 +37,7 @@ import keyIcon from "../../../../assets/icons/key.svg?raw";
 import { AWARD_VALIDATION_FAIL_MESSAGE, awardNumberValidator, isStaging, validate } from "./utils";
 import { createFormModal } from "../../forms/GlobalFormModal";
 
-export async function createDandiset(results = {}) {
+export function createDandiset(results = {}) {
     let notification;
 
     const notify = (message, type) => {
@@ -47,6 +47,7 @@ export async function createDandiset(results = {}) {
 
     const modal = new Modal({
         header: "Create a Dandiset",
+        onClose: () => modal.remove(),
     });
 
     const content = document.createElement("div");
@@ -101,7 +102,7 @@ export async function createDandiset(results = {}) {
 
     modal.onClose = async () => notify("Dandiset was not created.", "error");
 
-    return new Promise((resolve) => {
+    const promise = new Promise((resolve) => {
         const button = new Button({
             label: "Create",
             primary: true,
@@ -165,6 +166,11 @@ export async function createDandiset(results = {}) {
     }).finally(() => {
         modal.remove();
     });
+
+    return {
+        modal,
+        done: promise,
+    };
 }
 
 async function getAPIKey(staging = false) {
@@ -180,6 +186,7 @@ async function getAPIKey(staging = false) {
         const modal = new Modal({
             header: `${api_key ? "Update" : "Provide"} your ${header(whichAPIKey)}`,
             open: true,
+            onClose: () => modal.remove(),
         });
 
         const input = new JSONSchemaInput({
@@ -357,7 +364,10 @@ export class UploadsPage extends Page {
                 global.data.uploads = {};
                 global.save();
 
-                const modal = new Modal({ open: true });
+                const modal = new Modal({
+                    open: true,
+                    onClose: () => modal.remove(),
+                });
                 modal.header = "DANDI Upload Summary";
                 const summary = new DandiResults({
                     id: globalState.dandiset,
@@ -391,11 +401,14 @@ export class UploadsPage extends Page {
                                 buttonStyles: {
                                     width: "max-content",
                                 },
-                                onClick: async () => {
-                                    await createDandiset.call(this, {
+                                onClick: () => {
+                                    const { modal, done } = createDandiset.call(this, {
                                         title: this.form.resolved.dandiset,
                                     });
-                                    this.requestUpdate();
+
+                                    done.then(() => this.requestUpdate());
+
+                                    return modal;
                                 },
                             }),
                         ],

diff --git a/src/pyflask/manageNeuroconv/manage_neuroconv.py b/src/pyflask/manageNeuroconv/manage_neuroconv.py
@@ -8,7 +8,7 @@
 import re
 import traceback
 import zoneinfo
-from datetime import datetime
+from datetime import datetime, timedelta
 from pathlib import Path
 from shutil import copytree, rmtree
 from typing import Any, Dict, List, Optional, Union
@@ -1565,7 +1565,7 @@ def _format_spikeglx_meta_file(bin_file_path: str) -> str:
 
     meta_structure = f"""acqApLfSy=384,384,1
 appVersion=20190327
-fileCreateTime={datetime.now().isoformat(timespec='seconds')}
+fileCreateTime={(datetime.now() - timedelta(hours=1)).isoformat(timespec='seconds')}
 fileName={bin_file_path}
 fileSHA1={file_sha1}
 fileSizeBytes={file_size}

diff --git a/tests/e2e/workflow.ts b/tests/e2e/workflow.ts
@@ -35,22 +35,29 @@ export const uploadToDandi = (subdirectory, forceSkip = false) => {
       await takeScreenshot(join(subdirectory, 'api-token-added'), 100)
 
 
+      const modalId = 'dandiset-creation-modal-for-test'
+
       // Open dandiset creation modal
-      await evaluate(() => {
+      await evaluate(( modalId: string ) => {
         const dashboard = document.querySelector('nwb-dashboard')
         const form = dashboard.page.form
         const dandisetInput = form.getFormElement(['dandiset'])
         const createDandiset = dandisetInput.controls[0]
-        createDandiset.onClick()
-      })
+        const modal = createDandiset.onClick()
+        modal.setAttribute('id', modalId)
+      }, modalId)
 
       await takeScreenshot(join(subdirectory, 'create-dandiset'), 100)
 
       // Close modal
-      await evaluate(() => {
-        const modal = document.querySelector('nwb-modal') as any
+      await evaluate(( modalId: string ) => {
+        const modal = document.getElementById(modalId) as any
         modal.toggle(false)
-      })
+
+        const page = document.querySelector('nwb-dashboard').page
+        page.dismiss() // Dismiss all internal notifications
+
+      }, modalId)
 
       await evaluate(async (dandisetId) => {
         const dashboard = document.querySelector('nwb-dashboard')