Skip to content

bug: Download Progress #80

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

Merged
cbolles merged 2 commits into from
May 15, 2024
Merged

bug: Download Progress #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e614b0
Only allow downloading when the request is complete
cbolles May 15, 2024
467b8b8
Fix formatting
cbolles May 15, 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
3 changes: 2 additions & 1 deletion packages/client/src/pages/datasets/DatasetDownloads.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ export const DatasetDownloads: React.FC = () => {
width: 200,
headerName: t('components.datasetDownload.entryDownload'),
renderCell: (params) =>
params.value && (
params.value &&
params.row.status == DownloadStatus.Ready && (
<IconButton href={params.value}>
<Download />
</IconButton>
Expand Down
9 changes: 6 additions & 3 deletions packages/client/src/pages/studies/StudyDownloads.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ export const StudyDownloads: React.FC = () => {
width: 200,
headerName: t('components.datasetDownload.entryDownload'),
renderCell: (params) =>
params.value && (
params.value &&
params.row.status == DownloadStatus.Ready && (
<IconButton href={params.value}>
<Download />
</IconButton>
Expand All @@ -68,7 +69,8 @@ export const StudyDownloads: React.FC = () => {
width: 200,
headerName: t('components.studyDownload.csv'),
renderCell: (params) =>
params.value && (
params.value &&
params.row.status == DownloadStatus.Ready && (
<IconButton href={params.value}>
<Download />
</IconButton>
Expand All @@ -79,7 +81,8 @@ export const StudyDownloads: React.FC = () => {
width: 200,
headerName: t('components.studyDownload.taggedEntries'),
renderCell: (params) =>
params.value && (
params.value &&
params.row.status == DownloadStatus.Ready && (
<IconButton href={params.value}>
<Download />
</IconButton>
Expand Down
5 changes: 1 addition & 4 deletions packages/server/src/download-request/services/study-download-request.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ export class StudyDownloadService {
request = (await this.downloadRequestModel.findById(request._id))!;

// Download the entries that were generated as part of this study
/*
await this.downloadService.startZipJob({
entryJSONLocation: request.entryJSONLocation!,
entryZIPLocation: request.entryZIPLocation!,
Expand All @@ -108,11 +107,9 @@ export class StudyDownloadService {
bucket: (await this.bucketFactory.getBucket(request.organization))!,
organization: request.organization
});
*/
// Download the tag data as a CSV
await this.generateCSV(request);
// Download the entries that were tagged in this study
/*
await this.downloadService.startZipJob({
entryJSONLocation: request.taggedEntriesJSONLocation!,
entryZIPLocation: request.taggedEntriesZipLocation!,
Expand All @@ -129,7 +126,7 @@ export class StudyDownloadService {
entries: await this.getLabeledEntries(request),
bucket: (await this.bucketFactory.getBucket(request.organization))!,
organization: request.organization
}); */
});

return request;
}
Expand Down