decidim-assemblies 0.29.5 → 0.30.0.rc1

data/app/views/decidim/assemblies/admin/assemblies/_assembly_row.html.erb

@@ -0,0 +1,101 @@
+<tr data-assembly-id="<%= assembly.id %>" data-parent-id="<%= assembly.parent_id %>" data-level="<%= assembly.ancestors.count %>">
+  <td class="whitespace-nowrap">
+    <% if parent_assembly_id %>
+      <% [assembly.ancestors.count - 1, 0].max.times do |index| %>
+        <span class="px-3"></span>
+      <% end %>
+      <span class="px-3 text-xl text-secondary opacity-10">|</span>
+    <% end %>
+
+    <% if assembly.promoted? %>
+      <%= icon_with_tooltip "star-s-fill", t("models.assembly.fields.promoted", scope: "decidim.admin") %>
+    <% end %>
+
+    <span class="table-list__title-ellipsis">
+      <% if allowed_to? :update, :assembly, assembly: assembly %>
+        <%= link_to translated_attribute(assembly.title), edit_assembly_path(assembly) %>
+      <% elsif allowed_to? :read, :component, assembly: assembly %>
+        <%= link_to translated_attribute(assembly.title), components_path(assembly) %><br>
+      <% else %>
+        <%= translated_attribute(assembly.title) %>
+      <% end %>
+    </span>
+
+    <% if assembly.children.count.positive? %>
+      <%= link_to url_for(query_params_with(parent_id_eq: assembly.id)), remote: true, data: { arrow_down: true } do %>
+        <%= icon "arrow-down-s-line", class: "w-4 h-4 ml-2" %>
+      <% end %>
+      <%= link_to "#", class: "hidden", data: { arrow_up: true } do %>
+        <%= icon "arrow-up-s-line", class: "w-4 h-4 ml-2" %>
+      <% end %>
+    <% end %>
+  </td>
+  <td class="table-list__date">
+    <%= l(assembly.created_at, format: :short) %>
+  </td>
+  <td class="table-list__state">
+    <% if assembly.private_space? %>
+      <span><%= t("assemblies.index.private", scope: "decidim.admin") %></span>
+    <% else %>
+      <span><%= t("assemblies.index.public", scope: "decidim.admin") %></span>
+    <% end %>
+  </td>
+  <td class="table-list__state">
+    <% if assembly.published? %>
+      <span class="label success !text-sm"><%= t("assemblies.index.published", scope: "decidim.admin") %></span>
+    <% else %>
+      <span class="label alert !text-sm"><%= t("assemblies.index.unpublished", scope: "decidim.admin") %></span>
+    <% end %>
+  </td>
+  <td class="table-list__actions">
+    <% if view == :deleted %>
+      <% if allowed_to? :restore, :assembly, trashable_deleted_resource: assembly %>
+        <%= icon_link_to "refresh-line", restore_assembly_path(assembly), 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: assembly %>
+        <%= icon_link_to "share-line", decidim_admin_assemblies.assembly_share_tokens_path(assembly), t("actions.share_tokens", scope: "decidim.admin"), class: "action-icon--new" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+      <% if allowed_to? :update, :assembly, assembly: assembly %>
+        <%= icon_link_to "pencil-line", edit_assembly_path(assembly), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+      <% if allowed_to? :copy, :assembly, assembly: assembly, assembly: parent_assembly %>
+        <%= icon_link_to "file-copy-line", new_assembly_copy_path(assembly), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+
+      <% if allowed_to? :export, :assembly, assembly: assembly %>
+        <%= icon_link_to "download-line", assembly_export_path(assembly), t("actions.export", scope: "decidim.admin"), method: :post, class: "action-icon--export" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+
+      <% if allowed_to? :preview, :assembly, assembly: assembly %>
+        <%= icon_link_to "eye-line", decidim_assemblies.assembly_path(assembly), 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, assembly: assembly %>
+        <%= icon_link_to "flag-line", moderations_path(assembly), t("actions.moderate", scope: "decidim.admin"), class: "action-icon--moderate" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+
+      <% if allowed_to? :soft_delete, :assembly, trashable_deleted_resource: assembly %>
+        <% if assembly.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_assembly_path(assembly), t("actions.soft_delete", scope: "decidim.admin"), method: :patch, class: "action-icon--delete", data: { confirm: t("actions.confirm_delete_assembly", scope: "decidim.admin") } %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </td>
+</tr>

