decidim-accountability 0.27.9 → 0.28.0.rc4

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # A command with all the business logic when an admin imports projects from
+      # one component to accountability.
+      class ImportProjectsToAccountability < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        def initialize(form)
+          @form = form
+        end
+
+        def call
+          return broadcast(:invalid) unless @form.valid?
+
+          ImportProjectsJob.perform_later(projects.pluck(:id), @form.current_component, @form.current_user)
+          broadcast(:ok, projects.count)
+        end
+
+        private
+
+        def projects
+          Decidim::Budgets::Project.joins(:budget).selected.where(
+            budget: { component: origin_component }
+          ).reject { |item| @form.project_already_copied?(item) }
+        end
+
+        def origin_component
+          @form.origin_component
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/accountability/admin/filterable.rb

@@ -39,7 +39,7 @@ module Decidim
             }
           end
 
-          # Can't user `super` here, because it does not belong to a superclass
+          # Cannot user `super` here, because it does not belong to a superclass
           # but to a concern.
           def dynamically_translated_filters
             [:scope_id_eq, :category_id_eq, :status_id_eq]
@@ -50,7 +50,7 @@ module Decidim
           end
 
           def translated_status_id_eq(id)
-            translated_attribute(statuses.find_by(id: id).name)
+            translated_attribute(statuses.find_by(id:).name)
           end
         end
       end

data/app/controllers/decidim/accountability/admin/import_results_controller.rb

@@ -5,18 +5,30 @@ module Decidim
     module Admin
       # This controller allows an admin to import results from a csv file for the Accountability component
       class ImportResultsController < Admin::ApplicationController
+        before_action :ensure_permissions
+
         def new
-          @errors = []
+          @form = form(Admin::ImportResultsForm).instance
         end
 
         def create
-          @csv_file = params[:csv_file]
-          redirect_to(new_import_path) && return if @csv_file.blank?
+          @form = form(Admin::ImportResultsForm).from_params(params, current_component:)
+
+          if @form.valid?
+            Decidim::Accountability::Admin::ImportResultsCsvJob.perform_later(current_user, current_component, @form.local_file_path)
+
+            flash[:notice] = I18n.t("imports.create.success", scope: "decidim.accountability.admin")
+            redirect_to import_results_path(current_participatory_space, current_component)
+          else
+            flash[:alert] = I18n.t("imports.create.invalid", scope: "decidim.accountability.admin")
+            render action: "new"
+          end
+        end
 
-          Decidim::Accountability::Admin::ImportResultsCsvJob.perform_later(current_user, current_component, @csv_file.read.force_encoding("utf-8").encode("utf-8"))
+        private
 
-          flash[:notice] = I18n.t("imports.create.success", scope: "decidim.accountability.admin")
-          redirect_to import_results_path(current_participatory_space, current_component)
+        def ensure_permissions
+          enforce_permission_to :create, :result
         end
       end
     end

data/app/controllers/decidim/accountability/admin/projects_import_controller.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # This controller allows an admin to import results from a csv file for the Accountability component
+      class ProjectsImportController < Admin::ApplicationController
+        def new
+          enforce_permission_to :create, :import_projects
+          @form = form(Admin::ResultImportProjectsForm).instance
+        end
+
+        def create
+          enforce_permission_to :create, :import_projects
+          @form = form(Admin::ResultImportProjectsForm).from_params(params, accountability_component: current_component)
+          Admin::ImportProjectsToAccountability.call(@form) do
+            on(:ok) do |projects|
+              flash[:notice] = I18n.t("projects_import.new.success", scope: "decidim.accountability.admin", count: projects)
+              redirect_to results_path
+            end
+
+            on(:invalid) do
+              flash[:alert] = I18n.t("projects_import.create.invalid", scope: "decidim.accountability.admin")
+              render action: "new"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/accountability/admin/results_controller.rb

@@ -7,14 +7,13 @@ module Decidim
       class ResultsController < Admin::ApplicationController
         include Decidim::ApplicationHelper
         include Decidim::SanitizeHelper
