@atlaskit/editor-synced-block-provider 0.5.0 → 0.5.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-synced-block-provider
 
+## 0.5.1
+
+### Patch Changes
+
+- [`1256b3dd0431e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1256b3dd0431e) -
+  Fix isSource check in provider
+
 ## 0.5.0
 
 ### Minor Changes

package/dist/cjs/common/syncBlockStoreManager.js

@@ -10,6 +10,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _uuid = _interopRequireDefault(require("uuid"));
+var _ari = require("../utils/ari");
 var _rebaseTransaction2 = require("./rebase-transaction");
 // Do this typedef to make it clear that
 // this is a local identifier for a resource for local use
@@ -32,13 +33,18 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
   }, {
     key: "isSourceBlock",
     value: function isSourceBlock(node) {
+      var _this$dataProvider;
       if (node.type.name !== 'syncBlock') {
         return false;
       }
       var _node$attrs = node.attrs,
         resourceId = _node$attrs.resourceId,
         localId = _node$attrs.localId;
-      return resourceId.includes(localId);
+      var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
+      if (!sourceId) {
+        return false;
+      }
+      return typeof resourceId === 'string' && typeof sourceId === 'string' && typeof localId === 'string' && resourceId === (0, _ari.resourceIdFromSourceAndLocalId)(sourceId, localId);
     }
   }, {
     key: "registerConfirmationCallback",
@@ -57,10 +63,10 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
   }, {
     key: "createSyncBlockNode",
     value: function createSyncBlockNode() {
-      var _this$dataProvider;
+      var _this$dataProvider2;
       var localId = (0, _uuid.default)();
-      var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
-      var resourceId = sourceId ? "".concat(sourceId, "/").concat(localId) : localId;
+      var sourceId = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.getSourceId();
+      var resourceId = sourceId ? (0, _ari.resourceIdFromSourceAndLocalId)(sourceId, localId) : localId;
       var syncBlockNode = {
         attrs: {
           resourceId: resourceId,

package/dist/cjs/providers/confluenceContentAPI.js

@@ -142,46 +142,52 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               pageId = (0, _ari.getPageIdFromAri)(data.resourceId);
+              if (!(data.sourceDocumentAri && data.resourceId !== (0, _ari.resourceIdFromSourceAndLocalId)(data.sourceDocumentAri, data.localId))) {
+                _context3.next = 3;
+                break;
+              }
+              return _context3.abrupt("return", Promise.reject('Resource ARI differs from source document ARI'));
+            case 3:
               syncedBlockValue = JSON.stringify({
                 content: data.content
               });
               if (!data.resourceId) {
-                _context3.next = 19;
+                _context3.next = 21;
                 break;
               }
               // Update existing content property
               localId = (0, _ari.getLocalIdFromAri)(data.resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
-              _context3.next = 7;
+              _context3.next = 9;
               return (0, _contentProperty.updateContentProperty)({
                 pageId: pageId,
                 key: key,
                 value: syncedBlockValue,
                 cloudId: this.config.cloudId
               });
-            case 7:
+            case 9:
               contentProperty = _context3.sent;
               if (!(((_contentProperty$data3 = contentProperty.data.confluence.updateValuePageProperty.pageProperty) === null || _contentProperty$data3 === void 0 ? void 0 : _contentProperty$data3.key) === key)) {
-                _context3.next = 12;
+                _context3.next = 14;
                 break;
               }
               return _context3.abrupt("return", key);
-            case 12:
+            case 14:
               if (!(contentProperty.data.confluence.updateValuePageProperty.pageProperty === null)) {
-                _context3.next = 16;
+                _context3.next = 18;
                 break;
               }
               return _context3.abrupt("return", this.createNewContentProperty(pageId, key, syncedBlockValue));
-            case 16:
+            case 18:
               throw new Error('Failed to update content property');
-            case 17:
-              _context3.next = 21;
-              break;
             case 19:
+              _context3.next = 23;
+              break;
+            case 21:
               // Create new content property
               _key = getContentPropertyKey(this.config.contentPropertyKey, data.localId);
               return _context3.abrupt("return", this.createNewContentProperty(pageId, _key, syncedBlockValue));
-            case 21:
+            case 23:
             case "end":
               return _context3.stop();
           }

package/dist/cjs/utils/ari.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getPageIdFromAri = exports.getLocalIdFromAri = exports.getContentPropertyIdFromAri = exports.getContentPropertyAri = exports.getConfluencePageAri = void 0;
+exports.resourceIdFromSourceAndLocalId = exports.getPageIdFromAri = exports.getLocalIdFromAri = exports.getContentPropertyIdFromAri = exports.getContentPropertyAri = exports.getConfluencePageAri = void 0;
 var getConfluencePageAri = exports.getConfluencePageAri = function getConfluencePageAri(pageId, cloudId) {
   return "ari:cloud:confluence:".concat(cloudId, ":page/").concat(pageId);
 };
@@ -39,4 +39,7 @@ var getContentPropertyIdFromAri = exports.getContentPropertyIdFromAri = function
     return match[1];
   }
   throw new Error("Invalid content property ARI: ".concat(ari));
+};
+var resourceIdFromSourceAndLocalId = exports.resourceIdFromSourceAndLocalId = function resourceIdFromSourceAndLocalId(sourceId, localId) {
+  return sourceId + '/' + localId;
 };

package/dist/es2019/common/syncBlockStoreManager.js

@@ -1,4 +1,5 @@
 import uuid from 'uuid';
+import { resourceIdFromSourceAndLocalId } from '../utils/ari';
 import { rebaseTransaction } from './rebase-transaction';
 
 // Do this typedef to make it clear that
@@ -18,6 +19,7 @@ export class SyncBlockStoreManager {
     this.editorView = editorView;
   }
   isSourceBlock(node) {
+    var _this$dataProvider;
     if (node.type.name !== 'syncBlock') {
       return false;
     }
@@ -25,7 +27,11 @@ export class SyncBlockStoreManager {
       resourceId,
       localId
     } = node.attrs;
-    return resourceId.includes(localId);
+    const sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
+    if (!sourceId) {
+      return false;
+    }
+    return typeof resourceId === 'string' && typeof sourceId === 'string' && typeof localId === 'string' && resourceId === resourceIdFromSourceAndLocalId(sourceId, localId);
   }
   registerConfirmationCallback(callback) {
     this.confirmationCallback = callback;
@@ -37,10 +43,10 @@ export class SyncBlockStoreManager {
     return !!this.confirmationCallback;
   }
   createSyncBlockNode() {
-    var _this$dataProvider;
+    var _this$dataProvider2;
     const localId = uuid();
-    const sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
-    const resourceId = sourceId ? `${sourceId}/${localId}` : localId;
+    const sourceId = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.getSourceId();
+    const resourceId = sourceId ? resourceIdFromSourceAndLocalId(sourceId, localId) : localId;
     const syncBlockNode = {
       attrs: {
         resourceId,

package/dist/es2019/providers/confluenceContentAPI.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { useMemo } from 'react';
-import { getLocalIdFromAri, getPageIdFromAri } from '../utils/ari';
+import { getLocalIdFromAri, getPageIdFromAri, resourceIdFromSourceAndLocalId } from '../utils/ari';
 import { getContentProperty, createContentProperty, updateContentProperty } from '../utils/contentProperty';
 
 /**
@@ -81,6 +81,9 @@ class ConfluenceADFWriteProvider {
   }
   async writeData(data) {
     const pageId = getPageIdFromAri(data.resourceId);
+    if (data.sourceDocumentAri && data.resourceId !== resourceIdFromSourceAndLocalId(data.sourceDocumentAri, data.localId)) {
+      return Promise.reject('Resource ARI differs from source document ARI');
+    }
     const syncedBlockValue = JSON.stringify({
       content: data.content
     });

package/dist/es2019/utils/ari.js

@@ -29,4 +29,7 @@ export const getContentPropertyIdFromAri = ari => {
     return match[1];
   }
   throw new Error(`Invalid content property ARI: ${ari}`);
+};
+export const resourceIdFromSourceAndLocalId = (sourceId, localId) => {
+  return sourceId + '/' + localId;
 };

package/dist/esm/common/syncBlockStoreManager.js

@@ -3,6 +3,7 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import uuid from 'uuid';
+import { resourceIdFromSourceAndLocalId } from '../utils/ari';
 import { rebaseTransaction as _rebaseTransaction } from './rebase-transaction';
 
 // Do this typedef to make it clear that
@@ -27,13 +28,18 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "isSourceBlock",
     value: function isSourceBlock(node) {
+      var _this$dataProvider;
       if (node.type.name !== 'syncBlock') {
         return false;
       }
       var _node$attrs = node.attrs,
         resourceId = _node$attrs.resourceId,
         localId = _node$attrs.localId;
-      return resourceId.includes(localId);
+      var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
+      if (!sourceId) {
+        return false;
+      }
+      return typeof resourceId === 'string' && typeof sourceId === 'string' && typeof localId === 'string' && resourceId === resourceIdFromSourceAndLocalId(sourceId, localId);
     }
   }, {
     key: "registerConfirmationCallback",
@@ -52,10 +58,10 @@ export var SyncBlockStoreManager = /*#__PURE__*/function () {
   }, {
     key: "createSyncBlockNode",
     value: function createSyncBlockNode() {
-      var _this$dataProvider;
+      var _this$dataProvider2;
       var localId = uuid();
-      var sourceId = (_this$dataProvider = this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.getSourceId();
-      var resourceId = sourceId ? "".concat(sourceId, "/").concat(localId) : localId;
+      var sourceId = (_this$dataProvider2 = this.dataProvider) === null || _this$dataProvider2 === void 0 ? void 0 : _this$dataProvider2.getSourceId();
+      var resourceId = sourceId ? resourceIdFromSourceAndLocalId(sourceId, localId) : localId;
       var syncBlockNode = {
         attrs: {
           resourceId: resourceId,

package/dist/esm/providers/confluenceContentAPI.js

@@ -4,7 +4,7 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useMemo } from 'react';
-import { getLocalIdFromAri, getPageIdFromAri } from '../utils/ari';
+import { getLocalIdFromAri, getPageIdFromAri, resourceIdFromSourceAndLocalId } from '../utils/ari';
 import { getContentProperty, createContentProperty, updateContentProperty } from '../utils/contentProperty';
 
 /**
@@ -136,46 +136,52 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               pageId = getPageIdFromAri(data.resourceId);
+              if (!(data.sourceDocumentAri && data.resourceId !== resourceIdFromSourceAndLocalId(data.sourceDocumentAri, data.localId))) {
+                _context3.next = 3;
+                break;
+              }
+              return _context3.abrupt("return", Promise.reject('Resource ARI differs from source document ARI'));
+            case 3:
               syncedBlockValue = JSON.stringify({
                 content: data.content
               });
               if (!data.resourceId) {
-                _context3.next = 19;
+                _context3.next = 21;
                 break;
               }
               // Update existing content property
               localId = getLocalIdFromAri(data.resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
-              _context3.next = 7;
+              _context3.next = 9;
               return updateContentProperty({
                 pageId: pageId,
                 key: key,
                 value: syncedBlockValue,
                 cloudId: this.config.cloudId
               });
-            case 7:
+            case 9:
               contentProperty = _context3.sent;
               if (!(((_contentProperty$data3 = contentProperty.data.confluence.updateValuePageProperty.pageProperty) === null || _contentProperty$data3 === void 0 ? void 0 : _contentProperty$data3.key) === key)) {
-                _context3.next = 12;
+                _context3.next = 14;
                 break;
               }
               return _context3.abrupt("return", key);
-            case 12:
+            case 14:
               if (!(contentProperty.data.confluence.updateValuePageProperty.pageProperty === null)) {
-                _context3.next = 16;
+                _context3.next = 18;
                 break;
               }
               return _context3.abrupt("return", this.createNewContentProperty(pageId, key, syncedBlockValue));
-            case 16:
+            case 18:
               throw new Error('Failed to update content property');
-            case 17:
-              _context3.next = 21;
-              break;
             case 19:
+              _context3.next = 23;
+              break;
+            case 21:
               // Create new content property
               _key = getContentPropertyKey(this.config.contentPropertyKey, data.localId);
               return _context3.abrupt("return", this.createNewContentProperty(pageId, _key, syncedBlockValue));
-            case 21:
+            case 23:
             case "end":
               return _context3.stop();
           }

package/dist/esm/utils/ari.js

@@ -33,4 +33,7 @@ export var getContentPropertyIdFromAri = function getContentPropertyIdFromAri(ar
     return match[1];
   }
   throw new Error("Invalid content property ARI: ".concat(ari));
+};
+export var resourceIdFromSourceAndLocalId = function resourceIdFromSourceAndLocalId(sourceId, localId) {
+  return sourceId + '/' + localId;
 };

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

@@ -8,3 +8,4 @@ export declare const getPageIdFromAri: (ari: string) => string;
 export declare const getLocalIdFromAri: (ari: string) => string;
 export declare const getContentPropertyAri: (contentPropertyId: string, cloudId: string) => string;
 export declare const getContentPropertyIdFromAri: (ari: string) => string;
+export declare const resourceIdFromSourceAndLocalId: (sourceId: string, localId: string) => string;

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

@@ -8,3 +8,4 @@ export declare const getPageIdFromAri: (ari: string) => string;
 export declare const getLocalIdFromAri: (ari: string) => string;
 export declare const getContentPropertyAri: (contentPropertyId: string, cloudId: string) => string;
 export declare const getContentPropertyIdFromAri: (ari: string) => string;
+export declare const resourceIdFromSourceAndLocalId: (sourceId: string, localId: string) => string;

package/package.json

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