@atlaskit/editor-synced-block-provider 3.29.2 → 3.30.0

package/dist/cjs/clients/confluence/sourceInfo.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 _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");
@@ -29,45 +30,49 @@ var GET_SOURCE_INFO_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_SOURCE_INFO';
  * @param documentARI
  * @returns subType live if livePage, subType null if classic page
  */
-var GET_SOURCE_INFO_QUERY = "query ".concat(GET_SOURCE_INFO_OPERATION_NAME, " ($id: ID!) {\n\tcontent (id: $id) {\n\t\tnodes {\n\t\t\tid\n\t\t\tlinks {\n\t\t\t\tbase\n\t\t\t}\n\t\t\tspace {\n\t\t\t\tkey\n\t\t\t}\n\t\t\tsubType\n\t\t\ttitle\n\t\t}\n\t}\n}");
+var GET_SOURCE_INFO_QUERY = "query ".concat(GET_SOURCE_INFO_OPERATION_NAME, " ($id: ID!, $status: [String]) {\n\tcontent (id: $id, status: $status) {\n\t\tnodes {\n\t\t\tid\n\t\t\tlinks {\n\t\t\t\tbase\n\t\t\t\teditui\n\t\t\t\twebui\n\t\t\t}\n\t\t\tspace {\n\t\t\t\tkey\n\t\t\t}\n\t\t\tstatus\n\t\t\tsubType\n\t\t\ttitle\n\t\t}\n\t}\n}");
 var getConfluenceSourceInfo = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(ari) {
-    var bodyData, response;
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(ari, status) {
+    var variables, bodyData, response;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          variables = {
+            id: ari
+          };
+          if (status) {
+            variables.status = status;
+          }
           bodyData = {
             query: GET_SOURCE_INFO_QUERY,
             operationName: GET_SOURCE_INFO_OPERATION_NAME,
-            variables: {
-              id: ari
-            }
+            variables: variables
           };
-          _context.next = 3;
+          _context.next = 5;
           return (0, _retry.fetchWithRetry)(GRAPHQL_ENDPOINT, {
             method: 'POST',
             headers: _objectSpread(_objectSpread({}, COMMON_HEADERS), AGG_HEADERS),
             body: JSON.stringify(bodyData)
           });
-        case 3:
+        case 5:
           response = _context.sent;
           if (response.ok) {
-            _context.next = 6;
+            _context.next = 8;
             break;
           }
           throw new Error("Failed to get url: ".concat(response.statusText));
-        case 6:
-          _context.next = 8;
-          return response.json();
         case 8:
+          _context.next = 10;
+          return response.json();
+        case 10:
           return _context.abrupt("return", _context.sent);
-        case 9:
+        case 11:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return function getConfluenceSourceInfo(_x) {
+  return function getConfluenceSourceInfo(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -113,7 +118,7 @@ var resolveNoAccessPageInfo = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function resolveNoAccessPageInfo(_x2) {
+  return function resolveNoAccessPageInfo(_x3) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -179,13 +184,13 @@ var fetchCompleteConfluencePageInfo = /*#__PURE__*/function () {
       }
     }, _callee3, null, [[0, 18]]);
   }));