-        include Decidim::Proposals::Admin::Picker if Decidim::Accountability.enable_proposal_linking
         include Decidim::Accountability::Admin::Filterable
 
         helper_method :results, :parent_result, :parent_results, :statuses, :present
 
         def collection
           parent_id = params[:parent_id].presence
-          @collection ||= Result.where(component: current_component, parent_id: parent_id).page(params[:page]).per(15)
+          @collection ||= Result.where(component: current_component, parent_id:).page(params[:page]).per(15)
         end
 
         def new
@@ -43,13 +42,13 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :result, result: result
+          enforce_permission_to(:update, :result, result:)
 
           @form = form(ResultForm).from_model(result)
         end
 
         def update
-          enforce_permission_to :update, :result, result: result
+          enforce_permission_to(:update, :result, result:)
 
           @form = form(ResultForm).from_params(params)
 
@@ -67,7 +66,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :destroy, :result, result: result
+          enforce_permission_to(:destroy, :result, result:)
 
           DestroyResult.call(result, current_user) do
             on(:ok) do

data/app/controllers/decidim/accountability/admin/statuses_controller.rb

@@ -32,13 +32,13 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :status, status: status
+          enforce_permission_to(:update, :status, status:)
 
           @form = form(StatusForm).from_model(status)
         end
 
         def update
-          enforce_permission_to :update, :status, status: status
+          enforce_permission_to(:update, :status, status:)
 
           @form = form(StatusForm).from_params(params)
 
@@ -56,7 +56,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :destroy, :status, status: status
+          enforce_permission_to(:destroy, :status, status:)
 
           Decidim.traceability.perform_action!("delete", status, current_user) do
             status.destroy!

data/app/controllers/decidim/accountability/admin/timeline_entries_controller.rb

@@ -33,13 +33,13 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :timeline_entry, timeline_entry: timeline_entry
+          enforce_permission_to(:update, :timeline_entry, timeline_entry:)
 
           @form = form(TimelineEntryForm).from_model(timeline_entry)
         end
 
         def update
-          enforce_permission_to :update, :timeline_entry, timeline_entry: timeline_entry
+          enforce_permission_to(:update, :timeline_entry, timeline_entry:)
 
           @form = form(TimelineEntryForm).from_params(params)
 
@@ -57,7 +57,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :destroy, :timeline_entry, timeline_entry: timeline_entry
+          enforce_permission_to(:destroy, :timeline_entry, timeline_entry:)
 
           Decidim.traceability.perform_action!("delete", timeline_entry, current_user) do
             timeline_entry.destroy!

data/app/controllers/decidim/accountability/results_controller.rb

@@ -8,7 +8,7 @@ module Decidim
       helper Decidim::TraceabilityHelper
       helper Decidim::Accountability::BreadcrumbHelper
 
-      helper_method :results, :result, :first_class_categories, :count_calculator
+      helper_method :results, :result, :first_class_categories, :count_calculator, :nav_paths
 
       def show
         raise ActionController::RoutingError, "Not Found" unless result
@@ -20,7 +20,7 @@ module Decidim
         @results ||= begin
           parent_id = params[:parent_id].presence
           search.result.where(
-            parent_id: [parent_id] + Result.where(parent_id: parent_id).pluck(:id)
+            parent_id: [parent_id] + Result.where(parent_id:).pluck(:id)
           ).page(params[:page]).per(12)
         end
       end
@@ -29,6 +29,24 @@ module Decidim
         @result ||= search_collection.includes(:timeline_entries).find_by(id: params[:id])
       end
 
+      def next_result
+        return if search_collection.size < 2
+
+        search_collection.order(:start_date, :id).where(Decidim::Accountability::Result.arel_table[:id].gt(result.id)).first
+      end
+
+      def prev_result
+        return if search_collection.size < 2
+
+        search_collection.order(:start_date, :id).where(Decidim::Accountability::Result.arel_table[:id].lt(result.id)).last
+      end
+
+      def nav_paths
+        return {} if result.blank?
+
+        { prev_path: prev_result, next_path: next_result }.compact_blank.transform_values { |result| result_path(result) }
+      end
+
       def search_collection
         Result.where(component: current_component)
       end

