@atlaskit/collab-provider 10.5.1 → 10.6.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/collab-provider
 
+## 10.6.0
+
+### Minor Changes
+
+- [#105322](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/105322)
+  [`8876083532adc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8876083532adc) -
+  Bumped editor-prosemirror version to 7.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 10.5.2
+
+### Patch Changes
+
+- [#109636](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/109636)
+  [`2eadf04054ac2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2eadf04054ac2) -
+  [ux] Introduces way to retrieve the document from offline if there is a possible conflict event on
+  reconnection.
+- Updated dependencies
+
 ## 10.5.1
 
 ### Patch Changes

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

@@ -120,6 +120,7 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
                     (_this$analyticsHelper = _this.analyticsHelper) === null || _this$analyticsHelper === void 0 || _this$analyticsHelper.sendActionEvent(_const.EVENT_ACTION.RECONNECTION, _const.EVENT_STATUS.INFO, _objectSpread(_objectSpread({}, reconnectionMetadata), {}, {
                       remoteStepsLength: (_steps$length = steps === null || steps === void 0 ? void 0 : steps.length) !== null && _steps$length !== void 0 ? _steps$length : 0
                     }));
+                    _this.notifyReconnectionConflict(steps);
                   }
                 },
                 getState: _this.getState
@@ -128,7 +129,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
               _this.catchUpOutofSync = _context.sent;
               latency = new Date().getTime() - start;
               (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 || _this$analyticsHelper2.sendActionEvent(_const.EVENT_ACTION.CATCHUP, _const.EVENT_STATUS.SUCCESS, {
-                latency: latency
+                latency: latency,
+                version: _this.getCurrentPmVersion()
               });
               _context.next = 20;
               break;
@@ -724,6 +726,29 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
       }
       return collabState.version;
     }
+  }, {
+    key: "notifyReconnectionConflict",
+    value:
+    /**
+     * In the event we reconnect check if we have existing unconfirmed steps and if so
+     * notify the editor that we have a potential conflict to resolve on the frontend.
+     *
+     * @param data remote steps payload
+     */
+    function notifyReconnectionConflict(steps) {
+      var _this$getState7, _getCollabState;
+      if (!(0, _platformFeatureFlags.fg)('platform_editor_offline_conflict_resolution')) {
+        return;
+      }
+      var state = (_this$getState7 = this.getState) === null || _this$getState7 === void 0 ? void 0 : _this$getState7.call(this);
+      var unconfirmedSteps = state ? (_getCollabState = (0, _prosemirrorCollab.getCollabState)(state)) === null || _getCollabState === void 0 ? void 0 : _getCollabState.unconfirmed : undefined;
+      if (steps.length > 0 && state && unconfirmedSteps && unconfirmedSteps.length > 0) {
+        // In the future we can determine the type of conflict
+        this.providerEmitCallback('data:conflict', {
+          offlineDoc: state.doc
+        });
+      }
+    }
   }, {
     key: "processQueue",
     value: function processQueue() {
@@ -817,8 +842,8 @@ var DocumentService = exports.DocumentService = /*#__PURE__*/function () {
   }, {
     key: "sendStepsFromCurrentState",
     value: function sendStepsFromCurrentState(sendAnalyticsEvent) {
-      var _this$getState7;
-      var state = (_this$getState7 = this.getState) === null || _this$getState7 === void 0 ? void 0 : _this$getState7.call(this);
+      var _this$getState8;
+      var state = (_this$getState8 = this.getState) === null || _this$getState8 === void 0 ? void 0 : _this$getState8.call(this);
       if (!state) {
         var _this$analyticsHelper33;
         (_this$analyticsHelper33 = this.analyticsHelper) === null || _this$analyticsHelper33 === void 0 || _this$analyticsHelper33.sendErrorEvent(new Error('Editor state is undefined'), 'sendStepsFromCurrentState called without state');

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.5.1";
+var version = exports.version = "10.6.0";
 var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

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

@@ -114,13 +114,15 @@ export class DocumentService {
                 ...reconnectionMetadata,
                 remoteStepsLength: (_steps$length = steps === null || steps === void 0 ? void 0 : steps.length) !== null && _steps$length !== void 0 ? _steps$length : 0
               });
+              this.notifyReconnectionConflict(steps);
             }
           },
           getState: this.getState
         });
         const latency = new Date().getTime() - start;
         (_this$analyticsHelper2 = this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 ? void 0 : _this$analyticsHelper2.sendActionEvent(EVENT_ACTION.CATCHUP, EVENT_STATUS.SUCCESS, {
-          latency
+          latency,
+          version: this.getCurrentPmVersion()
         });
       } catch (error) {
         var _this$analyticsHelper3;
@@ -611,6 +613,26 @@ export class DocumentService {
     }
     return collabState.version;
   }
+  /**
+   * In the event we reconnect check if we have existing unconfirmed steps and if so
+   * notify the editor that we have a potential conflict to resolve on the frontend.
+   *
+   * @param data remote steps payload
+   */
+  notifyReconnectionConflict(steps) {
+    var _this$getState7, _getCollabState;
+    if (!fg('platform_editor_offline_conflict_resolution')) {
+      return;
+    }
+    const state = (_this$getState7 = this.getState) === null || _this$getState7 === void 0 ? void 0 : _this$getState7.call(this);
+    const unconfirmedSteps = state ? (_getCollabState = getCollabState(state)) === null || _getCollabState === void 0 ? void 0 : _getCollabState.unconfirmed : undefined;
+    if (steps.length > 0 && state && unconfirmedSteps && unconfirmedSteps.length > 0) {
+      // In the future we can determine the type of conflict
+      this.providerEmitCallback('data:conflict', {
+        offlineDoc: state.doc
+      });
+    }
+  }
   processQueue() {
     if (this.stepQueue.isPaused()) {
       logger(`Queue is paused. Aborting.`);
@@ -693,8 +715,8 @@ export class DocumentService {
    * from the EditorView.
    */
   sendStepsFromCurrentState(sendAnalyticsEvent) {
-    var _this$getState7;
-    const state = (_this$getState7 = this.getState) === null || _this$getState7 === void 0 ? void 0 : _this$getState7.call(this);
+    var _this$getState8;
+    const state = (_this$getState8 = this.getState) === null || _this$getState8 === void 0 ? void 0 : _this$getState8.call(this);
     if (!state) {
       var _this$analyticsHelper33;
       (_this$analyticsHelper33 = this.analyticsHelper) === null || _this$analyticsHelper33 === void 0 ? void 0 : _this$analyticsHelper33.sendErrorEvent(new Error('Editor state is undefined'), 'sendStepsFromCurrentState called without state');

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/collab-provider";
-export const version = "10.5.1";
+export const version = "10.6.0";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

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

@@ -113,6 +113,7 @@ export var DocumentService = /*#__PURE__*/function () {
                     (_this$analyticsHelper = _this.analyticsHelper) === null || _this$analyticsHelper === void 0 || _this$analyticsHelper.sendActionEvent(EVENT_ACTION.RECONNECTION, EVENT_STATUS.INFO, _objectSpread(_objectSpread({}, reconnectionMetadata), {}, {
                       remoteStepsLength: (_steps$length = steps === null || steps === void 0 ? void 0 : steps.length) !== null && _steps$length !== void 0 ? _steps$length : 0
                     }));
+                    _this.notifyReconnectionConflict(steps);
                   }
                 },
                 getState: _this.getState
@@ -121,7 +122,8 @@ export var DocumentService = /*#__PURE__*/function () {
               _this.catchUpOutofSync = _context.sent;
               latency = new Date().getTime() - start;
               (_this$analyticsHelper2 = _this.analyticsHelper) === null || _this$analyticsHelper2 === void 0 || _this$analyticsHelper2.sendActionEvent(EVENT_ACTION.CATCHUP, EVENT_STATUS.SUCCESS, {
-                latency: latency
+                latency: latency,
+                version: _this.getCurrentPmVersion()
               });
               _context.next = 20;
               break;
@@ -717,6 +719,29 @@ export var DocumentService = /*#__PURE__*/function () {
       }
       return collabState.version;
     }
+  }, {
+    key: "notifyReconnectionConflict",
+    value:
+    /**
+     * In the event we reconnect check if we have existing unconfirmed steps and if so
+     * notify the editor that we have a potential conflict to resolve on the frontend.
+     *
+     * @param data remote steps payload
+     */
+    function notifyReconnectionConflict(steps) {
+      var _this$getState7, _getCollabState;
+      if (!fg('platform_editor_offline_conflict_resolution')) {
+        return;
+      }
+      var state = (_this$getState7 = this.getState) === null || _this$getState7 === void 0 ? void 0 : _this$getState7.call(this);
+      var unconfirmedSteps = state ? (_getCollabState = getCollabState(state)) === null || _getCollabState === void 0 ? void 0 : _getCollabState.unconfirmed : undefined;
+      if (steps.length > 0 && state && unconfirmedSteps && unconfirmedSteps.length > 0) {
+        // In the future we can determine the type of conflict
+        this.providerEmitCallback('data:conflict', {
+          offlineDoc: state.doc
+        });
+      }
+    }
   }, {
     key: "processQueue",
     value: function processQueue() {
@@ -810,8 +835,8 @@ export var DocumentService = /*#__PURE__*/function () {
   }, {
     key: "sendStepsFromCurrentState",
     value: function sendStepsFromCurrentState(sendAnalyticsEvent) {
-      var _this$getState7;
-      var state = (_this$getState7 = this.getState) === null || _this$getState7 === void 0 ? void 0 : _this$getState7.call(this);
+      var _this$getState8;
+      var state = (_this$getState8 = this.getState) === null || _this$getState8 === void 0 ? void 0 : _this$getState8.call(this);
       if (!state) {
         var _this$analyticsHelper33;
         (_this$analyticsHelper33 = this.analyticsHelper) === null || _this$analyticsHelper33 === void 0 || _this$analyticsHelper33.sendErrorEvent(new Error('Editor state is undefined'), 'sendStepsFromCurrentState called without state');

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/collab-provider";
-export var version = "10.5.1";
+export var version = "10.6.0";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/types/document/document-service.d.ts

@@ -62,6 +62,13 @@ export declare class DocumentService implements DocumentServiceInterface {
     private catchupv2;
     private getVersionFromCollabState;
     getCurrentPmVersion: () => number;
+    /**
+     * In the event we reconnect check if we have existing unconfirmed steps and if so
+     * notify the editor that we have a potential conflict to resolve on the frontend.
+     *
+     * @param data remote steps payload
+     */
+    private notifyReconnectionConflict;
     private processQueue;
     getCurrentState: () => Promise<ResolvedEditorState>;
     private isStepsFromNewClientIdForSameUserId;

package/dist/types-ts4.5/document/document-service.d.ts

@@ -62,6 +62,13 @@ export declare class DocumentService implements DocumentServiceInterface {
     private catchupv2;
     private getVersionFromCollabState;
     getCurrentPmVersion: () => number;
+    /**
+     * In the event we reconnect check if we have existing unconfirmed steps and if so
+     * notify the editor that we have a potential conflict to resolve on the frontend.
+     *
+     * @param data remote steps payload
+     */
+    private notifyReconnectionConflict;
     private processQueue;
     getCurrentState: () => Promise<ResolvedEditorState>;
     private isStepsFromNewClientIdForSameUserId;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "10.5.1",
+	"version": "10.6.0",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -35,12 +35,12 @@
 		"@atlaskit/adf-utils": "^19.18.0",
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/analytics-listeners": "^8.14.0",
-		"@atlaskit/editor-common": "^99.7.0",
-		"@atlaskit/editor-json-transformer": "^8.22.0",
-		"@atlaskit/editor-prosemirror": "6.2.1",
+		"@atlaskit/editor-common": "^99.10.0",
+		"@atlaskit/editor-json-transformer": "^8.23.0",
+		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/feature-gate-js-client": "^4.22.0",
 		"@atlaskit/platform-feature-flags": "^1.0.0",
-		"@atlaskit/prosemirror-collab": "^0.11.0",
+		"@atlaskit/prosemirror-collab": "^0.12.0",
 		"@atlaskit/react-ufo": "^2.14.0",
 		"@atlaskit/ufo": "^0.3.0",
 		"@atlaskit/util-service-support": "^6.2.0",
@@ -85,6 +85,9 @@
 		"tag_unconfirmed_steps_after_recovery": {
 			"type": "boolean"
 		},
+		"platform_editor_offline_conflict_resolution": {
+			"type": "boolean"
+		},
 		"platform_collab_provider_tracingheaders": {
 			"type": "boolean"
 		},