@atlaskit/editor-plugin-collab-edit 3.9.1 → 3.9.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-collab-edit
 
+## 3.9.3
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.9.2
+
+### Patch Changes
+
+- [#161613](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/161613)
+  [`081ebfcee0d82`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/081ebfcee0d82) -
+  [EDITOR-752] Add ncsSessionStepMetrics analytics event
+
 ## 3.9.1
 
 ### Patch Changes

package/dist/cjs/collabEditPlugin.js

@@ -17,6 +17,7 @@ var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _analytics2 = require("./pm-plugins/analytics");
 var _sendTransaction = require("./pm-plugins/events/send-transaction");
+var _filterAnalytics = require("./pm-plugins/filterAnalytics");
 var _main = require("./pm-plugins/main");
 var _pluginKey = require("./pm-plugins/main/plugin-key");
 var _mergeUnconfirmed = require("./pm-plugins/mergeUnconfirmed");
@@ -203,8 +204,10 @@ var collabEditPlugin = exports.collabEditPlugin = function collabEditPlugin(_ref
         userId = _ref5$userId === void 0 ? null : _ref5$userId;
       var transformUnconfirmed = function transformUnconfirmed(steps) {
         var transformed = steps;
-        if ((0, _experiments.editorExperiment)('platform_editor_reduce_noisy_steps_ncs', true)) {
-          transformed = (0, _mergeUnconfirmed.filterAnalyticsSteps)(transformed);
+        if ((0, _experiments.editorExperiment)('platform_editor_reduce_noisy_steps_ncs', true, {
+          exposure: true
+        })) {
+          transformed = (0, _filterAnalytics.filterAnalyticsSteps)(transformed);
         }
         if ((0, _experiments.editorExperiment)('platform_editor_offline_editing_web', true)) {
           transformed = (0, _mergeUnconfirmed.mergeUnconfirmedSteps)(transformed, api);

package/dist/cjs/pm-plugins/events/send-transaction.js

@@ -22,17 +22,18 @@ var sendTransaction = exports.sendTransaction = function sendTransaction(_ref) {
       return tr.docChanged;
     });
     var currentPluginState = _pluginKey.pluginKey.getState(newEditorState);
-    var tr = oldEditorState.tr;
-    var trNoAnalytics = docChangedTransaction === null || docChangedTransaction === void 0 ? void 0 : docChangedTransaction.steps.reduce(function (nextTr, step) {
+    var trNoAnalytics = oldEditorState.tr;
+    docChangedTransaction === null || docChangedTransaction === void 0 || docChangedTransaction.steps.forEach(function (step) {
       if (!(step instanceof _steps.AnalyticsStep)) {
-        return nextTr.step(step);
+        trNoAnalytics.step(step);
       }
-      return nextTr;
-    }, tr);
+    });
     if (!(currentPluginState !== null && currentPluginState !== void 0 && currentPluginState.isReady)) {
       return;
     }
-    var newTransaction = (0, _experiments.editorExperiment)('platform_editor_reduce_noisy_steps_ncs', true) ? trNoAnalytics : docChangedTransaction;
+    var newTransaction = (0, _experiments.editorExperiment)('platform_editor_reduce_noisy_steps_ncs', true, {
+      exposure: true
+    }) ? trNoAnalytics : docChangedTransaction;
     var shouldSendStepForSynchronyCollabProvider = !originalTransaction.getMeta('isRemote') &&
     // TODO: ED-8995 - We need to do this check to reduce the number of race conditions when working with tables.
     // This metadata is coming from the scaleTable command in table-resizing plugin

package/dist/cjs/pm-plugins/filterAnalytics.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.filterAnalyticsSteps = filterAnalyticsSteps;
+var _steps = require("@atlaskit/adf-schema/steps");
+var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
+/**
+ * Filter out AnalyticsStep from the steps.
+ *
+ * @param steps Rebaseable steps
+ * @returns Rebaseable steps
+ * @example
+ */
+function filterAnalyticsSteps(steps) {
+  var filteredSteps = steps.reduce(function (acc, rebaseable) {
+    if (!(rebaseable.step instanceof _steps.AnalyticsStep)) {
+      acc.push(new _prosemirrorCollab.Rebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin));
+    }
+    return acc;
+  }, []);
+  return filteredSteps;
+}

package/dist/cjs/pm-plugins/mergeUnconfirmed.js

@@ -1,23 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.LockableRebaseable = void 0;
-exports.filterAnalyticsSteps = filterAnalyticsSteps;
 exports.mergeUnconfirmedSteps = mergeUnconfirmedSteps;
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-var _steps = require("@atlaskit/adf-schema/steps");
 var _state = require("@atlaskit/editor-prosemirror/state");
-// Based on: `packages/editor/prosemirror-collab/src/index.ts`
-var LockableRebaseable = exports.LockableRebaseable = /*#__PURE__*/(0, _createClass2.default)(function LockableRebaseable(step, inverted, origin) {
-  (0, _classCallCheck2.default)(this, LockableRebaseable);
-  this.step = step;
-  this.inverted = inverted;
-  this.origin = origin;
-});
+var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
 var isLocked = function isLocked(step) {
   if (step.origin instanceof _state.Transaction) {
     return step.origin.getMeta('mergeIsLocked');
@@ -42,35 +30,19 @@ function mergeUnconfirmedSteps(steps, api) {
     var isOffline = (api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline';
     if (isOffline && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
       var mergedStep = lastStep.step.merge(rebaseable.step);
-      var _inverted = rebaseable.inverted.merge(lastStep.inverted);
+      var inverted = rebaseable.inverted.merge(lastStep.inverted);
       // Always take the origin of the new step.
       // We use this in packages/editor/collab-provider/src/document/document-service.ts:commitUnconfirmedSteps
       // to confirm that the last transaction has been sent. Since we're taking the latest this still works as expected
       // As we want to wait until all the transactions have been pushed through
-      var _origin = lastStep.origin;
-      if (mergedStep && _inverted) {
-        acc[acc.length - 1] = new LockableRebaseable(mergedStep, _inverted, _origin instanceof _state.Transaction ? _origin.setMeta('isOffline', isOffline) : _origin);
+      var origin = lastStep.origin;
+      if (mergedStep && inverted) {
+        acc[acc.length - 1] = new _prosemirrorCollab.Rebaseable(mergedStep, inverted, origin instanceof _state.Transaction ? origin.setMeta('isOffline', isOffline) : origin);
         return acc;
       }
     }
-    return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin instanceof _state.Transaction ? rebaseable.origin.setMeta('isOffline', rebaseable.origin.getMeta('isOffline') === true || isOffline) : rebaseable.origin));
+    acc.push(new _prosemirrorCollab.Rebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin instanceof _state.Transaction ? rebaseable.origin.setMeta('isOffline', rebaseable.origin.getMeta('isOffline') === true || isOffline) : rebaseable.origin));
+    return acc;
   }, []);
   return mergedSteps;
-}
-
-/**
- * Filter out AnalyticsStep from the steps.
- *
- * @param steps Rebaseable steps
- * @returns Rebaseable steps
- * @example
- */
-function filterAnalyticsSteps(steps) {
-  var filteredSteps = steps.reduce(function (acc, rebaseable) {
-    if (rebaseable.step instanceof _steps.AnalyticsStep) {
-      return acc;
-    }
-    return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin));
-  }, []);
-  return filteredSteps;
 }

