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

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-synced-block-provider
 
+## 3.29.0
+
+### Minor Changes
+
+- [`af9d0d672e930`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/af9d0d672e930) -
+  Revert: Edit at source for an archived page should not redirect and show ask for edit flag
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.28.1
 
 ### Patch Changes

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

@@ -9,7 +9,6 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _errorHandling = require("../../utils/errorHandling");
 var _retry = require("../../utils/retry");
 var _ari = require("./ari");
@@ -128,7 +127,7 @@ var resolveNoAccessPageInfo = /*#__PURE__*/function () {
  */
 var fetchCompleteConfluencePageInfo = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(pageAri, localId) {
-    var _pageData$_links, _pageData$_links2, _pageData$_links3, _getPageIdAndTypeFrom, pageId, response, pageData, base, edituiv2, webui, title, subType, status, url;
+    var _pageData$_links, _pageData$_links2, _getPageIdAndTypeFrom, pageId, response, pageData, base, edituiv2, title, subType, url;
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -155,15 +154,11 @@ var fetchCompleteConfluencePageInfo = /*#__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;
-          status = pageData.status;
-          if (base && edituiv2 && ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_2') ? status !== 'archived' : true)) {
+          if (base && edituiv2) {
             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,
@@ -171,18 +166,18 @@ var fetchCompleteConfluencePageInfo = /*#__PURE__*/function () {
             sourceAri: pageAri,
             subType: subType
           });
-        case 20:
-          _context3.prev = 20;
+        case 18:
+          _context3.prev = 18;
           _context3.t0 = _context3["catch"](0);
           (0, _monitoring.logException)(_context3.t0, {
-            location: 'editor-synced-block-provider/sourceInfo/fetchCompleteConfluencePageInfo'
+            location: 'editor-synced-block-provider/sourceInfo/fetchUnpublishedConfluencePageInfo'
           });
           return _context3.abrupt("return", Promise.resolve(undefined));
-        case 24:
+        case 22:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[0, 20]]);
+    }, _callee3, null, [[0, 18]]);
   }));
   return function fetchCompleteConfluencePageInfo(_x3, _x4) {
     return _ref3.apply(this, arguments);
@@ -248,37 +243,24 @@ var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/fun
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
           if (!isUnpublished) {
-            _context5.next = 5;
-            break;
-          }
-          if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_2')) {
-            _context5.next = 5;
+            _context5.next = 4;
             break;
           }
-          _context5.next = 4;
+          _context5.next = 3;
           return fetchCompleteConfluencePageInfo(pageAri, localId);
-        case 4:
+        case 3:
           return _context5.abrupt("return", _context5.sent);
-        case 5:
+        case 4:
           if (!hasAccess) {
-            _context5.next = 22;
+            _context5.next = 17;
             break;
           }
           _getPageIdAndTypeFrom3 = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
             ari: pageAri
           }), pageType = _getPageIdAndTypeFrom3.type;
-          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;
+          _context5.next = 8;
           return getConfluenceSourceInfo(pageAri);
-        case 13:
+        case 8:
           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;
@@ -299,12 +281,12 @@ var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/fun
             sourceAri: pageAri,
             subType: subType
           }));
-        case 22:
-          _context5.next = 24;
+        case 17:
+          _context5.next = 19;
           return resolveNoAccessPageInfo(pageAri);
-        case 24:
+        case 19:
           return _context5.abrupt("return", _context5.sent);
-        case 25:
+        case 20:
         case "end":
           return _context5.stop();
       }

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

@@ -1,7 +1,6 @@
 /* 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';
@@ -91,7 +90,7 @@ const resolveNoAccessPageInfo = async ari => {
  */
 const fetchCompleteConfluencePageInfo = async (pageAri, localId) => {
   try {
-    var _pageData$_links, _pageData$_links2, _pageData$_links3;
+    var _pageData$_links, _pageData$_links2;
     const {
       id: pageId
     } = getPageIdAndTypeFromConfluencePageAri({
@@ -107,16 +106,12 @@ const fetchCompleteConfluencePageInfo = 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 && (fg('platform_synced_block_patch_2') ? status !== 'archived' : true)) {
+    if (base && edituiv2) {
       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,
@@ -126,7 +121,7 @@ const fetchCompleteConfluencePageInfo = async (pageAri, localId) => {
     };
   } catch (error) {
     logException(error, {
-      location: 'editor-synced-block-provider/sourceInfo/fetchCompleteConfluencePageInfo'
+      location: 'editor-synced-block-provider/sourceInfo/fetchUnpublishedConfluencePageInfo'
     });
     return Promise.resolve(undefined);
   }
@@ -175,9 +170,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) {
-    if (!fg('platform_synced_block_patch_2')) {
-      return await fetchCompleteConfluencePageInfo(pageAri, localId);
-    }
+    return await fetchCompleteConfluencePageInfo(pageAri, localId);
   }
   if (hasAccess) {
     var _response$data2, _response$data2$conte, _response$data2$conte2, _contentData$space2;
@@ -186,9 +179,6 @@ 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/esm/clients/confluence/sourceInfo.js

@@ -6,7 +6,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 /* 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';
@@ -123,7 +122,7 @@ var resolveNoAccessPageInfo = /*#__PURE__*/function () {
  */
 var fetchCompleteConfluencePageInfo = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(pageAri, localId) {
-    var _pageData$_links, _pageData$_links2, _pageData$_links3, _getPageIdAndTypeFrom, pageId, response, pageData, base, edituiv2, webui, title, subType, status, url;
+    var _pageData$_links, _pageData$_links2, _getPageIdAndTypeFrom, pageId, response, pageData, base, edituiv2, title, subType, url;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -150,15 +149,11 @@ var fetchCompleteConfluencePageInfo = /*#__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;
-          status = pageData.status;
-          if (base && edituiv2 && (fg('platform_synced_block_patch_2') ? status !== 'archived' : true)) {
+          if (base && edituiv2) {
             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,
@@ -166,18 +161,18 @@ var fetchCompleteConfluencePageInfo = /*#__PURE__*/function () {
             sourceAri: pageAri,
             subType: subType
           });
-        case 20:
-          _context3.prev = 20;
+        case 18:
+          _context3.prev = 18;
           _context3.t0 = _context3["catch"](0);
           logException(_context3.t0, {
-            location: 'editor-synced-block-provider/sourceInfo/fetchCompleteConfluencePageInfo'
+            location: 'editor-synced-block-provider/sourceInfo/fetchUnpublishedConfluencePageInfo'
           });
           return _context3.abrupt("return", Promise.resolve(undefined));
-        case 24:
+        case 22:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[0, 20]]);
+    }, _callee3, null, [[0, 18]]);
   }));
   return function fetchCompleteConfluencePageInfo(_x3, _x4) {
     return _ref3.apply(this, arguments);
@@ -243,37 +238,24 @@ export var fetchConfluencePageInfo = /*#__PURE__*/function () {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
           if (!isUnpublished) {
-            _context5.next = 5;
-            break;
-          }
-          if (fg('platform_synced_block_patch_2')) {
-            _context5.next = 5;
+            _context5.next = 4;
             break;
           }
-          _context5.next = 4;
+          _context5.next = 3;
           return fetchCompleteConfluencePageInfo(pageAri, localId);
-        case 4:
+        case 3:
           return _context5.abrupt("return", _context5.sent);
-        case 5:
+        case 4:
           if (!hasAccess) {
-            _context5.next = 22;
+            _context5.next = 17;
             break;
           }
           _getPageIdAndTypeFrom3 = getPageIdAndTypeFromConfluencePageAri({
             ari: pageAri
           }), pageType = _getPageIdAndTypeFrom3.type;
-          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;
+          _context5.next = 8;
           return getConfluenceSourceInfo(pageAri);
-        case 13:
+        case 8:
           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;
@@ -294,12 +276,12 @@ export var fetchConfluencePageInfo = /*#__PURE__*/function () {
             sourceAri: pageAri,
             subType: subType
           }));
-        case 22:
-          _context5.next = 24;
+        case 17:
+          _context5.next = 19;
           return resolveNoAccessPageInfo(pageAri);
-        case 24:
+        case 19:
           return _context5.abrupt("return", _context5.sent);
-        case 25:
+        case 20:
         case "end":
           return _context5.stop();
       }

package/package.json

@@ -37,7 +37,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.12.0",
+		"@atlaskit/editor-common": "^111.13.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -80,7 +80,7 @@
 		}
 	},
 	"name": "@atlaskit/editor-synced-block-provider",
-	"version": "3.28.1",
+	"version": "3.29.0",
 	"description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",