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

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

@@ -8,6 +8,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(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; })(); }
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { fg } from '@atlaskit/platform-feature-flags';
 import { fetchWithRetry } from '../../utils/retry';
 export var isBlockContentResponse = function isBlockContentResponse(response) {
   var content = response.content;
@@ -218,24 +219,25 @@ export var batchRetrieveSyncedBlocks = /*#__PURE__*/function () {
 }();
 export var deleteSyncedBlock = /*#__PURE__*/function () {
   var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref6) {
-    var blockAri, response;
+    var blockAri, deleteReason, url, response;
     return _regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          blockAri = _ref6.blockAri;
-          _context4.next = 3;
-          return fetchWithRetry("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
+          blockAri = _ref6.blockAri, deleteReason = _ref6.deleteReason;
+          url = deleteReason && 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 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();
       }
@@ -283,11 +285,11 @@ export var updateSyncedBlock = /*#__PURE__*/function () {
 }();
 export var createSyncedBlock = /*#__PURE__*/function () {
   var _ref1 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(_ref0) {
-    var blockAri, blockInstanceId, sourceAri, product, content, stepVersion, requestBody, response;
+    var blockAri, blockInstanceId, sourceAri, product, content, stepVersion, status, requestBody, response;
     return _regeneratorRuntime.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,
@@ -298,25 +300,28 @@ export var createSyncedBlock = /*#__PURE__*/function () {
           if (stepVersion !== undefined) {
             requestBody.stepVersion = stepVersion;
           }
-          _context6.next = 5;
+          if (status !== undefined && fg('platform_synced_block_dogfooding')) {
+            requestBody.status = status;
+          }
+          _context6.next = 6;
           return 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/esm/hooks/useFetchSyncBlockData.js

@@ -83,7 +83,9 @@ export var useFetchSyncBlockData = function useFetchSyncBlockData(manager, resou
           setFetchState({
             syncBlockInstance: {
               resourceId: resourceId || '',
-              error: SyncBlockError.Errored
+              error: {
+                type: SyncBlockError.Errored
+              }
             },
             isLoading: false
           });

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

@@ -11,6 +11,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 /* eslint-disable require-unicode-regexp  */
 import { useMemo } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { generateBlockAri, generateBlockAriFromReference } from '../../clients/block-service/ari';
 import { batchRetrieveSyncedBlocks, BlockError, createSyncedBlock, deleteSyncedBlock, getReferenceSyncedBlocks, getReferenceSyncedBlocksByBlockAri, getSyncedBlockContent, updateReferenceSyncedBlockOnDocument, updateSyncedBlock } from '../../clients/block-service/blockService';
 import { subscribeToBlockUpdates as subscribeToBlockUpdatesWS } from '../../clients/block-service/blockSubscription';
@@ -147,7 +148,9 @@ export var fetchReferences = /*#__PURE__*/function () {
               if (!resourceId) {
                 // could not extract resourceId from blockAri, return InvalidContent error
                 return {
-                  error: SyncBlockError.InvalidContent,
+                  error: {
+                    type: SyncBlockError.InvalidContent
+                  },
                   resourceId: blockContentResponse.blockAri
                 };
               }
@@ -158,14 +161,18 @@ export var fetchReferences = /*#__PURE__*/function () {
             } catch (_unused2) {
               // JSON parsing error, return InvalidContent error
               return {
-                error: SyncBlockError.InvalidContent,
+                error: {
+                  type: SyncBlockError.InvalidContent
+                },
                 resourceId: blockContentResponse.blockAri
               };
             }
           });
           errorInstances = (errors || []).map(function (errorBlock) {
             return {
-              error: SyncBlockError.Errored,
+              error: {
+                type: SyncBlockError.Errored
+              },
               resourceId: errorBlock.blockAri
             };
           });
@@ -220,7 +227,10 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                 break;
               }
               return _context2.abrupt("return", {
-                error: SyncBlockError.NotFound,
+                error: {
+                  type: SyncBlockError.NotFound,
+                  reason: blockContentResponse.deletionReason
+                },
                 resourceId: resourceId
               });
             case 8:
@@ -235,7 +245,8 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                   contentUpdatedAt: convertContentUpdatedAt(blockContentResponse.contentUpdatedAt),
                   sourceAri: blockContentResponse.sourceAri,
                   product: blockContentResponse.product,
-                  status: blockContentResponse.status
+                  status: blockContentResponse.status,
+                  deletionReason: blockContentResponse.deletionReason
                 },
                 resourceId: resourceId
               });
@@ -247,12 +258,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: SyncBlockError.Errored,
+                error: {
+                  type: SyncBlockError.Errored
+                },
                 resourceId: resourceId
               });
             case 17:
@@ -375,7 +390,9 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
               }
               return _context4.abrupt("return", blockNodeIdentifiers.map(function (blockNodeIdentifier) {
                 return {
-                  error: SyncBlockError.Errored,
+                  error: {
+                    type: SyncBlockError.Errored
+                  },
                   resourceId: blockNodeIdentifier.resourceId
                 };
               }));
@@ -417,7 +434,10 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                 break;
               }
               results.push({
-                error: SyncBlockError.NotFound,
+                error: {
+                  type: SyncBlockError.NotFound,
+                  reason: blockContentResponse.deletionReason
+                },
                 resourceId: resourceId
               });
               return _context4.abrupt("continue", 25);
