Skip to content

Commit

Permalink
Merge branch 'dev' into HMS-2134-Change-quota-unit-to-TB
Browse files Browse the repository at this point in the history
  • Loading branch information
rv0lt authored Dec 12, 2024
2 parents 45f1113 + 3cf2437 commit 75da869
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions SPRINTLOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,7 @@ _Nothing merged during this sprint_

- Change the error raised upon attempt to download data after a password reset to an AuthenticationError to avoid getting an alert ([#1571](https://github.com/ScilifelabDataCentre/dds_web/pull/1571))
- Filter out the MaintenanceModeException from the logs ([#1573](https://github.com/ScilifelabDataCentre/dds_web/pull/1573))
- Bugfix: Quick and dirty change to prevent `dds ls --tree` from failing systematically ([#1575](https://github.com/ScilifelabDataCentre/dds_web/pull/1575)
- Bugfix: Quick and dirty change to prevent `dds ls --tree` from failing systematically ([#1575](https://github.com/ScilifelabDataCentre/dds_web/pull/1575))
- Update backend Dockerfile to pin a fixed version of mariadb-client ([#1581](https://github.com/ScilifelabDataCentre/dds_web/pull/1581))
- Update documentation regarding 'Upload' or 'Download' added to end of delivery directory name depending on command ([#1580](https://github.com/ScilifelabDataCentre/dds_web/pull/1580))
- Change quota input to TB ([#1575](https://github.com/ScilifelabDataCentre/dds_web/pull/1579))
- Update backend Dockerfile to pin a fixed version of mariadb-client ([#1581](https://github.com/ScilifelabDataCentre/dds_web/pull/1581)
6 changes: 3 additions & 3 deletions doc/technical-overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,8 @@ Personnel have the permissions to upload data.
When starting an upload, a directory (“staging directory”) is created by the executing command. The
default location of the staging directory is the current working directory, however the user can specify
an existing directory in which the staging directory should be placed. Independent of the location
(specified or default), the staging directory is named _DataDelivery*<timestamp>*<project_id>_,
where <timestamp> is the date and time when the upload was started, and <project_id> is the ID of
(specified or default), the staging directory is named _DataDelivery\_\<timestamp\>\_\<project_id\>\_upload_,
where \<timestamp\> is the date and time when the upload was started, and \<project_id\> is the ID of
the project the user is attempting to upload data to. If there is no data to upload, this directory is
deleted immediately. If not, the staging directory will contain three subdirectories:

Expand Down Expand Up @@ -533,7 +533,7 @@ When downloading data, the Researchers can either choose to download specific fi
folder(s), or the entire project contents.

As with the upload ([Uploading data](#uploading-data)), a staging directory is created when downloading the data. This
directory is placed by default in the current working directory, and is named DataDelivery*<timestamp>*<project_id>.
directory is placed by default in the current working directory, and is named _DataDelivery\_\<timestamp\>\_\<project_id\>\_download_.
However unlike the upload command, downloading allows the user to choose the name of the directory - specifying a
destination. The destination cannot be an existing directory[^22] - it must be a new directory. Since a new destination is required with every
download, downloading the same file(s) multiple times is possible and is only limited by the amount
Expand Down

0 comments on commit 75da869

Please sign in to comment.