From 99d751e4acb115c6f8c4bf9f97cfe07f16c65615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Bol=C3=ADvar?= <francisco.bolivar@nazaries.com>
Date: Thu, 17 Oct 2024 17:11:08 +0200
Subject: [PATCH 01/12] Fix CI

---
 .github/workflows/lint.yml            | 2 +-
 .github/workflows/test.yml            | 2 +-
 .github/workflows/test_census_sms.yml | 2 +-
 .github/workflows/test_stats.yml      | 2 +-
 .github/workflows/test_valid_auth.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 3608c94c9..a276d8c02 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -8,7 +8,7 @@ env:
 jobs:
   lint:
     name: Lint code
-    runs-on: ubuntu:22.04
+    runs-on: ubuntu-22.04
     env:
       DATABASE_USERNAME: postgres
       DATABASE_PASSWORD: postgres
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7a216af1a..b675e22ac 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ env:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu:22.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:11
diff --git a/.github/workflows/test_census_sms.yml b/.github/workflows/test_census_sms.yml
index 3156d4f79..f7a9a0e3e 100644
--- a/.github/workflows/test_census_sms.yml
+++ b/.github/workflows/test_census_sms.yml
@@ -8,7 +8,7 @@ env:
 jobs:
   test:
     name: Test Census SMS
-    runs-on: ubuntu:22-04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:11
diff --git a/.github/workflows/test_stats.yml b/.github/workflows/test_stats.yml
index fe33e7c72..761c75639 100644
--- a/.github/workflows/test_stats.yml
+++ b/.github/workflows/test_stats.yml
@@ -8,7 +8,7 @@ env:
 jobs:
   test:
     name: Test Stats
-    runs-on: ubuntu:22.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:11
diff --git a/.github/workflows/test_valid_auth.yml b/.github/workflows/test_valid_auth.yml
index b47187070..4b1137439 100644
--- a/.github/workflows/test_valid_auth.yml
+++ b/.github/workflows/test_valid_auth.yml
@@ -8,7 +8,7 @@ env:
 jobs:
   test:
     name: Test Valid Auth
-    runs-on: ubuntu:22-04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:11

From 426a2356802e156b4cef0a35242b56da85d24af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Bol=C3=ADvar?= <francisco.bolivar@nazaries.com>
Date: Thu, 17 Oct 2024 17:36:20 +0200
Subject: [PATCH 02/12] Fix overrides

---
 .../decidim/accountability/results/_scope_filters.html.erb | 4 ++--
 config/initializers/decidim.rb                             | 2 ++
 config/initializers/decidim_overrides.rb                   | 6 ------
 config/secrets.yml                                         | 2 ++
 spec/lib/overrides_spec.rb                                 | 7 +++----
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/views/decidim/accountability/results/_scope_filters.html.erb b/app/views/decidim/accountability/results/_scope_filters.html.erb
index 7c648c9d6..8a1002278 100644
--- a/app/views/decidim/accountability/results/_scope_filters.html.erb
+++ b/app/views/decidim/accountability/results/_scope_filters.html.erb
@@ -5,7 +5,7 @@
 
   <% if current_component.has_subscopes? && !hide_subscopes %>
     <div class="filter-container">
-      <button id="dropdown-trigger-accountability" data-component="dropdown" data-target="dropdown-menu-accountability" data-auto-close="true">
+      <button id="dropdown-trigger-accountability" data-component="dropdown" data-target="dropdown-menu-accountability" data-open-md="true">
         <% items.each do |item| %>
           <%= content_tag :span, class: "#{"is-active" if item[:active]}" do %>
             <span class="sr-only"><%= item[:sr_text] %></span>
@@ -18,7 +18,7 @@
       </button>
       <ul id="dropdown-menu-accountability" data-scope-filters>
         <% items.each do |item| %>
-          <li>
+          <li role="menuitem">
             <%= link_to item[:url], class: "filter#{" is-active" if item[:active]}" do %>
               <span class="sr-only"><%= item[:sr_text] %></span>
               <%= icon item[:icon] %>
diff --git a/config/initializers/decidim.rb b/config/initializers/decidim.rb
index 38d39eae7..852c15803 100644
--- a/config/initializers/decidim.rb
+++ b/config/initializers/decidim.rb
@@ -378,6 +378,8 @@
 
   # Additional optional configurations (see decidim-core/lib/decidim/core.rb)
   config.cache_key_separator = Rails.application.secrets.decidim[:cache_key_separator] if Rails.application.secrets.decidim[:cache_key_separator].present?
+  config.cache_expiry_time = Rails.application.secrets.decidim[:cache_expiry_time].to_i.minutes if Rails.application.secrets.decidim[:cache_expiry_time].present?
+  config.stats_cache_expiry_time = Rails.application.secrets.decidim[:stats_cache_expiry_time].to_i.minutes if Rails.application.secrets.decidim[:stats_cache_expiry_time].present?
   config.expire_session_after = Rails.application.secrets.decidim[:expire_session_after].to_i.minutes if Rails.application.secrets.decidim[:expire_session_after].present?
   config.enable_remember_me = Rails.application.secrets.decidim[:enable_remember_me].present? unless Rails.application.secrets.decidim[:enable_remember_me] == "auto"
   if Rails.application.secrets.decidim[:session_timeout_interval].present?
