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

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.10.5
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.10.4
+
+### Patch Changes
+
+- [`e48b21e64bb2e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e48b21e64bb2e) -
+  EDITOR-3312 Populate the sync block data on creation and fetch properly
+- Updated dependencies
+
 ## 2.10.3
 
 ### Patch Changes

package/dist/cjs/clients/confluence/contentProperty.js

@@ -140,9 +140,7 @@ var updateContentProperty = exports.updateContentProperty = /*#__PURE__*/functio
             pageId: documentARI
           }), {}, {
             key: key,
-            value: JSON.stringify({
-              content: value.content
-            })
+            value: JSON.stringify(value)
           }); // Blog content properties don't support the useSameVersion flag at the moment
           if (!isBlog) {
             input = _objectSpread(_objectSpread({}, input), useSameVersion);
@@ -201,9 +199,7 @@ var createContentProperty = exports.createContentProperty = /*#__PURE__*/functio
                 pageId: documentARI
               }), {}, {
                 key: key,
-                value: JSON.stringify({
-                  content: value.content
-                })
+                value: JSON.stringify(value)
               })
             }
           };

package/dist/cjs/providers/confluence/confluenceContentAPI.js

@@ -113,8 +113,18 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
               return _context.abrupt("return", {
                 data: {
                   content: syncedBlockData.content,
-                  resourceId: resourceId,
-                  blockInstanceId: localId
+                  // If the block instance ID is not set, use the local ID from the fetch data request
+                  // This is a fallback for the case where the block instance ID is not set in the synced block data (old data)
+                  blockInstanceId: syncedBlockData.blockInstanceId || localId,
+                  // If the resource ID is not set, use the resource ID from the fetch data request
+                  // This is a fallback for the case where the resource ID is not set in the synced block data (old data)
+                  resourceId: syncedBlockData.resourceId || resourceId,
+                  // If the product is not set, use the default product 'confluence-page'
+                  // This is a fallback for the case where the product is not set in the synced block data (old data)
+                  product: syncedBlockData.product || 'confluence-page',
+                  // If the source Ari is not set, use the resource ID as the source Ari
+                  // This is a fallback for the case where the source Ari is not set in the synced block data (old data)
+                  sourceAri: syncedBlockData.sourceAri || resourceId
                 },
                 resourceId: resourceId
               });
@@ -218,14 +228,14 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
   return (0, _createClass2.default)(ConfluenceADFWriteProvider, [{
     key: "writeData",
     value: function () {
-      var _writeData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(data) {
+      var _writeData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(syncBlockData) {
         var match, resourceId, _match, pageId, pageType, localId, key, sourceAri, syncBlockDataWithSourceDocumentAri, options, updatePayload, updateResult;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              resourceId = data.resourceId;
+              resourceId = syncBlockData.resourceId;
               _context3.prev = 1;
-              match = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(data.resourceId);
+              match = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(resourceId);
               _context3.next = 8;
               break;
             case 5:
@@ -241,7 +251,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
               localId = (0, _ari.getLocalIdFromConfluencePageAri)(resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
               sourceAri = (0, _ari.getConfluencePageAri)(pageId, this.config.cloudId, pageType);
-              syncBlockDataWithSourceDocumentAri = _objectSpread(_objectSpread({}, data), {}, {
+              syncBlockDataWithSourceDocumentAri = _objectSpread(_objectSpread({}, syncBlockData), {}, {
                 product: 'confluence-page',
                 sourceAri: sourceAri
               });
@@ -269,7 +279,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
                 _context3.next = 27;
                 break;
               }
-              return _context3.abrupt("return", this.createNewContentProperty(pageId, key, data, pageType).then(function () {
+              return _context3.abrupt("return", this.createNewContentProperty(pageId, key, syncBlockDataWithSourceDocumentAri, pageType).then(function () {
                 return {
                   resourceId: resourceId
                 };

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

@@ -183,9 +183,7 @@ export const updateContentProperty = async ({
       pageId: documentARI
     }),
     key,
-    value: JSON.stringify({
-      content: value.content
-    })
+    value: JSON.stringify(value)
   };
 
   // Blog content properties don't support the useSameVersion flag at the moment
@@ -235,9 +233,7 @@ export const createContentProperty = async ({
           pageId: documentARI
         }),
         key,
-        value: JSON.stringify({
-          content: value.content
-        })
+        value: JSON.stringify(value)
       }
     }
   };

package/dist/es2019/providers/confluence/confluenceContentAPI.js

@@ -86,8 +86,18 @@ class ConfluenceADFFetchProvider {
       return {
         data: {
           content: syncedBlockData.content,
-          resourceId,
-          blockInstanceId: localId
+          // If the block instance ID is not set, use the local ID from the fetch data request
+          // This is a fallback for the case where the block instance ID is not set in the synced block data (old data)
+          blockInstanceId: syncedBlockData.blockInstanceId || localId,
+          // If the resource ID is not set, use the resource ID from the fetch data request
+          // This is a fallback for the case where the resource ID is not set in the synced block data (old data)
+          resourceId: syncedBlockData.resourceId || resourceId,
+          // If the product is not set, use the default product 'confluence-page'
+          // This is a fallback for the case where the product is not set in the synced block data (old data)
+          product: syncedBlockData.product || 'confluence-page',
+          // If the source Ari is not set, use the resource ID as the source Ari
+          // This is a fallback for the case where the source Ari is not set in the synced block data (old data)
+          sourceAri: syncedBlockData.sourceAri || resourceId
         },
         resourceId
       };
@@ -146,13 +156,13 @@ class ConfluenceADFWriteProvider {
     });
     this.config = config;
   }
-  async writeData(data) {
+  async writeData(syncBlockData) {
     let match;
     const {
       resourceId
-    } = data;
+    } = syncBlockData;
     try {
-      match = getPageIdAndTypeFromConfluencePageAri(data.resourceId);
+      match = getPageIdAndTypeFromConfluencePageAri(resourceId);
     } catch (error) {
       return {
         error: stringifyError(error)
@@ -168,7 +178,7 @@ class ConfluenceADFWriteProvider {
       const key = getContentPropertyKey(this.config.contentPropertyKey, localId);
       const sourceAri = getConfluencePageAri(pageId, this.config.cloudId, pageType);
       const syncBlockDataWithSourceDocumentAri = {
-        ...data,
+        ...syncBlockData,
         product: 'confluence-page',
         sourceAri
       };
@@ -186,7 +196,7 @@ class ConfluenceADFWriteProvider {
           resourceId
         };
       } else if (!updateResult) {
-        return this.createNewContentProperty(pageId, key, data, pageType).then(() => {
+        return this.createNewContentProperty(pageId, key, syncBlockDataWithSourceDocumentAri, pageType).then(() => {
           return {
             resourceId
           };

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

@@ -133,9 +133,7 @@ export var updateContentProperty = /*#__PURE__*/function () {
             pageId: documentARI
           }), {}, {
             key: key,
-            value: JSON.stringify({
-              content: value.content
-            })
+            value: JSON.stringify(value)
           }); // Blog content properties don't support the useSameVersion flag at the moment
           if (!isBlog) {
             input = _objectSpread(_objectSpread({}, input), useSameVersion);
@@ -194,9 +192,7 @@ export var createContentProperty = /*#__PURE__*/function () {
                 pageId: documentARI
               }), {}, {
                 key: key,
-                value: JSON.stringify({
-                  content: value.content
-                })
+                value: JSON.stringify(value)
               })
             }
           };

package/dist/esm/providers/confluence/confluenceContentAPI.js

@@ -107,8 +107,18 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
               return _context.abrupt("return", {
                 data: {
                   content: syncedBlockData.content,
-                  resourceId: resourceId,
-                  blockInstanceId: localId
+                  // If the block instance ID is not set, use the local ID from the fetch data request
+                  // This is a fallback for the case where the block instance ID is not set in the synced block data (old data)
+                  blockInstanceId: syncedBlockData.blockInstanceId || localId,
+                  // If the resource ID is not set, use the resource ID from the fetch data request
+                  // This is a fallback for the case where the resource ID is not set in the synced block data (old data)
+                  resourceId: syncedBlockData.resourceId || resourceId,
+                  // If the product is not set, use the default product 'confluence-page'
+                  // This is a fallback for the case where the product is not set in the synced block data (old data)
+                  product: syncedBlockData.product || 'confluence-page',
+                  // If the source Ari is not set, use the resource ID as the source Ari
+                  // This is a fallback for the case where the source Ari is not set in the synced block data (old data)
+                  sourceAri: syncedBlockData.sourceAri || resourceId
                 },
                 resourceId: resourceId
               });
@@ -212,14 +222,14 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
   return _createClass(ConfluenceADFWriteProvider, [{
     key: "writeData",
     value: function () {
-      var _writeData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(data) {
+      var _writeData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(syncBlockData) {
         var match, resourceId, _match, pageId, pageType, localId, key, sourceAri, syncBlockDataWithSourceDocumentAri, options, updatePayload, updateResult;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              resourceId = data.resourceId;
+              resourceId = syncBlockData.resourceId;
               _context3.prev = 1;
-              match = getPageIdAndTypeFromConfluencePageAri(data.resourceId);
+              match = getPageIdAndTypeFromConfluencePageAri(resourceId);
               _context3.next = 8;
               break;
             case 5:
@@ -235,7 +245,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
               localId = getLocalIdFromConfluencePageAri(resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
               sourceAri = getConfluencePageAri(pageId, this.config.cloudId, pageType);
-              syncBlockDataWithSourceDocumentAri = _objectSpread(_objectSpread({}, data), {}, {
+              syncBlockDataWithSourceDocumentAri = _objectSpread(_objectSpread({}, syncBlockData), {}, {
                 product: 'confluence-page',
                 sourceAri: sourceAri
               });
@@ -263,7 +273,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
                 _context3.next = 27;
                 break;
               }
-              return _context3.abrupt("return", this.createNewContentProperty(pageId, key, data, pageType).then(function () {
+              return _context3.abrupt("return", this.createNewContentProperty(pageId, key, syncBlockDataWithSourceDocumentAri, pageType).then(function () {
                 return {
                   resourceId: resourceId
                 };

package/dist/types/providers/confluence/confluenceContentAPI.d.ts

@@ -23,7 +23,7 @@ declare class ConfluenceADFWriteProvider implements ADFWriteProvider {
     private config;
     constructor(config: ContentAPIConfig);
     private createNewContentProperty;
-    writeData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
+    writeData(syncBlockData: SyncBlockData): Promise<WriteSyncBlockResult>;
     deleteData(resourceId: string): Promise<DeleteSyncBlockResult>;
     generateResourceId(sourceId: string, localId: string): string;
 }

package/dist/types-ts4.5/providers/confluence/confluenceContentAPI.d.ts

@@ -23,7 +23,7 @@ declare class ConfluenceADFWriteProvider implements ADFWriteProvider {
     private config;
     constructor(config: ContentAPIConfig);
     private createNewContentProperty;
-    writeData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
+    writeData(syncBlockData: SyncBlockData): Promise<WriteSyncBlockResult>;
     deleteData(resourceId: string): Promise<DeleteSyncBlockResult>;
     generateResourceId(sourceId: string, localId: string): string;
 }

package/package.json

@@ -26,18 +26,18 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^51.4.0",
 		"@atlaskit/adf-utils": "^19.26.0",
-		"@atlaskit/css": "^0.16.0",
+		"@atlaskit/css": "^0.17.0",
 		"@atlaskit/editor-json-transformer": "^8.31.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/node-data-provider": "^7.5.0",
-		"@atlaskit/primitives": "^16.2.0",
-		"@atlaskit/tokens": "^8.1.0",
+		"@atlaskit/primitives": "^16.3.0",
+		"@atlaskit/tokens": "^8.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^0.18.6",
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.33.0",
+		"@atlaskit/editor-common": "^110.34.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -83,7 +83,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "2.10.3",
+	"version": "2.10.5",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",