@atlaskit/editor-common 98.2.4 → 98.2.5

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/editor-common
 
+## 98.2.5
+
+### Patch Changes
+
+- [#100845](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/100845)
+  [`bd4c63b5f9688`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bd4c63b5f9688) -
+  [ED-26055] Export a function from adf-utils used to detect the use of the nested-tables extension,
+  and add calculation of unexpectedly nested tables to editor-common utils
+- Updated dependencies
+
 ## 98.2.4
 
 ### Patch Changes

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "98.2.4";
+var packageVersion = "98.2.5";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/ui/DropList/index.js

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "98.2.4";
+var packageVersion = "98.2.5";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/cjs/utils/page-element-counts.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getPageElementCounts = void 0;
+var _transforms = require("@atlaskit/adf-utils/transforms");
 var _traverse = require("@atlaskit/adf-utils/traverse");
 /**
  * Traverses a JSON document and counts the number of unique elements, text formatting and macros.
@@ -13,7 +14,8 @@ var getPageElementCounts = exports.getPageElementCounts = function getPageElemen
   var pageElementCounts = {
     elements: {},
     textFormats: {},
-    macros: {}
+    macros: {},
+    unexpectedElements: {}
   };
   (0, _traverse.reduce)(doc, function (acc, node) {
     if (node.type === 'text') {
@@ -32,6 +34,22 @@ var getPageElementCounts = exports.getPageElementCounts = function getPageElemen
       if ('attrs' in node && node.attrs && 'extensionKey' in node.attrs && node.attrs.extensionKey) {
         var _acc$macros$extension;
         var extensionKey = node.attrs.extensionKey;
+
+        // If there is a nested table extension
+        if ((0, _transforms.isNestedTableExtension)(node)) {
+          if ('parameters' in node.attrs && node.attrs.parameters && 'adf' in node.attrs.parameters) {
+            // Check to see if the ADF contains a nested table
+            var adfString = node.attrs.parameters.adf;
+            var adf = JSON.parse(adfString);
+            if (adfString.includes('{"type":"table"')) {
+              if (getHasNestedTable(adf)) {
+                var _acc$unexpectedElemen;
+                acc.unexpectedElements['tablesNestedMoreThanOnce'] = ((_acc$unexpectedElemen = acc.unexpectedElements['tablesNestedMoreThanOnce']) !== null && _acc$unexpectedElemen !== void 0 ? _acc$unexpectedElemen : 0) + 1;
+              }
+            }
+          }
+        }
+
         // If macros extensionKey has <UUID>/<UUID>/static/ prepended to it, remove the prefix
         if (extensionKey.includes('/static/')) {
           var extensionKeyParts = extensionKey.split('/');
@@ -46,4 +64,24 @@ var getPageElementCounts = exports.getPageElementCounts = function getPageElemen
     return acc;
   }, pageElementCounts);
   return pageElementCounts;
+};
+
+/**
+ * Return true is the JSON document contains a table nested within a table
+ */
+var getHasNestedTable = function getHasNestedTable(node) {
+  return (0, _traverse.reduce)(node, function (hasNestedTable, node) {
+    if (hasNestedTable) {
+      return hasNestedTable;
+    }
+    if (node.type === 'table') {
+      return (0, _traverse.reduce)(node, function (acc, node) {
+        if (node.type === 'table') {
+          return true;
+        }
+        return acc;
+      }, false);
+    }
+    return hasNestedTable;
+  }, false);
 };

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "98.2.4";
+const packageVersion = "98.2.5";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/ui/DropList/index.js

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "98.2.4";
+const packageVersion = "98.2.5";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/es2019/utils/page-element-counts.js

@@ -1,3 +1,4 @@
+import { isNestedTableExtension } from '@atlaskit/adf-utils/transforms';
 import { reduce } from '@atlaskit/adf-utils/traverse';
 /**
  * Traverses a JSON document and counts the number of unique elements, text formatting and macros.
@@ -7,7 +8,8 @@ export const getPageElementCounts = doc => {
   const pageElementCounts = {
     elements: {},
     textFormats: {},
-    macros: {}
+    macros: {},
+    unexpectedElements: {}
   };
   reduce(doc, (acc, node) => {
     if (node.type === 'text') {
@@ -26,6 +28,22 @@ export const getPageElementCounts = doc => {
       if ('attrs' in node && node.attrs && 'extensionKey' in node.attrs && node.attrs.extensionKey) {
         var _acc$macros$extension;
         let extensionKey = node.attrs.extensionKey;
+
+        // If there is a nested table extension
+        if (isNestedTableExtension(node)) {
+          if ('parameters' in node.attrs && node.attrs.parameters && 'adf' in node.attrs.parameters) {
+            // Check to see if the ADF contains a nested table
+            const adfString = node.attrs.parameters.adf;
+            const adf = JSON.parse(adfString);
+            if (adfString.includes('{"type":"table"')) {
+              if (getHasNestedTable(adf)) {
+                var _acc$unexpectedElemen;
+                acc.unexpectedElements['tablesNestedMoreThanOnce'] = ((_acc$unexpectedElemen = acc.unexpectedElements['tablesNestedMoreThanOnce']) !== null && _acc$unexpectedElemen !== void 0 ? _acc$unexpectedElemen : 0) + 1;
+              }
+            }
+          }
+        }
+
         // If macros extensionKey has <UUID>/<UUID>/static/ prepended to it, remove the prefix
         if (extensionKey.includes('/static/')) {
           const extensionKeyParts = extensionKey.split('/');
@@ -40,4 +58,24 @@ export const getPageElementCounts = doc => {
     return acc;
   }, pageElementCounts);
   return pageElementCounts;
+};
+
+/**
+ * Return true is the JSON document contains a table nested within a table
+ */
+const getHasNestedTable = node => {
+  return reduce(node, (hasNestedTable, node) => {
+    if (hasNestedTable) {
+      return hasNestedTable;
+    }
+    if (node.type === 'table') {
+      return reduce(node, (acc, node) => {
+        if (node.type === 'table') {
+          return true;
+        }
+        return acc;
+      }, false);
+    }
+    return hasNestedTable;
+  }, false);
 };

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "98.2.4";
+var packageVersion = "98.2.5";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/ui/DropList/index.js

@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "98.2.4";
+var packageVersion = "98.2.5";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/esm/utils/page-element-counts.js

@@ -1,3 +1,4 @@
+import { isNestedTableExtension } from '@atlaskit/adf-utils/transforms';
 import { reduce } from '@atlaskit/adf-utils/traverse';
 /**
  * Traverses a JSON document and counts the number of unique elements, text formatting and macros.
@@ -7,7 +8,8 @@ export var getPageElementCounts = function getPageElementCounts(doc) {
   var pageElementCounts = {
     elements: {},
     textFormats: {},
-    macros: {}
+    macros: {},
+    unexpectedElements: {}
   };
   reduce(doc, function (acc, node) {
     if (node.type === 'text') {
@@ -26,6 +28,22 @@ export var getPageElementCounts = function getPageElementCounts(doc) {
       if ('attrs' in node && node.attrs && 'extensionKey' in node.attrs && node.attrs.extensionKey) {
         var _acc$macros$extension;
         var extensionKey = node.attrs.extensionKey;
+
+        // If there is a nested table extension
+        if (isNestedTableExtension(node)) {
+          if ('parameters' in node.attrs && node.attrs.parameters && 'adf' in node.attrs.parameters) {
+            // Check to see if the ADF contains a nested table
+            var adfString = node.attrs.parameters.adf;
+            var adf = JSON.parse(adfString);
+            if (adfString.includes('{"type":"table"')) {
+              if (getHasNestedTable(adf)) {
+                var _acc$unexpectedElemen;
+                acc.unexpectedElements['tablesNestedMoreThanOnce'] = ((_acc$unexpectedElemen = acc.unexpectedElements['tablesNestedMoreThanOnce']) !== null && _acc$unexpectedElemen !== void 0 ? _acc$unexpectedElemen : 0) + 1;
+              }
+            }
+          }
+        }
+
         // If macros extensionKey has <UUID>/<UUID>/static/ prepended to it, remove the prefix
         if (extensionKey.includes('/static/')) {
           var extensionKeyParts = extensionKey.split('/');
@@ -40,4 +58,24 @@ export var getPageElementCounts = function getPageElementCounts(doc) {
     return acc;
   }, pageElementCounts);
   return pageElementCounts;
+};
+
+/**
+ * Return true is the JSON document contains a table nested within a table
+ */
+var getHasNestedTable = function getHasNestedTable(node) {
+  return reduce(node, function (hasNestedTable, node) {
+    if (hasNestedTable) {
+      return hasNestedTable;
+    }
+    if (node.type === 'table') {
+      return reduce(node, function (acc, node) {
+        if (node.type === 'table') {
+          return true;
+        }
+        return acc;
+      }, false);
+    }
+    return hasNestedTable;
+  }, false);
 };

package/dist/types/utils/page-element-counts.d.ts

@@ -9,6 +9,9 @@ export type PageElementCounts = {
     macros: {
         [key: string]: number;
     };
+    unexpectedElements: {
+        [key: string]: number;
+    };
 };
 /**
  * Traverses a JSON document and counts the number of unique elements, text formatting and macros.

package/dist/types-ts4.5/utils/page-element-counts.d.ts

@@ -9,6 +9,9 @@ export type PageElementCounts = {
     macros: {
         [key: string]: number;
     };
+    unexpectedElements: {
+        [key: string]: number;
+    };
 };
 /**
  * Traverses a JSON document and counts the number of unique elements, text formatting and macros.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "98.2.4",
+	"version": "98.2.5",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -113,7 +113,7 @@
 	"dependencies": {
 		"@atlaskit/activity-provider": "^2.5.0",
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/adf-utils": "^19.14.0",
+		"@atlaskit/adf-utils": "^19.15.0",
 		"@atlaskit/analytics-listeners": "^8.13.0",
 		"@atlaskit/analytics-namespaced-context": "^6.12.0",
 		"@atlaskit/analytics-next": "^10.2.0",
@@ -154,7 +154,7 @@
 		"@atlaskit/spinner": "^16.3.0",
 		"@atlaskit/task-decision": "^17.11.0",
 		"@atlaskit/textfield": "^6.7.0",
-		"@atlaskit/tmp-editor-statsig": "^2.32.0",
+		"@atlaskit/tmp-editor-statsig": "^2.33.0",
 		"@atlaskit/tokens": "^2.5.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@atlaskit/width-detector": "^4.3.0",