decidim-admin 0.29.1 → 0.30.0.rc1

data/app/packs/stylesheets/decidim/admin/_legacy_foundation.scss

@@ -388,6 +388,19 @@ li.opens-left > .is-dropdown-submenu {
   color: var(--secondary);
 }
 
+.dropdown-pane.dropdown-pane--buttons {
+  li {
+    padding: 0;
+  }
+
+  li button {
+    width: 100%;
+    height: 100%;
+    text-align: left;
+    padding: 1rem;
+  }
+}
+
 .dropdown-pane li:hover {
   color: #fff;
   background-color: var(--secondary);

data/app/packs/stylesheets/decidim/admin/_moderations.scss

@@ -29,6 +29,14 @@
     list-style: none;
     margin: 0;
 
+    li a {
+      @apply flex items-center;
+
+      svg {
+        @apply ml-1;
+      }
+    }
+
     .icon {
       @apply ml-2;
     }

data/app/packs/stylesheets/decidim/admin/_select_picker.scss

@@ -0,0 +1,20 @@
+@import "tom-select/dist/scss/tom-select";
+
+/* overwrite tom-select defaults */
+.ts {
+  &-control {
+    @apply border-gray text-md min-h-[40px];
+
+    input {
+      @apply font-normal text-black text-md;
+    }
+  }
+
+  &-dropdown {
+    @apply text-md text-gray-2 font-normal;
+
+    .active {
+      @apply text-white bg-secondary;
+    }
+  }
+}

data/app/packs/stylesheets/decidim/admin/_table-list.scss

@@ -1,6 +1,10 @@
 .table-scroll {
   @apply overflow-x-auto;
 
+  &.half-vh {
+    @apply max-h-[50vh];
+  }
+
   table {
     border-collapse: unset;
 
@@ -108,6 +112,20 @@
   .icon-active {
     @apply bg-[#5dc560] inline-block w-3 h-3 align-middle mr-2 rounded-[50%];
   }
+
+  .draggable-table {
+    &.dragging {
+      @apply border-dashed border-y-2 border-gray;
+    }
+
+    .dragging-handle {
+      @apply cursor-ns-resize align-top p-3;
+
+      .dragger {
+        @apply text-2xl;
+      }
+    }
+  }
 }
 
 .table-list__actions {
@@ -153,3 +171,7 @@
     @apply inline-block;
   }
 }
+
+.table-list__title-ellipsis {
+  @apply whitespace-nowrap overflow-hidden text-ellipsis max-w-[200px] sm:max-w-sm md:max-w-md lg:max-w-lg xl:max-w-2xl inline-block align-middle;
+}

data/app/packs/stylesheets/decidim/admin/_taxonomies.scss

@@ -0,0 +1,74 @@
+.spinner-container {
+  &::before {
+    @apply absolute -mt-2 -ml-4 top-1/2 left-1/2;
+  }
+}
+
+.draggable-taxonomy {
+  &.change-page {
+    @apply bg-gray-3 italic;
+  }
+
+  .dragger {
+    @apply text-2xl;
+  }
+
+  td {
+    @apply align-top cursor-ns-resize;
+
+    &.js-drag-handle .dragger {
+      @apply mt-1;
+    }
+  }
+}
+
+ul.taxonomy {
+  @apply flex;
+
+  li {
+    @apply flex-none text-center w-20 mt-2 mb-2;
+
+    &:first-child {
+      @apply flex-initial text-left flex-grow;
+    }
+
+    &:nth-child(2),
+    &:last-child {
+      @apply w-36;
+    }
+  }
+
+  .taxonomy-list__actions {
+    span {
+      @apply ml-1;
+    }
+
+    svg {
+      @apply inline-block fill-secondary w-5 h-5;
+    }
+
+    .action-space {
+      @apply w-5 h-5;
+    }
+  }
+}
+
+[data-dialog]#item-form {
+  @apply bottom-0 sm:top-[5.5rem] top-[8.55rem];
+
+  [data-dialog-container] > :last-child {
+    grid-column: span 1 / span 1;
+  }
+}
+
+#item-form-content {
+  @apply p-6 rounded-r-none py-0;
+
+  h1 {
+    @apply mt-6 mx-0;
+  }
+
+  .row {
+    @apply px-0;
+  }
+}

