@atlaskit/editor-synced-block-provider 3.1.0 → 3.2.1

package/dist/cjs/providers/syncBlockProvider.js

@@ -18,28 +18,24 @@ var _react = require("react");
 var _ari = require("../clients/confluence/ari");
 var _sourceInfo = require("../clients/confluence/sourceInfo");
 var _types = require("../common/types");
-var _types2 = require("../providers/types");
+var _types2 = require("./types");
 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) {
-  // the source document ARI; that the source sync block is on.
-
   /**
    * Constructor for the SyncBlockProvider
    *
    * @param fetchProvider
    * @param writeProvider
-   * @param sourceId
    * @param nestedRendererDataProviders
    */
-  function SyncBlockProvider(fetchProvider, writeProvider, sourceId) {
+  function SyncBlockProvider(fetchProvider, writeProvider) {
     var _this;
     (0, _classCallCheck2.default)(this, SyncBlockProvider);
     _this = _callSuper(this, SyncBlockProvider);
     (0, _defineProperty2.default)(_this, "name", 'syncBlockProvider');
     _this.fetchProvider = fetchProvider;
     _this.writeProvider = writeProvider;
-    _this.sourceId = sourceId;
     _this.providerOptions = {};
     return _this;
   }
@@ -49,11 +45,6 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
     value: function setProviderOptions(providerOptions) {
       this.providerOptions = providerOptions;
     }
-  }, {
-    key: "getProduct",
-    value: function getProduct() {
-      return this.writeProvider.product;
-    }
 
     /**
      * Check if the node is supported by the provider
@@ -132,14 +123,24 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
+              if (this.writeProvider) {
+                _context.next = 2;
+                break;
+              }
+              return _context.abrupt("return", Promise.reject(new Error('Write provider not set')));
+            case 2:
+              _context.next = 4;
               return Promise.allSettled(nodes.map(function (_node, index) {
+                var _this3$writeProvider;
+                if (!_this3.writeProvider) {
+                  return Promise.reject('Write provider not set');
+                }
                 if (!data[index].content) {
                   return Promise.reject('No Synced Block content to write');
                 }
-                return _this3.writeProvider.writeData(data[index]);
+                return (_this3$writeProvider = _this3.writeProvider) === null || _this3$writeProvider === void 0 ? void 0 : _this3$writeProvider.writeData(data[index]);
               }));
-            case 2:
+            case 4:
               results = _context.sent;
               return _context.abrupt("return", results.map(function (result) {
                 if (result.status === 'fulfilled') {
@@ -150,11 +151,11 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
                   };
                 }
               }));
-            case 4:
+            case 6:
             case "end":
               return _context.stop();
           }
-        }, _callee);
+        }, _callee, this);
       }));
       function writeNodesData(_x, _x2) {
         return _writeNodesData.apply(this, arguments);
@@ -164,6 +165,9 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
   }, {
     key: "createNodeData",
     value: function createNodeData(data) {
+      if (!this.writeProvider) {
+        return Promise.reject(new Error('Write provider not set'));
+      }
       return this.writeProvider.createData(data).then(function (result) {
         return result;
       }, function (error) {
@@ -189,11 +193,20 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              if (this.writeProvider) {
+                _context2.next = 2;
+                break;
+              }
+              return _context2.abrupt("return", Promise.reject(new Error('Write provider not set')));
+            case 2:
+              _context2.next = 4;
               return Promise.allSettled(resourceIds.map(function (resourceId) {
+                if (!_this4.writeProvider) {
+                  return Promise.reject('Write provider not set');
+                }
                 return _this4.writeProvider.deleteData(resourceId);
               }));
-            case 2:
+            case 4:
               results = _context2.sent;
               return _context2.abrupt("return", results.map(function (result, index) {
                 if (result.status === 'fulfilled') {
@@ -206,29 +219,17 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
                   };
                 }
               }));
-            case 4:
+            case 6:
             case "end":
               return _context2.stop();
           }
-        }, _callee2);
+        }, _callee2, this);
       }));
       function deleteNodesData(_x3) {
         return _deleteNodesData.apply(this, arguments);
       }
       return deleteNodesData;
     }()
-    /**
-     * Get the source id
-     *
-     * @returns The source id
-     */
-    )
-  }, {
-    key: "getSourceId",
-    value: function getSourceId() {
-      return this.sourceId;
-    }
-
     /**
      * Fetch the source info from the source id
      *
@@ -238,6 +239,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
      *
      * @returns The source info
      */
+    )
   }, {
     key: "fetchSyncBlockSourceInfo",
     value: function fetchSyncBlockSourceInfo(localId, sourceAri, sourceProduct, fireAnalyticsEvent) {
@@ -255,12 +257,20 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
     }
   }, {
     key: "generateResourceId",
-    value: function generateResourceId(sourceId, localId) {
-      return this.writeProvider.generateResourceId(sourceId, localId);
+    value: function generateResourceId() {
+      var localId = crypto.randomUUID();
+      var resourceId = crypto.randomUUID();
+      return {
+        localId: localId,
+        resourceId: resourceId
+      };
     }
   }, {
     key: "generateResourceIdForReference",
     value: function generateResourceIdForReference(sourceId) {
+      if (!this.writeProvider) {
+        throw new Error('Write provider not set');
+      }
       return this.writeProvider.generateResourceIdForReference(sourceId);
     }
 
@@ -292,7 +302,9 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
       switch (sourceProduct) {
         case 'confluence-page':
           return {
-            contentId: (0, _ari.getPageIdAndTypeFromConfluencePageAri)(sourceAri).id,
+            contentId: (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
+              ari: sourceAri
+            }).id,
             contentProduct: sourceProduct
           };
         case 'jira-work-item':
@@ -304,14 +316,21 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
   }, {
     key: "updateReferenceData",
     value: function updateReferenceData(blocks, noContent) {
+      if (!this.writeProvider) {
+        throw new Error('Write provider not set');
+      }
       return this.writeProvider.updateReferenceData(blocks, noContent);
     }
   }]);
 }(_types2.SyncBlockDataProvider);
