decidim-participatory_processes 0.29.4 → 0.30.0.rc1

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

@@ -0,0 +1,83 @@
+<tr>
+  <td>
+    <% if process.promoted? %>
+      <%= icon_with_tooltip "star-s-fill", t("models.assembly.fields.promoted", scope: "decidim.admin") %>
+    <% 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 %>
+  </td>
+  <td class="table-list__date">
+    <%= l process.created_at, format: :short %>
+  </td>
+  <td class="table-list__state">
+    <% if process.private_space? %>
+      <span><%= t("participatory_processes.index.private", scope: "decidim.admin") %></span>
+    <% else %>
+      <span><%= t("participatory_processes.index.public", scope: "decidim.admin") %></span>
+    <% end %>
+  </td>
+  <td class="table-list__state">
+    <% if process.published? %>
+      <span class="label success !text-sm"><%= t("participatory_processes.index.published", scope: "decidim.admin") %></span>
+    <% else %>
+      <span class="label alert !text-sm"><%= t("participatory_processes.index.unpublished", scope: "decidim.admin") %></span>
+    <% end %>
+  </td>
+  <td class="table-list__actions">
+    <% if view == :deleted %>
+      <% if allowed_to? :restore, :process, trashable_deleted_resource: process %>
+        <%= icon_link_to "refresh-line", restore_participatory_process_path(process), t("actions.restore", scope: "decidim.admin"), method: :patch, class: "action-icon--restore" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+    <% else %>
+      <% if allowed_to? :read, :share_tokens, current_participatory_space: process %>
+        <%= icon_link_to "share-line", decidim_admin_participatory_processes.participatory_process_share_tokens_path(process), t("actions.share_tokens", scope: "decidim.admin"), class: "action-icon--new" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+      <% if allowed_to? :update, :process, process: process %>
+        <%= icon_link_to "pencil-line", edit_participatory_process_path(process), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+
+      <% if allowed_to? :create, :process, process: process %>
+        <%= icon_link_to "download-line", participatory_process_export_path(process), t("actions.export", scope: "decidim.admin"), method: :post, class: "action-icon--export" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+
+      <% if allowed_to? :create, :process, process: process %>
+        <%= icon_link_to "file-copy-line", new_participatory_process_copy_path(process), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+
+      <% if allowed_to? :preview, :process, process: process %>
+        <%= icon_link_to "eye-line", decidim_participatory_processes.participatory_process_path(process), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview", target: "_blank", data: { "external-link": false } %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+
+      <% if allowed_to? :read, :moderation, process: process %>
+        <%= icon_link_to "flag-line", moderations_path(process), t("actions.moderate", scope: "decidim.admin"), class: "action-icon--moderate" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+
+      <% if allowed_to? :soft_delete, :process, trashable_deleted_resource: process %>
+        <% if process.published? %>
+          <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.soft_delete", scope: "decidim.admin") %>
+        <% else %>
+          <%= icon_link_to "delete-bin-line", soft_delete_participatory_process_path(process), t("actions.soft_delete", scope: "decidim.admin"), method: :patch, class: "action-icon--delete", data: { confirm: t("actions.confirm_delete_process", scope: "decidim.admin") } %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </td>
+</tr>

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

@@ -0,0 +1,19 @@
+<thead>
+<tr>
+  <th>
+    <%= sort_link(query, :title, t("models.participatory_process.fields.title", scope: "decidim.admin")) %>
+  </th>
+  <th>
+    <%= sort_link(query, :created_at, t("models.participatory_process.fields.created_at", scope: "decidim.admin"), default_order: :desc) %>
+  </th>
+  <th>
+    <%= sort_link(query, :private_space, t("models.participatory_process.fields.private", scope: "decidim.admin")) %>
+  </th>
+  <th class="table-list__actions">
+    <%= sort_link(query, :published_at, t("models.participatory_process.fields.published", scope: "decidim.admin")) %>
+  </th>
+  <th>
+    <%= t("models.participatory_process.fields.actions", scope: "decidim.admin") %>
+  </th>
+</tr>
+</thead>

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

@@ -4,94 +4,26 @@
 <div class="card" id="processes">
   <%= admin_filter_selector %>
 </div>
+
 <div class="table-scroll">
   <table class="table-list">
