decidim-core 0.29.2 → 0.30.0.rc2

data/app/controllers/decidim/user_conversations_controller.rb

@@ -11,6 +11,7 @@ module Decidim
     include FormFactory
     include Messaging::ConversationHelper
     include HasProfileBreadcrumb
+    include AjaxPermissionHandler
 
     before_action :authenticate_user!
     before_action :ensure_profile_manager
@@ -18,9 +19,6 @@ module Decidim
     helper Decidim::ResourceHelper
     helper_method :user, :conversations, :conversation
 
-    # overwrite original rescue_from to ensure we print messages from ajax methods (update)
-    rescue_from Decidim::ActionForbidden, with: :ajax_user_has_no_permission
-
     def index
       enforce_permission_to :list, :conversation, interlocutor: user
     end
@@ -94,14 +92,6 @@ module Decidim
 
     private
 
-    # Rescue ajax calls and print the update.js view which prints the info on the message ajax form
-    # Only if the request is AJAX, otherwise behave as Decidim standards
-    def ajax_user_has_no_permission
-      return user_has_no_permission unless request.xhr?
-
-      render_unprocessable_entity I18n.t("actions.unauthorized", scope: "decidim.core")
-    end
-
     def render_unprocessable_entity(message)
       render action: :update, locals: { error: message }, status: :unprocessable_entity
     end

data/app/events/decidim/soft_delete_resource_event.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  class SoftDeleteResourceEvent < Decidim::Events::SimpleEvent
+    i18n_attributes :resource_type, :resource_title
+
+    def resource_type
+      resource.model_name.human
+    end
+
+    def resource_title
+      translated_attribute resource.title
+    end
+  end
+end

data/app/forms/decidim/amendable/form.rb

@@ -94,7 +94,8 @@ module Decidim
                            .from_model(@i18n_amendable)
                            .with_context(
                              current_component: @i18n_amendable.component,
-                             current_participatory_space: @i18n_amendable.participatory_space
+                             current_participatory_space: @i18n_amendable.participatory_space,
+                             current_organization: @i18n_amendable.organization
                            )
       end
 
@@ -114,7 +115,8 @@ module Decidim
       def form_context
         context.to_h.merge(
           current_component: amendable.component,
-          current_participatory_space: amendable.participatory_space
+          current_participatory_space: amendable.participatory_space,
+          current_organization: amendable.organization
         )
       end
     end

data/app/forms/decidim/ephemeral_user_form.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The form object of ephemeral users.
+  class EphemeralUserForm < Form
+    mimic :user
+
+    attribute :locale
+    attribute :name
+    attribute :nickname
+    attribute :organization
+    attribute :verified, Boolean, default: false
+
+    def name
+      super || I18n.t("decidim.ephemeral_user", locale:)
+    end
+
+    def nickname
+      super || User.nicknamize(name)
+    end
+  end
+end

data/app/forms/decidim/notifications_settings_form.rb

@@ -7,6 +7,7 @@ module Decidim
     mimic :user
 
     attribute :email_on_moderations, Boolean
+    attribute :email_on_assigned_proposals, Boolean
     attribute :newsletter_notifications, Boolean
     attribute :notifications_from_followed, Boolean
     attribute :notifications_from_own_activity, Boolean

data/app/forms/decidim/omniauth_registration_form.rb

@@ -11,6 +11,7 @@ module Decidim
     attribute :provider, String
     attribute :uid, String
     attribute :tos_agreement, Boolean
+    attribute :newsletter, Boolean
     attribute :oauth_signature, String
     attribute :avatar_url, String
     attribute :raw_data, Hash
@@ -21,11 +22,23 @@ module Decidim
     validates :uid, presence: true
 
     def self.create_signature(provider, uid)
-      Digest::MD5.hexdigest("#{provider}-#{uid}-#{Rails.application.secrets.secret_key_base}")
+      Digest::MD5.hexdigest("#{provider}-#{uid}-#{Rails.application.secret_key_base}")
     end
 
     def normalized_nickname
       UserBaseEntity.nicknamize(nickname || name, organization: current_organization)
     end
+
+    def newsletter_at
+      return nil unless newsletter?
+
+      Time.current
+    end
+
+    def valid_tos?
+      return if tos_agreement.nil?
+
+      errors.add :tos_agreement, :accepted
+    end
   end
 end

