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

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.27.1
+
+### Patch Changes
+
+- [`764672ccc7992`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/764672ccc7992) -
+  EDITOR-4049 Add support for prefetching of synced blocks data to synced block provider.
+- Updated dependencies
+
+## 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/index.js

@@ -21,6 +21,12 @@ Object.defineProperty(exports, "SyncedBlockProvider", {
     return _syncBlockProvider.SyncBlockProvider;
   }
 });
+Object.defineProperty(exports, "batchFetchData", {
+  enumerable: true,
+  get: function get() {
+    return _blockServiceAPI.batchFetchData;
+  }
+});
 Object.defineProperty(exports, "convertPMNodesToSyncBlockNodes", {
   enumerable: true,
   get: function get() {