decidim-proposals 0.27.9 → 0.28.0.rc4

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

@@ -41,16 +41,16 @@ module Decidim
           {
             t("proposals.filters.type", scope: "decidim.proposals") => {
               link_to(t("proposals", scope: "decidim.proposals.application_helper.filter_type_values"), q: ransak_params_for_query(is_emendation_true: "0"),
-                                                                                                        per_page: per_page) => nil,
+                                                                                                        per_page:) => nil,
               link_to(t("amendments", scope: "decidim.proposals.application_helper.filter_type_values"), q: ransak_params_for_query(is_emendation_true: "1"),
-                                                                                                         per_page: per_page) => nil
+                                                                                                         per_page:) => nil
             },
             t("models.proposal.fields.state", scope: "decidim.proposals") =>
-              Decidim::Proposals::Proposal::POSSIBLE_STATES.each_with_object({}) do |state, hash|
+              Decidim::Proposals::Proposal::STATES.each_pair do |state, hash|
                 if state == "not_answered"
-                  hash[link_to((humanize_proposal_state state), q: ransak_params_for_query(state_null: 1), per_page: per_page)] = nil
+                  hash[link_to((humanize_proposal_state state), q: ransak_params_for_query(state_null: 1), per_page:)] = nil
                 else
-                  hash[link_to((humanize_proposal_state state), q: ransak_params_for_query(state_eq: state), per_page: per_page)] = nil
+                  hash[link_to((humanize_proposal_state state), q: ransak_params_for_query(state_eq: state), per_page:)] = nil
                 end
               end,
             t("models.proposal.fields.category", scope: "decidim.proposals") => admin_filter_categories_tree(categories.first_class),
@@ -80,7 +80,7 @@ module Decidim
                      else
                        t("proposals", scope: "decidim.proposals.application_helper.filter_type_values")
                      end
-              tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:is_emendation_true), per_page: per_page), t("decidim.admin.actions.cancel"),
+              tag += icon_link_to("delete-bin-line", url_for(q: ransak_params_for_query_without(:is_emendation_true), per_page:), t("decidim.admin.actions.cancel"),
                                   class: "action-icon--remove")
               tag.html_safe
             end
@@ -89,7 +89,7 @@ module Decidim
             html << tag.span(class: "label secondary") do
               tag = "#{t("models.proposal.fields.state", scope: "decidim.proposals")}: "
               tag += humanize_proposal_state "not_answered"
-              tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:state_null), per_page: per_page), t("decidim.admin.actions.cancel"),
+              tag += icon_link_to("delete-bin-line", url_for(q: ransak_params_for_query_without(:state_null), per_page:), t("decidim.admin.actions.cancel"),
                                   class: "action-icon--remove")
               tag.html_safe
             end
@@ -98,7 +98,7 @@ module Decidim
             html << tag.span(class: "label secondary") do
               tag = "#{t("models.proposal.fields.state", scope: "decidim.proposals")}: "
               tag += humanize_proposal_state params[:q][:state_eq]
-              tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:state_eq), per_page: per_page), t("decidim.admin.actions.cancel"),
+              tag += icon_link_to("delete-bin-line", url_for(q: ransak_params_for_query_without(:state_eq), per_page:), t("decidim.admin.actions.cancel"),
                                   class: "action-icon--remove")
               tag.html_safe
             end
@@ -107,7 +107,7 @@ module Decidim
             html << tag.span(class: "label secondary") do
               tag = "#{t("models.proposal.fields.category", scope: "decidim.proposals")}: "
               tag += translated_attribute categories.find(params[:q][:category_id_eq]).name
-              tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:category_id_eq), per_page: per_page), t("decidim.admin.actions.cancel"),
+              tag += icon_link_to("delete-bin-line", url_for(q: ransak_params_for_query_without(:category_id_eq), per_page:), t("decidim.admin.actions.cancel"),
                                   class: "action-icon--remove")
               tag.html_safe
             end
@@ -116,7 +116,7 @@ module Decidim
             html << tag.span(class: "label secondary") do
               tag = "#{t("models.proposal.fields.scope", scope: "decidim.proposals")}: "
               tag += translated_attribute Decidim::Scope.where(decidim_organization_id: current_component.organization.id).find(params[:q][:scope_id_eq]).name
