@atlaskit/editor-synced-block-renderer 5.9.7 → 6.0.0
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 +14 -0
- package/dist/cjs/ui/SyncedBlockErrorComponent.js +0 -4
- package/dist/cjs/ui/SyncedBlockErrorStateCard.js +1 -1
- package/dist/cjs/ui/SyncedBlockLoadError.js +1 -1
- package/dist/cjs/ui/SyncedBlockLoadingState.js +2 -3
- package/dist/cjs/ui/SyncedBlockNodeComponentRenderer.js +8 -12
- package/dist/cjs/ui/SyncedBlockNotFoundError.js +3 -4
- package/dist/cjs/ui/SyncedBlockPermissionDenied.js +2 -3
- package/dist/cjs/ui/SyncedBlockUnpublishedError.js +2 -3
- package/dist/cjs/useSyncedBlockNodeComponent.js +5 -11
- package/dist/es2019/ui/SyncedBlockErrorComponent.js +0 -4
- package/dist/es2019/ui/SyncedBlockErrorStateCard.js +1 -1
- package/dist/es2019/ui/SyncedBlockLoadError.js +1 -1
- package/dist/es2019/ui/SyncedBlockLoadingState.js +2 -3
- package/dist/es2019/ui/SyncedBlockNodeComponentRenderer.js +8 -12
- package/dist/es2019/ui/SyncedBlockNotFoundError.js +3 -4
- package/dist/es2019/ui/SyncedBlockPermissionDenied.js +2 -3
- package/dist/es2019/ui/SyncedBlockUnpublishedError.js +2 -3
- package/dist/es2019/useSyncedBlockNodeComponent.js +3 -9
- package/dist/esm/ui/SyncedBlockErrorComponent.js +0 -4
- package/dist/esm/ui/SyncedBlockErrorStateCard.js +1 -1
- package/dist/esm/ui/SyncedBlockLoadError.js +1 -1
- package/dist/esm/ui/SyncedBlockLoadingState.js +2 -3
- package/dist/esm/ui/SyncedBlockNodeComponentRenderer.js +8 -12
- package/dist/esm/ui/SyncedBlockNotFoundError.js +3 -4
- package/dist/esm/ui/SyncedBlockPermissionDenied.js +2 -3
- package/dist/esm/ui/SyncedBlockUnpublishedError.js +2 -3
- package/dist/esm/useSyncedBlockNodeComponent.js +5 -11
- package/package.json +6 -12
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @atlaskit/editor-synced-block-renderer
|
|
2
2
|
|
|
3
|
+
## 6.0.0
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies
|
|
8
|
+
|
|
9
|
+
## 5.9.8
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [`2e6129d5b39bc`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2e6129d5b39bc) -
|
|
14
|
+
EDITOR-5529 clean up platform_synced_block_patch_3 and platform_synced_block_patch_4
|
|
15
|
+
- Updated dependencies
|
|
16
|
+
|
|
3
17
|
## 5.9.7
|
|
4
18
|
|
|
5
19
|
### Patch Changes
|
|
@@ -10,7 +10,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
|
|
|
10
10
|
var _monitoring = require("@atlaskit/editor-common/monitoring");
|
|
11
11
|
var _syncBlock = require("@atlaskit/editor-common/sync-block");
|
|
12
12
|
var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
|
|
13
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
14
13
|
var _SyncedBlockGenericError = require("./SyncedBlockGenericError");
|
|
15
14
|
var _SyncedBlockLoadError = require("./SyncedBlockLoadError");
|
|
16
15
|
var _SyncedBlockNotFoundError = require("./SyncedBlockNotFoundError");
|
|
@@ -46,9 +45,6 @@ var SyncedBlockErrorComponent = exports.SyncedBlockErrorComponent = function Syn
|
|
|
46
45
|
fireAnalyticsEvent = _ref.fireAnalyticsEvent,
|
|
47
46
|
sourceURL = _ref.sourceURL;
|
|
48
47
|
(0, _react.useEffect)(function () {
|
|
49
|
-
if (!(0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
|
|
50
|
-
return;
|
|
51
|
-
}
|
|
52
48
|
fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent({
|
|
53
49
|
action: _analytics.ACTION.ERROR,
|
|
54
50
|
actionSubject: _analytics.ACTION_SUBJECT.SYNCED_BLOCK,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* SyncedBlockLoadingState.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockLoadingState.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
"use strict";
|
|
3
3
|
|
|
4
4
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
@@ -12,7 +12,6 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
12
12
|
var _reactIntlNext = require("react-intl-next");
|
|
13
13
|
var _messages = require("@atlaskit/editor-common/messages");
|
|
14
14
|
var _syncBlock = require("@atlaskit/editor-common/sync-block");
|
|
15
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
16
15
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
17
16
|
var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
|
|
18
17
|
var styles = {
|
|
@@ -30,7 +29,7 @@ var SyncedBlockLoadingState = exports.SyncedBlockLoadingState = function SyncedB
|
|
|
30
29
|
xcss: styles.wrapper
|
|
31
30
|
}, /*#__PURE__*/_react.default.createElement(_spinner.default, {
|
|
32
31
|
size: "small",
|
|
33
|
-
label:
|
|
32
|
+
label: formatMessage(_messages.syncBlockMessages.loadingSyncedContent)
|
|
34
33
|
})))
|
|
35
34
|
);
|
|
36
35
|
};
|
|
@@ -21,7 +21,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
|
|
|
21
21
|
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; }
|
|
22
22
|
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; }
|
|
23
23
|
var SyncedBlockNodeComponentRenderer = exports.SyncedBlockNodeComponentRenderer = function SyncedBlockNodeComponentRenderer(_ref) {
|
|
24
|
-
var _syncBlockInstance$
|
|
24
|
+
var _syncBlockInstance$da5;
|
|
25
25
|
var nodeProps = _ref.nodeProps,
|
|
26
26
|
syncBlockStoreManager = _ref.syncBlockStoreManager,
|
|
27
27
|
rendererOptions = _ref.rendererOptions;
|
|
@@ -48,7 +48,7 @@ var SyncedBlockNodeComponentRenderer = exports.SyncedBlockNodeComponentRenderer
|
|
|
48
48
|
ssrProviders = _useFetchSyncBlockDat.ssrProviders;
|
|
49
49
|
var finalRendererOptions = (0, _react.useMemo)(function () {
|
|
50
50
|
var _rendererOptions$medi, _ssrProviders$media;
|
|
51
|
-
if (
|
|
51
|
+
if (rendererOptions !== null && rendererOptions !== void 0 && (_rendererOptions$medi = rendererOptions.media) !== null && _rendererOptions$medi !== void 0 && _rendererOptions$medi.ssr ||
|
|
52
52
|
// already has ssr config
|
|
53
53
|
!(ssrProviders !== null && ssrProviders !== void 0 && (_ssrProviders$media = ssrProviders.media) !== null && _ssrProviders$media !== void 0 && _ssrProviders$media.viewMediaClientConfig)) {
|
|
54
54
|
return rendererOptions;
|
|
@@ -56,7 +56,7 @@ var SyncedBlockNodeComponentRenderer = exports.SyncedBlockNodeComponentRenderer
|
|
|
56
56
|
var mediaSSR = {
|
|
57
57
|
// Use synced block's media config so auth uses source contentId, not current page.
|
|
58
58
|
// Server: during SSR; client: after hydration (avoids using page's MediaClient).
|
|
59
|
-
mode: (0,
|
|
59
|
+
mode: (0, _coreUtils.isSSR)() ? 'server' : 'client',
|
|
60
60
|
config: ssrProviders === null || ssrProviders === void 0 ? void 0 : ssrProviders.media.viewMediaClientConfig
|
|
61
61
|
};
|
|
62
62
|
return _objectSpread(_objectSpread({}, rendererOptions), {}, {
|
|
@@ -103,7 +103,7 @@ var SyncedBlockNodeComponentRenderer = exports.SyncedBlockNodeComponentRenderer
|
|
|
103
103
|
return /*#__PURE__*/_react.default.createElement(_SyncedBlockLoadingState.SyncedBlockLoadingState, null);
|
|
104
104
|
}
|
|
105
105
|
if (!resourceId || syncBlockInstance !== null && syncBlockInstance !== void 0 && syncBlockInstance.error || !(syncBlockInstance !== null && syncBlockInstance !== void 0 && syncBlockInstance.data) || syncBlockInstance.data.status === 'deleted') {
|
|
106
|
-
var _syncBlockInstance$er2, _syncBlockInstance$da3, _syncBlockInstance$da4
|
|
106
|
+
var _syncBlockInstance$er2, _syncBlockInstance$da3, _syncBlockInstance$da4;
|
|
107
107
|
var errorMessage = (_syncBlockInstance$er2 = syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : syncBlockInstance.error) !== null && _syncBlockInstance$er2 !== void 0 ? _syncBlockInstance$er2 : (syncBlockInstance === null || syncBlockInstance === void 0 || (_syncBlockInstance$da3 = syncBlockInstance.data) === null || _syncBlockInstance$da3 === void 0 ? void 0 : _syncBlockInstance$da3.status) === 'deleted' ? {
|
|
108
108
|
type: _editorSyncedBlockProvider.SyncBlockError.NotFound,
|
|
109
109
|
reason: (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.deletionReason
|
|
@@ -112,25 +112,21 @@ var SyncedBlockNodeComponentRenderer = exports.SyncedBlockNodeComponentRenderer
|
|
|
112
112
|
reason: !resourceId ? 'missing resource id' : "missing data for block ".concat(resourceId)
|
|
113
113
|
};
|
|
114
114
|
return /*#__PURE__*/_react.default.createElement(_SyncedBlockErrorComponent.SyncedBlockErrorComponent, {
|
|
115
|
-
error:
|
|
116
|
-
type: _editorSyncedBlockProvider.SyncBlockError.NotFound
|
|
117
|
-
} : {
|
|
118
|
-
type: _editorSyncedBlockProvider.SyncBlockError.Errored
|
|
119
|
-
},
|
|
115
|
+
error: errorMessage,
|
|
120
116
|
resourceId: syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : syncBlockInstance.resourceId,
|
|
121
117
|
onRetry: reloadData,
|
|
122
118
|
isLoading: isLoading,
|
|
123
119
|
fireAnalyticsEvent: fireAnalyticsEvent
|
|
124
120
|
});
|
|
125
121
|
}
|
|
126
|
-
if ((syncBlockInstance === null || syncBlockInstance === void 0 || (_syncBlockInstance$
|
|
127
|
-
var _syncBlockInstance$
|
|
122
|
+
if ((syncBlockInstance === null || syncBlockInstance === void 0 || (_syncBlockInstance$da5 = syncBlockInstance.data) === null || _syncBlockInstance$da5 === void 0 ? void 0 : _syncBlockInstance$da5.status) === 'unpublished') {
|
|
123
|
+
var _syncBlockInstance$da6;
|
|
128
124
|
return /*#__PURE__*/_react.default.createElement(_SyncedBlockErrorComponent.SyncedBlockErrorComponent, {
|
|
129
125
|
error: {
|
|
130
126
|
type: _editorSyncedBlockProvider.SyncBlockError.Unpublished
|
|
131
127
|
},
|
|
132
128
|
resourceId: syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : syncBlockInstance.resourceId,
|
|
133
|
-
sourceURL: (_syncBlockInstance$
|
|
129
|
+
sourceURL: (_syncBlockInstance$da6 = syncBlockInstance.data) === null || _syncBlockInstance$da6 === void 0 ? void 0 : _syncBlockInstance$da6.sourceURL,
|
|
134
130
|
fireAnalyticsEvent: fireAnalyticsEvent
|
|
135
131
|
});
|
|
136
132
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* SyncedBlockNotFoundError.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockNotFoundError.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
"use strict";
|
|
3
3
|
|
|
4
4
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
@@ -20,7 +20,6 @@ var _syncBlock = require("@atlaskit/editor-common/sync-block");
|
|
|
20
20
|
var _cross = _interopRequireDefault(require("@atlaskit/icon/core/cross"));
|
|
21
21
|
var _eyeOpenStrikethrough = _interopRequireDefault(require("@atlaskit/icon/core/eye-open-strikethrough"));
|
|
22
22
|
var _linkBroken = _interopRequireDefault(require("@atlaskit/icon/core/link-broken"));
|
|
23
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
24
23
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
25
24
|
var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
|
|
26
25
|
var _SyncedBlockErrorStateCard = require("./SyncedBlockErrorStateCard");
|
|
@@ -70,7 +69,7 @@ var useErrorInfo = function useErrorInfo(reason, url, title) {
|
|
|
70
69
|
icon: _icon2
|
|
71
70
|
};
|
|
72
71
|
}
|
|
73
|
-
var _ref = (
|
|
72
|
+
var _ref = (_errorMap = errorMap[reason || 'generic']) !== null && _errorMap !== void 0 ? _errorMap : errorMap['generic'],
|
|
74
73
|
icon = _ref.icon,
|
|
75
74
|
description = _ref.description;
|
|
76
75
|
return {
|
|
@@ -80,7 +79,7 @@ var useErrorInfo = function useErrorInfo(reason, url, title) {
|
|
|
80
79
|
return /*#__PURE__*/_react.default.createElement(_compiled.Anchor, {
|
|
81
80
|
href: url,
|
|
82
81
|
target: "_blank",
|
|
83
|
-
rel:
|
|
82
|
+
rel: 'noopener noreferrer',
|
|
84
83
|
xcss: styles.link
|
|
85
84
|
}, chunk);
|
|
86
85
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* SyncedBlockPermissionDenied.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockPermissionDenied.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
"use strict";
|
|
3
3
|
|
|
4
4
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
@@ -19,7 +19,6 @@ var _messages = require("@atlaskit/editor-common/messages");
|
|
|
19
19
|
var _heading = _interopRequireDefault(require("@atlaskit/heading"));
|
|
20
20
|
var _statusSuccess = _interopRequireDefault(require("@atlaskit/icon/core/status-success"));
|
|
21
21
|
var _image = _interopRequireDefault(require("@atlaskit/image"));
|
|
22
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
23
22
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
24
23
|
var _PermissionDenied = _interopRequireDefault(require("./assets/PermissionDenied.svg"));
|
|
25
24
|
var _SyncedBlockGenericError = require("./SyncedBlockGenericError");
|
|
@@ -85,7 +84,7 @@ var SyncedBlockPermissionDeniedConfluencePage = function SyncedBlockPermissionDe
|
|
|
85
84
|
}, /*#__PURE__*/_react.default.createElement(_statusSuccess.default, {
|
|
86
85
|
size: "small",
|
|
87
86
|
color: "var(--ds-icon-subtle, #505258)",
|
|
88
|
-
label:
|
|
87
|
+
label: formatMessage(_messages.syncBlockMessages.accessRequested)
|
|
89
88
|
}), /*#__PURE__*/_react.default.createElement(_compiled.Text, {
|
|
90
89
|
color: "color.text.subtlest",
|
|
91
90
|
weight: "bold",
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* SyncedBlockUnpublishedError.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockUnpublishedError.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
"use strict";
|
|
3
3
|
|
|
4
4
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
@@ -12,7 +12,6 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
12
12
|
var _reactIntlNext = require("react-intl-next");
|
|
13
13
|
var _messages = require("@atlaskit/editor-common/messages");
|
|
14
14
|
var _eyeOpenStrikethrough = _interopRequireDefault(require("@atlaskit/icon/core/eye-open-strikethrough"));
|
|
15
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
16
15
|
var _compiled = require("@atlaskit/primitives/compiled");
|
|
17
16
|
var _SyncedBlockErrorStateCard = require("./SyncedBlockErrorStateCard");
|
|
18
17
|
var styles = {
|
|
@@ -27,7 +26,7 @@ var SyncedBlockUnpublishedError = exports.SyncedBlockUnpublishedError = function
|
|
|
27
26
|
return sourceURL ? /*#__PURE__*/_react.default.createElement(_compiled.Text, null, /*#__PURE__*/_react.default.createElement(_compiled.Anchor, {
|
|
28
27
|
href: sourceURL,
|
|
29
28
|
target: "_blank",
|
|
30
|
-
rel:
|
|
29
|
+
rel: 'noopener noreferrer',
|
|
31
30
|
xcss: styles.link
|
|
32
31
|
}, chunks)) : chunks;
|
|
33
32
|
}
|
|
@@ -10,7 +10,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
|
|
|
10
10
|
var _errorBoundary = require("@atlaskit/editor-common/error-boundary");
|
|
11
11
|
var _syncBlock = require("@atlaskit/editor-common/sync-block");
|
|
12
12
|
var _editorSyncedBlockProvider = require("@atlaskit/editor-synced-block-provider");
|
|
13
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
14
13
|
var _SyncedBlockNodeComponentRenderer = require("./ui/SyncedBlockNodeComponentRenderer");
|
|
15
14
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
16
15
|
var getSyncBlockNodesFromDoc = exports.getSyncBlockNodesFromDoc = function getSyncBlockNodesFromDoc(doc) {
|
|
@@ -34,16 +33,11 @@ var useMemoizedSyncedBlockNodeComponent = exports.useMemoizedSyncedBlockNodeComp
|
|
|
34
33
|
// Process prefetched data early, if available
|
|
35
34
|
(0, _react.useEffect)(function () {
|
|
36
35
|
if (getPrefetchedData) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
// Silently ignore errors from getPrefetchedData so the fetch effect can still run
|
|
43
|
-
}
|
|
44
|
-
} else {
|
|
45
|
-
var _prefetchedData = getPrefetchedData();
|
|
46
|
-
syncBlockStoreManager.referenceManager.processPrefetchedData(_prefetchedData);
|
|
36
|
+
try {
|
|
37
|
+
var prefetchedData = getPrefetchedData();
|
|
38
|
+
syncBlockStoreManager.referenceManager.processPrefetchedData(prefetchedData);
|
|
39
|
+
} catch (_unused) {
|
|
40
|
+
// Silently ignore errors from getPrefetchedData so the fetch effect can still run
|
|
47
41
|
}
|
|
48
42
|
}
|
|
49
43
|
}, [getPrefetchedData, syncBlockStoreManager.referenceManager]);
|
|
@@ -3,7 +3,6 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
|
|
|
3
3
|
import { logException } from '@atlaskit/editor-common/monitoring';
|
|
4
4
|
import { SyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
|
|
5
5
|
import { fetchErrorPayload, getContentIdAndProductFromResourceId, SyncBlockError } from '@atlaskit/editor-synced-block-provider';
|
|
6
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
6
|
import { SyncedBlockGenericError } from './SyncedBlockGenericError';
|
|
8
7
|
import { SyncedBlockLoadError } from './SyncedBlockLoadError';
|
|
9
8
|
import { SyncedBlockNotFoundError } from './SyncedBlockNotFoundError';
|
|
@@ -40,9 +39,6 @@ export const SyncedBlockErrorComponent = ({
|
|
|
40
39
|
sourceURL
|
|
41
40
|
}) => {
|
|
42
41
|
useEffect(() => {
|
|
43
|
-
if (!fg('platform_synced_block_patch_3')) {
|
|
44
|
-
return;
|
|
45
|
-
}
|
|
46
42
|
fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 ? void 0 : fireAnalyticsEvent({
|
|
47
43
|
action: ACTION.ERROR,
|
|
48
44
|
actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* SyncedBlockErrorStateCard.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockErrorStateCard.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
import "./SyncedBlockErrorStateCard.compiled.css";
|
|
3
3
|
import { ax, ix } from "@compiled/react/runtime";
|
|
4
4
|
import React from 'react';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* SyncedBlockLoadError.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockLoadError.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
import "./SyncedBlockLoadError.compiled.css";
|
|
3
3
|
import { ax, ix } from "@compiled/react/runtime";
|
|
4
4
|
import React from 'react';
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
/* SyncedBlockLoadingState.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockLoadingState.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
import "./SyncedBlockLoadingState.compiled.css";
|
|
3
3
|
import { ax, ix } from "@compiled/react/runtime";
|
|
4
4
|
import React from 'react';
|
|
5
5
|
import { useIntl } from 'react-intl-next';
|
|
6
6
|
import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
|
|
7
7
|
import { SyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
|
|
8
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
8
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
10
9
|
import Spinner from '@atlaskit/spinner';
|
|
11
10
|
const styles = {
|
|
@@ -24,7 +23,7 @@ export const SyncedBlockLoadingState = () => {
|
|
|
24
23
|
xcss: styles.wrapper
|
|
25
24
|
}, /*#__PURE__*/React.createElement(Spinner, {
|
|
26
25
|
size: "small",
|
|
27
|
-
label:
|
|
26
|
+
label: formatMessage(messages.loadingSyncedContent)
|
|
28
27
|
})))
|
|
29
28
|
);
|
|
30
29
|
};
|
|
@@ -12,7 +12,7 @@ export const SyncedBlockNodeComponentRenderer = ({
|
|
|
12
12
|
syncBlockStoreManager,
|
|
13
13
|
rendererOptions
|
|
14
14
|
}) => {
|
|
15
|
-
var _syncBlockInstance$
|
|
15
|
+
var _syncBlockInstance$da5;
|
|
16
16
|
const {
|
|
17
17
|
resourceId,
|
|
18
18
|
localId,
|
|
@@ -39,7 +39,7 @@ export const SyncedBlockNodeComponentRenderer = ({
|
|
|
39
39
|
} = useFetchSyncBlockData(syncBlockStoreManager, resourceId, localId, fireAnalyticsEvent);
|
|
40
40
|
const finalRendererOptions = useMemo(() => {
|
|
41
41
|
var _rendererOptions$medi, _ssrProviders$media;
|
|
42
|
-
if (
|
|
42
|
+
if (rendererOptions !== null && rendererOptions !== void 0 && (_rendererOptions$medi = rendererOptions.media) !== null && _rendererOptions$medi !== void 0 && _rendererOptions$medi.ssr ||
|
|
43
43
|
// already has ssr config
|
|
44
44
|
!(ssrProviders !== null && ssrProviders !== void 0 && (_ssrProviders$media = ssrProviders.media) !== null && _ssrProviders$media !== void 0 && _ssrProviders$media.viewMediaClientConfig)) {
|
|
45
45
|
return rendererOptions;
|
|
@@ -47,7 +47,7 @@ export const SyncedBlockNodeComponentRenderer = ({
|
|
|
47
47
|
const mediaSSR = {
|
|
48
48
|
// Use synced block's media config so auth uses source contentId, not current page.
|
|
49
49
|
// Server: during SSR; client: after hydration (avoids using page's MediaClient).
|
|
50
|
-
mode:
|
|
50
|
+
mode: isSSR() ? 'server' : 'client',
|
|
51
51
|
config: ssrProviders === null || ssrProviders === void 0 ? void 0 : ssrProviders.media.viewMediaClientConfig
|
|
52
52
|
};
|
|
53
53
|
return {
|
|
@@ -98,7 +98,7 @@ export const SyncedBlockNodeComponentRenderer = ({
|
|
|
98
98
|
return /*#__PURE__*/React.createElement(SyncedBlockLoadingState, null);
|
|
99
99
|
}
|
|
100
100
|
if (!resourceId || syncBlockInstance !== null && syncBlockInstance !== void 0 && syncBlockInstance.error || !(syncBlockInstance !== null && syncBlockInstance !== void 0 && syncBlockInstance.data) || syncBlockInstance.data.status === 'deleted') {
|
|
101
|
-
var _syncBlockInstance$er2, _syncBlockInstance$da3, _syncBlockInstance$da4
|
|
101
|
+
var _syncBlockInstance$er2, _syncBlockInstance$da3, _syncBlockInstance$da4;
|
|
102
102
|
const errorMessage = (_syncBlockInstance$er2 = syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : syncBlockInstance.error) !== null && _syncBlockInstance$er2 !== void 0 ? _syncBlockInstance$er2 : (syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : (_syncBlockInstance$da3 = syncBlockInstance.data) === null || _syncBlockInstance$da3 === void 0 ? void 0 : _syncBlockInstance$da3.status) === 'deleted' ? {
|
|
103
103
|
type: SyncBlockError.NotFound,
|
|
104
104
|
reason: (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.deletionReason
|
|
@@ -107,25 +107,21 @@ export const SyncedBlockNodeComponentRenderer = ({
|
|
|
107
107
|
reason: !resourceId ? 'missing resource id' : `missing data for block ${resourceId}`
|
|
108
108
|
};
|
|
109
109
|
return /*#__PURE__*/React.createElement(SyncedBlockErrorComponent, {
|
|
110
|
-
error:
|
|
111
|
-
type: SyncBlockError.NotFound
|
|
112
|
-
} : {
|
|
113
|
-
type: SyncBlockError.Errored
|
|
114
|
-
},
|
|
110
|
+
error: errorMessage,
|
|
115
111
|
resourceId: syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : syncBlockInstance.resourceId,
|
|
116
112
|
onRetry: reloadData,
|
|
117
113
|
isLoading: isLoading,
|
|
118
114
|
fireAnalyticsEvent: fireAnalyticsEvent
|
|
119
115
|
});
|
|
120
116
|
}
|
|
121
|
-
if ((syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : (_syncBlockInstance$
|
|
122
|
-
var _syncBlockInstance$
|
|
117
|
+
if ((syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : (_syncBlockInstance$da5 = syncBlockInstance.data) === null || _syncBlockInstance$da5 === void 0 ? void 0 : _syncBlockInstance$da5.status) === 'unpublished') {
|
|
118
|
+
var _syncBlockInstance$da6;
|
|
123
119
|
return /*#__PURE__*/React.createElement(SyncedBlockErrorComponent, {
|
|
124
120
|
error: {
|
|
125
121
|
type: SyncBlockError.Unpublished
|
|
126
122
|
},
|
|
127
123
|
resourceId: syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : syncBlockInstance.resourceId,
|
|
128
|
-
sourceURL: (_syncBlockInstance$
|
|
124
|
+
sourceURL: (_syncBlockInstance$da6 = syncBlockInstance.data) === null || _syncBlockInstance$da6 === void 0 ? void 0 : _syncBlockInstance$da6.sourceURL,
|
|
129
125
|
fireAnalyticsEvent: fireAnalyticsEvent
|
|
130
126
|
});
|
|
131
127
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* SyncedBlockNotFoundError.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockNotFoundError.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
import "./SyncedBlockNotFoundError.compiled.css";
|
|
3
3
|
import { ax, ix } from "@compiled/react/runtime";
|
|
4
4
|
import React, { useEffect, useState } from 'react';
|
|
@@ -9,7 +9,6 @@ import { useSyncBlockActions } from '@atlaskit/editor-common/sync-block';
|
|
|
9
9
|
import CrossIcon from '@atlaskit/icon/core/cross';
|
|
10
10
|
import EyeOpenStrikethroughIcon from '@atlaskit/icon/core/eye-open-strikethrough';
|
|
11
11
|
import LinkBrokenIcon from '@atlaskit/icon/core/link-broken';
|
|
12
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
13
12
|
import { Anchor, Box } from '@atlaskit/primitives/compiled';
|
|
14
13
|
import Spinner from '@atlaskit/spinner';
|
|
15
14
|
import { SyncedBlockErrorStateCard } from './SyncedBlockErrorStateCard';
|
|
@@ -64,14 +63,14 @@ const useErrorInfo = (reason, url, title) => {
|
|
|
64
63
|
const {
|
|
65
64
|
icon,
|
|
66
65
|
description
|
|
67
|
-
} =
|
|
66
|
+
} = (_errorMap = errorMap[reason || 'generic']) !== null && _errorMap !== void 0 ? _errorMap : errorMap['generic'];
|
|
68
67
|
return {
|
|
69
68
|
description: formatMessage(description, {
|
|
70
69
|
title,
|
|
71
70
|
a: chunk => /*#__PURE__*/React.createElement(Anchor, {
|
|
72
71
|
href: url,
|
|
73
72
|
target: "_blank",
|
|
74
|
-
rel:
|
|
73
|
+
rel: 'noopener noreferrer',
|
|
75
74
|
xcss: styles.link
|
|
76
75
|
}, chunk)
|
|
77
76
|
}),
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* SyncedBlockPermissionDenied.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockPermissionDenied.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
import "./SyncedBlockPermissionDenied.compiled.css";
|
|
3
3
|
import { ax, ix } from "@compiled/react/runtime";
|
|
4
4
|
import _SyncedBlockPermissionDeniedRequestAccessMutation from "./__generated__/SyncedBlockPermissionDeniedRequestAccessMutation.graphql";
|
|
@@ -10,7 +10,6 @@ import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages'
|
|
|
10
10
|
import Heading from '@atlaskit/heading';
|
|
11
11
|
import StatusSuccessIcon from '@atlaskit/icon/core/status-success';
|
|
12
12
|
import Image from '@atlaskit/image';
|
|
13
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
14
13
|
import { Text, Flex, Stack, Box } from '@atlaskit/primitives/compiled';
|
|
15
14
|
import PermissionDenied from './assets/PermissionDenied.svg';
|
|
16
15
|
import { SyncedBlockGenericError } from './SyncedBlockGenericError';
|
|
@@ -72,7 +71,7 @@ const SyncedBlockPermissionDeniedConfluencePage = ({
|
|
|
72
71
|
}, /*#__PURE__*/React.createElement(StatusSuccessIcon, {
|
|
73
72
|
size: "small",
|
|
74
73
|
color: "var(--ds-icon-subtle, #505258)",
|
|
75
|
-
label:
|
|
74
|
+
label: formatMessage(messages.accessRequested)
|
|
76
75
|
}), /*#__PURE__*/React.createElement(Text, {
|
|
77
76
|
color: "color.text.subtlest",
|
|
78
77
|
weight: "bold",
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
/* SyncedBlockUnpublishedError.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockUnpublishedError.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
import "./SyncedBlockUnpublishedError.compiled.css";
|
|
3
3
|
import { ax, ix } from "@compiled/react/runtime";
|
|
4
4
|
import React from 'react';
|
|
5
5
|
import { useIntl } from 'react-intl-next';
|
|
6
6
|
import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
|
|
7
7
|
import EyeOpenStrikethroughIcon from '@atlaskit/icon/core/eye-open-strikethrough';
|
|
8
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
8
|
import { Anchor, Text } from '@atlaskit/primitives/compiled';
|
|
10
9
|
import { SyncedBlockErrorStateCard } from './SyncedBlockErrorStateCard';
|
|
11
10
|
const styles = {
|
|
@@ -21,7 +20,7 @@ export const SyncedBlockUnpublishedError = ({
|
|
|
21
20
|
link: chunks => sourceURL ? /*#__PURE__*/React.createElement(Text, null, /*#__PURE__*/React.createElement(Anchor, {
|
|
22
21
|
href: sourceURL,
|
|
23
22
|
target: "_blank",
|
|
24
|
-
rel:
|
|
23
|
+
rel: 'noopener noreferrer',
|
|
25
24
|
xcss: styles.link
|
|
26
25
|
}, chunks)) : chunks
|
|
27
26
|
});
|
|
@@ -3,7 +3,6 @@ import { ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
|
|
|
3
3
|
import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
|
|
4
4
|
import { SyncBlockActionsProvider } from '@atlaskit/editor-common/sync-block';
|
|
5
5
|
import { convertSyncBlockJSONNodeToSyncBlockNode, useMemoizedSyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
|
|
6
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
6
|
import { SyncedBlockNodeComponentRenderer } from './ui/SyncedBlockNodeComponentRenderer';
|
|
8
7
|
export const getSyncBlockNodesFromDoc = doc => {
|
|
9
8
|
const {
|
|
@@ -25,16 +24,11 @@ export const useMemoizedSyncedBlockNodeComponent = ({
|
|
|
25
24
|
// Process prefetched data early, if available
|
|
26
25
|
useEffect(() => {
|
|
27
26
|
if (getPrefetchedData) {
|
|
28
|
-
|
|
29
|
-
try {
|
|
30
|
-
const prefetchedData = getPrefetchedData();
|
|
31
|
-
syncBlockStoreManager.referenceManager.processPrefetchedData(prefetchedData);
|
|
32
|
-
} catch {
|
|
33
|
-
// Silently ignore errors from getPrefetchedData so the fetch effect can still run
|
|
34
|
-
}
|
|
35
|
-
} else {
|
|
27
|
+
try {
|
|
36
28
|
const prefetchedData = getPrefetchedData();
|
|
37
29
|
syncBlockStoreManager.referenceManager.processPrefetchedData(prefetchedData);
|
|
30
|
+
} catch {
|
|
31
|
+
// Silently ignore errors from getPrefetchedData so the fetch effect can still run
|
|
38
32
|
}
|
|
39
33
|
}
|
|
40
34
|
}, [getPrefetchedData, syncBlockStoreManager.referenceManager]);
|
|
@@ -3,7 +3,6 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
|
|
|
3
3
|
import { logException } from '@atlaskit/editor-common/monitoring';
|
|
4
4
|
import { SyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
|
|
5
5
|
import { fetchErrorPayload, getContentIdAndProductFromResourceId, SyncBlockError } from '@atlaskit/editor-synced-block-provider';
|
|
6
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
6
|
import { SyncedBlockGenericError } from './SyncedBlockGenericError';
|
|
8
7
|
import { SyncedBlockLoadError } from './SyncedBlockLoadError';
|
|
9
8
|
import { SyncedBlockNotFoundError } from './SyncedBlockNotFoundError';
|
|
@@ -38,9 +37,6 @@ export var SyncedBlockErrorComponent = function SyncedBlockErrorComponent(_ref)
|
|
|
38
37
|
fireAnalyticsEvent = _ref.fireAnalyticsEvent,
|
|
39
38
|
sourceURL = _ref.sourceURL;
|
|
40
39
|
useEffect(function () {
|
|
41
|
-
if (!fg('platform_synced_block_patch_3')) {
|
|
42
|
-
return;
|
|
43
|
-
}
|
|
44
40
|
fireAnalyticsEvent === null || fireAnalyticsEvent === void 0 || fireAnalyticsEvent({
|
|
45
41
|
action: ACTION.ERROR,
|
|
46
42
|
actionSubject: ACTION_SUBJECT.SYNCED_BLOCK,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* SyncedBlockErrorStateCard.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockErrorStateCard.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
import "./SyncedBlockErrorStateCard.compiled.css";
|
|
3
3
|
import { ax, ix } from "@compiled/react/runtime";
|
|
4
4
|
import React from 'react';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* SyncedBlockLoadError.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockLoadError.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
import "./SyncedBlockLoadError.compiled.css";
|
|
3
3
|
import { ax, ix } from "@compiled/react/runtime";
|
|
4
4
|
import React from 'react';
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
/* SyncedBlockLoadingState.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockLoadingState.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
import "./SyncedBlockLoadingState.compiled.css";
|
|
3
3
|
import { ax, ix } from "@compiled/react/runtime";
|
|
4
4
|
import React from 'react';
|
|
5
5
|
import { useIntl } from 'react-intl-next';
|
|
6
6
|
import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
|
|
7
7
|
import { SyncBlockSharedCssClassName } from '@atlaskit/editor-common/sync-block';
|
|
8
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
8
|
import { Box } from '@atlaskit/primitives/compiled';
|
|
10
9
|
import Spinner from '@atlaskit/spinner';
|
|
11
10
|
var styles = {
|
|
@@ -23,7 +22,7 @@ export var SyncedBlockLoadingState = function SyncedBlockLoadingState() {
|
|
|
23
22
|
xcss: styles.wrapper
|
|
24
23
|
}, /*#__PURE__*/React.createElement(Spinner, {
|
|
25
24
|
size: "small",
|
|
26
|
-
label:
|
|
25
|
+
label: formatMessage(messages.loadingSyncedContent)
|
|
27
26
|
})))
|
|
28
27
|
);
|
|
29
28
|
};
|
|
@@ -12,7 +12,7 @@ import { renderSyncedBlockContent } from './renderSyncedBlockContent';
|
|
|
12
12
|
import { SyncedBlockErrorComponent } from './SyncedBlockErrorComponent';
|
|
13
13
|
import { SyncedBlockLoadingState } from './SyncedBlockLoadingState';
|
|
14
14
|
export var SyncedBlockNodeComponentRenderer = function SyncedBlockNodeComponentRenderer(_ref) {
|
|
15
|
-
var _syncBlockInstance$
|
|
15
|
+
var _syncBlockInstance$da5;
|
|
16
16
|
var nodeProps = _ref.nodeProps,
|
|
17
17
|
syncBlockStoreManager = _ref.syncBlockStoreManager,
|
|
18
18
|
rendererOptions = _ref.rendererOptions;
|
|
@@ -39,7 +39,7 @@ export var SyncedBlockNodeComponentRenderer = function SyncedBlockNodeComponentR
|
|
|
39
39
|
ssrProviders = _useFetchSyncBlockDat.ssrProviders;
|
|
40
40
|
var finalRendererOptions = useMemo(function () {
|
|
41
41
|
var _rendererOptions$medi, _ssrProviders$media;
|
|
42
|
-
if (
|
|
42
|
+
if (rendererOptions !== null && rendererOptions !== void 0 && (_rendererOptions$medi = rendererOptions.media) !== null && _rendererOptions$medi !== void 0 && _rendererOptions$medi.ssr ||
|
|
43
43
|
// already has ssr config
|
|
44
44
|
!(ssrProviders !== null && ssrProviders !== void 0 && (_ssrProviders$media = ssrProviders.media) !== null && _ssrProviders$media !== void 0 && _ssrProviders$media.viewMediaClientConfig)) {
|
|
45
45
|
return rendererOptions;
|
|
@@ -47,7 +47,7 @@ export var SyncedBlockNodeComponentRenderer = function SyncedBlockNodeComponentR
|
|
|
47
47
|
var mediaSSR = {
|
|
48
48
|
// Use synced block's media config so auth uses source contentId, not current page.
|
|
49
49
|
// Server: during SSR; client: after hydration (avoids using page's MediaClient).
|
|
50
|
-
mode:
|
|
50
|
+
mode: isSSR() ? 'server' : 'client',
|
|
51
51
|
config: ssrProviders === null || ssrProviders === void 0 ? void 0 : ssrProviders.media.viewMediaClientConfig
|
|
52
52
|
};
|
|
53
53
|
return _objectSpread(_objectSpread({}, rendererOptions), {}, {
|
|
@@ -94,7 +94,7 @@ export var SyncedBlockNodeComponentRenderer = function SyncedBlockNodeComponentR
|
|
|
94
94
|
return /*#__PURE__*/React.createElement(SyncedBlockLoadingState, null);
|
|
95
95
|
}
|
|
96
96
|
if (!resourceId || syncBlockInstance !== null && syncBlockInstance !== void 0 && syncBlockInstance.error || !(syncBlockInstance !== null && syncBlockInstance !== void 0 && syncBlockInstance.data) || syncBlockInstance.data.status === 'deleted') {
|
|
97
|
-
var _syncBlockInstance$er2, _syncBlockInstance$da3, _syncBlockInstance$da4
|
|
97
|
+
var _syncBlockInstance$er2, _syncBlockInstance$da3, _syncBlockInstance$da4;
|
|
98
98
|
var errorMessage = (_syncBlockInstance$er2 = syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : syncBlockInstance.error) !== null && _syncBlockInstance$er2 !== void 0 ? _syncBlockInstance$er2 : (syncBlockInstance === null || syncBlockInstance === void 0 || (_syncBlockInstance$da3 = syncBlockInstance.data) === null || _syncBlockInstance$da3 === void 0 ? void 0 : _syncBlockInstance$da3.status) === 'deleted' ? {
|
|
99
99
|
type: SyncBlockError.NotFound,
|
|
100
100
|
reason: (_syncBlockInstance$da4 = syncBlockInstance.data) === null || _syncBlockInstance$da4 === void 0 ? void 0 : _syncBlockInstance$da4.deletionReason
|
|
@@ -103,25 +103,21 @@ export var SyncedBlockNodeComponentRenderer = function SyncedBlockNodeComponentR
|
|
|
103
103
|
reason: !resourceId ? 'missing resource id' : "missing data for block ".concat(resourceId)
|
|
104
104
|
};
|
|
105
105
|
return /*#__PURE__*/React.createElement(SyncedBlockErrorComponent, {
|
|
106
|
-
error:
|
|
107
|
-
type: SyncBlockError.NotFound
|
|
108
|
-
} : {
|
|
109
|
-
type: SyncBlockError.Errored
|
|
110
|
-
},
|
|
106
|
+
error: errorMessage,
|
|
111
107
|
resourceId: syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : syncBlockInstance.resourceId,
|
|
112
108
|
onRetry: reloadData,
|
|
113
109
|
isLoading: isLoading,
|
|
114
110
|
fireAnalyticsEvent: fireAnalyticsEvent
|
|
115
111
|
});
|
|
116
112
|
}
|
|
117
|
-
if ((syncBlockInstance === null || syncBlockInstance === void 0 || (_syncBlockInstance$
|
|
118
|
-
var _syncBlockInstance$
|
|
113
|
+
if ((syncBlockInstance === null || syncBlockInstance === void 0 || (_syncBlockInstance$da5 = syncBlockInstance.data) === null || _syncBlockInstance$da5 === void 0 ? void 0 : _syncBlockInstance$da5.status) === 'unpublished') {
|
|
114
|
+
var _syncBlockInstance$da6;
|
|
119
115
|
return /*#__PURE__*/React.createElement(SyncedBlockErrorComponent, {
|
|
120
116
|
error: {
|
|
121
117
|
type: SyncBlockError.Unpublished
|
|
122
118
|
},
|
|
123
119
|
resourceId: syncBlockInstance === null || syncBlockInstance === void 0 ? void 0 : syncBlockInstance.resourceId,
|
|
124
|
-
sourceURL: (_syncBlockInstance$
|
|
120
|
+
sourceURL: (_syncBlockInstance$da6 = syncBlockInstance.data) === null || _syncBlockInstance$da6 === void 0 ? void 0 : _syncBlockInstance$da6.sourceURL,
|
|
125
121
|
fireAnalyticsEvent: fireAnalyticsEvent
|
|
126
122
|
});
|
|
127
123
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* SyncedBlockNotFoundError.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockNotFoundError.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
|
3
3
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
4
4
|
import "./SyncedBlockNotFoundError.compiled.css";
|
|
@@ -12,7 +12,6 @@ import { useSyncBlockActions } from '@atlaskit/editor-common/sync-block';
|
|
|
12
12
|
import CrossIcon from '@atlaskit/icon/core/cross';
|
|
13
13
|
import EyeOpenStrikethroughIcon from '@atlaskit/icon/core/eye-open-strikethrough';
|
|
14
14
|
import LinkBrokenIcon from '@atlaskit/icon/core/link-broken';
|
|
15
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
16
15
|
import { Anchor, Box } from '@atlaskit/primitives/compiled';
|
|
17
16
|
import Spinner from '@atlaskit/spinner';
|
|
18
17
|
import { SyncedBlockErrorStateCard } from './SyncedBlockErrorStateCard';
|
|
@@ -61,7 +60,7 @@ var useErrorInfo = function useErrorInfo(reason, url, title) {
|
|
|
61
60
|
icon: _icon2
|
|
62
61
|
};
|
|
63
62
|
}
|
|
64
|
-
var _ref =
|
|
63
|
+
var _ref = (_errorMap = errorMap[reason || 'generic']) !== null && _errorMap !== void 0 ? _errorMap : errorMap['generic'],
|
|
65
64
|
icon = _ref.icon,
|
|
66
65
|
description = _ref.description;
|
|
67
66
|
return {
|
|
@@ -71,7 +70,7 @@ var useErrorInfo = function useErrorInfo(reason, url, title) {
|
|
|
71
70
|
return /*#__PURE__*/React.createElement(Anchor, {
|
|
72
71
|
href: url,
|
|
73
72
|
target: "_blank",
|
|
74
|
-
rel:
|
|
73
|
+
rel: 'noopener noreferrer',
|
|
75
74
|
xcss: styles.link
|
|
76
75
|
}, chunk);
|
|
77
76
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/* SyncedBlockPermissionDenied.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockPermissionDenied.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
3
3
|
import "./SyncedBlockPermissionDenied.compiled.css";
|
|
4
4
|
import { ax, ix } from "@compiled/react/runtime";
|
|
@@ -11,7 +11,6 @@ import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages'
|
|
|
11
11
|
import Heading from '@atlaskit/heading';
|
|
12
12
|
import StatusSuccessIcon from '@atlaskit/icon/core/status-success';
|
|
13
13
|
import Image from '@atlaskit/image';
|
|
14
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
15
14
|
import { Text, Flex, Stack, Box } from '@atlaskit/primitives/compiled';
|
|
16
15
|
import PermissionDenied from './assets/PermissionDenied.svg';
|
|
17
16
|
import { SyncedBlockGenericError } from './SyncedBlockGenericError';
|
|
@@ -76,7 +75,7 @@ var SyncedBlockPermissionDeniedConfluencePage = function SyncedBlockPermissionDe
|
|
|
76
75
|
}, /*#__PURE__*/React.createElement(StatusSuccessIcon, {
|
|
77
76
|
size: "small",
|
|
78
77
|
color: "var(--ds-icon-subtle, #505258)",
|
|
79
|
-
label:
|
|
78
|
+
label: formatMessage(messages.accessRequested)
|
|
80
79
|
}), /*#__PURE__*/React.createElement(Text, {
|
|
81
80
|
color: "color.text.subtlest",
|
|
82
81
|
weight: "bold",
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
/* SyncedBlockUnpublishedError.tsx generated by @compiled/babel-plugin v0.
|
|
1
|
+
/* SyncedBlockUnpublishedError.tsx generated by @compiled/babel-plugin v0.39.1 */
|
|
2
2
|
import "./SyncedBlockUnpublishedError.compiled.css";
|
|
3
3
|
import { ax, ix } from "@compiled/react/runtime";
|
|
4
4
|
import React from 'react';
|
|
5
5
|
import { useIntl } from 'react-intl-next';
|
|
6
6
|
import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
|
|
7
7
|
import EyeOpenStrikethroughIcon from '@atlaskit/icon/core/eye-open-strikethrough';
|
|
8
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
9
8
|
import { Anchor, Text } from '@atlaskit/primitives/compiled';
|
|
10
9
|
import { SyncedBlockErrorStateCard } from './SyncedBlockErrorStateCard';
|
|
11
10
|
var styles = {
|
|
@@ -20,7 +19,7 @@ export var SyncedBlockUnpublishedError = function SyncedBlockUnpublishedError(_r
|
|
|
20
19
|
return sourceURL ? /*#__PURE__*/React.createElement(Text, null, /*#__PURE__*/React.createElement(Anchor, {
|
|
21
20
|
href: sourceURL,
|
|
22
21
|
target: "_blank",
|
|
23
|
-
rel:
|
|
22
|
+
rel: 'noopener noreferrer',
|
|
24
23
|
xcss: styles.link
|
|
25
24
|
}, chunks)) : chunks;
|
|
26
25
|
}
|
|
@@ -3,7 +3,6 @@ import { ACTION_SUBJECT } from '@atlaskit/editor-common/analytics';
|
|
|
3
3
|
import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
|
|
4
4
|
import { SyncBlockActionsProvider } from '@atlaskit/editor-common/sync-block';
|
|
5
5
|
import { convertSyncBlockJSONNodeToSyncBlockNode, useMemoizedSyncBlockStoreManager } from '@atlaskit/editor-synced-block-provider';
|
|
6
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
6
|
import { SyncedBlockNodeComponentRenderer } from './ui/SyncedBlockNodeComponentRenderer';
|
|
8
7
|
export var getSyncBlockNodesFromDoc = function getSyncBlockNodesFromDoc(doc) {
|
|
9
8
|
var content = doc.content;
|
|
@@ -26,16 +25,11 @@ export var useMemoizedSyncedBlockNodeComponent = function useMemoizedSyncedBlock
|
|
|
26
25
|
// Process prefetched data early, if available
|
|
27
26
|
useEffect(function () {
|
|
28
27
|
if (getPrefetchedData) {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
// Silently ignore errors from getPrefetchedData so the fetch effect can still run
|
|
35
|
-
}
|
|
36
|
-
} else {
|
|
37
|
-
var _prefetchedData = getPrefetchedData();
|
|
38
|
-
syncBlockStoreManager.referenceManager.processPrefetchedData(_prefetchedData);
|
|
28
|
+
try {
|
|
29
|
+
var prefetchedData = getPrefetchedData();
|
|
30
|
+
syncBlockStoreManager.referenceManager.processPrefetchedData(prefetchedData);
|
|
31
|
+
} catch (_unused) {
|
|
32
|
+
// Silently ignore errors from getPrefetchedData so the fetch effect can still run
|
|
39
33
|
}
|
|
40
34
|
}
|
|
41
35
|
}, [getPrefetchedData, syncBlockStoreManager.referenceManager]);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-synced-block-renderer",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "6.0.0",
|
|
4
4
|
"description": "SyncedBlockRenderer for @atlaskit/editor-plugin-synced-block",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -30,17 +30,17 @@
|
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@atlaskit/button": "^23.10.0",
|
|
32
32
|
"@atlaskit/css": "^0.19.0",
|
|
33
|
-
"@atlaskit/editor-plugin-synced-block": "^
|
|
34
|
-
"@atlaskit/editor-synced-block-provider": "^
|
|
33
|
+
"@atlaskit/editor-plugin-synced-block": "^6.0.0",
|
|
34
|
+
"@atlaskit/editor-synced-block-provider": "^4.0.0",
|
|
35
35
|
"@atlaskit/heading": "^5.3.0",
|
|
36
36
|
"@atlaskit/icon": "^32.0.0",
|
|
37
37
|
"@atlaskit/icon-lab": "^5.17.0",
|
|
38
38
|
"@atlaskit/image": "^3.0.0",
|
|
39
39
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
40
40
|
"@atlaskit/primitives": "^18.0.0",
|
|
41
|
-
"@atlaskit/renderer": "^
|
|
41
|
+
"@atlaskit/renderer": "^128.0.0",
|
|
42
42
|
"@atlaskit/spinner": "^19.0.0",
|
|
43
|
-
"@atlaskit/tokens": "^11.
|
|
43
|
+
"@atlaskit/tokens": "^11.1.0",
|
|
44
44
|
"@atlaskit/tooltip": "^20.14.0",
|
|
45
45
|
"@babel/runtime": "^7.0.0",
|
|
46
46
|
"@compiled/react": "^0.20.0",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"relay-runtime": "npm:atl-relay-runtime@0.0.0-main-39e79f66"
|
|
49
49
|
},
|
|
50
50
|
"peerDependencies": {
|
|
51
|
-
"@atlaskit/editor-common": "^
|
|
51
|
+
"@atlaskit/editor-common": "^112.0.0",
|
|
52
52
|
"react": "^18.2.0",
|
|
53
53
|
"react-intl-next": "npm:react-intl@^5.18.1"
|
|
54
54
|
},
|
|
@@ -89,12 +89,6 @@
|
|
|
89
89
|
}
|
|
90
90
|
},
|
|
91
91
|
"platform-feature-flags": {
|
|
92
|
-
"platform_synced_block_patch_3": {
|
|
93
|
-
"type": "boolean"
|
|
94
|
-
},
|
|
95
|
-
"platform_synced_block_patch_4": {
|
|
96
|
-
"type": "boolean"
|
|
97
|
-
},
|
|
98
92
|
"platform_synced_block_patch_5": {
|
|
99
93
|
"type": "boolean"
|
|
100
94
|
}
|