@atlaskit/editor-synced-block-provider 3.9.0 → 3.11.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.11.0
+
+### Minor Changes
+
+- [`7b4cb91fc67a6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7b4cb91fc67a6) -
+  Do not immediately show error state on initial load of blocks
+
+## 3.10.0
+
+### Minor Changes
+
+- [`7638bd91b6c72`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7638bd91b6c72) -
+  The errors should render correctly when using batch-retrieve to fetch synced blocks
+
 ## 3.9.0
 
 ### Minor Changes

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

@@ -43,6 +43,26 @@ var mapBlockError = function mapBlockError(error) {
   }
   return _types.SyncBlockError.Errored;
 };
+var mapErrorResponseCode = function mapErrorResponseCode(errorCode) {
+  switch (errorCode) {
+    case 'FORBIDDEN':
+      return _types.SyncBlockError.Forbidden;
+    case 'NOT_FOUND':
+      return _types.SyncBlockError.NotFound;
+    case 'INVALID_REQUEST':
+      return _types.SyncBlockError.InvalidRequest;
+    case 'CONFLICT':
+      return _types.SyncBlockError.Conflict;
+    case 'RATE_LIMITED':
+      return _types.SyncBlockError.RateLimited;
+    case 'SERVER_ERROR':
+      return _types.SyncBlockError.ServerError;
+    case 'INVALID_CONTENT':
+      return _types.SyncBlockError.InvalidContent;
+    default:
+      return _types.SyncBlockError.Errored;
+  }
+};
 
 /**
  * Extracts the ResourceId from a block ARI by returning the full path after synced-block/.
@@ -460,7 +480,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             case 44:
               processedResourceIds.add(_resourceId);
               results.push({
-                error: _types.SyncBlockError.Errored,
+                error: mapErrorResponseCode(errorResponse.code),
                 resourceId: _resourceId
               });
             case 46:

package/dist/cjs/providers/syncBlockProvider.js

@@ -115,11 +115,21 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
             case 10:
               _context.prev = 10;
               _context.t0 = _context["catch"](4);
-              return _context.abrupt("return", blockIdentifiers.map(function (blockIdentifier) {
-                return {
-                  error: _types.SyncBlockError.Errored,
-                  resourceId: blockIdentifier.resourceId
-                };
+              return _context.abrupt("return", Promise.allSettled(blockIdentifiers.map(function (blockIdentifier) {
+                return _this2.fetchProvider.fetchData(blockIdentifier.resourceId).then(function (data) {
+                  return data;
+                }, function () {
+                  return {
+                    error: _types.SyncBlockError.Errored,
+                    resourceId: blockIdentifier.resourceId
+                  };
+                });
+              })).then(function (results) {
+                return results.filter(function (result) {
+                  return result.status === 'fulfilled';
+                }).map(function (result) {
+                  return result.value;
+                });
               }));
             case 13:
               _context.next = 16;

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

@@ -26,6 +26,26 @@ const mapBlockError = error => {
   }
   return SyncBlockError.Errored;
 };
+const mapErrorResponseCode = errorCode => {
+  switch (errorCode) {
+    case 'FORBIDDEN':
+      return SyncBlockError.Forbidden;
+    case 'NOT_FOUND':
+      return SyncBlockError.NotFound;
+    case 'INVALID_REQUEST':
+      return SyncBlockError.InvalidRequest;
+    case 'CONFLICT':
+      return SyncBlockError.Conflict;
+    case 'RATE_LIMITED':
+      return SyncBlockError.RateLimited;
+    case 'SERVER_ERROR':
+      return SyncBlockError.ServerError;
+    case 'INVALID_CONTENT':
+      return SyncBlockError.InvalidContent;
+    default:
+      return SyncBlockError.Errored;
+  }
+};
 
 /**
  * Extracts the ResourceId from a block ARI by returning the full path after synced-block/.
@@ -314,7 +334,7 @@ class BlockServiceADFFetchProvider {
           }
           processedResourceIds.add(resourceId);
           results.push({
-            error: SyncBlockError.Errored,
+            error: mapErrorResponseCode(errorResponse.code),
             resourceId
           });
         }

package/dist/es2019/providers/syncBlockProvider.js

@@ -66,11 +66,22 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
       try {
         return await this.fetchProvider.batchFetchData(blockIdentifiers);
       } catch {
-        // If batch fetch fails, return error for all resourceIds
-        return blockIdentifiers.map(blockIdentifier => ({
-          error: SyncBlockError.Errored,
-          resourceId: blockIdentifier.resourceId
-        }));
+        // If batch fetch fails, fall back to individual fetch behavior
+        // This allows loading states to be shown before errors, matching non-batch behavior
+        return Promise.allSettled(blockIdentifiers.map(blockIdentifier => {
+          return this.fetchProvider.fetchData(blockIdentifier.resourceId).then(data => {
+            return data;
+          }, () => {
+            return {
+              error: SyncBlockError.Errored,
+              resourceId: blockIdentifier.resourceId
+            };
+          });
+        })).then(results => {
+          return results.filter(result => {
+            return result.status === 'fulfilled';
+          }).map(result => result.value);
+        });
       }
     } else {
       return Promise.allSettled(blockIdentifiers.map(blockIdentifier => {

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

@@ -37,6 +37,26 @@ var mapBlockError = function mapBlockError(error) {
   }
   return SyncBlockError.Errored;
 };
+var mapErrorResponseCode = function mapErrorResponseCode(errorCode) {
+  switch (errorCode) {
+    case 'FORBIDDEN':
+      return SyncBlockError.Forbidden;
+    case 'NOT_FOUND':
+      return SyncBlockError.NotFound;
+    case 'INVALID_REQUEST':
+      return SyncBlockError.InvalidRequest;
+    case 'CONFLICT':
+      return SyncBlockError.Conflict;
+    case 'RATE_LIMITED':
+      return SyncBlockError.RateLimited;
+    case 'SERVER_ERROR':
+      return SyncBlockError.ServerError;
+    case 'INVALID_CONTENT':
+      return SyncBlockError.InvalidContent;
+    default:
+      return SyncBlockError.Errored;
+  }
+};
 
 /**
  * Extracts the ResourceId from a block ARI by returning the full path after synced-block/.
@@ -454,7 +474,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             case 44:
               processedResourceIds.add(_resourceId);
               results.push({
-                error: SyncBlockError.Errored,
+                error: mapErrorResponseCode(errorResponse.code),
                 resourceId: _resourceId
               });
             case 46:

package/dist/esm/providers/syncBlockProvider.js

@@ -108,11 +108,21 @@ export var SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
             case 10:
               _context.prev = 10;
               _context.t0 = _context["catch"](4);
-              return _context.abrupt("return", blockIdentifiers.map(function (blockIdentifier) {
-                return {
-                  error: SyncBlockError.Errored,
-                  resourceId: blockIdentifier.resourceId
-                };
+              return _context.abrupt("return", Promise.allSettled(blockIdentifiers.map(function (blockIdentifier) {
+                return _this2.fetchProvider.fetchData(blockIdentifier.resourceId).then(function (data) {
+                  return data;
+                }, function () {
+                  return {
+                    error: SyncBlockError.Errored,
+                    resourceId: blockIdentifier.resourceId
+                  };
+                });
+              })).then(function (results) {
+                return results.filter(function (result) {
+                  return result.status === 'fulfilled';
+                }).map(function (result) {
+                  return result.value;
+                });
               }));
             case 13:
               _context.next = 16;

package/dist/types/clients/confluence/fetchMediaToken.d.ts

@@ -1,11 +1,10 @@
-type ConfigData = {
+export type ConfigData = {
     readonly clientId: string;
     readonly fileStoreUrl: string;
 };
-type TokenData = {
+export type TokenData = {
     collectionId?: string;
     config: ConfigData;
     token: string;
 };
 export declare const fetchMediaToken: (contentId: string) => Promise<TokenData>;
-export {};

package/dist/types/index.d.ts

@@ -6,7 +6,7 @@ export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
 export { generateBlockAri, generateBlockAriFromReference, getLocalIdFromBlockResourceId, } from './clients/block-service/ari';
 export { getConfluencePageAri, getPageIdAndTypeFromConfluencePageAri, } from './clients/confluence/ari';
-export { fetchMediaToken } from './clients/confluence/fetchMediaToken';
+export { fetchMediaToken, type TokenData, type ConfigData, } from './clients/confluence/fetchMediaToken';
 export { getJiraWorkItemAri, getJiraWorkItemIdFromAri } from './clients/jira/ari';
 export { useMemoizedBlockServiceAPIProviders, useMemoizedBlockServiceFetchOnlyAPIProvider, } from './providers/block-service/blockServiceAPI';
 export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';

package/dist/types-ts4.5/clients/confluence/fetchMediaToken.d.ts

@@ -1,11 +1,10 @@
-type ConfigData = {
+export type ConfigData = {
     readonly clientId: string;
     readonly fileStoreUrl: string;
 };
-type TokenData = {
+export type TokenData = {
     collectionId?: string;
     config: ConfigData;
     token: string;
 };
 export declare const fetchMediaToken: (contentId: string) => Promise<TokenData>;
-export {};

package/dist/types-ts4.5/index.d.ts

@@ -6,7 +6,7 @@ export { useFetchSyncBlockTitle } from './hooks/useFetchSyncBlockTitle';
 export { useHandleContentChanges } from './hooks/useHandleContentChanges';
 export { generateBlockAri, generateBlockAriFromReference, getLocalIdFromBlockResourceId, } from './clients/block-service/ari';
 export { getConfluencePageAri, getPageIdAndTypeFromConfluencePageAri, } from './clients/confluence/ari';
-export { fetchMediaToken } from './clients/confluence/fetchMediaToken';
+export { fetchMediaToken, type TokenData, type ConfigData, } from './clients/confluence/fetchMediaToken';
 export { getJiraWorkItemAri, getJiraWorkItemIdFromAri } from './clients/jira/ari';
 export { useMemoizedBlockServiceAPIProviders, useMemoizedBlockServiceFetchOnlyAPIProvider, } from './providers/block-service/blockServiceAPI';
 export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';

package/package.json

@@ -77,7 +77,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "3.9.0",
+	"version": "3.11.0",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",