@atlaskit/editor-synced-block-provider 3.28.0 → 3.28.1

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;
@@ -71,7 +70,6 @@ const COMMON_HEADERS = {
   'Content-Type': 'application/json',
   Accept: 'application/json'
 };
-const BLOCK_SERVICE_API_URL = '/gateway/api/blocks/v1';
 const GRAPHQL_ENDPOINT = '/gateway/api/graphql';
 const GET_DOCUMENT_REFERENCE_BLOCKS_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_DOCUMENT_REFERENCE_BLOCKS';
 const UPDATE_BLOCK_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_UPDATE_BLOCK';
@@ -122,7 +120,7 @@ const buildUpdateBlockMutation = (blockAri, content, stepVersion, status) => {
   if (stepVersion !== undefined) {
     inputParts.push(`stepVersion: ${stepVersion}`);
   }
-  if (status !== undefined && fg('platform_synced_block_patch_1')) {
+  if (status !== undefined) {
     inputParts.push(`status: ${JSON.stringify(status)}`);
   }
   const inputArgs = inputParts.join(', ');
@@ -260,134 +258,91 @@ export class BlockError extends Error {
 export const getSyncedBlockContent = async ({
   blockAri
 }) => {
-  if (fg('platform_synced_block_patch_1')) {
-    var _result$data;
-    const bodyData = {
-      query: buildGetBlockQuery(blockAri),
-      operationName: GET_BLOCK_OPERATION_NAME
-    };
-    const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
-      method: 'POST',
-      headers: COMMON_HEADERS,
-      body: JSON.stringify(bodyData)
-    });
-    if (!response.ok) {
-      throw new BlockError(response.status);
-    }
-    const result = await response.json();
-    if (result.errors && result.errors.length > 0) {
-      throw new Error(result.errors.map(e => e.message).join(', '));
-    }
-    if (!((_result$data = result.data) !== null && _result$data !== void 0 && _result$data.blockService_getBlock)) {
-      throw new Error('No data returned from GraphQL query');
-    }
-    return result.data.blockService_getBlock;
-  }
-
-  // Disable sending documentAri for now. We'll add it back if we find a way to update references that follows the save & refresh principle.
-  // Slack discussion here: https://atlassian.slack.com/archives/C09DZT1TBNW/p1767836775552099?thread_ts=1767836754.024889&cid=C09DZT1TBNW
-  // const queryParams = documentAri ? `?documentAri=${encodeURIComponent(documentAri)}` : '';
-  const queryParams = '';
-  const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}` + queryParams, {
-    method: 'GET',
-    headers: COMMON_HEADERS
+  var _result$data;
+  const bodyData = {
+    query: buildGetBlockQuery(blockAri),
+    operationName: GET_BLOCK_OPERATION_NAME
+  };
+  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+    method: 'POST',
+    headers: COMMON_HEADERS,
+    body: JSON.stringify(bodyData)
   });
   if (!response.ok) {
     throw new BlockError(response.status);
   }
-  return await response.json();
+  const result = await response.json();
+  if (result.errors && result.errors.length > 0) {
+    throw new Error(result.errors.map(e => e.message).join(', '));
+  }
+  if (!((_result$data = result.data) !== null && _result$data !== void 0 && _result$data.blockService_getBlock)) {
+    throw new Error('No data returned from GraphQL query');
+  }
+  return result.data.blockService_getBlock;
 };
 
 /**
  * Batch retrieves multiple synced blocks by their ARIs.
  *
- * Calls the Block Service API endpoint: `POST /v1/block/batch-retrieve`
- * or GraphQL query `blockService_batchRetrieveBlocks` when feature flag is enabled
+ * Calls the Block Service GraphQL API: `blockService_batchRetrieveBlocks`
  *
- * @param blockAris - Array of block ARIs to retrieve
+ * @param blockIdentifiers - Array of block identifiers to retrieve
  * @returns A promise containing arrays of successfully fetched blocks and any errors encountered
  */
 export const batchRetrieveSyncedBlocks = async ({
-  blockIdentifiers,
-  documentAri
+  blockIdentifiers
 }) => {
-  if (fg('platform_synced_block_patch_1')) {
-    var _result$data2;
-    const blockAris = blockIdentifiers.map(blockIdentifier => blockIdentifier.blockAri);
-    const bodyData = {
-      query: buildBatchRetrieveBlocksQuery(blockAris),
-      operationName: BATCH_RETRIEVE_BLOCKS_OPERATION_NAME
-    };
-    const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
-      method: 'POST',
-      headers: COMMON_HEADERS,
-      body: JSON.stringify(bodyData)
-    });
-    if (!response.ok) {
-      throw new BlockError(response.status);
-    }
-    const result = await response.json();
-    if (result.errors && result.errors.length > 0) {
-      throw new Error(result.errors.map(e => e.message).join(', '));
-    }
-    if (!((_result$data2 = result.data) !== null && _result$data2 !== void 0 && _result$data2.blockService_batchRetrieveBlocks)) {
-      throw new Error('No data returned from GraphQL query');
-    }
-    const graphqlResponse = result.data.blockService_batchRetrieveBlocks;
-    return {
-      success: graphqlResponse.success,
-      error: graphqlResponse.error
-    };
-  }
-  const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block/batch-retrieve`, {
+  var _result$data2;
+  const blockAris = blockIdentifiers.map(blockIdentifier => blockIdentifier.blockAri);
+  const bodyData = {
+    query: buildBatchRetrieveBlocksQuery(blockAris),
+    operationName: BATCH_RETRIEVE_BLOCKS_OPERATION_NAME
+  };
+  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
     method: 'POST',
     headers: COMMON_HEADERS,
-    body: JSON.stringify({
-      documentAri,
-      blockIdentifiers,
-      blockAris: blockIdentifiers.map(blockIdentifier => blockIdentifier.blockAri)
-    })
+    body: JSON.stringify(bodyData)
   });
   if (!response.ok) {
     throw new BlockError(response.status);
   }
-  return await response.json();
+  const result = await response.json();
+  if (result.errors && result.errors.length > 0) {
+    throw new Error(result.errors.map(e => e.message).join(', '));
+  }
+  if (!((_result$data2 = result.data) !== null && _result$data2 !== void 0 && _result$data2.blockService_batchRetrieveBlocks)) {
+    throw new Error('No data returned from GraphQL query');
+  }
+  const graphqlResponse = result.data.blockService_batchRetrieveBlocks;
+  return {
+    success: graphqlResponse.success,
+    error: graphqlResponse.error
+  };
 };
 export const deleteSyncedBlock = async ({
   blockAri,
   deleteReason
 }) => {
-  if (fg('platform_synced_block_patch_1')) {
-    var _result$data3;
-    const bodyData = {
-      query: buildDeleteBlockMutation(blockAri, deleteReason),
-      operationName: DELETE_BLOCK_OPERATION_NAME
-    };
-    const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
-      method: 'POST',
-      headers: COMMON_HEADERS,
-      body: JSON.stringify(bodyData)
-    });
-    if (!response.ok) {
-      throw new BlockError(response.status);
-    }
-    const result = await response.json();
-    if (result.errors && result.errors.length > 0) {
-      throw new Error(result.errors.map(e => e.message).join(', '));
-    }
-    if (!((_result$data3 = result.data) !== null && _result$data3 !== void 0 && _result$data3.blockService_deleteBlock.deleted)) {
-      throw new Error('Block deletion failed; deleted flag is false');
-    }
-    return;
-  }
-  const url = deleteReason ? `${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}?deletionReason=${encodeURIComponent(deleteReason)}` : `${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}`;
-  const response = await fetchWithRetry(url, {
-    method: 'DELETE',
-    headers: COMMON_HEADERS
+  var _result$data3;
+  const bodyData = {
+    query: buildDeleteBlockMutation(blockAri, deleteReason),
+    operationName: DELETE_BLOCK_OPERATION_NAME
+  };
+  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+    method: 'POST',
+    headers: COMMON_HEADERS,
+    body: JSON.stringify(bodyData)
   });
   if (!response.ok) {
     throw new BlockError(response.status);
   }
+  const result = await response.json();
+  if (result.errors && result.errors.length > 0) {
+    throw new Error(result.errors.map(e => e.message).join(', '));
+  }
+  if (!((_result$data3 = result.data) !== null && _result$data3 !== void 0 && _result$data3.blockService_deleteBlock.deleted)) {
+    throw new Error('Block deletion failed; deleted flag is false');
+  }
 };
 export const updateSyncedBlock = async ({
   blockAri,
@@ -395,42 +350,22 @@ export const updateSyncedBlock = async ({
   stepVersion,
   status
 }) => {
-  if (fg('platform_synced_block_patch_1')) {
-    const bodyData = {
-      query: buildUpdateBlockMutation(blockAri, content, stepVersion, status),
-      operationName: UPDATE_BLOCK_OPERATION_NAME
-    };
-    const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
-      method: 'POST',
-      headers: COMMON_HEADERS,
-      body: JSON.stringify(bodyData)
-    });
-    if (!response.ok) {
-      throw new BlockError(response.status);
-    }
-    const result = await response.json();
-    if (result.errors && result.errors.length > 0) {
-      throw new Error(result.errors.map(e => e.message).join(', '));
-    }
-    return;
-  }
-  const requestBody = {
-    content
+  const bodyData = {
+    query: buildUpdateBlockMutation(blockAri, content, stepVersion, status),
+    operationName: UPDATE_BLOCK_OPERATION_NAME
   };
-  if (stepVersion !== undefined) {
-    requestBody.stepVersion = stepVersion;
-  }
-  if (status !== undefined && fg('platform_synced_block_patch_1')) {
-    requestBody.status = status;
-  }
-  const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}`, {
-    method: 'PUT',
+  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+    method: 'POST',
     headers: COMMON_HEADERS,
-    body: JSON.stringify(requestBody)
+    body: JSON.stringify(bodyData)
   });
   if (!response.ok) {
     throw new BlockError(response.status);
   }
+  const result = await response.json();
+  if (result.errors && result.errors.length > 0) {
+    throw new Error(result.errors.map(e => e.message).join(', '));
+  }
 };
 export const createSyncedBlock = async ({
   blockAri,
@@ -441,136 +376,85 @@ export const createSyncedBlock = async ({
   stepVersion,
   status
 }) => {
-  if (fg('platform_synced_block_patch_1')) {
-    var _result$data4;
-    const bodyData = {
-      query: buildCreateBlockMutation(blockAri, blockInstanceId, content, product, sourceAri, stepVersion, status),
-      operationName: CREATE_BLOCK_OPERATION_NAME
-    };
-    const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
-      method: 'POST',
-      headers: COMMON_HEADERS,
-      body: JSON.stringify(bodyData)
-    });
-    if (!response.ok) {
-      throw new BlockError(response.status);
-    }
-    const result = await response.json();
-    if (result.errors && result.errors.length > 0) {
-      throw new Error(result.errors.map(e => e.message).join(', '));
-    }
-    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;
-  }
-  const requestBody = {
-    blockAri,
-    blockInstanceId,
-    sourceAri,
-    product,
-    content
+  var _result$data4;
+  const bodyData = {
+    query: buildCreateBlockMutation(blockAri, blockInstanceId, content, product, sourceAri, stepVersion, status),
+    operationName: CREATE_BLOCK_OPERATION_NAME
   };
-  if (stepVersion !== undefined) {
-    requestBody.stepVersion = stepVersion;
-  }
-  if (status !== undefined) {
-    requestBody.status = status;
-  }
-  const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block`, {
+  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
     method: 'POST',
     headers: COMMON_HEADERS,
-    body: JSON.stringify(requestBody)
+    body: JSON.stringify(bodyData)
   });
   if (!response.ok) {
     throw new BlockError(response.status);
   }
-  return await response.json();
+  const result = await response.json();
+  if (result.errors && result.errors.length > 0) {
+    throw new Error(result.errors.map(e => e.message).join(', '));
+  }
+  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;
 };
 export const updateReferenceSyncedBlockOnDocument = async ({
   documentAri,
   blocks,
   noContent = true
 }) => {
-  if (fg('platform_synced_block_patch_1')) {
-    const bodyData = {
-      query: buildUpdateDocumentReferencesMutation(documentAri, blocks, noContent),
-      operationName: UPDATE_DOCUMENT_REFERENCES_OPERATION_NAME
-    };
-    const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
-      method: 'POST',
-      headers: COMMON_HEADERS,
-      body: JSON.stringify(bodyData),
-      keepalive: true
-    });
-    if (!response.ok) {
-      throw new BlockError(response.status);
-    }
-    const result = await response.json();
-    if (result.errors && result.errors.length > 0) {
-      throw new Error(result.errors.map(e => e.message).join(', '));
-    }
-    if (!noContent) {
-      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;
-    }
-    return;
-  }
-  const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block/document/${encodeURIComponent(documentAri)}/references?noContent=${noContent}`, {
-    method: 'PUT',
+  const bodyData = {
+    query: buildUpdateDocumentReferencesMutation(documentAri, blocks, noContent),
+    operationName: UPDATE_DOCUMENT_REFERENCES_OPERATION_NAME
+  };
+  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+    method: 'POST',
     headers: COMMON_HEADERS,
-    body: JSON.stringify({
-      blocks
-    }),
+    body: JSON.stringify(bodyData),
     keepalive: true
   });
   if (!response.ok) {
     throw new BlockError(response.status);
   }
+  const result = await response.json();
+  if (result.errors && result.errors.length > 0) {
+    throw new Error(result.errors.map(e => e.message).join(', '));
+  }
   if (!noContent) {
-    return await response.json();
+    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;
   }
 };
 export const getReferenceSyncedBlocksByBlockAri = async ({
   blockAri
 }) => {
-  if (fg('platform_synced_block_patch_1')) {
-    var _result$data6;
-    const bodyData = {
-      query: buildGetBlockReferencesQuery(blockAri),
-      operationName: GET_BLOCK_REFERENCES_OPERATION_NAME
-    };
-    const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
-      method: 'POST',
-      headers: COMMON_HEADERS,
-      body: JSON.stringify(bodyData)
-    });
-    if (!response.ok) {
-      throw new BlockError(response.status);
-    }
-    const result = await response.json();
-    if (result.errors && result.errors.length > 0) {
-      throw new Error(result.errors.map(e => e.message).join(', '));
-    }
-    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;
-    return {
-      blockAri,
-      references: graphqlResponse.references || [],
-      errors: graphqlResponse.errors || []
-    };
-  }
-  const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/reference/batch-retrieve/${encodeURIComponent(blockAri)}`, {
-    method: 'GET',
-    headers: COMMON_HEADERS
+  var _result$data6;
+  const bodyData = {
+    query: buildGetBlockReferencesQuery(blockAri),
+    operationName: GET_BLOCK_REFERENCES_OPERATION_NAME
+  };
+  const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
+    method: 'POST',
+    headers: COMMON_HEADERS,
+    body: JSON.stringify(bodyData)
   });
   if (!response.ok) {
     throw new BlockError(response.status);
   }
-  return await response.json();
+  const result = await response.json();
+  if (result.errors && result.errors.length > 0) {
+    throw new Error(result.errors.map(e => e.message).join(', '));
+  }
+  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;
+  return {
+    blockAri,
+    references: graphqlResponse.references || [],
+    errors: graphqlResponse.errors || []
+  };
 };

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

@@ -174,7 +174,7 @@ 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 && fg('platform_synced_block_patch_1')) {
+  if (isUnpublished) {
     if (!fg('platform_synced_block_patch_2')) {
       return await fetchCompleteConfluencePageInfo(pageAri, localId);
     }

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 } from '../../clients/block-service/blockService';
 import { subscribeToBlockUpdates as subscribeToBlockUpdatesWS } from '../../clients/block-service/blockSubscription';
@@ -193,7 +192,6 @@ export const batchFetchData = async (cloudId, parentAri, blockNodeIdentifiers) =
   }
   try {
     const response = await batchRetrieveSyncedBlocks({
-      documentAri: parentAri,
       blockIdentifiers
     });
     const results = [];
@@ -315,8 +313,7 @@ class BlockServiceADFFetchProvider {
     });
     try {
       const blockContentResponse = await getSyncedBlockContent({
-        blockAri,
-        documentAri: this.parentAri
+        blockAri
       });
       const {
         content,
@@ -463,15 +460,13 @@ class BlockServiceADFWriteProvider {
     parentAri,
     parentId,
     product,
-    getVersion,
-    isParentUnpublished
+    getVersion
   }) {
     this.cloudId = cloudId;
     this.parentAri = parentAri;
     this.parentId = parentId;
     this.product = product;
     this.getVersion = getVersion;
-    this.isParentUnpublished = isParentUnpublished;
   }
 
   // it will first try to update and if it can't (404) then it will try to create
@@ -516,7 +511,6 @@ class BlockServiceADFWriteProvider {
     }
   }
   async createData(data) {
-    var _this$isParentUnpubli;
     if (!this.parentAri || !this.parentId) {
       return {
         error: SyncBlockError.Errored
@@ -532,7 +526,7 @@ class BlockServiceADFWriteProvider {
       resourceId
     });
     const stepVersion = this.getVersion ? await this.getVersion() : undefined;
-    const status = fg('platform_synced_block_patch_1') ? 'unpublished' : (_this$isParentUnpubli = this.isParentUnpublished) !== null && _this$isParentUnpubli !== void 0 && _this$isParentUnpubli.call(this) ? 'unpublished' : data.status || 'active';
+    const status = 'unpublished';
     try {
       await createSyncedBlock({
         blockAri,
@@ -657,8 +651,7 @@ const createBlockServiceAPIProviders = ({
   parentAri,
   parentId,
   product,
-  getVersion,
-  isParentUnpublished
+  getVersion
 }) => {
   return {
     fetchProvider: new BlockServiceADFFetchProvider({
@@ -670,8 +663,7 @@ const createBlockServiceAPIProviders = ({
       parentAri,
       parentId,
       product,
-      getVersion,
-      isParentUnpublished
+      getVersion
     })
   };
 };
@@ -680,8 +672,7 @@ export const useMemoizedBlockServiceAPIProviders = ({
   parentAri,
   parentId,
   product,
-  getVersion,
-  isParentUnpublished
+  getVersion
 }) => {
   return useMemo(() => {
     return createBlockServiceAPIProviders({
@@ -689,10 +680,9 @@ export const useMemoizedBlockServiceAPIProviders = ({
       parentAri,
       parentId,
       product,
-      getVersion,
-      isParentUnpublished
+      getVersion
     });
-  }, [cloudId, parentAri, parentId, product, getVersion, isParentUnpublished]);
+  }, [cloudId, parentAri, parentId, product, getVersion]);
 };
 const createBlockServiceFetchOnlyAPIProvider = ({
   cloudId,