decidim-initiatives 0.23.6 → 0.24.0.rc1

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

@@ -0,0 +1,61 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Initiatives
+    class ApproveMembershipRequestEvent < Decidim::Events::BaseEvent
+      include Decidim::Events::EmailEvent
+      include Decidim::Events::NotificationEvent
+
+      def email_subject
+        I18n.t(
+          "decidim.initiatives.events.approve_membership_request.email_subject",
+          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
+        )
+      end
+
+      def email_outro
+        I18n.t(
+          "decidim.initiatives.events.approve_membership_request.email_outro",
+          resource_title: resource_title,
+          resource_url: 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
+        ).html_safe
+      end
+
+      private
+
+      def author_nickname
+        author.nickname
+      end
+
+      def author_profile_url
+        author.profile_url
+      end
+
+      def author
+        @author ||= Decidim::UserPresenter.new(
+          Decidim::User.find(@extra["author"]["id"])
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Initiatives
+    class InitiativeSentToTechnicalValidationEvent < Decidim::Events::SimpleEvent
+      include Rails.application.routes.mounted_helpers
+
+      i18n_attributes :admin_initiative_url, :admin_initiative_path
+
+      def admin_initiative_path
+        ResourceLocatorPresenter.new(resource).edit
+      end
+
+      def admin_initiative_url
+        decidim_admin_initiatives.edit_initiative_url(resource, resource.mounted_params)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Initiatives
+    class RevokeMembershipRequestEvent < Decidim::Events::BaseEvent
+      include Decidim::Events::EmailEvent
+      include Decidim::Events::NotificationEvent
+
+      def email_subject
+        I18n.t(
+          "decidim.initiatives.events.revoke_membership_request.email_subject",
+          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
+        )
+      end
+
+      def email_outro
+        I18n.t(
+          "decidim.initiatives.events.revoke_membership_request.email_outro",
+          resource_title: resource_title,
+          resource_url: 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
+        ).html_safe
+      end
+
+      private
+
+      def author_nickname
+        author.nickname
+      end
+
+      def author_profile_url
+        author.profile_url
+      end
+
+      def author
+        @author ||= Decidim::UserPresenter.new(
+          Decidim::User.find(@extra["author"]["id"])
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Initiatives
+    class SpawnCommitteeRequestEvent < Decidim::Events::BaseEvent
+      include Decidim::Events::EmailEvent
+      include Decidim::Events::NotificationEvent
+
+      def email_subject
+        I18n.t(
+          "decidim.initiatives.events.spawn_committee_request_event.email_subject",
+          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
+        )
+      end
+
+      def email_outro
+        I18n.t(
+          "decidim.initiatives.events.spawn_committee_request_event.email_outro",
+          resource_title: resource_title,
+          resource_url: 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
+        ).html_safe
+      end
+
+      private
+
+      def applicant_nickname
+        applicant.nickname
+      end
+
+      def applicant_profile_url
+        applicant.profile_url
+      end
+
+      def applicant
+        @applicant ||= Decidim::UserPresenter.new(
+          Decidim::User.find(@extra["applicant"]["id"])
+        )
+      end
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ module Decidim
         attribute :state, String
         attribute :attachment, AttachmentForm
 
-        validates :title, :description, presence: true
+        validates :title, :description, translatable_presence: true
         validates :area, presence: true, if: ->(form) { form.area_id.present? }
         validates :signature_type, presence: true, if: :signature_type_updatable?
         validates :signature_start_date, presence: true, if: ->(form) { form.context.initiative.published? }
@@ -38,6 +38,8 @@ module Decidim
         validate :notify_missing_attachment_if_errored
         validate :area_is_not_removed
 
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/PerceivedComplexity
         def map_model(model)
           self.type_id = model.type.id
           self.decidim_scope_id = model.scope&.id
@@ -59,12 +61,14 @@ module Decidim
             end
           end
         end
+        # rubocop:enable Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/PerceivedComplexity
 
         def signature_type_updatable?
           @signature_type_updatable ||= begin
-                                          state ||= context.initiative.state
-                                          state == "validating" && context.current_user.admin? || state == "created"
-                                        end
+            state ||= context.initiative.state
+            state == "validating" && context.current_user.admin? || state == "created"
+          end
         end
 
         def state_updatable?

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

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # A form object used to collect the all the initiative type attributes.
       class InitiativeTypeForm < Decidim::Form
+        DEFAULT_MINIMUM_COMMITTEE_MEMBERS = 2
+
         include TranslatableAttributes
 
         mimic :initiatives_type
@@ -39,6 +41,7 @@ module Decidim
 
         def minimum_committee_members
           return 0 unless promoting_committee_enabled?
+          return DEFAULT_MINIMUM_COMMITTEE_MEMBERS if super.blank?
 
           super
         end

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

@@ -5,6 +5,7 @@ module Decidim
     # A form object used to collect the data for a new initiative.
     class InitiativeForm < Form
       include TranslatableAttributes
+      include AttachmentAttributes
 
       mimic :initiative
 
@@ -18,6 +19,10 @@ module Decidim
       attribute :signature_end_date, Date
       attribute :state, String
       attribute :attachment, AttachmentForm
+      attribute :hashtag, String
+
+      attachments_attribute :photos
+      attachments_attribute :documents
 
       validates :title, :description, presence: true
       validates :title, length: { maximum: 150 }
@@ -40,6 +45,14 @@ module Decidim
         state == "created" || state.nil?
       end
 
+      def state_updatable?
+        false
+      end
+
+      def area_updatable?
+        @area_updatable ||= current_user.admin? || context.initiative.created?
+      end
+
       def scope_id
         return nil if initiative_type.only_global_scope_enabled?
 
@@ -51,7 +64,7 @@ module Decidim
       end
 
       def initiative_type
-        @initiative_type ||= InitiativesType.find(type_id)
+        @initiative_type ||= type_id ? InitiativesType.find(type_id) : context.initiative.type
       end
 
       def available_scopes
@@ -66,12 +79,22 @@ module Decidim
         @scope ||= Scope.find(scope_id) if scope_id.present?
       end
 
+      def scoped_type_id
+        return unless type && scope_id
+
+        type.scopes.find_by(decidim_scopes_id: scope_id.presence).id
+      end
+
       private
 
+      def type
+        @type ||= type_id ? Decidim::InitiativesType.find(type_id) : context.initiative.type
+      end
+
       def scope_exists
         return if scope_id.blank?
 
-        errors.add(:scope_id, :invalid) unless InitiativesTypeScope.where(type: initiative_type, scope: scope).exists?
+        errors.add(:scope_id, :invalid) unless InitiativesTypeScope.exists?(type: initiative_type, scope: scope)
       end
 
       # This method will add an error to the `attachment` field only if there's

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

@@ -141,7 +141,7 @@ module Decidim
 
       # Private: Checks if there's any existing vote that matches the user's data.
       def already_voted?
-        errors.add(:document_number, :taken) if initiative.votes.where(hash_id: hash_id, scope: scope).exists?
+        errors.add(:document_number, :taken) if initiative.votes.exists?(hash_id: hash_id, scope: scope)
       end
 
       def author

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      module InitiativeAdminMenuHelper
+        include Decidim::Admin::SidebarMenuHelper
+
+        def admin_initiatives_menu
+          @admin_initiatives_menu ||= sidebar_menu(:admin_initiatives_menu)
+        end
+      end
+    end
+  end
+end

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

@@ -10,9 +10,10 @@ module Decidim
         type = ::Decidim::InitiativesType.find(initiative_form.type_id)
         allowed_signatures = type.allowed_signature_types_for_initiatives
 
-        if allowed_signatures == %w(online)
+        case allowed_signatures
+        when %w(online)
           online_signature_type_options
-        elsif allowed_signatures == %w(offline)
+        when %w(offline)
           offline_signature_type_options
         else
           all_signature_type_options

data/app/models/concerns/decidim/initiatives/has_area.rb

@@ -23,7 +23,7 @@ module Decidim
       def area_belongs_to_organization
         return unless area && organization
 
-        errors.add(:area, :invalid) unless areas.where(id: area.id).exists?
+        errors.add(:area, :invalid) unless areas.exists?(id: area.id)
       end
     end
   end

data/app/models/decidim/initiative.rb

@@ -29,7 +29,6 @@ module Decidim
                class_name: "Decidim::Organization"
 
     belongs_to :scoped_type,
-               foreign_key: "scoped_type_id",
                class_name: "Decidim::InitiativesTypeScope",
                inverse_of: :initiatives
 

data/app/permissions/decidim/initiatives/admin/permissions.rb

@@ -198,10 +198,11 @@ module Decidim
         end
 
         def allowed_to_send_to_technical_validation?
-          initiative.created? && (
-            !initiative.created_by_individual? ||
-            initiative.enough_committee_members?
-          )
+          initiative.discarded? ||
+            (initiative.created? && (
+              !initiative.created_by_individual? ||
+              initiative.enough_committee_members?
+            ))
         end
       end
     end

data/app/permissions/decidim/initiatives/permissions.rb

@@ -4,11 +4,6 @@ module Decidim
   module Initiatives
     class Permissions < Decidim::DefaultPermissions
       def permissions
-        if read_admin_dashboard_action?
-          user_can_read_admin_dashboard?
-          return permission_action
-        end
-
         # Delegate the admin permission checks to the admin permissions class
         return Decidim::Initiatives::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public
@@ -23,6 +18,8 @@ module Decidim
         return permission_action unless user
 
         create_initiative?
+        edit_public_initiative?
+        update_public_initiative?
 
         vote_initiative?
         sign_initiative?
@@ -30,6 +27,9 @@ module Decidim
 
         initiative_attachment?
 
+        initiative_committee_action?
+        send_to_technical_validation?
+
         permission_action
       end
 
@@ -72,6 +72,18 @@ module Decidim
         toggle_allow(creation_enabled?)
       end
 
+      def edit_public_initiative?
+        allow! if permission_action.subject == :initiative &&
+                  permission_action.action == :edit
+      end
+
+      def update_public_initiative?
+        return unless permission_action.subject == :initiative &&
+                      permission_action.action == :update
+
+        toggle_allow(initiative.created?)
+      end
+
       def creation_enabled?
         Decidim::Initiatives.creation_enabled && (
           Decidim::Initiatives.do_not_require_authorization ||
@@ -108,21 +120,6 @@ module Decidim
           )
       end
 
-      def has_initiatives?
-        (InitiativesCreated.by(user) | InitiativesPromoted.by(user)).any?
-      end
-
-      def read_admin_dashboard_action?
-        permission_action.action == :read &&
-          permission_action.subject == :admin_dashboard
-      end
-
-      def user_can_read_admin_dashboard?
-        return unless user
-
-        allow! if has_initiatives?
-      end
-
       def vote_initiative?
         return unless permission_action.action == :vote &&
                       permission_action.subject == :initiative
@@ -189,6 +186,36 @@ module Decidim
           UserAuthorizations.for(user).any?
         )
       end
+
+      def initiative_committee_action?
+        return unless permission_action.subject == :initiative_committee_member
+
+        request = context.fetch(:request, nil)
+        return unless user.admin? || initiative&.has_authorship?(user)
+
+        case permission_action.action
+        when :index
+          allow!
+        when :approve
+          toggle_allow(!request&.accepted?)
+        when :revoke
+          toggle_allow(!request&.rejected?)
+        end
+      end
+
+      def send_to_technical_validation?
+        return unless permission_action.action == :send_to_technical_validation &&
+                      permission_action.subject == :initiative
+
+        toggle_allow(allowed_to_send_to_technical_validation?)
+      end
+
+      def allowed_to_send_to_technical_validation?
+        initiative.created? && (
+          !initiative.created_by_individual? ||
+          initiative.enough_committee_members?
+        )
+      end
     end
   end
 end

data/app/queries/decidim/initiatives/initiatives_promoted.rb

@@ -25,7 +25,7 @@ module Decidim
         Initiative
           .joins(:committee_members)
           .where("decidim_initiatives_committee_members.state = 2")
-          .where("decidim_initiatives_committee_members.decidim_users_id = ?", user.id)
+          .where(decidim_initiatives_committee_members: { decidim_users_id: user.id })
       end
     end
   end

data/app/queries/decidim/initiatives/organization_prioritized_initiatives.rb

@@ -4,13 +4,24 @@ module Decidim
   module Initiatives
     # This query retrieves the organization prioritized initiatives that will appear in the homepage
     class OrganizationPrioritizedInitiatives < Rectify::Query
-      attr_reader :organization
+      attr_reader :organization, :order
 
-      def initialize(organization)
+      def initialize(organization, order)
         @organization = organization
+        @order = order
       end
 
       def query
+        if order == "most_recent"
+          base_query.order_by_most_recently_published
+        else
+          base_query
+        end
+      end
+
+      private
+
+      def base_query
         Decidim::Initiative.where(organization: organization).published.open
       end
     end

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

@@ -24,6 +24,9 @@ module Decidim
           authors: {
             id: resource.author_users.map(&:id),
             name: resource.author_users.map(&:name)
+          },
+          area: {
+            name: resource.area&.name
           }
         }
       end

