decidim-core 0.29.1 → 0.29.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a3dc5c9feb9a081fb911d75e25eba2847b1d159837b23853140d96f3c6754b
-  data.tar.gz: 18e41bc984ad456282a1b0c9d3ec3fef7fc89376b330b79198fe3e650cee1301
+  metadata.gz: 83ba22655575833dce2ce20e91060aa195abccf10cd5d185dbadbc04e79fcd93
+  data.tar.gz: a53c89d6b0c01046408b2872119406ffbd1a80a50b943256b872c8575b069e4a
 SHA512:
-  metadata.gz: 1c3e01dc59cb7b999828421bfad4e0bdbbddc813200b4b99de17bd89c4b6a664ad0f98af080ec0f84bcd335b89f99fa871c851d56429ee998979ad68bbec4c3c
-  data.tar.gz: 593fff36a401ad9116314865972323861374a70b53883c5c7421f902899d3ea0b934f64aaec1f2c9ed8879440fd647344e60a67beab12e76924851f7b377e788
+  metadata.gz: 07db0787cc696b27044eb8765477b338a16f7263cd29d9231dfd8e7145f5c4b63b19753a90b4d35c5e7614c1a69d47104435fcb2ecf12badea9a1163709ccbef
+  data.tar.gz: 034e07f956b0ad613172afdd3a56cbb3e37e273555537919073bf75b63dfe8b2ab7ec5502ecf87fb224cd5d525ad009a01e0db6742815ce61eec643c0fa1f1ae

data/app/cells/decidim/activity_cell.rb

@@ -105,9 +105,6 @@ module Decidim
       hash << I18n.locale.to_s
       hash << model.class.name.underscore
       hash << model.cache_key_with_version if model.respond_to?(:cache_key_with_version)
-      if (author_cell = author)
-        hash.push(Digest::MD5.hexdigest(author_cell.send(:cache_hash)))
-      end
 
       hash.join(Decidim.cache_key_separator)
     end

data/app/cells/decidim/author/show.erb

@@ -1,6 +1,7 @@
-<% data = has_tooltip? ? { tooltip: render(:profile_minicard).html_safe } : nil %>
-<span class="author" data-author>
-  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}", data: do %>
+<%# If the options hash has the demo key it means we are in the decidim-design engine, so it is not a real-world scenario with actual users %>
+<% tooltip = options.has_key?(:demo) ? { tooltip: render(:profile_minicard).html_safe } : nil %>
+<%= content_tag(:span, class: :author, data: ) do %>
+  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}", data: tooltip do %>
     <% if layout == :compact %>
       <%= render :avatar %>
 
@@ -24,4 +25,4 @@
       <%= render action %>
     <% end %>
   <% end %>
-</span>
+<% end %>

data/app/cells/decidim/author_cell.rb

@@ -47,8 +47,26 @@ module Decidim
       @context_actions_options ||= options[:context_actions].map(&:to_sym)
     end
 
+    def profile_minicard
+      render
+    end
+
     private
 
+    # If the options hash has the demo key it means we are in the decidim-design engine,
+    # so it is not a real-world scenario with actual users
+    def data
+      @data ||= begin
+        internal_data = { author: true }
+        if has_tooltip? && !options.has_key?(:demo)
+          internal_data["remote_tooltip"] = true
+          internal_data["tooltip-url"] = decidim.profile_tooltip_path(raw_model.nickname)
+        end
+
+        internal_data
+      end
+    end
+
     def layout
       @layout ||= LAYOUTS.include?(options[:layout]) ? options[:layout] : :default
     end
@@ -160,5 +178,13 @@ module Decidim
     def resource_name
       @resource_name ||= from_context.class.name.demodulize.underscore
     end
+
+    def has_tooltip?
+      return false if model.deleted?
+      return false if model.respond_to?(:blocked?) && model.blocked?
+      return true if options.has_key?(:tooltip)
+
+      model.has_tooltip?
+    end
   end
 end

data/app/cells/decidim/card_s/show.erb

@@ -1,10 +1,12 @@
-<%= link_to resource_path, class: "card__search", id: dom_id(resource) do %>
+<%= content_tag :div, id: dom_id(resource), class: "card__search" do %>
   <%= content_tag title_tag, class: "h4 card__search-title" do %>
-    <%= title %>
+    <%= link_to resource_path, class: "card__search" do %>
+      <%= title %>
+    <% end %>
   <% end %>
   <% if metadata_cell.present? %>
     <div class="card__search-metadata">
-      <%= cell metadata_cell, resource, links: false %>
+     <%= cell metadata_cell, resource, links: false %>
     </div>
   <% end %>
 <% end %>

data/app/cells/decidim/diff_cell.rb

@@ -70,6 +70,10 @@ module Decidim
 
     # DiffRenderer class for the current_version's item; falls back to `BaseDiffRenderer`.
     def diff_renderer_class
+      renderer_class = "#{current_version.item_type}DiffRenderer".safe_constantize
+
+      return renderer_class if renderer_class
+
       if current_version.item_type.deconstantize == "Decidim"
         "#{current_version.item_type.pluralize}::DiffRenderer".constantize
       else

data/app/cells/decidim/newsletter_templates/image_text_cta_cell.rb

@@ -50,7 +50,7 @@ module Decidim
       end
 
       def main_image_url
-        newsletter.template.images_container.attached_uploader(:main_image).url(host: organization.host)
+        newsletter.template.images_container.attached_uploader(:main_image).url
       end
 
       def organization_primary_color

data/app/cells/decidim/translation_bar/show.erb

@@ -1,6 +1,6 @@
 <div>
-  <div class="row column">
+  <div class="pt-4 pb-4 text-center bg-background">
     <%= link %>
-    <span class="translation-button-help"><%= help_text %></span>
+    <span class="translation-button-help ml-4"><%= help_text %></span>
   </div>
 </div>

data/app/cells/decidim/translation_bar_cell.rb

@@ -32,7 +32,7 @@ module Decidim
       parsed_url.query = new_query
       url = parsed_url.to_s
 
-      link_to button_text, url, class: "button small hollow"
+      link_to button_text, url, class: "button button__sm button__transparent-secondary"
     end
 
     def button_text

data/app/commands/decidim/destroy_account.rb

@@ -37,6 +37,9 @@ module Decidim
       current_user.name = ""
       current_user.nickname = ""
       current_user.email = ""
+      current_user.personal_url = ""
+      current_user.about = ""
+      current_user.notifications_sending_frequency = "none"
       current_user.delete_reason = @form.delete_reason
       current_user.admin = false if current_user.admin?
       current_user.deleted_at = Time.current

data/app/controllers/decidim/doorkeeper/credentials_controller.rb

@@ -28,7 +28,7 @@ module Decidim
       end
 
       def avatar_url
-        avatar_url = current_resource_owner.attached_uploader(:avatar).url(host: current_resource_owner.organization.host)
+        avatar_url = current_resource_owner.attached_uploader(:avatar).url
         return unless avatar_url
 
         unless %r{^https?://}.match? avatar_url

data/app/controllers/decidim/links_controller.rb

@@ -41,7 +41,7 @@ module Decidim
     end
 
     def escape_url(external_url)
-      before_fragment, fragment = external_url.split("#", 2)
+      before_fragment, fragment = URI.decode_www_form_component(external_url).split("#", 2)
       escaped_before_fragment = URI::Parser.new.escape(before_fragment)
 
       if fragment

data/app/controllers/decidim/profiles_controller.rb

@@ -27,6 +27,10 @@ module Decidim
       redirect_to profile_activity_path(nickname: params[:nickname])
     end
 
+    def tooltip
+      render json: { data: cell("decidim/author", profile_holder.presenter).profile_minicard }
+    end
+
     def following
       @content_cell = "decidim/following"
       @title_key = "following"

data/app/helpers/concerns/decidim/user_role_checker.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module UserRoleChecker
+    # Shared behaviour for signed_in admins
+    extend ActiveSupport::Concern
+
+    private
+
+    def user_has_any_role?(user, participatory_space = nil, broad_check: false)
+      return false unless user
+
+      [
+        user.admin,
+        user.roles.any?,
+        participatory_process_user_role?(user, participatory_space, broad_check:),
+        assembly_user_role?(user, participatory_space, broad_check:),
+        conference_user_role?(user, participatory_space, broad_check:)
+      ].any?
+    end
+
+    def participatory_process_user_role?(user, participatory_process = nil, broad_check: false)
+      return false unless Decidim.module_installed?(:participatory_processes)
+      return Decidim::ParticipatoryProcessUserRole.exists?(user:) if broad_check
+      return false unless participatory_process.is_a?(Decidim::ParticipatoryProcess)
+
+      Decidim::ParticipatoryProcessUserRole.exists?(user:, participatory_process:)
+    end
+
+    def assembly_user_role?(user, assembly = nil, broad_check: false)
+      return false unless Decidim.module_installed?(:assemblies)
+      return Decidim::AssemblyUserRole.exists?(user:) if broad_check
+      return false unless assembly.is_a?(Decidim::Assembly)
+
+      Decidim::AssemblyUserRole.exists?(user:, assembly:)
+    end
+
+    def conference_user_role?(user, conference = nil, broad_check: false)
+      return false unless Decidim.module_installed?(:conferences)
+      return Decidim::ConferenceUserRole.exists?(user:) if broad_check
+      return false unless conference.is_a?(Decidim::Conference)
+
+      Decidim::ConferenceUserRole.exists?(user:, conference:)
+    end
+  end
+end

data/app/helpers/decidim/cta_button_helper.rb

@@ -16,7 +16,7 @@ module Decidim
     # Finds the CTA button path to reuse it in other places.
     def cta_button_path
       if current_organization.cta_button_path.present?
-        current_organization.cta_button_path
+        "/#{current_organization.cta_button_path}"
       elsif Decidim::ParticipatoryProcess.where(organization: current_organization).published.any?
         decidim_participatory_processes.participatory_processes_path
       elsif current_user

data/app/helpers/decidim/map_helper.rb

@@ -35,7 +35,12 @@ module Decidim
             data: { "external-link": "text-only" }
           }.merge(map_html_options)
           return link_to(map_url, html_options) do
-            image_tag decidim.static_map_path(sgid: resource.to_sgid.to_s), alt: "#{map_service_brand} - #{address_text}"
+            # We also add the latitude and the longitude to prevent the Workbox cache to be overly aggressive when updating a map
+            image_tag decidim.static_map_path(
+              sgid: resource.to_sgid.to_s,
+              latitude: resource.latitude,
+              longitude: resource.longitude
+            ), alt: "#{map_service_brand} - #{address_text}"
           end
         end
       end

data/app/helpers/decidim/sanitize_helper.rb

@@ -37,13 +37,22 @@ module Decidim
       end
     end
 
+    # Converts the blob and blob variant references to blob URLs.
+    def decidim_rich_text(html, **)
+      renderer = Decidim::ContentProcessor.renderer_klass(:blob).constantize.new(html)
+      renderer.render(**)
+    end
+
     def decidim_sanitize_editor(html, options = {})
       content_tag(:div, decidim_sanitize(html, options), class: %w(rich-text-display))
     end
 
     def decidim_sanitize_editor_admin(html, options = {})
       html = Decidim::IframeDisabler.new(html, options).perform
-      decidim_sanitize_editor(html, { scrubber: Decidim::AdminInputScrubber.new }.merge(options))
+      decidim_sanitize_editor(
+        decidim_rich_text(html),
+        { scrubber: Decidim::AdminInputScrubber.new }.merge(options)
+      )
     end
 
     def decidim_html_escape(text)
@@ -51,7 +60,7 @@ module Decidim
     end
 
     def decidim_url_escape(text)
-      decidim_html_escape(text).sub(/^javascript:/, "")
+      decidim_html_escape(text).sub(/^\s*javascript:/, "")
     end
 
     def decidim_sanitize_translated(text)

data/app/models/decidim/attachment.rb

@@ -74,7 +74,7 @@ module Decidim
     # Returns String.
     def file_type
       if file?
-        url&.split(".")&.last&.downcase
+        url&.split(".")&.last&.split("&")&.first&.downcase
       elsif link?
         "link"
       end

data/app/packs/src/decidim/append_redirect_url_to_modals.js

@@ -53,10 +53,18 @@ $(() => {
   }
 
   $(document).on("click.zf.trigger", (event) => {
-    const target = `#${$(event.target).data("dialogOpen")}`;
-    const redirectUrl = $(event.target).data("redirectUrl");
+    // Try to get the <a> directly or find the closest parent <a>
+    const $target = $(event.target).closest("a");
 
-    if (!target || !redirectUrl) {
+    // Check if an <a> was found
+    if (!$target) {
+      return;
+    }
+
+    const dialogTarget = `#${$target.data("dialog-open")}`;
+    const redirectUrl = $target.data("redirectUrl");
+
+    if (!dialogTarget || !redirectUrl) {
       return;
     }
 
@@ -64,10 +72,10 @@ $(() => {
       attr("id", "redirect_url").
       attr("name", "redirect_url").
       attr("value", redirectUrl).
-      appendTo(`${target} form`);
+      appendTo(`${dialogTarget} form`);
 
-    $(`${target} a`).attr("href", (index, href) => {
-      const querystring = jQuery.param({ "redirect_url": redirectUrl });
+    $(`${dialogTarget} a`).attr("href", (index, href) => {
+      const querystring = jQuery.param({"redirect_url": redirectUrl});
       return href + (href.match(/\?/) ? "&" : "?") + querystring;
     });
   });

data/app/packs/src/decidim/direct_uploads/upload_field.js

@@ -21,6 +21,7 @@ const updateActiveUploads = (modal) => {
   const files = document.querySelector(`[data-active-uploads=${modal.modal.id}]`)
   const previousId = Array.from(files.querySelectorAll("[type=hidden][id]"))
   const isMultiple = modal.options.multiple
+  const isTitled = modal.options.titled
 
   // fastest way to clean children nodes
   files.textContent = ""
@@ -34,16 +35,26 @@ const updateActiveUploads = (modal) => {
     let hidden = ""
     if (file.hiddenField) {
       // if there is hiddenField, this file is new
-      const fileField = isMultiple
-        ? `${modal.options.resourceName}[${modal.options.addAttribute}][${ix}][file]`
-        : `${modal.options.resourceName}[${modal.options.addAttribute}]`
+      let fileField = null;
+      if (isMultiple) {
+        fileField = `${modal.options.resourceName}[${modal.options.addAttribute}][${ix}][file]`
+      } else if (isTitled) {
+        fileField = `${modal.options.resourceName}[${modal.options.addAttribute}][file]`
+      } else {
+        fileField = `${modal.options.resourceName}[${modal.options.addAttribute}]`;
+      }
 
       hidden = `<input type="hidden" name="${fileField}" value="${file.hiddenField}" />`
     } else {
       // otherwise, we keep the attachmentId
-      const fileField = isMultiple
-        ? `${modal.options.resourceName}[${modal.options.addAttribute}][${ix}][id]`
-        : `${modal.options.resourceName}[${modal.options.addAttribute}]`
+      let fileField = null;
+      if (isMultiple) {
+        fileField = `${modal.options.resourceName}[${modal.options.addAttribute}][${ix}][id]`;
+      } else if (isTitled) {
+        fileField = `${modal.options.resourceName}[${modal.options.addAttribute}][id]`;
+      } else {
+        fileField = `${modal.options.resourceName}[${modal.options.addAttribute}]`;
+      }
 
       // convert all node attributes to string
       const attributes = Array.from(previousId.find(({ id }) => id === file.attachmentId).attributes).reduce((acc, { name, value }) => `${acc} ${name}="${value}"`, "")
@@ -51,10 +62,12 @@ const updateActiveUploads = (modal) => {
       hidden += `<input type="hidden" name="${fileField}" value="${file.attachmentId}" />`
     }
 
-    if (modal.options.titled) {
+    if (isTitled) {
       const titleValue = modal.modal.querySelectorAll('input[type="text"]')[ix].value
       // NOTE - Renaming the attachment is not supported when multiple uploader is disabled
-      const titleField = `${modal.options.resourceName}[${modal.options.addAttribute}][${ix}][title]`
+      const titleField = isMultiple
+        ? `${modal.options.resourceName}[${modal.options.addAttribute}][${ix}][title]`
+        : `${modal.options.resourceName}[${modal.options.addAttribute}][title]`
       hidden += `<input type="hidden" name="${titleField}" value="${escapeQuotes(titleValue)}" />`
 
       title = titleValue

data/app/packs/src/decidim/index.js

@@ -69,6 +69,7 @@ import handleNotificationActions from "src/decidim/notifications_actions"
 import RemoteModal from "src/decidim/remote_modal"
 import selectActiveIdentity from "src/decidim/identity_selector_dialog"
 import createTooltip from "src/decidim/tooltips"
+import fetchRemoteTooltip from "src/decidim/remote_tooltips"
 import createToggle from "src/decidim/toggle"
 import {
   createAccordion,
@@ -195,6 +196,8 @@ const initializer = (element = document) => {
   // Initialize data-toggles
   element.querySelectorAll("[data-toggle]").forEach((elem) => createToggle(elem))
 
+  element.querySelectorAll("[data-remote-tooltip]").forEach((elem) => fetchRemoteTooltip(elem))
+
   element.querySelectorAll(".new_report").forEach((elem) => changeReportFormBehavior(elem))
 }
 

data/app/packs/src/decidim/remote_tooltips.js

@@ -0,0 +1,38 @@
+import createTooltip from "src/decidim/tooltips"
+
+/**
+ * Given the following HTML structure,
+ * <span data-remote-tooltip="true" tooltip-url="some url" data-author="true">
+ *   <span></span>
+ * </span>
+ *
+ * This function will check if the HTMLElement where is attached to has a child, and will add a data tooltip attribute
+ * to the respective child in order to attach the fetched HTML content fetched under a json key as the content of the
+ * HTML tooltip. The DOM structure is expected to be like follows:
+ *
+ * <span data-remote-tooltip="true" tooltip-url="some url" data-author="true">
+ *   <span data-tooltip="HTML content from json data field"></span>
+ * </span>
+ *
+ * @param {HTMLElement} node The element holding the initialization data
+ * @returns {void}
+ */
+export default async function(node) {
+  const container = node.firstElementChild;
+
+  if (container) {
+    const response = await fetch(node.dataset.tooltipUrl, {
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+    if (response.ok) {
+      const json = await response.json();
+
+      container.dataset.tooltip = json.data;
+      createTooltip(container);
+    } else {
+      console.error(response.status, response.statusText);
+    }
+  }
+}

data/app/packs/src/decidim/toggle.js

@@ -9,7 +9,7 @@ export default function createToggle(component) {
   const { toggle } = component.dataset
 
   if (!component.id) {
-    // when component has no id, we enforce to have it one
+    // when component has no id, we enforce it to have one
     component.id = `toggle-${Math.random().toString(36).substring(7)}`
   }
 

data/app/packs/src/decidim/tooltips.js

@@ -63,9 +63,32 @@ export default function(node) {
   // append to dom hidden, to apply css transitions
   tooltip.setAttribute("aria-hidden", true)
 
-  const append = () => {
-    // do nothing if the tooltip is already present at the DOM
+  // used to detect if the user is on a mobile device by checking the user agent
+  const useMobile = (/Mobi|Android/i).test(navigator.userAgent);
+
+  // used not to collapse tooltip
+  let removeTooltip = () => {
+    tooltip.setAttribute("aria-hidden", "true");
+  }
+
+  // used to allow clicks outside the tooltip to take place on the page or device
+  const OutsideClick = (event) => {
+    if (!tooltip.contains(event.target) && event.target !== node) {
+      removeTooltip();
+    }
+  }
+
+  // function called again to allow clicks outside the tooltip to collapse the tooltip
+  removeTooltip = () => {
+    tooltip.setAttribute("aria-hidden", "true");
+    document.removeEventListener("click", OutsideClick)
+  }
+
+  const toggleTooltip = (event) => {
+    event.preventDefault();
+    // if the tooltip is visible in the DOM, hide it otherwise display
     if (tooltip.getAttribute("aria-hidden") === "false") {
+      tooltip.setAttribute("aria-hidden", "true");
       return
     }
 
@@ -106,27 +129,24 @@ export default function(node) {
     tooltip.style.left = `${positionX}px`
 
     tooltip.setAttribute("aria-hidden", false)
-  }
-
-  // in order to revoke the remove event when the mouse is over the trigger/tooltip
-  let cancelRemove = false
 
-  const remove = () => {
-    cancelRemove = false
-    // give some sleep time before hiding the element from the DOM
-    setTimeout(() => !cancelRemove && tooltip.setAttribute("aria-hidden", true), 500);
+    // sleep time before hiding the element from the DOM
+    setTimeout(() => document.addEventListener("click", OutsideClick))
   }
 
-  // keyboard listener is at root-level
-  window.addEventListener("keydown", (event) => event.key === "Escape" && remove())
-
-  node.addEventListener("mouseenter", append)
-  node.addEventListener("mouseleave", remove)
-  node.addEventListener("focus", append)
-  node.addEventListener("blur", remove)
-  tooltip.addEventListener("mouseenter", () => tooltip.setAttribute("aria-hidden", false))
-  tooltip.addEventListener("mouseleave", remove)
-
-  node.addEventListener("mouseover", () => (cancelRemove = true))
-  tooltip.addEventListener("mouseover", () => (cancelRemove = true))
+  if (useMobile) {
+    // mobile use to click and toggle the tooltip
+    node.addEventListener("click", toggleTooltip);
+    window.addEventListener("keydown", (event) => event.key === "Escape" && removeTooltip())
+  } else {
+    // desktop use for hover and blur over tooltip
+    node.addEventListener("mouseenter", toggleTooltip)
+    node.addEventListener("mouseleave", removeTooltip)
+    node.addEventListener("focus", toggleTooltip)
+    node.addEventListener("blur", removeTooltip)
+
+    // tooltip hover listeners to prevent hiding when hovered
+    tooltip.addEventListener("mouseenter", () => tooltip.setAttribute("aria-hidden", false))
+    tooltip.addEventListener("mouseleave", removeTooltip)
+  }
 }

data/app/packs/stylesheets/decidim/_labels.scss

@@ -6,7 +6,7 @@
   --warning: #ad4910;
   --bg-warning: #ffeebd;
 
-  @apply bg-background text-gray-2 rounded inline-flex items-center gap-1 px-2 font-semibold text-sm;
+  @apply bg-background text-gray-2 rounded inline-flex items-center gap-1 px-2 py-1 h-min font-semibold text-sm;
 
   &.success {
     @apply bg-[var(--bg-success)] text-[var(--success)];

data/app/packs/stylesheets/decidim/_profile.scss

@@ -45,7 +45,7 @@
 
   &__actions {
     &-main {
-      @apply w-fit grid grid-cols-2 md:grid-cols-1 mx-auto gap-x-4 gap-y-6 md:gap-4;
+      @apply w-fit mx-auto gap-x-4 gap-y-6 md:gap-4;
 
       &__dropdown {
         @apply divide-y divide-gray-3 z-20 w-64;

data/app/packs/stylesheets/decidim/_progress-bar.scss

@@ -29,7 +29,7 @@
   }
 
   &__sm {
-    @apply w-16;
+    @apply w-16 pt-2;
   }
 
   &__sm &__number {

data/app/packs/stylesheets/decidim/legacy/conference-diploma.scss

@@ -37,7 +37,6 @@
 }
 
 .conference-diploma .diploma__logo {
-  border: 1px solid #333;
   padding: 2rem;
 }
 
@@ -47,10 +46,12 @@
     max-height: 100%;
     max-width: 100%;
     margin: 0;
+    padding-top: 10%;
   }
 
   .conference-diploma .diploma__border {
     margin: 0;
+    margin-top: 15%;
     -moz-border-image: url("../images/decidim/pattern.png") 20 repeat;
     -webkit-border-image: url("../images/decidim/pattern.png") 20 repeat;
     -o-border-image: url("../images/decidim/pattern.png") 20 repeat;

data/app/presenters/decidim/attachment_presenter.rb

@@ -6,7 +6,7 @@ module Decidim
   #
   class AttachmentPresenter < SimpleDelegator
     def attachment_file_url
-      attachment.attached_uploader(:file).url(host: attached_to.organization.host)
+      attachment.attached_uploader(:file).url
     end
 
     def attachment