decidim-core 0.26.8 → 0.26.9

data/lib/tasks/upgrade/decidim_deduplicate_endorsements.rake

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    desc "Remove duplicated endorsements"
+    task fix_duplicate_endorsements: :environment do
+      logger = Logger.new($stdout)
+      logger.info("Removing duplicate endorsements...")
+      has_count = 0
+
+      columns = [:resource_type, :resource_id, :decidim_author_type, :decidim_author_id, :decidim_user_group_id]
+
+      get_duplicates(columns).each do |issue|
+        while row_count(issue) > 1
+          find_next(issue)&.destroy
+          has_count += 1
+          logger.info("Removed duplicate endorsement for #{issue.resource_type} #{issue.resource_id}")
+        end
+      end
+
+      logger.info("Patch remaining endorsements.")
+      Decidim::Endorsement.where(decidim_user_group_id: nil).update(decidim_user_group_id: 0)
+      logger.info("Process terminated, #{has_count} endorsements have been removed.")
+      logger.info("Done")
+    end
+
+    private
+
+    def get_duplicates(*columns)
+      Decidim::Endorsement.select("#{columns.join(",")}, COUNT(*)").group(columns).having("COUNT(*) > 1")
+    end
+
+    def row_count(issue)
+      Decidim::Endorsement.where(
+        resource_type: issue.resource_type,
+        resource_id: issue.resource_id,
+        decidim_author_type: issue.decidim_author_type,
+        decidim_author_id: issue.decidim_author_id,
+        decidim_user_group_id: issue.decidim_user_group_id
+      ).count
+    end
+
+    def find_next(issue)
+      Decidim::Endorsement.find_by(
+        resource_type: issue.resource_type,
+        resource_id: issue.resource_id,
+        decidim_author_type: issue.decidim_author_type,
+        decidim_author_id: issue.decidim_author_id,
+        decidim_user_group_id: issue.decidim_user_group_id
+      )
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.26.8
+  version: 0.26.9
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -754,28 +754,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.26.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.26.9
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.26.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.26.9
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1195,7 +1195,6 @@ files:
 - app/helpers/decidim/icon_helper.rb
 - app/helpers/decidim/language_chooser_helper.rb
 - app/helpers/decidim/layout_helper.rb
-- app/helpers/decidim/layout_helper.rb.orig
 - app/helpers/decidim/localized_locales_helper.rb
 - app/helpers/decidim/map_helper.rb
 - app/helpers/decidim/markup_helper.rb
@@ -1531,7 +1530,6 @@ files:
 - app/packs/stylesheets/decidim/modules/_datepicker.scss
 - app/packs/stylesheets/decidim/modules/_definition-data.scss
 - app/packs/stylesheets/decidim/modules/_docs-manager.scss
-- app/packs/stylesheets/decidim/modules/_dropdown_menu.scss
 - app/packs/stylesheets/decidim/modules/_extra.scss
 - app/packs/stylesheets/decidim/modules/_filter-tags.scss
 - app/packs/stylesheets/decidim/modules/_filters.scss
@@ -1778,7 +1776,6 @@ files:
 - app/views/decidim/devise/passwords/edit.html.erb
 - app/views/decidim/devise/passwords/new.html.erb
 - app/views/decidim/devise/registrations/new.html.erb
-- app/views/decidim/devise/registrations/new.html.erb.orig
 - app/views/decidim/devise/sessions/new.html.erb
 - app/views/decidim/devise/shared/_links.html.erb
 - app/views/decidim/devise/shared/_newsletter_modal.html.erb
@@ -2018,9 +2015,11 @@ files:
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/so-SO.yml
+- config/locales/sq-AL.yml
 - config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/sw-KE.yml
+- config/locales/th-TH.yml
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -2225,6 +2224,7 @@ files:
 - db/migrate/20210629172525_fix_blocked_user_names_in_action_log.rb
 - db/migrate/20210730112319_create_decidim_editor_images.rb
 - db/migrate/20211126183540_add_timestamps_to_content_blocks.rb
+- db/migrate/20231027142329_change_default_value_for_decidim_endorsements.rb
 - db/seeds.rb
 - db/seeds/homepage_image.jpg
 - lib/decidim/action_authorization.rb
@@ -2582,6 +2582,7 @@ files:
 - lib/tasks/decidim_open_data_tasks.rake
 - lib/tasks/decidim_tasks.rake
 - lib/tasks/decidim_webpacker_tasks.rake
