decidim-assemblies 0.29.3 → 0.30.0.rc1

data/app/packs/src/decidim/assemblies/admin/assemblies_list.js

@@ -0,0 +1,72 @@
+/* eslint-disable require-jsdoc */
+
+class AdminAssembliesListComponent {
+  run() {
+    this.rebindArrows();
+  }
+
+  rebindArrows() {
+    this.unbindArrows();
+    this.bindArrows();
+  }
+
+  bindArrows() {
+    document.querySelectorAll("[data-arrow-up]").forEach((element) => {
+      element.addEventListener("click", this._onClickUpArrow);
+    });
+    document.querySelectorAll("[data-arrow-down]").forEach((element) => {
+      element.addEventListener("click", this._onClickDownArrow);
+    });
+  }
+
+  unbindArrows() {
+    document.querySelectorAll("[data-arrow-up]").forEach((element) => {
+      element.removeEventListener("click", this._onClickUpArrow);
+    });
+    document.querySelectorAll("[data-arrow-down]").forEach((element) => {
+      element.removeEventListener("click", this._onClickDownArrow);
+    });
+  }
+
+  _onClickDownArrow(event) {
+    event.preventDefault();
+
+    const target = event.currentTarget;
+    const assembly = target.closest("[data-assembly-id]");
+    const upArrow = assembly.querySelector("[data-arrow-up]");
+
+    target.classList.toggle("hidden");
+    upArrow.classList.toggle("hidden");
+  }
+
+  _onClickUpArrow(event) {
+    event.preventDefault();
+
+    const target = event.currentTarget;
+    const assembly = target.closest("[data-assembly-id]");
+    const parentLevel = assembly.dataset.level;
+    const downArrow = assembly.querySelector("[data-arrow-down]");
+
+    target.classList.toggle("hidden");
+    downArrow.classList.toggle("hidden");
+
+    // Get all following tr elements
+    let nextElement = assembly.nextElementSibling;
+    while (nextElement) {
+      const currentLevel = nextElement.dataset.level;
+      const nextSibling = nextElement.nextElementSibling;
+
+      if (currentLevel > parentLevel) {
+        nextElement.remove();
+      } else {
+        break;
+      }
+      nextElement = nextSibling;
+    }
+  }
+}
+
+window.Decidim.AdminAssembliesListComponent = AdminAssembliesListComponent;
+const component = new AdminAssembliesListComponent();
+
+component.run();

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

@@ -3,8 +3,6 @@
 module Decidim
   module Assemblies
     class Permissions < Decidim::DefaultPermissions
-      include Decidim::UserRoleChecker
-
       def permissions
         user_can_enter_space_area?
 
@@ -36,11 +34,9 @@ module Decidim
         user_can_create_assembly?
         user_can_export_assembly?
         user_can_copy_assembly?
-        user_can_upload_images_in_assembly?
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
-        assemblies_type_action?
 
         return permission_action unless assembly
 
@@ -63,21 +59,6 @@ module Decidim
         toggle_allow(user.admin? || can_manage_assembly?(role: :admin) || can_manage_assembly?(role: :collaborator))
       end
 
-      def assemblies_type_action?
-        return unless [:assembly_type, :assemblies_type].include? permission_action.subject
-        return disallow! unless user.admin?
-
-        assembly_type = context.fetch(:assembly_type, nil)
-        case permission_action.action
-        when :destroy
-          assemblies_is_empty = assembly_type && assembly_type.assemblies.empty?
-
-          toggle_allow(assemblies_is_empty)
-        else
-          allow!
-        end
-      end
-
       # It is an admin user if it is an organization admin or is a space admin
       # for the current `assembly`.
       def admin_user?
@@ -129,6 +110,7 @@ module Decidim
         return disallow! unless can_view_private_space?
         return allow! if user&.admin?
         return allow! if assembly.published?
+        return allow! if user_can_preview_space?
 
         toggle_allow(can_manage_assembly?)
       end
@@ -261,14 +243,13 @@ module Decidim
         is_allowed = [
           :attachment,
           :attachment_collection,
-          :category,
           :component,
           :component_data,
           :moderation,
           :assembly,
           :assembly_user_role,
-          :assembly_member,
           :export_space,
+          :share_tokens,
           :import
         ].include?(permission_action.subject)
         allow! if is_allowed
@@ -280,19 +261,24 @@ module Decidim
         is_allowed = [
           :attachment,
           :attachment_collection,
-          :category,
           :component,
           :component_data,
           :moderation,
           :assembly,
           :assembly_user_role,
-          :assembly_member,
           :export_space,
+          :share_tokens,
           :import
         ].include?(permission_action.subject)
         allow! if is_allowed
       end
 
+      def user_can_preview_space?
+        context[:share_token].present? && Decidim::ShareToken.use!(token_for: assembly, token: context[:share_token], user:)
+      rescue ActiveRecord::RecordNotFound, StandardError
+        nil
+      end
+
       # Checks if the permission_action is to read the admin assemblies list or
       # not.
       def read_assembly_list_permission_action?
@@ -317,11 +303,6 @@ module Decidim
           Decidim::Assembly.where(id: assemblies + child_assemblies)
         end
       end
-
-      # Checks if the assigned admins can upload images on the editor
-      def user_can_upload_images_in_assembly?
-        allow! if user&.admin_terms_accepted? && user_has_any_role?(user, assembly, broad_check: true) && (permission_action.subject == :editor_image)
-      end
     end
   end
 end

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

@@ -62,7 +62,7 @@ module Decidim
 
         def action_string
           case action
-          when "create", "publish", "unpublish", "update", "duplicate", "export", "import"
+          when "create", "publish", "unpublish", "update", "duplicate", "export", "import", "soft_delete", "restore"
             "decidim.admin_log.assembly.#{action}"
           else
             super

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

@@ -37,12 +37,6 @@ module Decidim
         formatted_date(date)
       end
 
-      def assembly_type
-        return if assembly.assembly_type.blank?
-
-        translated_attribute(assembly.assembly_type.title)
-      end
-
       def formatted_date(date)
         return if date.blank?
 

data/app/queries/decidim/assemblies/metrics/assemblies_metric_manage.rb

@@ -14,12 +14,12 @@ module Decidim
           return @query if @query
 
           @query = Decidim::Assembly.where(organization: @organization)
-          @query = @query.where("decidim_assemblies.published_at <= ?", end_time)
+          @query = @query.where(decidim_assemblies: { published_at: ..end_time })
           @query
         end
 
         def quantity
-          @quantity ||= query.where("decidim_assemblies.published_at >= ?", start_time).count
+          @quantity ||= query.where(decidim_assemblies: { published_at: start_time.. }).count
         end
       end
     end

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

@@ -36,14 +36,12 @@ module Decidim
             target: attributes["target"],
             participatory_scope: attributes["participatory_scope"],
             participatory_structure: attributes["participatory_structure"],
-            scopes_enabled: attributes["scopes_enabled"],
             private_space: attributes["private_space"],
             reference: attributes["reference"],
             purpose_of_action: attributes["purpose_of_action"],
             composition: attributes["composition"],
             duration: attributes["duration"],
             creation_date: attributes["creation_date"],
-            decidim_scope_id: attributes["decidim_scope_id"],
             closing_date_reason: attributes["closing_date_reason"],
             included_at: attributes["included_at"],
             closing_date: attributes["closing_date"],
@@ -68,39 +66,6 @@ module Decidim
         end
       end
 
