decidim-admin 0.27.10 → 0.28.0.rc4

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

@@ -10,8 +10,20 @@ module Decidim
       #           current component.
       #
       # Returns a rendered dropdown.
-      def export_dropdown(component = current_component, resource_id = nil)
-        render partial: "decidim/admin/exports/dropdown", locals: { component: component, resource_id: resource_id }
+      def export_dropdown(component = current_component, resource_id = nil, apply_search: false)
+        filters =
+          if apply_search && respond_to?(:query)
+            { id_in: query.result.map(&:id) }
+          else
+            {}
+          end
+        render_dropdown(component:, resource_id:, filters:)
+      end
+
+      def export_dropdowns(query, component = current_component, resource_id = nil)
+        return export_dropdown(component, resource_id, apply_search: false) if query.conditions.empty?
+
+        export_dropdown(component, resource_id, apply_search: false).concat(export_dropdown(component, resource_id, apply_search: true))
       end
 
       # Routes to the correct exporter for a component.
@@ -23,6 +35,18 @@ module Decidim
       def exports_path(component, options)
         EngineRouter.admin_proxy(component.participatory_space).component_exports_path(options.merge(component_id: component))
       end
+
+      def dropdown_id(filters)
+        return "export-dropdown" if filters.empty?
+
+        "export-selection-dropdown"
+      end
+
+      private
+
+      def render_dropdown(component:, resource_id:, filters:)
+        render partial: "decidim/admin/exports/dropdown", locals: { component:, resource_id:, filters: }
+      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Decidim
     module FilterableHelper
       # Renders the filters selector with tags in the admin panel.
       def admin_filter_selector(i18n_ctx = nil)
-        render partial: "decidim/admin/shared/filters", locals: { i18n_ctx: i18n_ctx }
+        render partial: "decidim/admin/shared/filters", locals: { i18n_ctx: }
       end
 
       # Builds a tree of links from Decidim::Admin::Filterable::filters_with_values
@@ -113,7 +113,7 @@ module Decidim
 
       def remove_filter_icon_link(filter)
         icon_link_to(
-          "circle-x",
+          "delete-bin-line",
           url_for(query_params_without(filter)),
           t("decidim.admin.actions.cancel"),
           class: "action-icon--remove"

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

@@ -5,8 +5,7 @@ module Decidim
     module IconLinkHelper
       # This helper adds the necessary boilerplate for the admin icon links.
       #
-      # icon_name - A String representing the icon name from Iconic
-      #             http://useiconic.com/open
+      # icon_name - A String representing the icon name
       # link      - The path or url where the link should point to.
       # title     - A String that will be shown when hovering the icon.
       # options   - An optional Hash containing extra data for the link:
@@ -15,15 +14,17 @@ module Decidim
       #             data   - This option can be used to add custom data attributes.
       #
       def icon_link_to(icon_name, link, title, options = {})
-        link_to(link,
-                method: options[:method],
-                class: "action-icon #{options[:class]}",
-                data: options[:data] || {},
-                title: title,
-                target: options[:target]) do
-          content_tag(:span, data: { tooltip: true, disable_hover: false, click_open: false },
-                             title: title) do
-            icon(icon_name, aria_label: title, role: "img")
+        with_tooltip(title, options.merge(class: "top")) do
+          link_to(link,
+                  method: options[:method],
+                  class: "action-icon #{options[:class]}",
+                  data: options[:data] || {},
+                  title:,
+                  target: options[:target]) do
+            content_tag(:span, data: { tooltip: true, disable_hover: false, click_open: false },
+                               title:) do
+              icon(icon_name, aria_label: title, role: "img")
+            end
           end
         end
       end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module IconWithTooltipHelper
+      # This helper adds the necessary boilerplate for the admin icon with tooltip.
+      #
+      # icon_name - A String representing the icon name
+      # title     - A String that will be shown when hovering the icon.
+      #             class  - Any extra class that will be added to the link.
+      #             data   - This option can be used to add custom data attributes.
+      def icon_with_tooltip(icon_name, title, options = {})
+        with_tooltip(title, options.merge(class: "top")) do
+          content_tag(:span, data: { tooltip: true, disable_hover: false, click_open: false },
+                             title:) do
+            icon(icon_name, aria_label: title, role: "img")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -13,7 +13,7 @@ module Decidim
       #
       # Returns a rendered dropdown.
       def import_dropdown(component = current_component, resource_id: nil)
-        render "decidim/admin/imports/dropdown", component: component, resource_id: resource_id, custom: block_given? do
+        render "decidim/admin/imports/dropdown", component:, resource_id:, custom: block_given? do
           yield if block_given?
         end
       end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    module LogsHelper
+      def participatory_space_options
+        Decidim.participatory_space_manifests.map do |manifest|
+          model_class = manifest.model_class_name.constantize
+          spaces = manifest.participatory_spaces.call(current_organization).map do |space|
+            [translated_attribute(space.title), "#{manifest.name}(#{space.id})"]
+          end
+
+          [model_class.model_name.human(count: 2), spaces]
+        end
+      end
+    end
+  end
+end

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

@@ -14,14 +14,74 @@ module Decidim
         )
       end
 
