decidim-initiatives 0.27.5 → 0.28.0.rc4

data/app/events/decidim/initiatives/approve_membership_request_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Initiatives
@@ -9,35 +9,35 @@ module Decidim
       def email_subject
         I18n.t(
           "decidim.initiatives.events.approve_membership_request.email_subject",
-          author_nickname: author_nickname
+          author_nickname:
         )
       end
 
       def email_intro
         I18n.t(
           "decidim.initiatives.events.approve_membership_request.email_intro",
-          resource_title: resource_title,
-          resource_url: resource_url,
-          author_profile_url: author_profile_url,
-          author_nickname: author_nickname
+          resource_title:,
+          resource_url:,
+          author_profile_url:,
+          author_nickname:
         )
       end
 
       def email_outro
         I18n.t(
           "decidim.initiatives.events.approve_membership_request.email_outro",
-          resource_title: resource_title,
-          resource_url: resource_url
+          resource_title:,
+          resource_url:
         )
       end
 
       def notification_title
         I18n.t(
           "decidim.initiatives.events.approve_membership_request.notification_title",
-          resource_title: resource_title,
-          resource_url: resource_url,
-          author_profile_url: author_profile_url,
-          author_nickname: author_nickname
+          resource_title:,
+          resource_url:,
+          author_profile_url:,
+          author_nickname:
         ).html_safe
       end
 

data/app/events/decidim/initiatives/create_initiative_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Initiatives
@@ -9,7 +9,7 @@ module Decidim
       def email_subject
         I18n.t(
           "decidim.initiatives.events.create_initiative_event.email_subject",
-          resource_title: resource_title,
+          resource_title:,
           author_nickname: author.nickname,
           author_name: author.name
         )
@@ -18,7 +18,7 @@ module Decidim
       def email_intro
         I18n.t(
           "decidim.initiatives.events.create_initiative_event.email_intro",
-          resource_title: resource_title,
+          resource_title:,
           author_nickname: author.nickname,
           author_name: author.name
         )
@@ -27,7 +27,7 @@ module Decidim
       def email_outro
         I18n.t(
           "decidim.initiatives.events.create_initiative_event.email_outro",
-          resource_title: resource_title,
+          resource_title:,
           author_nickname: author.nickname,
           author_name: author.name
         )
