@atlaskit/editor-synced-block-provider 2.10.5 → 2.10.6

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.10.6
+
+### Patch Changes
+
+- [`23c24c4b7faff`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/23c24c4b7faff) -
+  EDITOR-3312 Make data handling product agnostic
+- Updated dependencies
+
 ## 2.10.5
 
 ### Patch Changes

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.fetchConfluenceSourceInfo = void 0;
+exports.fetchConfluencePageInfo = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -68,7 +68,7 @@ var getConfluenceSourceInfo = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-var fetchConfluenceSourceInfo = exports.fetchConfluenceSourceInfo = /*#__PURE__*/function () {
+var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(pageAri, localId) {
     var _response$data, _contentData$space, _getPageIdAndTypeFrom, pageType, response, contentData, title, url, _ref3, base;
     return _regenerator.default.wrap(function _callee2$(_context2) {
@@ -113,7 +113,7 @@ var fetchConfluenceSourceInfo = exports.fetchConfluenceSourceInfo = /*#__PURE__*
       }
     }, _callee2, null, [[0, 15]]);
   }));
-  return function fetchConfluenceSourceInfo(_x2, _x3) {
+  return function fetchConfluencePageInfo(_x2, _x3) {
     return _ref2.apply(this, arguments);
   };
 }();

package/dist/cjs/index.js

@@ -63,10 +63,10 @@ Object.defineProperty(exports, "createSyncBlockNode", {
     return _utils.createSyncBlockNode;
   }
 });
-Object.defineProperty(exports, "fetchConfluenceSourceInfo", {
+Object.defineProperty(exports, "fetchConfluencePageInfo", {
   enumerable: true,
   get: function get() {
-    return _sourceInfo.fetchConfluenceSourceInfo;
+    return _sourceInfo.fetchConfluencePageInfo;
   }
 });
 Object.defineProperty(exports, "getConfluencePageAri", {

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

@@ -96,20 +96,6 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
       }
       return fetchData;
     }()
-  }, {
-    key: "retrieveSourceInfoFetchData",
-    value: function retrieveSourceInfoFetchData(resourceId, pageARI) {
-      var sourceLocalId;
-      try {
-        sourceLocalId = (0, _ari.getLocalIdFromBlockResourceId)(resourceId);
-      } catch (error) {
-        // EDITOR-1921: log analytic here, safe to continue
-      }
-      return {
-        pageARI: pageARI,
-        sourceLocalId: sourceLocalId
-      };
-    }
   }]);
 }();
 /**

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

@@ -146,21 +146,6 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
       }
       return fetchData;
     }()
-  }, {
-    key: "retrieveSourceInfoFetchData",
-    value: function retrieveSourceInfoFetchData(resourceId) {
-      var pageARI = (0, _ari.getPageARIFromContentPropertyResourceId)(resourceId);
-      var sourceLocalId;
-      try {
-        sourceLocalId = (0, _ari.getLocalIdFromConfluencePageAri)(resourceId);
-      } catch (error) {
-        // EDITOR-1921: log analytic here, safe to continue
-      }
-      return {
-        pageARI: pageARI,
-        sourceLocalId: sourceLocalId
-      };
-    }
   }]);
 }();
 /**

package/dist/cjs/providers/syncBlockProvider.js

@@ -209,34 +209,28 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
     }
 
     /**
-     * Retrieve the source info from the source id
+     * Fetch the source info from the source id
      *
-     * @param node
+     * @param params
+     * @param params.sourceAri - The source ARI
+     * @param params.sourceProduct - The source product. e.g. 'confluence-page', 'jira-work-item'
      *
      * @returns The source info
      */
   }, {
-    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 {
-          var fetchData = this.fetchProvider.retrieveSourceInfoFetchData(resourceId, this.sourceId);
-          pageARI = fetchData.pageARI;
-          sourceLocalId = fetchData.sourceLocalId;
-        } catch (error) {
-          return Promise.reject(error);
-        }
+    key: "fetchSyncBlockSourceInfo",
+    value: function fetchSyncBlockSourceInfo(localId, sourceAri, sourceProduct) {
+      if (!sourceAri || !sourceProduct) {
+        return Promise.resolve(undefined);
+      }
+      switch (sourceProduct) {
+        case 'confluence-page':
+          return (0, _sourceInfo.fetchConfluencePageInfo)(sourceAri, localId);
+        case 'jira-work-item':
+          return Promise.reject(new Error('Jira work item source product not supported'));
+        default:
+          return Promise.reject(new Error("".concat(sourceProduct, " source product not supported")));
       }
-
-      // TODO: EDITOR-3312 - based on the source sync block product,
-      // execute fetchConfluenceSourceInfo or fetchJiraItemSourceInfo or similar...
-      return pageARI ? (0, _sourceInfo.fetchConfluenceSourceInfo)(pageARI, sourceLocalId) : Promise.resolve(undefined);
     }
   }, {
     key: "generateResourceId",
@@ -258,32 +252,28 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
     /**
      * Retrieve the parent info for the sync block
      *
-     * @param resourceId
-     * @param syncBlockInstance
+     * @param sourceAri - The source ARI
+     * @param sourceProduct - The source product. e.g. 'confluence-page', 'jira-work-item'
      *
      * @returns The parent info for the sync block
      */
   }, {
     key: "retrieveSyncBlockParentInfo",
-    value: function retrieveSyncBlockParentInfo(syncBlockInstance) {
-      if (!syncBlockInstance || !syncBlockInstance.data) {
+    value: function retrieveSyncBlockParentInfo(sourceAri, sourceProduct) {
+      if (!sourceAri || !sourceProduct) {
         return undefined;
       }
-      var _syncBlockInstance$da = syncBlockInstance.data,
-        sourceAri = _syncBlockInstance$da.sourceAri,
-        product = _syncBlockInstance$da.product;
-      if (!sourceAri || !product) {
-        return undefined;
+      switch (sourceProduct) {
+        case 'confluence-page':
+          return {
+            contentId: (0, _ari.getPageIdAndTypeFromConfluencePageAri)(sourceAri).id,
+            contentProduct: sourceProduct
+          };
+        case 'jira-work-item':
+          throw new Error('Jira work item source product not supported');
+        default:
+          throw new Error("".concat(sourceProduct, " source product not supported"));
       }
-
-      // TODO: EDITOR-3312 - based on the source sync block product,
-      // execute getPageIdAndTypeFromConfluencePageAri or getJiraItemIdAndTypeFromJiraItemAri or similar...
-      var _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(sourceAri),
-        contentId = _getPageIdAndTypeFrom.id;
-      return {
-        contentId: contentId,
-        contentProduct: product
-      };
     }
   }]);
 }(_types2.SyncBlockDataProvider);

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

@@ -121,35 +121,45 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       return refreshSubscriptions;
     }())
   }, {
-    key: "retrieveSyncBlockSourceInfo",
-    value: function retrieveSyncBlockSourceInfo(resourceId) {
-      var _this = this;
+    key: "fetchSyncBlockSourceInfo",
+    value: function fetchSyncBlockSourceInfo(resourceId) {
+      var _existingSyncBlock$da,
+        _existingSyncBlock$da2,
+        _this = this;
       if (!resourceId || !this.dataProvider) {
         return;
       }
+      if (this.syncBlockURLRequests.get(resourceId)) {
+        return;
+      }
+      this.syncBlockURLRequests.set(resourceId, true);
+      var existingSyncBlock = this.getFromCache(resourceId);
+      if (!existingSyncBlock) {
+        return;
+      }
 
-      // TODO: EDITOR-3312 - retrieve the source info based on the source sync block product
-
-      // if the sync block is a reference block, we need to fetch the URL to the source
-      // we could optimise this further by checking if the sync block is on the same page as the source
-      if (!this.syncBlockURLRequests.get(resourceId)) {
-        this.syncBlockURLRequests.set(resourceId, true);
-        this.dataProvider.retrieveSyncBlockSourceInfo((0, _utils.createSyncBlockNode)('', resourceId)).then(function (sourceInfo) {
-          var existingSyncBlock = _this.getFromCache(resourceId);
-          if (existingSyncBlock && existingSyncBlock.data) {
-            existingSyncBlock.data = _objectSpread(_objectSpread({}, existingSyncBlock.data), {}, {
-              sourceURL: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url,
-              sourceTitle: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.title
-            });
-            _this.updateCache(existingSyncBlock);
-            if (sourceInfo !== null && sourceInfo !== void 0 && sourceInfo.title) {
-              _this.updateSourceTitleSubscriptions(existingSyncBlock.resourceId, sourceInfo.title);
-            }
-          }
-        }).finally(function () {
-          _this.syncBlockURLRequests.set(resourceId, false);
-        });
+      // skip if source URL and title are already present
+      if ((_existingSyncBlock$da = existingSyncBlock.data) !== null && _existingSyncBlock$da !== void 0 && _existingSyncBlock$da.sourceURL && (_existingSyncBlock$da2 = existingSyncBlock.data) !== null && _existingSyncBlock$da2 !== void 0 && _existingSyncBlock$da2.sourceTitle) {
+        return;
       }
+      var _ref = existingSyncBlock.data || {},
+        sourceAri = _ref.sourceAri,
+        product = _ref.product,
+        blockInstanceId = _ref.blockInstanceId;
+      if (!sourceAri || !product || !blockInstanceId) {
+        return;
+      }
+      this.dataProvider.fetchSyncBlockSourceInfo(blockInstanceId, sourceAri, product).then(function (sourceInfo) {
+        if (!sourceInfo) {
+          return;
+        }
+        _this.updateCacheWithSourceInfo(resourceId, sourceInfo);
+        if (sourceInfo.title) {
+          _this.updateSourceTitleSubscriptions(resourceId, sourceInfo.title);
+        }
+      }).finally(function () {
+        _this.syncBlockURLRequests.delete(resourceId);
+      });
     }
 
     /**
@@ -200,7 +210,6 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
             case 11:
               resolvedData = [];
               data.forEach(function (syncBlockInstance) {
-                var _resolvedSyncBlockIns, _resolvedSyncBlockIns2;
                 if (!syncBlockInstance.resourceId) {
                   return;
                 }
@@ -213,11 +222,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                 var resolvedSyncBlockInstance = existingSyncBlock ? (0, _resolveSyncBlockInstance.resolveSyncBlockInstance)(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
                 _this2.updateCache(resolvedSyncBlockInstance);
                 resolvedData.push(resolvedSyncBlockInstance);
-
-                // fetch source URL and title if not already present
-                if ((!((_resolvedSyncBlockIns = resolvedSyncBlockInstance.data) !== null && _resolvedSyncBlockIns !== void 0 && _resolvedSyncBlockIns.sourceURL) || !((_resolvedSyncBlockIns2 = resolvedSyncBlockInstance.data) !== null && _resolvedSyncBlockIns2 !== void 0 && _resolvedSyncBlockIns2.sourceTitle)) && resolvedSyncBlockInstance.resourceId) {
-                  _this2.retrieveSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
-                }
+                _this2.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
               });
               return _context3.abrupt("return", [].concat(resolvedData, blocksWithNotFoundError));
             case 14:
@@ -231,6 +236,19 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       }
       return fetchSyncBlocksData;
     }())
+  }, {
+    key: "updateCacheWithSourceInfo",
+    value: function updateCacheWithSourceInfo(resourceId, sourceInfo) {
+      var existingSyncBlock = this.getFromCache(resourceId);
+      if (existingSyncBlock && existingSyncBlock.data) {
+        existingSyncBlock.data.sourceURL = sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url;
+        existingSyncBlock.data = _objectSpread(_objectSpread({}, existingSyncBlock.data), {}, {
+          sourceURL: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url,
+          sourceTitle: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.title
+        });
+        this.updateCache(existingSyncBlock);
+      }
+    }
   }, {
     key: "updateCache",
     value: function updateCache(syncBlock) {
@@ -386,6 +404,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "retrieveDynamicProviders",
     value: function retrieveDynamicProviders(resourceId, providerFactory, providerCreator) {
+      var _syncBlock$data2, _syncBlock$data3, _syncBlock$data4, _syncBlock$data5;
       if (!this.dataProvider) {
         return;
       }
@@ -394,7 +413,11 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       if (hasMediaProvider && hasEmojiProvider) {
         return;
       }
-      var parentInfo = this.dataProvider.retrieveSyncBlockParentInfo(this.syncBlockCache.get(resourceId));
+      var syncBlock = this.getFromCache(resourceId);
+      if (!syncBlock || !((_syncBlock$data2 = syncBlock.data) !== null && _syncBlock$data2 !== void 0 && _syncBlock$data2.sourceAri) || !((_syncBlock$data3 = syncBlock.data) !== null && _syncBlock$data3 !== void 0 && _syncBlock$data3.product)) {
+        return;
+      }
+      var parentInfo = this.dataProvider.retrieveSyncBlockParentInfo((_syncBlock$data4 = syncBlock.data) === null || _syncBlock$data4 === void 0 ? void 0 : _syncBlock$data4.sourceAri, (_syncBlock$data5 = syncBlock.data) === null || _syncBlock$data5 === void 0 ? void 0 : _syncBlock$data5.product);
       if (!parentInfo) {
         return;
       }

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

@@ -52,7 +52,7 @@ const getConfluenceSourceInfo = async ari => {
   }
   return await response.json();
 };
-export const fetchConfluenceSourceInfo = async (pageAri, localId) => {
+export const fetchConfluencePageInfo = async (pageAri, localId) => {
   try {
     var _response$data, _response$data$conten, _response$data$conten2, _contentData$space;
     const {

package/dist/es2019/index.js

@@ -15,7 +15,7 @@ export { getConfluencePageAri, getLocalIdFromConfluencePageAri, getPageARIFromCo
 // providers
 export { useMemoizedBlockServiceAPIProviders } from './providers/block-service/blockServiceAPI';
 export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders } from './providers/confluence/confluenceContentAPI';
-export { fetchConfluenceSourceInfo } from './clients/confluence/sourceInfo';
+export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
 // store managers
 export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';

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

@@ -56,18 +56,6 @@ class BlockServiceADFFetchProvider {
       };
     }
   }
-  retrieveSourceInfoFetchData(resourceId, pageARI) {
-    let sourceLocalId;
-    try {
-      sourceLocalId = getLocalIdFromBlockResourceId(resourceId);
-    } catch (error) {
-      // EDITOR-1921: log analytic here, safe to continue
-    }
-    return {
-      pageARI,
-      sourceLocalId
-    };
-  }
 }
 
 /**

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

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { useMemo } from 'react';
-import { getConfluencePageAri, getPageARIFromContentPropertyResourceId, getLocalIdFromConfluencePageAri, getPageIdAndTypeFromConfluencePageAri, resourceIdFromConfluencePageSourceIdAndLocalId } from '../../clients/confluence/ari';
+import { getConfluencePageAri, getLocalIdFromConfluencePageAri, getPageIdAndTypeFromConfluencePageAri, resourceIdFromConfluencePageSourceIdAndLocalId } from '../../clients/confluence/ari';
 import { getContentProperty, createContentProperty, updateContentProperty, deleteContentProperty } from '../../clients/confluence/contentProperty';
 import { isBlogPageType } from '../../clients/confluence/utils';
 import { SyncBlockError } from '../../common/types';
@@ -108,19 +108,6 @@ class ConfluenceADFFetchProvider {
       };
     }
   }
-  retrieveSourceInfoFetchData(resourceId) {
-    const pageARI = getPageARIFromContentPropertyResourceId(resourceId);
-    let sourceLocalId;
-    try {
-      sourceLocalId = getLocalIdFromConfluencePageAri(resourceId);
-    } catch (error) {
-      // EDITOR-1921: log analytic here, safe to continue
-    }
-    return {
-      pageARI,
-      sourceLocalId
-    };
-  }
 }
 
 /**

package/dist/es2019/providers/syncBlockProvider.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { useMemo } from 'react';
 import { getPageIdAndTypeFromConfluencePageAri } from '../clients/confluence/ari';
-import { fetchConfluenceSourceInfo } from '../clients/confluence/sourceInfo';
+import { fetchConfluencePageInfo } from '../clients/confluence/sourceInfo';
 import { SyncBlockError } from '../common/types';
 import { SyncBlockDataProvider } from '../providers/types';
 export class SyncBlockProvider extends SyncBlockDataProvider {
@@ -131,34 +131,26 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
   }
 
   /**
-   * Retrieve the source info from the source id
+   * Fetch the source info from the source id
    *
-   * @param node
+   * @param params
+   * @param params.sourceAri - The source ARI
+   * @param params.sourceProduct - The source product. e.g. 'confluence-page', 'jira-work-item'
    *
    * @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;
-    let pageARI;
-    let sourceLocalId;
-    if (resourceId && typeof resourceId === 'string') {
-      try {
-        const fetchData = this.fetchProvider.retrieveSourceInfoFetchData(resourceId, this.sourceId);
-        pageARI = fetchData.pageARI;
-        sourceLocalId = fetchData.sourceLocalId;
-      } catch (error) {
-        return Promise.reject(error);
-      }
+  fetchSyncBlockSourceInfo(localId, sourceAri, sourceProduct) {
+    if (!sourceAri || !sourceProduct) {
+      return Promise.resolve(undefined);
+    }
+    switch (sourceProduct) {
+      case 'confluence-page':
+        return fetchConfluencePageInfo(sourceAri, localId);
+      case 'jira-work-item':
+        return Promise.reject(new Error('Jira work item source product not supported'));
+      default:
+        return Promise.reject(new Error(`${sourceProduct} source product not supported`));
     }
-
-    // TODO: EDITOR-3312 - based on the source sync block product,
-    // execute fetchConfluenceSourceInfo or fetchJiraItemSourceInfo or similar...
-    return pageARI ? fetchConfluenceSourceInfo(pageARI, sourceLocalId) : Promise.resolve(undefined);
   }
   generateResourceId(sourceId, localId) {
     return this.writeProvider.generateResourceId(sourceId, localId);
@@ -176,32 +168,26 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
   /**
    * Retrieve the parent info for the sync block
    *
-   * @param resourceId
-   * @param syncBlockInstance
+   * @param sourceAri - The source ARI
+   * @param sourceProduct - The source product. e.g. 'confluence-page', 'jira-work-item'
    *
    * @returns The parent info for the sync block
    */
-  retrieveSyncBlockParentInfo(syncBlockInstance) {
-    if (!syncBlockInstance || !syncBlockInstance.data) {
+  retrieveSyncBlockParentInfo(sourceAri, sourceProduct) {
+    if (!sourceAri || !sourceProduct) {
       return undefined;
     }
-    const {
-      sourceAri,
-      product
-    } = syncBlockInstance.data;
-    if (!sourceAri || !product) {
-      return undefined;
+    switch (sourceProduct) {
+      case 'confluence-page':
+        return {
+          contentId: getPageIdAndTypeFromConfluencePageAri(sourceAri).id,
+          contentProduct: sourceProduct
+        };
+      case 'jira-work-item':
+        throw new Error('Jira work item source product not supported');
+      default:
+        throw new Error(`${sourceProduct} source product not supported`);
     }
-
-    // TODO: EDITOR-3312 - based on the source sync block product,
-    // execute getPageIdAndTypeFromConfluencePageAri or getJiraItemIdAndTypeFromJiraItemAri or similar...
-    const {
-      id: contentId
-    } = getPageIdAndTypeFromConfluencePageAri(sourceAri);
-    return {
-      contentId,
-      contentProduct: product
-    };
   }
 }
 export const useMemoizedSyncedBlockProvider = (fetchProvider, writeProvider, sourceId, providerOptions) => {

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

@@ -45,34 +45,43 @@ export class ReferenceSyncBlockStoreManager {
       this.isRefreshingSubscriptions = false;
     }
   }
-  retrieveSyncBlockSourceInfo(resourceId) {
+  fetchSyncBlockSourceInfo(resourceId) {
+    var _existingSyncBlock$da, _existingSyncBlock$da2;
     if (!resourceId || !this.dataProvider) {
       return;
     }
+    if (this.syncBlockURLRequests.get(resourceId)) {
+      return;
+    }
+    this.syncBlockURLRequests.set(resourceId, true);
+    const existingSyncBlock = this.getFromCache(resourceId);
+    if (!existingSyncBlock) {
+      return;
+    }
 
-    // TODO: EDITOR-3312 - retrieve the source info based on the source sync block product
-
-    // if the sync block is a reference block, we need to fetch the URL to the source
-    // we could optimise this further by checking if the sync block is on the same page as the source
-    if (!this.syncBlockURLRequests.get(resourceId)) {
-      this.syncBlockURLRequests.set(resourceId, true);
-      this.dataProvider.retrieveSyncBlockSourceInfo(createSyncBlockNode('', resourceId)).then(sourceInfo => {
-        const existingSyncBlock = this.getFromCache(resourceId);
-        if (existingSyncBlock && existingSyncBlock.data) {
-          existingSyncBlock.data = {
-            ...existingSyncBlock.data,
-            sourceURL: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url,
-            sourceTitle: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.title
-          };
-          this.updateCache(existingSyncBlock);
-          if (sourceInfo !== null && sourceInfo !== void 0 && sourceInfo.title) {
-            this.updateSourceTitleSubscriptions(existingSyncBlock.resourceId, sourceInfo.title);
-          }
-        }
-      }).finally(() => {
-        this.syncBlockURLRequests.set(resourceId, false);
-      });
+    // skip if source URL and title are already present
+    if ((_existingSyncBlock$da = existingSyncBlock.data) !== null && _existingSyncBlock$da !== void 0 && _existingSyncBlock$da.sourceURL && (_existingSyncBlock$da2 = existingSyncBlock.data) !== null && _existingSyncBlock$da2 !== void 0 && _existingSyncBlock$da2.sourceTitle) {
+      return;
+    }
+    const {
+      sourceAri,
+      product,
+      blockInstanceId
+    } = existingSyncBlock.data || {};
+    if (!sourceAri || !product || !blockInstanceId) {
+      return;
     }
+    this.dataProvider.fetchSyncBlockSourceInfo(blockInstanceId, sourceAri, product).then(sourceInfo => {
+      if (!sourceInfo) {
+        return;
+      }
+      this.updateCacheWithSourceInfo(resourceId, sourceInfo);
+      if (sourceInfo.title) {
+        this.updateSourceTitleSubscriptions(resourceId, sourceInfo.title);
+      }
+    }).finally(() => {
+      this.syncBlockURLRequests.delete(resourceId);
+    });
   }
 
   /**
@@ -105,7 +114,6 @@ export class ReferenceSyncBlockStoreManager {
     }
     const resolvedData = [];
     data.forEach(syncBlockInstance => {
-      var _resolvedSyncBlockIns, _resolvedSyncBlockIns2;
       if (!syncBlockInstance.resourceId) {
         return;
       }
@@ -118,14 +126,22 @@ export class ReferenceSyncBlockStoreManager {
       const resolvedSyncBlockInstance = existingSyncBlock ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
       this.updateCache(resolvedSyncBlockInstance);
       resolvedData.push(resolvedSyncBlockInstance);
-
-      // fetch source URL and title if not already present
-      if ((!((_resolvedSyncBlockIns = resolvedSyncBlockInstance.data) !== null && _resolvedSyncBlockIns !== void 0 && _resolvedSyncBlockIns.sourceURL) || !((_resolvedSyncBlockIns2 = resolvedSyncBlockInstance.data) !== null && _resolvedSyncBlockIns2 !== void 0 && _resolvedSyncBlockIns2.sourceTitle)) && resolvedSyncBlockInstance.resourceId) {
-        this.retrieveSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
-      }
+      this.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
     });
     return [...resolvedData, ...blocksWithNotFoundError];
   }
+  updateCacheWithSourceInfo(resourceId, sourceInfo) {
+    const existingSyncBlock = this.getFromCache(resourceId);
+    if (existingSyncBlock && existingSyncBlock.data) {
+      existingSyncBlock.data.sourceURL = sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url;
+      existingSyncBlock.data = {
+        ...existingSyncBlock.data,
+        sourceURL: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url,
+        sourceTitle: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.title
+      };
+      this.updateCache(existingSyncBlock);
+    }
+  }
   updateCache(syncBlock) {
     const {
       resourceId
@@ -270,6 +286,7 @@ export class ReferenceSyncBlockStoreManager {
     return providerFactory;
   }
   retrieveDynamicProviders(resourceId, providerFactory, providerCreator) {
+    var _syncBlock$data2, _syncBlock$data3, _syncBlock$data4, _syncBlock$data5;
     if (!this.dataProvider) {
       return;
     }
@@ -278,7 +295,11 @@ export class ReferenceSyncBlockStoreManager {
     if (hasMediaProvider && hasEmojiProvider) {
       return;
     }
-    const parentInfo = this.dataProvider.retrieveSyncBlockParentInfo(this.syncBlockCache.get(resourceId));
+    const syncBlock = this.getFromCache(resourceId);
+    if (!syncBlock || !((_syncBlock$data2 = syncBlock.data) !== null && _syncBlock$data2 !== void 0 && _syncBlock$data2.sourceAri) || !((_syncBlock$data3 = syncBlock.data) !== null && _syncBlock$data3 !== void 0 && _syncBlock$data3.product)) {
+      return;
+    }
+    const parentInfo = this.dataProvider.retrieveSyncBlockParentInfo((_syncBlock$data4 = syncBlock.data) === null || _syncBlock$data4 === void 0 ? void 0 : _syncBlock$data4.sourceAri, (_syncBlock$data5 = syncBlock.data) === null || _syncBlock$data5 === void 0 ? void 0 : _syncBlock$data5.product);
     if (!parentInfo) {
       return;
     }

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

@@ -63,7 +63,7 @@ var getConfluenceSourceInfo = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-export var fetchConfluenceSourceInfo = /*#__PURE__*/function () {
+export var fetchConfluencePageInfo = /*#__PURE__*/function () {
   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) {
@@ -108,7 +108,7 @@ export var fetchConfluenceSourceInfo = /*#__PURE__*/function () {
       }
     }, _callee2, null, [[0, 15]]);
   }));
-  return function fetchConfluenceSourceInfo(_x2, _x3) {
+  return function fetchConfluencePageInfo(_x2, _x3) {
     return _ref2.apply(this, arguments);
   };
 }();

package/dist/esm/index.js

@@ -15,7 +15,7 @@ export { getConfluencePageAri, getLocalIdFromConfluencePageAri, getPageARIFromCo
 // providers
 export { useMemoizedBlockServiceAPIProviders } from './providers/block-service/blockServiceAPI';
 export { createContentAPIProvidersWithDefaultKey, useMemoizedContentAPIProviders } from './providers/confluence/confluenceContentAPI';
-export { fetchConfluenceSourceInfo } from './clients/confluence/sourceInfo';
+export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
 export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
 // store managers
 export { ReferenceSyncBlockStoreManager } from './store-manager/referenceSyncBlockStoreManager';