Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Update to generic annotation transformation callout during download #1186

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

feat: Update to generic annotation transformation callout during download #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b673fb9
bchu1 Sep 27, 2024
e7cd3ce
fix margin
bchu1 Sep 27, 2024
b8b1fcf
add a sleep
bchu1 Sep 27, 2024
9de26ca
sleep longer
bchu1 Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/frontend-e2e-tests.yml
View file
Open in desktop
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
8 changes: 6 additions & 2 deletions frontend/packages/data-portal/app/components/Download/ConfigureTomogramDownloadContent.tsx
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions frontend/packages/data-portal/app/components/Download/DownloadOptionsContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,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
2 changes: 1 addition & 1 deletion frontend/packages/data-portal/public/locales/en/translation.json
View file
Open in desktop
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
Loading