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

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @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

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) {
@@ -157,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;
@@ -174,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);
@@ -182,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 _callee3(ari, sourceLocalId) {
-    var response, _payload$data, _payload$data2, payload, url, title;
-    return _regenerator.default.wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          _context3.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 = _context3.sent;
-          if (!response.ok) {
-            _context3.next = 12;
-            break;
-          }
-          _context3.next = 6;
-          return response.json();
-        case 6:
-          payload = _context3.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 _context3.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 _context3.abrupt("return", undefined);
-        case 14:
-        case "end":
-          return _context3.stop();
-      }
-    }, _callee3);
-  }));
-  return function fetchURLandTitlefromARI(_x4, _x5) {
-    return _ref.apply(this, arguments);
-  };
-}();
+};

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

@@ -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, _utils.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);

package/dist/cjs/utils/sourceInfo.js

@@ -0,0 +1,119 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchSourceInfo = 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"));
+var _ari = require("./ari");
+var _utils = require("./utils");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /* eslint-disable require-unicode-regexp  */
+var COMMON_HEADERS = {
+  'Content-Type': 'application/json',
+  Accept: 'application/json'
+};
+var AGG_HEADERS = {
+  'X-ExperimentalApi': 'confluence-agg-beta'
+};
+var GRAPHQL_ENDPOINT = '/gateway/api/graphql';
+var GET_SOURCE_INFO_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_SOURCE_INFO';
+/**
+ * Query to get the page subtype by id (i.e. live or classic)
+ * @param documentARI
+ * @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 _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(ari) {
+    var bodyData, response;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          bodyData = {
+            query: GET_SOURCE_INFO_QUERY,
+            operationName: GET_SOURCE_INFO_OPERATION_NAME,
+            variables: {
+              id: ari
+            }
+          };
+          _context.next = 3;
+          return fetch(GRAPHQL_ENDPOINT, {
+            method: 'POST',
+            headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
+            body: JSON.stringify(bodyData)
+          });
+        case 3:
+          response = _context.sent;
+          if (response.ok) {
+            _context.next = 6;
+            break;
+          }
+          throw new Error("Failed to get url: ".concat(response.statusText));
+        case 6:
+          _context.next = 8;
+          return response.json();
+        case 8:
+          return _context.abrupt("return", _context.sent);
+        case 9:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getSourceInfo(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var fetchSourceInfo = exports.fetchSourceInfo = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(ari, 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)(ari), pageType = _getPageIdAndTypeFrom.type;
+          _context2.next = 4;
+          return getSourceInfo(ari);
+        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];
+          if (contentData) {
+            _context2.next = 8;
+            break;
+          }
+          throw new Error("Failed to get content data");
+        case 8:
+          title = contentData.title;
+          _ref3 = contentData.links || {}, base = _ref3.base;
+          if (base && (_contentData$space = contentData.space) !== null && _contentData$space !== void 0 && _contentData$space.key && contentData.id) {
+            if ((0, _utils.isBlogPageType)(pageType)) {
+              url = "".concat(base, "/spaces/").concat(contentData.space.key, "/blog/edit-v2/").concat(contentData.id);
+            } else if (contentData.subType === 'live') {
+              url = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages/").concat(contentData.id);
+            } else {
+              url = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages/edit-v2/").concat(contentData.id);
+            }
+          }
+          url = url && localId ? "".concat(url, "#block-").concat(localId) : url;
+          return _context2.abrupt("return", Promise.resolve({
+            title: title,
+            url: url
+          }));
+        case 15:
+          _context2.prev = 15;
+          _context2.t0 = _context2["catch"](0);
+          return _context2.abrupt("return", Promise.resolve(undefined));
+        case 18:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 15]]);
+  }));
+  return function fetchSourceInfo(_x2, _x3) {
+    return _ref2.apply(this, arguments);
+  };
+}();

package/dist/es2019/providers/syncBlockProvider.js

@@ -3,6 +3,7 @@ import { useMemo } from 'react';
 import { SyncBlockError } from '../common/types';
 import { SyncBlockDataProvider } from '../providers/types';
 import { getLocalIdFromAri, getPageARIFromResourceId } from '../utils/ari';
+import { fetchSourceInfo } from '../utils/sourceInfo';
 export class SyncBlockProvider extends SyncBlockDataProvider {
   constructor(fetchProvider, writeProvider, sourceId) {
     super();
@@ -78,7 +79,7 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
   getSourceId() {
     return this.sourceId;
   }
-  retrieveSyncBlockSourceUrlAndTitle(node) {
+  retrieveSyncBlockSourceInfo(node) {
     const {
       resourceId
     } = node.attrs;
@@ -96,37 +97,11 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
         // EDITOR-1921: log analytic here, safe to continue
       }
     }
-    return pageARI ? fetchURLandTitlefromARI(pageARI, sourceLocalId) : Promise.resolve(undefined);
+    return pageARI ? fetchSourceInfo(pageARI, sourceLocalId) : Promise.resolve(undefined);
   }
 }
 export const useMemoizedSyncedBlockProvider = (fetchProvider, writeProvider, sourceId) => {
   return useMemo(() => {
     return new SyncBlockProvider(fetchProvider, writeProvider, sourceId);
   }, [fetchProvider, writeProvider, sourceId]);
-};
-const fetchURLandTitlefromARI = async (ari, sourceLocalId) => {
-  const response = await fetch('/gateway/api/object-resolver/resolve/ari', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      Accept: 'application/json'
-    },
-    body: JSON.stringify({
-      ari
-    })
-  });
-  if (response.ok) {
-    var _payload$data, _payload$data2;
-    const payload = await response.json();
-    const url = payload === null || payload === void 0 ? void 0 : (_payload$data = payload.data) === null || _payload$data === void 0 ? void 0 : _payload$data.url;
-    const title = payload === null || payload === void 0 ? void 0 : (_payload$data2 = payload.data) === null || _payload$data2 === void 0 ? void 0 : _payload$data2.name;
-    return {
-      url: typeof url === 'string' ? sourceLocalId ? url + `?block=${sourceLocalId}` : url : undefined,
-      title: typeof title === 'string' ? title : undefined
-    };
-  } else {
-    //eslint-disable-next-line no-console
-    console.error('Failed to fetch URL and title from ARI', response.statusText);
-  }
-  return undefined;
 };

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

@@ -36,7 +36,7 @@ export class ReferenceSyncBlockStoreManager {
       this.isRefreshingSubscriptions = false;
     }
   }
-  fetchSyncBlockSourceURLAndTitle(resourceId) {
+  retrieveSyncBlockSourceInfo(resourceId) {
     if (!resourceId || !this.dataProvider) {
       return;
     }
@@ -45,7 +45,7 @@ export class 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(createSyncBlockNode('', resourceId)).then(sourceInfo => {
+      this.dataProvider.retrieveSyncBlockSourceInfo(createSyncBlockNode('', resourceId)).then(sourceInfo => {
         const existingSyncBlock = this.getFromCache(resourceId);
         if (existingSyncBlock && existingSyncBlock.data) {
           existingSyncBlock.data = {
@@ -84,7 +84,7 @@ export class 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) {
-        this.fetchSyncBlockSourceURLAndTitle(resolvedSyncBlockInstance.resourceId);
+        this.retrieveSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
       }
     });
     return resolvedData;

package/dist/es2019/utils/sourceInfo.js

@@ -0,0 +1,89 @@
+/* eslint-disable require-unicode-regexp  */
+
+import { getPageIdAndTypeFromAri } from "./ari";
+import { isBlogPageType } from "./utils";
+const COMMON_HEADERS = {
+  'Content-Type': 'application/json',
+  Accept: 'application/json'
+};
+const AGG_HEADERS = {
+  'X-ExperimentalApi': 'confluence-agg-beta'
+};
+const GRAPHQL_ENDPOINT = '/gateway/api/graphql';
+const GET_SOURCE_INFO_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_SOURCE_INFO';
+/**
+ * Query to get the page subtype by id (i.e. live or classic)
+ * @param documentARI
+ * @returns subType live if livePage, subType null if classic page
+ */
+const GET_SOURCE_INFO_QUERY = `query ${GET_SOURCE_INFO_OPERATION_NAME} ($id: ID!) {
+	content (id: $id) {
+		nodes {
+			id
+			links {
+				base
+			}
+			space {
+				key
+			}
+			subType
+			title
+		}
+	}
+}`;
+const getSourceInfo = async ari => {
+  const bodyData = {
+    query: GET_SOURCE_INFO_QUERY,
+    operationName: GET_SOURCE_INFO_OPERATION_NAME,
+    variables: {
+      id: ari
+    }
+  };
+  const response = await fetch(GRAPHQL_ENDPOINT, {
+    method: 'POST',
+    headers: {
+      ...COMMON_HEADERS,
+      ...AGG_HEADERS
+    },
+    body: JSON.stringify(bodyData)
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to get url: ${response.statusText}`);
+  }
+  return await response.json();
+};
+export const fetchSourceInfo = async (ari, localId) => {
+  try {
+    var _response$data, _response$data$conten, _response$data$conten2, _contentData$space;
+    const {
+      type: pageType
+    } = getPageIdAndTypeFromAri(ari);
+    const response = await getSourceInfo(ari);
+    const contentData = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$conten = _response$data.content) === null || _response$data$conten === void 0 ? void 0 : (_response$data$conten2 = _response$data$conten.nodes) === null || _response$data$conten2 === void 0 ? void 0 : _response$data$conten2[0];
+    if (!contentData) {
+      throw new Error(`Failed to get content data`);
+    }
+    const title = contentData.title;
+    let url;
+    const {
+      base
+    } = contentData.links || {};
+    if (base && (_contentData$space = contentData.space) !== null && _contentData$space !== void 0 && _contentData$space.key && contentData.id) {
+      if (isBlogPageType(pageType)) {
+        url = `${base}/spaces/${contentData.space.key}/blog/edit-v2/${contentData.id}`;
+      } else if (contentData.subType === 'live') {
+        url = `${base}/spaces/${contentData.space.key}/pages/${contentData.id}`;
+      } else {
+        url = `${base}/spaces/${contentData.space.key}/pages/edit-v2/${contentData.id}`;
+      }
+    }
+    url = url && localId ? `${url}#block-${localId}` : url;
+    return Promise.resolve({
+      title,
+      url
+    });
+  } catch (error) {
+    // TODO: EDITOR-1921 - add error analytics
+    return Promise.resolve(undefined);
+  }
+};

package/dist/esm/providers/syncBlockProvider.js

@@ -13,6 +13,7 @@ import { useMemo } from 'react';
 import { SyncBlockError } from '../common/types';
 import { SyncBlockDataProvider } from '../providers/types';
 import { getLocalIdFromAri, getPageARIFromResourceId } from '../utils/ari';
+import { fetchSourceInfo } from '../utils/sourceInfo';
 export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
   function SyncBlockProvider(fetchProvider, writeProvider, sourceId) {
     var _this;
@@ -150,8 +151,8 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
       return this.sourceId;
     }
   }, {
-    key: "retrieveSyncBlockSourceUrlAndTitle",
-    value: function retrieveSyncBlockSourceUrlAndTitle(node) {
+    key: "retrieveSyncBlockSourceInfo",
+    value: function retrieveSyncBlockSourceInfo(node) {
       var resourceId = node.attrs.resourceId;
       var pageARI;
       var sourceLocalId;
@@ -167,7 +168,7 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
           // EDITOR-1921: log analytic here, safe to continue
         }
       }
-      return pageARI ? fetchURLandTitlefromARI(pageARI, sourceLocalId) : Promise.resolve(undefined);
+      return pageARI ? fetchSourceInfo(pageARI, sourceLocalId) : Promise.resolve(undefined);
     }
   }]);
 }(SyncBlockDataProvider);