@@ -432,13 +452,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: SyncBlockError.Errored,
+                  error: {
+                    type: SyncBlockError.Errored
+                  },
                   resourceId: resourceId
                 });
               }
@@ -480,7 +503,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:
@@ -505,7 +530,9 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                   blockNodeIdentifier = _step3.value;
                   if (!processedResourceIds.has(blockNodeIdentifier.resourceId)) {
                     results.push({
-                      error: SyncBlockError.NotFound,
+                      error: {
+                        type: SyncBlockError.NotFound
+                      },
                       resourceId: blockNodeIdentifier.resourceId
                     });
                   }
@@ -521,7 +548,9 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
               _context4.t2 = _context4["catch"](5);
               return _context4.abrupt("return", blockNodeIdentifiers.map(function (blockNodeIdentifier) {
                 return {
-                  error: _context4.t2 instanceof BlockError ? mapBlockError(_context4.t2) : SyncBlockError.Errored,
+                  error: {
+                    type: _context4.t2 instanceof BlockError ? mapBlockError(_context4.t2) : SyncBlockError.Errored
+                  },
                   resourceId: blockNodeIdentifier.resourceId
                 };
               }));
@@ -581,13 +610,15 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
       parentAri = _ref4.parentAri,
       parentId = _ref4.parentId,
       product = _ref4.product,
-      getVersion = _ref4.getVersion;
+      getVersion = _ref4.getVersion,
+      isParentUnpublished = _ref4.isParentUnpublished;
     _classCallCheck(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
@@ -657,7 +688,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
     key: "createData",
     value: function () {
       var _createData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(data) {
-        var resourceId, blockAri, stepVersion;
+        var _this$isParentUnpubli;
+        var resourceId, blockAri, stepVersion, status;
         return _regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -677,41 +709,43 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
                 resourceId: resourceId
               });
               stepVersion = this.getVersion ? this.getVersion() : undefined;
-              _context6.prev = 5;
-              _context6.next = 8;
+              status = 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 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 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: 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);
@@ -721,7 +755,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
   }, {
     key: "deleteData",
     value: function () {
-      var _deleteData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(resourceId) {
+      var _deleteData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(resourceId, deleteReason) {
         var blockAri;
         return _regeneratorRuntime.wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
@@ -745,7 +779,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
               _context7.prev = 3;
               _context7.next = 6;
               return deleteSyncedBlock({
-                blockAri: blockAri
+                blockAri: blockAri,
+                deleteReason: deleteReason
               });
             case 6:
               return _context7.abrupt("return", {
@@ -786,7 +821,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
           }
         }, _callee7, this, [[3, 9]]);
       }));
-      function deleteData(_x7) {
+      function deleteData(_x7, _x8) {
         return _deleteData.apply(this, arguments);
       }
       return deleteData;
@@ -859,7 +894,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
           }
         }, _callee8, this, [[2, 8]]);
       }));
-      function updateReferenceData(_x8, _x9) {
+      function updateReferenceData(_x9, _x0) {
         return _updateReferenceData.apply(this, arguments);
       }
       return updateReferenceData;
@@ -871,7 +906,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,
@@ -882,7 +918,8 @@ var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(_re
       parentAri: parentAri,
       parentId: parentId,
       product: product,
-      getVersion: getVersion
+      getVersion: getVersion,
+      isParentUnpublished: isParentUnpublished
     })
   };
 };
@@ -891,16 +928,18 @@ export var useMemoizedBlockServiceAPIProviders = function useMemoizedBlockServic
     parentAri = _ref6.parentAri,
     parentId = _ref6.parentId,
     product = _ref6.product,
-    getVersion = _ref6.getVersion;
+    getVersion = _ref6.getVersion,
+    isParentUnpublished = _ref6.isParentUnpublished;
   return 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/esm/providers/syncBlockProvider.js

@@ -114,7 +114,9 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
                   return data;
                 }, function () {
                   return {
-                    error: SyncBlockError.Errored,
+                    error: {
+                      type: SyncBlockError.Errored
+                    },
                     resourceId: blockIdentifier.resourceId
                   };
                 });
@@ -134,7 +136,9 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
                   return data;
                 }, function () {
                   return {
-                    error: SyncBlockError.Errored,
+                    error: {
+                      type: SyncBlockError.Errored
+                    },
                     resourceId: blockIdentifier.resourceId
                   };
                 });
@@ -239,7 +243,7 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
   }, {
     key: "deleteNodesData",
     value: (function () {
-      var _deleteNodesData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(resourceIds) {
+      var _deleteNodesData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(resourceIds, deletionReason) {
         var _this4 = this;
         var results;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -256,7 +260,7 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
                 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;
@@ -277,7 +281,7 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
           }
         }, _callee3, this);
       }));
-      function deleteNodesData(_x4) {
+      function deleteNodesData(_x4, _x5) {
         return _deleteNodesData.apply(this, arguments);
       }
       return deleteNodesData;
@@ -375,7 +379,7 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
           }
         }, _callee4, this);
       }));
-      function fetchSyncBlockSourceInfo(_x5, _x6, _x7, _x8) {
+      function fetchSyncBlockSourceInfo(_x6, _x7, _x8, _x9) {
         return _fetchSyncBlockSourceInfo.apply(this, arguments);
       }
       return fetchSyncBlockSourceInfo;