decidim-accountability 0.28.6 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d682ce8d4abee7a0a97537d2b3a6f80d3b2e2d378b6c0c04d9bca20bcebca21
-  data.tar.gz: 9ff2bff902e26ee2cf6c07e6729d022fb6e5723db6b33fe2ff34f14f6e667cc6
+  metadata.gz: e5066128dfe96611650d7c9136807b2a466eb4620811a7d0ce3cb21cc260f71f
+  data.tar.gz: 178b5e88b8d8c1a675111acf39f98a76cff77f7762cd188a780a0e3ac06d46b6
 SHA512:
-  metadata.gz: 4cdfab5c8f8555a9a102265af88a97b054e7c65b7c5fd5886c23a0e966f6c3f88106b381805aa2354e2197d6b9204d7d50e725aa90d3ce905e4b14dd55d6684f
-  data.tar.gz: c096120b0edb9151d677564bd0ec7d49f7e50a8515a9efde7ef8dfd01060d4628878f47dd5ef05a5d458d318470bf277f821ea9befc8e0312bdb57910de3aa6a
+  metadata.gz: fc439260b2cd7806e116f3dc11ef2ed7188d698fd21de653074e531e5a4c613f725162bf2cb4a98e4a91421dcaa5d0e7e2477264b7225c7f86ef4d0b7e46ac63
+  data.tar.gz: 78df80399a808127946f638f8489d45b178f7efad952493d3d2082fc77911edd84b6a8e0c79c300859c2b3c2774b950b4b8b1ecc147ed097a7103fffa4f61386

data/app/cells/decidim/accountability/highlighted_results_for_component_cell.rb

@@ -8,10 +8,7 @@ module Decidim
     # It is intended to be used in the `participatory_space_highlighted_elements`
     # view hook.
     class HighlightedResultsForComponentCell < Decidim::ViewModel
-      include ActiveSupport::NumberHelper
       include Decidim::Accountability::ApplicationHelper
-      include Decidim::ComponentPathHelper
-      include Decidim::LayoutHelper
       include Cell::ViewModel::Partial
 
       delegate :snippets, to: :controller

data/app/cells/decidim/accountability/project_cell.rb

@@ -6,12 +6,7 @@ module Decidim
   module Accountability
     # This cell renders a project
     class ProjectCell < Decidim::ViewModel
-      include ApplicationHelper
-      include Decidim::ResourceHelper
-      include Decidim::TranslationsHelper
-      include Decidim::AttachmentsHelper
-
-      delegate :current_component, :component_settings, to: :controller
+      include Decidim::Accountability::ApplicationHelper
       delegate :children, :timeline_entries, to: :model
 
       alias result model

data/app/cells/decidim/accountability/result_l_cell.rb

@@ -7,8 +7,7 @@ module Decidim
     # This cell renders the List (:l) result card
     # for an instance of a Result
     class ResultLCell < Decidim::CardLCell
-      include ApplicationHelper
-      include ActiveSupport::NumberHelper
+      include Decidim::Accountability::ApplicationHelper
 
       alias result model
 

data/app/cells/decidim/accountability/result_metadata_cell.rb

@@ -4,13 +4,7 @@ module Decidim
   module Accountability
     # This cell renders metadata for an instance of a Result
     class ResultMetadataCell < Decidim::CardMetadataCell
-      include Decidim::SanitizeHelper
-      include Decidim::TranslationsHelper
-      include ActiveSupport::NumberHelper
-      include Decidim::ResourceReferenceHelper
-      include Decidim::ResourceVersionsHelper
       include Decidim::Accountability::Engine.routes.url_helpers
-      include Decidim::LayoutHelper
 
       delegate :start_date, :end_date, :status, :category, :parent, :reference, to: :model
 

data/app/cells/decidim/accountability/results_cell.rb

@@ -6,8 +6,6 @@ module Decidim
   module Accountability
     # This cell renders a list of results
     class ResultsCell < Decidim::ViewModel
-      include Decidim::CardHelper
-
       alias results model
     end
   end

data/app/cells/decidim/accountability/status_cell.rb

@@ -6,15 +6,10 @@ module Decidim
   module Accountability
     # This cell renders the status of a category
     class StatusCell < Decidim::ViewModel
-      include ApplicationHelper
-      include BreadcrumbHelper
-      include Decidim::SanitizeHelper
-      include Decidim::TranslationsHelper
-      include ActiveSupport::NumberHelper
+      include Decidim::Accountability::ApplicationHelper
+      include Decidim::Accountability::BreadcrumbHelper
       include ActionView::Helpers::NumberHelper
 
