decidim-assemblies 0.30.2 → 0.31.0.rc1

data/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js

@@ -0,0 +1,66 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  connect() {
+    const privateSpace = this.element.querySelector("#private_space");
+
+    if (privateSpace) {
+      privateSpace.addEventListener("change", this.toggleDisabledHiddenFields);
+    }
+    this.toggleDisabledHiddenFields();
+
+    this.assignBehavior("assembly_type");
+    this.assignBehavior("created_by");
+  }
+
+  assignBehavior(field) {
+    const assemblyCreatedBy = this.element.querySelector(`#assembly_${field}`);
+    const assemblyCreatedByOther = this.element.querySelector(`#${field}_other`);
+    this.attachVisibility(assemblyCreatedBy, assemblyCreatedByOther);
+  }
+
+  attachVisibility(type, other) {
+    if (type && other) {
+      type.addEventListener("change", (ev) => {
+        this.toggleDependsOnSelect(ev.target, other);
+      });
+      this.toggleDependsOnSelect(type, other);
+    }
+  }
+
+  toggleDependsOnSelect(target, showDiv) {
+    if (!target || !showDiv) {
+      return;
+    }
+    const value = target.value;
+
+    showDiv.style.display = "none";
+    if (value === "others") {
+      showDiv.style.display = "block";
+    }
+  }
+
+  toggleDisabledHiddenFields() {
+    const privateSpace = document.getElementById("private_space");
+    const isTransparent = document.getElementById("is_transparent");
+    const specialFeatures = document.getElementById("special_features");
+
+    const enabledPrivateSpace = privateSpace?.querySelector("input[type='checkbox']")?.checked;
+    const isTransparentCheckbox = isTransparent?.querySelector("input[type='checkbox']");
+
+    if (isTransparentCheckbox) {
+      isTransparentCheckbox.disabled = (enabledPrivateSpace === false);
+
+      if (isTransparentCheckbox.checked) {
+        isTransparentCheckbox.checked = false;
+      }
+    }
+
+    if (specialFeatures) {
+      specialFeatures.style.display = enabledPrivateSpace
+        ? "block"
+        : "none";
+    }
+  }
+
+}

data/app/permissions/decidim/assemblies/permissions.rb

@@ -33,7 +33,7 @@ module Decidim
         user_can_read_current_assembly?
         user_can_create_assembly?
         user_can_export_assembly?
-        user_can_copy_assembly?
+        user_can_duplicate_assembly?
         user_can_upload_images_in_assembly?
 
         # org admins and space admins can do everything in the admin section
@@ -45,7 +45,7 @@ module Decidim
 
         moderator_action?
         collaborator_action?
-        valuator_action?
+        evaluator_action?
         assembly_admin_action?
 
         permission_action
@@ -172,8 +172,8 @@ module Decidim
         toggle_allow(user.admin? || admin_assembly?)
       end
 
-      def user_can_copy_assembly?
-        return unless permission_action.action == :copy &&
+      def user_can_duplicate_assembly?
+        return unless permission_action.action == :duplicate &&
                       permission_action.subject == :assembly
 
         toggle_allow(user.admin? || admin_assembly?)
@@ -227,9 +227,9 @@ module Decidim
         allow! if permission_action.action == :read || permission_action.action == :preview
       end
 
-      # Valuators can only read the assembly components
-      def valuator_action?
-        return unless can_manage_assembly?(role: :valuator)
+      # Evaluators can only read the assembly components
+      def evaluator_action?
+        return unless can_manage_assembly?(role: :evaluator)
 
         allow! if permission_action.action == :read && permission_action.subject == :component
         allow! if permission_action.action == :export && permission_action.subject == :component_data

data/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb

@@ -18,7 +18,6 @@ module Decidim
         def diff_fields_mapping
           {
             description: :i18n,
-            hashtag: :string,
             decidim_area_id: :area,
             decidim_scope_id: :scope,
             developer_group: :i18n,

data/app/presenters/decidim/assemblies/assembly_stats_presenter.rb

@@ -8,9 +8,7 @@ module Decidim
 
       private
 
-      def participatory_space = __getobj__.fetch(:assembly)
-
-      def participatory_space_sym = :assemblies
+      def scope_entity = __getobj__.fetch(:assembly)
     end
   end
 end

data/app/queries/decidim/assemblies/assemblies_stats_followers_count.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This class counts all Followers of a assembly
+    class AssembliesStatsFollowersCount < Decidim::StatsFollowersCount
+      def self.for(participatory_space)
+        return 0 unless participatory_space.is_a?(Decidim::Assemblies)
+
+        new(participatory_space).query
+      end
+    end
+  end
+end

data/app/queries/decidim/assemblies/assemblies_stats_participants_count.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This class counts unique Participants on a assembly
+    class AssembliesStatsParticipantsCount < Decidim::StatsParticipantsCount
+      def self.for(participatory_space)
+        return 0 unless participatory_space.is_a?(Decidim::Assemblies)
+
+        new(participatory_space).query
+      end
+    end
+  end
+end

data/app/serializers/decidim/assemblies/assembly_importer.rb

@@ -26,7 +26,6 @@ module Decidim
             organization: @organization,
             title:,
             slug:,
-            hashtag: attributes["hashtag"],
             subtitle: attributes["subtitle"],
             short_description: attributes["short_description"],
             description: attributes["description"],

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

@@ -1,5 +1,5 @@
 <tr data-assembly-id="<%= assembly.id %>" data-parent-id="<%= assembly.parent_id %>" data-level="<%= assembly.ancestors.count %>">
-  <td class="whitespace-nowrap">
+  <td class="whitespace-nowrap" data-label="<%= t("models.assembly.fields.title", scope: "decidim.admin") %>">
     <% if parent_assembly_id %>
       <% [assembly.ancestors.count - 1, 0].max.times do |index| %>
         <span class="px-3"></span>
@@ -30,72 +30,141 @@
       <% end %>
     <% end %>
   </td>
-  <td class="table-list__date">
+  <td class="table-list__date" data-label="<%= t("models.assembly.fields.created_at", scope: "decidim.admin") %>">
     <%= l(assembly.created_at, format: :short) %>
   </td>
-  <td class="table-list__state">
+  <td class="table-list__state" data-label="<%= t("models.assembly.fields.private", scope: "decidim.admin") %>">
     <% 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">
+  <td class="table-list__state" data-label="<%= t("models.assembly.fields.published", scope: "decidim.admin") %>">
     <% 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_token, 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 %>
+  <td class="table-list__actions" data-label="<%= t("models.assembly.fields.actions", scope: "decidim.admin") %>">
+    <button type="button" data-controller="dropdown" data-target="actions-assembly-<%= assembly.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: translated_attribute(assembly.title)) %>">
+      <%= icon "more-fill", class: "text-secondary" %>
+    </button>
 
-      <% 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 %>
+    <div class="inline-block relative">
+      <ul id="actions-assembly-<%= assembly.id %>" class="dropdown dropdown__action" aria-hidden="true">
+        <% if view == :deleted %>
+          <% if allowed_to? :restore, :assembly, trashable_deleted_resource: assembly %>
+            <li class="dropdown__item">
+              <%= link_to restore_assembly_path(assembly), class: "dropdown__button", method: :patch do %>
+                <%= icon "refresh-line" %>
+                <%= t("actions.restore", scope: "decidim.admin") %>
+              <% end %>
+            </li>
+          <% end %>
+        <% else %>
+          <% if allowed_to? :update, :assembly, assembly: assembly %>
+            <li class="dropdown__item">
+              <%= link_to edit_assembly_path(assembly), class: "dropdown__button" do %>
+                <%= icon "pencil-line" %>
+                <%= t("actions.edit", scope: "decidim.admin") %>
+              <% end %>
+            </li>
+          <% 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 %>
+          <hr>
 
-      <% 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? :duplicate, :assembly, assembly: assembly %>
+            <li class="dropdown__item">
+              <%= link_to new_assembly_duplicate_path(assembly), class: "dropdown__button" do %>
+                <%= icon "file-copy-line" %>
+                <%= t("actions.duplicate", scope: "decidim.admin") %>
+              <% end %>
+            </li>
+          <% 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") } %>
+          <% if allowed_to? :export, :assembly, assembly: assembly %>
+            <li class="dropdown__item">
+              <%= link_to assembly_export_path(assembly), class: "dropdown__button", method: :post do %>
+                <%= icon "download-line" %>
+                <%= t("actions.export", scope: "decidim.admin") %>
+              <% end %>
+            </li>
+          <% end %>
+
+          <hr>
+
+          <% if allowed_to? :preview, :assembly, assembly: assembly %>
+            <li class="dropdown__item">
+              <%= link_to decidim_assemblies.assembly_path(assembly), class: "dropdown__button", target: "_blank", data: { "external-link": false } do %>
+                <%= icon "eye-line" %>
+                <%= t("actions.preview", scope: "decidim.admin") %>
+              <% end %>
+            </li>
+          <% end %>
+
+          <% if allowed_to? :read, :share_token, current_participatory_space: assembly %>
+            <li class="dropdown__item">
+              <%= link_to decidim_admin_assemblies.assembly_share_tokens_path(assembly), class: "dropdown__button" do %>
+                <%= icon "share-line" %>
+                <%= t("actions.share_tokens", scope: "decidim.admin") %>
+              <% end %>
+            </li>
+          <% end %>
+
+          <% if allowed_to? :publish, :assembly, assembly: assembly %>
+            <li class="dropdown__item">
+              <% if assembly.published? %>
+                <%= link_to assembly_publish_path(assembly), method: :delete, class: "dropdown__button" do %>
+                  <%= icon "close-circle-line" %>
+                  <%= t("actions.unpublish", scope: "decidim.admin") %>
+                <% end %>
+              <% else %>
+                <%= link_to assembly_publish_path(assembly), method: :post, class: "dropdown__button" do %>
+                  <%= icon "check-line" %>
+                  <%= t("actions.publish", scope: "decidim.admin") %>
+                <% end %>
+              <% end %>
+            </li>
+          <% end %>
+
+          <hr>
+
+          <% if allowed_to? :read, :moderation, assembly: assembly %>
+            <li class="dropdown__item">
+              <%= link_to moderations_path(assembly), class: "dropdown__button" do %>
+                <%= icon "flag-line" %>
+                <%= t("actions.moderate", scope: "decidim.admin") %>
+              <% end %>
+            </li>
+
+            <hr>
+          <% end %>
+
+          <% if allowed_to? :soft_delete, :assembly, trashable_deleted_resource: assembly %>
+            <% if assembly.published? %>
+              <li class="dropdown__item">
+                <div class="dropdown__button-disabled">
+                  <%= with_tooltip t("tooltips.deleted_assemblies_info", scope: "decidim.admin") do %>
+                    <%= icon "delete-bin-line", class: "text-gray" %>
+                    <span>
+                      <%= t("actions.soft_delete", scope: "decidim.admin") %>
+                    </span>
+                  <% end %>
+                </div>
+              </li>
+            <% else %>
+              <li class="dropdown__item">
+                <%= link_to soft_delete_assembly_path(assembly), class: "dropdown__button", method: :patch, data: { confirm: t("actions.confirm_delete_assembly", scope: "decidim.admin") } do %>
+                  <%= icon "delete-bin-line" %>
+                  <%= t("actions.soft_delete", scope: "decidim.admin") %>
+                <% end %>
+              </li>
+            <% end %>
+          <% end %>
         <% end %>
-      <% end %>
-    <% end %>
+      </ul>
+    </div>
   </td>
 </tr>

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

@@ -1,5 +1,5 @@
 <div class="form__wrapper">
-  <div class="card" data-component="accordion" id="accordion-title">
+  <div class="card" data-controller="accordion" id="accordion-title">
     <div class="card-divider">
       <button class="card-divider-button" data-open="true" data-controls="panel-title" type="button">
         <%= icon "arrow-right-s-line" %>
@@ -23,13 +23,9 @@
       </div>
 
     <div class="row">
-      <div class="columns slug">
+      <div class="columns" data-controller="slug">
         <%= form.text_field :slug, help_text: t(".slug_help_html", url: decidim_form_slug_url(:assemblies, form.object.slug)) %>
       </div>
-
-        <div class="columns">
-          <%= form.text_field :hashtag %>
-        </div>
       </div>
 
       <div class="row column">
@@ -57,7 +53,7 @@
       </div>
     </div>
   </div>
-  <div class="card" data-component="accordion" id="accordion-duration">
+  <div class="card" data-controller="accordion" id="accordion-duration">
     <div class="card-divider">
       <button class="card-divider-button" data-open="true" data-controls="panel-duration" type="button">
         <%= icon "arrow-right-s-line" %>
@@ -90,7 +86,7 @@
     </div>
   </div>
 
-  <div class="card" data-component="accordion" id="accordion-images">
+  <div class="card" data-controller="accordion" id="accordion-images">
     <div class="card-divider">
       <button class="card-divider-button" data-open="true" data-controls="panel-images" type="button">
         <%= icon "arrow-right-s-line" %>
@@ -113,7 +109,7 @@
     </div>
   </div>
 
-  <div class="card" data-component="accordion" id="accordion-metadata">
+  <div class="card" data-controller="accordion" id="accordion-metadata">
     <div class="card-divider">
       <button class="card-divider-button" data-open="true" data-controls="panel-metadata" type="button">
         <%= icon "arrow-right-s-line" %>
@@ -153,7 +149,7 @@
     </div>
   </div>
 
-  <div class="card" data-component="accordion" id="accordion-taxonomies">
+  <div class="card" data-controller="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" %>
@@ -180,7 +176,7 @@
     </div>
   </div>
 
-  <div class="card" data-component="accordion" id="accordion-visibility">
+  <div class="card" data-controller="accordion" id="accordion-visibility">
     <div class="card-divider">
       <button class="card-divider-button" data-open="true" data-controls="panel-visibility" type="button">
         <%= icon "arrow-right-s-line" %>
@@ -216,7 +212,7 @@
     </div>
   </div>
 
-  <div class="card" data-component="accordion" id="accordion-other">
+  <div class="card" data-controller="accordion" id="accordion-other">
     <div class="card-divider">
       <button class="card-divider-button" data-open="true" data-controls="panel-other" type="button">
         <%= icon "arrow-right-s-line" %>

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

@@ -7,19 +7,11 @@
 
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
-    <%= decidim_form_for(@form, html: { class: "form form-defaults edit_assembly assembly_form_admin" }) do |f| %>
+    <%= decidim_form_for(@form, data: { controller: "assembly-admin" }, html: { class: "form form-defaults edit_assembly assembly_form_admin" }) do |f| %>
       <%= render partial: "form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t("assemblies.edit.update", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
-
-          <% if allowed_to? :publish, :assembly, assembly: current_assembly %>
-            <% if current_assembly.published? %>
-              <%= link_to t("actions.unpublish", scope: "decidim.admin"), assembly_publish_path(current_assembly), method: :delete, class: "button button__sm button__secondary" %>
-            <% else %>
-              <%= link_to t("actions.publish", scope: "decidim.admin"), assembly_publish_path(current_assembly), method: :post, class: "button button__sm button__secondary" %>
-            <% end %>
-          <% end %>
         </div>
       </div>
     <% end %>

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

@@ -16,7 +16,7 @@
 
   <%= admin_filter_selector %>
 
-  <div class="table-scroll">
+  <div class="table-stacked">
     <table class="table-list">
       <%= render partial: "assemblies_thead" %>
       <tbody>
@@ -30,7 +30,7 @@
 
   <% if allowed_to? :read, :assembly, trashable_deleted_resource: @assemblies %>
     <div class="mt-4">
-      <%= link_to manage_trash_assemblies_path, class: "flex items-center underline text-secondary" do %>
+      <%= link_to manage_trash_assemblies_path, class: "flex items-center  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">

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

@@ -5,6 +5,10 @@ $('[data-assembly-id="<%= parent_assembly_id %>"]').after(
                 locals: { view: :index }).strip.html_safe %>'
 );
 
+// Dispatch the `ajax:loaded` event with the newly inserted element
+const insertedElement = $('[data-assembly-id="<%= parent_assembly_id %>"]').next()[0];
+document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: insertedElement }));
+
 var component = new window.Decidim.AdminAssembliesListComponent();
 
 component.run();

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

@@ -1,4 +1,5 @@
 <% 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" %>
@@ -7,7 +8,7 @@
 <div class="card" id="assemblies">
   <%= admin_filter_selector %>
 </div>
-<div class="table-scroll">
+<div class="table-stacked">
   <table class="table-list">
     <%= render partial: "assemblies_thead" %>
     <tbody>

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

@@ -8,7 +8,7 @@
 
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
-    <%= decidim_form_for(@form, html: { class: "form-defaults form new_assembly assembly_form_admin" }) do |f| %>
+    <%= decidim_form_for(@form, data: { controller: "assembly-admin" }, html: { class: "form-defaults form new_assembly assembly_form_admin" }) do |f| %>
       <%= render partial: "form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">

data/app/views/decidim/assemblies/admin/{assembly_copies → assembly_duplicates}/_form.html.erb

@@ -5,20 +5,20 @@
       <div class="row column">
         <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
       </div>
-      <div class="row column slug">
+      <div class="row column" data-controller="slug">
         <%= form.text_field :slug, help_text: t(".slug_help_html", url: decidim_form_slug_url(:assemblies, form.object.slug)) %>
       </div>
       <div class="card">
         <div class="card-divider">
-          <legend><%= t("assembly_copies.new.select", scope: "decidim.admin") %></legend>
+          <legend><%= t("assembly_duplicates.new.select", scope: "decidim.admin") %></legend>
         </div>
         <div class="card-section">
           <div class="row">
             <div class="columns">
-              <%= form.check_box :copy_components %>
+              <%= form.check_box :duplicate_components %>
             </div>
             <div class="columns">
-              <%= form.check_box :copy_landing_page_blocks %>
+              <%= form.check_box :duplicate_landing_page_blocks %>
             </div>
           </div>
         </div>

data/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb

@@ -0,0 +1,19 @@
+<% add_decidim_page_title(t("assembly_duplicates.new.title", scope: "decidim.admin")) %>
+<div class="item_show__header">
+  <h1 class="item_show__header-title">
+    <%= t("assembly_duplicates.new.title", scope: "decidim.admin") %>
+  </h1>
+</div>
+
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: assembly_duplicates_path(current_assembly), method: :post, html: { class: "form form-defaults duplicate_assembly" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t("assembly_duplicates.new.duplicate", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>