-    <thead>
-      <tr>
-        <th>
-          <%= sort_link(query, :title, t("models.participatory_process.fields.title", scope: "decidim.admin")) %>
-        </th>
-        <th>
-          <%= sort_link(query, :created_at, t("models.participatory_process.fields.created_at", scope: "decidim.admin"), default_order: :desc) %>
-        </th>
-        <th>
-          <%= sort_link(query, :private_space, t("models.participatory_process.fields.private", scope: "decidim.admin")) %>
-        </th>
-        <th class="table-list__actions">
-          <%= sort_link(query, :published_at, t("models.participatory_process.fields.published", scope: "decidim.admin")) %>
-        </th>
-        <th>
-          <%= t("models.participatory_process.fields.actions", scope: "decidim.admin") %>
-        </th>
-      </tr>
-    </thead>
+    <%= render partial: "processes_thead" %>
     <tbody>
-      <% @participatory_processes.each do |process| %>
-        <tr>
-          <td>
-            <% if process.promoted? %>
-              <%= icon_with_tooltip "star-s-fill", t("models.assembly.fields.promoted", scope: "decidim.admin") %>
-            <% 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 %>
-          </td>
-          <td class="table-list__date">
-            <%= l process.created_at, format: :short %>
-          </td>
-          <td class="table-list__state">
-            <% if process.private_space? %>
-              <span><%= t("participatory_processes.index.private", scope: "decidim.admin") %></span>
-            <% else %>
-              <span><%= t("participatory_processes.index.public", scope: "decidim.admin") %></span>
-            <% end %>
-          </td>
-          <td class="table-list__state">
-            <% if process.published? %>
-              <span class="label success !text-sm"><%= t("participatory_processes.index.published", scope: "decidim.admin") %></span>
-            <% else %>
-              <span class="label alert !text-sm"><%= t("participatory_processes.index.unpublished", scope: "decidim.admin") %></span>
-            <% end %>
-          </td>
-          <td class="table-list__actions">
-
-            <% if allowed_to? :update, :process, process: process %>
-              <%= icon_link_to "pencil-line", edit_participatory_process_path(process), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>
-            <% else %>
-              <span class="action-space icon"></span>
-            <% end %>
-
-            <% if allowed_to? :create, :process, process: process %>
-              <%= icon_link_to "download-line", participatory_process_export_path(process), t("actions.export", scope: "decidim.admin"), method: :post, class: "action-icon--export" %>
-            <% else %>
-              <span class="action-space icon"></span>
-            <% end %>
-
-            <% if allowed_to? :create, :process, process: process %>
-              <%= icon_link_to "file-copy-line", new_participatory_process_copy_path(process), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
-            <% else %>
-              <span class="action-space icon"></span>
-            <% end %>
-
-            <% if allowed_to? :preview, :process, process: process %>
-              <%= icon_link_to "eye-line", decidim_participatory_processes.participatory_process_path(process), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview", target: "_blank", data: { "external-link": false } %>
-            <% else %>
-              <span class="action-space icon"></span>
-            <% end %>
-
-            <% if allowed_to? :read, :moderation, process: process %>
-              <%= icon_link_to "flag-line", moderations_path(process), t("actions.moderate", scope: "decidim.admin"), class: "action-icon--moderate" %>
-            <% else %>
-              <span class="action-space icon"></span>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
+    <%= render partial: "decidim/participatory_processes/admin/participatory_processes/process_row",
+               collection: @participatory_processes,
+               as: :process,
+               locals: { view: :index } %>
     </tbody>
   </table>
 </div>
+<div class="card mt-4">
+  <%= link_to manage_trash_participatory_processes_path, class: "flex items-center underline text-secondary" do %>
+    <%= icon "delete-bin-2-line", class: "mr-2 fill-current text-secondary", role: "img" %>
+    <%= t("actions.view_deleted_processes", scope: "decidim.admin") %>
+    <span class="ml-2">
+      <%= icon_with_tooltip("information-line", t("tooltips.deleted_processes_info", scope: "decidim.admin")) %>
+    </span>
+  <% end %>
+</div>
+
 <%= decidim_paginate @participatory_processes %>

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

@@ -0,0 +1,20 @@
+<% add_decidim_page_title(t("participatory_processes_deleted", scope: "decidim.admin.titles")) %>
+<div class="item_show__header">
+  <h1 class="item_show__header-title">
+    <%= t "participatory_processes.manage_trash.title", scope: "decidim.admin" %>
+  </h1>
+</div>
+<div class="card" id="processes">
+  <%= admin_filter_selector %>
+</div>
+<div class="table-scroll">
+  <table class="table-list">
+    <%= render partial: "processes_thead" %>
+    <tbody>
+    <%= render partial: "decidim/participatory_processes/admin/participatory_processes/process_row",
+               collection: trashable_deleted_collection,
+               as: :process,
+               locals: { view: :deleted } %>
+    </tbody>
+  </table>
+</div>

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