data/app/helpers/concerns/decidim/flash_helper_extensions.rb

@@ -7,6 +7,17 @@ module Decidim
     extend ActiveSupport::Concern
 
     included do
+      DEFAULT_KEY_MATCHING = {
+        alert: :alert,
+        notice: :success,
+        info: :info,
+        secondary: :secondary,
+        success: :success,
+        error: :alert,
+        warning: :warning,
+        primary: :primary
+      }.freeze
+
       # Displays the flash messages found in ActionDispatch's +flash+ hash using
       # FoundationRailsHelper's +callout+ component.
       #
@@ -20,7 +31,7 @@ module Decidim
       #
       # @return [String] the HTML with all the flash messages
       def display_flash_messages(closable: true, key_matching: {})
-        key_matching = FoundationRailsHelper::FlashHelper::DEFAULT_KEY_MATCHING.merge(key_matching)
+        key_matching = DEFAULT_KEY_MATCHING.merge(key_matching)
         key_matching.default = :primary
 
         capture do
@@ -106,13 +117,17 @@ module Decidim
       end
 
       def message(value)
-        return content_tag(:div, value, class: "flash__message flex items-center") unless value.is_a?(Hash)
+        return content_tag(:div, value, class: "flash__message") unless value.is_a?(Hash)
 
         content_tag(:div, class: "flash__message") do
           concat value[:title]
           concat content_tag(:span, value[:body], class: "flash__message-body")
         end
       end
+
+      def ignored_key?(key)
+        [:timedout].include?(key)
+      end
     end
   end
 end

data/app/helpers/decidim/action_authorization_helper.rb

@@ -57,26 +57,35 @@ module Decidim
         url = arguments[0]
         html_options = arguments[1]
       else
-        body = content_tag :span, arguments[0]
+        body = arguments[0]
         url = arguments[1]
         html_options = arguments[2]
       end
 
-      html_options ||= {}
+      html_options = (html_options || {}).with_indifferent_access
       resource = html_options.delete(:resource)
       permissions_holder = html_options.delete(:permissions_holder)
+      authorization_status = get_authorization_status(action, resource, permissions_holder)
+      redirect_path = valid_redirect(url, tag:, method: html_options[:method])
+      onboarding_options = onboarding_data_attributes(authorization_status, action, resource, permissions_holder, redirect_path)
 
-      if !current_user
-        html_options = clean_authorized_to_data_open(html_options)
-
+      if sign_in_required?(authorization_status)
+        html_options = clean_authorized_to_data_open(html_options.merge(onboarding_options))
         html_options["data-dialog-open"] = "loginModal"
-        url = "#"
-      elsif action && !action_authorized_to(action, resource:, permissions_holder:).ok?
-        html_options = clean_authorized_to_data_open(html_options)
 
-        html_options["data-dialog-open"] = "authorizationModal"
-        html_options["data-dialog-remote-url"] = modal_path(action, resource)
         url = "#"
+      elsif authorization_status&.ok? == false
+        html_options = clean_authorized_to_data_open(html_options.merge(onboarding_options))
+        if pending_steps?(authorization_status)
+          tag = "link"
+          html_options["method"] = "post"
+          html_options.delete(:remote)
+          url = decidim_verifications.renew_onboarding_data_authorizations_path
+        else
+          html_options["data-dialog-open"] = "authorizationModal"
+          html_options["data-dialog-remote-url"] = modal_path(action, resource, html_options)
+          url = "#"
+        end
       end
 
       html_options["onclick"] = "event.preventDefault();" if url == ""
@@ -84,25 +93,33 @@ module Decidim
       if block
         send("#{tag}_to", url, html_options, &body)
       else
-        send("#{tag}_to", body, url, html_options)
+        send("#{tag}_to", content_tag(:span, body), url, html_options)
       end
     end
     # rubocop: enable Metrics/PerceivedComplexity
 
-    def modal_path(action, resource)
+    def modal_path(action, resource, opts = {})
+      if (default_path = opts.delete(:authorizations_modal_path)).present?
+        return default_path
+      end
+
       resource_params = if resource
                           { resource_name: resource.resource_manifest.name, resource_id: resource.id }
                         else
                           {}
                         end