+      def main_menu_modules
+        @main_menu_modules ||= ::Decidim::MenuPresenter.new(
+          :admin_menu_modules,
+          self,
+          container_options: { class: "main-nav__modules" },
+          active_class: "is-active",
+          label: t("layouts.decidim.header.main_menu")
+        )
+      end
+
+      def dropdown_menu(target_menu)
+        ::Decidim::Admin::SecondaryMenuPresenter.new(
+          target_menu,
+          self,
+          container_options: { class: "dropdown dropdown__bottom" },
+          element_class: "dropdown__item",
+          active_class: "is-active"
+        )
+      end
+
       def sidebar_menu(target_menu)
-        ::Decidim::Admin::SecondaryMenuPresenter.new(target_menu, self, active_class: "is-active")
+        ::Decidim::Admin::SecondaryMenuPresenter.new(
+          target_menu,
+          self,
+          element_class: "sidebar-menu__item",
+          active_class: "is-active"
+        )
+      end
+
+      def admin_tabs(target_menu)
+        ::Decidim::MenuPresenter.new(
+          target_menu,
+          self,
+          container_options: { class: "tab-x-container" },
+          active_class: "is-active"
+        )
+      end
+
+      def breadcrumb_modules_admin_menu
+        @breadcrumb_modules_admin_menu ||= ::Decidim::BreadcrumbRootMenuPresenter.new(
+          :admin_menu_modules,
+          self,
+          container_options: { class: "menu-bar__main-dropdown__menu" }
+        )
+      end
+
+      def breadcrumb_root_admin_menu
+        @breadcrumb_root_admin_menu ||= ::Decidim::BreadcrumbRootMenuPresenter.new(
+          :admin_menu,
+          self,
+          container_options: { class: "menu-bar__main-dropdown__menu" }
+        )
       end
 
       def simple_menu(target_menu:, options: {})
         options = { active_class: "is-active" }.merge(options)
         ::Decidim::Admin::SimpleMenuPresenter.new(target_menu, self, options)
       end
+
+      def add_secondary_root_menu(menu)
+        @secondary_root_menu = menu
+      end
+
+      attr_reader :secondary_root_menu
+
+      def has_secondary_root_menu?
+        @secondary_root_menu.present?
+      end
     end
   end
 end

data/app/helpers/decidim/admin/moderations/reports_helper.rb

@@ -7,6 +7,7 @@ module Decidim
       module ReportsHelper
         include Decidim::Messaging::ConversationHelper
         include Decidim::ResourceHelper
+        include Decidim::SanitizeHelper
         include Decidim::TranslationsHelper
 
         # Public: Returns the reportable's author names separated by commas.
@@ -18,13 +19,13 @@ module Decidim
               when User
                 content_tag :li do
                   link_to current_or_new_conversation_path_with(author), target: "_blank", rel: "noopener" do
-                    "#{author.name} #{icon "envelope-closed"}".html_safe
+                    "#{author.name} #{icon "mail-send-line"}".html_safe
                   end
                 end
               when Decidim::Meetings::Meeting
                 content_tag :li do
                   link_to resource_locator(author).path, target: "_blank", rel: "noopener" do
-                    translated_attribute(author.title)
+                    decidim_sanitize(translated_attribute(author.title))
                   end
                 end
               else

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

@@ -31,7 +31,7 @@ module Decidim
                             { prompt: t("select_recipients_to_deliver.none", scope: "decidim.admin.newsletters"),
                               label: t("activerecord.models.decidim/#{manifest_name.singularize}.other"),
                               include_hidden: false },
