@atlaskit/editor-synced-block-provider 2.10.6 → 2.11.1

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

@@ -11,8 +11,11 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _uuid = _interopRequireDefault(require("uuid"));
+var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _utils = require("@atlaskit/editor-common/utils");
 var _rebaseTransaction2 = require("../common/rebase-transaction");
-var _utils = require("../utils/utils");
+var _errorHandling = require("../utils/errorHandling");
+var _utils2 = require("../utils/utils");
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 // A store manager responsible for the lifecycle and state management of source sync blocks in an editor instance.
 // Designed to manage local in-memory state and synchronize with an external data provider.
@@ -20,7 +23,7 @@ var _utils = require("../utils/utils");
 // Handles caching, debouncing updates, and publish/subscribe for local changes.
 // Ensures consistency between local and remote state, and can be used in both editor and renderer contexts.
 var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PURE__*/function () {
-  function SourceSyncBlockStoreManager(dataProvider) {
+  function SourceSyncBlockStoreManager(dataProvider, fireAnalyticsEvent) {
     var _this = this;
     (0, _classCallCheck2.default)(this, SourceSyncBlockStoreManager);
     (0, _defineProperty2.default)(this, "setPendingDeletion", function (Ids, value) {
@@ -31,6 +34,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
     });
     this.dataProvider = dataProvider;
     this.syncBlockCache = new Map();
+    this.fireAnalyticsEvent = fireAnalyticsEvent;
   }
   return (0, _createClass2.default)(SourceSyncBlockStoreManager, [{
     key: "isSourceBlock",
@@ -45,18 +49,27 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
   }, {
     key: "updateSyncBlockData",
     value: function updateSyncBlockData(syncBlockNode) {
-      if (!this.isSourceBlock(syncBlockNode)) {
-        throw new Error('Invalid sync block node type provided for updateSyncBlockData');
-      }
-      var _syncBlockNode$attrs = syncBlockNode.attrs,
-        localId = _syncBlockNode$attrs.localId,
-        resourceId = _syncBlockNode$attrs.resourceId;
-      if (!localId || !resourceId) {
-        throw new Error('Local ID or resource ID is not set');
+      try {
+        if (!this.isSourceBlock(syncBlockNode)) {
+          throw new Error('Invalid sync block node type provided for updateSyncBlockData');
+        }
+        var _syncBlockNode$attrs = syncBlockNode.attrs,
+          localId = _syncBlockNode$attrs.localId,
+          resourceId = _syncBlockNode$attrs.resourceId;
+        if (!localId || !resourceId) {
+          throw new Error('Local ID or resource ID is not set');
+        }
+        var syncBlockData = (0, _utils2.convertSyncBlockPMNodeToSyncBlockData)(syncBlockNode);
+        this.syncBlockCache.set(resourceId, syncBlockData);
+        return true;
+      } catch (error) {
+        var _this$fireAnalyticsEv;
+        (0, _monitoring.logException)(error, {
+          location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
+        });
+        (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 || _this$fireAnalyticsEv.call(this, (0, _errorHandling.updateCacheErrorPayload)(error.message));
+        return false;
       }
-      var syncBlockData = (0, _utils.convertSyncBlockPMNodeToSyncBlockData)(syncBlockNode);
-      this.syncBlockCache.set(resourceId, syncBlockData);
-      return true;
     }
 
     /**
@@ -68,7 +81,8 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
     key: "flush",
     value: (function () {
       var _flush = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults;
+        var _this2 = this;
+        var bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults, _this$fireAnalyticsEv2;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -104,18 +118,37 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
               return this.dataProvider.writeNodesData(bodiedSyncBlockNodes, bodiedSyncBlockData);
             case 10:
               writeResults = _context.sent;
-              return _context.abrupt("return", writeResults.every(function (result) {
+              if (!writeResults.every(function (result) {
                 return result.resourceId !== undefined;
-              }));
-            case 14:
-              _context.prev = 14;
-              _context.t0 = _context["catch"](0);
+              })) {
+                _context.next = 15;
+                break;
+              }
+              return _context.abrupt("return", true);
+            case 15:
+              writeResults.filter(function (result) {
+                return result.resourceId === undefined;
+              }).forEach(function (result) {
+                var _this2$fireAnalyticsE;
+                (_this2$fireAnalyticsE = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE === void 0 || _this2$fireAnalyticsE.call(_this2, (0, _errorHandling.updateErrorPayload)(result.error || 'Failed to write data'));
+              });
               return _context.abrupt("return", false);
             case 17:
+              _context.next = 24;
+              break;
+            case 19:
+              _context.prev = 19;
+              _context.t0 = _context["catch"](0);
+              (0, _monitoring.logException)(_context.t0, {
+                location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
+              });
+              (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 || _this$fireAnalyticsEv2.call(this, (0, _errorHandling.updateErrorPayload)(_context.t0.message));
+              return _context.abrupt("return", false);
+            case 24:
             case "end":
               return _context.stop();
           }
-        }, _callee, this, [[0, 14]]);
+        }, _callee, this, [[0, 19]]);
       }));
       function flush() {
         return _flush.apply(this, arguments);
@@ -168,10 +201,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
   }, {
     key: "registerConfirmationCallback",
     value: function registerConfirmationCallback(callback) {
-      var _this2 = this;
+      var _this3 = this;
       this.confirmationCallback = callback;
       return function () {
-        _this2.confirmationCallback = undefined;
+        _this3.confirmationCallback = undefined;
       };
     }
   }, {
@@ -191,7 +224,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
       var localId = (0, _uuid.default)();
       var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
       if (!this.dataProvider || !sourceId) {
-        throw new Error('Provider of sync block plugin is not set');
+        throw new Error('Data provider not set or source id not set');
       }
       var resourceId = this.dataProvider.generateResourceId(sourceId, localId);
       return {
@@ -207,14 +240,14 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
   }, {
     key: "createBodiedSyncBlockNode",
     value: function createBodiedSyncBlockNode(attrs) {
-      var _this3 = this;
+      var _this4 = this;
       try {
         if (!this.dataProvider) {
           throw new Error('Data provider not set');
         }
         var resourceId = attrs.resourceId,
           blockInstanceId = attrs.localId;
-        this.dataProvider.writeNodesData([(0, _utils.createBodiedSyncBlockNode)(blockInstanceId, resourceId)], [{
+        this.dataProvider.writeNodesData([(0, _utils2.createBodiedSyncBlockNode)(blockInstanceId, resourceId)], [{
           content: [],
           blockInstanceId: blockInstanceId,
           resourceId: resourceId
@@ -222,35 +255,44 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
           results.forEach(function (result) {
             var resourceId = result.resourceId;
             if (resourceId) {
-              _this3.commitPendingCreation(true);
+              _this4.commitPendingCreation(true);
             } else {
-              _this3.commitPendingCreation(false);
-              // TODO: EDITOR-1921 - add error analytics
+              var _this4$fireAnalyticsE;
+              _this4.commitPendingCreation(false);
+              (_this4$fireAnalyticsE = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE === void 0 || _this4$fireAnalyticsE.call(_this4, (0, _errorHandling.createErrorPayload)(result.error || 'Failed to create bodied sync block'));
             }
           });
-        }).catch(function (_reason) {
-          _this3.commitPendingCreation(false);
-          // TODO: EDITOR-1921 - add error analytics
+        }).catch(function (error) {
+          var _this4$fireAnalyticsE2;
+          _this4.commitPendingCreation(false);
+          (0, _monitoring.logException)(error, {
+            location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
+          });
+          (_this4$fireAnalyticsE2 = _this4.fireAnalyticsEvent) === null || _this4$fireAnalyticsE2 === void 0 || _this4$fireAnalyticsE2.call(_this4, (0, _errorHandling.createErrorPayload)(error.message));
         });
         this.registerPendingCreation(resourceId);
       } catch (error) {
+        var _this$fireAnalyticsEv3;
         if (this.hasPendingCreation()) {
           this.commitPendingCreation(false);
         }
-        // TODO: EDITOR-1921 - add error analytics
+        (0, _monitoring.logException)(error, {
+          location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
+        });
+        (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 || _this$fireAnalyticsEv3.call(this, (0, _errorHandling.createErrorPayload)(error.message));
       }
     }
   }, {
     key: "deleteSyncBlocksWithConfirmation",
     value: function () {
       var _deleteSyncBlocksWithConfirmation = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(tr, syncBlockIds) {
-        var _this4 = this;
-        var confirmed, _this$editorView, results, callback;
+        var _this5 = this;
+        var confirmed, _this$editorView, trToDispatch, results, callback, _this$fireAnalyticsEv4;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if (!this.confirmationCallback) {
-                _context2.next = 22;
+                _context2.next = 26;
                 break;
               }
               this.confirmationTransaction = tr;
@@ -259,55 +301,69 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
             case 4:
               confirmed = _context2.sent;
               if (!confirmed) {
-                _context2.next = 21;
+                _context2.next = 25;
                 break;
               }
-              (_this$editorView = this.editorView) === null || _this$editorView === void 0 || _this$editorView.dispatch(this.confirmationTransaction.setMeta('isConfirmedSyncBlockDeletion', true));
-              _context2.prev = 7;
+              trToDispatch = this.confirmationTransaction.setMeta('isConfirmedSyncBlockDeletion', true);
+              if (!trToDispatch.getMeta(_utils.pmHistoryPluginKey)) {
+                // bodiedSyncBlock deletion is expected to be permanent (cannot be undo)
+                // For a normal delete (not triggered by undo), remove it from history so that it cannot be undone
+                trToDispatch.setMeta('addToHistory', false);
+              }
+              (_this$editorView = this.editorView) === null || _this$editorView === void 0 || _this$editorView.dispatch(trToDispatch);
+              _context2.prev = 9;
               if (this.dataProvider) {
-                _context2.next = 10;
+                _context2.next = 12;
                 break;
               }
               throw new Error('Data provider not set');
-            case 10:
+            case 12:
               syncBlockIds.forEach(function (Ids) {
-                _this4.setPendingDeletion(Ids, true);
+                _this5.setPendingDeletion(Ids, true);
               });
-              _context2.next = 13;
+              _context2.next = 15;
               return this.dataProvider.deleteNodesData(syncBlockIds.map(function (attrs) {
                 return attrs.resourceId;
               }));
-            case 13:
+            case 15:
               results = _context2.sent;
               if (results.every(function (result) {
                 return result.success;
               })) {
                 callback = function callback(Ids) {
-                  return _this4.syncBlockCache.delete(Ids.resourceId);
+                  return _this5.syncBlockCache.delete(Ids.resourceId);
                 };
               } else {
                 callback = function callback(Ids) {
-                  _this4.setPendingDeletion(Ids, false);
+                  _this5.setPendingDeletion(Ids, false);
                 };
-                // TODO: EDITOR-1921 - add error analytics
+                results.filter(function (result) {
+                  return result.resourceId === undefined;
+                }).forEach(function (result) {
+                  var _this5$fireAnalyticsE;
+                  (_this5$fireAnalyticsE = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE === void 0 || _this5$fireAnalyticsE.call(_this5, (0, _errorHandling.deleteErrorPayload)(result.error || 'Failed to delete synced block'));
+                });
               }
               syncBlockIds.forEach(callback);
-              _context2.next = 21;
+              _context2.next = 25;
               break;
-            case 18:
-              _context2.prev = 18;
-              _context2.t0 = _context2["catch"](7);
+            case 20:
+              _context2.prev = 20;
+              _context2.t0 = _context2["catch"](9);
               syncBlockIds.forEach(function (Ids) {
-                _this4.setPendingDeletion(Ids, false);
+                _this5.setPendingDeletion(Ids, false);
+              });
+              (0, _monitoring.logException)(_context2.t0, {
+                location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
               });
-              // TODO: EDITOR-1921 - add error analytics
-            case 21:
+              (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 || _this$fireAnalyticsEv4.call(this, (0, _errorHandling.deleteErrorPayload)(_context2.t0.message));
+            case 25:
               this.confirmationTransaction = undefined;
-            case 22:
+            case 26:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[7, 18]]);
+        }, _callee2, this, [[9, 20]]);
       }));
       function deleteSyncBlocksWithConfirmation(_x, _x2) {
         return _deleteSyncBlocksWithConfirmation.apply(this, arguments);
@@ -332,6 +388,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
       this.creationCallback = undefined;
       this.dataProvider = undefined;
       this.editorView = undefined;
+      this.fireAnalyticsEvent = undefined;
     }
   }]);
 }();

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

@@ -15,12 +15,12 @@ var _sourceSyncBlockStoreManager = require("./sourceSyncBlockStoreManager");
 // SourceSyncBlockStoreManager is responsible for the lifecycle and state management of source sync blocks in an editor instance.
 // Can be used in both editor and renderer contexts.
 var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/function () {
-  function SyncBlockStoreManager(dataProvider) {
+  function SyncBlockStoreManager(dataProvider, fireAnalyticsEvent) {
     (0, _classCallCheck2.default)(this, SyncBlockStoreManager);
     // In future, if reference manager needs to reach to source manager and read it's current in memorey cache
     // we can pass the source manager as a parameter to the reference manager constructor
-    this.sourceSyncBlockStoreManager = new _sourceSyncBlockStoreManager.SourceSyncBlockStoreManager(dataProvider);
-    this.referenceSyncBlockStoreManager = new _referenceSyncBlockStoreManager.ReferenceSyncBlockStoreManager(dataProvider);
+    this.sourceSyncBlockStoreManager = new _sourceSyncBlockStoreManager.SourceSyncBlockStoreManager(dataProvider, fireAnalyticsEvent);
+    this.referenceSyncBlockStoreManager = new _referenceSyncBlockStoreManager.ReferenceSyncBlockStoreManager(dataProvider, fireAnalyticsEvent);
   }
   return (0, _createClass2.default)(SyncBlockStoreManager, [{
     key: "referenceManager",

package/dist/cjs/utils/errorHandling.js

@@ -3,11 +3,41 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.stringifyError = void 0;
+exports.updateErrorPayload = exports.updateCacheErrorPayload = exports.stringifyError = exports.getSourceInfoErrorPayload = exports.getErrorPayload = exports.fetchErrorPayload = exports.deleteErrorPayload = exports.createErrorPayload = void 0;
+var _analytics = require("@atlaskit/editor-common/analytics");
 var stringifyError = exports.stringifyError = function stringifyError(error) {
   try {
     return JSON.stringify(error);
   } catch (_unused) {
     return undefined;
   }
+};
+var getErrorPayload = exports.getErrorPayload = function getErrorPayload(actionSubjectId, error) {
+  return {
+    action: _analytics.ACTION.ERROR,
+    actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
+    actionSubjectId: actionSubjectId,
+    eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+    attributes: {
+      error: error
+    }
+  };
+};
+var fetchErrorPayload = exports.fetchErrorPayload = function fetchErrorPayload(error) {
+  return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_FETCH, error);
+};
+var getSourceInfoErrorPayload = exports.getSourceInfoErrorPayload = function getSourceInfoErrorPayload(error) {
+  return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_GET_SOURCE_INFO, error);
+};
+var updateErrorPayload = exports.updateErrorPayload = function updateErrorPayload(error) {
+  return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_UPDATE, error);
+};
+var createErrorPayload = exports.createErrorPayload = function createErrorPayload(error) {
+  return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE, error);
+};
+var deleteErrorPayload = exports.deleteErrorPayload = function deleteErrorPayload(error) {
+  return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_DELETE, error);
+};
+var updateCacheErrorPayload = exports.updateCacheErrorPayload = function updateCacheErrorPayload(error) {
+  return getErrorPayload(_analytics.ACTION_SUBJECT_ID.SYNCED_BLOCK_UPDATE_CACHE, error);
 };

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

@@ -12,7 +12,7 @@ export class BlockError extends Error {
 export const getSyncedBlockContent = async ({
   blockAri
 }) => {
-  const response = await fetch(`${BLOCK_SERVICE_API_URL}/block/${blockAri}`, {
+  const response = await fetch(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}`, {
     method: 'GET',
     headers: COMMON_HEADERS
   });
@@ -24,7 +24,7 @@ export const getSyncedBlockContent = async ({
 export const deleteSyncedBlock = async ({
   blockAri
 }) => {
-  const response = await fetch(`${BLOCK_SERVICE_API_URL}/block/${blockAri}`, {
+  const response = await fetch(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}`, {
     method: 'DELETE',
     headers: COMMON_HEADERS
   });
@@ -36,7 +36,7 @@ export const updateSyncedBlock = async ({
   blockAri,
   content
 }) => {
-  const response = await fetch(`${BLOCK_SERVICE_API_URL}/block/${blockAri}`, {
+  const response = await fetch(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}`, {
     method: 'PUT',
     headers: COMMON_HEADERS,
     body: JSON.stringify({
@@ -54,10 +54,11 @@ export const createSyncedBlock = async ({
   product,
   content
 }) => {
-  const response = await fetch(`${BLOCK_SERVICE_API_URL}/block/${blockAri}`, {
+  const response = await fetch(`${BLOCK_SERVICE_API_URL}/block`, {
     method: 'POST',
     headers: COMMON_HEADERS,
     body: JSON.stringify({
+      blockAri,
       blockInstanceId,
       sourceAri,
       product,

package/dist/es2019/clients/confluence/sourceInfo.js

@@ -1,5 +1,7 @@
 /* eslint-disable require-unicode-regexp  */
 
+import { logException } from '@atlaskit/editor-common/monitoring';
+import { getSourceInfoErrorPayload } from '../../utils/errorHandling';
 import { getPageIdAndTypeFromConfluencePageAri } from './ari';
 import { isBlogPageType } from './utils';
 const COMMON_HEADERS = {
@@ -52,7 +54,7 @@ const getConfluenceSourceInfo = async ari => {
   }
   return await response.json();
 };
-export const fetchConfluencePageInfo = async (pageAri, localId) => {
+export const fetchConfluencePageInfo = async (pageAri, localId, fireAnalyticsEvent) => {
   try {
     var _response$data, _response$data$conten, _response$data$conten2, _contentData$space;
     const {
@@ -60,15 +62,12 @@ export const fetchConfluencePageInfo = async (pageAri, localId) => {
     } = getPageIdAndTypeFromConfluencePageAri(pageAri);
     const response = await getConfluenceSourceInfo(pageAri);
     const contentData = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$conten = _response$data.content) === null || _response$data$conten === void 0 ? void 0 : (_response$data$conten2 = _response$data$conten.nodes) === null || _response$data$conten2 === void 0 ? void 0 : _response$data$conten2[0];
-    if (!contentData) {
-      throw new Error(`Failed to get content data`);
-    }
-    const title = contentData.title;
+    const title = contentData === null || contentData === void 0 ? void 0 : contentData.title;
     let url;
     const {
       base
-    } = contentData.links || {};
-    if (base && (_contentData$space = contentData.space) !== null && _contentData$space !== void 0 && _contentData$space.key && contentData.id) {
+    } = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {};
+    if (base && contentData !== null && contentData !== void 0 && (_contentData$space = contentData.space) !== null && _contentData$space !== void 0 && _contentData$space.key && contentData !== null && contentData !== void 0 && contentData.id) {
       if (isBlogPageType(pageType)) {
         url = `${base}/spaces/${contentData.space.key}/blog/edit-v2/${contentData.id}`;
       } else if (contentData.subType === 'live') {
@@ -78,12 +77,18 @@ export const fetchConfluencePageInfo = async (pageAri, localId) => {
       }
     }
     url = url && localId ? `${url}#block-${localId}` : url;
+    if (!title || !url) {
+      fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent(getSourceInfoErrorPayload('Failed to get confluence page source info'));
+    }
     return Promise.resolve({
       title,
       url
     });
   } catch (error) {
-    // TODO: EDITOR-1921 - add error analytics
+    logException(error, {
+      location: 'editor-synced-block-provider/sourceInfo'
+    });
+    fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent(getSourceInfoErrorPayload(error.message));
     return Promise.resolve(undefined);
   }
 };

package/dist/es2019/hooks/useFetchSyncBlockData.js

@@ -1,22 +1,30 @@
 import { useCallback, useEffect, useState } from 'react';
+import { logException } from '@atlaskit/editor-common/monitoring';
 import { SyncBlockError } from '../common/types';
+import { fetchErrorPayload } from '../utils/errorHandling';
 import { createSyncBlockNode } from '../utils/utils';
-export const useFetchSyncBlockData = (manager, resourceId, localId) => {
+export const useFetchSyncBlockData = (manager, resourceId, localId, fireAnalyticsEvent) => {
   const [syncBlockInstance, setSyncBlockInstance] = useState(null);
   const [isLoading, setIsLoading] = useState(true);
   const reloadData = useCallback(async () => {
     if (isLoading) {
       return;
     }
-    const syncBlockNode = resourceId && localId ? createSyncBlockNode(localId, resourceId) : null;
-    if (!syncBlockNode) {
-      return;
-    }
-    setIsLoading(true);
     try {
+      const syncBlockNode = resourceId && localId ? createSyncBlockNode(localId, resourceId) : null;
+      if (!syncBlockNode) {
+        throw new Error('Failed to create sync block node from resourceid and localid');
+      }
+      setIsLoading(true);
+
       // Fetch sync block data, the `subscribeToSyncBlock` will update the state once data is fetched
       await manager.referenceManager.fetchSyncBlocksData([syncBlockNode]);
     } catch (error) {
+      logException(error, {
+        location: 'editor-synced-block-provider/useFetchSyncBlockData'
+      });
+      fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent(fetchErrorPayload(error.message));
+
       // Set error state if fetching fails
       setSyncBlockInstance({
         resourceId: resourceId || '',
@@ -24,7 +32,7 @@ export const useFetchSyncBlockData = (manager, resourceId, localId) => {
       });
     }
     setIsLoading(false);
-  }, [isLoading, localId, manager.referenceManager, resourceId]);
+  }, [isLoading, localId, manager.referenceManager, resourceId, fireAnalyticsEvent]);
   useEffect(() => {
     const unsubscribe = manager.referenceManager.subscribeToSyncBlock(resourceId || '', localId || '', data => {
       setSyncBlockInstance(data);

package/dist/es2019/hooks/useHandleContentChanges.js

@@ -1,10 +1,6 @@
 import { useEffect } from 'react';
 export const useHandleContentChanges = (manager, syncBlockNode) => {
   useEffect(() => {
-    try {
-      manager.sourceManager.updateSyncBlockData(syncBlockNode);
-    } catch {
-      //TODO: EDITOR-1921 - add error analytics
-    }
+    manager.sourceManager.updateSyncBlockData(syncBlockNode);
   }, [manager, syncBlockNode]);
 };

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

@@ -62,6 +62,11 @@ class BlockServiceADFFetchProvider {
  * ADFWriteProvider implementation that writes synced block data to Block Service API
  */
 class BlockServiceADFWriteProvider {
+  constructor(sourceAri, product) {
+    this.sourceAri = sourceAri;
+    this.product = product;
+  }
+
   // it will first try to update and if it can't (404) then it will try to create
   async writeData(data) {
     const {
@@ -83,8 +88,8 @@ class BlockServiceADFWriteProvider {
           await createSyncedBlock({
             blockAri: resourceId,
             blockInstanceId: data.blockInstanceId,
-            sourceAri: resourceId,
-            product: 'confluence-page',
+            sourceAri: this.sourceAri,
+            product: this.product,
             content: JSON.stringify(data.content)
           });
         } else {
@@ -127,22 +132,22 @@ class BlockServiceADFWriteProvider {
       };
     }
   }
-  generateResourceId(sourceId, localId) {
-    return blockResourceIdFromSourceAndLocalId(sourceId, localId);
+  generateResourceId(sourceAri, localId) {
+    return blockResourceIdFromSourceAndLocalId(sourceAri, localId);
   }
 }
 
 /**
  * Factory function to create both providers with shared configuration
  */
-const createBlockServiceAPIProviders = () => {
+const createBlockServiceAPIProviders = (sourceAri, product) => {
   const fetchProvider = new BlockServiceADFFetchProvider();
-  const writeProvider = new BlockServiceADFWriteProvider();
+  const writeProvider = new BlockServiceADFWriteProvider(sourceAri, product);
   return {
     fetchProvider,
     writeProvider
   };
 };
-export const useMemoizedBlockServiceAPIProviders = () => {
-  return useMemo(createBlockServiceAPIProviders, []);
+export const useMemoizedBlockServiceAPIProviders = (sourceAri, product) => {
+  return useMemo(() => createBlockServiceAPIProviders(sourceAri, product), [sourceAri, product]);
 };

package/dist/es2019/providers/syncBlockProvider.js

@@ -61,7 +61,7 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
         return data;
       }, () => {
         return {
-          status: SyncBlockError.Errored,
+          error: SyncBlockError.Errored,
           resourceId
         };
       });
@@ -139,13 +139,13 @@ export class SyncBlockProvider extends SyncBlockDataProvider {
    *
    * @returns The source info
    */
-  fetchSyncBlockSourceInfo(localId, sourceAri, sourceProduct) {
+  fetchSyncBlockSourceInfo(localId, sourceAri, sourceProduct, fireAnalyticsEvent) {
     if (!sourceAri || !sourceProduct) {
-      return Promise.resolve(undefined);
+      return Promise.reject(new Error('Source ari or source product is undefined'));
     }
     switch (sourceProduct) {
       case 'confluence-page':
-        return fetchConfluencePageInfo(sourceAri, localId);
+        return fetchConfluencePageInfo(sourceAri, localId, fireAnalyticsEvent);
       case 'jira-work-item':
         return Promise.reject(new Error('Jira work item source product not supported'));
       default: