decidim-accountability 0.28.2 → 0.29.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce10e6fa54bd6b83357be2d515ee441397757309e9d8a2e9ab038c7315488650
-  data.tar.gz: a16768d26ef1444000da351bd940506b99d540ac3e331cb4f25587e0f38932ee
+  metadata.gz: f7e58543f06c92324b4dad83eda21d8e76efd284a6a8fa454ce278d173819cff
+  data.tar.gz: 2a780ac15132012f4d4b2cf211b34299e281a60141f41d293eb8e9ba34465497
 SHA512:
-  metadata.gz: 5c625ff0064c939e7f1b794467958232964b3f841319d0a9c1ef9c39941c73ffd2c66dc382aa05fc3ea9a546b0bc45a888f955bde9947b3e00a03901d505e26d
-  data.tar.gz: 9dc2c614406d132403a80047cb87f98d4078097d575aae73b8798a78e95e19b96451e4c8337a755e830b1a78e7f46951ff6b0be46b9b66abfa3997f07fc23559
+  metadata.gz: fef0ecee15dfb9ef15b4c1ae15e7191c906e94017326de012bfa7055434007002b055f8b576f2fb07f7ed0b82e6cc47d4fc0959eb47fb7364c0ed51fbf66701b
+  data.tar.gz: 2579b836bb459bf6a99ce562c5da8a113d820a17cf26c3866ecb472b3c3f6fc13e418c31a051e7c49fe7627c6b0ec106a02b9e70236d28c6d0d1950f80299a42

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