decidim-core 0.29.5 → 0.30.0.rc1

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?
@@ -70,9 +61,8 @@ module Decidim
     # Checks if the user can accept and reject the emendation
     def allowed_to_accept_and_reject?(emendation)
       return unless emendation.amendment.evaluating?
-      return current_user.admin? if emendation.amendable.respond_to?(:official?) && emendation.amendable.official?
 
-      emendation.amendable.created_by?(current_user)
+      emendation.amendable.created_by?(current_user) || current_user.admin?
     end
 
     # Checks if the user can promote the emendation

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/filters_helper.rb

@@ -32,31 +32,6 @@ module Decidim
       end
     end
 
-    def filter_search_label(label, id)
-      I18n.t("decidim.searches.filters.resource", label:, collection: filter_for_resource(id))
-    end
-
-    def filter_for_resource(skip_to_id)
-      case skip_to_id
-      when "proposals"
-        I18n.t("decidim/proposals/proposal.other", scope: "activerecord.models")
-      when "meetings"
-        I18n.t("decidim/meetings/meeting.other", scope: "activerecord.models")
-      when "debates"
-        I18n.t("decidim/debates/debate.other", scope: "activerecord.models")
-      when "sortitions"
-        I18n.t("decidim/sortitions/sortition.other", scope: "activerecord.models")
-      when "surveys"
-        I18n.t("decidim/surveys/survey.other", scope: "activerecord.models")
-      when "projects"
-        I18n.t("decidim/budgets/project.other", scope: "activerecord.models")
-      when "initiatives"
-        I18n.t("decidim/initiative.other", scope: "activerecord.models")
-      else
-        ""
-      end
-    end
-
     private
 
     # Creates a unique namespace for a filter form to prevent duplicate IDs in

data/app/helpers/decidim/layout_helper.rb

@@ -60,12 +60,6 @@ module Decidim
       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)
 
-      if name == "wechat-line"
-        html_properties = html_properties.merge({ "aria-label" => I18n.t("decidim.author.comments.other") }).except("aria-hidden")
-      elsif name == "heart-line"
-        html_properties = html_properties.merge({ "aria-label" => I18n.t("decidim.author.endorsements.other") }).except("aria-hidden")
-      end
-
       href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg")
 
       content_tag :svg, html_properties do
@@ -160,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/menu_helper.rb

@@ -39,7 +39,7 @@ module Decidim
       @breadcrumb_root_menu ||= ::Decidim::BreadcrumbRootMenuPresenter.new(
         :menu,
         self,
-        container_options: { class: "menu-bar__dropdown-menu" }
+        container_options: { class: "menu-bar__main-dropdown__menu" }
       )
     end
 
@@ -47,7 +47,7 @@ module Decidim
       @mobile_breadcrumb_root_menu ||= ::Decidim::BreadcrumbRootMenuPresenter.new(
         :mobile_menu,
         self,
-        container_options: { class: "menu-bar__main-dropdown__top-menu" }
+        container_options: { class: "menu-bar__main-dropdown__menu" }
       )
     end
 

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

data/app/helpers/decidim/meta_tags_helper.rb

@@ -8,6 +8,7 @@ module Decidim
     # the other methods to see how they work.
     #
     # @param [Hash] tags - A Hash containing the meta tag name as keys and its content as values.
+    # @param [Object, nil] resource - The resource object that may contain the image.
     #
     # @return [nil]
     def add_decidim_meta_tags(tags)
@@ -15,33 +16,31 @@ module Decidim
       add_decidim_meta_description(tags[:description])
       add_decidim_meta_url(tags[:url])
       add_decidim_meta_twitter_handler(tags[:twitter_handler])
-      add_decidim_meta_image_url(add_base_url_to(tags[:image_url]))
+      image_url = tags[:image_url].presence || resolve_meta_image_url(tags[:resource])
+      add_decidim_meta_image_url(add_base_url_to(image_url)) if image_url.present?
     end
 
-    # Add base url to path if path does not include host.
+    # Adds base URL to the given path if it does not include a host.
     #
-    # @parma [String] path - A String containing path (e.g. "/proposals/1" )
+    # @param [String] path - A String containing the path (e.g. "/proposals/1").
     #
-    # @return [String] - a String of URL including base URL and path, or path if it is blank.
+    # @return [String] - A String with the base URL and path, or the original path if it already includes a host.
     def add_base_url_to(path)
-      return path if path.blank?
-      return path if URI.parse(path).host.present?
+      return path if path.blank? || URI.parse(path).host.present?
 
       "#{resolve_base_url}#{path}"
     end
 
-    # Resolve base url (example: https://www.decidim.org) without url params
+    # Resolves the base URL (example: https://www.decidim.org) without URL parameters.
     #
