decidim-accountability 0.28.1 → 0.29.0.rc1

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

@@ -5,83 +5,21 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Result from the admin
       # panel.
-      class UpdateResult < Decidim::Command
-        # Initializes an UpdateResult Command.
-        #
-        # form - The form from which to get the data.
-        # result - The current instance of the result to be updated.
-        def initialize(form, result)
-          @form = form
-          @result = result
-        end
-
-        # Updates the result if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
+      class UpdateResult < Decidim::Commands::UpdateResource
+        include Decidim::Accountability::Admin::HasResultCommand
 
-          transaction do
-            update_result
-            link_proposals
-            link_meetings
-            link_projects
-            send_notifications if should_notify_followers?
-          end
-
-          broadcast(:ok)
-        end
+        fetch_form_attributes :scope, :category, :parent_id, :title, :description, :start_date, :end_date,
+                              :progress, :decidim_accountability_status_id, :external_id, :weight
 
         private
 
-        attr_reader :result, :form
-
-        def update_result
-          Decidim.traceability.update!(
-            result,
-            form.current_user,
-            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
-          )
-        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

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

@@ -3,46 +3,10 @@
 module Decidim
   module Accountability
     module Admin
-      # This command is executed when the user changes a Result from the admin
+      # This command is executed when the user changes a Status from the admin
       # panel.
-      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, user)
-          @form = form
-          @status = status
-          @user = user
-        end
-
-        # Updates the status if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          transaction do
-            update_status
-          end
-
-          broadcast(:ok)
-        end
-
-        private
-
-        attr_reader :status, :form
-
-        def update_status
-          Decidim.traceability.update!(
-            status,
-            @user,
-            key: @form.key,
-            name: @form.name,
-            description: @form.description,
-            progress: @form.progress
-          )
-        end
+      class UpdateStatus < Decidim::Commands::UpdateResource
+        fetch_form_attributes :key, :name, :description, :progress
       end
     end
   end

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

@@ -3,45 +3,10 @@
 module Decidim
   module Accountability
     module Admin
-      # This command is executed when the user changes a Result from the admin
+      # This command is executed when the user changes a TimelineEntry from the admin
       # panel.
-      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, user)
-          @form = form
-          @timeline_entry = timeline_entry
-          @user = user
-        end
-
-        # Updates the timeline_entry if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          transaction do
-            update_timeline_entry
-          end
-
-          broadcast(:ok)
-        end
-
-        private
-
-        attr_reader :timeline_entry, :form
-
-        def update_timeline_entry
-          Decidim.traceability.update!(
-            timeline_entry,
-            @user,
-            entry_date: form.entry_date,
-            title: form.title,
-            description: form.description
-          )
-        end
+      class UpdateTimelineEntry < Decidim::Commands::UpdateResource
+        fetch_form_attributes :entry_date, :title, :description
       end
     end
   end

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

@@ -68,7 +68,7 @@ module Decidim
         def destroy
           enforce_permission_to(:destroy, :result, result:)
 
-          DestroyResult.call(result, current_user) do
+          Decidim::Commands::DestroyResource.call(result, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("results.destroy.success", scope: "decidim.accountability.admin")
 

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

@@ -18,7 +18,7 @@ module Decidim
 
           @form = form(StatusForm).from_params(params)
 
-          CreateStatus.call(@form, current_user) do
+          CreateStatus.call(@form) 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, current_user) do
+          UpdateStatus.call(@form, status) do
             on(:ok) do
               flash[:notice] = I18n.t("statuses.update.success", scope: "decidim.accountability.admin")
               redirect_to statuses_path
@@ -58,13 +58,12 @@ module Decidim
         def destroy
           enforce_permission_to(:destroy, :status, status:)
 
-          Decidim.traceability.perform_action!("delete", status, current_user) do
-            status.destroy!
+          Decidim::Commands::DestroyResource.call(status, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("statuses.destroy.success", scope: "decidim.accountability.admin")
+              redirect_to statuses_path
+            end
           end
-
-          flash[:notice] = I18n.t("statuses.destroy.success", scope: "decidim.accountability.admin")
-
-          redirect_to statuses_path
         end
 
         private

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, current_user) do
+          CreateTimelineEntry.call(@form) 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, current_user) do
+          UpdateTimelineEntry.call(@form, timeline_entry) 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,13 +59,13 @@ module Decidim
         def destroy
           enforce_permission_to(:destroy, :timeline_entry, timeline_entry:)
 