-      if current_component.present?
-        decidim.authorization_modal_path(authorization_action: action, component_id: current_component&.id, **resource_params)
+
+      component = try(:current_component)
+      if component.present?
+        decidim.authorization_modal_path(authorization_action: action, component_id: component&.id, **resource_params)
       else
         decidim.free_resource_authorization_modal_path(authorization_action: action, **resource_params)
       end
     end
 
     def clean_authorized_to_data_open(html_options)
+      return {} if html_options.blank?
+
       html_options.delete(:"data-dialog-open")
       html_options.delete(:"data-dialog-remote-url")
 
@@ -115,9 +132,53 @@ module Decidim
         html_options[key].delete("open_url")
         html_options[key].delete(:"open-url")
         html_options[key].delete("open-url")
+        html_options[key].delete(:"dialog-open")
+        html_options[key].delete(:"dialog-remote-url")
       end
 
       html_options
     end
+
+    def get_authorization_status(action, resource, permissions_holder)
+      return if action.blank?
+
+      permissions_holder ||= resource.blank? ? try(:current_component) : nil
+      return if permissions_holder.blank? && resource.try(:component).blank?
+
+      action_authorized_to(action, resource:, permissions_holder:)
+    end
+
+    def pending_steps?(authorization_status)
+      authorization_status.pending_authorizations_count.positive? && authorization_status.global_code != :unauthorized
+    end
+
+    def onboarding_data_attributes(authorization_status, action, resource, permissions_holder, redirect_path = nil)
+      return {} if action.blank?
+      return {} unless pending_steps?(authorization_status)
+
+      permissions_holder ||= try(:current_component) if resource.blank?
+      return {} if [resource, permissions_holder].all?(&:blank?)
+
+      {
+        "data-onboarding-model" => resource&.to_gid,
+        "data-onboarding-permissions-holder" => permissions_holder&.to_gid,
+        "data-onboarding-action" => action,
+        "data-onboarding-redirect-path" => redirect_path
+      }.compact
+    end
+
+    def valid_redirect(path, opts = {})
+      return if opts[:tag]&.to_sym == :button
+      return if path == "#"
+      return if opts[:method].present? && opts[:method].to_s != "get"
+
+      path
+    end
+
+    def sign_in_required?(authorization_status)
+      return if current_user.present?
+
+      !authorization_status&.ephemeral?
+    end
   end
 end

data/app/helpers/decidim/amendments_helper.rb

@@ -16,15 +16,6 @@ module Decidim
       cell("decidim/amendable/announcement", emendation)
     end
 
-    # Returns Html action button card to AMEND an amendable resource
-    def amend_button_for(amendable)
-      return unless amendments_enabled? && amendable.amendable?
-      return unless current_component.current_settings.amendment_creation_enabled
-      return unless can_participate_in_private_space?
-
-      cell("decidim/amendable/amend_button_card", amendable)
-    end
-
     # Checks if the user can participate in a participatory space
     # based on its settings related with Decidim::HasPrivateUsers.
     def can_participate_in_private_space?

data/app/helpers/decidim/application_helper.rb

@@ -4,11 +4,15 @@ module Decidim
   # Main module to add application-wide helpers.
   module ApplicationHelper
     include Decidim::OmniauthHelper
-    include Decidim::ScopesHelper
+    include Decidim::DecidimFormHelper
     include Decidim::ContextualHelpHelper
     include Decidim::AmendmentsHelper
     include Decidim::CacheHelper
 
+    def layout_item_classes
+      "layout-item"
+    end
+
     # Truncates a given text respecting its HTML tags.
     #
     # text    - The String text to be truncated.
@@ -99,7 +103,7 @@ module Decidim
     # Renders the cell contents.
     def cell(name, model, options = {}, &)
       options = { context: { view_context: self, current_user: } }.deep_merge(options)
-      super(name, model, options, &)
+      super
     end
 
     def prevent_timeout_seconds

data/app/helpers/decidim/breadcrumb_helper.rb

@@ -56,5 +56,11 @@ module Decidim
         active: active_item.active?
       }
     end
+
+    def render_schema_org_breadcrumb_list(breadcrumb_items)
+      exporter_options = { breadcrumb_items:, base_url: request.base_url, organization_name: current_organization_name }
+      exported_breadcrumb_list = Decidim::Exporters::JSON.new([exporter_options], Decidim::SchemaOrgBreadcrumbListSerializer).export.read
+      JSON.pretty_generate(JSON.parse(exported_breadcrumb_list).first)
+    end
   end
 end

