@atlaskit/editor-synced-block-provider 2.2.3 → 2.3.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-synced-block-provider
 
+## 2.3.1
+
+### Patch Changes
+
+- [`eb9f8e2ab6fb5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/eb9f8e2ab6fb5) -
+  [EDITOR-2543] Save bodiedSyncBlock deletion to BE instantly
+
+## 2.3.0
+
+### Minor Changes
+
+- [`6f9f13ab4687d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6f9f13ab4687d) -
+  EDITOR-2451 update sync-block refreshed logic based on experience principles
+
 ## 2.2.3
 
 ### Patch Changes

package/dist/cjs/hooks/useFetchSyncBlockData.js

@@ -7,44 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.useFetchSyncBlockData = exports.SYNC_BLOCK_FETCH_INTERVAL = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
-var _types = require("../common/types");
 var SYNC_BLOCK_FETCH_INTERVAL = exports.SYNC_BLOCK_FETCH_INTERVAL = 3000;
 var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyncBlockData(manager, syncBlockNode) {
   var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     fetchSyncBlockDataResult = _useState2[0],
     setFetchSyncBlockDataResult = _useState2[1];
-  var fetchSyncBlockNode = (0, _react.useCallback)(function () {
-    manager.fetchSyncBlockData(syncBlockNode).then(function (data) {
-      if (data !== null && data !== void 0 && data.error) {
-        // if there is an error, we don't want to replace real existing data with the error data
-        setFetchSyncBlockDataResult(function (prev) {
-          if (!prev || prev.error) {
-            return data;
-          }
-          return prev;
-        });
-      } else {
-        setFetchSyncBlockDataResult(data !== null && data !== void 0 ? data : null);
-      }
-    }).catch(function () {
-      //TODO: EDITOR-1921 - add error analytics
-      setFetchSyncBlockDataResult(function (prev) {
-        if (!prev || prev.error) {
-          return {
-            error: _types.SyncBlockError.Errored
-          };
-        }
-        return prev;
-      });
-    });
-  }, [manager, syncBlockNode]);
   (0, _react.useEffect)(function () {
-    fetchSyncBlockNode();
-    var interval = window.setInterval(fetchSyncBlockNode, SYNC_BLOCK_FETCH_INTERVAL);
+    var unsubscribe = manager.subscribeToSyncBlockData(syncBlockNode, function (data) {
+      setFetchSyncBlockDataResult(data);
+    });
     return function () {
-      window.clearInterval(interval);
+      unsubscribe();
     };
-  }, [fetchSyncBlockNode]);
+  }, [manager, setFetchSyncBlockDataResult, syncBlockNode]);
   return fetchSyncBlockDataResult;
 };

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

@@ -280,6 +280,56 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
       }
       return writeData;
     }()
+  }, {
+    key: "deleteData",
+    value: function () {
+      var _deleteData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(resourceId) {
+        var _getPageIdAndTypeFrom3, pageId, pageType, localId, key, options, deletePayload, deleteResult;
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _getPageIdAndTypeFrom3 = (0, _ari.getPageIdAndTypeFromAri)(resourceId), pageId = _getPageIdAndTypeFrom3.id, pageType = _getPageIdAndTypeFrom3.type;
+              localId = (0, _ari.getLocalIdFromAri)(resourceId);
+              key = getContentPropertyKey(this.config.contentPropertyKey, localId);
+              options = {
+                pageId: pageId,
+                key: key,
+                cloudId: this.config.cloudId,
+                pageType: pageType
+              };
+              _context4.prev = 4;
+              _context4.next = 7;
+              return (0, _contentProperty4.deleteContentProperty)(options);
+            case 7:
+              deletePayload = _context4.sent;
+              deleteResult = (0, _utils.isBlogPageType)(pageType) ? deletePayload.data.confluence.deleteBlogPostProperty : deletePayload.data.confluence.deletePageProperty;
+              _context4.next = 14;
+              break;
+            case 11:
+              _context4.prev = 11;
+              _context4.t0 = _context4["catch"](4);
+              return _context4.abrupt("return", {
+                resourceId: resourceId,
+                success: false,
+                error: "Fail to delete ".concat(pageType, " content property")
+              });
+            case 14:
+              return _context4.abrupt("return", {
+                resourceId: resourceId,
+                success: deleteResult.success,
+                error: deleteResult.errors.join()
+              });
+            case 15:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4, this, [[4, 11]]);
+      }));
+      function deleteData(_x7) {
+        return _deleteData.apply(this, arguments);
+      }
+      return deleteData;
+    }()
   }]);
 }();
 /**

package/dist/cjs/providers/in-memory/inMemory.js

@@ -27,5 +27,12 @@ var inMemoryWriteProvider = exports.inMemoryWriteProvider = {
       inMemStore.set(uuid, data);
       return Promise.resolve(uuid);
     }
+  },
+  deleteData: function deleteData(resourceId) {
+    var success = inMemStore.delete(resourceId);
+    return Promise.resolve({
+      resourceId: resourceId,
+      success: success
+    });
   }
 };

package/dist/cjs/providers/syncBlockProvider.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useMemoizedSyncedBlockProvider = exports.SyncBlockProvider = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -14,7 +15,8 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
-var _types = require("../providers/types");
+var _types = require("../common/types");
+var _types2 = require("../providers/types");
 var _ari = require("../utils/ari");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -44,9 +46,26 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
     key: "fetchNodesData",
     value: function fetchNodesData(nodes) {
       var _this2 = this;
-      return Promise.all(nodes.map(function (node) {
-        return _this2.fetchProvider.fetchData(node.attrs.resourceId);
+      var resourceIdSet = new Set(nodes.map(function (node) {
+        return node.attrs.resourceId;
       }));
+      var resourceIds = (0, _toConsumableArray2.default)(resourceIdSet);
+      return Promise.allSettled(resourceIds.map(function (resourceId) {
+        return _this2.fetchProvider.fetchData(resourceId).then(function (data) {
+          return data;
+        }, function () {
+          return {
+            status: _types.SyncBlockError.Errored,
+            resourceId: resourceId
+          };
+        });
+      })).then(function (results) {
+        return results.filter(function (result) {
+          return result.status === 'fulfilled';
+        }).map(function (result) {
+          return result.value;
+        });
+      });
     }
 
     /**
@@ -71,6 +90,43 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
       });
       return Promise.all(resourceIds);
     }
+  }, {
+    key: "deleteNodesData",
+    value: function () {
+      var _deleteNodesData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(resourceIds) {
+        var _this4 = this;
+        var results;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return Promise.allSettled(resourceIds.map(function (resourceId) {
+                return _this4.writeProvider.deleteData(resourceId);
+              }));
+            case 2:
+              results = _context.sent;
+              return _context.abrupt("return", results.map(function (result, index) {
+                if (result.status === 'fulfilled') {
+                  return result.value;
+                } else {
+                  return {
+                    resourceId: resourceIds[index],
+                    success: false,
+                    error: result.reason
+                  };
+                }
+              }));
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function deleteNodesData(_x) {
+        return _deleteNodesData.apply(this, arguments);
+      }
+      return deleteNodesData;
+    }()
   }, {
     key: "getSourceId",
     value: function getSourceId() {
@@ -97,19 +153,19 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
       return pageARI ? fetchURLfromARI(pageARI, sourceLocalId) : Promise.resolve(undefined);
     }
   }]);
-}(_types.SyncBlockDataProvider);
+}(_types2.SyncBlockDataProvider);
 var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(fetchProvider, writeProvider, sourceId) {
   return (0, _react.useMemo)(function () {
     return new SyncBlockProvider(fetchProvider, writeProvider, sourceId);
   }, [fetchProvider, writeProvider, sourceId]);
 };
 var fetchURLfromARI = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(ari, sourceLocalId) {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(ari, sourceLocalId) {
     var response, _payload$data, payload, url;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          _context.next = 2;
+          _context2.next = 2;
           return fetch('/gateway/api/object-resolver/resolve/ari', {
             method: 'POST',
             headers: {
@@ -121,36 +177,36 @@ var fetchURLfromARI = /*#__PURE__*/function () {
             })
           });
         case 2:
-          response = _context.sent;
+          response = _context2.sent;
           if (!response.ok) {
-            _context.next = 12;
+            _context2.next = 12;
             break;
           }
-          _context.next = 6;
+          _context2.next = 6;
           return response.json();
         case 6:
-          payload = _context.sent;
+          payload = _context2.sent;
           url = payload === null || payload === void 0 || (_payload$data = payload.data) === null || _payload$data === void 0 ? void 0 : _payload$data.url;
           if (!(typeof url === 'string')) {
-            _context.next = 10;
+            _context2.next = 10;
             break;
           }
-          return _context.abrupt("return", sourceLocalId ? url + "?block=".concat(sourceLocalId) : url);
+          return _context2.abrupt("return", sourceLocalId ? url + "?block=".concat(sourceLocalId) : url);
         case 10:
-          _context.next = 13;
+          _context2.next = 13;
           break;
         case 12:
           //eslint-disable-next-line no-console
           console.error('Failed to fetch URL from ARI', response.statusText);
         case 13:
-          return _context.abrupt("return", undefined);
+          return _context2.abrupt("return", undefined);
         case 14:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee);
+    }, _callee2);
   }));
-  return function fetchURLfromARI(_x, _x2) {
+  return function fetchURLfromARI(_x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();