@atlaskit/editor-synced-block-provider 4.1.6 → 4.1.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-synced-block-provider
 
+## 4.1.7
+
+### Patch Changes
+
+- [`612d18a57aabd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/612d18a57aabd) -
+  404s on updating a source synced block should be ignored
+- Updated dependencies
+
 ## 4.1.6
 
 ### Patch Changes

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 _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _ari = require("../../clients/block-service/ari");
 var _blockService = require("../../clients/block-service/blockService");
@@ -49,6 +50,8 @@ var mapErrorResponseCode = function mapErrorResponseCode(errorCode) {
   switch (errorCode) {
     case 'FORBIDDEN':
       return _types.SyncBlockError.Forbidden;
+    case 'RESOURCE_NOT_FOUND':
+      return (0, _platformFeatureFlags.fg)('block_service_source_repair') ? _types.SyncBlockError.NotFound : _types.SyncBlockError.Errored;
     case 'NOT_FOUND':
       return _types.SyncBlockError.NotFound;
     case 'INVALID_REQUEST':
@@ -832,8 +835,6 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
     this.product = product;
     this.getVersion = getVersion;
   }
-
-  // it will first try to update and if it can't (404) then it will try to create
   return (0, _createClass2.default)(BlockServiceADFWriteProvider, [{
     key: "writeData",
     value: function () {
@@ -1241,10 +1242,19 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
                       block = _step7.value;
                       error = errorResourceIds.get(block.resourceId);
                       if (error) {
-                        results.push({
-                          error: error,
-                          resourceId: block.resourceId
-                        });
+                        if ((0, _platformFeatureFlags.fg)('block_service_source_repair')) {
+                          if (error !== _types.SyncBlockError.NotFound) {
+                            results.push({
+                              error: error,
+                              resourceId: block.resourceId
+                            });
+                          }
+                        } else {
+                          results.push({
+                            error: error,
+                            resourceId: block.resourceId
+                          });
+                        }
                       } else if (!results.some(function (r) {
                         return r.resourceId === block.resourceId;
                       })) {

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

@@ -1,5 +1,6 @@
 /* eslint-disable require-unicode-regexp  */
 import { useMemo } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { generateBlockAri, generateBlockAriFromReference } from '../../clients/block-service/ari';
 import { batchRetrieveSyncedBlocks, BlockError, BlockTimeoutError, createSyncedBlock, deleteSyncedBlock, getReferenceSyncedBlocks, getReferenceSyncedBlocksByBlockAri, getSyncedBlockContent, updateReferenceSyncedBlockOnDocument, updateSyncedBlock, updateSyncedBlocks } from '../../clients/block-service/blockService';
@@ -32,6 +33,8 @@ const mapErrorResponseCode = errorCode => {
   switch (errorCode) {
     case 'FORBIDDEN':
       return SyncBlockError.Forbidden;
+    case 'RESOURCE_NOT_FOUND':
+      return fg('block_service_source_repair') ? SyncBlockError.NotFound : SyncBlockError.Errored;
     case 'NOT_FOUND':
       return SyncBlockError.NotFound;
     case 'INVALID_REQUEST':
@@ -573,8 +576,6 @@ class BlockServiceADFWriteProvider {
     this.product = product;
     this.getVersion = getVersion;
   }
-
-  // it will first try to update and if it can't (404) then it will try to create
   async writeData(data) {
     if (!this.parentAri || !this.parentId) {
       return {
@@ -802,10 +803,19 @@ class BlockServiceADFWriteProvider {
         for (const block of data) {
           const error = errorResourceIds.get(block.resourceId);
           if (error) {
-            results.push({
-              error,
-              resourceId: block.resourceId
-            });
+            if (fg('block_service_source_repair')) {
+              if (error !== SyncBlockError.NotFound) {
+                results.push({
+                  error,
+                  resourceId: block.resourceId
+                });
+              }
+            } else {
+              results.push({
+                error,
+                resourceId: block.resourceId
+              });
+            }
           } else if (!results.some(r => r.resourceId === block.resourceId)) {
             // If not in success or error lists, mark as errored
             results.push({

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

@@ -11,6 +11,7 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 /* eslint-disable require-unicode-regexp  */
 import { useMemo } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { generateBlockAri as _generateBlockAri, generateBlockAriFromReference } from '../../clients/block-service/ari';
 import { batchRetrieveSyncedBlocks, BlockError, BlockTimeoutError, createSyncedBlock, deleteSyncedBlock, getReferenceSyncedBlocks, getReferenceSyncedBlocksByBlockAri, getSyncedBlockContent, updateReferenceSyncedBlockOnDocument, updateSyncedBlock, updateSyncedBlocks } from '../../clients/block-service/blockService';
@@ -43,6 +44,8 @@ var mapErrorResponseCode = function mapErrorResponseCode(errorCode) {
   switch (errorCode) {
     case 'FORBIDDEN':
       return SyncBlockError.Forbidden;
+    case 'RESOURCE_NOT_FOUND':
+      return fg('block_service_source_repair') ? SyncBlockError.NotFound : SyncBlockError.Errored;
     case 'NOT_FOUND':
       return SyncBlockError.NotFound;
     case 'INVALID_REQUEST':
@@ -827,8 +830,6 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
     this.product = product;
     this.getVersion = getVersion;
   }
-
-  // it will first try to update and if it can't (404) then it will try to create
   return _createClass(BlockServiceADFWriteProvider, [{
     key: "writeData",
     value: function () {
@@ -1236,10 +1237,19 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
                       block = _step7.value;
                       error = errorResourceIds.get(block.resourceId);
                       if (error) {
-                        results.push({
-                          error: error,
-                          resourceId: block.resourceId
-                        });
+                        if (fg('block_service_source_repair')) {
+                          if (error !== SyncBlockError.NotFound) {
+                            results.push({
+                              error: error,
+                              resourceId: block.resourceId
+                            });
+                          }
+                        } else {
+                          results.push({
+                            error: error,
+                            resourceId: block.resourceId
+                          });
+                        }
                       } else if (!results.some(function (r) {
                         return r.resourceId === block.resourceId;
                       })) {

package/package.json

@@ -81,12 +81,16 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "4.1.6",
+	"version": "4.1.7",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
 	},
-	"platform-feature-flags": {}
+	"platform-feature-flags": {
+		"block_service_source_repair": {
+			"type": "boolean"
+		}
+	}
 }