@atlaskit/editor-synced-block-provider 3.14.1 → 3.14.3

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.14.3
+
+### Patch Changes
+
+- [`7702ea47c5329`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7702ea47c5329) -
+  [ux] Show editor flag when unpublished sync block is pasted
+- [`2a9dfb4b326e6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2a9dfb4b326e6) -
+  EDITOR-4698 add missing analytics for fetch references, graphql subsciption update, reference sync
+  block insert and delete success
+- Updated dependencies
+
+## 3.14.2
+
+### Patch Changes
+
+- [`28434cbe03f1e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/28434cbe03f1e) -
+  [ux] [EDITOR-2851]
+  - Implement unsync feature for source sync block
+  - Update deletion confirmation modal and reference block UI after source deletion
+
+- Updated dependencies
+
 ## 3.14.1
 
 ### 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; })(); }
@@ -225,24 +226,25 @@ var batchRetrieveSyncedBlocks = exports.batchRetrieveSyncedBlocks = /*#__PURE__*
 }();
 var deleteSyncedBlock = exports.deleteSyncedBlock = /*#__PURE__*/function () {
   var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(_ref6) {
-    var blockAri, response;
+    var blockAri, deleteReason, url, response;
     return _regenerator.default.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          blockAri = _ref6.blockAri;
-          _context4.next = 3;
-          return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
+          blockAri = _ref6.blockAri, deleteReason = _ref6.deleteReason;
+          url = deleteReason && (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding') ? "".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri), "?deletionReason=").concat(encodeURIComponent(deleteReason)) : "".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri));
+          _context4.next = 4;
+          return (0, _retry.fetchWithRetry)(url, {
             method: 'DELETE',
             headers: COMMON_HEADERS
           });
-        case 3:
+        case 4:
           response = _context4.sent;
           if (response.ok) {
-            _context4.next = 6;
+            _context4.next = 7;
             break;
           }
           throw new BlockError(response.status);
-        case 6:
+        case 7:
         case "end":
           return _context4.stop();
       }
@@ -290,11 +292,11 @@ 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 blockAri, blockInstanceId, sourceAri, product, content, stepVersion, requestBody, response;
+    var blockAri, blockInstanceId, sourceAri, product, content, stepVersion, status, requestBody, response;
     return _regenerator.default.wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
-          blockAri = _ref0.blockAri, blockInstanceId = _ref0.blockInstanceId, sourceAri = _ref0.sourceAri, product = _ref0.product, content = _ref0.content, stepVersion = _ref0.stepVersion;
+          blockAri = _ref0.blockAri, blockInstanceId = _ref0.blockInstanceId, sourceAri = _ref0.sourceAri, product = _ref0.product, content = _ref0.content, stepVersion = _ref0.stepVersion, status = _ref0.status;
           requestBody = {
             blockAri: blockAri,
             blockInstanceId: blockInstanceId,
@@ -305,25 +307,28 @@ var createSyncedBlock = exports.createSyncedBlock = /*#__PURE__*/function () {
           if (stepVersion !== undefined) {
             requestBody.stepVersion = stepVersion;
           }
-          _context6.next = 5;
+          if (status !== undefined && (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
+            requestBody.status = status;
+          }
+          _context6.next = 6;
           return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block"), {
             method: 'POST',
             headers: COMMON_HEADERS,
             body: JSON.stringify(requestBody)
           });
-        case 5:
+        case 6:
           response = _context6.sent;
           if (response.ok) {
-            _context6.next = 8;
+            _context6.next = 9;
             break;
           }
           throw new BlockError(response.status);
-        case 8:
-          _context6.next = 10;
+        case 9:
+          _context6.next = 11;
           return response.json();
-        case 10:
-          return _context6.abrupt("return", _context6.sent);
         case 11:
+          return _context6.abrupt("return", _context6.sent);
+        case 12:
         case "end":
           return _context6.stop();
       }

package/dist/cjs/hooks/useFetchSyncBlockData.js

@@ -90,7 +90,9 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
           setFetchState({
             syncBlockInstance: {
               resourceId: resourceId || '',
-              error: _types.SyncBlockError.Errored
+              error: {
+                type: _types.SyncBlockError.Errored
+              }
             },
             isLoading: false
           });

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

@@ -12,6 +12,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _react = require("react");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _ari = require("../../clients/block-service/ari");
 var _blockService = require("../../clients/block-service/blockService");
 var _blockSubscription = require("../../clients/block-service/blockSubscription");
@@ -153,7 +154,9 @@ var fetchReferences = exports.fetchReferences = /*#__PURE__*/function () {
               if (!resourceId) {
                 // could not extract resourceId from blockAri, return InvalidContent error
                 return {
-                  error: _types.SyncBlockError.InvalidContent,
+                  error: {
+                    type: _types.SyncBlockError.InvalidContent
+                  },
                   resourceId: blockContentResponse.blockAri
                 };
               }
@@ -164,14 +167,18 @@ var fetchReferences = exports.fetchReferences = /*#__PURE__*/function () {
             } catch (_unused2) {
               // JSON parsing error, return InvalidContent error
               return {
-                error: _types.SyncBlockError.InvalidContent,
+                error: {
+                  type: _types.SyncBlockError.InvalidContent
+                },
                 resourceId: blockContentResponse.blockAri
               };
             }
           });
           errorInstances = (errors || []).map(function (errorBlock) {
             return {
-              error: _types.SyncBlockError.Errored,
+              error: {
+                type: _types.SyncBlockError.Errored
+              },
               resourceId: errorBlock.blockAri
             };
           });
@@ -226,7 +233,10 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                 break;
               }
               return _context2.abrupt("return", {
-                error: _types.SyncBlockError.NotFound,
+                error: {
+                  type: _types.SyncBlockError.NotFound,
+                  reason: blockContentResponse.deletionReason
+                },
                 resourceId: resourceId
               });
             case 8:
@@ -241,7 +251,8 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                   contentUpdatedAt: (0, _utils.convertContentUpdatedAt)(blockContentResponse.contentUpdatedAt),
                   sourceAri: blockContentResponse.sourceAri,
                   product: blockContentResponse.product,
-                  status: blockContentResponse.status
+                  status: blockContentResponse.status,
+                  deletionReason: blockContentResponse.deletionReason
                 },
                 resourceId: resourceId
               });
@@ -253,12 +264,16 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                 break;
               }
               return _context2.abrupt("return", {
-                error: mapBlockError(_context2.t0),
+                error: {
+                  type: mapBlockError(_context2.t0)
+                },
                 resourceId: resourceId
               });
             case 16:
               return _context2.abrupt("return", {
-                error: _types.SyncBlockError.Errored,
+                error: {
+                  type: _types.SyncBlockError.Errored
+                },
                 resourceId: resourceId
               });
             case 17:
@@ -381,7 +396,9 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
               }
               return _context4.abrupt("return", blockNodeIdentifiers.map(function (blockNodeIdentifier) {
                 return {
-                  error: _types.SyncBlockError.Errored,
+                  error: {
+                    type: _types.SyncBlockError.Errored
+                  },
                   resourceId: blockNodeIdentifier.resourceId
                 };
               }));
@@ -423,7 +440,10 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                 break;
               }
               results.push({
-                error: _types.SyncBlockError.NotFound,
+                error: {
+                  type: _types.SyncBlockError.NotFound,
+                  reason: blockContentResponse.deletionReason
+                },
                 resourceId: resourceId
               });
               return _context4.abrupt("continue", 25);
@@ -438,13 +458,16 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                     blockInstanceId: blockContentResponse.blockInstanceId,
                     sourceAri: blockContentResponse.sourceAri,
                     product: blockContentResponse.product,
-                    status: blockContentResponse.status
+                    status: blockContentResponse.status,
+                    deletionReason: blockContentResponse.deletionReason
                   },
                   resourceId: resourceId
                 });
               } catch (_unused3) {
                 results.push({
-                  error: _types.SyncBlockError.Errored,
+                  error: {
+                    type: _types.SyncBlockError.Errored
+                  },
                   resourceId: resourceId
                 });
               }
@@ -486,7 +509,9 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             case 44:
               processedResourceIds.add(_resourceId);
               results.push({
-                error: mapErrorResponseCode(errorResponse.code),
+                error: {
+                  type: mapErrorResponseCode(errorResponse.code)
+                },
                 resourceId: _resourceId
               });
             case 46:
@@ -511,7 +536,9 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                   blockNodeIdentifier = _step3.value;
                   if (!processedResourceIds.has(blockNodeIdentifier.resourceId)) {
                     results.push({
-                      error: _types.SyncBlockError.NotFound,
+                      error: {
+                        type: _types.SyncBlockError.NotFound
+                      },
                       resourceId: blockNodeIdentifier.resourceId
                     });
                   }
@@ -527,7 +554,9 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
               _context4.t2 = _context4["catch"](5);
               return _context4.abrupt("return", blockNodeIdentifiers.map(function (blockNodeIdentifier) {
                 return {
-                  error: _context4.t2 instanceof _blockService.BlockError ? mapBlockError(_context4.t2) : _types.SyncBlockError.Errored,
+                  error: {
+                    type: _context4.t2 instanceof _blockService.BlockError ? mapBlockError(_context4.t2) : _types.SyncBlockError.Errored
+                  },
                   resourceId: blockNodeIdentifier.resourceId
                 };
               }));
@@ -587,13 +616,15 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
       parentAri = _ref4.parentAri,
       parentId = _ref4.parentId,
       product = _ref4.product,
-      getVersion = _ref4.getVersion;
+      getVersion = _ref4.getVersion,
+      isParentUnpublished = _ref4.isParentUnpublished;
     (0, _classCallCheck2.default)(this, BlockServiceADFWriteProvider);
     this.cloudId = cloudId;
     this.parentAri = parentAri;
     this.parentId = parentId;
     this.product = product;
     this.getVersion = getVersion;
+    this.isParentUnpublished = isParentUnpublished;
   }
 
   // it will first try to update and if it can't (404) then it will try to create
@@ -663,7 +694,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
     key: "createData",
     value: function () {
       var _createData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(data) {
-        var resourceId, blockAri, stepVersion;
+        var _this$isParentUnpubli;
+        var resourceId, blockAri, stepVersion, status;
         return _regenerator.default.wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -683,41 +715,43 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
                 resourceId: resourceId
               });
               stepVersion = this.getVersion ? this.getVersion() : undefined;
-              _context6.prev = 5;
-              _context6.next = 8;
+              status = (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding') ? (_this$isParentUnpubli = this.isParentUnpublished) !== null && _this$isParentUnpubli !== void 0 && _this$isParentUnpubli.call(this) ? 'unpublished' : data.status || 'active' : undefined;
+              _context6.prev = 6;
+              _context6.next = 9;
               return (0, _blockService.createSyncedBlock)({
                 blockAri: blockAri,
                 blockInstanceId: data.blockInstanceId,
                 sourceAri: this.parentAri,
                 product: this.product,
                 content: JSON.stringify(data.content),
-                stepVersion: stepVersion
+                stepVersion: stepVersion,
+                status: status
               });
-            case 8:
+            case 9:
               return _context6.abrupt("return", {
                 resourceId: resourceId
               });
-            case 11:
-              _context6.prev = 11;
-              _context6.t0 = _context6["catch"](5);
+            case 12:
+              _context6.prev = 12;
+              _context6.t0 = _context6["catch"](6);
               if (!(_context6.t0 instanceof _blockService.BlockError)) {
-                _context6.next = 15;
+                _context6.next = 16;
                 break;
               }
               return _context6.abrupt("return", {
                 error: mapBlockError(_context6.t0),
                 resourceId: resourceId
               });
-            case 15:
+            case 16:
               return _context6.abrupt("return", {
                 error: (0, _errorHandling.stringifyError)(_context6.t0),
                 resourceId: resourceId
               });
-            case 16:
+            case 17:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[5, 11]]);
+        }, _callee6, this, [[6, 12]]);
       }));
       function createData(_x6) {
         return _createData.apply(this, arguments);
@@ -727,7 +761,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
   }, {
     key: "deleteData",
     value: function () {
-      var _deleteData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(resourceId) {
+      var _deleteData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(resourceId, deleteReason) {
         var blockAri;
         return _regenerator.default.wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
@@ -751,7 +785,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
               _context7.prev = 3;
               _context7.next = 6;
               return (0, _blockService.deleteSyncedBlock)({
-                blockAri: blockAri
+                blockAri: blockAri,
+                deleteReason: deleteReason
               });
             case 6:
               return _context7.abrupt("return", {
@@ -792,7 +827,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
           }
         }, _callee7, this, [[3, 9]]);
       }));
-      function deleteData(_x7) {
+      function deleteData(_x7, _x8) {
         return _deleteData.apply(this, arguments);
       }
       return deleteData;
@@ -865,7 +900,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
           }
         }, _callee8, this, [[2, 8]]);
       }));
-      function updateReferenceData(_x8, _x9) {
+      function updateReferenceData(_x9, _x0) {
         return _updateReferenceData.apply(this, arguments);
       }
       return updateReferenceData;
@@ -877,7 +912,8 @@ var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(_re
     parentAri = _ref5.parentAri,
     parentId = _ref5.parentId,
     product = _ref5.product,
-    getVersion = _ref5.getVersion;
+    getVersion = _ref5.getVersion,
+    isParentUnpublished = _ref5.isParentUnpublished;
   return {
     fetchProvider: new BlockServiceADFFetchProvider({
       cloudId: cloudId,
@@ -888,7 +924,8 @@ var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(_re
       parentAri: parentAri,
       parentId: parentId,
       product: product,
-      getVersion: getVersion
+      getVersion: getVersion,
+      isParentUnpublished: isParentUnpublished
     })
   };
 };
@@ -897,16 +934,18 @@ var useMemoizedBlockServiceAPIProviders = exports.useMemoizedBlockServiceAPIProv
     parentAri = _ref6.parentAri,
     parentId = _ref6.parentId,
     product = _ref6.product,
-    getVersion = _ref6.getVersion;
+    getVersion = _ref6.getVersion,
+    isParentUnpublished = _ref6.isParentUnpublished;
   return (0, _react.useMemo)(function () {
     return createBlockServiceAPIProviders({
       cloudId: cloudId,
       parentAri: parentAri,
       parentId: parentId,
       product: product,
-      getVersion: getVersion
+      getVersion: getVersion,
+      isParentUnpublished: isParentUnpublished
     });
-  }, [cloudId, parentAri, parentId, product, getVersion]);
+  }, [cloudId, parentAri, parentId, product, getVersion, isParentUnpublished]);
 };
 var createBlockServiceFetchOnlyAPIProvider = function createBlockServiceFetchOnlyAPIProvider(_ref7) {
   var cloudId = _ref7.cloudId,

package/dist/cjs/providers/syncBlockProvider.js

@@ -121,7 +121,9 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
                   return data;
                 }, function () {
                   return {
-                    error: _types.SyncBlockError.Errored,
+                    error: {
+                      type: _types.SyncBlockError.Errored
+                    },
                     resourceId: blockIdentifier.resourceId
                   };
                 });
@@ -141,7 +143,9 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
                   return data;
                 }, function () {
                   return {
-                    error: _types.SyncBlockError.Errored,
+                    error: {
+                      type: _types.SyncBlockError.Errored
+                    },
                     resourceId: blockIdentifier.resourceId
                   };
                 });
@@ -246,7 +250,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
   }, {
     key: "deleteNodesData",
     value: (function () {
-      var _deleteNodesData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(resourceIds) {
+      var _deleteNodesData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(resourceIds, deletionReason) {
         var _this4 = this;
         var results;
         return _regenerator.default.wrap(function _callee3$(_context3) {
@@ -263,7 +267,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
                 if (!_this4.writeProvider) {
                   return Promise.reject('Write provider not set');
                 }
-                return _this4.writeProvider.deleteData(resourceId);
+                return _this4.writeProvider.deleteData(resourceId, deletionReason);
               }));
             case 4:
               results = _context3.sent;
@@ -284,7 +288,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
           }
         }, _callee3, this);
       }));
-      function deleteNodesData(_x4) {
+      function deleteNodesData(_x4, _x5) {
         return _deleteNodesData.apply(this, arguments);
       }
       return deleteNodesData;
@@ -382,7 +386,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
           }
         }, _callee4, this);
       }));
-      function fetchSyncBlockSourceInfo(_x5, _x6, _x7, _x8) {
+      function fetchSyncBlockSourceInfo(_x6, _x7, _x8, _x9) {
         return _fetchSyncBlockSourceInfo.apply(this, arguments);
       }
       return fetchSyncBlockSourceInfo;