Skip to content

Commit

Permalink
feat: Update to generic annotation transformation callout during down…
Browse files Browse the repository at this point in the history
…load (#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`).
  • Loading branch information
bchu1 authored Sep 30, 2024
1 parent 1732fb2 commit 5597524
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/frontend-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,11 @@ export function ConfigureTomogramDownloadContent() {
</RadioGroup>

{runId && (
<Callout className="!w-full !mt-sds-xl" intent="info" expandable>
<Callout
className="!w-full !mt-sds-xl !mb-sds-xxs"
intent="info"
expandable
>
<CalloutTitle>
<p className="text-sds-body-xs leading-sds-body-xs">
<I18n i18nKey="downloadAllRunData" />
Expand All @@ -197,7 +201,7 @@ export function ConfigureTomogramDownloadContent() {

{multipleTomogramsEnabled && (
<Callout intent="notice" className="!w-full !mt-0">
{t('annotationsDownloadedFromThePortal')}
{t('annotationsMayRequireTransformation')}
</Callout>
)}
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ export function DownloadOptionsContent() {
<DownloadTabContent />

{multipleTomogramsEnabled && (
<Callout intent="notice" className="!w-full">
{t('annotationsDownloadedFromThePortal')}
<Callout intent="notice" className="!w-full !mt-sds-xl">
{t('annotationsMayRequireTransformation')}
</Callout>
)}
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
"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",
"annotationObject": "Annotation Object",
"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",
Expand Down

0 comments on commit 5597524

Please sign in to comment.