decidim-core 0.28.0 → 0.28.2

data/app/mailers/decidim/messaging/conversation_mailer.rb

@@ -5,74 +5,12 @@ module Decidim
     # A custom mailer for sending notifications to users when they receive
     # private messages
     class ConversationMailer < Decidim::ApplicationMailer
-      def new_conversation(originator, user, conversation)
-        notification_mail(
-          from: originator,
-          to: user,
-          conversation:,
-          message: conversation.messages.first.body,
-          action: "new_conversation"
-        )
-      end
-
-      def new_group_conversation(originator, manager, conversation, group)
-        notification_mail(
-          from: originator,
-          to: manager,
-          conversation:,
-          message: conversation.messages.first.body,
-          action: "new_group_conversation",
-          third_party: group
-        )
-      end
-
-      def comanagers_new_conversation(group, user, conversation, manager)
-        notification_mail(
-          from: group,
-          to: user,
-          conversation:,
-          message: conversation.messages.first.body,
-          action: "comanagers_new_conversation",
-          third_party: manager
-        )
-      end
-
-      def new_message(sender, user, conversation, message)
-        notification_mail(
-          from: sender,
-          to: user,
-          conversation:,
-          message: message.body,
-          action: "new_message"
-        )
-      end
-
-      def new_group_message(sender, user, conversation, message, group)
-        notification_mail(
-          from: sender,
-          to: user,
-          conversation:,
-          message: message.body,
-          action: "new_group_message",
-          third_party: group
-        )
-      end
-
-      def comanagers_new_message(sender, user, conversation, message, manager)
-        notification_mail(
-          from: sender,
-          to: user,
-          conversation:,
-          message: message.body,
-          action: "comanagers_new_message",
-          third_party: manager
-        )
-      end
+      include HasConversations
 
       private
 
       # rubocop:disable Metrics/ParameterLists
-      def notification_mail(from:, to:, conversation:, action:, message: nil, third_party: nil)
+      def send_notification(from:, to:, conversation:, action:, message: nil, third_party: nil)
         with_user(to) do
           @organization = to.organization
           @conversation = conversation
@@ -81,14 +19,7 @@ module Decidim
           @third_party = third_party
           @message = message
           @host = @organization.host
-
-          subject = I18n.t(
-            "conversation_mailer.#{action}.subject",
-            scope: "decidim.messaging",
-            sender: @sender.name,
-            manager: @third_party&.name,
-            group: @third_party&.name
-          )
+          subject = get_subject(action:, sender: @sender, third_party: @third_party)
 
           mail(to: to.email, subject:)
         end

data/app/models/decidim/push_notification_message.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A messsage from a conversation that will be sent as a push notification
+  class PushNotificationMessage
+    class InvalidActionError < StandardError; end
+
+    include SanitizeHelper
+
+    def initialize(recipient:, conversation:, message:)
+      @recipient = recipient
+      @conversation = conversation
+      @message = message
+    end
+
+    attr_reader :recipient, :conversation, :message
+
+    alias user recipient
+
+    def body
+      decidim_escape_translated(message)
+    end
+
+    def icon
+      organization.attached_uploader(:favicon).variant_url(:big, host: organization.host)
+    end
+
+    def url
+      EngineRouter.new("decidim", {}).public_send(:conversation_path, host: organization.host, id: @conversation)
+    end
+
+    private
+
+    def organization
+      @organization ||= recipient.organization
+    end
+  end
+end

data/app/packs/entrypoints/decidim_overrides.scss

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

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

@@ -104,6 +104,20 @@ const createDropdown = (component) => {
     });
   }
 
+  // Disable focus on children elements so we can pass the AXE accessibility tests
+  const dropdownMenu = document.getElementById(dropdownOptions.dropdown);
+  if (dropdownMenu.getAttribute("aria-hidden") === "true") {
+    dropdownMenu.
+      querySelectorAll("a, input, button").
+      forEach((element) => { element.tabIndex = -1 })
+  }
+
+  component.addEventListener("click", () => {
+    dropdownMenu.
+      querySelectorAll("a, input, button").
+      forEach((element) => { element.tabIndex = 0 })
+  })
+
   Dropdowns.render(component.id, dropdownOptions);
 }
 
@@ -136,7 +150,7 @@ const createDialog = (component) => {
     enableAutoFocus: false,
     onOpen: (params, trigger) => {
       setFocusOnTitle(params);
-      window.focusGuard.trap(trigger);
+      window.focusGuard.trap(params, trigger);
       params.dispatchEvent(new CustomEvent("open.dialog"));
     },
     onClose: (params) => {

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

@@ -0,0 +1,44 @@
+/**
+ * This script modifies the behavior of Abide form validation to address the issue of form validation errors
+ * appearing prematurely in input fields.
+ *
+ * The primary goal is to hide error messages until the input field loses focus.
+ */
+
+class AbideFormValidatorFixer {
+  initialize() {
+    const forms = document.querySelectorAll("main [data-live-validate='true']");
+
+    forms.forEach((form) => {
+      if (this.isElementVisible(form)) {
+        this.setupForm(form);
+      }
+    });
+  }
+
+  isElementVisible(element) {
+    return element.offsetParent !== null && getComputedStyle(element).display !== "none";
+  }
+
+  setupForm(form) {
+    const inputs = form.querySelectorAll("input");
+
+    inputs.forEach((input) => {
+      const errorElement = input.closest("label")?.querySelector(".form-error") || input.parentElement.querySelector(".form-error");
+      if (!errorElement) {
+        return;
+      }
+      form.removeAttribute("data-live-validate");
+      input.addEventListener("input", this.hideErrorElement.bind(this, errorElement));
+    });
+  }
+
+  hideErrorElement(errorElement) {
+    errorElement.classList.remove("is-visible");
+  }
+}
+
+document.addEventListener("DOMContentLoaded", () => {
+  const validatorFixer = new AbideFormValidatorFixer();
+  validatorFixer.initialize();
+});

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

@@ -1,4 +1,4 @@
-import PasswordToggler from "./password_toggler";
+import PasswordToggler from "src/decidim/password_toggler";
 
 const initializeAccountForm = () => {
   const newPasswordPanel = document.getElementById("panel-password");

data/app/packs/src/decidim/data_consent/consent_manager.test.js

@@ -1,7 +1,7 @@
 /* global global, jest */
 
 import Cookies from "js-cookie";
-import ConsentManager from "./consent_manager";
+import ConsentManager from "src/decidim/data_consent/consent_manager";
 
 // Mock js-cookie so that we can store the return values from the "set" method
 // in order to inspect their flags.

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

@@ -1,4 +1,4 @@
-import ConsentManager from "./consent_manager";
+import ConsentManager from "src/decidim/data_consent/consent_manager";
 
 const initDialog = (manager) => {
   if (Object.keys(manager.state).length > 0) {

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

@@ -66,7 +66,7 @@ const updateActiveUploads = (modal) => {
 
     const template = `
       <div ${attachmentIdOrHiddenField} data-filename="${escapeQuotes(file.name)}" data-title="${escapeQuotes(title)}">
-        ${(/image/).test(file.type) && `<div><img src="" alt="${escapeQuotes(file.name)}" /></div>` || ""}
+        ${(/image/).test(file.type) && `<div><img src="data:," alt="${escapeQuotes(file.name)}" /></div>` || ""}
         <span>${escapeHtml(title)} (${escapeHtml(truncateFilename(file.name))})</span>
         ${hidden}
       </div>

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

@@ -122,8 +122,8 @@ export default class UploadModal {
     if (src) {
       buffer = await fetch(src).then((res) => res.arrayBuffer())
       // since we cannot know the exact mime-type of the file,
-      // we assume as "image" if it has the src attribute in order to load the preview
-      type = "image"
+      // we assume as "image/*" if it has the src attribute in order to load the preview
+      type = "image/*"
     }
 
     const file = new File([buffer], element.dataset.filename, { type })
@@ -162,13 +162,13 @@ export default class UploadModal {
       this.emptyItems.querySelector("label").removeAttribute("disabled");
     } else {
       this.emptyItems.classList.add("is-disabled");
-      this.emptyItems.querySelector("label").setAttribute("disabled", true);
+      this.emptyItems.querySelector("label").disabled = true;
     }
   }
 
   createUploadItem(file, errors, opts = {}) {
     const okTemplate = `
-      <img src="" alt="${escapeQuotes(file.name)}" />
+      <img src="data:," alt="${escapeQuotes(file.name)}" />
       <span>${escapeHtml(truncateFilename(file.name))}</span>
     `
 
@@ -182,7 +182,7 @@ export default class UploadModal {
     `
 
     const titleTemplate = `
-      <img src="" alt="${escapeQuotes(file.name)}" />
+      <img src="data:," alt="${escapeQuotes(file.name)}" />
       <div>
         <div>
           <label>${this.locales.filename}</label>

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

@@ -6,7 +6,7 @@ import { createSuggestionRenderer, createNodeView } from "src/decidim/editor/com
 export const HashtagPluginKey = new PluginKey("hashtag");
 
 const searchHashtags = async (queryText) => {
-  return fetch("/api", {
+  return fetch(window.Decidim.config.get("api_path"), {
     method: "POST",
     cache: "no-cache",
     headers: { "Content-Type": "application/json" },

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

@@ -14,7 +14,7 @@ const searchUsers = async (queryText) => {
   }`;
 
 
-  return fetch("/api", {
+  return fetch(window.Decidim.config.get("api_path"), {
     method: "POST",
     cache: "no-cache",
     headers: { "Content-Type": "application/json" },

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

@@ -165,6 +165,9 @@ export default Node.create({
 
           src = videoDialog.getValue("src");
           title = videoDialog.getValue("title");
+          if (title && title.trim().length < 1) {
+            title = null;
+          }
           if (!src || src.length < 1) {
             this.editor.commands.focus(null, { scrollIntoView: false });
             return false;

data/app/packs/src/decidim/editor/test/editor/create.test.js

@@ -1,6 +1,6 @@
 import { Editor } from "@tiptap/core";
 
-import { createEditorContainer, updateContent } from "../helpers";
+import { createEditorContainer, updateContent } from "src/decidim/editor/test/helpers";
 
 describe("createEditor", () => {
   const ctx = {

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

@@ -6,10 +6,9 @@ import OrderedList from "@tiptap/extension-ordered-list";
 import ListItem from "@tiptap/extension-list-item";
 import Text from "@tiptap/extension-text";
 
-import Bold from "../../extensions/bold";
-// import OrderedList from "../../extensions/ordered_list";
+import Bold from "src/decidim/editor/extensions/bold";
 
-import { updateContent } from "../helpers";
+import { updateContent } from "src/decidim/editor/test/helpers";
 
 const createBasicEditor = () => {
   const element = document.createElement("div");

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

@@ -1,6 +1,6 @@
-import { createBasicEditor, updateContent } from "../helpers";
+import { createBasicEditor, updateContent } from "src/decidim/editor/test/helpers";
 
-import CharacterCount from "../../extensions/character_count";
+import CharacterCount from "src/decidim/editor/extensions/character_count";
 
 describe("CharacterCount", () => {
   let editor = null;

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

@@ -1,11 +1,10 @@
 /* global jest */
 
-// import { createBasicEditor } from "../helpers";
 import { Editor } from "@tiptap/core";
 
-import DecidimKit from "../../extensions/decidim_kit";
+import DecidimKit from "src/decidim/editor/extensions/decidim_kit";
 
-import { createEditorContainer } from "../helpers";
+import { createEditorContainer } from "src/decidim/editor/test/helpers";
 
 // Mock picmo as it is distributed as an ES6 module that is not fully compatible
 // with Jest without configuration changes.

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

@@ -1,6 +1,6 @@
-import { createBasicEditor } from "../helpers";
+import { createBasicEditor } from "src/decidim/editor/test/helpers";
 
-import Dialog from "../../extensions/dialog";
+import Dialog from "src/decidim/editor/extensions/dialog";
 
 describe("Dialog", () => {
   let editor = null;

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

@@ -1,8 +1,8 @@
 /* eslint-disable no-undef */
 
-import { createBasicEditor, sleep } from "../helpers";
+import { createBasicEditor, sleep } from "src/decidim/editor/test/helpers";
 
-import Emoji from "../../extensions/emoji";
+import Emoji from "src/decidim/editor/extensions/emoji";
 
 Reflect.defineProperty(window, "matchMedia", {
   writable: true,

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

@@ -1,8 +1,8 @@
 /* global jest, global */
 
-import { createBasicEditor, updateContent } from "../helpers";
+import { createBasicEditor, updateContent } from "src/decidim/editor/test/helpers";
 
-import Hashtag from "../../extensions/hashtag";
+import Hashtag from "src/decidim/editor/extensions/hashtag";
 
 const hashtagsResponse = [
   { name: "apples" },

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

@@ -6,9 +6,9 @@ import OrderedList from "@tiptap/extension-ordered-list";
 import ListItem from "@tiptap/extension-list-item";
 import Text from "@tiptap/extension-text";
 
-import { updateContent } from "../helpers";
+import { updateContent } from "src/decidim/editor/test/helpers";
 
-import Heading from "../../extensions/heading";
+import Heading from "src/decidim/editor/extensions/heading";
 
 const createBasicEditor = () => {
   const element = document.createElement("div");

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

@@ -1,10 +1,10 @@
 /* global jest, global */
 
-import { createBasicEditor, updateContent, sleep, pasteFixtureFile, dropFixtureFile } from "../helpers";
+import { createBasicEditor, updateContent, sleep, pasteFixtureFile, dropFixtureFile } from "src/decidim/editor/test/helpers";
 
-import Dialog from "../../extensions/dialog";
-import Image from "../../extensions/image";
-import uploadTemplates from "../fixtures/upload_templates";
+import Dialog from "src/decidim/editor/extensions/dialog";
+import Image from "src/decidim/editor/extensions/image";
+import uploadTemplates from "src/decidim/editor/test/fixtures/upload_templates";
 
 class DummyDialog {
   constructor(element) { this.element = element; }

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

@@ -1,6 +1,6 @@
-import { createBasicEditor, updateContent, selectRange } from "../helpers";
+import { createBasicEditor, updateContent, selectRange } from "src/decidim/editor/test/helpers";
 
-import Indent from "../../extensions/indent";
+import Indent from "src/decidim/editor/extensions/indent";
 
 describe("Indent", () => {
   let editor = null;

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

@@ -1,7 +1,7 @@
-import { createBasicEditor, updateContent, selectRange, sleep } from "../helpers";
+import { createBasicEditor, updateContent, selectRange, sleep } from "src/decidim/editor/test/helpers";
 
-import Dialog from "../../extensions/dialog";
-import Link from "../../extensions/link";
+import Dialog from "src/decidim/editor/extensions/dialog";
+import Link from "src/decidim/editor/extensions/link";
 
 describe("Link", () => {
   let editor = null;

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

@@ -1,8 +1,8 @@
 /* global jest, global */
 
-import { createBasicEditor, updateContent } from "../helpers";
+import { createBasicEditor, updateContent } from "src/decidim/editor/test/helpers";
 
-import Mention from "../../extensions/mention";
+import Mention from "src/decidim/editor/extensions/mention";
 
 const mentionsResponse = [
   {

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

@@ -5,9 +5,9 @@ import BulletList from "@tiptap/extension-bullet-list";
 import ListItem from "@tiptap/extension-list-item";
 import Text from "@tiptap/extension-text";
 
-import { updateContent, pasteContent } from "../helpers";
+import { updateContent, pasteContent } from "src/decidim/editor/test/helpers";
 
-import OrderedList from "../../extensions/ordered_list";
+import OrderedList from "src/decidim/editor/extensions/ordered_list";
 
 const createBasicEditor = () => {
   const element = document.createElement("div");

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

@@ -1,9 +1,9 @@
 /* global jest */
 
-import { createBasicEditor, updateContent, sleep, pasteContent } from "../helpers";
+import { createBasicEditor, updateContent, sleep, pasteContent } from "src/decidim/editor/test/helpers";
 
-import Dialog from "../../extensions/dialog";
-import VideoEmbed from "../../extensions/video_embed";
+import Dialog from "src/decidim/editor/extensions/dialog";
+import VideoEmbed from "src/decidim/editor/extensions/video_embed";
 
 describe("VideoEmbed", () => {
   let editor = null;

data/app/packs/src/decidim/editor/test/helpers.js

@@ -21,12 +21,13 @@ import OrderedList from "@tiptap/extension-ordered-list";
 import ListItem from "@tiptap/extension-list-item";
 import Text from "@tiptap/extension-text";
 
-import createEditor from "../index";
+import createEditor from "src/decidim/editor/index";
 
-import editorMessages from "./fixtures/editor_messages";
-import uploadTemplates from "./fixtures/upload_templates";
+import editorMessages from "src/decidim/editor/test/fixtures/editor_messages";
+import uploadTemplates from "src/decidim/editor/test/fixtures/upload_templates";
 
-const config = { messages: { editor: editorMessages } };
+// eslint-disable-next-line camelcase
+const config = { api_path: "/api",  messages: { editor: editorMessages } };
 window.Decidim = { config: { get: (key) => config[key] } };
 window.ClipboardEvent = class ClipboardEvent extends Event {};
 window.DragEvent = class DragEvent extends Event {};

data/app/packs/src/decidim/editor/test/toolbar/basic.test.js

@@ -1,5 +1,5 @@
-import { createEditorContainer } from "../helpers";
-import itBehavesLikeBasicToolbar from "./shared/behaves_like_basic";
+import { createEditorContainer } from "src/decidim/editor/test/helpers";
+import itBehavesLikeBasicToolbar from "src/decidim/editor/test/toolbar/shared/behaves_like_basic";
 
 describe("basic toolbar", () => {
   const ctx = {

data/app/packs/src/decidim/editor/test/toolbar/content.test.js

@@ -1,5 +1,5 @@
-import { createEditorContainer } from "../helpers";
-import itBehavesLikeContentToolbar from "./shared/behaves_like_content";
+import { createEditorContainer } from "src/decidim/editor/test/helpers";
+import itBehavesLikeContentToolbar from "src/decidim/editor/test/toolbar/shared/behaves_like_content";
 
 describe("content toolbar", () => {
   const ctx = {

data/app/packs/src/decidim/editor/test/toolbar/full.test.js

@@ -2,9 +2,9 @@
 
 import Dialog from "a11y-dialog-component";
 
-import { createEditorContainer, sleep, updateContent, selectContent, dropFixtureFile } from "../helpers";
-import contextHelpers from "./shared/context";
-import itBehavesLikeContentToolbar from "./shared/behaves_like_content";
+import { createEditorContainer, sleep, updateContent, selectContent, dropFixtureFile } from "src/decidim/editor/test/helpers";
+import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
+import itBehavesLikeContentToolbar from "src/decidim/editor/test/toolbar/shared/behaves_like_content";
 
 describe("full toolbar", () => {
   const ctx = {

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

@@ -1,9 +1,9 @@
-import itBehavesLikeBasicToolbarStyling from "./behaves_like_basic_styling";
-import itBehavesLikeBasicToolbarFormatting from "./behaves_like_basic_formatting";
-import itBehavesLikeBasicToolbarList from "./behaves_like_basic_list";
-import itBehavesLikeBasicToolbarBlock from "./behaves_like_basic_block";
-import itBehavesLikeBasicToolbarLink from "./behaves_like_basic_link";
-import itBehavesLikeBasicToolbarIndent from "./behaves_like_basic_indent";
+import itBehavesLikeBasicToolbarStyling from "src/decidim/editor/test/toolbar/shared/behaves_like_basic_styling";
+import itBehavesLikeBasicToolbarFormatting from "src/decidim/editor/test/toolbar/shared/behaves_like_basic_formatting";
+import itBehavesLikeBasicToolbarList from "src/decidim/editor/test/toolbar/shared/behaves_like_basic_list";
+import itBehavesLikeBasicToolbarBlock from "src/decidim/editor/test/toolbar/shared/behaves_like_basic_block";
+import itBehavesLikeBasicToolbarLink from "src/decidim/editor/test/toolbar/shared/behaves_like_basic_link";
+import itBehavesLikeBasicToolbarIndent from "src/decidim/editor/test/toolbar/shared/behaves_like_basic_indent";
 
 export default (ctx) => {
   ctx.prosemirror = null;

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

@@ -1,6 +1,6 @@
-import { selectContent } from "../../helpers";
+import { selectContent } from "src/decidim/editor/test/helpers";
 
-import contextHelpers from "./context";
+import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);

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

@@ -1,4 +1,4 @@
-import contextHelpers from "./context";
+import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);

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

@@ -1,6 +1,6 @@
-import { selectContent, selectRange } from "../../helpers";
+import { selectContent, selectRange } from "src/decidim/editor/test/helpers";
 
-import contextHelpers from "./context";
+import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);

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

@@ -1,6 +1,6 @@
-import { sleep, selectRange } from "../../helpers";
+import { sleep, selectRange } from "src/decidim/editor/test/helpers";
 
-import contextHelpers from "./context";
+import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);

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

@@ -1,6 +1,6 @@
-import { selectContent } from "../../helpers";
+import { selectContent } from "src/decidim/editor/test/helpers";
 
-import contextHelpers from "./context";
+import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);

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

@@ -1,6 +1,6 @@
-import { selectContent } from "../../helpers";
+import { selectContent } from "src/decidim/editor/test/helpers";
 
-import contextHelpers from "./context";
+import contextHelpers from "src/decidim/editor/test/toolbar/shared/context";
 
 export default (ctx) => {
   const { getControl, setContent } = contextHelpers(ctx);