-var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions, getSSRData) {
+var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(_ref) {
+  var fetchProvider = _ref.fetchProvider,
+    writeProvider = _ref.writeProvider,
+    providerOptions = _ref.providerOptions,
+    getSSRData = _ref.getSSRData;
   var syncBlockProvider = (0, _react.useMemo)(function () {
-    return new SyncBlockProvider(fetchProvider, writeProvider, sourceId);
-  }, [fetchProvider, writeProvider, sourceId]);
+    return new SyncBlockProvider(fetchProvider, writeProvider);
+  }, [fetchProvider, writeProvider]);
   syncBlockProvider.setProviderOptions(providerOptions);
   var ssrData = getSSRData ? getSSRData() : undefined;
   if (ssrData) {

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

@@ -10,13 +10,12 @@ 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 _uuid = _interopRequireDefault(require("uuid"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _types = require("../common/types");
 var _errorHandling = require("../utils/errorHandling");
 var _utils = require("../utils/utils");
 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; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
+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; }
 // A store manager responsible for the lifecycle and state management of source sync blocks in an editor instance.
 // Designed to manage local in-memory state and synchronize with an external data provider.
 // Supports create, flush, and delete operations for source sync blocks.
@@ -237,14 +236,12 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
   }, {
     key: "generateBodiedSyncBlockAttrs",
     value: function generateBodiedSyncBlockAttrs() {
-      var _this$dataProvider;
-      // 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 (!this.dataProvider || !sourceId) {
+      if (!this.dataProvider) {
         throw new Error('Data provider not set or source id not set');
       }
-      var resourceId = this.dataProvider.generateResourceId(sourceId, localId);
+      var _this$dataProvider$ge = this.dataProvider.generateResourceId(),
+        resourceId = _this$dataProvider$ge.resourceId,
+        localId = _this$dataProvider$ge.localId;
       return {
         resourceId: resourceId,
         localId: localId

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

@@ -2,32 +2,31 @@
 
 /**
  * Generates the block ARI from the source page ARI and the source block's resource ID.
- * @param sourceAri - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
+ * @param cloudId - the cloudId of the block. E.G the cloudId of the confluence page, or the cloudId of the Jira instance
+ * @param parentId - the parentId of the block. E.G the pageId for a confluence page, or the issueId for a Jira work item
  * @param resourceId - the resource ID of the block node. A randomly generated UUID
+ * @param product - the product of the block. E.G 'confluence-page', 'jira-work-item'
  * @returns the block ARI. E.G ari:cloud:blocks:<cloudId>:synced-block/<product>/<pageId>/<resourceId>
  */
-export const generateBlockAri = (sourceAri, resourceId, product) => {
-  const match = sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
-  if (!(match !== null && match !== void 0 && match[1])) {
-    throw new Error(`Invalid source ARI: ${sourceAri}`);
-  }
-  const cloudId = match[1];
-  const pageId = match[3];
-  return `ari:cloud:blocks:${cloudId}:synced-block/${product}/${pageId}/${resourceId}`;
+export const generateBlockAri = ({
+  cloudId,
+  parentId,
+  product,
+  resourceId
+}) => {
+  return `ari:cloud:blocks:${cloudId}:synced-block/${product}/${parentId}/${resourceId}`;
 };
 
 /**
  * Generates the block ARI from the reference synced block ARI and the resource ID
- * @param sourceAri - the ARI of the document. E.G ari:cloud:confluence:cloudId:page/pageId
+ * @param cloudId - the cloudId of the block. E.G the cloudId of the confluence page, or the cloudId of the Jira instance
  * @param resourceId - the resource ID of the reference synced block. E.G confluence-page/pageId/sourceResourceId
  * @returns the block ARI. E.G ari:cloud:blocks:<cloudId>:synced-block/<product>/<pageId>/<resourceId>
  */
-export const generateBlockAriFromReference = (sourceAri, resourceId) => {
-  const match = sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
-  if (!(match !== null && match !== void 0 && match[1])) {
-    throw new Error(`Invalid source ARI: ${sourceAri}`);
-  }
-  const cloudId = match[1];
+export const generateBlockAriFromReference = ({
+  cloudId,
+  resourceId
+}) => {
   return `ari:cloud:blocks:${cloudId}:synced-block/${resourceId}`;
 };
 

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

@@ -3,11 +3,10 @@ export const isBlockContentResponse = response => {
   const content = response.content;
   return typeof content === 'string';
 };
-
 /**
  * Retrieves all synced blocks referenced in a document.
  *
- * Calls the Block Service API endpoint: `/v1/block/document/reference/{documentAri}`
+ * Calls the Block Service GraphQL API: `blockService_getDocumentReferenceBlocks`
  *
  * @param documentAri - The ARI of the document to fetch synced blocks for
  * @returns A promise containing arrays of successfully fetched blocks and any errors encountered
@@ -44,23 +43,56 @@ export const isBlockContentResponse = response => {
  *   ]
  * }
  * ```
- * Check https://block-service.dev.atl-paas.net/ for latest API documentation.
  */
 export const getReferenceSyncedBlocks = async documentAri => {
-  const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block/document/reference/${encodeURIComponent(documentAri)}`, {
-    method: 'GET',
-    headers: COMMON_HEADERS
+  const bodyData = {
+    query: buildGetDocumentReferenceBlocksQuery(documentAri),
+    operationName: GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME
+  };
+  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+    method: 'POST',
+    headers: COMMON_HEADERS,
+    body: JSON.stringify(bodyData)
   });
   if (!response.ok) {
     throw new BlockError(response.status);
   }
-  return await response.json();
+  const result = await response.json();
+  if (result.errors && result.errors.length > 0) {
+    throw new Error(result.errors.map(e => e.message).join(', '));
+  }
+  if (!result.data) {
+    throw new Error('No data returned from GraphQL query');
+  }
+  return result.data.blockService_getDocumentReferenceBlocks;
 };
 const COMMON_HEADERS = {
   'Content-Type': 'application/json',
   Accept: 'application/json'
 };
 const BLOCK_SERVICE_API_URL = '/gateway/api/blocks/v1';
+const GRAPHQL_ENDPOINT = '/gateway/api/graphql';
+const GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_DOCUMENT_REFERENCE_BLOCKS';
+const buildGetDocumentReferenceBlocksQuery = documentAri => `query ${GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME} {
+	blockService_getDocumentReferenceBlocks(documentAri: "${documentAri}") {
+		blocks {
+			blockAri
+			blockInstanceId
+			content
+			createdAt
+			createdBy
+			product
+			sourceAri
+			status
+			version
+		}
+		errors {
+			blockAri
+			code
+			reason
+		}
+	}
+}`;
 export class BlockError extends Error {
   constructor(status) {
     super(`Block error`);

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

@@ -11,14 +11,22 @@
  * @param pageType - the type of the page
  * @returns the Confluence page ARI
  */
-export const getConfluencePageAri = (pageId, cloudId, pageType = 'page') => `ari:cloud:confluence:${cloudId}:${pageType}/${pageId}`;
+export const getConfluencePageAri = ({
+  pageId,
+  cloudId,
+  pageType
+}) => {
+  return `ari:cloud:confluence:${cloudId}:${pageType}/${pageId}`;
+};
 
 /**
  * Extracts the page ID and type from the Confluence page ARI
  * @param ari - the Confluence page ARI
  * @returns the page ID and type
  */
-export const getPageIdAndTypeFromConfluencePageAri = ari => {
+export const getPageIdAndTypeFromConfluencePageAri = ({
+  ari
+}) => {
   const match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/);
   if (match !== null && match !== void 0 && match[2]) {
     return {
@@ -27,38 +35,4 @@ export const getPageIdAndTypeFromConfluencePageAri = ari => {
     };
   }
   throw new Error(`Invalid page ARI: ${ari}`);
-};
-
-/**
- * Extracts the local ID from the Confluence page content property resource ID
- * @param resourceId - the Confluence page content property resource ID
- * @returns the local ID
- */
-export const getLocalIdFromContentPropertyResourceId = resourceId => {
-  const match = resourceId.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 resourceId: ${resourceId}`);
-};
-
-/**
- * Extracts the Confluence page ARI from the Confluence content property resource ID
- * @param resourceId - the Confluence content property resource ID
- * @returns the Confluence page ARI
- */
-export const getPageAriFromContentPropertyResourceId = resourceId => {
-  const match = resourceId.match(/(ari:cloud:confluence:[^:]+:(page|blogpost)\/\d+)\/([a-zA-Z0-9-]+)$/);
-  if (match !== null && match !== void 0 && match[1]) {
-    return match[1];
-  }
-  throw new Error(`Invalid resourceId: ${resourceId}`);
-};
-
-/**
- * Generates the Confluence page content property resource ID from the source ID and local ID
- * @param sourceId - the source ID
- * @param localId - the local ID
- * @returns the Confluence page content property resource ID
- */
-export const resourceIdFromConfluencePageSourceIdAndLocalId = (sourceId, localId) => `${sourceId}/${localId}`;
+};

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

@@ -60,7 +60,9 @@ export const fetchConfluencePageInfo = async (pageAri, localId, fireAnalyticsEve
     var _response$data, _response$data$conten, _response$data$conten2, _contentData$space;
     const {
       type: pageType
-    } = getPageIdAndTypeFromConfluencePageAri(pageAri);
+    } = getPageIdAndTypeFromConfluencePageAri({
+      ari: pageAri
+    });
     const response = await getConfluenceSourceInfo(pageAri);
     const contentData = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$conten = _response$data.content) === null || _response$data$conten === void 0 ? void 0 : (_response$data$conten2 = _response$data$conten.nodes) === null || _response$data$conten2 === void 0 ? void 0 : _response$data$conten2[0];
     const title = contentData === null || contentData === void 0 ? void 0 : contentData.title;

package/dist/es2019/clients/jira/ari.js

@@ -6,14 +6,21 @@
  * @param cloudId - the cloud ID
  * @returns the Jira work item ARI
  */
-export const getJiraWorkItemAri = (workItemId, cloudId) => `ari:cloud:jira:${cloudId}:issue/${workItemId}`;
+export const getJiraWorkItemAri = ({
+  cloudId,
+  workItemId
+}) => {
+  return `ari:cloud:jira:${cloudId}:issue/${workItemId}`;
+};
 
 /**
  * Extracts the Jira work item ID from the Jira work item ARI
  * @param ari - the Jira work item ARI
  * @returns the Jira work item ID
  */
-export const getJiraWorkItemIdFromAri = ari => {
+export const getJiraWorkItemIdFromAri = ({
+  ari
+}) => {
   const match = ari.match(/ari:cloud:jira:([^:]+):issue\/(\d+)/);
   if (match !== null && match !== void 0 && match[2]) {
     return match[2];

package/dist/es2019/index.js

@@ -10,12 +10,11 @@ export { useHandleContentChanges } from './hooks/useHandleContentChanges';
 
 // clients
 export { generateBlockAri, generateBlockAriFromReference, getLocalIdFromBlockResourceId } from './clients/block-service/ari';
-export { getConfluencePageAri, getLocalIdFromContentPropertyResourceId, getPageAriFromContentPropertyResourceId, getPageIdAndTypeFromConfluencePageAri, resourceIdFromConfluencePageSourceIdAndLocalId } from './clients/confluence/ari';
+export { getConfluencePageAri, getPageIdAndTypeFromConfluencePageAri } from './clients/confluence/ari';
 export { getJiraWorkItemAri, getJiraWorkItemIdFromAri } from './clients/jira/ari';
 
 // providers
-export { useMemoizedBlockServiceAPIProviders } from './providers/block-service/blockServiceAPI';
-export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders } from './providers/confluence/confluenceContentAPI';
+export { useMemoizedBlockServiceAPIProviders, useMemoizedBlockServiceFetchOnlyAPIProvider } from './providers/block-service/blockServiceAPI';
 export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
 

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

@@ -77,19 +77,23 @@ export const fetchReferences = async documentAri => {
   }));
   return [...blocksInstances, ...errorInstances];
 };
-
 /**
  * ADFFetchProvider implementation that fetches synced block data from Block Service API
  */
 class BlockServiceADFFetchProvider {
-  constructor(sourceAri) {
-    this.sourceAri = sourceAri;
+  constructor({
+    cloudId
+  }) {
+    this.cloudId = cloudId;
   }
 
   // resourceId of the reference synced block.
   // the ARI must be constructed to call the block service API
   async fetchData(resourceId) {
-    const blockAri = generateBlockAriFromReference(this.sourceAri, resourceId);
+    const blockAri = generateBlockAriFromReference({
+      cloudId: this.cloudId,
+      resourceId
+    });
     try {
       const blockContentResponse = await getSyncedBlockContent({
         blockAri
@@ -129,15 +133,21 @@ class BlockServiceADFFetchProvider {
     }
   }
 }
-
 /**
  * ADFWriteProvider implementation that writes synced block data to Block Service API
  */
 class BlockServiceADFWriteProvider {
-  constructor(sourceAri, product, sourceDocumentId, getVersion) {
-    this.sourceAri = sourceAri;
+  constructor({
+    cloudId,
+    parentAri,
+    parentId,
+    product,
+    getVersion
+  }) {
+    this.cloudId = cloudId;
+    this.parentAri = parentAri;
+    this.parentId = parentId;
     this.product = product;
-    this.sourceDocumentId = sourceDocumentId;
     this.getVersion = getVersion;
   }
 
@@ -146,7 +156,12 @@ class BlockServiceADFWriteProvider {
     const {
       resourceId
     } = data;
-    const blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
+    const blockAri = generateBlockAri({
+      cloudId: this.cloudId,
+      parentId: this.parentId,
+      product: this.product,
+      resourceId
+    });
     const stepVersion = this.getVersion ? this.getVersion() : undefined;
     try {
       // Try update existing block's content
@@ -175,13 +190,18 @@ class BlockServiceADFWriteProvider {
     const {
       resourceId
     } = data;
-    const blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
+    const blockAri = generateBlockAri({
+      cloudId: this.cloudId,
+      parentId: this.parentId,
+      product: this.product,
+      resourceId
+    });
     const stepVersion = this.getVersion ? this.getVersion() : undefined;
     try {
       await createSyncedBlock({
         blockAri,
         blockInstanceId: data.blockInstanceId,
-        sourceAri: this.sourceAri,
+        sourceAri: this.parentAri,
         product: this.product,
         content: JSON.stringify(data.content),
         stepVersion
@@ -205,7 +225,12 @@ class BlockServiceADFWriteProvider {
 
   // soft deletes the source synced block
   async deleteData(resourceId) {
-    const blockAri = generateBlockAri(this.sourceAri, resourceId, this.product);
+    const blockAri = generateBlockAri({
+      cloudId: this.cloudId,
+      parentId: this.parentId,
+      product: this.product,
+      resourceId
+    });
     try {
       await deleteSyncedBlock({
         blockAri
@@ -241,7 +266,7 @@ class BlockServiceADFWriteProvider {
 
   // the sourceId is the resourceId of the source synced block.
   generateResourceIdForReference(sourceId) {
-    return `${this.product}/${this.sourceDocumentId}/${sourceId}`;
+    return `${this.product}/${this.parentId}/${sourceId}`;
   }
   generateResourceId() {
     return crypto.randomUUID();
@@ -249,9 +274,12 @@ class BlockServiceADFWriteProvider {
   async updateReferenceData(blocks, noContent) {
     try {
       await updateReferenceSyncedBlockOnDocument({
-        documentAri: this.sourceAri,
+        documentAri: this.parentAri,
         blocks: blocks.map(block => ({
-          blockAri: generateBlockAriFromReference(this.sourceAri, block.resourceId),
+          blockAri: generateBlockAriFromReference({
+            cloudId: this.cloudId,
+            resourceId: block.resourceId
+          }),
           blockInstanceId: block.localId
         })),
         noContent
@@ -273,18 +301,37 @@ class BlockServiceADFWriteProvider {
     }
   }
 }
-
-/**
- * Factory function to create both providers with shared configuration
- */
-const createBlockServiceAPIProviders = (sourceAri, product, sourceDocumentId, getVersion) => {
-  const fetchProvider = new BlockServiceADFFetchProvider(sourceAri);
-  const writeProvider = new BlockServiceADFWriteProvider(sourceAri, product, sourceDocumentId, getVersion);
-  return {
-    fetchProvider,
-    writeProvider
-  };
+export const useMemoizedBlockServiceAPIProviders = ({
+  cloudId,
+  parentAri,
+  parentId,
+  product,
+  getVersion
+}) => {
+  return useMemo(() => {
+    return {
+      fetchProvider: new BlockServiceADFFetchProvider({
+        cloudId
+      }),
+      writeProvider: new BlockServiceADFWriteProvider({
+        cloudId,
+        parentAri,
+        parentId,
+        product,
+        getVersion
+      })
+    };
+  }, [cloudId, parentAri, parentId, product, getVersion]);
 };
-export const useMemoizedBlockServiceAPIProviders = (sourceAri, product, sourceDocumentId, getVersion) => {
-  return useMemo(() => createBlockServiceAPIProviders(sourceAri, product, sourceDocumentId, getVersion), [sourceAri, product, sourceDocumentId, getVersion]);
+export const useMemoizedBlockServiceFetchOnlyAPIProvider = ({
+  cloudId
+}) => {
+  return useMemo(() => {
+    return {
+      fetchProvider: new BlockServiceADFFetchProvider({
+        cloudId
+      }),
+      writeProvider: undefined
+    };
+  }, [cloudId]);
 };