@atlaskit/collab-provider 9.32.2 → 9.33.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/collab-provider
 
+## 9.33.0
+
+### Minor Changes
+
+- [#119314](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/119314)
+  [`e7b05702b37eb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e7b05702b37eb) -
+  Include session id in the activity join/ack data
+
+### Patch Changes
+
+- Updated dependencies
+
+## 9.32.3
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 9.32.2
 
 ### Patch Changes

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

@@ -256,11 +256,7 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
     (0, _defineProperty2.default)(this, "onParticipantActivityJoin", function (payload) {
       try {
         logger('New participant joined: ', payload.activity);
-        var _data2 = {
-          userId: payload.userId,
-          activity: payload.activity
-        };
-        _this.emit('activity:join', _data2);
+        _this.emit('activity:join', payload);
       } catch (error) {
         var _this$analyticsHelper8;
         // We don't want to throw errors for Presence features as they tend to self-restore
@@ -273,11 +269,12 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
     (0, _defineProperty2.default)(this, "onParticipantActivityAck", function (payload) {
       try {
         logger('Existing participants ack: ', payload.activity);
-        var _data3 = {
+        var _data2 = {
           activity: payload.activity,
-          userId: _this.getPresenceData().userId
+          userId: _this.getPresenceData().userId,
+          sessionId: _this.getPresenceData().sessionId
         };
-        _this.emit('activity:ack', _data3);
+        _this.emit('activity:ack', _data2);
       } catch (error) {
         var _this$analyticsHelper9;
         // We don't want to throw errors for Presence features as they tend to self-restore

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

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

@@ -205,11 +205,7 @@ export class ParticipantsService {
     _defineProperty(this, "onParticipantActivityJoin", payload => {
       try {
         logger('New participant joined: ', payload.activity);
-        const data = {
-          userId: payload.userId,
-          activity: payload.activity
-        };
-        this.emit('activity:join', data);
+        this.emit('activity:join', payload);
       } catch (error) {
         var _this$analyticsHelper8;
         // We don't want to throw errors for Presence features as they tend to self-restore
@@ -224,7 +220,8 @@ export class ParticipantsService {
         logger('Existing participants ack: ', payload.activity);
         const data = {
           activity: payload.activity,
-          userId: this.getPresenceData().userId
+          userId: this.getPresenceData().userId,
+          sessionId: this.getPresenceData().sessionId
         };
         this.emit('activity:ack', data);
       } catch (error) {

package/dist/es2019/version-wrapper.js

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

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

@@ -249,11 +249,7 @@ export var ParticipantsService = /*#__PURE__*/function () {
     _defineProperty(this, "onParticipantActivityJoin", function (payload) {
       try {
         logger('New participant joined: ', payload.activity);
-        var _data2 = {
-          userId: payload.userId,
-          activity: payload.activity
-        };
-        _this.emit('activity:join', _data2);
+        _this.emit('activity:join', payload);
       } catch (error) {
         var _this$analyticsHelper8;
         // We don't want to throw errors for Presence features as they tend to self-restore
@@ -266,11 +262,12 @@ export var ParticipantsService = /*#__PURE__*/function () {
     _defineProperty(this, "onParticipantActivityAck", function (payload) {
       try {
         logger('Existing participants ack: ', payload.activity);
-        var _data3 = {
+        var _data2 = {
           activity: payload.activity,
-          userId: _this.getPresenceData().userId
+          userId: _this.getPresenceData().userId,
+          sessionId: _this.getPresenceData().sessionId
         };
-        _this.emit('activity:ack', _data3);
+        _this.emit('activity:ack', _data2);
       } catch (error) {
         var _this$analyticsHelper9;
         // We don't want to throw errors for Presence features as they tend to self-restore

package/dist/esm/version-wrapper.js

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

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
 export { Provider } from './provider';
 export type { CollabEventDisconnectedData, Socket } from './types';
-export type { NewCollabSyncUpErrorAttributes, ResolvedEditorState, CollabMetadataPayload, CollabEventInitData, CollabInitPayload, CollabEventConnectionData, CollabConnectedPayload, CollabDisconnectedPayload, CollabDataPayload, CollabTelepointerPayload, CollabPresencePayload, CollabLocalStepsPayload, CollabPermissionEventPayload, CollabEventRemoteData, CollabEventPresenceData, CollabActivityJoinPayload, CollabActivityAckPayload, CollabEventConnectingData, CollabEventTelepointerData, CollabSendableSelection, CollabParticipant, CollabEvents, SyncUpErrorFunction, CollabEditProvider, ProviderError, ProviderParticipant, CollabEventLocalStepData, UserPermitType, } from '@atlaskit/editor-common/collab';
+export type { NewCollabSyncUpErrorAttributes, ResolvedEditorState, CollabMetadataPayload, CollabEventInitData, CollabInitPayload, CollabEventConnectionData, CollabConnectedPayload, CollabDisconnectedPayload, CollabDataPayload, CollabActivityData, CollabTelepointerPayload, CollabPresencePayload, CollabLocalStepsPayload, CollabPermissionEventPayload, CollabEventRemoteData, CollabEventPresenceData, CollabActivityJoinPayload, CollabActivityAckPayload, CollabEventConnectingData, CollabEventTelepointerData, CollabSendableSelection, CollabParticipant, CollabEvents, SyncUpErrorFunction, CollabEditProvider, ProviderError, ProviderParticipant, CollabEventLocalStepData, UserPermitType, } from '@atlaskit/editor-common/collab';
 export { PROVIDER_ERROR_CODE } from '@atlaskit/editor-common/collab';

package/dist/types/types.d.ts

@@ -129,6 +129,7 @@ export type PresencePayload = PresenceData & {
 export type ActivityPayload = {
     userId: string | undefined;
     activity: Activity;
+    sessionId: string;
 };
 export type TelepointerPayload = PresencePayload & {
     selection: CollabSendableSelection;

package/dist/types-ts4.5/index.d.ts

@@ -1,4 +1,4 @@
 export { Provider } from './provider';
 export type { CollabEventDisconnectedData, Socket } from './types';
-export type { NewCollabSyncUpErrorAttributes, ResolvedEditorState, CollabMetadataPayload, CollabEventInitData, CollabInitPayload, CollabEventConnectionData, CollabConnectedPayload, CollabDisconnectedPayload, CollabDataPayload, CollabTelepointerPayload, CollabPresencePayload, CollabLocalStepsPayload, CollabPermissionEventPayload, CollabEventRemoteData, CollabEventPresenceData, CollabActivityJoinPayload, CollabActivityAckPayload, CollabEventConnectingData, CollabEventTelepointerData, CollabSendableSelection, CollabParticipant, CollabEvents, SyncUpErrorFunction, CollabEditProvider, ProviderError, ProviderParticipant, CollabEventLocalStepData, UserPermitType, } from '@atlaskit/editor-common/collab';
+export type { NewCollabSyncUpErrorAttributes, ResolvedEditorState, CollabMetadataPayload, CollabEventInitData, CollabInitPayload, CollabEventConnectionData, CollabConnectedPayload, CollabDisconnectedPayload, CollabDataPayload, CollabActivityData, CollabTelepointerPayload, CollabPresencePayload, CollabLocalStepsPayload, CollabPermissionEventPayload, CollabEventRemoteData, CollabEventPresenceData, CollabActivityJoinPayload, CollabActivityAckPayload, CollabEventConnectingData, CollabEventTelepointerData, CollabSendableSelection, CollabParticipant, CollabEvents, SyncUpErrorFunction, CollabEditProvider, ProviderError, ProviderParticipant, CollabEventLocalStepData, UserPermitType, } from '@atlaskit/editor-common/collab';
 export { PROVIDER_ERROR_CODE } from '@atlaskit/editor-common/collab';

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

@@ -129,6 +129,7 @@ export type PresencePayload = PresenceData & {
 export type ActivityPayload = {
     userId: string | undefined;
     activity: Activity;
+    sessionId: string;
 };
 export type TelepointerPayload = PresencePayload & {
     selection: CollabSendableSelection;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "9.32.2",
+	"version": "9.33.0",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -39,7 +39,7 @@
 	"dependencies": {
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/analytics-listeners": "^8.10.0",
-		"@atlaskit/editor-common": "^83.5.0",
+		"@atlaskit/editor-common": "^84.5.0",
 		"@atlaskit/editor-json-transformer": "^8.15.0",
 		"@atlaskit/editor-prosemirror": "4.0.1",
 		"@atlaskit/platform-feature-flags": "^0.3.0",