@atlaskit/editor-synced-block-provider 3.6.0 → 3.6.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.6.1
+
+### Patch Changes
+
+- [`f0124a523d8f1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f0124a523d8f1) -
+  [ux] [EDITOR-2845] Implement synced location for source and reference sync block
+- Updated dependencies
+
 ## 3.6.0
 
 ### Minor Changes

package/dist/cjs/clients/block-service/ari.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLocalIdFromBlockResourceId = exports.generateBlockAriFromReference = exports.generateBlockAri = void 0;
+exports.getProductFromSourceAri = exports.getLocalIdFromBlockResourceId = exports.generateBlockAriFromReference = exports.generateBlockAri = void 0;
 /* eslint-disable require-unicode-regexp */
 
 /**
@@ -45,4 +45,15 @@ var getLocalIdFromBlockResourceId = exports.getLocalIdFromBlockResourceId = func
     return match[1];
   }
   throw new Error("Invalid page ARI: ".concat(ari));
+};
+var getProductFromSourceAri = exports.getProductFromSourceAri = function getProductFromSourceAri(ari) {
+  var jiraMatch = ari === null || ari === void 0 ? void 0 : ari.search(/ari:cloud:jira:.*/);
+  if (jiraMatch !== -1) {
+    return 'jira-work-item';
+  }
+  var confluenceMatch = ari === null || ari === void 0 ? void 0 : ari.search(/ari:cloud:confluence:.*/);
+  if (confluenceMatch !== -1) {
+    return 'confluence-page';
+  }
+  return undefined;
 };

package/dist/cjs/clients/block-service/blockService.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateSyncedBlock = exports.updateReferenceSyncedBlockOnDocument = exports.isBlockContentResponse = exports.getSyncedBlockContent = exports.getReferenceSyncedBlocks = exports.deleteSyncedBlock = exports.createSyncedBlock = exports.batchRetrieveSyncedBlocks = exports.BlockError = void 0;
+exports.updateSyncedBlock = exports.updateReferenceSyncedBlockOnDocument = exports.isBlockContentResponse = exports.getSyncedBlockContent = exports.getReferenceSyncedBlocksByBlockAri = exports.getReferenceSyncedBlocks = exports.deleteSyncedBlock = exports.createSyncedBlock = exports.batchRetrieveSyncedBlocks = exports.BlockError = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -173,7 +173,6 @@ var getSyncedBlockContent = exports.getSyncedBlockContent = /*#__PURE__*/functio
     return _ref3.apply(this, arguments);
   };
 }();
-;
 
 /**
  * Batch retrieves multiple synced blocks by their ARIs.
@@ -370,4 +369,38 @@ var updateReferenceSyncedBlockOnDocument = exports.updateReferenceSyncedBlockOnD
   return function updateReferenceSyncedBlockOnDocument(_x7) {
     return _ref11.apply(this, arguments);
   };
+}();
+var getReferenceSyncedBlocksByBlockAri = exports.getReferenceSyncedBlocksByBlockAri = /*#__PURE__*/function () {
+  var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(_ref12) {
+    var blockAri, response;
+    return _regenerator.default.wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
+        case 0:
+          blockAri = _ref12.blockAri;
+          _context8.next = 3;
+          return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/reference/batch-retrieve/").concat(encodeURIComponent(blockAri)), {
+            method: 'GET',
+            headers: COMMON_HEADERS
+          });
+        case 3:
+          response = _context8.sent;
+          if (response.ok) {
+            _context8.next = 6;
+            break;
+          }
+          throw new BlockError(response.status);
+        case 6:
+          _context8.next = 8;
+          return response.json();
+        case 8:
+          return _context8.abrupt("return", _context8.sent);
+        case 9:
+        case "end":
+          return _context8.stop();
+      }
+    }, _callee8);
+  }));
+  return function getReferenceSyncedBlocksByBlockAri(_x8) {
+    return _ref13.apply(this, arguments);
+  };
 }();

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

@@ -72,23 +72,69 @@ var getConfluenceSourceInfo = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-var fetchConfluencePageInfoOld = exports.fetchConfluencePageInfoOld = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(pageAri, localId, fireAnalyticsEvent) {
-    var _response$data, _contentData$space, _getPageIdAndTypeFrom, pageType, response, contentData, title, url, _ref3, base;
+var resolveNoAccessPageInfo = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(ari) {
+    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.prev = 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' ? url : undefined,
+            title: typeof title === 'string' ? title : undefined,
+            sourceAri: ari
+          });
+        case 12:
+          throw new Error("Failed to resolve ari: ".concat(response.statusText));
+        case 13:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function resolveNoAccessPageInfo(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+var fetchConfluencePageInfoOld = exports.fetchConfluencePageInfoOld = /*#__PURE__*/function () {
+  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(pageAri, localId, fireAnalyticsEvent) {
+    var _response$data, _contentData$space, _getPageIdAndTypeFrom, pageType, response, contentData, title, url, _ref4, base;
+    return _regenerator.default.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.prev = 0;
           _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
             ari: pageAri
           }), pageType = _getPageIdAndTypeFrom.type;
-          _context2.next = 4;
+          _context3.next = 4;
           return getConfluenceSourceInfo(pageAri);
         case 4:
-          response = _context2.sent;
+          response = _context3.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];
           title = contentData === null || contentData === void 0 ? void 0 : contentData.title;
-          _ref3 = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {}, base = _ref3.base;
+          _ref4 = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {}, base = _ref4.base;
           if (base && contentData !== null && contentData !== void 0 && (_contentData$space = contentData.space) !== null && _contentData$space !== void 0 && _contentData$space.key && contentData !== null && contentData !== void 0 && contentData.id) {
             if ((0, _utils.isBlogPageType)(pageType)) {
               url = "".concat(base, "/spaces/").concat(contentData.space.key, "/blog/edit-v2/").concat(contentData.id);
@@ -102,98 +148,109 @@ var fetchConfluencePageInfoOld = exports.fetchConfluencePageInfoOld = /*#__PURE_
           if (!title || !url) {
             fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent((0, _errorHandling.getSourceInfoErrorPayload)('Failed to get confluence page source info'));
           }
-          return _context2.abrupt("return", Promise.resolve({
+          return _context3.abrupt("return", Promise.resolve({
             title: title,
-            url: url
+            url: url,
+            sourceAri: pageAri
           }));
         case 14:
-          _context2.prev = 14;
-          _context2.t0 = _context2["catch"](0);
-          (0, _monitoring.logException)(_context2.t0, {
+          _context3.prev = 14;
+          _context3.t0 = _context3["catch"](0);
+          (0, _monitoring.logException)(_context3.t0, {
             location: 'editor-synced-block-provider/sourceInfo'
           });
-          fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent((0, _errorHandling.getSourceInfoErrorPayload)(_context2.t0.message));
-          return _context2.abrupt("return", Promise.resolve(undefined));
+          fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent((0, _errorHandling.getSourceInfoErrorPayload)(_context3.t0.message));
+          return _context3.abrupt("return", Promise.resolve(undefined));
         case 19:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[0, 14]]);
+    }, _callee3, null, [[0, 14]]);
   }));
-  return function fetchConfluencePageInfoOld(_x2, _x3, _x4) {
-    return _ref2.apply(this, arguments);
+  return function fetchConfluencePageInfoOld(_x3, _x4, _x5) {
+    return _ref3.apply(this, arguments);
   };
 }();
 var fetchConfluencePageInfoNew = exports.fetchConfluencePageInfoNew = /*#__PURE__*/function () {
-  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(pageAri, localId) {
-    var _response$data2, _contentData$space2;
-    var _getPageIdAndTypeFrom2, pageType, response, contentData, title, url, _ref5, base;
-    return _regenerator.default.wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+  var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(pageAri, hasAccess, urlType, localId) {
+    var _response$data2, _contentData$space2, _getPageIdAndTypeFrom2, pageType, response, contentData, _ref6, title, subType, url, _ref7, base;
+    return _regenerator.default.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
+          if (!hasAccess) {
+            _context4.next = 13;
+            break;
+          }
           _getPageIdAndTypeFrom2 = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
             ari: pageAri
           }), pageType = _getPageIdAndTypeFrom2.type;
-          _context3.next = 3;
+          _context4.next = 4;
           return getConfluenceSourceInfo(pageAri);
-        case 3:
-          response = _context3.sent;
+        case 4:
+          response = _context4.sent;
           contentData = (_response$data2 = response.data) === null || _response$data2 === void 0 || (_response$data2 = _response$data2.content) === null || _response$data2 === void 0 || (_response$data2 = _response$data2.nodes) === null || _response$data2 === void 0 ? void 0 : _response$data2[0];
-          title = contentData === null || contentData === void 0 ? void 0 : contentData.title;
-          _ref5 = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {}, base = _ref5.base;
+          _ref6 = contentData || {}, title = _ref6.title, subType = _ref6.subType;
+          _ref7 = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {}, base = _ref7.base;
           if (base && contentData !== null && contentData !== void 0 && (_contentData$space2 = contentData.space) !== null && _contentData$space2 !== void 0 && _contentData$space2.key && contentData !== null && contentData !== void 0 && contentData.id) {
             if ((0, _utils.isBlogPageType)(pageType)) {
-              url = "".concat(base, "/spaces/").concat(contentData.space.key, "/blog/edit-v2/").concat(contentData.id);
+              url = "".concat(base, "/spaces/").concat(contentData.space.key, "/blog").concat(urlType === 'edit' ? '/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 = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages").concat(urlType === 'edit' ? '/edit-v2' : '', "/").concat(contentData.id);
             }
           }
           url = url && localId ? "".concat(url, "#block-").concat(localId) : url;
-          return _context3.abrupt("return", Promise.resolve({
+          return _context4.abrupt("return", Promise.resolve({
             title: title,
-            url: url
+            url: url,
+            sourceAri: pageAri,
+            subType: subType
           }));
-        case 10:
+        case 13:
+          _context4.next = 15;
+          return resolveNoAccessPageInfo(pageAri);
+        case 15:
+          return _context4.abrupt("return", _context4.sent);
+        case 16:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3);
+    }, _callee4);
   }));
-  return function fetchConfluencePageInfoNew(_x5, _x6) {
-    return _ref4.apply(this, arguments);
+  return function fetchConfluencePageInfoNew(_x6, _x7, _x8, _x9) {
+    return _ref5.apply(this, arguments);
   };
 }();
 var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/function () {
-  var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(pageAri, localId, fireAnalyticsEvent) {
-    return _regenerator.default.wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+  var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(pageAri, hasAccess, urlType, localId, fireAnalyticsEvent) {
+    return _regenerator.default.wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
         case 0:
           if (!(0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
-            _context4.next = 6;
+            _context5.next = 6;
             break;
           }
-          _context4.next = 3;
-          return fetchConfluencePageInfoNew(pageAri, localId);
+          _context5.next = 3;
+          return fetchConfluencePageInfoNew(pageAri, hasAccess, urlType, localId);
         case 3:
-          _context4.t0 = _context4.sent;
-          _context4.next = 9;
+          _context5.t0 = _context5.sent;
+          _context5.next = 9;
           break;
         case 6:
-          _context4.next = 8;
+          _context5.next = 8;
           return fetchConfluencePageInfoOld(pageAri, localId, fireAnalyticsEvent);
         case 8:
-          _context4.t0 = _context4.sent;
+          _context5.t0 = _context5.sent;
         case 9:
-          return _context4.abrupt("return", _context4.t0);
+          return _context5.abrupt("return", _context5.t0);
         case 10:
         case "end":
-          return _context4.stop();
+          return _context5.stop();
       }
-    }, _callee4);
+    }, _callee5);
   }));
-  return function fetchConfluencePageInfo(_x7, _x8, _x9) {
-    return _ref6.apply(this, arguments);
+  return function fetchConfluencePageInfo(_x0, _x1, _x10, _x11, _x12) {
+    return _ref8.apply(this, arguments);
   };
 }();