data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb

@@ -113,34 +113,6 @@
     </div>
   </div>
 
-  <div class="card" data-component="accordion" id="accordion-filters">
-    <div class="card-divider">
-      <button class="card-divider-button" data-open="true" data-controls="panel-filters" type="button">
-        <%= icon "arrow-right-s-line" %>
-        <h2 class="card-title" id="filters">
-          <%= t("filters", scope: "decidim.assemblies.admin.assemblies.form") %>
-        </h2>
-      </button>
-    </div>
-
-    <div id="panel-filters" class="card-section">
-      <div class="row column">
-        <%= form.check_box :scopes_enabled %>
-      </div>
-
-      <div class="row column">
-        <%= scopes_select_field form, :scope_id, root: nil %>
-      </div>
-
-      <div class="row column">
-        <%= form.areas_select :area_id,
-                              areas_for_select(current_organization),
-                              selected: current_assembly.try(:decidim_area_id),
-                              include_blank: t(".select_an_area") %>
-      </div>
-    </div>
-  </div>
-
   <div class="card" data-component="accordion" id="accordion-metadata">
     <div class="card-divider">
       <button class="card-divider-button" data-open="true" data-controls="panel-metadata" type="button">
@@ -181,6 +153,33 @@
     </div>
   </div>
 
+  <div class="card" data-component="accordion" id="accordion-taxonomies">
+    <div class="card-divider">
+      <button class="card-divider-button" data-open="true" data-controls="panel-taxonomies" type="button">
+        <%= icon "arrow-right-s-line" %>
+        <h2 class="card-title" id="taxonomies">
+          <%= t("taxonomies", scope: "decidim.assemblies.admin.assemblies.form") %>
+        </h2>
+      </button>
+    </div>
+    <div id="panel-taxonomies" class="card-section">
+      <% if @form.taxonomy_filters.blank? %>
+        <div class="row column">
+          <p class="text-gray mr-2 mt-4">
+            <%= t("no_taxonomy_filters_found", scope: "decidim.assemblies.admin.assemblies.form") %>
+            <%= link_to(t("define_taxonomy_filters", scope: "decidim.assemblies.admin.assemblies.form"), decidim_admin.taxonomies_path, class: "button button__text-secondary") %>
+          </p>
+      </div>
+      <% else %>
+        <% @form.taxonomy_filters.each do |filter| %>
+          <div class="row column">
+            <%= filter_taxonomy_items_select_field form, :taxonomies, filter %>
+          </div>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+
   <div class="card" data-component="accordion" id="accordion-visibility">
     <div class="card-divider">
       <button class="card-divider-button" data-open="true" data-controls="panel-visibility" type="button">
@@ -197,12 +196,7 @@
       <% else %>
         <div class="row column">
           <%= form.select :parent_id,
-                          options_from_collection_for_select(
-                            parent_assemblies_for_select,
-                            :id,
-                            :translated_title,
-                            selected: current_assembly.try(:parent_id)
-                          ),
+                          parent_assemblies_options,
                           include_blank: t(".select_parent_assembly") %>
         </div>
       <% end %>
@@ -213,6 +207,7 @@
 
       <div class="row column" id="private_space">
         <%= form.check_box :private_space %>
+        <p class="help-text"><%= t(".private_notice") %></p>
       </div>
 
       <div class="row column" id="is_transparent">
@@ -243,13 +238,6 @@
         <%= form.translated :text_field, :created_by_other, aria: { label: :created_by_other } %>
       </div>
 
