decidim-admin 0.30.2 → 0.31.0.rc1

data/app/forms/decidim/admin/organization_form.rb

@@ -11,25 +11,44 @@ module Decidim
       mimic :organization
 
       translatable_attribute :name, String
+      translatable_attribute :description, Decidim::Attributes::RichText
       attribute :reference_prefix, String
       attribute :time_zone, String
-      attribute :twitter_handler, String
-      attribute :facebook_handler, String
-      attribute :instagram_handler, String
-      attribute :youtube_handler, String
-      attribute :github_handler, String
       attribute :default_locale, String
       attribute :badges_enabled, Boolean
-      attribute :user_groups_enabled, Boolean
       attribute :comments_max_length, Integer, default: 0
       attribute :rich_text_editor_in_public_views, Boolean
       attribute :enable_machine_translations, Boolean
       attribute :machine_translation_display_priority, String
       attribute :enable_participatory_space_filters, Boolean
 
+      attribute :twitter_handler, String
+      attribute :facebook_handler, String
+      attribute :instagram_handler, String
+      attribute :youtube_handler, String
+      attribute :github_handler, String
+
+      attribute :logo
+      attribute :remove_logo, Boolean, default: false
+      attribute :favicon
+      attribute :remove_favicon, Boolean, default: false
+      attribute :official_url
+      attribute :official_img_footer
+      attribute :remove_official_img_footer, Boolean, default: false
+
+      attribute :primary_color, String
+      attribute :secondary_color, String
+      attribute :tertiary_color, String
+
       attribute :send_welcome_notification, Boolean
       attribute :customize_welcome_notification, Boolean
 
+      attribute :enable_omnipresent_banner, Boolean, default: false
+      attribute :omnipresent_banner_url, String
+
+      translatable_attribute :omnipresent_banner_title, String
+      translatable_attribute :omnipresent_banner_short_description, String
+
       translatable_attribute :welcome_notification_subject, String
       translatable_attribute :welcome_notification_body, Decidim::Attributes::RichText
 
@@ -48,6 +67,16 @@ module Decidim
                 inclusion: { in: Decidim::Organization::AVAILABLE_MACHINE_TRANSLATION_DISPLAY_PRIORITIES },
                 if: :machine_translation_enabled?
 
+      validates :official_img_footer,
+                :logo,
+                passthru: { to: Decidim::Organization }
+
+      validates :omnipresent_banner_url, url: true, presence: true, if: :enable_omnipresent_banner?
+      validates :omnipresent_banner_title, translatable_presence: true, if: :enable_omnipresent_banner?
+      validates :omnipresent_banner_short_description, translatable_presence: true, if: :enable_omnipresent_banner?
+
+      alias enable_omnipresent_banner? enable_omnipresent_banner
+
       def machine_translation_priorities
         Decidim::Organization::AVAILABLE_MACHINE_TRANSLATION_DISPLAY_PRIORITIES.map do |priority|
           [

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

@@ -52,20 +52,40 @@ 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", "aria-hidden": true) do
+      #
+      def dropdown_submenu(options, menu_id)
+        css_classes = menu_id.starts_with?("top-") ? "dropdown" : "dropdown dropdown__right z-#{options.length * 10}"
+
+        content_tag(:ul, id: "dropdown-filters-#{menu_id}", class: css_classes, "aria-hidden": true) do
           options.map do |key, value|
             if value.nil?
-              content_tag(:li, key)
+              content_tag(:li, class: "dropdown__item") do
+                concat content_tag(:span, class: "dropdown__button") { key }
+              end
             elsif value.is_a?(Hash)
-              content_tag(:li, class: "is-dropdown-submenu-parent") do
-                key + dropdown_submenu(value)
+              child_id = SecureRandom.uuid
+              content_tag(:li, class: "dropdown__item") do
+                dropdown_link(key, child_id) + dropdown_submenu(value, child_id)
               end
             end
           end.join.html_safe
         end
       end
 
+      def dropdown_link(key, menu_id)
+        link_to("#", class: "dropdown__button", data: { controller: "dropdown", target: "dropdown-filters-#{menu_id}" }) do
+          safe_join([
+                      content_tag(:span) { extract_html_value(key) },
+                      icon("arrow-right-s-line", class: "fill-secondary absolute right-2"),
+                      icon("arrow-right-s-line", class: "!fill-current !text-white absolute right-2")
+                    ])
+        end
+      end
+
+      def extract_html_value(html_string)
+        Nokogiri::HTML.fragment(html_string).at("a").text
+      end
+
       def filter_link_label(filter, i18n_scope)
         link_to(i18n_filter_label(filter, i18n_scope), href: "#")
       end
@@ -109,7 +129,7 @@ module Decidim
       end
 
       def applied_filter_tag(filter, value, i18n_scope)
-        content_tag(:span, class: "label secondary") do
+        content_tag(:span, class: "label reverse") do
           concat "#{i18n_filter_label(filter, i18n_scope)}: "
           concat i18n_filter_value(filter, value, i18n_scope)
           concat remove_filter_icon_link(filter)
@@ -127,8 +147,7 @@ module Decidim
         icon_link_to(
           "delete-bin-line",
           url_for(query_params_without(filter)),
-          t("decidim.admin.actions.cancel"),
-          class: "action-icon--remove"
+          t("decidim.admin.actions.cancel")
         )
       end
 

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

@@ -17,12 +17,11 @@ module Decidim
         with_tooltip(title, options.merge(class: "top")) do
           link_to(link,
                   method: options[:method],
-                  class: "action-icon #{options[:class]}",
+                  class: options[:class],
                   data: options[:data] || {},
                   title:,
                   target: options[:target]) do
-            content_tag(:span, data: { tooltip: true, disable_hover: false, click_open: false },
-                               title:) do
+            content_tag(:span) do
               icon(icon_name, aria_label: title, role: "img")
             end
           end

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

@@ -11,8 +11,7 @@ module Decidim
       #             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
+          content_tag(:span) do
             icon(icon_name, aria_label: title, role: "img")
           end
         end

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

@@ -43,11 +43,6 @@ module Decidim
         accepted_mime_types = Decidim::Admin::Import::Readers::ACCEPTED_MIME_TYPES.keys
         accepted_mime_types.index_with { |mime_type| I18n.t("decidim.admin.imports.new.accepted_mime_types.#{mime_type}") }
       end
-
-      # Returns verified user groups of current user
-      def user_groups
-        Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
-      end
     end
   end
 end

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

@@ -29,7 +29,8 @@ module Decidim
           target_menu,
           self,
           container_options: { class: "dropdown dropdown__bottom" },
-          element_class: "dropdown__item",
+          element_class: "dropdown__button",
+          element_wrapper_class: "dropdown__item",
           active_class: "is-active"
         )
       end
