decidim-initiatives 0.29.1 → 0.30.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66cadff3b0a6f7bee1799cf2a45a75473996a85a9044342f67c00de3e5d3fc02
-  data.tar.gz: 1afa0ba7da9298837a5b0446b5cb694a84ace63dfc05e79c3b84f467ab87bffd
+  metadata.gz: a360ab1b183437a7998f2664a48d8063f30890dbd0b574b0d3b01f86a43a0d40
+  data.tar.gz: cfd173738482c5f31a32d8f7fe4dc61c1d66d76cbb047247282c8812bc941901
 SHA512:
-  metadata.gz: 11e7100d9c3befb0dd83ebc3a103616153d59058af98d55915e47c8789e41033842c97461baa7be9c196e926e815e1d7816f68483f85b04be13b9d4cbbb14cab
-  data.tar.gz: a5bfa283cdcae83076bceddf1c4dee645ba79d288f8b2fb4e9fae315575c4c0f4ec5628e90016d921f968857396081ef6bd9785d79be2336747f78a20f13fbaa
+  metadata.gz: 14e69a315639c4572ac74d2ac5c6647e917fba75e26b0159e9597958a8b2533616af98addb9b5ac7b986b56f531dda3a4f96368c6d71db155ad64321cf4d22e8
+  data.tar.gz: a5d23dd4581af526566e2378a29f173116c2da9c4cf8575c25bc9a08ece7b6dc49233cc5d1fd7d0489e6d9a8ad281903d1d391a4ecfe78c597e3d2aedd4b411b

data/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives_settings_form/show.erb

@@ -1,4 +1,4 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.select :max_results, [4, 8, 12], prompt: "", label: max_results_label %>
+  <%= settings_fields.number_field :max_results, label: max_results_label %>
   <%= settings_fields.select :order, order_select, prompt: "", label: order_label %>
 <% end %>

data/app/commands/decidim/initiatives/create_initiative.rb

@@ -46,16 +46,28 @@ module Decidim
         end
       end
 
+      protected
+
+      def event_arguments
+        {
+          resource: initiative,
+          extra: {
+            event_author: form.current_user,
+            locale:
+          }
+        }
+      end
+
       private
 
-      attr_reader :form, :attachment
+      attr_reader :form, :attachment, :initiative
 
       # Creates the initiative and all default components
       def create_initiative
-        initiative = build_initiative
+        build_initiative
         return initiative unless initiative.valid?
 
-        initiative.transaction do
+        with_events(with_transaction: true) do
           initiative.save!
 
           @attached_to = initiative
@@ -72,7 +84,7 @@ module Decidim
       end
 
       def build_initiative
-        Initiative.new(
+        @initiative = Initiative.new(
           organization: form.current_organization,
           title: { current_locale => form.title },
           description: { current_locale => form.description },
@@ -86,7 +98,7 @@ module Decidim
       end
 
       def scoped_type
-        InitiativesTypeScope.order(:id).find_by(type: form.type)
+        InitiativesTypeScope.order(:id).find_by(type: form.type, scope: form.scope)
       end
 
       def signature_end_date

data/app/commands/decidim/initiatives/update_initiative.rb

@@ -39,22 +39,36 @@ module Decidim
           return broadcast(:invalid) if gallery_invalid?
         end
 
-        @initiative = Decidim.traceability.update!(
-          initiative,
-          current_user,
-          attributes
-        )
+        with_events(with_transaction: true) do
+          @initiative = Decidim.traceability.update!(
+            initiative,
+            current_user,
+            attributes
+          )
 
-        photo_cleanup!
-        document_cleanup!
-        create_attachments if process_attachments?
-        create_gallery if process_gallery?
+          photo_cleanup!
+          document_cleanup!
+          create_attachments if process_attachments?
+          create_gallery if process_gallery?
+        end
 
         broadcast(:ok, initiative)
       rescue ActiveRecord::RecordInvalid
         broadcast(:invalid, initiative)
       end
 
+      protected
+
+      def event_arguments
+        {
+          resource: initiative,
+          extra: {
+            event_author: form.current_user,
+            locale:
+          }
+        }
+      end
+
       private
 
       attr_reader :form, :initiative

data/app/controllers/concerns/decidim/initiatives/needs_initiative.rb

@@ -51,7 +51,7 @@ module Decidim
         def detect_initiative
           request.env["current_initiative"] ||
             Initiative.find_by(
-              id: (id_from_slug(params[:slug]) || id_from_slug(params[:initiative_slug]) || params[:initiative_id] || params[:id]),
+              id: id_from_slug(params[:slug]) || id_from_slug(params[:initiative_slug]) || params[:initiative_id] || params[:id],
               organization: current_organization
             )
         end

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

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # The main admin application controller for initiatives
       class ApplicationController < Decidim::Admin::ApplicationController
+        helper Decidim::Initiatives::ScopesHelper
+
         layout "decidim/admin/initiatives"
 
         register_permissions(::Decidim::Initiatives::Admin::ApplicationController,

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # This controller allows sharing unpublished things.
+      # It is targeted for customizations for sharing unpublished things that lives under
+      # an initiative.
+      class ComponentShareTokensController < Decidim::Admin::ShareTokensController
+        include InitiativeAdmin
+
+        def resource
+          @resource ||= current_participatory_space.components.find(params[:component_id])
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # This controller allows sharing unpublished things.
+      # It is targeted for customizations for sharing unpublished things that lives under
+      # an initiative.
+      class InitiativeShareTokensController < Decidim::Admin::ShareTokensController
+        include InitiativeAdmin
+
+        def resource
+          current_initiative
+        end
+      end
+    end
+  end
+end

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

@@ -172,19 +172,19 @@ module Decidim
 
           @votes = current_initiative.votes
 
-          output = render_to_string(
-            pdf: "votes_#{current_initiative.id}",
-            layout: "decidim/admin/initiatives_votes",
-            template: "decidim/initiatives/admin/initiatives/export_pdf_signatures",
-            format: [:pdf]
-          )
-          output = pdf_signature_service.new(pdf: output).signed_pdf if pdf_signature_service
+          serializer = Decidim::Forms::UserAnswersSerializer
+          pdf_export = Decidim::Exporters::InitiativeVotesPDF.new(@votes, current_initiative, serializer).export
+
+          output = if pdf_signature_service
+                     pdf_signature_service.new(pdf: pdf_export.read).signed_pdf
+                   else
+                     pdf_export.read
+                   end
 
           respond_to do |format|
             format.pdf do
               send_data(output, filename: "votes_#{current_initiative.id}.pdf", type: "application/pdf")
             end
-            format.html
           end
         end
 

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

@@ -14,6 +14,7 @@ module Decidim
       helper Decidim::Admin::IconLinkHelper
       helper InitiativeHelper
       helper SignatureTypeOptionsHelper
+      helper Decidim::ActionAuthorizationHelper
 
       helper_method :scopes
       helper_method :areas
@@ -63,7 +64,7 @@ module Decidim
 
             path = promotal_committee_required? ? "promotal_committee" : "finish"
 
-            redirect_to send("#{path}_create_initiative_index_path".to_sym)
+            redirect_to send(:"#{path}_create_initiative_index_path")
           end
 
           on(:invalid) do
@@ -110,7 +111,7 @@ module Decidim
         return if action_name == destination_step
         return if initiative_type_id.present? && initiative_type.present?
 
-        redirect_to send("#{destination_step}_create_initiative_index_path".to_sym)
+        redirect_to send(:"#{destination_step}_create_initiative_index_path")
       end
 
       def scopes

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

@@ -3,7 +3,7 @@
 # i18n-tasks-use t('decidim.initiatives.show.badge_name.accepted')
 # i18n-tasks-use t('decidim.initiatives.show.badge_name.created')
 # i18n-tasks-use t('decidim.initiatives.show.badge_name.discarded')
-# i18n-tasks-use t('decidim.initiatives.show.badge_name.published')
+# i18n-tasks-use t('decidim.initiatives.show.badge_name.open')
 # i18n-tasks-use t('decidim.initiatives.show.badge_name.rejected')
 # i18n-tasks-use t('decidim.initiatives.show.badge_name.validating')
 #

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

@@ -17,6 +17,7 @@ module Decidim
       helper PaginateHelper
       helper InitiativeHelper
       helper SignatureTypeOptionsHelper
+      helper Decidim::ActionAuthorizationHelper
 
       include InitiativeSlug
       include FilterResource
@@ -107,7 +108,9 @@ module Decidim
       end
 
       def print
-        enforce_permission_to :read, :initiative, initiative: current_initiative
+        enforce_permission_to :print, :initiative, initiative: current_initiative
+        output = Decidim::Initiatives::ApplicationFormPDF.new(current_initiative).render
+        send_data(output, filename: "initiative_submit_#{current_initiative.id}.pdf", type: "application/pdf")
       end
 
       private

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

@@ -10,7 +10,7 @@ module Decidim
 
         mimic :initiative
 
-        translatable_attribute :answer, String
+        translatable_attribute :answer, Decidim::Attributes::RichText
         attribute :answer_url, String
         attribute :signature_start_date, Decidim::Attributes::LocalizedDate
         attribute :signature_end_date, Decidim::Attributes::LocalizedDate
@@ -21,7 +21,7 @@ module Decidim
         }
 
         def signature_dates_required?
-          @signature_dates_required ||= context.initiative.state == "published"
+          @signature_dates_required ||= context.initiative.state == "open"
         end
       end
     end

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

@@ -11,7 +11,7 @@ module Decidim
         mimic :initiative
 
         translatable_attribute :title, String
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
         attribute :type_id, Integer
         attribute :decidim_scope_id, Integer
         attribute :area_id, Integer

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

@@ -12,7 +12,7 @@ module Decidim
         mimic :initiatives_type
 
         translatable_attribute :title, String
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
         attribute :banner_image
         attribute :signature_type, String
         attribute :undo_online_signatures_enabled, Boolean
@@ -25,7 +25,7 @@ module Decidim
         attribute :promoting_committee_enabled, Boolean
         attribute :minimum_committee_members, Integer
         attribute :collect_user_extra_fields, Boolean
-        translatable_attribute :extra_fields_legal_information, String
+        translatable_attribute :extra_fields_legal_information, Decidim::Attributes::RichText
         attribute :validate_sms_code_on_votes, Boolean
         attribute :document_number_authorization_handler, String
 

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

@@ -48,7 +48,7 @@ module Decidim
           [
             initiative.id,
             document_number || signer.id,
-            Rails.application.secrets.secret_key_base
+            Rails.application.secret_key_base
           ].compact.join("-")
         )
       end

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

@@ -9,7 +9,7 @@ module Decidim
 
       def metadata_badge_css_class(initiative)
         case initiative
-        when "accepted", "published"
+        when "accepted", "open"
           "success"
         when "rejected", "discarded"
           "alert"
@@ -30,44 +30,6 @@ module Decidim
         I18n.t(state, scope: "decidim.initiatives.admin_states", default: :created)
       end
 
-      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-dialog-open"] = "authorizationModal"
-          html_options["data-dialog-remote-url"] = authorization_sign_modal_initiative_path(initiative)
-        else
-          html_options["data-dialog-open"] = "loginModal"
-        end
-
-        html_options["onclick"] = "event.preventDefault();"
-
-        send("#{tag}_to", "/", html_options, &)
-      end
-
       def can_edit_custom_signature_end_date?(initiative)
         return false unless initiative.custom_signature_end_date_enabled?
 

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

@@ -26,12 +26,15 @@ module Decidim
       # 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" }
+          { method: :with_any_state, collection: filter_states_values, label: t("decidim.initiatives.initiatives.filters.state"), id: "state" },
+          { method: :with_any_scope, collection: filter_global_scopes_values, label: t("decidim.initiatives.initiatives.filters.scope"), 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
+        unless single_initiative_type?
+          sections.append(method: :with_any_type, collection: filter_types_values, label: t("decidim.initiatives.initiatives.filters.type"),
+                          id: "type")
+        end
+        sections.append(method: :with_any_area, collection: filter_areas_values, label: t("decidim.initiatives.initiatives.filters.area"), id: "area")
+        sections.append(method: :author, collection: filter_author_values, label: t("decidim.initiatives.initiatives.filters.author"), id: "author") if current_user
         sections.reject { |item| item[:collection].blank? }
       end
 

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # A Helper to render scopes, including a global scope, for forms.
+    module ScopesHelper
+      include DecidimFormHelper
+      include TranslatableAttributes
+
+      # Renders a scopes select field in a form.
+      # form - FormBuilder object
+      # name - attribute name
+      # options       - An optional Hash with options:
+      #
+      # Returns nothing.
+      def scopes_select_field(form, name, root: false, options: {}, html_options: {})
+        options = options.merge(include_blank: I18n.t("decidim.scopes.prompt")) unless options.has_key?(:include_blank)
+
+        form.select(
+          name,
+          ordered_scopes_descendants_for_select(root),
+          options,
+          html_options
+        )
+      end
+
+      def ordered_scopes_descendants(root = nil)
+        root = try(:current_participatory_space)&.scope if root == false
+        if root.present?
+          root.descendants
+        else
+          current_organization.scopes
+        end.sort { |a, b| a.part_of.reverse <=> b.part_of.reverse }
+      end
+
+      def ordered_scopes_descendants_for_select(root = nil)
+        ordered_scopes_descendants(root).map do |scope|
+          [" #{"&nbsp;" * 4 * (scope.part_of.count - 1)} #{translated_attribute(scope.name)}".html_safe, scope&.id]
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,8 @@
 module Decidim
   module Initiatives
     class ExportInitiativesJob < ApplicationJob
+      include Decidim::PrivateDownloadHelper
+
       queue_as :exports
 
       def perform(user, organization, format, collection_ids = nil)
@@ -11,7 +13,9 @@ module Decidim
           serializer
         ).export
 
-        ExportMailer.export(user, "initiatives", export_data).deliver_now
+        private_export = attach_archive(export_data, "initiatives", user)
+
+        ExportMailer.export(user, private_export).deliver_later
       end
 
       private

data/app/models/decidim/initiative.rb

@@ -14,6 +14,7 @@ module Decidim
     include Decidim::HasAttachmentCollections
     include Decidim::Traceable
     include Decidim::Loggable
+    include Decidim::DownloadYourData
     include Decidim::Initiatives::InitiativeSlug
     include Decidim::Resourceable
     include Decidim::HasReference
@@ -24,6 +25,8 @@ module Decidim
     include Decidim::HasResourcePermission
     include Decidim::HasArea
     include Decidim::FilterableResource
+    include Decidim::Reportable
+    include Decidim::ShareableWithToken
 
     translatable_fields :title, :description, :answer
 
@@ -63,7 +66,7 @@ module Decidim
              as: :participatory_space
 
     enum signature_type: [:online, :offline, :any], _suffix: true
-    enum state: [:created, :validating, :discarded, :published, :rejected, :accepted]
+    enum state: [:created, :validating, :discarded, :open, :rejected, :accepted]
 
     validates :title, :description, :state, :signature_type, presence: true
     validates :hashtag,
@@ -72,8 +75,8 @@ module Decidim
     validate :signature_type_allowed
 
     scope :open, lambda {
-      where.not(state: [:discarded, :rejected, :accepted, :created])
-           .currently_signable
+      where(state: [:open])
+        .currently_signable
     }
     scope :closed, lambda {
       where(state: [:discarded, :rejected, :accepted])
@@ -85,12 +88,12 @@ module Decidim
     scope_search_multi :with_any_state, [:accepted, :rejected, :answered, :open, :closed]
 
     scope :currently_signable, lambda {
-      where("signature_start_date <= ?", Date.current)
-        .where("signature_end_date >= ?", Date.current)
+      where(signature_start_date: ..Date.current)
+        .where(signature_end_date: Date.current..)
     }
     scope :currently_unsignable, lambda {
       where("signature_start_date > ?", Date.current)
-        .or(where("signature_end_date < ?", Date.current))
+        .or(where(signature_end_date: ...Date.current))
     }
 
     scope :answered, -> { where.not(answered_at: nil) }
@@ -155,10 +158,26 @@ module Decidim
                       # is Resourceable instead of ParticipatorySpaceResourceable so we cannot use `visible?`
                       index_on_update: ->(initiative) { initiative.published? })
 
+    def self.export_serializer
+      Decidim::Initiatives::DownloadYourDataInitiativeSerializer
+    end
+
     def self.log_presenter_class_for(_log)
       Decidim::Initiatives::AdminLog::InitiativePresenter
     end
 
+    def self.ransackable_attributes(auth_object = nil)
+      base = %w(search_text title description id id_string supports_count author_name author_nickname)
+
+      return base unless auth_object&.admin?
+
+      base + %w(published_at state decidim_area_id type_id)
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w(area scope taxonomies)
+    end
+
     def self.ransackable_scopes(_auth_object = nil)
       [:with_any_state, :with_any_type, :with_any_scope, :with_any_area]
     end
@@ -184,26 +203,6 @@ module Decidim
       decidim_user_group_id.nil?
     end
 
-    # Public: check if an initiative is open
-    #
-    # Returns a Boolean
-    def open?
-      !closed?
-    end
-
-    # Public: Checks if an initiative is closed. An initiative is closed when
-    # at least one of the following conditions is true:
-    #
-    # * It has been discarded.
-    # * It has been rejected.
-    # * It has been accepted.
-    # * Signature collection period has finished.
-    #
-    # Returns a Boolean
-    def closed?
-      discarded? || rejected? || accepted? || !votes_enabled?
-    end
-
     # Public: Returns the author name. If it has been created by an organization it will
     # return the organization's name. Otherwise it will return author's name.
     #
@@ -212,6 +211,16 @@ module Decidim
       user_group&.name || author.name
     end
 
+    # Public: Overrides the `reported_content_url` Reportable concern method.
+    def reported_content_url
+      ResourceLocatorPresenter.new(self).url
+    end
+
+    # Public: Overrides the `reported_attributes` Reportable concern method.
+    def reported_attributes
+      [:title, :description]
+    end
+
     def votes_enabled?
       published? &&
         signature_start_date <= Date.current &&
@@ -254,7 +263,7 @@ module Decidim
 
       update(
         published_at: Time.current,
-        state: "published",
+        state: "open",
         signature_start_date: Date.current,
         signature_end_date: signature_end_date || (Date.current + Decidim::Initiatives.default_signature_time_period_length)
       )
@@ -465,6 +474,10 @@ module Decidim
       ActionAuthorizer.new(user, "comment", self, nil).authorize.ok?
     end
 
+    def shareable_url(share_token)
+      EngineRouter.main_proxy(self).initiative_url(self, share_token: share_token.token)
+    end
+
     def self.ransack(params = {}, options = {})
       Initiatives::InitiativeSearch.new(self, params, options)
     end

data/app/models/decidim/initiatives_type_scope.rb

@@ -7,6 +7,11 @@ module Decidim
                class_name: "Decidim::InitiativesType",
                inverse_of: :scopes
 
+    belongs_to :taxonomy,
+               foreign_key: "decidim_taxonomy_id",
+               class_name: "Decidim::Taxonomy",
+               optional: true
+
     belongs_to :scope,
                foreign_key: "decidim_scopes_id",
                class_name: "Decidim::Scope",
@@ -34,5 +39,9 @@ module Decidim
 
       scope&.name.presence || { I18n.locale.to_s => I18n.t("decidim.initiatives.unavailable_scope") }
     end
+
+    def taxonomy_name
+      taxonomy&.name.presence || { I18n.locale.to_s => I18n.t("decidim.initiatives.unavailable_scope") }
+    end
   end
 end

data/app/packs/entrypoints/decidim_initiatives_admin.js

@@ -1,3 +1,5 @@
 import "src/decidim/initiatives/admin/initiatives_types"
 import "src/decidim/initiatives/admin/invite_users"
 import "src/decidim/initiatives/scoped_type"
+
+import "entrypoints/decidim_initiatives_admin.scss"

data/app/packs/entrypoints/decidim_initiatives_admin.scss

@@ -0,0 +1 @@
+@import "stylesheets/decidim/initiatives/admin/initiatives.scss";

data/app/packs/stylesheets/decidim/initiatives/admin/initiatives.scss

@@ -0,0 +1,13 @@
+#committee_members {
+  .card-section {
+    .row {
+      div[data-committee_link] {
+        @apply flex items-center;
+
+        svg {
+          @apply mx-1;
+        }
+      }
+    }
+  }
+}