@@ -36,8 +36,8 @@ module Decidim
       def notification_title
         I18n.t(
           "decidim.initiatives.events.create_initiative_event.notification_title",
-          resource_title: resource_title,
-          resource_path: resource_path,
+          resource_title:,
+          resource_path:,
           author_nickname: author.nickname,
           author_name: author.name,
           author_path: author.profile_path

data/app/events/decidim/initiatives/endorse_initiative_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Initiatives

data/app/events/decidim/initiatives/extend_initiative_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Initiatives

data/app/events/decidim/initiatives/initiative_sent_to_technical_validation_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Initiatives

data/app/events/decidim/initiatives/milestone_completed_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Initiatives

data/app/events/decidim/initiatives/revoke_membership_request_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Initiatives
@@ -9,35 +9,35 @@ module Decidim
       def email_subject
         I18n.t(
           "decidim.initiatives.events.revoke_membership_request.email_subject",
-          author_nickname: author_nickname
+          author_nickname:
         )
       end
 
       def email_intro
         I18n.t(
           "decidim.initiatives.events.revoke_membership_request.email_intro",
-          resource_title: resource_title,
-          resource_url: resource_url,
-          author_profile_url: author_profile_url,
-          author_nickname: author_nickname
+          resource_title:,
+          resource_url:,
+          author_profile_url:,
+          author_nickname:
         )
       end
 
       def email_outro
         I18n.t(
           "decidim.initiatives.events.revoke_membership_request.email_outro",
-          resource_title: resource_title,
-          resource_url: resource_url
+          resource_title:,
+          resource_url:
         )
       end
 
       def notification_title
         I18n.t(
           "decidim.initiatives.events.revoke_membership_request.notification_title",
-          resource_title: resource_title,
-          resource_url: resource_url,
-          author_profile_url: author_profile_url,
-          author_nickname: author_nickname
+          resource_title:,
+          resource_url:,
+          author_profile_url:,
+          author_nickname:
         ).html_safe
       end
 

data/app/events/decidim/initiatives/spawn_committee_request_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Initiatives
@@ -9,35 +9,35 @@ module Decidim
       def email_subject
         I18n.t(
           "decidim.initiatives.events.spawn_committee_request_event.email_subject",
-          applicant_nickname: applicant_nickname
+          applicant_nickname:
         )
       end
 
       def email_intro
         I18n.t(
           "decidim.initiatives.events.spawn_committee_request_event.email_intro",
-          resource_title: resource_title,
-          resource_url: resource_url,
-          applicant_profile_url: applicant_profile_url,
-          applicant_nickname: applicant_nickname
+          resource_title:,
+          resource_url:,
+          applicant_profile_url:,
+          applicant_nickname:
         )
       end
 
       def email_outro
         I18n.t(
           "decidim.initiatives.events.spawn_committee_request_event.email_outro",
-          resource_title: resource_title,
-          resource_url: resource_url
+          resource_title:,
+          resource_url:
         )
       end
 
       def notification_title
         I18n.t(
           "decidim.initiatives.events.spawn_committee_request_event.notification_title",
-          resource_title: resource_title,
-          resource_url: resource_url,
-          applicant_profile_url: applicant_profile_url,
-          applicant_nickname: applicant_nickname
+          resource_title:,
+          resource_url:,
+          applicant_profile_url:,
+          applicant_nickname:
         ).html_safe
       end
 

data/app/forms/decidim/initiatives/admin/initiative_form.rb

@@ -95,7 +95,7 @@ module Decidim
           @type ||= type_id ? Decidim::InitiativesType.find(type_id) : context.initiative.type
         end
 
-        # This method will add an error to the `attachment` field only if there's
+        # This method will add an error to the `attachment` field only if there is
         # any error in any other field. This is needed because when the form has
         # an error, the attachment is lost, so we need a way to inform the user of
         # this problem.

data/app/forms/decidim/initiatives/initiative_form.rb

@@ -3,16 +3,12 @@
 module Decidim
   module Initiatives
     # A form object used to collect the data for a new initiative.
-    class InitiativeForm < Form
+    class InitiativeForm < PreviousForm
       include TranslatableAttributes
       include AttachmentAttributes
 
       mimic :initiative
 
-      attribute :title, String
-      attribute :description, String
-      attribute :type_id, Integer
-      attribute :scope_id, Integer
       attribute :area_id, Integer
       attribute :decidim_user_group_id, Integer
       attribute :signature_type, String
@@ -20,18 +16,16 @@ module Decidim
       attribute :state, String
       attribute :attachment, AttachmentForm
       attribute :hashtag, String
+      attribute :scope_id, Integer
 
       attachments_attribute :photos
       attachments_attribute :documents
 
-      validates :title, :description, presence: true
-      validates :title, length: { maximum: 150 }
       validates :signature_type, presence: true
-      validates :type_id, presence: true
       validates :area, presence: true, if: ->(form) { form.area_id.present? }
-      validate :scope_exists
       validate :notify_missing_attachment_if_errored
       validate :trigger_attachment_errors
+      validate :scope_exists
       validates :signature_end_date, date: { after: Date.current }, if: lambda { |form|
         form.context.initiative_type.custom_signature_end_date_enabled? && form.signature_end_date.present?
       }
@@ -39,7 +33,8 @@ module Decidim
       def map_model(model)
         self.type_id = model.type.id
         self.scope_id = model.scope&.id
-        self.signature_type = model.signature_type
+        self.decidim_user_group_id = model.decidim_user_group_id
+        self.signature_type = model.signature_type || initiative_type.signature_type
         self.title = translated_attribute(model.title)
         self.description = translated_attribute(model.description)
       end
@@ -56,12 +51,6 @@ module Decidim
         @area_updatable ||= current_user.admin? || context.initiative.created?
       end
 
-      def scope_id
-        return nil if initiative_type.only_global_scope_enabled?
-
-        super.presence
-      end
-
       def area
         @area ||= current_organization.areas.find_by(id: area_id)
       end
@@ -70,37 +59,39 @@ module Decidim
         @initiative_type ||= type_id ? InitiativesType.find(type_id) : context.initiative.type
       end
 
-      def available_scopes
-        @available_scopes ||= if initiative_type.only_global_scope_enabled?
-                                initiative_type.scopes.where(scope: nil)
-                              else
-                                initiative_type.scopes
-                              end
+      def scoped_type_id
+        return unless type && scope_id
+
+        type.scopes.find_by(decidim_scopes_id: scope_id.presence).id
       end
 
       def scope
         @scope ||= Scope.find(scope_id) if scope_id.present?
       end
 
-      def scoped_type_id
-        return unless type && scope_id
+      def scope_id
+        return nil if type.only_global_scope_enabled?
 
-        type.scopes.find_by(decidim_scopes_id: scope_id.presence).id
+        super.presence
       end
 
-      private
-
-      def type
-        @type ||= type_id ? Decidim::InitiativesType.find(type_id) : context.initiative.type
+      def available_scopes
+        @available_scopes ||= if type.only_global_scope_enabled?
+                                type.scopes.where(scope: nil)
+                              else
+                                type.scopes
+                              end
       end
 
+      private
+
       def scope_exists
         return if scope_id.blank?
 
-        errors.add(:scope_id, :invalid) unless InitiativesTypeScope.exists?(type: initiative_type, scope: scope)
+        errors.add(:scope_id, :invalid) unless InitiativesTypeScope.exists?(type:, scope:)
       end
 
-      # This method will add an error to the `attachment` field only if there's
+      # This method will add an error to the `attachment` field only if there is
       # any error in any other field. This is needed because when the form has
       # an error, the attachment is lost, so we need a way to inform the user of
       # this problem.

data/app/forms/decidim/initiatives/previous_form.rb

@@ -15,6 +15,10 @@ module Decidim
       validates :title, :description, presence: true
       validates :title, length: { maximum: 150 }
       validates :type_id, presence: true
+
+      def type
+        @type ||= type_id ? Decidim::InitiativesType.find(type_id) : context.initiative.type
+      end
     end
   end
 end

data/app/forms/decidim/initiatives/vote_form.rb

@@ -109,10 +109,10 @@ module Decidim
 
       def metadata
         {
-          name_and_surname: name_and_surname,
-          document_number: document_number,
-          date_of_birth: date_of_birth,
-          postal_code: postal_code
+          name_and_surname:,
+          document_number:,
+          date_of_birth:,
+          postal_code:
         }
       end
 
@@ -137,9 +137,9 @@ module Decidim
         errors.add(:document_number, :invalid) unless authorized? && authorization_handler && authorization.unique_id == authorization_handler.unique_id
       end
 
-      # Private: Checks if there's any existing vote that matches the user's data.
+      # Private: Checks if there is any existing vote that matches the user's data.
       def already_voted?
-        errors.add(:document_number, :taken) if initiative.votes.exists?(hash_id: hash_id, scope: scope)
+        errors.add(:document_number, :taken) if initiative.votes.exists?(hash_id:, scope:)
       end
 
       def author
@@ -158,7 +158,7 @@ module Decidim
         ).first
       end
 
