@atlaskit/editor-synced-block-provider 3.5.2 → 3.5.4
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 +14 -9
- package/dist/cjs/index.js +0 -24
- package/dist/cjs/providers/block-service/blockServiceAPI.js +89 -49
- package/dist/cjs/providers/syncBlockProvider.js +20 -30
- package/dist/cjs/store-manager/referenceSyncBlockStoreManager.js +9 -3
- package/dist/cjs/store-manager/sourceSyncBlockStoreManager.js +2 -0
- package/dist/cjs/store-manager/syncBlockStoreManager.js +1 -8
- package/dist/es2019/clients/block-service/blockService.js +6 -1
- package/dist/es2019/index.js +3 -3
- package/dist/es2019/providers/block-service/blockServiceAPI.js +34 -6
- package/dist/es2019/providers/syncBlockProvider.js +3 -17
- package/dist/es2019/store-manager/referenceSyncBlockStoreManager.js +3 -0
- package/dist/es2019/store-manager/sourceSyncBlockStoreManager.js +2 -0
- package/dist/es2019/store-manager/syncBlockStoreManager.js +0 -8
- package/dist/esm/clients/block-service/blockService.js +14 -9
- package/dist/esm/index.js +3 -3
- package/dist/esm/providers/block-service/blockServiceAPI.js +88 -48
- package/dist/esm/providers/syncBlockProvider.js +19 -29
- package/dist/esm/store-manager/referenceSyncBlockStoreManager.js +9 -3
- package/dist/esm/store-manager/sourceSyncBlockStoreManager.js +2 -0
- package/dist/esm/store-manager/syncBlockStoreManager.js +0 -7
- package/dist/types/index.d.ts +3 -3
- package/dist/types/providers/block-service/blockServiceAPI.d.ts +9 -15
- package/dist/types/providers/syncBlockProvider.d.ts +0 -1
- package/dist/types/store-manager/syncBlockStoreManager.d.ts +0 -4
- package/dist/types-ts4.5/index.d.ts +3 -3
- package/dist/types-ts4.5/providers/block-service/blockServiceAPI.d.ts +9 -15
- package/dist/types-ts4.5/providers/syncBlockProvider.d.ts +0 -1
- package/dist/types-ts4.5/store-manager/syncBlockStoreManager.d.ts +0 -4
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# @atlaskit/editor-synced-block-provider
|
|
2
2
|
|
|
3
|
+
## 3.5.4
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`0248c6fa91442`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0248c6fa91442) -
|
|
8
|
+
EDITOR-4310 Ensure confirmation callback is cleaned up properly
|
|
9
|
+
|
|
10
|
+
## 3.5.3
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- [`bf9309f0d44d1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bf9309f0d44d1) -
|
|
15
|
+
Pass parentAri to block service provider
|
|
16
|
+
- Updated dependencies
|
|
17
|
+
|
|
3
18
|
## 3.5.2
|
|
4
19
|
|
|
5
20
|
### Patch Changes
|
|
@@ -137,29 +137,33 @@ var BlockError = exports.BlockError = /*#__PURE__*/function (_Error) {
|
|
|
137
137
|
}( /*#__PURE__*/(0, _wrapNativeSuper2.default)(Error));
|
|
138
138
|
var getSyncedBlockContent = exports.getSyncedBlockContent = /*#__PURE__*/function () {
|
|
139
139
|
var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(_ref2) {
|
|
140
|
-
var blockAri, documentAri, response;
|
|
140
|
+
var blockAri, documentAri, queryParams, response;
|
|
141
141
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
142
142
|
while (1) switch (_context2.prev = _context2.next) {
|
|
143
143
|
case 0:
|
|
144
144
|
blockAri = _ref2.blockAri, documentAri = _ref2.documentAri;
|
|
145
|
-
|
|
146
|
-
|
|
145
|
+
// Disable sending documentAri for now. We'll add it back if we find a way to update references that follows the save & refresh principle.
|
|
146
|
+
// Slack discussion here: https://atlassian.slack.com/archives/C09DZT1TBNW/p1767836775552099?thread_ts=1767836754.024889&cid=C09DZT1TBNW
|
|
147
|
+
// const queryParams = documentAri ? `?documentAri=${encodeURIComponent(documentAri)}` : '';
|
|
148
|
+
queryParams = '';
|
|
149
|
+
_context2.next = 4;
|
|
150
|
+
return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)) + queryParams, {
|
|
147
151
|
method: 'GET',
|
|
148
152
|
headers: COMMON_HEADERS
|
|
149
153
|
});
|
|
150
|
-
case
|
|
154
|
+
case 4:
|
|
151
155
|
response = _context2.sent;
|
|
152
156
|
if (response.ok) {
|
|
153
|
-
_context2.next =
|
|
157
|
+
_context2.next = 7;
|
|
154
158
|
break;
|
|
155
159
|
}
|
|
156
160
|
throw new BlockError(response.status);
|
|
157
|
-
case
|
|
158
|
-
_context2.next =
|
|
161
|
+
case 7:
|
|
162
|
+
_context2.next = 9;
|
|
159
163
|
return response.json();
|
|
160
|
-
case 8:
|
|
161
|
-
return _context2.abrupt("return", _context2.sent);
|
|
162
164
|
case 9:
|
|
165
|
+
return _context2.abrupt("return", _context2.sent);
|
|
166
|
+
case 10:
|
|
163
167
|
case "end":
|
|
164
168
|
return _context2.stop();
|
|
165
169
|
}
|
|
@@ -169,6 +173,7 @@ var getSyncedBlockContent = exports.getSyncedBlockContent = /*#__PURE__*/functio
|
|
|
169
173
|
return _ref3.apply(this, arguments);
|
|
170
174
|
};
|
|
171
175
|
}();
|
|
176
|
+
;
|
|
172
177
|
|
|
173
178
|
/**
|
|
174
179
|
* Batch retrieves multiple synced blocks by their ARIs.
|
package/dist/cjs/index.js
CHANGED
|
@@ -39,30 +39,6 @@ Object.defineProperty(exports, "convertSyncBlockPMNodeToSyncBlockData", {
|
|
|
39
39
|
return _utils.convertSyncBlockPMNodeToSyncBlockData;
|
|
40
40
|
}
|
|
41
41
|
});
|
|
42
|
-
Object.defineProperty(exports, "createAndInitializeSyncBlockStoreManager", {
|
|
43
|
-
enumerable: true,
|
|
44
|
-
get: function get() {
|
|
45
|
-
return _syncBlockStoreManager.createAndInitializeSyncBlockStoreManager;
|
|
46
|
-
}
|
|
47
|
-
});
|
|
48
|
-
Object.defineProperty(exports, "createAndInitializeSyncedBlockProvider", {
|
|
49
|
-
enumerable: true,
|
|
50
|
-
get: function get() {
|
|
51
|
-
return _syncBlockProvider.createAndInitializeSyncedBlockProvider;
|
|
52
|
-
}
|
|
53
|
-
});
|
|
54
|
-
Object.defineProperty(exports, "createBlockServiceAPIProviders", {
|
|
55
|
-
enumerable: true,
|
|
56
|
-
get: function get() {
|
|
57
|
-
return _blockServiceAPI.createBlockServiceAPIProviders;
|
|
58
|
-
}
|
|
59
|
-
});
|
|
60
|
-
Object.defineProperty(exports, "createBlockServiceFetchOnlyAPIProvider", {
|
|
61
|
-
enumerable: true,
|
|
62
|
-
get: function get() {
|
|
63
|
-
return _blockServiceAPI.createBlockServiceFetchOnlyAPIProvider;
|
|
64
|
-
}
|
|
65
|
-
});
|
|
66
42
|
Object.defineProperty(exports, "createSyncBlockNode", {
|
|
67
43
|
enumerable: true,
|
|
68
44
|
get: function get() {
|
|
@@ -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.useMemoizedBlockServiceFetchOnlyAPIProvider = exports.useMemoizedBlockServiceAPIProviders = exports.fetchReferences = exports.
|
|
7
|
+
exports.useMemoizedBlockServiceFetchOnlyAPIProvider = exports.useMemoizedBlockServiceAPIProviders = exports.fetchReferences = exports.convertToSyncBlockData = exports.blockAriToResourceId = void 0;
|
|
8
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
9
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
10
10
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
@@ -164,9 +164,11 @@ var fetchReferences = exports.fetchReferences = /*#__PURE__*/function () {
|
|
|
164
164
|
*/
|
|
165
165
|
var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
|
|
166
166
|
function BlockServiceADFFetchProvider(_ref3) {
|
|
167
|
-
var cloudId = _ref3.cloudId
|
|
167
|
+
var cloudId = _ref3.cloudId,
|
|
168
|
+
parentAri = _ref3.parentAri;
|
|
168
169
|
(0, _classCallCheck2.default)(this, BlockServiceADFFetchProvider);
|
|
169
170
|
this.cloudId = cloudId;
|
|
171
|
+
this.parentAri = parentAri;
|
|
170
172
|
}
|
|
171
173
|
|
|
172
174
|
// resourceId of the reference synced block.
|
|
@@ -186,7 +188,8 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
|
|
|
186
188
|
_context2.prev = 1;
|
|
187
189
|
_context2.next = 4;
|
|
188
190
|
return (0, _blockService.getSyncedBlockContent)({
|
|
189
|
-
blockAri: blockAri
|
|
191
|
+
blockAri: blockAri,
|
|
192
|
+
documentAri: this.parentAri
|
|
190
193
|
});
|
|
191
194
|
case 4:
|
|
192
195
|
blockContentResponse = _context2.sent;
|
|
@@ -455,6 +458,14 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
455
458
|
return _regenerator.default.wrap(function _callee4$(_context4) {
|
|
456
459
|
while (1) switch (_context4.prev = _context4.next) {
|
|
457
460
|
case 0:
|
|
461
|
+
if (!(!this.parentAri || !this.parentId)) {
|
|
462
|
+
_context4.next = 2;
|
|
463
|
+
break;
|
|
464
|
+
}
|
|
465
|
+
return _context4.abrupt("return", {
|
|
466
|
+
error: _types.SyncBlockError.Errored
|
|
467
|
+
});
|
|
468
|
+
case 2:
|
|
458
469
|
resourceId = data.resourceId;
|
|
459
470
|
blockAri = (0, _ari.generateBlockAri)({
|
|
460
471
|
cloudId: this.cloudId,
|
|
@@ -463,38 +474,38 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
463
474
|
resourceId: resourceId
|
|
464
475
|
});
|
|
465
476
|
stepVersion = this.getVersion ? this.getVersion() : undefined;
|
|
466
|
-
_context4.prev =
|
|
467
|
-
_context4.next =
|
|
477
|
+
_context4.prev = 5;
|
|
478
|
+
_context4.next = 8;
|
|
468
479
|
return (0, _blockService.updateSyncedBlock)({
|
|
469
480
|
blockAri: blockAri,
|
|
470
481
|
content: JSON.stringify(data.content),
|
|
471
482
|
stepVersion: stepVersion
|
|
472
483
|
});
|
|
473
|
-
case
|
|
484
|
+
case 8:
|
|
474
485
|
return _context4.abrupt("return", {
|
|
475
486
|
resourceId: resourceId
|
|
476
487
|
});
|
|
477
|
-
case
|
|
478
|
-
_context4.prev =
|
|
479
|
-
_context4.t0 = _context4["catch"](
|
|
488
|
+
case 11:
|
|
489
|
+
_context4.prev = 11;
|
|
490
|
+
_context4.t0 = _context4["catch"](5);
|
|
480
491
|
if (!(_context4.t0 instanceof _blockService.BlockError)) {
|
|
481
|
-
_context4.next =
|
|
492
|
+
_context4.next = 15;
|
|
482
493
|
break;
|
|
483
494
|
}
|
|
484
495
|
return _context4.abrupt("return", {
|
|
485
496
|
error: mapBlockError(_context4.t0),
|
|
486
497
|
resourceId: resourceId
|
|
487
498
|
});
|
|
488
|
-
case
|
|
499
|
+
case 15:
|
|
489
500
|
return _context4.abrupt("return", {
|
|
490
501
|
error: (0, _errorHandling.stringifyError)(_context4.t0),
|
|
491
502
|
resourceId: resourceId
|
|
492
503
|
});
|
|
493
|
-
case
|
|
504
|
+
case 16:
|
|
494
505
|
case "end":
|
|
495
506
|
return _context4.stop();
|
|
496
507
|
}
|
|
497
|
-
}, _callee4, this, [[
|
|
508
|
+
}, _callee4, this, [[5, 11]]);
|
|
498
509
|
}));
|
|
499
510
|
function writeData(_x4) {
|
|
500
511
|
return _writeData.apply(this, arguments);
|
|
@@ -509,6 +520,14 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
509
520
|
return _regenerator.default.wrap(function _callee5$(_context5) {
|
|
510
521
|
while (1) switch (_context5.prev = _context5.next) {
|
|
511
522
|
case 0:
|
|
523
|
+
if (!(!this.parentAri || !this.parentId)) {
|
|
524
|
+
_context5.next = 2;
|
|
525
|
+
break;
|
|
526
|
+
}
|
|
527
|
+
return _context5.abrupt("return", {
|
|
528
|
+
error: _types.SyncBlockError.Errored
|
|
529
|
+
});
|
|
530
|
+
case 2:
|
|
512
531
|
resourceId = data.resourceId;
|
|
513
532
|
blockAri = (0, _ari.generateBlockAri)({
|
|
514
533
|
cloudId: this.cloudId,
|
|
@@ -517,8 +536,8 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
517
536
|
resourceId: resourceId
|
|
518
537
|
});
|
|
519
538
|
stepVersion = this.getVersion ? this.getVersion() : undefined;
|
|
520
|
-
_context5.prev =
|
|
521
|
-
_context5.next =
|
|
539
|
+
_context5.prev = 5;
|
|
540
|
+
_context5.next = 8;
|
|
522
541
|
return (0, _blockService.createSyncedBlock)({
|
|
523
542
|
blockAri: blockAri,
|
|
524
543
|
blockInstanceId: data.blockInstanceId,
|
|
@@ -527,31 +546,31 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
527
546
|
content: JSON.stringify(data.content),
|
|
528
547
|
stepVersion: stepVersion
|
|
529
548
|
});
|
|
530
|
-
case
|
|
549
|
+
case 8:
|
|
531
550
|
return _context5.abrupt("return", {
|
|
532
551
|
resourceId: resourceId
|
|
533
552
|
});
|
|
534
|
-
case
|
|
535
|
-
_context5.prev =
|
|
536
|
-
_context5.t0 = _context5["catch"](
|
|
553
|
+
case 11:
|
|
554
|
+
_context5.prev = 11;
|
|
555
|
+
_context5.t0 = _context5["catch"](5);
|
|
537
556
|
if (!(_context5.t0 instanceof _blockService.BlockError)) {
|
|
538
|
-
_context5.next =
|
|
557
|
+
_context5.next = 15;
|
|
539
558
|
break;
|
|
540
559
|
}
|
|
541
560
|
return _context5.abrupt("return", {
|
|
542
561
|
error: mapBlockError(_context5.t0),
|
|
543
562
|
resourceId: resourceId
|
|
544
563
|
});
|
|
545
|
-
case
|
|
564
|
+
case 15:
|
|
546
565
|
return _context5.abrupt("return", {
|
|
547
566
|
error: (0, _errorHandling.stringifyError)(_context5.t0),
|
|
548
567
|
resourceId: resourceId
|
|
549
568
|
});
|
|
550
|
-
case
|
|
569
|
+
case 16:
|
|
551
570
|
case "end":
|
|
552
571
|
return _context5.stop();
|
|
553
572
|
}
|
|
554
|
-
}, _callee5, this, [[
|
|
573
|
+
}, _callee5, this, [[5, 11]]);
|
|
555
574
|
}));
|
|
556
575
|
function createData(_x5) {
|
|
557
576
|
return _createData.apply(this, arguments);
|
|
@@ -566,55 +585,65 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
566
585
|
return _regenerator.default.wrap(function _callee6$(_context6) {
|
|
567
586
|
while (1) switch (_context6.prev = _context6.next) {
|
|
568
587
|
case 0:
|
|
588
|
+
if (this.parentId) {
|
|
589
|
+
_context6.next = 2;
|
|
590
|
+
break;
|
|
591
|
+
}
|
|
592
|
+
return _context6.abrupt("return", {
|
|
593
|
+
resourceId: resourceId,
|
|
594
|
+
success: false,
|
|
595
|
+
error: _types.SyncBlockError.Errored
|
|
596
|
+
});
|
|
597
|
+
case 2:
|
|
569
598
|
blockAri = (0, _ari.generateBlockAri)({
|
|
570
599
|
cloudId: this.cloudId,
|
|
571
600
|
parentId: this.parentId,
|
|
572
601
|
product: this.product,
|
|
573
602
|
resourceId: resourceId
|
|
574
603
|
});
|
|
575
|
-
_context6.prev =
|
|
576
|
-
_context6.next =
|
|
604
|
+
_context6.prev = 3;
|
|
605
|
+
_context6.next = 6;
|
|
577
606
|
return (0, _blockService.deleteSyncedBlock)({
|
|
578
607
|
blockAri: blockAri
|
|
579
608
|
});
|
|
580
|
-
case
|
|
609
|
+
case 6:
|
|
581
610
|
return _context6.abrupt("return", {
|
|
582
611
|
resourceId: resourceId,
|
|
583
612
|
success: true,
|
|
584
613
|
error: undefined
|
|
585
614
|
});
|
|
586
|
-
case
|
|
587
|
-
_context6.prev =
|
|
588
|
-
_context6.t0 = _context6["catch"](
|
|
615
|
+
case 9:
|
|
616
|
+
_context6.prev = 9;
|
|
617
|
+
_context6.t0 = _context6["catch"](3);
|
|
589
618
|
if (!(_context6.t0 instanceof _blockService.BlockError)) {
|
|
590
|
-
_context6.next =
|
|
619
|
+
_context6.next = 15;
|
|
591
620
|
break;
|
|
592
621
|
}
|
|
593
622
|
if (!(_context6.t0.status === 404)) {
|
|
594
|
-
_context6.next =
|
|
623
|
+
_context6.next = 14;
|
|
595
624
|
break;
|
|
596
625
|
}
|
|
597
626
|
return _context6.abrupt("return", {
|
|
598
627
|
resourceId: resourceId,
|
|
599
628
|
success: true
|
|
600
629
|
});
|
|
601
|
-
case
|
|
630
|
+
case 14:
|
|
602
631
|
return _context6.abrupt("return", {
|
|
603
632
|
resourceId: resourceId,
|
|
604
633
|
success: false,
|
|
605
634
|
error: mapBlockError(_context6.t0)
|
|
606
635
|
});
|
|
607
|
-
case
|
|
636
|
+
case 15:
|
|
608
637
|
return _context6.abrupt("return", {
|
|
609
638
|
resourceId: resourceId,
|
|
610
639
|
success: false,
|
|
611
640
|
error: (0, _errorHandling.stringifyError)(_context6.t0)
|
|
612
641
|
});
|
|
613
|
-
case
|
|
642
|
+
case 16:
|
|
614
643
|
case "end":
|
|
615
644
|
return _context6.stop();
|
|
616
645
|
}
|
|
617
|
-
}, _callee6, this, [[
|
|
646
|
+
}, _callee6, this, [[3, 9]]);
|
|
618
647
|
}));
|
|
619
648
|
function deleteData(_x6) {
|
|
620
649
|
return _deleteData.apply(this, arguments);
|
|
@@ -639,8 +668,17 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
639
668
|
return _regenerator.default.wrap(function _callee7$(_context7) {
|
|
640
669
|
while (1) switch (_context7.prev = _context7.next) {
|
|
641
670
|
case 0:
|
|
642
|
-
|
|
643
|
-
|
|
671
|
+
if (this.parentAri) {
|
|
672
|
+
_context7.next = 2;
|
|
673
|
+
break;
|
|
674
|
+
}
|
|
675
|
+
return _context7.abrupt("return", {
|
|
676
|
+
success: false,
|
|
677
|
+
error: _types.SyncBlockError.Errored
|
|
678
|
+
});
|
|
679
|
+
case 2:
|
|
680
|
+
_context7.prev = 2;
|
|
681
|
+
_context7.next = 5;
|
|
644
682
|
return (0, _blockService.updateReferenceSyncedBlockOnDocument)({
|
|
645
683
|
documentAri: this.parentAri,
|
|
646
684
|
blocks: blocks.map(function (block) {
|
|
@@ -654,31 +692,31 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
654
692
|
}),
|
|
655
693
|
noContent: noContent
|
|
656
694
|
});
|
|
657
|
-
case
|
|
695
|
+
case 5:
|
|
658
696
|
return _context7.abrupt("return", {
|
|
659
697
|
success: true
|
|
660
698
|
});
|
|
661
|
-
case
|
|
662
|
-
_context7.prev =
|
|
663
|
-
_context7.t0 = _context7["catch"](
|
|
699
|
+
case 8:
|
|
700
|
+
_context7.prev = 8;
|
|
701
|
+
_context7.t0 = _context7["catch"](2);
|
|
664
702
|
if (!(_context7.t0 instanceof _blockService.BlockError)) {
|
|
665
|
-
_context7.next =
|
|
703
|
+
_context7.next = 12;
|
|
666
704
|
break;
|
|
667
705
|
}
|
|
668
706
|
return _context7.abrupt("return", {
|
|
669
707
|
success: false,
|
|
670
708
|
error: mapBlockError(_context7.t0)
|
|
671
709
|
});
|
|
672
|
-
case
|
|
710
|
+
case 12:
|
|
673
711
|
return _context7.abrupt("return", {
|
|
674
712
|
success: false,
|
|
675
713
|
error: (0, _errorHandling.stringifyError)(_context7.t0)
|
|
676
714
|
});
|
|
677
|
-
case
|
|
715
|
+
case 13:
|
|
678
716
|
case "end":
|
|
679
717
|
return _context7.stop();
|
|
680
718
|
}
|
|
681
|
-
}, _callee7, this, [[
|
|
719
|
+
}, _callee7, this, [[2, 8]]);
|
|
682
720
|
}));
|
|
683
721
|
function updateReferenceData(_x7, _x8) {
|
|
684
722
|
return _updateReferenceData.apply(this, arguments);
|
|
@@ -687,7 +725,7 @@ var BlockServiceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
687
725
|
}()
|
|
688
726
|
}]);
|
|
689
727
|
}();
|
|
690
|
-
var createBlockServiceAPIProviders =
|
|
728
|
+
var createBlockServiceAPIProviders = function createBlockServiceAPIProviders(_ref5) {
|
|
691
729
|
var cloudId = _ref5.cloudId,
|
|
692
730
|
parentAri = _ref5.parentAri,
|
|
693
731
|
parentId = _ref5.parentId,
|
|
@@ -722,11 +760,13 @@ var useMemoizedBlockServiceAPIProviders = exports.useMemoizedBlockServiceAPIProv
|
|
|
722
760
|
});
|
|
723
761
|
}, [cloudId, parentAri, parentId, product, getVersion]);
|
|
724
762
|
};
|
|
725
|
-
var createBlockServiceFetchOnlyAPIProvider =
|
|
726
|
-
var cloudId = _ref7.cloudId
|
|
763
|
+
var createBlockServiceFetchOnlyAPIProvider = function createBlockServiceFetchOnlyAPIProvider(_ref7) {
|
|
764
|
+
var cloudId = _ref7.cloudId,
|
|
765
|
+
parentAri = _ref7.parentAri;
|
|
727
766
|
return {
|
|
728
767
|
fetchProvider: new BlockServiceADFFetchProvider({
|
|
729
|
-
cloudId: cloudId
|
|
768
|
+
cloudId: cloudId,
|
|
769
|
+
parentAri: parentAri
|
|
730
770
|
}),
|
|
731
771
|
writeProvider: undefined
|
|
732
772
|
};
|
|
@@ -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.useMemoizedSyncedBlockProvider = exports.
|
|
7
|
+
exports.useMemoizedSyncedBlockProvider = exports.SyncBlockProvider = void 0;
|
|
8
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
9
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
10
10
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
@@ -93,28 +93,34 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
|
|
|
93
93
|
return node.attrs.resourceId;
|
|
94
94
|
}));
|
|
95
95
|
resourceIds = (0, _toConsumableArray2.default)(resourceIdSet);
|
|
96
|
+
if (!(resourceIds.length === 0)) {
|
|
97
|
+
_context.next = 4;
|
|
98
|
+
break;
|
|
99
|
+
}
|
|
100
|
+
return _context.abrupt("return", []);
|
|
101
|
+
case 4:
|
|
96
102
|
if (!(0, _platformFeatureFlags.fg)('platform_synced_block_dogfooding')) {
|
|
97
|
-
_context.next =
|
|
103
|
+
_context.next = 16;
|
|
98
104
|
break;
|
|
99
105
|
}
|
|
100
|
-
_context.prev =
|
|
101
|
-
_context.next =
|
|
106
|
+
_context.prev = 5;
|
|
107
|
+
_context.next = 8;
|
|
102
108
|
return this.fetchProvider.batchFetchData(resourceIds);
|
|
103
|
-
case
|
|
109
|
+
case 8:
|
|
104
110
|
return _context.abrupt("return", _context.sent);
|
|
105
|
-
case
|
|
106
|
-
_context.prev =
|
|
107
|
-
_context.t0 = _context["catch"](
|
|
111
|
+
case 11:
|
|
112
|
+
_context.prev = 11;
|
|
113
|
+
_context.t0 = _context["catch"](5);
|
|
108
114
|
return _context.abrupt("return", resourceIds.map(function (resourceId) {
|
|
109
115
|
return {
|
|
110
116
|
error: _types.SyncBlockError.Errored,
|
|
111
117
|
resourceId: resourceId
|
|
112
118
|
};
|
|
113
119
|
}));
|
|
114
|
-
case 12:
|
|
115
|
-
_context.next = 15;
|
|
116
|
-
break;
|
|
117
120
|
case 14:
|
|
121
|
+
_context.next = 17;
|
|
122
|
+
break;
|
|
123
|
+
case 16:
|
|
118
124
|
return _context.abrupt("return", Promise.allSettled(resourceIds.map(function (resourceId) {
|
|
119
125
|
return _this2.fetchProvider.fetchData(resourceId).then(function (data) {
|
|
120
126
|
return data;
|
|
@@ -131,11 +137,11 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
|
|
|
131
137
|
return result.value;
|
|
132
138
|
});
|
|
133
139
|
}));
|
|
134
|
-
case
|
|
140
|
+
case 17:
|
|
135
141
|
case "end":
|
|
136
142
|
return _context.stop();
|
|
137
143
|
}
|
|
138
|
-
}, _callee, this, [[
|
|
144
|
+
}, _callee, this, [[5, 11]]);
|
|
139
145
|
}));
|
|
140
146
|
function fetchNodesData(_x) {
|
|
141
147
|
return _fetchNodesData.apply(this, arguments);
|
|
@@ -366,27 +372,11 @@ var createSyncedBlockProvider = function createSyncedBlockProvider(_ref) {
|
|
|
366
372
|
writeProvider = _ref.writeProvider;
|
|
367
373
|
return new SyncBlockProvider(fetchProvider, writeProvider);
|
|
368
374
|
};
|
|
369
|
-
var
|
|
375
|
+
var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(_ref2) {
|
|
370
376
|
var fetchProvider = _ref2.fetchProvider,
|
|
371
377
|
writeProvider = _ref2.writeProvider,
|
|
372
378
|
providerOptions = _ref2.providerOptions,
|
|
373
379
|
getSSRData = _ref2.getSSRData;
|
|
374
|
-
var syncBlockProvider = createSyncedBlockProvider({
|
|
375
|
-
fetchProvider: fetchProvider,
|
|
376
|
-
writeProvider: writeProvider
|
|
377
|
-
});
|
|
378
|
-
syncBlockProvider.setProviderOptions(providerOptions);
|
|
379
|
-
var ssrData = getSSRData ? getSSRData() : undefined;
|
|
380
|
-
if (ssrData) {
|
|
381
|
-
syncBlockProvider.setSSRData(ssrData);
|
|
382
|
-
}
|
|
383
|
-
return syncBlockProvider;
|
|
384
|
-
};
|
|
385
|
-
var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(_ref3) {
|
|
386
|
-
var fetchProvider = _ref3.fetchProvider,
|
|
387
|
-
writeProvider = _ref3.writeProvider,
|
|
388
|
-
providerOptions = _ref3.providerOptions,
|
|
389
|
-
getSSRData = _ref3.getSSRData;
|
|
390
380
|
var syncBlockProvider = (0, _react.useMemo)(function () {
|
|
391
381
|
return createSyncedBlockProvider({
|
|
392
382
|
fetchProvider: fetchProvider,
|
|
@@ -254,16 +254,22 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
|
|
|
254
254
|
}
|
|
255
255
|
nodesToFetch.push(node);
|
|
256
256
|
});
|
|
257
|
+
if (!(nodesToFetch.length === 0)) {
|
|
258
|
+
_context3.next = 8;
|
|
259
|
+
break;
|
|
260
|
+
}
|
|
261
|
+
return _context3.abrupt("return");
|
|
262
|
+
case 8:
|
|
257
263
|
nodesToFetch.forEach(function (node) {
|
|
258
264
|
_this2.syncBlockFetchDataRequests.set(node.attrs.resourceId, true);
|
|
259
265
|
});
|
|
260
|
-
_context3.next =
|
|
266
|
+
_context3.next = 11;
|
|
261
267
|
return this.dataProvider.fetchNodesData(nodesToFetch).finally(function () {
|
|
262
268
|
nodesToFetch.forEach(function (node) {
|
|
263
269
|
_this2.syncBlockFetchDataRequests.delete(node.attrs.resourceId);
|
|
264
270
|
});
|
|
265
271
|
});
|
|
266
|
-
case
|
|
272
|
+
case 11:
|
|
267
273
|
data = _context3.sent;
|
|
268
274
|
resolvedData = [];
|
|
269
275
|
data.forEach(function (syncBlockInstance) {
|
|
@@ -283,7 +289,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
|
|
|
283
289
|
}
|
|
284
290
|
_this2.fetchSyncBlockSourceInfo(resolvedSyncBlockInstance.resourceId);
|
|
285
291
|
});
|
|
286
|
-
case
|
|
292
|
+
case 14:
|
|
287
293
|
case "end":
|
|
288
294
|
return _context3.stop();
|
|
289
295
|
}
|
|
@@ -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.useMemoizedSyncBlockStoreManager = exports.
|
|
7
|
+
exports.useMemoizedSyncBlockStoreManager = exports.SyncBlockStoreManager = void 0;
|
|
8
8
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
9
9
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
10
10
|
var _react = require("react");
|
|
@@ -50,13 +50,6 @@ var SyncBlockStoreManager = exports.SyncBlockStoreManager = /*#__PURE__*/functio
|
|
|
50
50
|
var createSyncBlockStoreManager = function createSyncBlockStoreManager(dataProvider) {
|
|
51
51
|
return new SyncBlockStoreManager(dataProvider);
|
|
52
52
|
};
|
|
53
|
-
var createAndInitializeSyncBlockStoreManager = exports.createAndInitializeSyncBlockStoreManager = function createAndInitializeSyncBlockStoreManager(_ref) {
|
|
54
|
-
var dataProvider = _ref.dataProvider,
|
|
55
|
-
fireAnalyticsEvent = _ref.fireAnalyticsEvent;
|
|
56
|
-
var syncBlockStoreManager = createSyncBlockStoreManager(dataProvider);
|
|
57
|
-
syncBlockStoreManager.setFireAnalyticsEvent(fireAnalyticsEvent);
|
|
58
|
-
return syncBlockStoreManager;
|
|
59
|
-
};
|
|
60
53
|
var useMemoizedSyncBlockStoreManager = exports.useMemoizedSyncBlockStoreManager = function useMemoizedSyncBlockStoreManager(dataProvider, fireAnalyticsEvent) {
|
|
61
54
|
var syncBlockStoreManager = (0, _react.useMemo)(function () {
|
|
62
55
|
var syncBlockStoreManager = createSyncBlockStoreManager(dataProvider);
|
|
@@ -103,7 +103,11 @@ export const getSyncedBlockContent = async ({
|
|
|
103
103
|
blockAri,
|
|
104
104
|
documentAri
|
|
105
105
|
}) => {
|
|
106
|
-
|
|
106
|
+
// Disable sending documentAri for now. We'll add it back if we find a way to update references that follows the save & refresh principle.
|
|
107
|
+
// Slack discussion here: https://atlassian.slack.com/archives/C09DZT1TBNW/p1767836775552099?thread_ts=1767836754.024889&cid=C09DZT1TBNW
|
|
108
|
+
// const queryParams = documentAri ? `?documentAri=${encodeURIComponent(documentAri)}` : '';
|
|
109
|
+
const queryParams = '';
|
|
110
|
+
const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}` + queryParams, {
|
|
107
111
|
method: 'GET',
|
|
108
112
|
headers: COMMON_HEADERS
|
|
109
113
|
});
|
|
@@ -112,6 +116,7 @@ export const getSyncedBlockContent = async ({
|
|
|
112
116
|
}
|
|
113
117
|
return await response.json();
|
|
114
118
|
};
|
|
119
|
+
;
|
|
115
120
|
|
|
116
121
|
/**
|
|
117
122
|
* Batch retrieves multiple synced blocks by their ARIs.
|
package/dist/es2019/index.js
CHANGED
|
@@ -14,13 +14,13 @@ export { getConfluencePageAri, getPageIdAndTypeFromConfluencePageAri } from './c
|
|
|
14
14
|
export { getJiraWorkItemAri, getJiraWorkItemIdFromAri } from './clients/jira/ari';
|
|
15
15
|
|
|
16
16
|
// providers
|
|
17
|
-
export {
|
|
17
|
+
export { useMemoizedBlockServiceAPIProviders, useMemoizedBlockServiceFetchOnlyAPIProvider } from './providers/block-service/blockServiceAPI';
|
|
18
18
|
export { fetchConfluencePageInfo } from './clients/confluence/sourceInfo';
|
|
19
|
-
export { SyncBlockProvider as SyncedBlockProvider,
|
|
19
|
+
export { SyncBlockProvider as SyncedBlockProvider, useMemoizedSyncedBlockProvider } from './providers/syncBlockProvider';
|
|
20
20
|
|
|
21
21
|
// store managers
|
|
22
22
|
|
|
23
|
-
export { SyncBlockStoreManager,
|
|
23
|
+
export { SyncBlockStoreManager, useMemoizedSyncBlockStoreManager } from './store-manager/syncBlockStoreManager';
|
|
24
24
|
|
|
25
25
|
// utils
|
|
26
26
|
export { resolveSyncBlockInstance } from './utils/resolveSyncBlockInstance';
|