@atlaskit/editor-synced-block-provider 3.5.4 → 3.6.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.6.0
+
+### Minor Changes
+
+- [`8100ae00326b4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8100ae00326b4) -
+  EDITOR-2850-add media ssr support for sync blocks
+
+### Patch Changes
+
+- [`fff45a651440a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fff45a651440a) -
+  EDITOR-1665 add experience tracking analytics for sync block save, fetch and delete
+- Updated dependencies
+
+## 3.5.5
+
+### Patch Changes
+
+- [`a36447029e3c3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a36447029e3c3) -
+  Add fetchMediaToken helper function to synced block provider confluence client.
+
 ## 3.5.4
 
 ### Patch Changes

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

@@ -0,0 +1,109 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.fetchMediaToken = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _retry = require("../../utils/retry");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+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) { (0, _defineProperty2.default)(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; }
+var COMMON_HEADERS = {
+  'Content-Type': 'application/json',
+  Accept: 'application/json'
+};
+var AGG_HEADERS = {
+  'X-ExperimentalApi': 'confluence-agg-beta'
+};
+var GRAPHQL_ENDPOINT = '/gateway/api/graphql';
+var GET_CONTENT_MEDIA_SESSION_OPERATION_NAME = 'MediaUploadTokenQuery';
+var GET_CONTENT_MEDIA_SESSION_QUERY = "query ".concat(GET_CONTENT_MEDIA_SESSION_OPERATION_NAME, "($contentId: ID!) {\n\tcontentMediaSession(contentId: $contentId) {\n\t\ttoken {\n\t\t\tvalue\n\t\t}\n\t\tconfiguration {\n\t\t\tclientId\n\t\t\tfileStoreUrl\n\t\t}\n\t\tcollection\n\t}\n}");
+var getContentMediaSession = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(contentId) {
+    var bodyData, response, result;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          bodyData = {
+            query: GET_CONTENT_MEDIA_SESSION_QUERY,
+            operationName: GET_CONTENT_MEDIA_SESSION_OPERATION_NAME,
+            variables: {
+              contentId: contentId
+            }
+          };
+          _context.next = 3;
+          return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
+            method: 'POST',
+            headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
+            body: JSON.stringify(bodyData)
+          });
+        case 3:
+          response = _context.sent;
+          if (response.ok) {
+            _context.next = 6;
+            break;
+          }
+          throw new Error("Failed to get content media session: ".concat(response.statusText));
+        case 6:
+          _context.next = 8;
+          return response.json();
+        case 8:
+          result = _context.sent;
+          return _context.abrupt("return", result);
+        case 10:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getContentMediaSession(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var fetchMediaToken = exports.fetchMediaToken = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(contentId) {
+    var _response$data, _contentData$token, response, contentData, token, configuration, collection;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.prev = 0;
+          _context2.next = 3;
+          return getContentMediaSession(contentId);
+        case 3:
+          response = _context2.sent;
+          contentData = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.contentMediaSession;
+          token = contentData === null || contentData === void 0 || (_contentData$token = contentData.token) === null || _contentData$token === void 0 ? void 0 : _contentData$token.value;
+          configuration = contentData === null || contentData === void 0 ? void 0 : contentData.configuration;
+          collection = contentData === null || contentData === void 0 ? void 0 : contentData.collection;
+          if (!(!token || !configuration || !collection)) {
+            _context2.next = 10;
+            break;
+          }
+          throw new Error('Failed to get content media session data');
+        case 10:
+          return _context2.abrupt("return", Promise.resolve({
+            config: configuration,
+            token: token,
+            collectionId: collection
+          }));
+        case 13:
+          _context2.prev = 13;
+          _context2.t0 = _context2["catch"](0);
+          (0, _monitoring.logException)(_context2.t0, {
+            location: 'editor-synced-block-provider/fetchMediaToken'
+          });
+          throw new Error("Failed to get content media session: ".concat(_context2.t0));
+        case 17:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 13]]);
+  }));
+  return function fetchMediaToken(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();

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

@@ -4,11 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.fetchConfluencePageInfo = void 0;
+exports.fetchConfluencePageInfoOld = exports.fetchConfluencePageInfoNew = exports.fetchConfluencePageInfo = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _errorHandling = require("../../utils/errorHandling");
 var _retry = require("../../utils/retry");
 var _ari = require("./ari");
@@ -71,7 +72,7 @@ var getConfluenceSourceInfo = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/function () {
+var fetchConfluencePageInfoOld = exports.fetchConfluencePageInfoOld = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(pageAri, localId, fireAnalyticsEvent) {
     var _response$data, _contentData$space, _getPageIdAndTypeFrom, pageType, response, contentData, title, url, _ref3, base;
     return _regenerator.default.wrap(function _callee2$(_context2) {
@@ -119,7 +120,80 @@ var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/fun
       }
     }, _callee2, null, [[0, 14]]);
   }));
-  return function fetchConfluencePageInfo(_x2, _x3, _x4) {
+  return function fetchConfluencePageInfoOld(_x2, _x3, _x4) {
     return _ref2.apply(this, arguments);
   };
+}();
+var fetchConfluencePageInfoNew = exports.fetchConfluencePageInfoNew = /*#__PURE__*/function () {
+  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(pageAri, localId) {
+    var _response$data2, _contentData$space2;
+    var _getPageIdAndTypeFrom2, pageType, response, contentData, title, url, _ref5, base;
+    return _regenerator.default.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _getPageIdAndTypeFrom2 = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
+            ari: pageAri
+          }), pageType = _getPageIdAndTypeFrom2.type;
+          _context3.next = 3;
+          return getConfluenceSourceInfo(pageAri);
+        case 3:
+          response = _context3.sent;
+          contentData = (_response$data2 = response.data) === null || _response$data2 === void 0 || (_response$data2 = _response$data2.content) === null || _response$data2 === void 0 || (_response$data2 = _response$data2.nodes) === null || _response$data2 === void 0 ? void 0 : _response$data2[0];
+          title = contentData === null || contentData === void 0 ? void 0 : contentData.title;
+          _ref5 = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {}, base = _ref5.base;
+          if (base && contentData !== null && contentData !== void 0 && (_contentData$space2 = contentData.space) !== null && _contentData$space2 !== void 0 && _contentData$space2.key && contentData !== null && contentData !== void 0 && contentData.id) {
+            if ((0, _utils.isBlogPageType)(pageType)) {
+              url = "".concat(base, "/spaces/").concat(contentData.space.key, "/blog/edit-v2/").concat(contentData.id);
+            } else if (contentData.subType === 'live') {
+              url = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages/").concat(contentData.id);
+            } else {
+              url = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages/edit-v2/").concat(contentData.id);
+            }
+          }
+          url = url && localId ? "".concat(url, "#block-").concat(localId) : url;
+          return _context3.abrupt("return", Promise.resolve({
+            title: title,
+            url: url
+          }));
+        case 10:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function fetchConfluencePageInfoNew(_x5, _x6) {
+    return _ref4.apply(this, arguments);
+  };
+}();
+var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/function () {
+  var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(pageAri, localId, fireAnalyticsEvent) {
+    return _regenerator.default.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          if (!(0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
+            _context4.next = 6;
+            break;
+          }
+          _context4.next = 3;
+          return fetchConfluencePageInfoNew(pageAri, localId);
+        case 3:
+          _context4.t0 = _context4.sent;
+          _context4.next = 9;
+          break;
+        case 6:
+          _context4.next = 8;
+          return fetchConfluencePageInfoOld(pageAri, localId, fireAnalyticsEvent);
+        case 8:
+          _context4.t0 = _context4.sent;
+        case 9:
+          return _context4.abrupt("return", _context4.t0);
+        case 10:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return function fetchConfluencePageInfo(_x7, _x8, _x9) {
+    return _ref6.apply(this, arguments);
+  };
 }();

package/dist/cjs/common/consts.js

@@ -0,0 +1,7 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.SYNC_BLOCK_PRODUCTS = void 0;
+var SYNC_BLOCK_PRODUCTS = exports.SYNC_BLOCK_PRODUCTS = ['confluence-page', 'jira-work-item'];

package/dist/cjs/hooks/useFetchSyncBlockData.js

@@ -11,6 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _monitoring = require("@atlaskit/editor-common/monitoring");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("../common/types");
 var _errorHandling = require("../utils/errorHandling");
 var _utils = require("../utils/utils");
@@ -41,7 +42,7 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
     isLoading = _useState2$.isLoading,
     setFetchState = _useState2[1];
   var reloadData = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-    var syncBlockNode;
+    var syncBlockNode, _manager$referenceMan2;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -77,7 +78,13 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
           (0, _monitoring.logException)(_context.t0, {
             location: 'editor-synced-block-provider/useFetchSyncBlockData'
           });
-          fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent((0, _errorHandling.fetchErrorPayload)(_context.t0.message));
+          if ((0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
+            manager === null || manager === void 0 || (_manager$referenceMan2 = manager.referenceManager) === null || _manager$referenceMan2 === void 0 || (_manager$referenceMan2 = _manager$referenceMan2.fetchExperience) === null || _manager$referenceMan2 === void 0 || _manager$referenceMan2.failure({
+              reason: _context.t0.message
+            });
+          } else {
+            fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent((0, _errorHandling.fetchErrorPayload)(_context.t0.message));
+          }
 
           // Set error state if fetching fails
           setFetchState({
@@ -113,6 +120,7 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
   }, [localId, manager.referenceManager, resourceId]);
   return {
     isLoading: isLoading,
+    ssrProviders: resourceId ? manager.referenceManager.getSSRProviders(resourceId) : null,
     providerFactory: manager.referenceManager.getProviderFactory(resourceId || ''),
     reloadData: reloadData,
     syncBlockInstance: syncBlockInstance

package/dist/cjs/index.js

@@ -57,6 +57,12 @@ Object.defineProperty(exports, "fetchErrorPayload", {
     return _errorHandling.fetchErrorPayload;
   }
 });
+Object.defineProperty(exports, "fetchMediaToken", {
+  enumerable: true,
+  get: function get() {
+    return _fetchMediaToken.fetchMediaToken;
+  }
+});
 Object.defineProperty(exports, "fetchReferences", {
   enumerable: true,
   get: function get() {
@@ -111,6 +117,12 @@ Object.defineProperty(exports, "getPageIdAndTypeFromConfluencePageAri", {
     return _ari2.getPageIdAndTypeFromConfluencePageAri;
   }
 });
+Object.defineProperty(exports, "parseResourceId", {
+  enumerable: true,
+  get: function get() {
+    return _parseResourceId.parseResourceId;
+  }
+});
 Object.defineProperty(exports, "rebaseTransaction", {
   enumerable: true,
   get: function get() {
@@ -172,11 +184,13 @@ var _useFetchSyncBlockTitle = require("./hooks/useFetchSyncBlockTitle");
 var _useHandleContentChanges = require("./hooks/useHandleContentChanges");
 var _ari = require("./clients/block-service/ari");
 var _ari2 = require("./clients/confluence/ari");
+var _fetchMediaToken = require("./clients/confluence/fetchMediaToken");
 var _ari3 = require("./clients/jira/ari");
 var _blockServiceAPI = require("./providers/block-service/blockServiceAPI");
 var _sourceInfo = require("./clients/confluence/sourceInfo");
 var _syncBlockProvider = require("./providers/syncBlockProvider");
 var _syncBlockStoreManager = require("./store-manager/syncBlockStoreManager");
 var _resolveSyncBlockInstance = require("./utils/resolveSyncBlockInstance");
+var _parseResourceId = require("./utils/parseResourceId");
 var _utils = require("./utils/utils");
 var _errorHandling = require("./utils/errorHandling");