decidim-core 0.27.3 → 0.27.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6577740d87b562e24f541c4723480ec774239f69a389d4434536ab72be3b116
-  data.tar.gz: 8366df277375b9fadc5c96b4a9e647a0300057d7148eafcb672f3a57d3abd55f
+  metadata.gz: d976829c2218ab34a1bf7c2ad99443edd61c4f37bb56963c8bb21a3e74afddef
+  data.tar.gz: acbaa2ce577af7e32648ce22941616e258f48bdbfb304e754344770fafaf9ef4
 SHA512:
-  metadata.gz: f6f4e9e7bcf14ccc5943ec41d4468338d1cf62aec7d37b296d0fa37a3c1c7bc97711b06579d10b32167ce291b8d664989f90eecfcba9a94f228ff60e7e8698e0
-  data.tar.gz: 4fcd0dacd12572c3a4b404709ec632dcc6c5cc964dfd9dc29d92a4dd03da2b10ddc3e5df57a6ed91cb3f90e0dac70c4668ba89040f8cf5788e34d1f8e857d3b8
+  metadata.gz: 868d324e0f83442b37750933c39985dffdba9bfd06a2f47ad00836b7c9b89164bafff5d2083d5e24d7f01eb9c47dac46f564a375bacaa17726fe5d472bf6c86b
+  data.tar.gz: 1af449d8a281aa2ae5db6c0f03a7be077f7a7eeaa2a300e8bc2a2d36622cd4be5aafb4245878a24e4bd2496542d0166a84287974e72cdeb294acdcd021144b00

data/app/cells/decidim/activities_cell.rb

@@ -27,13 +27,7 @@ module Decidim
     end
 
     def activities
-      @activities ||= last_activities.select do |activity|
-        activity.visible_for?(current_user)
-      end
-    end
-
-    def last_activities
-      @last_activities ||= model.map do |activity|
+      @activities ||= model.map do |activity|
         activity.organization_lazy
         activity.resource_lazy
         activity.participatory_space_lazy

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

@@ -16,7 +16,7 @@
     </span>
   </div>
 <% else %>
-  <div class="collapsible-list <%= list_class %>">
+  <div class="<%= list_class %>">
     <% list.each do |element| %>
       <% if cell_name %>
         <%= cell cell_name, element, cell_options %>

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

@@ -56,10 +56,7 @@ module Decidim
       end
 
       def activities
-        @activities ||= ActionLog.where(
-          organization: current_organization,
-          visibility: %w(public-only all)
-        ).with_new_resource_type("all").order(created_at: :desc).limit(activities_to_show * 6)
+        @activities ||= Decidim::LastActivity.new(current_organization, current_user: current_user).query.limit(activities_to_show * 6)
       end
 
       def activities_to_show

data/app/cells/decidim/tags_cell.rb

@@ -55,7 +55,7 @@ module Decidim
     end
 
     def category_path
-      resource_locator(model).index(filter: { category_id: [model.category.id.to_s] })
+      resource_locator(model).index(filter: { filter_param(:category) => [model.category.id.to_s] })
     end
 
     def scope?
@@ -86,7 +86,18 @@ module Decidim
     end
 
     def scope_path
-      resource_locator(model).index(filter: { scope_id: [model.scope.id] })
+      resource_locator(model).index(filter: { filter_param(:scope) => [model.scope.id] })
+    end
+
+    def filter_param(name)
+      candidates = ["with_any_#{name}".to_sym, "with_#{name}".to_sym]
+      return candidates.first unless controller.respond_to?(:default_filter_params, true)
+
+      available_params = controller.send(:default_filter_params)
+      candidates.each do |candidate|
+        return candidate if available_params.has_key?(candidate)
+      end
+      candidates.first
     end
   end
 end

data/app/commands/decidim/create_omniauth_registration.rb

@@ -46,8 +46,6 @@ module Decidim
     attr_reader :form, :verified_email
 
     def create_or_find_user