diff --git a/config/initializers/decidim_overrides.rb b/config/initializers/decidim_overrides.rb
index 2e9fe9463..3df4c8b2c 100644
--- a/config/initializers/decidim_overrides.rb
+++ b/config/initializers/decidim_overrides.rb
@@ -22,10 +22,4 @@
   Decidim::Forms::QuestionnaireUserAnswers.include(Decidim::Forms::QuestionnaireUserAnswersOverride)
   Decidim::Proposals::ApplicationHelper.include(Decidim::Proposals::ApplicationHelperOverride)
   Decidim::Assemblies::AssembliesController.include(Decidim::Assemblies::AssembliesControllerOverride)
-  # This last one will be removed once https://github.com/decidim/decidim/pull/13402 is used
-  Decidim::ViewModel.class_eval do
-    def cache_expiry_time
-      5.minutes
-    end
-  end
 end
diff --git a/config/secrets.yml b/config/secrets.yml
index d7136965c..7dd3d823a 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -33,6 +33,8 @@ decidim_default: &decidim_default
   default_csv_col_sep: <%= Decidim::Env.new("DECIDIM_DEFAULT_CSV_COL_SEP", ";").to_json %>
   consent_cookie_name: <%= Decidim::Env.new("DECIDIM_CONSENT_COOKIE_NAME", "decidim-consent").to_json %>
   cache_key_separator: <%= Decidim::Env.new("DECIDIM_CACHE_KEY_SEPARATOR", "/").to_json %>
+  cache_expiry_time: <%= Decidim::Env.new("DECIDIM_CACHE_EXPIRATION_TIME", "1440").to_i %>
+  stats_cache_expiry_time: <%= Decidim::Env.new("DECIDIM_STATS_CACHE_EXPIRATION_TIME", 10).to_i %>
   expire_session_after: <%= Decidim::Env.new("DECIDIM_EXPIRE_SESSION_AFTER", "30").to_i %>
   session_timeout_interval: <%= Decidim::Env.new("DECIDIM_SESSION_TIMEOUT_INTERVAL", "10").to_i %>
   enable_remember_me: <%= Decidim::Env.new("DECIDIM_ENABLE_REMEMBER_ME", "auto").default_or_present_if_exists.to_s %>
diff --git a/spec/lib/overrides_spec.rb b/spec/lib/overrides_spec.rb
index 17fc47958..cde5b056a 100644
--- a/spec/lib/overrides_spec.rb
+++ b/spec/lib/overrides_spec.rb
@@ -26,7 +26,6 @@
       "/app/cells/decidim/content_blocks/last_activity_cell.rb" => "22355fa93da7c8776e7e7f56a5b207f7",
       "/app/cells/decidim/activities_cell.rb" => "dd17416a8d1efe7f26b1e759613e4db4",
       "/app/cells/decidim/user_profile_cell.rb" => "71216a17c7eea8dd8ebc1ea3907efaef",
-      "/lib/decidim/view_model.rb" => "141f2ea7b4c8bb35bd3966882780c225",
       "/lib/decidim/search_resource_fields_mapper.rb" => "ff2cc476eb72c2942cf2e69ae21b84fa",
       "/app/views/layouts/decidim/header/_main.html.erb" => "a6496ec11e073062743a927ee3c8bd3c"
     }
@@ -82,7 +81,7 @@
       "/app/views/decidim/accountability/results/home.html.erb" => "4050a327e040350e247c9086fc432cde",
       "/app/views/decidim/accountability/results/index.html.erb" => "1b655348f4e689fb27b2892846faf586",
       "/app/views/decidim/accountability/results/_home_categories.html.erb" => "00721e6e14f5ad718a3d80ecd905999e",
-      "/app/views/decidim/accountability/results/_scope_filters.html.erb" => "457ac0cce5522504d0a33a245cd424d4",
+      "/app/views/decidim/accountability/results/_scope_filters.html.erb" => "a405bb47fe4f8f7b216165b5044c1462",
       "/app/views/decidim/accountability/results/_stats_box.html.erb" => "2ce34e1ee1a824dc4fbe36940c97f3e8",
       "/app/models/decidim/accountability/result.rb" => "e1c063ba7c39ca8996daa740c7ff6bc6",
       "/app/services/decidim/accountability/results_calculator.rb" => "4cc5ed480220f0bfe7561ad887e59576"
