From 5d16a1c4456a083d214aca9c2fe3b9c97d851b90 Mon Sep 17 00:00:00 2001 From: Andrej Date: Thu, 13 Feb 2025 14:50:22 +0100 Subject: [PATCH 1/8] Fix notification destroy in user data deletion [SCI-11549] --- app/services/user_data_deletion.rb | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/app/services/user_data_deletion.rb b/app/services/user_data_deletion.rb index fef2dc995..f4270a45a 100644 --- a/app/services/user_data_deletion.rb +++ b/app/services/user_data_deletion.rb @@ -112,20 +112,6 @@ class UserDataDeletion end def self.destroy_notifications(user) - # Find all notifications where user is the only reference - # on the notification, and destroy all such notifications - # (user_notifications are destroyed when notification is - # destroyed). We try to do this efficiently (hence in_groups_of). - nids_all = user.notifications.pluck(:id) - nids_all.in_groups_of(1000, false) do |nids| - Notification - .where(id: nids) - .joins(:user_notifications) - .group('notifications.id') - .having('count(notification_id) <= 1') - .destroy_all - end - # Now, simply destroy all user notification relations left - user.user_notifications.destroy_all + user.notifications.in_batches(of: 1000).destroy_all end end From 22e5867932c3f703a8f6318ce70611c04a7d2150 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2025 10:04:24 +0100 Subject: [PATCH 2/8] Bump net-imap from 0.4.17 to 0.4.19 (#8223) Bumps [net-imap](https://github.com/ruby/net-imap) from 0.4.17 to 0.4.19. - [Release notes](https://github.com/ruby/net-imap/releases) - [Commits](https://github.com/ruby/net-imap/compare/v0.4.17...v0.4.19) --- updated-dependencies: - dependency-name: net-imap dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6964ec415..cd3d466de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -292,7 +292,7 @@ GEM activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) - date (3.3.4) + date (3.4.1) debug_inspector (1.1.0) deface (1.9.0) actionview (>= 5.2) @@ -454,7 +454,7 @@ GEM rails (>= 3.2.0) net-http (0.4.1) uri - net-imap (0.4.17) + net-imap (0.4.19) date net-protocol net-pop (0.1.2) @@ -728,7 +728,7 @@ GEM thor (1.3.1) tilt (2.4.0) timecop (0.9.6) - timeout (0.4.1) + timeout (0.4.3) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) From 5c7ad932b3c195034596db7259561ebaad08e55e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2025 10:28:41 +0100 Subject: [PATCH 3/8] Bump serialize-javascript from 6.0.1 to 6.0.2 (#8238) Bumps [serialize-javascript](https://github.com/yahoo/serialize-javascript) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/yahoo/serialize-javascript/releases) - [Commits](https://github.com/yahoo/serialize-javascript/compare/v6.0.1...v6.0.2) --- updated-dependencies: - dependency-name: serialize-javascript dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 78b8fd076..f793441d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7206,9 +7206,9 @@ semver@^7.6.3: integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== serialize-javascript@^6.0.0, serialize-javascript@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" - integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== + version "6.0.2" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" + integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== dependencies: randombytes "^2.1.0" @@ -7654,6 +7654,7 @@ tiny-emitter@^2.0.0, tiny-emitter@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== + tiny-invariant@^1.0.2, tiny-invariant@^1.0.6: version "1.3.1" resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642" @@ -7668,6 +7669,7 @@ tinycolor2@^1.4.1: version "1.6.0" resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.6.0.tgz#f98007460169b0263b97072c5ae92484ce02d09e" integrity sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw== + tinymce@^6.8.5: version "6.8.5" resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.8.5.tgz#aa9a711c4e0b59d506dd281bade857d35a7b3c59" From 67dc83d8cf40ccab4c20767a7ad0be6a8384e261 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2025 10:35:24 +0100 Subject: [PATCH 4/8] Bump elliptic from 6.6.0 to 6.6.1 (#8237) Bumps [elliptic](https://github.com/indutny/elliptic) from 6.6.0 to 6.6.1. - [Commits](https://github.com/indutny/elliptic/compare/v6.6.0...v6.6.1) --- updated-dependencies: - dependency-name: elliptic dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index f793441d1..098bee6d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3548,9 +3548,9 @@ element-resize-detector@^1.2.1: batch-processor "1.0.0" elliptic@^6.5.3, elliptic@^6.5.4: - version "6.6.0" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.0.tgz#5919ec723286c1edf28685aa89261d4761afa210" - integrity sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA== + version "6.6.1" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.6.1.tgz#3b8ffb02670bf69e382c7f65bf524c97c5405c06" + integrity sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g== dependencies: bn.js "^4.11.9" brorand "^1.1.0" From 6438b050fcc305a06c289f07f3dc7919371f4294 Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Fri, 14 Feb 2025 13:55:27 +0100 Subject: [PATCH 5/8] Include global constants in print protocol layout [SCI-11583] --- app/views/layouts/protocols/print.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/layouts/protocols/print.html.erb b/app/views/layouts/protocols/print.html.erb index e3a74b6c8..fe823208a 100644 --- a/app/views/layouts/protocols/print.html.erb +++ b/app/views/layouts/protocols/print.html.erb @@ -3,6 +3,8 @@ <%= t("protocols.print.title") %> + + <%= javascript_include_tag 'jquery_bundle' %> <%= javascript_include_tag 'application' %> <%= javascript_include_tag "handsontable.full" %> From e82e2e95e948beb3f9396a0a0aa0cf5d6c886b28 Mon Sep 17 00:00:00 2001 From: Andrej Date: Thu, 21 Nov 2024 17:06:41 +0100 Subject: [PATCH 6/8] Fix reloading of protocol table after protocol publish [SCI-11304] --- app/services/lists/base_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/lists/base_service.rb b/app/services/lists/base_service.rb index c3b844f90..2ac6ceb2a 100644 --- a/app/services/lists/base_service.rb +++ b/app/services/lists/base_service.rb @@ -29,7 +29,7 @@ module Lists end def paginate_records - @records = @records.page(@params[:page]).per(@params[:per_page]) if @params[:page].present? + @records = @records.page(@params[:page]).per(@params[:per_page]) end def sort_direction(order_params) From 8817b6f54420037313a3a414c363572e088b5429 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Feb 2025 17:29:24 +0100 Subject: [PATCH 7/8] Bump rack from 2.2.10 to 2.2.11 (#8239) Bumps [rack](https://github.com/rack/rack) from 2.2.10 to 2.2.11. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.10...v2.2.11) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cd3d466de..1627e9eac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -551,7 +551,7 @@ GEM nio4r (~> 2.0) raabro (1.4.0) racc (1.8.1) - rack (2.2.10) + rack (2.2.11) rack-attack (6.6.1) rack (>= 1.0, < 3) rack-cors (2.0.2) From a28e024cb3176c38d899fa31f488ac315276d659 Mon Sep 17 00:00:00 2001 From: Martin Artnik <85488244+artoscinote@users.noreply.github.com> Date: Tue, 18 Feb 2025 13:06:28 +0100 Subject: [PATCH 8/8] Bump version to 1.39.1.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index f1e40e814..f50159248 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.39.1.1 +1.39.1.2