decidim-core 0.31.0 → 0.31.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 644720c93a8b08cdb4aa839557a74298774aef2719321671ca3bee677d8e93a6
-  data.tar.gz: e603634ef33432a213f5122b5e00c11614085d95fcc35e4a3c1b180d582427d8
+  metadata.gz: a09ab97ba5e294cac771913b5136ad740e670befc9509ca5827cf86d215f9fa6
+  data.tar.gz: ad5ddc3a2ea6c21d8ed9dea42ee2a9307ba44799a8f4ca90c5253f3a75c217dd
 SHA512:
-  metadata.gz: a98933696db00e724d2b7ae56c14e3cc718be1026234a9a36679ef3678395a3fe4308be1ff8d9fd59aa233f7c056459e2466089a2f9e21368c9df6b37c722505
-  data.tar.gz: 2dc98284fe86eb99c409a4f418b00ec6baba661476bfa2114b518a63dfba5313b33e268099a1e90703d98ec4ec438c8e1e4a30e51717ca63c2fb2f57b20e4664
+  metadata.gz: 0cbb0319b8de1e90e2f6d3f4eb52d81ff023c9849d902a6569084065b8e9ec2ef76b48d811d23ada7731f48a2defa940764c6846bf1ae59797d83ab78afb351b
+  data.tar.gz: 34ef4ee5189225382525aa6c01c09f7b1a4bc39c1edbec9a7beff9408acacb8766ece1cf6688962d70d4695e2be708b48f74f9fe69d023d675ffe2e10ebf51e3

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

@@ -1,7 +1,7 @@
 <%= link_to resource_path, class: classes[:default], id: resource_id do %>
   <div class="<%= classes[:img] %>">
     <% if has_image? %>
-      <%= image_tag resource_image_url, alt: alt_title %>
+      <%= image_tag resource_image_url, alt: "" %>
     <% else %>
       <%= external_icon "media/images/placeholder-card-g.svg", class: "card__placeholder-g" %>
     <% end %>

data/app/cells/decidim/notification/deleted.erb

@@ -0,0 +1,12 @@
+<div class="notification" data-notification>
+  <div class="notification__wrapper">
+    <div class="notification__time" title="<%= l(notification.created_at) %>"> <%= notification.created_at_in_words %></div>
+    <div class="notification__snippet">
+      <span class="notification__snippet-title text-gray"><%= t("decidim.notifications.show.deleted") %></span>
+    </div>
+  </div>
+  <%= link_to model, remote: true, method: :delete, class: "notification__button", data: { "notification-read": "" } do %>
+    <span class="sr-only md:not-sr-only"><%= t("mark_as_read", scope: "layouts.decidim.notifications_dashboard") %></span>
+    <%= icon "check-line", class: "fill-current" %>
+  <% end %>
+</div>

data/app/cells/decidim/notification/not_available.erb

@@ -0,0 +1,12 @@
+<div class="notification" data-notification>
+  <div class="notification__wrapper">
+    <div class="notification__time" title="<%= l(notification.created_at) %>"> <%= notification.created_at_in_words %></div>
+    <div class="notification__snippet">
+      <span class="notification__snippet-title text-gray"><%= t("decidim.notifications.show.not_available") %></span>
+    </div>
+  </div>
+  <%= link_to model, remote: true, method: :delete, class: "notification__button", data: { "notification-read": "" } do %>
+    <span class="sr-only md:not-sr-only"><%= t("mark_as_read", scope: "layouts.decidim.notifications_dashboard") %></span>
+    <%= icon "check-line", class: "fill-current" %>
+  <% end %>
+</div>

data/app/cells/decidim/notification_cell.rb

@@ -7,7 +7,11 @@ module Decidim
     include Decidim::Core::Engine.routes.url_helpers
 
     def show
-      if notification.event_class_instance.try(:hidden_resource?)
+      if !notification.can_participate?(current_user)
+        render :not_available
+      elsif notification.deleted_resource?
+        render :deleted
+      elsif notification.hidden_resource?
         render :moderated
       else
         render :show

data/app/cells/decidim/share_widget/modal.erb

@@ -1,6 +1,6 @@
 <%= decidim_modal id: "socialShare", class: "share-modal" do %>
   <div data-dialog-container>
-    <h2 tabindex="-1" data-dialog-title><%= t("share", scope: "decidim.shared.share_modal") %></h2>
+    <h2 id="dialog-title-social-share-modal" tabindex="-1" data-dialog-title><%= t("share", scope: "decidim.shared.share_modal") %></h2>
 
     <div>
 

data/app/commands/decidim/destroy_account.rb

@@ -19,6 +19,15 @@ module Decidim
         destroy_user_account!
         destroy_user_identities
         destroy_follows
+        destroy_user_versions
+        destroy_user_private_exports
+        destroy_user_access_grants
+        destroy_user_access_tokens
+        destroy_user_reminders
+        destroy_user_notifications
+        destroy_user_badges
+        destroy_user_likes
+        destroy_user_reports
         destroy_participatory_space_private_user
         delegate_destroy_to_participatory_spaces
       end
@@ -47,17 +56,53 @@ module Decidim
       current_user.save!
     end
 
+    def destroy_user_badges
+      Decidim::Gamification::BadgeScore.where(user: current_user).find_each(&:destroy)
+    end
+
+    def destroy_user_reports
+      Decidim::UserModeration.where(user: current_user).find_each(&:destroy)
+    end
+
+    def destroy_user_likes
+      Decidim::Like.where(author: current_user).find_each(&:destroy)
+    end
+
     def destroy_user_identities
-      current_user.identities.destroy_all
+      current_user.identities.find_each(&:destroy)
+    end
+
+    def destroy_user_versions
+      current_user.versions.find_each(&:destroy)
+    end
+
+    def destroy_user_private_exports
+      current_user.private_exports.find_each(&:destroy)
+    end
+
+    def destroy_user_access_grants
+      current_user.access_grants.find_each(&:destroy)
+    end
+
+    def destroy_user_access_tokens
+      current_user.access_tokens.find_each(&:destroy)
+    end
+
+    def destroy_user_reminders
+      current_user.reminders.find_each(&:destroy)
+    end
+
+    def destroy_user_notifications
+      current_user.notifications.find_each(&:destroy)
     end
 
     def destroy_follows
-      Decidim::Follow.where(followable: current_user).destroy_all
-      Decidim::Follow.where(user: current_user).destroy_all
+      Decidim::Follow.where(followable: current_user).find_each(&:destroy)
+      Decidim::Follow.where(user: current_user).find_each(&:destroy)
     end
 
     def destroy_participatory_space_private_user
-      Decidim::ParticipatorySpacePrivateUser.where(user: current_user).destroy_all
+      Decidim::ParticipatorySpacePrivateUser.where(user: current_user).find_each(&:destroy)
     end
 
     def delegate_destroy_to_participatory_spaces

data/app/events/decidim/welcome_notification_event.rb

@@ -43,7 +43,7 @@ module Decidim
 
     def interpolate(template)
       template
-        .gsub("{{name}}", user.name)
+        .gsub("{{name}}", user.presenter.name)
         .gsub("{{organization}}", organization_name(organization))
         .gsub("{{help_url}}", url_helpers.pages_url(host: organization.host))
         .gsub("{{badges_url}}", url_helpers.gamification_badges_url(host: organization.host))

data/app/jobs/decidim/remove_search_indexes_job.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  class RemoveSearchIndexesJob < ApplicationJob
+    queue_as :default
+
+    def perform(elements)
+      elements.each do |element|
+        element.remove_from_index(element)
+        next unless element.respond_to?(:comments)
+
+        element.comments.each do |comment|
+          Decidim::RemoveSearchIndexesJob.perform_later([comment])
+        end
+      end
+    end
+  end
+end

data/app/mailers/decidim/notifications_digest_mailer.rb