data/app/events/decidim/accountability/proposal_linked_event.rb

@@ -2,7 +2,24 @@
 
 module Decidim
   module Accountability
-    class ProposalLinkedEvent < BaseResultEvent
+    class ProposalLinkedEvent < Decidim::Events::SimpleEvent
+      i18n_attributes :proposal_title, :proposal_path
+
+      def proposal_path
+        @proposal_path ||= Decidim::ResourceLocatorPresenter.new(proposal).path
+      end
+
+      def proposal_title
+        @proposal_title ||= translated_attribute(proposal.title)
+      end
+
+      def proposal
+        @proposal ||= resource.linked_resources(:proposals, "included_proposals").find_by(id: extra[:proposal_id])
+      end
+
+      def resource_text
+        translated_attribute(resource.description)
+      end
     end
   end
 end

data/app/events/decidim/accountability/result_progress_updated_event.rb

@@ -2,12 +2,28 @@
 
 module Decidim
   module Accountability
-    class ResultProgressUpdatedEvent < BaseResultEvent
-      i18n_attributes :progress
+    class ResultProgressUpdatedEvent < Decidim::Events::SimpleEvent
+      i18n_attributes :proposal_title, :proposal_path, :progress
+
+      def proposal_path
+        @proposal_path ||= Decidim::ResourceLocatorPresenter.new(proposal).path
+      end
+
+      def proposal_title
+        @proposal_title ||= translated_attribute(proposal.title)
+      end
+
+      def proposal
+        @proposal ||= resource.linked_resources(:proposals, "included_proposals").find_by(id: extra[:proposal_id])
+      end
 
       def progress
         extra[:progress]
       end
+
+      def resource_text
+        translated_attribute(resource.description)
+      end
     end
   end
 end

data/app/forms/decidim/accountability/admin/import_results_form.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      class ImportResultsForm < Decidim::Form
+        include Decidim::HasUploadValidations
+        include Decidim::ProcessesFileLocally
+
+        attribute :file, Decidim::Attributes::Blob
+
+        validates :file, presence: true, file_content_type: { allow: ["text/csv"] }
+
+        def local_file_path
+          process_file_locally(file) do |file_path|
+            file_path
+          end
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/accountability/admin/result_import_projects_form.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # A form object to be used when admin users want to import a collection of projects
+      # from another component into Accountability component.
+      class ResultImportProjectsForm < Decidim::Form
+        attribute :origin_component_id, Integer
+        attribute :import_all_selected_projects, Boolean
+
+        validates :origin_component_id, presence: true
+        validates :import_all_selected_projects, allow_nil: false, acceptance: true
+        validates :origin_projects_count, numericality: { greater_than: 0 }, if: ->(form) { form.origin_component_id }
+
+        def origin_component
+          @origin_component ||= origin_components.find_by(id: origin_component_id)
+        end
+
+        def origin_components_collection
+          origin_components.map do |component|
+            [component.name[I18n.locale.to_s], component.id]
+          end
+        end
+
+        def origin_components
+          @budgets_component ||= current_participatory_space.components.where(manifest_name: "budgets")
+        end
+
+        def selected_projects_count(component)
+          projects = Decidim::Budgets::Project.joins(:budget).selected.where(
+            budget: { component: }
+          )
+          projects.reject { |project| project_already_copied?(project) }.count
+        end
+
+        def project_already_copied?(original_project)
+          original_project.linked_resources(:results, "included_projects").any? do |result|
+            result.component == current_component
+          end
+        end
+
+        private
+
+        def origin_projects_count
+          selected_projects_count(origin_component_id)
+        end
+      end
+    end
+  end
+end

data/app/helpers/decidim/accountability/admin/application_helper.rb

@@ -7,6 +7,7 @@ module Decidim
       #
       module ApplicationHelper
         include Decidim::Admin::ResourceScopeHelper
+        include Decidim::PaginateHelper
       end
     end
   end

