decidim-initiatives 0.28.3 → 0.29.0.rc1

data/app/controllers/decidim/initiatives/admin/initiatives_controller.rb

@@ -17,6 +17,8 @@ module Decidim
         helper Decidim::Initiatives::InitiativeHelper
         helper Decidim::Initiatives::SignatureTypeOptionsHelper
 
+        helper_method :show_initiative_type_callout?
+
         # GET /admin/initiatives
         def index
           enforce_permission_to :list, :initiative
@@ -46,7 +48,7 @@ module Decidim
           @form = form(Decidim::Initiatives::Admin::InitiativeForm)
                   .from_params(params, initiative: current_initiative)
 
-          Decidim::Initiatives::Admin::UpdateInitiative.call(current_initiative, @form, current_user) do
+          Decidim::Initiatives::Admin::UpdateInitiative.call(@form, current_initiative) do
             on(:ok) do |initiative|
               flash[:notice] = I18n.t("initiatives.update.success", scope: "decidim.initiatives.admin")
               redirect_to edit_initiative_path(initiative)
@@ -183,6 +185,10 @@ module Decidim
 
         private
 
+        def show_initiative_type_callout?
+          Decidim::InitiativesType.where(organization: current_organization).none?
+        end
+
         def collection
           @collection ||= ManageableInitiatives.for(current_user)
         end

data/app/controllers/decidim/initiatives/admin/initiatives_settings_controller.rb

@@ -23,7 +23,7 @@ module Decidim
           @form = initiatives_settings_form
                   .from_params(params, initiatives_settings: current_initiatives_settings)
 
-          UpdateInitiativesSettings.call(current_initiatives_settings, @form) do
+          UpdateInitiativesSettings.call(@form, current_initiatives_settings) do
             on(:ok) do
               flash[:notice] = I18n.t("initiatives_settings.update.success", scope: "decidim.admin")
               redirect_to edit_initiatives_setting_path

data/app/controllers/decidim/initiatives/admin/initiatives_type_scopes_controller.rb

@@ -48,10 +48,10 @@ module Decidim
           enforce_permission_to :update, :initiative_type_scope, initiative_type_scope: current_initiative_type_scope
           @form = initiative_type_scope_form.from_params(params)
 
-          UpdateInitiativeTypeScope.call(current_initiative_type_scope, @form) do
+          UpdateInitiativeTypeScope.call(@form, current_initiative_type_scope) do
             on(:ok) do
               flash[:notice] = I18n.t("decidim.initiatives.admin.initiatives_type_scopes.update.success")
-              redirect_to edit_initiatives_type_path(initiative_type_scope.type)
+              redirect_to edit_initiatives_type_path(resource.type)
             end
 
             on(:invalid) do

data/app/controllers/decidim/initiatives/admin/initiatives_types_controller.rb

@@ -32,7 +32,7 @@ module Decidim
           enforce_permission_to :create, :initiative_type
           @form = initiative_type_form.from_params(params)
 
-          CreateInitiativeType.call(@form, current_user) do
+          CreateInitiativeType.call(@form) do
             on(:ok) do |initiative_type|
               flash[:notice] = I18n.t("decidim.initiatives.admin.initiatives_types.create.success")
               redirect_to edit_initiatives_type_path(initiative_type)
@@ -60,7 +60,7 @@ module Decidim
           @form = initiative_type_form
                   .from_params(params, initiative_type: current_initiative_type)
 
-          UpdateInitiativeType.call(current_initiative_type, @form, current_user) do
+          UpdateInitiativeType.call(@form, current_initiative_type) do
             on(:ok) do
               flash[:notice] = I18n.t("decidim.initiatives.admin.initiatives_types.update.success")
               redirect_to edit_initiatives_type_path(current_initiative_type)

data/app/controllers/decidim/initiatives/application_controller.rb

@@ -2,7 +2,10 @@
 
 module Decidim
   module Initiatives
-    # The main admin application controller for initiatives
+    # The main application controller for initiatives
+    #
+    # This controller is the abstract class from which all other controllers of
+    # this engine inherit.
     class ApplicationController < Decidim::ApplicationController
       include NeedsPermission
       register_permissions(::Decidim::Initiatives::ApplicationController,
@@ -11,7 +14,7 @@ module Decidim
                            ::Decidim::Permissions)
 
       before_action do
