decidim-participatory_processes 0.28.0 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bffe9572293be30aec66c3866bd2329fb2187a18e2c9edb1539a2e2d21b8527
-  data.tar.gz: da41fb6ed4d6198f9264e8c688ec209f21f6f9b3a928a122ab0b47bab7561bfa
+  metadata.gz: d07c02ed3c00dd29897ccfbbbec0a2d526525758f5301e8adae5b2ea74baafef
+  data.tar.gz: a7b906037157e287a4d3501562fa553be5f667d5b45b6ae4aab6115d3b6e3920
 SHA512:
-  metadata.gz: 21132dbd08297f7d00fcb5a6108c74c05601a9c999bb3ce378e1fd2052197129e8b068aa6e48a1be3ee77032730f1cab4dad3860d153d4a7d9071c236d974521
-  data.tar.gz: 57f97491e1970ccae681f44f64339132ef59082da73b8c65ed012c7c74fe8e82390f1012f4a2e3cb1ba66f22617f0e89199722651ec6701cdc3a3b0765f12aa6
+  metadata.gz: 4090af8da92aa6012fff7bb562049ad2a80e2bbb9f040ed2acabc18397a8b278f8f4229e860ff38506de8197bb8ef341d1bc383e13d997e0383b21dcc7656752
+  data.tar.gz: ec11735ab658b1f4ee0a0d800bd244b023ecb819350250fee2c5fe57c744d7e82c6a44465e6c3d7308b4120f67753fe860ea23463fc739805a5174685c7959ad

data/app/cells/decidim/participatory_process_groups/content_blocks/main_data_cell.rb

@@ -16,7 +16,7 @@ module Decidim
         end
 
         def title_text
-          translated_attribute(title)
+          decidim_escape_translated(title)
         end
 
         def description_text

data/app/cells/decidim/participatory_processes/content_blocks/extra_data_cell.rb

@@ -49,7 +49,7 @@ module Decidim
             title: t("belongs_to_group", scope: "decidim.participatory_processes.show"),
             icon: "archive-line",
             text: link_to(
-              translated_attribute(participatory_process_group.title),
+              decidim_escape_translated(participatory_process_group.title).html_safe,
               decidim_participatory_processes.participatory_process_group_path(participatory_process_group)
             )
           }

data/app/cells/decidim/participatory_processes/process_dropdown_metadata_cell.rb

@@ -26,7 +26,7 @@ module Decidim
       end
 
       def step_title
-        translated_attribute process.active_step&.title
+        decidim_html_escape translated_attribute(process.active_step&.title)
       end
 
       def display_steps?

data/app/cells/decidim/participatory_processes/process_step/show.erb

@@ -10,12 +10,12 @@
             <li>
               <%# NOTE: The following markup is duplicated to fulfill a11y requirements %>
               <% if steps.length == 1 %>
-                <div id="trigger-process-steps-<%= i %>" class="participatory-space__metadata-modal__step<%= " is-active" if active %>" aria-expanded="true">
+                <div id="trigger-process-steps-<%= i %>" class="participatory-space__metadata-modal__step<%= " is-active" if active %>">
                   <span><%= step.position + 1 %></span>
                   <span>
                     <span class="participatory-space__metadata-modal__step-title">
                       <span class="participatory-space__metadata-modal__step-current"><%= t("active_step", scope: "layouts.decidim.participatory_processes.participatory_process") %></span>
-                      <%= translated_attribute(step.title) %>
+                      <%= decidim_escape_translated(step.title) %>
                     </span>
                     <span class="participatory-space__metadata-modal__step-dates"><%= step_dates(step) %></span>
                   </span>
@@ -26,7 +26,7 @@
                   <span>
                     <span class="participatory-space__metadata-modal__step-title">
                       <span class="participatory-space__metadata-modal__step-current"><%= t("active_step", scope: "layouts.decidim.participatory_processes.participatory_process") %></span>
-                      <%= translated_attribute(step.title) %>
+                      <%= decidim_escape_translated(step.title) %>
                     </span>
                     <span class="participatory-space__metadata-modal__step-dates"><%= step_dates(step) %></span>
                   </span>

data/app/controllers/concerns/decidim/participatory_processes/admin/filterable.rb

@@ -17,9 +17,29 @@ module Decidim
             collection
           end
 
-          def extra_filters
+          def filters
+            [
+              :private_space_eq,
+              :published_at_null,
+              :decidim_participatory_process_group_id_eq
+            ]
+          end
+
+          def filters_with_values
+            {
+              private_space_eq: [true, false],
+              published_at_null: [true, false],
+              decidim_participatory_process_group_id_eq: OrganizationParticipatoryProcessGroups.new(current_organization).pluck(:id)
+            }
+          end
+
+          def dynamically_translated_filters
             [:decidim_participatory_process_group_id_eq]
           end
+
+          def translated_decidim_participatory_process_group_id_eq(id)
+            translated_attribute(Decidim::ParticipatoryProcessGroup.find(id).title)
+          end
         end
       end
     end

data/app/controllers/decidim/participatory_processes/admin/categories_controller.rb

@@ -7,8 +7,6 @@ module Decidim
       #
       class CategoriesController < Decidim::Admin::CategoriesController
         include Concerns::ParticipatoryProcessAdmin
-
-        add_breadcrumb_item_from_menu :admin_participatory_process_menu
       end
     end
   end

data/app/helpers/decidim/participatory_processes/participatory_process_helper.rb

@@ -63,7 +63,7 @@ module Decidim
 
         components.map do |component|
           {
-            name: translated_attribute(component.name),
+            name: decidim_escape_translated(component.name),
             url: main_component_path(component),
             active: is_active_link?(main_component_path(component), :inclusive)
           }

data/app/views/decidim/participatory_processes/admin/participatory_process_copies/new.html.erb

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

data/app/views/decidim/participatory_processes/admin/participatory_process_groups/edit.html.erb

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

data/app/views/decidim/participatory_processes/admin/participatory_process_groups/new.html.erb

@@ -12,9 +12,9 @@
   </div>
 <% end %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t "participatory_process_groups.new.title", scope: "decidim.admin" %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

data/app/views/decidim/participatory_processes/admin/participatory_process_imports/new.html.erb

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(t("participatory_process_imports.new.title", scope: "decidim.admin")) %>
 
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("participatory_process_imports.new.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

data/app/views/decidim/participatory_processes/admin/participatory_process_steps/edit.html.erb

@@ -1,13 +1,18 @@
 <% add_decidim_page_title(t("participatory_process_steps.edit.title", scope: "decidim.admin")) %>
 
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("participatory_process_steps.edit.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
+    <%= cell "decidim/announcement", {
+          title: t("title", scope: "decidim.admin.participatory_process_steps.edit.cta_deprecated"),
+          body: t("body_html", scope: "decidim.admin.participatory_process_steps.edit.cta_deprecated")
+        }, callout_class: "warning" %>
+
     <%= decidim_form_for(@form, url: participatory_process_step_path(@participatory_process_step.participatory_process, @participatory_process_step), html: { class: "form form-defaults edit_participatory_process_step" }) do |f| %>
       <%= render partial: "form", object: f, locals: { title: t("participatory_process_steps.edit.title", scope: "decidim.admin") } %>
       <div class="item__edit-sticky">

data/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb

@@ -1,12 +1,12 @@
 <% add_decidim_page_title(t("participatory_process_steps.index.steps_title", scope: "decidim.admin")) %>
 <div class="card" id="steps">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t("participatory_process_steps.index.steps_title", scope: "decidim.admin") %>
       <% if allowed_to? :create, :process_step %>
         <%= link_to t("actions.new_process_step", scope: "decidim.admin"), new_participatory_process_step_path(current_participatory_process), class: "button button__sm button__secondary ml-auto" %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <% if current_participatory_process.steps.any? %>
     <div class="table-scroll">

data/app/views/decidim/participatory_processes/admin/participatory_process_steps/new.html.erb

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

data/app/views/decidim/participatory_processes/admin/participatory_process_types/edit.html.erb

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

data/app/views/decidim/participatory_processes/admin/participatory_process_types/index.html.erb

@@ -1,14 +1,14 @@
 <% add_decidim_page_title(t("titles.participatory_process_types", scope: "decidim.admin")) %>
 <div class="card" id="participatory-process-types">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t("titles.participatory_process_types", scope: "decidim.admin") %>
       <%= link_to(
             t("actions.new_process_type", scope: "decidim.admin"),
             [:new, :participatory_process_type],
             class: "button button__sm button__secondary"
           ) if allowed_to? :create, :participatory_process_type %>
-    </h2>
+    </h1>
   </div>
   <div class="table-scroll">
     <table class="table-list">

data/app/views/decidim/participatory_processes/admin/participatory_process_types/new.html.erb

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

data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/_form.html.erb

@@ -10,7 +10,7 @@
         </div>
         <div class="columns">
           <%= form.label :role %>
-          <%= select :participatory_process_user_role, :role, @form.roles, include_blank: false %>
+          <%= select :participatory_process_user_role, :role, options_for_select(@form.roles, @user_role&.role) %>
         </div>
       </div>
     </div>

data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/edit.html.erb

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(t("participatory_process_user_roles.edit.title", scope: "decidim.admin")) %>
 
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("participatory_process_user_roles.edit.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/index.html.erb

@@ -2,12 +2,12 @@
 
 <div class="card" id="process_admins">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t("participatory_process_user_roles.index.process_admins_title", scope: "decidim.admin") %>
       <% if allowed_to? :create, :process_user_role %>
          <%= link_to t("actions.new_process_user_role", scope: "decidim.admin"), new_participatory_process_user_role_path(current_participatory_process), class: "button button__sm button__secondary new ml-auto" %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <%= admin_filter_selector %>
   <div class="table-scroll">

data/app/views/decidim/participatory_processes/admin/participatory_process_user_roles/new.html.erb

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(t("participatory_process_user_roles.new.title", scope: "decidim.admin")) %>
 
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("participatory_process_user_roles.new.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

data/app/views/decidim/participatory_processes/admin/participatory_processes/edit.html.erb

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(t("info", scope: "decidim.admin.menu.participatory_processes_submenu")) %>
 <% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("info", scope: "decidim.admin.menu.participatory_processes_submenu") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

data/app/views/decidim/participatory_processes/admin/participatory_processes/index.html.erb

@@ -2,31 +2,6 @@
 <%= admin_tabs(:admin_participatory_processes_menu).render %>
 
 <div class="card" id="processes">
-  <div class="flex justify-end" data-group-filter>
-    <button data-toggle="process_groups" class="button button__sm button__secondary">
-      <%= t("actions.filter.process_groups", scope: "decidim.admin") %>
-      <%= icon "arrow-down-s-line", class: "dropdown-filter-icon" %>
-    </button>
-    <div id="process_groups" class="dropdown-pane" data-position="bottom" data-dropdown data-auto-focus="true">
-      <ul>
-        <%= link_to query_params_with(decidim_participatory_process_group_id_eq: nil) do %>
-          <li><%= t("actions.filter.all_processes", scope: "decidim.admin") %></li>
-        <% end %>
-        <% process_groups_for_select.each do |group_title, group_id| %>
-          <%= link_to query_params_with(decidim_participatory_process_group_id_eq: group_id) do %>
-            <li><%= group_title %></li>
-          <% end %>
-        <% end %>
-      </ul>
-    </div>
-  </div>
-  <% if process_group %>
-    <div>
-      <%= link_to translated_attribute(process_group.title),
-                  edit_participatory_process_group_path(process_group) %>
-    </div>
-  <% end %>
-  <br>
   <%= admin_filter_selector %>
 </div>
 <div class="table-scroll">
@@ -59,6 +34,8 @@
             <% end %>
             <% if allowed_to? :update, :process, process: process %>
               <%= link_to translated_attribute(process.title), edit_participatory_process_path(process) %><br>
+            <% elsif allowed_to? :read, :component, process: process %>
+              <%= link_to translated_attribute(process.title), components_path(process) %><br>
             <% else %>
               <%= translated_attribute(process.title) %>
             <% end %>

data/app/views/decidim/participatory_processes/admin/participatory_processes/new.html.erb

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

data/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb

@@ -10,11 +10,11 @@
   )
 %>
 
-<div class="participatory-space__container">
+<main class="participatory-space__container">
   <% active_content_blocks.each do |content_block| %>
     <% next unless content_block.manifest %>
     <%= cell content_block.manifest.cell, content_block %>
   <% end %>
-</div>
+</main>
 
 <%= append_javascript_pack_tag "decidim_participatory_processes" %>

data/app/views/decidim/participatory_processes/participatory_process_groups/show.js.erb

@@ -11,5 +11,5 @@ $order_by_filters.html('<%= j(cell(
                                 group,
                                 base_relation: participatory_processes
                               ).show).strip.html_safe %>');
-$order_by_filters.foundation();
+window.initFoundation($order_by_filters);
 $loading.hide();

data/app/views/layouts/decidim/admin/_manage_processes.html.erb

@@ -5,32 +5,7 @@
     </span>
     <%= icon "arrow-down-s-line" %>
   <% end %>
-  <div id="processes-dropdown-menu-settings" aria-hidden="true">
-    <ul class="dropdown dropdown__bottom">
-      <% if allowed_to? :read, :process_list %>
-        <li class="dropdown__item">
-          <%= icon "treasure-map-line", class: "fill-gray-2" %>
-          <%= link_to t("menu.participatory_processes", scope: "decidim.admin"),
-                      decidim_admin_participatory_processes.participatory_processes_path,
-                      class: "text-secondary" %>
-        </li>
-      <% end %>
-      <% if allowed_to? :import, :process %>
-        <li class="dropdown__item">
-          <%= icon "upload-line", class: "fill-gray-2" %>
-          <%= link_to t("actions.import_process", scope: "decidim.admin"),
-                      new_import_path,
-                      class: "text-secondary" %>
-        </li>
-      <% end %>
-      <% if allowed_to? :manage, :participatory_process_type %>
-        <li class="dropdown__item">
-          <%= icon "price-tag-3-line", class: "fill-gray-2" %>
-          <%= link_to t("menu.participatory_process_types", scope: "decidim.admin"),
-                      decidim_admin_participatory_processes.participatory_process_types_path,
-                      class: "text-secondary" %>
-        </li>
-      <% end %>
-    </ul>
+  <div id="processes-dropdown-menu-settings" class="process-title-content-dropdown" aria-hidden="true">
+    <%= dropdown_menu(:admin_participatory_processes_manage_menu ).render %>
   </div>
 </div>

data/config/locales/ar.yml

@@ -85,8 +85,6 @@ ar:
         destroy: حذف
         duplicate: مكرر
         edit: تعديل
-        filter:
-          all_processes: عرض جميع العمليات
         import_process: استيراد
         new_process: عملية جديدة
         new_process_group: مجموعة عملية جديدة
@@ -309,7 +307,6 @@ ar:
             select_an_area: اختر منطقة
             select_process_group: حدد مجموعة عملية
             title: معلومات عامة
-            visbility: رؤية
       content_blocks:
         highlighted_processes:
           name: عمليات مميزة