@atlaskit/editor-synced-block-provider 3.26.2 → 3.27.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.27.0
+
+### Minor Changes
+
+- [`8433176cb97f5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8433176cb97f5) -
+  Edit at source for an archived page should not redirect and show ask for edit flag
+
+### Patch Changes
+
+- [`328425ff14e85`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/328425ff14e85) -
+  Update synced block to active state on flush
+- Updated dependencies
+
 ## 3.26.2
 
 ### Patch Changes

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

@@ -135,11 +135,14 @@ var buildGetDocumentReferenceBlocksQuery = function buildGetDocumentReferenceBlo
 var buildGetBlockQuery = function buildGetBlockQuery(blockAri) {
   return "query ".concat(GET_BLOCK_OPERATION_NAME, " {\n\tblockService_getBlock(blockAri: ").concat(JSON.stringify(blockAri), ") {\n\t\tblockAri\n\t\tblockInstanceId\n\t\tcontent\n\t\tcontentUpdatedAt\n\t\tcreatedAt\n\t\tcreatedBy\n\t\tdeletionReason\n\t\tproduct\n\t\tsourceAri\n\t\tstatus\n\t\tversion\n\t}\n}");
 };
-var buildUpdateBlockMutation = function buildUpdateBlockMutation(blockAri, content, stepVersion) {
+var buildUpdateBlockMutation = function buildUpdateBlockMutation(blockAri, content, stepVersion, status) {
   var inputParts = ["blockAri: ".concat(JSON.stringify(blockAri)), "content: ".concat(JSON.stringify(content))];
   if (stepVersion !== undefined) {
     inputParts.push("stepVersion: ".concat(stepVersion));
   }
+  if (status !== undefined && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1')) {
+    inputParts.push("status: ".concat(JSON.stringify(status)));
+  }
   var inputArgs = inputParts.join(', ');
   return "mutation ".concat(UPDATE_BLOCK_OPERATION_NAME, " {\n\tblockService_updateBlock(input: { ").concat(inputArgs, " }) {\n\t\t__typename\n\t}\n}");
 };
@@ -457,17 +460,17 @@ var deleteSyncedBlock = exports.deleteSyncedBlock = /*#__PURE__*/function () {
 }();
 var updateSyncedBlock = exports.updateSyncedBlock = /*#__PURE__*/function () {
   var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(_ref8) {
-    var blockAri, content, stepVersion, bodyData, _response4, result, requestBody, response;
+    var blockAri, content, stepVersion, status, bodyData, _response4, result, requestBody, response;
     return _regenerator.default.wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          blockAri = _ref8.blockAri, content = _ref8.content, stepVersion = _ref8.stepVersion;
+          blockAri = _ref8.blockAri, content = _ref8.content, stepVersion = _ref8.stepVersion, status = _ref8.status;
           if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_1')) {
             _context5.next = 14;
             break;
           }
           bodyData = {
-            query: buildUpdateBlockMutation(blockAri, content, stepVersion),
+            query: buildUpdateBlockMutation(blockAri, content, stepVersion, status),
             operationName: UPDATE_BLOCK_OPERATION_NAME
           };
           _context5.next = 5;
@@ -504,20 +507,23 @@ var updateSyncedBlock = exports.updateSyncedBlock = /*#__PURE__*/function () {
           if (stepVersion !== undefined) {
             requestBody.stepVersion = stepVersion;
           }
-          _context5.next = 18;
+          if (status !== undefined && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1')) {
+            requestBody.status = status;
+          }
+          _context5.next = 19;
           return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'PUT',
             headers: COMMON_HEADERS,
             body: JSON.stringify(requestBody)
           });
-        case 18:
+        case 19:
           response = _context5.sent;
           if (response.ok) {
-            _context5.next = 21;
+            _context5.next = 22;
             break;
           }
           throw new BlockError(response.status);
-        case 21:
+        case 22:
         case "end":
           return _context5.stop();
       }

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

@@ -126,9 +126,9 @@ var resolveNoAccessPageInfo = /*#__PURE__*/function () {
  * @param localId - Optional local ID to append as block anchor
  * @returns Source info with URL, title, and optional subtype
  */
-var fetchUnpublishedConfluencePageInfo = /*#__PURE__*/function () {
+var fetchCompleteConfluencePageInfo = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(pageAri, localId) {
-    var _pageData$_links, _pageData$_links2, _getPageIdAndTypeFrom, pageId, response, pageData, base, edituiv2, title, subType, url;
+    var _pageData$_links, _pageData$_links2, _pageData$_links3, _getPageIdAndTypeFrom, pageId, response, pageData, base, edituiv2, webui, title, subType, status, url;
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -155,11 +155,15 @@ var fetchUnpublishedConfluencePageInfo = /*#__PURE__*/function () {
           pageData = _context3.sent;
           base = (_pageData$_links = pageData._links) === null || _pageData$_links === void 0 ? void 0 : _pageData$_links.base;
           edituiv2 = (_pageData$_links2 = pageData._links) === null || _pageData$_links2 === void 0 ? void 0 : _pageData$_links2.edituiv2;
+          webui = (_pageData$_links3 = pageData._links) === null || _pageData$_links3 === void 0 ? void 0 : _pageData$_links3.webui;
           title = pageData.title;
           subType = pageData.subtype;
-          if (base && edituiv2) {
+          status = pageData.status;
+          if (base && edituiv2 && ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_2') ? status !== 'archived' : true)) {
             url = "".concat(base).concat(edituiv2);
             url = url && localId ? "".concat(url, "#block-").concat(localId) : url;
+          } else if (base && webui && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_2')) {
+            url = "".concat(base).concat(webui);
           }
           return _context3.abrupt("return", {
             title: title,
@@ -167,20 +171,20 @@ var fetchUnpublishedConfluencePageInfo = /*#__PURE__*/function () {
             sourceAri: pageAri,
             subType: subType
           });
-        case 18:
-          _context3.prev = 18;
+        case 20:
+          _context3.prev = 20;
           _context3.t0 = _context3["catch"](0);
           (0, _monitoring.logException)(_context3.t0, {
-            location: 'editor-synced-block-provider/sourceInfo/fetchUnpublishedConfluencePageInfo'
+            location: 'editor-synced-block-provider/sourceInfo/fetchCompleteConfluencePageInfo'
           });
           return _context3.abrupt("return", Promise.resolve(undefined));
-        case 22:
+        case 24:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[0, 18]]);
+    }, _callee3, null, [[0, 20]]);
   }));
-  return function fetchUnpublishedConfluencePageInfo(_x3, _x4) {
+  return function fetchCompleteConfluencePageInfo(_x3, _x4) {
     return _ref3.apply(this, arguments);
   };
 }();
@@ -244,24 +248,37 @@ var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/fun
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
           if (!(isUnpublished && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1'))) {
-            _context5.next = 4;
+            _context5.next = 5;
             break;
           }
-          _context5.next = 3;
-          return fetchUnpublishedConfluencePageInfo(pageAri, localId);
-        case 3:
-          return _context5.abrupt("return", _context5.sent);
+          if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_2')) {
+            _context5.next = 5;
+            break;
+          }
+          _context5.next = 4;
+          return fetchCompleteConfluencePageInfo(pageAri, localId);
         case 4:
+          return _context5.abrupt("return", _context5.sent);
+        case 5:
           if (!hasAccess) {
-            _context5.next = 17;
+            _context5.next = 22;
             break;
           }
           _getPageIdAndTypeFrom3 = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
             ari: pageAri
           }), pageType = _getPageIdAndTypeFrom3.type;
-          _context5.next = 8;
+          if (!(pageType === 'page' && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_2'))) {
+            _context5.next = 11;
+            break;
+          }
+          _context5.next = 10;
+          return fetchCompleteConfluencePageInfo(pageAri, localId);
+        case 10:
+          return _context5.abrupt("return", _context5.sent);
+        case 11:
+          _context5.next = 13;
           return getConfluenceSourceInfo(pageAri);
-        case 8:
+        case 13:
           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;
@@ -282,12 +299,12 @@ var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/fun
             sourceAri: pageAri,
             subType: subType
           }));
-        case 17:
-          _context5.next = 19;
+        case 22:
+          _context5.next = 24;
           return resolveNoAccessPageInfo(pageAri);
-        case 19:
+        case 24:
           return _context5.abrupt("return", _context5.sent);
-        case 20:
+        case 25:
         case "end":
           return _context5.stop();
       }

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

@@ -632,7 +632,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
     key: "writeData",
     value: function () {
       var _writeData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(data) {
-        var resourceId, blockAri, stepVersion;
+        var resourceId, blockAri, stepVersion, status;
         return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -666,37 +666,39 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
             case 11:
               stepVersion = _context5.t0;
               _context5.prev = 12;
-              _context5.next = 15;
+              status = data.status;
+              _context5.next = 16;
               return (0, _blockService.updateSyncedBlock)({
                 blockAri: blockAri,
                 content: JSON.stringify(data.content),
-                stepVersion: stepVersion
+                stepVersion: stepVersion,
+                status: status
               });
-            case 15:
+            case 16:
               return _context5.abrupt("return", {
                 resourceId: resourceId
               });
-            case 18:
-              _context5.prev = 18;
+            case 19:
+              _context5.prev = 19;
               _context5.t1 = _context5["catch"](12);
               if (!(_context5.t1 instanceof _blockService.BlockError)) {
-                _context5.next = 22;
+                _context5.next = 23;
                 break;
               }
               return _context5.abrupt("return", {
                 error: mapBlockError(_context5.t1),
                 resourceId: resourceId
               });
-            case 22:
+            case 23:
               return _context5.abrupt("return", {
                 error: (0, _errorHandling.stringifyError)(_context5.t1),
                 resourceId: resourceId
               });
-            case 23:
+            case 24:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[12, 18]]);
+        }, _callee5, this, [[12, 19]]);
       }));
       function writeData(_x5) {
         return _writeData.apply(this, arguments);

package/dist/cjs/store-manager/sourceSyncBlockStoreManager.js

@@ -114,14 +114,17 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
                       resourceId: syncBlockData.resourceId
                     }
                   });
-                  bodiedSyncBlockData.push(syncBlockData);
-
                   // reset isDirty early to prevent race condition
                   // There is a race condition where if a user makes changes to a source sync block
                   // on a live page and the source sync block is being saved while the user
                   // is still making changes, the new changes might not be saved if they all happen
                   // exactly at a time when the writeNodesData is being executed asynchronously.
                   syncBlockData.isDirty = false;
+                  // When flushing, set status to 'active' so the block is published (when feature gate is on)
+                  var dataToFlush = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1') ? _objectSpread(_objectSpread({}, syncBlockData), {}, {
+                    status: 'active'
+                  }) : syncBlockData;
+                  bodiedSyncBlockData.push(dataToFlush);
                 }
               });
               if (!(bodiedSyncBlockNodes.length === 0)) {

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

@@ -117,11 +117,14 @@ const buildGetBlockQuery = blockAri => `query ${GET_BLOCK_OPERATION_NAME} {
 		version
 	}
 }`;
-const buildUpdateBlockMutation = (blockAri, content, stepVersion) => {
+const buildUpdateBlockMutation = (blockAri, content, stepVersion, status) => {
   const inputParts = [`blockAri: ${JSON.stringify(blockAri)}`, `content: ${JSON.stringify(content)}`];
   if (stepVersion !== undefined) {
     inputParts.push(`stepVersion: ${stepVersion}`);
   }
+  if (status !== undefined && fg('platform_synced_block_patch_1')) {
+    inputParts.push(`status: ${JSON.stringify(status)}`);
+  }
   const inputArgs = inputParts.join(', ');
   return `mutation ${UPDATE_BLOCK_OPERATION_NAME} {
 	blockService_updateBlock(input: { ${inputArgs} }) {
@@ -389,11 +392,12 @@ export const deleteSyncedBlock = async ({
 export const updateSyncedBlock = async ({
   blockAri,
   content,
-  stepVersion
+  stepVersion,
+  status
 }) => {
   if (fg('platform_synced_block_patch_1')) {
     const bodyData = {
-      query: buildUpdateBlockMutation(blockAri, content, stepVersion),
+      query: buildUpdateBlockMutation(blockAri, content, stepVersion, status),
       operationName: UPDATE_BLOCK_OPERATION_NAME
     };
     const response = await fetchWithRetry(GRAPHQL_ENDPOINT, {
@@ -416,6 +420,9 @@ export const updateSyncedBlock = async ({
   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',
     headers: COMMON_HEADERS,

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

@@ -89,9 +89,9 @@ const resolveNoAccessPageInfo = async ari => {
  * @param localId - Optional local ID to append as block anchor
  * @returns Source info with URL, title, and optional subtype
  */
-const fetchUnpublishedConfluencePageInfo = async (pageAri, localId) => {
+const fetchCompleteConfluencePageInfo = async (pageAri, localId) => {
   try {
-    var _pageData$_links, _pageData$_links2;
+    var _pageData$_links, _pageData$_links2, _pageData$_links3;
     const {
       id: pageId
     } = getPageIdAndTypeFromConfluencePageAri({
@@ -107,12 +107,16 @@ const fetchUnpublishedConfluencePageInfo = async (pageAri, localId) => {
     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 webui = (_pageData$_links3 = pageData._links) === null || _pageData$_links3 === void 0 ? void 0 : _pageData$_links3.webui;
     const title = pageData.title;
     const subType = pageData.subtype;
+    const status = pageData.status;
     let url;
-    if (base && edituiv2) {
+    if (base && edituiv2 && (fg('platform_synced_block_patch_2') ? status !== 'archived' : true)) {
       url = `${base}${edituiv2}`;
       url = url && localId ? `${url}#block-${localId}` : url;
+    } else if (base && webui && fg('platform_synced_block_patch_2')) {
+      url = `${base}${webui}`;
     }
     return {
       title,
@@ -122,7 +126,7 @@ const fetchUnpublishedConfluencePageInfo = async (pageAri, localId) => {
     };
   } catch (error) {
     logException(error, {
-      location: 'editor-synced-block-provider/sourceInfo/fetchUnpublishedConfluencePageInfo'
+      location: 'editor-synced-block-provider/sourceInfo/fetchCompleteConfluencePageInfo'
     });
     return Promise.resolve(undefined);
   }
@@ -171,7 +175,9 @@ 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')) {
-    return await fetchUnpublishedConfluencePageInfo(pageAri, localId);
+    if (!fg('platform_synced_block_patch_2')) {
+      return await fetchCompleteConfluencePageInfo(pageAri, localId);
+    }
   }
   if (hasAccess) {
     var _response$data2, _response$data2$conte, _response$data2$conte2, _contentData$space2;
@@ -180,6 +186,9 @@ export const fetchConfluencePageInfo = async (pageAri, hasAccess, urlType, local
     } = getPageIdAndTypeFromConfluencePageAri({
       ari: pageAri
     });
+    if (pageType === 'page' && fg('platform_synced_block_patch_2')) {
+      return await fetchCompleteConfluencePageInfo(pageAri, localId);
+    }
     const response = await getConfluenceSourceInfo(pageAri);
     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 {

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

@@ -481,11 +481,12 @@ class BlockServiceADFWriteProvider {
     });
     const stepVersion = this.getVersion ? await this.getVersion() : undefined;
     try {
-      // Try update existing block's content
+      const status = data.status;
       await updateSyncedBlock({
         blockAri,
         content: JSON.stringify(data.content),
-        stepVersion
+        stepVersion,
+        status
       });
       return {
         resourceId

package/dist/es2019/store-manager/sourceSyncBlockStoreManager.js

@@ -88,14 +88,18 @@ export class SourceSyncBlockStoreManager {
               resourceId: syncBlockData.resourceId
             }
           });
-          bodiedSyncBlockData.push(syncBlockData);
-
           // reset isDirty early to prevent race condition
           // There is a race condition where if a user makes changes to a source sync block
           // on a live page and the source sync block is being saved while the user
           // is still making changes, the new changes might not be saved if they all happen
           // exactly at a time when the writeNodesData is being executed asynchronously.
           syncBlockData.isDirty = false;
+          // When flushing, set status to 'active' so the block is published (when feature gate is on)
+          const dataToFlush = fg('platform_synced_block_patch_1') ? {
+            ...syncBlockData,
+            status: 'active'
+          } : syncBlockData;
+          bodiedSyncBlockData.push(dataToFlush);
         }
       });
       if (bodiedSyncBlockNodes.length === 0) {

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

@@ -128,11 +128,14 @@ var buildGetDocumentReferenceBlocksQuery = function buildGetDocumentReferenceBlo
 var buildGetBlockQuery = function buildGetBlockQuery(blockAri) {
   return "query ".concat(GET_BLOCK_OPERATION_NAME, " {\n\tblockService_getBlock(blockAri: ").concat(JSON.stringify(blockAri), ") {\n\t\tblockAri\n\t\tblockInstanceId\n\t\tcontent\n\t\tcontentUpdatedAt\n\t\tcreatedAt\n\t\tcreatedBy\n\t\tdeletionReason\n\t\tproduct\n\t\tsourceAri\n\t\tstatus\n\t\tversion\n\t}\n}");
 };
-var buildUpdateBlockMutation = function buildUpdateBlockMutation(blockAri, content, stepVersion) {
+var buildUpdateBlockMutation = function buildUpdateBlockMutation(blockAri, content, stepVersion, status) {
   var inputParts = ["blockAri: ".concat(JSON.stringify(blockAri)), "content: ".concat(JSON.stringify(content))];
   if (stepVersion !== undefined) {
     inputParts.push("stepVersion: ".concat(stepVersion));
   }
+  if (status !== undefined && fg('platform_synced_block_patch_1')) {
+    inputParts.push("status: ".concat(JSON.stringify(status)));
+  }
   var inputArgs = inputParts.join(', ');
   return "mutation ".concat(UPDATE_BLOCK_OPERATION_NAME, " {\n\tblockService_updateBlock(input: { ").concat(inputArgs, " }) {\n\t\t__typename\n\t}\n}");
 };
@@ -450,17 +453,17 @@ export var deleteSyncedBlock = /*#__PURE__*/function () {
 }();
 export var updateSyncedBlock = /*#__PURE__*/function () {
   var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref8) {
-    var blockAri, content, stepVersion, bodyData, _response4, result, requestBody, response;
+    var blockAri, content, stepVersion, status, bodyData, _response4, result, requestBody, response;
     return _regeneratorRuntime.wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          blockAri = _ref8.blockAri, content = _ref8.content, stepVersion = _ref8.stepVersion;
+          blockAri = _ref8.blockAri, content = _ref8.content, stepVersion = _ref8.stepVersion, status = _ref8.status;
           if (!fg('platform_synced_block_patch_1')) {
             _context5.next = 14;
             break;
           }
           bodyData = {
-            query: buildUpdateBlockMutation(blockAri, content, stepVersion),
+            query: buildUpdateBlockMutation(blockAri, content, stepVersion, status),
             operationName: UPDATE_BLOCK_OPERATION_NAME
           };
           _context5.next = 5;
@@ -497,20 +500,23 @@ export var updateSyncedBlock = /*#__PURE__*/function () {
           if (stepVersion !== undefined) {
             requestBody.stepVersion = stepVersion;
           }
-          _context5.next = 18;
+          if (status !== undefined && fg('platform_synced_block_patch_1')) {
+            requestBody.status = status;
+          }
+          _context5.next = 19;
           return fetchWithRetry("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
             method: 'PUT',
             headers: COMMON_HEADERS,
             body: JSON.stringify(requestBody)
           });
-        case 18:
+        case 19:
           response = _context5.sent;
           if (response.ok) {
-            _context5.next = 21;
+            _context5.next = 22;
             break;
           }
           throw new BlockError(response.status);
-        case 21:
+        case 22:
         case "end":
           return _context5.stop();
       }

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

@@ -121,9 +121,9 @@ var resolveNoAccessPageInfo = /*#__PURE__*/function () {
  * @param localId - Optional local ID to append as block anchor
  * @returns Source info with URL, title, and optional subtype
  */
-var fetchUnpublishedConfluencePageInfo = /*#__PURE__*/function () {
+var fetchCompleteConfluencePageInfo = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(pageAri, localId) {
-    var _pageData$_links, _pageData$_links2, _getPageIdAndTypeFrom, pageId, response, pageData, base, edituiv2, title, subType, url;
+    var _pageData$_links, _pageData$_links2, _pageData$_links3, _getPageIdAndTypeFrom, pageId, response, pageData, base, edituiv2, webui, title, subType, status, url;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -150,11 +150,15 @@ var fetchUnpublishedConfluencePageInfo = /*#__PURE__*/function () {
           pageData = _context3.sent;
           base = (_pageData$_links = pageData._links) === null || _pageData$_links === void 0 ? void 0 : _pageData$_links.base;
           edituiv2 = (_pageData$_links2 = pageData._links) === null || _pageData$_links2 === void 0 ? void 0 : _pageData$_links2.edituiv2;
+          webui = (_pageData$_links3 = pageData._links) === null || _pageData$_links3 === void 0 ? void 0 : _pageData$_links3.webui;
           title = pageData.title;
           subType = pageData.subtype;
-          if (base && edituiv2) {
+          status = pageData.status;
+          if (base && edituiv2 && (fg('platform_synced_block_patch_2') ? status !== 'archived' : true)) {
             url = "".concat(base).concat(edituiv2);
             url = url && localId ? "".concat(url, "#block-").concat(localId) : url;
+          } else if (base && webui && fg('platform_synced_block_patch_2')) {
+            url = "".concat(base).concat(webui);
           }
           return _context3.abrupt("return", {
             title: title,
@@ -162,20 +166,20 @@ var fetchUnpublishedConfluencePageInfo = /*#__PURE__*/function () {
             sourceAri: pageAri,
             subType: subType
           });
-        case 18:
-          _context3.prev = 18;
+        case 20:
+          _context3.prev = 20;
           _context3.t0 = _context3["catch"](0);
           logException(_context3.t0, {
-            location: 'editor-synced-block-provider/sourceInfo/fetchUnpublishedConfluencePageInfo'
+            location: 'editor-synced-block-provider/sourceInfo/fetchCompleteConfluencePageInfo'
           });
           return _context3.abrupt("return", Promise.resolve(undefined));
-        case 22:
+        case 24:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[0, 18]]);
+    }, _callee3, null, [[0, 20]]);
   }));
-  return function fetchUnpublishedConfluencePageInfo(_x3, _x4) {
+  return function fetchCompleteConfluencePageInfo(_x3, _x4) {
     return _ref3.apply(this, arguments);
   };
 }();
@@ -239,24 +243,37 @@ export var fetchConfluencePageInfo = /*#__PURE__*/function () {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
           if (!(isUnpublished && fg('platform_synced_block_patch_1'))) {
-            _context5.next = 4;
+            _context5.next = 5;
             break;
           }
-          _context5.next = 3;
-          return fetchUnpublishedConfluencePageInfo(pageAri, localId);
-        case 3:
-          return _context5.abrupt("return", _context5.sent);
+          if (fg('platform_synced_block_patch_2')) {
+            _context5.next = 5;
+            break;
+          }
+          _context5.next = 4;
+          return fetchCompleteConfluencePageInfo(pageAri, localId);
         case 4:
+          return _context5.abrupt("return", _context5.sent);
+        case 5:
           if (!hasAccess) {
-            _context5.next = 17;
+            _context5.next = 22;
             break;
           }
           _getPageIdAndTypeFrom3 = getPageIdAndTypeFromConfluencePageAri({
             ari: pageAri
           }), pageType = _getPageIdAndTypeFrom3.type;
-          _context5.next = 8;
+          if (!(pageType === 'page' && fg('platform_synced_block_patch_2'))) {
+            _context5.next = 11;
+            break;
+          }
+          _context5.next = 10;
+          return fetchCompleteConfluencePageInfo(pageAri, localId);
+        case 10:
+          return _context5.abrupt("return", _context5.sent);
+        case 11:
+          _context5.next = 13;
           return getConfluenceSourceInfo(pageAri);
-        case 8:
+        case 13:
           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;
@@ -277,12 +294,12 @@ export var fetchConfluencePageInfo = /*#__PURE__*/function () {
             sourceAri: pageAri,
             subType: subType
           }));
-        case 17:
-          _context5.next = 19;
+        case 22:
+          _context5.next = 24;
           return resolveNoAccessPageInfo(pageAri);
-        case 19:
+        case 24:
           return _context5.abrupt("return", _context5.sent);
-        case 20:
+        case 25:
         case "end":
           return _context5.stop();
       }

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

@@ -626,7 +626,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
     key: "writeData",
     value: function () {
       var _writeData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(data) {
-        var resourceId, blockAri, stepVersion;
+        var resourceId, blockAri, stepVersion, status;
         return _regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -660,37 +660,39 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
             case 11:
               stepVersion = _context5.t0;
               _context5.prev = 12;
-              _context5.next = 15;
+              status = data.status;
+              _context5.next = 16;
               return updateSyncedBlock({
                 blockAri: blockAri,
                 content: JSON.stringify(data.content),
-                stepVersion: stepVersion
+                stepVersion: stepVersion,
+                status: status
               });
-            case 15:
+            case 16:
               return _context5.abrupt("return", {
                 resourceId: resourceId
               });
-            case 18:
-              _context5.prev = 18;
+            case 19:
+              _context5.prev = 19;
               _context5.t1 = _context5["catch"](12);
               if (!(_context5.t1 instanceof BlockError)) {
-                _context5.next = 22;
+                _context5.next = 23;
                 break;
               }
               return _context5.abrupt("return", {
                 error: mapBlockError(_context5.t1),
                 resourceId: resourceId
               });
-            case 22:
+            case 23:
               return _context5.abrupt("return", {
                 error: stringifyError(_context5.t1),
                 resourceId: resourceId
               });
-            case 23:
+            case 24:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[12, 18]]);
+        }, _callee5, this, [[12, 19]]);
       }));
       function writeData(_x5) {
         return _writeData.apply(this, arguments);

package/dist/esm/store-manager/sourceSyncBlockStoreManager.js

@@ -107,14 +107,17 @@ export var SourceSyncBlockStoreManager = /*#__PURE__*/function () {
                       resourceId: syncBlockData.resourceId
                     }
                   });
-                  bodiedSyncBlockData.push(syncBlockData);
-
                   // reset isDirty early to prevent race condition
                   // There is a race condition where if a user makes changes to a source sync block
                   // on a live page and the source sync block is being saved while the user
                   // is still making changes, the new changes might not be saved if they all happen
                   // exactly at a time when the writeNodesData is being executed asynchronously.
                   syncBlockData.isDirty = false;
+                  // When flushing, set status to 'active' so the block is published (when feature gate is on)
+                  var dataToFlush = fg('platform_synced_block_patch_1') ? _objectSpread(_objectSpread({}, syncBlockData), {}, {
+                    status: 'active'
+                  }) : syncBlockData;
+                  bodiedSyncBlockData.push(dataToFlush);
                 }
               });
               if (!(bodiedSyncBlockNodes.length === 0)) {

package/dist/types/clients/block-service/blockService.d.ts

@@ -76,6 +76,7 @@ export type DeleteSyncedBlockRequest = {
 export type UpdateSyncedBlockRequest = {
     blockAri: string;
     content: string;
+    status?: SyncBlockStatus;
     stepVersion?: number;
 };
 export type CreateSyncedBlockRequest = {
@@ -132,7 +133,7 @@ export declare const getSyncedBlockContent: ({ blockAri, }: GetSyncedBlockConten
  */
 export declare const batchRetrieveSyncedBlocks: ({ blockIdentifiers, documentAri, }: BatchRetrieveSyncedBlocksRequest) => Promise<BatchRetrieveSyncedBlocksResponse>;
 export declare const deleteSyncedBlock: ({ blockAri, deleteReason, }: DeleteSyncedBlockRequest) => Promise<void>;
-export declare const updateSyncedBlock: ({ blockAri, content, stepVersion, }: UpdateSyncedBlockRequest) => Promise<void>;
+export declare const updateSyncedBlock: ({ blockAri, content, stepVersion, status, }: UpdateSyncedBlockRequest) => Promise<void>;
 export declare const createSyncedBlock: ({ blockAri, blockInstanceId, sourceAri, product, content, stepVersion, status, }: CreateSyncedBlockRequest) => Promise<BlockContentResponse>;
 export declare const updateReferenceSyncedBlockOnDocument: ({ documentAri, blocks, noContent, }: UpdateReferenceSyncedBlockOnDocumentRequest) => Promise<ReferenceSyncedBlockResponse | void>;
 export declare const getReferenceSyncedBlocksByBlockAri: ({ blockAri, }: GetReferenceSyncedBlocksByBlockAriRequest) => Promise<GetReferenceSyncedBlocksByBlockAriResponse>;

package/dist/types-ts4.5/clients/block-service/blockService.d.ts

@@ -76,6 +76,7 @@ export type DeleteSyncedBlockRequest = {
 export type UpdateSyncedBlockRequest = {
     blockAri: string;
     content: string;
+    status?: SyncBlockStatus;
     stepVersion?: number;
 };
 export type CreateSyncedBlockRequest = {
@@ -132,7 +133,7 @@ export declare const getSyncedBlockContent: ({ blockAri, }: GetSyncedBlockConten
  */
 export declare const batchRetrieveSyncedBlocks: ({ blockIdentifiers, documentAri, }: BatchRetrieveSyncedBlocksRequest) => Promise<BatchRetrieveSyncedBlocksResponse>;
 export declare const deleteSyncedBlock: ({ blockAri, deleteReason, }: DeleteSyncedBlockRequest) => Promise<void>;
-export declare const updateSyncedBlock: ({ blockAri, content, stepVersion, }: UpdateSyncedBlockRequest) => Promise<void>;
+export declare const updateSyncedBlock: ({ blockAri, content, stepVersion, status, }: UpdateSyncedBlockRequest) => Promise<void>;
 export declare const createSyncedBlock: ({ blockAri, blockInstanceId, sourceAri, product, content, stepVersion, status, }: CreateSyncedBlockRequest) => Promise<BlockContentResponse>;
 export declare const updateReferenceSyncedBlockOnDocument: ({ documentAri, blocks, noContent, }: UpdateReferenceSyncedBlockOnDocumentRequest) => Promise<ReferenceSyncedBlockResponse | void>;
 export declare const getReferenceSyncedBlocksByBlockAri: ({ blockAri, }: GetReferenceSyncedBlocksByBlockAriRequest) => Promise<GetReferenceSyncedBlocksByBlockAriResponse>;

package/package.json

@@ -79,7 +79,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "3.26.2",
+	"version": "3.27.0",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -89,6 +89,9 @@
 	"platform-feature-flags": {
 		"platform_synced_block_patch_1": {
 			"type": "boolean"
+		},
+		"platform_synced_block_patch_2": {
+			"type": "boolean"
 		}
 	}
 }