From 6221f9d2f4525c5eeb1bdba4e7e1c316b438ce22 Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 3 Nov 2023 12:39:01 -0700 Subject: [PATCH 1/3] Upload section headers --- src/renderer/src/pages.js | 2 ++ src/renderer/src/stories/pages/globals.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/renderer/src/pages.js b/src/renderer/src/pages.js index a02bed0c8..72acb13ac 100644 --- a/src/renderer/src/pages.js +++ b/src/renderer/src/pages.js @@ -108,11 +108,13 @@ const pages = { start: new GuidedStartPage({ label: "Start", }), + details: new GuidedNewDatasetPage({ title: "Project Setup", label: "Project details", section: sections[0], }), + structure: new GuidedStructurePage({ title: "Data Formats", label: "Data formats", diff --git a/src/renderer/src/stories/pages/globals.js b/src/renderer/src/stories/pages/globals.js index 0ec23337d..4d16a4115 100644 --- a/src/renderer/src/stories/pages/globals.js +++ b/src/renderer/src/stories/pages/globals.js @@ -1 +1 @@ -export const sections = ["Project Structure", "Data Review", "Conversion Preview", "Final Review"]; +export const sections = ["Project Structure", "Data Entry", "Conversion Preview", "Upload & Review"]; From 5f956a4bdef0ddcbfc181087498b4ad7ff4b7169 Mon Sep 17 00:00:00 2001 From: Garrett Date: Fri, 3 Nov 2023 12:44:22 -0700 Subject: [PATCH 2/3] Update list of sections --- .../src/stories/pages/guided-mode/GuidedStart.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/renderer/src/stories/pages/guided-mode/GuidedStart.js b/src/renderer/src/stories/pages/guided-mode/GuidedStart.js index 62235c912..666742215 100644 --- a/src/renderer/src/stories/pages/guided-mode/GuidedStart.js +++ b/src/renderer/src/stories/pages/guided-mode/GuidedStart.js @@ -3,6 +3,7 @@ import { Page } from "../Page.js"; import "./GuidedFooter"; import { InfoBox } from "../../InfoBox.js"; import { InspectorListItem } from "../../preview/inspector/InspectorList.js"; +import { sections } from "../globals.js"; export class GuidedStartPage extends Page { constructor(...args) { @@ -57,11 +58,11 @@ export class GuidedStartPage extends Page {

In the GUIDE, the process of running a conversion pipeline is broken into four high-level sections.

-

1. Project Structure

+

1. ${sections[0]}

The first section will direct you to specify the high-level structure of your conversion pipeline, including data formats and global metadata.

-

2. Data Review

+

2. ${sections[1]}

The second section will have you provide your source data files and NWB File metadata on a per-subject basis to populate your files.

@@ -86,17 +87,16 @@ export class GuidedStartPage extends Page { — though you don't need to specify a value at the current stage.

-

3. Conversion Preview

+

3. ${sections[2]}

In the third section, you will preview your conversion before uploading to DANDI.

-

4. Final Review

+

4. ${sections[3]}

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

-
-

Additional Resources

+

Additional Resources

${new InfoBox({ header: "Where can I learn more about the conversion process?", From e58503b920bdd3049402837132b7181e47a30f18 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 19:45:39 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/renderer/assets/css/section.css | 1 - src/renderer/src/pages.js | 2 +- src/renderer/src/stories/Main.js | 42 +++++++++++-------- .../guided-mode/data/GuidedSourceData.js | 2 - .../pages/guided-mode/data/GuidedStructure.js | 4 +- .../guided-mode/options/GuidedStubPreview.js | 1 - .../stories/pages/settings/SettingsPage.js | 8 ++-- 7 files changed, 32 insertions(+), 28 deletions(-) diff --git a/src/renderer/assets/css/section.css b/src/renderer/assets/css/section.css index 9a326064d..1dea6d6ae 100755 --- a/src/renderer/assets/css/section.css +++ b/src/renderer/assets/css/section.css @@ -19,7 +19,6 @@ transform 0.12s ease-in-out; } - nwb-main h3, nwb-main p { color: var(--color); diff --git a/src/renderer/src/pages.js b/src/renderer/src/pages.js index 72acb13ac..561b9209a 100644 --- a/src/renderer/src/pages.js +++ b/src/renderer/src/pages.js @@ -108,7 +108,7 @@ const pages = { start: new GuidedStartPage({ label: "Start", }), - + details: new GuidedNewDatasetPage({ title: "Project Setup", label: "Project details", diff --git a/src/renderer/src/stories/Main.js b/src/renderer/src/stories/Main.js index 74a08db7a..f02b0cc3d 100644 --- a/src/renderer/src/stories/Main.js +++ b/src/renderer/src/stories/Main.js @@ -144,25 +144,33 @@ export class Main extends LitElement { return html` ${headerEl} - ${capsules - ? html`
${capsules}
` - : html``} - ${title - ? html`
-
-
-

${title}

- ${unsafeHTML(subtitle)} + ${ + capsules + ? html`
${capsules}
` + : html`` + } + ${ + title + ? html`
+
+
+

${title}

+ ${unsafeHTML(subtitle)} +
+
${controls}
-
${controls}
-
-
-
` - : ""} +
+
` + : "" + } -
+
${page}
${footerEl} diff --git a/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js b/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js index 909a2f7d6..c732cc92d 100644 --- a/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js +++ b/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js @@ -24,8 +24,6 @@ const propsToIgnore = [ ]; export class GuidedSourceDataPage extends ManagedPage { - - constructor(...args) { super(...args); this.style.height = "100%"; // Fix main section diff --git a/src/renderer/src/stories/pages/guided-mode/data/GuidedStructure.js b/src/renderer/src/stories/pages/guided-mode/data/GuidedStructure.js index 79e05460e..6832405a1 100644 --- a/src/renderer/src/stories/pages/guided-mode/data/GuidedStructure.js +++ b/src/renderer/src/stories/pages/guided-mode/data/GuidedStructure.js @@ -142,7 +142,9 @@ export class GuidedStructurePage extends Page { this.addButton.setAttribute("hidden", ""); return html` -
${this.list} ${this.addButton}
+
+ ${this.list} ${this.addButton} +
${this.searchModal} `; } 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 75cc28a66..ea52056ab 100644 --- a/src/renderer/src/stories/pages/guided-mode/options/GuidedStubPreview.js +++ b/src/renderer/src/stories/pages/guided-mode/options/GuidedStubPreview.js @@ -17,7 +17,6 @@ export class GuidedStubPreviewPage extends Page { constructor(...args) { super(...args); this.style.height = "100%"; // Fix main section - } header = { diff --git a/src/renderer/src/stories/pages/settings/SettingsPage.js b/src/renderer/src/stories/pages/settings/SettingsPage.js index ce3729273..99139488b 100644 --- a/src/renderer/src/stories/pages/settings/SettingsPage.js +++ b/src/renderer/src/stories/pages/settings/SettingsPage.js @@ -31,8 +31,8 @@ export class SettingsPage extends Page { if (!this.unsavedUpdates) return this.#openNotyf("All changes were already saved", "success"); this.save(); }, - }) - ] + }), + ], }; constructor(...args) { @@ -76,9 +76,7 @@ export class SettingsPage extends Page { onThrow, }); - return html` - ${this.form} - `; + return html` ${this.form} `; } }