decidim-admin 0.28.0 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40ed6d9572b43902816815e55d3bdabfb7e16d319ab328cc705f753aa053a5e8
-  data.tar.gz: 73e23f6a91596b65503a49bda5397bf843da48175f48f696fc527dcc95951822
+  metadata.gz: 5cf03aeb983e0ddb8c344dbe1f8b8d21f7fbdfbd2a0f0c75f2ca76010320dd77
+  data.tar.gz: 91db438a29f5e05315b436f3b1cf96d0d0b2ad6fa03f4ec5955f30605fd99f12
 SHA512:
-  metadata.gz: 7ea41cc7a5afa9e4c4ead314708c89187da26170c96f21a9817d2d9591e2e1dd4d8e682991724e2b8b89bdf1d90d6df14cb84e5fcfb8c823b59f8a17c3e77177
-  data.tar.gz: b881939bb98f615689a21e0f5396fed9b8f63e781fdf10659e6a21858a42623c6697466bcd3d5255a6f586bd0e64af1d7c9eccb935081987ec1952045eb19840
+  metadata.gz: 8fa198551d57ea25461ecd2e86a0f7aae31f4b3e67151ed8e952ed4e91bcfb088c460ebde206520b83c7d13e5ab478b510d5eb6b9fe8e870ef1df2fe92f14cb4
+  data.tar.gz: cb21f050e6fa924f96579bd440058c7290d2ca29a6a4501e22a3b10c6b5199aa39b686e153e03a32aef78c80cc4c0d9c07746d00bc67656aeb56ba862e3a29c7

data/app/cells/decidim/admin/content_block_cell.rb

@@ -30,7 +30,7 @@ module Decidim
       def name
         return I18n.t(public_name_key) if component.blank?
 
-        "#{I18n.t(public_name_key)} (#{translated_attribute(component&.name)})"
+        "#{I18n.t(public_name_key)} (#{decidim_escape_translated(component&.name)})"
       end
     end
   end

data/app/commands/decidim/admin/destroy_category.rb

@@ -20,7 +20,7 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) if category.nil? || category.subcategories.any?
+        return broadcast(:invalid) if category.nil? || category.subcategories.any? || !category.unused?
 
         destroy_category
         broadcast(:ok)

data/app/controllers/decidim/admin/application_controller.rb

@@ -34,7 +34,8 @@ module Decidim
       helper Decidim::ComponentPathHelper
       helper Decidim::SanitizeHelper
       helper Decidim::BreadcrumbHelper
-      helper Decidim::Templates::Admin::ApplicationHelper if Decidim.module_installed?(:templates)
+
+      helper Decidim::Templates::Admin::ApplicationHelper if Decidim.module_installed?(:templates) && defined?(Decidim::Templates::Admin::ApplicationHelper)
 
       default_form_builder Decidim::Admin::FormBuilder
 

data/app/controllers/decidim/admin/area_types_controller.rb

@@ -9,7 +9,7 @@ module Decidim
 
       layout "decidim/admin/settings"
 
-      add_breadcrumb_item_from_menu :admin_settings_menu
+      add_breadcrumb_item_from_menu :admin_areas_menu
 
       helper_method :area_types
 

data/app/controllers/decidim/admin/authorization_workflows_controller.rb

@@ -5,6 +5,8 @@ module Decidim
     class AuthorizationWorkflowsController < Decidim::Admin::ApplicationController
       layout "decidim/admin/users"
 
+      add_breadcrumb_item_from_menu :admin_user_menu
+
       def index
         enforce_permission_to :index, :authorization_workflow
 

data/app/controllers/decidim/admin/conflicts_controller.rb

@@ -5,13 +5,21 @@ module Decidim
     class ConflictsController < Decidim::Admin::ApplicationController
       layout "decidim/admin/users"
 
+      helper_method :context_breadcrumb_items
+
+      add_breadcrumb_item_from_menu :impersonate_menu
+
       def index
+        enforce_permission_to :index, :impersonatable_user
+
         @conflicts = Decidim::Verifications::Conflict.joins(:current_user).where(
           decidim_users: { decidim_organization_id: current_organization.id }
         )
       end
 
       def edit
