@atlaskit/collab-provider 10.4.0 → 10.4.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/collab-provider
 
+## 10.4.1
+
+### Patch Changes
+
+- [#104569](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/104569)
+  [`b79a89c03faf9`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b79a89c03faf9) -
+  log obfuscated steps for transactions in view only
+
 ## 10.4.0
 
 ### Minor Changes

package/afm-cc/tsconfig.json

@@ -41,6 +41,9 @@
         {
             "path": "../../prosemirror-collab/afm-cc/tsconfig.json"
         },
+        {
+            "path": "../../../react-ufo/atlaskit/afm-cc/tsconfig.json"
+        },
         {
             "path": "../../../data/ufo-external/afm-cc/tsconfig.json"
         },

package/afm-jira/tsconfig.json

@@ -17,6 +17,9 @@
 		"../src/**/test.*"
 	],
 	"references": [
+		{
+			"path": "../../adf-utils/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../../analytics/analytics-gas-types/afm-jira/tsconfig.json"
 		},
@@ -38,6 +41,9 @@
 		{
 			"path": "../../prosemirror-collab/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../../react-ufo/atlaskit/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../../data/ufo-external/afm-jira/tsconfig.json"
 		},

package/dist/cjs/analytics/analytics-helper.js

@@ -71,8 +71,6 @@ var triggerAnalyticsEvent = function triggerAnalyticsEvent(analyticsEvent, analy
   }
 };
 var AnalyticsHelper = exports.default = /*#__PURE__*/function () {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   function AnalyticsHelper(documentAri, subProduct, analyticsClient, getAnalyticsClient) {
     (0, _classCallCheck2.default)(this, AnalyticsHelper);
     this.documentAri = documentAri;

package/dist/cjs/api/api.js

@@ -15,6 +15,9 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
 var _utils = require("../helpers/utils");
+var _experienceTraceIdContext = require("@atlaskit/react-ufo/experience-trace-id-context");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _featureFlagsAccessed = require("@atlaskit/react-ufo/feature-flags-accessed");
 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; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -46,7 +49,7 @@ var Api = exports.Api = /*#__PURE__*/function () {
     (0, _classCallCheck2.default)(this, Api);
     (0, _defineProperty2.default)(this, "submitComment", /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(steps, version) {
-        var reqBody, url, fetchOptions;
+        var reqBody, url, tracingHeaderEnabled, tracingHeaders, fetchOptions;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -57,25 +60,33 @@ var Api = exports.Api = /*#__PURE__*/function () {
               });
               url = "".concat(_this2.config.url, "/document/").concat(encodeURIComponent(_this2.config.documentAri), "/comment");
               logger("Request url: ", url);
+
+              //Get tracing headers from UFO
+              tracingHeaderEnabled = (0, _platformFeatureFlags.fg)('platform_collab_provider_tracingheaders');
+              (0, _featureFlagsAccessed.addFeatureFlagAccessed)('platform_collab_provider_tracingheaders', tracingHeaderEnabled);
+              tracingHeaders = {};
+              if (tracingHeaderEnabled) {
+                tracingHeaders = (0, _experienceTraceIdContext.getActiveTraceHttpRequestHeaders)(url);
+              }
               _context.t0 = _objectSpread;
               _context.t1 = _objectSpread;
               _context.t2 = {};
               if (!_this2.config.permissionTokenRefresh) {
-                _context.next = 13;
+                _context.next = 17;
                 break;
               }
-              _context.next = 9;
+              _context.next = 13;
               return _this2.channel.getChannelToken();
-            case 9:
+            case 13:
               _context.t4 = _context.sent;
               _context.t3 = {
                 'x-token': _context.t4
               };
-              _context.next = 14;
+              _context.next = 18;
               break;
-            case 13:
+            case 17:
               _context.t3 = {};
-            case 14:
+            case 18:
               _context.t5 = _context.t3;
               _context.t6 = (0, _context.t1)(_context.t2, _context.t5);
               _context.t7 = {};
@@ -84,19 +95,20 @@ var Api = exports.Api = /*#__PURE__*/function () {
                 'x-subproduct': (0, _utils.getSubProduct)(_this2.config.productInfo),
                 'Content-Type': 'application/json'
               };
-              _context.t9 = (0, _context.t0)(_context.t6, _context.t7, _context.t8);
-              _context.t10 = reqBody;
+              _context.t9 = tracingHeaders;
+              _context.t10 = (0, _context.t0)(_context.t6, _context.t7, _context.t8, _context.t9);
+              _context.t11 = reqBody;
               fetchOptions = {
                 credentials: 'include',
-                headers: _context.t9,
+                headers: _context.t10,
                 method: 'POST',
-                body: _context.t10
+                body: _context.t11
               };
-              _context.next = 23;
+              _context.next = 28;
               return fetch(url, fetchOptions);
-            case 23:
+            case 28:
               return _context.abrupt("return", _context.sent);
-            case 24:
+            case 29:
             case "end":
               return _context.stop();
           }

package/dist/cjs/channel.js

@@ -235,8 +235,6 @@ var Channel = exports.Channel = /*#__PURE__*/function (_Emitter) {
         _this.emit('steps:added', data);
       }
     });
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/max-params
     (0, _defineProperty2.default)(_this, "fetchCatchupv2", /*#__PURE__*/function () {
       var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(fromVersion, clientId, catchUpOutofSync, reason) {
         var _yield$utils$requestS, steps, metadata, errorNotFound, errorCatchupv2;

package/dist/cjs/document/catchupv2.js

@@ -96,10 +96,7 @@ var logObfuscatedSteps = function logObfuscatedSteps(steps, opt) {
  * @param clientId The ID of the currently connected session (one user can have multiple if theu have multiple tabs open)
  * @returns True if we're out of sync, false if not.
  */
-var isOutOfSync = exports.isOutOfSync = function isOutOfSync(fromVersion, currentVersion, steps, clientId
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-) {
+var isOutOfSync = exports.isOutOfSync = function isOutOfSync(fromVersion, currentVersion, steps, clientId) {
   return (
     // If version number hasn't increased, and steps are not from our client, we're out of sync
     Boolean(fromVersion >= currentVersion && steps.some(function (step) {

package/dist/cjs/document/document-service.js

@@ -47,8 +47,6 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
    * @param enableErrorOnFailedDocumentApply - Enable failed document update exceptions.
    * @param getConnected - if the channel is currently connected
    */
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   function DocumentService(participantsService, analyticsHelper, fetchCatchupv2, fetchReconcile,
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -64,6 +62,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "stepRejectCounter", 0);
     (0, _defineProperty2.default)(this, "aggressiveCatchup", false);
     (0, _defineProperty2.default)(this, "catchUpOutofSync", false);
+    (0, _defineProperty2.default)(this, "hasRecovered", false);
     /**
      * To prevent calling catchup to often, use lodash throttle to reduce the frequency
      * @param reason - optional reason to attach.
@@ -315,21 +314,24 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               doc = _ref6.doc, version = _ref6.version, metadata = _ref6.metadata, targetClientId = _ref6.targetClientId;
+              if (!targetClientId) {
+                _this.hasRecovered = true;
+              }
               if (!(targetClientId && _this.clientId !== targetClientId)) {
-                _context3.next = 3;
+                _context3.next = 4;
                 break;
               }
               return _context3.abrupt("return");
-            case 3:
+            case 4:
               // We preserve these as they will be lost apon this.updateDocument. This is because we are using document recovery.
               // We can then reconcile the document with the preserved state.
               unconfirmedSteps = _this.getUnconfirmedSteps();
-              _context3.next = 6;
+              _context3.next = 7;
               return _this.getCurrentState();
-            case 6:
+            case 7:
               currentState = _context3.sent;
               useReconcile = Boolean((unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length) && currentState && !targetClientId);
-              _context3.prev = 8;
+              _context3.prev = 9;
               // Reset the editor,
               //  - Replace the document, keep in sync with the server
               //  - Replace the version number, so editor is in sync with NCS server and can commit new changes.
@@ -344,10 +346,10 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
               });
               _this.metadataService.updateMetadata(metadata);
               if (!(0, _platformFeatureFlags.fg)('restore_localstep_fallback_reconcile')) {
-                _context3.next = 25;
+                _context3.next = 26;
                 break;
               }
-              _context3.prev = 12;
+              _context3.prev = 13;
               (_this$analyticsHelper13 = _this.analyticsHelper) === null || _this$analyticsHelper13 === void 0 || _this$analyticsHelper13.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.INFO, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
                 hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
@@ -358,35 +360,35 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
               if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
                 _this.applyLocalSteps(unconfirmedSteps);
               }
-              _context3.next = 23;
+              _context3.next = 24;
               break;
-            case 17:
-              _context3.prev = 17;
-              _context3.t0 = _context3["catch"](12);
+            case 18:
+              _context3.prev = 18;
+              _context3.t0 = _context3["catch"](13);
               (_this$analyticsHelper14 = _this.analyticsHelper) === null || _this$analyticsHelper14 === void 0 || _this$analyticsHelper14.sendErrorEvent(_context3.t0, "Error while onRestore with applyLocalSteps. Will fallback to fetchReconcile");
               useReconcile = true;
-              _context3.next = 23;
+              _context3.next = 24;
               return _this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-            case 23:
-              _context3.next = 31;
+            case 24:
+              _context3.next = 32;
               break;
-            case 25:
+            case 26:
               if (!(useReconcile && currentState)) {
-                _context3.next = 30;
+                _context3.next = 31;
                 break;
               }
-              _context3.next = 28;
+              _context3.next = 29;
               return _this.fetchReconcile(JSON.stringify(currentState.content), 'fe-restore');
-            case 28:
-              _context3.next = 31;
+            case 29:
+              _context3.next = 32;
               break;
-            case 30:
+            case 31:
               if (unconfirmedSteps !== null && unconfirmedSteps !== void 0 && unconfirmedSteps.length) {
                 // we don't want to use reconcile for restore triggered by catchup client out of sync (when targetClientId is provided)
                 // as this results in all changes made while the client was out of sync being lost
                 _this.applyLocalSteps(unconfirmedSteps);
               }
-            case 31:
+            case 32:
               (_this$analyticsHelper15 = _this.analyticsHelper) === null || _this$analyticsHelper15 === void 0 || _this$analyticsHelper15.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.SUCCESS, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
                 hasTitle: !!(metadata !== null && metadata !== void 0 && metadata.title),
@@ -395,11 +397,11 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                 targetClientId: targetClientId,
                 triggeredByCatchup: targetClientId ? true : false
               });
-              _context3.next = 39;
+              _context3.next = 40;
               break;
-            case 34:
-              _context3.prev = 34;
-              _context3.t1 = _context3["catch"](8);
+            case 35:
+              _context3.prev = 35;
+              _context3.t1 = _context3["catch"](9);
               (_this$analyticsHelper16 = _this.analyticsHelper) === null || _this$analyticsHelper16 === void 0 || _this$analyticsHelper16.sendActionEvent(_const.EVENT_ACTION.REINITIALISE_DOCUMENT, _const.EVENT_STATUS.FAILURE, {
                 numUnconfirmedSteps: unconfirmedSteps === null || unconfirmedSteps === void 0 ? void 0 : unconfirmedSteps.length,
                 useReconcile: useReconcile,
@@ -416,11 +418,11 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                   code: _internalErrors.INTERNAL_ERROR_CODE.DOCUMENT_RESTORE_ERROR
                 }
               });
-            case 39:
+            case 40:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, null, [[8, 34], [12, 17]]);
+        }, _callee3, null, [[9, 35], [13, 18]]);
       }));
       return function (_x3) {
         return _ref7.apply(this, arguments);
@@ -831,8 +833,6 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
      * Send steps from transaction to other participants
      * It needs the superfluous arguments because we keep the interface of the send API the same as the Synchrony plugin
      */
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/max-params
     function send(_tr, _oldState, newState, sendAnalyticsEvent) {
       var unconfirmedStepsData = (0, _prosemirrorCollab.sendableSteps)(newState);
       var version = this.getVersionFromCollabState(newState, 'collab-provider: send');
@@ -890,7 +890,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
         onErrorHandled: this.onErrorHandled,
         analyticsHelper: this.analyticsHelper,
         emit: this.providerEmitCallback,
-        __livePage: this.options.__livePage
+        __livePage: this.options.__livePage,
+        hasRecovered: this.hasRecovered
       });
     }
   }]);

package/dist/cjs/helpers/utils.js

@@ -5,9 +5,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isAIProviderID = exports.getSubProduct = exports.getStepsAdfWithObfuscation = exports.getStepUGCFreeDetails = exports.getStepTypes = exports.getStepPositions = exports.getProduct = exports.getObfuscatedSteps = exports.getDocAdfWithObfuscation = exports.createLogger = void 0;
+exports.logObfuscatedSteps = logObfuscatedSteps;
 exports.sleep = sleep;
+exports.toObfuscatedSteps = toObfuscatedSteps;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _scrub = require("@atlaskit/adf-utils/scrub");
+var _prosemirrorCollab = require("@atlaskit/prosemirror-collab");
+var _customErrors = require("../errors/custom-errors");
 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 createLogger = exports.createLogger = function createLogger(prefix) {
@@ -199,4 +205,77 @@ var stepToAdf = function stepToAdf(step) {
     });
   }
   return [];
-};
+};
+function logObfuscatedSteps(_x, _x2) {
+  return _logObfuscatedSteps.apply(this, arguments);
+}
+function _logObfuscatedSteps() {
+  _logObfuscatedSteps = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(oldState, newState) {
+    var _states$new, _states$old, stepsFromOldState, stepsFromNewState, states;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          stepsFromOldState = '', stepsFromNewState = '';
+          states = {
+            old: oldState ? (0, _prosemirrorCollab.sendableSteps)(oldState) : null,
+            new: (0, _prosemirrorCollab.sendableSteps)(newState)
+          };
+          if (!((_states$new = states.new) !== null && _states$new !== void 0 && _states$new.steps)) {
+            _context.next = 7;
+            break;
+          }
+          _context.next = 6;
+          return toObfuscatedSteps(states.new.steps);
+        case 6:
+          stepsFromNewState = _context.sent;
+        case 7:
+          if (!((_states$old = states.old) !== null && _states$old !== void 0 && _states$old.steps)) {
+            _context.next = 11;
+            break;
+          }
+          _context.next = 10;
+          return toObfuscatedSteps(states.old.steps);
+        case 10:
+          stepsFromOldState = _context.sent;
+        case 11:
+          return _context.abrupt("return", {
+            stepsFromOldState: stepsFromOldState,
+            stepsFromNewState: stepsFromNewState
+          });
+        case 14:
+          _context.prev = 14;
+          _context.t0 = _context["catch"](0);
+          return _context.abrupt("return", new _customErrors.CustomError('Failed to obfuscate steps', _context.t0));
+        case 17:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0, 14]]);
+  }));
+  return _logObfuscatedSteps.apply(this, arguments);
+}
+function toObfuscatedSteps(_x3) {
+  return _toObfuscatedSteps.apply(this, arguments);
+}
+function _toObfuscatedSteps() {
+  _toObfuscatedSteps = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(steps) {
+    var _steps;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.next = 2;
+          return Promise.resolve(steps.slice().map(function (s) {
+            return s.toJSON();
+          }));
+        case 2:
+          _steps = _context2.sent;
+          return _context2.abrupt("return", JSON.stringify(getObfuscatedSteps(_steps)));
+        case 4:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _toObfuscatedSteps.apply(this, arguments);
+}

package/dist/cjs/participants/participants-service.js

@@ -31,8 +31,6 @@ var SEND_PRESENCE_INTERVAL = 150 * 1000; // 150 seconds
  * @param sendPresenceJoined Callback to Channel class
  */
 var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function () {
-  // Ignored via go/ees005
-  // eslint-disable-next-line @typescript-eslint/max-params
   function ParticipantsService(analyticsHelper) {
     var _this = this;
     var participantsState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new _participantsState.ParticipantsState();

package/dist/cjs/provider/commit-step.js

@@ -27,7 +27,8 @@ var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
     onErrorHandled = _ref.onErrorHandled,
     analyticsHelper = _ref.analyticsHelper,
     emit = _ref.emit,
-    __livePage = _ref.__livePage;
+    __livePage = _ref.__livePage,
+    hasRecovered = _ref.hasRecovered;
   if (!readyToCommit) {
     logger('Not ready to commit, skip');
     return;
@@ -69,6 +70,16 @@ var commitStepQueue = exports.commitStepQueue = function commitStepQueue(_ref) {
       return step;
     });
   }
+
+  // tag unconfirmed steps sent after page has been recovered during client's editing session
+  if (hasRecovered && (0, _platformFeatureFlags.fg)('tag_unconfirmed_steps_after_recovery')) {
+    stepsWithClientAndUserId = stepsWithClientAndUserId.map(function (step) {
+      step.metadata = _objectSpread(_objectSpread({}, step.metadata), {}, {
+        unconfirmedStepAfterRecovery: true
+      });
+      return step;
+    });
+  }
   var start = new Date().getTime();
   emit('commit-status', {
     status: 'attempt',

package/dist/cjs/provider/index.js

@@ -15,6 +15,7 @@ var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _uuid = require("uuid");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _emitter = require("../emitter");
 var _channel = require("../channel");
 var _utils = require("../helpers/utils");
@@ -162,7 +163,29 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
         _this.emit('permission', permit);
       }).on('steps:added', _this.documentService.onStepsAdded).on('metadata:changed', _this.metadataService.onMetadataChanged).on('participant:telepointer', function (payload) {
         return _this.participantsService.onParticipantTelepointer(payload, _this.sessionId);
-      }).on('participant:activity-join', _this.participantsService.onParticipantActivityJoin).on('participant:activity-ack', _this.participantsService.onParticipantActivityAck).on('presence:joined', _this.participantsService.onPresenceJoined).on('presence', _this.participantsService.onPresence).on('participant:left', _this.participantsService.onParticipantLeft).on('participant:updated', _this.participantsService.onParticipantUpdated).on('disconnect', _this.onDisconnected.bind(_this)).on('error', _this.onErrorHandled).on('status', _this.namespaceService.onNamespaceStatusChanged).connect(shouldSkipDocumentInit);
+      }).on('participant:activity-join', _this.participantsService.onParticipantActivityJoin).on('participant:activity-ack', _this.participantsService.onParticipantActivityAck).on('presence:joined', _this.participantsService.onPresenceJoined).on('presence', _this.participantsService.onPresence).on('participant:left', _this.participantsService.onParticipantLeft).on('participant:updated', _this.participantsService.onParticipantUpdated).on('disconnect', _this.onDisconnected.bind(_this)).on('error', _this.onErrorHandled).on('status', /*#__PURE__*/function () {
+        var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(status) {
+          var isLocked;
+          return _regenerator.default.wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return _this.namespaceService.onNamespaceStatusChanged(status);
+              case 2:
+                isLocked = _this.namespaceService.getIsNamespaceLocked();
+                _this.emit('namespace-lock:check', {
+                  isLocked: isLocked
+                });
+              case 4:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        return function (_x) {
+          return _ref4.apply(this, arguments);
+        };
+      }()).connect(shouldSkipDocumentInit);
     });
     (0, _defineProperty2.default)(_this, "setUserId", function (id) {
       _this.userId = id;
@@ -209,8 +232,8 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
       return _this.aiProviderActiveIds;
     });
     // Note: this gets triggered on page reload for Firefox (not other browsers) because of closeOnBeforeunload: false