data/app/services/decidim/initiatives/dummy_timestamp.rb

@@ -15,7 +15,7 @@ module Decidim
 
       # Public: Timestamp generated from data
       def timestamp
-        @timestamp ||= Base64.encode64(OpenSSL::Digest::SHA1.digest("#{@document}-#{Time.current}")).chop
+        @timestamp ||= Base64.encode64(OpenSSL::Digest.digest("SHA1", "#{@document}-#{Time.current}")).chop
       end
     end
   end

data/app/services/decidim/initiatives/initiative_search.rb

@@ -45,18 +45,14 @@ module Decidim
 
       # Handle the state filter
       def search_state
-        accepted = state.member?("accepted") ? query.accepted : nil
-        rejected = state.member?("rejected") ? query.rejected : nil
-        answered = state.member?("answered") ? query.answered : nil
-        open = state.member?("open") ? query.open : nil
-        closed = state.member?("closed") ? query.closed : nil
-
-        query
-          .where(id: accepted)
-          .or(query.where(id: rejected))
-          .or(query.where(id: answered))
-          .or(query.where(id: open))
-          .or(query.where(id: closed))
+        ids = []
+        ids += state.member?("accepted") ? query.accepted.ids : []
+        ids += state.member?("rejected") ? query.rejected.ids : []
+        ids += state.member?("answered") ? query.answered.ids : []
+        ids += state.member?("open") ? query.open.ids : []
+        ids += state.member?("closed") ? query.closed.ids : []
+
+        query.where(id: ids)
       end
 
       def search_type_id
@@ -69,7 +65,13 @@ module Decidim
 
       def search_author
         if author == "myself" && options[:current_user]
-          query.where(decidim_author_id: options[:current_user].id)
+          co_authoring_initiative_ids = Decidim::InitiativesCommitteeMember.where(
+            decidim_users_id: options[:current_user].id
+          ).pluck(:decidim_initiatives_id)
+
+          query.where(decidim_author_id: options[:current_user].id, decidim_author_type: Decidim::UserBaseEntity.name)
+               .or(query.where(id: co_authoring_initiative_ids))
+               .unscope(where: :published_at)
         else
           query
         end