@atlaskit/editor-synced-block-provider 3.25.0 → 3.26.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. package/CHANGELOG.md +21 -0
  2. package/dist/cjs/clients/block-service/blockService.js +98 -57
  3. package/dist/cjs/clients/confluence/sourceInfo.js +112 -69
  4. package/dist/cjs/hooks/useFetchSyncBlockData.js +5 -11
  5. package/dist/cjs/providers/block-service/blockServiceAPI.js +1 -1
  6. package/dist/cjs/providers/syncBlockProvider.js +34 -75
  7. package/dist/cjs/store-manager/referenceSyncBlockStoreManager.js +83 -124
  8. package/dist/cjs/store-manager/sourceSyncBlockStoreManager.js +59 -93
  9. package/dist/cjs/store-manager/syncBlockStoreManager.js +2 -4
  10. package/dist/cjs/utils/errorHandling.js +2 -5
  11. package/dist/cjs/utils/resolveSyncBlockInstance.js +1 -3
  12. package/dist/cjs/utils/utils.js +5 -6
  13. package/dist/es2019/clients/block-service/blockService.js +55 -19
  14. package/dist/es2019/clients/confluence/sourceInfo.js +51 -4
  15. package/dist/es2019/hooks/useFetchSyncBlockData.js +6 -12
  16. package/dist/es2019/providers/block-service/blockServiceAPI.js +1 -1
  17. package/dist/es2019/providers/syncBlockProvider.js +22 -54
  18. package/dist/es2019/store-manager/referenceSyncBlockStoreManager.js +73 -114
  19. package/dist/es2019/store-manager/sourceSyncBlockStoreManager.js +60 -92
  20. package/dist/es2019/store-manager/syncBlockStoreManager.js +2 -4
  21. package/dist/es2019/utils/errorHandling.js +1 -4
  22. package/dist/es2019/utils/resolveSyncBlockInstance.js +2 -5
  23. package/dist/es2019/utils/utils.js +5 -6
  24. package/dist/esm/clients/block-service/blockService.js +98 -57
  25. package/dist/esm/clients/confluence/sourceInfo.js +111 -68
  26. package/dist/esm/hooks/useFetchSyncBlockData.js +5 -11
  27. package/dist/esm/providers/block-service/blockServiceAPI.js +1 -1
  28. package/dist/esm/providers/syncBlockProvider.js +34 -75
  29. package/dist/esm/store-manager/referenceSyncBlockStoreManager.js +83 -124
  30. package/dist/esm/store-manager/sourceSyncBlockStoreManager.js +59 -93
  31. package/dist/esm/store-manager/syncBlockStoreManager.js +2 -4
  32. package/dist/esm/utils/errorHandling.js +2 -5
  33. package/dist/esm/utils/resolveSyncBlockInstance.js +1 -3
  34. package/dist/esm/utils/utils.js +5 -6
  35. package/dist/types/clients/confluence/sourceInfo.d.ts +1 -2
  36. package/dist/types/hooks/useFetchSyncBlockData.d.ts +1 -1
  37. package/dist/types/providers/syncBlockProvider.d.ts +2 -2
  38. package/dist/types/providers/types.d.ts +3 -3
  39. package/dist/types/store-manager/sourceSyncBlockStoreManager.d.ts +1 -1
  40. package/dist/types-ts4.5/clients/confluence/sourceInfo.d.ts +1 -2
  41. package/dist/types-ts4.5/hooks/useFetchSyncBlockData.d.ts +1 -1
  42. package/dist/types-ts4.5/providers/syncBlockProvider.d.ts +2 -2
  43. package/dist/types-ts4.5/providers/types.d.ts +3 -3
  44. package/dist/types-ts4.5/store-manager/sourceSyncBlockStoreManager.d.ts +1 -1
  45. package/package.json +2 -5
@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.fetchConfluencePageInfoOld = exports.fetchConfluencePageInfoNew = exports.fetchConfluencePageInfo = void 0;
7
+ exports.fetchConfluencePageInfoOld = exports.fetchConfluencePageInfo = void 0;
8
8
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
9
9
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
10
10
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -118,69 +118,79 @@ var resolveNoAccessPageInfo = /*#__PURE__*/function () {
118
118
  return _ref2.apply(this, arguments);
119
119
  };
120
120
  }();
121
- var fetchConfluencePageInfoOld = exports.fetchConfluencePageInfoOld = /*#__PURE__*/function () {
122
- var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(pageAri, localId, fireAnalyticsEvent) {
123
- var _response$data, _contentData$space, _getPageIdAndTypeFrom, pageType, response, contentData, title, url, _ref4, base;
121
+
122
+ /**
123
+ * Fetches unpublished page info from the v2 pages API
124
+ * Used when the GraphQL query returns empty content.nodes for unpublished pages
125
+ * @param pageAri - The page ARI
126
+ * @param localId - Optional local ID to append as block anchor
127
+ * @returns Source info with URL, title, and optional subtype
128
+ */
129
+ var fetchUnpublishedConfluencePageInfo = /*#__PURE__*/function () {
130
+ var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(pageAri, localId) {
131
+ var _pageData$_links, _pageData$_links2, _getPageIdAndTypeFrom, pageId, response, pageData, base, edituiv2, title, subType, url;
124
132
  return _regenerator.default.wrap(function _callee3$(_context3) {
125
133
  while (1) switch (_context3.prev = _context3.next) {
126
134
  case 0:
127
135
  _context3.prev = 0;
128
136
  _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
129
137
  ari: pageAri
130
- }), pageType = _getPageIdAndTypeFrom.type;
138
+ }), pageId = _getPageIdAndTypeFrom.id;
131
139
  _context3.next = 4;
132
- return getConfluenceSourceInfo(pageAri);
140
+ return (0, _retry.fetchWithRetry)("/wiki/api/v2/pages/".concat(pageId, "?draft=true"), {
141
+ method: 'GET',
142
+ headers: COMMON_HEADERS
143
+ });
133
144
  case 4:
134
145
  response = _context3.sent;
135
- contentData = (_response$data = response.data) === null || _response$data === void 0 || (_response$data = _response$data.content) === null || _response$data === void 0 || (_response$data = _response$data.nodes) === null || _response$data === void 0 ? void 0 : _response$data[0];
136
- title = contentData === null || contentData === void 0 ? void 0 : contentData.title;
137
- _ref4 = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {}, base = _ref4.base;
138
- 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) {
139
- if ((0, _utils.isBlogPageType)(pageType)) {
140
- url = "".concat(base, "/spaces/").concat(contentData.space.key, "/blog/edit-v2/").concat(contentData.id);
141
- } else if (contentData.subType === 'live') {
142
- url = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages/").concat(contentData.id);
143
- } else {
144
- url = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages/edit-v2/").concat(contentData.id);
145
- }
146
+ if (response.ok) {
147
+ _context3.next = 7;
148
+ break;
146
149
  }
147
- url = url && localId ? "".concat(url, "#block-").concat(localId) : url;
148
- if (!title || !url) {
149
- fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent((0, _errorHandling.getSourceInfoErrorPayload)('Failed to get confluence page source info'));
150
+ throw new Error("Failed to get unpublished page info: ".concat(response.statusText));
151
+ case 7:
152
+ _context3.next = 9;
153
+ return response.json();
154
+ case 9:
155
+ pageData = _context3.sent;
156
+ base = (_pageData$_links = pageData._links) === null || _pageData$_links === void 0 ? void 0 : _pageData$_links.base;
157
+ edituiv2 = (_pageData$_links2 = pageData._links) === null || _pageData$_links2 === void 0 ? void 0 : _pageData$_links2.edituiv2;
158
+ title = pageData.title;
159
+ subType = pageData.subtype;
160
+ if (base && edituiv2) {
161
+ url = "".concat(base).concat(edituiv2);
162
+ url = url && localId ? "".concat(url, "#block-").concat(localId) : url;
150
163
  }
151
- return _context3.abrupt("return", Promise.resolve({
164
+ return _context3.abrupt("return", {
152
165
  title: title,
153
166
  url: url,
154
- sourceAri: pageAri
155
- }));
156
- case 14:
157
- _context3.prev = 14;
167
+ sourceAri: pageAri,
168
+ subType: subType
169
+ });
170
+ case 18:
171
+ _context3.prev = 18;
158
172
  _context3.t0 = _context3["catch"](0);
159
173
  (0, _monitoring.logException)(_context3.t0, {
160
- location: 'editor-synced-block-provider/sourceInfo'
174
+ location: 'editor-synced-block-provider/sourceInfo/fetchUnpublishedConfluencePageInfo'
161
175
  });
162
- fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent((0, _errorHandling.getSourceInfoErrorPayload)(_context3.t0.message));
163
176
  return _context3.abrupt("return", Promise.resolve(undefined));
164
- case 19:
177
+ case 22:
165
178
  case "end":
166
179
  return _context3.stop();
167
180
  }
168
- }, _callee3, null, [[0, 14]]);
181
+ }, _callee3, null, [[0, 18]]);
169
182
  }));
