decidim-proposals 0.21.0 → 0.22.0

data/app/helpers/decidim/proposals/admin/filterable_helper.rb

@@ -4,10 +4,10 @@ module Decidim
   module Proposals
     module Admin
       module FilterableHelper
-        def extra_dropdown_submenu_options_items(filter)
+        def extra_dropdown_submenu_options_items(filter, i18n_scope)
           options = case filter
                     when :state_eq
-                      content_tag(:li, filter_link_value(:state_null, true))
+                      content_tag(:li, filter_link_value(:state_null, true, i18n_scope))
                     end
           [options].compact
         end

data/app/helpers/decidim/proposals/admin/proposal_rankings_helper.rb

@@ -17,7 +17,7 @@ module Decidim
         #
         # Examples:
         #   ranking_for(proposal, proposal_votes_count: :desc)
-        #   ranking_for(proposal, proposal_endorsements_count: :desc)
+        #   ranking_for(proposal, endorsements_count: :desc)
         def ranking_for(proposal, order = {})
           siblings = Decidim::Proposals::Proposal.where(component: proposal.component)
           ranked = siblings.order([order, id: :asc])
@@ -28,7 +28,7 @@ module Decidim
 
         # Public: Gets the ranking for a given proposal, ordered by endorsements.
         def endorsements_ranking_for(proposal)
-          ranking_for(proposal, proposal_endorsements_count: :desc)
+          ranking_for(proposal, endorsements_count: :desc)
         end
 
         # Public: Gets the ranking for a given proposal, ordered by votes.

data/app/helpers/decidim/proposals/admin/proposals_picker_helper.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # This class contains helpers needed to show the Proposals picker.
+      #
+      module ProposalsPickerHelper
+        def proposals_picker(form, field, url)
+          picker_options = {
+            id: sanitize_to_id(field),
+            class: "picker-multiple",
+            name: "#{form.object_name}[#{field.to_s.sub(/s$/, "_ids")}]",
+            multiple: true,
+            autosort: true
+          }
+
+          prompt_params = {
+            url: url,
+            text: t("proposals_picker.choose_proposals", scope: "decidim.proposals")
+          }
+
+          form.data_picker(field, picker_options, prompt_params) do |item|
+            { url: url, text: present(item).id_and_title }
+          end
+        end
+      end
+    end
+  end
+end

data/app/helpers/decidim/proposals/application_helper.rb

@@ -8,7 +8,8 @@ module Decidim
       include Decidim::Comments::CommentsHelper
       include PaginateHelper
       include ProposalVotesHelper
-      include ProposalEndorsementsHelper
+      include ::Decidim::EndorsableHelper
+      include ::Decidim::FollowableHelper
       include Decidim::MapHelper
       include Decidim::Proposals::MapHelper
       include CollaborativeDraftHelper
@@ -99,8 +100,11 @@ module Decidim
       # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.
       def render_proposal_body(proposal)
         body = present(proposal).body(links: true, strip_tags: !safe_content?)
+        body = simple_format(body, {}, sanitize: false)
 
-        safe_content? ? decidim_sanitize(body) : simple_format(body, {}, sanitize: false)
+        return body unless safe_content?
+
+        decidim_sanitize(body)
       end
 
       # Returns :text_area or :editor based on the organization' settings.
@@ -127,10 +131,6 @@ module Decidim
         ).count
       end
 
-      def follow_button_for(model, large = nil)
-        render partial: "decidim/shared/follow_button.html", locals: { followable: model, large: large }
-      end
-
       def votes_count_for(model, from_proposals_list)
         render partial: "decidim/proposals/proposals/participatory_texts/proposal_votes_count.html", locals: { proposal: model, from_proposals_list: from_proposals_list }
       end

data/app/helpers/decidim/proposals/control_version_helper.rb

@@ -5,43 +5,7 @@ module Decidim
     # Custom helpers, scoped to the proposals engine.
     module ControlVersionHelper
       def item_name
-        item.model_name.singular_route_key.to_sym
-      end
-
-      def back_to_resource_path_text
-        case item_name
-        when :proposal
-          t("back_to_proposal", scope: "decidim.proposals.versions.stats")
-        when :collaborative_draft
-          t("back_to_collaborative_draft", scope: "decidim.proposals.versions.stats")
-        end
-      end
-
-      def back_to_resource_path
-        case item_name
-        when :proposal
-          proposal_path(item)
-        when :collaborative_draft
-          collaborative_draft_path(item)
-        end
-      end
-
-      def resource_version_path(index)
-        case item_name
-        when :proposal
-          proposal_version_path(item, index + 1)
-        when :collaborative_draft
-          collaborative_draft_version_path(item, index + 1)
-        end
-      end
-
-      def resource_all_versions_path
-        case item_name
-        when :proposal
-          proposal_versions_path(item)
-        when :collaborative_draft
-          collaborative_draft_versions_path(item)
-        end
+        versioned_resource.model_name.singular_route_key.to_sym
       end
     end
   end

data/app/helpers/decidim/proposals/proposal_endorsements_helper.rb

@@ -1,145 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Proposals
-    # Simple helper to handle markup variations for proposal endorsements partials
-    module ProposalEndorsementsHelper
-      # Returns the css classes used for proposal endorsement button in both proposals list and show pages
-      #
-      # from_proposals_list - A boolean to indicate if the template is rendered from the proposals list page
-      #
-      # Returns a string with the value of the css classes.
-      def endorsement_button_classes(from_proposals_list)
-        return "small" if from_proposals_list
-
-        "small compact light button--sc expanded"
-      end
-
-      # Public: Checks if endorsement are enabled in this step.
-      #
-      # Returns true if enabled, false otherwise.
-      def endorsements_enabled?
-        current_settings.endorsements_enabled
-      end
-
-      # Public: Checks if endorsements are blocked in this step.
-      #
-      # Returns true if blocked, false otherwise.
-      def endorsements_blocked?
-        current_settings.endorsements_blocked
-      end
-
-      # Public: Checks if the current user is allowed to endorse in this step.
-      #
-      # Returns true if the current user can endorse, false otherwise.
-      def current_user_can_endorse?
-        current_user && endorsements_enabled? && !endorsements_blocked?
-      end
-
-      # Public: Checks if the card for endorsements should be rendered.
-      #
-      # Returns true if the endorsements card should be rendered, false otherwise.
-      def show_endorsements_card?
-        endorsements_enabled?
-      end
-
-      def endorsement_identity_presenter(endorsement)
-        if endorsement.user_group
-          Decidim::UserGroupPresenter.new(endorsement.user_group)
-        else
-          Decidim::UserPresenter.new(endorsement.author)
-        end
-      end
-
-      # Public: Renders a button to endorse the given proposal.
-      # To override the translation for both buttons: endorse and unendorse (use to be the name of the user/user_group).
-      #
-      # @params (mandatory): proposal, from_proposals_list
-      # @params (optional) : user_group, btn_label
-      def endorsement_button(proposal, from_proposals_list, btn_label = nil, user_group = nil)
-        current_endorsement_url = proposal_proposal_endorsement_path(
-          proposal_id: proposal,
-          from_proposals_list: from_proposals_list,
-          user_group_id: user_group&.id
-        )
-        endorse_label = btn_label || t("decidim.proposals.proposal_endorsements_helper.endorsement_button.endorse")
-        unendorse_label = btn_label || t("decidim.proposals.proposal_endorsements_helper.endorsement_button.already_endorsed")
-
-        render partial: "decidim/proposals/proposals/endorsement_button", locals: { proposal: proposal,
-                                                                                    from_proposals_list: from_proposals_list, user_group: user_group,
-                                                                                    current_endorsement_url: current_endorsement_url,
-                                                                                    endorse_label: endorse_label, unendorse_label: unendorse_label }
-      end
-
-      #
-      # Public: Checks if the given Proposal has been endorsed by all identities of the user.
-      #
-      # @param proposal: The Proposal from which endorsements will be checked against.
-      # @param user:     The user whose identities and endorsements  will be checked against.
-      #
-      def fully_endorsed?(proposal, user)
-        return false unless user
-
-        user_group_endorsements = Decidim::UserGroups::ManageableUserGroups.for(user).verified.all? { |user_group| proposal.endorsed_by?(user, user_group) }
-
-        user_group_endorsements && proposal.endorsed_by?(user)
-      end
-
-      # Public: Renders an identity for endorsement.
-      #
-      # @params (mandatory): proposal, from_proposals_list
-      # @params (mandatory): user, the user that is endorsing at the end.
-      # @params (optional) : user_group, the user_group on behalf of which the endorsement is being done
-      def render_endorsement_identity(proposal, user, user_group = nil)
-        current_endorsement_url = proposal_proposal_endorsement_path(
-          proposal_id: proposal,
-          from_proposals_list: false,
-          user_group_id: user_group&.id,
-          authenticity_token: form_authenticity_token
-        )
-        presenter = if user_group
-                      Decidim::UserGroupPresenter.new(user_group)
-                    else
-                      Decidim::UserPresenter.new(user)
-                    end
-        selected = proposal.endorsed_by?(user, user_group)
-        http_method = selected ? :delete : :post
-        render partial: "decidim/proposals/proposal_endorsements/identity", locals:
-        { identity: presenter, selected: selected, current_endorsement_url: current_endorsement_url, http_method: http_method }
-      end
-
-      # Renders the counter of endorsements that appears in card at show Propoal.
-      def render_endorsements_count_card_part(proposal, fully_endorsed, html_class = nil)
-        content = icon("bullhorn", class: "icon--small", aria_label: "Endorsements", role: "img")
-        content += proposal.proposal_endorsements_count.to_s
-        html_class = "button small compact light button--sc button--shadow" if html_class.blank?
-        tag_params = { id: "proposal-#{proposal.id}-endorsements-count", class: "#{html_class} #{fully_endorsed ? "success" : "secondary"}" }
-        if proposal.proposal_endorsements_count.positive?
-          link_to "#list-of-endorsements", tag_params do
-            content
-          end
-        else
-          content_tag("div", tag_params) do
-            content
-          end
-        end
-      end
-
-      def render_endorsements_button_card_part(proposal, fully_endorsed, html_class = nil)
-        endorse_translated = t("decidim.proposals.proposal_endorsements_helper.render_endorsements_button_card_part.endorse")
-        html_class = "card__button button" if html_class.blank?
-        if current_settings.endorsements_blocked? || !current_component.participatory_space.can_participate?(current_user)
-          content_tag :span, endorse_translated, class: "#{html_class} #{endorsement_button_classes(false)} disabled", disabled: true, title: endorse_translated
-        elsif current_user && allowed_to?(:endorse, :proposal, proposal: proposal)
-          render partial: "endorsement_identities_cabin", locals: { proposal: proposal, fully_endorsed: fully_endorsed }
-        elsif current_user
-          button_to(endorse_translated, proposal_path(proposal),
-                    data: { open: "authorizationModal", "open-url": modal_path(:endorse, proposal) },
-                    class: "#{html_class} #{endorsement_button_classes(false)} secondary")
-        else
-          action_authorized_button_to :endorse, endorse_translated, "", resource: proposal, class: "#{html_class} #{endorsement_button_classes(false)} secondary"
-        end
-      end
-    end
-  end
-end

