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

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.10.3
+
+### Patch Changes
+
+- [`964b980644f9d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/964b980644f9d) -
+  EDITOR-3348 Refactor Synced Block Store Manager
+- [`caa54ec7bac4c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/caa54ec7bac4c) -
+  EDITOR-3312 Refactor and restructure synced block provider
+
 ## 2.10.2
 
 ### Patch Changes

package/dist/cjs/{providers → clients}/block-service/ari.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLocalIdFromResourceId = exports.blockResourceIdFromSourceAndLocalId = void 0;
+exports.getLocalIdFromBlockResourceId = exports.blockResourceIdFromSourceAndLocalId = void 0;
 /* eslint-disable require-unicode-regexp */
 /**
  * Generates a unique block ARI from a source ARI and a local ID.
@@ -25,7 +25,7 @@ var blockResourceIdFromSourceAndLocalId = exports.blockResourceIdFromSourceAndLo
  * @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 getLocalIdFromBlockResourceId = exports.getLocalIdFromBlockResourceId = function getLocalIdFromBlockResourceId(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];

package/dist/cjs/{utils → clients/confluence}/ari.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resourceIdFromSourceAndLocalId = exports.getPageIdAndTypeFromAri = exports.getPageARIFromResourceId = exports.getLocalIdFromAri = exports.getConfluencePageAri = void 0;
+exports.resourceIdFromConfluencePageSourceIdAndLocalId = exports.getPageIdAndTypeFromConfluencePageAri = exports.getPageARIFromContentPropertyResourceId = exports.getLocalIdFromConfluencePageAri = exports.getConfluencePageAri = void 0;
 /* eslint-disable require-unicode-regexp  */
 
 var getConfluencePageAri = exports.getConfluencePageAri = function getConfluencePageAri(pageId, cloudId) {
@@ -12,7 +12,7 @@ var getConfluencePageAri = exports.getConfluencePageAri = function getConfluence
 };
 
 // For extracting from Page ARI and also the content property's version of resourceId
-var getPageIdAndTypeFromAri = exports.getPageIdAndTypeFromAri = function getPageIdAndTypeFromAri(ari) {
+var getPageIdAndTypeFromConfluencePageAri = exports.getPageIdAndTypeFromConfluencePageAri = function getPageIdAndTypeFromConfluencePageAri(ari) {
   var match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/);
   if (match !== null && match !== void 0 && match[2]) {
     return {
@@ -22,20 +22,20 @@ var getPageIdAndTypeFromAri = exports.getPageIdAndTypeFromAri = function getPage
   }
   throw new Error("Invalid page ARI: ".concat(ari));
 };
-var getLocalIdFromAri = exports.getLocalIdFromAri = function getLocalIdFromAri(ari) {
+var getLocalIdFromConfluencePageAri = exports.getLocalIdFromConfluencePageAri = function getLocalIdFromConfluencePageAri(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));
 };
-var getPageARIFromResourceId = exports.getPageARIFromResourceId = function getPageARIFromResourceId(resourceId) {
+var getPageARIFromContentPropertyResourceId = exports.getPageARIFromContentPropertyResourceId = function getPageARIFromContentPropertyResourceId(resourceId) {
   var 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: ".concat(resourceId));
 };
-var resourceIdFromSourceAndLocalId = exports.resourceIdFromSourceAndLocalId = function resourceIdFromSourceAndLocalId(sourceId, localId) {
+var resourceIdFromConfluencePageSourceIdAndLocalId = exports.resourceIdFromConfluencePageSourceIdAndLocalId = function resourceIdFromConfluencePageSourceIdAndLocalId(sourceId, localId) {
   return sourceId + '/' + localId;
 };

package/dist/cjs/{utils → clients/confluence}/sourceInfo.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.fetchSourceInfo = void 0;
+exports.fetchConfluenceSourceInfo = 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"));
@@ -27,7 +27,7 @@ var GET_SOURCE_INFO_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_SOURCE_INFO';
  * @returns subType live if livePage, subType null if classic page
  */
 var GET_SOURCE_INFO_QUERY = "query ".concat(GET_SOURCE_INFO_OPERATION_NAME, " ($id: ID!) {\n\tcontent (id: $id) {\n\t\tnodes {\n\t\t\tid\n\t\t\tlinks {\n\t\t\t\tbase\n\t\t\t}\n\t\t\tspace {\n\t\t\t\tkey\n\t\t\t}\n\t\t\tsubType\n\t\t\ttitle\n\t\t}\n\t}\n}");
-var getSourceInfo = /*#__PURE__*/function () {
+var getConfluenceSourceInfo = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(ari) {
     var bodyData, response;
     return _regenerator.default.wrap(function _callee$(_context) {
@@ -64,20 +64,20 @@ var getSourceInfo = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function getSourceInfo(_x) {
+  return function getConfluenceSourceInfo(_x) {
     return _ref.apply(this, arguments);
   };
 }();
-var fetchSourceInfo = exports.fetchSourceInfo = /*#__PURE__*/function () {
+var fetchConfluenceSourceInfo = exports.fetchConfluenceSourceInfo = /*#__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) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.prev = 0;
-          _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromAri)(pageAri), pageType = _getPageIdAndTypeFrom.type;
+          _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(pageAri), pageType = _getPageIdAndTypeFrom.type;
           _context2.next = 4;
-          return getSourceInfo(pageAri);
+          return getConfluenceSourceInfo(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];
@@ -113,7 +113,7 @@ var fetchSourceInfo = exports.fetchSourceInfo = /*#__PURE__*/function () {
       }
     }, _callee2, null, [[0, 15]]);
   }));
-  return function fetchSourceInfo(_x2, _x3) {
+  return function fetchConfluenceSourceInfo(_x2, _x3) {
     return _ref2.apply(this, arguments);
   };
 }();

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

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isBlogPageType = void 0;
+var isBlogPageType = exports.isBlogPageType = function isBlogPageType(pageType) {
+  return pageType === 'blogpost';
+};

package/dist/cjs/hooks/useFetchSyncBlockData.js

@@ -20,7 +20,6 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     isLoading = _useState4[0],
     setIsLoading = _useState4[1];
-  var referenceSyncBlockStoreManager = manager.getReferenceSyncBlockStoreManager();
   var reloadData = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
     var syncBlockNode;
     return _regenerator.default.wrap(function _callee$(_context) {
@@ -42,7 +41,7 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
           setIsLoading(true);
           _context.prev = 6;
           _context.next = 9;
-          return referenceSyncBlockStoreManager.fetchSyncBlocksData([syncBlockNode]);
+          return manager.referenceManager.fetchSyncBlocksData([syncBlockNode]);
         case 9:
           _context.next = 14;
           break;
@@ -61,19 +60,19 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
           return _context.stop();
       }
     }, _callee, null, [[6, 11]]);
-  })), [isLoading, localId, referenceSyncBlockStoreManager, resourceId]);
+  })), [isLoading, localId, manager.referenceManager, resourceId]);
   (0, _react.useEffect)(function () {
-    var unsubscribe = referenceSyncBlockStoreManager.subscribeToSyncBlock(resourceId || '', localId || '', function (data) {
+    var unsubscribe = manager.referenceManager.subscribeToSyncBlock(resourceId || '', localId || '', function (data) {
       setSyncBlockInstance(data);
       setIsLoading(false);
     });
     return function () {
       unsubscribe();
     };
-  }, [localId, referenceSyncBlockStoreManager, resourceId]);
+  }, [localId, manager.referenceManager, resourceId]);
   return {
     isLoading: isLoading,
-    providerFactory: referenceSyncBlockStoreManager.getProviderFactory(resourceId || ''),
+    providerFactory: manager.referenceManager.getProviderFactory(resourceId || ''),
     reloadData: reloadData,
     syncBlockInstance: syncBlockInstance
   };

package/dist/cjs/hooks/useFetchSyncBlockTitle.js

@@ -13,7 +13,7 @@ var useFetchSyncBlockTitle = exports.useFetchSyncBlockTitle = function useFetchS
     sourceTitle = _useState2[0],
     setSourceTitle = _useState2[1];
   (0, _react.useEffect)(function () {
-    var unsubscribe = manager.subscribeToSyncBlockSourceTitle(syncBlockNode, function (title) {
+    var unsubscribe = manager.referenceManager.subscribeToSourceTitle(syncBlockNode, function (title) {
       setSourceTitle(title);
     });
     return function () {

package/dist/cjs/hooks/useHandleContentChanges.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var useHandleContentChanges = exports.useHandleContentChanges = function useHandleContentChanges(manager, syncBlockNode) {
   (0, _react.useEffect)(function () {
     try {
-      manager.updateSyncBlockData(syncBlockNode);
+      manager.sourceManager.updateSyncBlockData(syncBlockNode);
     } catch (_unused) {
       //TODO: EDITOR-1921 - add error analytics
     }

package/dist/cjs/index.js

@@ -33,6 +33,12 @@ Object.defineProperty(exports, "blockResourceIdFromSourceAndLocalId", {
     return _ari.blockResourceIdFromSourceAndLocalId;
   }
 });
+Object.defineProperty(exports, "convertPMNodesToSyncBlockNodes", {
+  enumerable: true,
+  get: function get() {
+    return _utils.convertPMNodesToSyncBlockNodes;
+  }
+});
 Object.defineProperty(exports, "convertSyncBlockJSONNodeToSyncBlockNode", {
   enumerable: true,
   get: function get() {
@@ -57,34 +63,40 @@ Object.defineProperty(exports, "createSyncBlockNode", {
     return _utils.createSyncBlockNode;
   }
 });
+Object.defineProperty(exports, "fetchConfluenceSourceInfo", {
+  enumerable: true,
+  get: function get() {
+    return _sourceInfo.fetchConfluenceSourceInfo;
+  }
+});
 Object.defineProperty(exports, "getConfluencePageAri", {
   enumerable: true,
   get: function get() {
     return _ari2.getConfluencePageAri;
   }
 });
-Object.defineProperty(exports, "getLocalIdFromAri", {
+Object.defineProperty(exports, "getLocalIdFromBlockResourceId", {
   enumerable: true,
   get: function get() {
-    return _ari2.getLocalIdFromAri;
+    return _ari.getLocalIdFromBlockResourceId;
   }
 });
-Object.defineProperty(exports, "getLocalIdFromResourceId", {
+Object.defineProperty(exports, "getLocalIdFromConfluencePageAri", {
   enumerable: true,
   get: function get() {
-    return _ari.getLocalIdFromResourceId;
+    return _ari2.getLocalIdFromConfluencePageAri;
   }
 });
-Object.defineProperty(exports, "getPageARIFromResourceId", {
+Object.defineProperty(exports, "getPageARIFromContentPropertyResourceId", {
   enumerable: true,
   get: function get() {
-    return _ari2.getPageARIFromResourceId;
+    return _ari2.getPageARIFromContentPropertyResourceId;
   }
 });
-Object.defineProperty(exports, "getPageIdAndTypeFromAri", {
+Object.defineProperty(exports, "getPageIdAndTypeFromConfluencePageAri", {
   enumerable: true,
   get: function get() {
-    return _ari2.getPageIdAndTypeFromAri;
+    return _ari2.getPageIdAndTypeFromConfluencePageAri;
   }
 });
 Object.defineProperty(exports, "rebaseTransaction", {
@@ -99,10 +111,10 @@ Object.defineProperty(exports, "resolveSyncBlockInstance", {
     return _resolveSyncBlockInstance.resolveSyncBlockInstance;
   }
 });
-Object.defineProperty(exports, "resourceIdFromSourceAndLocalId", {
+Object.defineProperty(exports, "resourceIdFromConfluencePageSourceIdAndLocalId", {
   enumerable: true,
   get: function get() {
-    return _ari2.resourceIdFromSourceAndLocalId;
+    return _ari2.resourceIdFromConfluencePageSourceIdAndLocalId;
   }
 });
 Object.defineProperty(exports, "useFetchSyncBlockData", {
@@ -146,12 +158,13 @@ var _types = require("./common/types");
 var _useFetchSyncBlockData = require("./hooks/useFetchSyncBlockData");
 var _useFetchSyncBlockTitle = require("./hooks/useFetchSyncBlockTitle");
 var _useHandleContentChanges = require("./hooks/useHandleContentChanges");
-var _ari = require("./providers/block-service/ari");
+var _ari = require("./clients/block-service/ari");
+var _ari2 = require("./clients/confluence/ari");
 var _blockServiceAPI = require("./providers/block-service/blockServiceAPI");
 var _confluenceContentAPI = require("./providers/confluence/confluenceContentAPI");
+var _sourceInfo = require("./clients/confluence/sourceInfo");
 var _syncBlockProvider = require("./providers/syncBlockProvider");
 var _referenceSyncBlockStoreManager = require("./store-manager/referenceSyncBlockStoreManager");
 var _syncBlockStoreManager = require("./store-manager/syncBlockStoreManager");
-var _ari2 = require("./utils/ari");
-var _utils = require("./utils/utils");
-var _resolveSyncBlockInstance = require("./utils/resolveSyncBlockInstance");
+var _resolveSyncBlockInstance = require("./utils/resolveSyncBlockInstance");
+var _utils = require("./utils/utils");

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

@@ -10,10 +10,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _react = require("react");
+var _ari = require("../../clients/block-service/ari");
+var _blockService = require("../../clients/block-service/blockService");
 var _types = require("../../common/types");
-var _blockService = require("../../utils/blockService");
 var _errorHandling = require("../../utils/errorHandling");
-var _ari = require("./ari");
 var mapBlockError = function mapBlockError(error) {
   switch (error.status) {
     case 403:
@@ -41,7 +41,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              localId = (0, _ari.getLocalIdFromResourceId)(resourceId);
+              localId = (0, _ari.getLocalIdFromBlockResourceId)(resourceId);
               _context.prev = 1;
               _context.next = 4;
               return (0, _blockService.getSyncedBlockContent)({
@@ -101,7 +101,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
     value: function retrieveSourceInfoFetchData(resourceId, pageARI) {
       var sourceLocalId;
       try {
-        sourceLocalId = (0, _ari.getLocalIdFromResourceId)(resourceId);
+        sourceLocalId = (0, _ari.getLocalIdFromBlockResourceId)(resourceId);
       } catch (error) {
         // EDITOR-1921: log analytic here, safe to continue
       }

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

@@ -12,11 +12,11 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _react = require("react");
+var _ari = require("../../clients/confluence/ari");
+var _contentProperty3 = require("../../clients/confluence/contentProperty");
+var _utils = require("../../clients/confluence/utils");
 var _types = require("../../common/types");
-var _ari = require("../../utils/ari");
-var _contentProperty3 = require("../../utils/contentProperty");
 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; }
 /**
@@ -69,8 +69,8 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromAri)(resourceId), pageId = _getPageIdAndTypeFrom.id, pageType = _getPageIdAndTypeFrom.type;
-              localId = (0, _ari.getLocalIdFromAri)(resourceId);
+              _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(resourceId), pageId = _getPageIdAndTypeFrom.id, pageType = _getPageIdAndTypeFrom.type;
+              localId = (0, _ari.getLocalIdFromConfluencePageAri)(resourceId);
               _context.prev = 2;
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
               options = {
@@ -139,10 +139,10 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
   }, {
     key: "retrieveSourceInfoFetchData",
     value: function retrieveSourceInfoFetchData(resourceId) {
-      var pageARI = (0, _ari.getPageARIFromResourceId)(resourceId);
+      var pageARI = (0, _ari.getPageARIFromContentPropertyResourceId)(resourceId);
       var sourceLocalId;
       try {
-        sourceLocalId = (0, _ari.getLocalIdFromAri)(resourceId);
+        sourceLocalId = (0, _ari.getLocalIdFromConfluencePageAri)(resourceId);
       } catch (error) {
         // EDITOR-1921: log analytic here, safe to continue
       }
@@ -225,7 +225,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
             case 0:
               resourceId = data.resourceId;
               _context3.prev = 1;
-              match = (0, _ari.getPageIdAndTypeFromAri)(data.resourceId);
+              match = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(data.resourceId);
               _context3.next = 8;
               break;
             case 5:
@@ -238,7 +238,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
               _match = match, pageId = _match.id, pageType = _match.type;
               _context3.prev = 9;
               // Update existing content property
-              localId = (0, _ari.getLocalIdFromAri)(resourceId);
+              localId = (0, _ari.getLocalIdFromConfluencePageAri)(resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
               sourceAri = (0, _ari.getConfluencePageAri)(pageId, this.config.cloudId, pageType);
               syncBlockDataWithSourceDocumentAri = _objectSpread(_objectSpread({}, data), {}, {
@@ -311,7 +311,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _context4.prev = 0;
-              match = (0, _ari.getPageIdAndTypeFromAri)(resourceId);
+              match = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(resourceId);
               _context4.next = 7;
               break;
             case 4:
@@ -325,7 +325,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
             case 7:
               _match2 = match, pageId = _match2.id, pageType = _match2.type;
               _context4.prev = 8;
-              localId = (0, _ari.getLocalIdFromAri)(resourceId);
+              localId = (0, _ari.getLocalIdFromConfluencePageAri)(resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
               options = {
                 pageId: pageId,
@@ -368,7 +368,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
   }, {
     key: "generateResourceId",
     value: function generateResourceId(sourceId, localId) {
-      return (0, _ari.resourceIdFromSourceAndLocalId)(sourceId, localId);
+      return (0, _ari.resourceIdFromConfluencePageSourceIdAndLocalId)(sourceId, localId);
     }
   }]);
 }();

package/dist/cjs/providers/syncBlockProvider.js

@@ -15,10 +15,10 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 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 _ari = require("../utils/ari");
-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) {
@@ -233,7 +233,10 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
           return Promise.reject(error);
         }
       }
-      return pageARI ? (0, _sourceInfo.fetchSourceInfo)(pageARI, sourceLocalId) : Promise.resolve(undefined);
+
+      // 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",
@@ -268,16 +271,18 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
       }
       var _syncBlockInstance$da = syncBlockInstance.data,
         sourceAri = _syncBlockInstance$da.sourceAri,
-        resourceId = _syncBlockInstance$da.resourceId,
-        contentProduct = _syncBlockInstance$da.product;
+        product = _syncBlockInstance$da.product;
+      if (!sourceAri || !product) {
+        return undefined;
+      }
 
-      // Temp solution to get the pageId from resource since the sourceDocumentAri is not available for older sync blocks
-      var pageARI = sourceAri || resourceId;
-      var _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromAri)(pageARI),
+      // 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: contentProduct || 'confluence-page'
+        contentProduct: product
       };
     }
   }]);

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

@@ -20,6 +20,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+// A store manager responsible for the lifecycle and state management of reference sync blocks in an editor instance.
+// Designed to manage local in-memory state and synchronize with an external data provider.
+// Supports fetch, cache, and subscription for sync block data.
+// Handles fetching source URL and title for sync blocks.
+// Can be used in both editor and renderer contexts.
 var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
   function ReferenceSyncBlockStoreManager(dataProvider) {
     (0, _classCallCheck2.default)(this, ReferenceSyncBlockStoreManager);
@@ -123,6 +128,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         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)) {
@@ -144,21 +151,33 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         });
       }
     }
+
+    /**
+     * Fetch sync block data for a given array of sync block nodes.
+     * @param syncBlockNodes - The array of sync block nodes to fetch data for
+     * @returns The fetched sync block data results
+     */
   }, {
     key: "fetchSyncBlocksData",
-    value: function () {
+    value: (function () {
       var _fetchSyncBlocksData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(syncBlockNodes) {
         var _this2 = this;
         var nodesToFetch, blocksWithNotFoundError, data, resolvedData;
         return _regenerator.default.wrap(function _callee2$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              if (this.dataProvider) {
+              if (!(syncBlockNodes.length === 0)) {
                 _context3.next = 2;
                 break;
               }
-              throw new Error('Data provider not set');
+              return _context3.abrupt("return", Promise.resolve([]));
             case 2:
+              if (this.dataProvider) {
+                _context3.next = 4;
+                break;
+              }
+              throw new Error('Data provider not set');
+            case 4:
               // Don't fetch for not_found error since the source is already deleted
               nodesToFetch = [], blocksWithNotFoundError = [];
               syncBlockNodes.forEach(function (node) {
@@ -169,16 +188,16 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                   nodesToFetch.push(node);
                 }
               });
-              _context3.next = 6;
+              _context3.next = 8;
               return this.dataProvider.fetchNodesData(nodesToFetch);
-            case 6:
+            case 8:
               data = _context3.sent;
               if (data) {
-                _context3.next = 9;
+                _context3.next = 11;
                 break;
               }
               throw new Error('Failed to fetch sync block node data');
-            case 9:
+            case 11:
               resolvedData = [];
               data.forEach(function (syncBlockInstance) {
                 var _resolvedSyncBlockIns, _resolvedSyncBlockIns2;
@@ -201,7 +220,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                 }
               });
               return _context3.abrupt("return", [].concat(resolvedData, blocksWithNotFoundError));
-            case 12:
+            case 14:
             case "end":
               return _context3.stop();
           }
@@ -211,7 +230,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
         return _fetchSyncBlocksData.apply(this, arguments);
       }
       return fetchSyncBlocksData;
-    }()
+    }())
   }, {
     key: "updateCache",
     value: function updateCache(syncBlock) {
@@ -407,10 +426,17 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
   }, {
     key: "destroy",
     value: function destroy() {
+      this.dataProvider = undefined;
       this.syncBlockCache.clear();
       this.subscriptions.clear();
+      this.titleSubscriptions.clear();
       this.syncBlockURLRequests.clear();
       this.providerFactories.clear();
+      this.isRefreshingSubscriptions = false;
+      this.providerFactories.forEach(function (providerFactory) {
+        providerFactory.destroy();
+      });
+      this.providerFactories.clear();
     }
   }]);
 }();