data/app/packs/stylesheets/decidim/admin/application.scss

@@ -24,12 +24,14 @@
 @import "stylesheets/decidim/admin/_logs.scss";
 @import "stylesheets/decidim/admin/_filters.scss";
 @import "stylesheets/decidim/admin/_table-list.scss";
+@import "stylesheets/decidim/admin/_taxonomies.scss";
 @import "stylesheets/decidim/admin/_dropdown.scss";
 @import "stylesheets/decidim/admin/_item_show.scss";
 @import "stylesheets/decidim/admin/_item_edit.scss";
 @import "stylesheets/decidim/admin/_tabs.scss";
 @import "stylesheets/decidim/admin/_component-show.scss";
 @import "stylesheets/decidim/admin/_moderations.scss";
+@import "stylesheets/decidim/admin/_select_picker.scss";
 @import "stylesheets/decidim/admin/_show_email.scss";
 @import "stylesheets/decidim/admin/_bulk_actions.scss";
 @import "stylesheets/decidim/admin/_data_picker.scss";
@@ -38,3 +40,4 @@
 @import "stylesheets/decidim/admin/_datepicker.scss";
 @import "stylesheets/decidim/admin/_minimap.scss";
 @import "stylesheets/decidim/admin/_proposal_status.scss";
+@import "stylesheets/decidim/_tribute.scss";

data/app/permissions/decidim/admin/permissions.rb

@@ -41,7 +41,6 @@ module Decidim
           allow! if user_action?
           allow! if admin_user_action?
 
-          allow! if permission_action.subject == :category
           allow! if permission_action.subject == :component
           allow! if permission_action.subject == :attachment
           allow! if permission_action.subject == :editor_image
@@ -59,6 +58,22 @@ module Decidim
           allow! if permission_action.subject == :help_sections
           allow! if permission_action.subject == :share_token
           allow! if permission_action.subject == :reminder
+
+          if permission_action.action.in? [:manage_trash, :restore, :soft_delete]
+            if permission_action.action == :soft_delete
+              toggle_allow(trashable_deleted_resource.respond_to?(:deleted?) && !trashable_deleted_resource.deleted?)
+            elsif permission_action.action == :restore
+              toggle_allow(trashable_deleted_resource&.deleted?)
+            else
+              allow!
+            end
+          end
+
+          if permission_action.subject == :taxonomy
+            permission_action.action == :destroy ? allow_destroy_taxonomy? : allow!
+          end
+          allow! if permission_action.subject == :taxonomy_filter
+          allow! if permission_action.subject == :taxonomy_item
         end
 
         permission_action
@@ -66,6 +81,10 @@ module Decidim
 
       private
 
+      def trashable_deleted_resource
+        context.fetch(:trashable_deleted_resource, nil)
+      end
+
       def user_manager?
         user && !user.admin? && user.role?("user_manager")
       end
@@ -253,6 +272,18 @@ module Decidim
       def available_authorization_handlers?
         user.organization.available_authorization_handlers.any?
       end
+
+      def allow_destroy_taxonomy?
+        return unless permission_action.action == :destroy
+
+        taxonomy = context.fetch(:taxonomy, nil)
+
+        toggle_allow(taxonomy&.removable?)
+      end
+
+      def component
+        context.fetch(:component, nil)
+      end
     end
   end
 end

data/app/queries/decidim/admin/newsletter_recipients.rb

@@ -20,47 +20,74 @@ module Decidim
       end
 
       def query
-        recipients = Decidim::User.where(organization: @form.current_organization)
-                                  .where.not(newsletter_notifications_at: nil)
-                                  .where.not(email: nil)
-                                  .where.not(confirmed_at: nil)
-                                  .not_deleted
+        recipients = recipients_base_query
 
