decidim-proposals 0.28.0 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 963591788f589acc6e2f6bcc8225a171ee1c236160b875e7b69b4add7f5a846f
-  data.tar.gz: 29957cde18ba150a37c33099bfb9641e79b3d7e1314e3f08038f6c11aaa9ea9e
+  metadata.gz: 8718c7a21c7d5b239eb3c3e92285579ea84d134ef432258b4b0e840b09a2556c
+  data.tar.gz: 41c17711b34bb29d133e040275fb34be7840cfab5375303b583cb7d2f4957e89
 SHA512:
-  metadata.gz: 8cf69ac522bf200ee1a82ed4ba151a2d4fd415b5254dddb645c749c7b751d84821629298c14f9c15b8d477b2b0087bb54835c187ed1d47b34ce448c81c9db810
-  data.tar.gz: f4c9b0b58a7c01cc657223ac32740e84cb9dba142d30ff3f74b2d470d31c601220d62202c21bdb21cbedab4379fb0205e5594489afc8812729d8e6e724c82240
+  metadata.gz: '08b53946fb8f1043a0eafb6363ea5c0b9550f0c521b16f11ab396a817d6b5f4c23f6ab464113b05e05ac09f4e3312c7b5165bb4bc248e5b6d78388e21fd67d99'
+  data.tar.gz: e03c97bb74d5a5aec2a2e494a7bf4f6f0d91dc2bdfd21f502a4bf03198ea12eccb4ae911d22391087f5a0ea62c4946fe78e0f5edc466ea612ca18710de5aafe9

data/app/cells/decidim/proposals/highlighted_proposals_for_component/show.erb

@@ -1,6 +1,6 @@
 <div class="content-block__title">
   <h2 class="h2 decorator">
-    <%= single_component? ? translated_attribute(model.name) : t("decidim.components.proposals.name") %>
+    <%= single_component? ? decidim_escape_translated(model.name) : t("decidim.components.proposals.name") %>
   </h2>
   <div class="label text-lg"><%= proposals_count %></div>
   <% if single_component? %>

data/app/cells/decidim/proposals/participatory_text_proposal/buttons.erb

@@ -1,5 +1,5 @@
 <% if amendmendment_creation_enabled? || visible_emendations.any? %>
-  <%= link_to amend_resource_path, disabled: amend_button_disabled?, class: "proposal-participatory__button" do %>
+  <%= action_authorized_link_to :amend, amend_resource_path, resource: model, disabled: amend_button_disabled?, class: "proposal-participatory__button" do %>
     <%= icon "chat-1-line" %>
     <span><%= t("amend", scope: "decidim.proposals.participatory_text_proposal.buttons") %></span>
     <div class="label"><%= visible_emendations.count %></div>
@@ -14,7 +14,7 @@
       <div class="label"><%= model.comments_count %></div>
     <% end %>
   <% else %>
-    <%= link_to resource_comments_path, class: "proposal-participatory__button" do %>
+    <%= action_authorized_link_to :comment, resource_comments_path, resource: model, class: "proposal-participatory__button" do %>
       <%= icon "chat-1-line" %>
       <span><%= t("comment", scope: "decidim.proposals.participatory_text_proposal.buttons") %></span>
       <div class="label"><%= model.comments_count %></div>

data/app/controllers/concerns/decidim/proposals/orderable.rb

@@ -35,7 +35,7 @@ module Decidim
 
         def fetch_default_order
           default_order = current_settings.default_sort_order.presence || component_settings.default_sort_order
-          return order_by_default if default_order == "default"
+          return order_by_default if default_order == "automatic"
 
           possible_orders.include?(default_order) ? default_order : order_by_default
         end

data/app/controllers/decidim/proposals/admin/participatory_texts_controller.rb

@@ -47,7 +47,7 @@ module Decidim
         def update
           enforce_permission_to :manage, :participatory_texts
 
-          form_params = params.require(:preview_participatory_text).permit!
+          form_params = params.require(:preview_participatory_text)
           @preview_form = form(Admin::PreviewParticipatoryTextForm).from_params(proposals: form_params[:proposals_attributes]&.values)
 
           if params.has_key?("save_draft")

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

@@ -139,7 +139,7 @@ module Decidim
       end
 
       def show_voting_rules?
-        return false unless votes_enabled?
+        return false if !votes_enabled? || current_settings.votes_blocked?
 
         return true if vote_limit_enabled?
         return true if threshold_per_proposal_enabled?

data/app/models/decidim/proposals/proposal.rb

@@ -97,11 +97,11 @@ module Decidim
       }
 
       scope :sort_by_valuation_assignments_count_asc, lambda {
-        order(Arel.sql("#{sort_by_valuation_assignments_count_nulls_last_query} ASC NULLS FIRST").to_s)
+        order(valuation_assignments_count: :asc)
       }
 
       scope :sort_by_valuation_assignments_count_desc, lambda {
-        order(Arel.sql("#{sort_by_valuation_assignments_count_nulls_last_query} DESC NULLS LAST").to_s)
+        order(valuation_assignments_count: :desc)
       }
 
       scope_search_multi :with_any_state, [:accepted, :rejected, :evaluating, :state_not_published, :state_published]
@@ -334,18 +334,6 @@ module Decidim
         ProposalSearch.new(self, params, options)
       end
 
-      # Defines the base query so that ransack can actually sort by this value
-      def self.sort_by_valuation_assignments_count_nulls_last_query
-        <<-SQL.squish
-        (
-          SELECT COUNT(decidim_proposals_valuation_assignments.id)
-          FROM decidim_proposals_valuation_assignments
-          WHERE decidim_proposals_valuation_assignments.decidim_proposal_id = decidim_proposals_proposals.id
-          GROUP BY decidim_proposals_valuation_assignments.decidim_proposal_id
-        )
-        SQL
-      end
-
       # method to filter by assigned valuator role ID
       def self.valuator_role_ids_has(value)
         query = <<-SQL.squish

data/app/models/decidim/proposals/valuation_assignment.rb

@@ -9,7 +9,8 @@ module Decidim
       include Decidim::Traceable
       include Decidim::Loggable
 
-      belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: "Decidim::Proposals::Proposal"
+      belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: "Decidim::Proposals::Proposal",
+                            counter_cache: true
       belongs_to :valuator_role, polymorphic: true
 
       def self.log_presenter_class_for(_log)

data/app/packs/entrypoints/participatory_texts_admin.js

@@ -0,0 +1,2 @@
+require.context("../images", true)
+import "stylesheets/decidim/proposals/admin/participatory_texts.scss"

data/app/packs/src/decidim/proposals/admin/proposals.js

@@ -47,6 +47,12 @@ $(() => {
     }
   }
 
+  const resetForms = function() {
+    $("#js-bulk-actions-dropdown button").each(function() {
+      $(`#js-form-${$(this).data("action")}`)[0].reset();
+    })
+  }
+
   const showOtherActionsButtons = function() {
     $("#js-other-actions-wrapper").removeClass("hide");
   }
@@ -68,6 +74,7 @@ $(() => {
   window.showOtherActionsButtons = showOtherActionsButtons;
   window.hideOtherActionsButtons = hideOtherActionsButtons;
   window.hideBulkActionForms = hideBulkActionForms;
+  window.resetForms = resetForms;
 
   if ($(".js-bulk-action-form").length) {
     hideBulkActionForms();

data/app/packs/stylesheets/decidim/proposals/admin/participatory_texts.scss

@@ -0,0 +1,23 @@
+#participatory-text {
+  li {
+    @apply py-4 hover:cursor-move;
+
+    a {
+      @apply font-bold flex;
+
+      > svg {
+        @apply text-2xl fill-black;
+      }
+
+      &[aria-expanded="true"] {
+        & > svg {
+          @apply rotate-90 transition-transform;
+        }
+      }
+
+      span {
+        @apply ml-auto;
+      }
+    }
+  }
+}

data/app/presenters/decidim/proposals/admin_log/proposal_presenter.rb

@@ -15,13 +15,9 @@ module Decidim
       class ProposalPresenter < Decidim::Log::BasePresenter
         private
 
-        def resource_presenter
-          @resource_presenter ||= Decidim::Proposals::Log::ResourcePresenter.new(action_log.resource, h, action_log.extra["resource"])
-        end
-
         def diff_fields_mapping
           {
-            title: "Decidim::Proposals::AdminLog::ValueTypes::ProposalTitleBodyPresenter",
+            title: :i18n,
             body: "Decidim::Proposals::AdminLog::ValueTypes::ProposalTitleBodyPresenter",
             state: "Decidim::Proposals::AdminLog::ValueTypes::ProposalStatePresenter",
             answered_at: :date,

data/app/presenters/decidim/proposals/admin_log/value_types/proposal_title_body_presenter.rb

@@ -5,12 +5,10 @@ module Decidim
     module AdminLog
       module ValueTypes
         class ProposalTitleBodyPresenter < Decidim::Log::ValueTypes::DefaultPresenter
-          include Decidim::TranslatableAttributes
-
           def present
             return unless value
 
-            translated_value = translated_attribute(value)
+            translated_value = h.decidim_escape_translated(value)
             return if translated_value.blank?
 
             renderer = Decidim::ContentRenderers::HashtagRenderer.new(translated_value)

data/app/presenters/decidim/proposals/log/valuation_assignment_presenter.rb

@@ -11,7 +11,7 @@ module Decidim
         # Returns an HTML-safe String.
         def present_resource_name
           if resource.present?
-            Decidim::Proposals::ProposalPresenter.new(resource.proposal).title
+            resource.proposal.presenter.title(html_escape: true)
           else
             super
           end

data/app/views/decidim/proposals/admin/participatory_texts/index.html.erb

@@ -1,10 +1,10 @@
 <% 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") %>
     <%= render partial: "bulk-actions" %>
-  </h2>
+  </h1>
 </div>
 <% if @drafts.any? %>
   <div class="item__edit item__edit-1col">
@@ -15,6 +15,7 @@
             <div class="row column">
               <p class="mt-3"><%= t(".info_1") %></p>
               <ul id="participatory-text" class="draggable-list js-connect js-list-actives accordion  mb-m mt-2.5 ml-2.5 mr-2.5"
+                  data-component="accordion"
                   data-accordion
                   data-sort-url="#"
                   data-multi-expand="true"
@@ -22,11 +23,13 @@
                 <%= form.fields_for(:proposals) do |prop_form| %>
                   <% proposal = @drafts[prop_form.index] %>
 
-                  <li class="py-4 draggable-content <%= proposal.article? ? "is-active" : nil %>" data-accordion-item draggable="true">
-                    <a href="#" class="accordion-title font-bold mt-5"><%= preview_participatory_text_section_title(proposal) %>
+                  <li class="draggable-content is-active" data-accordion-item draggable="true">
+                    <a data-open="true" data-controls="article-<%= proposal.id %>">
+                      <%= icon "arrow-right-s-line" %>
+                      <%= preview_participatory_text_section_title(proposal) %>
                       <span class="mr-m"><%= icon "menu-line", class: "fill-black" %></span>
                     </a>
-                    <div class="accordion-content" data-tab-content>
+                    <div data-tab-content id="article-<%= proposal.id %>">
                       <%= render "article-preview", { form: prop_form, proposal: } %>
                     </div>
                   </li>

data/app/views/decidim/proposals/admin/participatory_texts/new_import.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">
@@ -19,7 +19,7 @@
             </div>
 
             <div class="row column">
-              <%= form.upload :document, label: t(".document_legend", valid_mime_types: mime_types_with_document_examples).html_safe, button_class: "button button__sm button__transparent-secondary" %>
+              <%= form.upload :document, help_text: t(".document_legend", valid_mime_types: mime_types_with_document_examples).html_safe, button_class: "button button__sm button__transparent-secondary" %>
             </div>
           </div>
         </div>

data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb

@@ -56,7 +56,7 @@
   </td>
 
   <td class="valuators-count">
-    <%= proposal.valuation_assignments.count %>
+    <%= proposal.valuation_assignments.size %>
   </td>
 
   <td>

data/app/views/decidim/proposals/admin/proposals/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/proposals/admin/proposals/index.html.erb

@@ -1,14 +1,16 @@
 <% 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">
       <div>
         <%= t(".title") %>
         <span id="js-selected-proposals-count" class="component-counter component-counter--inline" title="<%= t("decidim.proposals.admin.proposals.index.selected") %>"></span>
       </div>
+      <div class="flex items-center gap-x-4">
         <%= render partial: "bulk-actions" %>
         <%= render partial: "decidim/admin/components/resource_action" %>
-    </h2>
+      </div>
+    </h1>
   </div>
   <%= admin_filter_selector(:proposals) %>
   <div class="table-scroll mt-16">

data/app/views/decidim/proposals/admin/proposals/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/proposals/admin/proposals/update_attribute.js.erb

@@ -22,5 +22,6 @@
   window.hideBulkActionsButton();
   window.hideBulkActionForms();
   window.showOtherActionsButtons();
-  window.selectedResourcesCountUpdate();
+  window.selectedProposalsCountUpdate();
+  window.resetForms();
 <% end %>

data/app/views/decidim/proposals/admin/proposals_imports/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/proposals/collaborative_drafts/show.html.erb

@@ -26,7 +26,7 @@
     <% end %>
 
     <div class="layout-author">
-      <%= cell "decidim/coauthorships", @collaborative_draft %>
+      <%= cell "decidim/coauthorships", @collaborative_draft, context_actions: [] %>
 
       <% if @collaborative_draft.state %>
         <span class="<%= collaborative_drafts_state_class(@collaborative_draft.state) %> label">

data/app/views/decidim/proposals/proposals/_proposal_aside.html.erb

@@ -10,7 +10,10 @@
 <% if (@proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal)) || (amendments_enabled? && @proposal.amendable? && current_component.current_settings.amendment_creation_enabled && can_participate_in_private_space?) || amendments_enabled? && can_react_to_emendation?(@proposal) || @proposal.withdrawable_by?(current_user) %>
 <section class="layout-aside__section layout-aside__buttons">
   <% if @proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal) %>
-    <%= link_to t("edit_proposal", scope: "decidim.proposals.proposals.show"), edit_proposal_path(@proposal), class: "button button__sm button__transparent-secondary w-full" %>
+    <%= link_to edit_proposal_path(@proposal), class: "button button__sm button__transparent-secondary w-full" do %>
+    <span><%= t("edit_proposal", scope: "decidim.proposals.proposals.show") %></span>
+    <%= icon "pencil-line" %>
+    <% end %>
   <% else %>
     <%= amend_button_for @proposal %>
   <% end %>
@@ -22,7 +25,6 @@
   <% if @proposal.withdrawable_by?(current_user) %>
     <%= action_authorized_link_to :withdraw, withdraw_proposal_path(@proposal), method: :put, class: "button button__sm button__transparent-secondary w-full", title: t("withdraw_btn_hint", scope: "decidim.proposals.proposals.show" ), data: { confirm: t("withdraw_confirmation_html", scope: "decidim.proposals.proposals.show" ) } do %>
       <span><%= t("withdraw_proposal", scope: "decidim.proposals.proposals.show") %></span>
-      <%= icon "pencil-line" %>
     <% end %>
   <% end %>
 </section>

data/app/views/decidim/proposals/proposals/compare.html.erb

@@ -10,7 +10,7 @@
   <% if @similar_proposals.present? %>
     <div class="proposal__container my-10">
       <% @similar_proposals.each do |proposal| %>
-        <%= card_for @proposal %>
+        <%= card_for proposal %>
       <% end %>
     </div>
   <% end %>

data/app/views/decidim/proposals/proposals/preview.html.erb

@@ -11,7 +11,7 @@
     <h2 class="h3 text-secondary"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
 
     <% unless component_settings.participatory_texts_enabled? %>
-      <%= cell "decidim/coauthorships", @proposal %>
+      <%= cell "decidim/coauthorships", @proposal, context_actions: [] %>
     <% end %>
 
     <div class="editor-content">

data/app/views/decidim/proposals/proposals/show.html.erb

@@ -47,10 +47,10 @@ extra_admin_link(
 
     <% unless component_settings.participatory_texts_enabled? %>
       <div class="layout-author">
-        <%= cell "decidim/coauthorships", @proposal %>
+        <%= cell "decidim/coauthorships", @proposal, context_actions: [:date] %>
 
         <% if not ["section","subsection"].include? @proposal.participatory_text_level %>
-          <%== cell("decidim/proposals/proposal_metadata", @proposal).state_item&.dig(:text)&.html_safe %>
+          <%= cell("decidim/proposals/proposal_metadata", @proposal).state_item&.dig(:text) %>
         <% end %>
       </div>
     <% end %>

data/config/assets.rb

@@ -5,5 +5,6 @@ base_path = File.expand_path("..", __dir__)
 Decidim::Webpacker.register_path("#{base_path}/app/packs")
 Decidim::Webpacker.register_entrypoints(
   decidim_proposals: "#{base_path}/app/packs/entrypoints/decidim_proposals.js",
+  participatory_texts_admin: "#{base_path}/app/packs/entrypoints/participatory_texts_admin.js",
   decidim_proposals_admin: "#{base_path}/app/packs/entrypoints/decidim_proposals_admin.js"
 )

data/config/locales/ar.yml

@@ -157,9 +157,7 @@ ar:
             comments_enabled: تم تمكين التعليقات
             comments_max_length: الحد الأقصى لطول التعليقات (اترك 0 لاستعمال القيمة الافتراضية)
             default_sort_order: التصنيف الافتراضي للاقتراح
-            default_sort_order_help: الافتراضي يعني أنه إذا تم تمكين الدعم، سيتم عرض المقترحات عشوائياً، وإذا تم حظر الدعم، فسيتم فرزها حسب الأكثر دعم.
             default_sort_order_options:
-              default: الافتراضي
               most_commented: صاحبة الأكثر تعليقات
               most_endorsed: صاحبة أكثر تأييدات
               most_followed: صاحبة أكثر متابعات
@@ -186,7 +184,6 @@ ar:
             proposal_wizard_step_1_help_text: اقتراح الاقتراح "إنشاء" نص مساعدة الخطوة
             proposal_wizard_step_2_help_text: اقتراح الاقتراح "قارن" نص خطوة المساعدة
             proposal_wizard_step_3_help_text: نص اقتراح "إكمال" تعليمات نص المعالج
-            proposal_wizard_step_4_help_text: اقتراح الاقتراح "نشر" نص تعليمات الخطوة
             resources_permissions_enabled: يمكن تعيين أذونات الإجراءات لكل اقتراح
             scope_id: نطاق
             scopes_enabled: النطاقات مفعلة
@@ -211,9 +208,7 @@ ar:
             creation_enabled: يمكن للمشارِكين إنشاء اقتراحات
             creation_enabled_readonly: يتم تعطيل هذا الإعداد عند تفعيل وظيفة النصوص التشاركية. لتحميل الاقتراحات كنص تشاركي، يرجى النقر على زر النصوص التشاركية واتباع التعليمات.
             default_sort_order: التصنيف الافتراضي للاقتراح
-            default_sort_order_help: الافتراضي يعني أنه إذا تم تمكين الدعم، سيتم عرض المقترحات عشوائياً، وإذا تم حظر الدعم، فسيتم فرزها حسب الأكثر دعم.
             default_sort_order_options:
-              default: الافتراضي
               most_commented: صاحبة الأكثر تعليقات
               most_endorsed: صاحبة أكثر تأييدات
               most_followed: صاحبة أكثر متابعات
@@ -281,7 +276,6 @@ ar:
             notification_title: تم قبول اقتراحك <a href="%{resource_path}">%{resource_title}</a>.
           follower:
             email_intro: 'تم قبول الاقتراح "%{resource_title}". يمكنك قراءة الإجابة على هذه الصفحة:'
-            email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{resource_title}. يمكنك إلغاء المتابعة على الرابط السابق.
             notification_title: لقد تم قبول المُقتَرح <a href="%{resource_path}">%{resource_title}</a>.
         proposal_evaluating:
           affected_user:
@@ -291,7 +285,6 @@ ar:
             notification_title: يتم تقييم الاقتراح الخاص بك <a href="%{resource_path}">%{resource_title}</a>.
           follower:
             email_intro: 'الاقتراح "%{resource_title}" قيد التقييم حاليا. يمكنك التحقق من وجود إجابة على هذه الصفحة:'
-            email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{resource_title}. يمكنك إلغاء المتابعة على الرابط السابق.
             notification_title: الاقتراح <a href="%{resource_path}">%{resource_title}</a> قيد التقييم الآن.
         proposal_mentioned:
           email_intro: تم ذكر اقتراحك "%{mentioned_proposal_title}" <a href="%{resource_url}">في هذا الفضاء</a> في التعليقات.
@@ -315,7 +308,6 @@ ar:
             notification_title: تم رفض اقتراحك <a href="%{resource_path}">%{resource_title}</a>.
           follower:
             email_intro: 'تم رفض الاقتراح %{resource_title}. يمكنك قراءة الإجابة على ذلك على هذه الصفحة:'
-            email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{resource_title}. يمكنك إلغاء المتابعة على الرابط السابق.
             notification_title: تم رفض الاقتراح <a href="%{resource_path}">%{resource_title}</a>.
         proposal_update_category:
           email_intro: 'قام المشرف بتحديث فئة اقتراحك "%{resource_title}" ، تحقق من ذلك في هذه الصفحة:'
@@ -472,7 +464,7 @@ ar:
             accepted: وافقت
             answer_proposal: إجابة
             evaluating: تقييم
-            not_answered: لم تتم الإجابة عليه
+            not_answered: بلا جواب
             rejected: مرفوض
             title: الإجابة على الاقتراح %{title}
         proposal_notes:
@@ -864,7 +856,7 @@ ar:
           step_1: إنشاء اقتراحك
           step_2: قارن
           step_3: إكمال
-          step_4: انشر اقتراحك
+          step_4: نشر اقتراحك
           title: خطوات إنشاء الاقتراحات
       proposals_picker:
         choose_proposals: اختيار الاقتراحات