-                            multiple: true, size: spaces.size > 10 ? 10 : spaces.size, class: "chosen-select"
+                            multiple: true, size: [spaces.size, 10].min, class: "chosen-select"
         end
       end
 
@@ -74,7 +74,7 @@ module Decidim
           else
             Decidim.find_participatory_space_manifest(type["manifest_name"].to_sym)
                    .participatory_spaces.call(current_organization).where(id: type["ids"]).each do |space|
-              html += "<strong>#{decidim_escape_translated space.title}</strong>"
+              html += "<strong>#{decidim_html_escape(translated_attribute(space.title))}</strong>"
             end
           end
           html += "<br/>"
@@ -88,7 +88,7 @@ module Decidim
           concat t("index.segmented_to", scope: "decidim.admin.newsletters", subject: nil)
           if newsletter.sent_scopes.any?
             newsletter.sent_scopes.each do |scope|
-              concat content_tag(:strong, (translated_attribute scope.name).to_s)
+              concat content_tag(:strong, decidim_html_escape(translated_attribute(scope.name)).to_s)
             end
           else
             concat content_tag(:strong, t("index.no_scopes", scope: "decidim.admin.newsletters"))
@@ -141,7 +141,7 @@ module Decidim
         spinner = "<span id='recipients_count_spinner' class='loading-spinner hide'></span>"
         body = "#{t("recipients_count", scope: "decidim.admin.newsletters.select_recipients_to_deliver", count: recipients_count_query)} #{spinner}"
         {
-          body: body
+          body:
         }
       end
     end

data/app/helpers/decidim/admin/paginable/per_page_helper.rb

@@ -7,7 +7,7 @@ module Decidim
       module PerPageHelper
         def per_page_options
           OpenStruct.new(
-            per_page: per_page,
+            per_page:,
             per_page_range: Decidim::Admin.per_page_range
           )
         end

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

@@ -10,7 +10,7 @@ module Decidim
         return unless resource.allow_resource_permissions? && allowed_to?(:update, :component, component: resource.component)
 
         current_participatory_space_admin_proxy = ::Decidim::EngineRouter.admin_proxy(current_participatory_space)
-        icon_link_to "key",
+        icon_link_to "key-2-line",
                      current_participatory_space_admin_proxy.edit_component_permissions_path(
                        current_component.id,
                        resource_name: resource.resource_manifest.name,
@@ -28,7 +28,7 @@ module Decidim
         resource_key = resource.resource_manifest.name.to_sym
         return unless resource.allow_resource_permissions? && allowed_to?(:update, resource_key, resource_key => resource)
 
-        icon_link_to "key",
+        icon_link_to "key-2-line",
                      send("edit_#{resource_key}_permissions_path", resource, resource_name: resource.resource_manifest.name),
                      t("actions.permissions", scope: "decidim.admin"),
                      class: "action-icon--permissions #{"action-icon--highlighted" if resource.permissions.present?}"

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Overrides some methods from Ransack::Helpers::FormHelper to fix the search
+    # user interfaces within Decidim.
+    module SearchFormHelper
+      # Provide the correct builder option for the admin search forms. Otherwise
+      # they would be generated using Ransack::Helpers::FormHelper which does
+      # not provide all the same features that the Decidim form builders, such
+      # as datetime pickers.
+      def search_form_for(record, options = {}, &)
+        options[:builder] ||= SearchFormBuilder
+
+        super(record, options, &)
+      end
+    end
+  end
+end

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

@@ -11,6 +11,7 @@ module Decidim
         boolean: :check_box,
         integer: :number_field,
         string: :text_field,
+        float: :number_field,
         text: :text_area,
         select: :select_field,
         scope: :scope_field,
@@ -25,14 +26,14 @@ module Decidim
       # @param attribute [Decidim::SettingsManifest::Attribute] The Settings::Attribute instance with the
       #   description of the attribute.
       # @param name [Symbol] The name of the field.
-      # @param i18n_scope [String] The scope where it'll find all the texts for the internationalization (locales)
+      # @param i18n_scope [String] The scope where it will find all the texts for the internationalization (locales)
       # @param options [Hash] Extra options to be passed to the field helper.
       # @option options [String] :tabs_prefix The type of the setting.
       #   It can be "global-settings" or "step-N-settings", where N is the number of the step.
       # @option options [nil, Boolean] :readonly True if the input is readonly.
       # @return [ActiveSupport::SafeBuffer] Rendered form field.
       def settings_attribute_input(form, attribute, name, i18n_scope, options = {})
-        form_method = form_method_for_attribute(attribute)
+        form_method = form_method_for_attribute(attribute, options)
 
         container_class = "#{name}_container"
         if options[:readonly]
@@ -40,7 +41,7 @@ module Decidim
           help_text = text_for_setting(name, "readonly", i18n_scope)
         end
         help_text ||= text_for_setting(name, "help", i18n_scope)
-        help_text_options = help_text ? { help_text: help_text } : {}
+        help_text_options = help_text ? { help_text: } : {}
 
         options = { label: t(name, scope: i18n_scope) }
                   .merge(help_text_options)
@@ -56,7 +57,7 @@ module Decidim
           elsif form_method == :select_field
             render_select_form_field(form, attribute, name, i18n_scope, options)
           elsif form_method == :scope_field
-            scopes_picker_field(form, name)
+            scopes_select_field(form, name)
           else
             form.send(form_method, name, options)
           end
@@ -108,14 +109,14 @@ module Decidim
                                                :last,
                                                :first,
                                                { checked: form.object.send(name) },
-                                               options) { |b| b.label { b.radio_button + b.text } }
+                                               options) { |b| b.label(class: "form__wrapper-checkbox-label") { b.radio_button + b.text } }
         end
         html << content_tag(:p, options[:help_text], class: "help-text") if options[:help_text]
         html
       end
 
       # Get the translation for a given attribute