@@ -1,5 +1,7 @@
 <% add_decidim_page_title(translated_attribute(group.title)) %>
-<% add_decidim_meta_tags(title: t("participatory_process_groups.show.title", scope: "decidim")) %>
+<% add_decidim_meta_tags(
+  title: t("participatory_process_groups.show.title", scope: "decidim"),
+  resource: group) %>
 
 <%
   edit_link(

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

@@ -1,4 +1,6 @@
-<% add_decidim_meta_tags(title: t("participatory_processes.index.title", scope: "decidim")) %>
+<% add_decidim_meta_tags(
+  title: t("participatory_processes.index.title", scope: "decidim"),
+  resource: current_participatory_space) %>
 
 <%
 edit_link(

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

@@ -1,9 +1,9 @@
-<% add_decidim_meta_tags({
-                           title: translated_attribute(current_participatory_space.title),
-                           image_url: current_participatory_space.attached_uploader(:hero_image).url,
-                           description: translated_attribute(current_participatory_space.short_description),
-                           url: participatory_process_url(current_participatory_space)
-                         }) %>
+<% add_decidim_meta_tags(
+  title: translated_attribute(current_participatory_space.title),
+  image_url: resolve_meta_image_url(current_participatory_space),
+  description: translated_attribute(current_participatory_space.short_description),
+  url: participatory_process_url(current_participatory_space),
+  resource: current_participatory_space) %>
 
 <%
   edit_link(

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

@@ -0,0 +1,22 @@
+<% add_decidim_page_title(t(".title")) %>
+<% add_decidim_meta_tags(
+     title: translated_attribute(current_participatory_space.title),
+     resource: current_participatory_space) %>
+<%
+edit_link(
+  decidim_admin_participatory_processes.participatory_space_private_users_path(current_participatory_space.slug),
+  :update,
+  :process,
+  process: current_participatory_space
+)
+%>
+
+<div class="container py-8">
+  <h3 class="h3 decorator mb-8">
+    <%= t("members", scope: "decidim.assemblies.assembly_members.index") %>
+    <span class="label text-md"><%= collection.size %></span>
+  </h3>
+  <div id="assembly_members-grid" class="grid grid-cols-1 md:grid-cols-3 gap-4 md:gap-12">
+    <%= render(collection) %>
+  </div>
+</div>

data/config/assets.rb

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

data/config/locales/ar.yml

@@ -23,7 +23,6 @@ ar:
         promoted: رقية
         published_at: نشرت في
         related_process_ids: العمليات ذات الصلة
-        scopes_enabled: النطاقات المُفعّلَة
         short_description: وصف قصير
         slug: سبيكة العنوان الشبكي
         start_date: تاريخ البدء
@@ -42,8 +41,6 @@ ar:
         short_description: وصف قصير
         start_date: تاريخ البداية
         title: العنوان
-      participatory_process_type:
-        title: عنوان
       participatory_process_user_role:
         email: البريد الإلكتروني
         name: اسم
@@ -99,10 +96,8 @@ ar:
           attachment_collections: المجلدات
           attachment_files: ملفات
           attachments: مرفقات
-          categories: الاقسام
           components: المكونات
           moderations: الإعتدال
-          private_users: المشاركون من القطاع الخاص
           process_admins: مدراء العملية
           steps: المراحل
       models:
@@ -122,10 +117,6 @@ ar:
             start_date: تاريخ البدء
             title: عنوان
           name: مرحلة العملية التشاركية
-        participatory_process_type:
-          fields:
-            created_at: أنشئت في
-            title: عنوان
         participatory_process_user_role:
           fields:
             email: البريد الإلكتروني
@@ -192,11 +183,6 @@ ar:
         update:
           error: حدثت مشكلة أثناء تحديث هذه المرحلة من العملية التشاركية.
           success: تم تحديث المرحلة التشاركية بنجاح.
-      participatory_process_types:
-        edit:
-          update: تحديث
-        new:
-          create: إنشاء
       participatory_process_user_roles:
         create:
           error: حدثت مشكلة أثناء إضافة مشارك لهذه العملية التشاركية.
@@ -309,12 +295,9 @@ ar:
           form:
             announcement_help: سيتم عرض النص الذي تدخله هنا للمستخدم مباشرة أسفل معلومات العملية.
             duration: المدة الزمنية
-            filters: مرشحات
             images: صور
             metadata: البيانات الوصفية
-            other: آخر
             related_processes: العمليات ذات الصلة
-            select_an_area: اختر منطقة
             select_process_group: حدد مجموعة عملية
             title: معلومات عامة
       content_blocks:

data/config/locales/bg.yml

@@ -23,16 +23,12 @@ bg:
         local_area: Район на организацията
         meta_scope: Метаданни сфера
         participatory_process_group_id: Група процеси
-        participatory_process_type_id: Тип на процесите
         participatory_scope: Какво е решено
         participatory_structure: Как е решено
         private_space: Частен процес
         promoted: Промотирано
         published_at: Публикувано на
         related_process_ids: Свързани процеси
-        scope_id: Обхват
-        scope_type_max_depth_id: Дълбочина на филтъра за обхвата
-        scopes_enabled: Обхватите са активирани
         short_description: Кратко описание
         slug: Съкратен URL
         start_date: Начална дата
@@ -61,8 +57,6 @@ bg:
         short_description: Кратко описание
         start_date: Начална дата
         title: Заглавие
-      participatory_process_type:
-        title: Заглавие
       participatory_process_user_role:
         email: Имейл
         name: Име
@@ -101,7 +95,6 @@ bg:
         new_process: Нов процес
         new_process_group: Нова група на процеса
         new_process_step: Нова фаза
-        new_process_type: Нов тип процес
         new_process_user_role: Нов администратор на процес
         preview: Преглед
         publish: Публикувай
@@ -116,18 +109,15 @@ bg:
         participatory_process_groups_submenu:
           info: Информация
           landing_page: Целева страница
-        participatory_process_types: Типове процеси
         participatory_processes: Процеси
         participatory_processes_submenu:
           attachment_collections: Папки
           attachment_files: Файлове
           attachments: Прикачени файлове
-          categories: Категории
           components: Компоненти
           info: Относно този процес
           landing_page: Целева страница
           moderations: Модерации
-          private_users: Частни участници
           process_admins: Администратори на процеси
           steps: Фази
       models:
@@ -149,11 +139,6 @@ bg:
             start_date: Начална дата
             title: Заглавие
           name: Фаза на процес на участие
-        participatory_process_type:
-          fields:
-            created_at: Създадено на
-            title: Заглавие
-          name: Вид на процеса
         participatory_process_user_role:
           fields:
             email: Имейл
@@ -176,7 +161,6 @@ bg:
           title: Дублиране на процеси на участие
       participatory_process_groups:
         destroy:
-          error: Възникна грешка при премахването на групата на процеса на участие.
           success: Групата на процеса на участие беше изтрита успешно.
         edit:
           title: Редактиране на групата на процеса
@@ -236,21 +220,6 @@ bg:
         update:
           error: Възникна проблем при актуализирането на тази фаза от процеса на участие.
           success: Фазата на участие е актуализирана успешно.
-      participatory_process_types:
-        create:
-          error: Възникна проблем при създаването на нов тип процес.
-          success: Типът процес е създаден успешно.
-        destroy:
-          success: Типът процес е изтрит успешно.
-        edit:
-          title: Редактиране на типа процес
-          update: Актуализация
-        new:
-          create: Създаване
-          title: Нов тип процес
-        update:
-          error: Възникна проблем при актуализирането на този тип процес.
-          success: Типът процес е актуализиран успешно.
       participatory_process_user_roles:
         create:
           error: Възникна проблем при добавянето на участник за този процес на участие.
@@ -424,14 +393,9 @@ bg:
           form:
             announcement_help: Текстът, който въведете тук, ще се показва на потребителите под информацията за процеса.
             duration: Продължителност
-            filters: Филтри
             images: Изображения
             metadata: Метаданни
-            other: Друго
             related_processes: Свързани процеси
-            scope_type_max_depth_help: Ограничете дълбочината на филтъра за обхвата; Филтърът ще извежда данни от общото положение до избрания тип обхват.
-            select_an_area: Изберете област
-            select_participatory_process_type: Изберете тип процес
             select_process_group: Изберете група на процеса
             slug_help_html: 'Съкратените URL се използват за генериране на URL адреси, които сочат към този процес. Приема само букви, цифри и тирета и трябва да започва с буква. Пример: %{url}'
             title: Основна информация

data/config/locales/bs-BA.yml

@@ -1,9 +1,5 @@
 ---
 bs:
-  activemodel:
-    attributes:
-      participatory_process:
-        scope_type_max_depth_id: Obim dubine filtera
   decidim:
     admin:
       models:
@@ -25,8 +21,3 @@ bs:
       content_blocks:
         stats:
           name: Statistika
-    participatory_processes:
-      admin:
-        participatory_processes:
-          form:
-            scope_type_max_depth_help: Ograniči obim dubine filtera; Filter će pokazivati od opšteg ka odabranom tipu obima.