decidim-accountability 0.10.1 → 0.11.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 757a3051ec263ec176bc03f9ae7b2ce3a683f3cfe3f862b27366b8696ebe6d6d
-  data.tar.gz: ace2f7badfb536fd190b30ec68351fc4e90e6ed7da6bbbc72764cdb5f2fa9ec3
+  metadata.gz: 5207908e5a433224053e690acac13d24905ab648c799ebedc244dc40ae164d82
+  data.tar.gz: dbb8a639b0b117157c9f408914d2dfa222340d6e5f31631ac7f0bde9dc7a76af
 SHA512:
-  metadata.gz: fe71357f53a478a380e287d81a52f94ba87100dc2b9be7da74ca19cc940ede34da3ab7448ac994d09f485de38038de214fdf005965a6dbfb3e70009f2cc50781
-  data.tar.gz: 9858e94c1e805a97382f00551e953ae76cc2ac0c88116910d1ed7a2bf50abd5d0d5beade04286b129075bf55124f85bacd678e81a17deceaabba27b274e78dd6
+  metadata.gz: a3b5c13923e8a3c4a4bd35c5c901efef01aa143cf87a678462d19225b5b7af8d71f7510f7e0efb30ea55a96d8940c62f85019cdc611e97288a567969469c2da6
+  data.tar.gz: ea3e503988ea03b8d6fa1bbf8c96e6e5f8c48e0cc12a54feadc018053d2331163b65ad351fd9d046d1cea53708b6957290ba8b32137b8120b7b1eb93c8a602c0

data/README.md

@@ -4,7 +4,7 @@ The Accountability module adds results to any participatory process. It adds a C
 
 ## Usage
 
-Accountability will be available as a Feature for a Participatory Process.
+Accountability will be available as a Component for a Participatory Process.
 
 ## Installation
 

data/app/assets/javascripts/decidim/accountability/accountability.js.es6

