@atlaskit/editor-synced-block-provider 6.6.9 → 6.6.11
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.
- package/CHANGELOG.md +15 -0
- package/dist/cjs/clients/block-service/blockService.js +107 -107
- package/dist/cjs/clients/confluence/fetchMediaToken.js +21 -21
- package/dist/cjs/clients/confluence/sourceInfo.js +24 -24
- package/dist/cjs/clients/jira/fetchMediaToken.js +21 -21
- package/dist/cjs/clients/jira/sourceInfo.js +24 -24
- package/dist/cjs/hooks/useFetchSyncBlockData.js +18 -18
- package/dist/cjs/providers/block-service/blockServiceAPI.js +322 -321
- package/dist/cjs/providers/syncBlockProvider.js +49 -48
- package/dist/cjs/store-manager/referenceSyncBlockStoreManager.js +75 -75
- package/dist/cjs/store-manager/sourceSyncBlockStoreManager.js +77 -78
- package/dist/cjs/store-manager/syncBlockStoreManager.js +41 -41
- package/dist/cjs/store-manager/syncBlockSubscriptionManager.js +7 -18
- package/dist/cjs/utils/resourceId.js +2 -1
- package/dist/cjs/utils/retry.js +8 -8
- package/dist/cjs/utils/utils.js +4 -3
- package/dist/es2019/store-manager/referenceSyncBlockStoreManager.js +1 -1
- package/dist/es2019/store-manager/sourceSyncBlockStoreManager.js +1 -2
- package/dist/es2019/store-manager/syncBlockSubscriptionManager.js +7 -18
- package/dist/es2019/utils/utils.js +1 -2
- package/dist/esm/clients/block-service/blockService.js +107 -107
- package/dist/esm/clients/confluence/fetchMediaToken.js +21 -21
- package/dist/esm/clients/confluence/sourceInfo.js +24 -24
- package/dist/esm/clients/jira/fetchMediaToken.js +21 -21
- package/dist/esm/clients/jira/sourceInfo.js +24 -24
- package/dist/esm/hooks/useFetchSyncBlockData.js +18 -18
- package/dist/esm/providers/block-service/blockServiceAPI.js +321 -320
- package/dist/esm/providers/syncBlockProvider.js +49 -48
- package/dist/esm/store-manager/referenceSyncBlockStoreManager.js +75 -75
- package/dist/esm/store-manager/sourceSyncBlockStoreManager.js +77 -78
- package/dist/esm/store-manager/syncBlockStoreManager.js +41 -41
- package/dist/esm/store-manager/syncBlockSubscriptionManager.js +7 -18
- package/dist/esm/utils/resourceId.js +2 -1
- package/dist/esm/utils/retry.js +8 -8
- package/dist/esm/utils/utils.js +1 -2
- package/package.json +5 -8
|
@@ -12,7 +12,6 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
|
|
|
12
12
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
13
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
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
16
|
var _errorHandling = require("../utils/errorHandling");
|
|
18
17
|
var _experienceTracking = require("../utils/experienceTracking");
|
|
@@ -166,19 +165,19 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
166
165
|
value: (function () {
|
|
167
166
|
var _flush = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
|
|
168
167
|
var _this2 = this;
|
|
169
|
-
var _this$saveExperience, timedOut, timeoutId, timeout, _iterator, _step, resourceId, bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults, _this$saveExperience2, _this$saveExperience3, _this$fireAnalyticsEv2, _this$flushCompletion;
|
|
170
|
-
return _regenerator.default.wrap(function
|
|
168
|
+
var _this$saveExperience, timedOut, timeoutId, timeout, _iterator, _step, resourceId, bodiedSyncBlockNodes, bodiedSyncBlockData, writeResults, _this$saveExperience2, _this$saveExperience3, _this$fireAnalyticsEv2, _this$flushCompletion, _t;
|
|
169
|
+
return _regenerator.default.wrap(function (_context) {
|
|
171
170
|
while (1) switch (_context.prev = _context.next) {
|
|
172
171
|
case 0:
|
|
173
172
|
_context.prev = 0;
|
|
174
173
|
if (!(this.viewMode === 'view')) {
|
|
175
|
-
_context.next =
|
|
174
|
+
_context.next = 1;
|
|
176
175
|
break;
|
|
177
176
|
}
|
|
178
177
|
return _context.abrupt("return", true);
|
|
179
|
-
case
|
|
180
|
-
if (!(this.pendingCreationPromises.size > 0
|
|
181
|
-
_context.next =
|
|
178
|
+
case 1:
|
|
179
|
+
if (!(this.pendingCreationPromises.size > 0)) {
|
|
180
|
+
_context.next = 3;
|
|
182
181
|
break;
|
|
183
182
|
}
|
|
184
183
|
timedOut = false;
|
|
@@ -188,9 +187,9 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
188
187
|
resolve();
|
|
189
188
|
}, FLUSH_CREATION_AWAIT_TIMEOUT_MS);
|
|
190
189
|
});
|
|
191
|
-
_context.next =
|
|
190
|
+
_context.next = 2;
|
|
192
191
|
return Promise.race([Promise.all(this.pendingCreationPromises.values()), timeout]);
|
|
193
|
-
case
|
|
192
|
+
case 2:
|
|
194
193
|
if (timeoutId !== undefined) {
|
|
195
194
|
clearTimeout(timeoutId);
|
|
196
195
|
}
|
|
@@ -209,7 +208,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
209
208
|
_iterator.f();
|
|
210
209
|
}
|
|
211
210
|
}
|
|
212
|
-
case
|
|
211
|
+
case 3:
|
|
213
212
|
bodiedSyncBlockNodes = [];
|
|
214
213
|
bodiedSyncBlockData = [];
|
|
215
214
|
Array.from(this.syncBlockCache.values()).forEach(function (syncBlockData) {
|
|
@@ -239,21 +238,21 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
239
238
|
}
|
|
240
239
|
});
|
|
241
240
|
if (!(bodiedSyncBlockNodes.length === 0)) {
|
|
242
|
-
_context.next =
|
|
241
|
+
_context.next = 4;
|
|
243
242
|
break;
|
|
244
243
|
}
|
|
245
244
|
return _context.abrupt("return", Promise.resolve(true));
|
|
246
|
-
case
|
|
245
|
+
case 4:
|
|
247
246
|
if (this.dataProvider) {
|
|
248
|
-
_context.next =
|
|
247
|
+
_context.next = 5;
|
|
249
248
|
break;
|
|
250
249
|
}
|
|
251
250
|
throw new Error('Data provider not set');
|
|
252
|
-
case
|
|
251
|
+
case 5:
|
|
253
252
|
(_this$saveExperience = this.saveExperience) === null || _this$saveExperience === void 0 || _this$saveExperience.start({});
|
|
254
|
-
_context.next =
|
|
253
|
+
_context.next = 6;
|
|
255
254
|
return this.dataProvider.writeNodesData(bodiedSyncBlockNodes, bodiedSyncBlockData);
|
|
256
|
-
case
|
|
255
|
+
case 6:
|
|
257
256
|
writeResults = _context.sent;
|
|
258
257
|
writeResults.forEach(function (result) {
|
|
259
258
|
// set isDirty to true for cases where it failed to save the sync block to the BE
|
|
@@ -267,7 +266,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
267
266
|
if (!writeResults.every(function (result) {
|
|
268
267
|
return result.resourceId && !result.error;
|
|
269
268
|
})) {
|
|
270
|
-
_context.next =
|
|
269
|
+
_context.next = 7;
|
|
271
270
|
break;
|
|
272
271
|
}
|
|
273
272
|
(_this$saveExperience2 = this.saveExperience) === null || _this$saveExperience2 === void 0 || _this$saveExperience2.success();
|
|
@@ -283,7 +282,7 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
283
282
|
}
|
|
284
283
|
});
|
|
285
284
|
return _context.abrupt("return", true);
|
|
286
|
-
case
|
|
285
|
+
case 7:
|
|
287
286
|
(_this$saveExperience3 = this.saveExperience) === null || _this$saveExperience3 === void 0 || _this$saveExperience3.failure();
|
|
288
287
|
writeResults.filter(function (result) {
|
|
289
288
|
return !result.resourceId || result.error;
|
|
@@ -292,27 +291,27 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
292
291
|
(_this2$fireAnalyticsE2 = _this2.fireAnalyticsEvent) === null || _this2$fireAnalyticsE2 === void 0 || _this2$fireAnalyticsE2.call(_this2, (0, _errorHandling.updateErrorPayload)(result.error || 'Failed to write data', result.resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(result.resourceId)));
|
|
293
292
|
});
|
|
294
293
|
return _context.abrupt("return", false);
|
|
295
|
-
case
|
|
296
|
-
_context.next =
|
|
294
|
+
case 8:
|
|
295
|
+
_context.next = 10;
|
|
297
296
|
break;
|
|
298
|
-
case
|
|
299
|
-
_context.prev =
|
|
300
|
-
|
|
301
|
-
(0, _monitoring.logException)(
|
|
297
|
+
case 9:
|
|
298
|
+
_context.prev = 9;
|
|
299
|
+
_t = _context["catch"](0);
|
|
300
|
+
(0, _monitoring.logException)(_t, {
|
|
302
301
|
location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
|
|
303
302
|
});
|
|
304
303
|
// Top-level flush failure is not tied to a single resourceId.
|
|
305
|
-
(_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 || _this$fireAnalyticsEv2.call(this, (0, _errorHandling.updateErrorPayload)(
|
|
304
|
+
(_this$fireAnalyticsEv2 = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv2 === void 0 || _this$fireAnalyticsEv2.call(this, (0, _errorHandling.updateErrorPayload)(_t.message));
|
|
306
305
|
return _context.abrupt("return", false);
|
|
307
|
-
case
|
|
308
|
-
_context.prev =
|
|
306
|
+
case 10:
|
|
307
|
+
_context.prev = 10;
|
|
309
308
|
(_this$flushCompletion = this.flushCompletionCallback) === null || _this$flushCompletion === void 0 || _this$flushCompletion.call(this);
|
|
310
|
-
return _context.finish(
|
|
311
|
-
case
|
|
309
|
+
return _context.finish(10);
|
|
310
|
+
case 11:
|
|
312
311
|
case "end":
|
|
313
312
|
return _context.stop();
|
|
314
313
|
}
|
|
315
|
-
}, _callee, this, [[0,
|
|
314
|
+
}, _callee, this, [[0, 9, 10, 11]]);
|
|
316
315
|
}));
|
|
317
316
|
function flush() {
|
|
318
317
|
return _flush.apply(this, arguments);
|
|
@@ -509,32 +508,32 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
509
508
|
value: function () {
|
|
510
509
|
var _delete2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(syncBlockIds, onDelete, onDeleteCompleted, reason) {
|
|
511
510
|
var _this5 = this;
|
|
512
|
-
var _this$deleteExperienc, results, callback, isDeleteSuccessful, _this$deleteExperienc2, _this$deleteExperienc3;
|
|
513
|
-
return _regenerator.default.wrap(function
|
|
511
|
+
var _this$deleteExperienc, results, callback, isDeleteSuccessful, _this$deleteExperienc2, _this$deleteExperienc3, _t2;
|
|
512
|
+
return _regenerator.default.wrap(function (_context2) {
|
|
514
513
|
while (1) switch (_context2.prev = _context2.next) {
|
|
515
514
|
case 0:
|
|
516
515
|
_context2.prev = 0;
|
|
517
516
|
if (!(this.viewMode === 'view')) {
|
|
518
|
-
_context2.next =
|
|
517
|
+
_context2.next = 1;
|
|
519
518
|
break;
|
|
520
519
|
}
|
|
521
520
|
return _context2.abrupt("return", false);
|
|
522
|
-
case
|
|
521
|
+
case 1:
|
|
523
522
|
if (this.dataProvider) {
|
|
524
|
-
_context2.next =
|
|
523
|
+
_context2.next = 2;
|
|
525
524
|
break;
|
|
526
525
|
}
|
|
527
526
|
throw new Error('Data provider not set');
|
|
528
|
-
case
|
|
527
|
+
case 2:
|
|
529
528
|
syncBlockIds.forEach(function (Ids) {
|
|
530
529
|
_this5.setPendingDeletion(Ids, true);
|
|
531
530
|
});
|
|
532
531
|
(_this$deleteExperienc = this.deleteExperience) === null || _this$deleteExperienc === void 0 || _this$deleteExperienc.start({});
|
|
533
|
-
_context2.next =
|
|
532
|
+
_context2.next = 3;
|
|
534
533
|
return this.dataProvider.deleteNodesData(syncBlockIds.map(function (attrs) {
|
|
535
534
|
return attrs.resourceId;
|
|
536
535
|
}), reason);
|
|
537
|
-
case
|
|
536
|
+
case 3:
|
|
538
537
|
results = _context2.sent;
|
|
539
538
|
isDeleteSuccessful = results.every(function (result) {
|
|
540
539
|
return result.success;
|
|
@@ -568,24 +567,24 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
568
567
|
}
|
|
569
568
|
syncBlockIds.forEach(callback);
|
|
570
569
|
return _context2.abrupt("return", isDeleteSuccessful);
|
|
571
|
-
case
|
|
572
|
-
_context2.prev =
|
|
573
|
-
|
|
570
|
+
case 4:
|
|
571
|
+
_context2.prev = 4;
|
|
572
|
+
_t2 = _context2["catch"](0);
|
|
574
573
|
syncBlockIds.forEach(function (Ids) {
|
|
575
574
|
var _this5$fireAnalyticsE4;
|
|
576
575
|
_this5.setPendingDeletion(Ids, false);
|
|
577
|
-
(_this5$fireAnalyticsE4 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE4 === void 0 || _this5$fireAnalyticsE4.call(_this5, (0, _errorHandling.deleteErrorPayload)(
|
|
576
|
+
(_this5$fireAnalyticsE4 = _this5.fireAnalyticsEvent) === null || _this5$fireAnalyticsE4 === void 0 || _this5$fireAnalyticsE4.call(_this5, (0, _errorHandling.deleteErrorPayload)(_t2.message, Ids.resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(Ids.resourceId)));
|
|
578
577
|
});
|
|
579
|
-
(0, _monitoring.logException)(
|
|
578
|
+
(0, _monitoring.logException)(_t2, {
|
|
580
579
|
location: 'editor-synced-block-provider/sourceSyncBlockStoreManager'
|
|
581
580
|
});
|
|
582
581
|
onDeleteCompleted(false);
|
|
583
582
|
return _context2.abrupt("return", false);
|
|
584
|
-
case
|
|
583
|
+
case 5:
|
|
585
584
|
case "end":
|
|
586
585
|
return _context2.stop();
|
|
587
586
|
}
|
|
588
|
-
}, _callee2, this, [[0,
|
|
587
|
+
}, _callee2, this, [[0, 4]]);
|
|
589
588
|
}));
|
|
590
589
|
function _delete(_x, _x2, _x3, _x4) {
|
|
591
590
|
return _delete2.apply(this, arguments);
|
|
@@ -602,29 +601,29 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
602
601
|
value: function () {
|
|
603
602
|
var _retryDeletion = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
|
|
604
603
|
var _this$deletionRetryIn, syncBlockIds, onDelete, onDeleteCompleted, deletionReason;
|
|
605
|
-
return _regenerator.default.wrap(function
|
|
604
|
+
return _regenerator.default.wrap(function (_context3) {
|
|
606
605
|
while (1) switch (_context3.prev = _context3.next) {
|
|
607
606
|
case 0:
|
|
608
607
|
if (!(this.viewMode === 'view')) {
|
|
609
|
-
_context3.next =
|
|
608
|
+
_context3.next = 1;
|
|
610
609
|
break;
|
|
611
610
|
}
|
|
612
611
|
return _context3.abrupt("return", Promise.resolve());
|
|
613
|
-
case
|
|
612
|
+
case 1:
|
|
614
613
|
if (this.deletionRetryInfo) {
|
|
615
|
-
_context3.next =
|
|
614
|
+
_context3.next = 2;
|
|
616
615
|
break;
|
|
617
616
|
}
|
|
618
617
|
return _context3.abrupt("return", Promise.resolve());
|
|
619
|
-
case
|
|
618
|
+
case 2:
|
|
620
619
|
_this$deletionRetryIn = this.deletionRetryInfo, syncBlockIds = _this$deletionRetryIn.syncBlockIds, onDelete = _this$deletionRetryIn.onDelete, onDeleteCompleted = _this$deletionRetryIn.onDeleteCompleted, deletionReason = _this$deletionRetryIn.deletionReason;
|
|
621
620
|
if (!this.confirmationCallback) {
|
|
622
|
-
_context3.next =
|
|
621
|
+
_context3.next = 3;
|
|
623
622
|
break;
|
|
624
623
|
}
|
|
625
|
-
_context3.next =
|
|
624
|
+
_context3.next = 3;
|
|
626
625
|
return this.delete(syncBlockIds, onDelete, onDeleteCompleted, deletionReason);
|
|
627
|
-
case
|
|
626
|
+
case 3:
|
|
628
627
|
case "end":
|
|
629
628
|
return _context3.stop();
|
|
630
629
|
}
|
|
@@ -653,16 +652,16 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
653
652
|
value: (function () {
|
|
654
653
|
var _fetchAndCacheStatuses = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
|
|
655
654
|
var _this6 = this;
|
|
656
|
-
var sourceToReferenceMap, syncBlockNodes, results, _iterator2, _step2, _sourceToReferenceMap, _result$data, result, sourceResourceId, cached;
|
|
657
|
-
return _regenerator.default.wrap(function
|
|
655
|
+
var sourceToReferenceMap, syncBlockNodes, results, _iterator2, _step2, _sourceToReferenceMap, _result$data, result, sourceResourceId, cached, _t3;
|
|
656
|
+
return _regenerator.default.wrap(function (_context4) {
|
|
658
657
|
while (1) switch (_context4.prev = _context4.next) {
|
|
659
658
|
case 0:
|
|
660
659
|
if (!(!this.dataProvider || this.syncBlockCache.size === 0)) {
|
|
661
|
-
_context4.next =
|
|
660
|
+
_context4.next = 1;
|
|
662
661
|
break;
|
|
663
662
|
}
|
|
664
663
|
return _context4.abrupt("return");
|
|
665
|
-
case
|
|
664
|
+
case 1:
|
|
666
665
|
// Source blocks have plain UUID resourceIds, but fetchNodesData internally uses
|
|
667
666
|
// generateBlockAriFromReference which expects reference-format resourceIds
|
|
668
667
|
// (e.g. "confluence-page/pageId/uuid"). We convert source resourceIds to reference
|
|
@@ -684,10 +683,10 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
684
683
|
}
|
|
685
684
|
};
|
|
686
685
|
});
|
|
687
|
-
_context4.prev =
|
|
688
|
-
_context4.next =
|
|
686
|
+
_context4.prev = 2;
|
|
687
|
+
_context4.next = 3;
|
|
689
688
|
return this.dataProvider.fetchNodesData(syncBlockNodes);
|
|
690
|
-
case
|
|
689
|
+
case 3:
|
|
691
690
|
results = _context4.sent;
|
|
692
691
|
_iterator2 = _createForOfIteratorHelper(results);
|
|
693
692
|
try {
|
|
@@ -705,16 +704,16 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
705
704
|
} finally {
|
|
706
705
|
_iterator2.f();
|
|
707
706
|
}
|
|
708
|
-
_context4.next =
|
|
707
|
+
_context4.next = 5;
|
|
709
708
|
break;
|
|
710
|
-
case
|
|
711
|
-
_context4.prev =
|
|
712
|
-
|
|
713
|
-
case
|
|
709
|
+
case 4:
|
|
710
|
+
_context4.prev = 4;
|
|
711
|
+
_t3 = _context4["catch"](2);
|
|
712
|
+
case 5:
|
|
714
713
|
case "end":
|
|
715
714
|
return _context4.stop();
|
|
716
715
|
}
|
|
717
|
-
}, _callee4, this, [[
|
|
716
|
+
}, _callee4, this, [[2, 4]]);
|
|
718
717
|
}));
|
|
719
718
|
function fetchAndCacheStatuses() {
|
|
720
719
|
return _fetchAndCacheStatuses.apply(this, arguments);
|
|
@@ -769,30 +768,30 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
769
768
|
value: (function () {
|
|
770
769
|
var _deleteSyncBlocksWithConfirmation = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(syncBlockIds, deletionReason, onDelete, onDeleteCompleted, destroyCallback) {
|
|
771
770
|
var confirmed, isDeleteSuccessful;
|
|
772
|
-
return _regenerator.default.wrap(function
|
|
771
|
+
return _regenerator.default.wrap(function (_context5) {
|
|
773
772
|
while (1) switch (_context5.prev = _context5.next) {
|
|
774
773
|
case 0:
|
|
775
774
|
if (!(this.viewMode === 'view')) {
|
|
776
|
-
_context5.next =
|
|
775
|
+
_context5.next = 1;
|
|
777
776
|
break;
|
|
778
777
|
}
|
|
779
778
|
return _context5.abrupt("return", Promise.resolve());
|
|
780
|
-
case
|
|
779
|
+
case 1:
|
|
781
780
|
if (!this.confirmationCallback) {
|
|
782
|
-
_context5.next =
|
|
781
|
+
_context5.next = 5;
|
|
783
782
|
break;
|
|
784
783
|
}
|
|
785
|
-
_context5.next =
|
|
784
|
+
_context5.next = 2;
|
|
786
785
|
return this.confirmationCallback(syncBlockIds, deletionReason);
|
|
787
|
-
case
|
|
786
|
+
case 2:
|
|
788
787
|
confirmed = _context5.sent;
|
|
789
788
|
if (!confirmed) {
|
|
790
|
-
_context5.next =
|
|
789
|
+
_context5.next = 4;
|
|
791
790
|
break;
|
|
792
791
|
}
|
|
793
|
-
_context5.next =
|
|
792
|
+
_context5.next = 3;
|
|
794
793
|
return this.delete(syncBlockIds, onDelete, onDeleteCompleted, deletionReason);
|
|
795
|
-
case
|
|
794
|
+
case 3:
|
|
796
795
|
isDeleteSuccessful = _context5.sent;
|
|
797
796
|
if (!isDeleteSuccessful) {
|
|
798
797
|
// If deletion failed, save deletion info for potential retry
|
|
@@ -806,11 +805,11 @@ var SourceSyncBlockStoreManager = exports.SourceSyncBlockStoreManager = /*#__PUR
|
|
|
806
805
|
} else {
|
|
807
806
|
destroyCallback();
|
|
808
807
|
}
|
|
809
|
-
_context5.next =
|
|
808
|
+
_context5.next = 5;
|
|
810
809
|
break;
|
|
811
|
-
case
|
|
810
|
+
case 4:
|
|
812
811
|
destroyCallback();
|
|
813
|
-
case
|
|
812
|
+
case 5:
|
|
814
813
|
case "end":
|
|
815
814
|
return _context5.stop();
|
|
816
815
|
}
|
|
@@ -46,24 +46,24 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
|
|
|
46
46
|
value: function () {
|
|
47
47
|
var _fetchReferencesSourceInfo = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(resourceId, blockInstanceId, isSourceSyncBlock) {
|
|
48
48
|
var _this = this;
|
|
49
|
-
var _this$fetchReferences, _response$references, _this$fetchReferences3, _response$references2, response, _this$fetchReferences2, sourceInfoPromises, sourceInfos, sourceSyncBlockData, _this$fireAnalyticsEv;
|
|
50
|
-
return _regenerator.default.wrap(function
|
|
49
|
+
var _this$fetchReferences, _response$references, _this$fetchReferences3, _response$references2, response, _this$fetchReferences2, sourceInfoPromises, sourceInfos, sourceSyncBlockData, _this$fireAnalyticsEv, _t;
|
|
50
|
+
return _regenerator.default.wrap(function (_context2) {
|
|
51
51
|
while (1) switch (_context2.prev = _context2.next) {
|
|
52
52
|
case 0:
|
|
53
53
|
_context2.prev = 0;
|
|
54
54
|
if (this.dataProvider) {
|
|
55
|
-
_context2.next =
|
|
55
|
+
_context2.next = 1;
|
|
56
56
|
break;
|
|
57
57
|
}
|
|
58
58
|
throw new Error('Data provider not set');
|
|
59
|
-
case
|
|
59
|
+
case 1:
|
|
60
60
|
(_this$fetchReferences = this.fetchReferencesExperience) === null || _this$fetchReferences === void 0 || _this$fetchReferences.start();
|
|
61
|
-
_context2.next =
|
|
61
|
+
_context2.next = 2;
|
|
62
62
|
return this.dataProvider.fetchReferences(resourceId, isSourceSyncBlock);
|
|
63
|
-
case
|
|
63
|
+
case 2:
|
|
64
64
|
response = _context2.sent;
|
|
65
65
|
if (!response.error) {
|
|
66
|
-
_context2.next =
|
|
66
|
+
_context2.next = 3;
|
|
67
67
|
break;
|
|
68
68
|
}
|
|
69
69
|
(_this$fetchReferences2 = this.fetchReferencesExperience) === null || _this$fetchReferences2 === void 0 || _this$fetchReferences2.failure({
|
|
@@ -72,42 +72,42 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
|
|
|
72
72
|
return _context2.abrupt("return", {
|
|
73
73
|
error: response.error
|
|
74
74
|
});
|
|
75
|
-
case
|
|
75
|
+
case 3:
|
|
76
76
|
if (!(!response.references || ((_response$references = response.references) === null || _response$references === void 0 ? void 0 : _response$references.length) === 0)) {
|
|
77
|
-
_context2.next =
|
|
77
|
+
_context2.next = 4;
|
|
78
78
|
break;
|
|
79
79
|
}
|
|
80
80
|
return _context2.abrupt("return", this.getUnregisteredReferences(resourceId, blockInstanceId, isSourceSyncBlock));
|
|
81
|
-
case
|
|
81
|
+
case 4:
|
|
82
82
|
(_this$fetchReferences3 = this.fetchReferencesExperience) === null || _this$fetchReferences3 === void 0 || _this$fetchReferences3.success();
|
|
83
83
|
sourceInfoPromises = ((_response$references2 = response.references) !== null && _response$references2 !== void 0 ? _response$references2 : []).map( /*#__PURE__*/function () {
|
|
84
84
|
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(reference) {
|
|
85
85
|
var _this$fetchSourceInfo, _this$dataProvider, _this$fetchSourceInfo3;
|
|
86
86
|
var sourceInfo, _this$fetchSourceInfo2;
|
|
87
|
-
return _regenerator.default.wrap(function
|
|
87
|
+
return _regenerator.default.wrap(function (_context) {
|
|
88
88
|
while (1) switch (_context.prev = _context.next) {
|
|
89
89
|
case 0:
|
|
90
90
|
(_this$fetchSourceInfo = _this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo === void 0 || _this$fetchSourceInfo.start();
|
|
91
|
-
_context.next =
|
|
91
|
+
_context.next = 1;
|
|
92
92
|
return (_this$dataProvider = _this.dataProvider) === null || _this$dataProvider === void 0 ? void 0 : _this$dataProvider.fetchSyncBlockSourceInfo(reference.blockInstanceId || '', reference.documentAri, (0, _ari.getProductFromSourceAri)(reference.documentAri), reference.hasAccess);
|
|
93
|
-
case
|
|
93
|
+
case 1:
|
|
94
94
|
sourceInfo = _context.sent;
|
|
95
95
|
if (sourceInfo) {
|
|
96
|
-
_context.next =
|
|
96
|
+
_context.next = 2;
|
|
97
97
|
break;
|
|
98
98
|
}
|
|
99
99
|
(_this$fetchSourceInfo2 = _this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo2 === void 0 || _this$fetchSourceInfo2.failure({
|
|
100
100
|
reason: "no source info returned for ari: ".concat(reference.documentAri)
|
|
101
101
|
});
|
|
102
102
|
return _context.abrupt("return", undefined);
|
|
103
|
-
case
|
|
103
|
+
case 2:
|
|
104
104
|
(_this$fetchSourceInfo3 = _this.fetchSourceInfoExperience) === null || _this$fetchSourceInfo3 === void 0 || _this$fetchSourceInfo3.success();
|
|
105
105
|
return _context.abrupt("return", _objectSpread(_objectSpread({}, sourceInfo), {}, {
|
|
106
106
|
onSameDocument: reference.onSameDocument,
|
|
107
107
|
hasAccess: reference.hasAccess,
|
|
108
108
|
productType: sourceInfo.productType
|
|
109
109
|
}));
|
|
110
|
-
case
|
|
110
|
+
case 3:
|
|
111
111
|
case "end":
|
|
112
112
|
return _context.stop();
|
|
113
113
|
}
|
|
@@ -117,13 +117,13 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
|
|
|
117
117
|
return _ref.apply(this, arguments);
|
|
118
118
|
};
|
|
119
119
|
}());
|
|
120
|
-
_context2.next =
|
|
120
|
+
_context2.next = 5;
|
|
121
121
|
return Promise.all(sourceInfoPromises);
|
|
122
|
-
case
|
|
122
|
+
case 5:
|
|
123
123
|
sourceInfos = _context2.sent;
|
|
124
|
-
_context2.next =
|
|
124
|
+
_context2.next = 6;
|
|
125
125
|
return isSourceSyncBlock ? this.sourceSyncBlockStoreManager.getSyncBlockSourceInfo(blockInstanceId) : this.referenceSyncBlockStoreManager.fetchSyncBlockSourceInfo(resourceId);
|
|
126
|
-
case
|
|
126
|
+
case 6:
|
|
127
127
|
sourceSyncBlockData = _context2.sent;
|
|
128
128
|
if (sourceSyncBlockData) {
|
|
129
129
|
sourceInfos.push(_objectSpread(_objectSpread({}, sourceSyncBlockData), {}, {
|
|
@@ -136,21 +136,21 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
|
|
|
136
136
|
return _context2.abrupt("return", {
|
|
137
137
|
references: sourceInfos
|
|
138
138
|
});
|
|
139
|
-
case
|
|
140
|
-
_context2.prev =
|
|
141
|
-
|
|
142
|
-
(0, _monitoring.logException)(
|
|
139
|
+
case 7:
|
|
140
|
+
_context2.prev = 7;
|
|
141
|
+
_t = _context2["catch"](0);
|
|
142
|
+
(0, _monitoring.logException)(_t, {
|
|
143
143
|
location: 'editor-synced-block-provider/syncBlockStoreManager'
|
|
144
144
|
});
|
|
145
|
-
(_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 || _this$fireAnalyticsEv.call(this, (0, _errorHandling.fetchReferencesErrorPayload)(
|
|
145
|
+
(_this$fireAnalyticsEv = this.fireAnalyticsEvent) === null || _this$fireAnalyticsEv === void 0 || _this$fireAnalyticsEv.call(this, (0, _errorHandling.fetchReferencesErrorPayload)(_t.message, resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId)));
|
|
146
146
|
return _context2.abrupt("return", {
|
|
147
147
|
error: _types.SyncBlockError.Errored
|
|
148
148
|
});
|
|
149
|
-
case
|
|
149
|
+
case 8:
|
|
150
150
|
case "end":
|
|
151
151
|
return _context2.stop();
|
|
152
152
|
}
|
|
153
|
-
}, _callee2, this, [[0,
|
|
153
|
+
}, _callee2, this, [[0, 7]]);
|
|
154
154
|
}));
|
|
155
155
|
function fetchReferencesSourceInfo(_x, _x2, _x3) {
|
|
156
156
|
return _fetchReferencesSourceInfo.apply(this, arguments);
|
|
@@ -195,11 +195,11 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
|
|
|
195
195
|
var _getUnregisteredReferences = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(resourceId, blockInstanceId, isSourceSyncBlock) {
|
|
196
196
|
var _this$fetchReferences8;
|
|
197
197
|
var _this$fetchReferences6, referenceResourceId, hasUnregisteredReferenceOnPage, _this$fetchReferences5, _sourceSyncBlockData, _references, sourceSyncBlockReference, referenceSyncBlockReference, references, sourceSyncBlockData, currentPageData, _this$fetchReferences7;
|
|
198
|
-
return _regenerator.default.wrap(function
|
|
198
|
+
return _regenerator.default.wrap(function (_context3) {
|
|
199
199
|
while (1) switch (_context3.prev = _context3.next) {
|
|
200
200
|
case 0:
|
|
201
201
|
if (!isSourceSyncBlock) {
|
|
202
|
-
_context3.next =
|
|
202
|
+
_context3.next = 3;
|
|
203
203
|
break;
|
|
204
204
|
}
|
|
205
205
|
// Verify that a reference sync block for this specific source actually
|
|
@@ -208,12 +208,12 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
|
|
|
208
208
|
referenceResourceId = this.referenceSyncBlockStoreManager.generateResourceIdForReference(resourceId);
|
|
209
209
|
hasUnregisteredReferenceOnPage = this.referenceSyncBlockStoreManager.getSubscribedResourceIds().includes(referenceResourceId);
|
|
210
210
|
if (!hasUnregisteredReferenceOnPage) {
|
|
211
|
-
_context3.next =
|
|
211
|
+
_context3.next = 2;
|
|
212
212
|
break;
|
|
213
213
|
}
|
|
214
|
-
_context3.next =
|
|
214
|
+
_context3.next = 1;
|
|
215
215
|
return this.sourceSyncBlockStoreManager.getSyncBlockSourceInfo(blockInstanceId);
|
|
216
|
-
case
|
|
216
|
+
case 1:
|
|
217
217
|
_sourceSyncBlockData = _context3.sent;
|
|
218
218
|
_references = [];
|
|
219
219
|
if (_sourceSyncBlockData) {
|
|
@@ -233,20 +233,20 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
|
|
|
233
233
|
return _context3.abrupt("return", {
|
|
234
234
|
references: _references
|
|
235
235
|
});
|
|
236
|
-
case
|
|
236
|
+
case 2:
|
|
237
237
|
// No remote or local reference exists — show info text with link to doco on how to use Synced Blocks
|
|
238
238
|
(_this$fetchReferences6 = this.fetchReferencesExperience) === null || _this$fetchReferences6 === void 0 || _this$fetchReferences6.success();
|
|
239
239
|
return _context3.abrupt("return", {
|
|
240
240
|
references: []
|
|
241
241
|
});
|
|
242
|
-
case
|
|
242
|
+
case 3:
|
|
243
243
|
// Though no references registered yet for this reference sync block,
|
|
244
244
|
// still show the source and the current page itself since they are known
|
|
245
245
|
// but not saved yet.
|
|
246
246
|
references = [];
|
|
247
|
-
_context3.next =
|
|
247
|
+
_context3.next = 4;
|
|
248
248
|
return this.referenceSyncBlockStoreManager.fetchSyncBlockSourceInfo(resourceId);
|
|
249
|
-
case
|
|
249
|
+
case 4:
|
|
250
250
|
sourceSyncBlockData = _context3.sent;
|
|
251
251
|
if (sourceSyncBlockData) {
|
|
252
252
|
references.push(_objectSpread(_objectSpread({}, sourceSyncBlockData), {}, {
|
|
@@ -255,9 +255,9 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
|
|
|
255
255
|
isSource: true
|
|
256
256
|
}));
|
|
257
257
|
}
|
|
258
|
-
_context3.next =
|
|
258
|
+
_context3.next = 5;
|
|
259
259
|
return this.referenceSyncBlockStoreManager.fetchSyncBlockSourceInfoByLocalId(blockInstanceId);
|
|
260
|
-
case
|
|
260
|
+
case 5:
|
|
261
261
|
currentPageData = _context3.sent;
|
|
262
262
|
if (currentPageData) {
|
|
263
263
|
references.push(_objectSpread(_objectSpread({}, currentPageData), {}, {
|
|
@@ -267,7 +267,7 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
|
|
|
267
267
|
}));
|
|
268
268
|
}
|
|
269
269
|
if (!(references.length === 0)) {
|
|
270
|
-
_context3.next =
|
|
270
|
+
_context3.next = 6;
|
|
271
271
|
break;
|
|
272
272
|
}
|
|
273
273
|
(_this$fetchReferences7 = this.fetchReferencesExperience) === null || _this$fetchReferences7 === void 0 || _this$fetchReferences7.failure({
|
|
@@ -276,12 +276,12 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
|
|
|
276
276
|
return _context3.abrupt("return", {
|
|
277
277
|
error: _types.SyncBlockError.Errored
|
|
278
278
|
});
|
|
279
|
-
case
|
|
279
|
+
case 6:
|
|
280
280
|
(_this$fetchReferences8 = this.fetchReferencesExperience) === null || _this$fetchReferences8 === void 0 || _this$fetchReferences8.success();
|
|
281
281
|
return _context3.abrupt("return", {
|
|
282
282
|
references: references
|
|
283
283
|
});
|
|
284
|
-
case
|
|
284
|
+
case 7:
|
|
285
285
|
case "end":
|
|
286
286
|
return _context3.stop();
|
|
287
287
|
}
|
|
@@ -9,7 +9,6 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
|
|
|
9
9
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
10
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
11
11
|
var _monitoring = require("@atlaskit/editor-common/monitoring");
|
|
12
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
13
12
|
var _errorHandling = require("../utils/errorHandling");
|
|
14
13
|
var _resolveSyncBlockInstance = require("../utils/resolveSyncBlockInstance");
|
|
15
14
|
var _utils = require("../utils/utils");
|
|
@@ -253,7 +252,6 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
|
|
|
253
252
|
if (!(dataProvider !== null && dataProvider !== void 0 && dataProvider.subscribeToBlockUpdates)) {
|
|
254
253
|
return;
|
|
255
254
|
}
|
|
256
|
-
var reconnectEnabled = (0, _platformFeatureFlags.fg)('platform_synced_block_patch_12');
|
|
257
255
|
var unsubscribe = dataProvider.subscribeToBlockUpdates(resourceId, function (syncBlockInstance) {
|
|
258
256
|
_this5.handleGraphQLUpdate(syncBlockInstance);
|
|
259
257
|
}, function (error) {
|
|
@@ -262,12 +260,10 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
|
|
|
262
260
|
location: 'editor-synced-block-provider/syncBlockSubscriptionManager/graphql-subscription'
|
|
263
261
|
});
|
|
264
262
|
(_this5$deps$getFireAn = _this5.deps.getFireAnalyticsEvent()) === null || _this5$deps$getFireAn === void 0 || _this5$deps$getFireAn((0, _errorHandling.fetchErrorPayload)(error.message, resourceId, (0, _utils.getSourceProductFromResourceIdSafe)(resourceId)));
|
|
265
|
-
if (reconnectEnabled) {
|
|
266
|
-
_this5.handleSubscriptionTerminated(resourceId);
|
|
267
|
-
}
|
|
268
|
-
}, reconnectEnabled ? function () {
|
|
269
263
|
_this5.handleSubscriptionTerminated(resourceId);
|
|
270
|
-
}
|
|
264
|
+
}, function () {
|
|
265
|
+
_this5.handleSubscriptionTerminated(resourceId);
|
|
266
|
+
});
|
|
271
267
|
if (unsubscribe) {
|
|
272
268
|
this.graphqlSubscriptions.set(resourceId, unsubscribe);
|
|
273
269
|
}
|
|
@@ -379,10 +375,8 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
|
|
|
379
375
|
unsubscribe();
|
|
380
376
|
this.graphqlSubscriptions.delete(resourceId);
|
|
381
377
|
}
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
this.retryAttempts.delete(resourceId);
|
|
385
|
-
}
|
|
378
|
+
this.cancelPendingRetry(resourceId);
|
|
379
|
+
this.retryAttempts.delete(resourceId);
|
|
386
380
|
}
|
|
387
381
|
}, {
|
|
388
382
|
key: "setupSubscriptionsForAllBlocks",
|
|
@@ -416,9 +410,7 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
|
|
|
416
410
|
_iterator3.f();
|
|
417
411
|
}
|
|
418
412
|
this.graphqlSubscriptions.clear();
|
|
419
|
-
|
|
420
|
-
this.cancelAllPendingRetries();
|
|
421
|
-
}
|
|
413
|
+
this.cancelAllPendingRetries();
|
|
422
414
|
}
|
|
423
415
|
}, {
|
|
424
416
|
key: "destroy",
|
|
@@ -460,10 +452,7 @@ var SyncBlockSubscriptionManager = exports.SyncBlockSubscriptionManager = /*#__P
|
|
|
460
452
|
var resolved = existing ? (0, _resolveSyncBlockInstance.resolveSyncBlockInstance)(existing, syncBlockInstance) : syncBlockInstance;
|
|
461
453
|
this.deps.updateCache(resolved);
|
|
462
454
|
if (!syncBlockInstance.error) {
|
|
463
|
-
|
|
464
|
-
if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_12')) {
|
|
465
|
-
this.resetRetryCount(syncBlockInstance.resourceId);
|
|
466
|
-
}
|
|
455
|
+
this.resetRetryCount(syncBlockInstance.resourceId);
|
|
467
456
|
var callbacks = this.subscriptions.get(syncBlockInstance.resourceId);
|
|
468
457
|
var localIds = callbacks ? Object.keys(callbacks) : [];
|
|
469
458
|
localIds.forEach(function (localId) {
|