@atlaskit/editor-synced-block-provider 0.6.1 → 0.8.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-synced-block-provider
 
+## 0.8.0
+
+### Minor Changes
+
+- [`5167552fe1a93`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5167552fe1a93) -
+  [EDITOR-2339] Bump @atlaskit/adf-schema to 51.3.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 0.7.0
+
+### Minor Changes
+
+- [`4140dc02feebd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4140dc02feebd) -
+  Add support for blogpost pages in content property provider
+
 ## 0.6.1
 
 ### Patch Changes

package/dist/cjs/providers/confluenceContentAPI.js

@@ -12,7 +12,8 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _react = require("react");
 var _ari = require("../utils/ari");
-var _contentProperty = require("../utils/contentProperty");
+var _contentProperty4 = require("../utils/contentProperty");
+var _utils = require("../utils/utils");
 /**
  * Configuration for Content API providers
  */
@@ -22,17 +23,19 @@ var getContentPropertyKey = function getContentPropertyKey(contentPropertyKey, l
 };
 var parseSyncedBlockContentPropertyValue = function parseSyncedBlockContentPropertyValue(value) {
   try {
-    if (typeof value === 'string') {
-      return JSON.parse(value);
+    if (value !== '') {
+      var parsedValue = JSON.parse(value);
+      if (parsedValue.content) {
+        return parsedValue;
+      }
     }
-    return value;
   } catch (error) {
     // eslint-disable-next-line no-console
     console.error('Failed to parse synced block content:', error);
-    return {
-      content: undefined
-    };
   }
+  return {
+    content: undefined
+  };
 };
 
 /**
@@ -47,30 +50,43 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
     key: "fetchData",
     value: function () {
       var _fetchData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(resourceId) {
-        var _contentProperty$data;
-        var pageId, localId, key, options, contentProperty, value, syncedBlockData;
+        var _getPageIdAndTypeFrom, pageId, pageType, localId, key, options, value, _contentProperty$data, contentProperty, _contentProperty$data2, _contentProperty, syncedBlockData;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              pageId = (0, _ari.getPageIdFromAri)(resourceId);
+              _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromAri)(resourceId), pageId = _getPageIdAndTypeFrom.id, pageType = _getPageIdAndTypeFrom.type;
               localId = (0, _ari.getLocalIdFromAri)(resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
               options = {
                 pageId: pageId,
                 key: key,
-                cloudId: this.config.cloudId
+                cloudId: this.config.cloudId,
+                pageType: pageType
               };
-              _context.next = 6;
-              return (0, _contentProperty.getContentProperty)(options);
-            case 6:
+              if (!(0, _utils.isBlogPageType)(pageType)) {
+                _context.next = 11;
+                break;
+              }
+              _context.next = 7;
+              return (0, _contentProperty4.getContentProperty)(options);
+            case 7:
               contentProperty = _context.sent;
-              value = (_contentProperty$data = contentProperty.data.confluence.page.properties) === null || _contentProperty$data === void 0 || (_contentProperty$data = _contentProperty$data[0]) === null || _contentProperty$data === void 0 ? void 0 : _contentProperty$data.value;
+              value = (_contentProperty$data = contentProperty.data.confluence.blogPost.properties) === null || _contentProperty$data === void 0 || (_contentProperty$data = _contentProperty$data[0]) === null || _contentProperty$data === void 0 ? void 0 : _contentProperty$data.value;
+              _context.next = 15;
+              break;
+            case 11:
+              _context.next = 13;
+              return (0, _contentProperty4.getContentProperty)(options);
+            case 13:
+              _contentProperty = _context.sent;
+              value = (_contentProperty$data2 = _contentProperty.data.confluence.page.properties) === null || _contentProperty$data2 === void 0 || (_contentProperty$data2 = _contentProperty$data2[0]) === null || _contentProperty$data2 === void 0 ? void 0 : _contentProperty$data2.value;
+            case 15:
               if (value) {
-                _context.next = 10;
+                _context.next = 17;
                 break;
               }
               throw new Error('Content property value does not exist');
-            case 10:
+            case 17:
               // Parse the synced block content from the property value
               syncedBlockData = parseSyncedBlockContentPropertyValue(value);
               return _context.abrupt("return", {
@@ -78,7 +94,7 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
                 resourceId: resourceId,
                 localId: localId
               });
-            case 12:
+            case 19:
             case "end":
               return _context.stop();
           }
@@ -99,35 +115,55 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
     var _this = this;
     (0, _classCallCheck2.default)(this, ConfluenceADFWriteProvider);
     (0, _defineProperty2.default)(this, "createNewContentProperty", /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(pageId, key, value) {
-        var _contentProperty$data2;
-        var contentProperty;
+      var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(pageId, key, value, pageType) {
+        var options, _contentProperty$data3, contentProperty, _contentProperty2$dat, _contentProperty2;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
-              return (0, _contentProperty.createContentProperty)({
+              options = {
                 pageId: pageId,
                 key: key,
                 value: value,
-                cloudId: _this.config.cloudId
-              });
-            case 2:
+                cloudId: _this.config.cloudId,
+                pageType: pageType
+              };
+              if (!(0, _utils.isBlogPageType)(pageType)) {
+                _context2.next = 12;
+                break;
+              }
+              _context2.next = 4;
+              return (0, _contentProperty4.createContentProperty)(options);
+            case 4:
               contentProperty = _context2.sent;
-              if (!(((_contentProperty$data2 = contentProperty.data.confluence.createPageProperty.pageProperty) === null || _contentProperty$data2 === void 0 ? void 0 : _contentProperty$data2.key) === key)) {
-                _context2.next = 7;
+              if (!(((_contentProperty$data3 = contentProperty.data.confluence.createBlogPostProperty.blogPostProperty) === null || _contentProperty$data3 === void 0 ? void 0 : _contentProperty$data3.key) === key)) {
+                _context2.next = 9;
                 break;
               }
               return _context2.abrupt("return", key);
-            case 7:
-              throw new Error('Failed to create content property');
-            case 8:
+            case 9:
+              throw new Error('Failed to create blog post content property');
+            case 10:
+              _context2.next = 20;
+              break;
+            case 12:
+              _context2.next = 14;
+              return (0, _contentProperty4.createContentProperty)(options);
+            case 14:
+              _contentProperty2 = _context2.sent;
+              if (!(((_contentProperty2$dat = _contentProperty2.data.confluence.createPageProperty.pageProperty) === null || _contentProperty2$dat === void 0 ? void 0 : _contentProperty2$dat.key) === key)) {
+                _context2.next = 19;
+                break;
+              }
+              return _context2.abrupt("return", key);
+            case 19:
+              throw new Error('Failed to create page content property');
+            case 20:
             case "end":
               return _context2.stop();
           }
         }, _callee2);
       }));
-      return function (_x2, _x3, _x4) {
+      return function (_x2, _x3, _x4, _x5) {
         return _ref.apply(this, arguments);
       };
     }());
@@ -137,11 +173,11 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
     key: "writeData",
     value: function () {
       var _writeData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(data) {
-        var pageId, syncedBlockValue, _contentProperty$data3, localId, key, contentProperty, _key;
+        var _getPageIdAndTypeFrom2, pageId, pageType, syncedBlockValue, localId, key, options, _contentProperty$data4, contentProperty, _contentProperty3$dat, _contentProperty3, _key;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              pageId = (0, _ari.getPageIdFromAri)(data.resourceId);
+              _getPageIdAndTypeFrom2 = (0, _ari.getPageIdAndTypeFromAri)(data.resourceId), pageId = _getPageIdAndTypeFrom2.id, pageType = _getPageIdAndTypeFrom2.type;
               if (!(data.sourceDocumentAri && data.resourceId !== (0, _ari.resourceIdFromSourceAndLocalId)(data.sourceDocumentAri, data.localId))) {
                 _context3.next = 3;
                 break;
@@ -152,48 +188,75 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
                 content: data.content
               });
               if (!data.resourceId) {
-                _context3.next = 21;
+                _context3.next = 37;
                 break;
               }
               // Update existing content property
               localId = (0, _ari.getLocalIdFromAri)(data.resourceId);
               key = getContentPropertyKey(this.config.contentPropertyKey, localId);
-              _context3.next = 9;
-              return (0, _contentProperty.updateContentProperty)({
+              options = {
                 pageId: pageId,
                 key: key,
                 value: syncedBlockValue,
-                cloudId: this.config.cloudId
-              });
-            case 9:
+                cloudId: this.config.cloudId,
+                pageType: pageType
+              };
+              if (!(0, _utils.isBlogPageType)(pageType)) {
+                _context3.next = 23;
+                break;
+              }
+              _context3.next = 11;
+              return (0, _contentProperty4.updateContentProperty)(options);
+            case 11:
               contentProperty = _context3.sent;
-              if (!(((_contentProperty$data3 = contentProperty.data.confluence.updateValuePageProperty.pageProperty) === null || _contentProperty$data3 === void 0 ? void 0 : _contentProperty$data3.key) === key)) {
-                _context3.next = 14;
+              if (!(((_contentProperty$data4 = contentProperty.data.confluence.updateValueBlogPostProperty.blogPostProperty) === null || _contentProperty$data4 === void 0 ? void 0 : _contentProperty$data4.key) === key)) {
+                _context3.next = 16;
                 break;
               }
               return _context3.abrupt("return", key);
-            case 14:
-              if (!(contentProperty.data.confluence.updateValuePageProperty.pageProperty === null)) {
-                _context3.next = 18;
+            case 16:
+              if (!(contentProperty.data.confluence.updateValueBlogPostProperty.blogPostProperty === null)) {
+                _context3.next = 20;
                 break;
               }
-              return _context3.abrupt("return", this.createNewContentProperty(pageId, key, syncedBlockValue));
-            case 18:
+              return _context3.abrupt("return", this.createNewContentProperty(pageId, key, syncedBlockValue, pageType));
+            case 20:
+              throw new Error('Failed to update blog post content property');
+            case 21:
+              _context3.next = 35;
+              break;
+            case 23:
+              _context3.next = 25;
+              return (0, _contentProperty4.updateContentProperty)(options);
+            case 25:
+              _contentProperty3 = _context3.sent;
+              if (!(((_contentProperty3$dat = _contentProperty3.data.confluence.updateValuePageProperty.pageProperty) === null || _contentProperty3$dat === void 0 ? void 0 : _contentProperty3$dat.key) === key)) {
+                _context3.next = 30;
+                break;
+              }
+              return _context3.abrupt("return", key);
+            case 30:
+              if (!(_contentProperty3.data.confluence.updateValuePageProperty.pageProperty === null)) {
+                _context3.next = 34;
+                break;
+              }
+              return _context3.abrupt("return", this.createNewContentProperty(pageId, key, syncedBlockValue, pageType));
+            case 34:
               throw new Error('Failed to update content property');
-            case 19:
-              _context3.next = 23;
+            case 35:
+              _context3.next = 39;
               break;
-            case 21:
+            case 37:
               // Create new content property
               _key = getContentPropertyKey(this.config.contentPropertyKey, data.localId);
-              return _context3.abrupt("return", this.createNewContentProperty(pageId, _key, syncedBlockValue));
-            case 23:
+              return _context3.abrupt("return", this.createNewContentProperty(pageId, _key, syncedBlockValue, pageType));
+            case 39:
             case "end":
               return _context3.stop();
           }
         }, _callee3, this);
       }));
-      function writeData(_x5) {
+      function writeData(_x6) {
         return _writeData.apply(this, arguments);
       }
       return writeData;

package/dist/cjs/utils/ari.js

@@ -3,35 +3,32 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.resourceIdFromSourceAndLocalId = exports.getPageIdFromAri = exports.getPageARIFromResourceId = exports.getLocalIdFromAri = exports.getContentPropertyIdFromAri = exports.getContentPropertyAri = exports.getConfluencePageAri = void 0;
+exports.resourceIdFromSourceAndLocalId = exports.getPageIdAndTypeFromAri = exports.getPageARIFromResourceId = exports.getLocalIdFromAri = exports.getContentPropertyIdFromAri = exports.getContentPropertyAri = exports.getConfluencePageAri = void 0;
+/* eslint-disable require-unicode-regexp  */
+
 var getConfluencePageAri = exports.getConfluencePageAri = function getConfluencePageAri(pageId, cloudId) {
-  return "ari:cloud:confluence:".concat(cloudId, ":page/").concat(pageId);
+  var pageType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'page';
+  return "ari:cloud:confluence:".concat(cloudId, ":").concat(pageType, "/").concat(pageId);
 };
-var getPageIdFromAri = exports.getPageIdFromAri = function getPageIdFromAri(ari) {
-  // eslint-disable-next-line require-unicode-regexp
-  var match = ari.match(/ari:cloud:confluence:[^:]+:page\/(\d+)/);
-  if (match !== null && match !== void 0 && match[1]) {
-    return match[1];
+var getPageIdAndTypeFromAri = exports.getPageIdAndTypeFromAri = function getPageIdAndTypeFromAri(ari) {
+  var match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/);
+  if (match !== null && match !== void 0 && match[2]) {
+    return {
+      type: match[1],
+      id: match[2]
+    };
   }
   throw new Error("Invalid page ARI: ".concat(ari));
 };
-
-/**
- *
- * @param ari ari:cloud:confluence:<cloudId>:page/<pageId>/<localId>
- * @returns
- */
 var getLocalIdFromAri = exports.getLocalIdFromAri = function getLocalIdFromAri(ari) {
-  // eslint-disable-next-line require-unicode-regexp
-  var match = ari.match(/ari:cloud:confluence:[^:]+:page\/\d+\/([a-zA-Z0-9-]+)/);
-  if (match !== null && match !== void 0 && match[1]) {
-    return match[1];
+  var match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/\d+\/([a-zA-Z0-9-]+)/);
+  if (match !== null && match !== void 0 && match[2]) {
+    return match[2];
   }
   throw new Error("Invalid page ARI: ".concat(ari));
 };
 var getPageARIFromResourceId = exports.getPageARIFromResourceId = function getPageARIFromResourceId(resourceId) {
-  // eslint-disable-next-line require-unicode-regexp
-  var match = resourceId.match(/(ari:cloud:confluence:[^:]+:page\/\d+)\/([a-zA-Z0-9-]+)$/);
+  var match = resourceId.match(/(ari:cloud:confluence:[^:]+:(page|blogpost)\/\d+)\/([a-zA-Z0-9-]+)$/);
   if (match !== null && match !== void 0 && match[1]) {
     return match[1];
   }
@@ -40,8 +37,15 @@ var getPageARIFromResourceId = exports.getPageARIFromResourceId = function getPa
 var getContentPropertyAri = exports.getContentPropertyAri = function getContentPropertyAri(contentPropertyId, cloudId) {
   return "ari:cloud:confluence:".concat(cloudId, ":content/").concat(contentPropertyId);
 };
+
+/**
+ * DEPRECATED - Will be removed in the future
+ * @private
+ * @deprecated
+ * @param ari
+ * @returns
+ */
 var getContentPropertyIdFromAri = exports.getContentPropertyIdFromAri = function getContentPropertyIdFromAri(ari) {
-  // eslint-disable-next-line require-unicode-regexp
   var match = ari.match(/ari:cloud:confluence:[^:]+:content\/([^/]+)/);
   if (match) {
     return match[1];

package/dist/cjs/utils/contentProperty.js

@@ -9,6 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _ari = require("./ari");
+var _utils = require("./utils");
 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 = {
@@ -28,7 +29,15 @@ var UPDATE_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_UPDATE';
  * @param key
  * @returns
  */
-var GET_QUERY = "query ".concat(GET_OPERATION_NAME, " ($id: ID!, $keys: [String]!) {\n\t\t\t\t\tconfluence {\n\t\t\t\t\t\tpage (id: $id) {\n\t\t\t\t\t\t\tproperties(keys: $keys) {\n\t\t\t\t\t\t\t\tkey,\n\t\t\t\t\t\t\t\tvalue\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}");
+var GET_PAGE_QUERY = "query ".concat(GET_OPERATION_NAME, " ($id: ID!, $keys: [String]!) {\n\t\t\t\t\tconfluence {\n\t\t\t\t\t\tpage (id: $id) {\n\t\t\t\t\t\t\tproperties(keys: $keys) {\n\t\t\t\t\t\t\t\tkey,\n\t\t\t\t\t\t\t\tvalue\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}");
+
+/**
+ * Query to get the blog page property by key
+ * @param documentARI
+ * @param key
+ * @returns
+ */
+var GET_BLOG_QUERY = "query ".concat(GET_OPERATION_NAME, " ($id: ID!, $keys: [String]!) {\n\tconfluence {\n\t\tblogPost (id: $id) {\n\t\t\tproperties(keys: $keys) {\n\t\t\t\tkey,\n\t\t\t\tvalue\n\t\t\t}\n\t\t}\n\t}\n}");
 
 /**
  * Query to create a page property with key and value
@@ -37,7 +46,16 @@ var GET_QUERY = "query ".concat(GET_OPERATION_NAME, " ($id: ID!, $keys: [String]
  * @param value
  * @returns
  */
-var CREATE_QUERY = "mutation ".concat(CREATE_OPERATION_NAME, " ($input: ConfluenceCreatePagePropertyInput!){\n\t\t\t\t\t\tconfluence {\n\t\t\t\t\t\t\tcreatePageProperty(input: $input) {\n\t\t\t\t\t\t\t\tpageProperty {\n\t\t\t\t\t\t\t\t\tkey,\n\t\t\t\t\t\t\t\t\tvalue\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}");
+var CREATE_PAGE_QUERY = "mutation ".concat(CREATE_OPERATION_NAME, " ($input: ConfluenceCreatePagePropertyInput!){\n\t\t\t\t\t\tconfluence {\n\t\t\t\t\t\t\tcreatePageProperty(input: $input) {\n\t\t\t\t\t\t\t\tpageProperty {\n\t\t\t\t\t\t\t\t\tkey,\n\t\t\t\t\t\t\t\t\tvalue\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}");
+
+/**
+ * Query to create a blog page property with key and value
+ * @param documentARI
+ * @param key
+ * @param value
+ * @returns
+ */
+var CREATE_BLOG_QUERY = "mutation ".concat(CREATE_OPERATION_NAME, " ($input: ConfluenceCreateBlogPostPropertyInput!){\n\tconfluence {\n\t\tcreateBlogPostProperty(input: $input) {\n\t\t\tblogPostProperty {\n\t\t\t\tkey,\n\t\t\t\tvalue\n\t\t\t}\n\t\t}\n\t}\n}");
 
 /**
  * Query to update a page property with key and value without bumping the version
@@ -46,42 +64,51 @@ var CREATE_QUERY = "mutation ".concat(CREATE_OPERATION_NAME, " ($input: Confluen
  * @param value
  * @returns
  */
-var UPDATE_QUERY = "mutation ".concat(UPDATE_OPERATION_NAME, " ($input: ConfluenceUpdateValuePagePropertyInput!) {\n\t\t\t\t\t\tconfluence {\n\t\t\t\t\t\t\tupdateValuePageProperty(input: $input) {\n\t\t\t\t\t\t\t\tpageProperty {\n\t\t\t\t\t\t\t\t\tkey,\n\t\t\t\t\t\t\t\t\tvalue\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}");
+var UPDATE_PAGE_QUERY = "mutation ".concat(UPDATE_OPERATION_NAME, " ($input: ConfluenceUpdateValuePagePropertyInput!) {\n\t\t\t\t\t\tconfluence {\n\t\t\t\t\t\t\tupdateValuePageProperty(input: $input) {\n\t\t\t\t\t\t\t\tpageProperty {\n\t\t\t\t\t\t\t\t\tkey,\n\t\t\t\t\t\t\t\t\tvalue\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}");
+
+/**
+ * Query to update a blog page property with key and value without bumping the version
+ * @param documentARI
+ * @param key
+ * @param value
+ * @returns
+ */
+var UPDATE_BLOG_QUERY = "mutation ".concat(UPDATE_OPERATION_NAME, " ($input: ConfluenceUpdateValueBlogPostPropertyInput!) {\n\tconfluence {\n\t\tupdateValueBlogPostProperty(input: $input) {\n\t\t\tblogPostProperty {\n\t\t\t\tkey,\n\t\t\t\tvalue\n\t\t\t}\n\t\t}\n\t}\n}");
 var getContentProperty = exports.getContentProperty = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(_ref) {
-    var pageId, key, cloudId, documentARI, bodyData, response, contentProperty;
+    var pageId, key, cloudId, pageType, documentARI, isBlog, bodyData, response;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          pageId = _ref.pageId, key = _ref.key, cloudId = _ref.cloudId;
-          documentARI = (0, _ari.getConfluencePageAri)(pageId, cloudId);
+          pageId = _ref.pageId, key = _ref.key, cloudId = _ref.cloudId, pageType = _ref.pageType;
+          documentARI = (0, _ari.getConfluencePageAri)(pageId, cloudId, pageType);
+          isBlog = (0, _utils.isBlogPageType)(pageType);
           bodyData = {
-            query: GET_QUERY,
+            query: isBlog ? GET_BLOG_QUERY : GET_PAGE_QUERY,
             operationName: GET_OPERATION_NAME,
             variables: {
               id: documentARI,
               keys: [key]
             }
           };
-          _context.next = 5;
+          _context.next = 6;
           return fetch(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)
           });
-        case 5:
+        case 6:
           response = _context.sent;
           if (response.ok) {
-            _context.next = 8;
+            _context.next = 9;
             break;
           }
           throw new Error("Failed to get content property: ".concat(response.statusText));
-        case 8:
-          _context.next = 10;
+        case 9:
+          _context.next = 11;
           return response.json();
-        case 10:
-          contentProperty = _context.sent;
-          return _context.abrupt("return", contentProperty);
+        case 11:
+          return _context.abrupt("return", _context.sent);
         case 12:
         case "end":
           return _context.stop();
@@ -94,44 +121,53 @@ var getContentProperty = exports.getContentProperty = /*#__PURE__*/function () {
 }();
 var updateContentProperty = exports.updateContentProperty = /*#__PURE__*/function () {
   var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(_ref3) {
-    var pageId, key, value, cloudId, documentARI, bodyData, response, contentProperty;
+    var pageId, key, value, cloudId, pageType, documentARI, isBlog, useSameVersion, input, bodyData, response;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          pageId = _ref3.pageId, key = _ref3.key, value = _ref3.value, cloudId = _ref3.cloudId;
-          documentARI = (0, _ari.getConfluencePageAri)(pageId, cloudId);
+          pageId = _ref3.pageId, key = _ref3.key, value = _ref3.value, cloudId = _ref3.cloudId, pageType = _ref3.pageType;
+          documentARI = (0, _ari.getConfluencePageAri)(pageId, cloudId, pageType);
+          isBlog = (0, _utils.isBlogPageType)(pageType);
+          useSameVersion = {
+            useSameVersion: true
+          };
+          input = _objectSpread(_objectSpread({}, isBlog ? {
+            blogPostId: documentARI
+          } : {
+            pageId: documentARI
+          }), {}, {
+            key: key,
+            value: value
+          }); // Blog content properties don't support the useSameVersion flag at the moment
+          if (!isBlog) {
+            input = _objectSpread(_objectSpread({}, input), useSameVersion);
+          }
           bodyData = {
-            query: UPDATE_QUERY,
+            query: isBlog ? UPDATE_BLOG_QUERY : UPDATE_PAGE_QUERY,
             operationName: UPDATE_OPERATION_NAME,
             variables: {
-              input: {
-                pageId: documentARI,
-                key: key,
-                value: value,
-                useSameVersion: true
-              }
+              input: input
             }
           };
-          _context2.next = 5;
+          _context2.next = 9;
           return fetch(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)
           });
-        case 5:
+        case 9:
           response = _context2.sent;
           if (response.ok) {
-            _context2.next = 8;
+            _context2.next = 12;
             break;
           }
           throw new Error("Failed to update content property: ".concat(response.statusText));
-        case 8:
-          _context2.next = 10;
-          return response.json();
-        case 10:
-          contentProperty = _context2.sent;
-          return _context2.abrupt("return", contentProperty);
         case 12:
+          _context2.next = 14;
+          return response.json();
+        case 14:
+          return _context2.abrupt("return", _context2.sent);
+        case 15:
         case "end":
           return _context2.stop();
       }
@@ -143,43 +179,46 @@ var updateContentProperty = exports.updateContentProperty = /*#__PURE__*/functio
 }();
 var createContentProperty = exports.createContentProperty = /*#__PURE__*/function () {
   var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(_ref5) {
-    var pageId, key, value, cloudId, documentARI, escapedValue, bodyData, response, contentProperty;
+    var pageId, key, value, cloudId, pageType, documentARI, isBlog, escapedValue, bodyData, response;
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          pageId = _ref5.pageId, key = _ref5.key, value = _ref5.value, cloudId = _ref5.cloudId;
-          documentARI = (0, _ari.getConfluencePageAri)(pageId, cloudId); // eslint-disable-next-line require-unicode-regexp
+          pageId = _ref5.pageId, key = _ref5.key, value = _ref5.value, cloudId = _ref5.cloudId, pageType = _ref5.pageType;
+          documentARI = (0, _ari.getConfluencePageAri)(pageId, cloudId, pageType);
+          isBlog = (0, _utils.isBlogPageType)(pageType); // eslint-disable-next-line require-unicode-regexp
           escapedValue = value.replace(/"/g, '\\"');
           bodyData = {
-            query: CREATE_QUERY,
+            query: isBlog ? CREATE_BLOG_QUERY : CREATE_PAGE_QUERY,
             operationName: CREATE_OPERATION_NAME,
             variables: {
-              input: {
-                pageId: documentARI,
+              input: _objectSpread(_objectSpread({}, isBlog ? {
+                blogPostId: documentARI
+              } : {
+                pageId: documentARI
+              }), {}, {
                 key: key,
                 value: escapedValue
-              }
+              })
             }
           };
-          _context3.next = 6;
+          _context3.next = 7;
           return fetch(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)
           });
-        case 6:
+        case 7:
           response = _context3.sent;
           if (response.ok) {
-            _context3.next = 9;
+            _context3.next = 10;
             break;
           }
           throw new Error("Failed to create content property: ".concat(response.statusText));
-        case 9:
-          _context3.next = 11;
+        case 10:
+          _context3.next = 12;
           return response.json();
-        case 11:
-          contentProperty = _context3.sent;
-          return _context3.abrupt("return", contentProperty);
+        case 12:
+          return _context3.abrupt("return", _context3.sent);
         case 13:
         case "end":
           return _context3.stop();

package/dist/cjs/utils/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.convertSyncBlockPMNodeToSyncBlockData = void 0;
+exports.isBlogPageType = exports.convertSyncBlockPMNodeToSyncBlockData = void 0;
 var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
 var convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockPMNodeToSyncBlockData = function convertSyncBlockPMNodeToSyncBlockData(node) {
   var includeContent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -19,4 +19,7 @@ var convertSyncBlockPMNodeToSyncBlockData = exports.convertSyncBlockPMNodeToSync
     },
     content: includeContent ? node.content.content.map(toJSON) : undefined
   };
+};
+var isBlogPageType = exports.isBlogPageType = function isBlogPageType(pageType) {
+  return pageType === 'blogpost';
 };