@@ -5,8 +5,8 @@
 $(() => {
   // Show category list on click when we are on a small scren
   if ($(window).width() < 768) {
-    $('.category--section').click((event) => {
-      $(event.currentTarget).next('.category--elements').toggleClass('active');
+    $(".category--section").click((event) => {
+      $(event.currentTarget).next(".category--elements").toggleClass("active");
     });
   }
 })

data/app/assets/javascripts/decidim/accountability/admin/accountability_admin.js.es6

@@ -2,7 +2,7 @@
 
 $("#result_decidim_accountability_status_id").change(function () {
   /* eslint-disable no-invalid-this */
-  const progress = $(this).find(':selected').data('progress')
+  const progress = $(this).find(":selected").data("progress")
   if (progress || progress === 0) {
     $("#result_progress").val(progress);
   }
@@ -12,7 +12,7 @@ $(function() {
   $(document).on("open.zf.reveal", "#data_picker-modal", function () {
     let xhr = null;
 
-    $('#data_picker-autocomplete').autoComplete({
+    $("#data_picker-autocomplete").autoComplete({
       minChars: 2,
       source: function(term, response) {
         try {
@@ -20,26 +20,26 @@ $(function() {
         } catch (exception) { xhr = null}
 
         xhr = $.getJSON(
-          'proposals.json',
+          "proposals.json",
           { term: term },
           function(data) { response(data); }
         );
       },
       renderItem: function (item, search) {
-        let sanitizedSearch = search.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
-        let re = new RegExp(`(${sanitizedSearch.split(' ').join('|')})`, "gi");
+        let sanitizedSearch = search.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
+        let re = new RegExp(`(${sanitizedSearch.split(" ").join("|")})`, "gi");
         let title = item[0]
         let modelId = item[1]
         let val = `#${modelId}- ${title}`;
         return `<div class="autocomplete-suggestion" data-model-id="${modelId}" data-val ="${title}">${val.replace(re, "<b>$1</b>")}</div>`;
       },
       onSelect: function(event, term, item) {
-        let choose = $('#proposal-picker-choose')
-        let modelId = item.data('modelId')
-        let val = `#${modelId}- ${item.data('val')}`;
-        choose.data('picker-value', modelId)
-        choose.data('picker-text', val)
-        choose.data('picker-choose', '')
+        let choose = $("#proposal-picker-choose")
+        let modelId = item.data("modelId")
+        let val = `#${modelId}- ${item.data("val")}`;
+        choose.data("picker-value", modelId)
+        choose.data("picker-text", val)
+        choose.data("picker-choose", "")
       }
     })
   });

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

@@ -35,7 +35,7 @@ module Decidim
           @result = Decidim.traceability.create!(
             Result,
             @form.current_user,
-            feature: @form.current_feature,
+            component: @form.current_component,
             scope: @form.scope,
             category: @form.category,
             parent_id: @form.parent_id,

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

@@ -29,7 +29,7 @@ module Decidim
 
         def create_status
           @status = Status.create!(
-            feature: @form.current_feature,
+            component: @form.current_component,
             key: @form.key,
             name: @form.name,
             description: @form.description,

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # This command is executed when the user destroys a Result from the admin
+      # panel.
+      class DestroyResult < Rectify::Command
+        # Initializes an UpdateResult Command.
+        #
+        # result - The current instance of the result to be destroyed.
+        # current_user - the user performing the action
+        def initialize(result, current_user)
+          @result = result
+          @current_user = current_user
+        end
+
+        # Destroys the result.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          destroy_result
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :result, :current_user
+
+        def destroy_result
+          Decidim.traceability.perform_action!(
+            :delete,
+            result,
+            current_user
+          ) do
+            result.destroy!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -6,9 +6,9 @@ module Decidim
       # This controller is the abstract class from which all other controllers of
       # this engine inherit.
       #
-      # Note that it inherits from `Decidim::Features::BaseController`, which
+      # Note that it inherits from `Decidim::Components::BaseController`, which
       # override its layout and provide all kinds of useful methods.
-      class ApplicationController < Decidim::Admin::Features::BaseController
+      class ApplicationController < Decidim::Admin::Components::BaseController
       end
     end
   end

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

@@ -49,11 +49,13 @@ module Decidim
         end
 
         def destroy
-          result.destroy!
-
-          flash[:notice] = I18n.t("results.destroy.success", scope: "decidim.accountability.admin")
+          DestroyResult.call(result, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("results.destroy.success", scope: "decidim.accountability.admin")
 
-          redirect_to results_path(parent_id: result.parent_id)
+              redirect_to results_path(parent_id: result.parent_id)
+            end
+          end
         end
 
         def proposals
@@ -63,7 +65,7 @@ module Decidim
             end
             format.json do
               query = Decidim.find_resource_manifest(:proposals)
-                             .try(:resource_scope, current_feature)&.order(title: :asc)
+                             .try(:resource_scope, current_component)&.order(title: :asc)
               term = params[:term]
               if term&.start_with?("#")
                 term.delete!("#")
@@ -80,23 +82,23 @@ module Decidim
 
         def results
           parent_id = params[:parent_id].presence
-          @results ||= Result.where(feature: current_feature, parent_id: parent_id).page(params[:page]).per(15)
+          @results ||= Result.where(component: current_component, parent_id: parent_id).page(params[:page]).per(15)
         end
 
         def result
-          @result ||= Result.where(feature: current_feature).find(params[:id])
+          @result ||= Result.where(component: current_component).find(params[:id])
         end
 
         def parent_result
-          @parent_result ||= Result.where(feature: current_feature, id: params[:parent_id]).first
+          @parent_result ||= Result.find_by(component: current_component, id: params[:parent_id])
         end
 
         def parent_results
-          @parent_results ||= Result.where(feature: current_feature, parent_id: nil)
+          @parent_results ||= Result.where(component: current_component, parent_id: nil)
         end
 
         def statuses
-          @statuses ||= Status.where(feature: current_feature)
+          @statuses ||= Status.where(component: current_component)
         end
       end
     end

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

@@ -58,7 +58,7 @@ module Decidim
         private
 
         def statuses
-          @statuses ||= Status.where(feature: current_feature).page(params[:page]).per(15)
+          @statuses ||= Status.where(component: current_component).page(params[:page]).per(15)
         end
 
         def status

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

@@ -67,7 +67,7 @@ module Decidim
         end
 
         def result
-          @result ||= Result.where(feature: current_feature).find(params[:result_id])
+          @result ||= Result.where(component: current_component).find(params[:result_id])
         end
       end
     end

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

@@ -5,9 +5,9 @@ module Decidim
     # This controller is the abstract class from which all other controllers of
     # this engine inherit.
     #
-    # Note that it inherits from `Decidim::Features::BaseController`, which
+    # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
-    class ApplicationController < Decidim::Features::BaseController
+    class ApplicationController < Decidim::Components::BaseController
     end
   end
 end

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

@@ -8,7 +8,7 @@ module Decidim
       private
 
       def model
-        @model ||= Result.where(feature: params[:feature_id]).find(params[:result_id])
+        @model ||= Result.where(component: params[:component_id]).find(params[:result_id])
       end
 
       def iframe_url

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

@@ -19,7 +19,7 @@ module Decidim
       end
 
       def result
-        @result ||= Result.includes(:timeline_entries).where(feature: current_feature).find(params[:id])
+        @result ||= Result.includes(:timeline_entries).where(component: current_component).find(params[:id])
       end
 
       def search_klass
@@ -35,7 +35,7 @@ module Decidim
       end
 
       def context_params
-        { feature: current_feature, organization: current_organization }
+        { component: current_component, organization: current_organization }
       end
 
       def first_class_categories
@@ -43,7 +43,7 @@ module Decidim
       end
 
       def count_calculator(scope_id, category_id)
-        Decidim::Accountability::ResultsCalculator.new(current_feature, scope_id, category_id).count
+        Decidim::Accountability::ResultsCalculator.new(current_component, scope_id, category_id).count
       end
     end
   end

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

@@ -12,7 +12,7 @@ module Decidim
       private
 
       def result
-        @result ||= Result.includes(:timeline_entries).where(feature: current_feature).find(params[:result_id])
+        @result ||= Result.includes(:timeline_entries).where(component: current_component).find(params[:result_id])
       end
 
       def current_version

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

@@ -14,7 +14,7 @@ module Decidim
       end
 
       def proposal
-        @proposal ||= resource.linked_resources(:proposals, "included_proposals").where(id: extra[:proposal_id]).first
+        @proposal ||= resource.linked_resources(:proposals, "included_proposals").find_by(id: extra[:proposal_id])
       end
     end
   end

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

@@ -32,7 +32,7 @@ module Decidim
 
         validate :scope_belongs_to_participatory_space_scope
 
-        delegate :categories, to: :current_feature
+        delegate :categories, to: :current_component
 
         def map_model(model)
           self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
@@ -42,13 +42,13 @@ module Decidim
 
         def proposals
           @proposals ||= Decidim.find_resource_manifest(:proposals)
-                                .try(:resource_scope, current_feature)
+                                .try(:resource_scope, current_component)
                                 &.where(id: proposal_ids)
                                 &.order(title: :asc)
         end
 
         def projects
-          @projects ||= Decidim.find_resource_manifest(:projects).try(:resource_scope, current_feature)&.order(title: :asc)
+          @projects ||= Decidim.find_resource_manifest(:projects).try(:resource_scope, current_component)&.order(title: :asc)
                                &.select(:title, :id)&.map { |a| [a.title[I18n.locale.to_s], a.id] }
         end
 
@@ -71,11 +71,11 @@ module Decidim
         end
 
         def parent
-          @parent ||= Decidim::Accountability::Result.find_by(feature: current_feature, id: parent_id)
+          @parent ||= Decidim::Accountability::Result.find_by(component: current_component, id: parent_id)
         end
 
         def status
-          @status ||= Decidim::Accountability::Status.find_by(feature: current_feature, id: decidim_accountability_status_id)
+          @status ||= Decidim::Accountability::Status.find_by(component: current_component, id: decidim_accountability_status_id)
         end
 
         private

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

@@ -23,15 +23,15 @@ module Decidim
       end
 
       def categories_label
-        translated_attribute(feature_settings.categories_label).presence || t("results.home.categories_label", scope: "decidim.accountability")
+        translated_attribute(component_settings.categories_label).presence || t("results.home.categories_label", scope: "decidim.accountability")
       end
 
       def subcategories_label
-        translated_attribute(feature_settings.subcategories_label).presence || t("results.home.subcategories_label", scope: "decidim.accountability")
+        translated_attribute(component_settings.subcategories_label).presence || t("results.home.subcategories_label", scope: "decidim.accountability")
       end
 
       def heading_parent_level_results(count)
-        text = translated_attribute(feature_settings.heading_parent_level_results).presence
+        text = translated_attribute(component_settings.heading_parent_level_results).presence
         if text
           "#{count} #{text}"
         else
@@ -40,7 +40,7 @@ module Decidim
       end
 
       def heading_leaf_level_results(count)
-        text = translated_attribute(feature_settings.heading_leaf_level_results).presence
+        text = translated_attribute(component_settings.heading_leaf_level_results).presence
         if text
           "#{count} #{text}"
         else

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

@@ -14,7 +14,7 @@ module Decidim
       end
 
       def progress_calculator(scope_id, category_id)
-        Decidim::Accountability::ResultsCalculator.new(current_feature, scope_id, category_id).progress
+        Decidim::Accountability::ResultsCalculator.new(current_component, scope_id, category_id).progress
       end
 
       def category

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

@@ -6,14 +6,15 @@ module Decidim
     # title, description and any other useful information to render a custom result.
     class Result < Accountability::ApplicationRecord
       include Decidim::Resourceable
-      include Decidim::HasFeature
-      include Decidim::ScopableFeature
+      include Decidim::HasComponent
+      include Decidim::ScopableComponent
       include Decidim::HasCategory
       include Decidim::HasReference
       include Decidim::Comments::Commentable
       include Decidim::Traceable
+      include Decidim::Loggable
 
-      feature_manifest_name "accountability"
+      component_manifest_name "accountability"
 
       has_many :children, foreign_key: "parent_id", class_name: "Decidim::Accountability::Result", inverse_of: :parent, dependent: :destroy
       belongs_to :parent, foreign_key: "parent_id", class_name: "Decidim::Accountability::Result", inverse_of: :children, optional: true, counter_cache: :children_count
@@ -32,6 +33,10 @@ module Decidim
         end
       end
 
+      def self.log_presenter_class_for(_log)
+        Decidim::Accountability::AdminLog::ResultPresenter
+      end
+
       def update_parent_progress
         return if parent.blank?
 
@@ -45,12 +50,12 @@ module Decidim
 
       # Public: Overrides the `commentable?` Commentable concern method.
       def commentable?
-        feature.settings.comments_enabled?
+        component.settings.comments_enabled?
       end
 
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
       def accepts_new_comments?
-        commentable? && !feature.current_settings.comments_blocked
+        commentable? && !component.current_settings.comments_blocked
       end
 
       # Public: Overrides the `comments_have_alignment?` Commentable concern method.

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

@@ -5,13 +5,13 @@ module Decidim
     # The data store for a Status in the Decidim::Accountability component. It stores a
     # key, a localized name, a localized description and and associated progress number.
     class Status < Accountability::ApplicationRecord
-      include Decidim::HasFeature
+      include Decidim::HasComponent
 
-      feature_manifest_name "accountability"
+      component_manifest_name "accountability"
 
       has_many :results, foreign_key: "decidim_accountability_status_id", class_name: "Decidim::Accountability::Result", inverse_of: :status, dependent: :nullify
 
-      validates :key, presence: true, uniqueness: { scope: :decidim_feature_id }
+      validates :key, presence: true, uniqueness: { scope: :decidim_component_id }
       validates :name, presence: true
     end
   end