170
- return function fetchConfluencePageInfoOld(_x3, _x4, _x5) {
183
+ return function fetchUnpublishedConfluencePageInfo(_x3, _x4) {
171
184
  return _ref3.apply(this, arguments);
172
185
  };
173
186
  }();
174
- var fetchConfluencePageInfoNew = exports.fetchConfluencePageInfoNew = /*#__PURE__*/function () {
175
- var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(pageAri, hasAccess, urlType, localId) {
176
- var _response$data2, _contentData$space2, _getPageIdAndTypeFrom2, pageType, response, contentData, _ref6, title, subType, url, _ref7, base;
187
+ var fetchConfluencePageInfoOld = exports.fetchConfluencePageInfoOld = /*#__PURE__*/function () {
188
+ var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(pageAri, localId, fireAnalyticsEvent) {
189
+ var _response$data, _contentData$space, _getPageIdAndTypeFrom2, pageType, response, contentData, title, url, _ref5, base;
177
190
  return _regenerator.default.wrap(function _callee4$(_context4) {
178
191
  while (1) switch (_context4.prev = _context4.next) {
179
192
  case 0:
180
- if (!hasAccess) {
181
- _context4.next = 13;
182
- break;
183
- }
193
+ _context4.prev = 0;
184
194
  _getPageIdAndTypeFrom2 = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
185
195
  ari: pageAri
186
196
  }), pageType = _getPageIdAndTypeFrom2.type;
@@ -188,69 +198,102 @@ var fetchConfluencePageInfoNew = exports.fetchConfluencePageInfoNew = /*#__PURE_
188
198
  return getConfluenceSourceInfo(pageAri);
189
199
  case 4:
190
200
  response = _context4.sent;
191
- 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];
192
- _ref6 = contentData || {}, title = _ref6.title, subType = _ref6.subType;
193
- _ref7 = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {}, base = _ref7.base;
194
- 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) {
201
+ contentData = (_response$data = response.data) === null || _response$data === void 0 || (_response$data = _response$data.content) === null || _response$data === void 0 || (_response$data = _response$data.nodes) === null || _response$data === void 0 ? void 0 : _response$data[0];
202
+ title = contentData === null || contentData === void 0 ? void 0 : contentData.title;
203
+ _ref5 = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {}, base = _ref5.base;
204
+ 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) {
195
205
  if ((0, _utils.isBlogPageType)(pageType)) {
196
- url = "".concat(base, "/spaces/").concat(contentData.space.key, "/blog").concat(urlType === 'edit' ? '/edit-v2' : '', "/").concat(contentData.id);
206
+ url = "".concat(base, "/spaces/").concat(contentData.space.key, "/blog/edit-v2/").concat(contentData.id);
197
207
  } else if (contentData.subType === 'live') {
198
208
  url = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages/").concat(contentData.id);
199
209
  } else {
200
- url = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages").concat(urlType === 'edit' ? '/edit-v2' : '', "/").concat(contentData.id);
210
+ url = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages/edit-v2/").concat(contentData.id);
201
211
  }
202
212
  }
203
213
  url = url && localId ? "".concat(url, "#block-").concat(localId) : url;
214
+ if (!title || !url) {
215
+ fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent((0, _errorHandling.getSourceInfoErrorPayload)('Failed to get confluence page source info'));
216
+ }
204
217
  return _context4.abrupt("return", Promise.resolve({
205
218
  title: title,
206
219
  url: url,
207
- sourceAri: pageAri,
208
- subType: subType
220
+ sourceAri: pageAri
209
221
  }));
210
- case 13:
211
- _context4.next = 15;
212
- return resolveNoAccessPageInfo(pageAri);
213
- case 15:
214
- return _context4.abrupt("return", _context4.sent);
215
- case 16:
222
+ case 14:
223
+ _context4.prev = 14;
224
+ _context4.t0 = _context4["catch"](0);
225
+ (0, _monitoring.logException)(_context4.t0, {
226
+ location: 'editor-synced-block-provider/sourceInfo'
227
+ });
228
+ fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent((0, _errorHandling.getSourceInfoErrorPayload)(_context4.t0.message));
229
+ return _context4.abrupt("return", Promise.resolve(undefined));
230
+ case 19:
216
231
  case "end":
217
232
  return _context4.stop();
218
233
  }
219
- }, _callee4);
234
+ }, _callee4, null, [[0, 14]]);
220
235
  }));
221
- return function fetchConfluencePageInfoNew(_x6, _x7, _x8, _x9) {
222
- return _ref5.apply(this, arguments);
236
+ return function fetchConfluencePageInfoOld(_x5, _x6, _x7) {
237
+ return _ref4.apply(this, arguments);
223
238
  };
224
239
  }();
225
240
  var fetchConfluencePageInfo = exports.fetchConfluencePageInfo = /*#__PURE__*/function () {
226
- var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(pageAri, hasAccess, urlType, localId, fireAnalyticsEvent) {
241
+ var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(pageAri, hasAccess, urlType, localId, isUnpublished) {
242
+ var _response$data2, _contentData$space2, _getPageIdAndTypeFrom3, pageType, response, contentData, _ref7, title, subType, url, _ref8, base;
227
243
  return _regenerator.default.wrap(function _callee5$(_context5) {
228
244
  while (1) switch (_context5.prev = _context5.next) {
229
245
  case 0:
230
- if (!(0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
231
- _context5.next = 6;
246
+ if (!(isUnpublished && (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1'))) {
247
+ _context5.next = 4;
232
248
  break;
233
249
  }
234
250
  _context5.next = 3;
235
- return fetchConfluencePageInfoNew(pageAri, hasAccess, urlType, localId);
251
+ return fetchUnpublishedConfluencePageInfo(pageAri, localId);
236
252
  case 3:
237
- _context5.t0 = _context5.sent;
238
- _context5.next = 9;
239
- break;
240
- case 6:
253
+ return _context5.abrupt("return", _context5.sent);
254
+ case 4:
255
+ if (!hasAccess) {
256
+ _context5.next = 17;
257
+ break;
258
+ }
259
+ _getPageIdAndTypeFrom3 = (0, _ari.getPageIdAndTypeFromConfluencePageAri)({
260
+ ari: pageAri
261
+ }), pageType = _getPageIdAndTypeFrom3.type;
241
262
  _context5.next = 8;
242
- return fetchConfluencePageInfoOld(pageAri, localId, fireAnalyticsEvent);
263
+ return getConfluenceSourceInfo(pageAri);
243
264
  case 8:
244
- _context5.t0 = _context5.sent;
245
- case 9:
246
- return _context5.abrupt("return", _context5.t0);
247
- case 10:
265
+ response = _context5.sent;
266
+ 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];
267
+ _ref7 = contentData || {}, title = _ref7.title, subType = _ref7.subType;
268
+ _ref8 = (contentData === null || contentData === void 0 ? void 0 : contentData.links) || {}, base = _ref8.base;
269
+ 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) {
270
+ if ((0, _utils.isBlogPageType)(pageType)) {
271
+ url = "".concat(base, "/spaces/").concat(contentData.space.key, "/blog").concat(urlType === 'edit' ? '/edit-v2' : '', "/").concat(contentData.id);
272
+ } else if (contentData.subType === 'live') {
273
+ url = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages/").concat(contentData.id);
274
+ } else {
275
+ url = "".concat(base, "/spaces/").concat(contentData.space.key, "/pages").concat(urlType === 'edit' ? '/edit-v2' : '', "/").concat(contentData.id);
276
+ }
277
+ }
278
+ url = url && localId ? "".concat(url, "#block-").concat(localId) : url;
279
+ return _context5.abrupt("return", Promise.resolve({
280
+ title: title,
281
+ url: url,
282
+ sourceAri: pageAri,
283
+ subType: subType
284
+ }));
285
+ case 17:
286
+ _context5.next = 19;
287
+ return resolveNoAccessPageInfo(pageAri);
288
+ case 19:
289
+ return _context5.abrupt("return", _context5.sent);
290
+ case 20:
248
291
  case "end":
249
292
  return _context5.stop();
250
293
  }
251
294
  }, _callee5);
252
295
  }));
253
- return function fetchConfluencePageInfo(_x0, _x1, _x10, _x11, _x12) {
254
- return _ref8.apply(this, arguments);
296
+ return function fetchConfluencePageInfo(_x8, _x9, _x0, _x1, _x10) {
297
+ return _ref6.apply(this, arguments);
255
298
  };
256
299
  }();
@@ -12,13 +12,11 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
12
12
  var _react = require("react");
13
13
  var _coreUtils = require("@atlaskit/editor-common/core-utils");
14
14
  var _monitoring = require("@atlaskit/editor-common/monitoring");
15
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
16
15
  var _types = require("../common/types");
17
- var _errorHandling = require("../utils/errorHandling");
18
16
  var _utils = require("../utils/utils");
19
17
  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; }
20
18
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
21
- var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyncBlockData(manager, resourceId, localId, fireAnalyticsEvent) {
19
+ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyncBlockData(manager, resourceId, localId, _fireAnalyticsEvent) {
22
20
  // Initialize both states from a single cache lookup to avoid race conditions.
23
21
  // When a block is moved/remounted, the old component's cleanup may clear the cache
24
22
  // before or after the new component mounts. By doing a single lookup, we ensure
@@ -79,13 +77,9 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
79
77
  (0, _monitoring.logException)(_context.t0, {
80
78
  location: 'editor-synced-block-provider/useFetchSyncBlockData'
81
79
  });
82
- if ((0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
83
- manager === null || manager === void 0 || (_manager$referenceMan2 = manager.referenceManager) === null || _manager$referenceMan2 === void 0 || (_manager$referenceMan2 = _manager$referenceMan2.fetchExperience) === null || _manager$referenceMan2 === void 0 || _manager$referenceMan2.failure({
84
- reason: _context.t0.message
85
- });
86
- } else {
87
- fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent((0, _errorHandling.fetchErrorPayload)(_context.t0.message));
88
- }
80
+ manager === null || manager === void 0 || (_manager$referenceMan2 = manager.referenceManager) === null || _manager$referenceMan2 === void 0 || (_manager$referenceMan2 = _manager$referenceMan2.fetchExperience) === null || _manager$referenceMan2 === void 0 || _manager$referenceMan2.failure({
81
+ reason: _context.t0.message
82
+ });
89
83
 
90
84
  // Set error state if fetching fails
91
85
  setFetchState({
@@ -109,7 +103,7 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
109
103
  return _context.stop();
110
104
  }
111
105
  }, _callee, null, [[2, 11]]);
112
- })), [isLoading, localId, manager.referenceManager, resourceId, fireAnalyticsEvent]);
106
+ })), [isLoading, localId, manager.referenceManager, resourceId]);
113
107
  (0, _react.useEffect)(function () {
114
108
  if ((0, _coreUtils.isSSR)()) {
115
109
  // in SSR, we don't need to subscribe to updates,
@@ -741,7 +741,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
741
741
  _context6.t0 = undefined;
742
742
  case 11:
743
743
  stepVersion = _context6.t0;
744
- status = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1') ? 'unpublished' : (0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding') ? (_this$isParentUnpubli = this.isParentUnpublished) !== null && _this$isParentUnpubli !== void 0 && _this$isParentUnpubli.call(this) ? 'unpublished' : data.status || 'active' : undefined;
744
+ status = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_1') ? 'unpublished' : (_this$isParentUnpubli = this.isParentUnpublished) !== null && _this$isParentUnpubli !== void 0 && _this$isParentUnpubli.call(this) ? 'unpublished' : data.status || 'active';
745
745
  _context6.prev = 13;
746
746
  _context6.next = 16;
747
747
  return (0, _blockService.createSyncedBlock)({
@@ -14,7 +14,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
14
14
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
15
15
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
16
16
  var _react = require("react");
17
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
18
17
  var _ari = require("../clients/block-service/ari");
19
18
  var _ari2 = require("../clients/confluence/ari");
20
19
  var _sourceInfo2 = require("../clients/confluence/sourceInfo");
@@ -104,40 +103,14 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
104
103
  }
105
104
  return _context.abrupt("return", []);
106
105
  case 3:
107
- if (!(0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
108
- _context.next = 15;
109
- break;
110
- }
111
- _context.prev = 4;
112
- _context.next = 7;
106
+ _context.prev = 3;
107
+ _context.next = 6;
113
108
  return this.fetchProvider.batchFetchData(blockIdentifiers);
114
- case 7:
109
+ case 6:
115
110
  return _context.abrupt("return", _context.sent);
116
- case 10:
117
- _context.prev = 10;
118
- _context.t0 = _context["catch"](4);
119
- return _context.abrupt("return", Promise.allSettled(blockIdentifiers.map(function (blockIdentifier) {
120
- return _this2.fetchProvider.fetchData(blockIdentifier.resourceId).then(function (data) {
121
- return data;
122
- }, function () {
123
- return {
124
- error: {
125
- type: _types.SyncBlockError.Errored
126
- },
127
- resourceId: blockIdentifier.resourceId
128
- };
129
- });
130
- })).then(function (results) {
131
- return results.filter(function (result) {
132
- return result.status === 'fulfilled';
133
- }).map(function (result) {
134
- return result.value;
135
- });
136
- }));
137
- case 13:
138
- _context.next = 16;
139
- break;
140
- case 15:
111
+ case 9:
112
+ _context.prev = 9;
113
+ _context.t0 = _context["catch"](3);
141
114
  return _context.abrupt("return", Promise.allSettled(blockIdentifiers.map(function (blockIdentifier) {
142
115
  return _this2.fetchProvider.fetchData(blockIdentifier.resourceId).then(function (data) {
143
116
  return data;
@@ -156,11 +129,11 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
156
129
  return result.value;
157
130
  });
158
131
  }));
159
- case 16:
132
+ case 12:
160
133
  case "end":
161
134
  return _context.stop();
162
135
  }
163
- }, _callee, this, [[4, 10]]);
136
+ }, _callee, this, [[3, 9]]);
164
137
  }));