-      <div class="row column">
-        <%= form.select :decidim_assemblies_type_id,
-                        @form.assembly_types_for_select,
-                        { include_blank: t(".select_an_assembly_type") },
-                        { multiple: false } %>
-      </div>
-
       <div class="row column">
         <% if @form.processes_for_select %>
           <%= form.select :participatory_processes_ids,

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

@@ -18,101 +18,27 @@
 
   <div class="table-scroll">
     <table class="table-list">
-      <thead>
-        <tr>
-          <th>
-            <%= sort_link(query, :title, t("models.assembly.fields.title", scope: "decidim.admin")) %>
-          </th>
-          <th>
-            <%= sort_link(query, :created_at, t("models.assembly.fields.created_at", scope: "decidim.admin"), default_order: :desc) %>
-          </th>
-          <th>
-            <%= sort_link(query, :private_space, t("models.assembly.fields.private", scope: "decidim.admin")) %>
-          </th>
-          <th class="table-list__actions">
-            <%= sort_link(query, :published_at, t("models.assembly.fields.published", scope: "decidim.admin")) %>
-          </th>
-          <th>
-            <%= t("models.assembly.fields.actions", scope: "decidim.admin") %>
-          </th>
-        </tr>
-      </thead>
+      <%= render partial: "assemblies_thead" %>
       <tbody>
-        <% @assemblies.each do |assembly| %>
-          <% next unless allowed_to? :list, :assembly, assembly: assembly %>
-          <tr>
-            <td>
-              <% if assembly.promoted? %>
-                <%= icon_with_tooltip "star-s-fill", t("models.assembly.fields.promoted", scope: "decidim.admin") %>
-              <% end %>
-
-              <% if allowed_to? :update, :assembly, assembly: assembly %>
-                <%= link_to translated_attribute(assembly.title), edit_assembly_path(assembly) %>
-              <% elsif allowed_to? :read, :component, assembly: assembly %>
-                <%= link_to translated_attribute(assembly.title), components_path(assembly) %><br>
-              <% else %>
-                <%= translated_attribute(assembly.title) %>
-              <% end %>
-            </td>
-            <td class="table-list__date">
-              <%= l(assembly.created_at, format: :short) %>
-            </td>
-            <td class="table-list__state">
-              <% if assembly.private_space? %>
-                <span><%= t("assemblies.index.private", scope: "decidim.admin") %></span>
-              <% else %>
-                <span><%= t("assemblies.index.public", scope: "decidim.admin") %></span>
-              <% end %>
-            </td>
-            <td class="table-list__state">
-              <% if assembly.published? %>
-                <span class="label success !text-sm"><%= t("assemblies.index.published", scope: "decidim.admin") %></span>
-              <% else %>
-                <span class="label alert !text-sm"><%= t("assemblies.index.unpublished", scope: "decidim.admin") %></span>
-              <% end %>
-            </td>
-            <td class="table-list__actions">
-              <% if allowed_to? :update, :assembly, assembly: assembly %>
-                 <%= icon_link_to "pencil-line", edit_assembly_path(assembly), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>
-               <% else %>
-                 <span class="action-space icon"></span>
-               <% end %>
-               <% if assembly.children.count.positive? || allowed_to?(:read, :assembly, assembly:) %>
-                 <%= icon_link_to "government-line",
-                                  url_for(query_params_with(parent_id_eq: assembly.id)),
-                                  t("decidim.admin.titles.assemblies"),
-                                  class: "action-icon--dial #{"highlighted" if assembly.children.count.positive?}" %>
-               <% else %>
-                 <span class="action-space icon"></span>
-               <% end %>
-               <% if allowed_to? :copy, :assembly, assembly: assembly, assembly: parent_assembly %>
-                <%= icon_link_to "file-copy-line", new_assembly_copy_path(assembly), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
-
-              <% if allowed_to? :export, :assembly, assembly: assembly %>
-                <%= icon_link_to "download-line", assembly_export_path(assembly), t("actions.export", scope: "decidim.admin"), method: :post, class: "action-icon--export" %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
-
-              <% if allowed_to? :preview, :assembly, assembly: assembly %>
-                <%= icon_link_to "eye-line", decidim_assemblies.assembly_path(assembly), 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, assembly: assembly %>
-                <%= icon_link_to "flag-line", moderations_path(assembly), t("actions.moderate", scope: "decidim.admin"), class: "action-icon--moderate" %>
-              <% else %>
-                <span class="action-space icon"></span>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
+        <%= render partial: "decidim/assemblies/admin/assemblies/assembly_row",
+                   collection: @assemblies,
+                   as: :assembly,
+                   locals: { view: :index } %>
       </tbody>
     </table>
   </div>
+
+  <div class="mt-4">
+    <%= link_to manage_trash_assemblies_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_assemblies", scope: "decidim.admin") %>
+      <span class="ml-2">
+      <%= icon_with_tooltip("information-line", t("tooltips.deleted_assemblies_info", scope: "decidim.admin")) %>
+    </span>
+    <% end %>
+  </div>
+
   <%= decidim_paginate @assemblies %>
 </div>
+
+<%= append_javascript_pack_tag "decidim_assemblies_admin_list" %>

data/app/views/decidim/assemblies/admin/assemblies/index.js.erb

@@ -0,0 +1,10 @@
+$('[data-assembly-id="<%= parent_assembly_id %>"]').after(
+  '<%= j(render partial: "decidim/assemblies/admin/assemblies/assembly_row",
+                collection: @assemblies,
+                as: :assembly,
+                locals: { view: :index }).strip.html_safe %>'
+);
+
+var component = new window.Decidim.AdminAssembliesListComponent();
+
+component.run();

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

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

data/app/views/decidim/assemblies/admin/assembly_copies/_form.html.erb

@@ -14,16 +14,9 @@
         </div>
         <div class="card-section">
           <div class="row">
-            <div class="columns">
-              <%= form.check_box :copy_categories %>
-            </div>
-
             <div class="columns">
               <%= form.check_box :copy_components %>
             </div>
-            <div class="columns">
-              <%= form.check_box :copy_landing_page_blocks %>
-            </div>
           </div>
         </div>
       </div>

data/app/views/decidim/assemblies/admin/assembly_imports/_form.html.erb

@@ -19,9 +19,6 @@
           </div>
           <div class="card-section">
             <div class="row">
-              <div class="columns">
-                <%= form.check_box :import_categories %>
-              </div>
               <div class="columns">
                 <%= form.check_box :import_attachments %>
               </div>

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

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

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

@@ -1,9 +1,8 @@
-<% 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: assembly_url(current_participatory_space)
-                         }) %>
+<% add_decidim_meta_tags(
+  title: translated_attribute(current_participatory_space.title),
+  description: translated_attribute(current_participatory_space.short_description),
+  url: assembly_url(current_participatory_space),
+  resource: current_participatory_space) %>
 
 <%
 edit_link(

data/app/views/decidim/assemblies/{assembly_members → participatory_space_private_users}/index.html.erb

@@ -1,9 +1,10 @@
 <% add_decidim_page_title(t("assembly_members.index.title", scope: "decidim")) %>
-<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
-
+<% add_decidim_meta_tags(
+     title: translated_attribute(current_participatory_space.title),
+     resource: current_participatory_space) %>
 <%
 edit_link(
-  decidim_admin_assemblies.assembly_members_path(current_participatory_space.slug),
+  decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space.slug),
   :update,
   :assembly,
   assembly: current_participatory_space
@@ -12,9 +13,9 @@ edit_link(
 
 <%= cell "decidim/content_blocks/participatory_space_hero", nil, resource: current_participatory_space %>
 <div class="container py-8">
-  <h3 class="h3 decorator mb-8">
+  <h3 class="h3 decorator mb-10">
     <%= t("members", scope: "decidim.assemblies.assembly_members.index") %>
-    <span class="label text-md"><%= collection.size %></span>
+    <span class="label text-md ml-2"><%= 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) %>

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_assemblies: "#{base_path}/app/packs/entrypoints/decidim_assemblies.js",
-  decidim_assemblies_admin: "#{base_path}/app/packs/entrypoints/decidim_assemblies_admin.js"
+  decidim_assemblies_admin: "#{base_path}/app/packs/entrypoints/decidim_assemblies_admin.js",
+  decidim_assemblies_admin_list: "#{base_path}/app/packs/entrypoints/decidim_assemblies_admin_list.js"
 )

