decidim-accountability 0.28.0 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c44709e4f0be476fbe736b6aef8085a3d4d36096a6203d040b9b6c7b3f2c231d
-  data.tar.gz: 2cd9462d29855ea54629141a81a4abc8e7cbbff3bdfadb26c093d1200b5ea3a7
+  metadata.gz: ce10e6fa54bd6b83357be2d515ee441397757309e9d8a2e9ab038c7315488650
+  data.tar.gz: a16768d26ef1444000da351bd940506b99d540ac3e331cb4f25587e0f38932ee
 SHA512:
-  metadata.gz: 50ca660426ef73e3dc827e98aa438b1a94e1e83226e7f70ac5ad8ee79e471430dc2a8be0283727fc97b6dbefa01f75f69be7248a9e9a1be7dcd13cea3058f553
-  data.tar.gz: 6558d7f669c3c34ef96f8266d0e5cdb323b70311fc00b6a515e0e3adb4ae21779d3867994c2105e4b1a934f8f205a352bfe4cc13c7990246c1401988b8dfa8ad
+  metadata.gz: 5c625ff0064c939e7f1b794467958232964b3f841319d0a9c1ef9c39941c73ffd2c66dc382aa05fc3ea9a546b0bc45a888f955bde9947b3e00a03901d505e26d
+  data.tar.gz: 9dc2c614406d132403a80047cb87f98d4078097d575aae73b8798a78e95e19b96451e4c8337a755e830b1a78e7f46951ff6b0be46b9b66abfa3997f07fc23559

data/app/cells/decidim/accountability/highlighted_results_for_component/show.erb

@@ -3,7 +3,7 @@
 
 <div class="content-block__title">
   <h2 class="h2 decorator">
-    <%= single_component? ? translated_attribute(model.name) : t("decidim.accountability.content_blocks.highlighted_results.results") %>
+    <%= single_component? ? decidim_escape_translated(model.name) : t("decidim.accountability.content_blocks.highlighted_results.results") %>
   </h2>
   <div class="label text-lg"><%= results_count %></div>
   <% if single_component? %>

data/app/cells/decidim/accountability/project/timeline.erb

@@ -6,14 +6,14 @@
       </div>
       <div class="accountability__project-timeline-entry-attributes">
         <h3>
-          <%= translated_attribute timeline_entry.title %>
+          <%= decidim_sanitize_translated timeline_entry.title %>
         </h3>
         <div>
           <%= l timeline_entry.entry_date, format: :decidim_short %>
         </div>
         <% if translated_attribute(timeline_entry.description).present? %>
           <div>
-            <%= translated_attribute(timeline_entry.description).html_safe %>
+            <%= decidim_sanitize_translated(timeline_entry.description) %>
           </div>
         <% end %>
       </div>

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

@@ -17,17 +17,21 @@ module Decidim
       alias result model
 
       def show
-        render
+        render template
       end
 
       private
 
+      def template
+        @template ||= options[:template] || :show
+      end
+
       def title
-        translated_attribute result.title
+        decidim_escape_translated result.title
       end
 
       def description
-        translated_attribute(result.description).html_safe
+        decidim_sanitize_admin translated_attribute(result.description)
       end
 
       def scope