-        recipients = recipients.interested_in_scopes(@form.scope_ids) if @form.scope_ids.present?
+        return recipients if @form.send_to_all_users
+        return verified_users if @form.send_to_verified_users
 
-        followers = recipients.where(id: user_id_of_followers) if @form.send_to_followers
+        if filters_present?
+          filtered_recipients = apply_filters(recipients)
+          return recipients.none if filtered_recipients.empty?
 
-        participants = recipients.where(id: participant_ids) if @form.send_to_participants
-
-        recipients = participants if @form.send_to_participants
-        recipients = followers if @form.send_to_followers
-        recipients = (followers + participants).uniq if @form.send_to_followers && @form.send_to_participants
+          return filtered_recipients
+        end
 
         recipients
       end
 
       private
 
+      def recipients_base_query
+        Decidim::User.available
+                     .where(organization: @form.current_organization)
+                     .where.not(newsletter_notifications_at: nil)
+                     .where.not(email: nil)
+                     .confirmed
+      end
+
+      def filters_present?
+        @form.send_to_followers || @form.send_to_participants || @form.send_to_private_members
+      end
+
+      def apply_filters(recipients)
+        filters = [
+          user_id_of_followers,
+          participant_ids,
+          private_member_ids
+        ].compact.flatten.uniq
+
+        filters.empty? ? recipients.none : recipients.where(id: filters)
+      end
+
       # Return the ids of the ParticipatorySpace selected
       # in form, grouped by type
       # This will be used to take followers and
       # participants of each ParticipatorySpace
       def spaces
-        return if @form.participatory_space_types.blank?
+        return [] if @form.participatory_space_types.blank?
 
         @spaces ||= @form.participatory_space_types.map do |type|
           next if type.ids.blank?
 
+          ids = type.ids
+
           object_class = Decidim.participatory_space_registry.find(type.manifest_name).model_class_name.constantize
 
-          if type.ids.include?("all")
-            object_class.where(organization: @organization)
-          else
-            object_class.where(id: type.ids.compact_blank)
-          end
+          ids.include?("all") ? object_class.where(organization: @form.organization) : object_class.where(id: ids.compact_blank)
         end.flatten.compact
       end
 
+      def verified_users
+        users = recipients_base_query
+
+        verified_users = Decidim::Authorization.select(:decidim_user_id)
+                                               .where(decidim_user_id: users.select(:id))
+                                               .where.not(granted_at: nil)
+                                               .where(name: @form.verification_types)
+                                               .distinct
+        users.where(id: verified_users)
+      end
+
       # Return the ids of Users that are following
       # the spaces selected in form
       def user_id_of_followers
@@ -70,7 +97,7 @@ module Decidim
         Decidim::Follow.user_follower_ids_for_participatory_spaces(spaces)
       end
 
-      # Return the ids of Users that have participate
+      # Return the ids of Users that have participated in
       # the spaces selected in form
       def participant_ids
         return if spaces.blank?
@@ -91,6 +118,19 @@ module Decidim
 
         participant_ids.flatten.compact.uniq
       end
+
+      def private_spaces
+        return [] if spaces.blank?
+
+        spaces.select { |space| space.try(:private_space?) }
+      end
+
+      def private_member_ids
+        return unless @form.send_to_private_members
+        return [] if private_spaces.blank?
+
+        Decidim::ParticipatorySpacePrivateUser.private_user_ids_for_participatory_spaces(private_spaces)
+      end
     end
   end
 end

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

@@ -8,6 +8,9 @@
       <% end %>
     </h1>
   </div>
+
+  <div class="callout warning"><%= t("areas.deprecated", scope: "decidim.admin") %></div>
+
   <% if @areas.any? %>
     <div class="table-scroll">
       <table class="table-list">

data/app/views/decidim/admin/block_user/bulk_new.html.erb