@@ -114,8 +113,8 @@
   {
     package: "decidim-proposals",
     files: {
-      "/app/helpers/decidim/proposals/application_helper.rb" => "317b0347528e697fa405a792bcfa3db8",
-      "/app/presenters/decidim/proposals/proposal_presenter.rb" => "72910541010305f25baf297f4a58497b"
+      "/app/helpers/decidim/proposals/application_helper.rb" => "c17dd875a166cd0cd3c09b0e596ebef5",
+      "/app/presenters/decidim/proposals/proposal_presenter.rb" => "bbc7cee02125c1f8cf909219e48af337"
     }
   },
   {

From 07470b8f0032bb60489395346d28f7cfba4fc878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Bol=C3=ADvar?= <francisco.bolivar@nazaries.com>
Date: Thu, 17 Oct 2024 17:43:42 +0200
Subject: [PATCH 03/12] Remove badge of unused module

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index e0f0df906..977a7018e 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,6 @@ Citizen Participation and Open Government Application.
 [![[CI] Lint](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/lint.yml/badge.svg)](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/lint.yml)
 [![[CI] Test](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test.yml/badge.svg)](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test.yml)
 [![[CI] Test Census SMS](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_census_sms.yml/badge.svg)](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_census_sms.yml)
-[![[CI] Test Ephemeral Participation](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_ephemeral_participation.yml/badge.svg)](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_ephemeral_participation.yml)
 [![[CI] Test Stats](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_stats.yml/badge.svg)](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_stats.yml)
 [![[CI] Test Valid Auth](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_valid_auth.yml/badge.svg)](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_valid_auth.yml)
 [![Code Climate](https://codeclimate.com/github/AjuntamentdeBarcelona/decidim-barcelona/badges/gpa.svg)](https://codeclimate.com/github/AjuntamentdeBarcelona/decidim-barcelona)

From 82b973b8b6cc99e3b79d82b902477a6de9101ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Bol=C3=ADvar?= <francisco.bolivar@nazaries.com>
Date: Fri, 18 Oct 2024 08:56:28 +0200
Subject: [PATCH 04/12] Upload screenshots

---
 .github/workflows/test.yml            | 7 +++++++
 .github/workflows/test_census_sms.yml | 7 +++++++
 .github/workflows/test_stats.yml      | 7 +++++++
 .github/workflows/test_valid_auth.yml | 7 +++++++
 4 files changed, 28 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b675e22ac..66c106dea 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -47,3 +47,10 @@ jobs:
           mkdir node_modules
           bundle exec rspec
         name: Run specs
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: screenshots
+          path: ./tmp/screenshots
+          if-no-files-found: ignore
+          overwrite: true
diff --git a/.github/workflows/test_census_sms.yml b/.github/workflows/test_census_sms.yml
index f7a9a0e3e..84332e458 100644
--- a/.github/workflows/test_census_sms.yml
+++ b/.github/workflows/test_census_sms.yml
@@ -47,3 +47,10 @@ jobs:
           mkdir node_modules
           bundle exec rspec decidim-census_sms
         name: Run specs
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: screenshots
+          path: ./tmp/screenshots
+          if-no-files-found: ignore
+          overwrite: true
diff --git a/.github/workflows/test_stats.yml b/.github/workflows/test_stats.yml
index 761c75639..e53d2e195 100644
--- a/.github/workflows/test_stats.yml
+++ b/.github/workflows/test_stats.yml
@@ -47,3 +47,10 @@ jobs:
           mkdir node_modules
           bundle exec rspec decidim-stats
         name: Run specs
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: screenshots
+          path: ./tmp/screenshots
+          if-no-files-found: ignore
+          overwrite: true
diff --git a/.github/workflows/test_valid_auth.yml b/.github/workflows/test_valid_auth.yml
index 4b1137439..e8c0a5e05 100644
--- a/.github/workflows/test_valid_auth.yml
+++ b/.github/workflows/test_valid_auth.yml
@@ -47,3 +47,10 @@ jobs:
           mkdir node_modules
           bundle exec rspec decidim-valid_auth
         name: Run specs
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: screenshots
+          path: ./tmp/screenshots
+          if-no-files-found: ignore
+          overwrite: true

From e96cbff47c226c257342fa627a3abfc3dc44f7e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Bol=C3=ADvar?= <francisco.bolivar@nazaries.com>
Date: Fri, 18 Oct 2024 12:48:26 +0200
Subject: [PATCH 05/12] Change Gemfile

---
 Gemfile      |   7 ++-
 Gemfile.lock | 134 +++++++++++++++++++++++++++------------------------
 2 files changed, 73 insertions(+), 68 deletions(-)

diff --git a/Gemfile b/Gemfile
index b518f8f55..1b3c558a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,14 +2,12 @@
 
 source "https://rubygems.org"
 
-DECIDIM_VERSION = "0.28.4"
+DECIDIM_VERSION = { github: "AjuntamentdeBarcelona/decidim", branch: "bcn/0.28-branch" }.freeze
 
 ruby RUBY_VERSION
 
-# gem "decidim", DECIDIM_VERSION
-gem "decidim", github: "ajuntamentdeBarcelona/decidim", branch: "bcn/0.28-branch"
+gem "decidim", DECIDIM_VERSION
 gem "decidim-initiatives", DECIDIM_VERSION
-gem "decidim-internal_evaluation", github: "AjuntamentdeBarcelona/decidim-internal-evaluation-module", branch: "release/0.28-stable"
 gem "decidim-sortitions", DECIDIM_VERSION
 gem "decidim-templates", DECIDIM_VERSION
 
@@ -20,6 +18,7 @@ gem "decidim-stats", path: "decidim-stats"
 gem "decidim-valid_auth", path: "decidim-valid_auth"
 
 gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome"
+gem "decidim-internal_evaluation", git: "https://github.com/AjuntamentdeBarcelona/decidim-internal-evaluation-module", branch: "release/0.28-stable"
 gem "decidim-kids", git: "https://github.com/AjuntamentdeBarcelona/decidim-module-kids"
 gem "decidim-navigation_maps", git: "https://github.com/Platoniq/decidim-module-navigation_maps"
 gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer"
diff --git a/Gemfile.lock b/Gemfile.lock
index 0136fecf8..e1f3dd8dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,5 +1,5 @@
 GIT
-  remote: https://github.com/AjuntamentdeBarcelona/decidim-internal-evaluation-module.git
+  remote: https://github.com/AjuntamentdeBarcelona/decidim-internal-evaluation-module
   revision: cf5eb7f00f957881ade8360a69655e92d95ceff0
   branch: release/0.28-stable
   specs:
@@ -20,15 +20,7 @@ GIT
       deface (>= 1.5)
 
 GIT
-  remote: https://github.com/Platoniq/decidim-module-navigation_maps
-  revision: 7fd50e1368bae4c7955c0ba8ec5ee395273a5329
-  specs:
-    decidim-navigation_maps (1.5.0)
-      decidim-admin (>= 0.28, < 0.29)
-      decidim-core (>= 0.28, < 0.29)
-
-GIT
-  remote: https://github.com/ajuntamentdeBarcelona/decidim.git
+  remote: https://github.com/AjuntamentdeBarcelona/decidim.git
   revision: 9c78c1c36bb6c44a855c02acd6f58c70345853c4
   branch: bcn/0.28-branch
   specs:
@@ -131,12 +123,51 @@ GIT
     decidim-debates (0.28.4)
       decidim-comments (= 0.28.4)
       decidim-core (= 0.28.4)
+    decidim-dev (0.28.4)
+      bullet (~> 7.0)
+      byebug (~> 11.0)
+      capybara (~> 3.39)
+      decidim (= 0.28.4)
+      erb_lint (~> 0.4.0)
+      factory_bot_rails (~> 6.2)
+      faker (~> 3.2)
+      i18n-tasks (~> 1.0)
+      nokogiri (~> 1.14, >= 1.14.3)
+      parallel_tests (~> 4.2)
+      puma (~> 6.2, >= 6.3.1)
+      rails-controller-testing (~> 1.0)
+      rspec (~> 3.12)
+      rspec-cells (~> 0.3.7)
+      rspec-html-matchers (~> 0.10)
+      rspec-rails (~> 6.0)
+      rspec-retry (~> 0.6.2)
+      rspec_junit_formatter (~> 0.6.0)
+      rubocop (~> 1.50.0)
+      rubocop-faker (~> 1.1)
+      rubocop-rails (~> 2.19)
+      rubocop-rspec (~> 2.20)
+      selenium-webdriver (~> 4.9)
+      simplecov (~> 0.22.0)
+      simplecov-cobertura (~> 2.1.0)
+      spring (~> 2.0)
+      spring-watcher-listen (~> 2.0)
+      w3c_rspec_validators (~> 0.3.0)
+      webmock (~> 3.18)
+      wisper-rspec (~> 1.0)
     decidim-forms (0.28.4)
       decidim-core (= 0.28.4)
       wicked_pdf (~> 2.1)
       wkhtmltopdf-binary (~> 0.12)
     decidim-generators (0.28.4)
       decidim-core (= 0.28.4)
+    decidim-initiatives (0.28.4)
+      decidim-admin (= 0.28.4)
+      decidim-comments (= 0.28.4)
+      decidim-core (= 0.28.4)
+      decidim-verifications (= 0.28.4)
+      hexapdf (~> 0.32.0)
+      wicked_pdf (~> 2.1)
+      wkhtmltopdf-binary (~> 0.12)
     decidim-meetings (0.28.4)
       decidim-core (= 0.28.4)
       decidim-forms (= 0.28.4)
@@ -150,6 +181,11 @@ GIT
       decidim-core (= 0.28.4)
       doc2text (~> 0.4.6)
       redcarpet (~> 3.5, >= 3.5.1)
+    decidim-sortitions (0.28.4)
+      decidim-admin (= 0.28.4)
+      decidim-comments (= 0.28.4)
+      decidim-core (= 0.28.4)
+      decidim-proposals (= 0.28.4)
     decidim-surveys (0.28.4)
       decidim-core (= 0.28.4)
       decidim-forms (= 0.28.4)
@@ -159,9 +195,21 @@ GIT
       devise (~> 4.7)
       devise-i18n (~> 1.2)
       devise_invitable (~> 2.0, >= 2.0.9)
+    decidim-templates (0.28.4)
+      decidim-core (= 0.28.4)
+      decidim-forms (= 0.28.4)
+      decidim-proposals (= 0.28.4)
     decidim-verifications (0.28.4)
       decidim-core (= 0.28.4)
 
+GIT
+  remote: https://github.com/Platoniq/decidim-module-navigation_maps
+  revision: 7fd50e1368bae4c7955c0ba8ec5ee395273a5329
+  specs:
+    decidim-navigation_maps (1.5.0)
+      decidim-admin (>= 0.28, < 0.29)
+      decidim-core (>= 0.28, < 0.29)
+
 GIT
   remote: https://github.com/decidim-ice/decidim-module-decidim_awesome
   revision: 84374037d34a3ac80dc18406834169c65869f11b
@@ -379,54 +427,6 @@ GEM
     date_validator (0.12.0)
       activemodel (>= 3)
       activesupport (>= 3)
-    decidim-dev (0.28.4)
-      bullet (~> 7.0)
-      byebug (~> 11.0)
-      capybara (~> 3.39)
-      decidim (= 0.28.4)
-      erb_lint (~> 0.4.0)
-      factory_bot_rails (~> 6.2)
-      faker (~> 3.2)
-      i18n-tasks (~> 1.0)
-      nokogiri (~> 1.14, >= 1.14.3)
-      parallel_tests (~> 4.2)
-      puma (~> 6.2, >= 6.3.1)
-      rails-controller-testing (~> 1.0)
-      rspec (~> 3.12)
-      rspec-cells (~> 0.3.7)
-      rspec-html-matchers (~> 0.10)
-      rspec-rails (~> 6.0)
-      rspec-retry (~> 0.6.2)
-      rspec_junit_formatter (~> 0.6.0)
-      rubocop (~> 1.50.0)
-      rubocop-faker (~> 1.1)
-      rubocop-rails (~> 2.19)
-      rubocop-rspec (~> 2.20)
-      selenium-webdriver (~> 4.9)
-      simplecov (~> 0.22.0)
-      simplecov-cobertura (~> 2.1.0)
-      spring (~> 2.0)
-      spring-watcher-listen (~> 2.0)
-      w3c_rspec_validators (~> 0.3.0)
-      webmock (~> 3.18)
-      wisper-rspec (~> 1.0)
-    decidim-initiatives (0.28.4)
-      decidim-admin (= 0.28.4)
-      decidim-comments (= 0.28.4)
-      decidim-core (= 0.28.4)
-      decidim-verifications (= 0.28.4)
-      hexapdf (~> 0.32.0)
-      wicked_pdf (~> 2.1)
-      wkhtmltopdf-binary (~> 0.12)
-    decidim-sortitions (0.28.4)
-      decidim-admin (= 0.28.4)
-      decidim-comments (= 0.28.4)
-      decidim-core (= 0.28.4)
-      decidim-proposals (= 0.28.4)
-    decidim-templates (0.28.4)
-      decidim-core (= 0.28.4)
-      decidim-forms (= 0.28.4)
-      decidim-proposals (= 0.28.4)
     declarative-builder (0.1.0)
       declarative-option (< 0.2.0)
     declarative-option (0.1.0)
@@ -843,6 +843,8 @@ GEM
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
+    rubocop-factory_bot (2.26.0)
+      rubocop (~> 1.41)
     rubocop-faker (1.1.0)
       faker (>= 2.12.0)
       rubocop (>= 0.82.0)
@@ -851,9 +853,13 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.20.0)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.31.0)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.29.0)
+      rubocop (~> 1.40)
     ruby-progressbar (1.13.0)
     ruby-vips (2.2.2)
       ffi (~> 1.12)
@@ -994,15 +1000,15 @@ DEPENDENCIES
   decidim-census_sms!
   decidim-dataviz!
   decidim-decidim_awesome!
-  decidim-dev (= 0.28.4)
+  decidim-dev!
   decidim-ephemeral_participation!
-  decidim-initiatives (= 0.28.4)
+  decidim-initiatives!
   decidim-internal_evaluation!
   decidim-kids!
   decidim-navigation_maps!
-  decidim-sortitions (= 0.28.4)
+  decidim-sortitions!
   decidim-stats!
-  decidim-templates (= 0.28.4)
+  decidim-templates!
   decidim-term_customizer!
   decidim-valid_auth!
   dotenv-rails

From ab2dc16a40d2c392d3e03b26b483b119afeb4455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Bol=C3=ADvar?= <francisco.bolivar@nazaries.com>
Date: Mon, 21 Oct 2024 13:34:51 +0200
Subject: [PATCH 06/12] Fix rubocop versions

---
 Gemfile.lock | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e1f3dd8dd..8fec996b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -839,27 +839,24 @@ GEM
       rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
-      parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
+    rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.26.0)
+    rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
     rubocop-faker (1.1.0)
       faker (>= 2.12.0)
       rubocop (>= 0.82.0)
-    rubocop-rails (2.25.1)
+    rubocop-rails (2.24.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.31.0)
+    rubocop-rspec (2.27.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.29.0)
-      rubocop (~> 1.40)
     ruby-progressbar (1.13.0)
     ruby-vips (2.2.2)
       ffi (~> 1.12)

From 6d5c2d8f1dee51d40933a8c18c2863b47caf5616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Bol=C3=ADvar?= <francisco.bolivar@nazaries.com>
Date: Mon, 21 Oct 2024 14:14:32 +0200
Subject: [PATCH 07/12] Bump decidim-decidim_awesome

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8fec996b0..e499e6925 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -212,7 +212,7 @@ GIT
 
 GIT
   remote: https://github.com/decidim-ice/decidim-module-decidim_awesome
-  revision: 84374037d34a3ac80dc18406834169c65869f11b
+  revision: a8d21e4e178f1965a6e3e73cf0c781cb78661e32
   specs:
     decidim-decidim_awesome (0.11.2)
       decidim-admin (>= 0.28.0, < 0.29)

From d6d135c976f72e3640e76f3f27e9095fd97c33ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Bol=C3=ADvar?= <francisco.bolivar@nazaries.com>
Date: Mon, 21 Oct 2024 14:21:34 +0200
Subject: [PATCH 08/12] Change decidim branch

---
 Gemfile      |  2 +-
 Gemfile.lock | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1b3c558a4..49d7cc27a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-DECIDIM_VERSION = { github: "AjuntamentdeBarcelona/decidim", branch: "bcn/0.28-branch" }.freeze
+DECIDIM_VERSION = { git: "https://github.com/AjuntamentdeBarcelona/decidim", branch: "release/0.28-stable-bcn" }.freeze
 
 ruby RUBY_VERSION
 