-        if Decidim::InitiativesType.joins(:scopes).where(organization: current_organization).all.empty?
+        if Decidim::InitiativesType.joins(:scopes).where(organization: current_organization).none?
           flash[:alert] = t("index.uninitialized", scope: "decidim.initiatives")
           redirect_to(decidim.root_path)
         end

data/app/controllers/decidim/initiatives/committee_requests_controller.rb

@@ -21,7 +21,7 @@ module Decidim
         form = Decidim::Initiatives::CommitteeMemberForm
                .from_params(initiative_id: current_initiative.id, user_id: current_user.id, state: "requested")
 
-        SpawnCommitteeRequest.call(form, current_user) do
+        SpawnCommitteeRequest.call(form) do
           on(:ok) do
             redirect_to initiatives_path, flash: {
               notice: I18n.t(

data/app/controllers/decidim/initiatives/create_initiative_controller.rb

@@ -57,7 +57,7 @@ module Decidim
       def store_data
         @form = form(Decidim::Initiatives::InitiativeForm).from_params(params, { initiative_type: })
 
-        CreateInitiative.call(@form, current_user) do
+        CreateInitiative.call(@form) do
           on(:ok) do |initiative|
             session[:initiative_id] = initiative.id
 

data/app/controllers/decidim/initiatives/initiatives_controller.rb

@@ -93,7 +93,7 @@ module Decidim
         @form = form(Decidim::Initiatives::InitiativeForm)
                 .from_params(params, initiative_type: current_initiative.type, initiative: current_initiative)
 
-        UpdateInitiative.call(current_initiative, @form, current_user) do
+        UpdateInitiative.call(current_initiative, @form) do
           on(:ok) do |initiative|
             flash[:notice] = I18n.t("success", scope: "decidim.initiatives.update")
             redirect_to initiative_path(initiative)

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

@@ -3,39 +3,19 @@
 module Decidim
   module Initiatives
     class ApproveMembershipRequestEvent < Decidim::Events::SimpleEvent
-      def email_subject
-        I18n.t(
-          "decidim.initiatives.events.approve_membership_request.email_subject",
-          author_nickname:
-        )
-      end
+      def i18n_scope = "decidim.initiatives.events.approve_membership_request"
 
-      def email_intro
-        I18n.t(
-          "decidim.initiatives.events.approve_membership_request.email_intro",
-          resource_title:,
-          resource_url:,
+      def i18n_options
+        {
+          author_nickname:,
           author_profile_url:,
-          author_nickname:
-        )
-      end
-
-      def email_outro
-        I18n.t(
-          "decidim.initiatives.events.approve_membership_request.email_outro",
-          resource_title:,
-          resource_url:
-        )
-      end
-
-      def notification_title
-        I18n.t(
-          "decidim.initiatives.events.approve_membership_request.notification_title",
+          participatory_space_title:,
+          participatory_space_url:,
+          resource_path:,
           resource_title:,
           resource_url:,
-          author_profile_url:,
-          author_nickname:
-        ).html_safe
+          scope: i18n_scope
+        }
       end
 
       private

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

@@ -2,49 +2,30 @@
 
 module Decidim
   module Initiatives
-    class CreateInitiativeEvent < Decidim::Events::BaseEvent
-      include Decidim::Events::EmailEvent
-      include Decidim::Events::NotificationEvent
+    class CreateInitiativeEvent < Decidim::Events::SimpleEvent
+      def i18n_scope = "decidim.initiatives.events.create_initiative_event"
 
-      def email_subject
-        I18n.t(
-          "decidim.initiatives.events.create_initiative_event.email_subject",
+      def i18n_options
+        {
+          author_name:,
+          author_nickname:,
+          author_path:,
+          participatory_space_title:,
+          participatory_space_url:,
+          resource_path:,
           resource_title:,
-          author_nickname: author.nickname,
-          author_name: author.name
-        )
+          resource_url:,
+          scope: i18n_scope
+        }
       end
 
-      def email_intro
-        I18n.t(
-          "decidim.initiatives.events.create_initiative_event.email_intro",
-          resource_title:,
-          author_nickname: author.nickname,
-          author_name: author.name
-        )
-      end
+      private
 
-      def email_outro
-        I18n.t(
-          "decidim.initiatives.events.create_initiative_event.email_outro",
-          resource_title:,
-          author_nickname: author.nickname,
-          author_name: author.name
-        )
-      end
+      def author_nickname = author.nickname
 
-      def notification_title
-        I18n.t(
-          "decidim.initiatives.events.create_initiative_event.notification_title",
-          resource_title:,
-          resource_path:,
-          author_nickname: author.nickname,
-          author_name: author.name,
-          author_path: author.profile_path
-        ).html_safe
-      end
+      def author_name = author.name
 
-      private
+      def author_path = author.profile_path
 
       def author
         @author ||= Decidim::UserPresenter.new(resource.author)

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

@@ -2,43 +2,20 @@
 
 module Decidim
   module Initiatives
-    class RevokeMembershipRequestEvent < Decidim::Events::BaseEvent
-      include Decidim::Events::EmailEvent
-      include Decidim::Events::NotificationEvent
+    class RevokeMembershipRequestEvent < Decidim::Events::SimpleEvent
+      def i18n_scope = "decidim.initiatives.events.revoke_membership_request"
 
-      def email_subject
-        I18n.t(
-          "decidim.initiatives.events.revoke_membership_request.email_subject",
-          author_nickname:
-        )
-      end
-
-      def email_intro
-        I18n.t(
-          "decidim.initiatives.events.revoke_membership_request.email_intro",
-          resource_title:,
-          resource_url:,
+      def i18n_options
+        {
+          author_nickname:,
           author_profile_url:,
-          author_nickname:
-        )
-      end
-
-      def email_outro
-        I18n.t(
-          "decidim.initiatives.events.revoke_membership_request.email_outro",
-          resource_title:,
-          resource_url:
-        )
-      end
-
-      def notification_title
-        I18n.t(
-          "decidim.initiatives.events.revoke_membership_request.notification_title",
+          participatory_space_title:,
+          participatory_space_url:,
+          resource_path:,
           resource_title:,
           resource_url:,
-          author_profile_url:,
-          author_nickname:
-        ).html_safe
+          scope: i18n_scope
+        }
       end
 
       private

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

@@ -2,43 +2,20 @@
 
 module Decidim
   module Initiatives
-    class SpawnCommitteeRequestEvent < Decidim::Events::BaseEvent
-      include Decidim::Events::EmailEvent
-      include Decidim::Events::NotificationEvent
+    class SpawnCommitteeRequestEvent < Decidim::Events::SimpleEvent
+      def i18n_scope = "decidim.initiatives.events.spawn_committee_request_event"
 
-      def email_subject
-        I18n.t(
-          "decidim.initiatives.events.spawn_committee_request_event.email_subject",
-          applicant_nickname:
-        )
-      end
-
-      def email_intro
-        I18n.t(
-          "decidim.initiatives.events.spawn_committee_request_event.email_intro",
-          resource_title:,
-          resource_url:,
+      def i18n_options
+        {
+          applicant_nickname:,
           applicant_profile_url:,
-          applicant_nickname:
-        )
-      end
-
-      def email_outro
-        I18n.t(
-          "decidim.initiatives.events.spawn_committee_request_event.email_outro",
-          resource_title:,
-          resource_url:
-        )
-      end
-
-      def notification_title
-        I18n.t(
-          "decidim.initiatives.events.spawn_committee_request_event.notification_title",
+          participatory_space_title:,
+          participatory_space_url:,
+          resource_path:,
           resource_title:,
           resource_url:,
-          applicant_profile_url:,
-          applicant_nickname:
-        ).html_safe
+          scope: i18n_scope
+        }
       end
 
       private

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

@@ -41,7 +41,7 @@ module Decidim
         def map_model(model)
           self.type_id = model.type.id
           self.decidim_scope_id = model.scope&.id
-          self.offline_votes = offline_votes.empty? ? zero_offine_votes_with_scopes_names(model) : offline_votes_with_scopes_names(model)
+          self.offline_votes = offline_votes.empty? ? zero_offline_votes_with_scopes_names(model) : offline_votes_with_scopes_names(model)
         end
 
         def signature_type_updatable?
@@ -72,7 +72,7 @@ module Decidim
         private
 
         # Private: set the in-person signatures to zero for every scope
-        def zero_offine_votes_with_scopes_names(model)
+        def zero_offline_votes_with_scopes_names(model)
           model.votable_initiative_type_scopes.each_with_object({}) do |initiative_scope_type, all_votes|
             all_votes[initiative_scope_type.decidim_scopes_id || "global"] = [0, initiative_scope_type.scope_name]
           end

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

@@ -3,12 +3,15 @@
 module Decidim
   module Initiatives
     # A form object used to collect the data for a new initiative.
-    class InitiativeForm < PreviousForm
+    class InitiativeForm < Form
       include TranslatableAttributes
       include AttachmentAttributes
 
       mimic :initiative
 
+      attribute :title, String
+      attribute :description, String
+      attribute :type_id, Integer
       attribute :area_id, Integer
       attribute :decidim_user_group_id, Integer
       attribute :signature_type, String
@@ -21,6 +24,9 @@ module Decidim
       attachments_attribute :photos
       attachments_attribute :documents
 
+      validates :title, :description, presence: true
+      validates :title, length: { maximum: 150 }
+      validates :type_id, presence: true
       validates :signature_type, presence: true
       validates :area, presence: true, if: ->(form) { form.area_id.present? }
       validate :notify_missing_attachment_if_errored
@@ -39,6 +45,10 @@ module Decidim
         self.description = translated_attribute(model.description)
       end
 
+      def type
+        @type ||= type_id ? Decidim::InitiativesType.find(type_id) : context.initiative.type
+      end
+
       def signature_type_updatable?
         state == "created" || state.nil?
       end

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

@@ -93,8 +93,8 @@ module Decidim
       # Public: Builds a list of Decidim::Scopes where the user could have a
       # valid authorization.
       #
-      # If the intiative is set with a global scope (meaning the scope is nil),
-      # all the scopes in the organizaton are valid.
+      # If the initiative is set with a global scope (meaning the scope is nil),
+      # all the scopes in the organization are valid.
       #
       # Returns an array of Decidim::Scopes.
       def authorized_scope_candidates

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

@@ -7,18 +7,6 @@ module Decidim
       include Decidim::SanitizeHelper
       include Decidim::ResourceVersionsHelper
 
-      # Public: The css class applied based on the initiative state to
-      #         the initiative badge.
-      #
-      # initiative - Decidim::Initiative
-      #
-      # Returns a String.
-      def state_badge_css_class(initiative)
-        return "success" if initiative.accepted?
-
-        "warning"
-      end
-
       def metadata_badge_css_class(initiative)
         case initiative
         when "accepted", "published"
@@ -32,17 +20,6 @@ module Decidim
         end
       end
 
-      # Public: The state of an initiative in a way a human can understand.
-      #
-      # initiative - Decidim::Initiative.
-      #
-      # Returns a String.
-      def humanize_state(initiative)
-        I18n.t(initiative.accepted? ? "accepted" : "expired",
-               scope: "decidim.initiatives.states",
-               default: :expired)
-      end
-
       # Public: The state of an initiative from an administration perspective in
       # a way that a human can understand.
       #
@@ -53,51 +30,6 @@ module Decidim
         I18n.t(state, scope: "decidim.initiatives.admin_states", default: :created)
       end
 
-      def popularity_tag(initiative)
-        content_tag(:div, class: "extra__popularity popularity #{popularity_class(initiative)}".strip) do
-          5.times do
-            concat(content_tag(:span, class: "popularity__item") do
-              # empty block
-            end)
-          end
-
-          concat(content_tag(:span, class: "popularity__desc") do
-            I18n.t("decidim.initiatives.initiatives.vote_cabin.supports_required",
-                   total_supports: initiative.scoped_type.supports_required)
-          end)
-        end
-      end
-
-      def popularity_class(initiative)
-        return "popularity--level1" if popularity_level1?(initiative)
-        return "popularity--level2" if popularity_level2?(initiative)
-        return "popularity--level3" if popularity_level3?(initiative)
-        return "popularity--level4" if popularity_level4?(initiative)
-        return "popularity--level5" if popularity_level5?(initiative)
-
-        ""
-      end
-
-      def popularity_level1?(initiative)
-        initiative.percentage.positive? && initiative.percentage < 40
-      end
-
-      def popularity_level2?(initiative)
-        initiative.percentage >= 40 && initiative.percentage < 60
-      end
-
-      def popularity_level3?(initiative)
-        initiative.percentage >= 60 && initiative.percentage < 80
-      end
-
-      def popularity_level4?(initiative)
-        initiative.percentage >= 80 && initiative.percentage < 100
-      end
-
-      def popularity_level5?(initiative)
-        initiative.percentage >= 100
-      end
-
       def authorized_create_modal_button(type, html_options, &)
         tag = "button"
         html_options ||= {}
@@ -142,12 +74,6 @@ module Decidim
         initiative.created? || initiative.validating?
       end
 
-      def can_edit_area?(initiative)
-        return false unless initiative.area_enabled?
-
-        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"

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

@@ -19,13 +19,6 @@ module Decidim
 
       private
 
-      # Creates a unique namespace for a filter form to prevent dupliacte IDs in
-      # the DOM when multiple filter forms are rendered with the same fields (e.g.
-      # for desktop and mobile).
-      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')

data/app/models/decidim/initiative.rb

@@ -269,7 +269,7 @@ module Decidim
       update(published_at: nil, state: "discarded")
     end
 
-    # Public: Returns wether the signature interval is already defined or not.
+    # Public: Returns whether the signature interval is already defined or not.
     def has_signature_interval_defined?
       signature_end_date.present? && signature_start_date.present?
     end

data/app/packs/src/decidim/initiatives/admin/invite_users.js

@@ -5,7 +5,7 @@ $(() => {
 
   if (inviteUsersButton !== null) {
     inviteUsersButton.addEventListener("click", function (event) {
-      let link = document.querySelector("#committee_link"),
+      let link = document.querySelector("div[data-committee_link]"),
           range = document.createRange();
 
       event.preventDefault();

data/app/serializers/decidim/initiatives/initiative_serializer.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     class InitiativeSerializer < Decidim::Exporters::Serializer
-      # Serializes an inititative
+      # Serializes an initiative
       def serialize
         {
           id: resource.id,

data/app/views/decidim/initiatives/admin/answers/_info_initiative.html.erb

@@ -3,7 +3,7 @@
     <div class="card-divider">
       <h2 class="card-title">
         <%= link_to "#{t ".initiatives"} > ", initiatives_path %>
-        <%= decidim_sanitize translated_attribute(initiative.title) %>
+        <%= decidim_sanitize_translated(initiative.title) %>
       </h2>
     </div>
 

data/app/views/decidim/initiatives/admin/committee_requests/index.html.erb

@@ -12,7 +12,7 @@
     </div>
 
     <div class="row column">
-      <div class="committee_link" id="committee_link">
+      <div data-committee_link>
         <%= decidim_initiatives.new_initiative_committee_request_url(current_initiative) %>
         <%= icon_link_to "clipboard-line", "#", t(".invite_to_committee_help"), class: "card--list__data__icon invite-users-link" %>
       </div>

data/app/views/decidim/initiatives/admin/exports/_dropdown.html.erb

@@ -1,4 +1,4 @@
-<span class="exports button button__sm button__secondary button--simple" data-toggle="<%= dropdown_id(collection_ids) %>">
+<span class="exports button button__sm button__secondary" data-toggle="<%= dropdown_id(collection_ids) %>">
   <% if collection_ids.present? %>
     <%= t("actions.export-selection", scope: "decidim.admin") %>
   <% else %>
@@ -15,11 +15,11 @@
      data-close-on-click="true">
   <ul class="vertical menu add-components">
     <% %w(CSV JSON).each do |format| %>
-      <%= link_to export_initiatives_path(format:, collection_ids:) do %>
-        <li class="exports--format--<%= format.downcase %> exports--initiatives">
-          <%= t("decidim.admin.exports.export_as", name: t("decidim.initiatives.admin.exports.initiatives"), export_format: format.upcase) %>
-        </li>
-      <% end %>
+      <li class="exports--format--<%= format.downcase %> exports--initiatives">
+        <%= link_to t("decidim.admin.exports.export_as", name: t("decidim.initiatives.admin.exports.initiatives"),
+                                                         export_format: format.upcase),
+                    export_initiatives_path(format:, collection_ids:) %>
+      </li>
     <% end %>
   </ul>
 </div>