@atlaskit/collab-provider 24.0.1 → 24.1.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/collab-provider
 
+## 24.1.0
+
+### Minor Changes
+
+- [`3c9414f125601`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3c9414f125601) -
+  Show editing status for agents detected from agent-authored collaboration steps.
+
+## 24.0.2
+
+### Patch Changes
+
+- [`d7528657a607f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d7528657a607f) -
+  Feature-gate and serialize agent attribution from matching transaction origins onto native-collab
+  steps.
+- Updated dependencies
+
 ## 24.0.1
 
 ### Patch Changes

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

@@ -142,7 +142,9 @@ var ParticipantsService = exports.ParticipantsService = /*#__PURE__*/function ()
       var sessionId = payload.sessionId;
       var existing = _this.participantsState.getBySessionId(sessionId);
       var wasInactive = existing ? Date.now() - existing.lastActive >= AGENT_PRESENCE_INACTIVE_MS : false;
-      var participant = _objectSpread(_objectSpread({}, payload), {}, {
+      var participant = _objectSpread(_objectSpread(_objectSpread({}, payload), (0, _fg.fg)('platform_move_presence_agents') ? {
+        presenceActivity: 'editor'
+      } : {}), {}, {
         // `payload.userId` is typed `string | undefined`; here it is always the (string)
         // providerId, so pin it to satisfy ProviderParticipant.userId (string).
         userId: providerId,

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

@@ -13,6 +13,8 @@ var _const = require("../helpers/const");
 var _types = require("../types");
 var _ncsErrors = require("../errors/ncs-errors");
 var _utils = require("../helpers/utils");
+var _transactionAgentAttribution = require("@atlaskit/editor-common/transaction-agent-attribution");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 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; }
@@ -36,6 +38,7 @@ var CommitStepService = exports.CommitStepService = /*#__PURE__*/function () {
     this.onErrorHandled = onErrorHandled;
     this.readyToCommit = true;
     this.lastBroadcastRequestAcked = true;
+    this.shouldSerializeAgentAttribution = (0, _fg.fg)('platform_editor_agentic_step_attribution');
   }
   return (0, _createClass2.default)(CommitStepService, [{
     key: "commitStepQueue",
@@ -75,11 +78,17 @@ var CommitStepService = exports.CommitStepService = /*#__PURE__*/function () {
         _this.lastBroadcastRequestAcked = true;
         logger('reset readyToCommit by timer');
       }, RESET_READYTOCOMMIT_INTERVAL_MS);
-      var stepsWithClientAndUserId = steps.map(function (step) {
+      var stepsWithClientAndUserId = steps.map(function (step, index) {
+        var _stepOrigins$index;
+        var agentAttribution = _this.shouldSerializeAgentAttribution ? stepOrigins === null || stepOrigins === void 0 || (_stepOrigins$index = stepOrigins[index]) === null || _stepOrigins$index === void 0 ? void 0 : _stepOrigins$index.getMeta(_transactionAgentAttribution.AGENT_ATTRIBUTION_META) : undefined;
         return _objectSpread(_objectSpread({}, step.toJSON()), {}, {
           clientId: clientId,
           userId: userId
-        });
+        }, agentAttribution ? _objectSpread({
+          agentType: agentAttribution.agentType
+        }, agentAttribution.agentId !== undefined ? {
+          agentId: agentAttribution.agentId
+        } : {}) : {});
       });
 
       // Mutate steps to ignore expand expand/collapse changes in live pages

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

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

@@ -130,6 +130,9 @@ export class ParticipantsService {
       const wasInactive = existing ? Date.now() - existing.lastActive >= AGENT_PRESENCE_INACTIVE_MS : false;
       const participant = {
         ...payload,
+        ...(fg('platform_move_presence_agents') ? {
+          presenceActivity: 'editor'
+        } : {}),
         // `payload.userId` is typed `string | undefined`; here it is always the (string)
         // providerId, so pin it to satisfy ProviderParticipant.userId (string).
         userId: providerId,

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

@@ -3,6 +3,8 @@ import { ADD_STEPS_TYPE, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { AcknowledgementResponseTypes } from '../types';
 import { NCS_ERROR_CODE } from '../errors/ncs-errors';
 import { createLogger } from '../helpers/utils';
+import { AGENT_ATTRIBUTION_META } from '@atlaskit/editor-common/transaction-agent-attribution';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 const logger = createLogger('commit-step', 'black');
 export const RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
@@ -23,6 +25,7 @@ export class CommitStepService {
     this.onErrorHandled = onErrorHandled;
     this.readyToCommit = true;
     this.lastBroadcastRequestAcked = true;
+    this.shouldSerializeAgentAttribution = fg('platform_editor_agentic_step_attribution');
   }
   commitStepQueue({
     steps,
@@ -60,11 +63,21 @@ export class CommitStepService {
       this.lastBroadcastRequestAcked = true;
       logger('reset readyToCommit by timer');
     }, RESET_READYTOCOMMIT_INTERVAL_MS);
-    let stepsWithClientAndUserId = steps.map(step => ({
-      ...step.toJSON(),
-      clientId,
-      userId
-    }));
+    let stepsWithClientAndUserId = steps.map((step, index) => {
+      var _stepOrigins$index;
+      const agentAttribution = this.shouldSerializeAgentAttribution ? stepOrigins === null || stepOrigins === void 0 ? void 0 : (_stepOrigins$index = stepOrigins[index]) === null || _stepOrigins$index === void 0 ? void 0 : _stepOrigins$index.getMeta(AGENT_ATTRIBUTION_META) : undefined;
+      return {
+        ...step.toJSON(),
+        clientId,
+        userId,
+        ...(agentAttribution ? {
+          agentType: agentAttribution.agentType,
+          ...(agentAttribution.agentId !== undefined ? {
+            agentId: agentAttribution.agentId
+          } : {})
+        } : {})
+      };
+    });
 
     // Mutate steps to ignore expand expand/collapse changes in live pages
     // This is expected to be a temporary divergence from standard editor behaviour

package/dist/es2019/version-wrapper.js

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

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

@@ -135,7 +135,9 @@ export var ParticipantsService = /*#__PURE__*/function () {
       var sessionId = payload.sessionId;
       var existing = _this.participantsState.getBySessionId(sessionId);
       var wasInactive = existing ? Date.now() - existing.lastActive >= AGENT_PRESENCE_INACTIVE_MS : false;
-      var participant = _objectSpread(_objectSpread({}, payload), {}, {
+      var participant = _objectSpread(_objectSpread(_objectSpread({}, payload), fg('platform_move_presence_agents') ? {
+        presenceActivity: 'editor'
+      } : {}), {}, {
         // `payload.userId` is typed `string | undefined`; here it is always the (string)
         // providerId, so pin it to satisfy ProviderParticipant.userId (string).
         userId: providerId,

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

@@ -8,6 +8,8 @@ import { ADD_STEPS_TYPE, EVENT_ACTION, EVENT_STATUS } from '../helpers/const';
 import { AcknowledgementResponseTypes } from '../types';
 import { NCS_ERROR_CODE } from '../errors/ncs-errors';
 import { createLogger } from '../helpers/utils';
+import { AGENT_ATTRIBUTION_META } from '@atlaskit/editor-common/transaction-agent-attribution';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var logger = createLogger('commit-step', 'black');
 export var RESET_READYTOCOMMIT_INTERVAL_MS = 5000;
@@ -29,6 +31,7 @@ export var CommitStepService = /*#__PURE__*/function () {
     this.onErrorHandled = onErrorHandled;
     this.readyToCommit = true;
     this.lastBroadcastRequestAcked = true;
+    this.shouldSerializeAgentAttribution = fg('platform_editor_agentic_step_attribution');
   }
   return _createClass(CommitStepService, [{
     key: "commitStepQueue",
@@ -68,11 +71,17 @@ export var CommitStepService = /*#__PURE__*/function () {
         _this.lastBroadcastRequestAcked = true;
         logger('reset readyToCommit by timer');
       }, RESET_READYTOCOMMIT_INTERVAL_MS);
-      var stepsWithClientAndUserId = steps.map(function (step) {
+      var stepsWithClientAndUserId = steps.map(function (step, index) {
+        var _stepOrigins$index;
+        var agentAttribution = _this.shouldSerializeAgentAttribution ? stepOrigins === null || stepOrigins === void 0 || (_stepOrigins$index = stepOrigins[index]) === null || _stepOrigins$index === void 0 ? void 0 : _stepOrigins$index.getMeta(AGENT_ATTRIBUTION_META) : undefined;
         return _objectSpread(_objectSpread({}, step.toJSON()), {}, {
           clientId: clientId,
           userId: userId
-        });
+        }, agentAttribution ? _objectSpread({
+          agentType: agentAttribution.agentType
+        }, agentAttribution.agentId !== undefined ? {
+          agentId: agentAttribution.agentId
+        } : {}) : {});
       });
 
       // Mutate steps to ignore expand expand/collapse changes in live pages

package/dist/esm/version-wrapper.js

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

package/dist/types/provider/commit-step.d.ts

@@ -13,6 +13,7 @@ export declare class CommitStepService {
     private onErrorHandled;
     private readyToCommit;
     private lastBroadcastRequestAcked;
+    private readonly shouldSerializeAgentAttribution;
     /**
      * @param broadcast - Callback for broadcasting events to other clients
      * @param analyticsHelper - Helper for analytics events

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/collab-provider",
-	"version": "24.0.1",
+	"version": "24.1.0",
 	"description": "A provider for collaborative editing.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -18,18 +18,18 @@
 		"team": "Editor: Collaboration"
 	},
 	"dependencies": {
-		"@atlaskit/adf-utils": "^20.5.0",
+		"@atlaskit/adf-utils": "^20.6.0",
 		"@atlaskit/analytics-gas-types": "^6.0.0",
 		"@atlaskit/analytics-listeners": "^11.1.0",
 		"@atlaskit/anonymous-assets": "^2.8.0",
 		"@atlaskit/atlassian-context": "^1.1.0",
-		"@atlaskit/editor-json-transformer": "^9.2.0",
+		"@atlaskit/editor-json-transformer": "^9.4.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/feature-gate-js-client": "^6.0.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
 		"@atlaskit/prosemirror-collab": "^1.0.0",
-		"@atlaskit/react-ufo": "^7.5.0",
+		"@atlaskit/react-ufo": "^7.6.0",
 		"@atlaskit/tmp-editor-statsig": "^147.1.0",
 		"@atlaskit/ufo": "^1.0.0",
 		"@atlaskit/util-service-support": "^7.2.0",
@@ -56,7 +56,7 @@
 		}
 	},
 	"devDependencies": {
-		"@atlaskit/adf-schema": "^56.7.0",
+		"@atlaskit/adf-schema": "^57.0.0",
 		"@atlassian/a11y-jest-testing": "^0.15.0",
 		"@atlassian/experiment-test-utils": "^0.2.0",
 		"@atlassian/feature-flags-test-utils": "^1.2.0"
@@ -66,6 +66,9 @@
 			"type": "boolean",
 			"referenceOnly": true
 		},
+		"platform_editor_agentic_step_attribution": {
+			"type": "boolean"
+		},
 		"platform-editor-presence-websocket-only": {
 			"type": "boolean"
 		},
@@ -74,6 +77,6 @@
 		}
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^119.1.0"
+		"@atlaskit/editor-common": "^119.4.0"
 	}
 }