-    (0, _defineProperty2.default)(_this, "onDisconnected", function (_ref4) {
-      var reason = _ref4.reason;
+    (0, _defineProperty2.default)(_this, "onDisconnected", function (_ref5) {
+      var reason = _ref5.reason;
       _this.disconnectedAt = Date.now();
       _this.participantsService.disconnect(reason, _this.sessionId);
     });
@@ -225,52 +248,52 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
      * Used for draft sync, a process running every 5s for the first editor of a document to sync the document to the Confluence back-end.
      * @throws {GetCurrentStateError} Something went wrong while returning the current state
      */
-    (0, _defineProperty2.default)(_this, "getCurrentState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+    (0, _defineProperty2.default)(_this, "getCurrentState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
       var _this$analyticsHelper4;
-      return _regenerator.default.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator.default.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context.prev = 0;
-            _context.next = 3;
+            _context2.prev = 0;
+            _context2.next = 3;
             return _this.documentService.getCurrentState();
           case 3:
-            return _context.abrupt("return", _context.sent);
+            return _context2.abrupt("return", _context2.sent);
           case 6:
-            _context.prev = 6;
-            _context.t0 = _context["catch"](0);
-            (_this$analyticsHelper4 = _this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 || _this$analyticsHelper4.sendErrorEvent(_context.t0, 'Error while returning ADF version of current draft document');
-            throw new _customErrors.GetCurrentStateError('Error while returning the current state of the draft document', _context.t0);
+            _context2.prev = 6;
+            _context2.t0 = _context2["catch"](0);
+            (_this$analyticsHelper4 = _this.analyticsHelper) === null || _this$analyticsHelper4 === void 0 || _this$analyticsHelper4.sendErrorEvent(_context2.t0, 'Error while returning ADF version of current draft document');
+            throw new _customErrors.GetCurrentStateError('Error while returning the current state of the draft document', _context2.t0);
           case 10:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, null, [[0, 6]]);
+      }, _callee2, null, [[0, 6]]);
     })));
     /**
      * Return the final acknowledged (by NCS) ADF version of the current draft document, together with it's title and the current step version.
      * Used when returning the document to Confluence on publish.
      * @throws {GetFinalAcknowledgedStateError} Something went wrong while returning the acknowledged state
      */