data/config/locales/ar.yml

@@ -2,8 +2,6 @@
 ar:
   activemodel:
     attributes:
-      assemblies_type:
-        title: العنوان
       assembly:
         announcement: إعلان
         area_id: المنطقة
@@ -20,7 +18,6 @@ ar:
         created_by_other: التي أنشأتها الآخرون
         creation_date: تاريخ الإنشاء
         decidim_area_id: المنطقة
-        decidim_assemblies_type_id: نوع التجمع
         decidim_scope_id: النطاق
         description: الوصف
         developer_group: مجموعة المروجين
@@ -36,7 +33,6 @@ ar:
         import_components: استيراد المكونات
         included_at: المدرجة في
         instagram: انستجرام
-        internal_organisation: التنظيم الداخلي
         is_transparent: شفافة
         local_area: منطقة التنظيم
         meta_scope: نطاق البيانات الوصفية
@@ -48,8 +44,6 @@ ar:
         promoted: سلط الضوء
         published_at: نشرت في
         purpose_of_action: الغرض من العمل
-        scope_id: النطاق
-        scopes_enabled: النطاقات المُفعّلَة
         short_description: وصف قصير
         slug: سبيكة العنوان الشبكي
         special_features: مميزات خاصة
@@ -102,11 +96,9 @@ ar:
       actions:
         import_assembly: استيراد
         new_assembly: جمعية جديدة
-        new_assembly_type: نوع جديد للجمعية
       assemblies:
         create:
           error: حدثت مشكلة أثناء إنشاء جمعية جديدة.
-          success: تم إنشاء الجمعية بنجاح.
         edit:
           update: تحديث
         index:
@@ -119,21 +111,15 @@ ar:
         update:
           error: حدثت مشكلة أثناء تحديث هذه الجمعية.
           success: تم تحديث الجمعية بنجاح.
-      assemblies_types:
+      assemblies_copies:
         create:
-          error: حدثت مشكلة أثناء إنشاء جمعية جديدة.
-          success: تم إنشاء نوع الجمعية بنجاح.
-        destroy:
-          success: تم حذف نوع الجمعية بنجاح.
-        new:
-          create: إنشاء
-          title: نوع جديد للجمعية
-        update:
-          error: حدثت مشكلة أثناء تحديث نوع هذه الجمعية.
-          success: تم تحديث نوع الجمعية بنجاح.
+          error: حدثت مشكلة في تكرار هذا التجميع.
+          success: الجمعية مكررة بنجاح.
       assembly_copies:
         new:
           copy: نسخ
+          select: حدد البيانات التي ترغب في تكرارها
+          title: نسخ الجمعية
       assembly_imports:
         create:
           error: حدثت مشكلة أثناء استيراد هذه الجمعية.
@@ -142,21 +128,6 @@ ar:
           import: استيراد
           select: اختر البيانات التي ترغب في استيرادها
           title: استيراد الجمعية
-      assembly_members:
-        create:
-          error: حدثت مشكلة أثناء إضافة عضو لهذا التجميع.
-          success: تم إنشاء العضو بنجاح لهذا التجميع.
-        destroy:
-          success: تم حذف العضو بنجاح لهذا التجميع.
-        edit:
-          update: تحديث
-        index:
-          assembly_members_title: أعضاء الجمعية
-        new:
-          create: إنشاء
-        update:
-          error: حدثت مشكلة أثناء تحديث العضو لهذا التجميع.
-          success: تم تحديث العضو بنجاح لهذا التجميع.
       assembly_publications:
         create:
           error: حدثت مشكلة في نشر هذا التجميع.
@@ -179,26 +150,16 @@ ar:
         update:
           error: حدثت مشكلة أثناء تحديث مشرفٍ على هذه الجمعية.
           success: تم تحديث المشرف على هذه الجمعية بنجاح.
-      filters:
-        decidim_assemblies_type_id_eq:
-          label: نوع التجمع
       menu:
         assemblies: الجمعيات
         assemblies_submenu:
           assembly_admins: مدراء الجمعية
-          assembly_members: الأعضاء
           attachment_collections: المجلدات
           attachment_files: الملفات
           attachments: المرفقات
-          categories: الفئات
           components: المكونات
           moderations: الإعتدال
-        assemblies_types: أنواع التجمّعات
       models:
-        assemblies_types:
-          fields:
-            created_at: تاريخ الإنشاء
-            title: العنوان
         assembly:
           fields:
             actions: الإجراءات
@@ -209,11 +170,6 @@ ar:
             title: العنوان
           name: الجمعية
         assembly_member:
-          fields:
-            ceased_date: تاريخ التوقف
-            designation_date: تاريخ التعيين
-            full_name: الاسم
-            position: الموقع
           name: عضو
           positions:
             other: آخر
@@ -266,29 +222,18 @@ ar:
             announcement_help: سيظهر النص الذي أدخلته هنا للمستخدم مباشرة تحت معلومات الجمعية.
             duration: المدة الزمنية
             duration_help: إذا كانت مدة هذه الجمعية محدودة ، فحدد تاريخ الانتهاء. خلاف ذلك ، سوف يظهر على أنه غير مسمى.
-            filters: مرشحات
             images: الصور
             included_at_help: حدد التاريخ الذي تمت فيه إضافة هذه الجمعية إلى المنصة. ليس بالضرورة أن يكون هو نفسه تاريخ الإنشاء.
             metadata: البيانات الوصفية
             other: آخر
             select_a_created_by: حدد تم إنشاؤها بواسطة
-            select_an_area: اختر منطقة
-            select_an_assembly_type: حدد نوع الجمعية
             select_parent_assembly: حدد الجمعية الأصلية
             social_handlers: التواصل الاجتماعي
             title: معلومات عامة
-        assemblies_types:
-          form:
-            title: العنوان
         assembly_members:
           form:
-            existing_user: المشارك الحالي
             explanation: 'إرشادات للصورة:'
-            non_user: غير مشارك
             non_user_avatar_help: يجب أن تحصل على موافقة الأشخاص قبل نشرهم كأعضاء.
-            select_a_position: اختر المنصب
-            select_user: اختيار مشارك
-            user_type: نوع المشارك
         content_blocks:
           highlighted_assemblies:
             max_results: أقصى قدر من العناصر لإظهارها
@@ -304,14 +249,6 @@ ar:
       assembly_members:
         index:
           members: الأعضاء
-      assembly_types:
-        commission: اللجنة
-        consultative_advisory: استشاري / الاستشارية
-        executive: تنفيذية
-        government: الحكومية
-        others: أخرى
-        participatory: التشاركية
-        working_group: فريق العمل
       content_blocks:
         children_assemblies:
           name: جمعيات
@@ -340,13 +277,10 @@ ar:
           member_of:
             member_of: عضو في
       show:
-        assembly_type: نوع التجمع
         duration: المدة الزمنية
         private_space: هذه جمعية خاصة
         social_networks_title: زيارة التجمع على
     assembly_members:
-      assembly_member:
-        designated_on: المعينة على
       index:
         title: الأعضاء
     events: