@atlaskit/editor-synced-block-provider 4.2.5 → 4.2.6

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-synced-block-provider
 
+## 4.2.6
+
+### Patch Changes
+
+- [`9039c3cc043e0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9039c3cc043e0) -
+  Editor-5990-Fixed-deleting-source-synced-block-on-copied-page-throw-error"
+- Updated dependencies
+
 ## 4.2.5
 
 ### 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; })(); }
@@ -375,7 +376,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, url, response, result, isDeleted;
+    var blockAri, deleteReason, bodyData, url, response, result, allNotFound, isDeleted;
     return _regenerator.default.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -404,20 +405,34 @@ var deleteSyncedBlock = exports.deleteSyncedBlock = /*#__PURE__*/function () {
         case 10:
           result = _context4.sent;
           if (!(result.errors && result.errors.length > 0)) {
-            _context4.next = 13;
+            _context4.next = 17;
             break;
           }
+          if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_8')) {
+            _context4.next = 16;
+            break;
+          }
+          allNotFound = result.errors.every(function (e) {
+            var _e$extensions;
+            return ((_e$extensions = e.extensions) === null || _e$extensions === void 0 ? void 0 : _e$extensions.errorType) === 'RESOURCE_NOT_FOUND';
+          });
+          if (!allNotFound) {
+            _context4.next = 16;
+            break;
+          }
+          return _context4.abrupt("return");
+        case 16:
           throw new Error(result.errors.map(function (e) {
             return e.message;
           }).join(', '));
-        case 13:
+        case 17:
           isDeleted = (_result$data3 = result.data) === null || _result$data3 === void 0 || (_result$data3 = _result$data3.blockService_deleteBlock) === null || _result$data3 === void 0 ? void 0 : _result$data3.deleted;
           if (isDeleted) {
-            _context4.next = 16;
+            _context4.next = 20;
             break;
           }
           throw new Error('Block deletion failed; deleted flag is false');
-        case 16:
+        case 20:
         case "end":
           return _context4.stop();
       }

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

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 import { fetchWithRetry } from '../../utils/retry';
 export const isBlockContentResponse = response => {
   const content = response.content;
@@ -397,6 +398,18 @@ export const deleteSyncedBlock = async ({
   }
   const result = await response.json();
   if (result.errors && result.errors.length > 0) {
+    if (fg('platform_synced_block_patch_8')) {
+      const allNotFound = result.errors.every(e => {
+        var _e$extensions;
+        return ((_e$extensions = e.extensions) === null || _e$extensions === void 0 ? void 0 : _e$extensions.errorType) === 'RESOURCE_NOT_FOUND';
+      });
+      if (allNotFound) {
+        // do not throw an error, return early
+        // as if the block is not found, it is likely an orphan from a page copy.
+        // delete the synced block should just delete the block from the ADF, no need to delete it from the block service as it does not exist.
+        return;
+      }
+    }
     throw new Error(result.errors.map(e => e.message).join(', '));
   }
   const isDeleted = (_result$data3 = result.data) === null || _result$data3 === void 0 ? void 0 : (_result$data3$blockSe = _result$data3.blockService_deleteBlock) === null || _result$data3$blockSe === void 0 ? void 0 : _result$data3$blockSe.deleted;

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;
@@ -368,7 +369,7 @@ export var batchRetrieveSyncedBlocks = /*#__PURE__*/function () {
 export var deleteSyncedBlock = /*#__PURE__*/function () {
   var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref6) {
     var _result$data3;
-    var blockAri, deleteReason, bodyData, url, response, result, isDeleted;
+    var blockAri, deleteReason, bodyData, url, response, result, allNotFound, isDeleted;
     return _regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -397,20 +398,34 @@ export var deleteSyncedBlock = /*#__PURE__*/function () {
         case 10:
           result = _context4.sent;
           if (!(result.errors && result.errors.length > 0)) {
-            _context4.next = 13;
+            _context4.next = 17;
             break;
           }
+          if (!fg('platform_synced_block_patch_8')) {
+            _context4.next = 16;
+            break;
+          }
+          allNotFound = result.errors.every(function (e) {
+            var _e$extensions;
+            return ((_e$extensions = e.extensions) === null || _e$extensions === void 0 ? void 0 : _e$extensions.errorType) === 'RESOURCE_NOT_FOUND';
+          });
+          if (!allNotFound) {
+            _context4.next = 16;
+            break;
+          }
+          return _context4.abrupt("return");
+        case 16:
           throw new Error(result.errors.map(function (e) {
             return e.message;
           }).join(', '));
-        case 13:
+        case 17:
           isDeleted = (_result$data3 = result.data) === null || _result$data3 === void 0 || (_result$data3 = _result$data3.blockService_deleteBlock) === null || _result$data3 === void 0 ? void 0 : _result$data3.deleted;
           if (isDeleted) {
-            _context4.next = 16;
+            _context4.next = 20;
             break;
           }
           throw new Error('Block deletion failed; deleted flag is false');
-        case 16:
+        case 20:
         case "end":
           return _context4.stop();
       }

package/package.json

@@ -81,7 +81,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "4.2.5",
+	"version": "4.2.6",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -94,6 +94,9 @@
 		},
 		"platform_synced_block_patch_7": {
 			"type": "boolean"
+		},
+		"platform_synced_block_patch_8": {
+			"type": "boolean"
 		}
 	}
 }