From 2b547be3fa85ff658778d82a027df172cf1777a4 Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Thu, 28 Dec 2023 16:17:04 -0600 Subject: [PATCH 1/3] Fix Server Error Parsing (#546) * Update GuidedSourceData.js * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update GuidedSourceData.js * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .../pages/guided-mode/data/GuidedSourceData.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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 86ff3c6e0..a3414cf75 100644 --- a/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js +++ b/src/renderer/src/stories/pages/guided-mode/data/GuidedSourceData.js @@ -104,14 +104,11 @@ export class GuidedSourceDataPage extends ManagedPage { if (isStorybook) return; if (result.message) { - const [ - type, - text = `
${result.traceback
-                                .trim()
-                                .split("\n")
-                                .slice(-2)[0]
-                                .trim()}
`, - ] = result.message.split(":"); + const [type, ...splitText] = result.message.split(":"); + const text = splitText.length + ? splitText.join(":").replaceAll("<", "<").replaceAll(">", ">") + : `
${result.traceback.trim().split("\n").slice(-2)[0].trim()}
`; + const message = `

Request Failed

${type}

${text}

`; this.notify(message, "error"); throw result; From 4ade2207246d2f754ed3a4c018d6a835fba8aa86 Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Fri, 29 Dec 2023 11:48:26 -0500 Subject: [PATCH 2/3] Automatic chromatic deployment on PR approval (#549) * Update chromatic.yml * change to apostrophes * temporarily disable, print trigger event string * isolate echo * try different context * restore fixed version --- .github/workflows/chromatic.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 9f07329ef..09b74deac 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -1,9 +1,13 @@ -name: "Chromatic Publish" +name: Chromatic -on: workflow_dispatch +on: + workflow_dispatch: + pull_request_review: + types: [submitted] jobs: test: + if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request_review' && github.event.review.state == 'approved') runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From 86d0ffb063e46942b71eafb51fb476f3eeadc4f3 Mon Sep 17 00:00:00 2001 From: Garrett Michael Flynn Date: Fri, 29 Dec 2023 11:18:58 -0600 Subject: [PATCH 3/3] Update guideGlobalMetadata.json (#465) Co-authored-by: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> --- guideGlobalMetadata.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guideGlobalMetadata.json b/guideGlobalMetadata.json index 711c4177d..c7decb1e7 100644 --- a/guideGlobalMetadata.json +++ b/guideGlobalMetadata.json @@ -40,6 +40,7 @@ "SpikeGLXConverterPipe", "BrukerTiffSinglePlaneConverter", "BrukerTiffMultiPlaneConverter", - "MiniscopeConverter" + "MiniscopeConverter", + "CellExplorerRecordingInterface" ] }