@@ -175,52 +176,4 @@ export var useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvi
   return useMemo(function () {
     return new SyncBlockProvider(fetchProvider, writeProvider, sourceId);
   }, [fetchProvider, writeProvider, sourceId]);
-};
-var fetchURLandTitlefromARI = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(ari, sourceLocalId) {
-    var response, _payload$data, _payload$data2, payload, url, title;
-    return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
-        case 0:
-          _context3.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 = _context3.sent;
-          if (!response.ok) {
-            _context3.next = 12;
-            break;
-          }
-          _context3.next = 6;
-          return response.json();
-        case 6:
-          payload = _context3.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 _context3.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 _context3.abrupt("return", undefined);
-        case 14:
-        case "end":
-          return _context3.stop();
-      }
-    }, _callee3);
-  }));
-  return function fetchURLandTitlefromARI(_x4, _x5) {
-    return _ref.apply(this, arguments);
-  };
-}();
+};

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

@@ -106,8 +106,8 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       return refreshSubscriptions;
     }())
   }, {
-    key: "fetchSyncBlockSourceURLAndTitle",
-    value: function fetchSyncBlockSourceURLAndTitle(resourceId) {
+    key: "retrieveSyncBlockSourceInfo",
+    value: function retrieveSyncBlockSourceInfo(resourceId) {
       var _this = this;
       if (!resourceId || !this.dataProvider) {
         return;
@@ -117,7 +117,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
       // 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(createSyncBlockNode('', resourceId)).then(function (sourceInfo) {
+        this.dataProvider.retrieveSyncBlockSourceInfo(createSyncBlockNode('', resourceId)).then(function (sourceInfo) {
           var existingSyncBlock = _this.getFromCache(resourceId);
           if (existingSyncBlock && existingSyncBlock.data) {
             existingSyncBlock.data = _objectSpread(_objectSpread({}, existingSyncBlock.data), {}, {
@@ -172,7 +172,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
 
                 // 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);

package/dist/esm/utils/sourceInfo.js

@@ -0,0 +1,114 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+/* eslint-disable require-unicode-regexp  */
+
+import { getPageIdAndTypeFromAri } from "./ari";
+import { isBlogPageType } from "./utils";
+var COMMON_HEADERS = {
+  'Content-Type': 'application/json',
+  Accept: 'application/json'
+};
+var AGG_HEADERS = {
+  'X-ExperimentalApi': 'confluence-agg-beta'
+};
+var GRAPHQL_ENDPOINT = '/gateway/api/graphql';
+var GET_SOURCE_INFO_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_SOURCE_INFO';
+/**
+ * Query to get the page subtype by id (i.e. live or classic)
+ * @param documentARI
+ * @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 _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(ari) {
+    var bodyData, response;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          bodyData = {
+            query: GET_SOURCE_INFO_QUERY,
+            operationName: GET_SOURCE_INFO_OPERATION_NAME,
+            variables: {
+              id: ari
+            }
+          };
+          _context.next = 3;
+          return fetch(GRAPHQL_ENDPOINT, {
+            method: 'POST',
+            headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
+            body: JSON.stringify(bodyData)
+          });
+        case 3:
+          response = _context.sent;
+          if (response.ok) {
+            _context.next = 6;
+            break;
+          }
+          throw new Error("Failed to get url: ".concat(response.statusText));
+        case 6:
+          _context.next = 8;
+          return response.json();
+        case 8:
+          return _context.abrupt("return", _context.sent);
+        case 9:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getSourceInfo(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export var fetchSourceInfo = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(ari, localId) {
+    var _response$data, _contentData$space, _getPageIdAndTypeFrom, pageType, response, contentData, title, url, _ref3, base;
+    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.prev = 0;
+          _getPageIdAndTypeFrom = getPageIdAndTypeFromAri(ari), pageType = _getPageIdAndTypeFrom.type;
+          _context2.next = 4;
+          return getSourceInfo(ari);
+        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];
+          if (contentData) {
+            _context2.next = 8;
+            break;
+          }
+          throw new Error("Failed to get content data");
+        case 8:
+          title = contentData.title;
+          _ref3 = contentData.links || {}, base = _ref3.base;
+          if (base && (_contentData$space = contentData.space) !== null && _contentData$space !== void 0 && _contentData$space.key && contentData.id) {
+            if (isBlogPageType(pageType)) {
+              url = "".concat(base, "/spaces/").concat(contentData.space.key, "/blog/edit-v2/").concat(contentData.id);
+            } else if (contentData.subType === 'live') {
+              url = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages/").concat(contentData.id);
+            } else {
+              url = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages/edit-v2/").concat(contentData.id);
+            }
+          }
+          url = url && localId ? "".concat(url, "#block-").concat(localId) : url;
+          return _context2.abrupt("return", Promise.resolve({
+            title: title,
+            url: url
+          }));
+        case 15:
+          _context2.prev = 15;
+          _context2.t0 = _context2["catch"](0);
+          return _context2.abrupt("return", Promise.resolve(undefined));
+        case 18:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 15]]);
+  }));
+  return function fetchSourceInfo(_x2, _x3) {
+    return _ref2.apply(this, arguments);
+  };
+}();

package/dist/types/providers/syncBlockProvider.d.ts

@@ -21,6 +21,6 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
     writeNodesData(nodes: SyncBlockNode[], data: SyncBlockData[]): Promise<Array<WriteSyncBlockResult>>;
     deleteNodesData(resourceIds: string[]): Promise<Array<DeleteSyncBlockResult>>;
     getSourceId(): string;
-    retrieveSyncBlockSourceUrlAndTitle(node: SyncBlockNode): Promise<SyncBlockSourceInfo | undefined>;
+    retrieveSyncBlockSourceInfo(node: SyncBlockNode): Promise<SyncBlockSourceInfo | undefined>;
 }
 export declare const useMemoizedSyncedBlockProvider: (fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string) => SyncBlockProvider;

package/dist/types/providers/types.d.ts

@@ -34,7 +34,7 @@ export declare abstract class SyncBlockDataProvider extends NodeDataProvider<Syn
     abstract writeNodesData(nodes: SyncBlockNode[], data: SyncBlockData[]): Promise<Array<WriteSyncBlockResult>>;
     abstract deleteNodesData(resourceIds: string[]): Promise<Array<DeleteSyncBlockResult>>;
     abstract getSourceId(): ResourceId;
-    abstract retrieveSyncBlockSourceUrlAndTitle(node: SyncBlockNode): Promise<SyncBlockSourceInfo | undefined>;
+    abstract retrieveSyncBlockSourceInfo(node: SyncBlockNode): Promise<SyncBlockSourceInfo | undefined>;
 }
 export type SubscriptionCallback = (data: SyncBlockInstance) => void;
 export type TitleSubscriptionCallback = (title: string) => void;

package/dist/types/store-manager/referenceSyncBlockStoreManager.d.ts

@@ -14,7 +14,7 @@ export declare class ReferenceSyncBlockStoreManager {
      * @returns {Promise<void>}
      */
     refreshSubscriptions(): Promise<void>;
-    private fetchSyncBlockSourceURLAndTitle;
+    private retrieveSyncBlockSourceInfo;
     fetchSyncBlocksData(syncBlockNodes: SyncBlockNode[]): Promise<SyncBlockInstance[]>;
     private updateCache;
     private updateSourceTitleSubscriptions;

package/dist/types/utils/sourceInfo.d.ts

@@ -0,0 +1,2 @@
+import type { SyncBlockSourceInfo } from "../providers/types";
+export declare const fetchSourceInfo: (ari: string, localId?: string) => Promise<SyncBlockSourceInfo | undefined>;

package/dist/types-ts4.5/providers/syncBlockProvider.d.ts

@@ -21,6 +21,6 @@ export declare class SyncBlockProvider extends SyncBlockDataProvider {
     writeNodesData(nodes: SyncBlockNode[], data: SyncBlockData[]): Promise<Array<WriteSyncBlockResult>>;
     deleteNodesData(resourceIds: string[]): Promise<Array<DeleteSyncBlockResult>>;
     getSourceId(): string;
-    retrieveSyncBlockSourceUrlAndTitle(node: SyncBlockNode): Promise<SyncBlockSourceInfo | undefined>;
+    retrieveSyncBlockSourceInfo(node: SyncBlockNode): Promise<SyncBlockSourceInfo | undefined>;
 }
 export declare const useMemoizedSyncedBlockProvider: (fetchProvider: ADFFetchProvider, writeProvider: ADFWriteProvider, sourceId: string) => SyncBlockProvider;

package/dist/types-ts4.5/providers/types.d.ts

@@ -34,7 +34,7 @@ export declare abstract class SyncBlockDataProvider extends NodeDataProvider<Syn
     abstract writeNodesData(nodes: SyncBlockNode[], data: SyncBlockData[]): Promise<Array<WriteSyncBlockResult>>;
     abstract deleteNodesData(resourceIds: string[]): Promise<Array<DeleteSyncBlockResult>>;
     abstract getSourceId(): ResourceId;
-    abstract retrieveSyncBlockSourceUrlAndTitle(node: SyncBlockNode): Promise<SyncBlockSourceInfo | undefined>;
+    abstract retrieveSyncBlockSourceInfo(node: SyncBlockNode): Promise<SyncBlockSourceInfo | undefined>;
 }
 export type SubscriptionCallback = (data: SyncBlockInstance) => void;
 export type TitleSubscriptionCallback = (title: string) => void;

package/dist/types-ts4.5/store-manager/referenceSyncBlockStoreManager.d.ts

@@ -14,7 +14,7 @@ export declare class ReferenceSyncBlockStoreManager {
      * @returns {Promise<void>}
      */
     refreshSubscriptions(): Promise<void>;
-    private fetchSyncBlockSourceURLAndTitle;
+    private retrieveSyncBlockSourceInfo;
     fetchSyncBlocksData(syncBlockNodes: SyncBlockNode[]): Promise<SyncBlockInstance[]>;
     private updateCache;
     private updateSourceTitleSubscriptions;

package/dist/types-ts4.5/utils/sourceInfo.d.ts

@@ -0,0 +1,2 @@
+import type { SyncBlockSourceInfo } from "../providers/types";
+export declare const fetchSourceInfo: (ari: string, localId?: string) => Promise<SyncBlockSourceInfo | undefined>;

package/package.json

@@ -82,7 +82,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "2.7.0",
+	"version": "2.7.1",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",