data/app/helpers/decidim/cache_helper.rb

@@ -8,7 +8,7 @@ module Decidim
     def cache(name = {}, options = {}, &)
       name = Array(name) + [current_locale]
 
-      super(name, options, &)
+      super
     end
   end
 end

data/app/helpers/decidim/check_boxes_tree_helper.rb

@@ -9,6 +9,7 @@ module Decidim
     # used in filters that uses checkboxes trees
     def check_boxes_tree_options(value, label, **options)
       parent_id = options.delete(:parent_id) || ""
+      object = options.delete(:object)
       checkbox_options = {
         value:,
         label:,
@@ -16,10 +17,16 @@ module Decidim
         include_hidden: false,
         label_options: {
           "data-children-checkbox": parent_id,
-          value:
+          value:,
+          for: "#{options[:namespace]}_#{options[:id]}"
         }
       }
       options.merge!(checkbox_options)
+      # as taxonomies work with a nested array of values, we need to manually check if the value is checked
+      matches = options[:id]&.match(/^with_any_taxonomies_([0-9]+)__taxonomy-([0-9_]+)/)
+      if matches.present? && object.respond_to?(:with_any_taxonomies) && object.with_any_taxonomies&.dig(matches[1]).is_a?(Array)
+        options[:checked] = object.with_any_taxonomies[matches[1]].include?(value.to_s)
+      end
 
       if options.delete(:is_root_check_box) == true
         options[:label_options].merge!("data-global-checkbox": "")
@@ -37,10 +44,14 @@ module Decidim
     end
 
     # struct for leafs of checkboxes trees
-    TreePoint = Struct.new(:value, :label) do
+    TreePoint = Struct.new(:value, :label, :root) do
       def tree_node?
         is_a?(TreeNode)
       end
+
+      def root?
+        root.present? || value.blank?
+      end
     end
 
     # Overwrite this method in your component helper to define
@@ -49,52 +60,29 @@ module Decidim
       raise StandardError, "Not implemented"
     end
 
-    def filter_categories_values
-      sorted_main_categories = current_participatory_space.categories.first_class.includes(:subcategories).sort_by do |category|
-        [category.weight, decidim_escape_translated(category.name)]
-      end
-
-      categories_values = sorted_main_categories.flat_map do |category|
-        sorted_descendant_categories = category.descendants.includes(:subcategories).sort_by do |subcategory|
-          [subcategory.weight, decidim_escape_translated(subcategory.name)]
-        end
-
-        subcategories = sorted_descendant_categories.flat_map do |subcategory|
-          TreePoint.new(subcategory.id.to_s, decidim_escape_translated(subcategory.name))
-        end
-
-        TreeNode.new(
-          TreePoint.new(category.id.to_s, decidim_escape_translated(category.name)),
-          subcategories
-        )
-      end
-
+    def filter_taxonomy_values_for(taxonomy_filter)
+      taxonomies = filter_taxonomy_values_children(taxonomy_filter.taxonomies)
       TreeNode.new(
-        TreePoint.new("", t("decidim.core.application_helper.filter_category_values.all")),
-        categories_values
+        TreePoint.new(taxonomy_filter.root_taxonomy_id, t("decidim.core.application_helper.filter_taxonomy_values.all"), true),
+        taxonomies
       )
     end
 
-    def resource_filter_scope_values(resource)
-      if resource.is_a?(Scope)
-        filter_scopes_values_from([resource], current_participatory_space)
-      else
-        filter_scopes_values
+    def filter_taxonomy_values_children(children)
+      children.map do |id, hash|
+        TreeNode.new(
+          TreePoint.new(id, decidim_escape_translated(hash[:taxonomy].name).html_safe),
+          filter_taxonomy_values_children(hash[:children])
+        )
       end
     end
 
-    def filter_scopes_values
-      return filter_scopes_values_from_parent(current_component.scope) if current_component.scope.present?
-
-      main_scopes = current_participatory_space.scopes.top_level
-                                               .includes(:scope_type, :children)
-      filter_scopes_values_from(main_scopes, current_participatory_space)
-    end
-
+    # pending initiatives removal
     def filter_global_scopes_values
       filter_scopes_values_from(current_organization.scopes.top_level)
     end
 