-      delegate :current_component, :component_settings, to: :controller
-
       def show
         return unless render?
 
@@ -41,7 +36,7 @@ module Decidim
 
       def title
         if model.is_a? Decidim::Category
-          decidim_html_escape translated_attribute(model.name)
+          decidim_escape_translated(model.name)
         else
           options[:title]
         end
@@ -75,6 +70,14 @@ module Decidim
         display_count(results_count)
       end
 
+      def display_count(count)
+        heading_parent_level_results(count)
+      end
+
+      def heading_parent_level_results(count)
+        t("results.count.results_count", scope: "decidim.accountability", count:)
+      end
+
       def render_count
         return true unless options.has_key?(:render_count)
 

data/app/commands/decidim/accountability/admin/create_imported_result.rb

@@ -4,101 +4,34 @@ module Decidim
   module Accountability
     module Admin
       # This command is executed when the user creates a Result from the admin
-      # panel.
-      class CreateImportedResult < Decidim::Command
-        def initialize(form, parent_id = nil)
-          @form = form
-          @parent_id = parent_id
-        end
+      # panel using the "Import results from CSV file" feature
+      class CreateImportedResult < Decidim::Commands::CreateResource
+        include Decidim::Accountability::Admin::HasResultCommand
 
-        # Creates the result if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if @form.invalid?
+        fetch_form_attributes :scope, :component, :category, :parent_id, :title, :description, :start_date,
+                              :end_date, :progress, :decidim_accountability_status_id, :external_id, :weight
 
-          transaction do
-            create_result
-            link_meetings
-            link_proposals
-            link_projects
-            notify_proposal_followers
-          end
-
-          broadcast(:ok)
+        def initialize(form, parent_id = nil)
+          super(form)
+          @parent_id = parent_id
         end
 
         private
 
-        attr_reader :result
-
-        def create_result
-          params = {
-            component: @form.current_component,
-            scope: @form.scope,
-            category: @form.category,
-            parent_id: @parent_id,
-            title: @form.title,
-            description: @form.description,
-            start_date: @form.start_date,
-            end_date: @form.end_date,
-            progress: @form.progress,
-            decidim_accountability_status_id: @form.decidim_accountability_status_id,
-            external_id: @form.external_id.presence,
-            weight: @form.weight
-          }
-
-          @result = Decidim.traceability.create!(
-            Result,
-            @form.current_user,
-            params,
-            visibility: "all"
-          )
-        end
-
-        def proposals
-          @proposals ||= result.sibling_scope(:proposals).where(id: @form.proposal_ids)
-        end
-
-        def projects
-          @projects ||= result.sibling_scope(:projects).where(id: @form.project_ids)
-        end
-
-        def meeting_ids
-          @meeting_ids ||= proposals.flat_map do |proposal|
-            proposal.linked_resources(:meetings, "proposals_from_meeting").pluck(:id)
-          end.uniq
-        end
+        attr_reader :parent_id
+        alias result resource
 
-        def meetings
-          @meetings ||= result.sibling_scope(:meetings).where(id: meeting_ids)
-        end
+        def resource_class = Decidim::Accountability::Result
 
-        def link_proposals
-          result.link_resources(proposals, "included_proposals")
-        end
+        def extra_params = { visibility: "all" }
 
-        def link_projects
-          result.link_resources(projects, "included_projects")
-        end
-
-        def link_meetings
-          result.link_resources(meetings, "meetings_through_proposals")
-        end
+        def attributes = super.merge(parent_id:)
 
-        def notify_proposal_followers
-          proposals.each do |proposal|
-            Decidim::EventsManager.publish(
-              event: "decidim.events.accountability.proposal_linked",
-              event_class: Decidim::Accountability::ProposalLinkedEvent,
-              resource: result,
-              affected_users: proposal.notifiable_identities,
-              followers: proposal.followers - proposal.notifiable_identities,
-              extra: {
-                proposal_id: proposal.id
-              }
-            )
-          end
+        def run_after_hooks
+          link_meetings
+          link_proposals
+          link_projects
+          notify_proposal_followers
         end
       end
     end

data/app/commands/decidim/accountability/admin/create_result.rb

@@ -5,99 +5,25 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Result from the admin
       # panel.
-      class CreateResult < Decidim::Command
-        def initialize(form)
-          @form = form
-        end
-
-        # Creates the result if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if @form.invalid?
+      class CreateResult < Decidim::Commands::CreateResource
+        include Decidim::Accountability::Admin::HasResultCommand
 
-          transaction do
-            create_result
-            link_meetings
-            link_proposals
-            link_projects
-            notify_proposal_followers
-          end
-
-          broadcast(:ok)
-        end
+        fetch_form_attributes :scope, :component, :category, :parent_id, :title, :description, :start_date,
+                              :end_date, :progress, :decidim_accountability_status_id, :external_id, :weight
 
         private
 
-        attr_reader :result
-
-        def create_result
-          params = {
-            component: @form.current_component,
-            scope: @form.scope,
-            category: @form.category,
-            parent_id: @form.parent_id,
-            title: @form.title,
-            description: @form.description,
-            start_date: @form.start_date,
-            end_date: @form.end_date,
-            progress: @form.progress,
-            decidim_accountability_status_id: @form.decidim_accountability_status_id,
-            external_id: @form.external_id.presence,
-            weight: @form.weight
-          }
+        alias result resource
 
-          @result = Decidim.traceability.create!(
-            Result,
-            @form.current_user,
-            params,
-            visibility: "all"
-          )
-        end
-
-        def proposals
-          @proposals ||= result.sibling_scope(:proposals).where(id: @form.proposal_ids)
-        end
-
-        def projects
-          @projects ||= result.sibling_scope(:projects).where(id: @form.project_ids)
-        end
+        def resource_class = Decidim::Accountability::Result
 
-        def meeting_ids
-          @meeting_ids ||= proposals.flat_map do |proposal|
-            proposal.linked_resources(:meetings, "proposals_from_meeting").pluck(:id)
-          end.uniq
-        end
-
-        def meetings
-          @meetings ||= result.sibling_scope(:meetings).where(id: meeting_ids)
-        end
-
-        def link_proposals
-          result.link_resources(proposals, "included_proposals")
-        end
-
-        def link_projects
-          result.link_resources(projects, "included_projects")
-        end
-
-        def link_meetings
-          result.link_resources(meetings, "meetings_through_proposals")
-        end
+        def extra_params = { visibility: "all" }
 
-        def notify_proposal_followers
-          proposals.each do |proposal|
-            Decidim::EventsManager.publish(
-              event: "decidim.events.accountability.proposal_linked",
-              event_class: Decidim::Accountability::ProposalLinkedEvent,
-              resource: result,
-              affected_users: proposal.notifiable_identities,
-              followers: proposal.followers - proposal.notifiable_identities,
-              extra: {
-                proposal_id: proposal.id
-              }
-            )
-          end
+        def run_after_hooks
+          link_meetings
+          link_proposals
+          link_projects
+          notify_proposal_followers
         end
       end
     end

data/app/commands/decidim/accountability/admin/create_status.rb

@@ -5,40 +5,12 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Status from the admin
       # panel.
-      class CreateStatus < Decidim::Command
-        def initialize(form, user)
-          @form = form
-          @user = user
-        end
-
-        # Creates the status if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if @form.invalid?
-
-          transaction do
-            create_status
-          end
-
-          broadcast(:ok)
-        end
+      class CreateStatus < Decidim::Commands::CreateResource
+        fetch_form_attributes :key, :name, :description, :progress, :component
 
         private
 
-        attr_reader :status
-
-        def create_status
-          @status = Decidim.traceability.create!(
-            Status,
-            @user,
-            component: @form.current_component,
-            key: @form.key,
-            name: @form.name,
-            description: @form.description,
-            progress: @form.progress
-          )
-        end
+        def resource_class = Decidim::Accountability::Status
       end
     end
   end

data/app/commands/decidim/accountability/admin/create_timeline_entry.rb

@@ -5,39 +5,12 @@ module Decidim
     module Admin
       # This command is executed when the user creates a TimelineEntry
       # for a Result from the admin panel.
-      class CreateTimelineEntry < Decidim::Command
-        def initialize(form, user)
-          @form = form
-          @user = user
-        end
-
-        # Creates the timeline_entry if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if @form.invalid?
-
-          transaction do
-            create_timeline_entry
-          end
-
-          broadcast(:ok)
-        end
+      class CreateTimelineEntry < Decidim::Commands::CreateResource
+        fetch_form_attributes :decidim_accountability_result_id, :entry_date, :title, :description
 
         private
 