@@ -0,0 +1,45 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="item_show__header">
+  <h1 class="item_show__header-title">
+    <%= t(".title") %>
+  </h1>
+</div>
+
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: bulk_create_moderated_users_path, method: :post, html: { class: "form-defaults form import_participatory_process" }) do |f| %>
+      <div class="form__wrapper">
+        <div class="card pt-4">
+          <div class="card-section">
+            <div class="row column">
+              <%= t(".description") %>
+            </div>
+
+            <% if @form.hide %>
+              <%= cell("decidim/announcement", t(".already_reported_html"), callout_class: "alert" ) %>
+            <% end %>
+
+            <% if Decidim.module_installed?(:templates) %>
+              <%= render "decidim/templates/admin/block_user_templates/template_chooser", form: f %>
+            <% end %>
+
+            <div class="row column">
+
+              <% @form.user_ids.each do |id| %>
+                <%= hidden_field_tag "user_ids[]", id %>
+              <% end %>
+              <%= f.hidden_field :hide %>
+              <%= f.text_area :justification, required: true, label: t(".justification") %>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".action"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/admin/components/_actions.html.erb

@@ -1,44 +1,61 @@
-<% if component.manifest.admin_engine %>
-  <%= icon_link_to "pencil-line", manage_component_path(component), t("actions.manage", scope: "decidim.admin"), class: "action-icon--manage" %>
+<% if view == :deleted %>
+  <% if allowed_to? :restore, :component, trashable_deleted_resource: component %>
+    <%= icon_link_to "refresh-line", url_for(action: :restore, id: component, controller: "components"), t("decidim.admin.actions.restore"), method: :patch, class: "action-icon--restore" %>
+  <% end %>
 <% else %>
-  <span class="action-space icon"></span>
-<% end %>
+  <% if component.manifest.admin_engine %>
+    <%= icon_link_to "pencil-line", manage_component_path(component), t("actions.manage", scope: "decidim.admin"), class: "action-icon--manage" %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
 
-<% if allowed_to? :share, :component, component: component %>
-  <%= icon_link_to "share-line", url_for(action: :share, id: component, controller: "components"), t("actions.share", scope: "decidim.admin"), target: :blank, class: "action-icon--share" %>
-<% else %>
-  <span class="action-space icon"></span>
-<% end %>
-<% if allowed_to? :update, :component, component: component %>
-  <%= icon_link_to "settings-4-line", url_for(action: :edit, id: component, controller: "components"), t("actions.configure", scope: "decidim.admin"), class: "action-icon--configure" %>
-<% else %>
-  <span class="action-space icon"></span>
-<% end %>
+  <% if component.manifest.admin_engine && allowed_to?(:share, :component, component: component) %>
+    <%= icon_link_to "share-line", component_share_tokens_path(component_id: component), t("actions.share_tokens", scope: "decidim.admin"), class: "action-icon--share" %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
 
-<% if allowed_to?(:update, :component, component: component) %>
-  <% if component.published? %>
-    <%= icon_link_to "close-circle-line", url_for(action: :unpublish, id: component, controller: "components"), t("actions.unpublish", scope: "decidim.admin"), class: "action-icon--unpublish", method: :put %>
+  <% if allowed_to? :update, :component, component: component %>
+    <%= icon_link_to "settings-4-line", url_for(action: :edit, id: component, controller: "components"), t("actions.configure", scope: "decidim.admin"), class: "action-icon--configure" %>
   <% else %>
-    <%= icon_link_to "check-line", url_for(action: :publish, id: component, controller: "components"), t("actions.publish", scope: "decidim.admin"), class: "action-icon--publish", method: :put %>
+    <span class="action-space icon"></span>
   <% end %>
-<% else %>
-  <span class="action-space icon"></span>
-<% end %>
 
