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

package/dist/es2019/providers/syncBlockProvider.js

@@ -2,9 +2,11 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { useMemo } from 'react';
 import { SyncBlockError } from '../common/types';
 import { SyncBlockDataProvider } from '../providers/types';
-import { getLocalIdFromAri, getPageARIFromResourceId } from '../utils/ari';
+import { getPageIdAndTypeFromAri } from '../utils/ari';
 import { fetchSourceInfo } from '../utils/sourceInfo';
 export class SyncBlockProvider extends SyncBlockDataProvider {
+  // the source document ARI; that the source sync block is on.
+
   /**
    * Constructor for the SyncBlockProvider
    *
@@ -136,6 +138,9 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
    * @returns The source info
    */
   retrieveSyncBlockSourceInfo(node) {
+    // with content API, this is the concatenation of the page ARI and the block's localId.
+    // with block service, this is the ARI of the block.
+    // this can be cleaned up from the specific providers and placed here after platform_synced_blocks_block_service_provider
     const {
       resourceId
     } = node.attrs;
@@ -143,15 +148,12 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
     let sourceLocalId;
     if (resourceId && typeof resourceId === 'string') {
       try {
-        pageARI = getPageARIFromResourceId(resourceId);
+        const fetchData = this.fetchProvider.retrieveSourceInfoFetchData(resourceId, this.sourceId);
+        pageARI = fetchData.pageARI;
+        sourceLocalId = fetchData.sourceLocalId;
       } catch (error) {
         return Promise.reject(error);
       }
-      try {
-        sourceLocalId = getLocalIdFromAri(resourceId);
-      } catch (error) {
-        // EDITOR-1921: log analytic here, safe to continue
-      }
     }
     return pageARI ? fetchSourceInfo(pageARI, sourceLocalId) : Promise.resolve(undefined);
   }
@@ -167,6 +169,35 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
   getSyncedBlockRendererProviderOptions() {
     return this.providerOptions;
   }
+
+  /**
+   * Retrieve the parent info for the sync block
+   *
+   * @param resourceId
+   * @param syncBlockInstance
+   *
+   * @returns The parent info for the sync block
+   */
+  retrieveSyncBlockParentInfo(syncBlockInstance) {
+    if (!syncBlockInstance || !syncBlockInstance.data) {
+      return undefined;
+    }
+    const {
+      sourceAri,
+      resourceId,
+      product: contentProduct
+    } = syncBlockInstance.data;
+
+    // Temp solution to get the pageId from resource since the sourceDocumentAri is not available for older sync blocks
+    const pageARI = sourceAri || resourceId;
+    const {
+      id: contentId
+    } = getPageIdAndTypeFromAri(pageARI);
+    return {
+      contentId,
+      contentProduct: contentProduct || 'confluence-page'
+    };
+  }
 }
 export const useMemoizedSyncedBlockProvider = (fetchProvider, writeProvider, sourceId, providerOptions) => {
   return useMemo(() => {

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

@@ -235,21 +235,62 @@ export class ReferenceSyncBlockStoreManager {
       return undefined;
     }
     const {
-      parentDataProviders
+      parentDataProviders,
+      providerCreator
     } = this.dataProvider.getSyncedBlockRendererProviderOptions();
-    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.create({
-        emojiProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.emojiProvider,
-        mediaProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mediaProvider,
+    let providerFactory = this.providerFactories.get(resourceId);
+    if (!providerFactory) {
+      providerFactory = ProviderFactory.create({
         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
-      }));
+      });
+      this.providerFactories.set(resourceId, providerFactory);
+    }
+    if (providerCreator) {
+      this.retrieveDynamicProviders(resourceId, providerFactory, providerCreator);
+    }
+    return providerFactory;
+  }
+  retrieveDynamicProviders(resourceId, providerFactory, providerCreator) {
+    if (!this.dataProvider) {
+      return;
+    }
+    const hasMediaProvider = providerFactory.hasProvider('mediaProvider');
+    const hasEmojiProvider = providerFactory.hasProvider('emojiProvider');
+    if (hasMediaProvider && hasEmojiProvider) {
+      return;
+    }
+    const parentInfo = this.dataProvider.retrieveSyncBlockParentInfo(this.syncBlockCache.get(resourceId));
+    if (!parentInfo) {
+      return;
+    }
+    const {
+      contentId,
+      contentProduct
+    } = parentInfo;
+    if (!hasMediaProvider) {
+      if (providerCreator.createMediaProvider && contentId && contentProduct) {
+        const mediaProvider = providerCreator.createMediaProvider({
+          contentProduct,
+          contentId
+        });
+        if (mediaProvider) {
+          providerFactory.setProvider('mediaProvider', mediaProvider);
+        }
+      }
+    }
+    if (!hasEmojiProvider) {
+      if (providerCreator.createEmojiProvider && contentId && contentProduct) {
+        const emojiProvider = providerCreator.createEmojiProvider({
+          contentProduct,
+          contentId
+        });
+        if (emojiProvider) {
+          providerFactory.setProvider('emojiProvider', emojiProvider);
+        }
+      }
     }
-    return this.providerFactories.get(resourceId);
   }
   destroy() {
     this.syncBlockCache.clear();

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

@@ -1,3 +1,5 @@
+// eslint-disable-next-line no-restricted-imports
+
 import { convertPMNodeToSyncBlockNode } from '../utils/utils';
 import { ReferenceSyncBlockStoreManager } from './referenceSyncBlockStoreManager';
 import { SourceSyncBlockStoreManager } from './sourceSyncBlockStoreManager';

package/dist/es2019/utils/ari.js

@@ -1,6 +1,8 @@
 /* eslint-disable require-unicode-regexp  */
 
 export const getConfluencePageAri = (pageId, cloudId, pageType = 'page') => `ari:cloud:confluence:${cloudId}:${pageType}/${pageId}`;
+
+// For extracting from Page ARI and also the content property's version of resourceId
 export const getPageIdAndTypeFromAri = ari => {
   const match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/);
   if (match !== null && match !== void 0 && match[2]) {
@@ -27,35 +29,4 @@ export const getPageARIFromResourceId = resourceId => {
 };
 export const 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
- */
-export const blockResourceIdFromSourceAndLocalId = (sourceId, localId) => {
-  const match = sourceId.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/.*/);
-  if (!(match !== null && match !== void 0 && match[1])) {
-    throw new Error(`Invalid source ARI: ${sourceId}`);
-  }
-  const cloudId = match[1];
-  return `ari:cloud:blocks:${cloudId}:synced-block/${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
- */
-export const getLocalIdFromResourceId = ari => {
-  const 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: ${ari}`);
 };

package/dist/es2019/utils/sourceInfo.js

@@ -52,13 +52,13 @@ const getSourceInfo = async ari => {
   }
   return await response.json();
 };
-export const fetchSourceInfo = async (ari, localId) => {
+export const fetchSourceInfo = async (pageAri, localId) => {
   try {
     var _response$data, _response$data$conten, _response$data$conten2, _contentData$space;
     const {
       type: pageType
-    } = getPageIdAndTypeFromAri(ari);
-    const response = await getSourceInfo(ari);
+    } = getPageIdAndTypeFromAri(pageAri);
+    const response = await getSourceInfo(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];
     if (!contentData) {
       throw new Error(`Failed to get content data`);

package/dist/esm/index.js

@@ -5,11 +5,12 @@ export { SyncBlockError } from './common/types';
 export { useFetchSyncBlockData } from './hooks/useFetchSyncBlockData';
 export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
+export { blockResourceIdFromSourceAndLocalId, getLocalIdFromResourceId } from './providers/block-service/ari';
 export { useMemoizedBlockServiceAPIProviders } from './providers/block-service/blockServiceAPI';
 export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders } from './providers/confluence/confluenceContentAPI';
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
 export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';
 export { SyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
-export { blockResourceIdFromSourceAndLocalId, getConfluencePageAri, getLocalIdFromAri, getLocalIdFromResourceId, getPageARIFromResourceId, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId } from './utils/ari';
+export { getConfluencePageAri, getLocalIdFromAri, getPageARIFromResourceId, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId } from './utils/ari';
 export { createSyncBlockNode, convertSyncBlockPMNodeToSyncBlockData, convertSyncBlockJSONNodeToSyncBlockNode } from './utils/utils';
 export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';

package/dist/esm/providers/block-service/ari.js

@@ -0,0 +1,28 @@
+/* eslint-disable require-unicode-regexp */
+/**
+ * Generates a unique block ARI from a source ARI and a local ID.
+ * @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
+ */
+export var 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);
+};
+
+/**
+ * Extracts the local ID from a block ARI.
+ * @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
+ */
+export var getLocalIdFromResourceId = function getLocalIdFromResourceId(ari) {
+  var match = ari.match(/ari:cloud:blocks:[^:]+:synced-block\/([a-zA-Z0-9-]+)/);
+  if (match !== null && match !== void 0 && match[1]) {
+    return match[1];
+  }
+  throw new Error("Invalid page ARI: ".concat(ari));
+};

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

@@ -4,9 +4,9 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useMemo } from 'react';
 import { SyncBlockError } from '../../common/types';
