@atlaskit/editor-synced-block-provider 2.6.0 → 2.7.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.7.1
+
+### Patch Changes
+
+- [`23f6c637ea176`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/23f6c637ea176) -
+  [ux] EDITOR-2629 redirect to source edit page instead of view page on edit source url click in
+  sync block
+
+## 2.7.0
+
+### Minor Changes
+
+- [`5b03ddd528034`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5b03ddd528034) -
+  [EDITOR-2542] Save new bodiedSyncBlock to backend when creating the node, so that the node can be
+  copied and reference without page being published/updated
+
 ## 2.6.0
 
 ### Minor Changes

package/dist/cjs/hooks/useFetchSyncBlockData.js

@@ -10,7 +10,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _types = require("../common/types");
-var _createSyncBlock = require("../utils/createSyncBlock");
+var _utils = require("../utils/utils");
 var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyncBlockData(manager, resourceId, localId) {
   var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -32,7 +32,7 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
           }
           return _context.abrupt("return");
         case 2:
-          syncBlockNode = resourceId && localId ? (0, _createSyncBlock.createSyncBlockNode)(localId, resourceId) : null;
+          syncBlockNode = resourceId && localId ? (0, _utils.createSyncBlockNode)(localId, resourceId) : null;
           if (syncBlockNode) {
             _context.next = 5;
             break;

package/dist/cjs/index.js

@@ -27,6 +27,12 @@ Object.defineProperty(exports, "SyncedBlockProvider", {
     return _syncBlockProvider.SyncBlockProvider;
   }
 });
+Object.defineProperty(exports, "convertSyncBlockJSONNodeToSyncBlockNode", {
+  enumerable: true,
+  get: function get() {
+    return _utils.convertSyncBlockJSONNodeToSyncBlockNode;
+  }
+});
 Object.defineProperty(exports, "convertSyncBlockPMNodeToSyncBlockData", {
   enumerable: true,
   get: function get() {
@@ -42,7 +48,7 @@ Object.defineProperty(exports, "createContentAPIProvidersWithDefaultKey", {
 Object.defineProperty(exports, "createSyncBlockNode", {
   enumerable: true,
   get: function get() {
-    return _createSyncBlock.createSyncBlockNode;
+    return _utils.createSyncBlockNode;
   }
 });
 Object.defineProperty(exports, "getConfluencePageAri", {
@@ -116,6 +122,5 @@ var _syncBlockProvider = require("./providers/syncBlockProvider");
 var _referenceSyncBlockStoreManager = require("./store-manager/referenceSyncBlockStoreManager");
 var _syncBlockStoreManager = require("./store-manager/syncBlockStoreManager");
 var _ari = require("./utils/ari");
-var _createSyncBlock = require("./utils/createSyncBlock");
-var _resolveSyncBlockInstance = require("./utils/resolveSyncBlockInstance");
-var _utils = require("./utils/utils");
+var _utils = require("./utils/utils");
+var _resolveSyncBlockInstance = require("./utils/resolveSyncBlockInstance");

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

@@ -14,7 +14,8 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _react = require("react");
 var _types = require("../../common/types");
 var _ari = require("../../utils/ari");
-var _contentProperty4 = require("../../utils/contentProperty");
+var _contentProperty3 = require("../../utils/contentProperty");
+var _errorHandling = require("../../utils/errorHandling");
 var _utils = require("../../utils/utils");
 /**
  * Configuration for Content API providers
@@ -81,7 +82,7 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
                 break;
               }
               _context.next = 8;
-              return (0, _contentProperty4.getContentProperty)(options);
+              return (0, _contentProperty3.getContentProperty)(options);
             case 8:
               contentProperty = _context.sent;
               value = (_contentProperty$data = contentProperty.data.confluence.blogPost) === null || _contentProperty$data === void 0 || (_contentProperty$data = _contentProperty$data.properties) === null || _contentProperty$data === void 0 || (_contentProperty$data = _contentProperty$data[0]) === null || _contentProperty$data === void 0 ? void 0 : _contentProperty$data.value;
@@ -90,7 +91,7 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
               break;
             case 13:
               _context.next = 15;
-              return (0, _contentProperty4.getContentProperty)(options);
+              return (0, _contentProperty3.getContentProperty)(options);
             case 15:
               _contentProperty = _context.sent;
               value = (_contentProperty$data2 = _contentProperty.data.confluence.page) === null || _contentProperty$data2 === void 0 || (_contentProperty$data2 = _contentProperty$data2.properties) === null || _contentProperty$data2 === void 0 || (_contentProperty$data2 = _contentProperty$data2[0]) === null || _contentProperty$data2 === void 0 ? void 0 : _contentProperty$data2.value;
@@ -160,7 +161,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
                 break;
               }
               _context2.next = 4;
-              return (0, _contentProperty4.createContentProperty)(options);
+              return (0, _contentProperty3.createContentProperty)(options);
             case 4:
               contentProperty = _context2.sent;
               if (!(((_contentProperty$data3 = contentProperty.data.confluence.createBlogPostProperty.blogPostProperty) === null || _contentProperty$data3 === void 0 ? void 0 : _contentProperty$data3.key) === key)) {
@@ -169,13 +170,13 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
               }
               return _context2.abrupt("return", key);
             case 9:
-              throw new Error('Failed to create blog post content property');
+              return _context2.abrupt("return", Promise.reject('Failed to create blog post content property'));
             case 10:
               _context2.next = 20;
               break;
             case 12:
               _context2.next = 14;
-              return (0, _contentProperty4.createContentProperty)(options);
+              return (0, _contentProperty3.createContentProperty)(options);
             case 14:
               _contentProperty2 = _context2.sent;
               if (!(((_contentProperty2$dat = _contentProperty2.data.confluence.createPageProperty.pageProperty) === null || _contentProperty2$dat === void 0 ? void 0 : _contentProperty2$dat.key) === key)) {
@@ -184,7 +185,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
               }
               return _context2.abrupt("return", key);
             case 19:
-              throw new Error('Failed to create page content property');
+              return _context2.abrupt("return", Promise.reject('Failed to create page content property'));
             case 20:
             case "end":
               return _context2.stop();
@@ -201,17 +202,26 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
     key: "writeData",
     value: function () {
       var _writeData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(data) {
-        var _getPageIdAndTypeFrom2, pageId, pageType, localId, key, options, _contentProperty$data4, contentProperty, _contentProperty3$dat, _contentProperty3, _key;
+        var match, resourceId, _match, pageId, pageType, localId, key, options, updatePayload, updateResult;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _getPageIdAndTypeFrom2 = (0, _ari.getPageIdAndTypeFromAri)(data.resourceId), pageId = _getPageIdAndTypeFrom2.id, pageType = _getPageIdAndTypeFrom2.type;
-              if (!data.resourceId) {
-                _context3.next = 34;
-                break;
-              }
+              resourceId = data.resourceId;
+              _context3.prev = 1;
+              match = (0, _ari.getPageIdAndTypeFromAri)(data.resourceId);
+              _context3.next = 8;
+              break;
+            case 5:
+              _context3.prev = 5;
+              _context3.t0 = _context3["catch"](1);
+              return _context3.abrupt("return", {
+                error: (0, _errorHandling.stringifyError)(_context3.t0)
+              });
+            case 8:
+              _match = match, pageId = _match.id, pageType = _match.type;
+              _context3.prev = 9;
               // Update existing content property
-              localId = (0, _ari.getLocalIdFromAri)(data.resourceId);
+              localId = (0, _ari.getLocalIdFromAri)(resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
               options = {
                 pageId: pageId,
@@ -220,60 +230,50 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
                 cloudId: this.config.cloudId,
                 pageType: pageType
               };
-              if (!(0, _utils.isBlogPageType)(pageType)) {
-                _context3.next = 20;
-                break;
-              }
-              _context3.next = 8;
-              return (0, _contentProperty4.updateContentProperty)(options);
-            case 8:
-              contentProperty = _context3.sent;
-              if (!(((_contentProperty$data4 = contentProperty.data.confluence.updateValueBlogPostProperty.blogPostProperty) === null || _contentProperty$data4 === void 0 ? void 0 : _contentProperty$data4.key) === key)) {
-                _context3.next = 13;
+              _context3.next = 15;
+              return (0, _contentProperty3.updateContentProperty)(options);
+            case 15:
+              updatePayload = _context3.sent;
+              updateResult = (0, _utils.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;
                 break;
               }
-              return _context3.abrupt("return", key);
-            case 13:
-              if (!(contentProperty.data.confluence.updateValueBlogPostProperty.blogPostProperty === null)) {
-                _context3.next = 17;
+              return _context3.abrupt("return", {
+                resourceId: resourceId
+              });
+            case 21:
+              if (updateResult) {
+                _context3.next = 25;
                 break;
               }
-              return _context3.abrupt("return", this.createNewContentProperty(pageId, key, data, pageType));
-            case 17:
-              throw new Error('Failed to update blog post content property');
-            case 18:
-              _context3.next = 32;
+              return _context3.abrupt("return", this.createNewContentProperty(pageId, key, data, pageType).then(function () {
+                return {
+                  resourceId: resourceId
+                };
+              }, function (error) {
+                return {
+                  error: error
+                };
+              }));
+            case 25:
+              return _context3.abrupt("return", {
+                error: "Failed to update ".concat(pageType, " content property")
+              });
+            case 26:
+              _context3.next = 31;
               break;
-            case 20:
-              _context3.next = 22;
-              return (0, _contentProperty4.updateContentProperty)(options);
-            case 22:
-              _contentProperty3 = _context3.sent;
-              if (!(((_contentProperty3$dat = _contentProperty3.data.confluence.updateValuePageProperty.pageProperty) === null || _contentProperty3$dat === void 0 ? void 0 : _contentProperty3$dat.key) === key)) {
-                _context3.next = 27;
-                break;
-              }
-              return _context3.abrupt("return", key);
-            case 27:
-              if (!(_contentProperty3.data.confluence.updateValuePageProperty.pageProperty === null)) {
-                _context3.next = 31;
-                break;
-              }
-              return _context3.abrupt("return", this.createNewContentProperty(pageId, key, data, pageType));
+            case 28:
+              _context3.prev = 28;
+              _context3.t1 = _context3["catch"](9);
+              return _context3.abrupt("return", {
+                error: "Failed to write ".concat(pageType)
+              });
             case 31:
-              throw new Error('Failed to update content property');
-            case 32:
-              _context3.next = 36;
-              break;
-            case 34:
-              // Create new content property
-              _key = getContentPropertyKey(this.config.contentPropertyKey, data.blockInstanceId);
-              return _context3.abrupt("return", this.createNewContentProperty(pageId, _key, data, pageType));
-            case 36:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this);
+        }, _callee3, this, [[1, 5], [9, 28]]);
       }));
       function writeData(_x6) {
         return _writeData.apply(this, arguments);
@@ -284,11 +284,25 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
     key: "deleteData",
     value: function () {
       var _deleteData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(resourceId) {
-        var _getPageIdAndTypeFrom3, pageId, pageType, localId, key, options, deletePayload, deleteResult;
+        var deletePayload, deleteResult, match, _match2, pageId, pageType, localId, key, options, _stringifyError;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              _getPageIdAndTypeFrom3 = (0, _ari.getPageIdAndTypeFromAri)(resourceId), pageId = _getPageIdAndTypeFrom3.id, pageType = _getPageIdAndTypeFrom3.type;
+              _context4.prev = 0;
+              match = (0, _ari.getPageIdAndTypeFromAri)(resourceId);
+              _context4.next = 7;
+              break;
+            case 4:
+              _context4.prev = 4;
+              _context4.t0 = _context4["catch"](0);
+              return _context4.abrupt("return", {
+                resourceId: resourceId,
+                success: false,
+                error: (0, _errorHandling.stringifyError)(_context4.t0)
+              });
+            case 7:
+              _match2 = match, pageId = _match2.id, pageType = _match2.type;
+              _context4.prev = 8;
               localId = (0, _ari.getLocalIdFromAri)(resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
               options = {
@@ -297,33 +311,32 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
                 cloudId: this.config.cloudId,
                 pageType: pageType
               };
-              _context4.prev = 4;
-              _context4.next = 7;
-              return (0, _contentProperty4.deleteContentProperty)(options);
-            case 7:
+              _context4.next = 14;
+              return (0, _contentProperty3.deleteContentProperty)(options);
+            case 14:
               deletePayload = _context4.sent;
               deleteResult = (0, _utils.isBlogPageType)(pageType) ? deletePayload.data.confluence.deleteBlogPostProperty : deletePayload.data.confluence.deletePageProperty;
-              _context4.next = 14;
+              _context4.next = 21;
               break;
-            case 11:
-              _context4.prev = 11;
-              _context4.t0 = _context4["catch"](4);
+            case 18:
+              _context4.prev = 18;
+              _context4.t1 = _context4["catch"](8);
               return _context4.abrupt("return", {
                 resourceId: resourceId,
                 success: false,
-                error: "Fail to delete ".concat(pageType, " content property")
+                error: (_stringifyError = (0, _errorHandling.stringifyError)(_context4.t1)) !== null && _stringifyError !== void 0 ? _stringifyError : "Fail to delete ".concat(pageType, " content property")
               });
-            case 14:
+            case 21:
               return _context4.abrupt("return", {
                 resourceId: resourceId,
                 success: deleteResult.success,
                 error: deleteResult.errors.join()
               });
-            case 15:
+            case 22:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[4, 11]]);
+        }, _callee4, this, [[0, 4], [8, 18]]);
       }));
       function deleteData(_x7) {
         return _deleteData.apply(this, arguments);

package/dist/cjs/providers/syncBlockProvider.js

@@ -18,6 +18,7 @@ var _react = require("react");
 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) {
@@ -73,39 +74,63 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
      * @param nodes
      * @param data
      *
-     * @returns the resource ids of the nodes that were written
+     * @returns Array of {resourceId?: string, error?: string}.
+     * resourceId: resource id of the node if write successfully , error: reason for when write failed
      */
   }, {
     key: "writeNodesData",
-    value: function writeNodesData(nodes, data) {
-      var _this3 = this;
-      var resourceIds = [];
-      nodes.forEach(function (_node, index) {
-        if (!data[index].content) {
-          resourceIds.push(Promise.reject('No Synced Block content to write'));
-          return;
-        }
-        var resourceId = _this3.writeProvider.writeData(data[index]);
-        resourceIds.push(resourceId);
-      });
-      return Promise.all(resourceIds);
-    }
+    value: (function () {
+      var _writeNodesData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(nodes, data) {
+        var _this3 = this;
+        var results;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return Promise.allSettled(nodes.map(function (_node, index) {
+                if (!data[index].content) {
+                  return Promise.reject('No Synced Block content to write');
+                }
+                return _this3.writeProvider.writeData(data[index]);
+              }));
+            case 2:
+              results = _context.sent;
+              return _context.abrupt("return", results.map(function (result) {
+                if (result.status === 'fulfilled') {
+                  return result.value;
+                } else {
+                  return {
+                    error: result.reason
+                  };
+                }
+              }));
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function writeNodesData(_x, _x2) {
+        return _writeNodesData.apply(this, arguments);
+      }
+      return writeNodesData;
+    }())
   }, {
     key: "deleteNodesData",
     value: function () {
-      var _deleteNodesData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(resourceIds) {
+      var _deleteNodesData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(resourceIds) {
         var _this4 = this;
         var results;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context.next = 2;
+              _context2.next = 2;
               return Promise.allSettled(resourceIds.map(function (resourceId) {
                 return _this4.writeProvider.deleteData(resourceId);
               }));
             case 2:
-              results = _context.sent;
-              return _context.abrupt("return", results.map(function (result, index) {
+              results = _context2.sent;
+              return _context2.abrupt("return", results.map(function (result, index) {
                 if (result.status === 'fulfilled') {
                   return result.value;
                 } else {
@@ -118,11 +143,11 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
               }));
             case 4:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee);
+        }, _callee2);
       }));
-      function deleteNodesData(_x) {
+      function deleteNodesData(_x3) {
         return _deleteNodesData.apply(this, arguments);
       }
       return deleteNodesData;
@@ -133,8 +158,8 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
       return this.sourceId;
     }
   }, {
-    key: "retrieveSyncBlockSourceUrlAndTitle",
-    value: function retrieveSyncBlockSourceUrlAndTitle(node) {
+    key: "retrieveSyncBlockSourceInfo",
+    value: function retrieveSyncBlockSourceInfo(node) {
       var resourceId = node.attrs.resourceId;
       var pageARI;
       var sourceLocalId;
@@ -150,7 +175,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
           // EDITOR-1921: log analytic here, safe to continue
         }
       }
-      return pageARI ? fetchURLandTitlefromARI(pageARI, sourceLocalId) : Promise.resolve(undefined);
+      return pageARI ? (0, _sourceInfo.fetchSourceInfo)(pageARI, sourceLocalId) : Promise.resolve(undefined);
     }
   }]);
 }(_types2.SyncBlockDataProvider);
@@ -158,52 +183,4 @@ var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = fu
   return (0, _react.useMemo)(function () {
     return new SyncBlockProvider(fetchProvider, writeProvider, sourceId);
   }, [fetchProvider, writeProvider, sourceId]);
-};
-var fetchURLandTitlefromARI = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(ari, sourceLocalId) {
-    var response, _payload$data, _payload$data2, payload, url, title;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          _context2.next = 2;
-          return fetch('/gateway/api/object-resolver/resolve/ari', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-              Accept: 'application/json'
-            },
-            body: JSON.stringify({
-              ari: ari
-            })
-          });
-        case 2:
-          response = _context2.sent;
-          if (!response.ok) {
-            _context2.next = 12;
-            break;
-          }
-          _context2.next = 6;
-          return response.json();
-        case 6:
-          payload = _context2.sent;
-          url = payload === null || payload === void 0 || (_payload$data = payload.data) === null || _payload$data === void 0 ? void 0 : _payload$data.url;
-          title = payload === null || payload === void 0 || (_payload$data2 = payload.data) === null || _payload$data2 === void 0 ? void 0 : _payload$data2.name;
-          return _context2.abrupt("return", {
-            url: typeof url === 'string' ? sourceLocalId ? url + "?block=".concat(sourceLocalId) : url : undefined,
-            title: typeof title === 'string' ? title : undefined
-          });
-        case 12:
-          //eslint-disable-next-line no-console
-          console.error('Failed to fetch URL and title from ARI', response.statusText);
-        case 13:
-          return _context2.abrupt("return", undefined);
-        case 14:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return function fetchURLandTitlefromARI(_x2, _x3) {
-    return _ref.apply(this, arguments);
-  };
-}();
+};

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

@@ -11,8 +11,8 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _createSyncBlock = require("../utils/createSyncBlock");
 var _resolveSyncBlockInstance = require("../utils/resolveSyncBlockInstance");
+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; }
 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; } } }; }
@@ -58,7 +58,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                     case 0:
                       _step$value = (0, _slicedToArray2.default)(_step.value, 2), resourceId = _step$value[0], callbacks = _step$value[1];
                       Object.keys(callbacks).forEach(function (localId) {
-                        syncBlocks.push((0, _createSyncBlock.createSyncBlockNode)(localId, resourceId));
+                        syncBlocks.push((0, _utils.createSyncBlockNode)(localId, resourceId));
                       });
                     case 2:
                     case "end":
@@ -113,8 +113,8 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       return refreshSubscriptions;
     }())
   }, {
-    key: "fetchSyncBlockSourceURLAndTitle",
-    value: function fetchSyncBlockSourceURLAndTitle(resourceId) {
+    key: "retrieveSyncBlockSourceInfo",
+    value: function retrieveSyncBlockSourceInfo(resourceId) {
       var _this = this;
       if (!resourceId || !this.dataProvider) {
         return;
@@ -124,7 +124,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       // 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.retrieveSyncBlockSourceUrlAndTitle((0, _createSyncBlock.createSyncBlockNode)('', resourceId)).then(function (sourceInfo) {
+        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), {}, {
@@ -179,7 +179,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
 
                 // 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.fetchSyncBlockSourceURLAndTitle(resolvedSyncBlockInstance.resourceId);
+                  _this2.retrieveSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
                 }
               });
               return _context3.abrupt("return", resolvedData);
@@ -241,7 +241,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
       if (cachedData) {
         callback(cachedData);
       } else {
-        this.fetchSyncBlocksData([(0, _createSyncBlock.createSyncBlockNode)(localId, resourceId)]).catch(function () {});
+        this.fetchSyncBlocksData([(0, _utils.createSyncBlockNode)(localId, resourceId)]).catch(function () {});
       }
       return function () {
         var resourceSubscriptions = _this3.subscriptions.get(resourceId);