@@ -17,13 +17,30 @@ module Decidim
         # Note that this could be improved by adding a "type" column to the notifications table
         # This fix can generate lists of notifications that are below the SIZE_LIMIT
         @notifications = notifications[0...SIZE_LIMIT].filter_map do |notification|
+          # Check if is a notification that can be sent on email
           next unless notification.event_class_instance.respond_to?(:email_intro)
+          # checks if the resource exists, as we have implemented the possibility of soft deleting resources
+          next unless resource_is_present?(notification)
+          # checks if the resource is visible
+          next unless notification.can_participate?(@user)
+          # It usually checks if the resource is reportable and is not hidden, however, there are some exceptions
+          # like in the comments, where we check if the resource and intended comment is visible.
+          next if notification.hidden_resource?
+          # It usually checks if the resource is deletable and is not deleted, however, there are some exceptions
+          # like in the comments, where we check if the resource and intended comment is visible.
+          next if notification.deleted_resource?
 
           Decidim::NotificationToMailerPresenter.new(notification)
         end
 
-        mail(to: user.email, subject: @notifications_digest.subject)
+        mail(to: user.email, subject: @notifications_digest.subject) if @notifications.any?
       end
     end
+
+    private
+
+    def resource_is_present?(notification)
+      notification.resource
+    end
   end
 end

data/app/models/decidim/component.rb

@@ -100,11 +100,14 @@ module Decidim
     def resource_description; end
 
     def can_participate_in_space?(user)
+      return false unless published?
+      return false unless participatory_space.published?
       return true unless participatory_space.try(:private_space?)
       return false unless user
 
       participatory_space.can_participate?(user)
     end
+    alias can_participate? can_participate_in_space?
 
     def private_non_transparent_space?
       return false unless participatory_space.respond_to?(:private_space?)

data/app/models/decidim/notification.rb

@@ -37,8 +37,20 @@ module Decidim
       where(decidim_user_id: user.id)
     end
 
+    def can_participate?(user)
+      resource.can_participate?(user)
+    end
+
     def self.export_serializer
       Decidim::DownloadYourDataSerializers::DownloadYourDataNotificationSerializer
     end
+
+    def hidden_resource?
+      event_class_instance.respond_to?(:hidden_resource?) && event_class_instance.hidden_resource?
+    end
+
+    def deleted_resource?
+      event_class_instance.respond_to?(:deleted_resource?) && event_class_instance.deleted_resource?
+    end
   end
 end

data/app/models/decidim/user.rb

@@ -153,6 +153,10 @@ module Decidim
       deleted_at.present?
     end
 
+    def can_participate?(_user)
+      true
+    end
+
     # Public: whether the user has been officialized or not
     def officialized?
       !officialized_at.nil?

data/app/models/decidim/user_base_entity.rb

@@ -20,7 +20,7 @@ module Decidim
     has_one :blocking, class_name: "Decidim::UserBlock", foreign_key: :id, primary_key: :block_id, dependent: :destroy
 
     # Regex for name & nickname format validations
-    REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|])/
+    REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|\n\r])/m
     REGEXP_NICKNAME = /\A[a-z0-9_-]+\z/
 
     has_one_attached :avatar

data/app/packs/src/decidim/controllers/multiple_mentions/controller.js

@@ -16,11 +16,30 @@ export default class extends Controller {
 
     this.initializeEmptyFocusElement();
     this.initializeAutoComplete();
-    this.searchInput.addEventListener("selection", (event) => {
+    this.setupSelectionListener();
+  }
+
+  /**
+   * Setup the selection event listener
+   * @returns {void}
+   */
+  setupSelectionListener() {
+    this.selectionHandler = (event) => {
       const feedback = event.detail;
       const selection = feedback.selection;
       this.handleSelection(selection);
-    });
+    };
+    this.searchInput.addEventListener("selection", this.selectionHandler);
+  }
+
+  /*
+   * Remove event listener to prevent duplicates
+   * @returns {void}
+   */
+  disconnect() {
+    if (this.searchInput && this.selectionHandler) {
+      this.searchInput.removeEventListener("selection", this.selectionHandler);
+    }
   }
 
   /**
@@ -150,6 +169,10 @@ export default class extends Controller {
     this.addSelectedUser(selection, id);
     this.autoComplete.setInput("");
     this.selected.push(id);
+
+    if (this.autoComplete && this.autoComplete.autocomplete) {
+      this.autoComplete.autocomplete.close();
+    }
   }
 
   /**

data/app/packs/src/decidim/editor/extensions/link/index.js

@@ -28,7 +28,6 @@ export default Link.extend({
       ...this.parent?.(),
       allowTargetControl: false,
       HTMLAttributes: {
-        target: "_blank",
         class: null
       }
     }

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

@@ -81,7 +81,11 @@ export default function createEditor(container) {
   const toolbar = createEditorToolbar(editor);
   container.insertBefore(toolbar, editorContainer);
 
-  editor.on("update", () => (input.value = editor.getHTML()));
+  editor.on("update", () => {
+    input.value = editor.isEmpty
+      ? ""
+      : editor.getHTML();
+  });
 
   return editor;
 }

data/app/packs/src/decidim/editor/test/extensions/link.test.js

@@ -37,14 +37,14 @@ describe("Link", () => {
     await sleep(50);
 
     expect(editor.getHTML()).toEqual(
-      '<p>Hello, <a target="_blank" href="https://decidim.org">world</a>!</p>'
+      '<p>Hello, <a href="https://decidim.org" target="_blank">world</a>!</p>'
     );
   });
 
   it("allows editing the link through the dialog", async () => {
     editorElement.focus();
     await updateContent(editorElement,
-      '<p>Hello, <a target="_blank" href="https://decidim.org">world</a>!</p>'
+      '<p>Hello, <a href="https://decidim.org" target="_blank" >world</a>!</p>'
     );
 
     // Set the editor cursor inside the link

data/app/packs/src/decidim/editor/test/toolbar/shared/behaves_like_basic_link.js

@@ -26,7 +26,7 @@ export default (ctx) => {
       await sleep(0);
 
       expect(ctx.prosemirror.innerHTML).toEqual(
-        '<p>Hello, <a target="_blank" href="https://decidim.org">world</a>!</p>'
+        '<p>Hello, <a href="https://decidim.org" target="_blank">world</a>!</p>'
       );
     });
   });

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

@@ -56,7 +56,7 @@
   }
 
   &__participants {
-    @apply bg-background rounded px-4 py-2 flex flex-col md:flex-row items-start md:items-center gap-2 md:gap-6 mb-14;
+    @apply bg-background rounded px-4 py-2 flex flex-wrap items-start md:items-center gap-2 md:gap-6 mb-14;
   }
 
   &__message {

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

@@ -2,7 +2,11 @@
   @apply invisible opacity-0 fixed z-50 inset-0 bg-[rgba(0,0,0,0.25)] transition duration-300;
 
   & > * {
-    @apply absolute inset-1/2 ltr:-translate-x-1/2 rtl:translate-x-1/2 -translate-y-1/2 w-[90%] lg:max-w-[900px] max-h-[95vh] h-fit overflow-y-auto p-6 bg-white z-50 rounded shadow-[0_4px_6px_rgba(211,211,211,0.25)];
+    @apply absolute inset-1/2 translate-x-[-50%] translate-y-[-50%] w-[90%] lg:max-w-[900px] max-h-[95vh] h-fit overflow-y-auto p-6 bg-white z-50 rounded shadow-[0_4px_6px_rgba(211,211,211,0.25)];
+
+    [dir="rtl"] & {
+      @apply translate-x-[50%];
+    }
 
     & > svg:only-child {
       @apply w-8 h-8 mx-auto text-gray-2 fill-current animate-spin;

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

@@ -8,7 +8,7 @@
   }
 
   &__code {
-    @apply block max-h-24 overflow-auto border border-gray-3 bg-background p-2 break-all;
+    @apply block max-h-24 overflow-auto border border-gray-3 bg-background p-2 break-words whitespace-pre-wrap;
   }
 
   a {

data/app/presenters/decidim/log/user_presenter.rb

@@ -10,6 +10,7 @@ module Decidim
     # overwrite `BasePresenter#user_presenter` to return your custom user presenter.
     # The only requirement for custom renderers is that they should respond to `present`.
     class UserPresenter
+      include Decidim::SanitizeHelper
       # Public: Initializes the presenter.
       #
       # user - An instance of Decidim::User
@@ -60,7 +61,7 @@ module Decidim
       #
       # Returns an HTML-safe String.
       def present_user_name
-        extra["name"].html_safe
+        decidim_sanitize_translated(extra["name"]).html_safe
       end
 
       # Private: Presents the nickname of the user performing the action.

data/app/presenters/decidim/organization_presenter.rb

@@ -7,6 +7,10 @@ module Decidim
       translated_attribute(name).html_safe
     end
 
+    def html_short_name
+      translated_attribute(short_name).html_safe
+    end
+
     def translated_description
       ActionView::Base.full_sanitizer.sanitize(translated_attribute(description)).html_safe
     end

data/app/presenters/decidim/user_presenter.rb

@@ -6,7 +6,12 @@ module Decidim
   #
   class UserPresenter < SimpleDelegator
     include ActionView::Helpers::UrlHelper
-    include Decidim::TranslatableAttributes
+    include Decidim::SanitizeHelper
+
+    # name sanitized
+    def name
+      decidim_sanitize_translated(__getobj__.name)
+    end
 
     #
     # nickname presented in a twitter-like style

data/app/views/decidim/manifests/show.json.erb

@@ -1,5 +1,6 @@
 {
   "name": "<%= organization_params.html_name %>",
+  "short_name": "<%= organization_params.html_short_name %>",
   "lang": "<%= organization_params.default_locale %>",
   "description": "<%= organization_params.translated_description %>",
   "display": "<%= organization_params.pwa_display %>",

data/app/views/decidim/pages/_tabbed.html.erb

@@ -21,7 +21,7 @@
       <ul id="dropdown-menu-pages" class="vertical-tabs__list" role="menu">
         <% pages.each do |sibling| %>
           <li class="<%= "is-active" if page == sibling %>" role="menuitem">
-            <%= link_to translated_attribute(sibling.title), page_path(sibling.slug), "aria-current": (page == sibling).to_s %>
+            <%= link_to translated_attribute(sibling.title), page_path(sibling.slug), "aria-current": ("page" if page == sibling) %>
           </li>
         <% end %>
       </ul>

data/app/views/decidim/shared/_orders.html.erb

@@ -9,6 +9,6 @@
                    i18n_scope:,
                    title: t("#{i18n_scope}.label"),
                    role: :menuitem,
-                   class: "button button__sm button__text-secondary #{order_name == order ? "underline font-bold" : "font-normal"}" %>
+                   class: "button button__sm button__text-secondary #{order_name == order ? "underline font-bold" : "font-normal"}", "aria-current": order_name == order ? "true" : "" %>
   <% end %>
 </div>

data/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb

@@ -10,8 +10,9 @@
     </div>
 
     <div>
-      <div class="main-bar__links-mobile__trigger" onclick="document.querySelector('#dropdown-trigger-links-mobile').click();document.querySelector('#dropdown-menu-account-mobile').removeAttribute('aria-modal')">
+      <div class="main-bar__links-mobile__trigger" tabindex="0" onclick="document.querySelector('#dropdown-trigger-links-mobile').click();document.querySelector('#dropdown-menu-account-mobile').removeAttribute('aria-modal')">
         <%= icon "close-line" %>
+        <p class="sr-only"><%= t("close", scope: "decidim.shared.flag_modal") %></p>
       </div>
     </div>
   </div>
@@ -37,3 +38,16 @@
     </ul>
   </div>
 </div>
+<script type="text/javascript">
+  const closeDiv = document.querySelector('div.main-bar__links-mobile__trigger');
+  const menuDropdown = document.querySelector('#dropdown-menu-account-mobile');
+  const dropdownTrigger = document.querySelector('#dropdown-trigger-links-mobile');
+  // 32 is code for space bar and 13 is code for enter
+  closeDiv.addEventListener('keydown', function(e){
+    if (e.keyCode === 13 || e.keyCode === 32) {
+      menuDropdown.removeAttribute('aria-modal');
+      menuDropdown.setAttribute('aria-hidden', "true");
+      dropdownTrigger.focus();
+    }
+  })
+</script>

data/config/locales/ar.yml

@@ -885,7 +885,6 @@ ar:
       hello: مرحبا %{name}،
       intro:
         daily: 'هذه هي إخطارات اليوم الأخير بناءً على النشاط الذي تتابعه:'
-        real_time: 'هذا تنبيه عن النشاط الذي تتبعّه:'
         weekly: 'هذه هي إخطارات الأسبوع الأخير بناءً على النشاط الذي تتابعه:'
       outro: لقد تلقيت هذه الإشعارات لأنك تتبع هذا المحتوى أو مؤلفيه. يمكنك إلغاء متابعتها من صفحات كل منهم.
       see_more: عرض المزيد من الإشعارات
@@ -934,13 +933,10 @@ ar:
           proposals_explanation: تقديم مقترحات ، ودعم المقترحات الحالية وتعزيز التغييرات التي تريد رؤيتها.
         footer_sub_hero:
           footer_sub_hero_headline: مرحبًا بكم على المنصة التشاركية لـ %{organization}.
-          register: تسجيل
         hero:
           participate: مشاركة
           participate_title: المشاركة في مسارات المنصة
           welcome: مرحبًا بكم على %{organization}!
-        sub_hero:
-          register: تسجيل
       index:
         standalone_pages: صفحات
         subheading: انتقل من خلال صفحات المساعدة من %{name}

data/config/locales/bg.yml

@@ -626,7 +626,6 @@ bg:
       files:
         file_cannot_be_processed: Файлът не може да бъде обработен
         file_resolution_too_large: Разделителната способност на файла е твърде голяма
-        not_inside_organization: Файлът не е прикачен към никоя организация.
       internal_server_error:
         copied: Текстът е копиран!
         copy_error_message_clarification: Копирайте съобщението за грешка в клипборда
@@ -1014,11 +1013,9 @@ bg:
         same_language: Съдържанието е публикувано на предпочитания от вас език (%{language}), поради което в този имейл не се показва автоматичен превод.
         translated_text: 'Автоматично преведен текст:'
     notifications:
-      action_error: Възникна проблем при актуализирането на известията.
       no_notifications: Още няма известия.
       show:
         missing_event: Упс, това известие принадлежи на съдържание, което вече не е налично. Можете да го подминете.
-        moderated: Съдържанието е модерирано
     notifications_digest_mailer:
       header:
         daily: Ежедневно обобщение на известията
@@ -1082,13 +1079,10 @@ bg:
         footer_sub_hero:
           footer_sub_hero_body_html: Нека изградим по-отворено, прозрачно и задружно общество.<br /> Присъединете се, участвайте и решавайте.
           footer_sub_hero_headline: Добре дошли в платформата за сътрудничество %{organization}!
-          register: Регистрация
         hero:
           participate: Участвайте
           participate_title: Участвайте в процесите на платформата
           welcome: Добре дошли в %{organization}!
-        sub_hero:
-          register: Регистрация
       index:
         standalone_pages: Страници
         subheading: Придвижвайте се в помощта на %{name}
@@ -1350,8 +1344,6 @@ bg:
         subject: Получихте покана да управлявате %{organization}
       invite_collaborator:
         subject: Получихте покана да сътрудничите на %{organization}
-      invite_private_user:
-        subject: Поканени сте в частен процес на сътрудничество в %{organization}
       organization_admin_invitation_instructions:
         subject: Получихте покана да управлявате %{organization}
       password_change: