decidim-core 0.30.1 → 0.31.0.rc1

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

@@ -3,17 +3,17 @@ import { Extension } from "@tiptap/core";
 import StarterKit from "@tiptap/starter-kit";
 import CodeBlock from "@tiptap/extension-code-block";
 import Underline from "@tiptap/extension-underline";
+import Heading from "@tiptap/extension-heading";
 
 import CharacterCount from "src/decidim/editor/extensions/character_count";
 import Bold from "src/decidim/editor/extensions/bold";
 import Dialog from "src/decidim/editor/extensions/dialog";
-import Hashtag from "src/decidim/editor/extensions/hashtag";
-import Heading from "src/decidim/editor/extensions/heading";
 import OrderedList from "src/decidim/editor/extensions/ordered_list";
 import Image from "src/decidim/editor/extensions/image";
 import Indent from "src/decidim/editor/extensions/indent";
 import Link from "src/decidim/editor/extensions/link";
 import Mention from "src/decidim/editor/extensions/mention";
+import MentionResource from "src/decidim/editor/extensions/mention_resource";
 import VideoEmbed from "src/decidim/editor/extensions/video_embed";
 import Emoji from "src/decidim/editor/extensions/emoji";
 
@@ -31,8 +31,8 @@ export default Extension.create({
         uploadImagesPath: null,
         contentTypes: /^image\/(jpe?g|png|svg|webp)$/i
       },
-      hashtag: false,
       mention: false,
+      mentionResource: false,
       emoji: false
     };
   },
@@ -67,14 +67,14 @@ export default Extension.create({
       extensions.push(Image.configure(this.options.image));
     }
 
-    if (this.options.hashtag !== false) {
-      extensions.push(Hashtag.configure(this.options.hashtag));
-    }
-
     if (this.options.mention !== false) {
       extensions.push(Mention.configure(this.options.mention));
     }
 
+    if (this.options.mentionResource !== false) {
+      extensions.push(MentionResource.configure(this.options.mentionResource));
+    }
+
     if (this.options.emoji !== false) {
       extensions.push(Emoji.configure(this.options.emoji));
     }

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

@@ -1,10 +1,9 @@
 import { Extension } from "@tiptap/core";
 
-import { EmojiButton } from "src/decidim/input_emoji";
-
 const createEmojiButton = (editor) => {
   const { view: { dom } } = editor;
-  return new EmojiButton(dom);
+
+  return dom.setAttribute("data-controller", "emoji");
 }
 
 export default Extension.create({

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

@@ -2,7 +2,7 @@ import { mergeAttributes } from "@tiptap/core";
 import Image from "@tiptap/extension-image";
 import { Plugin } from "prosemirror-state";
 
-import { getDictionary } from "src/decidim/i18n";
+import { getDictionary } from "src/decidim/refactor/moved/i18n";
 import { fileNameToTitle } from "src/decidim/editor/utilities/file";
 import createNodeView from "src/decidim/editor/extensions/image/node_view";
 

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

@@ -1,6 +1,6 @@
 import { DOMSerializer } from "prosemirror-model";
 
-import { getDictionary } from "src/decidim/i18n";
+import { getDictionary } from "src/decidim/refactor/moved/i18n";
 
 const createControl = (position, label) => {
   const el = document.createElement("button");

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

@@ -1,6 +1,6 @@
 import { PluginKey } from "prosemirror-state";
 
-import { getDictionary } from "src/decidim/i18n";
+import { getDictionary } from "src/decidim/refactor/moved/i18n";
 import BubbleMenu from "src/decidim/editor/common/bubble_menu";
 
 class LinkBubbleMenu extends BubbleMenu {

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

@@ -1,7 +1,7 @@
 import Link from "@tiptap/extension-link";
 import { Plugin } from "prosemirror-state";
 
-import { getDictionary } from "src/decidim/i18n";
+import { getDictionary } from "src/decidim/refactor/moved/i18n";
 import InputDialog from "src/decidim/editor/common/input_dialog";
 import createBubbleMenu from "src/decidim/editor/extensions/link/bubble_menu";
 

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

@@ -8,8 +8,7 @@ const searchUsers = async (queryText) => {
       nickname,
       name,
       avatarUrl,
-      __typename,
-      ...on UserGroup { membersCount }
+      __typename
     }
   }`;
 

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

@@ -0,0 +1,69 @@
+import Mention from "@tiptap/extension-mention";
+import { PluginKey } from "prosemirror-state";
+
+import { createSuggestionRenderer, createNodeView } from "src/decidim/editor/common/suggestion";
+
+export const MentionResourcePluginKey = new PluginKey("mentionResource");
+
+const searchResources = async (queryText) => {
+  const currentParticipatorySpace = document.querySelector("meta[name='context-current-participatory-space']")?.content;
+
+  let url = `/resource_autocomplete?term=${queryText}`;
+
+  if (currentParticipatorySpace) {
+    url += `&participatory_space_gid=${currentParticipatorySpace}`;
+  }
+
+  return new Promise((resolve, reject) => {
+    Rails.ajax({
+      url,
+      type: "GET",
+      dataType: "json",
+      success: (response) => resolve(response),
+      error: () => reject(new Error("Could not retrieve data"))
+    });
+  });
+};
+
+export default Mention.extend({
+  name: "mentionResource",
+
+  addOptions() {
+    const options = this.parent?.();
+    const suggestion = options?.suggestion;
+
+    return {
+      ...options,
+      renderLabel({ node }) {
+        // The labels are formed based on the titles returned by the API
+        // which already contain the suggestion character, so there is no need
+        // to display it twice.
+        return `${node.attrs.label ?? node.attrs.id}`
+      },
+      suggestion: {
+        ...suggestion,
+        char: "/",
+        pluginKey: MentionResourcePluginKey,
+        allowSpaces: false,
+        items: async ({ query }) => {
+          const data = await searchResources(query);
+
+          return data;
+        },
+        render: createSuggestionRenderer(this, {
+          itemConverter: (resource) => {
+            return {
+              id: resource.gid,
+              label: resource.title,
+              help: resource.help
+            }
+          }
+        })
+      }
+    };
+  },
+
+  addNodeView() {
+    return createNodeView(this);
+  }
+});

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

@@ -1,7 +1,7 @@
 import { Node, nodePasteRule, mergeAttributes } from "@tiptap/core";
 import { Plugin } from "prosemirror-state";
 
-import { getDictionary } from "src/decidim/i18n";
+import { getDictionary } from "src/decidim/refactor/moved/i18n";
 import InputDialog from "src/decidim/editor/common/input_dialog";
 
 const YOUTUBE_REGEX = /^(https?:\/\/)?(www\.|music\.)?(youtube\.com|youtu\.be)(.+)?$/;

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

@@ -59,16 +59,17 @@ export default function createEditor(container) {
     };
   }
 
-  if (container.classList.contains("js-hashtags")) {
-    decidimOptions.hashtag = true;
-  }
-  if (container.classList.contains("js-mentions")) {
+  if (options.mention) {
     decidimOptions.mention = true;
   }
-  if (container.classList.contains("js-emojis")) {
+  if (options.emoji) {
     decidimOptions.emoji = true;
   }
 
+  if (container.classList.contains("js-resource-mentions")) {
+    decidimOptions.mentionResource = true;
+  }
+
   const editor = new Editor({
     element: editorContainer,
     editorProps: { attributes: editorAttributes },

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

@@ -66,7 +66,6 @@ describe("DecidimKit", () => {
       [
         "videoEmbed",
         "image",
-        "hashtag",
         "mention",
         "emoji"
       ].forEach((name) => expect(extensions).not.toContain(name));
@@ -76,8 +75,8 @@ describe("DecidimKit", () => {
   const extensionSettings = {
     videoEmbed: true,
     image: { uploadDialogSelector: "#upload_dialog", uploadImagesPath: "/upload" },
-    hashtag: true,
     mention: true,
+    mentionResource: true,
     emoji: true
   };
   Object.keys(extensionSettings).forEach((extensionKey) => {

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

@@ -1,5 +1,7 @@
 /* eslint-disable no-undef */
 
+import { Application } from "@hotwired/stimulus"
+import EmojiController from "src/decidim/controllers/emoji/controller";
 import { createBasicEditor, sleep } from "src/decidim/editor/test/helpers";
 
 import Emoji from "src/decidim/editor/extensions/emoji";
@@ -19,16 +21,31 @@ Reflect.defineProperty(window, "matchMedia", {
 });
 
 describe("Emoji", () => {
+  let application = null;
+  let controller = null;
+
   beforeEach(async () => {
+    application = Application.start();
+    application.register("emoji", EmojiController);
+
     document.body.innerHTML = "";
 
     createBasicEditor({ extensions: [Emoji] })
 
     // Wait the event loop to finish creating the emoji picker
     await sleep(0);
+
+    let mockElement = document.querySelector("[data-controller='emoji']")
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        controller = application.getControllerForElementAndIdentifier(mockElement, "emoji");
+        resolve();
+      }, 0);
+    });
   });
 
   it("creates the emoji button for the editor", () => {
+    expect(controller).toBeDefined()
     expect(document.querySelector(".editor-input .emoji__container")).toBeInstanceOf(HTMLElement);
     expect(document.querySelector(".editor-input .emoji__trigger button.emoji__button")).toBeInstanceOf(HTMLElement);
   });

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

@@ -8,7 +8,7 @@ import Text from "@tiptap/extension-text";
 
 import { updateContent } from "src/decidim/editor/test/helpers";
 
-import Heading from "src/decidim/editor/extensions/heading";
+import Heading from "@tiptap/extension-heading";
 
 const createBasicEditor = () => {
   const element = document.createElement("div");
@@ -51,6 +51,6 @@ describe("Heading", () => {
     editorElement.focus();
     await updateContent(editorElement, "# ");
 
-    expect(editor.getHTML()).toMatchHtml("<p># </p>");
+    expect(editor.getHTML()).toMatchHtml("<h2></h2>");
   });
 });

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

@@ -1,4 +1,4 @@
-import { getDictionary } from "src/decidim/i18n";
+import { getDictionary } from "src/decidim/refactor/moved/i18n";
 import html from "src/decidim/editor/utilities/html";
 
 import iconsUrl from "images/decidim/remixicon.symbol.svg";

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

@@ -1,4 +1,4 @@
-$(() => {
+document.addEventListener("turbo:load", () => {
   $("form .attachments_container").on("closed.zf.callout", (event) => {
     $(event.target).remove();
   });

data/app/packs/src/decidim/geocoding/attach_input.js

@@ -60,6 +60,9 @@ import getCoordinateInputName from "src/decidim/geocoding/coordinate_input"
 
 export default function attachGeocoding($input, options, callback) {
   const attachOptions = $.extend({}, options);
+  if (!$input.attr("id")) {
+    return;
+  };
   const inputIdParts = $input.attr("id").split("_");
   inputIdParts.pop();
 

data/app/packs/src/decidim/geocoding/provider/here.js

@@ -5,7 +5,7 @@ import formatAddress from "src/decidim/geocoding/format_address"
  * For the available address format keys, refer to:
  * https://developer.here.com/documentation/geocoder-autocomplete/dev_guide/topics/resource-type-response-suggest.html
  */
-$(() => {
+document.addEventListener("turbo:load", () => {
   const generateAddressLabel = formatAddress;
 
   $("[data-decidim-geocoding]").each((_i, el) => {

data/app/packs/src/decidim/geocoding/provider/photon.js

@@ -5,7 +5,7 @@ import formatAddress from "src/decidim/geocoding/format_address"
  * For the available address format keys, refer to:
  * https://github.com/komoot/photon
  */
-$(() => {
+document.addEventListener("turbo:load", () => {
   const generateAddressLabel = formatAddress;
 
   $("[data-decidim-geocoding]").each((_i, el) => {

data/app/packs/src/decidim/geocoding/reverse_geocoding.js

@@ -1,4 +1,4 @@
-document.addEventListener("DOMContentLoaded", () => {
+export const initializeReverseGeocoding = function() {
   const info = (target, msg) => {
     const label = target.closest("label");
     label.querySelectorAll(".form-error").forEach((el) => el.remove());
@@ -57,4 +57,4 @@ document.addEventListener("DOMContentLoaded", () => {
       }
     });
   });
-});
+};

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

@@ -1,6 +1,6 @@
-import AutoComplete from "src/decidim/autocomplete";
+import AutoComplete from "src/decidim/refactor/moved/autocomplete";
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   $("[data-decidim-geocoding]").each((_i, el) => {
     const $input = $(el);