-  return function fetchCompleteConfluencePageInfo(_x3, _x4) {
+  return function fetchCompleteConfluencePageInfo(_x4, _x5) {
     return _ref3.apply(this, arguments);
   };
 }();
 var fetchConfluencePageInfoOld = exports.fetchConfluencePageInfoOld = /*#__PURE__*/function () {
   var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(pageAri, localId, fireAnalyticsEvent) {
-    var _response$data, _contentData$space, _getPageIdAndTypeFrom2, pageType, response, contentData, title, url, _ref5, base;
+    var _response$data, _contentData$space, _getPageIdAndTypeFrom2, pageType, status, response, contentData, title, url, _ref5, base;
     return _regenerator.default.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -193,9 +198,10 @@ var fetchConfluencePageInfoOld = exports.fetchConfluencePageInfoOld = /*#__PURE_
           _getPageIdAndTypeFrom2 = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
             ari: pageAri
           }), pageType = _getPageIdAndTypeFrom2.type;
-          _context4.next = 4;
-          return getConfluenceSourceInfo(pageAri);
-        case 4:
+          status = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? ['draft', 'archived', 'current'] : undefined;
+          _context4.next = 5;
+          return getConfluenceSourceInfo(pageAri, status);
+        case 5:
           response = _context4.sent;
           contentData = (_response$data = response.data) === null || _response$data === void 0 || (_response$data = _response$data.content) === null || _response$data === void 0 || (_response$data = _response$data.nodes) === null || _response$data === void 0 ? void 0 : _response$data[0];
           title = contentData === null || contentData === void 0 ? void 0 : contentData.title;
@@ -218,31 +224,31 @@ var fetchConfluencePageInfoOld = exports.fetchConfluencePageInfoOld = /*#__PURE_
             url: url,
             sourceAri: pageAri
           }));
-        case 14:
-          _context4.prev = 14;
+        case 15:
+          _context4.prev = 15;
           _context4.t0 = _context4["catch"](0);
           (0, _monitoring.logException)(_context4.t0, {
             location: 'editor-synced-block-provider/sourceInfo'
           });
           fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent((0, _errorHandling.getSourceInfoErrorPayload)(_context4.t0.message));
           return _context4.abrupt("return", Promise.resolve(undefined));
-        case 19:
+        case 20:
         case "end":
           return _context4.stop();
       }
-    }, _callee4, null, [[0, 14]]);
+    }, _callee4, null, [[0, 15]]);
   }));
-  return function fetchConfluencePageInfoOld(_x5, _x6, _x7) {
+  return function fetchConfluencePageInfoOld(_x6, _x7, _x8) {
     return _ref4.apply(this, arguments);
   };
 }();
 var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/function () {
   var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(pageAri, hasAccess, urlType, localId, isUnpublished) {
-    var _response$data2, _contentData$space2, _getPageIdAndTypeFrom3, pageType, response, contentData, _ref7, title, subType, url, _ref8, base;
+    var _response$data2, _getPageIdAndTypeFrom3, pageType, status, response, contentData, _ref7, title, subType, url, _ref8, base, editui, webui, pageStatus, _contentData$space2;
     return _regenerator.default.wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          if (!isUnpublished) {
+          if (!(isUnpublished && !(0, _platformFeatureFlags.fg)('platform_synced_block_patch_3'))) {
             _context5.next = 4;
             break;
           }
@@ -252,26 +258,36 @@ var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/fun
           return _context5.abrupt("return", _context5.sent);
         case 4:
           if (!hasAccess) {
-            _context5.next = 17;
+            _context5.next = 19;
             break;
           }
           _getPageIdAndTypeFrom3 = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
             ari: pageAri
           }), pageType = _getPageIdAndTypeFrom3.type;
-          _context5.next = 8;
-          return getConfluenceSourceInfo(pageAri);
-        case 8:
+          status = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? ['draft', 'archived'] : undefined;
+          _context5.next = 9;
+          return getConfluenceSourceInfo(pageAri, status);
+        case 9:
           response = _context5.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];
           _ref7 = contentData || {}, title = _ref7.title, subType = _ref7.subType;
-          _ref8 = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {}, base = _ref8.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").concat(urlType === 'edit' ? '/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").concat(urlType === 'edit' ? '/edit-v2' : '', "/").concat(contentData.id);
+          _ref8 = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {}, base = _ref8.base, editui = _ref8.editui, webui = _ref8.webui;
+          pageStatus = contentData === null || contentData === void 0 ? void 0 : contentData.status;
+          if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
+            if (base && editui && pageStatus !== 'archived') {
+              url = "".concat(base).concat(editui);
+            } else if (base && webui && pageStatus === 'archived') {
+              url = "".concat(base).concat(webui);
+            }
+          } else {
+            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").concat(urlType === 'edit' ? '/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").concat(urlType === 'edit' ? '/edit-v2' : '', "/").concat(contentData.id);
+              }
             }
           }
           url = url && localId ? "".concat(url, "#block-").concat(localId) : url;
@@ -281,18 +297,18 @@ var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/fun
             sourceAri: pageAri,
             subType: subType
           }));
-        case 17:
-          _context5.next = 19;
-          return resolveNoAccessPageInfo(pageAri);
         case 19:
+          _context5.next = 21;
+          return resolveNoAccessPageInfo(pageAri);
+        case 21:
           return _context5.abrupt("return", _context5.sent);
-        case 20:
+        case 22:
         case "end":
           return _context5.stop();
       }
     }, _callee5);
   }));
-  return function fetchConfluencePageInfo(_x8, _x9, _x0, _x1, _x10) {
+  return function fetchConfluencePageInfo(_x9, _x0, _x1, _x10, _x11) {
     return _ref6.apply(this, arguments);
   };
 }();

package/dist/cjs/utils/resolveSyncBlockInstance.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.resolveSyncBlockInstance = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _ari = require("../clients/confluence/ari");
 var _types = require("../common/types");
 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; }
@@ -40,8 +42,30 @@ var resolveSyncBlockInstance = exports.resolveSyncBlockInstance = function resol
     data: _objectSpread(_objectSpread({}, newResult.data), {}, {
       sourceURL: ((_newResult$data = newResult.data) === null || _newResult$data === void 0 ? void 0 : _newResult$data.sourceURL) || ((_oldResult$data = oldResult.data) === null || _oldResult$data === void 0 ? void 0 : _oldResult$data.sourceURL) || undefined,
       sourceTitle: ((_newResult$data2 = newResult.data) === null || _newResult$data2 === void 0 ? void 0 : _newResult$data2.sourceTitle) || ((_oldResult$data2 = oldResult.data) === null || _oldResult$data2 === void 0 ? void 0 : _oldResult$data2.sourceTitle) || undefined,
-      sourceSubType: ((_newResult$data3 = newResult.data) === null || _newResult$data3 === void 0 ? void 0 : _newResult$data3.sourceSubType) || ((_oldResult$data3 = oldResult.data) === null || _oldResult$data3 === void 0 ? void 0 : _oldResult$data3.sourceSubType) || undefined,
+      sourceSubType: (0, _platformFeatureFlags.fg)('platform_synced_block_patch_3') ? mergeSubType(oldResult, newResult) : ((_newResult$data3 = newResult.data) === null || _newResult$data3 === void 0 ? void 0 : _newResult$data3.sourceSubType) || ((_oldResult$data3 = oldResult.data) === null || _oldResult$data3 === void 0 ? void 0 : _oldResult$data3.sourceSubType) || undefined,
       onSameDocument: ((_newResult$data4 = newResult.data) === null || _newResult$data4 === void 0 ? void 0 : _newResult$data4.onSameDocument) || ((_oldResult$data4 = oldResult.data) === null || _oldResult$data4 === void 0 ? void 0 : _oldResult$data4.onSameDocument) || undefined
     })
   });
+};
+var mergeSubType = function mergeSubType(oldResult, newResult) {
+  var _newResult$data5, _newResult$data6, _oldResult$data5;
+  // for classic pages, subType is 'null'
+  if (((_newResult$data5 = newResult.data) === null || _newResult$data5 === void 0 ? void 0 : _newResult$data5.sourceSubType) !== undefined) {
+    return newResult.data.sourceSubType;
+  }
+  if ((_newResult$data6 = newResult.data) !== null && _newResult$data6 !== void 0 && _newResult$data6.sourceAri) {
+    // for blogposts, subType is always undefined
+    try {
+      var _newResult$data7;
+      var _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
+          ari: (_newResult$data7 = newResult.data) === null || _newResult$data7 === void 0 ? void 0 : _newResult$data7.sourceAri
+        }),
+        pageType = _getPageIdAndTypeFrom.type;
+      if (pageType === 'blogpost') {
+        var _newResult$data8;
+        return (_newResult$data8 = newResult.data) === null || _newResult$data8 === void 0 ? void 0 : _newResult$data8.sourceSubType;
+      }
+    } catch (_unused) {}
+  }
+  return (_oldResult$data5 = oldResult.data) === null || _oldResult$data5 === void 0 ? void 0 : _oldResult$data5.sourceSubType;
 };

package/dist/es2019/clients/block-service/blockService.js

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 import { fetchWithRetry } from '../../utils/retry';
 export const isBlockContentResponse = response => {
   const content = response.content;
@@ -49,7 +50,8 @@ export const getReferenceSyncedBlocks = async documentAri => {
     query: buildGetDocumentReferenceBlocksQuery(documentAri),
     operationName: GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME
   };
-  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockGetDocumentReferenceBlocks` : GRAPHQL_ENDPOINT;
+  const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
     body: JSON.stringify(bodyData)
@@ -263,7 +265,8 @@ export const getSyncedBlockContent = async ({
     query: buildGetBlockQuery(blockAri),
     operationName: GET_BLOCK_OPERATION_NAME
   };
-  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockGetBlock` : GRAPHQL_ENDPOINT;
+  const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
     body: JSON.stringify(bodyData)
@@ -298,7 +301,8 @@ export const batchRetrieveSyncedBlocks = async ({
     query: buildBatchRetrieveBlocksQuery(blockAris),
     operationName: BATCH_RETRIEVE_BLOCKS_OPERATION_NAME
   };
-  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockBatchRetrieveBlocks` : GRAPHQL_ENDPOINT;
+  const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
     body: JSON.stringify(bodyData)
@@ -328,7 +332,8 @@ export const deleteSyncedBlock = async ({
     query: buildDeleteBlockMutation(blockAri, deleteReason),
     operationName: DELETE_BLOCK_OPERATION_NAME
   };
-  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockDeleteBlock` : GRAPHQL_ENDPOINT;
+  const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
     body: JSON.stringify(bodyData)
@@ -354,7 +359,8 @@ export const updateSyncedBlock = async ({
     query: buildUpdateBlockMutation(blockAri, content, stepVersion, status),
     operationName: UPDATE_BLOCK_OPERATION_NAME
   };
-  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockUpdateBlock` : GRAPHQL_ENDPOINT;
+  const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
     body: JSON.stringify(bodyData)
@@ -381,7 +387,8 @@ export const createSyncedBlock = async ({
     query: buildCreateBlockMutation(blockAri, blockInstanceId, content, product, sourceAri, stepVersion, status),
     operationName: CREATE_BLOCK_OPERATION_NAME
   };
-  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockCreateBlock` : GRAPHQL_ENDPOINT;
+  const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
     body: JSON.stringify(bodyData)
@@ -407,7 +414,8 @@ export const updateReferenceSyncedBlockOnDocument = async ({
     query: buildUpdateDocumentReferencesMutation(documentAri, blocks, noContent),
     operationName: UPDATE_DOCUMENT_REFERENCES_OPERATION_NAME
   };
-  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockUpdateDocumentReferences` : GRAPHQL_ENDPOINT;
+  const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
     body: JSON.stringify(bodyData),
@@ -436,7 +444,8 @@ export const getReferenceSyncedBlocksByBlockAri = async ({
     query: buildGetBlockReferencesQuery(blockAri),
     operationName: GET_BLOCK_REFERENCES_OPERATION_NAME
   };
-  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockGetReferences` : GRAPHQL_ENDPOINT;
+  const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
     body: JSON.stringify(bodyData)

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

@@ -1,6 +1,7 @@
 /* eslint-disable require-unicode-regexp  */
 
 import { logException } from '@atlaskit/editor-common/monitoring';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { getSourceInfoErrorPayload } from '../../utils/errorHandling';
 import { fetchWithRetry } from '../../utils/retry';
 import { getPageIdAndTypeFromConfluencePageAri } from './ari';
@@ -19,28 +20,35 @@ const GET_SOURCE_INFO_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_SOURCE_INFO';
  * @param documentARI
  * @returns subType live if livePage, subType null if classic page
  */
-const GET_SOURCE_INFO_QUERY = `query ${GET_SOURCE_INFO_OPERATION_NAME} ($id: ID!) {
-	content (id: $id) {
+const GET_SOURCE_INFO_QUERY = `query ${GET_SOURCE_INFO_OPERATION_NAME} ($id: ID!, $status: [String]) {
+	content (id: $id, status: $status) {
 		nodes {
 			id
 			links {
 				base
+				editui
+				webui
 			}
 			space {
 				key
 			}
+			status
 			subType
 			title
 		}
 	}
 }`;
-const getConfluenceSourceInfo = async ari => {
+const getConfluenceSourceInfo = async (ari, status) => {
+  const variables = {
+    id: ari
+  };
+  if (status) {
+    variables.status = status;
+  }
   const bodyData = {
     query: GET_SOURCE_INFO_QUERY,
     operationName: GET_SOURCE_INFO_OPERATION_NAME,
-    variables: {
-      id: ari
-    }
+    variables
   };
   const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
     method: 'POST',
@@ -134,7 +142,8 @@ export const fetchConfluencePageInfoOld = async (pageAri, localId, fireAnalytics
     } = getPageIdAndTypeFromConfluencePageAri({
       ari: pageAri
     });
-    const response = await getConfluenceSourceInfo(pageAri);
+    const status = fg('platform_synced_block_patch_3') ? ['draft', 'archived', 'current'] : undefined;
+    const response = await getConfluenceSourceInfo(pageAri, status);
     const contentData = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : (_response$data$conten = _response$data.content) === null || _response$data$conten === void 0 ? void 0 : (_response$data$conten2 = _response$data$conten.nodes) === null || _response$data$conten2 === void 0 ? void 0 : _response$data$conten2[0];
     const title = contentData === null || contentData === void 0 ? void 0 : contentData.title;
     let url;
@@ -169,17 +178,19 @@ export const fetchConfluencePageInfoOld = async (pageAri, localId, fireAnalytics
 };
 export const fetchConfluencePageInfo = async (pageAri, hasAccess, urlType, localId, isUnpublished) => {
   // For unpublished pages, use the v2 pages API as GraphQL returns empty content.nodes
-  if (isUnpublished) {
+  // We don't want to use the Rest API at all because it doesn't work if accessed from a custom base URL (e.g in Jira)
+  if (isUnpublished && !fg('platform_synced_block_patch_3')) {
     return await fetchCompleteConfluencePageInfo(pageAri, localId);
   }
   if (hasAccess) {
-    var _response$data2, _response$data2$conte, _response$data2$conte2, _contentData$space2;
+    var _response$data2, _response$data2$conte, _response$data2$conte2;
     const {
       type: pageType
     } = getPageIdAndTypeFromConfluencePageAri({
       ari: pageAri
     });
-    const response = await getConfluenceSourceInfo(pageAri);
+    const status = fg('platform_synced_block_patch_3') ? ['draft', 'archived'] : undefined;
+    const response = await getConfluenceSourceInfo(pageAri, status);
     const contentData = (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$conte = _response$data2.content) === null || _response$data2$conte === void 0 ? void 0 : (_response$data2$conte2 = _response$data2$conte.nodes) === null || _response$data2$conte2 === void 0 ? void 0 : _response$data2$conte2[0];
     const {
       title,
@@ -187,15 +198,27 @@ export const fetchConfluencePageInfo = async (pageAri, hasAccess, urlType, local
     } = contentData || {};
     let url;
     const {
-      base
+      base,
+      editui,
+      webui
     } = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {};
-    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 (isBlogPageType(pageType)) {
-        url = `${base}/spaces/${contentData.space.key}/blog${urlType === 'edit' ? '/edit-v2' : ''}/${contentData.id}`;
-      } else if (contentData.subType === 'live') {
-        url = `${base}/spaces/${contentData.space.key}/pages/${contentData.id}`;
-      } else {
-        url = `${base}/spaces/${contentData.space.key}/pages${urlType === 'edit' ? '/edit-v2' : ''}/${contentData.id}`;
+    const pageStatus = contentData === null || contentData === void 0 ? void 0 : contentData.status;
+    if (fg('platform_synced_block_patch_3')) {
+      if (base && editui && pageStatus !== 'archived') {
+        url = `${base}${editui}`;
+      } else if (base && webui && pageStatus === 'archived') {
+        url = `${base}${webui}`;
+      }
+    } else {
+      var _contentData$space2;
+      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 (isBlogPageType(pageType)) {
+          url = `${base}/spaces/${contentData.space.key}/blog${urlType === 'edit' ? '/edit-v2' : ''}/${contentData.id}`;
+        } else if (contentData.subType === 'live') {
+          url = `${base}/spaces/${contentData.space.key}/pages/${contentData.id}`;
+        } else {
+          url = `${base}/spaces/${contentData.space.key}/pages${urlType === 'edit' ? '/edit-v2' : ''}/${contentData.id}`;
+        }
       }
     }
     url = url && localId ? `${url}#block-${localId}` : url;

package/dist/es2019/utils/resolveSyncBlockInstance.js

@@ -1,3 +1,5 @@
+import { fg } from '@atlaskit/platform-feature-flags';
+import { getPageIdAndTypeFromConfluencePageAri } from '../clients/confluence/ari';
 import { SyncBlockError } from '../common/types';
 /**
  * Merges two SyncBlockInstance objects,
@@ -32,8 +34,31 @@ export const resolveSyncBlockInstance = (oldResult, newResult) => {
       ...newResult.data,
       sourceURL: ((_newResult$data = newResult.data) === null || _newResult$data === void 0 ? void 0 : _newResult$data.sourceURL) || ((_oldResult$data = oldResult.data) === null || _oldResult$data === void 0 ? void 0 : _oldResult$data.sourceURL) || undefined,
       sourceTitle: ((_newResult$data2 = newResult.data) === null || _newResult$data2 === void 0 ? void 0 : _newResult$data2.sourceTitle) || ((_oldResult$data2 = oldResult.data) === null || _oldResult$data2 === void 0 ? void 0 : _oldResult$data2.sourceTitle) || undefined,
-      sourceSubType: ((_newResult$data3 = newResult.data) === null || _newResult$data3 === void 0 ? void 0 : _newResult$data3.sourceSubType) || ((_oldResult$data3 = oldResult.data) === null || _oldResult$data3 === void 0 ? void 0 : _oldResult$data3.sourceSubType) || undefined,
+      sourceSubType: fg('platform_synced_block_patch_3') ? mergeSubType(oldResult, newResult) : ((_newResult$data3 = newResult.data) === null || _newResult$data3 === void 0 ? void 0 : _newResult$data3.sourceSubType) || ((_oldResult$data3 = oldResult.data) === null || _oldResult$data3 === void 0 ? void 0 : _oldResult$data3.sourceSubType) || undefined,
       onSameDocument: ((_newResult$data4 = newResult.data) === null || _newResult$data4 === void 0 ? void 0 : _newResult$data4.onSameDocument) || ((_oldResult$data4 = oldResult.data) === null || _oldResult$data4 === void 0 ? void 0 : _oldResult$data4.onSameDocument) || undefined
     }
   };
+};
+const mergeSubType = (oldResult, newResult) => {
+  var _newResult$data5, _newResult$data6, _oldResult$data5;
+  // for classic pages, subType is 'null'
+  if (((_newResult$data5 = newResult.data) === null || _newResult$data5 === void 0 ? void 0 : _newResult$data5.sourceSubType) !== undefined) {
+    return newResult.data.sourceSubType;
+  }
+  if ((_newResult$data6 = newResult.data) !== null && _newResult$data6 !== void 0 && _newResult$data6.sourceAri) {
+    // for blogposts, subType is always undefined
+    try {
+      var _newResult$data7;
+      const {
+        type: pageType
+      } = getPageIdAndTypeFromConfluencePageAri({
+        ari: (_newResult$data7 = newResult.data) === null || _newResult$data7 === void 0 ? void 0 : _newResult$data7.sourceAri
+      });
+      if (pageType === 'blogpost') {
+        var _newResult$data8;
+        return (_newResult$data8 = newResult.data) === null || _newResult$data8 === void 0 ? void 0 : _newResult$data8.sourceSubType;
+      }
+    } catch {}
+  }
+  return (_oldResult$data5 = oldResult.data) === null || _oldResult$data5 === void 0 ? void 0 : _oldResult$data5.sourceSubType;
 };