data/app/helpers/decidim/proposals/proposal_votes_helper.rb

@@ -21,9 +21,9 @@ module Decidim
       #
       # Returns a string with the value of the css classes.
       def vote_button_classes(from_proposals_list)
-        return "card__button button--sc" if from_proposals_list
+        return "card__button" if from_proposals_list
 
-        "expanded button--sc"
+        "expanded"
       end
 
       # Public: Gets the vote limit for each user, if set.

data/app/helpers/decidim/proposals/proposal_wizard_helper.rb

@@ -58,7 +58,15 @@ module Decidim
       def proposal_wizard_stepper_step(step, current_step)
         return if step == :step_4 && type_of == :collaborative_drafts
 
-        content_tag(:li, proposal_wizard_step_name(step), class: proposal_wizard_step_classes(step, current_step).to_s)
+        attributes = { class: proposal_wizard_step_classes(step, current_step).to_s }
+        step_title = proposal_wizard_step_name(step)
+        if step.to_s.split("_").last.to_i == proposal_wizard_step_number(current_step)
+          current_step_title = proposal_wizard_step_name("current_step")
+          step_title = content_tag(:span, "#{current_step_title}: ", class: "show-for-sr") + step_title
+          attributes["aria-current"] = "step"
+        end
+
+        content_tag(:li, step_title, attributes)
       end
 
       # Returns the list with all the steps, in html
@@ -77,15 +85,21 @@ module Decidim
 
       # Returns a string with the current step number and the total steps number
       #
-      # step - A symbol of the target step
       def proposal_wizard_current_step_of(step)
         current_step_num = proposal_wizard_step_number(step)
-        content_tag :span, class: "text-small" do
-          concat t(:"decidim.proposals.proposals.wizard_steps.step_of", current_step_num: current_step_num, total_steps: total_steps)
+        see_steps = content_tag(:span, class: "hide-for-large") do
           concat " ("
           concat content_tag :a, t(:"decidim.proposals.proposals.wizard_steps.see_steps"), "data-toggle": "steps"
           concat ")"
         end
+        content_tag :span, class: "text-small" do
+          concat t(:"decidim.proposals.proposals.wizard_steps.step_of", current_step_num: current_step_num, total_steps: total_steps)
+          concat see_steps
+        end
+      end
+
+      def proposal_wizard_steps_title
+        t("title", scope: "decidim.proposals.#{type_of}.wizard_steps")
       end
 
       # Returns a boolean if the step has a help text defined
