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

Challenges understanding AWS downloads #179

Merged
merged 4 commits into from
Aug 16, 2024
Merged

Challenges understanding AWS downloads #179

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
db8aaec
aws download text changes
ignapas Aug 13, 2024
6aa035a
Merge branch 'main' into aws-download
ignapas Aug 16, 2024
6e1c52b
trying to correct a some of tests
ignapas Aug 16, 2024
0bba6b5
fixed more tests
ignapas Aug 16, 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
19 changes: 9 additions & 10 deletions components/DatasetDetails/DatasetFilesInfo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@
<el-col :md="12" class="bx--col-sm-4 bx--col-md-8 bx--col left-column">
<div v-if="!isDatasetSizeLarge">
<div><span class="label4">Option 1 - Direct download: </span>Download a zip archive of all the files and
metadata directly to your computer free of charge. Please note that the files will be compressed upon
download.</div>
metadata directly to your computer, free of charge. <span class="label4">Note:</span> Files will be compressed prior to downloading the archive.
</div>
<div class="mt-24">If you only need certain files or folders, select and download them from the <span class="label4">Dataset Files</span> listing.</div>
<a :href="downloadUrl">
<el-button @click="sendGtmEvent" class="my-16">Download Full Dataset</el-button>
</a>
Expand All @@ -78,6 +79,7 @@
<div><span class="label4">Option 1 - Direct download: </span>Direct downloads are only available free of
charge for datasets that are 5GB or smaller. Datasets bigger than 5GB will need to be downloaded via AWS.
</div>
<div class="mt-24">If you only need certain files or folders, select and download them from the <span class="label4">Dataset Files</span> listing.</div>
<sparc-tooltip placement="left-center">
<template #data>
<div>
Expand All @@ -97,10 +99,9 @@
</el-col>
<el-col :md="12" class="bx--col-sm-4 bx--col-md-8 bx--col aws-download-column">
<div class="mb-8">
<span class="label4">Option 2 - AWS download: </span>
Download or transfer the dataset to your AWS Account. The files and metadata are stored in an AWS S3
Requester Pays bucket. You can learn more about downloading data from AWS on our
<a href="https://docs.sparc.science/docs/accessing-public-datasets" target="_blank">Help Page</a>.
<span class="label4">Option 2 - AWS S3:</span>
Download or transfer using Amazon AWS S3. Quickly obtain dataset hiles from our S3 bucket with your AWS account at Amazon's
<a href="https://aws.amazon.com/s3/pricing/" target="_blank">nominally priced usage rates</a>.
</div>
<div class="aws-block mb-16 px-16 pb-16 pt-8">
<template v-if="isLatestVersion || !showRehydrationFeature">
Expand Down Expand Up @@ -135,10 +136,8 @@
</template>
</div>
<div>
* Requester Pays means that any costs associated with downloading the data will be charged to your AWS
account.
For transfer pricing information, visit the <a href="https://aws.amazon.com/s3/pricing/" target="blank">AWS
Pricing documentation.</a>
* See our <a href="https://docs.sparc.science/docs/accessing-public-datasets" target="blank">Help page</a> for information on
AWS S3 and links to tutorials. AWS required for 5GB and over.
</div>
</el-col>
</el-row>
Expand Down
10 changes: 5 additions & 5 deletions tests/cypress/e2e/datasets.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,9 @@ datasetIds.forEach(datasetId => {
cy.get('.active.style1.tab2.tab-link.p-16').should('contain', 'Files');

// Check for content
cy.get('[style=""] > .heading2.mb-8').should('have.text', 'Download Dataset');
cy.get('.left-column > :nth-child(1) > div > .label4').should('have.text', 'Option 1 - Direct download: ');
cy.get('.aws-download-column > :nth-child(1) > .label4').should('have.text', 'Option 2 - AWS download: ');
cy.get('#datasetDetailsTabsContainer > div > div:nth-child(4) > div.heading2.mb-8').should('have.text', 'Download Dataset');
cy.get('#datasetDetailsTabsContainer .left-column > div > div:nth-child(1) > span:nth-child(1)').should('have.text', 'Option 1 - Direct download: ');
cy.get('.aws-download-column > :nth-child(1) > .label4').should('have.text', 'Option 2 - AWS S3:');

// Check for download full dataset button
cy.get('.left-column .el-button').contains('Download Full Dataset').should('be.visible');
Expand All @@ -302,8 +302,8 @@ datasetIds.forEach(datasetId => {
})

// Check for help link
cy.get('.aws-download-column > :nth-child(1) > a').should('have.attr', 'href', 'https://docs.sparc.science/docs/accessing-public-datasets');
cy.get('.aws-download-column > :nth-child(3) > a').should('have.attr', 'href', 'https://aws.amazon.com/s3/pricing/');
cy.get('.aws-download-column > :nth-child(1) > a').should('have.attr', 'href', 'https://aws.amazon.com/s3/pricing/');
cy.get('.aws-download-column > :nth-child(3) > a').should('have.attr', 'href', 'https://docs.sparc.science/docs/accessing-public-datasets');

//Find the download file button
cy.contains('.el-table__row', 'dataset_description.xlsx').should('have.length', 1).as('datasetDescription');
Expand Down
Loading