@atlaskit/editor-synced-block-provider 2.8.0 → 2.9.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.9.1
+
+### Patch Changes
+
+- [`e3aafa008fcf4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e3aafa008fcf4) -
+  EDITOR-2771 Pass parent Editor/Renderer data providers through SyncBlockDataProvider to the nested
+  renderer
+- Updated dependencies
+
+## 2.9.0
+
+### Minor Changes
+
+- [`e0dc40edfc665`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e0dc40edfc665) -
+  Update the resource ID generation for blockAri format
+
 ## 2.8.0
 
 ### Minor Changes

package/dist/cjs/hooks/useFetchSyncBlockData.js

@@ -72,8 +72,9 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
     };
   }, [localId, referenceSyncBlockStoreManager, resourceId]);
   return {
-    syncBlockInstance: syncBlockInstance,
     isLoading: isLoading,
-    reloadData: reloadData
+    providerFactory: referenceSyncBlockStoreManager.getProviderFactory(resourceId || ''),
+    reloadData: reloadData,
+    syncBlockInstance: syncBlockInstance
   };
 };

package/dist/cjs/index.js

@@ -27,6 +27,12 @@ Object.defineProperty(exports, "SyncedBlockProvider", {
     return _syncBlockProvider.SyncBlockProvider;
   }
 });
+Object.defineProperty(exports, "blockResourceIdFromSourceAndLocalId", {
+  enumerable: true,
+  get: function get() {
+    return _ari.blockResourceIdFromSourceAndLocalId;
+  }
+});
 Object.defineProperty(exports, "convertSyncBlockJSONNodeToSyncBlockNode", {
   enumerable: true,
   get: function get() {
@@ -57,6 +63,24 @@ Object.defineProperty(exports, "getConfluencePageAri", {
     return _ari.getConfluencePageAri;
   }
 });
+Object.defineProperty(exports, "getLocalIdFromAri", {
+  enumerable: true,
+  get: function get() {
+    return _ari.getLocalIdFromAri;
+  }
+});
+Object.defineProperty(exports, "getLocalIdFromResourceId", {
+  enumerable: true,
+  get: function get() {
+    return _ari.getLocalIdFromResourceId;
+  }
+});
+Object.defineProperty(exports, "getPageARIFromResourceId", {
+  enumerable: true,
+  get: function get() {
+    return _ari.getPageARIFromResourceId;
+  }
+});
 Object.defineProperty(exports, "getPageIdAndTypeFromAri", {
   enumerable: true,
   get: function get() {
@@ -75,6 +99,12 @@ Object.defineProperty(exports, "resolveSyncBlockInstance", {
     return _resolveSyncBlockInstance.resolveSyncBlockInstance;
   }
 });
+Object.defineProperty(exports, "resourceIdFromSourceAndLocalId", {
+  enumerable: true,
+  get: function get() {
+    return _ari.resourceIdFromSourceAndLocalId;
+  }
+});
 Object.defineProperty(exports, "useFetchSyncBlockData", {
   enumerable: true,
   get: function get() {

package/dist/cjs/providers/block-service/blockServiceAPI.js

@@ -34,21 +34,22 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
   return (0, _createClass2.default)(BlockServiceADFFetchProvider, [{
     key: "fetchData",
     value: // resourceId is the ARI of the block. E.G ari:cloud:blocks:site-123:synced-block/uuid-456
+    // in the content API provider, this was the concatenation of the source document's ARI and the local ID. E.G ari:cloud:confluence:site-123:page/pageId/uuid-456
     function () {
       var _fetchData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(resourceId) {
-        var localId, contentProperty, value, syncedBlockData;
+        var localId, blockContentResponse, value, syncedBlockData;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              localId = (0, _ari.getLocalIdFromAri)(resourceId);
+              localId = (0, _ari.getLocalIdFromResourceId)(resourceId);
               _context.prev = 1;
               _context.next = 4;
               return (0, _blockService.getSyncedBlockContent)({
                 blockAri: resourceId
               });
             case 4:
-              contentProperty = _context.sent;
-              value = contentProperty.content;
+              blockContentResponse = _context.sent;
+              value = blockContentResponse.content;
               if (value) {
                 _context.next = 8;
                 break;
@@ -58,7 +59,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                 resourceId: resourceId
               });
             case 8:
-              // Parse the synced block content from the property value
+              // Parse the synced block content from the response's content
               syncedBlockData = JSON.parse(value);
               return _context.abrupt("return", {
                 data: {
@@ -106,7 +107,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
   }
   return (0, _createClass2.default)(BlockServiceADFWriteProvider, [{
     key: "writeData",
-    value: // it will first try to update and if it can't (404) then it will try to create 
+    value: // it will first try to update and if it can't (404) then it will try to create
     function () {
       var _writeData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(data) {
         var resourceId;
@@ -137,7 +138,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
               }
               _context2.next = 13;
               return (0, _blockService.createSyncedBlock)({
-                blockAri: (0, _ari.resourceIdFromSourceAndLocalId)(resourceId, data.blockInstanceId),
+                blockAri: resourceId,
                 blockInstanceId: data.blockInstanceId,
                 sourceAri: resourceId,
                 product: 'confluence-page',
@@ -166,7 +167,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
         return _writeData.apply(this, arguments);
       }
       return writeData;
-    }() // soft deletes the source synced block 
+    }() // soft deletes the source synced block
   }, {
     key: "deleteData",
     value: function () {
@@ -214,6 +215,11 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
       }
       return deleteData;
     }()
+  }, {
+    key: "generateResourceId",
+    value: function generateResourceId(sourceId, localId) {
+      return (0, _ari.blockResourceIdFromSourceAndLocalId)(sourceId, localId);
+    }
   }]);
 }();
 /**

package/dist/cjs/providers/confluence/confluenceContentAPI.js

@@ -343,6 +343,11 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
       }
       return deleteData;
     }()
+  }, {
+    key: "generateResourceId",
+    value: function generateResourceId(sourceId, localId) {
+      return (0, _ari.resourceIdFromSourceAndLocalId)(sourceId, localId);
+    }
   }]);
 }();
 /**

package/dist/cjs/providers/syncBlockProvider.js

@@ -22,7 +22,15 @@ var _sourceInfo = require("../utils/sourceInfo");
 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)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
-  function SyncBlockProvider(fetchProvider, writeProvider, sourceId) {
+  /**
+   * Constructor for the SyncBlockProvider
+   *
+   * @param fetchProvider
+   * @param writeProvider
+   * @param sourceId
+   * @param nestedRendererDataProviders
+   */
+  function SyncBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions) {
     var _this;
     (0, _classCallCheck2.default)(this, SyncBlockProvider);
     _this = _callSuper(this, SyncBlockProvider);
@@ -30,19 +38,44 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
     _this.fetchProvider = fetchProvider;
     _this.writeProvider = writeProvider;
     _this.sourceId = sourceId;
+    _this.providerOptions = providerOptions;
     return _this;
   }
+
+  /**
+   * Check if the node is supported by the provider
+   *
+   * @param node
+   *
+   * @returns True if the node is supported, false otherwise
+   */
   (0, _inherits2.default)(SyncBlockProvider, _SyncBlockDataProvide);
   return (0, _createClass2.default)(SyncBlockProvider, [{
     key: "isNodeSupported",
     value: function isNodeSupported(node) {
-      return node.type === 'syncBlock';
+      return node.type === 'syncBlock' || node.type === 'bodiedSyncBlock';
     }
+
+    /**
+     * Get the data key for the node
+     *
+     * @param node
+     *
+     * @returns The data key
+     */
   }, {
     key: "nodeDataKey",
     value: function nodeDataKey(node) {
       return node.attrs.localId;
     }
+
+    /**
+     * Fetch the data from the fetch provider
+     *
+     * @param nodes
+     *
+     * @returns Array of {resourceId?: string, error?: string}.
+     */
   }, {
     key: "fetchNodesData",
     value: function fetchNodesData(nodes) {
@@ -70,6 +103,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
     }
 
     /**
+     * Write the data to the write provider
      *
      * @param nodes
      * @param data
@@ -114,10 +148,18 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
         return _writeNodesData.apply(this, arguments);
       }
       return writeNodesData;
-    }())
+    }()
+    /**
+     * Delete the data from the write provider
+     *
+     * @param resourceIds
+     *
+     * @returns Array of {resourceId?: string, error?: string}.
+     */
+    )
   }, {
     key: "deleteNodesData",
-    value: function () {
+    value: (function () {
       var _deleteNodesData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(resourceIds) {
         var _this4 = this;
         var results;
@@ -152,11 +194,25 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
       }
       return deleteNodesData;
     }()
+    /**
+     * Get the source id
+     *
+     * @returns The source id
+     */
+    )
   }, {
     key: "getSourceId",
     value: function getSourceId() {
       return this.sourceId;
     }
+
+    /**
+     * Retrieve the source info from the source id
+     *
+     * @param node
+     *
+     * @returns The source info
+     */
   }, {
     key: "retrieveSyncBlockSourceInfo",
     value: function retrieveSyncBlockSourceInfo(node) {
@@ -177,10 +233,26 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
       }
       return pageARI ? (0, _sourceInfo.fetchSourceInfo)(pageARI, sourceLocalId) : Promise.resolve(undefined);
     }
+  }, {
+    key: "generateResourceId",
+    value: function generateResourceId(sourceId, localId) {
+      return this.writeProvider.generateResourceId(sourceId, localId);
+    }
+
+    /**
+     * Get the synced block renderer provider options
+     *
+     * @returns The synced block renderer provider options
+     */
+  }, {
+    key: "getSyncedBlockRendererProviderOptions",
+    value: function getSyncedBlockRendererProviderOptions() {
+      return this.providerOptions;
+    }
   }]);
 }(_types2.SyncBlockDataProvider);
-var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(fetchProvider, writeProvider, sourceId) {
+var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions) {
   return (0, _react.useMemo)(function () {
-    return new SyncBlockProvider(fetchProvider, writeProvider, sourceId);
-  }, [fetchProvider, writeProvider, sourceId]);
+    return new SyncBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions);
+  }, [fetchProvider, writeProvider, sourceId, providerOptions]);
 };

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

@@ -11,6 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _types = require("../common/types");
 var _resolveSyncBlockInstance = require("../utils/resolveSyncBlockInstance");
 var _utils = require("../utils/utils");
@@ -28,6 +29,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     this.titleSubscriptions = new Map();
     this.dataProvider = dataProvider;
     this.syncBlockURLRequests = new Map();
+    this.providerFactories = new Map();
   }
 
   /**
@@ -243,6 +245,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     key: "deleteFromCache",
     value: function deleteFromCache(resourceId) {
       this.syncBlockCache.delete(resourceId);
+      this.providerFactories.delete(resourceId);
     }
   }, {
     key: "subscribeToSyncBlock",
@@ -338,12 +341,35 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       }
       return (_syncBlock$data = syncBlock.data) === null || _syncBlock$data === void 0 ? void 0 : _syncBlock$data.sourceURL;
     }
+  }, {
+    key: "getProviderFactory",
+    value: function getProviderFactory(resourceId) {
+      if (!this.dataProvider) {
+        return undefined;
+      }
+      var _this$dataProvider$ge = this.dataProvider.getSyncedBlockRendererProviderOptions(),
+        parentDataProviders = _this$dataProvider$ge.parentDataProviders;
+      if (!this.providerFactories.has(resourceId)) {
+        // TODO: EDITOR-2771 - In follow up PR, create media & emoji providers per ref sync block
+        // The media & emoji providers will be set later, once we get ref sync block data with page ID
+        // So we need to keep the reference to the Provider Factory so we can then set media & emoji providers later
+        this.providerFactories.set(resourceId, _providerFactory.ProviderFactory.create({
+          emojiProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.emojiProvider,
+          mediaProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mediaProvider,
+          mentionProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider,
+          profilecardProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider,
+          taskDecisionProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider
+        }));
+      }
+      return this.providerFactories.get(resourceId);
+    }
   }, {
     key: "destroy",
     value: function destroy() {
       this.syncBlockCache.clear();
       this.subscriptions.clear();
       this.syncBlockURLRequests.clear();
+      this.providerFactories.clear();
     }
   }]);
 }();

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

@@ -12,7 +12,6 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _uuid = _interopRequireDefault(require("uuid"));
 var _rebaseTransaction2 = require("../common/rebase-transaction");
-var _ari = require("../utils/ari");
 var _utils = require("../utils/utils");
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PURE__*/function () {
@@ -165,12 +164,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
       // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
       var localId = (0, _uuid.default)();
       var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
-      if (!sourceId) {
+      if (!this.dataProvider || !sourceId) {
         throw new Error('Provider of sync block plugin is not set');
       }
-
-      // This should be generated by the data provider implementation as it differs between data providers
-      var resourceId = (0, _ari.resourceIdFromSourceAndLocalId)(sourceId, localId);
+      var resourceId = this.dataProvider.generateResourceId(sourceId, localId);
       return {
         resourceId: resourceId,
         localId: localId

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

@@ -171,6 +171,11 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
       // only applicable to source sync block, for now (will be refactored further)
       this.sourceSyncBlockStoreManager.rebaseTransaction(incomingTr, state);
     }
+  }, {
+    key: "getReferenceSyncBlockProviderFactory",
+    value: function getReferenceSyncBlockProviderFactory(resourceId) {
+      return this.referenceSyncBlockStoreManager.getProviderFactory(resourceId);
+    }
   }, {
     key: "destroy",
     value: function destroy() {

package/dist/cjs/utils/ari.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resourceIdFromSourceAndLocalId = exports.getPageIdAndTypeFromAri = exports.getPageARIFromResourceId = exports.getLocalIdFromAri = exports.getContentPropertyAri = exports.getConfluencePageAri = void 0;
+exports.resourceIdFromSourceAndLocalId = exports.getPageIdAndTypeFromAri = exports.getPageARIFromResourceId = exports.getLocalIdFromResourceId = exports.getLocalIdFromAri = exports.getConfluencePageAri = exports.blockResourceIdFromSourceAndLocalId = void 0;
 /* eslint-disable require-unicode-regexp  */
 
 var getConfluencePageAri = exports.getConfluencePageAri = function getConfluencePageAri(pageId, cloudId) {
@@ -34,9 +34,37 @@ var getPageARIFromResourceId = exports.getPageARIFromResourceId = function getPa
   }
   throw new Error("Invalid resourceId: ".concat(resourceId));
 };
-var getContentPropertyAri = exports.getContentPropertyAri = function getContentPropertyAri(contentPropertyId, cloudId) {
-  return "ari:cloud:confluence:".concat(cloudId, ":content/").concat(contentPropertyId);
-};
 var resourceIdFromSourceAndLocalId = exports.resourceIdFromSourceAndLocalId = function resourceIdFromSourceAndLocalId(sourceId, localId) {
   return sourceId + '/' + localId;
+};
+
+/**
+ * For the following functions, they are used for the block service API provider.
+ * The resourceId/blockResourceId always refers to the block ARI.
+ */
+
+/**
+ * @param sourceId - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
+ * @param localId - the localId of the block node. A randomly generated UUID
+ * @returns the block ARI. E.G ari:cloud:blocks:cloudId:synced-block/localId
+ */
+var blockResourceIdFromSourceAndLocalId = exports.blockResourceIdFromSourceAndLocalId = function blockResourceIdFromSourceAndLocalId(sourceId, localId) {
+  var match = sourceId.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/.*/);
+  if (!(match !== null && match !== void 0 && match[1])) {
+    throw new Error("Invalid source ARI: ".concat(sourceId));
+  }
+  var cloudId = match[1];
+  return "ari:cloud:blocks:".concat(cloudId, ":synced-block/").concat(localId);
+};
+
+/**
+ * @param ari - the block ARI. E.G ari:cloud:blocks:cloudId:synced-block/localId
+ * @returns the localId of the block node. A randomly generated UUID
+ */
+var getLocalIdFromResourceId = exports.getLocalIdFromResourceId = function getLocalIdFromResourceId(ari) {
+  var match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/\d+\/([a-zA-Z0-9-]+)/);
+  if (match !== null && match !== void 0 && match[2]) {
+    return match[2];
+  }
+  throw new Error("Invalid page ARI: ".concat(ari));
 };

package/dist/es2019/hooks/useFetchSyncBlockData.js

@@ -36,8 +36,9 @@ export const useFetchSyncBlockData = (manager, resourceId, localId) => {
     };
   }, [localId, referenceSyncBlockStoreManager, resourceId]);
   return {
-    syncBlockInstance,
     isLoading,
-    reloadData
+    providerFactory: referenceSyncBlockStoreManager.getProviderFactory(resourceId || ''),
+    reloadData,
+    syncBlockInstance
   };
 };

package/dist/es2019/index.js

@@ -10,6 +10,6 @@ export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
 export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
 export { SyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
-export { getConfluencePageAri, getPageIdAndTypeFromAri } from './utils/ari';
+export { blockResourceIdFromSourceAndLocalId, getConfluencePageAri, getLocalIdFromAri, getLocalIdFromResourceId, getPageARIFromResourceId, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId } from './utils/ari';
 export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode } from './utils/utils';
 export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';

package/dist/es2019/providers/block-service/blockServiceAPI.js

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import { SyncBlockError } from '../../common/types';
-import { getLocalIdFromAri, resourceIdFromSourceAndLocalId } from '../../utils/ari';
+import { blockResourceIdFromSourceAndLocalId, getLocalIdFromResourceId } from '../../utils/ari';
 import { BlockError, createSyncedBlock, deleteSyncedBlock, getSyncedBlockContent, updateSyncedBlock } from '../../utils/blockService';
 import { stringifyError } from '../../utils/errorHandling';
 const mapBlockError = error => {
@@ -18,13 +18,14 @@ const mapBlockError = error => {
  */
 class BlockServiceADFFetchProvider {
   // resourceId is the ARI of the block. E.G ari:cloud:blocks:site-123:synced-block/uuid-456
+  // in the content API provider, this was the concatenation of the source document's ARI and the local ID. E.G ari:cloud:confluence:site-123:page/pageId/uuid-456
   async fetchData(resourceId) {
-    const localId = getLocalIdFromAri(resourceId);
+    const localId = getLocalIdFromResourceId(resourceId);
     try {
-      const contentProperty = await getSyncedBlockContent({
+      const blockContentResponse = await getSyncedBlockContent({
         blockAri: resourceId
       });
-      const value = contentProperty.content;
+      const value = blockContentResponse.content;
       if (!value) {
         return {
           error: SyncBlockError.NotFound,
@@ -32,7 +33,7 @@ class BlockServiceADFFetchProvider {
         };
       }
 
-      // Parse the synced block content from the property value
+      // Parse the synced block content from the response's content
       const syncedBlockData = JSON.parse(value);
       return {
         data: {
@@ -61,7 +62,7 @@ class BlockServiceADFFetchProvider {
  * ADFWriteProvider implementation that writes synced block data to Block Service API
  */
 class BlockServiceADFWriteProvider {
-  // it will first try to update and if it can't (404) then it will try to create 
+  // it will first try to update and if it can't (404) then it will try to create
   async writeData(data) {
     const {
       resourceId
@@ -80,7 +81,7 @@ class BlockServiceADFWriteProvider {
         if (error.status === 404) {
           // Create the block
           await createSyncedBlock({
-            blockAri: resourceIdFromSourceAndLocalId(resourceId, data.blockInstanceId),
+            blockAri: resourceId,
             blockInstanceId: data.blockInstanceId,
             sourceAri: resourceId,
             product: 'confluence-page',
@@ -100,7 +101,7 @@ class BlockServiceADFWriteProvider {
     }
   }
 
-  // soft deletes the source synced block 
+  // soft deletes the source synced block
   async deleteData(resourceId) {
     try {
       await deleteSyncedBlock({
@@ -126,6 +127,9 @@ class BlockServiceADFWriteProvider {
       };
     }
   }
+  generateResourceId(sourceId, localId) {
+    return blockResourceIdFromSourceAndLocalId(sourceId, localId);
+  }
 }
 
 /**

package/dist/es2019/providers/confluence/confluenceContentAPI.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { useMemo } from 'react';
 import { SyncBlockError } from '../../common/types';
-import { getLocalIdFromAri, getPageIdAndTypeFromAri } from '../../utils/ari';
+import { getLocalIdFromAri, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId } from '../../utils/ari';
 import { getContentProperty, createContentProperty, updateContentProperty, deleteContentProperty } from '../../utils/contentProperty';
 import { stringifyError } from '../../utils/errorHandling';
 import { isBlogPageType } from '../../utils/utils';
@@ -227,6 +227,9 @@ class ConfluenceADFWriteProvider {
       error: deleteResult.errors.join()
     };
   }
+  generateResourceId(sourceId, localId) {
+    return resourceIdFromSourceAndLocalId(sourceId, localId);
+  }
 }
 
 /**