+- lib/tasks/upgrade/decidim_deduplicate_endorsements.rake
 - lib/tasks/upgrade/decidim_moderation_tasks.rake
 - lib/tasks/upgrade/decidim_user_moderation.rake
 homepage: https://github.com/decidim/decidim

data/app/helpers/decidim/layout_helper.rb.orig

@@ -1,225 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # View helpers related to the layout.
-  module LayoutHelper
-    include Decidim::ModalHelper
-    include Decidim::TooltipHelper
-
-    # Public: Generates a set of meta tags that generate the different favicon
-    # versions for an organization.
-    #
-    # Returns a safe String with the versions.
-    def favicon
-      return if current_organization.favicon.blank?
-
-      safe_join(Decidim::OrganizationFaviconUploader::SIZES.map do |version, size|
-        favicon_link_tag(current_organization.attached_uploader(:favicon).variant_url(version, host: current_organization.host), sizes: "#{size}x#{size}")
-      end)
-    end
-
-    def apple_favicon
-      icon_image = current_organization.attached_uploader(:favicon).variant_url(:medium, host: current_organization.host)
-      return unless icon_image
-
-      favicon_link_tag(icon_image, rel: "apple-touch-icon", type: "image/png")
-    end
-
-    def legacy_favicon
-      variant = :favicon if current_organization.favicon.content_type != "image/vnd.microsoft.icon"
-      icon_image = current_organization.attached_uploader(:favicon).variant_url(variant, host: current_organization.host)
-      return unless icon_image
-
-      favicon_link_tag(icon_image, rel: "icon", sizes: "any", type: nil)
-    end
-
-    # Outputs an SVG-based icon.
-    #
-    # name    - The String with the icon name.
-    # options - The Hash options used to customize the icon (default {}):
-    #             :width  - The Number of width in pixels (optional).
-    #             :height - The Number of height in pixels (optional).
-    #             :title - The title for the SVG element (optional, similar to alt for img)
-    #             :aria_label - The String to set as aria label (optional).
-    #             :aria_hidden - The Truthy value to enable aria_hidden (optional).
-    #             :role - The String to set as the role (optional).
-    #             :class - The String to add as a CSS class (optional).
-    #
-    # Returns a String.
-    def redesigned_icon(name, options = {})
-      default_html_properties = {
-        "width" => "1em",
-        "height" => "1em",
-        "role" => "img",
-        "aria-hidden" => "true"
-      }
-
-      html_properties = options.with_indifferent_access.transform_keys(&:dasherize).slice("width", "height", "aria-label", "role", "aria-hidden", "class", "style")
-      html_properties = default_html_properties.merge(html_properties)
-
-      href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/remixicon.symbol.svg")
-
-      content_tag :svg, html_properties do
-        content_tag :use, nil, "href" => "#{href}#ri-#{name}", tabindex: -1
-      end
-    end
-
-    def legacy_icon(name, options = {})
-      options = options.with_indifferent_access
-      html_properties = {}
-
-      html_properties["width"] = options[:width]
-      html_properties["height"] = options[:height]
-      html_properties["aria-label"] = options[:aria_label] || options[:"aria-label"]
-      html_properties["role"] = options[:role] || "img"
-      html_properties["aria-hidden"] = options[:aria_hidden] || options[:"aria-hidden"]
-
-      html_properties["class"] = (["icon--#{name}"] + _icon_classes(options)).join(" ")
-
-      title = options["title"] || html_properties["aria-label"]
-      if title.blank? && html_properties["role"] == "img"
-        # This will make the accessibility audit tools happy as with the "img"
-        # role, the alternative text (aria-label) and title are required for the
-        # element. This will also force the SVG to be hidden because otherwise
-        # the screen reader would announce the icon name which can be in
-        # different language (English) than the page language which is not
-        # allowed.
-        title = name
-        html_properties["aria-label"] = title
-        html_properties["aria-hidden"] = true
-      end
-
-      href = Decidim.cors_enabled ? "" : asset_pack_path("media/images/icons.svg")
-
-      content_tag :svg, html_properties do
-        inner = content_tag :title, title
-        inner += content_tag :use, nil, "href" => "#{href}#icon-#{name}"
-
-        inner
-      end
-    end
-
-    def icon(*args)
-      redesign_enabled? ? redesigned_icon(*args) : legacy_icon(*args)
-    end
-
-    # Outputs a SVG icon from an external file. It apparently renders an image
-    # tag, but then a JS script kicks in and replaces it with an inlined SVG
-    # version.
-    #
-    # path    - The asset's path
-    #
-    # Returns an <img /> tag with the SVG icon.
-    def external_icon(path, options = {})
-      classes = _icon_classes(options) + ["external-icon"]
-
-      if path.split(".").last == "svg"
-        icon_path = application_path(path)
-        return unless icon_path
-
-        attributes = { class: classes.join(" ") }.merge(options)
-        asset = File.read(icon_path)
-        asset.gsub("<svg ", "<svg#{tag_builder.tag_options(attributes)} ").html_safe
-      else
-        image_pack_tag(path, class: classes.join(" "), style: "display: none")
-      end
-    end
-
-    def application_path(path)
-      # Force the path to be returned without the protocol and host even when a
-      # custom asset host has been defined. The host parameter needs to be a
-      # non-nil because otherwise it will be set to the asset host at
-      # ActionView::Helpers::AssetUrlHelper#compute_asset_host.
-      img_path = asset_pack_path(path, host: "", protocol: :relative)
-      path = Rails.public_path.join(img_path.sub(%r{^/}, ""))
-      return unless File.exist?(path)
-
-      path
-    rescue ::Webpacker::Manifest::MissingEntryError
-      nil
-    end
-
-    # Allows to create role attribute according to accessibility rules
-    #
-    # Returns role attribute string if role option is specified
-    def role(options = {})
-      "role=\"#{options[:role]}\" " if options[:role]
-    end
-
-    def _icon_classes(options = {})
-      classes = options[:remove_icon_class] ? [] : ["icon"]
-      classes += [options[:class]]
-      classes.compact
-    end
-
-    def extended_navigation_bar(items, max_items: 5)
-      return unless items.any?
-
-      extra_items = items.slice((max_items + 1)..-1) || []
-      active_item = items.find { |item| item[:active] }
-
-      controller.view_context.render partial: "decidim/shared/extended_navigation_bar", locals: {
-        items:,
-        extra_items:,
-        active_item:,
-        max_items:
-      }
-    end
-
-    # Renders a view with the customizable CSS variables in two flavours:
-    # 1. as a hexadecimal valid CSS color (ie: #ff0000)
-    # 2. as a disassembled RGB components (ie: 255 0 0)
-    #
-    # Example:
-    #
-    # --primary: #ff0000;
-    # --primary-rgb: 255,0,0
-    #
-    # Hexadecimal variables can be used as a normal CSS color:
-    #
-    # color: var(--primary)
-    #
-    # While the disassembled variant can be used where you need to manipulate
-    # the color somehow (ie: adding a background transparency):
-    #
-    # background-color: rgba(var(--primary-rgb), 0.5)
-    def organization_colors
-      css = current_organization.colors.each.map { |k, v| "--#{k}: #{v};--#{k}-rgb: #{v[1..2].hex} #{v[3..4].hex} #{v[5..6].hex};" }.join
-      render partial: "layouts/decidim/organization_colors", locals: { css: }
-    end
-
-<<<<<<< HEAD
-    def current_user_unread_data
-      return {} if current_user.blank?
-
-      {}.tap do |d|
-        d.merge!(unread_notifications: true) if current_user.notifications.any?
-        d.merge!(unread_conversations: true) if current_user.unread_conversations.any?
-        d.merge!(unread_items: d.present?)
-      end
-    end
-
-||||||| parent of 53b6893e5c (Use local emojibase data instead of CDN)
-=======
-    # Public: Gets the name of the webpacker entrypoint that will be used
-    # for the locale of the Emojibase NPM package, used with @picmo/popup-picker
-    #
-    # Returns a string with the entrypoint name
-    def emojibase_entrypoint_locale
-      entrypoint = Decidim::Webpacker.configuration.entrypoints.keys.select do |entry|
-        entry == "decidim_emojibase_#{I18n.locale}"
-      end
-
-      return "decidim_emojibase_en" if entrypoint.empty?
-
-      entrypoint.first
-    end
-
->>>>>>> 53b6893e5c (Use local emojibase data instead of CDN)
-    private
-
-    def tag_builder
-      @tag_builder ||= ActionView::Helpers::TagHelper::TagBuilder.new(self)
-    end
-  end
-end

data/app/packs/stylesheets/decidim/modules/_dropdown_menu.scss

@@ -1,9 +0,0 @@
-.dropdown.menu > li {
-  &.is-active > a {
-    color: var(--secondary);
-  }
-
-  &.is-dropdown-submenu-parent > a::after {
-    border-color: var(--secondary) transparent transparent;
-  }
-}

data/app/views/decidim/devise/registrations/new.html.erb.orig

@@ -1,231 +0,0 @@
-<% add_decidim_page_title(t(".sign_up")) %>
-
-<% content_for :devise_links do %>
-  <%= render "decidim/devise/shared/links" %>
-<% end %>
-
-<%= render layout: "layouts/decidim/shared/layout_center" do %>
-  <div class="flex justify-center">
-    <h1 class="h3 md:h1 decorator my-12"><%= t("decidim.devise.registrations.new.sign_up") %></h1>
-  </div>
-
-  <div class="login__info">
-    <p>
-      <%= t("decidim.devise.registrations.new.subtitle") %>
-    </p>
-    <p class="font-semibold">
-      <%= t("decidim.devise.registrations.new.already_have_an_account?") %>
-      <%= link_to t("decidim.devise.registrations.new.sign_in"), new_user_session_path %>
-    </p>
-  </div>
-
-  <div class="login__info-required">
-    <%= form_required_explanation %>
-  </div>
-
-  <div class="login__omniauth-container">
-    <% cache current_organization do %>
-      <%= render "decidim/devise/shared/omniauth_buttons" %>
-    <% end %>
-  </div>
-
-  <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: registration_path(resource_name), html: { id: "register-form" }) do |f| %>
-    <%= invisible_captcha %>
-
-    <div class="form__wrapper">
-      <%= f.text_field :name, help_text: t("decidim.devise.registrations.new.username_help"), autocomplete: "name", placeholder: "John Doe" %>
-
-      <%= f.text_field :nickname, help_text: t("decidim.devise.registrations.new.nickname_help", organization: current_organization.name), autocomplete: "nickname", placeholder: "johndoe" %>
-
-      <%= f.email_field :email, autocomplete: "email", placeholder: "hi@email.com" %>
-
-      <%= f.password_field :password, password_field_options_for(:user) %>
-
-      <%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %>
-    </div>
-
-    <div id="card__tos" class="form__wrapper-block">
-      <h4 class="h4"><%= t("decidim.devise.registrations.new.tos_title") %></h4>
-
-      <div class="tos-text">
-        <% terms_of_service_summary_content_blocks.each do |content_block| %>
-          <%= cell content_block.manifest.cell, content_block %>
-        <% end %>
-      </div>
-
-      <%= f.check_box :tos_agreement, label: t("decidim.devise.registrations.new.tos_agreement", link: link_to(t("decidim.devise.registrations.new.terms"), page_path("terms-of-service"))), label_options: { class: "form__wrapper-checkbox-label" } %>
-    </div>
-
-    <div id="card__newsletter" class="form__wrapper-block">
-      <h4 class="h4"><%= t("decidim.devise.registrations.new.newsletter_title") %></h4>
-      <%= f.check_box :newsletter, label: t("decidim.devise.registrations.new.newsletter"), checked: @form.newsletter, label_options: { class: "form__wrapper-checkbox-label" } %>
-    </div>
-
-    <div class="form__wrapper-block">
-      <button type="submit" class="button button__lg button__secondary">
-        <%= t("decidim.devise.registrations.new.sign_up") %>
-        <%= icon "arrow-right-line", class: "fill-current" %>
-      </button>
-    </div>
-
-    <div class="login__links">
-      <%= render "decidim/devise/shared/redesigned_links" %>
-    </div>
-  <% end %>
-<% end %>
-
-<<<<<<< HEAD
-||||||| parent of 4e14afa36c (add password toggle via unobstructive javascript)
-  <div class="row">
-    <div class="columns large-6 medium-10 medium-centered">
-
-      <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user", id: "register-form" }) do |f| %>
-        <%= invisible_captcha %>
-        <div class="card">
-          <div class="card__content">
-            <%= form_required_explanation %>
-
-            <div class="user-person">
-              <div class="field">
-                <%= f.text_field :name, help_text: t(".username_help"), autocomplete: "name" %>
-              </div>
-            </div>
-
-            <div class="user-nickname">
-              <div class="field">
-                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), prefix: { value: "@", small: 1, large: 1 }, autocomplete: "nickname" %>
-              </div>
-            </div>
-
-            <div class="field">
-              <%= f.email_field :email, autocomplete: "email" %>
-            </div>
-
-            <div class="field">
-              <%= f.password_field :password, password_field_options_for(:user) %>
-            </div>
-
-            <div class="field">
-              <%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %>
-            </div>
-          </div>
-        </div>
-
-        <div class="card" id="card__tos">
-          <div class="card__content">
-            <h3><%= t(".tos_title") %></h3>
-
-            <p class="tos-text">
-              <%= strip_tags(translated_attribute(terms_and_conditions_page.content)) %>
-            </p>
-
-            <div class="field">
-              <%= f.check_box :tos_agreement, label: t(".tos_agreement", link: link_to(t(".terms"), page_path("terms-and-conditions"))) %>
-            </div>
-          </div>
-        </div>
-
-        <div class="card" id="card__newsletter">
-          <div class="card__content">
-            <h3><%= t(".newsletter_title") %></h3>
-              <div class="field">
-                <%= f.check_box :newsletter, label: t(".newsletter"), checked: @form.newsletter %>
-              </div>
-          </div>
-        </div>
-
-        <div class="card">
-          <div class="card__content">
-            <div class="actions">
-              <%= f.submit t("devise.registrations.new.sign_up"), class: "button expanded" %>
-            </div>
-            <%= yield :devise_links %>
-          </div>
-        </div>
-      <% end %>
-    </div>
-  </div>
-</div>
-</div>
-=======
-  <div class="row">
-    <div class="columns large-6 medium-10 medium-centered">
-
-      <%= decidim_form_for(@form, namespace: "registration", as: resource_name, url: registration_path(resource_name), html: { class: "register-form new_user", id: "register-form" }) do |f| %>
-        <%= invisible_captcha %>
-        <div class="card">
-          <div class="card__content">
-            <%= form_required_explanation %>
-
-            <div class="user-person">
-              <div class="field">
-                <%= f.text_field :name, help_text: t(".username_help"), autocomplete: "off" %>
-              </div>
-            </div>
-
-            <div class="user-nickname">
-              <div class="field">
-                <%= f.text_field :nickname, help_text: t(".nickname_help", organization: current_organization.name), prefix: { value: "@", small: 1, large: 1 }, autocomplete: "off" %>
-              </div>
-            </div>
-
-            <div class="field">
-              <%= f.email_field :email, autocomplete: "email" %>
-            </div>
-
-            <div class="user-password">
-              <div class="field">
-                <%= f.password_field :password, password_field_options_for(:user) %>
-              </div>
-            </div>
-
-            <div class="user-password-confirmation">
-              <div class="field">
-                <%= f.password_field :password_confirmation, password_field_options_for(:user).except(:help_text) %>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div class="card" id="card__tos">
-          <div class="card__content">
-            <h3><%= t(".tos_title") %></h3>
-
-            <p class="tos-text">
-              <%= strip_tags(translated_attribute(terms_and_conditions_page.content)) %>
-            </p>
-
-            <div class="field">
-              <%= f.check_box :tos_agreement, label: t(".tos_agreement", link: link_to(t(".terms"), page_path("terms-and-conditions"))) %>
-            </div>
-          </div>
-        </div>
-
-        <div class="card" id="card__newsletter">
-          <div class="card__content">
-            <h3><%= t(".newsletter_title") %></h3>
-              <div class="field">
-                <%= f.check_box :newsletter, label: t(".newsletter"), checked: @form.newsletter %>
-              </div>
-          </div>
-        </div>
-
-        <div class="card">
-          <div class="card__content">
-            <div class="actions">
-              <%= f.submit t("devise.registrations.new.sign_up"), class: "button expanded" %>
-            </div>
-            <%= yield :devise_links %>
-          </div>
-        </div>
-      <% end %>
-    </div>
-  </div>
-</div>
-</div>
->>>>>>> 4e14afa36c (add password toggle via unobstructive javascript)
-<%= render "decidim/devise/shared/newsletter_modal" %>
-
-<% content_for :js_content do %>
-  <%= javascript_pack_tag "decidim_registrations" %>
-<% end %>