diff --git a/Gemfile.lock b/Gemfile.lock
index e499e6925..99994234d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,28 +1,7 @@
 GIT
-  remote: https://github.com/AjuntamentdeBarcelona/decidim-internal-evaluation-module
-  revision: cf5eb7f00f957881ade8360a69655e92d95ceff0
-  branch: release/0.28-stable
-  specs:
-    decidim-internal_evaluation (0.0.1)
-      decidim-core (~> 0.28.0)
-      decidim-proposals (~> 0.28.0)
-      decidim-templates (~> 0.28.0)
-      deface (~> 1.9)
-
-GIT
-  remote: https://github.com/AjuntamentdeBarcelona/decidim-module-kids
-  revision: df16cf4de13c306348761d850d19815c8221874e
-  specs:
-    decidim-kids (0.2.0)
-      decidim-core (>= 0.28, < 0.29)
-      decidim-system (>= 0.28, < 0.29)
-      decidim-verifications (>= 0.28, < 0.29)
-      deface (>= 1.5)
-
-GIT
-  remote: https://github.com/AjuntamentdeBarcelona/decidim.git
+  remote: https://github.com/AjuntamentdeBarcelona/decidim
   revision: 9c78c1c36bb6c44a855c02acd6f58c70345853c4
-  branch: bcn/0.28-branch
+  branch: release/0.28-stable-bcn
   specs:
     decidim (0.28.4)
       decidim-accountability (= 0.28.4)
@@ -202,6 +181,27 @@ GIT
     decidim-verifications (0.28.4)
       decidim-core (= 0.28.4)
 
+GIT
+  remote: https://github.com/AjuntamentdeBarcelona/decidim-internal-evaluation-module
+  revision: cf5eb7f00f957881ade8360a69655e92d95ceff0
+  branch: release/0.28-stable
+  specs:
+    decidim-internal_evaluation (0.0.1)
+      decidim-core (~> 0.28.0)
+      decidim-proposals (~> 0.28.0)
+      decidim-templates (~> 0.28.0)
+      deface (~> 1.9)
+
+GIT
+  remote: https://github.com/AjuntamentdeBarcelona/decidim-module-kids
+  revision: df16cf4de13c306348761d850d19815c8221874e
+  specs:
+    decidim-kids (0.2.0)
+      decidim-core (>= 0.28, < 0.29)
+      decidim-system (>= 0.28, < 0.29)
+      decidim-verifications (>= 0.28, < 0.29)
+      deface (>= 1.5)
+
 GIT
   remote: https://github.com/Platoniq/decidim-module-navigation_maps
   revision: 7fd50e1368bae4c7955c0ba8ec5ee395273a5329

From 1895186b93c4335933dc911d50a341b976d09331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Bol=C3=ADvar?= <francisco.bolivar@nazaries.com>
Date: Tue, 22 Oct 2024 11:13:25 +0200
Subject: [PATCH 09/12] Bump decidim version

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 99994234d..33667d6e6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/AjuntamentdeBarcelona/decidim
-  revision: 9c78c1c36bb6c44a855c02acd6f58c70345853c4
+  revision: 6e50c98a52907d8e830301d8e2a02c27ec5246c6
   branch: release/0.28-stable-bcn
   specs:
     decidim (0.28.4)

From 9fde560d398f60eb96899e0e76c2c3fc71c58449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Bol=C3=ADvar?= <francisco.bolivar@nazaries.com>
Date: Tue, 22 Oct 2024 12:16:29 +0200
Subject: [PATCH 10/12] Fix tests related to valid_auth module

---
 .../decidim/layout_helper_override.rb         | 25 +++++++++++++++++++
 config/initializers/decidim_overrides.rb      |  1 +
 spec/lib/overrides_spec.rb                    |  1 +
 3 files changed, 27 insertions(+)
 create mode 100644 app/helpers/concerns/decidim/layout_helper_override.rb

diff --git a/app/helpers/concerns/decidim/layout_helper_override.rb b/app/helpers/concerns/decidim/layout_helper_override.rb
new file mode 100644
index 000000000..bba1c53c4
--- /dev/null
+++ b/app/helpers/concerns/decidim/layout_helper_override.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module LayoutHelperOverride
+    extend ActiveSupport::Concern
+
+    included do
+      # Include NoMethodError as an exception to handle cases where the URL is not available.
+      def current_url(params = request.parameters)
+        current_url_exceptions = [ActionController::UrlGenerationError, NoMethodError]
+        return url_for(params) if respond_to?(:current_participatory_space) || respond_to?(:current_component)
+
+        each_decidim_engine do |helpers|
+          return helpers.url_for(params)
+        rescue *current_url_exceptions
+          # Continue to next engine in case the URL is not available.
+        end
+
+        main_app.url_for(params)
+      rescue *current_url_exceptions
+        "#{request.base_url}#{"?#{params.to_query}" unless params.empty?}"
+      end
+    end
+  end
+end
diff --git a/config/initializers/decidim_overrides.rb b/config/initializers/decidim_overrides.rb
index 3df4c8b2c..eed90336f 100644
--- a/config/initializers/decidim_overrides.rb
+++ b/config/initializers/decidim_overrides.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 Rails.application.config.to_prepare do
+  Decidim::LayoutHelper.include(Decidim::LayoutHelperOverride)
   Decidim::PaginateHelper.include(Decidim::PaginateHelperOverride)
   Decidim::Initiatives::Admin::Permissions.prepend(Decidim::Initiatives::Admin::PermissionsOverride)
   Decidim::SearchResourceFieldsMapper.prepend(Decidim::Overrides::SearchResourceFieldsMapper)
diff --git a/spec/lib/overrides_spec.rb b/spec/lib/overrides_spec.rb
index cde5b056a..92d079277 100644
--- a/spec/lib/overrides_spec.rb
+++ b/spec/lib/overrides_spec.rb
@@ -9,6 +9,7 @@
   {
     package: "decidim-core",
     files: {
+      "/app/helpers/decidim/layout_helper.rb" => "68cf3228de374d3b0b5a299394ed8421",
       "/app/helpers/decidim/paginate_helper.rb" => "6fd69359386319d678c7a17cf64de4d9",
       "/app/controllers/decidim/application_controller.rb" => "e86fe37834b061828536f9417fe56cd1", # ephemeral participation overrides
       "/app/controllers/concerns/decidim/paginable.rb" => "a42381a0883c92df189ac61cebea3047", # update per_page method in assemblies_controller_override.rb

From 0795d8063ce7b5de2beb4332f412c3027aa7afd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Bol=C3=ADvar?= <francisco.bolivar@nazaries.com>
Date: Tue, 22 Oct 2024 12:18:18 +0200
Subject: [PATCH 11/12] Ignore file for codeclimate

---
 .codeclimate.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 65826a4e1..1781353b6 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -63,3 +63,4 @@ exclude_paths:
 - "decidim-ephemeral_participation/app/permissions/decidim/ephemeral_participation/ephemeral_participation_permissions.rb"
 - "app/services/decidim_legacy_routes.rb"
 - "app/helpers/concerns/decidim/paginate_helper_override.rb"
+- "app/helpers/concerns/decidim/layout_helper_override.rb"

From fa0e5e8d94774777e37699d88ef55405a35c1de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francisco=20Bol=C3=ADvar?= <francisco.bolivar@nazaries.com>
Date: Tue, 22 Oct 2024 12:59:22 +0200
Subject: [PATCH 12/12] Disable valid_auth module

---
 .codeclimate.yml                              |  1 -
 .github/workflows/test_valid_auth.yml         | 56 -------------------
 Gemfile                                       |  1 -
 Gemfile.lock                                  |  7 ---
 README.md                                     |  1 -
 .../decidim/layout_helper_override.rb         | 25 ---------
 config/initializers/decidim_overrides.rb      |  1 -
 spec/lib/overrides_spec.rb                    |  1 -
 8 files changed, 93 deletions(-)
 delete mode 100644 .github/workflows/test_valid_auth.yml
 delete mode 100644 app/helpers/concerns/decidim/layout_helper_override.rb

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 1781353b6..65826a4e1 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -63,4 +63,3 @@ exclude_paths:
 - "decidim-ephemeral_participation/app/permissions/decidim/ephemeral_participation/ephemeral_participation_permissions.rb"
 - "app/services/decidim_legacy_routes.rb"
 - "app/helpers/concerns/decidim/paginate_helper_override.rb"
-- "app/helpers/concerns/decidim/layout_helper_override.rb"
diff --git a/.github/workflows/test_valid_auth.yml b/.github/workflows/test_valid_auth.yml
deleted file mode 100644
index e8c0a5e05..000000000
--- a/.github/workflows/test_valid_auth.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: Test Valid Auth
-on: [push]
-
-env:
-  RUBY_VERSION: 3.1.1
-  NODE_VERSION: 18.17.1
-
-jobs:
-  test:
-    name: Test Valid Auth
-    runs-on: ubuntu-22.04
-    services:
-      postgres:
-        image: postgres:11
-        ports: ["5432:5432"]
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        env:
-          POSTGRES_PASSWORD: postgres
-      redis:
-        image: redis:3.2-alpine
-        ports: ["6379:6379"]
-    env:
-      DATABASE_USERNAME: postgres
-      DATABASE_PASSWORD: postgres
-      DATABASE_HOST: localhost
-      RAILS_ENV: test
-    steps:
-      - uses: actions/checkout@v2.0.0
-        with:
-          fetch-depth: 1
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ env.RUBY_VERSION }}
-          bundler-cache: true
-      - uses: nanasess/setup-chromedriver@v2
-      - run: bundle exec rake db:test:prepare
-        name: Setup database
-      - name: Precompile assets
-        run: |
-          npm install
-          bundle exec rake assets:precompile
-      - run: |
-          mkdir node_modules
-          bundle exec rspec decidim-valid_auth
-        name: Run specs
-      - uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: screenshots
-          path: ./tmp/screenshots
-          if-no-files-found: ignore
-          overwrite: true
diff --git a/Gemfile b/Gemfile
index 49d7cc27a..c23cc5a58 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,6 @@ gem "decidim-census_sms", path: "decidim-census_sms"
 gem "decidim-dataviz", path: "decidim-dataviz"
 gem "decidim-ephemeral_participation", path: "decidim-ephemeral_participation" # Installed but not used anymore
 gem "decidim-stats", path: "decidim-stats"