package/dist/cjs/pm-plugins/track-step-metrics.js

@@ -4,13 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateStepSessionMetrics = exports.updateActiveSessions = exports.getStepSessionMetrics = void 0;
+exports.updateNcsSessionStepMetrics = exports.updateNcsActiveSessions = exports.getNcsSessionStepMetrics = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _ncsStepMetrics = require("@atlaskit/editor-common/ncs-step-metrics");
 var _frontendUtilities = require("@atlaskit/frontend-utilities");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var STORAGE_CLIENT_KEY = 'ncs-step-metrics-storage';
-var storageClient = new _frontendUtilities.StorageClient(STORAGE_CLIENT_KEY);
+var storageClient = new _frontendUtilities.StorageClient(_ncsStepMetrics.NCS_STORAGE.NCS_STORAGE_CLIENT_KEY);
 
 /**
  * Gets the current step session metrics for a given session ID
@@ -23,9 +23,10 @@ var storageClient = new _frontendUtilities.StorageClient(STORAGE_CLIENT_KEY);
  * @param steps - The steps to calculate the metrics from.
  * @returns The updated step session metrics for the given session ID.
  */
-var getStepSessionMetrics = exports.getStepSessionMetrics = function getStepSessionMetrics(metrics, sessionId, steps) {
+var getNcsSessionStepMetrics = exports.getNcsSessionStepMetrics = function getNcsSessionStepMetrics(metrics, sessionId, steps) {
   var _metrics$sessionId;
   var current = (_metrics$sessionId = metrics[sessionId]) !== null && _metrics$sessionId !== void 0 ? _metrics$sessionId : {
+    ncsSessionId: sessionId,
     totalStepSize: 0,
     numberOfSteps: 0,
     maxStepSize: 0,
@@ -51,10 +52,10 @@ var getStepSessionMetrics = exports.getStepSessionMetrics = function getStepSess
  * @param sessionId - The session ID to check or update in local storage.
  * @returns void
  */
-var updateActiveSessions = exports.updateActiveSessions = function updateActiveSessions(sessionId) {
-  var currentActiveSessions = JSON.parse(storageClient.getItem('ncsActiveSessions') || '{}');
+var updateNcsActiveSessions = exports.updateNcsActiveSessions = function updateNcsActiveSessions(sessionId) {
+  var currentActiveSessions = JSON.parse(storageClient.getItem(_ncsStepMetrics.NCS_STORAGE.NCS_ACTIVE_SESSIONS) || '{}');
   if (!currentActiveSessions[sessionId]) {
-    storageClient.setItemWithExpiry('ncsActiveSessions', JSON.stringify(_objectSpread(_objectSpread({}, currentActiveSessions), {}, (0, _defineProperty2.default)({}, sessionId, true))));
+    storageClient.setItemWithExpiry(_ncsStepMetrics.NCS_STORAGE.NCS_ACTIVE_SESSIONS, JSON.stringify(_objectSpread(_objectSpread({}, currentActiveSessions), {}, (0, _defineProperty2.default)({}, sessionId, true))));
   }
 };
 /**
@@ -65,7 +66,7 @@ var updateActiveSessions = exports.updateActiveSessions = function updateActiveS
  * @param steps - The steps to calculate the metrics from.
  * @return void
  */
-var updateStepSessionMetrics = exports.updateStepSessionMetrics = function updateStepSessionMetrics(_ref) {
+var updateNcsSessionStepMetrics = exports.updateNcsSessionStepMetrics = function updateNcsSessionStepMetrics(_ref) {
   var _api$collabEdit;
   var api = _ref.api,
     steps = _ref.steps;
@@ -73,8 +74,8 @@ var updateStepSessionMetrics = exports.updateStepSessionMetrics = function updat
   if (!sessionId) {
     return;
   }
-  var existingMetrics = JSON.parse(storageClient.getItem('ncsStepSessionMetrics') || '{}');
-  var stepSessionMetrics = getStepSessionMetrics(existingMetrics, sessionId, steps);
-  storageClient.setItemWithExpiry('ncsStepSessionMetrics', JSON.stringify(_objectSpread(_objectSpread({}, existingMetrics), {}, (0, _defineProperty2.default)({}, sessionId, stepSessionMetrics))));
-  updateActiveSessions(sessionId);
+  var existingMetrics = JSON.parse(storageClient.getItem(_ncsStepMetrics.NCS_STORAGE.NCS_SESSION_STEP_METRICS) || '{}');
+  var ncsSessionStepMetrics = getNcsSessionStepMetrics(existingMetrics, sessionId, steps);
+  storageClient.setItemWithExpiry(_ncsStepMetrics.NCS_STORAGE.NCS_SESSION_STEP_METRICS, JSON.stringify(_objectSpread(_objectSpread({}, existingMetrics), {}, (0, _defineProperty2.default)({}, sessionId, ncsSessionStepMetrics))));
+  updateNcsActiveSessions(sessionId);
 };

package/dist/cjs/pm-plugins/track-steps.js

@@ -176,13 +176,13 @@ var track = exports.track = function track(_ref3) {
     endedAt: endedAt,
     steps: steps
   });
+  if ((0, _platformFeatureFlags.fg)('platform_enable_ncs_step_metrics')) {
+    (0, _trackStepMetrics.updateNcsSessionStepMetrics)({
+      api: api,
+      steps: newSteps
+    });
+  }
   scheduler.postTask(function () {
-    if ((0, _platformFeatureFlags.fg)('platform_enable_ncs_step_metrics')) {
-      (0, _trackStepMetrics.updateStepSessionMetrics)({
-        api: api,
-        steps: newSteps
-      });
-    }
     task(stepsSentCache, onTrackDataProcessed);
   }, {
     priority: 'background',

package/dist/es2019/collabEditPlugin.js

@@ -6,9 +6,10 @@ import { collab, getCollabState, sendableSteps } from '@atlaskit/prosemirror-col
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { addSynchronyErrorAnalytics } from './pm-plugins/analytics';
 import { sendTransaction } from './pm-plugins/events/send-transaction';
+import { filterAnalyticsSteps } from './pm-plugins/filterAnalytics';
 import { createPlugin } from './pm-plugins/main';
 import { pluginKey as mainPluginKey } from './pm-plugins/main/plugin-key';
-import { filterAnalyticsSteps, mergeUnconfirmedSteps } from './pm-plugins/mergeUnconfirmed';
+import { mergeUnconfirmedSteps } from './pm-plugins/mergeUnconfirmed';
 import { nativeCollabProviderPlugin } from './pm-plugins/native-collab-provider-plugin';
 import { sanitizeFilteredStep, createPlugin as trackSpammingStepsPlugin } from './pm-plugins/track-and-filter-spamming-steps';
 import { createPlugin as createLastOrganicChangePlugin, trackLastOrganicChangePluginKey } from './pm-plugins/track-last-organic-change';
@@ -158,7 +159,9 @@ export const collabEditPlugin = ({
       } = options || {};
       const transformUnconfirmed = steps => {
         let transformed = steps;
-        if (editorExperiment('platform_editor_reduce_noisy_steps_ncs', true)) {
+        if (editorExperiment('platform_editor_reduce_noisy_steps_ncs', true, {
+          exposure: true
+        })) {
           transformed = filterAnalyticsSteps(transformed);
         }
         if (editorExperiment('platform_editor_offline_editing_web', true)) {

package/dist/es2019/pm-plugins/events/send-transaction.js

@@ -14,17 +14,18 @@ export const sendTransaction = ({
 }) => provider => {
   const docChangedTransaction = transactions.find(tr => tr.docChanged);
   const currentPluginState = pluginKey.getState(newEditorState);
-  const tr = oldEditorState.tr;
-  const trNoAnalytics = docChangedTransaction === null || docChangedTransaction === void 0 ? void 0 : docChangedTransaction.steps.reduce((nextTr, step) => {
+  const trNoAnalytics = oldEditorState.tr;
+  docChangedTransaction === null || docChangedTransaction === void 0 ? void 0 : docChangedTransaction.steps.forEach(step => {
     if (!(step instanceof AnalyticsStep)) {
-      return nextTr.step(step);
+      trNoAnalytics.step(step);
     }
-    return nextTr;
-  }, tr);
+  });
   if (!(currentPluginState !== null && currentPluginState !== void 0 && currentPluginState.isReady)) {
     return;
   }
-  const newTransaction = editorExperiment('platform_editor_reduce_noisy_steps_ncs', true) ? trNoAnalytics : docChangedTransaction;
+  const newTransaction = editorExperiment('platform_editor_reduce_noisy_steps_ncs', true, {
+    exposure: true
+  }) ? trNoAnalytics : docChangedTransaction;
   const shouldSendStepForSynchronyCollabProvider = !originalTransaction.getMeta('isRemote') &&
   // TODO: ED-8995 - We need to do this check to reduce the number of race conditions when working with tables.
   // This metadata is coming from the scaleTable command in table-resizing plugin

package/dist/es2019/pm-plugins/filterAnalytics.js

@@ -0,0 +1,19 @@
+import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
+import { Rebaseable } from '@atlaskit/prosemirror-collab';
+
+/**
+ * Filter out AnalyticsStep from the steps.
+ *
+ * @param steps Rebaseable steps
+ * @returns Rebaseable steps
+ * @example
+ */
+export function filterAnalyticsSteps(steps) {
+  const filteredSteps = steps.reduce((acc, rebaseable) => {
+    if (!(rebaseable.step instanceof AnalyticsStep)) {
+      acc.push(new Rebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin));
+    }
+    return acc;
+  }, []);
+  return filteredSteps;
+}

package/dist/es2019/pm-plugins/mergeUnconfirmed.js

@@ -1,13 +1,5 @@
-import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
-// Based on: `packages/editor/prosemirror-collab/src/index.ts`
-export class LockableRebaseable {
-  constructor(step, inverted, origin) {
-    this.step = step;
-    this.inverted = inverted;
-    this.origin = origin;
-  }
-}
+import { Rebaseable } from '@atlaskit/prosemirror-collab';
 const isLocked = step => {
   if (step.origin instanceof Transaction) {
     return step.origin.getMeta('mergeIsLocked');
@@ -39,28 +31,12 @@ export function mergeUnconfirmedSteps(steps, api) {
       // As we want to wait until all the transactions have been pushed through
       const origin = lastStep.origin;
       if (mergedStep && inverted) {
-        acc[acc.length - 1] = new LockableRebaseable(mergedStep, inverted, origin instanceof Transaction ? origin.setMeta('isOffline', isOffline) : origin);
+        acc[acc.length - 1] = new Rebaseable(mergedStep, inverted, origin instanceof Transaction ? origin.setMeta('isOffline', isOffline) : origin);
         return acc;
       }
     }
-    return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin instanceof Transaction ? rebaseable.origin.setMeta('isOffline', rebaseable.origin.getMeta('isOffline') === true || isOffline) : rebaseable.origin));
+    acc.push(new Rebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin instanceof Transaction ? rebaseable.origin.setMeta('isOffline', rebaseable.origin.getMeta('isOffline') === true || isOffline) : rebaseable.origin));
+    return acc;
   }, []);
   return mergedSteps;
-}
-
-/**
- * Filter out AnalyticsStep from the steps.
- *
- * @param steps Rebaseable steps
- * @returns Rebaseable steps
- * @example
- */
-export function filterAnalyticsSteps(steps) {
-  const filteredSteps = steps.reduce((acc, rebaseable) => {
-    if (rebaseable.step instanceof AnalyticsStep) {
-      return acc;
-    }
-    return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin));
-  }, []);
-  return filteredSteps;
 }

package/dist/es2019/pm-plugins/track-step-metrics.js

@@ -1,6 +1,6 @@
+import { NCS_STORAGE } from '@atlaskit/editor-common/ncs-step-metrics';
 import { StorageClient } from '@atlaskit/frontend-utilities';
-const STORAGE_CLIENT_KEY = 'ncs-step-metrics-storage';
-const storageClient = new StorageClient(STORAGE_CLIENT_KEY);
+const storageClient = new StorageClient(NCS_STORAGE.NCS_STORAGE_CLIENT_KEY);
 
 /**
  * Gets the current step session metrics for a given session ID
@@ -13,9 +13,10 @@ const storageClient = new StorageClient(STORAGE_CLIENT_KEY);
  * @param steps - The steps to calculate the metrics from.
  * @returns The updated step session metrics for the given session ID.
  */
-export const getStepSessionMetrics = (metrics, sessionId, steps) => {
+export const getNcsSessionStepMetrics = (metrics, sessionId, steps) => {
   var _metrics$sessionId;
   const current = (_metrics$sessionId = metrics[sessionId]) !== null && _metrics$sessionId !== void 0 ? _metrics$sessionId : {
+    ncsSessionId: sessionId,
     totalStepSize: 0,
     numberOfSteps: 0,
     maxStepSize: 0,
@@ -41,10 +42,10 @@ export const getStepSessionMetrics = (metrics, sessionId, steps) => {
  * @param sessionId - The session ID to check or update in local storage.
  * @returns void
  */
-export const updateActiveSessions = sessionId => {
-  const currentActiveSessions = JSON.parse(storageClient.getItem('ncsActiveSessions') || '{}');
+export const updateNcsActiveSessions = sessionId => {
+  const currentActiveSessions = JSON.parse(storageClient.getItem(NCS_STORAGE.NCS_ACTIVE_SESSIONS) || '{}');
   if (!currentActiveSessions[sessionId]) {
-    storageClient.setItemWithExpiry('ncsActiveSessions', JSON.stringify({
+    storageClient.setItemWithExpiry(NCS_STORAGE.NCS_ACTIVE_SESSIONS, JSON.stringify({
       ...currentActiveSessions,
       [sessionId]: true
     }));
@@ -58,7 +59,7 @@ export const updateActiveSessions = sessionId => {
  * @param steps - The steps to calculate the metrics from.
  * @return void
  */
-export const updateStepSessionMetrics = ({
+export const updateNcsSessionStepMetrics = ({
   api,
   steps
 }) => {
@@ -67,11 +68,11 @@ export const updateStepSessionMetrics = ({
   if (!sessionId) {
     return;
   }
-  const existingMetrics = JSON.parse(storageClient.getItem('ncsStepSessionMetrics') || '{}');
-  const stepSessionMetrics = getStepSessionMetrics(existingMetrics, sessionId, steps);
-  storageClient.setItemWithExpiry('ncsStepSessionMetrics', JSON.stringify({
+  const existingMetrics = JSON.parse(storageClient.getItem(NCS_STORAGE.NCS_SESSION_STEP_METRICS) || '{}');
+  const ncsSessionStepMetrics = getNcsSessionStepMetrics(existingMetrics, sessionId, steps);
+  storageClient.setItemWithExpiry(NCS_STORAGE.NCS_SESSION_STEP_METRICS, JSON.stringify({
     ...existingMetrics,
-    [sessionId]: stepSessionMetrics
+    [sessionId]: ncsSessionStepMetrics
   }));
-  updateActiveSessions(sessionId);
+  updateNcsActiveSessions(sessionId);
 };

package/dist/es2019/pm-plugins/track-steps.js

@@ -2,7 +2,7 @@ import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { AddMarkStep, AddNodeMarkStep, AttrStep, DocAttrStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { sendableSteps } from '@atlaskit/prosemirror-collab';
-import { updateStepSessionMetrics } from './track-step-metrics';
+import { updateNcsSessionStepMetrics } from './track-step-metrics';
 function groupBy(array, keyGetter) {
   // Check group by exists, and that it's a function. If so, use the native browser code
   if ('groupBy' in Object && typeof Object.groupBy === 'function') {
@@ -154,13 +154,13 @@ export const track = ({
     endedAt,
     steps
   });
+  if (fg('platform_enable_ncs_step_metrics')) {
+    updateNcsSessionStepMetrics({
+      api,
+      steps: newSteps
+    });
+  }
   scheduler.postTask(() => {
-    if (fg('platform_enable_ncs_step_metrics')) {
-      updateStepSessionMetrics({
-        api,
-        steps: newSteps
-      });
-    }
     task(stepsSentCache, onTrackDataProcessed);
   }, {
     priority: 'background',

package/dist/esm/collabEditPlugin.js

@@ -12,9 +12,10 @@ import { collab, getCollabState, sendableSteps } from '@atlaskit/prosemirror-col
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { addSynchronyErrorAnalytics } from './pm-plugins/analytics';
 import { sendTransaction } from './pm-plugins/events/send-transaction';
+import { filterAnalyticsSteps } from './pm-plugins/filterAnalytics';
 import { createPlugin } from './pm-plugins/main';
 import { pluginKey as mainPluginKey } from './pm-plugins/main/plugin-key';
-import { filterAnalyticsSteps, mergeUnconfirmedSteps } from './pm-plugins/mergeUnconfirmed';
+import { mergeUnconfirmedSteps } from './pm-plugins/mergeUnconfirmed';
 import { nativeCollabProviderPlugin } from './pm-plugins/native-collab-provider-plugin';
 import { sanitizeFilteredStep, createPlugin as trackSpammingStepsPlugin } from './pm-plugins/track-and-filter-spamming-steps';
 import { createPlugin as createLastOrganicChangePlugin, trackLastOrganicChangePluginKey } from './pm-plugins/track-last-organic-change';
@@ -196,7 +197,9 @@ export var collabEditPlugin = function collabEditPlugin(_ref4) {
         userId = _ref5$userId === void 0 ? null : _ref5$userId;
       var transformUnconfirmed = function transformUnconfirmed(steps) {
         var transformed = steps;
-        if (editorExperiment('platform_editor_reduce_noisy_steps_ncs', true)) {
+        if (editorExperiment('platform_editor_reduce_noisy_steps_ncs', true, {
+          exposure: true
+        })) {
           transformed = filterAnalyticsSteps(transformed);
         }
         if (editorExperiment('platform_editor_offline_editing_web', true)) {

package/dist/esm/pm-plugins/events/send-transaction.js

@@ -16,17 +16,18 @@ export var sendTransaction = function sendTransaction(_ref) {
       return tr.docChanged;
     });
     var currentPluginState = pluginKey.getState(newEditorState);
-    var tr = oldEditorState.tr;
-    var trNoAnalytics = docChangedTransaction === null || docChangedTransaction === void 0 ? void 0 : docChangedTransaction.steps.reduce(function (nextTr, step) {
+    var trNoAnalytics = oldEditorState.tr;
+    docChangedTransaction === null || docChangedTransaction === void 0 || docChangedTransaction.steps.forEach(function (step) {
       if (!(step instanceof AnalyticsStep)) {
-        return nextTr.step(step);
+        trNoAnalytics.step(step);
       }
-      return nextTr;
-    }, tr);
+    });
     if (!(currentPluginState !== null && currentPluginState !== void 0 && currentPluginState.isReady)) {
       return;
     }
-    var newTransaction = editorExperiment('platform_editor_reduce_noisy_steps_ncs', true) ? trNoAnalytics : docChangedTransaction;
+    var newTransaction = editorExperiment('platform_editor_reduce_noisy_steps_ncs', true, {
+      exposure: true
+    }) ? trNoAnalytics : docChangedTransaction;
     var shouldSendStepForSynchronyCollabProvider = !originalTransaction.getMeta('isRemote') &&
     // TODO: ED-8995 - We need to do this check to reduce the number of race conditions when working with tables.
     // This metadata is coming from the scaleTable command in table-resizing plugin

package/dist/esm/pm-plugins/filterAnalytics.js

@@ -0,0 +1,19 @@
+import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
+import { Rebaseable } from '@atlaskit/prosemirror-collab';
+
+/**
+ * Filter out AnalyticsStep from the steps.
+ *
+ * @param steps Rebaseable steps
+ * @returns Rebaseable steps
+ * @example
+ */
+export function filterAnalyticsSteps(steps) {
+  var filteredSteps = steps.reduce(function (acc, rebaseable) {
+    if (!(rebaseable.step instanceof AnalyticsStep)) {
+      acc.push(new Rebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin));
+    }
+    return acc;
+  }, []);
+  return filteredSteps;
+}

package/dist/esm/pm-plugins/mergeUnconfirmed.js

@@ -1,14 +1,5 @@
-import _createClass from "@babel/runtime/helpers/createClass";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import { AnalyticsStep } from '@atlaskit/adf-schema/steps';
 import { Transaction } from '@atlaskit/editor-prosemirror/state';
-// Based on: `packages/editor/prosemirror-collab/src/index.ts`
-export var LockableRebaseable = /*#__PURE__*/_createClass(function LockableRebaseable(step, inverted, origin) {
-  _classCallCheck(this, LockableRebaseable);
-  this.step = step;
-  this.inverted = inverted;
-  this.origin = origin;
-});
+import { Rebaseable } from '@atlaskit/prosemirror-collab';
 var isLocked = function isLocked(step) {
   if (step.origin instanceof Transaction) {
     return step.origin.getMeta('mergeIsLocked');
@@ -33,35 +24,19 @@ export function mergeUnconfirmedSteps(steps, api) {
     var isOffline = (api === null || api === void 0 || (_api$connectivity = api.connectivity) === null || _api$connectivity === void 0 || (_api$connectivity = _api$connectivity.sharedState.currentState()) === null || _api$connectivity === void 0 ? void 0 : _api$connectivity.mode) === 'offline';
     if (isOffline && lastStep && !isLocked(lastStep) && !isLocked(rebaseable)) {
       var mergedStep = lastStep.step.merge(rebaseable.step);
-      var _inverted = rebaseable.inverted.merge(lastStep.inverted);
+      var inverted = rebaseable.inverted.merge(lastStep.inverted);
       // Always take the origin of the new step.
       // We use this in packages/editor/collab-provider/src/document/document-service.ts:commitUnconfirmedSteps
       // to confirm that the last transaction has been sent. Since we're taking the latest this still works as expected
       // As we want to wait until all the transactions have been pushed through
-      var _origin = lastStep.origin;
-      if (mergedStep && _inverted) {
-        acc[acc.length - 1] = new LockableRebaseable(mergedStep, _inverted, _origin instanceof Transaction ? _origin.setMeta('isOffline', isOffline) : _origin);
+      var origin = lastStep.origin;
+      if (mergedStep && inverted) {
+        acc[acc.length - 1] = new Rebaseable(mergedStep, inverted, origin instanceof Transaction ? origin.setMeta('isOffline', isOffline) : origin);
         return acc;
       }
     }
-    return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin instanceof Transaction ? rebaseable.origin.setMeta('isOffline', rebaseable.origin.getMeta('isOffline') === true || isOffline) : rebaseable.origin));
+    acc.push(new Rebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin instanceof Transaction ? rebaseable.origin.setMeta('isOffline', rebaseable.origin.getMeta('isOffline') === true || isOffline) : rebaseable.origin));
+    return acc;
   }, []);
   return mergedSteps;
-}
-
-/**
- * Filter out AnalyticsStep from the steps.
- *
- * @param steps Rebaseable steps
- * @returns Rebaseable steps
- * @example
- */
-export function filterAnalyticsSteps(steps) {
-  var filteredSteps = steps.reduce(function (acc, rebaseable) {
-    if (rebaseable.step instanceof AnalyticsStep) {
-      return acc;
-    }
-    return acc.concat(new LockableRebaseable(rebaseable.step, rebaseable.inverted, rebaseable.origin));
-  }, []);
-  return filteredSteps;
 }

package/dist/esm/pm-plugins/track-step-metrics.js

@@ -1,9 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import { NCS_STORAGE } from '@atlaskit/editor-common/ncs-step-metrics';
 import { StorageClient } from '@atlaskit/frontend-utilities';
-var STORAGE_CLIENT_KEY = 'ncs-step-metrics-storage';
-var storageClient = new StorageClient(STORAGE_CLIENT_KEY);
+var storageClient = new StorageClient(NCS_STORAGE.NCS_STORAGE_CLIENT_KEY);
 
 /**
  * Gets the current step session metrics for a given session ID
@@ -16,9 +16,10 @@ var storageClient = new StorageClient(STORAGE_CLIENT_KEY);
  * @param steps - The steps to calculate the metrics from.
  * @returns The updated step session metrics for the given session ID.
  */
-export var getStepSessionMetrics = function getStepSessionMetrics(metrics, sessionId, steps) {
+export var getNcsSessionStepMetrics = function getNcsSessionStepMetrics(metrics, sessionId, steps) {
   var _metrics$sessionId;
   var current = (_metrics$sessionId = metrics[sessionId]) !== null && _metrics$sessionId !== void 0 ? _metrics$sessionId : {
+    ncsSessionId: sessionId,
     totalStepSize: 0,
     numberOfSteps: 0,
     maxStepSize: 0,
@@ -44,10 +45,10 @@ export var getStepSessionMetrics = function getStepSessionMetrics(metrics, sessi
  * @param sessionId - The session ID to check or update in local storage.
  * @returns void
  */
-export var updateActiveSessions = function updateActiveSessions(sessionId) {
-  var currentActiveSessions = JSON.parse(storageClient.getItem('ncsActiveSessions') || '{}');
+export var updateNcsActiveSessions = function updateNcsActiveSessions(sessionId) {
+  var currentActiveSessions = JSON.parse(storageClient.getItem(NCS_STORAGE.NCS_ACTIVE_SESSIONS) || '{}');
   if (!currentActiveSessions[sessionId]) {
-    storageClient.setItemWithExpiry('ncsActiveSessions', JSON.stringify(_objectSpread(_objectSpread({}, currentActiveSessions), {}, _defineProperty({}, sessionId, true))));
+    storageClient.setItemWithExpiry(NCS_STORAGE.NCS_ACTIVE_SESSIONS, JSON.stringify(_objectSpread(_objectSpread({}, currentActiveSessions), {}, _defineProperty({}, sessionId, true))));
   }
 };
 /**
@@ -58,7 +59,7 @@ export var updateActiveSessions = function updateActiveSessions(sessionId) {
  * @param steps - The steps to calculate the metrics from.
  * @return void
  */
-export var updateStepSessionMetrics = function updateStepSessionMetrics(_ref) {
+export var updateNcsSessionStepMetrics = function updateNcsSessionStepMetrics(_ref) {
   var _api$collabEdit;
   var api = _ref.api,
     steps = _ref.steps;
@@ -66,8 +67,8 @@ export var updateStepSessionMetrics = function updateStepSessionMetrics(_ref) {
   if (!sessionId) {
     return;
   }
-  var existingMetrics = JSON.parse(storageClient.getItem('ncsStepSessionMetrics') || '{}');
-  var stepSessionMetrics = getStepSessionMetrics(existingMetrics, sessionId, steps);
-  storageClient.setItemWithExpiry('ncsStepSessionMetrics', JSON.stringify(_objectSpread(_objectSpread({}, existingMetrics), {}, _defineProperty({}, sessionId, stepSessionMetrics))));
-  updateActiveSessions(sessionId);
+  var existingMetrics = JSON.parse(storageClient.getItem(NCS_STORAGE.NCS_SESSION_STEP_METRICS) || '{}');
+  var ncsSessionStepMetrics = getNcsSessionStepMetrics(existingMetrics, sessionId, steps);
+  storageClient.setItemWithExpiry(NCS_STORAGE.NCS_SESSION_STEP_METRICS, JSON.stringify(_objectSpread(_objectSpread({}, existingMetrics), {}, _defineProperty({}, sessionId, ncsSessionStepMetrics))));
+  updateNcsActiveSessions(sessionId);
 };

package/dist/esm/pm-plugins/track-steps.js

@@ -6,7 +6,7 @@ import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
 import { AddMarkStep, AddNodeMarkStep, AttrStep, DocAttrStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { sendableSteps } from '@atlaskit/prosemirror-collab';
-import { updateStepSessionMetrics } from './track-step-metrics';
+import { updateNcsSessionStepMetrics } from './track-step-metrics';
 function groupBy(array, keyGetter) {
   // Check group by exists, and that it's a function. If so, use the native browser code
   if ('groupBy' in Object && typeof Object.groupBy === 'function') {
@@ -169,13 +169,13 @@ export var track = function track(_ref3) {
     endedAt: endedAt,
     steps: steps
   });
+  if (fg('platform_enable_ncs_step_metrics')) {
+    updateNcsSessionStepMetrics({
+      api: api,
+      steps: newSteps
+    });
+  }
   scheduler.postTask(function () {
-    if (fg('platform_enable_ncs_step_metrics')) {
-      updateStepSessionMetrics({
-        api: api,
-        steps: newSteps
-      });
-    }
     task(stepsSentCache, onTrackDataProcessed);
   }, {
     priority: 'background',

package/dist/types/pm-plugins/filterAnalytics.d.ts

@@ -0,0 +1,9 @@
+import { Rebaseable } from '@atlaskit/prosemirror-collab';
+/**
+ * Filter out AnalyticsStep from the steps.
+ *
+ * @param steps Rebaseable steps
+ * @returns Rebaseable steps
+ * @example
+ */
+export declare function filterAnalyticsSteps(steps: Rebaseable[]): Rebaseable[];

package/dist/types/pm-plugins/mergeUnconfirmed.d.ts

@@ -1,13 +1,6 @@
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
-import type { Transform as ProseMirrorTransform } from '@atlaskit/editor-prosemirror/transform';
+import { Rebaseable } from '@atlaskit/prosemirror-collab';
 import type { CollabEditPlugin } from '../collabEditPluginType';
-export declare class LockableRebaseable {
-    readonly step: ProseMirrorStep;
-    readonly inverted: ProseMirrorStep;
-    readonly origin: ProseMirrorTransform;
-    constructor(step: ProseMirrorStep, inverted: ProseMirrorStep, origin: ProseMirrorTransform);
-}
 /**
  * Merge a set of steps together to reduce the total number of steps stored in memory.
  *
@@ -18,12 +11,4 @@ export declare class LockableRebaseable {
  * @param steps Rebaseable steps
  * @returns Rebaseable steps
  */
-export declare function mergeUnconfirmedSteps(steps: LockableRebaseable[], api: ExtractInjectionAPI<CollabEditPlugin> | undefined): LockableRebaseable[];
-/**
- * Filter out AnalyticsStep from the steps.
- *
- * @param steps Rebaseable steps
- * @returns Rebaseable steps
- * @example
- */
-export declare function filterAnalyticsSteps(steps: LockableRebaseable[]): LockableRebaseable[];
+export declare function mergeUnconfirmedSteps(steps: Rebaseable[], api: ExtractInjectionAPI<CollabEditPlugin> | undefined): Rebaseable[];

package/dist/types/pm-plugins/track-step-metrics.d.ts

@@ -18,7 +18,7 @@ type StepSessionMetrics = {
  * @param steps - The steps to calculate the metrics from.
  * @returns The updated step session metrics for the given session ID.
  */
-export declare const getStepSessionMetrics: (metrics: {
+export declare const getNcsSessionStepMetrics: (metrics: {
     [sessionId: string]: StepSessionMetrics;
 }, sessionId: string, steps: Step[]) => StepSessionMetrics;
 /**
@@ -31,8 +31,8 @@ export declare const getStepSessionMetrics: (metrics: {
  * @param sessionId - The session ID to check or update in local storage.
  * @returns void
  */
-export declare const updateActiveSessions: (sessionId: string) => void;
-type UpdateStepSessionMetricProps = {
+export declare const updateNcsActiveSessions: (sessionId: string) => void;
+type UpdateNcsSessionStepMetricProps = {
     api: ExtractInjectionAPI<CollabEditPlugin> | undefined;
     steps: Step[];
 };
@@ -44,5 +44,5 @@ type UpdateStepSessionMetricProps = {
  * @param steps - The steps to calculate the metrics from.
  * @return void
  */
-export declare const updateStepSessionMetrics: ({ api, steps }: UpdateStepSessionMetricProps) => void;
+export declare const updateNcsSessionStepMetrics: ({ api, steps }: UpdateNcsSessionStepMetricProps) => void;
 export {};

package/dist/types-ts4.5/pm-plugins/filterAnalytics.d.ts

@@ -0,0 +1,9 @@
+import { Rebaseable } from '@atlaskit/prosemirror-collab';
+/**
+ * Filter out AnalyticsStep from the steps.
+ *
+ * @param steps Rebaseable steps
+ * @returns Rebaseable steps
+ * @example
+ */
+export declare function filterAnalyticsSteps(steps: Rebaseable[]): Rebaseable[];

package/dist/types-ts4.5/pm-plugins/mergeUnconfirmed.d.ts

@@ -1,13 +1,6 @@
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { Step as ProseMirrorStep } from '@atlaskit/editor-prosemirror/transform';
-import type { Transform as ProseMirrorTransform } from '@atlaskit/editor-prosemirror/transform';
+import { Rebaseable } from '@atlaskit/prosemirror-collab';
 import type { CollabEditPlugin } from '../collabEditPluginType';
-export declare class LockableRebaseable {
-    readonly step: ProseMirrorStep;
-    readonly inverted: ProseMirrorStep;
-    readonly origin: ProseMirrorTransform;
-    constructor(step: ProseMirrorStep, inverted: ProseMirrorStep, origin: ProseMirrorTransform);
-}
 /**
  * Merge a set of steps together to reduce the total number of steps stored in memory.
  *
@@ -18,12 +11,4 @@ export declare class LockableRebaseable {
  * @param steps Rebaseable steps
  * @returns Rebaseable steps
  */
-export declare function mergeUnconfirmedSteps(steps: LockableRebaseable[], api: ExtractInjectionAPI<CollabEditPlugin> | undefined): LockableRebaseable[];
-/**
- * Filter out AnalyticsStep from the steps.
- *
- * @param steps Rebaseable steps
- * @returns Rebaseable steps
- * @example
- */
-export declare function filterAnalyticsSteps(steps: LockableRebaseable[]): LockableRebaseable[];
+export declare function mergeUnconfirmedSteps(steps: Rebaseable[], api: ExtractInjectionAPI<CollabEditPlugin> | undefined): Rebaseable[];

package/dist/types-ts4.5/pm-plugins/track-step-metrics.d.ts

@@ -18,7 +18,7 @@ type StepSessionMetrics = {
  * @param steps - The steps to calculate the metrics from.
  * @returns The updated step session metrics for the given session ID.
  */
-export declare const getStepSessionMetrics: (metrics: {
+export declare const getNcsSessionStepMetrics: (metrics: {
     [sessionId: string]: StepSessionMetrics;
 }, sessionId: string, steps: Step[]) => StepSessionMetrics;
 /**
@@ -31,8 +31,8 @@ export declare const getStepSessionMetrics: (metrics: {
  * @param sessionId - The session ID to check or update in local storage.
  * @returns void
  */
-export declare const updateActiveSessions: (sessionId: string) => void;
-type UpdateStepSessionMetricProps = {
+export declare const updateNcsActiveSessions: (sessionId: string) => void;
+type UpdateNcsSessionStepMetricProps = {
     api: ExtractInjectionAPI<CollabEditPlugin> | undefined;
     steps: Step[];
 };
@@ -44,5 +44,5 @@ type UpdateStepSessionMetricProps = {
  * @param steps - The steps to calculate the metrics from.
  * @return void
  */
-export declare const updateStepSessionMetrics: ({ api, steps }: UpdateStepSessionMetricProps) => void;
+export declare const updateNcsSessionStepMetrics: ({ api, steps }: UpdateNcsSessionStepMetricProps) => void;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-collab-edit",
-	"version": "3.9.1",
+	"version": "3.9.3",
 	"description": "Collab Edit plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,7 +33,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^106.1.0",
+		"@atlaskit/editor-common": "^106.5.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/frontend-utilities": "^3.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-collab": "^0.17.0",
-		"@atlaskit/tmp-editor-statsig": "^5.5.0",
+		"@atlaskit/tmp-editor-statsig": "^6.0.0",
 		"@babel/runtime": "^7.0.0",
 		"memoize-one": "^6.0.0"
 	},