@atlaskit/editor-synced-block-provider 3.29.2 → 3.30.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.30.0
+
+### Minor Changes
+
+- [`05e18ecc17fb3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/05e18ecc17fb3) -
+  Use GraphQL to also fetch the URLs for draft + unpublished pages
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.29.3
+
+### Patch Changes
+
+- [`e4b932a41725c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e4b932a41725c) -
+  [ux] EDITOR-5459 fix merging logic for subtype in resolve sync block instance
+- [`aef1e97f7c9f4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/aef1e97f7c9f4) -
+  [EDITOR-5278] Append operation name to graphql call url for better observability
+- Updated dependencies
+
 ## 3.29.2
 
 ### Patch Changes

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

@@ -13,6 +13,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _retry = require("../../utils/retry");
 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; })(); }
@@ -63,7 +64,7 @@ var isBlockContentResponse = exports.isBlockContentResponse = function isBlockCo
  */
 var getReferenceSyncedBlocks = exports.getReferenceSyncedBlocks = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(documentAri) {
-    var bodyData, response, result;
+    var bodyData, url, response, result;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -71,40 +72,41 @@ var getReferenceSyncedBlocks = exports.getReferenceSyncedBlocks = /*#__PURE__*/f
             query: buildGetDocumentReferenceBlocksQuery(documentAri),
             operationName: GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME
           };
-          _context.next = 3;
-          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
+          url = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockGetDocumentReferenceBlocks") : GRAPHQL_ENDPOINT;
+          _context.next = 4;
+          return (0, _retry.fetchWithRetry)(url, {
             method: 'POST',
             headers: COMMON_HEADERS,
             body: JSON.stringify(bodyData)
           });
-        case 3:
+        case 4:
           response = _context.sent;
           if (response.ok) {
-            _context.next = 6;
+            _context.next = 7;
             break;
           }
           throw new BlockError(response.status);
-        case 6:
-          _context.next = 8;
+        case 7:
+          _context.next = 9;
           return response.json();
-        case 8:
+        case 9:
           result = _context.sent;
           if (!(result.errors && result.errors.length > 0)) {
-            _context.next = 11;
+            _context.next = 12;
             break;
           }
           throw new Error(result.errors.map(function (e) {
             return e.message;
           }).join(', '));
-        case 11:
+        case 12:
           if (result.data) {
-            _context.next = 13;
+            _context.next = 14;
             break;
           }
           throw new Error('No data returned from GraphQL query');
-        case 13:
-          return _context.abrupt("return", result.data.blockService_getDocumentReferenceBlocks);
         case 14:
+          return _context.abrupt("return", result.data.blockService_getDocumentReferenceBlocks);
+        case 15:
         case "end":
           return _context.stop();
       }
@@ -207,7 +209,7 @@ var BlockError = exports.BlockError = /*#__PURE__*/function (_Error) {
 var getSyncedBlockContent = exports.getSyncedBlockContent = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(_ref2) {
     var _result$data;
-    var blockAri, bodyData, response, result;
+    var blockAri, bodyData, url, response, result;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -216,40 +218,41 @@ var getSyncedBlockContent = exports.getSyncedBlockContent = /*#__PURE__*/functio
             query: buildGetBlockQuery(blockAri),
             operationName: GET_BLOCK_OPERATION_NAME
           };
-          _context2.next = 4;
-          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
+          url = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockGetBlock") : GRAPHQL_ENDPOINT;
+          _context2.next = 5;
+          return (0, _retry.fetchWithRetry)(url, {
             method: 'POST',
             headers: COMMON_HEADERS,
             body: JSON.stringify(bodyData)
           });
-        case 4:
+        case 5:
           response = _context2.sent;
           if (response.ok) {
-            _context2.next = 7;
+            _context2.next = 8;
             break;
           }
           throw new BlockError(response.status);
-        case 7:
-          _context2.next = 9;
+        case 8:
+          _context2.next = 10;
           return response.json();
-        case 9:
+        case 10:
           result = _context2.sent;
           if (!(result.errors && result.errors.length > 0)) {
-            _context2.next = 12;
+            _context2.next = 13;
             break;
           }
           throw new Error(result.errors.map(function (e) {
             return e.message;
           }).join(', '));
-        case 12:
+        case 13:
           if ((_result$data = result.data) !== null && _result$data !== void 0 && _result$data.blockService_getBlock) {
-            _context2.next = 14;
+            _context2.next = 15;
             break;
           }
           throw new Error('No data returned from GraphQL query');
-        case 14:
-          return _context2.abrupt("return", result.data.blockService_getBlock);
         case 15:
+          return _context2.abrupt("return", result.data.blockService_getBlock);
+        case 16:
         case "end":
           return _context2.stop();
       }
@@ -271,7 +274,7 @@ var getSyncedBlockContent = exports.getSyncedBlockContent = /*#__PURE__*/functio
 var batchRetrieveSyncedBlocks = exports.batchRetrieveSyncedBlocks = /*#__PURE__*/function () {
   var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(_ref4) {
     var _result$data2;
-    var blockIdentifiers, blockAris, bodyData, response, result, graphqlResponse;
+    var blockIdentifiers, blockAris, bodyData, url, response, result, graphqlResponse;
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -283,44 +286,45 @@ var batchRetrieveSyncedBlocks = exports.batchRetrieveSyncedBlocks = /*#__PURE__*
             query: buildBatchRetrieveBlocksQuery(blockAris),
             operationName: BATCH_RETRIEVE_BLOCKS_OPERATION_NAME
           };
-          _context3.next = 5;
-          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
+          url = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockBatchRetrieveBlocks") : GRAPHQL_ENDPOINT;
+          _context3.next = 6;
+          return (0, _retry.fetchWithRetry)(url, {
             method: 'POST',
             headers: COMMON_HEADERS,
             body: JSON.stringify(bodyData)
           });
-        case 5:
+        case 6:
           response = _context3.sent;
           if (response.ok) {
-            _context3.next = 8;
+            _context3.next = 9;
             break;
           }
           throw new BlockError(response.status);
-        case 8:
-          _context3.next = 10;
+        case 9:
+          _context3.next = 11;
           return response.json();
-        case 10:
+        case 11:
           result = _context3.sent;
           if (!(result.errors && result.errors.length > 0)) {
-            _context3.next = 13;
+            _context3.next = 14;
             break;
           }
           throw new Error(result.errors.map(function (e) {
             return e.message;
           }).join(', '));
-        case 13:
+        case 14:
           if ((_result$data2 = result.data) !== null && _result$data2 !== void 0 && _result$data2.blockService_batchRetrieveBlocks) {
-            _context3.next = 15;
+            _context3.next = 16;
             break;
           }
           throw new Error('No data returned from GraphQL query');
-        case 15:
+        case 16:
           graphqlResponse = result.data.blockService_batchRetrieveBlocks;
           return _context3.abrupt("return", {
             success: graphqlResponse.success,
             error: graphqlResponse.error
           });
-        case 17:
+        case 18:
         case "end":
           return _context3.stop();
       }
@@ -333,7 +337,7 @@ var batchRetrieveSyncedBlocks = exports.batchRetrieveSyncedBlocks = /*#__PURE__*
 var deleteSyncedBlock = exports.deleteSyncedBlock = /*#__PURE__*/function () {
   var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(_ref6) {
     var _result$data3;
-    var blockAri, deleteReason, bodyData, response, result;
+    var blockAri, deleteReason, bodyData, url, response, result;
     return _regenerator.default.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -342,38 +346,39 @@ var deleteSyncedBlock = exports.deleteSyncedBlock = /*#__PURE__*/function () {
             query: buildDeleteBlockMutation(blockAri, deleteReason),
             operationName: DELETE_BLOCK_OPERATION_NAME
           };
-          _context4.next = 4;
-          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
+          url = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockDeleteBlock") : GRAPHQL_ENDPOINT;
+          _context4.next = 5;
+          return (0, _retry.fetchWithRetry)(url, {
             method: 'POST',
             headers: COMMON_HEADERS,
             body: JSON.stringify(bodyData)
           });
-        case 4:
+        case 5:
           response = _context4.sent;
           if (response.ok) {
-            _context4.next = 7;
+            _context4.next = 8;
             break;
           }
           throw new BlockError(response.status);
-        case 7:
-          _context4.next = 9;
+        case 8:
+          _context4.next = 10;
           return response.json();
-        case 9:
+        case 10:
           result = _context4.sent;
           if (!(result.errors && result.errors.length > 0)) {
-            _context4.next = 12;
+            _context4.next = 13;
             break;
           }
           throw new Error(result.errors.map(function (e) {
             return e.message;
           }).join(', '));
-        case 12:
+        case 13:
           if ((_result$data3 = result.data) !== null && _result$data3 !== void 0 && _result$data3.blockService_deleteBlock.deleted) {
-            _context4.next = 14;
+            _context4.next = 15;
             break;
           }
           throw new Error('Block deletion failed; deleted flag is false');
-        case 14:
+        case 15:
         case "end":
           return _context4.stop();
       }
@@ -385,7 +390,7 @@ var deleteSyncedBlock = exports.deleteSyncedBlock = /*#__PURE__*/function () {
 }();
 var updateSyncedBlock = exports.updateSyncedBlock = /*#__PURE__*/function () {
   var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(_ref8) {
-    var blockAri, content, stepVersion, status, bodyData, response, result;
+    var blockAri, content, stepVersion, status, bodyData, url, response, result;
     return _regenerator.default.wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
@@ -394,32 +399,33 @@ var updateSyncedBlock = exports.updateSyncedBlock = /*#__PURE__*/function () {
             query: buildUpdateBlockMutation(blockAri, content, stepVersion, status),
             operationName: UPDATE_BLOCK_OPERATION_NAME
           };
-          _context5.next = 4;
-          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
+          url = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockUpdateBlock") : GRAPHQL_ENDPOINT;
+          _context5.next = 5;
+          return (0, _retry.fetchWithRetry)(url, {
             method: 'POST',
             headers: COMMON_HEADERS,
             body: JSON.stringify(bodyData)
           });
-        case 4:
+        case 5:
           response = _context5.sent;
           if (response.ok) {
-            _context5.next = 7;
+            _context5.next = 8;
             break;
           }
           throw new BlockError(response.status);
-        case 7:
-          _context5.next = 9;
+        case 8:
+          _context5.next = 10;
           return response.json();
-        case 9:
+        case 10:
           result = _context5.sent;
           if (!(result.errors && result.errors.length > 0)) {
-            _context5.next = 12;
+            _context5.next = 13;
             break;
           }
           throw new Error(result.errors.map(function (e) {
             return e.message;
           }).join(', '));
-        case 12:
+        case 13:
         case "end":
           return _context5.stop();
       }
@@ -432,7 +438,7 @@ var updateSyncedBlock = exports.updateSyncedBlock = /*#__PURE__*/function () {
 var createSyncedBlock = exports.createSyncedBlock = /*#__PURE__*/function () {
   var _ref1 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(_ref0) {
     var _result$data4;
-    var blockAri, blockInstanceId, sourceAri, product, content, stepVersion, status, bodyData, response, result;
+    var blockAri, blockInstanceId, sourceAri, product, content, stepVersion, status, bodyData, url, response, result;
     return _regenerator.default.wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
@@ -441,40 +447,41 @@ var createSyncedBlock = exports.createSyncedBlock = /*#__PURE__*/function () {
             query: buildCreateBlockMutation(blockAri, blockInstanceId, content, product, sourceAri, stepVersion, status),
             operationName: CREATE_BLOCK_OPERATION_NAME
           };
-          _context6.next = 4;
-          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
+          url = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockCreateBlock") : GRAPHQL_ENDPOINT;
+          _context6.next = 5;
+          return (0, _retry.fetchWithRetry)(url, {
             method: 'POST',
             headers: COMMON_HEADERS,
             body: JSON.stringify(bodyData)
           });
-        case 4:
+        case 5:
           response = _context6.sent;
           if (response.ok) {
-            _context6.next = 7;
+            _context6.next = 8;
             break;
           }
           throw new BlockError(response.status);
-        case 7:
-          _context6.next = 9;
+        case 8:
+          _context6.next = 10;
           return response.json();
-        case 9:
+        case 10:
           result = _context6.sent;
           if (!(result.errors && result.errors.length > 0)) {
-            _context6.next = 12;
+            _context6.next = 13;
             break;
           }
           throw new Error(result.errors.map(function (e) {
             return e.message;
           }).join(', '));
-        case 12:
+        case 13:
           if ((_result$data4 = result.data) !== null && _result$data4 !== void 0 && _result$data4.blockService_createBlock) {
-            _context6.next = 14;
+            _context6.next = 15;
             break;
           }
           throw new Error('No data returned from GraphQL mutation');
-        case 14:
-          return _context6.abrupt("return", result.data.blockService_createBlock);
         case 15:
+          return _context6.abrupt("return", result.data.blockService_createBlock);
+        case 16:
         case "end":
           return _context6.stop();
       }
@@ -486,7 +493,7 @@ var createSyncedBlock = exports.createSyncedBlock = /*#__PURE__*/function () {
 }();
 var updateReferenceSyncedBlockOnDocument = exports.updateReferenceSyncedBlockOnDocument = /*#__PURE__*/function () {
   var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(_ref10) {
-    var documentAri, blocks, _ref10$noContent, noContent, bodyData, response, result, _result$data5;
+    var documentAri, blocks, _ref10$noContent, noContent, bodyData, url, response, result, _result$data5;
     return _regenerator.default.wrap(function _callee7$(_context7) {
       while (1) switch (_context7.prev = _context7.next) {
         case 0:
@@ -495,45 +502,46 @@ var updateReferenceSyncedBlockOnDocument = exports.updateReferenceSyncedBlockOnD
             query: buildUpdateDocumentReferencesMutation(documentAri, blocks, noContent),
             operationName: UPDATE_DOCUMENT_REFERENCES_OPERATION_NAME
           };
-          _context7.next = 4;
-          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
+          url = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockUpdateDocumentReferences") : GRAPHQL_ENDPOINT;
+          _context7.next = 5;
+          return (0, _retry.fetchWithRetry)(url, {
             method: 'POST',
             headers: COMMON_HEADERS,
             body: JSON.stringify(bodyData),
             keepalive: true
           });
-        case 4:
+        case 5:
           response = _context7.sent;
           if (response.ok) {
-            _context7.next = 7;
+            _context7.next = 8;
             break;
           }
           throw new BlockError(response.status);
-        case 7:
-          _context7.next = 9;
+        case 8:
+          _context7.next = 10;
           return response.json();
-        case 9:
+        case 10:
           result = _context7.sent;
           if (!(result.errors && result.errors.length > 0)) {
-            _context7.next = 12;
+            _context7.next = 13;
             break;
           }
           throw new Error(result.errors.map(function (e) {
             return e.message;
           }).join(', '));
-        case 12:
+        case 13:
           if (noContent) {
-            _context7.next = 16;
+            _context7.next = 17;
             break;
           }
           if ((_result$data5 = result.data) !== null && _result$data5 !== void 0 && _result$data5.blockService_updateDocumentReferences) {
-            _context7.next = 15;
+            _context7.next = 16;
             break;
           }
           throw new Error('No data returned from GraphQL mutation');
-        case 15:
-          return _context7.abrupt("return", result.data.blockService_updateDocumentReferences);
         case 16:
+          return _context7.abrupt("return", result.data.blockService_updateDocumentReferences);
+        case 17:
         case "end":
           return _context7.stop();
       }
@@ -546,7 +554,7 @@ var updateReferenceSyncedBlockOnDocument = exports.updateReferenceSyncedBlockOnD
 var getReferenceSyncedBlocksByBlockAri = exports.getReferenceSyncedBlocksByBlockAri = /*#__PURE__*/function () {
   var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(_ref12) {
     var _result$data6;
-    var blockAri, bodyData, response, result, graphqlResponse;
+    var blockAri, bodyData, url, response, result, graphqlResponse;
     return _regenerator.default.wrap(function _callee8$(_context8) {
       while (1) switch (_context8.prev = _context8.next) {
         case 0:
@@ -555,45 +563,46 @@ var getReferenceSyncedBlocksByBlockAri = exports.getReferenceSyncedBlocksByBlock
             query: buildGetBlockReferencesQuery(blockAri),
             operationName: GET_BLOCK_REFERENCES_OPERATION_NAME
           };
-          _context8.next = 4;
-          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
+          url = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? "".concat(GRAPHQL_ENDPOINT, "?operation=editorSyncedBlockGetReferences") : GRAPHQL_ENDPOINT;
+          _context8.next = 5;
+          return (0, _retry.fetchWithRetry)(url, {
             method: 'POST',
             headers: COMMON_HEADERS,
             body: JSON.stringify(bodyData)
           });
-        case 4:
+        case 5:
           response = _context8.sent;
           if (response.ok) {
-            _context8.next = 7;
+            _context8.next = 8;
             break;
           }
           throw new BlockError(response.status);
-        case 7:
-          _context8.next = 9;
+        case 8:
+          _context8.next = 10;
           return response.json();
-        case 9:
+        case 10:
           result = _context8.sent;
           if (!(result.errors && result.errors.length > 0)) {
-            _context8.next = 12;
+            _context8.next = 13;
             break;
           }
           throw new Error(result.errors.map(function (e) {
             return e.message;
           }).join(', '));
-        case 12:
+        case 13:
           if ((_result$data6 = result.data) !== null && _result$data6 !== void 0 && _result$data6.blockService_getReferences) {
-            _context8.next = 14;
+            _context8.next = 15;
             break;
           }
           throw new Error('No data returned from GraphQL query');
-        case 14:
+        case 15:
           graphqlResponse = result.data.blockService_getReferences;
           return _context8.abrupt("return", {
             blockAri: blockAri,
             references: graphqlResponse.references || [],
             errors: graphqlResponse.errors || []
           });
-        case 16:
+        case 17:
         case "end":
           return _context8.stop();
       }