@atlaskit/editor-synced-block-provider 2.14.1 → 2.15.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.15.0
+
+### Minor Changes
+
+- [`4daaa6358e6fb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4daaa6358e6fb) -
+  Update resourceId generation for create reference from browser copy + pasting source block
+
+### Patch Changes
+
+- [`dcc6a3e73f414`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dcc6a3e73f414) -
+  [ux] EDITOR-3304 add offline error state for sync blocks and update other error UI to match new
+  designs
+- Updated dependencies
+
 ## 2.14.1
 
 ### Patch Changes

package/dist/cjs/common/types.js

@@ -13,6 +13,8 @@ var SyncBlockError = exports.SyncBlockError = /*#__PURE__*/function (SyncBlockEr
   SyncBlockError["Conflict"] = "conflict";
   // attempt to create block that already exists
   SyncBlockError["ServerError"] = "server_error";
-  SyncBlockError["InvalidContent"] = "invalid_content"; // content is not a valid JSON
+  SyncBlockError["InvalidContent"] = "invalid_content";
+  // content is not a valid JSON
+  SyncBlockError["Offline"] = "offline";
   return SyncBlockError;
 }({});

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

@@ -196,10 +196,11 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
  * ADFWriteProvider implementation that writes synced block data to Block Service API
  */
 var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
-  function BlockServiceADFWriteProvider(sourceAri, product) {
+  function BlockServiceADFWriteProvider(sourceAri, product, sourceDocumentId) {
     (0, _classCallCheck2.default)(this, BlockServiceADFWriteProvider);
     this.sourceAri = sourceAri;
     this.product = product;
+    this.sourceDocumentId = sourceDocumentId;
   }
 
   // it will first try to update and if it can't (404) then it will try to create
@@ -352,12 +353,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
   }, {
     key: "generateResourceIdForReference",
     value: function generateResourceIdForReference(sourceId) {
-      var match = this.sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
-      if (!(match !== null && match !== void 0 && match[1])) {
-        throw new Error("Invalid source ARI: ".concat(this.sourceAri));
-      }
-      var pageId = match[3];
-      return "".concat(this.product, "/").concat(pageId, "/").concat(sourceId);
+      return "".concat(this.product, "/").concat(this.sourceDocumentId, "/").concat(sourceId);
     }
   }, {
     key: "generateResourceId",
@@ -369,16 +365,16 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
 /**
  * Factory function to create both providers with shared configuration
  */
-var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(sourceAri, product) {
+var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(sourceAri, product, sourceDocumentId) {
   var fetchProvider = new BlockServiceADFFetchProvider(sourceAri);
-  var writeProvider = new BlockServiceADFWriteProvider(sourceAri, product);
+  var writeProvider = new BlockServiceADFWriteProvider(sourceAri, product, sourceDocumentId);
   return {
     fetchProvider: fetchProvider,
     writeProvider: writeProvider
   };
 };
-var useMemoizedBlockServiceAPIProviders = exports.useMemoizedBlockServiceAPIProviders = function useMemoizedBlockServiceAPIProviders(sourceAri, product) {
+var useMemoizedBlockServiceAPIProviders = exports.useMemoizedBlockServiceAPIProviders = function useMemoizedBlockServiceAPIProviders(sourceAri, product, sourceDocumentId) {
   return (0, _react.useMemo)(function () {
-    return createBlockServiceAPIProviders(sourceAri, product);
-  }, [sourceAri, product]);
+    return createBlockServiceAPIProviders(sourceAri, product, sourceDocumentId);
+  }, [sourceAri, product, sourceDocumentId]);
 };

package/dist/es2019/common/types.js

@@ -7,6 +7,8 @@ export let SyncBlockError = /*#__PURE__*/function (SyncBlockError) {
   SyncBlockError["Conflict"] = "conflict";
   // attempt to create block that already exists
   SyncBlockError["ServerError"] = "server_error";
-  SyncBlockError["InvalidContent"] = "invalid_content"; // content is not a valid JSON
+  SyncBlockError["InvalidContent"] = "invalid_content";
+  // content is not a valid JSON
+  SyncBlockError["Offline"] = "offline";
   return SyncBlockError;
 }({});

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

@@ -134,9 +134,10 @@ class BlockServiceADFFetchProvider {
  * ADFWriteProvider implementation that writes synced block data to Block Service API
  */
 class BlockServiceADFWriteProvider {
-  constructor(sourceAri, product) {
+  constructor(sourceAri, product, sourceDocumentId) {
     this.sourceAri = sourceAri;
     this.product = product;
+    this.sourceDocumentId = sourceDocumentId;
   }
 
   // it will first try to update and if it can't (404) then it will try to create
@@ -227,12 +228,7 @@ class BlockServiceADFWriteProvider {
 
   // the sourceId is the resourceId of the source synced block.
   generateResourceIdForReference(sourceId) {
-    const match = this.sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
-    if (!(match !== null && match !== void 0 && match[1])) {
-      throw new Error(`Invalid source ARI: ${this.sourceAri}`);
-    }
-    const pageId = match[3];
-    return `${this.product}/${pageId}/${sourceId}`;
+    return `${this.product}/${this.sourceDocumentId}/${sourceId}`;
   }
   generateResourceId() {
     return crypto.randomUUID();
@@ -242,14 +238,14 @@ class BlockServiceADFWriteProvider {
 /**
  * Factory function to create both providers with shared configuration
  */
-const createBlockServiceAPIProviders = (sourceAri, product) => {
+const createBlockServiceAPIProviders = (sourceAri, product, sourceDocumentId) => {
   const fetchProvider = new BlockServiceADFFetchProvider(sourceAri);
-  const writeProvider = new BlockServiceADFWriteProvider(sourceAri, product);
+  const writeProvider = new BlockServiceADFWriteProvider(sourceAri, product, sourceDocumentId);
   return {
     fetchProvider,
     writeProvider
   };
 };
-export const useMemoizedBlockServiceAPIProviders = (sourceAri, product) => {
-  return useMemo(() => createBlockServiceAPIProviders(sourceAri, product), [sourceAri, product]);
+export const useMemoizedBlockServiceAPIProviders = (sourceAri, product, sourceDocumentId) => {
+  return useMemo(() => createBlockServiceAPIProviders(sourceAri, product, sourceDocumentId), [sourceAri, product, sourceDocumentId]);
 };

package/dist/esm/common/types.js

@@ -7,6 +7,8 @@ export var SyncBlockError = /*#__PURE__*/function (SyncBlockError) {
   SyncBlockError["Conflict"] = "conflict";
   // attempt to create block that already exists
   SyncBlockError["ServerError"] = "server_error";
-  SyncBlockError["InvalidContent"] = "invalid_content"; // content is not a valid JSON
+  SyncBlockError["InvalidContent"] = "invalid_content";
+  // content is not a valid JSON
+  SyncBlockError["Offline"] = "offline";
   return SyncBlockError;
 }({});

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

@@ -188,10 +188,11 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
  * ADFWriteProvider implementation that writes synced block data to Block Service API
  */
 var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
-  function BlockServiceADFWriteProvider(sourceAri, product) {
+  function BlockServiceADFWriteProvider(sourceAri, product, sourceDocumentId) {
     _classCallCheck(this, BlockServiceADFWriteProvider);
     this.sourceAri = sourceAri;
     this.product = product;
+    this.sourceDocumentId = sourceDocumentId;
   }
 
   // it will first try to update and if it can't (404) then it will try to create
@@ -344,12 +345,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
   }, {
     key: "generateResourceIdForReference",
     value: function generateResourceIdForReference(sourceId) {
-      var match = this.sourceAri.match(/ari:cloud:confluence:([^:]+):(page|blogpost)\/(\d+)/);
-      if (!(match !== null && match !== void 0 && match[1])) {
-        throw new Error("Invalid source ARI: ".concat(this.sourceAri));
-      }
-      var pageId = match[3];
-      return "".concat(this.product, "/").concat(pageId, "/").concat(sourceId);
+      return "".concat(this.product, "/").concat(this.sourceDocumentId, "/").concat(sourceId);
     }
   }, {
     key: "generateResourceId",
@@ -361,16 +357,16 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
 /**
  * Factory function to create both providers with shared configuration
  */
-var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(sourceAri, product) {
+var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(sourceAri, product, sourceDocumentId) {
   var fetchProvider = new BlockServiceADFFetchProvider(sourceAri);
-  var writeProvider = new BlockServiceADFWriteProvider(sourceAri, product);
+  var writeProvider = new BlockServiceADFWriteProvider(sourceAri, product, sourceDocumentId);
   return {
     fetchProvider: fetchProvider,
     writeProvider: writeProvider
   };
 };
-export var useMemoizedBlockServiceAPIProviders = function useMemoizedBlockServiceAPIProviders(sourceAri, product) {
+export var useMemoizedBlockServiceAPIProviders = function useMemoizedBlockServiceAPIProviders(sourceAri, product, sourceDocumentId) {
   return useMemo(function () {
-    return createBlockServiceAPIProviders(sourceAri, product);
-  }, [sourceAri, product]);
+    return createBlockServiceAPIProviders(sourceAri, product, sourceDocumentId);
+  }, [sourceAri, product, sourceDocumentId]);
 };

package/dist/types/common/types.d.ts

@@ -20,7 +20,8 @@ export declare enum SyncBlockError {
     RateLimited = "rate_limited",
     Conflict = "conflict",// attempt to create block that already exists
     ServerError = "server_error",
-    InvalidContent = "invalid_content"
+    InvalidContent = "invalid_content",// content is not a valid JSON
+    Offline = "offline"
 }
 export interface SyncBlockData {
     blockInstanceId: BlockInstanceId;

package/dist/types/providers/block-service/blockServiceAPI.d.ts

@@ -14,15 +14,16 @@ declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
  */
 declare class BlockServiceADFWriteProvider implements ADFWriteProvider {
     private sourceAri;
+    private sourceDocumentId;
     product: SyncBlockProduct;
-    constructor(sourceAri: string, product: SyncBlockProduct);
+    constructor(sourceAri: string, product: SyncBlockProduct, sourceDocumentId: string);
     writeData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     createData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     deleteData(resourceId: string): Promise<DeleteSyncBlockResult>;
     generateResourceIdForReference(sourceId: ResourceId): ResourceId;
     generateResourceId(): ResourceId;
 }
-export declare const useMemoizedBlockServiceAPIProviders: (sourceAri: string, product: SyncBlockProduct) => {
+export declare const useMemoizedBlockServiceAPIProviders: (sourceAri: string, product: SyncBlockProduct, sourceDocumentId: string) => {
     fetchProvider: BlockServiceADFFetchProvider;
     writeProvider: BlockServiceADFWriteProvider;
 };

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

@@ -20,7 +20,8 @@ export declare enum SyncBlockError {
     RateLimited = "rate_limited",
     Conflict = "conflict",// attempt to create block that already exists
     ServerError = "server_error",
-    InvalidContent = "invalid_content"
+    InvalidContent = "invalid_content",// content is not a valid JSON
+    Offline = "offline"
 }
 export interface SyncBlockData {
     blockInstanceId: BlockInstanceId;

package/dist/types-ts4.5/providers/block-service/blockServiceAPI.d.ts

@@ -14,15 +14,16 @@ declare class BlockServiceADFFetchProvider implements ADFFetchProvider {
  */
 declare class BlockServiceADFWriteProvider implements ADFWriteProvider {
     private sourceAri;
+    private sourceDocumentId;
     product: SyncBlockProduct;
-    constructor(sourceAri: string, product: SyncBlockProduct);
+    constructor(sourceAri: string, product: SyncBlockProduct, sourceDocumentId: string);
     writeData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     createData(data: SyncBlockData): Promise<WriteSyncBlockResult>;
     deleteData(resourceId: string): Promise<DeleteSyncBlockResult>;
     generateResourceIdForReference(sourceId: ResourceId): ResourceId;
     generateResourceId(): ResourceId;
 }
-export declare const useMemoizedBlockServiceAPIProviders: (sourceAri: string, product: SyncBlockProduct) => {
+export declare const useMemoizedBlockServiceAPIProviders: (sourceAri: string, product: SyncBlockProduct, sourceDocumentId: string) => {
     fetchProvider: BlockServiceADFFetchProvider;
     writeProvider: BlockServiceADFWriteProvider;
 };

package/package.json

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