-      # Private: Checks if the authorization hasn't expired or is invalid.
+      # Private: Checks if the authorization has not expired or is invalid.
       def authorized?
         authorization_status&.first == :ok
       end
@@ -180,10 +180,10 @@ module Decidim
         return unless document_number && handler_name
 
         @authorization_handler ||= Decidim::AuthorizationHandler.handler_for(handler_name,
-                                                                             document_number: document_number,
-                                                                             name_and_surname: name_and_surname,
-                                                                             date_of_birth: date_of_birth,
-                                                                             postal_code: postal_code)
+                                                                             document_number:,
+                                                                             name_and_surname:,
+                                                                             date_of_birth:,
+                                                                             postal_code:)
       end
 
       # Private: The AuthorizationHandler name used to verify the user's

data/app/helpers/decidim/initiatives/admin/initiatives_helper.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       module InitiativesHelper
         def export_dropdown(collection_ids = nil)
-          render partial: "decidim/initiatives/admin/exports/dropdown", locals: { collection_ids: collection_ids }
+          render partial: "decidim/initiatives/admin/exports/dropdown", locals: { collection_ids: }
         end
 
         def export_dropdowns(query)

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

@@ -6,6 +6,8 @@ module Decidim
     #
     module ApplicationHelper
       include Decidim::CheckBoxesTreeHelper