-    # @return [String] -  a String of base URL
+    # @return [String] - A String of the base URL.
     def resolve_base_url
       return request.base_url if respond_to?(:request) && request&.base_url.present?
 
       uri = URI.parse(decidim.root_url(host: current_organization.host))
-      if uri.port.blank? || [80, 443].include?(uri.port)
-        "#{uri.scheme}://#{uri.host}"
-      else
-        "#{uri.scheme}://#{uri.host}:#{uri.port}"
-      end
+      port = uri.port.present? && [80, 443].exclude?(uri.port) ? ":#{uri.port}" : ""
+
+      "#{uri.scheme}://#{uri.host}#{port}"
     end
 
     #  Accumulates the given `title` so that they can be chained. Since Rails views
@@ -60,22 +59,20 @@ module Decidim
     # @return [Array<String>]
     def add_decidim_page_title(title)
       @decidim_page_title ||= []
-      return @decidim_page_title if title.blank?
-
-      @decidim_page_title << title
+      @decidim_page_title << title if title.present?
+      @decidim_page_title
     end
 
     # Renders the title for a page. Use the `add_decidim_page_title` method to
     # accumulate elements for the title. Basically, it joins the elements of the title
     # array with `" - "`.
     #
-    # @return [String]
+    # @return [String] - The concatenated title.
     def decidim_page_title
       (@decidim_page_title || []).join(" - ")
     end
 
-    attr_reader :decidim_meta_description, :decidim_meta_url, :decidim_meta_image_url,
-                :decidim_meta_twitter_handler
+    attr_reader :decidim_meta_description, :decidim_meta_url, :decidim_meta_image_url, :decidim_meta_twitter_handler
 
     # Sets the meta description for the current page. We want to keep the most specific
     # one, so you cannot replace the description if it is set by a view that has already
@@ -83,7 +80,7 @@ module Decidim
     # is the last one to be rendered. You can put there a basic content and override it
     # in other layers.
     #
-    # @param [String] description - The String to be set as description
+    # @param [String] description - The String to be set as description.
     #
     # @return [nil]
     def add_decidim_meta_description(description)
@@ -96,7 +93,7 @@ module Decidim
     # is the last one to be rendered. You can put there a basic content and override it
     # in other layers.
     #
-    # @param [String] twitter_handler - The String to be set as Twitter handler
+    # @param [String] twitter_handler - The String to be set as Twitter handler.
     #
     # @return [nil]
     def add_decidim_meta_twitter_handler(twitter_handler)
@@ -109,7 +106,7 @@ module Decidim
     # is the last one to be rendered. You can put there a basic content and override it
     # in other layers.
     #
-    # @param [String] url - The String to be set as URL
+    # @param [String] url - The String to be set as URL.
     #
     # @return [nil]
     def add_decidim_meta_url(url)
@@ -122,11 +119,23 @@ module Decidim
     # is the last one to be rendered. You can put there a basic content and override it
     # in other layers.
     #
-    # @param [String] image_url - The String to be set as image URL
+    # @param [String] image_url - The String to be set as image URL.
     #
     # @return [nil]
     def add_decidim_meta_image_url(image_url)
       @decidim_meta_image_url ||= image_url
     end
+
+    # Resolves the image URL to be used for meta tags.
+    # This method creates a new instance of MetaImageUrlResolver,
+    # which handles the logic for determining the most appropriate image URL.
+    #
+    # @param [Object, nil] resource - The resource object that may contain the image.
+    #
+    # @return [String, nil] - The resolved image URL, or nil if no appropriate image URL is found.
+    def resolve_meta_image_url(resource)
+      url = MetaImageUrlResolver.new(resource, current_organization).resolve
+      add_base_url_to(url) if url.present?
+    end
   end
 end

data/app/helpers/decidim/modal_helper.rb

@@ -34,5 +34,28 @@ module Decidim
         end
       end
     end
+
+    def decidim_drawer(opts = {}, &)
+      opts[:closable] = true unless opts.has_key?(:closable)
+
+      button = if opts[:closable] == false
+                 ""
+               else
+                 content_tag(
+                   :button,
+                   "&times".html_safe,
+                   type: :button,
+                   data: { dialog_close: opts[:id] || "", dialog_closable: "" },
+                   "aria-label": t("close_modal", scope: "decidim.shared.confirm_modal")
+                 )
+               end
+
+      content = opts[:remote].nil? ? button + capture(&).html_safe : button + icon("loader-3-line")
+      content_tag(:div, id: opts[:id], data: { dialog: opts[:id] || "", drawer: true }.merge(opts[:data] || {})) do
+        content_tag(:div, id: "#{opts[:id]}-content", class: opts[:class]) do
+          content
+        end
+      end
+    end
   end
 end