decidim-initiatives 0.23.5 → 0.24.2

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
 
@@ -53,7 +53,7 @@ module Decidim
                       permission_action.action == :read
 
         return allow! if initiative.published? || initiative.rejected? || initiative.accepted?
-        return allow! if user && (initiative.has_authorship?(user) || user.admin?)
+        return allow! if user && authorship_or_admin?
 
         disallow!
       end
@@ -72,12 +72,26 @@ module Decidim
         toggle_allow(creation_enabled?)
       end
 
+      def edit_public_initiative?
+        return unless permission_action.subject == :initiative &&
+                      permission_action.action == :edit
+
+        toggle_allow(initiative&.created? && authorship_or_admin?)
+      end
+
+      def update_public_initiative?
+        return unless permission_action.subject == :initiative &&
+                      permission_action.action == :update
+
+        toggle_allow(initiative&.created? && authorship_or_admin?)
+      end
+
       def creation_enabled?
         Decidim::Initiatives.creation_enabled && (
-          Decidim::Initiatives.do_not_require_authorization ||
+        Decidim::Initiatives.do_not_require_authorization ||
             UserAuthorizations.for(user).any? ||
             Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
-        )
+      )
       end
 
       def request_membership?
@@ -102,25 +116,10 @@ module Decidim
           initiative.promoting_committee_enabled? &&
           !initiative.has_authorship?(user) &&
           (
-            Decidim::Initiatives.do_not_require_authorization ||
-            UserAuthorizations.for(user).any? ||
-            Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
-          )
-      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?
+          Decidim::Initiatives.do_not_require_authorization ||
+              UserAuthorizations.for(user).any? ||
+              Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
+        )
       end
 
       def vote_initiative?
@@ -185,9 +184,43 @@ module Decidim
 
       def can_user_support?(initiative)
         !initiative.offline_signature_type? && (
-          Decidim::Initiatives.do_not_require_authorization ||
-          UserAuthorizations.for(user).any?
-        )
+        Decidim::Initiatives.do_not_require_authorization ||
+            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
+
+      def authorship_or_admin?
+        initiative&.has_authorship?(user) || user.admin?
       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

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

@@ -18,23 +18,23 @@ module Decidim
       # Public: PDF signed using a new certificate generated by the service
       def signed_pdf
         @signed_pdf ||= begin
-                          StringIO.open(pdf) do |stream|
-                            parsed_pdf = Origami::PDF.read(stream)
-                            parsed_pdf.append_page do |page|
-                              page.add_annotation(signature_annotation)
-                              parsed_pdf.sign(
-                                certificate,
-                                key,
-                                method: "adbe.pkcs7.detached",
-                                annotation: signature_annotation,
-                                location: location,
-                                contact: contact,
-                                issuer: issuer
-                              )
-                            end
-                            extract_signed_pdf(parsed_pdf)
-                          end
-                        end
+          StringIO.open(pdf) do |stream|
+            parsed_pdf = Origami::PDF.read(stream)
+            parsed_pdf.append_page do |page|
+              page.add_annotation(signature_annotation)
+              parsed_pdf.sign(
+                certificate,
+                key,
+                method: "adbe.pkcs7.detached",
+                annotation: signature_annotation,
+                location: location,
+                contact: contact,
+                issuer: issuer
+              )
+            end
+            extract_signed_pdf(parsed_pdf)
+          end
+        end
       end
 
       private
@@ -68,15 +68,15 @@ module Decidim
 
       def signature_annotation(options = {})
         @signature_annotation ||= begin
-                                    width = options.fetch(:width, 200.0)
-                                    height = options.fetch(:height, 50.0)
-
-                                    Origami::Annotation::Widget::Signature.new.tap do |annotation|
-                                      annotation.set_indirect(true)
-                                      annotation.Rect = Origami::Rectangle[llx: height, lly: width + height, urx: width + height, ury: width]
-                                      annotation.set_normal_appearance(text_annotation(width: width, height: height))
-                                    end
-                                  end
+          width = options.fetch(:width, 200.0)
+          height = options.fetch(:height, 50.0)
+
+          Origami::Annotation::Widget::Signature.new.tap do |annotation|
+            annotation.set_indirect(true)
+            annotation.Rect = Origami::Rectangle[llx: height, lly: width + height, urx: width + height, ury: width]
+            annotation.set_normal_appearance(text_annotation(width: width, height: height))
+          end
+        end
       end
 
       def certificate
@@ -85,7 +85,7 @@ module Decidim
           cert.not_after = 10.years.from_now
 
           cert.public_key = key.public_key
-          cert.sign(key, OpenSSL::Digest::SHA256.new)
+          cert.sign(key, OpenSSL::Digest.new("SHA256"))
         end
       end