-      # Returns a translation or nil. If nil, ZURB Foundation won't add the help_text.
+      # Returns a translation or nil. If nil, FoundationRailsHelper will not add the help_text.
       #
       # @param name (see #settings_attribute_input)
       # @param suffix [String] What suffix the i18n key has
@@ -133,8 +134,8 @@ module Decidim
       #
       # @param attribute [Decidim::SettingsManifest::Attribute]
       # @return [Symbol] The FormBuilder's method used to render
-      def form_method_for_attribute(attribute)
-        return :editor if attribute.type.to_sym == :text && attribute.editor?
+      def form_method_for_attribute(attribute, options)
+        return :editor if attribute.type.to_sym == :text && options[:editor]
 
         TYPES[attribute.type.to_sym]
       end

data/app/jobs/decidim/admin/application_job.rb

@@ -4,7 +4,7 @@ module Decidim
   module Admin
     # Custom ApplicationJob scoped to the admin panel.
     #
-    class ApplicationJob < ActiveJob::Base
+    class ApplicationJob < Decidim::ApplicationJob
     end
   end
 end

data/app/jobs/decidim/admin/expire_impersonation_job.rb

@@ -6,7 +6,7 @@ module Decidim
       queue_as :default
 
       def perform(user, current_user)
-        impersonation_log = Decidim::ImpersonationLog.where(admin: current_user, user: user).active.first
+        impersonation_log = Decidim::ImpersonationLog.where(admin: current_user, user:).active.first
         return unless impersonation_log
 
         impersonation_log.expire!

data/app/jobs/decidim/admin/import_participatory_space_private_user_csv_job.rb

@@ -14,9 +14,9 @@ module Decidim
           name: user_name,
           email: email.downcase.strip
         }
-        private_user_form = ParticipatorySpacePrivateUserForm.from_params(params, privatable_to: privatable_to)
+        private_user_form = ParticipatorySpacePrivateUserForm.from_params(params, privatable_to:)
                                                              .with_context(
-                                                               current_user: current_user,
+                                                               current_user:,
                                                                current_particiaptory_space: privatable_to
                                                              )
 

data/app/jobs/decidim/admin/newsletter_job.rb

@@ -17,7 +17,7 @@ module Decidim
 
           @newsletter.update!(
             sent_at: Time.current,
-            extended_data: extended_data,
+            extended_data:,
             total_recipients: recipients.count,
             total_deliveries: 0
           )

data/app/mailers/decidim/admin/application_mailer.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Custom application mailer, scoped to the admin mailer.
+    #
+    class ApplicationMailer < ActionMailer::Base
+      default from: Decidim.config.mailer_sender
+      layout "mailer"
+    end
+  end
+end

data/app/packs/entrypoints/decidim_admin.js

@@ -1,17 +1,6 @@
 /* eslint no-unused-vars: 0 */
 /* eslint id-length: ["error", { "exceptions": ["$"] }] */
 
-import "core-js/stable";
-import "regenerator-runtime/runtime";
-import $ from "jquery"
-import Quill from "quill"
-import Rails from "@rails/ujs"
-
-import "foundation-sites"
-import "src/decidim/vendor/foundation-datepicker"
-import "src/decidim/foundation_datepicker_locales"
-import "jquery-serializejson"
-
 import "src/decidim/admin/tab_focus"
 import initLanguageChangeSelect from "src/decidim/admin/choose_language"
 import "src/decidim/admin/application"
@@ -20,28 +9,18 @@ import "src/decidim/admin/welcome_notification"
 import "src/decidim/admin/newsletters"
 import "src/decidim/admin/form"
 import "src/decidim/admin/external_domain_whitelist"
-import "src/decidim/confirm"
 import "src/decidim/admin/draggable-list"
 import "src/decidim/admin/sortable"
-import "src/decidim/gallery"
 import "src/decidim/admin/moderations"
-import "src/decidim/input_tags"
-import "src/decidim/input_hashtags"
-import "src/decidim/input_mentions"
-import "src/decidim/vizzs"
-import "src/decidim/ajax_modals"
 import "src/decidim/admin/officializations"
-import "src/decidim/session_timeouter"
 import "src/decidim/slug_form"
-import "src/decidim/direct_uploads/upload_field"
 import "src/decidim/admin/admin_autocomplete"
+import "src/decidim/admin/triadic_color_picker"
+import "src/decidim/admin/participatory_space_search"
 
 // CSS
 import "entrypoints/decidim_admin.scss";
 
-// This needs to be loaded after confirm dialog to bind properly
-Rails.start()
-
 window.addEventListener("DOMContentLoaded", () => {
   initLanguageChangeSelect(document.querySelectorAll("select.language-change"));
 });

data/app/packs/entrypoints/decidim_admin.scss

@@ -1 +1 @@
-@import "stylesheets/decidim/admin/application.scss"
+@import "stylesheets/decidim/admin/application.scss";

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

@@ -2,9 +2,6 @@
 
 import toggleNav from "src/decidim/admin/toggle_nav"
 import createSortList from "src/decidim/admin/sort_list.component"
-import createQuillEditor from "src/decidim/editor"
-import formDatePicker from "src/decidim/form_datepicker"
-import DataPicker from "src/decidim/data_picker"
 import FormFilterComponent from "src/decidim/form_filter"
 import Configuration from "src/decidim/configuration"
 import InputCharacterCounter from "src/decidim/input_character_counter"
@@ -16,8 +13,6 @@ window.Decidim.config = new Configuration()
 window.Decidim.InputCharacterCounter = InputCharacterCounter;
 
 $(() => {
-  window.theDataPicker = new DataPicker($(".data-picker"));
-
   $(document).foundation();
 
   toggleNav();
@@ -37,16 +32,9 @@ $(() => {
     }
   })
 
-  formDatePicker();
-
-  $(".editor-container").each((_idx, container) => {
-    createQuillEditor(container);
-  });
-
   $("form.new_filter").each(function () {
     const formFilter = new FormFilterComponent($(this));
 
     formFilter.mountComponent();
   })
 });
-

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

@@ -9,12 +9,30 @@ $(() => {
   const $email = $("#user_email", $modal);
   const $fullName = $("#user_full_name", $modal);
 
-  $("[data-toggle=show-email-modal]").on("click", (event) => {
+  $("[data-dialog-open=show-email-modal]").on("click", (event) => {
     event.preventDefault()
 
     $button.show()
-    $button.attr("data-open-url", event.currentTarget.href)
+    $button.attr("data-remote-url", event.currentTarget.href)
     $fullName.text($(event.currentTarget).data("full-name"))
-    $email.html("")
+    $email.html("");
   })
+
+  /* eslint-disable */
+  async function getUserEmail(url) {
+    let response = await fetch(url);
+    if (response.ok) {
+      let userEmail = await response.text();
+      $("#user_email").html(userEmail);
+      $button.hide()
+    } else {
+      console.log(`Error-HTTP: " + ${response.status}`);
+    }
+  }
+  /* eslint-enable */
+
+  $("[data-open=user_email]").on("click", (event) => {
+    getUserEmail(event.currentTarget.dataset.remoteUrl);
+  })
+
 })