@atlaskit/editor-synced-block-provider 2.10.1 → 2.10.3
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 +17 -0
- package/dist/cjs/{providers → clients}/block-service/ari.js +2 -2
- package/dist/cjs/{utils → clients/confluence}/ari.js +6 -6
- package/dist/cjs/{utils → clients/confluence}/sourceInfo.js +7 -7
- package/dist/cjs/clients/confluence/utils.js +9 -0
- package/dist/cjs/hooks/useFetchSyncBlockData.js +5 -6
- package/dist/cjs/hooks/useFetchSyncBlockTitle.js +1 -1
- package/dist/cjs/hooks/useHandleContentChanges.js +1 -1
- package/dist/cjs/index.js +27 -14
- package/dist/cjs/providers/block-service/blockServiceAPI.js +4 -4
- package/dist/cjs/providers/confluence/confluenceContentAPI.js +33 -26
- package/dist/cjs/providers/syncBlockProvider.js +38 -3
- package/dist/cjs/store-manager/referenceSyncBlockStoreManager.js +86 -19
- package/dist/cjs/store-manager/sourceSyncBlockStoreManager.js +52 -10
- package/dist/cjs/store-manager/syncBlockStoreManager.js +14 -157
- package/dist/cjs/utils/utils.js +8 -4
- package/dist/es2019/{providers → clients}/block-service/ari.js +1 -1
- package/dist/es2019/{utils → clients/confluence}/ari.js +5 -5
- package/dist/es2019/{utils → clients/confluence}/sourceInfo.js +5 -5
- package/dist/es2019/clients/confluence/utils.js +3 -0
- package/dist/es2019/hooks/useFetchSyncBlockData.js +5 -6
- package/dist/es2019/hooks/useFetchSyncBlockTitle.js +1 -1
- package/dist/es2019/hooks/useHandleContentChanges.js +1 -1
- package/dist/es2019/index.js +14 -4
- package/dist/es2019/providers/block-service/blockServiceAPI.js +4 -4
- package/dist/es2019/providers/confluence/confluenceContentAPI.js +19 -13
- package/dist/es2019/providers/syncBlockProvider.js +38 -3
- package/dist/es2019/store-manager/referenceSyncBlockStoreManager.js +75 -10
- package/dist/es2019/store-manager/sourceSyncBlockStoreManager.js +39 -1
- package/dist/es2019/store-manager/syncBlockStoreManager.js +12 -117
- package/dist/es2019/utils/utils.js +3 -3
- package/dist/esm/{providers → clients}/block-service/ari.js +1 -1
- package/dist/esm/{utils → clients/confluence}/ari.js +5 -5
- package/dist/esm/{utils → clients/confluence}/sourceInfo.js +7 -7
- package/dist/esm/clients/confluence/utils.js +3 -0
- package/dist/esm/hooks/useFetchSyncBlockData.js +5 -6
- package/dist/esm/hooks/useFetchSyncBlockTitle.js +1 -1
- package/dist/esm/hooks/useHandleContentChanges.js +1 -1
- package/dist/esm/index.js +14 -4
- package/dist/esm/providers/block-service/blockServiceAPI.js +4 -4
- package/dist/esm/providers/confluence/confluenceContentAPI.js +33 -26
- package/dist/esm/providers/syncBlockProvider.js +38 -3
- package/dist/esm/store-manager/referenceSyncBlockStoreManager.js +87 -19
- package/dist/esm/store-manager/sourceSyncBlockStoreManager.js +52 -10
- package/dist/esm/store-manager/syncBlockStoreManager.js +14 -157
- package/dist/esm/utils/utils.js +7 -3
- package/dist/types/{providers → clients}/block-service/ari.d.ts +1 -1
- package/dist/types/{utils → clients/block-service}/blockService.d.ts +3 -3
- package/dist/types/clients/confluence/ari.d.ts +9 -0
- package/dist/types/{utils → clients/confluence}/contentProperty.d.ts +1 -1
- package/dist/types/clients/confluence/sourceInfo.d.ts +2 -0
- package/dist/types/clients/confluence/utils.d.ts +2 -0
- package/dist/types/common/types.d.ts +3 -1
- package/dist/types/index.d.ts +5 -4
- package/dist/types/providers/syncBlockProvider.d.ts +10 -1
- package/dist/types/providers/types.d.ts +20 -8
- package/dist/types/store-manager/referenceSyncBlockStoreManager.d.ts +6 -0
- package/dist/types/store-manager/sourceSyncBlockStoreManager.d.ts +17 -1
- package/dist/types/store-manager/syncBlockStoreManager.d.ts +4 -59
- package/dist/types/utils/utils.d.ts +1 -2
- package/dist/types-ts4.5/{providers → clients}/block-service/ari.d.ts +1 -1
- package/dist/types-ts4.5/{utils → clients/block-service}/blockService.d.ts +3 -3
- package/dist/types-ts4.5/clients/confluence/ari.d.ts +9 -0
- package/dist/types-ts4.5/{utils → clients/confluence}/contentProperty.d.ts +1 -1
- package/dist/types-ts4.5/clients/confluence/sourceInfo.d.ts +2 -0
- package/dist/types-ts4.5/clients/confluence/utils.d.ts +2 -0
- package/dist/types-ts4.5/common/types.d.ts +3 -1
- package/dist/types-ts4.5/index.d.ts +5 -4
- package/dist/types-ts4.5/providers/syncBlockProvider.d.ts +10 -1
- package/dist/types-ts4.5/providers/types.d.ts +20 -8
- package/dist/types-ts4.5/store-manager/referenceSyncBlockStoreManager.d.ts +6 -0
- package/dist/types-ts4.5/store-manager/sourceSyncBlockStoreManager.d.ts +17 -1
- package/dist/types-ts4.5/store-manager/syncBlockStoreManager.d.ts +4 -59
- package/dist/types-ts4.5/utils/utils.d.ts +1 -2
- package/package.json +5 -5
- package/dist/types/utils/ari.d.ts +0 -9
- package/dist/types/utils/sourceInfo.d.ts +0 -2
- package/dist/types-ts4.5/utils/ari.d.ts +0 -9
- package/dist/types-ts4.5/utils/sourceInfo.d.ts +0 -2
- /package/dist/cjs/{utils → clients/block-service}/blockService.js +0 -0
- /package/dist/cjs/{utils → clients/confluence}/contentProperty.js +0 -0
- /package/dist/es2019/{utils → clients/block-service}/blockService.js +0 -0
- /package/dist/es2019/{utils → clients/confluence}/contentProperty.js +0 -0
- /package/dist/esm/{utils → clients/block-service}/blockService.js +0 -0
- /package/dist/esm/{utils → clients/confluence}/contentProperty.js +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,22 @@
|
|
|
1
1
|
# @atlaskit/editor-synced-block-provider
|
|
2
2
|
|
|
3
|
+
## 2.10.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`964b980644f9d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/964b980644f9d) -
|
|
8
|
+
EDITOR-3348 Refactor Synced Block Store Manager
|
|
9
|
+
- [`caa54ec7bac4c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/caa54ec7bac4c) -
|
|
10
|
+
EDITOR-3312 Refactor and restructure synced block provider
|
|
11
|
+
|
|
12
|
+
## 2.10.2
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- [`27e34de207285`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/27e34de207285) -
|
|
17
|
+
EDITOR-2771 Create media & emoji provider per each reference sync block
|
|
18
|
+
- Updated dependencies
|
|
19
|
+
|
|
3
20
|
## 2.10.1
|
|
4
21
|
|
|
5
22
|
### Patch Changes
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.
|
|
6
|
+
exports.getLocalIdFromBlockResourceId = exports.blockResourceIdFromSourceAndLocalId = void 0;
|
|
7
7
|
/* eslint-disable require-unicode-regexp */
|
|
8
8
|
/**
|
|
9
9
|
* Generates a unique block ARI from a source ARI and a local ID.
|
|
@@ -25,7 +25,7 @@ var blockResourceIdFromSourceAndLocalId = exports.blockResourceIdFromSourceAndLo
|
|
|
25
25
|
* @param ari - the block ARI. E.G ari:cloud:blocks:cloudId:synced-block/localId
|
|
26
26
|
* @returns the localId of the block node. A randomly generated UUID
|
|
27
27
|
*/
|
|
28
|
-
var
|
|
28
|
+
var getLocalIdFromBlockResourceId = exports.getLocalIdFromBlockResourceId = function getLocalIdFromBlockResourceId(ari) {
|
|
29
29
|
var match = ari.match(/ari:cloud:blocks:[^:]+:synced-block\/([a-zA-Z0-9-]+)/);
|
|
30
30
|
if (match !== null && match !== void 0 && match[1]) {
|
|
31
31
|
return match[1];
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.
|
|
6
|
+
exports.resourceIdFromConfluencePageSourceIdAndLocalId = exports.getPageIdAndTypeFromConfluencePageAri = exports.getPageARIFromContentPropertyResourceId = exports.getLocalIdFromConfluencePageAri = exports.getConfluencePageAri = void 0;
|
|
7
7
|
/* eslint-disable require-unicode-regexp */
|
|
8
8
|
|
|
9
9
|
var getConfluencePageAri = exports.getConfluencePageAri = function getConfluencePageAri(pageId, cloudId) {
|
|
@@ -11,8 +11,8 @@ var getConfluencePageAri = exports.getConfluencePageAri = function getConfluence
|
|
|
11
11
|
return "ari:cloud:confluence:".concat(cloudId, ":").concat(pageType, "/").concat(pageId);
|
|
12
12
|
};
|
|
13
13
|
|
|
14
|
-
// For extracting from Page ARI and also the content property's version of resourceId
|
|
15
|
-
var
|
|
14
|
+
// For extracting from Page ARI and also the content property's version of resourceId
|
|
15
|
+
var getPageIdAndTypeFromConfluencePageAri = exports.getPageIdAndTypeFromConfluencePageAri = function getPageIdAndTypeFromConfluencePageAri(ari) {
|
|
16
16
|
var match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/(\d+)/);
|
|
17
17
|
if (match !== null && match !== void 0 && match[2]) {
|
|
18
18
|
return {
|
|
@@ -22,20 +22,20 @@ var getPageIdAndTypeFromAri = exports.getPageIdAndTypeFromAri = function getPage
|
|
|
22
22
|
}
|
|
23
23
|
throw new Error("Invalid page ARI: ".concat(ari));
|
|
24
24
|
};
|
|
25
|
-
var
|
|
25
|
+
var getLocalIdFromConfluencePageAri = exports.getLocalIdFromConfluencePageAri = function getLocalIdFromConfluencePageAri(ari) {
|
|
26
26
|
var match = ari.match(/ari:cloud:confluence:[^:]+:(page|blogpost)\/\d+\/([a-zA-Z0-9-]+)/);
|
|
27
27
|
if (match !== null && match !== void 0 && match[2]) {
|
|
28
28
|
return match[2];
|
|
29
29
|
}
|
|
30
30
|
throw new Error("Invalid page ARI: ".concat(ari));
|
|
31
31
|
};
|
|
32
|
-
var
|
|
32
|
+
var getPageARIFromContentPropertyResourceId = exports.getPageARIFromContentPropertyResourceId = function getPageARIFromContentPropertyResourceId(resourceId) {
|
|
33
33
|
var match = resourceId.match(/(ari:cloud:confluence:[^:]+:(page|blogpost)\/\d+)\/([a-zA-Z0-9-]+)$/);
|
|
34
34
|
if (match !== null && match !== void 0 && match[1]) {
|
|
35
35
|
return match[1];
|
|
36
36
|
}
|
|
37
37
|
throw new Error("Invalid resourceId: ".concat(resourceId));
|
|
38
38
|
};
|
|
39
|
-
var
|
|
39
|
+
var resourceIdFromConfluencePageSourceIdAndLocalId = exports.resourceIdFromConfluencePageSourceIdAndLocalId = function resourceIdFromConfluencePageSourceIdAndLocalId(sourceId, localId) {
|
|
40
40
|
return sourceId + '/' + localId;
|
|
41
41
|
};
|
|
@@ -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.
|
|
7
|
+
exports.fetchConfluenceSourceInfo = 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"));
|
|
@@ -27,7 +27,7 @@ var GET_SOURCE_INFO_OPERATION_NAME = 'EDITOR_SYNCED_BLOCK_GET_SOURCE_INFO';
|
|
|
27
27
|
* @returns subType live if livePage, subType null if classic page
|
|
28
28
|
*/
|
|
29
29
|
var GET_SOURCE_INFO_QUERY = "query ".concat(GET_SOURCE_INFO_OPERATION_NAME, " ($id: ID!) {\n\tcontent (id: $id) {\n\t\tnodes {\n\t\t\tid\n\t\t\tlinks {\n\t\t\t\tbase\n\t\t\t}\n\t\t\tspace {\n\t\t\t\tkey\n\t\t\t}\n\t\t\tsubType\n\t\t\ttitle\n\t\t}\n\t}\n}");
|
|
30
|
-
var
|
|
30
|
+
var getConfluenceSourceInfo = /*#__PURE__*/function () {
|
|
31
31
|
var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(ari) {
|
|
32
32
|
var bodyData, response;
|
|
33
33
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
@@ -64,20 +64,20 @@ var getSourceInfo = /*#__PURE__*/function () {
|
|
|
64
64
|
}
|
|
65
65
|
}, _callee);
|
|
66
66
|
}));
|
|
67
|
-
return function
|
|
67
|
+
return function getConfluenceSourceInfo(_x) {
|
|
68
68
|
return _ref.apply(this, arguments);
|
|
69
69
|
};
|
|
70
70
|
}();
|
|
71
|
-
var
|
|
71
|
+
var fetchConfluenceSourceInfo = exports.fetchConfluenceSourceInfo = /*#__PURE__*/function () {
|
|
72
72
|
var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(pageAri, localId) {
|
|
73
73
|
var _response$data, _contentData$space, _getPageIdAndTypeFrom, pageType, response, contentData, title, url, _ref3, base;
|
|
74
74
|
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
75
75
|
while (1) switch (_context2.prev = _context2.next) {
|
|
76
76
|
case 0:
|
|
77
77
|
_context2.prev = 0;
|
|
78
|
-
_getPageIdAndTypeFrom = (0, _ari.
|
|
78
|
+
_getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(pageAri), pageType = _getPageIdAndTypeFrom.type;
|
|
79
79
|
_context2.next = 4;
|
|
80
|
-
return
|
|
80
|
+
return getConfluenceSourceInfo(pageAri);
|
|
81
81
|
case 4:
|
|
82
82
|
response = _context2.sent;
|
|
83
83
|
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];
|
|
@@ -113,7 +113,7 @@ var fetchSourceInfo = exports.fetchSourceInfo = /*#__PURE__*/function () {
|
|
|
113
113
|
}
|
|
114
114
|
}, _callee2, null, [[0, 15]]);
|
|
115
115
|
}));
|
|
116
|
-
return function
|
|
116
|
+
return function fetchConfluenceSourceInfo(_x2, _x3) {
|
|
117
117
|
return _ref2.apply(this, arguments);
|
|
118
118
|
};
|
|
119
119
|
}();
|
|
@@ -20,7 +20,6 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
|
|
|
20
20
|
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
21
21
|
isLoading = _useState4[0],
|
|
22
22
|
setIsLoading = _useState4[1];
|
|
23
|
-
var referenceSyncBlockStoreManager = manager.getReferenceSyncBlockStoreManager();
|
|
24
23
|
var reloadData = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
|
|
25
24
|
var syncBlockNode;
|
|
26
25
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
@@ -42,7 +41,7 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
|
|
|
42
41
|
setIsLoading(true);
|
|
43
42
|
_context.prev = 6;
|
|
44
43
|
_context.next = 9;
|
|
45
|
-
return
|
|
44
|
+
return manager.referenceManager.fetchSyncBlocksData([syncBlockNode]);
|
|
46
45
|
case 9:
|
|
47
46
|
_context.next = 14;
|
|
48
47
|
break;
|
|
@@ -61,19 +60,19 @@ var useFetchSyncBlockData = exports.useFetchSyncBlockData = function useFetchSyn
|
|
|
61
60
|
return _context.stop();
|
|
62
61
|
}
|
|
63
62
|
}, _callee, null, [[6, 11]]);
|
|
64
|
-
})), [isLoading, localId,
|
|
63
|
+
})), [isLoading, localId, manager.referenceManager, resourceId]);
|
|
65
64
|
(0, _react.useEffect)(function () {
|
|
66
|
-
var unsubscribe =
|
|
65
|
+
var unsubscribe = manager.referenceManager.subscribeToSyncBlock(resourceId || '', localId || '', function (data) {
|
|
67
66
|
setSyncBlockInstance(data);
|
|
68
67
|
setIsLoading(false);
|
|
69
68
|
});
|
|
70
69
|
return function () {
|
|
71
70
|
unsubscribe();
|
|
72
71
|
};
|
|
73
|
-
}, [localId,
|
|
72
|
+
}, [localId, manager.referenceManager, resourceId]);
|
|
74
73
|
return {
|
|
75
74
|
isLoading: isLoading,
|
|
76
|
-
providerFactory:
|
|
75
|
+
providerFactory: manager.referenceManager.getProviderFactory(resourceId || ''),
|
|
77
76
|
reloadData: reloadData,
|
|
78
77
|
syncBlockInstance: syncBlockInstance
|
|
79
78
|
};
|
|
@@ -13,7 +13,7 @@ var useFetchSyncBlockTitle = exports.useFetchSyncBlockTitle = function useFetchS
|
|
|
13
13
|
sourceTitle = _useState2[0],
|
|
14
14
|
setSourceTitle = _useState2[1];
|
|
15
15
|
(0, _react.useEffect)(function () {
|
|
16
|
-
var unsubscribe = manager.
|
|
16
|
+
var unsubscribe = manager.referenceManager.subscribeToSourceTitle(syncBlockNode, function (title) {
|
|
17
17
|
setSourceTitle(title);
|
|
18
18
|
});
|
|
19
19
|
return function () {
|
|
@@ -8,7 +8,7 @@ var _react = require("react");
|
|
|
8
8
|
var useHandleContentChanges = exports.useHandleContentChanges = function useHandleContentChanges(manager, syncBlockNode) {
|
|
9
9
|
(0, _react.useEffect)(function () {
|
|
10
10
|
try {
|
|
11
|
-
manager.updateSyncBlockData(syncBlockNode);
|
|
11
|
+
manager.sourceManager.updateSyncBlockData(syncBlockNode);
|
|
12
12
|
} catch (_unused) {
|
|
13
13
|
//TODO: EDITOR-1921 - add error analytics
|
|
14
14
|
}
|
package/dist/cjs/index.js
CHANGED
|
@@ -33,6 +33,12 @@ Object.defineProperty(exports, "blockResourceIdFromSourceAndLocalId", {
|
|
|
33
33
|
return _ari.blockResourceIdFromSourceAndLocalId;
|
|
34
34
|
}
|
|
35
35
|
});
|
|
36
|
+
Object.defineProperty(exports, "convertPMNodesToSyncBlockNodes", {
|
|
37
|
+
enumerable: true,
|
|
38
|
+
get: function get() {
|
|
39
|
+
return _utils.convertPMNodesToSyncBlockNodes;
|
|
40
|
+
}
|
|
41
|
+
});
|
|
36
42
|
Object.defineProperty(exports, "convertSyncBlockJSONNodeToSyncBlockNode", {
|
|
37
43
|
enumerable: true,
|
|
38
44
|
get: function get() {
|
|
@@ -57,34 +63,40 @@ Object.defineProperty(exports, "createSyncBlockNode", {
|
|
|
57
63
|
return _utils.createSyncBlockNode;
|
|
58
64
|
}
|
|
59
65
|
});
|
|
66
|
+
Object.defineProperty(exports, "fetchConfluenceSourceInfo", {
|
|
67
|
+
enumerable: true,
|
|
68
|
+
get: function get() {
|
|
69
|
+
return _sourceInfo.fetchConfluenceSourceInfo;
|
|
70
|
+
}
|
|
71
|
+
});
|
|
60
72
|
Object.defineProperty(exports, "getConfluencePageAri", {
|
|
61
73
|
enumerable: true,
|
|
62
74
|
get: function get() {
|
|
63
75
|
return _ari2.getConfluencePageAri;
|
|
64
76
|
}
|
|
65
77
|
});
|
|
66
|
-
Object.defineProperty(exports, "
|
|
78
|
+
Object.defineProperty(exports, "getLocalIdFromBlockResourceId", {
|
|
67
79
|
enumerable: true,
|
|
68
80
|
get: function get() {
|
|
69
|
-
return
|
|
81
|
+
return _ari.getLocalIdFromBlockResourceId;
|
|
70
82
|
}
|
|
71
83
|
});
|
|
72
|
-
Object.defineProperty(exports, "
|
|
84
|
+
Object.defineProperty(exports, "getLocalIdFromConfluencePageAri", {
|
|
73
85
|
enumerable: true,
|
|
74
86
|
get: function get() {
|
|
75
|
-
return
|
|
87
|
+
return _ari2.getLocalIdFromConfluencePageAri;
|
|
76
88
|
}
|
|
77
89
|
});
|
|
78
|
-
Object.defineProperty(exports, "
|
|
90
|
+
Object.defineProperty(exports, "getPageARIFromContentPropertyResourceId", {
|
|
79
91
|
enumerable: true,
|
|
80
92
|
get: function get() {
|
|
81
|
-
return _ari2.
|
|
93
|
+
return _ari2.getPageARIFromContentPropertyResourceId;
|
|
82
94
|
}
|
|
83
95
|
});
|
|
84
|
-
Object.defineProperty(exports, "
|
|
96
|
+
Object.defineProperty(exports, "getPageIdAndTypeFromConfluencePageAri", {
|
|
85
97
|
enumerable: true,
|
|
86
98
|
get: function get() {
|
|
87
|
-
return _ari2.
|
|
99
|
+
return _ari2.getPageIdAndTypeFromConfluencePageAri;
|
|
88
100
|
}
|
|
89
101
|
});
|
|
90
102
|
Object.defineProperty(exports, "rebaseTransaction", {
|
|
@@ -99,10 +111,10 @@ Object.defineProperty(exports, "resolveSyncBlockInstance", {
|
|
|
99
111
|
return _resolveSyncBlockInstance.resolveSyncBlockInstance;
|
|
100
112
|
}
|
|
101
113
|
});
|
|
102
|
-
Object.defineProperty(exports, "
|
|
114
|
+
Object.defineProperty(exports, "resourceIdFromConfluencePageSourceIdAndLocalId", {
|
|
103
115
|
enumerable: true,
|
|
104
116
|
get: function get() {
|
|
105
|
-
return _ari2.
|
|
117
|
+
return _ari2.resourceIdFromConfluencePageSourceIdAndLocalId;
|
|
106
118
|
}
|
|
107
119
|
});
|
|
108
120
|
Object.defineProperty(exports, "useFetchSyncBlockData", {
|
|
@@ -146,12 +158,13 @@ var _types = require("./common/types");
|
|
|
146
158
|
var _useFetchSyncBlockData = require("./hooks/useFetchSyncBlockData");
|
|
147
159
|
var _useFetchSyncBlockTitle = require("./hooks/useFetchSyncBlockTitle");
|
|
148
160
|
var _useHandleContentChanges = require("./hooks/useHandleContentChanges");
|
|
149
|
-
var _ari = require("./
|
|
161
|
+
var _ari = require("./clients/block-service/ari");
|
|
162
|
+
var _ari2 = require("./clients/confluence/ari");
|
|
150
163
|
var _blockServiceAPI = require("./providers/block-service/blockServiceAPI");
|
|
151
164
|
var _confluenceContentAPI = require("./providers/confluence/confluenceContentAPI");
|
|
165
|
+
var _sourceInfo = require("./clients/confluence/sourceInfo");
|
|
152
166
|
var _syncBlockProvider = require("./providers/syncBlockProvider");
|
|
153
167
|
var _referenceSyncBlockStoreManager = require("./store-manager/referenceSyncBlockStoreManager");
|
|
154
168
|
var _syncBlockStoreManager = require("./store-manager/syncBlockStoreManager");
|
|
155
|
-
var
|
|
156
|
-
var _utils = require("./utils/utils");
|
|
157
|
-
var _resolveSyncBlockInstance = require("./utils/resolveSyncBlockInstance");
|
|
169
|
+
var _resolveSyncBlockInstance = require("./utils/resolveSyncBlockInstance");
|
|
170
|
+
var _utils = require("./utils/utils");
|
|
@@ -10,10 +10,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
|
10
10
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
11
11
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
12
12
|
var _react = require("react");
|
|
13
|
+
var _ari = require("../../clients/block-service/ari");
|
|
14
|
+
var _blockService = require("../../clients/block-service/blockService");
|
|
13
15
|
var _types = require("../../common/types");
|
|
14
|
-
var _blockService = require("../../utils/blockService");
|
|
15
16
|
var _errorHandling = require("../../utils/errorHandling");
|
|
16
|
-
var _ari = require("./ari");
|
|
17
17
|
var mapBlockError = function mapBlockError(error) {
|
|
18
18
|
switch (error.status) {
|
|
19
19
|
case 403:
|
|
@@ -41,7 +41,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
|
|
|
41
41
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
42
42
|
while (1) switch (_context.prev = _context.next) {
|
|
43
43
|
case 0:
|
|
44
|
-
localId = (0, _ari.
|
|
44
|
+
localId = (0, _ari.getLocalIdFromBlockResourceId)(resourceId);
|
|
45
45
|
_context.prev = 1;
|
|
46
46
|
_context.next = 4;
|
|
47
47
|
return (0, _blockService.getSyncedBlockContent)({
|
|
@@ -101,7 +101,7 @@ var BlockServiceADFFetchProvider = /*#__PURE__*/function () {
|
|
|
101
101
|
value: function retrieveSourceInfoFetchData(resourceId, pageARI) {
|
|
102
102
|
var sourceLocalId;
|
|
103
103
|
try {
|
|
104
|
-
sourceLocalId = (0, _ari.
|
|
104
|
+
sourceLocalId = (0, _ari.getLocalIdFromBlockResourceId)(resourceId);
|
|
105
105
|
} catch (error) {
|
|
106
106
|
// EDITOR-1921: log analytic here, safe to continue
|
|
107
107
|
}
|
|
@@ -12,11 +12,13 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
|
|
|
12
12
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
13
13
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
14
14
|
var _react = require("react");
|
|
15
|
+
var _ari = require("../../clients/confluence/ari");
|
|
16
|
+
var _contentProperty3 = require("../../clients/confluence/contentProperty");
|
|
17
|
+
var _utils = require("../../clients/confluence/utils");
|
|
15
18
|
var _types = require("../../common/types");
|
|
16
|
-
var _ari = require("../../utils/ari");
|
|
17
|
-
var _contentProperty3 = require("../../utils/contentProperty");
|
|
18
19
|
var _errorHandling = require("../../utils/errorHandling");
|
|
19
|
-
var
|
|
20
|
+
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; }
|
|
21
|
+
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; }
|
|
20
22
|
/**
|
|
21
23
|
* Configuration for Content API providers
|
|
22
24
|
*/
|
|
@@ -67,8 +69,8 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
|
|
|
67
69
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
68
70
|
while (1) switch (_context.prev = _context.next) {
|
|
69
71
|
case 0:
|
|
70
|
-
_getPageIdAndTypeFrom = (0, _ari.
|
|
71
|
-
localId = (0, _ari.
|
|
72
|
+
_getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(resourceId), pageId = _getPageIdAndTypeFrom.id, pageType = _getPageIdAndTypeFrom.type;
|
|
73
|
+
localId = (0, _ari.getLocalIdFromConfluencePageAri)(resourceId);
|
|
72
74
|
_context.prev = 2;
|
|
73
75
|
key = getContentPropertyKey(this.config.contentPropertyKey, localId);
|
|
74
76
|
options = {
|
|
@@ -137,10 +139,10 @@ var ConfluenceADFFetchProvider = /*#__PURE__*/function () {
|
|
|
137
139
|
}, {
|
|
138
140
|
key: "retrieveSourceInfoFetchData",
|
|
139
141
|
value: function retrieveSourceInfoFetchData(resourceId) {
|
|
140
|
-
var pageARI = (0, _ari.
|
|
142
|
+
var pageARI = (0, _ari.getPageARIFromContentPropertyResourceId)(resourceId);
|
|
141
143
|
var sourceLocalId;
|
|
142
144
|
try {
|
|
143
|
-
sourceLocalId = (0, _ari.
|
|
145
|
+
sourceLocalId = (0, _ari.getLocalIdFromConfluencePageAri)(resourceId);
|
|
144
146
|
} catch (error) {
|
|
145
147
|
// EDITOR-1921: log analytic here, safe to continue
|
|
146
148
|
}
|
|
@@ -217,13 +219,13 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
217
219
|
key: "writeData",
|
|
218
220
|
value: function () {
|
|
219
221
|
var _writeData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(data) {
|
|
220
|
-
var match, resourceId, _match, pageId, pageType, localId, key, options, updatePayload, updateResult;
|
|
222
|
+
var match, resourceId, _match, pageId, pageType, localId, key, sourceAri, syncBlockDataWithSourceDocumentAri, options, updatePayload, updateResult;
|
|
221
223
|
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
222
224
|
while (1) switch (_context3.prev = _context3.next) {
|
|
223
225
|
case 0:
|
|
224
226
|
resourceId = data.resourceId;
|
|
225
227
|
_context3.prev = 1;
|
|
226
|
-
match = (0, _ari.
|
|
228
|
+
match = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(data.resourceId);
|
|
227
229
|
_context3.next = 8;
|
|
228
230
|
break;
|
|
229
231
|
case 5:
|
|
@@ -236,30 +238,35 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
236
238
|
_match = match, pageId = _match.id, pageType = _match.type;
|
|
237
239
|
_context3.prev = 9;
|
|
238
240
|
// Update existing content property
|
|
239
|
-
localId = (0, _ari.
|
|
241
|
+
localId = (0, _ari.getLocalIdFromConfluencePageAri)(resourceId);
|
|
240
242
|
key = getContentPropertyKey(this.config.contentPropertyKey, localId);
|
|
243
|
+
sourceAri = (0, _ari.getConfluencePageAri)(pageId, this.config.cloudId, pageType);
|
|
244
|
+
syncBlockDataWithSourceDocumentAri = _objectSpread(_objectSpread({}, data), {}, {
|
|
245
|
+
product: 'confluence-page',
|
|
246
|
+
sourceAri: sourceAri
|
|
247
|
+
});
|
|
241
248
|
options = {
|
|
242
249
|
pageId: pageId,
|
|
243
250
|
key: key,
|
|
244
|
-
value:
|
|
251
|
+
value: syncBlockDataWithSourceDocumentAri,
|
|
245
252
|
cloudId: this.config.cloudId,
|
|
246
253
|
pageType: pageType
|
|
247
254
|
};
|
|
248
|
-
_context3.next =
|
|
255
|
+
_context3.next = 17;
|
|
249
256
|
return (0, _contentProperty3.updateContentProperty)(options);
|
|
250
|
-
case
|
|
257
|
+
case 17:
|
|
251
258
|
updatePayload = _context3.sent;
|
|
252
259
|
updateResult = (0, _utils.isBlogPageType)(pageType) ? updatePayload.data.confluence.updateValueBlogPostProperty.blogPostProperty : updatePayload.data.confluence.updateValuePageProperty.pageProperty;
|
|
253
260
|
if (!((updateResult === null || updateResult === void 0 ? void 0 : updateResult.key) === key)) {
|
|
254
|
-
_context3.next =
|
|
261
|
+
_context3.next = 23;
|
|
255
262
|
break;
|
|
256
263
|
}
|
|
257
264
|
return _context3.abrupt("return", {
|
|
258
265
|
resourceId: resourceId
|
|
259
266
|
});
|
|
260
|
-
case
|
|
267
|
+
case 23:
|
|
261
268
|
if (updateResult) {
|
|
262
|
-
_context3.next =
|
|
269
|
+
_context3.next = 27;
|
|
263
270
|
break;
|
|
264
271
|
}
|
|
265
272
|
return _context3.abrupt("return", this.createNewContentProperty(pageId, key, data, pageType).then(function () {
|
|
@@ -271,24 +278,24 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
271
278
|
error: error
|
|
272
279
|
};
|
|
273
280
|
}));
|
|
274
|
-
case
|
|
281
|
+
case 27:
|
|
275
282
|
return _context3.abrupt("return", {
|
|
276
283
|
error: "Failed to update ".concat(pageType, " content property")
|
|
277
284
|
});
|
|
278
|
-
case 26:
|
|
279
|
-
_context3.next = 31;
|
|
280
|
-
break;
|
|
281
285
|
case 28:
|
|
282
|
-
_context3.
|
|
286
|
+
_context3.next = 33;
|
|
287
|
+
break;
|
|
288
|
+
case 30:
|
|
289
|
+
_context3.prev = 30;
|
|
283
290
|
_context3.t1 = _context3["catch"](9);
|
|
284
291
|
return _context3.abrupt("return", {
|
|
285
292
|
error: "Failed to write ".concat(pageType)
|
|
286
293
|
});
|
|
287
|
-
case
|
|
294
|
+
case 33:
|
|
288
295
|
case "end":
|
|
289
296
|
return _context3.stop();
|
|
290
297
|
}
|
|
291
|
-
}, _callee3, this, [[1, 5], [9,
|
|
298
|
+
}, _callee3, this, [[1, 5], [9, 30]]);
|
|
292
299
|
}));
|
|
293
300
|
function writeData(_x6) {
|
|
294
301
|
return _writeData.apply(this, arguments);
|
|
@@ -304,7 +311,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
304
311
|
while (1) switch (_context4.prev = _context4.next) {
|
|
305
312
|
case 0:
|
|
306
313
|
_context4.prev = 0;
|
|
307
|
-
match = (0, _ari.
|
|
314
|
+
match = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(resourceId);
|
|
308
315
|
_context4.next = 7;
|
|
309
316
|
break;
|
|
310
317
|
case 4:
|
|
@@ -318,7 +325,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
318
325
|
case 7:
|
|
319
326
|
_match2 = match, pageId = _match2.id, pageType = _match2.type;
|
|
320
327
|
_context4.prev = 8;
|
|
321
|
-
localId = (0, _ari.
|
|
328
|
+
localId = (0, _ari.getLocalIdFromConfluencePageAri)(resourceId);
|
|
322
329
|
key = getContentPropertyKey(this.config.contentPropertyKey, localId);
|
|
323
330
|
options = {
|
|
324
331
|
pageId: pageId,
|
|
@@ -361,7 +368,7 @@ var ConfluenceADFWriteProvider = /*#__PURE__*/function () {
|
|
|
361
368
|
}, {
|
|
362
369
|
key: "generateResourceId",
|
|
363
370
|
value: function generateResourceId(sourceId, localId) {
|
|
364
|
-
return (0, _ari.
|
|
371
|
+
return (0, _ari.resourceIdFromConfluencePageSourceIdAndLocalId)(sourceId, localId);
|
|
365
372
|
}
|
|
366
373
|
}]);
|
|
367
374
|
}();
|
|
@@ -15,9 +15,10 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
|
|
|
15
15
|
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
16
16
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
17
17
|
var _react = require("react");
|
|
18
|
+
var _ari = require("../clients/confluence/ari");
|
|
19
|
+
var _sourceInfo = require("../clients/confluence/sourceInfo");
|
|
18
20
|
var _types = require("../common/types");
|
|
19
21
|
var _types2 = require("../providers/types");
|
|
20
|
-
var _sourceInfo = require("../utils/sourceInfo");
|
|
21
22
|
function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
|
|
22
23
|
function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
|
|
23
24
|
var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_SyncBlockDataProvide) {
|
|
@@ -217,7 +218,7 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
|
|
|
217
218
|
}, {
|
|
218
219
|
key: "retrieveSyncBlockSourceInfo",
|
|
219
220
|
value: function retrieveSyncBlockSourceInfo(node) {
|
|
220
|
-
// with content API, this is the concatenation of the page ARI and the block's localId.
|
|
221
|
+
// with content API, this is the concatenation of the page ARI and the block's localId.
|
|
221
222
|
// with block service, this is the ARI of the block.
|
|
222
223
|
// this can be cleaned up from the specific providers and placed here after platform_synced_blocks_block_service_provider
|
|
223
224
|
var resourceId = node.attrs.resourceId;
|
|
@@ -232,7 +233,10 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
|
|
|
232
233
|
return Promise.reject(error);
|
|
233
234
|
}
|
|
234
235
|
}
|
|
235
|
-
|
|
236
|
+
|
|
237
|
+
// TODO: EDITOR-3312 - based on the source sync block product,
|
|
238
|
+
// execute fetchConfluenceSourceInfo or fetchJiraItemSourceInfo or similar...
|
|
239
|
+
return pageARI ? (0, _sourceInfo.fetchConfluenceSourceInfo)(pageARI, sourceLocalId) : Promise.resolve(undefined);
|
|
236
240
|
}
|
|
237
241
|
}, {
|
|
238
242
|
key: "generateResourceId",
|
|
@@ -250,6 +254,37 @@ var SyncBlockProvider = exports.SyncBlockProvider = /*#__PURE__*/function (_Sync
|
|
|
250
254
|
value: function getSyncedBlockRendererProviderOptions() {
|
|
251
255
|
return this.providerOptions;
|
|
252
256
|
}
|
|
257
|
+
|
|
258
|
+
/**
|
|
259
|
+
* Retrieve the parent info for the sync block
|
|
260
|
+
*
|
|
261
|
+
* @param resourceId
|
|
262
|
+
* @param syncBlockInstance
|
|
263
|
+
*
|
|
264
|
+
* @returns The parent info for the sync block
|
|
265
|
+
*/
|
|
266
|
+
}, {
|
|
267
|
+
key: "retrieveSyncBlockParentInfo",
|
|
268
|
+
value: function retrieveSyncBlockParentInfo(syncBlockInstance) {
|
|
269
|
+
if (!syncBlockInstance || !syncBlockInstance.data) {
|
|
270
|
+
return undefined;
|
|
271
|
+
}
|
|
272
|
+
var _syncBlockInstance$da = syncBlockInstance.data,
|
|
273
|
+
sourceAri = _syncBlockInstance$da.sourceAri,
|
|
274
|
+
product = _syncBlockInstance$da.product;
|
|
275
|
+
if (!sourceAri || !product) {
|
|
276
|
+
return undefined;
|
|
277
|
+
}
|
|
278
|
+
|
|
279
|
+
// TODO: EDITOR-3312 - based on the source sync block product,
|
|
280
|
+
// execute getPageIdAndTypeFromConfluencePageAri or getJiraItemIdAndTypeFromJiraItemAri or similar...
|
|
281
|
+
var _getPageIdAndTypeFrom = (0, _ari.getPageIdAndTypeFromConfluencePageAri)(sourceAri),
|
|
282
|
+
contentId = _getPageIdAndTypeFrom.id;
|
|
283
|
+
return {
|
|
284
|
+
contentId: contentId,
|
|
285
|
+
contentProduct: product
|
|
286
|
+
};
|
|
287
|
+
}
|
|
253
288
|
}]);
|
|
254
289
|
}(_types2.SyncBlockDataProvider);
|
|
255
290
|
var useMemoizedSyncedBlockProvider = exports.useMemoizedSyncedBlockProvider = function useMemoizedSyncedBlockProvider(fetchProvider, writeProvider, sourceId, providerOptions) {
|