@@ -38,7 +39,7 @@ module Decidim
         ::Decidim::Admin::SecondaryMenuPresenter.new(
           target_menu,
           self,
-          element_class: "sidebar-menu__item",
+          element_wrapper_class: "sidebar-menu__item",
           active_class: "is-active"
         )
       end

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

@@ -12,7 +12,7 @@ module Decidim
 
         # Public: Returns the reportable's author names separated by commas.
         def reportable_author_name(reportable)
-          reportable_authors = reportable.try(:authors) || [reportable.try(:normalized_author)]
+          reportable_authors = reportable.try(:authors) || [reportable.try(:author)]
           content_tag :ul, class: "reportable-authors" do
             reportable_authors.compact_blank.map do |author|
               case author

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

@@ -6,18 +6,18 @@ module Decidim
       # Public: Render a link to the permissions page for the resource.
       #
       # resource - The resource which permissions are going to be modified
-      def resource_permissions_link(resource)
+      def dropdown_resource_permissions_link(resource)
         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-2-line",
-                     current_participatory_space_admin_proxy.edit_component_permissions_path(
-                       current_component.id,
-                       resource_name: resource.resource_manifest.name,
-                       resource_id: resource.id
-                     ),
-                     t("actions.permissions", scope: "decidim.admin"),
-                     class: "action-icon--permissions #{"action-icon--highlighted" if resource.permissions.present?}"
+        link_to current_participatory_space_admin_proxy.edit_component_permissions_path(
+          current_component.id,
+          resource_name: resource.resource_manifest.name,
+          resource_id: resource.id
+        ), class: "dropdown__button" do
+          concat icon "key-2-line"
+          concat t("actions.permissions", scope: "decidim.admin")
+        end
       end
 
       # Public: Render a link to the permissions page for a resource not
@@ -28,10 +28,10 @@ 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-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?}"
+        link_to send("edit_#{resource_key}_permissions_path", resource, resource_name: resource.resource_manifest.name), class: "dropdown__button" do
+          concat icon "key-2-line"
+          concat t("actions.permissions", scope: "decidim.admin")
+        end
       end
     end
   end

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

@@ -91,15 +91,23 @@ module Decidim
       # @param name (see #settings_attribute_input)
       # @param i18n_scope (see #settings_attribute_input)
       # @param options (see #settings_attribute_input)
-      # @option :tabs_prefix (see #settings_attribute_input)
-      # @option :readonly (see #settings_attribute_input)
+      # @option options [String] :tabs_prefix (see #settings_attribute_input)
+      # @option options [Boolean] :readonly (see #settings_attribute_input)
       # @option options [String] :label The label that this field has
       # @option options [String] :help_text The help text shown after the input field
       # @return (see #settings_attribute_input)
       def render_select_form_field(form, attribute, name, i18n_scope, options)
+        choices = attribute.build_choices(component: @component).map do |o|
+          if attribute.raw_choices
+            o
+          else
+            [t("#{name}_options.#{o}", scope: i18n_scope), o]
+          end
+        end
+
         html = form.select(
           name,
-          attribute.build_choices.map { |o| [t("#{name}_options.#{o}", scope: i18n_scope), o] },
+          choices,
           { include_blank: attribute.include_blank, label: options[:label] }
         )
         html << content_tag(:p, options[:help_text], class: "help-text") if options[:help_text]

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

@@ -6,6 +6,7 @@ module Decidim
     #
     class NewsletterJob < ApplicationJob
       queue_as :newsletter
+      self.enqueue_after_transaction_commit = :never
 
       def perform(newsletter, form, recipients_ids)
         @newsletter = newsletter

data/app/packs/entrypoints/decidim_admin.js

@@ -5,7 +5,6 @@ import "src/decidim/admin/tab_focus"
 import initLanguageChangeSelect from "src/decidim/admin/choose_language"
 import "src/decidim/admin/application"
 import "src/decidim/admin/resources_permissions"
-import "src/decidim/admin/welcome_notification"
 import "src/decidim/admin/newsletters"
 import "src/decidim/admin/form"
 import "src/decidim/admin/external_domain_allowlist"
@@ -16,7 +15,6 @@ import "src/decidim/admin/managed_moderated_users"
 import "src/decidim/admin/moderations"
 import "src/decidim/admin/global_moderations"
 import "src/decidim/admin/officializations"
-import "src/decidim/slug_form"
 import "src/decidim/admin/admin_autocomplete"
 import "src/decidim/admin/triadic_color_picker"
 import "src/decidim/admin/participatory_space_search"
@@ -28,6 +26,7 @@ import "src/decidim/admin/taxonomy_filters"
 // CSS
 import "entrypoints/decidim_admin.scss";
 
-window.addEventListener("DOMContentLoaded", () => {
+document.addEventListener("turbo:load", () => {
   initLanguageChangeSelect(document.querySelectorAll("select.language-change"));
 });
+

data/app/packs/entrypoints/decidim_admin.scss

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

data/app/packs/entrypoints/decidim_admin_overrides.scss

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

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

@@ -1,4 +1,4 @@
-import AutoComplete from "src/decidim/autocomplete";
+import AutoComplete from "src/decidim/refactor/moved/autocomplete";
 
 /**
  * This function can be used to create an autocomplete input automatically
@@ -74,7 +74,7 @@ const autoConfigure = (el) => {
   return ac;
 }
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   const $autocompleteDiv = $("[data-autocomplete]");
   if ($autocompleteDiv.length < 1) {
     return;

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

@@ -1,10 +1,10 @@
 /* eslint-disable no-invalid-this */
 
+import Configuration from "src/decidim/refactor/implementation/configuration"
+
+
 import toggleNav from "src/decidim/admin/toggle_nav";
 import createSortList from "src/decidim/admin/sort_list.component";
-import FormFilterComponent from "src/decidim/form_filter";
-import Configuration from "src/decidim/configuration";
-import InputCharacterCounter from "src/decidim/input_character_counter";
 import managedUsersForm from "src/decidim/admin/managed_users";
 
 import "chartkick/chart.js";
@@ -12,14 +12,18 @@ import "chartkick/chart.js";
 window.Decidim = window.Decidim || {};
 window.Decidim.managedUsersForm = managedUsersForm;
 window.Decidim.config = new Configuration();
-window.Decidim.InputCharacterCounter = InputCharacterCounter;
+
+
+const context = require.context("./controllers", true, /controller\.js$/)
+window.Stimulus.load(window.definitionsFromContext(context))
+
 
 // REDESIGN_PENDING: deprecated
 window.initFoundation = (element) => {
   $(element).foundation();
 };
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   window.initFoundation(document);
 
   $(document).on("show.zf.dropdownMenu", function(event, $element) {
@@ -51,9 +55,6 @@ $(() => {
     }
   });
 
-  $("form.new_filter").each(function () {
-    const formFilter = new FormFilterComponent($(this));
-
-    formFilter.mountComponent();
-  });
+  document.querySelectorAll("form.new_filter").forEach((container) =>
+    window.deprecate(container, "form-filter", "form.new_filter"))
 });

data/app/packs/src/decidim/admin/budget_rule_toggler.component.js

@@ -1,50 +1,100 @@
+/**
+ * BudgetRuleTogglerComponent
+ *
+ * Handles showing and hiding rule-specific input containers
+ * based on the selected radio option.
+ */
 export default class BudgetRuleTogglerComponent {
+
+  /**
+   * @param {Object} options - Configuration options
+   * @param {HTMLInputElement[]} options.ruleRadios - Array of radio inputs controlling the rules
+   * @param {Record<string, string[]>} options.mapping - Mapping from radio values to selectors of containers to show
+   */
   constructor(options = {}) {
-    this.ruleCheckboxes = options.ruleCheckboxes;
-    this._runAll();
+    this.ruleRadios = options.ruleRadios;
+    this.mapping = options.mapping || {};
   }
 
-  _runAll() {
-    this.ruleCheckboxes.each((_i, checkbox) => {
-      this._bindEvent(checkbox);
-      this.run(checkbox);
-    });
+  /**
+   * Initialize the component (bind events + run initial state).
+   * @returns {void}
+   */
+  init() {
+    this._bindEvents();
+    this._runInitial();
   }
 
-  _bindEvent(target) {
-    $(target).on("change", (event) => {
-      this.run(event.target);
+  /**
+   * Bind change events on all radios
+   * @private
+   * @returns {void}
+   */
+  _bindEvents() {
+    this.ruleRadios.forEach((radio) => {
+      radio.addEventListener("change", (event) => {
+        this._run(event.target);
+      });
     });
   }
 
-  run(target) {
-    this.toggleTextInput(target);
-
-    if ($(target).prop("checked")) {
-      this.ruleCheckboxes.filter(
-        (_i, checkbox) => {
-          return checkbox !== target;
-        }).prop("checked", false).each(
-        (_i, checkbox) => {
-          this.toggleTextInput(checkbox);
-        });
+  /**
+   * Run toggler logic on page load
+   * @private
+   * @returns {void}
+   */
+  _runInitial() {
+    const checked = this.ruleRadios.find((radio) => radio.checked);
+    if (checked) {
+      this._run(checked);
+    } else {
+      this._hideAll();
     }
   }
 
-  toggleTextInput(target) {
-    const container = $(target).closest("div");
-    if (container.length < 1) {
-      return;
-    }
-    const containerClassPrefix = container.attr("class").
-      replace(/^vote_rule_/, "vote_").
-      replace(/_enabled_container$/, "");
-    const input = $(`[class^="${containerClassPrefix}"][class$="_container"]`);
+  /**
+   * Show the containers associated with the selected radio
+   * @param {HTMLInputElement} target - The radio input that triggered the change
+   * @private
+   * @returns {void}
+   */
+  _run(target) {
+    this._hideAll();
 
-    if ($(target).prop("checked")) {
-      input.slideDown();
-    } else {
-      input.slideUp();
+    // Normalize radio value (snake_case → camelCase)
+    const rawValue = target.value;
+    const camelValue = rawValue.replace(/_([a-z])/g, (_match, letter) => letter.toUpperCase());
+
+    const selectors = this.mapping[camelValue] || [];
+
+    selectors.forEach((selector) => this._show(selector));
+  }
+
+  /**
+   * Hide all containers referenced in the mapping
+   * @private
+   * @returns {void}
+   */
+  _hideAll() {
+    const allSelectors = Object.values(this.mapping).flat();
+    allSelectors.forEach((selector) => {
+      const el = document.querySelector(selector);
+      if (el) {
+        el.style.display = "none";
+      }
+    });
+  }
+
+  /**
+   * Show a container by selector
+   * @param {string} selector - CSS selector of the container to show
+   * @private
+   * @returns {void}
+   */
+  _show(selector) {
+    const el = document.querySelector(selector);
+    if (el) {
+      el.style.display = "";
     }
   }
 }

data/app/packs/src/decidim/admin/controllers/slug/controller.js

@@ -0,0 +1,25 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  connect() {
+    this.input =  this.element.querySelector("input");
+    this.target = this.element.querySelector("span.slug-url-value");
+    this.boundUpdate = null;
+
+    if (this.input) {
+      this.boundUpdate = this.slugUpdater.bind(this);
+      this.input.addEventListener("keyup", this.boundUpdate)
+    }
+  }
+
+  disconnect() {
+    if (this.boundUpdate !== null) {
+      this.input.removeEventListener("keyup", this.boundUpdate)
+      this.boundUpdate = null;
+    }
+  }
+
+  slugUpdater(event) {
+    this.target.innerHTML = event.target.value;
+  }
+}