data/app/helpers/decidim/accountability/application_helper.rb

@@ -22,6 +22,10 @@ module Decidim
         "class=active" if scope.to_s == current_scope.to_s
       end
 
+      def component_name
+        (defined?(current_component) && translated_attribute(current_component&.name).presence) || t("decidim.components.accountability.name")
+      end
+
       def categories_label
         translated_attribute(component_settings.categories_label).presence || t("results.home.categories_label", scope: "decidim.accountability")
       end
@@ -35,7 +39,7 @@ module Decidim
         if text
           pluralize(count, text)
         else
-          t("results.count.results_count", scope: "decidim.accountability", count: count)
+          t("results.count.results_count", scope: "decidim.accountability", count:)
         end
       end
 
@@ -44,9 +48,46 @@ module Decidim
         if text
           pluralize(count, text)
         else
-          t("results.count.results_count", scope: "decidim.accountability", count: count)
+          t("results.count.results_count", scope: "decidim.accountability", count:)
         end
       end
+
+      def filter_items_for(participatory_space:, category:)
+        [
+          {
+            url: url_for(filter: { with_category: category.try(:id) }),
+            text: t("results.filters.all", scope: "decidim.accountability"),
+            icon: "apps-2-line",
+            active: current_scope.blank?,
+            sr_text: Decidim::Scope.model_name.human(count: 2)
+          },
+          *(
+            if participatory_space.scope
+              [{
+                url: url_for(filter: { with_scope: participatory_space.scope.id, with_category: category.try(:id) }),
+                text: translated_attribute(participatory_space.scope.name),
+                icon: resource_type_icon_key(participatory_space.scope.class),
+                active: participatory_space.scope.id.to_s == current_scope.to_s,
+                sr_text: Decidim::Scope.model_name.human(count: 1)
+              }]
+            end
+          ),
+          *participatory_space.subscopes.map do |scope|
+            {
+              url: url_for(filter: { with_scope: scope.id, with_category: category.try(:id) }),
+              text: translated_attribute(scope.name),
+              icon: resource_type_icon_key(scope.class),
+              active: scope.id.to_s == current_scope.to_s,
+              sr_text: Decidim::Scope.model_name.human(count: 1)
+            }
+          end
+        ]
+      end
+
+      def apply_accountability_pack_tags
+        append_stylesheet_pack_tag("decidim_accountability", media: "all")
+        append_javascript_pack_tag("decidim_accountability")
+      end
     end
   end
 end

data/app/helpers/decidim/accountability/breadcrumb_helper.rb

@@ -22,6 +22,16 @@ module Decidim
 
         @category ||= current_participatory_space.categories.find(category_id.is_a?(Array) ? category_id.first : category_id)
       end
+
+      def parent_categories(category)
+        return [] if category&.parent.blank?
+
+        [*parent_categories(category.parent), category.parent]
+      end
+
+      def categories_hierarchy
+        parent_categories(category)
+      end
     end
   end
 end

data/app/jobs/decidim/accountability/admin/import_projects_job.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      class ImportProjectsJob < ApplicationJob
+        queue_as :default
+
+        def perform(projects, component, user)
+          projects.map do |id|
+            original_project = Decidim::Budgets::Project.find_by(id:)
+
+            new_result = create_result_from_project!(original_project, statuses(component).first, component, user)
+            new_result.link_resources([original_project], "included_projects")
+            new_result.link_resources(
+              original_project.linked_resources(:proposals, "included_proposals"),
+              "included_proposals"
+            )
+
+            copy_attachments(original_project, new_result)
+          end.compact
+          Decidim::Accountability::ImportProjectsMailer.import(user, component, projects.count).deliver_now
+        end
+
+        private
+
+        def create_result_from_project!(project, status, component, user)
+          params = {
+            title: project.title,
+            description: project.description,
+            category: project.category,
+            scope: project.scope || project.budget.scope,
+            component:,
+            status:,
+            progress: status&.progress || 0
+          }
+          @result = Decidim.traceability.create!(
+            Result,
+            user,
+            params,
+            visibility: "all"
+          )
+        end
+
+        def copy_attachments(project, result)
+          project.attachments.each do |attachment|
+            new_attachment = Decidim::Attachment.new(
+              {
+                # Attached to needs to be always defined before the file is set
+                attached_to: result
+              }.merge(
+                attachment.attributes.slice("content_type", "description", "file_size", "title", "weight")
+              )
+            )
+
+            if attachment.file.attached?
+              new_attachment.file = attachment.file.blob
+            else
+              new_attachment.attached_uploader(:file).remote_url = attachment.attached_uploader(:file)
+            end
+
+            new_attachment.save!
+          end
+        end
+
+        def statuses(component)
+          Decidim::Accountability::Status.where(component:).order(:progress)
+        end
+      end
+    end
+  end
+end