-      def import_assemblies_type(type_id)
-        return if Decidim::AssembliesType.find_by(id: type_id).nil?
-
-        @imported_assembly.decidim_assemblies_type_id = type_id
-      end
-
-      def import_categories(categories)
-        return if categories.nil?
-
-        categories.map do |category_attributes|
-          category = Decidim.traceability.create!(
-            Category,
-            @user,
-            name: category_attributes["name"],
-            description: category_attributes["description"],
-            parent_id: category_attributes["parent_id"],
-            participatory_space: @imported_assembly
-          )
-          next if category_attributes["subcategories"].nil?
-
-          category_attributes["subcategories"].map do |subcategory_attributes|
-            Decidim.traceability.create!(
-              Category,
-              @user,
-              name: subcategory_attributes["name"],
-              description: subcategory_attributes["description"],
-              parent_id: category.id,
-              participatory_space: @imported_assembly
-            )
-          end
-        end
-      end
-
       def import_folders_and_attachments(attachments)
         return if attachments["files"].nil?
 

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

@@ -3,146 +3,22 @@
 module Decidim
   module Assemblies
     # This class serializes an Assembly so it can be exported to CSV, JSON or other formats.
-    class AssemblySerializer < Decidim::Exporters::Serializer
-      include Decidim::ApplicationHelper
-      include Decidim::ResourceHelper
-      include Decidim::TranslationsHelper
-
-      # Public: Initializes the serializer with an Assembly instance.
-      def initialize(assembly)
-        @assembly = assembly
-      end
-
+    class AssemblySerializer < Decidim::Assemblies::OpenDataAssemblySerializer
       # Public: Exports a hash with the serialized data for this assembly.
       def serialize
-        {
-          id: assembly.id,
-          slug: assembly.slug,
-          hashtag: assembly.hashtag,
-          decidim_organization_id: assembly.decidim_organization_id,
-          title: assembly.title,
-          subtitle: assembly.subtitle,
-          weight: assembly.weight,
-          short_description: assembly.short_description,
-          description: assembly.description,
-          remote_hero_image_url: Decidim::Assemblies::AssemblyPresenter.new(assembly).hero_image_url,
-          remote_banner_image_url: Decidim::Assemblies::AssemblyPresenter.new(assembly).banner_image_url,
-          promoted: assembly.promoted,
-          developer_group: assembly.developer_group,
-          meta_scope: assembly.meta_scope,
-          local_area: assembly.local_area,
-          target: assembly.target,
-          decidim_scope_id: assembly.decidim_scope_id,
-          paticipatory_scope: assembly.participatory_scope, # intentionally misspelled
-          participatory_structure: assembly.participatory_structure,
-          scopes_enabled: assembly.scopes_enabled,
-          private_space: assembly.private_space,
-          reference: assembly.reference,
-          purpose_of_action: assembly.purpose_of_action,
-          composition: assembly.composition,
-          duration: assembly.duration,
-          participatory_scope: assembly.participatory_scope,
-          included_at: assembly.included_at,
-          closing_date: assembly.closing_date,
-          created_by: assembly.created_by,
-          creation_date: assembly.creation_date,
-          closing_date_reason: assembly.closing_date_reason,
-          internal_organisation: assembly.internal_organisation,
-          is_transparent: assembly.is_transparent,
-          special_features: assembly.special_features,
-          twitter_handler: assembly.twitter_handler,
-          instagram_handler: assembly.instagram_handler,
-          facebook_handler: assembly.facebook_handler,
-          youtube_handler: assembly.youtube_handler,
-          github_handler: assembly.github_handler,
-          created_by_other: assembly.created_by_other,
-          decidim_assemblies_type_id: assembly.decidim_assemblies_type_id,
-          area: {
-            id: assembly.area.try(:id),
-            name: assembly.area.try(:name) || empty_translatable
-          },
-          scope: {
-            id: assembly.scope.try(:id),
-            name: assembly.scope.try(:name) || empty_translatable
-          },
-
-          assembly_categories: serialize_categories,
-          attachments: {
-            attachment_collections: serialize_attachment_collections,
-            files: serialize_attachments
-          },
-          components: serialize_components,
-          announcement: assembly.announcement
-        }
-      end
-
-      private
-
-      attr_reader :assembly
-      alias resource assembly
-
-      def serialize_categories
-        return unless assembly.categories.first_class.any?
-
-        assembly.categories.first_class.map do |category|
-          {
-            id: category.try(:id),
-            name: category.try(:name),
-            description: category.try(:description),
-            parent_id: category.try(:parent_id),
-            subcategories: serialize_subcategories(category.subcategories)
-          }
-        end
-      end
-
-      def serialize_subcategories(subcategories)
-        return unless subcategories.any?
-
-        subcategories.map do |subcategory|
+        super.merge(
           {
-            id: subcategory.try(:id),
-            name: subcategory.try(:name),
-            description: subcategory.try(:description),
-            parent_id: subcategory.try(:parent_id)
-          }
-        end
-      end
-
-      def serialize_attachment_collections
-        return unless assembly.attachment_collections.any?
-
-        assembly.attachment_collections.map do |collection|
-          {
-            id: collection.try(:id),
-            name: collection.try(:name),
-            weight: collection.try(:weight),
-            description: collection.try(:description)
-          }
-        end
-      end
-
-      def serialize_attachments
-        return unless assembly.attachments.any?
-
-        assembly.attachments.map do |attachment|
-          {
-            id: attachment.try(:id),
-            title: attachment.try(:title),
-            weight: attachment.try(:weight),
-            description: attachment.try(:description),
-            attachment_collection: {
-              name: attachment.attachment_collection.try(:name),
-              weight: attachment.attachment_collection.try(:weight),
-              description: attachment.attachment_collection.try(:description)
+            categories: serialize_categories,
+            taxonomies:,
+            attachments: {
+              attachment_collections: serialize_attachment_collections,
+              files: serialize_attachments
             },
-            remote_file_url: Decidim::AttachmentPresenter.new(attachment).attachment_file_url
+            private_space: resource.private_space,
+            weight: resource.weight,
+            components: serialize_components
           }
-        end
-      end
-
-      def serialize_components
-        serializer = Decidim::Exporters::ParticipatorySpaceComponentsSerializer.new(@assembly)
-        serializer.run
+        )
       end
     end
   end

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This class serializes an Assembly so it can be exported to CSV for the Open Data feature.
+    class OpenDataAssemblySerializer < Decidim::Exporters::ParticipatorySpaceSerializer
+      # Public: Exports a hash with the serialized data for this assembly.
+      #
+      def serialize
+        super.merge(
+          {
+            url: EngineRouter.main_proxy(resource).assembly_url(resource),
+            subtitle: resource.subtitle,
+            remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter.new(resource).hero_image_url,
+            remote_banner_image_url: Decidim::Assemblies::AssemblyPresenter.new(resource).banner_image_url,
+            announcement: resource.announcement,
+            developer_group: resource.developer_group,
+            local_area: resource.local_area,
+            meta_scope: resource.meta_scope,
+            participatory_scope: resource.participatory_scope,
+            purpose_of_action: resource.purpose_of_action,
+            composition: resource.composition,
+            duration: resource.duration,
+            participatory_structure: resource.participatory_structure,
+            target: resource.target,
+            decidim_scope_id: resource.decidim_scope_id,
+            area: {
+              id: resource.area.try(:id),
+              name: resource.area.try(:name) || empty_translatable
+            },
+            scope: {
+              id: resource.scope.try(:id),
+              name: resource.scope.try(:name) || empty_translatable
+            },
+            scopes_enabled: resource.scopes_enabled,
+            included_at: resource.included_at,
+            closing_date: resource.closing_date,
+            created_by: resource.created_by,
+            creation_date: resource.creation_date,
+            closing_date_reason: resource.closing_date_reason,
+            internal_organisation: resource.internal_organisation,
+            is_transparent: resource.is_transparent,
+            special_features: resource.special_features,
+            twitter_handler: resource.twitter_handler,
+            instagram_handler: resource.instagram_handler,
+            facebook_handler: resource.facebook_handler,
+            youtube_handler: resource.youtube_handler,
+            github_handler: resource.github_handler,
+            created_by_other: resource.created_by_other,
+            assembly_type: {
+              id: resource.assembly_type.try(:id),
+              title: resource.assembly_type.try(:title) || empty_translatable
+            }
+          }
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+<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>

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>