Merge remote-tracking branch 'origin/hotfix/2.6.3' into develop

e2e/server/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.10
 
 ADD requirements.txt .
 RUN pip3 install -U pip wheel setuptools

e2e/server/requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.8
 # by the following command:
 #
 #    pip-compile requirements.in

package.json

@@ -1,6 +1,6 @@
 {
   "name": "superdesk-core",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "license": "AGPL-3.0",
   "repository": {
     "type": "git",
@@ -119,7 +119,7 @@
     "sass-loader": "6.0.6",
     "shortid": "2.2.8",
     "style-loader": "0.20.2",
-    "superdesk-ui-framework": "^3.0.54",
+    "superdesk-ui-framework": "^3.0.56",
     "ts-loader": "3.5.0",
     "tslint": "5.11.0",
     "typescript": "~4.9.5",

scripts/core/editor3/components/handlePastedText.ts

@@ -109,7 +109,7 @@ export function handlePastedText(text: string, _html: string): DraftHandleValue
         return 'handled';
     }
 
-    if (htmlComesFromDraftjsEditor(html)) {
+    if (htmlComesFromDraftjsEditor(html, false)) {
         return 'not-handled';
     }
 

scripts/core/editor3/components/tests/handlePastedText.spec.tsx

@@ -4,6 +4,8 @@ import {cursorAtEndPosition, cursorAtPosition} from './utils';
 import {insertContentInState, createHtmlFromText} from '../handlePastedText';
 import {getAnnotationsFromContentState} from 'core/editor3/helpers/editor3CustomData';
 import {getContentStateFromHtml} from 'core/editor3/html/from-html';
+import {htmlComesFromDraftjsEditor} from 'core/editor3/helpers/htmlComesFromDraftjsEditor';
+import HTML_WITH_TABLE from './pastedHtmlWithTable.html';
 
 describe('editor3.handlePastedText', () => {
     it('should insert text without selection', () => {
@@ -111,4 +113,21 @@ describe('editor3.handlePastedText', () => {
 
         expect(contentState.getPlainText('\n')).toEqual(text);
     });
+
+    it('should handle table blocks', () => {
+        const contentState = getContentStateFromHtml(HTML_WITH_TABLE);
+        const blocks = contentState.getBlocksAsArray();
+
+        expect(htmlComesFromDraftjsEditor(HTML_WITH_TABLE, false)).toBe(false);
+
+        expect(blocks.length).toBe(2);
+        expect(blocks[0].getType()).toBe("atomic");
+
+        const entity = contentState.getEntity(blocks[0].getEntityAt(0));
+        expect(entity.getType()).toBe("TABLE");
+
+        const tableData = entity.getData().data;
+        expect(tableData.numRows).toBe(6);
+        expect(tableData.numCols).toBe(4);
+    });
 });

scripts/core/editor3/helpers/htmlComesFromDraftjsEditor.ts

@@ -1,2 +1,7 @@
-export const htmlComesFromDraftjsEditor = (html: string) =>
-    new DOMParser().parseFromString(html, 'text/html').querySelector('[data-offset-key]') != null;
+export const htmlComesFromDraftjsEditor = (html: string, allowTables = true) => {
+    const tree = new DOMParser().parseFromString(html, 'text/html');
+
+    return tree.querySelector('[data-offset-key]') != null && (
+        allowTables || tree.getElementsByClassName('table-inside').length === 0
+    );
+};

scripts/core/editor3/html/from-html/index.ts

@@ -128,6 +128,8 @@ class HTMLParser {
      * about the HTML that was extracted.
      */
     pruneNodes() {
+        this.cleanUpDraftTables();
+
         this.tree.html(this.manageEmbeds(this.tree.html()));
 
         this.tree.find('iframe').each((i, node) => {
@@ -357,6 +359,26 @@ class HTMLParser {
 
         return atomicBlock(block, 'MEDIA', 'MUTABLE', mediaJson);
     }
+
+    /**
+     * When copy&pasting between windows without editor instance around
+     * we just get internal draft html with editors inside table which
+     * is not feasible for parsing, so replace the inner editor markup
+     * with the contents of the span inside.
+     */
+    cleanUpDraftTables() {
+        const handleInnerEditor = (i, elem) => {
+            const content = elem.querySelector('span[data-text="true"]').innerHTML;
+
+            elem.innerHTML = content;
+        };
+
+        this.tree.find('.table-inside > table').each((i, table) => {
+            $(table).find('th').each(handleInnerEditor);
+            $(table).find('td').each(handleInnerEditor);
+            $(table).closest('figure').replaceWith(table);
+        });
+    }
 }
 
 export function getContentStateFromHtml(html: string, associations: object = {}): ContentState {

scripts/core/superdesk-api.d.ts

@@ -752,6 +752,7 @@ declare module 'superdesk-api' {
         preffered_items?: boolean;
         tags?: Array<IVocabularyTag>;
         disable_entire_category_selection?: boolean;
+        selection_type?: 'single selection' | 'multi selection' | 'do not show';
     }
 
     export interface IArticleField extends IVocabulary {