decidim-core 0.29.4 → 0.30.0.rc1

data/app/models/decidim/taxonomy.rb

@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Represents a hierarchical classification used to organize various entities within the system.
+  # Taxonomies are primarily used to categorize and manage different aspects of participatory spaces,
+  # such as proposals, assemblies, and other components, within an organization.
+  class Taxonomy < ApplicationRecord
+    include Decidim::TranslatableResource
+    include Decidim::FilterableResource
+    include Decidim::Traceable
+
+    before_create :set_default_weight
+    before_validation :update_part_of, on: [:update, :create]
+    after_create_commit :create_part_of
+
+    translatable_fields :name
+
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Decidim::Organization",
+               inverse_of: :taxonomies
+
+    belongs_to :parent,
+               class_name: "Decidim::Taxonomy",
+               counter_cache: :children_count,
+               inverse_of: :children,
+               optional: true
+
+    has_many :children,
+             foreign_key: "parent_id",
+             class_name: "Decidim::Taxonomy",
+             inverse_of: :parent,
+             dependent: :destroy
+
+    has_many :taxonomizations, class_name: "Decidim::Taxonomization", dependent: :destroy
+    has_many :taxonomy_filters, foreign_key: "root_taxonomy_id", class_name: "Decidim::TaxonomyFilter", dependent: :destroy
+    has_many :taxonomy_filter_items, foreign_key: "taxonomy_item_id", class_name: "Decidim::TaxonomyFilterItem", dependent: :destroy
+
+    validates :name, presence: true
+    validates :weight, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
+    validate :validate_max_children_levels
+    validate :forbid_cycles
+
+    default_scope { order(:weight) }
+    scope :for, ->(organization) { where(organization:) }
+    scope :roots, -> { where(parent_id: nil) }
+    scope :non_roots, -> { where.not(parent_id: nil) }
+
+    ransacker_i18n :name
+
+    scope :search_by_name, lambda { |name|
+      where("name ->> ? ILIKE ?", I18n.locale.to_s, "%#{name}%")
+    }
+
+    scope :part_of, lambda { |id|
+      where("part_of @> ARRAY[?]", id.to_i)
+    }
+
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::TaxonomyPresenter
+    end
+
+    def self.ransackable_scopes(_auth_object = nil)
+      [:search_by_name, :part_of]
+    end
+
+    def self.ransackable_attributes(_auth_object = nil)
+      %w(id name parent_id part_of)
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w(children)
+    end
+
+    def translated_name
+      Decidim::TaxonomyPresenter.new(self).translated_name
+    end
+
+    def root_taxonomy
+      @root_taxonomy ||= root? ? self : parent.root_taxonomy
+    end
+
+    def parent_ids
+      @parent_ids ||= part_of.excluding(id)
+    end
+
+    def root? = parent_id.nil?
+
+    # this might change in the future if we want to prevent the deletion of taxonomies with associated resources
+    def removable?
+      true
+    end
+
+    def all_children
+      @all_children ||= Decidim::Taxonomy.non_roots.part_of(id).reorder(Arel.sql("array_length(part_of, 1) ASC"), "parent_id ASC", "weight ASC")
+    end
+
+    def reset_all_counters
+      Taxonomy.reset_counters(id, :children_count, :taxonomizations_count, :taxonomy_filters_count, :taxonomy_filter_items_count)
+    end
+
+    private
+
+    def set_default_weight
+      return if weight.present?
+
+      self.weight = Taxonomy.where(parent_id:).count
+    end
+
+    def forbid_cycles
+      return unless parent_id
+
+      errors.add(:parent_id, :invalid) if parent.part_of.include?(id)
+    end
+
+    def create_part_of
+      build_part_of
+      save if changed?
+    end
+
+    def update_part_of
+      build_part_of
+    end
+
+    def build_part_of
+      if parent
+        part_of.clear.append(id).concat(parent.reload.part_of)
+      else
+        part_of.clear.append(id)
+      end
+    end
+
+    def validate_max_children_levels
+      return unless parent_id
+
+      errors.add(:base, :invalid) if parent_ids.size > 3
+    end
+  end
+end

data/app/models/decidim/taxonomy_filter.rb

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Represents the association between a taxonomy and a filterable entity within the system.
+  class TaxonomyFilter < ApplicationRecord
+    include Decidim::TranslatableResource
+    include Decidim::Traceable
+
+    translatable_fields :name, :internal_name
+
+    belongs_to :root_taxonomy,
+               class_name: "Decidim::Taxonomy",
+               counter_cache: :filters_count,
+               inverse_of: :taxonomy_filters
+
+    has_many :filter_items,
+             class_name: "Decidim::TaxonomyFilterItem",
+             inverse_of: :taxonomy_filter,
+             dependent: :destroy
+
+    validate :root_taxonomy_is_root
+    validate :space_manifest_is_registered
+
+    scope :for_manifest, ->(space_manifest) { where("? = ANY(participatory_space_manifests)", space_manifest) }
+    scope :space_filters, -> { where.not(participatory_space_manifests: []) }
+    # filters for the organization
+    scope :for, ->(organization) { joins(:root_taxonomy).where(decidim_taxonomies: { decidim_organization_id: organization.id }) }
+
+    delegate :organization, to: :root_taxonomy
+    delegate :translated_name, :translated_internal_name, to: :presenter
+
+    def presenter
+      Decidim::TaxonomyFilterPresenter.new(self)
+    end
+
+    # Returns the presenter class for this log.
+    #
+    # log - A Decidim::Log instance.
+    #
+    # Returns a Decidim::AdminLog::TaxonomyFilterPresenter class
+    def self.log_presenter_class_for(_log)
+      Decidim::AdminLog::TaxonomyFilterPresenter
+    end
+
+    # Public name for this filter, defaults to the root taxonomy name.
+    def name
+      return root_taxonomy&.name if super&.compact_blank.blank?
+
+      super
+    end
+
+    # Internal name for this filter, defaults to the root taxonomy name.
+    def internal_name
+      return root_taxonomy&.name if super&.compact_blank.blank?
+
+      super
+    end
+
+    # Components that have this taxonomy filter enabled.
+    def components
+      @components ||= Decidim::Component.where("(settings->'global'->'taxonomy_filters') @> ?", "\"#{id}\"")
+    end
+
+    def filter_taxonomy_ids
+      @filter_taxonomy_ids ||= filter_items.map(&:taxonomy_item_id)
+    end
+
+    # A memoized taxonomy tree hash filtered according to the filter_items
+
+    # that respects the order given by the taxonomies table.
+    # The returned hash structure is:
+    # {
+    #  _object_id_ => {
+    #    taxonomy: _object_,
+    #    children: {
+    #        _sub_object_id_: {
+    #          taxonomy: _sub_object_,
+    #          children: {
+    #    ...
+    # }
+    # @returns [Hash] a hash with the taxonomy tree structure.
+    def taxonomies
+      @taxonomies ||= root_taxonomy
+                      .all_children
+                      .where(id: filter_taxonomy_ids)
+                      .each_with_object({}) do |taxonomy, tree|
+        insert_child(taxonomy, tree)
+      end
+    end
+
+    def update_components_count
+      update(components_count: components.count)
+    end
+
+    def reset_all_counters
+      Decidim::TaxonomyFilter.reset_counters(id, :filter_items_count)
+      update_components_count
+    end
+
+    private
+
+    def insert_child(taxonomy, tree)
+      return if tree[taxonomy.id]
+
+      if (parent = find_parent(taxonomy, tree))
+        insert_child(taxonomy, parent[:children])
+      else
+        tree[taxonomy.id] = { taxonomy:, children: {} }
+      end
+    end
+
+    def find_parent(taxonomy, tree)
+      tree[taxonomy.parent_id].presence ||
+        tree.values.detect { |v| find_parent(taxonomy, v[:children]) }
+    end
+
+    def root_taxonomy_is_root
+      return if root_taxonomy&.root?
+
+      errors.add(:root_taxonomy, :invalid)
+    end
+
+    def space_manifest_is_registered
+      available_manifests = Decidim.participatory_space_manifests.map(&:name)
+      return if (participatory_space_manifests.map(&:to_sym) - available_manifests).empty?
+
+      errors.add(:participatory_space_manifests, :invalid)
+    end
+  end
+end

data/app/models/decidim/taxonomy_filter_item.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Represents the association between a taxonomy and a filterable entity within the system.
+  class TaxonomyFilterItem < ApplicationRecord
+    belongs_to :taxonomy_filter,
+               class_name: "Decidim::TaxonomyFilter",
+               counter_cache: :filter_items_count,
+               inverse_of: :filter_items
+
+    belongs_to :taxonomy_item,
+               class_name: "Decidim::Taxonomy",
+               counter_cache: :filter_items_count,
+               inverse_of: :taxonomy_filter_items
+
+    validate :taxonomy_item_is_not_root
+    validate :taxonomy_item_is_child_of_taxonomy_filter_root
+
+    private
+
+    def taxonomy_item_is_not_root
+      return unless taxonomy_item&.root?
+
+      errors.add(:taxonomy_item, :invalid)
+    end
+
+    def taxonomy_item_is_child_of_taxonomy_filter_root
+      return if taxonomy_item&.root_taxonomy == taxonomy_filter&.root_taxonomy
+
+      errors.add(:taxonomy_item, :invalid)
+    end
+  end
+end

data/app/models/decidim/user.rb

@@ -13,6 +13,8 @@ module Decidim
     include Decidim::UserReportable
     include Decidim::Traceable
 
+    REGEXP_NICKNAME = /\A[\w-]+\z/
+
     class Roles
       def self.all
         Decidim.config.user_roles
@@ -33,6 +35,7 @@ module Decidim
     has_many :access_grants, class_name: "Doorkeeper::AccessGrant", foreign_key: :resource_owner_id, dependent: :destroy
     has_many :access_tokens, class_name: "Doorkeeper::AccessToken", foreign_key: :resource_owner_id, dependent: :destroy
     has_many :reminders, foreign_key: "decidim_user_id", class_name: "Decidim::Reminder", dependent: :destroy
+    has_many :private_exports, class_name: "Decidim::PrivateExport", dependent: :destroy, inverse_of: :attached_to, as: :attached_to
 
     validates :name, presence: true, unless: -> { deleted? }
     validates :nickname,
@@ -43,37 +46,28 @@ module Decidim
     validates :locale, inclusion: { in: :available_locales }, allow_blank: true
     validates :tos_agreement, acceptance: true, allow_nil: false, on: :create
     validates :tos_agreement, acceptance: true, if: :user_invited?
+    validates :tos_agreement, acceptance: true, if: :ephemeral?
     validates :email, :nickname, uniqueness: { scope: :organization }, unless: -> { deleted? || managed? || nickname.blank? }
 
     validate :all_roles_are_valid
 
     has_one_attached :download_your_data_file
 
+    scope :not_deleted, -> { where(deleted_at: nil) }
+
     scope :managed, -> { where(managed: true) }
     scope :not_managed, -> { where(managed: false) }
 
     scope :officialized, -> { where.not(officialized_at: nil) }
     scope :not_officialized, -> { where(officialized_at: nil) }
 
-    scope :interested_in_scopes, lambda { |scope_ids|
-      actual_ids = scope_ids.select(&:presence)
-      if actual_ids.count.positive?
-        ids = actual_ids.map(&:to_i).join(",")
-        where(Arel.sql("extended_data->'interested_scopes' @> ANY('{#{ids}}')").to_s)
-      else
-        # Do not apply the scope filter when there are scope ids available. Note
-        # that the active record scope must always return an active record
-        # collection.
-        self
-      end
-    }
-
     scope :org_admins_except_me, ->(user) { where(organization: user.organization, admin: true).where.not(id: user.id) }
 
+    scope :ephemeral, -> { where("extended_data @> ?", Arel.sql({ ephemeral: true }.to_json)) }
+
     attr_accessor :newsletter_notifications
 
     searchable_fields({
-                        # scope_id: :decidim_scope_id,
                         organization_id: :decidim_organization_id,
                         A: :name,
                         B: :nickname,
@@ -191,7 +185,7 @@ module Decidim
     end
 
     def tos_accepted?
-      return true if managed
+      return true if managed && !ephemeral?
       return false if accepted_tos_version.nil?
 
       # For some reason, if we do not use `#to_i` here we get some
@@ -213,14 +207,6 @@ module Decidim
       ImpersonationLog.active.exists?(user: self)
     end
 
-    def interested_scopes_ids
-      extended_data["interested_scopes"] || []
-    end
-
-    def interested_scopes
-      @interested_scopes ||= organization.scopes.where(id: interested_scopes_ids)
-    end
-
     def user_name
       extended_data["user_name"] || name
     end
@@ -274,6 +260,10 @@ module Decidim
       false
     end
 
+    def ephemeral?
+      extended_data["ephemeral"]
+    end
+
     def after_confirmation
       return unless organization.send_welcome_notification?
 

data/app/models/decidim/user_base_entity.rb

@@ -21,13 +21,11 @@ module Decidim
 
     # Regex for name & nickname format validations
     REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|])/
-    REGEXP_NICKNAME = /\A[a-z0-9_-]+\z/
 
     has_one_attached :avatar
     validates_avatar :avatar, uploader: Decidim::AvatarUploader
 
     validates :name, format: { with: REGEXP_NAME }
-    validates :nickname, format: { with: REGEXP_NICKNAME }, unless: -> { deleted? || managed? }
 
     scope :confirmed, -> { where.not(confirmed_at: nil) }
     scope :not_confirmed, -> { where(confirmed_at: nil) }
@@ -36,8 +34,6 @@ module Decidim
     scope :not_blocked, -> { where(blocked: false) }
     scope :available, -> { where(deleted_at: nil, blocked: false, managed: false) }
 
-    scope :not_deleted, -> { where(deleted_at: nil) }
-
     # Public: Returns a collection with all the public entities this user is following.
     #
     # This cannot be done as with a `has_many :following, through: :following_follows`
@@ -69,6 +65,18 @@ module Decidim
       Decidim::UserBaseEntity.joins(:follows).where(decidim_follows: { user: self }).blocked.exists?
     end
 
+    def self.ransackable_attributes(auth_object = nil)
+      base = %w(name email nickname last_sign_in_at)
+
+      return base unless auth_object&.admin?
+
+      base + %w(invitation_sent_at invitation_accepted_at officialized_at)
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      []
+    end
+
     private
 
     def only_public(klass, ids)

data/app/models/decidim/user_moderation.rb

@@ -6,6 +6,7 @@ module Decidim
     include Loggable
 
     belongs_to :user, foreign_key: :decidim_user_id, class_name: "Decidim::UserBaseEntity"
+    has_one :blocking, through: :user
     has_many :reports, class_name: "Decidim::UserReport", dependent: :destroy
 
     scope :blocked, -> { joins(:user).where(decidim_users: { blocked: true }) }
@@ -16,5 +17,13 @@ module Decidim
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::UserModerationPresenter
     end
+
+    def self.ransackable_attributes(_auth_object = nil)
+      []
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w(reports user)
+    end
   end
 end

data/app/models/decidim/user_report.rb

@@ -19,6 +19,10 @@ module Decidim
       # Decidim::DownloadYourDataSerializers::DownloadYourDataReportSerializer
     end
 
+    def self.ransackable_attributes(_auth_object = nil)
+      %w(reason)
+    end
+
     private
 
     # Private: check if the moderation and the user have the same organization

data/app/packs/entrypoints/decidim_core.js

@@ -6,6 +6,7 @@ import "src/decidim/decidim_application"
 
 // CSS
 import "entrypoints/decidim_core.scss"
+import "stylesheets/decidim/resource_history.scss"
 
 // Images
 require.context("../images", true)

data/app/packs/entrypoints/decidim_geocoding.js

@@ -0,0 +1,2 @@
+import "src/decidim/geocoding/reverse_geocoding.js"
+import "stylesheets/decidim/geocoding_addons.scss";

data/app/packs/images/decidim/brands/facebook.svg

@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_29214_25190)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24 12.0707C24 5.40424 18.6274 0 12 0C5.37258 0 0 5.40424 0 12.0707C0 18.0956 4.38823 23.0893 10.125 23.9948V15.5599H7.07812V12.0707H10.125V9.41139C10.125 6.38617 11.9165 4.71513 14.6576 4.71513C15.9705 4.71513 17.3438 4.95088 17.3438 4.95088V7.92141H15.8306C14.3399 7.92141 13.875 8.85187 13.875 9.80645V12.0707H17.2031L16.6711 15.5599H13.875V23.9948C19.6118 23.0893 24 18.0956 24 12.0707Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_29214_25190">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>

data/app/packs/images/decidim/brands/google.svg

@@ -1 +1,7 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="42" height="42" viewBox="2 -2 42 42"><defs><filter id="b" width="2" height="2" x="-.5" y="-.5" filterUnits="objectBoundingBox"><feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation=".5"/><feColorMatrix in="shadowBlurOuter1" result="shadowMatrixOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.168 0"/><feOffset in="SourceAlpha" result="shadowOffsetOuter2"/><feGaussianBlur in="shadowOffsetOuter2" result="shadowBlurOuter2" stdDeviation=".5"/><feColorMatrix in="shadowBlurOuter2" result="shadowMatrixOuter2" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.084 0"/><feMerge><feMergeNode in="shadowMatrixOuter1"/><feMergeNode in="shadowMatrixOuter2"/><feMergeNode in="SourceGraphic"/></feMerge></filter><rect id="a" width="40" height="40" x="0" y="0" rx="2"/></defs><use width="100%" height="100%" fill="#fff" fill-rule="evenodd" filter="url(#b)" transform="translate(3 -1)" xlink:href="#a"/><use width="100%" height="100%" fill="none" fill-rule="evenodd" filter="url(#b)" transform="translate(3 -1)" xlink:href="#a"/><use width="100%" height="100%" fill="none" fill-rule="evenodd" filter="url(#b)" transform="translate(3 -1)" xlink:href="#a"/><use width="100%" height="100%" fill="none" fill-rule="evenodd" filter="url(#b)" transform="translate(3 -1)" xlink:href="#a"/><path fill="#4285f4" fill-rule="evenodd" d="M31.64 19.205c0-.639-.057-1.252-.164-1.841H23v3.481h4.844a4.14 4.14 0 01-1.796 2.716v2.259h2.908c1.702-1.567 2.684-3.875 2.684-6.615z"/><path fill="#34a853" fill-rule="evenodd" d="M23 28c2.43 0 4.467-.806 5.956-2.18l-2.908-2.259c-.806.54-1.837.86-3.048.86-2.344 0-4.328-1.584-5.036-3.711h-3.007v2.332A8.997 8.997 0 0023 28z"/><path fill="#fbbc05" fill-rule="evenodd" d="M17.964 20.71a5.41 5.41 0 01-.282-1.71c0-.593.102-1.17.282-1.71v-2.332h-3.007A8.996 8.996 0 0014 19c0 1.452.348 2.827.957 4.042z"/><path fill="#ea4335" fill-rule="evenodd" d="M23 13.58c1.321 0 2.508.454 3.44 1.345l2.582-2.58C27.463 10.891 25.426 10 23 10a8.997 8.997 0 00-8.043 4.958l3.007 2.332c.708-2.127 2.692-3.71 5.036-3.71z"/><path fill="none" d="M14 10h18v18H14z"/></svg>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" xmlns:xlink="http://www.w3.org/1999/xlink" style="display: block;">
+        <path fill="#EA4335" d="M24 9.5c3.54 0 6.71 1.22 9.21 3.6l6.85-6.85C35.9 2.38 30.47 0 24 0 14.62 0 6.51 5.38 2.56 13.22l7.98 6.19C12.43 13.72 17.74 9.5 24 9.5z"></path>
+        <path fill="#4285F4" d="M46.98 24.55c0-1.57-.15-3.09-.38-4.55H24v9.02h12.94c-.58 2.96-2.26 5.48-4.78 7.18l7.73 6c4.51-4.18 7.09-10.36 7.09-17.65z"></path>
+        <path fill="#FBBC05" d="M10.53 28.59c-.48-1.45-.76-2.99-.76-4.59s.27-3.14.76-4.59l-7.98-6.19C.92 16.46 0 20.12 0 24c0 3.88.92 7.54 2.56 10.78l7.97-6.19z"></path>
+        <path fill="#34A853" d="M24 48c6.48 0 11.93-2.13 15.89-5.81l-7.73-6c-2.15 1.45-4.92 2.3-8.16 2.3-6.26 0-11.57-4.22-13.47-9.91l-7.98 6.19C6.51 42.62 14.62 48 24 48z"></path>
+        <path fill="none" d="M0 0h48v48H0z"></path>
+      </svg>

data/app/packs/images/decidim/brands/twitter-x.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-twitter-x" viewBox="0 0 16 16">
+  <path d="M12.6.75h2.454l-5.36 6.142L16 15.25h-4.937l-3.867-5.07-4.425 5.07H.316l5.733-6.57L0 .75h5.063l3.495 4.633L12.601.75Zm-.86 13.028h1.36L4.323 2.145H2.865z"/>
+</svg>

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

@@ -101,7 +101,6 @@ export default class CheckBoxesTree {
     const indeterminateSiblings = totalCheckSiblings.filter((checkbox) => checkbox.indeterminate)
 
     if (checkedSiblings.length === 0 && indeterminateSiblings.length === 0) {
-      parentCheck.checked = false;
       parentCheck.indeterminate = false;
     } else if (checkedSiblings.length === totalCheckSiblings.length && indeterminateSiblings.length === 0) {
       parentCheck.checked = true;

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

@@ -21,7 +21,9 @@ import select from "select";
  *
  * Options through data attributes:
  * - `data-clipboard-copy` = The jQuery selector for the target input element
- *   where text will be copied from.
+ *   where text will be copied from. If this element does not contain any visible text (for instance is an image),
+ *   the selector indicated in here will be used to place the confirmation message.
+ * - `data-clipboard-content` = The text that will be copied. If empty or not present, the target input element will be used.
  * - `data-clipboard-copy-label` = The label that will be shown in the button
  *   after a succesful copy.
  * - `data-clipboard-copy-message` = The text that will be announced to screen
@@ -40,12 +42,17 @@ $(() => {
     }
 
     const $input = $($el.data("clipboard-copy"));
-    if ($input.length < 1 || !$input.is("input, textarea, select")) {
-      return;
+
+    let selectedText = $el.data("clipboard-content") || "";
+    if (selectedText === "" && $input.is("input, textarea, select")) {
+      selectedText = select($input[0]);
     }
 
+    let $msgEl = $el;
+    if ($msgEl.text() === "") {
+      $msgEl = $input;
+    }
     // Get the available text to clipboard.
-    const selectedText = select($input[0]);
     if (!selectedText || selectedText.length < 1) {
       return;
     }
@@ -83,16 +90,18 @@ $(() => {
       }
 
       if (!$el.data("clipboard-copy-label-original")) {
-        $el.data("clipboard-copy-label-original", $el.html());
+        $el.data("clipboard-copy-label-original", $msgEl.html());
       }
 
-      $el.html(label);
+      $msgEl.html(label);
+
       to = setTimeout(() => {
-        $el.html($el.data("clipboard-copy-label-original"));
+        $msgEl.html($el.data("clipboard-copy-label-original"));
         $el.removeData("clipboard-copy-label-original");
         $el.removeData("clipboard-copy-label-timeout");
       }, CLIPBOARD_COPY_TIMEOUT);
-      $el.data("clipboard-copy-label-timeout", to)
+
+      $el.data("clipboard-copy-label-timeout", to);
     }
 
     // Alert the screen reader what just happened (the link was copied).
@@ -107,7 +116,7 @@ $(() => {
         }
       } else {
         $msg = $('<div aria-role="alert" aria-live="assertive" aria-atomic="true" class="sr-only"></div>');
-        $el.after($msg);
+        $msgEl.append($msg);
         $el.data("clipboard-message-element", $msg);
       }