-    (0, _defineProperty2.default)(_this, "getFinalAcknowledgedState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+    (0, _defineProperty2.default)(_this, "getFinalAcknowledgedState", /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
       var _this$analyticsHelper5;
-      return _regenerator.default.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regenerator.default.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context2.prev = 0;
-            _context2.next = 3;
+            _context3.prev = 0;
+            _context3.next = 3;
             return _this.documentService.getFinalAcknowledgedState();
           case 3:
-            return _context2.abrupt("return", _context2.sent);
+            return _context3.abrupt("return", _context3.sent);
           case 6:
-            _context2.prev = 6;
-            _context2.t0 = _context2["catch"](0);
-            (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 || _this$analyticsHelper5.sendErrorEvent(_context2.t0, 'Error while returning ADF version of the final draft document');
-            throw new _customErrors.GetFinalAcknowledgedStateError('Error while returning the final acknowledged state of the draft document', _context2.t0);
+            _context3.prev = 6;
+            _context3.t0 = _context3["catch"](0);
+            (_this$analyticsHelper5 = _this.analyticsHelper) === null || _this$analyticsHelper5 === void 0 || _this$analyticsHelper5.sendErrorEvent(_context3.t0, 'Error while returning ADF version of the final draft document');
+            throw new _customErrors.GetFinalAcknowledgedStateError('Error while returning the final acknowledged state of the draft document', _context3.t0);
           case 10:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2, null, [[0, 6]]);
+      }, _callee3, null, [[0, 6]]);
     })));
     (0, _defineProperty2.default)(_this, "getUnconfirmedSteps", function () {
       return _this.documentService.getUnconfirmedSteps();
@@ -359,10 +382,10 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
      */
   }, {
     key: "setup",
-    value: function setup(_ref7) {
-      var getState = _ref7.getState,
-        editorApi = _ref7.editorApi,
-        onSyncUpError = _ref7.onSyncUpError;
+    value: function setup(_ref8) {
+      var getState = _ref8.getState,
+        editorApi = _ref8.editorApi,
+        onSyncUpError = _ref8.onSyncUpError;
       this.checkForCookies();
       try {
         // Ignored via go/ees005
@@ -456,16 +479,29 @@ var Provider = exports.Provider = /*#__PURE__*/function (_Emitter) {
   }, {
     key: "send",
     value: function send(_tr, _oldState, newState) {
+      var _this2 = this;
       try {
         if (this.isViewOnly()) {
-          var _this$analyticsHelper10;
           var error = {
             message: 'Attempted to send steps in view only mode',
             data: {
               code: _internalErrors.INTERNAL_ERROR_CODE.VIEW_ONLY_STEPS_ERROR
             }
           };
-          (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(error, error.message);
+          if ((0, _platformFeatureFlags.fg)('log_obfuscated_steps_for_view_only')) {
+            (0, _utils.logObfuscatedSteps)(_oldState, newState).then(function (attributes) {
+              var _this2$analyticsHelpe;
+              var stepAttributes = attributes instanceof _customErrors.CustomError ? {} : _objectSpread({}, attributes);
+              var stepsError = new _customErrors.CustomError(error.message, error, _objectSpread({}, stepAttributes));
+              (_this2$analyticsHelpe = _this2.analyticsHelper) === null || _this2$analyticsHelpe === void 0 || _this2$analyticsHelpe.sendErrorEvent(stepsError, stepsError.message);
+            }).catch(function (err) {
+              var _this2$analyticsHelpe2;
+              return (_this2$analyticsHelpe2 = _this2.analyticsHelper) === null || _this2$analyticsHelpe2 === void 0 ? void 0 : _this2$analyticsHelpe2.sendErrorEvent(err, err.message);
+            });
+          } else {
+            var _this$analyticsHelper10;
+            (_this$analyticsHelper10 = this.analyticsHelper) === null || _this$analyticsHelper10 === void 0 || _this$analyticsHelper10.sendErrorEvent(error, error.message);
+          }
           return;
         }
         // Don't send steps while the document is locked (eg. when restoring the document)

package/dist/cjs/version-wrapper.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = exports.name = "@atlaskit/collab-provider";
-var version = exports.version = "10.4.0";
+var version = exports.version = "10.4.1";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };