decidim-core 0.31.4 → 0.32.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 513dc9560cc17e12439bcef89efbb034edc6300b791810f2037bbb64191805a6
-  data.tar.gz: 99d7f076a772765592d34f5164659c5f4d0826edb4d146d5917fff28e02dc922
+  metadata.gz: caaaf7bbddd64f7bb5d4341c6ebeab59b35dd0f69326b136d11958165e513801
+  data.tar.gz: e18600f3eec00c3fbf76b58e90a34bf4888a114f7dc5a9d35896540d30a7a20f
 SHA512:
-  metadata.gz: d8928571dc994667af951c63981ce2472ce1be5db0c477beb27cadfc2ac43b6cfa87f1a8ab6854483cd00ce46fb1856adacf593ad4e159e7e1a46dc3ae099b87
-  data.tar.gz: e03706f2aadaac2165c6a513a5b1284011bda181ab5a29683fe5983e616c880fd9c7a6ff15cbf1619fb6d6f658eb30df40e4d151cb81f12b0bdbd16c7848b224
+  metadata.gz: 847ec9bd0ae30f358fd5330e3bf61cd34adedca669986b5082e391473e3f66df4e7eab20bac8ad4478827fd66b2d3e94e46559ef4138cf289d5a71caf60e904b
+  data.tar.gz: b832cfbd8827d809a1792ff0f7a6688f2282e3f2bfc8975bf821175465333ade87ef0e2fd92bf9ac3512f54e40d31872d2f35a28424b8549de717e2f645141b3

data/README.md

@@ -1,24 +1,14 @@
-# Decidim
+# decidim-core
 
 Core functionality in Decidim. Every single decidim functionality depends on this gem.
 
 ## Usage
 
-You will be using indirectly on any decidim application.
+This module will be using indirectly on any decidim application.
 
 ## Installation
 
-Add `decidim` to your `Gemfile` and you will be using it:
-
-```ruby
-gem 'decidim'
-```
-
-And then execute:
-
-```bash
-bundle
-```
+This is on the default Decidim installation so you should not change anything to use this feature.
 
 ## Users
 

data/app/cells/decidim/amendable/amend_button_card_cell.rb

@@ -7,7 +7,7 @@ module Decidim
       def show
         return unless amendments_enabled? && model.amendable?
         return unless current_component.current_settings.amendment_creation_enabled
-        return unless can_participate_in_private_space?
+        return unless can_participate_in_restricted_space?
 
         render
       end

data/app/cells/decidim/content_blocks/announcement_settings_form/show.erb

@@ -0,0 +1,5 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <div class="row column">
+    <%= settings_fields.translated :editor, :announcement, label:, required: true %>
+  </div>
+<% end %>

data/app/cells/decidim/content_blocks/announcement_settings_form_cell.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class AnnouncementSettingsFormCell < Decidim::ViewModel
+      alias form model
+
+      def content_block
+        options[:content_block]
+      end
+
+      def label
+        I18n.t("decidim.content_blocks.announcement.body")
+      end
+    end
+  end
+end

data/app/cells/decidim/content_blocks/how_to_participate/show.erb

@@ -37,7 +37,7 @@
       </div>
     </div>
   </div>
-  <%= link_to decidim.pages_path, class: "button button__sm md:button__lg button__secondary mt-6" do %>
+  <%= link_to decidim.pages_path(), class: "button button__sm md:button__lg button__secondary mt-6" do %>
     <%= t("more_info", scope: "decidim.pages.home.extended", resource_name: current_organization_name) %>
     <%= icon "arrow-right-line", class: "fill-current" %>
   <% end %>

data/app/cells/decidim/content_blocks/participatory_space_announcement_cell.rb

@@ -3,8 +3,6 @@
 module Decidim
   module ContentBlocks
     class ParticipatorySpaceAnnouncementCell < BaseCell
-      delegate :announcement, to: :resource
-
       def show
         return if announcement_cell.blank_content?
 
@@ -12,7 +10,7 @@ module Decidim
       end
 
       def announcement_cell
-        @announcement_cell ||= cell("decidim/announcement", announcement)
+        @announcement_cell ||= cell("decidim/announcement", model.settings.announcement)
       end
     end
   end

data/app/cells/decidim/content_blocks/participatory_space_hero_cell.rb

@@ -27,12 +27,8 @@ module Decidim
         decidim_escape_translated(resource.subtitle)
       end
 
-      # If it is called from the landing page content block, use the background image defined there
-      # Else, use the banner image defined in the space (for assemblies)
       def image_path
-        return model.images_container.attached_uploader(:background_image).url if model.respond_to?(:images_container)
-
-        attached_uploader(:banner_image).url
+        model.images_container.attached_uploader(:background_image).url
       end
 
       def has_cta?

data/app/cells/decidim/data_consent/category.erb

@@ -13,7 +13,7 @@
       <%= icon "close-line", class: "cookies__category-toggle-icon" %>
     </label>
 
-    <div id="accordion-trigger-<%= category[:slug] %>" data-controls="accordion-panel-<%= category[:slug] %>" aria-labelledby="accordion-title-<%= category[:slug] %>">
+    <div id="accordion-trigger-<%= category[:slug] %>" role="group" data-controls="accordion-panel-<%= category[:slug] %>" aria-labelledby="accordion-title-<%= category[:slug] %>">
       <h3 id="accordion-title-<%= category[:slug] %>" class="cookies__category-trigger-title">
         <%= category[:title] %>
       </h3>

data/app/cells/decidim/{participatory_space_private_user_cell.rb → member_cell.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   # This cell renders the card for an instance of an Assembly member
-  class ParticipatorySpacePrivateUserCell < Decidim::ViewModel
+  class MemberCell < Decidim::ViewModel
     property :name
     property :role
     property :nickname

data/app/cells/decidim/onboarding_action_message_cell.rb

@@ -8,6 +8,7 @@ module Decidim
   #
   class OnboardingActionMessageCell < Decidim::ViewModel
     include ActiveLinkTo
+    include Decidim::ActiveLinkToHelper
 
     alias user model
 

data/app/cells/decidim/profile/details.erb

@@ -20,4 +20,4 @@
   </div>
 </div>
 <p class="profile__description"><%= description %></p>
-<%= render_hook(:user_profile_bottom) %>
+<%= cell "decidim/profile_member_of", model %>

data/app/cells/decidim/profile_cell.rb

@@ -7,6 +7,7 @@ module Decidim
     include Decidim::AriaSelectedLinkToHelper
     include Decidim::ViewHooksHelper
     include ActiveLinkTo
+    include Decidim::ActiveLinkToHelper
 
     delegate :current_organization, :current_user, to: :controller
     delegate :avatar_url, :nickname, :personal_url, :followers_count, :users_followings, :officialized_as, to: :presented_profile

data/app/cells/decidim/profile_member_of/show.erb

@@ -0,0 +1,13 @@
+<div class="profile__description">
+  <div class="font-semibold"><%= t("member_of", scope: "decidim.participatory_space.pages.user_profile.member_of") %></div>
+  <% shown = false %>
+  <% sorted_types.each do |type| %>
+    <% spaces = grouped_members[type].map(&:participatory_space).sort_by { |s| translated_attribute(s.title) } %>
+    <% spaces.each do |space| %>
+      <%= "&nbsp;&#183;&nbsp;".html_safe if shown %>
+      <% path = Decidim::EngineRouter.main_proxy(space).public_send("#{type.demodulize.underscore}_path", space) %>
+      <%= link_to decidim_escape_translated(space.title), path, class: "hover:underline" %>
+      <% shown = true %>
+    <% end %>
+  <% end %>
+</div>

data/app/cells/decidim/profile_member_of_cell.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ProfileMemberOfCell < Decidim::ViewModel
+    include Decidim::Core::Engine.routes.url_helpers
+
+    def members
+      @members ||= Decidim::ParticipatorySpace::Member.where(user:)
+                                                      .includes(:participatory_space)
+                                                      .published
+                                                      .select { |m| m.participatory_space.present? && m.participatory_space.published? }
+                                                      .sort_by { |m| translated_attribute(m.participatory_space.title) }
+    end
+
+    def show
+      return unless members.any?
+
+      render
+    end
+
+    private
+
+    def user
+      model
+    end
+
+    def grouped_members
+      @grouped_members ||= members.group_by(&:participatory_space_type)
+    end
+
+    def sorted_types
+      @sorted_types ||= grouped_members.keys.sort_by { |k| k.split("::").last.downcase }
+    end
+  end
+end

data/app/cells/decidim/tags_cell.rb

@@ -25,7 +25,7 @@ module Decidim
       @taxonomies ||= model.taxonomies.map do |taxonomy|
         {
           name: decidim_sanitize_translated(taxonomy.name),
-          url: resource_locator(model).index(filter: { "with_any_taxonomies[#{taxonomy.root_taxonomy.id}]" => [taxonomy.id.to_s] })
+          url: resource_locator(model).index(filter: { "with_any_taxonomies" => { taxonomy.root_taxonomy.id => [taxonomy.id.to_s] } })
         }
       end
     end

data/app/cells/decidim/versions_list/show.erb

@@ -1,3 +1,28 @@
 <% reverse_ordered_versions.each_with_index do |version, index| %>
   <%= cell("decidim/versions_list_item", version, index:, versioned_resource:, version_path:, i18n_scope:, total:) %>
 <% end %>
+
+<% if versioned_resource.class.include?(Decidim::Fingerprintable) %>
+  <% fingerprint_id = dom_id(versioned_resource, :fingerprint_dialog) %>
+  <section class="mt-4 ml-2">
+    <%= content_tag :button, t("decidim.fingerprint.check"), class: "button button__lg button__text-secondary font-normal text-sm underline", data: { dialog_open: fingerprint_id } %>
+  </section>
+  <%= decidim_modal id: fingerprint_id, class: "fingerprint-modal" do %>
+    <div data-dialog-container>
+      <%= icon "fingerprint-line" %>
+      <h2 id="dialog-title-<%= fingerprint_id %>" tabindex="-1" data-dialog-title><%= t "decidim.fingerprint.title" %></h2>
+      <div class="fingerprint-modal__container">
+        <p id="dialog-desc-<%= fingerprint_id %>"><%= t "decidim.fingerprint.explanation" %></p>
+        <div>
+          <span class="fingerprint-modal__span"><%= t "decidim.fingerprint.value" %>:</span>
+          <code class="fingerprint-modal__code"><%= decidim_html_escape versioned_resource.fingerprint.value %></code>
+        </div>
+        <div>
+          <span class="fingerprint-modal__span"><%= t "decidim.fingerprint.source" %>:</span>
+          <code class="fingerprint-modal__code"><%= decidim_html_escape versioned_resource.fingerprint.source %></code>
+        </div>
+        <p><%= t("decidim.fingerprint.replicate_help", online_calculator_link: link_to(t("decidim.fingerprint.online_calculator_name"), "https://www.md5calc.com/sha256", target: "_blank", rel: "noopener")).html_safe %></p>
+      </div>
+    </div>
+  <% end %>
+<% end %>

data/app/commands/decidim/create_follow.rb

@@ -20,6 +20,7 @@ module Decidim
     # Returns nothing.
     def call
       return broadcast(:invalid) if form.invalid?
+      return broadcast(:invalid) unless current_user.is_a?(Decidim::User)
 
       create_follow!
       increment_score
@@ -32,13 +33,10 @@ module Decidim
     attr_reader :follow, :form
 
     def create_follow!
-      @follow = Follow.find_by(
+      @follow = Follow.where(
         followable: form.followable,
         user: current_user
-      ) || Follow.create!(
-        followable: form.followable,
-        user: current_user
-      )
+      ).first_or_create!
     end
 
     def increment_score

data/app/commands/decidim/create_user_report.rb

@@ -58,7 +58,7 @@ module Decidim
       current_user.organization.admins.each do |admin|
         next unless admin.email_on_moderations
 
-        Decidim::UserReportJob.perform_later(admin, report)
+        UserReportMailer.notify(admin, report).deliver_later
       end
     end
 

data/app/commands/decidim/destroy_account.rb

@@ -28,7 +28,7 @@ module Decidim
         destroy_user_badges
         destroy_user_likes
         destroy_user_reports
-        destroy_participatory_space_private_user
+        destroy_member
         delegate_destroy_to_participatory_spaces
       end
 
@@ -101,8 +101,8 @@ module Decidim
       Decidim::Follow.where(user: current_user).find_each(&:destroy)
     end
 
-    def destroy_participatory_space_private_user
-      Decidim::ParticipatorySpacePrivateUser.where(user: current_user).find_each(&:destroy)
+    def destroy_member
+      Decidim::ParticipatorySpace::Member.where(user: current_user).find_each(&:destroy)
     end
 
     def delegate_destroy_to_participatory_spaces

data/app/commands/decidim/search.rb

@@ -7,10 +7,10 @@ module Decidim
 
     # Public: Initializes the command.
     #
-    # @param term: The term to search for.
-    # @param organization: The Organization to which the results are constrained.
-    # @param filters: (optional) A Hash of SearchableResource attributes to filter for.
-    # @param page_params: (optional) A Hash with `page` and `per_page` options to paginate.
+    # @param term [String] -  The term to search for.
+    # @param organization [Decidim::Organization] - The Organization to which the results are constrained.
+    # @param filters [Hash] - (optional) A Hash of SearchableResource attributes to filter for.
+    # @param page_params [Hash] - (optional) A Hash with `page` and `per_page` options to paginate.
     def initialize(term, organization, filters = {}, page_params = {})
       @term = term
       @organization = organization
@@ -91,7 +91,7 @@ module Decidim
         query = query.where(decidim_participatory_space: spaces)
       end
 
-      query = query.order("datetime DESC")
+      query = query.order(datetime: :desc)
       query = query.global_search(I18n.transliterate(term)) if term.present?
       query
     end

data/app/controllers/concerns/decidim/ajax_permission_handler.rb

@@ -15,7 +15,7 @@ module Decidim
     def ajax_user_has_no_permission
       return user_has_no_permission unless request.xhr?
 
-      render json: { message: I18n.t("actions.unauthorized", scope: "decidim.core") }, status: :unprocessable_entity
+      render json: { message: I18n.t("actions.unauthorized", scope: "decidim.core") }, status: :unprocessable_content
     end
   end
 end

data/app/controllers/concerns/decidim/direct_upload.rb

@@ -6,6 +6,7 @@ module Decidim
 
     included do
       include Decidim::NeedsOrganization
+
       skip_before_action :verify_organization
 
       before_action :check_organization!,
@@ -18,14 +19,14 @@ module Decidim
       # We skip the validation if we are in system panel. `current_admin` refers to the main system admin user.
       return if current_admin.present?
 
-      head :unprocessable_entity unless [
+      head :unprocessable_content unless [
         maximum_allowed_size.try(:to_i) >= blob_args[:byte_size].try(:to_i),
         content_types.any? { |pattern| pattern.match?(blob_args[:content_type]) },
         content_types.any? { |pattern| pattern.match?(MiniMime.lookup_by_extension(extension)&.content_type) },
         allowed_extensions.any? { |pattern| pattern.match?(extension) }
       ].all?
     rescue NoMethodError
-      head :unprocessable_entity
+      head :unprocessable_content
     end
 
     def extension

data/app/controllers/concerns/decidim/ephemeral_session_checker.rb

@@ -78,7 +78,7 @@ module Decidim
                    end
       paths_list.prepend(
         pending_authorizations_path,
-        decidim.page_path(terms_of_service_page)
+        decidim.page_path(terms_of_service_page, locale: current_locale)
       )
 
       paths_list.find { |el| /\A#{URI.parse(el).path}/.match?(request.path) }

data/app/controllers/concerns/decidim/force_authentication.rb

@@ -38,12 +38,21 @@ module Decidim
       default_unauthorized_paths + Decidim::StaticPage.where(
         organization: current_organization,
         allow_public_access: true
-      ).pluck(Arel.sql("CONCAT('/pages/', slug)"))
+      ).pluck(
+        Arel::Nodes::Concat.new(
+          Arel::Nodes.build_quoted("/#{current_locale}/pages/"),
+          Arel::Table.new(Decidim::StaticPage.table_name)[:slug]
+        )
+      )
     end
 
     def default_unauthorized_paths
       # /locale is for changing the locale and /manifest.webmanifest to request PWA manifest
       %w(/locale /manifest.webmanifest)
     end
+
+    def current_locale
+      @current_locale ||= I18n.locale.to_s
+    end
   end
 end

data/app/controllers/concerns/decidim/impersonate_users.rb

@@ -71,6 +71,10 @@ module Decidim
         # Prevent redirect on non-HTML responses, because we want redirect AFTER impersonation.js inits a reload.
         return if request && request.negotiate_mime([Mime[:html]]).blank?
         return unless can_impersonate_users?
+
+        # Keep the expiration check in sync with the active impersonation log so
+        # the redirect happens in the same request when the session just expired.
+        impersonation_log&.ensure_not_expired!
         return unless expired_log
 
         expired_log.update!(ended_at: Time.current)

data/app/controllers/concerns/decidim/locale_switcher.rb

@@ -9,7 +9,7 @@ module Decidim
 
     included do
       around_action :switch_locale
-      helper_method :current_locale, :available_locales, :default_locale
+      helper_method :current_locale, :available_locales, :default_locale, :canonical_url
 
       # Sets the locale for the current session.
       # Saves current locale in a session variable in case some links are locale-orphaned
@@ -21,6 +21,7 @@ module Decidim
         else
           locale = default_locale
         end
+
         I18n.with_locale(locale, &)
       end
 
@@ -29,7 +30,7 @@ module Decidim
       #
       # Returns a Hash.
       def default_url_options
-        return {} if current_locale == default_locale.to_s
+        return {} if locale_in_script_name?
 
         { locale: current_locale }
       end
@@ -99,6 +100,55 @@ module Decidim
         end
         lang == "*" ? nil : lang
       end
+
+      def canonical_url(desired_url, target_locale = default_locale)
+        uri = URI(desired_url)
+        desired_locale = available_locales.include?(target_locale) ? target_locale : default_locale
+
+        path_segments = uri.path.split("/").compact_blank
+        locale_segment = path_segments.first
+
+        query = uri.query.to_s.gsub(/locale=[a-zA-Z-]{2,5}/, "")
+
+        if available_locales.include?(locale_segment)
+          path_segments[0] = desired_locale
+
+          uri.path = "/#{path_segments.join("/")}"
+
+          if query.present?
+            params = URI.decode_www_form(query)
+            uri.query = URI.encode_www_form(params)
+          else
+            uri.query = nil
+          end
+        elsif uri.host.blank? || uri.host == request.host
+          uri.path = if uri.path == "/"
+                       "/#{desired_locale}"
+                     else
+                       "/#{desired_locale}#{uri.path}"
+                     end
+
+          if query.present?
+            params = URI.decode_www_form(query)
+            uri.query = URI.encode_www_form(params)
+          else
+            uri.query = nil
+          end
+        else
+          params = URI.decode_www_form(query) << ["locale", desired_locale]
+          uri.query = URI.encode_www_form(params)
+        end
+
+        uri.to_s
+      end
+
+      def locale_in_script_name?
+        script_name = request&.script_name.to_s
+        return false if script_name.blank?
+
+        locale_segment = script_name.split("/").compact_blank.first
+        available_locales.include?(locale_segment)
+      end
       # rubocop: enable Metrics/CyclomaticComplexity
       # rubocop: enable Metrics/PerceivedComplexity
     end

data/app/controllers/concerns/decidim/needs_tos_accepted.rb

@@ -43,7 +43,7 @@ module Decidim
     end
 
     def tos_path
-      decidim.page_path terms_of_service_page
+      decidim.page_path terms_of_service_page, locale: current_locale
     end
 
     def redirect_to_tos

data/app/controllers/concerns/decidim/participatory_space/has_members_page.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module ParticipatorySpace
+    module HasMembersPage
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :collection
+
+        private
+
+        def can_visit_index?
+          current_user_can_visit_space? && current_participatory_space.members_public_page?
+        end
+
+        def members
+          @members ||= current_participatory_space.members.published
+        end
+
+        alias_method :collection, :members
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/participatory_space_context.rb

@@ -36,8 +36,6 @@ module Decidim
     #           title of the space (mandatory).
     # * url - The url of the resource (optional).
     # * active - Whether the item is active (optional).
-    # * dropdown_cell - When this value is present is used to generate a dropdown
-    #                   associated to the item (optional).
     # * resource - The resource of the item. This value is passed to the
     #              dropdown cell, so it is mandatory if the dropdown cell is
     #              present.
@@ -48,7 +46,6 @@ module Decidim
         label: current_participatory_space.title,
         url: Decidim::ResourceLocatorPresenter.new(current_participatory_space).path,
         active: true,
-        dropdown_cell: current_participatory_space_manifest.breadcrumb_cell,
         resource: current_participatory_space
       }
     end
@@ -79,8 +76,7 @@ module Decidim
 
     # Method for current user can visit the space (assembly or process)
     def current_user_can_visit_space?
-      return true unless current_participatory_space.try(:private_space?) &&
-                         !current_participatory_space.try(:is_transparent?)
+      return true unless current_participatory_space.respond_to?(:restricted?) && current_participatory_space.restricted?
       return false unless current_user
       return true if current_user.admin?
       return true if user_has_any_role?(current_user, current_participatory_space, broad_check: true)

data/app/controllers/decidim/account_controller.rb

@@ -31,7 +31,7 @@ module Decidim
         on(:invalid) do |password|
           fetch_entered_password(password)
           flash[:alert] = t("account.update.error", scope: "decidim")
-          render action: :show, status: :unprocessable_entity
+          render action: :show, status: :unprocessable_content
         end
       end
     end

data/app/controllers/decidim/amendments_controller.rb

@@ -5,6 +5,7 @@ module Decidim
     include Decidim::ApplicationHelper
     include FormFactory
     include HasSpecificBreadcrumb
+
     helper Decidim::ResourceReferenceHelper
 
     before_action :authenticate_user!
@@ -38,7 +39,7 @@ module Decidim
 
         on(:invalid) do
           flash.now[:alert] = t("created.error", scope: "decidim.amendments")
-          render :new, status: :unprocessable_entity
+          render :new, status: :unprocessable_content
         end
       end
     end
@@ -62,7 +63,7 @@ module Decidim
 
         on(:invalid) do
           flash.now[:alert] = t("error", scope: "decidim.amendments.update_draft")
-          render :edit_draft, status: :unprocessable_entity
+          render :edit_draft, status: :unprocessable_content
         end
       end
     end
@@ -100,7 +101,7 @@ module Decidim
 
         on(:invalid) do
           flash.now[:alert] = t("error", scope: "decidim.amendments.publish_draft")
-          render :edit_draft, status: :unprocessable_entity
+          render :edit_draft, status: :unprocessable_content
         end
       end
     end
@@ -160,7 +161,7 @@ module Decidim
 
         on(:invalid) do
           flash.now[:alert] = t("accepted.error", scope: "decidim.amendments")
-          render :review, status: :unprocessable_entity
+          render :review, status: :unprocessable_content
         end
       end
     end