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

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.14.1
+
+### Patch Changes
+
+- [`838e5da4cc27d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/838e5da4cc27d) -
+  Refactor SyncBlockLabel and BlockServiceAPI provider
+
 ## 3.14.0
 
 ### Minor Changes

package/dist/cjs/clients/block-service/blockSubscription.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.subscribeToBlockUpdates = void 0;
 var _graphqlWs = require("graphql-ws");
+var _utils = require("../../utils/utils");
 var GRAPHQL_WS_ENDPOINT = '/gateway/api/graphql/subscriptions';
 var blockServiceClient = null;
 var getBlockServiceClient = function getBlockServiceClient() {
@@ -60,6 +61,7 @@ var parseSubscriptionPayload = function parseSubscriptionPayload(payload) {
       blockAri: payload.blockAri,
       blockInstanceId: payload.blockInstanceId,
       content: JSON.parse(payload.content),
+      contentUpdatedAt: (0, _utils.convertContentUpdatedAt)(payload.contentUpdatedAt),
       createdAt: createdAt,
       createdBy: payload.createdBy,
       product: payload.product,

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

@@ -12,13 +12,13 @@ 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");
 var _types = require("../../common/types");
 var _errorHandling = require("../../utils/errorHandling");
 var _resourceId2 = require("../../utils/resourceId");
+var _utils = require("../../utils/utils");
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -104,24 +104,16 @@ var convertToSyncBlockData = exports.convertToSyncBlockData = function convertTo
       // BE returns microseconds, convert to milliseconds
       // BE should fix this in the future
       createdAt = new Date(data.createdAt / 1000).toISOString();
-    } catch (e) {
+    } catch (_unused) {
       // fallback to undefined
       // as we don't want to block the whole process due to invalid date
       createdAt = undefined;
     }
   }
-  var contentUpdatedAt;
-  if (typeof data.contentUpdatedAt === 'number' && (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
-    try {
-      contentUpdatedAt = new Date(data.contentUpdatedAt).toISOString();
-    } catch (e) {
-      contentUpdatedAt = undefined;
-    }
-  }
   return {
     blockInstanceId: data.blockInstanceId,
     content: JSON.parse(data.content),
-    contentUpdatedAt: contentUpdatedAt,
+    contentUpdatedAt: (0, _utils.convertContentUpdatedAt)(data.contentUpdatedAt),
     createdAt: createdAt,
     createdBy: data.createdBy,
     product: data.product,
@@ -169,7 +161,7 @@ var fetchReferences = exports.fetchReferences = /*#__PURE__*/function () {
                 data: convertToSyncBlockData(blockContentResponse, resourceId),
                 resourceId: resourceId
               };
-            } catch (_unused) {
+            } catch (_unused2) {
               // JSON parsing error, return InvalidContent error
               return {
                 error: _types.SyncBlockError.InvalidContent,
@@ -212,7 +204,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
     key: "fetchData",
     value: function () {
       var _fetchData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(resourceId) {
-        var blockAri, blockContentResponse, value, syncedBlockData, contentUpdatedAt;
+        var blockAri, blockContentResponse, value, syncedBlockData;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -240,47 +232,40 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             case 8:
               // Parse the synced block content from the response's content
               syncedBlockData = JSON.parse(value);
-              if (typeof blockContentResponse.contentUpdatedAt === 'number' && (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
-                try {
-                  contentUpdatedAt = new Date(blockContentResponse.contentUpdatedAt).toISOString();
-                } catch (e) {
-                  contentUpdatedAt = undefined;
-                }
-              }
               return _context2.abrupt("return", {
                 data: {
                   content: syncedBlockData,
                   resourceId: blockAri,
                   blockInstanceId: blockContentResponse.blockInstanceId,
                   // this was the node's localId, but has become the resourceId.
-                  contentUpdatedAt: contentUpdatedAt,
+                  contentUpdatedAt: (0, _utils.convertContentUpdatedAt)(blockContentResponse.contentUpdatedAt),
                   sourceAri: blockContentResponse.sourceAri,
                   product: blockContentResponse.product,
                   status: blockContentResponse.status
                 },
                 resourceId: resourceId
               });
-            case 13:
-              _context2.prev = 13;
+            case 12:
+              _context2.prev = 12;
               _context2.t0 = _context2["catch"](1);
               if (!(_context2.t0 instanceof _blockService.BlockError)) {
-                _context2.next = 17;
+                _context2.next = 16;
                 break;
               }
               return _context2.abrupt("return", {
                 error: mapBlockError(_context2.t0),
                 resourceId: resourceId
               });
-            case 17:
+            case 16:
               return _context2.abrupt("return", {
                 error: _types.SyncBlockError.Errored,
                 resourceId: resourceId
               });
-            case 18:
+            case 17:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[1, 13]]);
+        }, _callee2, this, [[1, 12]]);
       }));
       function fetchData(_x2) {
         return _fetchData.apply(this, arguments);
@@ -373,7 +358,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
     value: (function () {
       var _batchFetchData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(blockNodeIdentifiers) {
         var _this2 = this;
-        var blockIdentifiers, validResourceIds, processedResourceIds, response, results, _iterator, _step, blockContentResponse, resourceId, value, syncedBlockData, contentUpdatedAt, _iterator2, _step2, errorResponse, _resourceId, _iterator3, _step3, blockNodeIdentifier;
+        var blockIdentifiers, validResourceIds, processedResourceIds, response, results, _iterator, _step, blockContentResponse, resourceId, value, syncedBlockData, _iterator2, _step2, errorResponse, _resourceId, _iterator3, _step3, blockNodeIdentifier;
         return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -445,19 +430,11 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             case 24:
               try {
                 syncedBlockData = JSON.parse(value);
-                contentUpdatedAt = void 0;
-                if (typeof blockContentResponse.contentUpdatedAt === 'number' && (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
-                  try {
-                    contentUpdatedAt = new Date(blockContentResponse.contentUpdatedAt).toISOString();
-                  } catch (e) {
-                    contentUpdatedAt = undefined;
-                  }
-                }
                 results.push({
                   data: {
                     content: syncedBlockData,
                     resourceId: blockContentResponse.blockAri,
-                    contentUpdatedAt: contentUpdatedAt,
+                    contentUpdatedAt: (0, _utils.convertContentUpdatedAt)(blockContentResponse.contentUpdatedAt),
                     blockInstanceId: blockContentResponse.blockInstanceId,
                     sourceAri: blockContentResponse.sourceAri,
                     product: blockContentResponse.product,
@@ -465,7 +442,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                   },
                   resourceId: resourceId
                 });
-              } catch (_unused2) {
+              } catch (_unused3) {
                 results.push({
                   error: _types.SyncBlockError.Errored,
                   resourceId: resourceId
@@ -590,6 +567,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             sourceAri: parsedData.sourceAri,
             product: parsedData.product,
             createdAt: parsedData.createdAt,
+            contentUpdatedAt: parsedData.contentUpdatedAt,
             createdBy: parsedData.createdBy,
             status: parsedData.status
           },

package/dist/cjs/store-manager/referenceSyncBlockStoreManager.js

@@ -499,7 +499,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
     value: (function () {
       var _fetchSyncBlocksData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(syncBlockNodes) {
         var _this5 = this;
-        var nodesToFetch, _this$fetchExperience, data, resolvedData, hasUnexpectedError, hasExpectedError, _this$fetchExperience2, _this$fetchExperience3, _this$fetchExperience4;
+        var nodesToFetch, _this$fetchExperience, data, hasUnexpectedError, hasExpectedError, _this$fetchExperience2, _this$fetchExperience3, _this$fetchExperience4;
         return _regenerator.default.wrap(function _callee2$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -547,7 +547,6 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
               });
             case 12:
               data = _context3.sent;
-              resolvedData = [];
               hasUnexpectedError = false;
               hasExpectedError = false;
               data.forEach(function (syncBlockInstance) {
@@ -559,7 +558,6 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                 var existingSyncBlock = _this5.getFromCache(syncBlockInstance.resourceId);
                 var resolvedSyncBlockInstance = existingSyncBlock ? (0, _resolveSyncBlockInstance.resolveSyncBlockInstance)(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
                 _this5.updateCache(resolvedSyncBlockInstance);
-                resolvedData.push(resolvedSyncBlockInstance);
                 if (syncBlockInstance.error) {
                   var _this5$fireAnalyticsE2;
                   (_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, (0, _errorHandling.fetchErrorPayload)(syncBlockInstance.error, syncBlockInstance.resourceId));
@@ -588,7 +586,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
                   (_this$fetchExperience4 = this.fetchExperience) === null || _this$fetchExperience4 === void 0 || _this$fetchExperience4.success();
                 }
               }
-            case 18:
+            case 17:
             case "end":
               return _context3.stop();
           }

package/dist/cjs/utils/utils.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getContentIdAndProductFromResourceId = exports.createSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodesToSyncBlockNodes = exports.convertPMNodeToSyncBlockNode = void 0;
+exports.getContentIdAndProductFromResourceId = exports.createSyncBlockNode = exports.convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockJSONNodeToSyncBlockNode = exports.convertPMNodesToSyncBlockNodes = exports.convertPMNodeToSyncBlockNode = exports.convertContentUpdatedAt = void 0;
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /* eslint-disable require-unicode-regexp  */
 
 var convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockPMNodeToSyncBlockData = function convertSyncBlockPMNodeToSyncBlockData(node) {
@@ -57,4 +58,14 @@ var getContentIdAndProductFromResourceId = exports.getContentIdAndProductFromRes
     };
   }
   throw new Error("Invalid resourceId: ".concat(resourceId));
+};
+var convertContentUpdatedAt = exports.convertContentUpdatedAt = function convertContentUpdatedAt(contentUpdatedAt) {
+  if (typeof contentUpdatedAt === 'number' && (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
+    try {
+      return new Date(contentUpdatedAt).toISOString();
+    } catch (_unused) {
+      return undefined;
+    }
+  }
+  return undefined;
 };

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

@@ -1,4 +1,5 @@
 import { createClient } from 'graphql-ws';
+import { convertContentUpdatedAt } from '../../utils/utils';
 const GRAPHQL_WS_ENDPOINT = '/gateway/api/graphql/subscriptions';
 let blockServiceClient = null;
 const getBlockServiceClient = () => {
@@ -69,6 +70,7 @@ const parseSubscriptionPayload = payload => {
       blockAri: payload.blockAri,
       blockInstanceId: payload.blockInstanceId,
       content: JSON.parse(payload.content),
+      contentUpdatedAt: convertContentUpdatedAt(payload.contentUpdatedAt),
       createdAt,
       createdBy: payload.createdBy,
       product: payload.product,

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

@@ -1,12 +1,12 @@
 /* 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';
 import { SyncBlockError } from '../../common/types';
 import { stringifyError } from '../../utils/errorHandling';
 import { createResourceIdForReference } from '../../utils/resourceId';
+import { convertContentUpdatedAt } from '../../utils/utils';
 const mapBlockError = error => {
   switch (error.status) {
     case 400:
@@ -87,24 +87,16 @@ export const convertToSyncBlockData = (data, resourceId) => {
       // BE returns microseconds, convert to milliseconds
       // BE should fix this in the future
       createdAt = new Date(data.createdAt / 1000).toISOString();
-    } catch (e) {
+    } catch {
       // fallback to undefined
       // as we don't want to block the whole process due to invalid date
       createdAt = undefined;
     }
   }
-  let contentUpdatedAt;
-  if (typeof data.contentUpdatedAt === 'number' && fg('platform_synced_block_dogfooding')) {
-    try {
-      contentUpdatedAt = new Date(data.contentUpdatedAt).toISOString();
-    } catch (e) {
-      contentUpdatedAt = undefined;
-    }
-  }
   return {
     blockInstanceId: data.blockInstanceId,
     content: JSON.parse(data.content),
-    contentUpdatedAt,
+    contentUpdatedAt: convertContentUpdatedAt(data.contentUpdatedAt),
     createdAt,
     createdBy: data.createdBy,
     product: data.product,
@@ -189,21 +181,13 @@ class BlockServiceADFFetchProvider {
 
       // Parse the synced block content from the response's content
       const syncedBlockData = JSON.parse(value);
-      let contentUpdatedAt;
-      if (typeof blockContentResponse.contentUpdatedAt === 'number' && fg('platform_synced_block_dogfooding')) {
-        try {
-          contentUpdatedAt = new Date(blockContentResponse.contentUpdatedAt).toISOString();
-        } catch (e) {
-          contentUpdatedAt = undefined;
-        }
-      }
       return {
         data: {
           content: syncedBlockData,
           resourceId: blockAri,
           blockInstanceId: blockContentResponse.blockInstanceId,
           // this was the node's localId, but has become the resourceId.
-          contentUpdatedAt,
+          contentUpdatedAt: convertContentUpdatedAt(blockContentResponse.contentUpdatedAt),
           sourceAri: blockContentResponse.sourceAri,
           product: blockContentResponse.product,
           status: blockContentResponse.status
@@ -325,19 +309,11 @@ class BlockServiceADFFetchProvider {
           }
           try {
             const syncedBlockData = JSON.parse(value);
-            let contentUpdatedAt;
-            if (typeof blockContentResponse.contentUpdatedAt === 'number' && fg('platform_synced_block_dogfooding')) {
-              try {
-                contentUpdatedAt = new Date(blockContentResponse.contentUpdatedAt).toISOString();
-              } catch (e) {
-                contentUpdatedAt = undefined;
-              }
-            }
             results.push({
               data: {
                 content: syncedBlockData,
                 resourceId: blockContentResponse.blockAri,
-                contentUpdatedAt,
+                contentUpdatedAt: convertContentUpdatedAt(blockContentResponse.contentUpdatedAt),
                 blockInstanceId: blockContentResponse.blockInstanceId,
                 sourceAri: blockContentResponse.sourceAri,
                 product: blockContentResponse.product,
@@ -411,6 +387,7 @@ class BlockServiceADFFetchProvider {
           sourceAri: parsedData.sourceAri,
           product: parsedData.product,
           createdAt: parsedData.createdAt,
+          contentUpdatedAt: parsedData.contentUpdatedAt,
           createdBy: parsedData.createdBy,
           status: parsedData.status
         },

package/dist/es2019/store-manager/referenceSyncBlockStoreManager.js

@@ -399,7 +399,6 @@ export class ReferenceSyncBlockStoreManager {
         this.syncBlockFetchDataRequests.delete(node.attrs.resourceId);
       });
     });
-    const resolvedData = [];
     let hasUnexpectedError = false;
     let hasExpectedError = false;
     data.forEach(syncBlockInstance => {
@@ -411,7 +410,6 @@ export class ReferenceSyncBlockStoreManager {
       const existingSyncBlock = this.getFromCache(syncBlockInstance.resourceId);
       const resolvedSyncBlockInstance = existingSyncBlock ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
       this.updateCache(resolvedSyncBlockInstance);
-      resolvedData.push(resolvedSyncBlockInstance);
       if (syncBlockInstance.error) {
         var _this$fireAnalyticsEv0;
         (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 ? void 0 : _this$fireAnalyticsEv0.call(this, fetchErrorPayload(syncBlockInstance.error, syncBlockInstance.resourceId));

package/dist/es2019/utils/utils.js

@@ -1,5 +1,6 @@
 /* eslint-disable require-unicode-regexp  */
 
+import { fg } from '@atlaskit/platform-feature-flags';
 export const convertSyncBlockPMNodeToSyncBlockData = node => {
   return {
     blockInstanceId: node.attrs.localId,
@@ -47,4 +48,14 @@ export const getContentIdAndProductFromResourceId = resourceId => {
     };
   }
   throw new Error(`Invalid resourceId: ${resourceId}`);
+};
+export const convertContentUpdatedAt = contentUpdatedAt => {
+  if (typeof contentUpdatedAt === 'number' && fg('platform_synced_block_dogfooding')) {
+    try {
+      return new Date(contentUpdatedAt).toISOString();
+    } catch {
+      return undefined;
+    }
+  }
+  return undefined;
 };

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

@@ -1,4 +1,5 @@
 import { createClient } from 'graphql-ws';
+import { convertContentUpdatedAt } from '../../utils/utils';
 var GRAPHQL_WS_ENDPOINT = '/gateway/api/graphql/subscriptions';
 var blockServiceClient = null;
 var getBlockServiceClient = function getBlockServiceClient() {
@@ -54,6 +55,7 @@ var parseSubscriptionPayload = function parseSubscriptionPayload(payload) {
       blockAri: payload.blockAri,
       blockInstanceId: payload.blockInstanceId,
       content: JSON.parse(payload.content),
+      contentUpdatedAt: convertContentUpdatedAt(payload.contentUpdatedAt),
       createdAt: createdAt,
       createdBy: payload.createdBy,
       product: payload.product,

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

@@ -11,13 +11,13 @@ 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';
 import { SyncBlockError } from '../../common/types';
 import { stringifyError } from '../../utils/errorHandling';
 import { createResourceIdForReference } from '../../utils/resourceId';
+import { convertContentUpdatedAt } from '../../utils/utils';
 var mapBlockError = function mapBlockError(error) {
   switch (error.status) {
     case 400:
@@ -98,24 +98,16 @@ export var convertToSyncBlockData = function convertToSyncBlockData(data, resour
       // BE returns microseconds, convert to milliseconds
       // BE should fix this in the future
       createdAt = new Date(data.createdAt / 1000).toISOString();
-    } catch (e) {
+    } catch (_unused) {
       // fallback to undefined
       // as we don't want to block the whole process due to invalid date
       createdAt = undefined;
     }
   }
-  var contentUpdatedAt;
-  if (typeof data.contentUpdatedAt === 'number' && fg('platform_synced_block_dogfooding')) {
-    try {
-      contentUpdatedAt = new Date(data.contentUpdatedAt).toISOString();
-    } catch (e) {
-      contentUpdatedAt = undefined;
-    }
-  }
   return {
     blockInstanceId: data.blockInstanceId,
     content: JSON.parse(data.content),
-    contentUpdatedAt: contentUpdatedAt,
+    contentUpdatedAt: convertContentUpdatedAt(data.contentUpdatedAt),
     createdAt: createdAt,
     createdBy: data.createdBy,
     product: data.product,
@@ -163,7 +155,7 @@ export var fetchReferences = /*#__PURE__*/function () {
                 data: convertToSyncBlockData(blockContentResponse, resourceId),
                 resourceId: resourceId
               };
-            } catch (_unused) {
+            } catch (_unused2) {
               // JSON parsing error, return InvalidContent error
               return {
                 error: SyncBlockError.InvalidContent,
@@ -206,7 +198,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
     key: "fetchData",
     value: function () {
       var _fetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(resourceId) {
-        var blockAri, blockContentResponse, value, syncedBlockData, contentUpdatedAt;
+        var blockAri, blockContentResponse, value, syncedBlockData;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -234,47 +226,40 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             case 8:
               // Parse the synced block content from the response's content
               syncedBlockData = JSON.parse(value);
-              if (typeof blockContentResponse.contentUpdatedAt === 'number' && fg('platform_synced_block_dogfooding')) {
-                try {
-                  contentUpdatedAt = new Date(blockContentResponse.contentUpdatedAt).toISOString();
-                } catch (e) {
-                  contentUpdatedAt = undefined;
-                }
-              }
               return _context2.abrupt("return", {
                 data: {
                   content: syncedBlockData,
                   resourceId: blockAri,
                   blockInstanceId: blockContentResponse.blockInstanceId,
                   // this was the node's localId, but has become the resourceId.
-                  contentUpdatedAt: contentUpdatedAt,
+                  contentUpdatedAt: convertContentUpdatedAt(blockContentResponse.contentUpdatedAt),
                   sourceAri: blockContentResponse.sourceAri,
                   product: blockContentResponse.product,
                   status: blockContentResponse.status
                 },
                 resourceId: resourceId
               });
-            case 13:
-              _context2.prev = 13;
+            case 12:
+              _context2.prev = 12;
               _context2.t0 = _context2["catch"](1);
               if (!(_context2.t0 instanceof BlockError)) {
-                _context2.next = 17;
+                _context2.next = 16;
                 break;
               }
               return _context2.abrupt("return", {
                 error: mapBlockError(_context2.t0),
                 resourceId: resourceId
               });
-            case 17:
+            case 16:
               return _context2.abrupt("return", {
                 error: SyncBlockError.Errored,
                 resourceId: resourceId
               });
-            case 18:
+            case 17:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[1, 13]]);
+        }, _callee2, this, [[1, 12]]);
       }));
       function fetchData(_x2) {
         return _fetchData.apply(this, arguments);
@@ -367,7 +352,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
     value: (function () {
       var _batchFetchData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(blockNodeIdentifiers) {
         var _this2 = this;
-        var blockIdentifiers, validResourceIds, processedResourceIds, response, results, _iterator, _step, blockContentResponse, resourceId, value, syncedBlockData, contentUpdatedAt, _iterator2, _step2, errorResponse, _resourceId, _iterator3, _step3, blockNodeIdentifier;
+        var blockIdentifiers, validResourceIds, processedResourceIds, response, results, _iterator, _step, blockContentResponse, resourceId, value, syncedBlockData, _iterator2, _step2, errorResponse, _resourceId, _iterator3, _step3, blockNodeIdentifier;
         return _regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -439,19 +424,11 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             case 24:
               try {
                 syncedBlockData = JSON.parse(value);
-                contentUpdatedAt = void 0;
-                if (typeof blockContentResponse.contentUpdatedAt === 'number' && fg('platform_synced_block_dogfooding')) {
-                  try {
-                    contentUpdatedAt = new Date(blockContentResponse.contentUpdatedAt).toISOString();
-                  } catch (e) {
-                    contentUpdatedAt = undefined;
-                  }
-                }
                 results.push({
                   data: {
                     content: syncedBlockData,
                     resourceId: blockContentResponse.blockAri,
-                    contentUpdatedAt: contentUpdatedAt,
+                    contentUpdatedAt: convertContentUpdatedAt(blockContentResponse.contentUpdatedAt),
                     blockInstanceId: blockContentResponse.blockInstanceId,
                     sourceAri: blockContentResponse.sourceAri,
                     product: blockContentResponse.product,
@@ -459,7 +436,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
                   },
                   resourceId: resourceId
                 });
-              } catch (_unused2) {
+              } catch (_unused3) {
                 results.push({
                   error: SyncBlockError.Errored,
                   resourceId: resourceId
@@ -584,6 +561,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
             sourceAri: parsedData.sourceAri,
             product: parsedData.product,
             createdAt: parsedData.createdAt,
+            contentUpdatedAt: parsedData.contentUpdatedAt,
             createdBy: parsedData.createdBy,
             status: parsedData.status
           },

package/dist/esm/store-manager/referenceSyncBlockStoreManager.js

@@ -493,7 +493,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
     value: (function () {
       var _fetchSyncBlocksData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(syncBlockNodes) {
         var _this5 = this;
-        var nodesToFetch, _this$fetchExperience, data, resolvedData, hasUnexpectedError, hasExpectedError, _this$fetchExperience2, _this$fetchExperience3, _this$fetchExperience4;
+        var nodesToFetch, _this$fetchExperience, data, hasUnexpectedError, hasExpectedError, _this$fetchExperience2, _this$fetchExperience3, _this$fetchExperience4;
         return _regeneratorRuntime.wrap(function _callee2$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -541,7 +541,6 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
               });
             case 12:
               data = _context3.sent;
-              resolvedData = [];
               hasUnexpectedError = false;
               hasExpectedError = false;
               data.forEach(function (syncBlockInstance) {
@@ -553,7 +552,6 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
                 var existingSyncBlock = _this5.getFromCache(syncBlockInstance.resourceId);
                 var resolvedSyncBlockInstance = existingSyncBlock ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
                 _this5.updateCache(resolvedSyncBlockInstance);
-                resolvedData.push(resolvedSyncBlockInstance);
                 if (syncBlockInstance.error) {
                   var _this5$fireAnalyticsE2;
                   (_this5$fireAnalyticsE2 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE2 === void 0 || _this5$fireAnalyticsE2.call(_this5, fetchErrorPayload(syncBlockInstance.error, syncBlockInstance.resourceId));
@@ -582,7 +580,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
                   (_this$fetchExperience4 = this.fetchExperience) === null || _this$fetchExperience4 === void 0 || _this$fetchExperience4.success();
                 }
               }
-            case 18:
+            case 17:
             case "end":
               return _context3.stop();
           }

package/dist/esm/utils/utils.js

@@ -1,5 +1,6 @@
 /* eslint-disable require-unicode-regexp  */
 
+import { fg } from '@atlaskit/platform-feature-flags';
 export var convertSyncBlockPMNodeToSyncBlockData = function convertSyncBlockPMNodeToSyncBlockData(node) {
   return {
     blockInstanceId: node.attrs.localId,
@@ -51,4 +52,14 @@ export var getContentIdAndProductFromResourceId = function getContentIdAndProduc
     };
   }
   throw new Error("Invalid resourceId: ".concat(resourceId));
+};
+export var convertContentUpdatedAt = function convertContentUpdatedAt(contentUpdatedAt) {
+  if (typeof contentUpdatedAt === 'number' && fg('platform_synced_block_dogfooding')) {
+    try {
+      return new Date(contentUpdatedAt).toISOString();
+    } catch (_unused) {
+      return undefined;
+    }
+  }
+  return undefined;
 };

package/dist/types/clients/block-service/blockSubscription.d.ts

@@ -16,6 +16,7 @@ export type ParsedBlockSubscriptionData = {
     blockAri: string;
     blockInstanceId: string;
     content: ADFEntity[];
+    contentUpdatedAt?: string;
     createdAt?: string;
     createdBy: string;
     product: SyncBlockProduct;

package/dist/types/utils/utils.d.ts

@@ -10,3 +10,4 @@ export declare const getContentIdAndProductFromResourceId: (resourceId: string)
     sourceProduct: SyncBlockProduct;
     sourceContentId: string;
 };
+export declare const convertContentUpdatedAt: (contentUpdatedAt: number | undefined) => string | undefined;

package/dist/types-ts4.5/clients/block-service/blockSubscription.d.ts

@@ -16,6 +16,7 @@ export type ParsedBlockSubscriptionData = {
     blockAri: string;
     blockInstanceId: string;
     content: ADFEntity[];
+    contentUpdatedAt?: string;
     createdAt?: string;
     createdBy: string;
     product: SyncBlockProduct;

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

@@ -10,3 +10,4 @@ export declare const getContentIdAndProductFromResourceId: (resourceId: string)
     sourceProduct: SyncBlockProduct;
     sourceContentId: string;
 };
+export declare const convertContentUpdatedAt: (contentUpdatedAt: number | undefined) => string | undefined;

package/package.json

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