@@ -37,11 +41,19 @@ module Decidim
       def tab_panel_items
         [
           {
-            enabled: children.any?,
-            id: "list",
+            enabled: timeline_entries.any?,
+            id: "timeline_entries",
             text: t("decidim.accountability.results.timeline.title"),
             icon: "route-line",
             method: :cell,
+            args: ["decidim/accountability/project", result, { template: :timeline }]
+          },
+          {
+            enabled: children.any?,
+            id: "included_results",
+            text: t("activemodel.attributes.result.subresults"),
+            icon: "briefcase-2-line",
+            method: :cell,
             args: ["decidim/accountability/results", result.children]
           },
           {

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

@@ -75,7 +75,7 @@ module Decidim
         return if status.blank?
 
         {
-          text: translated_attribute(status.name),
+          text: decidim_escape_translated(status.name),
           icon: "focus-2-line"
         }
       end
@@ -114,12 +114,12 @@ module Decidim
         {
           text: t("models.result.fields.status", scope: "decidim.accountability"),
           icon: "focus-2-line",
-          value: translated_attribute(status.name)
+          value: decidim_escape_translated(status.name)
         }
       end
 
       def status_description
-        return unless status.present? && (description = translated_attribute(status.description)).present?
+        return unless status.present? && (description = decidim_escape_translated(status.description)).present?
 
         {
           text: t("models.status.fields.description", scope: "decidim.accountability"),

data/app/cells/decidim/accountability/status/status.erb

@@ -1,7 +1,7 @@
 <p class="accountability__status-title"><%= title %></p>
 
 <% if component_settings.display_progress_enabled? && progress.present? %>
-  <div class="accountability__status-progress">
+  <div class="accountability__status-progress" role="progressbar" aria-label="<%= t("decidim.shared.progress") %>" aria-valuenow="<%= number_with_precision(progress, separator: ".", precision: 1) %>" aria-valuemin="0" aria-valuemax="100" aria-valuetext="<%= number_to_percentage(progress, precision: 1) %>">
     <div style="width:<%= progress %>%"></div>
   </div>
 <% end %>

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

@@ -8,8 +8,10 @@ module Decidim
     class StatusCell < Decidim::ViewModel
       include ApplicationHelper
       include BreadcrumbHelper
+      include Decidim::SanitizeHelper
       include Decidim::TranslationsHelper
       include ActiveSupport::NumberHelper
+      include ActionView::Helpers::NumberHelper
 
       delegate :current_component, :component_settings, to: :controller
 
@@ -39,7 +41,7 @@ module Decidim
 
       def title
         if model.is_a? Decidim::Category
-          translated_attribute(model.name)
+          decidim_html_escape translated_attribute(model.name)
         else
           options[:title]
         end

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

@@ -5,11 +5,15 @@ module Decidim
     # Exposes the result resource so users can view them
     class ResultsController < Decidim::Accountability::ApplicationController
       include FilterResource
+      include Decidim::TranslatableAttributes
+
       helper Decidim::TraceabilityHelper
       helper Decidim::Accountability::BreadcrumbHelper
 
       helper_method :results, :result, :first_class_categories, :count_calculator, :nav_paths
 
+      before_action :set_controller_breadcrumb
+
       def show
         raise ActionController::RoutingError, "Not Found" unless result
       end
@@ -66,6 +70,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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    class BaseResultEvent < Decidim::Events::SimpleEvent
+      i18n_attributes :proposal_title, :proposal_path
+
+      def resource_text
+        translated_attribute(resource.description)
+      end
+
+      def proposal_title
+        @proposal_title ||= decidim_sanitize_translated(proposal.title)
+      end
+
+      def proposal_path
+        @proposal_path ||= Decidim::ResourceLocatorPresenter.new(proposal).path
+      end
+
+      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/events/decidim/accountability/proposal_linked_event.rb

@@ -2,24 +2,7 @@
 
 module Decidim
   module Accountability
-    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
+    class ProposalLinkedEvent < BaseResultEvent
     end
   end
 end

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

@@ -2,28 +2,12 @@
 
 module Decidim
   module Accountability
-    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
+    class ResultProgressUpdatedEvent < BaseResultEvent
+      i18n_attributes :progress
 
       def progress
         extra[:progress]
       end
-
-      def resource_text
-        translated_attribute(resource.description)
-      end
     end
   end
 end

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

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

@@ -1,7 +1,7 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <% if parent_result %>
         <%= "#{translated_attribute(parent_result.title)} > " %>
       <% end %>
@@ -19,7 +19,7 @@
       <%= render partial: "decidim/accountability/admin/shared/subnav" unless parent_result %>
       <%= link_to t("actions.new_result", scope: "decidim.accountability"), new_result_path(parent_id: parent_result), class: "button button__sm button__secondary" if allowed_to? :create, :result %>
       <%= render partial: "decidim/admin/components/resource_action" %>
-    </h2>
+    </h1>
   </div>
 
   <%= admin_filter_selector(:results) %>

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -1,10 +1,10 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t(".title") %>
       <%= link_to t("actions.new_status", scope: "decidim.accountability"), new_status_path, class: "button button__sm button__secondary" if allowed_to? :create, :status %>
-    </h2>
+    </h1>
   </div>
   <div class="table-scroll">
     <table class="table-list">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -2,13 +2,13 @@
 <% add_decidim_page_title(translated_attribute(result.title)) %>
 <div class="card">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <div>
         <%= link_to "#{translated_attribute(result.title)} > ", edit_result_path(result) %>
         <%= t(".title") %>
       </div>
       <%= link_to t("actions.new_timeline_entry", scope: "decidim.accountability"), new_result_timeline_entry_path(result), class: "button button__sm button__secondary button--title" if allowed_to? :create, :timeline_entry %>
-    </h2>
+    </h1>
   </div>
   <div class="table-scroll">
     <table class="table-list">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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/accountability/results/home.html.erb

@@ -21,7 +21,7 @@
 <%= render layout: "layouts/decidim/shared/layout_two_col" do %>
 
   <section class="layout-main__section">
-    <div class="editor-content"><%== translated_attribute component_settings.intro %></div>
+    <div class="editor-content"><%= decidim_sanitize_admin translated_attribute(component_settings.intro) %></div>
   </section>
 
   <section class="layout-main__section">

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

@@ -7,7 +7,7 @@
 
 <%= render layout: "layouts/decidim/shared/layout_two_col" do %>
   <section class="layout-main__section">
-    <h2 class="h4"><%= category.present? ? translated_attribute(category.name) : t("decidim.accountability.results.home_header.global_status") %></h2>
+    <h2 class="h4"><%= category.present? ? decidim_escape_translated(category.name) : t("decidim.accountability.results.home_header.global_status") %></h2>
   </section>
 
   <section id="results" class="layout-main__section">

data/config/locales/ar.yml

@@ -183,7 +183,7 @@ ar:
           stats:
             attendees: الحضور
             back_to_resource: العودة إلى النتيجة
-            comments: تعليقات
+            comments: التعليقات
             contributions: مساهمات
             last_edited_by: التعديل الأخير تم بواسطة
             last_updated_at: آخر تحديث في