-              tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:scope_id_eq), per_page: per_page), t("decidim.admin.actions.cancel"),
+              tag += icon_link_to("delete-bin-line", url_for(q: ransak_params_for_query_without(:scope_id_eq), per_page:), t("decidim.admin.actions.cancel"),
                                   class: "action-icon--remove")
               tag.html_safe
             end
@@ -125,14 +125,14 @@ module Decidim
         end
 
         def icon_with_link_to_proposal(proposal)
-          icon, tooltip = if allowed_to?(:create, :proposal_answer, proposal: proposal) && !proposal.emendation?
+          icon, tooltip = if allowed_to?(:create, :proposal_answer, proposal:) && !proposal.emendation?
                             [
-                              "comment-square",
+                              "question-answer-line",
                               t(:answer_proposal, scope: "decidim.proposals.actions")
                             ]
                           else
                             [
-                              "info",
+                              "information-line",
                               t(:show, scope: "decidim.proposals.actions")
                             ]
                           end

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

@@ -39,13 +39,13 @@ module Decidim
 
         case state
         when "accepted"
-          "text-success"
+          "success"
         when "rejected", "withdrawn"
-          "text-alert"
+          "alert"
         when "evaluating"
-          "text-warning"
+          "warning"
         else
-          "text-info"
+          "info"
         end
       end
 
@@ -91,7 +91,7 @@ module Decidim
       end
 
       # If the proposal is official or the rich text editor is enabled on the
-      # frontend, the proposal body is considered as safe content; that's unless
+      # frontend, the proposal body is considered as safe content; that is unless
       # the proposal comes from a collaborative_draft or a participatory_text.
       def safe_content?
         (rich_text_editor_in_public_views? && not_from_collaborative_draft(@proposal)) ||
@@ -110,7 +110,7 @@ module Decidim
         if safe_content?
           Decidim::ContentProcessor.render_without_format(sanitized).html_safe
         else
-          Decidim::ContentProcessor.render(sanitized, "div")
+          Decidim::ContentProcessor.render(sanitized)
         end
       end
 
@@ -119,7 +119,7 @@ module Decidim
         options = {
           class: "js-hashtags",
           hashtaggable: true,
-          value: form_presenter.body(extras: false).strip
+          value: form_presenter.body(extras: false, strip_tags: !current_organization.rich_text_editor_in_public_views).strip
         }
 
         text_editor_for(form, :body, options)
@@ -138,20 +138,8 @@ module Decidim
         ).count
       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
-
-      def vote_button_for(model, from_proposals_list)
-        render partial: "decidim/proposals/proposals/participatory_texts/proposal_vote_button.html", locals: { proposal: model, from_proposals_list: from_proposals_list }
-      end
-
-      def form_has_address?
-        @form.address.present? || @form.has_address
-      end
-
       def show_voting_rules?
-        return false if !votes_enabled? || current_settings.votes_blocked?
+        return false unless votes_enabled?
 
         return true if vote_limit_enabled?
         return true if threshold_per_proposal_enabled?
@@ -171,25 +159,89 @@ module Decidim
       # Options to filter Proposals by activity.
       def activity_filter_values
         base = [
-          ["all", t(".all")],
-          ["my_proposals", t(".my_proposals")]
+          ["all", t("decidim.proposals.proposals.filters.all")],
+          ["my_proposals", t("decidim.proposals.proposals.filters.my_proposals")]
         ]
-        base += [["voted", t(".voted")]] if current_settings.votes_enabled?
+        base += [["voted", t("decidim.proposals.proposals.filters.voted")]] if current_settings.votes_enabled?
         base
       end
 
+      # Explicitely commenting the used I18n keys so their are not flagged as unused
+      # i18n-tasks-use t('decidim.proposals.application_helper.filter_origin_values.official')
+      # i18n-tasks-use t('decidim.proposals.application_helper.filter_origin_values.participants')
+      # i18n-tasks-use t('decidim.proposals.application_helper.filter_origin_values.user_groups')
+      # i18n-tasks-use t('decidim.proposals.application_helper.filter_origin_values.official')
+      # i18n-tasks-use t('decidim.proposals.application_helper.filter_origin_values.meetings')
+      # i18n-tasks-use t('decidim.proposals.application_helper.filter_origin_values.all')
       def filter_origin_values
+        scope = "decidim.proposals.application_helper.filter_origin_values"
         origin_values = []
-        origin_values << TreePoint.new("official", t("decidim.proposals.application_helper.filter_origin_values.official")) if component_settings.official_proposals_enabled
-        origin_values << TreePoint.new("participants", t("decidim.proposals.application_helper.filter_origin_values.participants"))
-        origin_values << TreePoint.new("user_group", t("decidim.proposals.application_helper.filter_origin_values.user_groups")) if current_organization.user_groups_enabled?
-        origin_values << TreePoint.new("meeting", t("decidim.proposals.application_helper.filter_origin_values.meetings"))
+        origin_values << TreePoint.new("official", t("official", scope:)) if component_settings.official_proposals_enabled
+        origin_values << TreePoint.new("participants", t("participants", scope:))
+        origin_values << TreePoint.new("user_group", t("user_groups", scope:)) if current_organization.user_groups_enabled?
+        origin_values << TreePoint.new("meeting", t("meetings", scope:))
 
         TreeNode.new(
-          TreePoint.new("", t("decidim.proposals.application_helper.filter_origin_values.all")),
+          TreePoint.new("", t("all", scope:)),
           origin_values
         )
       end
+
+      def filter_proposals_state_values
+        Decidim::CheckBoxesTreeHelper::TreeNode.new(
+          Decidim::CheckBoxesTreeHelper::TreePoint.new("", t("decidim.proposals.application_helper.filter_state_values.all")),
+          [
+            Decidim::CheckBoxesTreeHelper::TreePoint.new("accepted", t("decidim.proposals.application_helper.filter_state_values.accepted")),
+            Decidim::CheckBoxesTreeHelper::TreePoint.new("evaluating", t("decidim.proposals.application_helper.filter_state_values.evaluating")),
+            Decidim::CheckBoxesTreeHelper::TreePoint.new("state_not_published", t("decidim.proposals.application_helper.filter_state_values.not_answered")),
+            Decidim::CheckBoxesTreeHelper::TreePoint.new("rejected", t("decidim.proposals.application_helper.filter_state_values.rejected"))
+          ]
+        )
+      end
+
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
+      def filter_sections
+        @filter_sections ||= begin
+          items = []
+          if component_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled
+            items.append(method: :with_any_state, collection: filter_proposals_state_values, label_scope: "decidim.proposals.proposals.filters", id: "state")
+          end
+          if current_component.has_subscopes?
+            items.append(method: :with_any_scope, collection: filter_scopes_values, label_scope: "decidim.proposals.proposals.filters", id: "scope")
+          end
+          if current_component.categories.any?
+            items.append(method: :with_any_category, collection: filter_categories_values, label_scope: "decidim.proposals.proposals.filters", id: "category")
+          end
+          if component_settings.official_proposals_enabled
+            items.append(method: :with_any_origin, collection: filter_origin_values, label_scope: "decidim.proposals.proposals.filters", id: "origin")
+          end
+          if current_user
+            items.append(method: :activity, collection: activity_filter_values, label_scope: "decidim.proposals.proposals.filters", id: "activity", type: :radio_buttons)
+          end
+          if @proposals.only_emendations.any?
+            items.append(method: :type, collection: filter_type_values, label_scope: "decidim.proposals.proposals.filters", id: "amendment_type", type: :radio_buttons)
+          end
+          if linked_classes_for(Decidim::Proposals::Proposal).any?
+            items.append(
+              method: :related_to,
+              collection: linked_classes_filter_values_for(Decidim::Proposals::Proposal),
+              label_scope: "decidim.proposals.proposals.filters",
+              id: "related_to",
+              type: :radio_buttons
+            )
+          end
+        end
+        # rubocop:enable Metrics/PerceivedComplexity
+        # rubocop:enable Metrics/CyclomaticComplexity
+
+        items.reject { |item| item[:collection].blank? }
+      end
+
+      def component_name
+        i18n_key = controller_name == "collaborative_drafts" ? "decidim.proposals.collaborative_drafts.name" : "decidim.components.proposals.name"
+        (defined?(current_component) && translated_attribute(current_component&.name).presence) || t(i18n_key)
+      end
     end
   end
 end

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

@@ -8,15 +8,28 @@ module Decidim
       def filter_collaborative_drafts_state_values
         scope = "decidim.proposals.collaborative_drafts.filters"
         Decidim::CheckBoxesTreeHelper::TreeNode.new(
-          Decidim::CheckBoxesTreeHelper::TreePoint.new("", t("all", scope: scope)),
+          Decidim::CheckBoxesTreeHelper::TreePoint.new("", t("all", scope:)),
           [
-            Decidim::CheckBoxesTreeHelper::TreePoint.new("open", t("open", scope: scope)),
-            Decidim::CheckBoxesTreeHelper::TreePoint.new("withdrawn", t("withdrawn", scope: scope)),
-            Decidim::CheckBoxesTreeHelper::TreePoint.new("published", t("published", scope: scope))
+            Decidim::CheckBoxesTreeHelper::TreePoint.new("open", t("open", scope:)),
+            Decidim::CheckBoxesTreeHelper::TreePoint.new("withdrawn", t("withdrawn", scope:)),
+            Decidim::CheckBoxesTreeHelper::TreePoint.new("published", t("published", scope:))
           ]
         )
       end
 
+      def humanize_collaborative_draft_state(state)
+        I18n.t(state, scope: "decidim.proposals.collaborative_drafts.states", default: :open)
+      end
+
+      def collaborative_drafts_state_class(type)
+        case type
+        when "withdrawn"
+          "alert"
+        when "open", "published"
+          "success"
+        end
+      end
+
       def accept_request_button_label
         t("accept_request", scope: "decidim.proposals.collaborative_drafts.requests.collaboration_requests")
       end
@@ -24,6 +37,33 @@ module Decidim
       def reject_request_button_label
         t("reject_request", scope: "decidim.proposals.collaborative_drafts.requests.collaboration_requests")
       end
+
+      def collaborative_drafts_filter_sections
+        @collaborative_drafts_filter_sections ||= begin
+          items = [{
+            method: :with_any_state,
+            collection: filter_collaborative_drafts_state_values,
+            label_scope: "decidim.proposals.collaborative_drafts.filters",
+            id: "state"
+          }]
+          if current_component.has_subscopes?
+            items.append(method: :with_any_scope, collection: filter_scopes_values, label_scope: "decidim.proposals.collaborative_drafts.filters", id: "scope")
+          end
+          if current_component.categories.any?
+            items.append(method: :with_any_category, collection: filter_categories_values, label_scope: "decidim.proposals.collaborative_drafts.filters", id: "category")
+          end
+          if linked_classes_for(Decidim::Proposals::CollaborativeDraft).any?
+            items.append(
+              method: :related_to,
+              collection: linked_classes_filter_values_for(Decidim::Proposals::CollaborativeDraft),
+              label_scope: "decidim.proposals.collaborative_drafts.filters",
+              id: "related_to",
+              type: :radio_buttons
+            )
+          end
+          items.reject { |item| item[:collection].blank? }
+        end
+      end
     end
   end
 end

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

@@ -19,9 +19,8 @@ module Decidim
           .slice(:latitude, :longitude, :address)
           .merge(
             title: decidim_html_escape(present(proposal).title),
-            body: html_truncate(decidim_sanitize_editor(present(proposal).body), length: 100),
-            icon: icon("proposals", width: 40, height: 70, remove_icon_class: true),
-            link: proposal_path(proposal)
+            link: proposal_path(proposal),
+            items: cell("decidim/proposals/proposal_metadata", proposal).send(:proposal_items_for_map).to_json
           )
       end
 
@@ -33,7 +32,7 @@ module Decidim
             :longitude,
             :address
           ).merge(
-            icon: icon("proposals", width: 40, height: 70, remove_icon_class: true)
+            icon: icon("chat-new-line", width: 40, height: 70, remove_icon_class: true)
           )
         }
       end

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

@@ -11,18 +11,10 @@ module Decidim
       # Returns a string with the title of the section, subsection or article.
       def preview_participatory_text_section_title(proposal)
         title = decidim_html_escape(present(proposal).title)
-        translated = t(proposal.participatory_text_level, scope: "decidim.proposals.admin.participatory_texts.sections", title: title)
+        translated = t(proposal.participatory_text_level, scope: "decidim.proposals.admin.participatory_texts.sections", title:)
         translated.html_safe
       end
 
-      def render_participatory_text_title(participatory_text)
-        if participatory_text.nil?
-          t("alternative_title", scope: "decidim.proposals.participatory_text_proposal")
-        else
-          translated_attribute(participatory_text.title)
-        end
-      end
-
       # Public: A formatted collection of mime_type to be used
       # in forms.
       def mime_types_with_document_examples

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

@@ -29,7 +29,7 @@ module Decidim
       end
 
       def proposals_controller?
-        context[:controller].class.to_s == "Decidim::Proposals::ProposalsController"
+        context[:controller].instance_of?(::Decidim::Proposals::ProposalsController)
       end
 
       def index_action?

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

@@ -4,33 +4,11 @@ module Decidim
   module Proposals
     # Simple helpers to handle markup variations for proposal votes partials
     module ProposalVotesHelper
-      # Returns the css classes used for proposal votes count 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 hash with the css classes for the count number and label
-      def votes_count_classes(from_proposals_list)
-        return { number: "card__support__number", label: "" } if from_proposals_list
-
-        { number: "extra__suport-number", label: "extra__suport-text" }
-      end
-
-      # Returns the css classes used for proposal vote 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 vote_button_classes(from_proposals_list)
-        return "card__button" if from_proposals_list
-
-        "expanded"
-      end
-
       # Public: Gets the vote limit for each user, if set.
       #
       # Returns an Integer if set, nil otherwise.
       def vote_limit
-        return nil if component_settings.vote_limit.zero?
+        return nil if component_settings.vote_limit&.zero?
 
         component_settings.vote_limit
       end
@@ -53,7 +31,7 @@ module Decidim
       #
       # Returns an Integer with the maximum amount of votes, nil otherwise.
       def threshold_per_proposal
-        return nil unless component_settings.threshold_per_proposal.positive?
+        return nil unless component_settings.threshold_per_proposal&.positive?
 
         component_settings.threshold_per_proposal
       end

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

@@ -4,37 +4,19 @@ module Decidim
   module Proposals
     # Simple helpers to handle markup variations for proposal wizard partials
     module ProposalWizardHelper
-      # Returns the css classes used for the proposal wizard for the desired step
-      #
-      # step - A symbol of the target step
-      # current_step - A symbol of the current step
-      #
-      # Returns a string with the css classes for the desired step
-      def proposal_wizard_step_classes(step, current_step)
-        step_i = step.to_s.split("_").last.to_i
-        if step_i == proposal_wizard_step_number(current_step)
-          %(step--active #{step} #{current_step})
-        elsif step_i < proposal_wizard_step_number(current_step)
-          %(step--past #{step})
-        else
-          %()
+      def wizard_steps(current_step)
+        scope = "decidim.proposals.proposals.wizard_steps"
+        inactive_data = { data: { past: "" } }
+        content_tag(:ol, id: "wizard-steps", class: "wizard-steps") do
+          proposal_wizard_steps.map do |wizard_step|
+            active = current_step == wizard_step
+            inactive_data = {} if active
+            attributes = active ? { "aria-current": "step", "aria-label": "#{t("current_step", scope:)}: #{t(wizard_step, scope:)}", data: { active: "" } } : inactive_data
+            content_tag(:li, t(wizard_step, scope:), attributes)
+          end.join.html_safe
         end
       end
 
-      # Returns the number of the step
-      #
-      # step - A symbol of the target step
-      def proposal_wizard_step_number(step)
-        step.to_s.split("_").last.to_i
-      end
-
-      # Returns the name of the step, translated
-      #
-      # step - A symbol of the target step
-      def proposal_wizard_step_name(step)
-        t("decidim.proposals.proposals.wizard_steps.#{step}")
-      end
-
       # Returns the page title of the given step, translated
       #
       # action_name - A string of the rendered action
@@ -51,55 +33,6 @@ module Decidim
         t("decidim.proposals.proposals.#{step_title}.title")
       end
 
-      # Returns the list item of the given step, in html
-      #
-      # step - A symbol of the target step
-      # current_step - A symbol of the current step
-      def proposal_wizard_stepper_step(step, current_step)
-        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
-      #
-      # current_step - A symbol of the current step
-      def proposal_wizard_stepper(current_step)
-        content_tag :ol, class: "wizard__steps" do
-          %(
-            #{proposal_wizard_stepper_step(ProposalsController::STEP1, current_step)}
-            #{proposal_wizard_stepper_step(ProposalsController::STEP2, current_step)}
-            #{proposal_wizard_stepper_step(ProposalsController::STEP3, current_step)}
-            #{proposal_wizard_stepper_step(ProposalsController::STEP4, current_step)}
-          ).html_safe
-        end
-      end
-
-      # Returns a string with the current step number and the total steps number
-      #
-      def proposal_wizard_current_step_of(step)
-        current_step_num = proposal_wizard_step_number(step)
-        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.proposals.wizard_steps")
-      end
-
       # Returns a boolean if the step has a help text defined
       #
       # step - A symbol of the target step
@@ -107,16 +40,16 @@ module Decidim
         translated_attribute(component_settings.try("proposal_wizard_#{step}_help_text")).present?
       end
 
+      def proposal_wizard_steps
+        [ProposalsController::STEP1, ProposalsController::STEP2, ProposalsController::STEP3, ProposalsController::STEP4]
+      end
+
       private
 
       def total_steps
         4
       end
 
-      def wizard_aside_info_text
-        t("info", scope: "decidim.proposals.proposals.wizard_aside").html_safe
-      end
-
       # Renders the back link except for step_2: compare
       def proposal_wizard_aside_link_to_back(step)
         case step

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

@@ -35,18 +35,6 @@ module Decidim
         t(i18n_key, scope: "decidim.proposals.proposals.show")
       end
 
-      def filter_proposals_state_values
-        Decidim::CheckBoxesTreeHelper::TreeNode.new(
-          Decidim::CheckBoxesTreeHelper::TreePoint.new("", t("decidim.proposals.application_helper.filter_state_values.all")),
-          [
-            Decidim::CheckBoxesTreeHelper::TreePoint.new("accepted", t("decidim.proposals.application_helper.filter_state_values.accepted")),
-            Decidim::CheckBoxesTreeHelper::TreePoint.new("evaluating", t("decidim.proposals.application_helper.filter_state_values.evaluating")),
-            Decidim::CheckBoxesTreeHelper::TreePoint.new("state_not_published", t("decidim.proposals.application_helper.filter_state_values.not_answered")),
-            Decidim::CheckBoxesTreeHelper::TreePoint.new("rejected", t("decidim.proposals.application_helper.filter_state_values.rejected"))
-          ]
-        )
-      end
-
       def proposal_has_costs?
         @proposal.cost.present? &&
           translated_attribute(@proposal.cost_report).present? &&

data/app/jobs/decidim/proposals/hide_all_created_by_author_job.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class HideAllCreatedByAuthorJob < ::Decidim::HideAllCreatedByAuthorJob
+      protected
+
+      def perform(resource:, extra: {})
+        return unless extra.fetch(:hide, false)
+
+        Decidim::Proposals::Proposal.not_hidden.from_author(resource).find_each do |content|
+          hide_content(content, extra[:event_author], extra[:justification])
+        end
+        Decidim::Proposals::CollaborativeDraft.not_hidden.from_author(resource).find_each do |content|
+          hide_content(content, extra[:event_author], extra[:justification])
+        end
+      end
+    end
+  end
+end

data/app/jobs/decidim/proposals/notify_proposals_mentioned_job.rb

@@ -14,7 +14,7 @@ module Decidim
             event: "decidim.events.proposals.proposal_mentioned",
             event_class: Decidim::Proposals::ProposalMentionedEvent,
             resource: comment.root_commentable,
-            affected_users: affected_users,
+            affected_users:,
             extra: {
               comment_id: comment.id,
               mentioned_proposal_id: proposal_id

data/app/jobs/decidim/proposals/settings_change_job.rb

@@ -20,8 +20,8 @@ module Decidim
         return unless event && event_class
 
         Decidim::EventsManager.publish(
-          event: event,
-          event_class: event_class,
+          event:,
+          event_class:,
           resource: component,
           followers: component.participatory_space.followers
         )

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

@@ -31,10 +31,10 @@ module Decidim
 
       geocoded_by :address
 
-      scope :open, -> { where(state: "open") }
-      scope :withdrawn, -> { where(state: "withdrawn") }
-      scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
-      scope :published, -> { where(state: "published") }
+      STATES = { open: 0, published: 10, withdrawn: -1 }.freeze
+
+      enum state: STATES, _default: "open"
+      scope :except_withdrawn, -> { not_withdrawn.or(where(state: nil)) }
 
       scope_search_multi :with_any_state, [:open, :published, :withdrawn]
 
@@ -45,18 +45,6 @@ module Decidim
         authored_by?(user)
       end
 
-      def open?
-        state == "open"
-      end
-
-      def withdrawn?
-        state == "withdrawn"
-      end
-
-      def published?
-        state == "published"
-      end
-
       # Public: Overrides the `reported_content_url` Reportable concern method.
       def reported_content_url
         ResourceLocatorPresenter.new(self).url