decidim-decidim_awesome 0.10.2 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08bc00aacee27422d2ad41cc59de7b1f6156cb56efa542cba8ca62ccc8e60bc1'
-  data.tar.gz: d5ecdc79b637343ee9333c43b723108b27450ea8218e6f499c6a9eb4c3edb474
+  metadata.gz: 2cf1da76fd4803091a1a436c61708acfffe4ce1766227e0dcdef5a03d43adb00
+  data.tar.gz: f6dbf35fc450c203eea9db332372c26432fb171d9a057fbdc44bd1725d319963
 SHA512:
-  metadata.gz: 82eac50d751b3e1c36fab86709e7fd67656d99f218dfd25e5738f9c5f1480459f3ef5b5e397458b3eba5e7aac626aec23ba2e42d1e297907de95fdadb4427d5e
-  data.tar.gz: 28c557694c26c9a82a282e368181bd5fe9e07403c33c91afcf6e42460230d5e5f7b46dd9d4cc903d015f91554fa23a50cc535276eee8c12dd716d11e56dbf1be
+  metadata.gz: '01794da0b71c3719eab36c0c7a7107bd4873fa08bc78d78d61723cc6b238ad68eaed5bd281729c652e50c1afa0acdc0af2a47cbd1f2a0dea4fa7d40856dd5f5e'
+  data.tar.gz: 519112bb3fd8422b23c2fb36330e80ee18a2b5d3dc08f2c27bddf5c4e2be53e619cfc056a101fe8c37e7a903a160c4e57c0d9023c8919457d9cceaa94cfa1559

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 CHANGELOG
 =========
 
+v0.10.3
+------
+
+Compatibility:
+  - Decidim v0.27.4
+
+Features:
+  - Added Private Custom Fields feature
+  - Added GraphQL types for weighted voting in the API
+  - Added GraphQL types for custom fields in the API
+  - Adds parsed information about custom fields in the Proposals export
+  - Adds parsed information bout private custom fields when admins exports private data
+  - Adds a maintenance menu with tools to remove old private 
+  - SQL vulnerability fix for admin accountability
+
 v0.10.2
 ------
 
@@ -56,7 +71,7 @@ Compatibility:
 
 Features:
   - Fixes for the menu hacker
- 
+
 v0.9.1
 ------
 

data/README.md

@@ -121,12 +121,77 @@ Technically, the content is stored in the database as an XML document compatible
 ![Custom fields screenshot](examples/custom-fields-2.png)
 ![Custom fields screenshot](examples/custom-fields-1.gif)
 
+Note that the custom fields are build using the jQuery library [formBuilder](https://formbuilder.online). This package is included in Decidim Awesome but the i18n translations are not. By default they are dynamically downloaded from the CDN https://cdn.jsdelivr.net/npm/formbuilder-languages@1.1.0/.
+If you wish to provide an alternative place for those files, you can configure the variable `form_builder_langs_location` in an initializer:
+
+```ruby
+# config/initializers/awesome_defaults.rb
+
+# A URL where to obtain the translations for the FormBuilder component
+# you can a custom place if you are worried about the CDN geolocation
+# Download them from https://github.com/kevinchappell/formBuilder-languages
+
+# For instance, copy them to your /public/fb_locales/ directory and set the path here:
+Decidim::DecidimAwesome.configure do |config|
+  config.form_builder_langs_location = "/fb_locales/"
+end
+```
+
+##### 12.1. GraphQL types for custom fields
+
+Custom fields are displayed in the GaphQL API according to their definition in a formatted array of objects in the attribute `bodyFields`.
+
+A query to extract this information could look like this (see that the original `body` is also available):
+
+```graphql
+{
+  component(id: 999) {
+    ... on Proposals {
+      proposals {
+        edges {
+          node {
+            id
+            bodyFields {
+              locales
+              translation(locale: "en")
+              translations {
+                locale
+                fields
+                machineTranslated
+              }
+            }
+            body {
+              locales
+              translations {
+                locale
+                text
+                machineTranslated
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+```
+
+You can then use this custom type in your GraphQL queries and mutations to handle the custom fields in proposals.
+
+
+##### 12.2. Private Custom fields
+
+Similar to the custom fields feature, but only admins can see the content of the fields. This is useful for adding metadata to proposals that should not be visible to the public (such as contact data).
+Data is stored encrypted in the database.
+
+![Private Custom fields screenshot](examples/private_custom_fields.png)
+
 #### 13. Custom Redirections (or URL shortener feature)
 
 Admins can create custom paths that redirect to other places. Destinations can be internal absolute paths or external sites.
 There's also possible to choose to sanitize (ie: remove) any query string or to maintain it (so you can decide to use).
 
-For instance you can create a redirection like 
+For instance you can create a redirection like
 
 * `/take-me-somewhere` => `/processes/canary-islands`
 
@@ -274,6 +339,49 @@ This view is used by the proposal cell in lists. It must implement the vote butt
 
 Note that, it is strongly recommended to add and HTML tag element with the id `proposal-<%= proposal.id %>-votes-count` so the Ajax vote re-loader can work. Even if you don't use (in this case use a `style="display:none"` attribute), this is because the Ajax reloader always look for this element and throw JavaScript errors if not.
 
+##### 17.1 GraphQL Types for weighted voting
+
+When a weighed voting mechanism is selected, the GraphQL API will show those weights separated in each proposal.
+The attribute that holds this information is `vote_weights`, a query example could look like this:
+
+```graphql
+{
+  component(id: 999) {
+    ... on Proposals {
+      proposals {
+        edges {
+          node {
+            id
+            voteWeights
+          }
+        }
+      }
+    }
+  }
+}
+```
+
+#### 18. Limiting amendments in proposals
+
+By default, when proposals can be amended, any number of amendments can be created.
+
+This feature allows admins to configure a specific Proposal's component to limit the number of evaluating amendments that can be created to one.
+Note that this only applies to amendments being in the state "evaluating", not to accepted or rejected.
+
+This option is disable by default, must be enabled in the component's configuration:
+
+![Limiting amendments](examples/limit_amendments.png)
+
+#### 18. Maintenance tools
+
+The awesome admin provides with some maintenance tools (more to come in the future);
+
+##### 18.1 Old private data removal
+
+These tools are designed to help remove old data as required by laws such as GDPR, particularly in relation to private custom fields.
+This menu will show if there's any data older than 6 months (configurable) and will let admins remove it component by component.
+
+![Private data](examples/private_data.png)
 
 #### To be continued...
 
@@ -298,6 +406,17 @@ bundle exec rails decidim:upgrade
 bundle exec rails db:migrate
 ```
 
+Go to `yourdomain/admin/decidim_awesome` and start tweaking things!
+
+> **EXPERTS ONLY**
+>
+> Under the hood, when running `bundle exec rails decidim:upgrade` the `decidim-decidim_awesome` gem will run the following two tasks (that can also be run manually if you consider):
+>
+> ```bash
+> bin/rails decidim_decidim_awesome:install:migrations
+> bin/rails decidim_decidim_awesome:webpacker:install
+> ```
+
 If you are upgrading from a version prior to 0.8, make sure to visit the URL `/admin/decidim_awesome/checks` and run image migrations for the old images:
 
 ![Check image migrations](examples/check_image_migrations.png)
@@ -319,20 +438,20 @@ However you can force some specific version using `gem "decidim-decidim_awesome"
 Depending on your Decidim version, choose the corresponding Awesome version to ensure compatibility:
 
 | Awesome version | Compatible Decidim versions |
-|---|---|
-| 0.10.0 | >= 0.26.7, >= 0.27.3 |
-| 0.9.2 | >= 0.26.7, >= 0.27.3 |
-| 0.9.x | 0.26.x, 0.27.x |
-| 0.8.x | 0.25.x, 0.26.x |
-| 0.7.x | 0.23.x, 0.24.x |
-| 0.6.x | 0.22.x, 0.23.x |
-| 0.5.x | 0.21.x, 0.22.x |
-
-> *Heads up!* 
+|-----------------|-----------------------------|
+| 0.10.x          | >= 0.26.7, >= 0.27.3        |
+| 0.9.2           | >= 0.26.7, >= 0.27.3        |
+| 0.9.x           | 0.26.x, 0.27.x              |
+| 0.8.x           | 0.25.x, 0.26.x              |
+| 0.7.x           | 0.23.x, 0.24.x              |
+| 0.6.x           | 0.22.x, 0.23.x              |
+| 0.5.x           | 0.21.x, 0.22.x              |
+
+> *Heads up!*
 > * version 0.10.0 requires database migrations! Don't forget the migrations step when updating.
 > * version 0.8.0 removes CSS Themes for tenants. If you have been using them you will have to manually migrate them to custom styles.
-> * version 0.8.0 uses ActiveStorage, same as Decidim 0.25. 2 new rake task have been introduced to facilitate the migration: `bin/rails decidim_awesome:active_storage_migrations:check_migration_from_carrierwave` and 
-`bin/rails decidim_awesome:active_storage_migrations:migrate_from_carrierwave`
+> * version 0.8.0 uses ActiveStorage, same as Decidim 0.25. 2 new rake task have been introduced to facilitate the migration: `bin/rails decidim_awesome:active_storage_migrations:check_migration_from_carrierwave` and
+    `bin/rails decidim_awesome:active_storage_migrations:migrate_from_carrierwave`
 > * version 0.7.1 requires database migrations! Don't forget the migrations step when updating.
 
 ## Configuration
@@ -453,8 +572,8 @@ However, this project works with different versions of Decidim. In order to test
 You can run run tests against the legacy Decidim versions by using:
 
 ```bash
-export DATABASE_USERNAME=<username> 
-export DATABASE_PASSWORD=<password> 
+export DATABASE_USERNAME=<username>
+export DATABASE_PASSWORD=<password>
 RBENV_VERSION=2.7.6 BUNDLE_GEMFILE=Gemfile.legacy bundle
 RBENV_VERSION=2.7.6 BUNDLE_GEMFILE=Gemfile.legacy bundle exec rake test_app
 RBENV_VERSION=2.7.6 BUNDLE_GEMFILE=Gemfile.legacy bundle exec rspec

data/app/cells/concerns/decidim/decidim_awesome/proposal_m_cell_override.rb

@@ -6,32 +6,12 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        # rubocop:disable Metrics/CyclomaticComplexity
-        def cache_hash
-          hash = []
-          hash << I18n.locale.to_s
-          hash << model.cache_key_with_version
-          hash << model.proposal_votes_count
-          hash << model.extra_fields&.vote_weight_totals
-          hash << model.endorsements_count
-          hash << model.comments_count
-          hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
-          hash << Digest::MD5.hexdigest(resource_image_path) if resource_image_path
-          hash << render_space? ? 1 : 0
-          if current_user
-            hash << current_user.cache_key_with_version
-            hash << current_user.follows?(model) ? 1 : 0
-          end
-          hash << model.follows_count
-          hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
-          hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
-          hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
-          hash << has_footer?
-          hash << has_actions?
+        alias_method :decidim_original_cache_hash, :cache_hash
 
-          hash.join(Decidim.cache_key_separator)
+        def cache_hash
+          extra_hash = model.extra_fields&.reload&.vote_weight_totals
+          "#{decidim_original_cache_hash}#{Decidim.cache_key_separator}#{extra_hash}"
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
       end
     end
   end

data/app/cells/decidim/decidim_awesome/content_blocks/map_cell.rb

@@ -40,11 +40,15 @@ module Decidim
 
         def global_map_components
           @global_map_components ||= Decidim::Component.where(manifest_name: [:meetings, :proposals]).published.filter do |component|
-            case component.manifest.name
-            when :meetings
-              true
-            when :proposals
-              component.settings.geocoding_enabled
+            if component.organization == current_organization
+              case component.manifest.name
+              when :meetings
+                true
+              when :proposals
+                component.settings.geocoding_enabled
+              else
+                false
+              end
             else
               false
             end

data/app/commands/concerns/decidim/decidim_awesome/admin/needs_constraint_helpers.rb

@@ -20,7 +20,7 @@ module Decidim
           return true if constraint.awesome_config.constraints.count > 1
 
           case constraint.awesome_config.var.to_s
-          when /^proposal_custom_field/
+          when /^proposal_(private_)?custom_field/
             false
           else
             true

data/app/commands/concerns/decidim/decidim_awesome/proposals/admin/update_proposal_override.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      module Admin
+        ##
+        # Decorates update draft and update proposal
+        # to avoid private field to be logged in PaperTrail.
+        module UpdateProposalOverride
+          extend ActiveSupport::Concern
+
+          included do
+            private
+
+            alias_method :decidim_original_update_proposal, :update_proposal
+
+            def update_proposal
+              decidim_original_update_proposal
+              update_private_field!
+            end
+
+            def update_private_field!
+              @proposal.update_private_body!(form.private_body) if form.private_body.present?
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/proposals/create_collaborative_draft_override.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      ##
+      # Decorate create_collaborative_draft to avoid
+      # private data to be in PaperTrail
+      module CreateCollaborativeDraftOverride
+        extend ActiveSupport::Concern
+
+        included do
+          private
+
+          alias_method :decidim_original_create_collaborative_draft, :create_collaborative_draft
+
+          def create_collaborative_draft
+            created_draft = decidim_original_create_collaborative_draft
+            # Update the proposal with the private body, to
+            # avoid tracebility on private fields.
+            created_draft.update_private_body!(form.private_body) if form.private_body.present?
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/proposals/create_proposal_override.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      ##
+      # Decorate create_proposal to avoid
+      # private data to be in PaperTrail
+      module CreateProposalOverride
+        extend ActiveSupport::Concern
+
+        included do
+          private
+
+          alias_method :decidim_original_create_proposal, :create_proposal
+
+          def create_proposal
+            decidim_original_create_proposal
+            # Update the proposal with the private body, to
+            # avoid tracebility on private fields.
+            @proposal.update_private_body!(form.private_body) if form.private_body.present?
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/proposals/update_collaborative_draft_override.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      ##
+      # Decorates update draft and update proposal
+      # to avoid private field to be logged in PaperTrail.
+      module UpdateCollaborativeDraftOverride
+        extend ActiveSupport::Concern
+
+        included do
+          private
+
+          alias_method :decidim_original_update_collaborative_draft, :update_collaborative_draft
+
+          def update_collaborative_draft
+            decidim_original_update_collaborative_draft
+            # Update the proposal with the private body, to
+            # avoid tracebility on private fields.
+            @collaborative_draft.update_private_body!(form.private_body) if form.private_body.present?
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/proposals/update_proposal_override.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      ##
+      # Decorates update draft and update proposal
+      # to avoid private field to be logged in PaperTrail.
+      module UpdateProposalOverride
+        extend ActiveSupport::Concern
+        include Admin::UpdateProposalOverride
+
+        included do
+          private
+
+          alias_method :decidim_original_update_draft, :update_draft
+
+          def update_draft
+            decidim_original_update_draft
+            update_private_field!
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/decidim_awesome/admin/create_proposal_custom_field.rb

@@ -8,9 +8,10 @@ module Decidim
 
         # Public: Initializes the command.
         #
-        def initialize(organization)
+        def initialize(organization, config_var = :proposal_custom_fields)
           @organization = organization
           @ident = rand(36**8).to_s(36)
+          @config_var = config_var
         end
 
         # Executes the command. Broadcasts these events:
@@ -20,13 +21,13 @@ module Decidim
         #
         # Returns nothing.
         def call
-          fields = AwesomeConfig.find_or_initialize_by(var: :proposal_custom_fields, organization: @organization)
+          fields = AwesomeConfig.find_or_initialize_by(var: @config_var, organization: @organization)
           fields.value = {} unless fields.value.is_a? Hash
           # TODO: prevent (unlikely) colisions with exisiting values
           fields.value[@ident] = default_definition
           fields.save!
 
-          create_constraint_never(:proposal_custom_field)
+          create_constraint_never(@config_var == :proposal_custom_fields ? :proposal_custom_field : :proposal_private_custom_field)
 
           broadcast(:ok, @ident)
         rescue StandardError => e

data/app/commands/decidim/decidim_awesome/admin/destroy_proposal_custom_field.rb

@@ -8,9 +8,10 @@ module Decidim
         #
         # key - the key to destroy inise proposal_custom_fields
         # organization
-        def initialize(key, organization)
+        def initialize(key, organization, config_var = :proposal_custom_fields)
           @key = key
           @organization = organization
+          @config_var = config_var
         end
 
         # Executes the command. Broadcasts these events:
@@ -20,14 +21,16 @@ module Decidim
         #
         # Returns nothing.
         def call
-          fields = AwesomeConfig.find_by(var: :proposal_custom_fields, organization: @organization)
+          fields = AwesomeConfig.find_by(var: @config_var, organization: @organization)
           return broadcast(:invalid, "Not a hash") unless fields&.value.is_a? Hash
           return broadcast(:invalid, "#{key} key invalid") unless fields.value.has_key?(@key)
 
           fields.value.except!(@key)
           fields.save!
+
           # remove constrains associated (a new config var is generated automatically, by removing it, it will trigger destroy on dependents)
-          constraint = AwesomeConfig.find_by(var: "proposal_custom_field_#{@key}", organization: @organization)
+          constraint = @config_var == :proposal_custom_fields ? :proposal_custom_field : :proposal_private_custom_field
+          constraint = AwesomeConfig.find_by(var: "#{constraint}_#{@key}", organization: @organization)
           constraint.destroy! if constraint.present?
 
           broadcast(:ok, @key)

data/app/controllers/concerns/decidim/decidim_awesome/admin/maintenance_context.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      module MaintenanceContext
+        extend ActiveSupport::Concern
+
+        included do
+          layout "decidim/decidim_awesome/admin/maintenance"
+          helper_method :current_view, :available_views, :present_private_data
+
+          private
+
+          def present_private_data(model)
+            PrivateDataPresenter.new(model)
+          end
+
+          def current_view
+            return params[:id] if available_views.include?(params[:id])
+
+            available_views.keys.first
+          end
+
+          def available_views
+            {
+              "private_data" => {
+                title: I18n.t("private_data", scope: "decidim.decidim_awesome.admin.menu.maintenance"),
+                icon: "lock-locked",
+                path: decidim_admin_decidim_awesome.maintenance_path("private_data")
+              },
+              "checks" => {
+                title: I18n.t("checks", scope: "decidim.decidim_awesome.admin.menu.maintenance"),
+                icon: "pulse",
+                path: decidim_admin_decidim_awesome.checks_maintenance_index_path
+              }
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/decidim_awesome/admin_accountability/admin/filterable_helper.rb

@@ -13,10 +13,11 @@ module Decidim
           end
 
           def applied_filters_tags(i18n_ctx)
-            if global? && params[:admin_role_type].present?
+            admin_role_type = PaperTrailVersion.safe_admin_role_type(params[:admin_role_type])
+            if global? && admin_role_type.present?
               content_tag(:span, class: "label secondary") do
                 concat "#{i18n_filter_label(:admin_role_type, filterable_i18n_scope_from_ctx(i18n_ctx))}: "
-                concat t("decidim.decidim_awesome.admin.admin_accountability.admin_roles.#{params[:admin_role_type]}", default: params[:admin_role_type])
+                concat t("decidim.decidim_awesome.admin.admin_accountability.admin_roles.#{admin_role_type}", default: admin_role_type)
                 concat icon_link_to(
                   "circle-x",
                   url_for(export_params.except(:admin_role_type)),

data/app/controllers/concerns/decidim/decidim_awesome/limit_pending_amendments.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module LimitPendingAmendments
+      extend ActiveSupport::Concern
+
+      included do
+        # rubocop:disable Rails/LexicallyScopedActionFilter
+        before_action :limit_pending_amendments, only: [:new, :create]
+        # rubocop:enable Rails/LexicallyScopedActionFilter
+
+        private
+
+        def limit_pending_amendments
+          return unless amendable&.amendments && amendable&.component&.settings.try(:limit_pending_amendments)
+          return unless amendable.component.settings.try(:amendments_enabled)
+          return unless amendable.component.current_settings.try(:amendment_creation_enabled)
+
+          return unless existing_emendations.any?
+
+          flash[:alert] = t("pending_limit_reached", scope: "decidim.decidim_awesome.amendments", emendation: translated_attribute(existing_emendations.first.title))
+          redirect_back(fallback_location: Decidim::ResourceLocatorPresenter.new(amendable).path)
+        end
+
+        def existing_emendations
+          @existing_emendations ||= begin
+            existing = amendable.amendments.where(state: :evaluating)
+            existing.filter_map { |amendment| !amendment.emendation&.hidden? && amendment.emendation }
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/decidim_awesome/proposals/orderable_override.rb

@@ -14,6 +14,8 @@ module Decidim
 
           private
 
+          alias_method :decidim_original_reorder, :reorder
+
           # read order from session if available
           def order
             @order ||= detect_order(session[:order]) || default_order
@@ -31,38 +33,23 @@ module Decidim
             end
           end
 
-          # rubocop:disable Metrics/CyclomaticComplexity
           def reorder(proposals)
+            title_by_locale = Arel.sql(proposals.sanitize_sql(["decidim_proposals_proposals.title->>? #{collation}", locale]))
+            title_by_machine_translation = Arel.sql(proposals.sanitize_sql(["decidim_proposals_proposals.title->'machine_translations'->>? #{collation}", locale]))
+            title_by_default_locale = Arel.sql(proposals.sanitize_sql(["decidim_proposals_proposals.title->>? #{collation}", default_locale]))
             case order
             when "az"
-              proposals.order(Arel.sql("CONCAT(decidim_proposals_proposals.title->>'#{locale}',
-                                        decidim_proposals_proposals.title->'machine_translations'->>'#{locale}',
-                                        decidim_proposals_proposals.title->>'#{default_locale}') #{collation} ASC"))
+              proposals.order(title_by_locale => :asc, title_by_machine_translation => :asc, title_by_default_locale => :asc)
             when "za"
-              proposals.order(Arel.sql("CONCAT(decidim_proposals_proposals.title->>'#{locale}',
-                                        decidim_proposals_proposals.title->'machine_translations'->>'#{locale}',
-                                        decidim_proposals_proposals.title->>'#{default_locale}') #{collation} DESC"))
+              proposals.order(title_by_locale => :desc, title_by_machine_translation => :desc, title_by_default_locale => :desc)
             when "supported_first"
               proposals.joins(my_votes_join).group(:id).order(Arel.sql("COUNT(decidim_proposals_proposal_votes.id) DESC"))
             when "supported_last"
               proposals.joins(my_votes_join).group(:id).order(Arel.sql("COUNT(decidim_proposals_proposal_votes.id) ASC"))
-            when "most_commented"
-              proposals.left_joins(:comments).group(:id).order(Arel.sql("COUNT(decidim_comments_comments.id) DESC"))
-            when "most_endorsed"
-              proposals.order(endorsements_count: :desc)
-            when "most_followed"
-              proposals.left_joins(:follows).group(:id).order(Arel.sql("COUNT(decidim_follows.id) DESC"))
-            when "most_voted"
-              proposals.order(proposal_votes_count: :desc)
-            when "random"
-              proposals.order_randomly(random_seed)
-            when "recent"
-              proposals.order(published_at: :desc)
-            when "with_more_authors"
-              proposals.order(coauthorships_count: :desc)
+            else
+              decidim_original_reorder(proposals)
             end
           end
-          # rubocop:enable Metrics/CyclomaticComplexity
 
           def collation
             @collation ||= begin