@@ -146,12 +160,15 @@ module Decidim
         url
       end
 
-      def wizard_aside_back_text
+      def wizard_aside_back_text(from = nil)
+        key = "back"
+        key = "back_from_#{from}" if from
+
         case type_of
         when :collaborative_drafts
-          t("back", scope: "decidim.proposals.collaborative_drafts.wizard_aside").html_safe
+          t(key, scope: "decidim.proposals.collaborative_drafts.wizard_aside").html_safe
         else
-          t("back", scope: "decidim.proposals.proposals.wizard_aside").html_safe
+          t(key, scope: "decidim.proposals.proposals.wizard_aside").html_safe
         end
       end
 

data/app/helpers/decidim/proposals/proposals_helper.rb

@@ -55,6 +55,12 @@ module Decidim
           translated_attribute(@proposal.cost_report).present? &&
           translated_attribute(@proposal.execution_period).present?
       end
+
+      def resource_version(resource, options = {})
+        return unless resource.respond_to?(:amendable?) && resource.amendable?
+
+        super
+      end
     end
   end
 end

data/app/models/decidim/proposals/proposal.rb

@@ -24,6 +24,7 @@ module Decidim
       include Decidim::Amendable
       include Decidim::NewsletterParticipant
       include Decidim::Randomable
+      include Decidim::Endorsable
       include Decidim::Proposals::Valuatable
 
       POSSIBLE_STATES = %w(not_answered evaluating accepted rejected withdrawn).freeze
@@ -37,8 +38,6 @@ module Decidim
 
       component_manifest_name "proposals"
 
-      has_many :endorsements, foreign_key: "decidim_proposal_id", class_name: "ProposalEndorsement", dependent: :destroy, counter_cache: "proposal_endorsements_count"
-
       has_many :votes,
                -> { final },
                foreign_key: "decidim_proposal_id",
@@ -145,10 +144,9 @@ module Decidim
 
         participants_has_voted_ids = Decidim::Proposals::ProposalVote.joins(:proposal).where(proposal: proposals).joins(:author).map(&:decidim_author_id).flatten.compact.uniq
 
-        endorsements_participants_ids = Decidim::Proposals::ProposalEndorsement.joins(:proposal)
-                                                                               .where(proposal: proposals)
-                                                                               .where(decidim_author_type: "Decidim::UserBaseEntity")
-                                                                               .map(&:decidim_author_id).flatten.compact.uniq
+        endorsements_participants_ids = Decidim::Endorsement.where(resource: proposals)
+                                                            .where(decidim_author_type: "Decidim::UserBaseEntity")
+                                                            .map(&:decidim_author_id).flatten.compact.uniq
 
         (endorsements_participants_ids + participants_has_voted_ids + coauthors_recipients_ids).flatten.compact.uniq
       end
@@ -169,14 +167,6 @@ module Decidim
         ProposalVote.where(proposal: self, author: user).any?
       end
 
-      # Public: Check if the user has endorsed the proposal.
-      # - user_group: may be nil if user is not representing any user_group.
-      #
-      # Returns Boolean.
-      def endorsed_by?(user, user_group = nil)
-        endorsements.where(author: user, user_group: user_group).any?
-      end
-
       # Public: Checks if the proposal has been published or not.
       #
       # Returns Boolean.

data/app/permissions/decidim/proposals/permissions.rb

@@ -31,10 +31,6 @@ module Decidim
           can_edit_proposal?
         when :withdraw
           can_withdraw_proposal?
-        when :endorse
-          can_endorse_proposal?
-        when :unendorse
-          can_unendorse_proposal?
         when :amend
           can_create_amendment?
         when :vote
@@ -47,7 +43,7 @@ module Decidim
       end
 
       def proposal
-        @proposal ||= context.fetch(:proposal, nil)
+        @proposal ||= context.fetch(:proposal, nil) || context.fetch(:resource, nil)
       end
 
       def voting_enabled?
@@ -82,23 +78,6 @@ module Decidim
         toggle_allow(proposal && proposal.authored_by?(user))
       end
 
-      def can_endorse_proposal?
-        is_allowed = proposal &&
-                     authorized?(:endorse, resource: proposal) &&
-                     current_settings&.endorsements_enabled? &&
-                     !current_settings&.endorsements_blocked?
-
-        toggle_allow(is_allowed)
-      end
-
-      def can_unendorse_proposal?
-        is_allowed = proposal &&
-                     authorized?(:endorse, resource: proposal) &&
-                     current_settings&.endorsements_enabled?
-
-        toggle_allow(is_allowed)
-      end
-
       def can_create_amendment?
         is_allowed = proposal &&
                      authorized?(:amend, resource: proposal) &&