@atlaskit/editor-synced-block-provider 2.10.5 → 2.11.0

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

@@ -1,6 +1,8 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { logException } from '@atlaskit/editor-common/monitoring';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { SyncBlockError } from '../common/types';
+import { fetchErrorPayload, getSourceInfoErrorPayload } from '../utils/errorHandling';
 import { resolveSyncBlockInstance } from '../utils/resolveSyncBlockInstance';
 import { createSyncBlockNode } from '../utils/utils';
 
@@ -10,7 +12,7 @@ import { createSyncBlockNode } from '../utils/utils';
 // Handles fetching source URL and title for sync blocks.
 // Can be used in both editor and renderer contexts.
 export class ReferenceSyncBlockStoreManager {
-  constructor(dataProvider) {
+  constructor(dataProvider, fireAnalyticsEvent) {
     _defineProperty(this, "isRefreshingSubscriptions", false);
     this.syncBlockCache = new Map();
     this.subscriptions = new Map();
@@ -18,6 +20,10 @@ export class ReferenceSyncBlockStoreManager {
     this.dataProvider = dataProvider;
     this.syncBlockURLRequests = new Map();
     this.providerFactories = new Map();
+    this.fireAnalyticsEvent = fireAnalyticsEvent;
+  }
+  updateFireAnalyticsEvent(fireAnalyticsEvent) {
+    this.fireAnalyticsEvent = fireAnalyticsEvent;
   }
 
   /**
@@ -40,38 +46,62 @@ export class ReferenceSyncBlockStoreManager {
       // this function will update the cache and call the subscriptions
       await this.fetchSyncBlocksData(syncBlocks);
     } catch (error) {
-      // TODO: EDITOR-1921 - add error analytics
+      var _this$fireAnalyticsEv;
+      logException(error, {
+        location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
+      });
+      (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 ? void 0 : _this$fireAnalyticsEv.call(this, fetchErrorPayload(error.message));
     } finally {
       this.isRefreshingSubscriptions = false;
     }
   }
-  retrieveSyncBlockSourceInfo(resourceId) {
-    if (!resourceId || !this.dataProvider) {
-      return;
-    }
-
-    // TODO: EDITOR-3312 - retrieve the source info based on the source sync block product
-
-    // if the sync block is a reference block, we need to fetch the URL to the source
-    // we could optimise this further by checking if the sync block is on the same page as the source
-    if (!this.syncBlockURLRequests.get(resourceId)) {
+  fetchSyncBlockSourceInfo(resourceId) {
+    try {
+      var _existingSyncBlock$da, _existingSyncBlock$da2;
+      if (!resourceId || !this.dataProvider) {
+        throw new Error('Data provider or resourceId not set');
+      }
+      if (this.syncBlockURLRequests.get(resourceId)) {
+        return;
+      }
       this.syncBlockURLRequests.set(resourceId, true);
-      this.dataProvider.retrieveSyncBlockSourceInfo(createSyncBlockNode('', resourceId)).then(sourceInfo => {
-        const existingSyncBlock = this.getFromCache(resourceId);
-        if (existingSyncBlock && existingSyncBlock.data) {
-          existingSyncBlock.data = {
-            ...existingSyncBlock.data,
-            sourceURL: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url,
-            sourceTitle: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.title
-          };
-          this.updateCache(existingSyncBlock);
-          if (sourceInfo !== null && sourceInfo !== void 0 && sourceInfo.title) {
-            this.updateSourceTitleSubscriptions(existingSyncBlock.resourceId, sourceInfo.title);
-          }
+      const existingSyncBlock = this.getFromCache(resourceId);
+      if (!existingSyncBlock) {
+        throw new Error('No existing sync block to fetch source info for');
+      }
+
+      // skip if source URL and title are already present
+      if ((_existingSyncBlock$da = existingSyncBlock.data) !== null && _existingSyncBlock$da !== void 0 && _existingSyncBlock$da.sourceURL && (_existingSyncBlock$da2 = existingSyncBlock.data) !== null && _existingSyncBlock$da2 !== void 0 && _existingSyncBlock$da2.sourceTitle) {
+        return;
+      }
+      const {
+        sourceAri,
+        product,
+        blockInstanceId
+      } = existingSyncBlock.data || {};
+      if (!sourceAri || !product || !blockInstanceId) {
+        throw new Error('SourceAri, product or blockInstanceId missing');
+      }
+      this.dataProvider.fetchSyncBlockSourceInfo(blockInstanceId, sourceAri, product, this.fireAnalyticsEvent).then(sourceInfo => {
+        if (!sourceInfo) {
+          return;
         }
+        this.updateCacheWithSourceInfo(resourceId, sourceInfo);
+        if (sourceInfo.title) {
+          this.updateSourceTitleSubscriptions(resourceId, sourceInfo.title);
+        }
+      }).catch(error => {
+        var _this$fireAnalyticsEv2;
+        (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 ? void 0 : _this$fireAnalyticsEv2.call(this, getSourceInfoErrorPayload(error.message));
       }).finally(() => {
-        this.syncBlockURLRequests.set(resourceId, false);
+        this.syncBlockURLRequests.delete(resourceId);
+      });
+    } catch (error) {
+      var _this$fireAnalyticsEv3;
+      logException(error, {
+        location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
       });
+      (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 ? void 0 : _this$fireAnalyticsEv3.call(this, getSourceInfoErrorPayload(error.message));
     }
   }
 
@@ -100,16 +130,16 @@ export class ReferenceSyncBlockStoreManager {
       }
     });
     const data = await this.dataProvider.fetchNodesData(nodesToFetch);
-    if (!data) {
-      throw new Error('Failed to fetch sync block node data');
-    }
     const resolvedData = [];
     data.forEach(syncBlockInstance => {
-      var _resolvedSyncBlockIns, _resolvedSyncBlockIns2;
       if (!syncBlockInstance.resourceId) {
+        var _this$fireAnalyticsEv4;
+        (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 ? void 0 : _this$fireAnalyticsEv4.call(this, fetchErrorPayload(syncBlockInstance.error || 'Returned sync block instance does not have resource id'));
         return;
       }
       if (syncBlockInstance.error) {
+        var _this$fireAnalyticsEv5;
+        (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 ? void 0 : _this$fireAnalyticsEv5.call(this, fetchErrorPayload(syncBlockInstance.error));
         this.updateCache(syncBlockInstance);
         resolvedData.push(syncBlockInstance);
         return;
@@ -118,14 +148,22 @@ export class ReferenceSyncBlockStoreManager {
       const resolvedSyncBlockInstance = existingSyncBlock ? resolveSyncBlockInstance(existingSyncBlock, syncBlockInstance) : syncBlockInstance;
       this.updateCache(resolvedSyncBlockInstance);
       resolvedData.push(resolvedSyncBlockInstance);
-
-      // fetch source URL and title if not already present
-      if ((!((_resolvedSyncBlockIns = resolvedSyncBlockInstance.data) !== null && _resolvedSyncBlockIns !== void 0 && _resolvedSyncBlockIns.sourceURL) || !((_resolvedSyncBlockIns2 = resolvedSyncBlockInstance.data) !== null && _resolvedSyncBlockIns2 !== void 0 && _resolvedSyncBlockIns2.sourceTitle)) && resolvedSyncBlockInstance.resourceId) {
-        this.retrieveSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
-      }
+      this.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
     });
     return [...resolvedData, ...blocksWithNotFoundError];
   }
+  updateCacheWithSourceInfo(resourceId, sourceInfo) {
+    const existingSyncBlock = this.getFromCache(resourceId);
+    if (existingSyncBlock && existingSyncBlock.data) {
+      existingSyncBlock.data.sourceURL = sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url;
+      existingSyncBlock.data = {
+        ...existingSyncBlock.data,
+        sourceURL: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.url,
+        sourceTitle: sourceInfo === null || sourceInfo === void 0 ? void 0 : sourceInfo.title
+      };
+      this.updateCache(existingSyncBlock);
+    }
+  }
   updateCache(syncBlock) {
     const {
       resourceId
@@ -168,7 +206,13 @@ export class ReferenceSyncBlockStoreManager {
     if (cachedData) {
       callback(cachedData);
     } else {
-      this.fetchSyncBlocksData([createSyncBlockNode(localId, resourceId)]).catch(() => {});
+      this.fetchSyncBlocksData([createSyncBlockNode(localId, resourceId)]).catch(error => {
+        var _this$fireAnalyticsEv6;
+        logException(error, {
+          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
+        });
+        (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 ? void 0 : _this$fireAnalyticsEv6.call(this, fetchErrorPayload(error.message));
+      });
     }
     return () => {
       const resourceSubscriptions = this.subscriptions.get(resourceId);
@@ -220,18 +264,27 @@ export class ReferenceSyncBlockStoreManager {
     };
   }
   subscribe(node, callback) {
-    // check node is a sync block, as we only support sync block subscriptions
-    if (node.type.name !== 'syncBlock') {
-      return () => {};
-    }
-    const {
-      resourceId,
-      localId
-    } = node.attrs;
-    if (!localId || !resourceId) {
+    try {
+      // check node is a sync block, as we only support sync block subscriptions
+      if (node.type.name !== 'syncBlock') {
+        throw new Error('Only sync block node subscriptions are supported');
+      }
+      const {
+        resourceId,
+        localId
+      } = node.attrs;
+      if (!localId || !resourceId) {
+        throw new Error('Missing local id or resource id');
+      }
+      return this.subscribeToSyncBlock(resourceId, localId, callback);
+    } catch (error) {
+      var _this$fireAnalyticsEv7;
+      logException(error, {
+        location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
+      });
+      (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 ? void 0 : _this$fireAnalyticsEv7.call(this, fetchErrorPayload(error.message));
       return () => {};
     }
-    return this.subscribeToSyncBlock(resourceId, localId, callback);
   }
 
   /**
@@ -249,6 +302,12 @@ export class ReferenceSyncBlockStoreManager {
   }
   getProviderFactory(resourceId) {
     if (!this.dataProvider) {
+      var _this$fireAnalyticsEv8;
+      const error = new Error('Data provider not set');
+      logException(error, {
+        location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
+      });
+      (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 ? void 0 : _this$fireAnalyticsEv8.call(this, fetchErrorPayload(error.message));
       return undefined;
     }
     const {
@@ -265,23 +324,38 @@ export class ReferenceSyncBlockStoreManager {
       this.providerFactories.set(resourceId, providerFactory);
     }
     if (providerCreator) {
-      this.retrieveDynamicProviders(resourceId, providerFactory, providerCreator);
+      try {
+        this.retrieveDynamicProviders(resourceId, providerFactory, providerCreator);
+      } catch (error) {
+        var _this$fireAnalyticsEv9;
+        logException(error, {
+          location: 'editor-synced-block-provider/referenceSyncBlockStoreManager'
+        });
+        (_this$fireAnalyticsEv9 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv9 === void 0 ? void 0 : _this$fireAnalyticsEv9.call(this, fetchErrorPayload(error.message));
+      }
     }
     return providerFactory;
   }
   retrieveDynamicProviders(resourceId, providerFactory, providerCreator) {
+    var _syncBlock$data2, _syncBlock$data3, _syncBlock$data4, _syncBlock$data5;
     if (!this.dataProvider) {
-      return;
+      throw new Error('Data provider not set');
     }
     const hasMediaProvider = providerFactory.hasProvider('mediaProvider');
     const hasEmojiProvider = providerFactory.hasProvider('emojiProvider');
     if (hasMediaProvider && hasEmojiProvider) {
       return;
     }
-    const parentInfo = this.dataProvider.retrieveSyncBlockParentInfo(this.syncBlockCache.get(resourceId));
-    if (!parentInfo) {
+    const syncBlock = this.getFromCache(resourceId);
+    if (!syncBlock || !((_syncBlock$data2 = syncBlock.data) !== null && _syncBlock$data2 !== void 0 && _syncBlock$data2.sourceAri) || !((_syncBlock$data3 = syncBlock.data) !== null && _syncBlock$data3 !== void 0 && _syncBlock$data3.product)) {
+      var _this$fireAnalyticsEv0;
+      (_this$fireAnalyticsEv0 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv0 === void 0 ? void 0 : _this$fireAnalyticsEv0.call(this, fetchErrorPayload('Sync block or source ari or product not found'));
       return;
     }
+    const parentInfo = this.dataProvider.retrieveSyncBlockParentInfo((_syncBlock$data4 = syncBlock.data) === null || _syncBlock$data4 === void 0 ? void 0 : _syncBlock$data4.sourceAri, (_syncBlock$data5 = syncBlock.data) === null || _syncBlock$data5 === void 0 ? void 0 : _syncBlock$data5.product);
+    if (!parentInfo) {
+      throw new Error('Unable to retrive sync block parent info');
+    }
     const {
       contentId,
       contentProduct
@@ -321,5 +395,6 @@ export class ReferenceSyncBlockStoreManager {
       providerFactory.destroy();
     });
     this.providerFactories.clear();
+    this.fireAnalyticsEvent = undefined;
   }
 }

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

@@ -1,7 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
 import uuid from 'uuid';
+import { logException } from '@atlaskit/editor-common/monitoring';
 import { rebaseTransaction } from '../common/rebase-transaction';
+import { updateErrorPayload, createErrorPayload, deleteErrorPayload, updateCacheErrorPayload } from '../utils/errorHandling';
 import { convertSyncBlockPMNodeToSyncBlockData, createBodiedSyncBlockNode } from '../utils/utils';
 // 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.
@@ -9,7 +11,7 @@ import { convertSyncBlockPMNodeToSyncBlockData, createBodiedSyncBlockNode } from
 // 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.
 export class SourceSyncBlockStoreManager {
-  constructor(dataProvider) {
+  constructor(dataProvider, fireAnalyticsEvent) {
     _defineProperty(this, "setPendingDeletion", (Ids, value) => {
       const syncBlock = this.syncBlockCache.get(Ids.resourceId);
       if (syncBlock) {
@@ -18,6 +20,7 @@ export class SourceSyncBlockStoreManager {
     });
     this.dataProvider = dataProvider;
     this.syncBlockCache = new Map();
+    this.fireAnalyticsEvent = fireAnalyticsEvent;
   }
   isSourceBlock(node) {
     return node.type.name === 'bodiedSyncBlock';
@@ -28,19 +31,28 @@ export class SourceSyncBlockStoreManager {
    * @param syncBlockNode - The sync block node to update
    */
   updateSyncBlockData(syncBlockNode) {
-    if (!this.isSourceBlock(syncBlockNode)) {
-      throw new Error('Invalid sync block node type provided for updateSyncBlockData');
-    }
-    const {
-      localId,
-      resourceId
-    } = syncBlockNode.attrs;
-    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');
+      }
+      const {
+        localId,
+        resourceId
+      } = syncBlockNode.attrs;
+      if (!localId || !resourceId) {
+        throw new Error('Local ID or resource ID is not set');
+      }
+      const syncBlockData = convertSyncBlockPMNodeToSyncBlockData(syncBlockNode);
+      this.syncBlockCache.set(resourceId, syncBlockData);
+      return true;
+    } catch (error) {
+      var _this$fireAnalyticsEv;
+      logException(error, {
+        location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
+      });
+      (_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 ? void 0 : _this$fireAnalyticsEv.call(this, updateCacheErrorPayload(error.message));
+      return false;
     }
-    const syncBlockData = convertSyncBlockPMNodeToSyncBlockData(syncBlockNode);
-    this.syncBlockCache.set(resourceId, syncBlockData);
-    return true;
   }
 
   /**
@@ -72,9 +84,21 @@ export class SourceSyncBlockStoreManager {
         return Promise.resolve(true);
       }
       const writeResults = await this.dataProvider.writeNodesData(bodiedSyncBlockNodes, bodiedSyncBlockData);
-      return writeResults.every(result => result.resourceId !== undefined);
-    } catch {
-      //TODO: EDITOR-1921 - add error analytics
+      if (writeResults.every(result => result.resourceId !== undefined)) {
+        return true;
+      } else {
+        writeResults.filter(result => result.resourceId === undefined).forEach(result => {
+          var _this$fireAnalyticsEv2;
+          (_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 ? void 0 : _this$fireAnalyticsEv2.call(this, updateErrorPayload(result.error || 'Failed to write data'));
+        });
+        return false;
+      }
+    } catch (error) {
+      var _this$fireAnalyticsEv3;
+      logException(error, {
+        location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
+      });
+      (_this$fireAnalyticsEv3 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv3 === void 0 ? void 0 : _this$fireAnalyticsEv3.call(this, updateErrorPayload(error.message));
       return false;
     }
   }
@@ -130,7 +154,7 @@ export class SourceSyncBlockStoreManager {
     const localId = uuid();
     const 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');
     }
     const resourceId = this.dataProvider.generateResourceId(sourceId, localId);
     return {
@@ -162,20 +186,29 @@ export class SourceSyncBlockStoreManager {
           if (resourceId) {
             this.commitPendingCreation(true);
           } else {
+            var _this$fireAnalyticsEv4;
             this.commitPendingCreation(false);
-            // TODO: EDITOR-1921 - add error analytics
+            (_this$fireAnalyticsEv4 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv4 === void 0 ? void 0 : _this$fireAnalyticsEv4.call(this, createErrorPayload(result.error || 'Failed to create bodied sync block'));
           }
         });
-      }).catch(_reason => {
+      }).catch(error => {
+        var _this$fireAnalyticsEv5;
         this.commitPendingCreation(false);
-        // TODO: EDITOR-1921 - add error analytics
+        logException(error, {
+          location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
+        });
+        (_this$fireAnalyticsEv5 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv5 === void 0 ? void 0 : _this$fireAnalyticsEv5.call(this, createErrorPayload(error.message));
       });
       this.registerPendingCreation(resourceId);
     } catch (error) {
+      var _this$fireAnalyticsEv6;
       if (this.hasPendingCreation()) {
         this.commitPendingCreation(false);
       }
-      // TODO: EDITOR-1921 - add error analytics
+      logException(error, {
+        location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
+      });
+      (_this$fireAnalyticsEv6 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv6 === void 0 ? void 0 : _this$fireAnalyticsEv6.call(this, createErrorPayload(error.message));
     }
   }
   async deleteSyncBlocksWithConfirmation(tr, syncBlockIds) {
@@ -200,14 +233,21 @@ export class SourceSyncBlockStoreManager {
             callback = Ids => {
               this.setPendingDeletion(Ids, false);
             };
-            // TODO: EDITOR-1921 - add error analytics
+            results.filter(result => result.resourceId === undefined).forEach(result => {
+              var _this$fireAnalyticsEv7;
+              (_this$fireAnalyticsEv7 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv7 === void 0 ? void 0 : _this$fireAnalyticsEv7.call(this, deleteErrorPayload(result.error || 'Failed to delete synced block'));
+            });
           }
           syncBlockIds.forEach(callback);
-        } catch (_error) {
+        } catch (error) {
+          var _this$fireAnalyticsEv8;
           syncBlockIds.forEach(Ids => {
             this.setPendingDeletion(Ids, false);
           });
-          // TODO: EDITOR-1921 - add error analytics
+          logException(error, {
+            location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
+          });
+          (_this$fireAnalyticsEv8 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv8 === void 0 ? void 0 : _this$fireAnalyticsEv8.call(this, deleteErrorPayload(error.message));
         }
       }
       this.confirmationTransaction = undefined;
@@ -227,5 +267,6 @@ export class SourceSyncBlockStoreManager {
     this.creationCallback = undefined;
     this.dataProvider = undefined;
     this.editorView = undefined;
+    this.fireAnalyticsEvent = undefined;
   }
 }

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

@@ -7,11 +7,11 @@ import { SourceSyncBlockStoreManager } from './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.
 export class SyncBlockStoreManager {
-  constructor(dataProvider) {
+  constructor(dataProvider, fireAnalyticsEvent) {
     // 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(dataProvider);
-    this.referenceSyncBlockStoreManager = new ReferenceSyncBlockStoreManager(dataProvider);
+    this.sourceSyncBlockStoreManager = new SourceSyncBlockStoreManager(dataProvider, fireAnalyticsEvent);
+    this.referenceSyncBlockStoreManager = new ReferenceSyncBlockStoreManager(dataProvider, fireAnalyticsEvent);
   }
   get referenceManager() {
     return this.referenceSyncBlockStoreManager;

package/dist/es2019/utils/errorHandling.js

@@ -1,7 +1,23 @@
+import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from "@atlaskit/editor-common/analytics";
 export const stringifyError = error => {
   try {
     return JSON.stringify(error);
   } catch {
     return undefined;
   }
-};
+};
+export const getErrorPayload = (actionSubjectId, error) => ({
+  action: ACTION.ERROR,
+  actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
+  actionSubjectId,
+  eventType: EVENT_TYPE.OPERATIONAL,
+  attributes: {
+    error
+  }
+});
+export const fetchErrorPayload = error => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_FETCH, error);
+export const getSourceInfoErrorPayload = error => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_GET_SOURCE_INFO, error);
+export const updateErrorPayload = error => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_UPDATE, error);
+export const createErrorPayload = error => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_CREATE, error);
+export const deleteErrorPayload = error => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_DELETE, error);
+export const updateCacheErrorPayload = error => getErrorPayload(ACTION_SUBJECT_ID.SYNCED_BLOCK_UPDATE_CACHE, error);

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

@@ -32,7 +32,7 @@ export var getSyncedBlockContent = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref.blockAri;
           _context.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(blockAri), {
+          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'GET',
             headers: COMMON_HEADERS
           });
@@ -66,7 +66,7 @@ export var deleteSyncedBlock = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref3.blockAri;
           _context2.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(blockAri), {
+          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'DELETE',
             headers: COMMON_HEADERS
           });
@@ -95,7 +95,7 @@ export var updateSyncedBlock = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref5.blockAri, content = _ref5.content;
           _context3.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(blockAri), {
+          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'PUT',
             headers: COMMON_HEADERS,
             body: JSON.stringify({
@@ -127,10 +127,11 @@ export var createSyncedBlock = /*#__PURE__*/function () {
         case 0:
           blockAri = _ref7.blockAri, blockInstanceId = _ref7.blockInstanceId, sourceAri = _ref7.sourceAri, product = _ref7.product, content = _ref7.content;
           _context4.next = 3;
-          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(blockAri), {
+          return fetch("".concat(BLOCK_SERVICE_API_URL, "/block"), {
             method: 'POST',
             headers: COMMON_HEADERS,
             body: JSON.stringify({
+              blockAri: blockAri,
               blockInstanceId: blockInstanceId,
               sourceAri: sourceAri,
               product: product,

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

@@ -5,6 +5,8 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /* 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';
 var COMMON_HEADERS = {
@@ -63,8 +65,8 @@ var getConfluenceSourceInfo = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-export var fetchConfluenceSourceInfo = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(pageAri, localId) {
+export var fetchConfluencePageInfo = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(pageAri, localId, fireAnalyticsEvent) {
     var _response$data, _contentData$space, _getPageIdAndTypeFrom, pageType, response, contentData, title, url, _ref3, base;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -76,15 +78,9 @@ export var fetchConfluenceSourceInfo = /*#__PURE__*/function () {
         case 4:
           response = _context2.sent;
           contentData = (_response$data = response.data) === null || _response$data === void 0 || (_response$data = _response$data.content) === null || _response$data === void 0 || (_response$data = _response$data.nodes) === null || _response$data === void 0 ? void 0 : _response$data[0];
-          if (contentData) {
-            _context2.next = 8;
-            break;
-          }
-          throw new Error("Failed to get content data");
-        case 8:
-          title = contentData.title;
-          _ref3 = contentData.links || {}, base = _ref3.base;
-          if (base && (_contentData$space = contentData.space) !== null && _contentData$space !== void 0 && _contentData$space.key && contentData.id) {
+          title = contentData === null || contentData === void 0 ? void 0 : contentData.title;
+          _ref3 = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {}, base = _ref3.base;
+          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 = "".concat(base, "/spaces/").concat(contentData.space.key, "/blog/edit-v2/").concat(contentData.id);
             } else if (contentData.subType === 'live') {
@@ -94,21 +90,28 @@ export var fetchConfluenceSourceInfo = /*#__PURE__*/function () {
             }
           }
           url = url && localId ? "".concat(url, "#block-").concat(localId) : url;
+          if (!title || !url) {
+            fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent(getSourceInfoErrorPayload('Failed to get confluence page source info'));
+          }
           return _context2.abrupt("return", Promise.resolve({
             title: title,
             url: url
           }));
-        case 15:
-          _context2.prev = 15;
+        case 14:
+          _context2.prev = 14;
           _context2.t0 = _context2["catch"](0);
+          logException(_context2.t0, {
+            location: 'editor-synced-block-provider/sourceInfo'
+          });
+          fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent(getSourceInfoErrorPayload(_context2.t0.message));
           return _context2.abrupt("return", Promise.resolve(undefined));
-        case 18:
+        case 19:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[0, 15]]);
+    }, _callee2, null, [[0, 14]]);
   }));
-  return function fetchConfluenceSourceInfo(_x2, _x3) {
+  return function fetchConfluencePageInfo(_x2, _x3, _x4) {
     return _ref2.apply(this, arguments);
   };
 }();