decidim-accountability 0.26.10 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed6100ed90d5e3fac894d1635e5907f0353ef548263afe8cff5472b11a966eb3
-  data.tar.gz: 694dc8d8039a9b57f948b49fcf1918dfd1b3ecc179825b41d18863c5fc0684c7
+  metadata.gz: 3c075f66ece3b892202c3936512fe378f3badd528a66d50e27c3b05e0139b330
+  data.tar.gz: 888ec8f73f7b72a36167359670cffb1228bfa30c29ed7f35f73213d30db35864
 SHA512:
-  metadata.gz: 021d0e003f2a60d3e5e97c2f9fc30b7b61294caa35be260c31c2dc20ffdb244496f8a3fa4df5183a9f0d85ee8aa101168e5be8c56a8ab148bd76ff3395dbd2f4
-  data.tar.gz: 48d88affb096c6130653d973d2a6f4b639f871764ff7cd23b31cd5d5a9dffc1bf333d31bb4f2cd1f92831b92c6e740b9d9041f86e5b4c4e66cae72ea3a02ebcf
+  metadata.gz: 8e9e0be0ac5170614d786e784e310c2f30cc1f7e03ff9b3eb16fe1a3911beee160fcdb2f1f39f87dd3ebfda418325a634199b29ef25250bef55afb9ba7e73897
+  data.tar.gz: 07a0e0128905106e8ac06ffeda3b60ae1c820039637cc32011e7524521d6af0340e4a930f9c04f7f065d3ed7b0f1cd75ecc801889310d5d9f535597c0c4cd723

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

@@ -21,7 +21,7 @@ module Decidim
       private
 
       def results
-        @results ||= Decidim::Accountability::Result.where(component: model).order_randomly(rand * 2 - 1)
+        @results ||= Decidim::Accountability::Result.where(component: model).order_randomly((rand * 2) - 1)
       end
 
       def results_to_render
@@ -31,6 +31,18 @@ module Decidim
       def results_count
         @results_count ||= results.count
       end
+
+      def cache_hash
+        hash = []
+        hash << "decidim/accountability/highlighted_results_for_component"
+        hash << results.cache_key_with_version
+        hash << I18n.locale.to_s
+        hash.join(Decidim.cache_key_separator)
+      end
+
+      def cache_expiry_time
+        10.minutes
+      end
     end
   end
 end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Result from the admin
       # panel.
-      class CreateImportedResult < Rectify::Command
+      class CreateImportedResult < Decidim::Command
         def initialize(form, parent_id = nil)
           @form = form
           @parent_id = parent_id

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Result from the admin
       # panel.
-      class CreateResult < Rectify::Command
+      class CreateResult < Decidim::Command
         def initialize(form)
           @form = form
         end

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

@@ -5,9 +5,10 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Status from the admin
       # panel.
-      class CreateStatus < Rectify::Command
-        def initialize(form)
+      class CreateStatus < Decidim::Command
+        def initialize(form, user)
           @form = form
+          @user = user
         end
 
         # Creates the status if valid.
@@ -28,7 +29,9 @@ module Decidim
         attr_reader :status
 
         def create_status
-          @status = Status.create!(
+          @status = Decidim.traceability.create!(
+            Status,
+            @user,
             component: @form.current_component,
             key: @form.key,
             name: @form.name,

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

@@ -5,9 +5,10 @@ module Decidim
     module Admin
       # This command is executed when the user creates a TimelineEntry
       # for a Result from the admin panel.
-      class CreateTimelineEntry < Rectify::Command
-        def initialize(form)
+      class CreateTimelineEntry < Decidim::Command
+        def initialize(form, user)
           @form = form
+          @user = user
         end
 
         # Creates the timeline_entry if valid.
@@ -25,13 +26,16 @@ module Decidim
 
         private
 
-        attr_reader :timeline_entry
+        attr_reader :timeline_entry, :form
 
         def create_timeline_entry
-          @timeline_entry = TimelineEntry.create!(
-            decidim_accountability_result_id: @form.decidim_accountability_result_id,
-            entry_date: @form.entry_date,
-            description: @form.description
+          @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
       end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user destroys a Result from the admin
       # panel.
-      class DestroyResult < Rectify::Command
+      class DestroyResult < Decidim::Command
         # Initializes an UpdateResult Command.
         #
         # result - The current instance of the result to be destroyed.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Result from the admin
       # panel.
-      class UpdateImportedResult < Rectify::Command
+      class UpdateImportedResult < Decidim::Command
         # Initializes an UpdateResult Command.
         #
         # form - The form from which to get the data.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Result from the admin
       # panel.
-      class UpdateResult < Rectify::Command
+      class UpdateResult < Decidim::Command
         # Initializes an UpdateResult Command.
         #
         # form - The form from which to get the data.

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

@@ -5,14 +5,15 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Result from the admin
       # panel.
-      class UpdateStatus < Rectify::Command
+      class UpdateStatus < Decidim::Command
         # Initializes an UpdateStatus Command.
         #
         # form - The form from which to get the data.
         # status - The current instance of the status to be updated.
-        def initialize(form, status)
+        def initialize(form, status, user)
           @form = form
           @status = status
+          @user = user
         end
 
         # Updates the status if valid.
@@ -33,7 +34,9 @@ module Decidim
         attr_reader :status, :form
 
         def update_status
-          status.update!(
+          Decidim.traceability.update!(
+            status,
+            @user,
             key: @form.key,
             name: @form.name,
             description: @form.description,

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

@@ -5,14 +5,15 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Result from the admin
       # panel.
-      class UpdateTimelineEntry < Rectify::Command
+      class UpdateTimelineEntry < Decidim::Command
         # Initializes an UpdateTimelineEntry Command.
         #
         # form - The form from which to get the data.
         # timeline_entry - The current instance of the timeline_entry to be updated.
-        def initialize(form, timeline_entry)
+        def initialize(form, timeline_entry, user)
           @form = form
           @timeline_entry = timeline_entry
+          @user = user
         end
 
         # Updates the timeline_entry if valid.
@@ -33,9 +34,12 @@ module Decidim
         attr_reader :timeline_entry, :form
 
         def update_timeline_entry
-          timeline_entry.update!(
-            entry_date: @form.entry_date,
-            description: @form.description
+          Decidim.traceability.update!(
+            timeline_entry,
+            @user,
+            entry_date: form.entry_date,
+            title: form.title,
+            description: form.description
           )
         end
       end

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

@@ -18,7 +18,7 @@ module Decidim
 
           @form = form(StatusForm).from_params(params)
 
-          CreateStatus.call(@form) do
+          CreateStatus.call(@form, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("statuses.create.success", scope: "decidim.accountability.admin")
               redirect_to statuses_path
@@ -42,7 +42,7 @@ module Decidim
 
           @form = form(StatusForm).from_params(params)
 
-          UpdateStatus.call(@form, status) do
+          UpdateStatus.call(@form, status, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("statuses.update.success", scope: "decidim.accountability.admin")
               redirect_to statuses_path
@@ -58,7 +58,9 @@ module Decidim
         def destroy
           enforce_permission_to :destroy, :status, status: status
 
-          status.destroy!
+          Decidim.traceability.perform_action!("delete", status, current_user) do
+            status.destroy!
+          end
 
           flash[:notice] = I18n.t("statuses.destroy.success", scope: "decidim.accountability.admin")
 

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

@@ -19,7 +19,7 @@ module Decidim
           @form = form(TimelineEntryForm).from_params(params)
           @form.decidim_accountability_result_id = params[:result_id]
 
-          CreateTimelineEntry.call(@form) do
+          CreateTimelineEntry.call(@form, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("timeline_entries.create.success", scope: "decidim.accountability.admin")
               redirect_to result_timeline_entries_path(params[:result_id])
@@ -43,7 +43,7 @@ module Decidim
 
           @form = form(TimelineEntryForm).from_params(params)
 
-          UpdateTimelineEntry.call(@form, timeline_entry) do
+          UpdateTimelineEntry.call(@form, timeline_entry, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("timeline_entries.update.success", scope: "decidim.accountability.admin")
               redirect_to result_timeline_entries_path(params[:result_id])
@@ -59,7 +59,9 @@ module Decidim
         def destroy
           enforce_permission_to :destroy, :timeline_entry, timeline_entry: timeline_entry
 
-          timeline_entry.destroy!
+          Decidim.traceability.perform_action!("delete", timeline_entry, current_user) do
+            timeline_entry.destroy!
+          end
 
           flash[:notice] = I18n.t("timeline_entries.destroy.success", scope: "decidim.accountability.admin")
 

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

@@ -17,30 +17,30 @@ module Decidim
       private
 
       def results
-        parent_id = params[:parent_id].presence
-        @results ||= search.results.where(parent_id: parent_id).page(params[:page]).per(12)
+        @results ||= begin
+          parent_id = params[:parent_id].presence
+          search.result.where(
+            parent_id: [parent_id] + Result.where(parent_id: parent_id).pluck(:id)
+          ).page(params[:page]).per(12)
+        end
       end
 
       def result
-        @result ||= Result.includes(:timeline_entries).where(component: current_component).find(params[:id])
+        @result ||= search_collection.includes(:timeline_entries).find_by(id: params[:id])
       end
 
-      def search_klass
-        ResultSearch
+      def search_collection
+        Result.where(component: current_component)
       end
 
       def default_filter_params
         {
-          search_text: "",
-          scope_id: "",
-          category_id: ""
+          search_text_cont: "",
+          with_scope: "",
+          with_category: ""
         }
       end
 
-      def context_params
-        { component: current_component, organization: current_organization }
-      end
-
       def first_class_categories
         @first_class_categories ||= current_participatory_space.categories.first_class
       end

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

@@ -59,14 +59,14 @@ module Decidim
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+          @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the result
         def decidim_scope_id
-          @decidim_scope_id || scope&.id
+          super || scope&.id
         end
 
         def category

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

@@ -10,10 +10,11 @@ module Decidim
 
         attribute :decidim_accountability_result_id, Integer
         attribute :entry_date, Decidim::Attributes::LocalizedDate
+        translatable_attribute :title, String
         translatable_attribute :description, String
 
         validates :entry_date, presence: true
-        validates :description, translatable_presence: true
+        validates :title, translatable_presence: true
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Decidim
       end
 
       def current_scope
-        params[:filter][:scope_id] if params[:filter]
+        params[:filter][:with_scope] if params[:filter]
       end
 
       def progress_calculator(scope_id, category_id)
@@ -18,7 +18,7 @@ module Decidim
       end
 
       def category
-        return if (category_id = params.dig(:filter, :category_id)).blank?
+        return if (category_id = params.dig(:filter, :with_category)).blank?
 
         @category ||= current_participatory_space.categories.find(category_id.is_a?(Array) ? category_id.first : category_id)
       end

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

@@ -15,10 +15,11 @@ module Decidim
       include Decidim::Comments::CommentableWithComponent
       include Decidim::Traceable
       include Decidim::Loggable
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Decidim::Randomable
       include Decidim::Searchable
       include Decidim::TranslatableResource
+      include Decidim::FilterableResource
 
       component_manifest_name "accountability"
 
@@ -81,14 +82,17 @@ module Decidim
         true
       end
 
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_category, :with_scope]
+      end
+
       ransacker :id_string do
         Arel.sql(%{cast("decidim_accountability_results"."id" as text)})
       end
 
-      # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-      ransacker :title do |parent|
-        Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
-      end
+      # Create i18n ransackers for :title and :description.
+      # Create the :search_text ransacker alias for searching from both of these.
+      ransacker_i18n_multi :search_text, [:title, :description]
 
       private
 

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

@@ -7,6 +7,8 @@ module Decidim
     class Status < Accountability::ApplicationRecord
       include Decidim::HasComponent
       include Decidim::TranslatableResource
+      include Decidim::FilterableResource
+      include Decidim::Traceable
 
       component_manifest_name "accountability"
 
@@ -18,8 +20,10 @@ module Decidim
       validates :name, presence: true
 
       # Allow ransacker to search for a key in a hstore column (`name`.`en`)
-      ransacker :name do |parent|
-        Arel::Nodes::InfixOperation.new("->>", parent.table[:name], Arel::Nodes.build_quoted(I18n.locale.to_s))
+      ransacker_i18n :name
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Accountability::AdminLog::StatusPresenter
       end
     end
   end

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

@@ -6,9 +6,15 @@ module Decidim
     # It stores a date, and localized description.
     class TimelineEntry < Accountability::ApplicationRecord
       include Decidim::TranslatableResource
+      include Decidim::Traceable
 
+      translatable_fields :title
       translatable_fields :description
       belongs_to :result, foreign_key: "decidim_accountability_result_id", class_name: "Decidim::Accountability::Result", inverse_of: :timeline_entries
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Accountability::AdminLog::TimelineEntryPresenter
+      end
     end
   end
 end

data/app/permissions/decidim/accountability/admin/permissions.rb

@@ -30,10 +30,9 @@ module Decidim
 
         def can_perform_actions_on?(subject, resource)
           return unless permission_action.subject == subject
-          return false if can_create_grandchildren_results?
 
           case permission_action.action
-          when :create, :create_children
+          when :create
             true
           when :update, :destroy
             resource.present?
@@ -41,11 +40,6 @@ module Decidim
             false
           end
         end
-
-        def can_create_grandchildren_results?
-          result&.parent&.present? &&
-            permission_action.action == :create_children
-        end
       end
     end
   end

data/app/presenters/decidim/accountability/admin_log/status_presenter.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Accountability::Status`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    StatusPresenter.new(action_log, view_helpers).present
+      class StatusPresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "create", "delete", "update"
+            "decidim.accountability.admin_log.status.#{action}"
+          else
+            super
+          end
+        end
+
+        def diff_fields_mapping
+          {
+            key: :string,
+            name: :i18n,
+            description: :i18n,
+            progress: :integer
+          }
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/accountability/admin_log/timeline_entry_presenter.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Accountability::TimelineEntry`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #     TimelineEntryPresenter.new(action_log, view_helpers).present
+      class TimelineEntryPresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "create", "delete", "update"
+            "decidim.accountability.admin_log.timeline_entry.#{action}"
+          else
+            super
+          end
+        end
+
+        def diff_fields_mapping
+          {
+            entry_date: :date,
+            description: :i18n,
+            title: :i18n
+          }
+        end
+      end
+    end
+  end
+end

data/app/services/decidim/accountability/results_calculator.rb

@@ -22,12 +22,16 @@ module Decidim
       attr_reader :component, :scope_id, :category_id
 
       def results
-        @results ||= ResultSearch.new(
-          component: component,
-          scope_id: scope_id,
-          category_id: category_id,
-          deep_search: false
-        ).results
+        @results ||= begin
+          query = Result.where(
+            parent_id: nil,
+            component: component
+          )
+          query = query.with_any_scope(scope_id) if scope_id
+          query = query.with_any_category(category_id) if category_id
+
+          query
+        end
       end
     end
   end

data/app/views/decidim/accountability/admin/import_results/new.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= form_tag(import_results_path, multipart: true, class: "form new_import") do %>
   <div class="card">
     <div class="card-divider">
@@ -8,13 +7,6 @@
     </div>
 
     <div class="card-section">
-      <div class="mb-s">
-        <p><%= t(".info",
-                 link_new_status: new_status_path,
-                 link_new_result: new_result_path,
-                 link_export_csv: link_to(t(".download_export"),exports_path(current_component, id: "results", format: "CSV"), method: :post)
-                ).try("html_safe") %></p>
-      </div>
       <div class="row column">
         <%= file_field_tag :csv_file %>
       </div>
@@ -24,4 +16,7 @@
   <div class="button--double form-general-submit">
     <%= submit_tag t(".import"), class: "button" %>
   </div>
+  <div class="import-process-info">
+    <%= t(".info", link_new_status: new_status_path, link_new_result: new_result_path, link_export_csv: link_to(t(".link"), exports_path(current_component, id: "results", format: "CSV"), method: :post)).try("html_safe") %>
+  </div>
 <% end %>

data/app/views/decidim/accountability/admin/results/edit.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form edit_result" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

data/app/views/decidim/accountability/admin/results/index.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">
@@ -75,7 +74,7 @@
               <td class="table-list__actions">
                 <%= icon_link_to "eye", resource_locator(result).path, t("actions.preview", scope: "decidim.accountability"), class: "action-icon--preview", target: :blank %>
 
-                <% if allowed_to? :create_children, :result, result: result %>
+                <% if allowed_to? :update, :result, result: result %>
                   <%= icon_link_to "plus", results_path(parent_id: result.id), t("actions.new", scope: "decidim.accountability", name: t("models.result.name", scope: "decidim.accountability.admin")), class: "action-icon--plus" %>
                 <% end %>
 

data/app/views/decidim/accountability/admin/results/new.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form new_result" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

data/app/views/decidim/accountability/admin/statuses/edit.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form edit_status" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

data/app/views/decidim/accountability/admin/statuses/index.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/accountability/admin/statuses/new.html.erb

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form new_status" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

data/app/views/decidim/accountability/admin/timeline_entries/_form.html.erb

@@ -9,7 +9,11 @@
     </div>
 
     <div class="row column">
-      <%= form.translated :text_field, :description %>
+      <%= form.translated :text_field, :title %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :editor, :description %>
     </div>
   </div>
 </div>