-          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")
+          Decidim::Commands::DestroyResource.call(timeline_entry, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("timeline_entries.destroy.success", scope: "decidim.accountability.admin")
 
-          redirect_to result_timeline_entries_path(params[:result_id])
+              redirect_to result_timeline_entries_path(params[:result_id])
+            end
+          end
         end
 
         private

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

@@ -8,7 +8,9 @@ module Decidim
       helper Decidim::TraceabilityHelper
       helper Decidim::Accountability::BreadcrumbHelper
 
-      helper_method :results, :result, :first_class_categories, :count_calculator, :nav_paths
+      helper_method :results, :result, :first_class_categories, :count_calculator
+
+      before_action :set_controller_breadcrumb
 
       def show
         raise ActionController::RoutingError, "Not Found" unless result
@@ -29,24 +31,6 @@ 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
@@ -66,6 +50,24 @@ module Decidim
       def count_calculator(scope_id, category_id)
         Decidim::Accountability::ResultsCalculator.new(current_component, scope_id, category_id).count
       end
+
+      def controller_breadcrumb_items
+        @controller_breadcrumb_items ||= []
+      end
+
+      def set_controller_breadcrumb
+        controller_breadcrumb_items << breadcrumb_item
+      end
+
+      def breadcrumb_item
+        return {} if result&.parent.blank?
+
+        {
+          label: translated_attribute(result.parent.title),
+          url: result_path(result.parent),
+          active: true
+        }
+      end
     end
   end
 end

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

@@ -20,6 +20,10 @@ module Decidim
       def proposal
         @proposal ||= resource.linked_resources(:proposals, "included_proposals").find_by(id: extra[:proposal_id])
       end
+
+      def hidden_resource?
+        super || (proposal.respond_to?(:hidden?) && proposal.hidden?)
+      end
     end
   end
 end

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

@@ -14,44 +14,10 @@ module Decidim
         number_to_percentage(number, precision: 1, strip_insignificant_zeros: true, locale: I18n.locale)
       end
 
-      def display_count(count)
-        heading_parent_level_results(count)
-      end
-
-      def active_class_if_current(scope)
-        "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
-
-      def subcategories_label
-        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(component_settings.heading_parent_level_results).presence
-        if text
-          pluralize(count, text)
-        else
-          t("results.count.results_count", scope: "decidim.accountability", count:)
-        end
-      end
-
-      def heading_leaf_level_results(count)
-        text = translated_attribute(component_settings.heading_leaf_level_results).presence
-        if text
-          pluralize(count, text)
-        else
-          t("results.count.results_count", scope: "decidim.accountability", count:)
-        end
-      end
-
       def filter_items_for(participatory_space:, category:)
         [
           {

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

@@ -5,10 +5,6 @@ module Decidim
     # Helpers needed to render the navigation breadcrumbs in results.
     #
     module BreadcrumbHelper
-      def stats_calculator
-        @stats_calculator ||= ResultStatsCalculator.new(result)
-      end
-
       def current_scope
         params[:filter][:with_scope] if params[:filter]
       end

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

@@ -56,7 +56,7 @@ module Decidim
       end
 
       # Public: There are two ways to update parent's progress:
-      #   - using weights, in which case each progress is multiplied by the weigth and them summed
+      #   - using weights, in which case each progress is multiplied by the weight and them summed
       #   - not using weights, and using the average of progress of each children
       def update_progress!
         self.progress = if children_use_weighted_progress?

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

@@ -3,7 +3,7 @@
 module Decidim
   module Accountability
     # 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.
+    # key, a localized name, a localized description and associated progress number.
     class Status < Accountability::ApplicationRecord
       include Decidim::HasComponent
       include Decidim::TranslatableResource

data/app/packs/src/decidim/accountability/index.js

@@ -2,7 +2,7 @@ import "diff"
 import "src/decidim/accountability/version_diff"
 
 $(() => {
-  // Show category list on click when we are on a small scren
+  // Show category list on click when we are on a small screen
   if ($(window).width() < 768) {
     $(".category--section").click((event) => {
       $(event.currentTarget).next(".category--elements").toggleClass("active");

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

@@ -131,7 +131,7 @@ module Decidim
         Decidim::Accountability::Result.includes(:parent).references(:parent)
                                        .where(parents_decidim_accountability_results: { id: nil })
                                        .where.not(parent_id: nil).each do |result|
-          DestroyResult.call(result, @extra_context[:current_user])
+          Decidim::Commands::DestroyResource.call(result, @extra_context[:current_user])
         end
       end
     end

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

@@ -50,7 +50,7 @@
           <th>
             <%= sort_link(query, :created_at, t("models.result.fields.created_at", scope: "decidim.accountability") ) %>
           </th>
-          <th class="actions"><%= t("actions.title", scope: "decidim.accountability") %></th>
+          <th><%= t("actions.title", scope: "decidim.accountability") %></th>
         </tr>
       </thead>
       <tbody>

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

@@ -14,7 +14,7 @@
           <th><%= t("models.status.fields.name", scope: "decidim.accountability") %></th>
           <th><%= t("models.status.fields.description", scope: "decidim.accountability") %></th>
           <th><%= t("models.status.fields.progress", scope: "decidim.accountability") %></th>
-          <th class="actions"><%= t("actions.title", scope: "decidim.accountability") %></th>
+          <th><%= t("actions.title", scope: "decidim.accountability") %></th>
         </tr>
       </thead>
       <tbody>
@@ -22,7 +22,7 @@
           <tr data-id="<%= status.id %>">
             <td><%= status.key %><br></td>
             <td><%= translated_attribute(status.name) %></td>
-            <td><%= truncate translated_attribute(status.description), lenght: 50 %></td>
+            <td><%= truncate translated_attribute(status.description), length: 50 %></td>
             <td><%= status.progress %></td>
             <td class="table-list__actions">
               <% if allowed_to? :update, :status, status: status %>

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

@@ -16,7 +16,7 @@
         <tr>
           <th><%= t("models.timeline_entry.fields.entry_date", scope: "decidim.accountability") %></th>
           <th><%= t("models.timeline_entry.fields.title", scope: "decidim.accountability") %></th>
-          <th class="actions"><%= t("actions.title", scope: "decidim.accountability") %></th>
+          <th><%= t("actions.title", scope: "decidim.accountability") %></th>
         </tr>
       </thead>
       <tbody>

data/app/views/decidim/accountability/results/_home_categories.html.erb

@@ -9,12 +9,12 @@
     ) %>
 
     <div>
-      <span class="accountability__grid-title"><%= categories_label %></span>
+      <span class="accountability__grid-title"><%= t("results.home.categories_label", scope: "decidim.accountability") %></span>
       <%= subelements.call %>
     </div>
 
     <div>
-      <span class="accountability__grid-title"><%= subcategories_label %></span>
+      <span class="accountability__grid-title"><%= t("results.home.subcategories_label", scope: "decidim.accountability") %></span>
         <% if subelements.has_results? %>
           <div class="accountability__subgrid">
             <% category.subcategories.each do |subcategory| %>

data/app/views/decidim/accountability/results/_nav_breadcrumb.html.erb

@@ -1,35 +1,35 @@
-<div class="lines-breadcrumb">
+<div>
   <%= link_to t(".global"), root_path %>
   <% if component_settings.display_progress_enabled? %>
-    <span class="percentage"><%= display_percentage progress_calculator(current_scope, nil) %></span>
+    <span><%= display_percentage progress_calculator(current_scope, nil) %></span>
   <% end %>
 
   <% if category.present? && category.parent.present? %>
-    <span class="breadcrumb--separator">></span>
+    <span>&gt;</span>
     <div>
       <%= link_to translated_attribute(category.parent.name), results_path(filter: { with_category: category.parent_id, with_scope: current_scope }) %>
       <% if component_settings.display_progress_enabled? %>
-        <span class="percentage"><%= display_percentage progress_calculator(current_scope, category.parent_id) %></span>
+        <span><%= display_percentage progress_calculator(current_scope, category.parent_id) %></span>
       <% end %>
     </div>
   <% end %>
 
   <% if category.present? %>
-    <span class="breadcrumb--separator">></span>
+    <span>&gt;</span>
     <div>
       <%= link_to translated_attribute(category.name), results_path(filter: { with_category: category.id, with_scope: current_scope }) %>
       <% if component_settings.display_progress_enabled? %>
-        <span class="percentage"><%= display_percentage progress_calculator(current_scope, category.id) %></span>
+        <span><%= display_percentage progress_calculator(current_scope, category.id) %></span>
       <% end %>
     </div>
   <% end %>
 
   <% if result && result.parent.present? %>
-    <span class="breadcrumb--separator">></span>
+    <span>&gt;</span>
     <div>
       <%= link_to translated_attribute(result.parent.title), result_path(result.parent, filter: { with_category: current_scope }) %>
       <% if component_settings.display_progress_enabled? %>
-        <span class="percentage"><%= display_percentage result.parent.progress %></span>
+        <span><%= display_percentage result.parent.progress %></span>
       <% end %>
     </div>
   <% end %>

data/app/views/decidim/accountability/results/_project.html.erb

@@ -1,4 +1,4 @@
-<%= render layout: "layouts/decidim/shared/layout_item", locals: nav_paths do %>
+<%= render layout: "layouts/decidim/shared/layout_item" do %>
   <%= cell("decidim/accountability/project", result) %>
 
   <section class="layout-main__section layout-main__buttons" data-buttons>

data/app/views/decidim/accountability/results/_scope_filters.html.erb

@@ -4,7 +4,7 @@
 
   <% if current_component.has_subscopes? %>
     <div class="filter-container">
-      <button id="dropdown-trigger-accountability" data-component="dropdown" data-target="dropdown-menu-accountability" data-auto-close="true" data-disabled-md="true">
+      <button id="dropdown-trigger-accountability" data-component="dropdown" data-target="dropdown-menu-accountability" data-auto-close="true">
         <% items.each do |item| %>
           <%= content_tag :span, class: "#{"is-active" if item[:active]}" do %>
             <span class="sr-only"><%= item[:sr_text] %></span>
@@ -15,7 +15,7 @@
         <%= icon "arrow-down-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
         <%= icon "arrow-up-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
       </button>
-      <ul id="dropdown-menu-accountability" data-scope-filters>
+      <ul id="dropdown-menu-accountability" data-scope-filters aria-hidden="true">
         <% items.each do |item| %>
           <li>
             <%= link_to item[:url], class: "filter#{" is-active" if item[:active]}" do %>

data/app/views/decidim/accountability/results/_search.html.erb

@@ -1,5 +1,5 @@
 <%= form_tag results_path, method: :get do %>
-  <div class="filter-search">
+  <div class="filter-search filter-container">
     <label>
       <span class="sr-only"><%= t("search", scope: "decidim.accountability.results.search") %></span>
       <%= search_field_tag(
@@ -10,9 +10,9 @@
             value: "",
             title: t("search", scope: "decidim.accountability.results.search")
           ) %>
-      <button type="submit" aria-label="<%= t("search", scope: "decidim.accountability.results.search") %>">
-        <%= icon "search-line" %>
-      </button>
     </label>
+    <button type="submit" aria-label="<%= t("search", scope: "decidim.accountability.results.search") %>">
+      <%= icon "search-line" %>
+    </button>
   </div>
 <% end %>

data/app/views/decidim/participatory_spaces/_result.html.erb

@@ -6,7 +6,7 @@
         <%= translated_attribute(result.title) %>
       </h4>
 
-      <div class="card--meta">
+      <div>
         <% if result.start_date %>
             <strong><%= t("models.result.fields.start_date", scope: "decidim.accountability") %></strong>
             <span><%= l result.start_date, format: :short %></span>
@@ -25,8 +25,8 @@
   <% end %>
 
   <% if result.progress.present? %>
-      <div class="card--list__data">
-        <span class="card--list__data__number"><%= display_percentage result.progress %></span>
+      <div>
+        <span><%= display_percentage result.progress %></span>
       </div>
   <% end %>
 </div>

data/config/locales/ar.yml

@@ -181,15 +181,7 @@ ar:
           search: البحث عن الإجراءات
         show:
           stats:
-            attendees: الحضور
             back_to_resource: العودة إلى النتيجة
-            comments: التعليقات
-            contributions: مساهمات
-            last_edited_by: التعديل الأخير تم بواسطة
-            last_updated_at: آخر تحديث في
-            meetings: اجتماعات
-            proposals: اقتراحات
-            votes: الدعم
         timeline:
           title: تطور المشروع
     admin:
@@ -208,16 +200,12 @@ ar:
         name: المسائلة
         settings:
           global:
-            categories_label: اسم "الفئات"
             comments_enabled: تم تمكين التعليقات
             comments_max_length: الحد الأقصى لطول التعليقات (اترك ال0 للقيمة الافتراضية)
             display_progress_enabled: عرض التقدم
-            heading_leaf_level_results: اسم "المشاريع"
-            heading_parent_level_results: اسم "النتائج"
             intro: مقدمة
             scope_id: النطاق
             scopes_enabled: النطاقات مفعلة
-            subcategories_label: اسم "الفئات الفرعية"
           step:
             comments_blocked: تم حظر التعليقات
     events: