decidim-initiatives 0.27.8 → 0.28.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4c4db74f0481e4c9bce563554904dc53b0683c280a682540aebcbdb37d11529
-  data.tar.gz: 28b6278c57b075d773bb547e08502972cc084df23b2105f7a9dc8fe9b6c03cb4
+  metadata.gz: 94122b5162ecd273467e354ff489ba748d195a75c21117126e482cb1948be7b8
+  data.tar.gz: ed119c245be320af5c574cdfd7ca4a5424fde46a7786b6e94d2c52cf6840952b
 SHA512:
-  metadata.gz: 45ba420598e3c185112bb2ba0a117d6e3225a4dc29d7c396ba64fc1406f8d04fa5a9a749810d940557ad8e9ee2aefcc907803d5178873ecca7f5e796bf1c2070
-  data.tar.gz: 41380e97357dc2b5a255fa95148497b9a0e9005e0fadcd30a42a96d3732a8f35bcca6f9d457afb406020d8e88903c988e1dcd0992216f934e4ad332435038106
+  metadata.gz: d7ab211a5052a18997c2bd54668f6b1fb5ef387a7511a6da45c357d2cde1f3a0d5c5376dd88adb4736f1470c34d0234160c9c728ea8bb7302c7c1eb69b563f5e
+  data.tar.gz: aa7fc49579be2765fbb0e7752e9c6b60d01e90fb1a3780cdd78a052d30c059ffc7c328cc16c4fe3741ad2d430d7962816a306859d612d0268f6f968f2a7fbeca

data/README.md

@@ -49,18 +49,22 @@ Some of the settings of the module need to be set in the code of your app, for e
 This is the case if you want to enable the creation of initiatives even when no authorization method is set.
 
 Just use the following line:
-```
+
+```ruby
 Decidim::Initiatives.do_not_require_authorization = true
 ```
 
 All the settings and their default values which can be overriden can be found in the file [`lib/decidim/initiatives.rb`](https://github.com/decidim/decidim/blob/develop/decidim-initiatives/lib/decidim/initiatives.rb).
 
 For example, you can also change the minimum number of required committee members to 1 (default is 2) by adding this line:
-```
+
+```ruby
 Decidim::Initiatives.minimum_committee_members = 1
 ```
+
 Or change the number of days given to gather signatures to 365 (default is 120) with:
-```
+
+```ruby
 Decidim::Initiatives.default_signature_time_period_length = 365
 ```
 

data/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives_cell.rb

@@ -3,37 +3,36 @@
 module Decidim
   module Initiatives
     module ContentBlocks
-      class HighlightedInitiativesCell < Decidim::ViewModel
-        include Decidim::SanitizeHelper
+      class HighlightedInitiativesCell < Decidim::ContentBlocks::HighlightedParticipatorySpacesCell
+        BLOCK_ID = "highlighted-initiatives"
 
         delegate :current_organization, to: :controller
 
-        def show
-          render if highlighted_initiatives.any?
+        def highlighted_spaces
+          @highlighted_spaces ||= OrganizationPrioritizedInitiatives
+                                  .new(current_organization, order)
+                                  .query
         end
 
-        def max_results
-          model.settings.max_results
+        def i18n_scope
+          "decidim.initiatives.pages.home.highlighted_initiatives"
         end
 
-        def order
-          model.settings.order
+        def all_path
+          Decidim::Initiatives::Engine.routes.url_helpers.initiatives_path
         end
 
-        def highlighted_initiatives
-          @highlighted_initiatives ||= OrganizationPrioritizedInitiatives
-                                       .new(current_organization, order)
-                                       .query
-                                       .limit(max_results)
-        end
+        private
 
-        def i18n_scope
-          "decidim.initiatives.pages.home.highlighted_initiatives"
+        def max_results
+          model.settings.max_results
         end
 
-        def decidim_initiatives
-          Decidim::Initiatives::Engine.routes.url_helpers
+        def order
+          model.settings.order
         end
+
+        def block_id = BLOCK_ID
       end
     end
   end

data/app/cells/decidim/initiatives/initiative_cell.rb

@@ -12,7 +12,12 @@ module Decidim
       private
 
       def card_size
-        "decidim/initiatives/initiative_m"
+        case @options[:size]
+        when :s
+          "decidim/initiatives/initiative_s"
+        else
+          "decidim/initiatives/initiative_g"
+        end
       end
     end
   end

data/app/cells/decidim/initiatives/initiative_dropdown_metadata_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    class InitiativeDropdownMetadataCell < Decidim::ParticipatorySpaceDropdownMetadataCell
+      include InitiativesHelper
+      include Decidim::ComponentPathHelper
+      include ActiveLinkTo
+
+      def decidim_initiatives
+        Decidim::Initiatives::Engine.routes.url_helpers
+      end
+
+      private
+
+      def nav_items_method = :initiative_nav_items
+    end
+  end
+end

data/app/cells/decidim/initiatives/initiative_g_cell.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # This cell renders the Grid (:g) initiative card
+    # for a given instance of an Initiative
+    class InitiativeGCell < Decidim::CardGCell
+      private
+
+      def resource_path
+        Decidim::Initiatives::Engine.routes.url_helpers.initiative_path(model)
+      end
+
+      def has_image?
+        image.present?
+      end
+
+      def image
+        @image ||= model.attachments.find(&:image?)
+      end
+
+      def resource_image_path
+        image.url if has_image?
+      end
+
+      def metadata_cell
+        "decidim/initiatives/initiative_metadata_g"
+      end
+    end
+  end
+end

data/app/cells/decidim/initiatives/initiative_metadata_g_cell.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # This cell renders the assembly metadata for g card
+    class InitiativeMetadataGCell < Decidim::CardMetadataCell
+      include Cell::ViewModel::Partial
+      include Decidim::Initiatives::InitiativeHelper
+
+      alias current_initiative resource
+      alias initiative resource
+
+      def initialize(*)
+        super
+
+        @items.prepend(*initiative_items)
+      end
+
+      private
+
+      def initiative_items
+        [dates_item, progress_bar_item, state_item].compact
+      end
+
+      def start_date
+        initiative.signature_start_date
+      end
+
+      def end_date
+        initiative.signature_end_date
+      end
+
+      def state_item
+        return if initiative.state.blank?
+
+        {
+          text: content_tag(
+            :span,
+            t(initiative.state, scope: "decidim.initiatives.show.badge_name"),
+            class: "label #{metadata_badge_css_class(initiative.state)} initiative-status"
+          )
+        }
+      end
+
+      def progress_bar_item
+        return if %w(created validating discarded).include?(initiative.state)
+
+        type_scope = initiative.votable_initiative_type_scopes[0]
+
+        {
+          cell: "decidim/progress_bar",
+          args: [initiative.supports_count_for(type_scope.scope), {
+            total: type_scope.supports_required,
+            element_id: "initiative-#{initiative.id}-votes-count",
+            class: "progress-bar__sm"
+          }],
+          icon: nil
+        }
+      end
+    end
+  end
+end

data/app/cells/decidim/initiatives/initiative_s_cell.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # This cell renders the Search (:s) initiative card
+    # for a given instance of an Initiative
+    class InitiativeSCell < Decidim::CardSCell
+      private
+
+      def metadata_cell
+        "decidim/initiatives/initiative_metadata_g"
+      end
+    end
+  end
+end

data/app/cells/decidim/initiatives_votes/vote/show.erb

@@ -1,33 +1,39 @@
+<% collect_user_extra_fields = model.initiative.type.collect_user_extra_fields %>
+<% cell_small_width = collect_user_extra_fields ? "9.4%" : "15.6%" %>
+<% style_initiatives_votes_table_row = "width: 100%; display: inline-block; min-height: 33pt; border-bottom: 1pt solid black;" %>
+<% style_initiatives_votes_table_cell = "width: #{cell_small_width}; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;" %>
 <br>
-<div class="initiatives-votes-table-row" style="width: 100%; display: inline-block; min-height: 33pt; border-bottom: 1pt solid black;">
-  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+<div class="initiatives-votes-table-row" style="<%= style_initiatives_votes_table_row %>">
+  <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
     <%= initiative_id %>
   </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
     <%= initiative_title %>
   </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
-    <%= name_and_surname %>
-  </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
-    <%= document_number %>
-  </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
-    <%= date_of_birth %>
-  </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
-    <%= postal_code %>
-  </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <% if collect_user_extra_fields %>
+    <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+      <%= name_and_surname %>
+    </div>
+    <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+      <%= document_number %>
+    </div>
+    <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+      <%= date_of_birth %>
+    </div>
+    <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
+      <%= postal_code %>
+    </div>
+  <% end %>
+  <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
     <%= time_and_date %>
   </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
     <%= timestamp %>
   </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
     <%= hash_id %>
   </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <div class="initiatives-votes-table-cell w11" style="<%= style_initiatives_votes_table_cell %>">
     <%= scope %>
   </div>
 </div>

data/app/cells/decidim/initiatives_votes/vote_cell.rb

@@ -3,6 +3,8 @@
 module Decidim
   module InitiativesVotes
     class VoteCell < Decidim::ViewModel
+      include Decidim::SanitizeHelper
+
       delegate :timestamp, :hash_id, to: :model
 
       def show
@@ -14,7 +16,7 @@ module Decidim
       end
 
       def initiative_title
-        translated_attribute(model.initiative.title)
+        decidim_sanitize(translated_attribute(model.initiative.title))
       end
 
       def name_and_surname

data/app/commands/decidim/initiatives/admin/accept_initiative.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # A command with all the business logic that accepts an
+      # existing initiative.
+      class AcceptInitiative < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # initiative - Decidim::Initiative
+        # current_user - the user performing the action
+        def initialize(initiative, current_user)
+          @initiative = initiative
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form was not valid and we could not proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if initiative.accepted?
+
+          @initiative = Decidim.traceability.perform_action!(:accept, initiative, current_user) do
+            initiative.accepted!
+            initiative
+          end
+          broadcast(:ok, initiative)
+        end
+
+        private
+
+        attr_reader :initiative, :current_user
+      end
+    end
+  end
+end

data/app/commands/decidim/initiatives/admin/create_initiative_type.rb

@@ -16,7 +16,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/initiatives/admin/create_initiative_type_scope.rb

@@ -15,7 +15,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/initiatives/admin/discard_initiative.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # A command with all the business logic that discards an
+      # existing initiative.
+      class DiscardInitiative < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # initiative - Decidim::Initiative
+        # current_user - the user performing the action
+        def initialize(initiative, current_user)
+          @initiative = initiative
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form was not valid and we could not proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if initiative.discarded?
+
+          @initiative = Decidim.traceability.perform_action!(:discard, initiative, current_user) do
+            initiative.discarded!
+            initiative
+          end
+          broadcast(:ok, initiative)
+        end
+
+        private
+
+        attr_reader :initiative, :current_user
+      end
+    end
+  end
+end

data/app/commands/decidim/initiatives/admin/publish_initiative.rb

@@ -18,7 +18,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/initiatives/admin/reject_initiative.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # A command with all the business logic that rejects an
+      # existing initiative.
+      class RejectInitiative < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # initiative - Decidim::Initiative
+        # current_user - the user performing the action
+        def initialize(initiative, current_user)
+          @initiative = initiative
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form was not valid and we could not proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if initiative.rejected?
+
+          @initiative = Decidim.traceability.perform_action!(:reject, initiative, current_user) do
+            initiative.rejected!
+            initiative
+          end
+          broadcast(:ok, initiative)
+        end
+
+        private
+
+        attr_reader :initiative, :current_user
+      end
+    end
+  end
+end

data/app/commands/decidim/initiatives/admin/send_initiative_to_technical_validation.rb

@@ -18,7 +18,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -47,7 +47,7 @@ module Decidim
             event: "decidim.events.initiatives.admin.initiative_sent_to_technical_validation",
             event_class: Decidim::Initiatives::Admin::InitiativeSentToTechnicalValidationEvent,
             resource: initiative,
-            affected_users: affected_users,
+            affected_users:,
             force_send: true
           }
 

data/app/commands/decidim/initiatives/admin/unpublish_initiative.rb

@@ -18,7 +18,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -22,7 +22,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/initiatives/admin/update_initiative_answer.rb

@@ -20,7 +20,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/initiatives/admin/update_initiative_type.rb

@@ -21,7 +21,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/initiatives/admin/update_initiative_type_scope.rb

@@ -18,7 +18,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/initiatives/admin/update_initiatives_settings.rb

@@ -18,7 +18,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form or initiatives_settings isn't valid and we couldn't proceed.
+        # - :invalid if the form or initiatives_settings is not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -3,31 +3,9 @@
 module Decidim
   module Initiatives
     module AttachmentMethods
-      private
-
-      def build_attachment(attached_to = nil)
-        attached_to = @attached_to if attached_to.blank?
-        attached_to = form.current_organization if attached_to.blank? && form.respond_to?(:current_organization)
-
-        @attachment = Attachment.new(
-          title: { I18n.locale => @form.attachment.title },
-          attached_to: attached_to,
-          file: @form.attachment.file, # Define attached_to before this
-          content_type: @form.attachment.file.content_type
-        )
-      end
+      include Decidim::AttachmentMethods
 
-      def attachment_invalid?
-        if attachment.invalid? && attachment.errors.has_key?(:file)
-          @form.attachment.errors.add :file, attachment.errors[:file]
-          true
-        end
-      end
-
-      def create_attachment
-        attachment.attached_to = @attached_to
-        attachment.save!
-      end
+      private
 
       def process_attachments?
         @form.attachment && @form.attachment.file.present? &&