From 5097f2e6bea4b7fee9c7e7629f348c5cb659496d Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Tue, 6 Feb 2024 15:10:15 -0800 Subject: [PATCH 1/3] Update footer design --- src/renderer/src/stories/pages/guided-mode/GuidedFooter.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/renderer/src/stories/pages/guided-mode/GuidedFooter.js b/src/renderer/src/stories/pages/guided-mode/GuidedFooter.js index b49e5d1ad..5b229209a 100644 --- a/src/renderer/src/stories/pages/guided-mode/GuidedFooter.js +++ b/src/renderer/src/stories/pages/guided-mode/GuidedFooter.js @@ -54,11 +54,14 @@ export class GuidedFooter extends LitElement { render() { return html` +
+ ${this.exit ? html`${this.exit}` : ""} +
+
${this.back ? html`${this.back}` : ""} ${this.next ? html`${this.next}` : ""}
- ${this.exit ? html`${this.exit}` : ""} `; } From 7be6e3cad9235390a935a147f2563594ebe3b5aa Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 23:11:52 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/renderer/src/stories/pages/guided-mode/GuidedFooter.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/renderer/src/stories/pages/guided-mode/GuidedFooter.js b/src/renderer/src/stories/pages/guided-mode/GuidedFooter.js index 5b229209a..cdd3c22b4 100644 --- a/src/renderer/src/stories/pages/guided-mode/GuidedFooter.js +++ b/src/renderer/src/stories/pages/guided-mode/GuidedFooter.js @@ -54,10 +54,8 @@ export class GuidedFooter extends LitElement { render() { return html` -
- ${this.exit ? html`${this.exit}` : ""} -
- +
${this.exit ? html`${this.exit}` : ""}
+
${this.back ? html`${this.back}` : ""} ${this.next ? html`${this.next}` : ""} From 823c0a32642cf48b835ec49e9a0a82b2b1e21687 Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Tue, 6 Feb 2024 15:25:10 -0800 Subject: [PATCH 3/3] Update next text --- src/renderer/src/stories/Main.js | 3 ++- src/renderer/src/stories/pages/guided-mode/GuidedFooter.js | 4 ++-- .../src/stories/pages/guided-mode/data/GuidedMetadata.js | 1 - .../src/stories/pages/guided-mode/data/GuidedPathExpansion.js | 1 - .../src/stories/pages/guided-mode/data/GuidedSourceData.js | 1 - .../pages/guided-mode/options/GuidedConversionOptions.js | 1 - .../stories/pages/guided-mode/options/GuidedInspectorPage.js | 4 +--- .../src/stories/pages/guided-mode/options/GuidedUpload.js | 1 - .../src/stories/pages/guided-mode/results/GuidedResults.js | 4 +--- .../src/stories/pages/guided-mode/setup/GuidedSubjects.js | 4 +--- 10 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/renderer/src/stories/Main.js b/src/renderer/src/stories/Main.js index 55f30b29a..2d711b444 100644 --- a/src/renderer/src/stories/Main.js +++ b/src/renderer/src/stories/Main.js @@ -98,6 +98,7 @@ export class Main extends LitElement { footer = Object.assign( { exit: false, + next: "Complete Pipeline", onNext: () => this.toRender.page.to("/"), }, footer && typeof footer === "object" ? footer : {} @@ -106,7 +107,7 @@ export class Main extends LitElement { } if (footer === true) footer = {}; - if (footer && "onNext" in footer && !("next" in footer)) footer.next = "Save and Continue"; + if (footer && "onNext" in footer && !("next" in footer)) footer.next = "Next"; // Default Capsules Behavior const section = sections[info.section]; diff --git a/src/renderer/src/stories/pages/guided-mode/GuidedFooter.js b/src/renderer/src/stories/pages/guided-mode/GuidedFooter.js index 5b229209a..d0dc4d2fa 100644 --- a/src/renderer/src/stories/pages/guided-mode/GuidedFooter.js +++ b/src/renderer/src/stories/pages/guided-mode/GuidedFooter.js @@ -27,7 +27,7 @@ export class GuidedFooter extends LitElement { constructor({ back = "Back", next = "Next", - exit = "Return to Home Screen", + exit = "Exit Current Pipeline", onBack = () => this.to(-1), onNext = () => this.to(1), onExit = () => this.to("/"), @@ -57,7 +57,7 @@ export class GuidedFooter extends LitElement {
${this.exit ? html`${this.exit}` : ""}
- +
${this.back ? html`${this.back}` : ""} ${this.next ? html`${this.next}` : ""} diff --git a/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js b/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js index dbec3445f..8487806e9 100644 --- a/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js +++ b/src/renderer/src/stories/pages/guided-mode/data/GuidedMetadata.js @@ -105,7 +105,6 @@ export class GuidedMetadataPage extends ManagedPage { }; footer = { - next: "Run Conversion Preview", onNext: async () => { await this.save(); // Save in case the conversion fails diff --git a/src/renderer/src/stories/pages/guided-mode/data/GuidedPathExpansion.js b/src/renderer/src/stories/pages/guided-mode/data/GuidedPathExpansion.js index 182a10eb2..559553261 100644 --- a/src/renderer/src/stories/pages/guided-mode/data/GuidedPathExpansion.js +++ b/src/renderer/src/stories/pages/guided-mode/data/GuidedPathExpansion.js @@ -214,7 +214,6 @@ export class GuidedPathExpansionPage extends Page { }; footer = { - next: "Populate Subject Details", onNext: async () => { await this.save(); // Save in case the request fails 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 fee0343cf..78f9f9e91 100644 --- a/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js +++ b/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js @@ -58,7 +58,6 @@ export class GuidedSourceDataPage extends ManagedPage { }; footer = { - next: "Request Metadata Schema", onNext: async () => { await this.save(); // Save in case the conversion fails diff --git a/src/renderer/src/stories/pages/guided-mode/options/GuidedConversionOptions.js b/src/renderer/src/stories/pages/guided-mode/options/GuidedConversionOptions.js index a3f60670e..591c99165 100644 --- a/src/renderer/src/stories/pages/guided-mode/options/GuidedConversionOptions.js +++ b/src/renderer/src/stories/pages/guided-mode/options/GuidedConversionOptions.js @@ -9,7 +9,6 @@ export class GuidedConversionOptionsPage extends Page { } footer = { - next: "Run Conversion Preview", onNext: async () => { await this.save(); // Save in case the conversion fails await this.form.validate(); // Will throw an error in the callback diff --git a/src/renderer/src/stories/pages/guided-mode/options/GuidedInspectorPage.js b/src/renderer/src/stories/pages/guided-mode/options/GuidedInspectorPage.js index d34489222..d38f35d29 100644 --- a/src/renderer/src/stories/pages/guided-mode/options/GuidedInspectorPage.js +++ b/src/renderer/src/stories/pages/guided-mode/options/GuidedInspectorPage.js @@ -76,9 +76,7 @@ export class GuidedInspectorPage extends Page { }; // NOTE: We may want to trigger this whenever (1) this page is visited AND (2) data has been changed. - footer = { - next: "Preview Files", - }; + footer = {}; getStatus = (list) => { return list.reduce((acc, messageInfo) => { 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 aca3145df..18a7f7cc1 100644 --- a/src/renderer/src/stories/pages/guided-mode/options/GuidedUpload.js +++ b/src/renderer/src/stories/pages/guided-mode/options/GuidedUpload.js @@ -88,7 +88,6 @@ export class GuidedUploadPage extends Page { } footer = { - next: "Upload Project", onNext: async () => { await this.save(); // Save in case the conversion fails 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 e23d33932..3aeb9ddf7 100644 --- a/src/renderer/src/stories/pages/guided-mode/results/GuidedResults.js +++ b/src/renderer/src/stories/pages/guided-mode/results/GuidedResults.js @@ -8,9 +8,7 @@ export class GuidedResultsPage extends Page { super(...args); } - footer = { - next: "Complete Conversion", - }; + footer = {}; render() { const { conversion } = this.info.globalState; diff --git a/src/renderer/src/stories/pages/guided-mode/setup/GuidedSubjects.js b/src/renderer/src/stories/pages/guided-mode/setup/GuidedSubjects.js index 9a9da4b7c..a591ab656 100644 --- a/src/renderer/src/stories/pages/guided-mode/setup/GuidedSubjects.js +++ b/src/renderer/src/stories/pages/guided-mode/setup/GuidedSubjects.js @@ -67,9 +67,7 @@ export class GuidedSubjectsPage extends Page { updateResultsFromSubjects(results, subjects, sourceDataObject); // NOTE: This directly mutates the results object }; - footer = { - next: "Generate Data Structure", - }; + footer = {}; updated() { const add = this.query("#addButton");