-import { blockResourceIdFromSourceAndLocalId, getLocalIdFromResourceId } from '../../utils/ari';
 import { BlockError, createSyncedBlock, deleteSyncedBlock, getSyncedBlockContent, updateSyncedBlock } from '../../utils/blockService';
 import { stringifyError } from '../../utils/errorHandling';
+import { blockResourceIdFromSourceAndLocalId, getLocalIdFromResourceId } from './ari';
 var mapBlockError = function mapBlockError(error) {
   switch (error.status) {
     case 403:
@@ -89,6 +89,20 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
       }
       return fetchData;
     }()
+  }, {
+    key: "retrieveSourceInfoFetchData",
+    value: function retrieveSourceInfoFetchData(resourceId, pageARI) {
+      var sourceLocalId;
+      try {
+        sourceLocalId = getLocalIdFromResourceId(resourceId);
+      } catch (error) {
+        // EDITOR-1921: log analytic here, safe to continue
+      }
+      return {
+        pageARI: pageARI,
+        sourceLocalId: sourceLocalId
+      };
+    }
   }]);
 }();
 /**

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

@@ -3,10 +3,12 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _typeof from "@babel/runtime/helpers/typeof";
+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) { _defineProperty(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; }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useMemo } from 'react';
 import { SyncBlockError } from '../../common/types';
-import { getLocalIdFromAri, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId } from '../../utils/ari';
+import { getConfluencePageAri, getPageARIFromResourceId, getLocalIdFromAri, getPageIdAndTypeFromAri, resourceIdFromSourceAndLocalId } from '../../utils/ari';
 import { getContentProperty, createContentProperty, updateContentProperty, deleteContentProperty } from '../../utils/contentProperty';
 import { stringifyError } from '../../utils/errorHandling';
 import { isBlogPageType } from '../../utils/utils';
@@ -128,6 +130,21 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
       }
       return fetchData;
     }()
+  }, {
+    key: "retrieveSourceInfoFetchData",
+    value: function retrieveSourceInfoFetchData(resourceId) {
+      var pageARI = getPageARIFromResourceId(resourceId);
+      var sourceLocalId;
+      try {
+        sourceLocalId = getLocalIdFromAri(resourceId);
+      } catch (error) {
+        // EDITOR-1921: log analytic here, safe to continue
+      }
+      return {
+        pageARI: pageARI,
+        sourceLocalId: sourceLocalId
+      };
+    }
   }]);
 }();
 /**
@@ -196,7 +213,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
     key: "writeData",
     value: function () {
       var _writeData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(data) {
-        var match, resourceId, _match, pageId, pageType, localId, key, options, updatePayload, updateResult;
+        var match, resourceId, _match, pageId, pageType, localId, key, sourceAri, syncBlockDataWithSourceDocumentAri, options, updatePayload, updateResult;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -217,28 +234,33 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
               // Update existing content property
               localId = getLocalIdFromAri(resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
+              sourceAri = getConfluencePageAri(pageId, this.config.cloudId, pageType);
+              syncBlockDataWithSourceDocumentAri = _objectSpread(_objectSpread({}, data), {}, {
+                product: 'confluence-page',
+                sourceAri: sourceAri
+              });
               options = {
                 pageId: pageId,
                 key: key,
-                value: data,
+                value: syncBlockDataWithSourceDocumentAri,
                 cloudId: this.config.cloudId,
                 pageType: pageType
               };
-              _context3.next = 15;
+              _context3.next = 17;
               return updateContentProperty(options);
-            case 15:
+            case 17:
               updatePayload = _context3.sent;
               updateResult = isBlogPageType(pageType) ? updatePayload.data.confluence.updateValueBlogPostProperty.blogPostProperty : updatePayload.data.confluence.updateValuePageProperty.pageProperty;
               if (!((updateResult === null || updateResult === void 0 ? void 0 : updateResult.key) === key)) {
-                _context3.next = 21;
+                _context3.next = 23;
                 break;
               }
               return _context3.abrupt("return", {
                 resourceId: resourceId
               });
-            case 21:
+            case 23:
               if (updateResult) {
-                _context3.next = 25;
+                _context3.next = 27;
                 break;
               }
               return _context3.abrupt("return", this.createNewContentProperty(pageId, key, data, pageType).then(function () {
@@ -250,24 +272,24 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
                   error: error
                 };
               }));
-            case 25:
+            case 27:
               return _context3.abrupt("return", {
                 error: "Failed to update ".concat(pageType, " content property")
               });
-            case 26:
-              _context3.next = 31;
-              break;
             case 28:
-              _context3.prev = 28;
+              _context3.next = 33;
+              break;
+            case 30:
+              _context3.prev = 30;
               _context3.t1 = _context3["catch"](9);
               return _context3.abrupt("return", {
                 error: "Failed to write ".concat(pageType)
               });
-            case 31:
+            case 33:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[1, 5], [9, 28]]);
+        }, _callee3, this, [[1, 5], [9, 30]]);
       }));
       function writeData(_x6) {
         return _writeData.apply(this, arguments);

package/dist/esm/providers/syncBlockProvider.js

@@ -12,9 +12,11 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import { useMemo } from 'react';
 import { SyncBlockError } from '../common/types';
 import { SyncBlockDataProvider } from '../providers/types';
-import { getLocalIdFromAri, getPageARIFromResourceId } from '../utils/ari';
+import { getPageIdAndTypeFromAri } from '../utils/ari';
 import { fetchSourceInfo } from '../utils/sourceInfo';
 export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
+  // the source document ARI; that the source sync block is on.
+
   /**
    * Constructor for the SyncBlockProvider
    *
@@ -209,20 +211,20 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
   }, {
     key: "retrieveSyncBlockSourceInfo",
     value: function retrieveSyncBlockSourceInfo(node) {
+      // with content API, this is the concatenation of the page ARI and the block's localId.
+      // with block service, this is the ARI of the block.
+      // this can be cleaned up from the specific providers and placed here after platform_synced_blocks_block_service_provider
       var resourceId = node.attrs.resourceId;
       var pageARI;
       var sourceLocalId;
       if (resourceId && typeof resourceId === 'string') {
         try {
-          pageARI = getPageARIFromResourceId(resourceId);
+          var fetchData = this.fetchProvider.retrieveSourceInfoFetchData(resourceId, this.sourceId);
+          pageARI = fetchData.pageARI;
+          sourceLocalId = fetchData.sourceLocalId;
         } catch (error) {
           return Promise.reject(error);
         }
-        try {
-          sourceLocalId = getLocalIdFromAri(resourceId);
-        } catch (error) {
-          // EDITOR-1921: log analytic here, safe to continue
-        }
       }
       return pageARI ? fetchSourceInfo(pageARI, sourceLocalId) : Promise.resolve(undefined);
     }
@@ -242,6 +244,35 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
     value: function getSyncedBlockRendererProviderOptions() {
       return this.providerOptions;
     }
+
+    /**
+     * Retrieve the parent info for the sync block
+     *
+     * @param resourceId
+     * @param syncBlockInstance
+     *
+     * @returns The parent info for the sync block
+     */
+  }, {
+    key: "retrieveSyncBlockParentInfo",
+    value: function retrieveSyncBlockParentInfo(syncBlockInstance) {
+      if (!syncBlockInstance || !syncBlockInstance.data) {
+        return undefined;
+      }
+      var _syncBlockInstance$da = syncBlockInstance.data,
+        sourceAri = _syncBlockInstance$da.sourceAri,
+        resourceId = _syncBlockInstance$da.resourceId,
+        contentProduct = _syncBlockInstance$da.product;
+
+      // Temp solution to get the pageId from resource since the sourceDocumentAri is not available for older sync blocks
+      var pageARI = sourceAri || resourceId;
+      var _getPageIdAndTypeFrom = getPageIdAndTypeFromAri(pageARI),
+        contentId = _getPageIdAndTypeFrom.id;
+      return {
+        contentId: contentId,
+        contentProduct: contentProduct || 'confluence-page'
+      };
+    }
   }]);
 }(SyncBlockDataProvider);
 export var useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions) {

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

@@ -341,20 +341,61 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
         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.create({
-          emojiProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.emojiProvider,
-          mediaProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mediaProvider,
+        parentDataProviders = _this$dataProvider$ge.parentDataProviders,
+        providerCreator = _this$dataProvider$ge.providerCreator;
+      var providerFactory = this.providerFactories.get(resourceId);
+      if (!providerFactory) {
+        providerFactory = ProviderFactory.create({
           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
-        }));
+        });
+        this.providerFactories.set(resourceId, providerFactory);
+      }
+      if (providerCreator) {
+        this.retrieveDynamicProviders(resourceId, providerFactory, providerCreator);
+      }
+      return providerFactory;
+    }
+  }, {
+    key: "retrieveDynamicProviders",
+    value: function retrieveDynamicProviders(resourceId, providerFactory, providerCreator) {
+      if (!this.dataProvider) {
+        return;
+      }
+      var hasMediaProvider = providerFactory.hasProvider('mediaProvider');
+      var hasEmojiProvider = providerFactory.hasProvider('emojiProvider');
+      if (hasMediaProvider && hasEmojiProvider) {
+        return;
+      }
+      var parentInfo = this.dataProvider.retrieveSyncBlockParentInfo(this.syncBlockCache.get(resourceId));
+      if (!parentInfo) {
+        return;
+      }
+      var contentId = parentInfo.contentId,
+        contentProduct = parentInfo.contentProduct;
+      if (!hasMediaProvider) {
+        if (providerCreator.createMediaProvider && contentId && contentProduct) {
+          var mediaProvider = providerCreator.createMediaProvider({
+            contentProduct: contentProduct,
+            contentId: contentId
+          });
+          if (mediaProvider) {
+            providerFactory.setProvider('mediaProvider', mediaProvider);
+          }
+        }
+      }
+      if (!hasEmojiProvider) {
+        if (providerCreator.createEmojiProvider && contentId && contentProduct) {
+          var emojiProvider = providerCreator.createEmojiProvider({
+            contentProduct: contentProduct,
+            contentId: contentId
+          });
+          if (emojiProvider) {
+            providerFactory.setProvider('emojiProvider', emojiProvider);
+          }
+        }
       }
-      return this.providerFactories.get(resourceId);
     }
   }, {
     key: "destroy",

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

@@ -1,5 +1,7 @@
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
+// eslint-disable-next-line no-restricted-imports
+
 import { convertPMNodeToSyncBlockNode } from '../utils/utils';
 import { ReferenceSyncBlockStoreManager } from './referenceSyncBlockStoreManager';
 import { SourceSyncBlockStoreManager } from './sourceSyncBlockStoreManager';

package/dist/esm/utils/ari.js

@@ -4,6 +4,8 @@ export var getConfluencePageAri = function getConfluencePageAri(pageId, cloudId)
   var pageType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'page';
   return "ari:cloud:confluence:".concat(cloudId, ":").concat(pageType, "/").concat(pageId);
 };