data/app/mailers/decidim/accountability/import_projects_mailer.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    # This mailer sends a notification email containing the result of importing
+    # Cprojects to the results.
+    class ImportProjectsMailer < Decidim::ApplicationMailer
+      # Public: Sends a notification email with the result of projects import selected projects to Accountability
+      #
+      # user   - The user to be notified.
+      #
+      # Returns nothing.
+      def import(user, component, projects)
+        @user = user
+        @organization = user.organization
+        @component = component
+        @projects = projects
+
+        with_user(user) do
+          mail(to: "#{user.name} <#{user.email}>", subject: I18n.t("decidim.accountability.import_projects_mailer.import.subject"))
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/accountability/result.rb

@@ -96,7 +96,7 @@ module Decidim
 
       private
 
-      # Private: When a row uses weight 1 and there's more than one, weight shouldn't be considered
+      # Private: When a row uses weight 1 and there is more than one, weight should not be considered
       # Handle special case when all children weight are nil
       def children_use_weighted_progress?
         return false if children.pluck(:weight).all?(&:nil?)

data/app/packs/entrypoints/decidim_accountability.js

@@ -1,4 +1,7 @@
-import "src/decidim/accountability/index"
+// import "src/decidim/accountability/index" --deprecated
 
 // Images
 require.context("../images", true)
+
+// CSS
+import "stylesheets/accountability.scss"

data/app/packs/entrypoints/decidim_accountability_admin_imports.js

@@ -0,0 +1,3 @@
+import initializeElement from "src/decidim/accountability/admin/imports"
+
+window.addEventListener("DOMContentLoaded", initializeElement);

data/app/packs/images/decidim/accountability/breadcrumb_arrow.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="43" viewBox="0 0 24 43" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.6979 35.6924C24.0211 36.0156 24.0211 36.5396 23.6979 36.8628L18.4312 42.1296C18.108 42.4527 17.5841 42.4527 17.2608 42.1296C16.9376 41.8064 16.9376 41.2824 17.2608 40.9592L21.9424 36.2776L17.2608 31.5961C16.9376 31.2729 16.9376 30.7489 17.2608 30.4257C17.584 30.1025 18.108 30.1025 18.4312 30.4257L23.6979 35.6924ZM2.4247 0V20.9346H0.769531V0.000447832L2.4247 0ZM16.9402 35.45H23.1127V37.1052H16.9402V35.45ZM2.4247 20.9346C2.4247 28.9512 8.92354 35.45 16.9402 35.45V37.1052C8.00938 37.1052 0.769531 29.8654 0.769531 20.9346H2.4247Z" fill="currentColor" />
+</svg>

data/app/packs/src/decidim/accountability/admin/imports.js

@@ -0,0 +1,15 @@
+const toggleInfo = (val) => {
+  document.querySelectorAll(".help-text").forEach((toBeHidden) => {
+    if (val === toBeHidden.id && toBeHidden.classList.value.includes("hide")) {
+      toBeHidden.classList.remove("hide")
+    } else {
+      toBeHidden.classList.add("hide")
+    }
+  });
+};
+export default () => {
+  const item = document.querySelector("#result_import_projects_origin_component_id");
+  item.addEventListener(("change"), (event) => {
+    toggleInfo(`component_${event.target.value}`);
+  });
+};