165
138
  function fetchNodesData(_x) {
166
139
  return _fetchNodesData.apply(this, arguments);
@@ -307,80 +280,66 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
307
280
  key: "fetchSyncBlockSourceInfo",
308
281
  value: (function () {
309
282
  var _fetchSyncBlockSourceInfo = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(localId, sourceAri, sourceProduct, fireAnalyticsEvent) {
283
+ var _this$writeProvider, _this$writeProvider3;
310
284
  var hasAccess,
311
285
  urlType,
286
+ isUnpublished,
312
287
  ari,
313
288
  product,
314
- _this$writeProvider,
315
- sourceInfo,
316
289
  _this$writeProvider2,
317
- _this$writeProvider3,
318
290
  _sourceInfo,
291
+ sourceInfo,
319
292
  _args4 = arguments;
320
293
  return _regenerator.default.wrap(function _callee4$(_context4) {
321
294
  while (1) switch (_context4.prev = _context4.next) {
322
295
  case 0:
323
296
  hasAccess = _args4.length > 4 && _args4[4] !== undefined ? _args4[4] : true;
324
297
  urlType = _args4.length > 5 && _args4[5] !== undefined ? _args4[5] : 'edit';
325
- ari = sourceAri, product = sourceProduct;
326
- if ((0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
327
- ari = sourceAri !== null && sourceAri !== void 0 ? sourceAri : (_this$writeProvider = this.writeProvider) === null || _this$writeProvider === void 0 ? void 0 : _this$writeProvider.parentAri;
328
- product = sourceProduct !== null && sourceProduct !== void 0 ? sourceProduct : (0, _ari.getProductFromSourceAri)(ari);
329
- }
298
+ isUnpublished = _args4.length > 6 ? _args4[6] : undefined;
299
+ ari = sourceAri !== null && sourceAri !== void 0 ? sourceAri : (_this$writeProvider = this.writeProvider) === null || _this$writeProvider === void 0 ? void 0 : _this$writeProvider.parentAri;
300
+ product = sourceProduct !== null && sourceProduct !== void 0 ? sourceProduct : (0, _ari.getProductFromSourceAri)(ari);
330
301
  if (!(!ari || !product)) {
331
- _context4.next = 6;
302
+ _context4.next = 7;
332
303
  break;
333
304
  }
334
305
  return _context4.abrupt("return", Promise.reject(new Error('Source ari or source product is undefined')));
335
- case 6:
306
+ case 7:
336
307
  _context4.t0 = product;
337
- _context4.next = _context4.t0 === 'confluence-page' ? 9 : _context4.t0 === 'jira-work-item' ? 19 : 27;
308
+ _context4.next = _context4.t0 === 'confluence-page' ? 10 : _context4.t0 === 'jira-work-item' ? 16 : 22;
338
309
  break;
339
- case 9:
340
- _context4.next = 11;
341
- return (0, _sourceInfo2.fetchConfluencePageInfo)(ari, hasAccess, urlType, localId, fireAnalyticsEvent);
342
- case 11:
343
- sourceInfo = _context4.sent;
344
- if (!(0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
345
- _context4.next = 18;
346
- break;
347
- }
348
- if (sourceInfo) {
310
+ case 10:
311
+ _context4.next = 12;
312
+ return (0, _sourceInfo2.fetchConfluencePageInfo)(ari, hasAccess, urlType, localId, isUnpublished);
313
+ case 12:
314
+ _sourceInfo = _context4.sent;
315
+ if (_sourceInfo) {
349
316
  _context4.next = 15;
350
317
  break;
351
318
  }
352
319
  return _context4.abrupt("return", Promise.resolve(undefined));
353
320
  case 15:
354
- return _context4.abrupt("return", _objectSpread(_objectSpread({}, sourceInfo), {}, {
321
+ return _context4.abrupt("return", _objectSpread(_objectSpread({}, _sourceInfo), {}, {
355
322
  onSameDocument: ((_this$writeProvider2 = this.writeProvider) === null || _this$writeProvider2 === void 0 ? void 0 : _this$writeProvider2.parentAri) === ari,
356
323
  productType: product
357
324
  }));
358
- case 18:
359
- return _context4.abrupt("return", sourceInfo);
360
- case 19:
361
- if (!(0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
362
- _context4.next = 26;
363
- break;
364
- }
365
- _context4.next = 22;
325
+ case 16:
326
+ _context4.next = 18;
366
327
  return (0, _sourceInfo3.fetchJiraWorkItemInfo)(ari, hasAccess);
367
- case 22:
368
- _sourceInfo = _context4.sent;
369
- if (_sourceInfo) {
370
- _context4.next = 25;
328
+ case 18:
329
+ sourceInfo = _context4.sent;
330
+ if (sourceInfo) {
331
+ _context4.next = 21;
371
332
  break;
372
333
  }
373
334
  return _context4.abrupt("return", Promise.resolve(undefined));
374
- case 25:
375
- return _context4.abrupt("return", _objectSpread(_objectSpread({}, _sourceInfo), {}, {
335
+ case 21:
336
+ return _context4.abrupt("return", _objectSpread(_objectSpread({}, sourceInfo), {}, {
376
337
  onSameDocument: ((_this$writeProvider3 = this.writeProvider) === null || _this$writeProvider3 === void 0 ? void 0 : _this$writeProvider3.parentAri) === ari,
377
338
  productType: product
378
339
  }));
379
- case 26:
380
- return _context4.abrupt("return", Promise.reject(new Error('Jira work item source product not supported')));
381
- case 27:
340
+ case 22:
382
341
  return _context4.abrupt("return", Promise.reject(new Error("".concat(product, " source product not supported"))));
383
- case 28:
342
+ case 23:
384
343
  case "end":
385
344
  return _context4.stop();
386
345
  }