-<%= icon_link_to "eye-line", main_component_path(component), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
+  <% if allowed_to?(:update, :component, component: component) %>
+    <% if component.published? %>
+      <% if component.visible? %>
+        <%= icon_link_to "eye-close", url_for(action: :hide, id: component, controller: "components"), t("actions.menu_hidden", scope: "decidim.admin"), class: "action-icon--unpublish", method: :put %>
+      <% else %>
+        <%= icon_link_to "close-circle-line", url_for(action: :unpublish, id: component, controller: "components"), t("actions.unpublish", scope: "decidim.admin"), class: "action-icon--menu-hidden", method: :put %>
+      <% end %>
+    <% else %>
+      <%= icon_link_to "check-line", url_for(action: :publish, id: component, controller: "components"), t("actions.publish", scope: "decidim.admin"), class: "action-icon--publish", method: :put %>
+    <% end %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
 
-<% if allowed_to? :update, :component, component: component %>
-  <% if component.manifest.actions.empty? %>
-    <%= icon "key-2-line", class: "action-icon action-icon--disabled" %>
+  <%= icon_link_to "eye-line", main_component_path(component), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
+
+  <% if allowed_to? :update, :component, component: component %>
+    <% if component.manifest.actions.empty? %>
+      <%= icon "key-2-line", class: "action-icon action-icon--disabled" %>
+    <% else %>
+      <%= icon_link_to "key-2-line", url_for(action: :edit, component_id: component, controller: "component_permissions"), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
+    <% end %>
   <% else %>
-    <%= icon_link_to "key-2-line", url_for(action: :edit, component_id: component, controller: "component_permissions"), t("actions.permissions", scope: "decidim.admin"), class: "action-icon--permissions" %>
+    <span class="action-space icon"></span>
   <% end %>
-<% else %>
-  <span class="action-space icon"></span>
-<% end %>
 
-<% if allowed_to? :destroy, :component, component: component %>
-  <%= icon_link_to "delete-bin-line", url_for(action: :destroy, id: component, controller: "components"), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete %>
-<% else %>
-  <span class="action-space icon"></span>
+  <% if allowed_to?(:soft_delete, :component, trashable_deleted_resource: component) %>
+    <% resources_count = component.primary_stat || 0 %>
+
+    <% if component.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", url_for(action: :soft_delete, id: component, controller: "components"), t("actions.soft_delete", scope: "decidim.admin", resources_count:), method: :patch, class: "action-icon--delete", data: { confirm: (t("actions.confirm_delete_component", scope: "decidim.admin", resources_count:)) } %>
+    <% end %>
+  <% else %>
+    <span class="action-space icon"></span>
+  <% end %>
 <% end %>

data/app/views/decidim/admin/components/{_component.html.erb → _component_row.html.erb}

@@ -1,6 +1,9 @@
 <% if user_role_config.component_is_accessible?(component.manifest_name) %>
-  <tr class="component-<%= component.id %>">
-    <td>
+  <tr class="draggable-content component-<%= component.id %>" draggable="true" data-record-id="<%= component.id %>">
+    <td class="text-center dragging-handle">
+      <%= icon("draggable", class: "dragger") %>
+    </td>
+    <td class="!text-left">
       <% if component.manifest.admin_engine %>
         <%= link_to translated_attribute(component.name), manage_component_path(component) %><br>
       <% else %>
@@ -10,12 +13,14 @@
     <td>
       <%= t "decidim.components.#{component.manifest.name}.name" %>
     </td>
-    <%= td_resource_scope_for(component.scope) %>
+    <td>
+      <%= render partial: "decidim/admin/components/visibility_label", locals: { component: } %>
+    </td>
     <td class="table-list__actions">
       <% if lookup_context.find_all("decidim/#{component.manifest_name}/admin/component/_actions").any? %>
-        <%= render partial: "decidim/#{component.manifest_name}/admin/component/actions", locals: { component: } %>
+        <%= render partial: "decidim/#{component.manifest_name}/admin/component/actions", locals: { component:, view: } %>
       <% else %>
-        <%= render partial: "actions", locals: { component: } %>
+        <%= render partial: "actions", locals: { component:, view: } %>
       <% end %>
     </td>
   </tr>

data/app/views/decidim/admin/components/_components_table.html.erb

@@ -0,0 +1,18 @@
+<div class="table-scroll">
+  <table class="table-list">
+    <thead>
+    <tr>
+      <th></th>
+      <th class="!text-left"><%= t("index.headers.name", scope: "decidim.admin.components") %></th>
+      <th><%= t("index.headers.type", scope: "decidim.admin.components") %></th>
+      <th><%= t("index.headers.visibility", scope: "decidim.admin.components") %></th>
+      <th><%= t("index.headers.actions", scope: "decidim.admin.components") %></th>
+    </tr>
+    </thead>
+    <tbody class="draggable-table" data-sort-url="<%= reorder_components_path %>" data-draggable-table>
+    <% components.each do |component| %>
+      <%= render partial: "component_row", locals: { component:, view: } %>
+    <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -13,9 +13,6 @@
       <div class="row column">
         <%= form.translated :text_field, :name, autofocus: true, aria: { label: :name } %>
       </div>
-      <div class="row column">
-        <%= form.number_field :weight %>
-      </div>
     </div>
   </div>
   <% if form.object.settings? %>
@@ -114,13 +111,4 @@
       </div>
     </div>
   <% end %>
-  <% if component && component.persisted? && !component.published? %>
-    <div class="card" data-component="accordion" id="accordion-share_tokens">
-      <div id="panel-share_tokens" class="card-section">
-        <div class="row column">
-            <%= render partial: "decidim/admin/share_tokens/share_tokens", locals: { share_tokens: form.object.share_tokens } %>
-        </div>
-      </div>
-    </div>
-  <% end %>
 </div>

data/app/views/decidim/admin/components/_taxonomy_filters_drawer.html.erb

@@ -0,0 +1,2 @@
+<div class="js-taxonomy-filters-drawer-container min-h-screen"
+     data-index-url="<%= decidim_admin.taxonomy_filters_selector_index_path(component_id: @component.id) %>"></div>

data/app/views/decidim/admin/components/_visibility_label.html.erb

@@ -0,0 +1,9 @@
+<% if component.published? %>
+  <% if component.visible? %>
+    <strong class="label success"><%= t(".published") %></strong>
+  <% else %>
+    <strong class="label warning"><%= t(".menu_hidden") %></strong>
+  <% end %>
+<% else %>
+  <strong class="label alert"><%= t(".unpublished") %></strong>
+<% end %>

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

@@ -27,18 +27,16 @@
     </h1>
   </div>
 
-  <div class="table-scroll">
-    <table class="table-list">
-      <thead>
-        <th><%= t(".headers.name") %></th>
-        <th><%= t(".headers.type") %></th>
-        <%= th_resource_scope_label(t(".headers.scope")) %>
-        <th><%= t(".headers.actions") %></th>
-      </thead>
-
-      <tbody>
-        <%= render partial: "component", collection: @components %>
-      </tbody>
-    </table>
-  </div>
+  <%= render partial: "components_table", locals: { components: @components, view: :index } %>
+  <% if allowed_to?(:manage_trash, :component, participatory_space: current_participatory_space) %>
+    <div class="card mt-4">
+      <%= link_to manage_trash_components_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_components", scope: "decidim.admin") %>
+        <span class="ml-2">
+        <%= icon_with_tooltip("information-line", t("tooltips.deleted_component_info", scope: "decidim.admin")) %>
+      </span>
+      <% end %>
+    </div>
+  <% end %>
 </div>

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

@@ -0,0 +1,11 @@
+<% add_decidim_page_title(t("components.manage_trash.title", scope: "decidim.admin")) %>
+
+<div class="card">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
+      <%= t("components.manage_trash.title", scope: "decidim.admin") %>
+    </h1>
+  </div>
+</div>
+
+<%= render partial: "components_table", locals: { components: trashable_deleted_collection, view: :deleted } %>