XWIKI-23459: Upgrade to Cristal 0.22.0

Author: mflorea

xwiki-platform-core/xwiki-platform-blocknote/xwiki-platform-blocknote-test/xwiki-platform-blocknote-test-docker/pom.xml

@@ -42,6 +42,7 @@
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-blocknote-api</artifactId>
       <version>${project.version}</version>
+      <scope>runtime</scope>
     </dependency>
     <!-- Test only dependencies -->
     <dependency>

xwiki-platform-core/xwiki-platform-blocknote/xwiki-platform-blocknote-test/xwiki-platform-blocknote-test-docker/src/test/it/org/xwiki/blocknote/test/ui/BlockNoteIT.java

@@ -19,7 +19,20 @@
  */
 package org.xwiki.blocknote.test.ui;
 
+import org.junit.jupiter.api.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+import org.xwiki.test.docker.junit5.TestReference;
 import org.xwiki.test.docker.junit5.UITest;
+import org.xwiki.test.ui.TestUtils;
+import org.xwiki.test.ui.XWikiWebDriver;
+import org.xwiki.test.ui.po.ViewPage;
+import org.xwiki.test.ui.po.editor.WYSIWYGEditPage;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.openqa.selenium.Keys.CONTROL;
+import static org.openqa.selenium.Keys.END;
 
 /**
  * Tests of the BlockNote integration.
@@ -30,4 +43,40 @@
 @UITest
 class BlockNoteIT
 {
-}
+    /**
+     * Run the minimal steps to validate the editor is loading: edit an existing page, add some content, save the
+     * result.
+     */
+    @Test
+    void minimal(TestUtils setup, TestReference testReference)
+    {
+        setup.loginAsSuperAdmin();
+        // Make Blocknote the default to not have to explicit it later.
+        setup.addObject("XWiki", "XWikiPreferences", "XWiki.EditorBindingClass", "dataType",
+            "org.xwiki.rendering.syntax.SyntaxContent#wysiwyg", "roleHint", "blocknote");
+        // Make the user advance to have access to the edit dropdown.
+        setup.createUserAndLogin("U1", "$U1", "editor", "Wysiwyg", "usertype", "Advanced");
+
+        // Create a page with a small content, edit it, add a little basic content, save and observe the content
+        // changed.
+        String textContent = "Test";
+        ViewPage page = setup.createPage(testReference, textContent, "", "markdown/1.2");
+        page.edit();
+        XWikiWebDriver driver = setup.getDriver();
+        WebElement blocknoteEditableContent = driver
+            .findElement(By.cssSelector(".xwiki-blocknote .bn-container .bn-editor"));
+        assertEquals(textContent, blocknoteEditableContent.getText());
+        String addedContent = "123";
+        blocknoteEditableContent.click();
+
+        // Move cursor to end using keyboard shortcuts, then insert the content.
+        Actions actions = new Actions(driver.getWrappedDriver());
+        actions.keyDown(CONTROL).sendKeys(END).keyUp(CONTROL)
+            .sendKeys(addedContent)
+            .perform();
+        ViewPage postSavePage = new WYSIWYGEditPage().clickSaveAndView();
+        assertEquals("""
+            %s
+            %s""".formatted(textContent, addedContent), postSavePage.getContent());
+    }
+}

xwiki-platform-core/xwiki-platform-blocknote/xwiki-platform-blocknote-webjar/src/main/node/package.json

@@ -9,26 +9,25 @@
     "lint": "eslint \"./src/**/*.{js,ts,vue}\" --fix --max-warnings=0"
   },
   "dependencies": {
-    "@blocknote/core": "0.31.3",
-    "@blocknote/mantine": "0.31.3",
-    "@mantine/core": "8.1.1",
-    "@xwiki/cristal-api": "0.19.0",
-    "@xwiki/cristal-attachments-default": "0.19.0",
-    "@xwiki/cristal-authentication-api": "0.19.0",
-    "@xwiki/cristal-backend-api": "0.19.0",
-    "@xwiki/cristal-document-api": "0.19.0",
-    "@xwiki/cristal-dsapi": "0.19.0",
-    "@xwiki/cristal-editors-blocknote-headless": "0.19.0",
-    "@xwiki/cristal-editors-blocknote-react": "0.19.0",
-    "@xwiki/cristal-link-suggest-api": "0.19.0",
-    "@xwiki/cristal-model-api": "0.19.0",
-    "@xwiki/cristal-model-reference-api": "0.19.0",
-    "@xwiki/cristal-model-remote-url-api": "0.19.0",
-    "@xwiki/cristal-uniast": "0.19.0",
+    "@xwiki/cristal-api": "0.22.0",
+    "@xwiki/cristal-attachments-default": "0.22.0",
+    "@xwiki/cristal-authentication-api": "0.22.0",
+    "@xwiki/cristal-backend-api": "0.22.0",
+    "@xwiki/cristal-collaboration-api": "0.22.0",
+    "@xwiki/cristal-document-api": "0.22.0",
+    "@xwiki/cristal-dsapi": "0.22.0",
+    "@xwiki/cristal-editors-blocknote-headless": "0.22.0",
+    "@xwiki/cristal-editors-blocknote-react": "0.22.0",
+    "@xwiki/cristal-link-suggest-api": "0.22.0",
+    "@xwiki/cristal-model-api": "0.22.0",
+    "@xwiki/cristal-model-reference-api": "0.22.0",
+    "@xwiki/cristal-model-remote-url-api": "0.22.0",
+    "@xwiki/cristal-uniast-api": "0.22.0",
+    "@xwiki/cristal-uniast-markdown": "0.22.0",
     "inversify": "7.5.2",
     "pinia": "3.0.2",
-    "react": "19.1.0",
-    "react-dom": "19.1.0",
+    "react": "19.1.1",
+    "react-dom": "19.1.1",
     "vue-i18n": "11.1.12"
   },
   "peerDependencies": {
@@ -58,14 +57,6 @@
     "vue-tsc": "3.0.6"
   },
   "pnpm": {
-    "overrides": {
-      "@xwiki/cristal-fn-utils": "0.19.0",
-      "@xwiki/cristal-model-api": "0.19.0",
-      "@xwiki/cristal-model-reference-api": "0.19.0",
-      "@xwiki/cristal-model-remote-url-api": "0.19.0",
-      "inversify": "7.5.2",
-      "vue": "3.5.22"
-    },
     "onlyBuiltDependencies": [
       "esbuild"
     ]