From 3683ea725519598a2f0c16e5065adcc5c9b93489 Mon Sep 17 00:00:00 2001 From: rv0lt Date: Fri, 13 Dec 2024 13:56:10 +0100 Subject: [PATCH 1/7] new version & changelog --- CHANGELOG.rst | 16 ++++++++++++++++ dds_web/version.py | 2 +- tests/test_version.py | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 62c932f5c..0595f240b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,22 @@ Changelog ========== +.. _2.9.0: + +2.8.2 - 2024-12-13 +~~~~~~~~~~~~~~~~~~~~~~~ +- Bugs fixed: + - Change the error raised upon attempt to download data after a password reset. + - Fix the dds ls --tree command. +- New features: + - Update backend Dockerfile to pin a fixed version of mariadb-client. + - Add documentation to new client feature of 'Upload' or 'Download' added to end of delivery directory name. + - Modify the monitor usage command to send warning to the affected unit as well as Data Centre. +Logging: + - Removed exception for invalid token to simplify logging. + - Logging: Add which user name reset password. + - Filter out the MaintenanceModeException from the logs. + .. _2.8.1: 2.8.1 - 2024-10-23 diff --git a/dds_web/version.py b/dds_web/version.py index dcd4a7562..2f21ab781 100644 --- a/dds_web/version.py +++ b/dds_web/version.py @@ -1,3 +1,3 @@ # Do not do major version upgrade during 2024. # If mid or minor version reaches 9, continue with 10, 11 etc etc. -__version__ = "2.8.1" +__version__ = "2.9.0" diff --git a/tests/test_version.py b/tests/test_version.py index 2ef1533b8..dd0c9e26f 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -2,4 +2,4 @@ def test_version(): - assert version.__version__ == "2.8.1" + assert version.__version__ == "2.9.0" From f3dbc64ebb6b9537e78c06a470230619fdf82476 Mon Sep 17 00:00:00 2001 From: rv0lt Date: Fri, 13 Dec 2024 13:58:02 +0100 Subject: [PATCH 2/7] sprintlog --- SPRINTLOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SPRINTLOG.md b/SPRINTLOG.md index fc1d90ec1..ae4e30b5b 100644 --- a/SPRINTLOG.md +++ b/SPRINTLOG.md @@ -466,4 +466,5 @@ _Nothing merged during this sprint_ - 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)) -- Modify the monitor usage command to send warning to the affected unit as well as Data Centre([#1562](https://github.com/ScilifelabDataCentre/dds_web/pull/1562)) +- Modify the monitor usage command to send warning to the affected unit as well as Data Centre ([#1562](https://github.com/ScilifelabDataCentre/dds_web/pull/1562)) +- New version & changelog ([#1583](https://github.com/ScilifelabDataCentre/dds_web/pull/1583)) From cf9739b1c103834d9de22fd3e2d0cb7cd325212d Mon Sep 17 00:00:00 2001 From: rv0lt Date: Mon, 16 Dec 2024 10:02:02 +0100 Subject: [PATCH 3/7] feedback changes --- CHANGELOG.rst | 10 +++++----- SPRINTLOG.md | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0595f240b..356b3f464 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,16 +5,16 @@ Changelog 2.8.2 - 2024-12-13 ~~~~~~~~~~~~~~~~~~~~~~~ +- New features: + - Add documentation to new client feature of 'Upload' or 'Download' added to end of delivery directory name. + - Modify the monitor usage command to send warning to the affected unit as well as Data Centre. - Bugs fixed: - Change the error raised upon attempt to download data after a password reset. - Fix the dds ls --tree command. -- New features: - Update backend Dockerfile to pin a fixed version of mariadb-client. - - Add documentation to new client feature of 'Upload' or 'Download' added to end of delivery directory name. - - Modify the monitor usage command to send warning to the affected unit as well as Data Centre. -Logging: +- Logging: - Removed exception for invalid token to simplify logging. - - Logging: Add which user name reset password. + - Username logged when password is reset. - Filter out the MaintenanceModeException from the logs. .. _2.8.1: diff --git a/SPRINTLOG.md b/SPRINTLOG.md index ae4e30b5b..f35d3b041 100644 --- a/SPRINTLOG.md +++ b/SPRINTLOG.md @@ -467,4 +467,4 @@ _Nothing merged during this sprint_ - 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)) - Modify the monitor usage command to send warning to the affected unit as well as Data Centre ([#1562](https://github.com/ScilifelabDataCentre/dds_web/pull/1562)) -- New version & changelog ([#1583](https://github.com/ScilifelabDataCentre/dds_web/pull/1583)) +- New version: 2.9.0 ([#1583](https://github.com/ScilifelabDataCentre/dds_web/pull/1583)) From ed8a0ab38483915ad905739d6552a93e7ae41402 Mon Sep 17 00:00:00 2001 From: rv0lt Date: Mon, 16 Dec 2024 10:03:47 +0100 Subject: [PATCH 4/7] merge --- SPRINTLOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/SPRINTLOG.md b/SPRINTLOG.md index d497d0288..27a1b38cd 100644 --- a/SPRINTLOG.md +++ b/SPRINTLOG.md @@ -468,5 +468,4 @@ _Nothing merged during this sprint_ - 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)) - Modify the monitor usage command to send warning to the affected unit as well as Data Centre([#1562](https://github.com/ScilifelabDataCentre/dds_web/pull/1562)) - Run npm audit fix to solve node cve's ([#1577](https://github.com/ScilifelabDataCentre/dds_web/pull/1577) -- Modify the monitor usage command to send warning to the affected unit as well as Data Centre ([#1562](https://github.com/ScilifelabDataCentre/dds_web/pull/1562)) - New version: 2.9.0 ([#1583](https://github.com/ScilifelabDataCentre/dds_web/pull/1583)) From bb799e1b3fc36e6d5348ea2d126c65d0d274d1cf Mon Sep 17 00:00:00 2001 From: rv0lt Date: Mon, 16 Dec 2024 11:06:35 +0100 Subject: [PATCH 5/7] rewrote --- CHANGELOG.rst | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 356b3f464..98291d092 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,19 +3,20 @@ Changelog .. _2.9.0: -2.8.2 - 2024-12-13 +2.9.0 - 2024-12-16 ~~~~~~~~~~~~~~~~~~~~~~~ - New features: - - Add documentation to new client feature of 'Upload' or 'Download' added to end of delivery directory name. - - Modify the monitor usage command to send warning to the affected unit as well as Data Centre. + - Delivery directory names now include 'Upload' or 'Download' for clarity. + - Monitor usage now sends warnings to the affected unit and Data Centre when approaching the allocated quota. - Bugs fixed: - - Change the error raised upon attempt to download data after a password reset. - - Fix the dds ls --tree command. - - Update backend Dockerfile to pin a fixed version of mariadb-client. + - Improved error message for downloads after a password reset. + - Fixed the dds ls --tree command. + - Pinned mariadb-client version in backend Dockerfile for stability. + - Resolved Node.js vulnerabilities with npm audit fix. - Logging: - - Removed exception for invalid token to simplify logging. - - Username logged when password is reset. - - Filter out the MaintenanceModeException from the logs. + - Removed invalid token exceptions from logs. + - Logged usernames for password resets. + - Filtered out MaintenanceModeException from logs. .. _2.8.1: From 638b296f62fd70251a4de382443cfd4cee909511 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?= <35953392+i-oden@users.noreply.github.com> Date: Tue, 17 Dec 2024 08:27:51 +0100 Subject: [PATCH 6/7] Update CHANGELOG.rst --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 98291d092..05d9a5e5c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,7 +3,7 @@ Changelog .. _2.9.0: -2.9.0 - 2024-12-16 +2.9.0 - 2024-12-18 ~~~~~~~~~~~~~~~~~~~~~~~ - New features: - Delivery directory names now include 'Upload' or 'Download' for clarity. From 7e1e3b018d66e1f0bb779f13578bd210f6dfb3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?= <35953392+i-oden@users.noreply.github.com> Date: Tue, 17 Dec 2024 08:28:46 +0100 Subject: [PATCH 7/7] Update SPRINTLOG.md --- SPRINTLOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SPRINTLOG.md b/SPRINTLOG.md index 27a1b38cd..c0ab76c87 100644 --- a/SPRINTLOG.md +++ b/SPRINTLOG.md @@ -468,4 +468,7 @@ _Nothing merged during this sprint_ - 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)) - Modify the monitor usage command to send warning to the affected unit as well as Data Centre([#1562](https://github.com/ScilifelabDataCentre/dds_web/pull/1562)) - Run npm audit fix to solve node cve's ([#1577](https://github.com/ScilifelabDataCentre/dds_web/pull/1577) + +# 2024-12-16 - 2024-12-20 + - New version: 2.9.0 ([#1583](https://github.com/ScilifelabDataCentre/dds_web/pull/1583))