+      include Decidim::DateRangeHelper
+      include InitiativesHelper
 
       def filter_states_values
         TreeNode.new(
@@ -24,35 +26,6 @@ module Decidim
         )
       end
 
-      def filter_scopes_values
-        main_scopes = current_organization.scopes.top_level
-
-        scopes_values = main_scopes.includes(:scope_type, :children).flat_map do |scope|
-          TreeNode.new(
-            TreePoint.new(scope.id.to_s, translated_attribute(scope.name, current_organization)),
-            scope_children_to_tree(scope)
-          )
-        end
-
-        scopes_values.prepend(TreePoint.new("global", t("decidim.scopes.global")))
-
-        TreeNode.new(
-          TreePoint.new("", t("decidim.initiatives.application_helper.filter_scope_values.all")),
-          scopes_values
-        )
-      end
-
-      def scope_children_to_tree(scope)
-        return unless scope.children.any?
-
-        scope.children.includes(:scope_type, :children).flat_map do |child|
-          TreeNode.new(
-            TreePoint.new(child.id.to_s, translated_attribute(child.name, current_organization)),
-            scope_children_to_tree(child)
-          )
-        end
-      end
-
       def filter_types_values
         types_values = Decidim::InitiativesType.where(organization: current_organization).map do |type|
           TreeNode.new(
@@ -66,38 +39,8 @@ module Decidim
         )
       end
 
-      def filter_areas_values
-        areas_or_types = areas_for_select(current_organization)
-
-        areas_values = if areas_or_types.first.is_a?(Decidim::Area)
-                         filter_areas(areas_or_types)
-                       else
-                         filter_areas_and_types(areas_or_types)
-                       end
-
-        TreeNode.new(
-          TreePoint.new("", t("decidim.initiatives.application_helper.filter_area_values.all")),
-          areas_values
-        )
-      end
-
-      def filter_areas(areas)
-        areas.map do |area|
-          TreeNode.new(
-            TreePoint.new(area.id.to_s, area.name[I18n.locale.to_s])
-          )
-        end
-      end
-
-      def filter_areas_and_types(area_types)
-        area_types.map do |area_type|
-          TreeNode.new(
-            TreePoint.new(area_type.area_ids.join("_"), area_type.name[I18n.locale.to_s]),
-            area_type.areas.map do |area|
-              TreePoint.new(area.id.to_s, area.name[I18n.locale.to_s])
-            end
-          )
-        end
+      def component_name
+        (defined?(current_component) && translated_attribute(current_component&.name).presence) || t("decidim.admin.models.initiatives.fields.title")
       end
     end
   end

data/app/helpers/decidim/initiatives/initiative_helper.rb

@@ -19,6 +19,19 @@ module Decidim
         "warning"
       end
 
+      def metadata_badge_css_class(initiative)
+        case initiative
+        when "accepted", "published"
+          "success"
+        when "rejected", "discarded"
+          "alert"
+        when "validating"
+          "warning"
+        else
+          "muted"
+        end
+      end
+
       # Public: The state of an initiative in a way a human can understand.
       #
       # initiative - Decidim::Initiative.
@@ -85,22 +98,42 @@ module Decidim
         initiative.percentage >= 100
       end
 
-      def authorized_vote_modal_button(initiative, html_options, &block)
+      def authorized_create_modal_button(type, html_options, &)
+        tag = "button"
+        html_options ||= {}
+
+        if current_user
+          if action_authorized_to("create", permissions_holder: type).ok?
+            html_options["data-dialog-open"] = "not-authorized-modal"
+          else
+            html_options["data-dialog-open"] = "authorizationModal"
+            html_options["data-dialog-remote-url"] = authorization_create_modal_initiative_path(type)
+          end
+        else
+          html_options["data-dialog-open"] = "loginModal"
+        end
+
+        html_options["onclick"] = "event.preventDefault();"
+
+        send("#{tag}_to", "", html_options, &)
+      end
+
+      def authorized_vote_modal_button(initiative, html_options, &)
         return if current_user && action_authorized_to("vote", resource: initiative, permissions_holder: initiative.type).ok?
 
         tag = "button"
         html_options ||= {}
 
         if current_user