-      generated_password = SecureRandom.hex
-
       @user = User.find_or_initialize_by(
         email: verified_email,
         organization: organization
@@ -59,6 +57,8 @@ module Decidim
         # to be marked confirmed.
         @user.skip_confirmation! if !@user.confirmed? && @user.email == verified_email
       else
+        generated_password = SecureRandom.hex
+
         @user.email = (verified_email || form.email)
         @user.name = form.name
         @user.nickname = form.normalized_nickname

data/app/controllers/decidim/authorization_modals_controller.rb

@@ -17,7 +17,7 @@ module Decidim
     end
 
     def current_component
-      @current_component ||= Decidim::Component.find(params[:component_id])
+      @current_component ||= Decidim::Component.where(participatory_space: current_organization.participatory_spaces).find(params[:component_id])
     end
 
     def authorization_action

data/app/controllers/decidim/last_activities_controller.rb

@@ -32,13 +32,7 @@ module Decidim
     end
 
     def search_collection
-      ActionLog
-        .where(
-          organization: current_organization,
-          visibility: %w(public-only all)
-        )
-        .with_new_resource_type("all")
-        .order(created_at: :desc)
+      LastActivity.new(current_organization, current_user: current_user).query
     end
 
     def default_filter_params

data/app/controllers/decidim/short_links_controller.rb

@@ -29,7 +29,7 @@ module Decidim
     #
     # @return [Decidim::ShortLink] The short link matching the identifier
     def link
-      @link ||= Decidim::ShortLink.find_by(identifier: params[:id])
+      @link ||= Decidim::ShortLink.find_by(identifier: params[:id], organization: current_organization)
     end
   end
 end

data/app/forms/decidim/notifications_settings_form.rb

@@ -53,7 +53,7 @@ module Decidim
     end
 
     def meet_push_notifications_requirements?
-      Rails.application.secrets.vapid[:enabled]
+      Rails.application.secrets.dig(:vapid, :enabled) || false
     end
   end
 end

data/app/forms/url_validator.rb

@@ -6,7 +6,7 @@
 #
 class UrlValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors.add attribute, (options[:message] || "must be a valid URL") unless url_valid?(value)
+    record.errors.add attribute, :url_format, **options unless url_valid?(value)
   end
 
   # a URL may be technically well-formed but may

data/app/helpers/decidim/layout_helper.rb

@@ -105,7 +105,10 @@ module Decidim
       # non-nil because otherwise it will be set to the asset host at
       # ActionView::Helpers::AssetUrlHelper#compute_asset_host.
       img_path = asset_pack_path(path, host: "", protocol: :relative)
-      Rails.public_path.join(img_path.sub(%r{^/}, ""))
+      path = Rails.public_path.join(img_path.sub(%r{^/}, ""))
+      return unless File.exist?(path)
+
+      path
     rescue ::Webpacker::Manifest::MissingEntryError
       nil
     end

data/app/helpers/decidim/layout_helper.rb.orig

@@ -0,0 +1,225 @@
+# frozen_string_literal: true
+
+module Decidim
+  # View helpers related to the layout.
+  module LayoutHelper
+    include Decidim::ModalHelper
+    include Decidim::TooltipHelper
+
+    # Public: Generates a set of meta tags that generate the different favicon
+    # versions for an organization.
+    #
+    # Returns a safe String with the versions.
+    def favicon
+      return if current_organization.favicon.blank?
+
+      safe_join(Decidim::OrganizationFaviconUploader::SIZES.map do |version, size|
+        favicon_link_tag(current_organization.attached_uploader(:favicon).variant_url(version, host: current_organization.host), sizes: "#{size}x#{size}")
+      end)
+    end
+
+    def apple_favicon
+      icon_image = current_organization.attached_uploader(:favicon).variant_url(:medium, host: current_organization.host)
+      return unless icon_image
+
+      favicon_link_tag(icon_image, rel: "apple-touch-icon", type: "image/png")
+    end
+
+    def legacy_favicon
+      variant = :favicon if current_organization.favicon.content_type != "image/vnd.microsoft.icon"
+      icon_image = current_organization.attached_uploader(:favicon).variant_url(variant, host: current_organization.host)
+      return unless icon_image
+
+      favicon_link_tag(icon_image, rel: "icon", sizes: "any", type: nil)
+    end
+
+    # Outputs an SVG-based icon.
+    #
+    # name    - The String with the icon name.
+    # options - The Hash options used to customize the icon (default {}):
+    #             :width  - The Number of width in pixels (optional).
+    #             :height - The Number of height in pixels (optional).
+    #             :title - The title for the SVG element (optional, similar to alt for img)
+    #             :aria_label - The String to set as aria label (optional).
+    #             :aria_hidden - The Truthy value to enable aria_hidden (optional).
+    #             :role - The String to set as the role (optional).
+    #             :class - The String to add as a CSS class (optional).
+    #
+    # Returns a String.
+    def redesigned_icon(name, options = {})
+      default_html_properties = {
+        "width" => "1em",
+        "height" => "1em",
+        "role" => "img",
+        "aria-hidden" => "true"
+      }
+
+      html_properties = options.with_indifferent_access.transform_keys(&:dasherize).slice("width", "height", "aria-label", "role", "aria-hidden", "class", "style")
+      html_properties = default_html_properties.merge(html_properties)
+
+      href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg")
+
+      content_tag :svg, html_properties do
+        content_tag :use, nil, "href" => "#{href}#ri-#{name}", tabindex: -1
+      end
+    end
+
+    def legacy_icon(name, options = {})
+      options = options.with_indifferent_access
+      html_properties = {}
+
+      html_properties["width"] = options[:width]
+      html_properties["height"] = options[:height]
+      html_properties["aria-label"] = options[:aria_label] || options[:"aria-label"]
+      html_properties["role"] = options[:role] || "img"
+      html_properties["aria-hidden"] = options[:aria_hidden] || options[:"aria-hidden"]
+
+      html_properties["class"] = (["icon--#{name}"] + _icon_classes(options)).join(" ")
+
+      title = options["title"] || html_properties["aria-label"]
+      if title.blank? && html_properties["role"] == "img"
+        # This will make the accessibility audit tools happy as with the "img"
+        # role, the alternative text (aria-label) and title are required for the
+        # element. This will also force the SVG to be hidden because otherwise
+        # the screen reader would announce the icon name which can be in
+        # different language (English) than the page language which is not
+        # allowed.
+        title = name
+        html_properties["aria-label"] = title
+        html_properties["aria-hidden"] = true
+      end
+
+      href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/icons.svg")
+
+      content_tag :svg, html_properties do
+        inner = content_tag :title, title
+        inner += content_tag :use, nil, "href" => "#{href}#icon-#{name}"
+
+        inner
+      end
+    end
+
+    def icon(*args)
+      redesign_enabled? ? redesigned_icon(*args) : legacy_icon(*args)
+    end
+
+    # Outputs a SVG icon from an external file. It apparently renders an image
+    # tag, but then a JS script kicks in and replaces it with an inlined SVG
+    # version.
+    #
+    # path    - The asset's path
+    #
+    # Returns an <img /> tag with the SVG icon.
+    def external_icon(path, options = {})
+      classes = _icon_classes(options) + ["external-icon"]
+
+      if path.split(".").last == "svg"
+        icon_path = application_path(path)
+        return unless icon_path
+
+        attributes = { class: classes.join(" ") }.merge(options)
+        asset = File.read(icon_path)
+        asset.gsub("<svg ", "<svg#{tag_builder.tag_options(attributes)} ").html_safe
+      else
+        image_pack_tag(path, class: classes.join(" "), style: "display: none")
+      end
+    end
+
+    def application_path(path)
+      # Force the path to be returned without the protocol and host even when a
+      # custom asset host has been defined. The host parameter needs to be a
+      # non-nil because otherwise it will be set to the asset host at
+      # ActionView::Helpers::AssetUrlHelper#compute_asset_host.
+      img_path = asset_pack_path(path, host: "", protocol: :relative)
+      path = Rails.public_path.join(img_path.sub(%r{^/}, ""))
+      return unless File.exist?(path)
+
+      path
+    rescue ::Webpacker::Manifest::MissingEntryError
+      nil
+    end
+
+    # Allows to create role attribute according to accessibility rules
+    #
+    # Returns role attribute string if role option is specified
+    def role(options = {})
+      "role=\"#{options[:role]}\" " if options[:role]
+    end
+
+    def _icon_classes(options = {})
+      classes = options[:remove_icon_class] ? [] : ["icon"]
+      classes += [options[:class]]
+      classes.compact
+    end
+
+    def extended_navigation_bar(items, max_items: 5)
+      return unless items.any?
+
+      extra_items = items.slice((max_items + 1)..-1) || []
+      active_item = items.find { |item| item[:active] }
+
+      controller.view_context.render partial: "decidim/shared/extended_navigation_bar", locals: {
+        items:,
+        extra_items:,
+        active_item:,
+        max_items:
+      }
+    end
+
+    # Renders a view with the customizable CSS variables in two flavours:
+    # 1. as a hexadecimal valid CSS color (ie: #ff0000)
+    # 2. as a disassembled RGB components (ie: 255 0 0)
+    #
+    # Example:
+    #
+    # --primary: #ff0000;
+    # --primary-rgb: 255,0,0
+    #
+    # Hexadecimal variables can be used as a normal CSS color:
+    #
+    # color: var(--primary)
+    #
+    # While the disassembled variant can be used where you need to manipulate
+    # the color somehow (ie: adding a background transparency):
+    #
+    # background-color: rgba(var(--primary-rgb), 0.5)
+    def organization_colors
+      css = current_organization.colors.each.map { |k, v| "--#{k}: #{v};--#{k}-rgb: #{v[1..2].hex} #{v[3..4].hex} #{v[5..6].hex};" }.join
+      render partial: "layouts/decidim/organization_colors", locals: { css: }
+    end
+
+<<<<<<< HEAD
+    def current_user_unread_data
+      return {} if current_user.blank?
+
+      {}.tap do |d|
+        d.merge!(unread_notifications: true) if current_user.notifications.any?
+        d.merge!(unread_conversations: true) if current_user.unread_conversations.any?
+        d.merge!(unread_items: d.present?)
+      end
+    end
+
+||||||| parent of 53b6893e5c (Use local emojibase data instead of CDN)
+=======
+    # Public: Gets the name of the webpacker entrypoint that will be used
+    # for the locale of the Emojibase NPM package, used with @picmo/popup-picker
+    #
+    # Returns a string with the entrypoint name
+    def emojibase_entrypoint_locale
+      entrypoint = Decidim::Webpacker.configuration.entrypoints.keys.select do |entry|
+        entry == "decidim_emojibase_#{I18n.locale}"
+      end
+
+      return "decidim_emojibase_en" if entrypoint.empty?
+
+      entrypoint.first
+    end
+
+>>>>>>> 53b6893e5c (Use local emojibase data instead of CDN)
+    private
+
+    def tag_builder
+      @tag_builder ||= ActionView::Helpers::TagHelper::TagBuilder.new(self)
+    end
+  end
+end

data/app/models/decidim/organization.rb

@@ -87,6 +87,12 @@ module Decidim
       @top_scopes ||= scopes.top_level
     end
 
+    def participatory_spaces
+      @participatory_spaces ||= Decidim.participatory_space_manifests.flat_map do |manifest|
+        manifest.participatory_spaces.call(self)
+      end
+    end
+
     def public_participatory_spaces
       @public_participatory_spaces ||= Decidim.participatory_space_manifests.flat_map do |manifest|
         manifest.participatory_spaces.call(self).public_spaces

data/app/models/decidim/user.rb

@@ -261,9 +261,10 @@ module Decidim
     end
 
     def needs_password_update?
+      return false if organization.users_registration_mode == "disabled"
       return false unless admin?
       return false unless Decidim.config.admin_password_strong
-      return true if password_updated_at.blank?
+      return identities.none? if password_updated_at.blank?
 
       password_updated_at < Decidim.config.admin_password_expiration_days.days.ago
     end
@@ -293,7 +294,8 @@ module Decidim
         event: "decidim.events.core.welcome_notification",
         event_class: WelcomeNotificationEvent,
         resource: self,
-        affected_users: [self]
+        affected_users: [self],
+        extra: { force_email: true }
       )
     end
 