+    # pending initiatives removal
     def filter_areas_values
       areas_or_types = areas_for_select(current_organization)
 
@@ -135,22 +123,6 @@ module Decidim
 
     private
 
-    def filter_scopes_values_from_parent(scope)
-      scopes_values = []
-      scope.children.each do |child|
-        unless child.children
-          scopes_values << TreePoint.new(child.id.to_s, translated_attribute(child.name, current_participatory_space.organization))
-          next
-        end
-        scopes_values << TreeNode.new(
-          TreePoint.new(child.id.to_s, translated_attribute(child.name, current_participatory_space.organization)),
-          scope_children_to_tree(child, current_participatory_space)
-        )
-      end
-
-      filter_tree_from(scopes_values)
-    end
-
     def filter_scopes_values_from(scopes, participatory_space = nil)
       scopes_values = scopes.compact.flat_map do |scope|
         TreeNode.new(

data/app/helpers/decidim/decidim_form_helper.rb

@@ -62,35 +62,6 @@ module Decidim
       end
     end
 
-    # A custom helper to include a scope picker field without requiring a form
-    # object
-    #
-    # name - The input name
-    # value - The input value as a scope id
-    # options - The set of options to send to the field
-    #           :id - The id to generate for the element (optional)
-    #
-    # Returns a scopes picker tag to be included in an html template.
-    def scopes_picker_field_tag(name, value, id: nil)
-      picker_options = {
-        id: id || sanitize_to_id(name),
-        class: "picker-single",
-        name:
-      }
-
-      prompt_params = yield(nil)
-      selected_scopes = value ? Decidim::Scope.where(id: value) : []
-      scopes = selected_scopes.map { |scope| [scope, yield(scope)] }
-
-      template = ""
-      template += render("decidim/scopes/scopes_picker_input",
-                         picker_options:,
-                         prompt_params:,
-                         scopes:,
-                         values_on_top: true)
-      template.html_safe
-    end
-
     # A custom helper to include a translated field without requiring a form object.
     #
     # type        - The type of the translated input field.
@@ -220,20 +191,5 @@ module Decidim
 
       organization.area_types
     end
-
-    def ordered_scopes_descendants(root = nil)
-      root = try(:current_participatory_space)&.scope if root == false
-      if root.present?
-        root.descendants
-      else
-        current_organization.scopes
-      end.sort { |a, b| a.part_of.reverse <=> b.part_of.reverse }
-    end
-
-    def ordered_scopes_descendants_for_select(root = nil)
-      ordered_scopes_descendants(root).map do |scope|
-        [" #{"&nbsp;" * 4 * (scope.part_of.count - 1)} #{translated_attribute(scope.name)}".html_safe, scope&.id]
-      end
-    end
   end
 end

data/app/helpers/decidim/endorsable_helper.rb

@@ -3,16 +3,6 @@
 module Decidim
   # A Helper for views with Endorsable resources.
   module EndorsableHelper
-    # Invokes the decidim/endorsement_buttons cell.
-    def endorsement_buttons_cell(resource)
-      cell("decidim/endorsement_block", resource)
-    end
-
-    # Invokes the decidim/endorsers_list cell.
-    def endorsers_list_cell(resource)
-      cell("decidim/endorsers_list", resource)
-    end
-
     #
     # Public: Checks if the given resource has been endorsed by all identities of the user.
     #

data/app/helpers/decidim/layout_helper.rb

@@ -154,6 +154,12 @@ module Decidim
       "#{request.base_url}#{"?#{params.to_query}" unless params.empty?}"
     end
 
+    def root_url
+      return onboarding_manager.root_path if current_user&.ephemeral?
+
+      decidim.root_url(host: current_organization.host)
+    end
+
     private
 
     def each_decidim_engine

data/app/helpers/decidim/messaging/conversation_helper.rb

@@ -29,10 +29,9 @@ module Decidim
       # Generates a visualization of users for listing conversations threads
       #
       def username_list(users, shorten: false)
-        content_tags = []
         first_users = shorten ? users.first(3) : users
-        first_users.each do |u|
-          content_tags.push(u.deleted? ? t("decidim.profile.deleted") : u.name)
+        content_tags = first_users.map do |u|
+          u.deleted? ? t("decidim.profile.deleted") : u.name
         end
 
         return content_tags.join(", ") unless shorten