@atlaskit/editor-synced-block-provider 3.31.2 → 3.32.0

package/dist/cjs/utils/resolveSyncBlockInstance.js

@@ -6,7 +6,6 @@ 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; }
@@ -23,7 +22,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * @returns A merged SyncBlockInstance object.
  */
 var resolveSyncBlockInstance = exports.resolveSyncBlockInstance = function resolveSyncBlockInstance(oldResult, newResult) {
-  var _newResult$data, _oldResult$data, _newResult$data2, _oldResult$data2, _newResult$data3, _oldResult$data3, _newResult$data4, _oldResult$data4;
+  var _newResult$data, _oldResult$data, _newResult$data2, _oldResult$data2, _newResult$data3, _oldResult$data3;
   // if the old result has no data, we simply return the new result
   if (!oldResult.data) {
     return newResult;
@@ -42,30 +41,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: (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
+      sourceSubType: mergeSubType(oldResult, newResult),
+      onSameDocument: ((_newResult$data3 = newResult.data) === null || _newResult$data3 === void 0 ? void 0 : _newResult$data3.onSameDocument) || ((_oldResult$data3 = oldResult.data) === null || _oldResult$data3 === void 0 ? void 0 : _oldResult$data3.onSameDocument) || undefined
     })
   });
 };
 var mergeSubType = function mergeSubType(oldResult, newResult) {
-  var _newResult$data5, _newResult$data6, _oldResult$data5;
+  var _newResult$data4, _newResult$data5, _oldResult$data4;
   // for classic pages, subType is 'null'
-  if (((_newResult$data5 = newResult.data) === null || _newResult$data5 === void 0 ? void 0 : _newResult$data5.sourceSubType) !== undefined) {
+  if (((_newResult$data4 = newResult.data) === null || _newResult$data4 === void 0 ? void 0 : _newResult$data4.sourceSubType) !== undefined) {
     return newResult.data.sourceSubType;
   }
-  if ((_newResult$data6 = newResult.data) !== null && _newResult$data6 !== void 0 && _newResult$data6.sourceAri) {
+  if ((_newResult$data5 = newResult.data) !== null && _newResult$data5 !== void 0 && _newResult$data5.sourceAri) {
     // for blogposts, subType is always undefined
     try {
-      var _newResult$data7;
+      var _newResult$data6;
       var _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
-          ari: (_newResult$data7 = newResult.data) === null || _newResult$data7 === void 0 ? void 0 : _newResult$data7.sourceAri
+          ari: (_newResult$data6 = newResult.data) === null || _newResult$data6 === void 0 ? void 0 : _newResult$data6.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;
+        var _newResult$data7;
+        return (_newResult$data7 = newResult.data) === null || _newResult$data7 === void 0 ? void 0 : _newResult$data7.sourceSubType;
       }
     } catch (_unused) {}
   }
-  return (_oldResult$data5 = oldResult.data) === null || _oldResult$data5 === void 0 ? void 0 : _oldResult$data5.sourceSubType;
+  return (_oldResult$data4 = oldResult.data) === null || _oldResult$data4 === void 0 ? void 0 : _oldResult$data4.sourceSubType;
 };

package/dist/cjs/utils/retry.js

@@ -7,26 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.fetchWithRetry = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
 var MAX_RETRY_DELAY = 30000;
-var parseRetryAfterBase = function parseRetryAfterBase(retryAfter) {
-  var newDelay;
-
-  // retryAfter can either be in seconds or HTTP date
-  var parsedRetryAfter = parseInt(retryAfter);
-  if (!isNaN(parsedRetryAfter)) {
-    newDelay = parsedRetryAfter * 1000;
-  } else {
-    var retryDate = new Date(retryAfter);
-    var delayFromDate = retryDate.getTime() - Date.now();
-    if (delayFromDate > 0) {
-      newDelay = delayFromDate;
-    }
-  }
-  return newDelay;
-};
-var parseRetryAfterPatched = function parseRetryAfterPatched(retryAfter) {
+var parseRetryAfter = function parseRetryAfter(retryAfter) {
   // retryAfter can either be in seconds or HTTP date
   var parsedRetryAfter = parseInt(retryAfter, 10);
   if (!isNaN(parsedRetryAfter) && parsedRetryAfter > 0) {
@@ -42,9 +24,6 @@ var parseRetryAfterPatched = function parseRetryAfterPatched(retryAfter) {
   }
   return undefined;
 };
-var parseRetryAfter = (0, _platformFeatureFlagsReact.functionWithCondition)(function () {
-  return (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4');
-}, parseRetryAfterPatched, parseRetryAfterBase);
 var _fetchWithRetry = exports.fetchWithRetry = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url, options) {
     var _ref2;
@@ -74,7 +53,7 @@ var _fetchWithRetry = exports.fetchWithRetry = /*#__PURE__*/function () {
         case 8:
           retryAfter = response.headers.get('Retry-After');
           parsedDelay = (_ref2 = retryAfter ? parseRetryAfter(retryAfter) : undefined) !== null && _ref2 !== void 0 ? _ref2 : delay;
-          retryDelay = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_4') ? Math.min(parsedDelay, MAX_RETRY_DELAY) : parsedDelay;
+          retryDelay = Math.min(parsedDelay, MAX_RETRY_DELAY);
           _context.next = 13;
           return new Promise(function (resolve) {
             return setTimeout(resolve, retryDelay);

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

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import { fetchWithRetry } from '../../utils/retry';
 export const isBlockContentResponse = response => {
   const content = response.content;
@@ -50,7 +49,7 @@ export const getReferenceSyncedBlocks = async documentAri => {
     query: buildGetDocumentReferenceBlocksQuery(documentAri),
     operationName: GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME
   };
-  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockGetDocumentReferenceBlocks` : GRAPHQL_ENDPOINT;
+  const url = `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockGetDocumentReferenceBlocks`;
   const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
@@ -83,7 +82,7 @@ const GET_BLOCK_REFERENCES_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_REFERENCES'
 const GET_BLOCK_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_BLOCK';
 const BATCH_UPDATE_BLOCKS_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_BATCH_UPDATE_BLOCKS';
 const buildGetDocumentReferenceBlocksQuery = documentAri => `query ${GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME} {
-	blockService_getDocumentReferenceBlocks(documentAri: ${fg('platform_synced_block_patch_4') ? JSON.stringify(documentAri) : `"${documentAri}"`}) {
+	blockService_getDocumentReferenceBlocks(documentAri: ${JSON.stringify(documentAri)}) {
 		blocks {
 			blockAri
 			blockInstanceId
@@ -306,7 +305,7 @@ export const getSyncedBlockContent = async ({
     query: buildGetBlockQuery(blockAri),
     operationName: GET_BLOCK_OPERATION_NAME
   };
-  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockGetBlock` : GRAPHQL_ENDPOINT;
+  const url = `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockGetBlock`;
   const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
@@ -331,6 +330,7 @@ export const getSyncedBlockContent = async ({
  * Calls the Block Service GraphQL API: `blockService_batchRetrieveBlocks`
  *
  * @param blockIdentifiers - Array of block identifiers to retrieve
+ * @param config - Optional batch fetch configuration (e.g. timeout)
  * @returns A promise containing arrays of successfully fetched blocks and any errors encountered
  */
 export const batchRetrieveSyncedBlocks = async ({
@@ -342,7 +342,7 @@ export const batchRetrieveSyncedBlocks = async ({
     query: buildBatchRetrieveBlocksQuery(blockAris),
     operationName: BATCH_RETRIEVE_BLOCKS_OPERATION_NAME
   };
-  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockBatchRetrieveBlocks` : GRAPHQL_ENDPOINT;
+  const url = `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockBatchRetrieveBlocks`;
   const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
@@ -368,12 +368,12 @@ export const deleteSyncedBlock = async ({
   blockAri,
   deleteReason
 }) => {
-  var _result$data3, _result$data3$blockSe, _result$data4;
+  var _result$data3, _result$data3$blockSe;
   const bodyData = {
     query: buildDeleteBlockMutation(blockAri, deleteReason),
     operationName: DELETE_BLOCK_OPERATION_NAME
   };
-  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockDeleteBlock` : GRAPHQL_ENDPOINT;
+  const url = `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockDeleteBlock`;
   const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
@@ -386,7 +386,7 @@ export const deleteSyncedBlock = async ({
   if (result.errors && result.errors.length > 0) {
     throw new Error(result.errors.map(e => e.message).join(', '));
   }
-  const isDeleted = fg('platform_synced_block_patch_4') ? (_result$data3 = result.data) === null || _result$data3 === void 0 ? void 0 : (_result$data3$blockSe = _result$data3.blockService_deleteBlock) === null || _result$data3$blockSe === void 0 ? void 0 : _result$data3$blockSe.deleted : (_result$data4 = result.data) === null || _result$data4 === void 0 ? void 0 : _result$data4.blockService_deleteBlock.deleted;
+  const isDeleted = (_result$data3 = result.data) === null || _result$data3 === void 0 ? void 0 : (_result$data3$blockSe = _result$data3.blockService_deleteBlock) === null || _result$data3$blockSe === void 0 ? void 0 : _result$data3$blockSe.deleted;
   if (!isDeleted) {
     throw new Error('Block deletion failed; deleted flag is false');
   }
@@ -401,7 +401,7 @@ export const updateSyncedBlock = async ({
     query: buildUpdateBlockMutation(blockAri, content, stepVersion, status),
     operationName: UPDATE_BLOCK_OPERATION_NAME
   };
-  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockUpdateBlock` : GRAPHQL_ENDPOINT;
+  const url = `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockUpdateBlock`;
   const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
@@ -424,12 +424,12 @@ export const createSyncedBlock = async ({
   stepVersion,
   status
 }) => {
-  var _result$data5;
+  var _result$data4;
   const bodyData = {
     query: buildCreateBlockMutation(blockAri, blockInstanceId, content, product, sourceAri, stepVersion, status),
     operationName: CREATE_BLOCK_OPERATION_NAME
   };
-  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockCreateBlock` : GRAPHQL_ENDPOINT;
+  const url = `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockCreateBlock`;
   const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
@@ -442,7 +442,7 @@ export const createSyncedBlock = async ({
   if (result.errors && result.errors.length > 0) {
     throw new Error(result.errors.map(e => e.message).join(', '));
   }
-  if (!((_result$data5 = result.data) !== null && _result$data5 !== void 0 && _result$data5.blockService_createBlock)) {
+  if (!((_result$data4 = result.data) !== null && _result$data4 !== void 0 && _result$data4.blockService_createBlock)) {
     throw new Error('No data returned from GraphQL mutation');
   }
   return result.data.blockService_createBlock;
@@ -456,7 +456,7 @@ export const updateReferenceSyncedBlockOnDocument = async ({
     query: buildUpdateDocumentReferencesMutation(documentAri, blocks, noContent),
     operationName: UPDATE_DOCUMENT_REFERENCES_OPERATION_NAME
   };
-  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockUpdateDocumentReferences` : GRAPHQL_ENDPOINT;
+  const url = `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockUpdateDocumentReferences`;
   const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
@@ -471,8 +471,8 @@ export const updateReferenceSyncedBlockOnDocument = async ({
     throw new Error(result.errors.map(e => e.message).join(', '));
   }
   if (!noContent) {
-    var _result$data6;
-    if (!((_result$data6 = result.data) !== null && _result$data6 !== void 0 && _result$data6.blockService_updateDocumentReferences)) {
+    var _result$data5;
+    if (!((_result$data5 = result.data) !== null && _result$data5 !== void 0 && _result$data5.blockService_updateDocumentReferences)) {
       throw new Error('No data returned from GraphQL mutation');
     }
     return result.data.blockService_updateDocumentReferences;
@@ -481,12 +481,12 @@ export const updateReferenceSyncedBlockOnDocument = async ({
 export const getReferenceSyncedBlocksByBlockAri = async ({
   blockAri
 }) => {
-  var _result$data7;
+  var _result$data6;
   const bodyData = {
     query: buildGetBlockReferencesQuery(blockAri),
     operationName: GET_BLOCK_REFERENCES_OPERATION_NAME
   };
-  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockGetReferences` : GRAPHQL_ENDPOINT;
+  const url = `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockGetReferences`;
   const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
@@ -499,7 +499,7 @@ export const getReferenceSyncedBlocksByBlockAri = async ({
   if (result.errors && result.errors.length > 0) {
     throw new Error(result.errors.map(e => e.message).join(', '));
   }
-  if (!((_result$data7 = result.data) !== null && _result$data7 !== void 0 && _result$data7.blockService_getReferences)) {
+  if (!((_result$data6 = result.data) !== null && _result$data6 !== void 0 && _result$data6.blockService_getReferences)) {
     throw new Error('No data returned from GraphQL query');
   }
   const graphqlResponse = result.data.blockService_getReferences;
@@ -535,12 +535,12 @@ export const getReferenceSyncedBlocksByBlockAri = async ({
 export const updateSyncedBlocks = async ({
   blocks
 }) => {
-  var _result$data8;
+  var _result$data7;
   const bodyData = {
     query: buildBatchUpdateBlocksMutation(blocks),
     operationName: BATCH_UPDATE_BLOCKS_OPERATION_NAME
   };
-  const url = fg('platform_synced_block_patch_3') ? `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockBatchUpdateBlocks` : GRAPHQL_ENDPOINT;
+  const url = `${GRAPHQL_ENDPOINT}?operation=editorSyncedBlockBatchUpdateBlocks`;
   const response = await fetchWithRetry(url, {
     method: 'POST',
     headers: COMMON_HEADERS,
@@ -553,7 +553,7 @@ export const updateSyncedBlocks = async ({
   if (result.errors && result.errors.length > 0) {
     throw new Error(result.errors.map(e => e.message).join(', '));
   }
-  if (!((_result$data8 = result.data) !== null && _result$data8 !== void 0 && _result$data8.blockService_batchUpdateBlocks)) {
+  if (!((_result$data7 = result.data) !== null && _result$data7 !== void 0 && _result$data7.blockService_batchUpdateBlocks)) {
     throw new Error('No data returned from GraphQL mutation');
   }
   const graphqlResponse = result.data.blockService_batchUpdateBlocks;

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

@@ -1,5 +1,4 @@
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { fetchWithRetry } from '../../utils/retry';
 const COMMON_HEADERS = {
   'Content-Type': 'application/json',
@@ -64,7 +63,7 @@ export const fetchMediaToken = async contentId => {
     logException(error, {
       location: 'editor-synced-block-provider/fetchMediaToken'
     });
-    const errorMsg = fg('platform_synced_block_patch_4') ? error instanceof Error ? error.message : String(error) : String(error);
+    const errorMsg = error instanceof Error ? error.message : String(error);
     throw new Error(`Failed to get content media session: ${errorMsg}`);
   }
 };

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

@@ -1,11 +1,4 @@
-/* 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';
-import { isBlogPageType } from './utils';
 const COMMON_HEADERS = {
   'Content-Type': 'application/json',
   Accept: 'application/json'
@@ -88,110 +81,12 @@ const resolveNoAccessPageInfo = async ari => {
     throw new Error(`Failed to resolve ari: ${response.statusText}`);
   }
 };
-
-/**
- * Fetches unpublished page info from the v2 pages API
- * Used when the GraphQL query returns empty content.nodes for unpublished pages
- * @param pageAri - The page ARI
- * @param localId - Optional local ID to append as block anchor
- * @returns Source info with URL, title, and optional subtype
- */
-const fetchCompleteConfluencePageInfo = async (pageAri, localId) => {
-  try {
-    var _pageData$_links, _pageData$_links2;
-    const {
-      id: pageId
-    } = getPageIdAndTypeFromConfluencePageAri({
-      ari: pageAri
-    });
-    const response = await fetchWithRetry(`/wiki/api/v2/pages/${pageId}?draft=true`, {
-      method: 'GET',
-      headers: COMMON_HEADERS
-    });
-    if (!response.ok) {
-      throw new Error(`Failed to get unpublished page info: ${response.statusText}`);
-    }
-    const pageData = await response.json();
-    const base = (_pageData$_links = pageData._links) === null || _pageData$_links === void 0 ? void 0 : _pageData$_links.base;
-    const edituiv2 = (_pageData$_links2 = pageData._links) === null || _pageData$_links2 === void 0 ? void 0 : _pageData$_links2.edituiv2;
-    const title = pageData.title;
-    const subType = pageData.subtype;
-    let url;
-    if (base && edituiv2) {
-      url = `${base}${edituiv2}`;
-      url = url && localId ? `${url}#block-${localId}` : url;
-    }
-    return {
-      title,
-      url,
-      sourceAri: pageAri,
-      subType
-    };
-  } catch (error) {
-    logException(error, {
-      location: 'editor-synced-block-provider/sourceInfo/fetchUnpublishedConfluencePageInfo'
-    });
-    return Promise.resolve(undefined);
-  }
-};
-export const fetchConfluencePageInfoOld = async (pageAri, localId, fireAnalyticsEvent) => {
-  try {
-    var _response$data, _response$data$conten, _response$data$conten2, _contentData$space;
-    const {
-      type: pageType
-    } = getPageIdAndTypeFromConfluencePageAri({
-      ari: 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;
-    const {
-      base
-    } = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {};
-    if (base && contentData !== null && contentData !== void 0 && (_contentData$space = contentData.space) !== null && _contentData$space !== void 0 && _contentData$space.key && contentData !== null && contentData !== void 0 && contentData.id) {
-      if (isBlogPageType(pageType)) {
-        url = `${base}/spaces/${contentData.space.key}/blog/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/edit-v2/${contentData.id}`;
-      }
-    }
-    url = url && localId ? `${url}#block-${localId}` : url;
-    if (!title || !url) {
-      fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent(getSourceInfoErrorPayload('Failed to get confluence page source info'));
-    }
-    return Promise.resolve({
-      title,
-      url,
-      sourceAri: pageAri
-    });
-  } catch (error) {
-    logException(error, {
-      location: 'editor-synced-block-provider/sourceInfo'
-    });
-    fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent(getSourceInfoErrorPayload(error.message));
-    return Promise.resolve(undefined);
-  }
-};
-export const fetchConfluencePageInfo = async (pageAri, hasAccess, urlType, localId, isUnpublished) => {
-  // For unpublished pages, use the v2 pages API as GraphQL returns empty content.nodes
-  // 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);
-  }
+export const fetchConfluencePageInfo = async (pageAri, hasAccess, localId) => {
   if (hasAccess) {
-    var _response$data2, _response$data2$conte, _response$data2$conte2;
-    const {
-      type: pageType
-    } = getPageIdAndTypeFromConfluencePageAri({
-      ari: pageAri
-    });
-    const status = fg('platform_synced_block_patch_3') ? ['draft', 'archived', 'current'] : undefined;
+    var _response$data, _response$data$conten, _response$data$conten2;
+    const status = ['draft', 'archived', 'current'];
     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 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,
       subType
@@ -203,23 +98,10 @@ export const fetchConfluencePageInfo = async (pageAri, hasAccess, urlType, local
       webui
     } = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {};
     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}`;
-        }
-      }
+    if (base && editui && pageStatus !== 'archived') {
+      url = `${base}${editui}`;
+    } else if (base && webui && pageStatus === 'archived') {
+      url = `${base}${webui}`;
     }
     url = url && localId ? `${url}#block-${localId}` : url;
     return Promise.resolve({

package/dist/es2019/hooks/useFetchSyncBlockData.js

@@ -1,7 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { logException } from '@atlaskit/editor-common/monitoring';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { SyncBlockError } from '../common/types';
 import { fetchErrorPayload } from '../utils/errorHandling';
 import { createSyncBlockNode } from '../utils/utils';
@@ -47,14 +46,7 @@ export const useFetchSyncBlockData = (manager, resourceId, localId, fireAnalytic
       logException(error, {
         location: 'editor-synced-block-provider/useFetchSyncBlockData'
       });
-      if (fg('platform_synced_block_patch_3')) {
-        fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent(fetchErrorPayload(error.message));
-      } else {
-        var _manager$referenceMan2, _manager$referenceMan3;
-        manager === null || manager === void 0 ? void 0 : (_manager$referenceMan2 = manager.referenceManager) === null || _manager$referenceMan2 === void 0 ? void 0 : (_manager$referenceMan3 = _manager$referenceMan2.fetchExperience) === null || _manager$referenceMan3 === void 0 ? void 0 : _manager$referenceMan3.failure({
-          reason: error.message
-        });
-      }
+      fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent(fetchErrorPayload(error.message));
 
       // Set error state if fetching fails
       setFetchState({

package/dist/es2019/hooks/useFetchSyncBlockTitle.js

@@ -1,33 +1,5 @@
 import { useEffect, useRef, useState } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
-const useFetchSyncBlockTitleBase = (manager, syncBlockNode) => {
-  // Initialize state from cache to prevent flickering during re-renders
-  const [sourceTitle, setSourceTitle] = useState(() => {
-    var _cachedData$data;
-    if (syncBlockNode.type.name !== 'syncBlock') {
-      return undefined;
-    }
-    const {
-      resourceId
-    } = syncBlockNode.attrs;
-    if (!resourceId) {
-      return undefined;
-    }
-    const cachedData = manager.referenceManager.getFromCache(resourceId);
-    return cachedData === null || cachedData === void 0 ? void 0 : (_cachedData$data = cachedData.data) === null || _cachedData$data === void 0 ? void 0 : _cachedData$data.sourceTitle;
-  });
-  useEffect(() => {
-    const unsubscribe = manager.referenceManager.subscribeToSourceTitle(syncBlockNode, title => {
-      setSourceTitle(title);
-    });
-    return () => {
-      unsubscribe();
-    };
-  }, [manager, syncBlockNode]);
-  return sourceTitle;
-};
-const useFetchSyncBlockTitlePatched = (manager, syncBlockNode) => {
+export const useFetchSyncBlockTitle = (manager, syncBlockNode) => {
   var _syncBlockNode$attrs, _syncBlockNode$attrs2;
   const nodeRef = useRef(syncBlockNode);
   nodeRef.current = syncBlockNode;
@@ -37,7 +9,7 @@ const useFetchSyncBlockTitlePatched = (manager, syncBlockNode) => {
 
   // Initialize state from cache to prevent flickering during re-renders
   const [sourceTitle, setSourceTitle] = useState(() => {
-    var _cachedData$data2;
+    var _cachedData$data;
     if (nodeTypeName !== 'syncBlock') {
       return undefined;
     }
@@ -45,7 +17,7 @@ const useFetchSyncBlockTitlePatched = (manager, syncBlockNode) => {
       return undefined;
     }
     const cachedData = manager.referenceManager.getFromCache(resourceId);
-    return cachedData === null || cachedData === void 0 ? void 0 : (_cachedData$data2 = cachedData.data) === null || _cachedData$data2 === void 0 ? void 0 : _cachedData$data2.sourceTitle;
+    return cachedData === null || cachedData === void 0 ? void 0 : (_cachedData$data = cachedData.data) === null || _cachedData$data === void 0 ? void 0 : _cachedData$data.sourceTitle;
   });
   useEffect(() => {
     const unsubscribe = manager.referenceManager.subscribeToSourceTitle(nodeRef.current, title => {
@@ -56,5 +28,4 @@ const useFetchSyncBlockTitlePatched = (manager, syncBlockNode) => {
     };
   }, [manager, nodeTypeName, resourceId, localId]);
   return sourceTitle;
-};
-export const useFetchSyncBlockTitle = conditionalHooksFactory(() => fg('platform_synced_block_patch_4'), useFetchSyncBlockTitlePatched, useFetchSyncBlockTitleBase);
+};

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

@@ -1,6 +1,5 @@
 /* eslint-disable require-unicode-regexp  */
 import { useMemo } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { generateBlockAri, generateBlockAriFromReference } from '../../clients/block-service/ari';
 import { batchRetrieveSyncedBlocks, BlockError, createSyncedBlock, deleteSyncedBlock, getReferenceSyncedBlocks, getReferenceSyncedBlocksByBlockAri, getSyncedBlockContent, updateReferenceSyncedBlockOnDocument, updateSyncedBlock, updateSyncedBlocks } from '../../clients/block-service/blockService';
 import { subscribeToBlockUpdates as subscribeToBlockUpdatesWS } from '../../clients/block-service/blockSubscription';
@@ -167,9 +166,10 @@ export const extractResourceIdFromBlockAri = blockAri => {
  * @param cloudId - The cloudId of the block. E.G the cloudId of the confluence page, or the cloudId of the Jira instance
  * @param parentAri - The ARI of the parent of the block. E.G the ARI of the confluence page, or the ARI of the Jira work item
  * @param blockNodeIdentifiers - Array of block node identifiers to fetch
+ * @param config - Optional batch fetch configuration
  * @returns Array of SyncBlockInstance results
  */
-export const batchFetchData = async (cloudId, parentAri, blockNodeIdentifiers) => {
+export const batchFetchData = async (cloudId, parentAri, blockNodeIdentifiers, config) => {
   const blockIdentifiers = blockNodeIdentifiers.map(blockIdentifier => ({
     blockAri: generateBlockAriFromReference({
       cloudId,
@@ -193,7 +193,8 @@ export const batchFetchData = async (cloudId, parentAri, blockNodeIdentifiers) =
   }
   try {
     const response = await batchRetrieveSyncedBlocks({
-      blockIdentifiers
+      blockIdentifiers,
+      config
     });
     const results = [];
 
@@ -243,22 +244,13 @@ export const batchFetchData = async (cloudId, parentAri, blockNodeIdentifiers) =
             resourceId
           });
         } catch {
-          if (fg('platform_synced_block_patch_3')) {
-            results.push({
-              error: {
-                type: SyncBlockError.Errored,
-                reason: `parsing JSON content response failed for resourceId: ${resourceId} localId: ${blockAri}`
-              },
-              resourceId
-            });
-          } else {
-            results.push({
-              error: {
-                type: SyncBlockError.Errored
-              },
-              resourceId
-            });
-          }
+          results.push({
+            error: {
+              type: SyncBlockError.Errored,
+              reason: `parsing JSON content response failed for resourceId: ${resourceId} localId: ${blockAri}`
+            },
+            resourceId
+          });
         }
       }
     }
@@ -273,11 +265,9 @@ export const batchFetchData = async (cloudId, parentAri, blockNodeIdentifiers) =
         }
         processedResourceIds.add(resourceId);
         results.push({
-          error: fg('platform_synced_block_patch_3') ? {
+          error: {
             type: mapErrorResponseCode(errorResponse.code),
             reason: errorResponse.reason
-          } : {
-            type: mapErrorResponseCode(errorResponse.code)
           },
           resourceId
         });
@@ -301,7 +291,7 @@ export const batchFetchData = async (cloudId, parentAri, blockNodeIdentifiers) =
     return blockNodeIdentifiers.map(blockNodeIdentifier => ({
       error: {
         type: error instanceof BlockError ? mapBlockError(error) : SyncBlockError.Errored,
-        reason: fg('platform_synced_block_patch_3') ? error.message : undefined
+        reason: error.message
       },
       resourceId: blockNodeIdentifier.resourceId
     }));
@@ -455,21 +445,17 @@ class BlockServiceADFFetchProvider {
     } catch (error) {
       if (error instanceof BlockError) {
         return {
-          error: fg('platform_synced_block_patch_3') ? {
+          error: {
             type: mapBlockError(error),
             reason: error.message
-          } : {
-            type: mapBlockError(error)
           },
           resourceId
         };
       }
       return {
-        error: fg('platform_synced_block_patch_3') ? {
+        error: {
           type: SyncBlockError.Errored,
           reason: error.message
-        } : {
-          type: SyncBlockError.Errored
         },
         resourceId
       };
@@ -520,10 +506,11 @@ class BlockServiceADFFetchProvider {
   /**
    * Batch fetches multiple synced blocks by their resource IDs.
    * @param blockNodeIdentifiers - Array of block node identifiers to fetch
+   * @param config - Optional batch fetch configuration
    * @returns Array of SyncBlockInstance results
    */
-  async batchFetchData(blockNodeIdentifiers) {
-    return await batchFetchData(this.cloudId, this.parentAri, blockNodeIdentifiers);
+  async batchFetchData(blockNodeIdentifiers, config) {
+    return await batchFetchData(this.cloudId, this.parentAri, blockNodeIdentifiers, config);
   }
 
   /**