data/app/packs/src/decidim/input_character_counter.js

@@ -33,7 +33,7 @@ export default class InputCharacterCounter {
     this.$target = $(this.$input.data("remaining-characters"));
     this.minCharacters = parseInt(this.$input.attr("minlength"), 10);
     this.maxCharacters = parseInt(this.$input.attr("maxlength"), 10);
-    this.describeByCounter = typeof this.$input.attr("aria-describedby") === "undefined";
+    this.describeByCounter = this.$input.attr("type") !== "hidden" && typeof this.$input.attr("aria-describedby") === "undefined";
 
     // Define the closest length for the input "gaps" defined by the threshold.
     if (this.maxCharacters > 10) {

data/app/packs/src/decidim/map/controller/drag_marker.js

@@ -1,6 +1,4 @@
-import * as L from "leaflet";
 import MapController from "src/decidim/map/controller"
-import "src/decidim/vendor/leaflet-tilelayer-here"
 
 export default class MapDragMarkerController extends MapController {
   start() {

data/app/packs/src/decidim/map/controller/markers.js

@@ -1,5 +1,4 @@
 import "src/decidim/vendor/jquery-tmpl"
-import * as L from "leaflet";
 import MapController from "src/decidim/map/controller"
 import "leaflet.markercluster";
 

data/app/packs/src/decidim/map/controller/static.js

@@ -1,4 +1,3 @@
-import * as L from "leaflet";
 import MapController from "src/decidim/map/controller"
 
 const openLink = window.open;

data/app/packs/src/decidim/map/controller.js

@@ -1,5 +1,3 @@
-import * as L from "leaflet";
-import "src/decidim/map/icon"
 import MapControllerRegistry from "src/decidim/map/controller_registry"
 
 export default class MapController {

data/app/packs/src/decidim/map/factory.js

@@ -1,3 +1,5 @@
+import "src/decidim/map/icon"
+
 import MapMarkersController from "src/decidim/map/controller/markers"
 import MapStaticController from "src/decidim/map/controller/static"
 import MapDragMarkerController from "src/decidim/map/controller/drag_marker"
@@ -22,7 +24,8 @@ import MapDragMarkerController from "src/decidim/map/controller/drag_marker"
  *   window.Decidim.createMapController = (mapId, config) => {
  *     if (config.type === "custom") {
  *       // Obviously you need to implement CustomMapController for this to
- *       // work.
+ *       // work. You can find an example at:
+ *       // decidim-dev/app/packs/src/decidim/dev/test/custom_map_factory.js
  *       return new window.Decidim.CustomMapController(mapId, config);
  *     }
  *

data/app/packs/src/decidim/map/icon.js

@@ -1,4 +1,3 @@
-import * as L from "leaflet";
 import { SVGIcon } from "src/decidim/map/svg-icon";
 
 L.DivIcon.SVGIcon = SVGIcon;

data/app/packs/src/decidim/map/legacy.js

@@ -1,6 +1,5 @@
 /* eslint-disable require-jsdoc */
 
-import * as L from "leaflet";
 import "src/decidim/map/factory"
 
 /**

data/app/packs/src/decidim/map/provider/default.js

@@ -1,3 +1,5 @@
+import "leaflet"
+
 /**
  * NOTE:
  * This has to load before decidim/map in order for it to apply correctly when

data/app/packs/src/decidim/map/provider/here.js

@@ -1,4 +1,5 @@
-import * as L from "leaflet"
+import "leaflet"
+import "src/decidim/vendor/leaflet-tilelayer-here"
 
 /**
  * NOTE:

data/app/packs/stylesheets/decidim/modules/_dropdown_menu.scss

@@ -0,0 +1,9 @@
+.dropdown.menu > li {
+  &.is-active > a {
+    color: var(--secondary);
+  }
+
+  &.is-dropdown-submenu-parent > a::after {
+    border-color: var(--secondary) transparent transparent;
+  }
+}

data/app/queries/decidim/last_activity.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This query finds the public ActionLog entries that can be shown in the
+  # activities views of the application within a Decidim Organization. It is
+  # intended to be used in the "Last activities" content block in the homepage,
+  # and also in the "Last activities" page, to retrieve public activity of this
+  # organization.
+  class LastActivity < Decidim::Query
+    def initialize(organization, options = {})
+      @organization = organization
+      @current_user = options[:current_user]
+    end
+
+    def query
+      @query ||= begin
+        query = base_query
+        query = filter_moderated(query)
+        query = filter_spaces(query)
+        query = filter_deleted(query)
+        query.with_new_resource_type("all")
+      end
+    end
+
+    private
+
+    attr_reader :organization, :current_user
+
+    def base_query
+      ActionLog
+        .where(organization: organization, visibility: visibility)
+        .order(created_at: :desc)
+    end
+
+    def visibility
+      %w(public-only all)
+    end
+
+    def filter_moderated(query)
+      # Filter out the items that have been moderated.
+      query.joins(
+        <<~SQL.squish
+          LEFT JOIN decidim_moderations
+            ON decidim_moderations.decidim_reportable_type = decidim_action_logs.resource_type
+            AND decidim_moderations.decidim_reportable_id = decidim_action_logs.resource_id
+            AND decidim_moderations.hidden_at IS NOT NULL
+      SQL
+      ).where(decidim_moderations: { id: nil })
+    end
+
+    def filter_spaces(query)
+      conditions = []
+
+      Decidim.participatory_space_manifests.map do |manifest|
+        klass = manifest.model_class_name.constantize
+
+        condition = if klass.include?(Decidim::HasPrivateUsers)
+                      Arel.sql(
+                        [
+                          "decidim_action_logs.participatory_space_type = '#{manifest.model_class_name}'",
+                          "decidim_action_logs.participatory_space_id IN (#{Arel.sql(klass.visible_for(current_user).select(:id).to_sql)})"
+                        ].join(" AND ")
+                      ).to_s
+                    else
+                      Arel.sql("decidim_action_logs.participatory_space_type = '#{manifest.model_class_name}'").to_s
+                    end
+
+        conditions << "(#{condition})"
+      end
+      query.where(Arel.sql(conditions.join(" OR ")).to_s)
+    end
+
+    def filter_deleted(query)
+      conditions = []
+
+      ActionLog.public_resource_types.each do |resource_type|
+        klass = resource_type.constantize
+
+        condition = if klass.respond_to?(:not_deleted)
+                      Arel.sql(
+                        [
+                          "decidim_action_logs.resource_type = '#{resource_type}'",
+                          "decidim_action_logs.resource_id IN (#{Arel.sql(klass.not_deleted.select(:id).to_sql)})"
+                        ].join(" AND ")
+                      ).to_s
+                    else
+                      Arel.sql("decidim_action_logs.resource_type = '#{resource_type}'").to_s
+                    end
+
+        conditions << "(#{condition})"
+      end
+
+      query.where(Arel.sql(conditions.join(" OR ")).to_s)
+    end
+  end
+end

data/app/queries/decidim/metrics/users_metric_manage.rb

@@ -11,15 +11,15 @@ module Decidim
       private
 
       def query
-        return @query if @query
-
-        @query = Decidim::User.where(organization: @organization)
-        @query = @query.where("created_at <= ?", end_time)
-        @query
+        @query ||= Decidim::User.where(organization: @organization)
+                                .where("deleted_at IS NULL OR deleted_at > ?", end_time)
+                                .where("blocked_at IS NULL OR blocked_at > ?", end_time)
+                                .confirmed
+                                .where("created_at <= ?", end_time)
       end
 
       def quantity
-        @quantity ||= @query.where("created_at >= ?", start_time).count
+        @quantity ||= query.where("created_at >= ?", start_time).count
       end
     end
   end