-gem "decidim-valid_auth", path: "decidim-valid_auth"
 
 gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome"
 gem "decidim-internal_evaluation", git: "https://github.com/AjuntamentdeBarcelona/decidim-internal-evaluation-module", branch: "release/0.28-stable"
diff --git a/Gemfile.lock b/Gemfile.lock
index 33667d6e6..d2d6bb368 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -254,12 +254,6 @@ PATH
       decidim-core (~> 0.28.0)
       decidim-proposals (~> 0.28.0)
 
-PATH
-  remote: decidim-valid_auth
-  specs:
-    decidim-valid_auth (0.0.3)
-      decidim-verifications (~> 0.28.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -1007,7 +1001,6 @@ DEPENDENCIES
   decidim-stats!
   decidim-templates!
   decidim-term_customizer!
-  decidim-valid_auth!
   dotenv-rails
   faker
   foreman
diff --git a/README.md b/README.md
index 977a7018e..f7f1ce826 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,6 @@ Citizen Participation and Open Government Application.
 [![[CI] Test](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test.yml/badge.svg)](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test.yml)
 [![[CI] Test Census SMS](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_census_sms.yml/badge.svg)](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_census_sms.yml)
 [![[CI] Test Stats](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_stats.yml/badge.svg)](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_stats.yml)
-[![[CI] Test Valid Auth](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_valid_auth.yml/badge.svg)](https://github.com/AjuntamentdeBarcelona/decidim-barcelona/actions/workflows/test_valid_auth.yml)
 [![Code Climate](https://codeclimate.com/github/AjuntamentdeBarcelona/decidim-barcelona/badges/gpa.svg)](https://codeclimate.com/github/AjuntamentdeBarcelona/decidim-barcelona)
 
 This is the opensource code repository for "decidim-barcelona", based on [Decidim](https://github.com/AjuntamentdeBarcelona/decidim).
diff --git a/app/helpers/concerns/decidim/layout_helper_override.rb b/app/helpers/concerns/decidim/layout_helper_override.rb
deleted file mode 100644
index bba1c53c4..000000000
--- a/app/helpers/concerns/decidim/layout_helper_override.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module LayoutHelperOverride
-    extend ActiveSupport::Concern
-
-    included do
-      # Include NoMethodError as an exception to handle cases where the URL is not available.
-      def current_url(params = request.parameters)
-        current_url_exceptions = [ActionController::UrlGenerationError, NoMethodError]
-        return url_for(params) if respond_to?(:current_participatory_space) || respond_to?(:current_component)
-
-        each_decidim_engine do |helpers|
-          return helpers.url_for(params)
-        rescue *current_url_exceptions
-          # Continue to next engine in case the URL is not available.
-        end
-
-        main_app.url_for(params)
-      rescue *current_url_exceptions
-        "#{request.base_url}#{"?#{params.to_query}" unless params.empty?}"
-      end
-    end
-  end
-end
diff --git a/config/initializers/decidim_overrides.rb b/config/initializers/decidim_overrides.rb
index eed90336f..3df4c8b2c 100644
--- a/config/initializers/decidim_overrides.rb
+++ b/config/initializers/decidim_overrides.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 Rails.application.config.to_prepare do
-  Decidim::LayoutHelper.include(Decidim::LayoutHelperOverride)
   Decidim::PaginateHelper.include(Decidim::PaginateHelperOverride)
   Decidim::Initiatives::Admin::Permissions.prepend(Decidim::Initiatives::Admin::PermissionsOverride)
   Decidim::SearchResourceFieldsMapper.prepend(Decidim::Overrides::SearchResourceFieldsMapper)
diff --git a/spec/lib/overrides_spec.rb b/spec/lib/overrides_spec.rb
index 92d079277..cde5b056a 100644
--- a/spec/lib/overrides_spec.rb
+++ b/spec/lib/overrides_spec.rb
@@ -9,7 +9,6 @@
   {
     package: "decidim-core",
     files: {
-      "/app/helpers/decidim/layout_helper.rb" => "68cf3228de374d3b0b5a299394ed8421",
       "/app/helpers/decidim/paginate_helper.rb" => "6fd69359386319d678c7a17cf64de4d9",
       "/app/controllers/decidim/application_controller.rb" => "e86fe37834b061828536f9417fe56cd1", # ephemeral participation overrides
       "/app/controllers/concerns/decidim/paginable.rb" => "a42381a0883c92df189ac61cebea3047", # update per_page method in assemblies_controller_override.rb