@atlaskit/editor-synced-block-provider 3.30.5 → 3.31.0

package/dist/cjs/providers/syncBlockProvider.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useMemoizedSyncedBlockProvider = exports.SyncedBlockProvider = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -15,6 +16,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _ari = require("../clients/block-service/ari");
 var _ari2 = require("../clients/confluence/ari");
 var _sourceInfo2 = require("../clients/confluence/sourceInfo");
@@ -159,7 +161,7 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
     value: (function () {
       var _writeNodesData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(nodes, data) {
         var _this3 = this;
-        var results;
+        var validDataWithIndices, invalidResults, batchResults, results;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -169,7 +171,38 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
               }
               return _context2.abrupt("return", Promise.reject(new Error('Write provider not set')));
             case 2:
-              _context2.next = 4;
+              if (!(this.writeProvider.writeDataBatch && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4'))) {
+                _context2.next = 12;
+                break;
+              }
+              // Separate data into valid (with content) and invalid (without content)
+              validDataWithIndices = [];
+              invalidResults = [];
+              data.forEach(function (blockData) {
+                if (blockData.content) {
+                  validDataWithIndices.push(blockData);
+                } else {
+                  invalidResults.push({
+                    error: 'No Synced Block content to write',
+                    resourceId: blockData.resourceId
+                  });
+                }
+              });
+
+              // Process valid data in batch
+              batchResults = [];
+              if (!(validDataWithIndices.length > 0)) {
+                _context2.next = 11;
+                break;
+              }
+              _context2.next = 10;
+              return this.writeProvider.writeDataBatch(validDataWithIndices);
+            case 10:
+              batchResults = _context2.sent;
+            case 11:
+              return _context2.abrupt("return", [].concat((0, _toConsumableArray2.default)(batchResults), invalidResults));
+            case 12:
+              _context2.next = 14;
               return Promise.allSettled(nodes.map(function (_node, index) {
                 var _this3$writeProvider;
                 if (!_this3.writeProvider) {
@@ -180,7 +213,7 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
                 }
                 return (_this3$writeProvider = _this3.writeProvider) === null || _this3$writeProvider === void 0 ? void 0 : _this3$writeProvider.writeData(data[index]);
               }));
-            case 4:
+            case 14:
               results = _context2.sent;
               return _context2.abrupt("return", results.map(function (result) {
                 if (result.status === 'fulfilled') {
@@ -191,7 +224,7 @@ var SyncedBlockProvider = exports.SyncedBlockProvider = /*#__PURE__*/function (_
                   };
                 }
               }));
-            case 6:
+            case 16:
             case "end":
               return _context2.stop();
           }
@@ -451,7 +484,7 @@ var createSyncedBlockProvider = function createSyncedBlockProvider(_ref) {
     writeProvider = _ref.writeProvider;
   return new SyncedBlockProvider(fetchProvider, writeProvider);
 };
-var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(_ref2) {
+var useMemoizedSyncedBlockProviderBase = function useMemoizedSyncedBlockProviderBase(_ref2) {
   var fetchProvider = _ref2.fetchProvider,
     writeProvider = _ref2.writeProvider,
     providerOptions = _ref2.providerOptions,
@@ -468,4 +501,33 @@ var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = fu
     syncBlockProvider.setSSRData(ssrData);
   }
   return syncBlockProvider;
-};
+};
+var useMemoizedSyncedBlockProviderPatched = function useMemoizedSyncedBlockProviderPatched(_ref3) {
+  var fetchProvider = _ref3.fetchProvider,
+    writeProvider = _ref3.writeProvider,
+    providerOptions = _ref3.providerOptions,
+    getSSRData = _ref3.getSSRData;
+  var syncBlockProvider = (0, _react.useMemo)(function () {
+    return createSyncedBlockProvider({
+      fetchProvider: fetchProvider,
+      writeProvider: writeProvider
+    });
+  }, [fetchProvider, writeProvider]);
+  var prevProviderOptionsRef = (0, _react.useRef)(undefined);
+  if (providerOptions !== prevProviderOptionsRef.current) {
+    prevProviderOptionsRef.current = providerOptions;
+    syncBlockProvider.setProviderOptions(providerOptions);
+  }
+  var prevSSRDataRef = (0, _react.useRef)(undefined);
+  var ssrData = getSSRData === null || getSSRData === void 0 ? void 0 : getSSRData();
+  if (ssrData !== prevSSRDataRef.current) {
+    prevSSRDataRef.current = ssrData;
+    if (ssrData) {
+      syncBlockProvider.setSSRData(ssrData);
+    }
+  }
+  return syncBlockProvider;
+};
+var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(function () {
+  return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4');
+}, useMemoizedSyncedBlockProviderPatched, useMemoizedSyncedBlockProviderBase);

package/dist/cjs/store-manager/referenceSyncBlockStoreManager.js

@@ -392,6 +392,9 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     value: function handleGraphQLSubscriptionUpdate(syncBlockInstance) {
       var _this5 = this;
       if (!syncBlockInstance.resourceId) {
+        if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_4')) {
+          return;
+        }
         throw new Error('Sync block instance provided to graphql subscription update missing resource id');
       }
       var existingSyncBlock = this.getFromCache(syncBlockInstance.resourceId);

package/dist/cjs/store-manager/syncBlockStoreManager.js

@@ -12,6 +12,8 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _react = require("react");
 var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var _ari = require("../clients/block-service/ari");
 var _types = require("../common/types");
 var _errorHandling = require("../utils/errorHandling");
@@ -28,7 +30,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/function () {
   function SyncBlockStoreManager(dataProvider) {
     (0, _classCallCheck2.default)(this, SyncBlockStoreManager);
-    // In future, if reference manager needs to reach to source manager and read it's current in memorey cache
+    // In future, if reference manager needs to reach to source manager and read its current in memory cache
     // we can pass the source manager as a parameter to the reference manager constructor
     this.sourceSyncBlockStoreManager = new _sourceSyncBlockStoreManager.SourceSyncBlockStoreManager(dataProvider);
     this.referenceSyncBlockStoreManager = new _referenceSyncBlockStoreManager.ReferenceSyncBlockStoreManager(dataProvider);
@@ -200,11 +202,24 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
 var createSyncBlockStoreManager = function createSyncBlockStoreManager(dataProvider) {
   return new SyncBlockStoreManager(dataProvider);
 };
-var useMemoizedSyncBlockStoreManager = exports.useMemoizedSyncBlockStoreManager = function useMemoizedSyncBlockStoreManager(dataProvider, fireAnalyticsEvent) {
+var useMemoizedSyncBlockStoreManagerBase = function useMemoizedSyncBlockStoreManagerBase(dataProvider, fireAnalyticsEvent) {
   var syncBlockStoreManager = (0, _react.useMemo)(function () {
-    var syncBlockStoreManager = createSyncBlockStoreManager(dataProvider);
-    return syncBlockStoreManager;
+    return createSyncBlockStoreManager(dataProvider);
   }, [dataProvider]);
   syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
   return syncBlockStoreManager;
-};
+};
+var useMemoizedSyncBlockStoreManagerPatched = function useMemoizedSyncBlockStoreManagerPatched(dataProvider, fireAnalyticsEvent) {
+  var syncBlockStoreManager = (0, _react.useMemo)(function () {
+    return createSyncBlockStoreManager(dataProvider);
+  }, [dataProvider]);
+  var prevFireAnalyticsEventRef = (0, _react.useRef)(undefined);
+  if (fireAnalyticsEvent !== prevFireAnalyticsEventRef.current) {
+    prevFireAnalyticsEventRef.current = fireAnalyticsEvent;
+    syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
+  }
+  return syncBlockStoreManager;
+};
+var useMemoizedSyncBlockStoreManager = exports.useMemoizedSyncBlockStoreManager = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(function () {
+  return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4');
+}, useMemoizedSyncBlockStoreManagerPatched, useMemoizedSyncBlockStoreManagerBase);

package/dist/cjs/utils/experienceTracking.js

@@ -87,9 +87,9 @@ var getFetchSourceInfoExperience = exports.getFetchSourceInfoExperience = functi
 /**
  * This experience tracks when a source sync block is deleted from the BE.
  *
- * Start: When the fetchSourceInfo function is called.
- * Success: When the fetching the data is successful within the timeout duration of start.
- * Failure: When the timeout duration passes without the data being successfully fetched, or the fetch fails
+ * Start: When the delete source sync block function is called.
+ * Success: When the sync block deletion is successful within the timeout duration of start.
+ * Failure: When the timeout duration passes without the sync block being successfully deleted, or the deletion fails
  */
 var getDeleteSourceExperience = exports.getDeleteSourceExperience = function getDeleteSourceExperience(fireAnalyticsEvent) {
   return new _experiences.Experience(_experiences.EXPERIENCE_ID.ASYNC_OPERATION, {
@@ -104,9 +104,9 @@ var getDeleteSourceExperience = exports.getDeleteSourceExperience = function get
 /**
  * This experience tracks when a source sync block is created and registered to the BE.
  *
- * Start: When the fetchSourceInfo function is called.
- * Success: When the fetching the data is successful within the timeout duration of start.
- * Failure: When the timeout duration passes without the data being successfully fetched, or the fetch fails
+ * Start: When the create source sync block function is called.
+ * Success: When the sync block creation is successful within the timeout duration of start.
+ * Failure: When the timeout duration passes without the sync block being successfully created, or the creation fails
  */
 var getCreateSourceExperience = exports.getCreateSourceExperience = function getCreateSourceExperience(fireAnalyticsEvent) {
   return new _experiences.Experience(_experiences.EXPERIENCE_ID.ASYNC_OPERATION, {
@@ -119,11 +119,11 @@ var getCreateSourceExperience = exports.getCreateSourceExperience = function get
 };
 
 /**
- * This experience tracks when a source sync block is created and registered to the BE.
+ * This experience tracks when references for a sync block are fetched from the BE.
  *
- * Start: When the fetchSourceInfo function is called.
- * Success: When the fetching the data is successful within the timeout duration of start.
- * Failure: When the timeout duration passes without the data being successfully fetched, or the fetch fails
+ * Start: When the fetchReferences function is called.
+ * Success: When the fetching of references is successful within the timeout duration of start.
+ * Failure: When the timeout duration passes without references being successfully fetched, or the fetch fails
  */
 var getFetchReferencesExperience = exports.getFetchReferencesExperience = function getFetchReferencesExperience(fireAnalyticsEvent) {
   return new _experiences.Experience(_experiences.EXPERIENCE_ID.ASYNC_OPERATION, {

package/dist/cjs/utils/resourceId.js

@@ -19,7 +19,7 @@ var isSyncBlockProduct = function isSyncBlockProduct(product) {
  *
  * Format
  * - {product}/{contentId}/{uuid}
- *   - product: a recognized `SyncBlockProduct` (e.g. 'confluence-page', 'jira-issue')
+ *   - product: a recognized `SyncBlockProduct` (e.g. 'confluence-page', 'jira-work-item')
  *   - contentId: the host content identifier (e.g. page ID or issue ID)
  *   - uuid: the UUID for the specific synced block instance
  *
@@ -32,7 +32,7 @@ var isSyncBlockProduct = function isSyncBlockProduct(product) {
  * - No extra segments; returns `undefined` on any invalid input
  *
  * Notes
- * - `product` is a qualified domain like 'confluence-page' or 'jira-issue',
+ * - `product` is a qualified domain like 'confluence-page' or 'jira-work-item',
  *   not just 'confluence' or 'jira'.
  */
 

package/dist/cjs/utils/retry.js

@@ -7,10 +7,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.fetchWithRetry = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var parseRetryAfter = function parseRetryAfter(retryAfter) {
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
+var MAX_RETRY_DELAY = 30000;
+var parseRetryAfterBase = function parseRetryAfterBase(retryAfter) {
   var newDelay;
 
-  // retryAfter can either be in ms or HTTP date
+  // retryAfter can either be in seconds or HTTP date
   var parsedRetryAfter = parseInt(retryAfter);
   if (!isNaN(parsedRetryAfter)) {
     newDelay = parsedRetryAfter * 1000;
@@ -23,13 +26,35 @@ var parseRetryAfter = function parseRetryAfter(retryAfter) {
   }
   return newDelay;
 };
+var parseRetryAfterPatched = function parseRetryAfterPatched(retryAfter) {
+  // retryAfter can either be in seconds or HTTP date
+  var parsedRetryAfter = parseInt(retryAfter, 10);
+  if (!isNaN(parsedRetryAfter) && parsedRetryAfter > 0) {
+    return parsedRetryAfter * 1000;
+  }
+  var retryDate = new Date(retryAfter);
+  if (isNaN(retryDate.getTime())) {
+    return undefined;
+  }
+  var delayFromDate = retryDate.getTime() - Date.now();
+  if (delayFromDate > 0) {
+    return delayFromDate;
+  }
+  return undefined;
+};
+var parseRetryAfter = (0, _platformFeatureFlagsReact.functionWithCondition)(function () {
+  return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4');
+}, parseRetryAfterPatched, parseRetryAfterBase);
 var _fetchWithRetry = exports.fetchWithRetry = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url, options) {
+    var _ref2;
     var retriesRemaining,
       delay,
       response,
       shouldRetry,
       retryAfter,
+      parsedDelay,
+      retryDelay,
       _args = arguments;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -48,14 +73,15 @@ var _fetchWithRetry = exports.fetchWithRetry = /*#__PURE__*/function () {
           return _context.abrupt("return", response);
         case 8:
           retryAfter = response.headers.get('Retry-After');
-          _context.next = 11;
+          parsedDelay = (_ref2 = retryAfter ? parseRetryAfter(retryAfter) : undefined) !== null && _ref2 !== void 0 ? _ref2 : delay;
+          retryDelay = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4') ? Math.min(parsedDelay, MAX_RETRY_DELAY) : parsedDelay;
+          _context.next = 13;
           return new Promise(function (resolve) {
-            var _ref2;
-            return setTimeout(resolve, (_ref2 = retryAfter ? parseRetryAfter(retryAfter) : undefined) !== null && _ref2 !== void 0 ? _ref2 : delay);
+            return setTimeout(resolve, retryDelay);
           });
-        case 11:
+        case 13:
           return _context.abrupt("return", _fetchWithRetry(url, options, retriesRemaining - 1, delay * 2));
-        case 12:
+        case 14:
         case "end":
           return _context.stop();
       }

package/dist/cjs/utils/utils.js

@@ -40,7 +40,7 @@ var convertPMNodesToSyncBlockNodes = exports.convertPMNodesToSyncBlockNodes = fu
     return convertPMNodeToSyncBlockNode(node);
   }).filter(function (node) {
     return node !== undefined;
-  }) || [];
+  });
 };
 
 /*

package/dist/cjs/utils/validValue.js

@@ -4,8 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.normaliseSyncBlockStatus = exports.normaliseSyncBlockProduct = void 0;
+var _consts = require("../common/consts");
 var normaliseSyncBlockProduct = exports.normaliseSyncBlockProduct = function normaliseSyncBlockProduct(value) {
-  return value === 'confluence-page' || value === 'jira-work-item' ? value : undefined;
+  return _consts.SYNC_BLOCK_PRODUCTS.includes(value) ? value : undefined;
 };
 var normaliseSyncBlockStatus = exports.normaliseSyncBlockStatus = function normaliseSyncBlockStatus(value) {
   return value === 'active' || value === 'unpublished' || value === 'deleted' ? value : undefined;

package/dist/es2019/clients/block-service/blockService.js

@@ -81,8 +81,9 @@ const UPDATE_DOCUMENT_REFERENCES_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_UPDATE_DO
 const BATCH_RETRIEVE_BLOCKS_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_BATCH_RETRIEVE_BLOCKS';
 const GET_BLOCK_REFERENCES_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_REFERENCES';
 const GET_BLOCK_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_BLOCK';
+const BATCH_UPDATE_BLOCKS_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_BATCH_UPDATE_BLOCKS';
 const buildGetDocumentReferenceBlocksQuery = documentAri => `query ${GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME} {
-	blockService_getDocumentReferenceBlocks(documentAri: "${documentAri}") {
+	blockService_getDocumentReferenceBlocks(documentAri: ${fg('platform_synced_block_patch_4') ? JSON.stringify(documentAri) : `"${documentAri}"`}) {
 		blocks {
 			blockAri
 			blockInstanceId
@@ -151,11 +152,17 @@ const buildDeleteBlockMutation = (blockAri, deletionReason) => {
  * 'jira-work-item' -> 'JIRA_WORK_ITEM'
  */
 const convertProductToGraphQLEnum = product => {
-  if (product === 'confluence-page') {
-    return 'CONFLUENCE_PAGE';
+  switch (product) {
+    case 'confluence-page':
+      return 'CONFLUENCE_PAGE';
+    case 'jira-work-item':
+      return 'JIRA_WORK_ITEM';
+    default:
+      {
+        const exhaustiveCheck = product;
+        throw new Error(`Unsupported product: ${exhaustiveCheck}`);
+      }
   }
-  // product must be 'jira-work-item' at this point
-  return 'JIRA_WORK_ITEM';
 };
 const buildCreateBlockMutation = (blockAri, blockInstanceId, content, product, sourceAri, stepVersion, status) => {
   const inputParts = [`blockAri: ${JSON.stringify(blockAri)}`, `blockInstanceId: ${JSON.stringify(blockInstanceId)}`, `content: ${JSON.stringify(content)}`, `product: ${convertProductToGraphQLEnum(product)}`, `sourceAri: ${JSON.stringify(sourceAri)}`];
@@ -251,6 +258,40 @@ const buildGetBlockReferencesQuery = blockAri => {
 	}
 }`;
 };
+const buildBatchUpdateBlocksMutation = blocks => {
+  const blocksArray = blocks.map(block => {
+    const inputParts = [`blockAri: ${JSON.stringify(block.blockAri)}`, `content: ${JSON.stringify(block.content)}`];
+    if (block.stepVersion !== undefined) {
+      inputParts.push(`stepVersion: ${block.stepVersion}`);
+    }
+    if (block.status !== undefined) {
+      inputParts.push(`status: ${JSON.stringify(block.status)}`);
+    }
+    return `{ ${inputParts.join(', ')} }`;
+  }).join(', ');
+  return `mutation ${BATCH_UPDATE_BLOCKS_OPERATION_NAME} {
+	blockService_batchUpdateBlocks(input: { blocks: [${blocksArray}] }) {
+		success {
+			blockAri
+			blockInstanceId
+			content
+			contentUpdatedAt
+			createdAt
+			createdBy
+			deletionReason
+			product
+			sourceAri
+			status
+			version
+		}
+		error {
+			blockAri
+			code
+			reason
+		}
+	}
+}`;
+};
 export class BlockError extends Error {
   constructor(status) {
     super(`Block error`);
@@ -327,7 +368,7 @@ export const deleteSyncedBlock = async ({
   blockAri,
   deleteReason
 }) => {
-  var _result$data3;
+  var _result$data3, _result$data3$blockSe, _result$data4;
   const bodyData = {
     query: buildDeleteBlockMutation(blockAri, deleteReason),
     operationName: DELETE_BLOCK_OPERATION_NAME
@@ -345,7 +386,8 @@ export const deleteSyncedBlock = async ({
   if (result.errors && result.errors.length > 0) {
     throw new Error(result.errors.map(e => e.message).join(', '));
   }
-  if (!((_result$data3 = result.data) !== null && _result$data3 !== void 0 && _result$data3.blockService_deleteBlock.deleted)) {
+  const isDeleted = fg('platform_synced_block_patch_4') ? (_result$data3 = result.data) === null || _result$data3 === void 0 ? void 0 : (_result$data3$blockSe = _result$data3.blockService_deleteBlock) === null || _result$data3$blockSe === void 0 ? void 0 : _result$data3$blockSe.deleted : (_result$data4 = result.data) === null || _result$data4 === void 0 ? void 0 : _result$data4.blockService_deleteBlock.deleted;
+  if (!isDeleted) {
     throw new Error('Block deletion failed; deleted flag is false');
   }
 };
@@ -382,7 +424,7 @@ export const createSyncedBlock = async ({
   stepVersion,
   status
 }) => {
-  var _result$data4;
+  var _result$data5;
   const bodyData = {
     query: buildCreateBlockMutation(blockAri, blockInstanceId, content, product, sourceAri, stepVersion, status),
     operationName: CREATE_BLOCK_OPERATION_NAME
@@ -400,7 +442,7 @@ export const createSyncedBlock = async ({
   if (result.errors && result.errors.length > 0) {
     throw new Error(result.errors.map(e => e.message).join(', '));
   }
-  if (!((_result$data4 = result.data) !== null && _result$data4 !== void 0 && _result$data4.blockService_createBlock)) {
+  if (!((_result$data5 = result.data) !== null && _result$data5 !== void 0 && _result$data5.blockService_createBlock)) {
     throw new Error('No data returned from GraphQL mutation');
   }
   return result.data.blockService_createBlock;
@@ -429,8 +471,8 @@ export const updateReferenceSyncedBlockOnDocument = async ({
     throw new Error(result.errors.map(e => e.message).join(', '));
   }
   if (!noContent) {
-    var _result$data5;
-    if (!((_result$data5 = result.data) !== null && _result$data5 !== void 0 && _result$data5.blockService_updateDocumentReferences)) {
+    var _result$data6;
+    if (!((_result$data6 = result.data) !== null && _result$data6 !== void 0 && _result$data6.blockService_updateDocumentReferences)) {
       throw new Error('No data returned from GraphQL mutation');
     }
     return result.data.blockService_updateDocumentReferences;
@@ -439,7 +481,7 @@ export const updateReferenceSyncedBlockOnDocument = async ({
 export const getReferenceSyncedBlocksByBlockAri = async ({
   blockAri
 }) => {
-  var _result$data6;
+  var _result$data7;
   const bodyData = {
     query: buildGetBlockReferencesQuery(blockAri),
     operationName: GET_BLOCK_REFERENCES_OPERATION_NAME
@@ -457,7 +499,7 @@ export const getReferenceSyncedBlocksByBlockAri = async ({
   if (result.errors && result.errors.length > 0) {
     throw new Error(result.errors.map(e => e.message).join(', '));
   }
-  if (!((_result$data6 = result.data) !== null && _result$data6 !== void 0 && _result$data6.blockService_getReferences)) {
+  if (!((_result$data7 = result.data) !== null && _result$data7 !== void 0 && _result$data7.blockService_getReferences)) {
     throw new Error('No data returned from GraphQL query');
   }
   const graphqlResponse = result.data.blockService_getReferences;
@@ -466,4 +508,57 @@ export const getReferenceSyncedBlocksByBlockAri = async ({
     references: graphqlResponse.references || [],
     errors: graphqlResponse.errors || []
   };
+};
+
+/**
+ * Batch updates multiple synced blocks.
+ *
+ * Calls the Block Service GraphQL API: `blockService_batchUpdateBlocks`
+ *
+ * @param blocks - Array of block updates to apply
+ * @returns A promise containing arrays of successfully updated blocks and any errors encountered
+ *
+ * @example
+ * ```typescript
+ * const result = await updateSyncedBlocks({
+ *   blocks: [
+ *     {
+ *       blockAri: 'ari:cloud:blocks:site-123:synced-block/uuid-456',
+ *       content: '{"type":"doc","version":1,"content":[]}',
+ *       status: 'active',
+ *       stepVersion: 42
+ *     }
+ *   ]
+ * });
+ * ```
+ */
+export const updateSyncedBlocks = async ({
+  blocks
+}) => {
+  var _result$data8;
+  const bodyData = {
+    query: buildBatchUpdateBlocksMutation(blocks),
+    operationName: BATCH_UPDATE_BLOCKS_OPERATION_NAME
+  };
+  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockBatchUpdateBlocks` : GRAPHQL_ENDPOINT;
+  const response = await fetchWithRetry(url, {
+    method: 'POST',
+    headers: COMMON_HEADERS,
+    body: JSON.stringify(bodyData)
+  });
+  if (!response.ok) {
+    throw new BlockError(response.status);
+  }
+  const result = await response.json();
+  if (result.errors && result.errors.length > 0) {
+    throw new Error(result.errors.map(e => e.message).join(', '));
+  }
+  if (!((_result$data8 = result.data) !== null && _result$data8 !== void 0 && _result$data8.blockService_batchUpdateBlocks)) {
+    throw new Error('No data returned from GraphQL mutation');
+  }
+  const graphqlResponse = result.data.blockService_batchUpdateBlocks;
+  return {
+    success: graphqlResponse.success,
+    error: graphqlResponse.error
+  };
 };

package/dist/es2019/clients/block-service/blockSubscription.js

@@ -1,6 +1,6 @@
 import { createClient } from 'graphql-ws';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
-import { BLOCK_SERVICE_SUBSCRIPTION_QUERY, parseSubscriptionPayload } from './sharedSubscriptionUtils';
+import { convertContentUpdatedAt } from '../../utils/utils';
 const GRAPHQL_WS_ENDPOINT = '/gateway/api/graphql/subscriptions';
 let blockServiceClient = null;
 const getBlockServiceClient = () => {
@@ -19,6 +19,66 @@ const getBlockServiceClient = () => {
   }
   return blockServiceClient;
 };
+const SUBSCRIPTION_QUERY = `
+subscription EDITOR_SYNCED_BLOCK_ON_BLOCK_UPDATED($resourceId: ID!) {
+	blockService_onBlockUpdated(resourceId: $resourceId) {
+		blockAri
+		blockInstanceId
+		content
+		contentUpdatedAt
+		createdAt
+		createdBy
+		deletionReason
+		product
+		sourceAri
+		status
+	}
+}
+`;
+/**
+ * Extracts the resourceId from a block ARI.
+ * Block ARI format: ari:cloud:blocks:<cloudId>:synced-block/<resourceId>
+ * @param blockAri - The block ARI string
+ * @returns The resourceId portion of the ARI
+ */
+const extractResourceIdFromBlockAri = blockAri => {
+  // eslint-disable-next-line require-unicode-regexp
+  const match = blockAri.match(/ari:cloud:blocks:[^:]+:synced-block\/(.+)$/);
+  return (match === null || match === void 0 ? void 0 : match[1]) || null;
+};
+
+/**
+ * Parses the subscription payload into a standardized format.
+ * @param payload - The raw subscription payload
+ * @returns Parsed block data or null if parsing fails
+ */
+const parseSubscriptionPayload = payload => {
+  try {
+    const resourceId = extractResourceIdFromBlockAri(payload.blockAri);
+    if (!resourceId) {
+      return null;
+    }
+    let createdAt;
+    if (payload.createdAt !== undefined && payload.createdAt !== null) {
+      createdAt = new Date(payload.createdAt).toISOString();
+    }
+    return {
+      blockAri: payload.blockAri,
+      blockInstanceId: payload.blockInstanceId,
+      content: JSON.parse(payload.content),
+      contentUpdatedAt: convertContentUpdatedAt(payload.contentUpdatedAt),
+      createdAt,
+      createdBy: payload.createdBy,
+      product: payload.product,
+      resourceId,
+      sourceAri: payload.sourceAri,
+      status: payload.status
+    };
+  } catch {
+    return null;
+  }
+};
+
 /**
  * Creates a GraphQL subscription to block updates using the shared graphql-ws client.
  *
@@ -34,7 +94,7 @@ export const subscribeToBlockUpdates = (blockAri, onData, onError) => {
     return () => {};
   }
   const unsubscribe = client.subscribe({
-    query: BLOCK_SERVICE_SUBSCRIPTION_QUERY,
+    query: SUBSCRIPTION_QUERY,
     variables: {
       resourceId: blockAri
     },

package/dist/es2019/clients/confluence/fetchMediaToken.js

@@ -1,4 +1,5 @@
 import { logException } from '@atlaskit/editor-common/monitoring';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { fetchWithRetry } from '../../utils/retry';
 const COMMON_HEADERS = {
   'Content-Type': 'application/json',
@@ -54,15 +55,16 @@ export const fetchMediaToken = async contentId => {
     if (!token || !configuration || !collection) {
       throw new Error('Failed to get content media session data');
     }
-    return Promise.resolve({
+    return {
       config: configuration,
       token,
       collectionId: collection
-    });
+    };
   } catch (error) {
     logException(error, {
       location: 'editor-synced-block-provider/fetchMediaToken'
     });
-    throw new Error(`Failed to get content media session: ${error}`);
+    const errorMsg = fg('platform_synced_block_patch_4') ? error instanceof Error ? error.message : String(error) : String(error);
+    throw new Error(`Failed to get content media session: ${errorMsg}`);
   }
 };