+
+// For extracting from Page ARI and also the content property's version of resourceId
 export var getPageIdAndTypeFromAri = function getPageIdAndTypeFromAri(ari) {
   var match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/);
   if (match !== null && match !== void 0 && match[2]) {
@@ -30,35 +32,4 @@ export var getPageARIFromResourceId = function getPageARIFromResourceId(resource
 };
 export var 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
- */
-export var 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
- */
-export var 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/esm/utils/sourceInfo.js

@@ -64,15 +64,15 @@ var getSourceInfo = /*#__PURE__*/function () {
   };
 }();
 export var fetchSourceInfo = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(ari, localId) {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(pageAri, localId) {
     var _response$data, _contentData$space, _getPageIdAndTypeFrom, pageType, response, contentData, title, url, _ref3, base;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.prev = 0;
-          _getPageIdAndTypeFrom = getPageIdAndTypeFromAri(ari), pageType = _getPageIdAndTypeFrom.type;
+          _getPageIdAndTypeFrom = getPageIdAndTypeFromAri(pageAri), pageType = _getPageIdAndTypeFrom.type;
           _context2.next = 4;
-          return getSourceInfo(ari);
+          return getSourceInfo(pageAri);
         case 4:
           response = _context2.sent;
           contentData = (_response$data = response.data) === null || _response$data === void 0 || (_response$data = _response$data.content) === null || _response$data === void 0 || (_response$data = _response$data.nodes) === null || _response$data === void 0 ? void 0 : _response$data[0];

package/dist/types/common/types.d.ts

@@ -2,6 +2,7 @@ import type { ADFEntity } from '@atlaskit/adf-utils/types';
 import type { JSONNode } from '@atlaskit/editor-json-transformer/types';
 export type BlockInstanceId = string;
 export type ResourceId = string;
+export type SyncBlockProduct = 'confluence-page' | 'jira-work-item';
 export type SyncBlockAttrs = {
     localId: BlockInstanceId;
     resourceId: ResourceId;
@@ -22,8 +23,9 @@ export interface SyncBlockData {
     createdAt?: string;
     createdBy?: string;
     isSynced?: boolean;
+    product?: SyncBlockProduct;
     resourceId: ResourceId;
-    sourceDocumentAri?: string;
+    sourceAri?: string;
     sourceTitle?: string;
     sourceURL?: string;
     updatedAt?: string;