-          html_options["data-open"] = "authorizationModal"
-          html_options["data-open-url"] = authorization_sign_modal_initiative_path(initiative)
+          html_options["data-dialog-open"] = "authorizationModal"
+          html_options["data-dialog-remote-url"] = authorization_sign_modal_initiative_path(initiative)
         else
-          html_options["data-open"] = "loginModal"
+          html_options["data-dialog-open"] = "loginModal"
         end
 
         html_options["onclick"] = "event.preventDefault();"
 
-        send("#{tag}_to", "", html_options, &block)
+        send("#{tag}_to", "", html_options, &)
       end
 
       def can_edit_custom_signature_end_date?(initiative)
@@ -114,6 +147,16 @@ module Decidim
 
         initiative.created? || initiative.validating?
       end
+
+      def render_committee_tooltip
+        with_tooltip t("decidim.initiatives.create_initiative.share_committee_link.invite_to_committee_help"), class: "left" do
+          icon "file-copy-line"
+        end
+      end
+
+      def hero_background_path(initiative)
+        initiative.attachments.find(&:image?)&.url
+      end
     end
   end
 end

data/app/helpers/decidim/initiatives/initiatives_helper.rb

@@ -4,18 +4,16 @@ module Decidim
   module Initiatives
     # Helper functions for initiatives views
     module InitiativesHelper
-      def initiatives_filter_form_for(filter)
-        content_tag :div, class: "filters" do
-          form_for filter,
-                   namespace: filter_form_namespace,
-                   builder: Decidim::Initiatives::InitiativesFilterFormBuilder,
-                   url: url_for,
-                   as: :filter,
-                   method: :get,
-                   remote: true,
-                   html: { id: nil } do |form|
-            yield form
-          end
+      # Items to display in the navigation of an initiative
+      def initiative_nav_items(participatory_space)
+        components = participatory_space.components.published.or(Decidim::Component.where(id: try(:current_component)))
+
+        components.map do |component|
+          {
+            name: translated_attribute(component.name),
+            url: main_component_path(component),
+            active: is_active_link?(main_component_path(component), :inclusive)
+          }
         end
       end
 
@@ -27,6 +25,29 @@ module Decidim
       def filter_form_namespace
         "filters_#{SecureRandom.uuid}"
       end
+
+      # i18n-tasks-use t('decidim.initiatives.initiatives.filters.state')
+      # i18n-tasks-use t('decidim.initiatives.initiatives.filters.scope')
+      # i18n-tasks-use t('decidim.initiatives.initiatives.filters.type')
+      # i18n-tasks-use t('decidim.initiatives.initiatives.filters.area')
+      # i18n-tasks-use t('decidim.initiatives.initiatives.filters.author')
+      def filter_sections
+        sections = [
+          { method: :with_any_state, collection: filter_states_values, label_scope: "decidim.initiatives.initiatives.filters", id: "state" },
+          { method: :with_any_scope, collection: filter_global_scopes_values, label_scope: "decidim.initiatives.initiatives.filters", id: "scope" }
+        ]
+        sections.append(method: :with_any_type, collection: filter_types_values, label_scope: "decidim.initiatives.initiatives.filters", id: "type") unless single_initiative_type?
+        sections.append(method: :with_any_area, collection: filter_areas_values, label_scope: "decidim.initiatives.initiatives.filters", id: "area")
+        sections.append(method: :author, collection: filter_author_values, label_scope: "decidim.initiatives.initiatives.filters", id: "author") if current_user
+        sections.reject { |item| item[:collection].blank? }
+      end
+
+      def filter_author_values
+        [
+          ["any", t("any", scope: "decidim.initiatives.initiatives.filters")],
+          ["myself", t("myself", scope: "decidim.initiatives.initiatives.filters")]
+        ]
+      end
     end
   end
 end

data/app/jobs/decidim/initiatives/export_initiatives_job.rb

@@ -17,7 +17,7 @@ module Decidim
       private
 
       def collection_to_export(ids, organization)
-        collection = Decidim::Initiative.where(organization: organization)
+        collection = Decidim::Initiative.where(organization:)
 
         collection = collection.where(id: ids) if ids.present?