From 75cf1b3e922b1b2b224ba622a973827898d9fc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?= Date: Tue, 17 Dec 2024 09:10:13 +0100 Subject: [PATCH 1/7] changelog --- CHANGELOG.rst | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 62c932f5c..b5a87b0fb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,24 @@ Changelog ========== +.. _2.9.0: + +2.9.0 - 2024-12-18 +~~~~~~~~~~~~~~~~~~ + +- New features: + - 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: + - 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 invalid token exceptions from logs. + - Logged usernames for password resets. + - Filtered out MaintenanceModeException from logs. + .. _2.8.1: 2.8.1 - 2024-10-23 From 2c910e2f9089ef5590fac49849ffff35fbcf994d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?= Date: Tue, 17 Dec 2024 09:11:32 +0100 Subject: [PATCH 2/7] sprintlog --- SPRINTLOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SPRINTLOG.md b/SPRINTLOG.md index bbc4640ca..75562b52b 100644 --- a/SPRINTLOG.md +++ b/SPRINTLOG.md @@ -468,3 +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 ([#1584](https://github.com/ScilifelabDataCentre/dds_web/pull/1584)) From 1ba90a2fadb6b7e1897453a68a0fd884aa9b1012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?= Date: Tue, 17 Dec 2024 09:12:25 +0100 Subject: [PATCH 3/7] version --- dds_web/version.py | 2 +- tests/test_version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 2ebdff539708c46c8c75e1d27c3944c1d83814d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?= Date: Tue, 17 Dec 2024 09:33:29 +0100 Subject: [PATCH 4/7] runs on ubuntu 22.04 --- .github/workflows/docker-compose-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-compose-tests.yml b/.github/workflows/docker-compose-tests.yml index 3bc8b81b1..6dd39ffc6 100644 --- a/.github/workflows/docker-compose-tests.yml +++ b/.github/workflows/docker-compose-tests.yml @@ -15,7 +15,7 @@ jobs: concurrency: group: ${{ github.ref }}-pytest cancel-in-progress: true - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout From 64bdc6d36183f07eca6603cbe8dc77b1be2c69fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?= Date: Tue, 17 Dec 2024 09:38:45 +0100 Subject: [PATCH 5/7] try ubuntu-24.04 --- .github/workflows/docker-compose-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-compose-tests.yml b/.github/workflows/docker-compose-tests.yml index 6dd39ffc6..424538aaa 100644 --- a/.github/workflows/docker-compose-tests.yml +++ b/.github/workflows/docker-compose-tests.yml @@ -15,7 +15,7 @@ jobs: concurrency: group: ${{ github.ref }}-pytest cancel-in-progress: true - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout From b03635583a650b2b86ff2f0680889c4d2996911a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?= Date: Tue, 17 Dec 2024 09:43:37 +0100 Subject: [PATCH 6/7] change in npm --- Dockerfiles/backend.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/backend.Dockerfile b/Dockerfiles/backend.Dockerfile index 6b0d639b0..609d16536 100644 --- a/Dockerfiles/backend.Dockerfile +++ b/Dockerfiles/backend.Dockerfile @@ -65,7 +65,7 @@ USER $USERNAME FROM node:18 as nodebuilder COPY ./dds_web/static /build WORKDIR /build -RUN npm install -g npm@latest --quiet +RUN npm install -g npm@10.9.2 --quiet RUN npm install --quiet RUN npm run css From 9ea634b0152f065b595de243b150ccf41c7a50d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ina=20Od=C3=A9n=20=C3=96sterbo?= Date: Tue, 17 Dec 2024 09:45:05 +0100 Subject: [PATCH 7/7] change npm in nodebuilder --- Dockerfiles/nodebuilder.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfiles/nodebuilder.Dockerfile b/Dockerfiles/nodebuilder.Dockerfile index cd8b8e97f..831330789 100644 --- a/Dockerfiles/nodebuilder.Dockerfile +++ b/Dockerfiles/nodebuilder.Dockerfile @@ -1,6 +1,6 @@ FROM node:18 RUN mkdir /build WORKDIR /build -RUN npm install -g npm@latest --quiet +RUN npm install -g npm@10.9.2 --quiet RUN echo "npm install --quiet && npm run watch" > /runner.sh CMD ["sh", "/runner.sh"]