-        attr_reader :timeline_entry, :form
-
-        def create_timeline_entry
-          @timeline_entry = Decidim.traceability.create!(
-            TimelineEntry,
-            @user,
-            decidim_accountability_result_id: form.decidim_accountability_result_id,
-            entry_date: form.entry_date,
-            title: form.title,
-            description: form.description
-          )
-        end
+        def resource_class = Decidim::Accountability::TimelineEntry
       end
     end
   end

data/app/commands/decidim/accountability/admin/has_result_command.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      module HasResultCommand
+        def proposals
+          @proposals ||= resource.sibling_scope(:proposals).where(id: form.proposal_ids)
+        end
+
+        def projects
+          @projects ||= resource.sibling_scope(:projects).where(id: form.project_ids)
+        end
+
+        def meeting_ids
+          @meeting_ids ||= proposals.flat_map do |proposal|
+            proposal.linked_resources(:meetings, "proposals_from_meeting").pluck(:id)
+          end.uniq
+        end
+
+        def meetings
+          @meetings ||= resource.sibling_scope(:meetings).where(id: meeting_ids)
+        end
+
+        def link_proposals
+          resource.link_resources(proposals, "included_proposals")
+        end
+
+        def link_projects
+          resource.link_resources(projects, "included_projects")
+        end
+
+        def link_meetings
+          resource.link_resources(meetings, "meetings_through_proposals")
+        end
+
+        def notify_proposal_followers
+          proposals.each do |proposal|
+            Decidim::EventsManager.publish(
+              event: "decidim.events.accountability.proposal_linked",
+              event_class: Decidim::Accountability::ProposalLinkedEvent,
+              resource:,
+              affected_users: proposal.notifiable_identities,
+              followers: proposal.followers - proposal.notifiable_identities,
+              extra: {
+                proposal_id: proposal.id
+              }
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/accountability/admin/update_imported_result.rb

@@ -3,86 +3,32 @@
 module Decidim
   module Accountability
     module Admin
-      # This command is executed when the user changes a Result from the admin
-      # panel.
-      class UpdateImportedResult < Decidim::Command
-        # Initializes an UpdateResult Command.
+      # This command is executed when the user imports a Result from the admin
+      # panel using the "Import results from CSV file" feature
+      class UpdateImportedResult < Decidim::Commands::UpdateResource
+        include Decidim::Accountability::Admin::HasResultCommand
+
+        fetch_form_attributes :scope, :category, :title, :description, :start_date, :end_date, :progress,
+                              :decidim_accountability_status_id, :external_id, :weight
+
+        # Initializes an UpdateImportedResult Command.
         #
         # form - The form from which to get the data.
         # result - The current instance of the result to be updated.
         def initialize(form, result, parent_id = nil)
-          @form = form
-          @result = result
+          super(form, result)
           @parent_id = parent_id
         end
 
-        # Updates the result if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          transaction do
-            update_result
-            link_proposals
-            link_meetings
-            link_projects
-            send_notifications if should_notify_followers?
-          end
-
-          broadcast(:ok)
-        end
-
         private
 
-        attr_reader :result, :form
-
-        def update_result
-          Decidim.traceability.update!(
-            result,
-            form.current_user,
-            scope: @form.scope,
-            category: @form.category,
-            parent_id: @parent_id,
-            title: @form.title,
-            description: @form.description,
-            start_date: @form.start_date,
-            end_date: @form.end_date,
-            progress: @form.progress,
-            decidim_accountability_status_id: @form.decidim_accountability_status_id,
-            external_id: @form.external_id.presence,
-            weight: @form.weight
-          )
-        end
-
-        def proposals
-          @proposals ||= result.sibling_scope(:proposals).where(id: form.proposal_ids)
-        end
-
-        def projects
-          @projects ||= result.sibling_scope(:projects).where(id: form.project_ids)
-        end
-
-        def meeting_ids
-          @meeting_ids ||= proposals.flat_map do |proposal|
-            proposal.linked_resources(:meetings, "proposals_from_meeting").pluck(:id)
-          end.uniq
-        end
-
-        def meetings
-          @meetings ||= result.sibling_scope(:meetings).where(id: meeting_ids)
-        end
-
-        def link_proposals
-          result.link_resources(proposals, "included_proposals")
-        end
-
-        def link_projects
-          result.link_resources(projects, "included_projects")
-        end
+        alias result resource
 
-        def link_meetings
-          result.link_resources(meetings, "meetings_through_proposals")
+        def run_after_hooks
+          link_proposals
+          link_meetings
+          link_projects
+          send_notifications if should_notify_followers?
         end
 
         def send_notifications