From 55975247a151c82114392fcab8c57b3abcb674ff Mon Sep 17 00:00:00 2001 From: Bryan Chu <151689101+bchu1@users.noreply.github.com> Date: Mon, 30 Sep 2024 13:35:13 -0700 Subject: [PATCH] feat: Update to generic annotation transformation callout during download (#1186) #1005 #1045 #1046 This change is being made because we are no longer providing specific transformation code when annotations are used with non-standard tomograms. This also adds a 15 second `sleep` before running tests so that the app server has time to start (`ERR_CONNECTION_REFUSED`). --- .github/workflows/frontend-e2e-tests.yml | 4 +++- .../Download/ConfigureTomogramDownloadContent.tsx | 8 ++++++-- .../app/components/Download/DownloadOptionsContent.tsx | 4 ++-- .../data-portal/public/locales/en/translation.json | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/frontend-e2e-tests.yml b/.github/workflows/frontend-e2e-tests.yml index 3803948d0..59382b9ad 100644 --- a/.github/workflows/frontend-e2e-tests.yml +++ b/.github/workflows/frontend-e2e-tests.yml @@ -159,7 +159,9 @@ jobs: ENV: ${{ inputs.environment }} - name: Run E2E tests - run: pnpm e2e --shard ${{ matrix.shardCurrent }}/${{ matrix.shardTotal }} + run: | + sleep 15 + pnpm e2e --shard ${{ matrix.shardCurrent }}/${{ matrix.shardTotal }} working-directory: frontend/packages/data-portal env: API_URL: ${{ vars.API_URL }} diff --git a/frontend/packages/data-portal/app/components/Download/ConfigureTomogramDownloadContent.tsx b/frontend/packages/data-portal/app/components/Download/ConfigureTomogramDownloadContent.tsx index 08046b39e..6df2df2c4 100644 --- a/frontend/packages/data-portal/app/components/Download/ConfigureTomogramDownloadContent.tsx +++ b/frontend/packages/data-portal/app/components/Download/ConfigureTomogramDownloadContent.tsx @@ -173,7 +173,11 @@ export function ConfigureTomogramDownloadContent() { {runId && ( - +

@@ -197,7 +201,7 @@ export function ConfigureTomogramDownloadContent() { {multipleTomogramsEnabled && ( - {t('annotationsDownloadedFromThePortal')} + {t('annotationsMayRequireTransformation')} )} diff --git a/frontend/packages/data-portal/app/components/Download/DownloadOptionsContent.tsx b/frontend/packages/data-portal/app/components/Download/DownloadOptionsContent.tsx index 2c0bb9a10..78e61e523 100644 --- a/frontend/packages/data-portal/app/components/Download/DownloadOptionsContent.tsx +++ b/frontend/packages/data-portal/app/components/Download/DownloadOptionsContent.tsx @@ -168,8 +168,8 @@ export function DownloadOptionsContent() { {multipleTomogramsEnabled && ( - - {t('annotationsDownloadedFromThePortal')} + + {t('annotationsMayRequireTransformation')} )} diff --git a/frontend/packages/data-portal/public/locales/en/translation.json b/frontend/packages/data-portal/public/locales/en/translation.json index 59be9b535..aa5daf9dd 100644 --- a/frontend/packages/data-portal/public/locales/en/translation.json +++ b/frontend/packages/data-portal/public/locales/en/translation.json @@ -30,6 +30,7 @@ "annotationConfidence": "Annotation Confidence", "annotationDetails": "Annotation Details", "annotationId": "Annotation ID", + "annotationsMayRequireTransformation": "Annotations may require transformation if the desired tomogram has a different Alignment ID.", "annotationMetadata": "Annotation Metadata", "annotationMethod": "Annotation Method", "annotationMethodsSummary": "Annotation Methods Summary", @@ -37,7 +38,6 @@ "annotationOverview": "Annotation Overview", "annotationSoftware": "Annotation Software", "annotations": "Annotations", - "annotationsDownloadedFromThePortal": "Annotations downloaded from the portal may require transformation to work with the selected tomogram.", "annotationsSummary": "Annotations Summary", "annotationsTotal": "Annotations (Total)", "api": "API",