+        enforce_permission_to :index, :impersonatable_user
+
         conflict = Decidim::Verifications::Conflict.find(params[:id])
 
         @form = form(TransferUserForm).from_params(
@@ -22,6 +30,8 @@ module Decidim
       end
 
       def update
+        enforce_permission_to :index, :impersonatable_user
+
         conflict = Decidim::Verifications::Conflict.find(params[:id])
 
         @form = form(TransferUserForm).from_params(
@@ -43,6 +53,19 @@ module Decidim
           end
         end
       end
+
+      private
+
+      def context_breadcrumb_items
+        @context_breadcrumb_items ||= [impersonations_breadcrumb_item]
+      end
+
+      def impersonations_breadcrumb_item
+        {
+          label: I18n.t("menu.impersonations", scope: "decidim.admin"),
+          url: decidim_admin.impersonatable_users_path
+        }
+      end
     end
   end
 end

data/app/controllers/decidim/admin/impersonatable_users_controller.rb

@@ -12,6 +12,8 @@ module Decidim
 
       helper_method :new_managed_user
 
+      add_breadcrumb_item_from_menu :admin_user_menu
+
       def index
         enforce_permission_to :index, :impersonatable_user
 
@@ -26,7 +28,7 @@ module Decidim
       private
 
       def collection
-        @collection ||= current_organization.users.where(admin: false, roles: []).order(created_at: :desc)
+        @collection ||= current_organization.users.not_deleted.not_blocked.where(admin: false, roles: []).order(created_at: :desc)
       end
 
       def new_managed_user

data/app/controllers/decidim/admin/impersonations_controller.rb

@@ -82,6 +82,7 @@ module Decidim
         return nil unless handler.unique_id
 
         existing_authorization = Authorization.find_by(
+          user: User.where(organization: current_organization),
           name: handler_name,
           unique_id: handler.unique_id
         )

data/app/controllers/decidim/admin/managed_users/impersonation_logs_controller.rb

@@ -9,6 +9,8 @@ module Decidim
         layout "decidim/admin/users"
 
         def index
+          enforce_permission_to :index, :impersonatable_user
+
           @impersonation_logs = Decidim::ImpersonationLog.where(user:).order(started_at: :desc).page(params[:page]).per(15)
         end
 

data/app/controllers/decidim/admin/moderated_users_controller.rb

@@ -7,6 +7,8 @@ module Decidim
 
       layout "decidim/admin/global_moderations"
 
+      before_action :set_moderation_breadcrumb_item
+
       def index
         enforce_permission_to :read, :moderate_users
 
@@ -46,6 +48,14 @@ module Decidim
                           base_query_finder.unblocked
                         end
       end
+
+      def set_moderation_breadcrumb_item
+        controller_breadcrumb_items << {
+          label: I18n.t("menu.reported_users", scope: "decidim.admin"),
+          url: decidim_admin.moderated_users_path,
+          active: true
+        }
+      end
     end
   end
 end

data/app/controllers/decidim/admin/moderations_controller.rb

@@ -8,6 +8,8 @@ module Decidim
 
       helper_method :moderations, :allowed_to?, :query, :permission_resource
 
+      before_action :set_moderation_breadcrumb_item
+
       def index
         enforce_permission_to :read, permission_resource
       end
@@ -103,6 +105,14 @@ module Decidim
       def permission_resource
         :moderation
       end
+
+      def set_moderation_breadcrumb_item
+        controller_breadcrumb_items << {
+          label: I18n.t("menu.content", scope: "decidim.admin"),
+          url: decidim_admin.moderations_path,
+          active: true
+        }
+      end
     end
   end
 end

data/app/controllers/decidim/admin/officializations_controller.rb

@@ -12,6 +12,8 @@ module Decidim
       helper_method :user
       helper Decidim::Messaging::ConversationHelper
 
+      add_breadcrumb_item_from_menu :admin_user_menu
+
       def index
         enforce_permission_to :read, :officialization
         @users = filtered_collection

data/app/controllers/decidim/admin/scope_types_controller.rb

@@ -9,7 +9,7 @@ module Decidim
 
       layout "decidim/admin/settings"
 
-      add_breadcrumb_item_from_menu :admin_settings_menu
+      add_breadcrumb_item_from_menu :admin_scopes_menu
 
       helper_method :scope_types
 

data/app/controllers/decidim/admin/static_page_topics_controller.rb

@@ -5,6 +5,8 @@ module Decidim
     class StaticPageTopicsController < Decidim::Admin::ApplicationController
       include Decidim::Admin::Concerns::HasTabbedMenu
 
+      before_action :set_static_page_topics_breadcrumb_item
+
       helper_method :topic, :topics
 
       def index
@@ -68,6 +70,14 @@ module Decidim
 
       private
 
+      def set_static_page_topics_breadcrumb_item
+        controller_breadcrumb_items << {
+          label: I18n.t("menu.static_page_topics", scope: "decidim.admin"),
+          url: decidim_admin.static_page_topics_path,
+          active: true
+        }
+      end
+
       def tab_menu_name = :admin_static_pages_menu
 
       def topic

data/app/controllers/decidim/admin/user_groups_controller.rb

@@ -12,6 +12,8 @@ module Decidim
 
       layout "decidim/admin/users"
 
+      add_breadcrumb_item_from_menu :admin_user_menu
+
       def index
         enforce_permission_to :index, :user_group
 

data/app/controllers/decidim/admin/users_controller.rb

@@ -7,6 +7,8 @@ module Decidim
     class UsersController < Decidim::Admin::ApplicationController
       include Decidim::Admin::Officializations::Filterable
 
+      add_breadcrumb_item_from_menu :admin_user_menu
+
       def index
         enforce_permission_to :read, :admin_user
         @users = filtered_collection

data/app/events/decidim/resource_hidden_event.rb

@@ -2,6 +2,8 @@
 
 module Decidim
   class ResourceHiddenEvent < Decidim::Events::SimpleEvent
+    include Decidim::ApplicationHelper
+
     i18n_attributes :resource_path, :report_reasons, :resource_type, :resource_content
 
     def resource_path
@@ -23,7 +25,9 @@ module Decidim
     end
 
     def resource_content
-      translated_attribute(@resource[@resource.reported_attributes.first]).truncate(100, separator: " ")
+      text = translated_attribute(@resource[@resource.reported_attributes.first])
+
+      decidim_sanitize(html_truncate(text, length: 100), strip_tags: true)
     end
 
     def resource_text

data/app/helpers/decidim/admin/admin_terms_helper.rb

@@ -5,7 +5,7 @@ module Decidim
     # This module includes helpers to show admin terms of service
     module AdminTermsHelper
       def admin_terms_of_service_body
-        current_organization.admin_terms_of_service_body.symbolize_keys[I18n.locale].html_safe
+        decidim_sanitize_admin(translated_attribute(current_organization.admin_terms_of_service_body)).html_safe
       end
 
       def announcement_body

data/app/helpers/decidim/admin/filterable_helper.rb

@@ -53,7 +53,7 @@ module Decidim
       # Produces the html for the dropdown submenu from the options tree.
       # Returns a ActiveSupport::SafeBuffer.
       def dropdown_submenu(options)
-        content_tag(:ul, class: "vertical menu") do
+        content_tag(:ul, class: "vertical menu", "aria-hidden": true) do
           options.map do |key, value|
             if value.nil?
               content_tag(:li, key)

data/app/packs/entrypoints/decidim_admin_overrides.scss

@@ -0,0 +1,2 @@
+// Application specific styles: https://docs.decidim.org/en/customize/styles/
+@import "stylesheets/decidim/admin/decidim_application";

data/app/packs/src/decidim/admin/application.js

@@ -15,6 +15,14 @@ window.Decidim.InputCharacterCounter = InputCharacterCounter;
 $(() => {
   $(document).foundation();
 
+  $(document).on("show.zf.dropdownMenu", function(event, $element) {
+    $element.attr("aria-hidden", "false");
+  });
+
+  $(document).on("hide.zf.dropdownMenu", function(event, $element) {
+    $element.children(".is-dropdown-submenu").attr("aria-hidden", "true");
+  });
+
   toggleNav();
 
   createSortList("#steps tbody", {

data/app/packs/src/decidim/admin/participatory_space_search.js

@@ -10,7 +10,7 @@ import AutoComplete from "src/decidim/autocomplete";
  */
 const apiRequest = (query) => {
   return new Promise((resolve) => {
-    fetch("/api", {
+    fetch(window.Decidim.config.get("api_path"), {
       method: "post",
       headers: {
         "Content-Type": "application/json"

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

@@ -16,7 +16,7 @@
   }
 
   .dropdown {
-    @apply relative p-0 bg-transparent border-0;
+    @apply relative p-0 border-0;
   }
 
   .button,

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

@@ -32,6 +32,16 @@ li.opens-left > .is-dropdown-submenu {
   display: none;
 }
 
+.dropdown.menu ul {
+  &[aria-hidden="true"] {
+    display: none;
+  }
+
+  &[aria-hidden="false"] {
+    display: block;
+  }
+}
+
 .dropdown.menu .nested.is-dropdown-submenu {
   margin-right: 0;
   margin-left: 0;

data/app/packs/stylesheets/decidim/admin/_sidebar-menu.scss

@@ -24,16 +24,16 @@
       @apply font-semibold;
     }
 
+    & .component-counter {
+      @apply ml-auto inline-flex items-center justify-center w-5 h-5 text-xs font-semibold rounded-full bg-background-4 border-secondary;
+    }
+
     ul {
       @apply ml-10;
 
       li {
         a {
           @apply px-2 py-1;
-
-          .component-counter {
-            @apply ml-auto inline-flex items-center justify-center w-5 h-5 text-xs font-semibold rounded-full bg-background-4 border-secondary;
-          }
         }
 
         &.is-active a {

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

@@ -55,6 +55,12 @@
   @apply hidden;
 }
 
+.form-defaults {
+  .language-change:not(.reset-defaults) {
+    @apply pt-1;
+  }
+}
+
 .form {
   .language-change {
     @apply h-8 mb-4;

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

@@ -0,0 +1,5 @@
+// This is a file that can be overridden by the application in order to override styles
+// Notice that this file is included at the very end of the stylesheets packs to have
+// more priority
+//
+// By default this is empty.

data/app/views/decidim/admin/admin_terms/show.html.erb

@@ -1,9 +1,9 @@
 <%= cell("decidim/announcement", announcement_body, callout_class: current_user.admin_terms_accepted? ? "success" : "warning" ) %>
 
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("title", scope: "decidim.admin.admin_terms_of_service") %>
-  </h2>
+  </h1>
 </div>
 
 <article class="card">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit-form">
   <%= decidim_form_for(@form, html: { class: "form-defaults form edit_area_type" }) do |f| %>

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

@@ -1,12 +1,12 @@
 <% add_decidim_page_title(t("decidim.admin.titles.area_types")) %>
 <div class="card" id="area-types">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t "decidim.admin.titles.area_types" %>
       <% if allowed_to? :create, :area_type %>
         <%= link_to t("actions.add", scope: "decidim.admin"), [:new, :area_type], class: "button button__sm button__secondary new" %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <div class="table-scroll">
       <table class="table-list">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit-form">
   <%= decidim_form_for(@form, html: { class: "form-defaults form new_area_type" }) do |f| %>

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit-form">
   <%= decidim_form_for(@form, html: { class: "form-defaults form edit_area_" }) do |f| %>

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

@@ -1,12 +1,12 @@
 <% add_decidim_page_title(t("areas", scope: "decidim.admin.titles")) %>
 <div class="card" id="areas">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t "decidim.admin.titles.areas" %>
       <% if allowed_to? :create, :area %>
         <%= link_to t("actions.add", scope: "decidim.admin"), new_area_path, class: "button button__sm button__secondary new" %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <% if @areas.any? %>
     <div class="table-scroll">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t ".title" %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit-form">
   <%= decidim_form_for(@form, url: areas_path, html: { class: "form-defaults form new_area_" }) do |f| %>

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

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(t("attachment_collections.edit.title", scope: "decidim.admin")) %>
 
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("attachment_collections.edit.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

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

@@ -1,12 +1,12 @@
 <% add_decidim_page_title(t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin")) %>
 <div class="card" id="attachment_collections">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin") %>
       <% if allowed_to? :create, :attachment_collection %>
         <%= link_to t("actions.attachment_collection.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <% if collection_for.attachment_collections.any? %>
     <div class="table-scroll">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t("attachment_collections.new.title", scope: "decidim.admin")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("attachment_collections.new.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

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

@@ -1,12 +1,12 @@
 <% add_decidim_page_title(t(".attachments_title")) %>
 <div class="card" id="attachments">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t(".attachments_title") %>
       <% if allowed_to? :create, :attachment %>
         <%= link_to t("actions.attachment.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <%= cell("decidim/admin/attachments_privacy_warning", attached_to.attachments) %>
   <% if attached_to.attachments.any? %>

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

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

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(t("authorization_workflows", scope: "decidim.admin.titles")) %>
 
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("authorization_workflows", scope: "decidim.admin.titles") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="card">

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title", name: user.name)) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t(".title", name: user.name) %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">
@@ -16,8 +16,7 @@
             </div>
 
             <% if @form.hide %>
-              <% announcement_message = t(".already_reported_html", link: new_user_block_path(user_id: user.id)) %>
-              <%= cell("decidim/announcement", announcement_message, callout_class: "alert" ) %>
+              <%= cell("decidim/announcement", t(".already_reported_html"), callout_class: "alert" ) %>
             <% end %>
 
             <% if defined?(Decidim::Templates) %>

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("categories.edit.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">