@atlaskit/collab-provider 9.21.0 → 9.21.2
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/analytics/analytics-helper.js +13 -1
- package/dist/cjs/version-wrapper.js +1 -1
- package/dist/es2019/analytics/analytics-helper.js +10 -0
- package/dist/es2019/version-wrapper.js +1 -1
- package/dist/esm/analytics/analytics-helper.js +13 -1
- package/dist/esm/version-wrapper.js +1 -1
- package/dist/types/analytics/analytics-helper.d.ts +1 -0
- package/dist/types/helpers/const.d.ts +1 -0
- package/dist/types-ts4.5/analytics/analytics-helper.d.ts +1 -0
- package/dist/types-ts4.5/helpers/const.d.ts +1 -0
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @atlaskit/collab-provider
|
|
2
2
|
|
|
3
|
+
## 9.21.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#65800](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65800) [`7fe1789ade99`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7fe1789ade99) - Add UGC free logs for error messages
|
|
8
|
+
- Updated dependencies
|
|
9
|
+
|
|
10
|
+
## 9.21.1
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- [#65031](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65031) [`a00094111b5a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a00094111b5a) - ED-21609 Update adf-schema to 35.3.0
|
|
15
|
+
- Updated dependencies
|
|
16
|
+
|
|
3
17
|
## 9.21.0
|
|
4
18
|
|
|
5
19
|
### Minor Changes
|
|
@@ -17,6 +17,7 @@ var _customErrors = require("../errors/custom-errors");
|
|
|
17
17
|
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
18
18
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
19
19
|
var EVENT_SUBJECT = 'collab';
|
|
20
|
+
var loggableErrorName = ['RangeError', 'TypeError', 'TransformError'];
|
|
20
21
|
var COLLAB_SERVICE = /*#__PURE__*/function (COLLAB_SERVICE) {
|
|
21
22
|
COLLAB_SERVICE["NCS"] = "ncs";
|
|
22
23
|
COLLAB_SERVICE["SYNCHRONY"] = "synchrony";
|
|
@@ -88,7 +89,8 @@ var AnalyticsHelper = exports.default = /*#__PURE__*/function () {
|
|
|
88
89
|
errorMessage: errorMessage,
|
|
89
90
|
errorName: error instanceof Error ? error.name : undefined,
|
|
90
91
|
errorCode: (_data$code = (_data = error.data) === null || _data === void 0 ? void 0 : _data.code) !== null && _data$code !== void 0 ? _data$code : undefined,
|
|
91
|
-
errorStatus: (_data$status = (_data2 = error.data) === null || _data2 === void 0 ? void 0 : _data2.status) !== null && _data$status !== void 0 ? _data$status : undefined
|
|
92
|
+
errorStatus: (_data$status = (_data2 = error.data) === null || _data2 === void 0 ? void 0 : _data2.status) !== null && _data$status !== void 0 ? _data$status : undefined,
|
|
93
|
+
originalErrorMessage: this.getUGCFreeErrorMessage(error)
|
|
92
94
|
}, errorExtraAttributes),
|
|
93
95
|
nonPrivacySafeAttributes: {
|
|
94
96
|
error: error
|
|
@@ -104,6 +106,7 @@ var AnalyticsHelper = exports.default = /*#__PURE__*/function () {
|
|
|
104
106
|
attributes: {
|
|
105
107
|
documentAri: this.documentAri,
|
|
106
108
|
errorMessage: 'Error emitted',
|
|
109
|
+
originalErrorMessage: error.message,
|
|
107
110
|
errorCode: error.code,
|
|
108
111
|
mappedError: error
|
|
109
112
|
}
|
|
@@ -157,6 +160,15 @@ var AnalyticsHelper = exports.default = /*#__PURE__*/function () {
|
|
|
157
160
|
}
|
|
158
161
|
return sendEvent;
|
|
159
162
|
}()
|
|
163
|
+
}, {
|
|
164
|
+
key: "getUGCFreeErrorMessage",
|
|
165
|
+
value: function getUGCFreeErrorMessage(error) {
|
|
166
|
+
if (error instanceof Error && loggableErrorName.includes(error.name)) {
|
|
167
|
+
return error.message;
|
|
168
|
+
} else {
|
|
169
|
+
return undefined;
|
|
170
|
+
}
|
|
171
|
+
}
|
|
160
172
|
}]);
|
|
161
173
|
return AnalyticsHelper;
|
|
162
174
|
}();
|
|
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.version = exports.nextMajorVersion = exports.name = void 0;
|
|
7
7
|
var name = exports.name = "@atlaskit/collab-provider";
|
|
8
|
-
var version = exports.version = "9.21.
|
|
8
|
+
var version = exports.version = "9.21.2";
|
|
9
9
|
var nextMajorVersion = exports.nextMajorVersion = function nextMajorVersion() {
|
|
10
10
|
return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
|
|
11
11
|
};
|
|
@@ -3,6 +3,7 @@ import { name as packageName, version as packageVersion } from '../version-wrapp
|
|
|
3
3
|
import { network } from '../connectivity/singleton';
|
|
4
4
|
import { CustomError } from '../errors/custom-errors';
|
|
5
5
|
const EVENT_SUBJECT = 'collab';
|
|
6
|
+
const loggableErrorName = ['RangeError', 'TypeError', 'TransformError'];
|
|
6
7
|
var COLLAB_SERVICE = /*#__PURE__*/function (COLLAB_SERVICE) {
|
|
7
8
|
COLLAB_SERVICE["NCS"] = "ncs";
|
|
8
9
|
COLLAB_SERVICE["SYNCHRONY"] = "synchrony";
|
|
@@ -73,6 +74,7 @@ export default class AnalyticsHelper {
|
|
|
73
74
|
errorName: error instanceof Error ? error.name : undefined,
|
|
74
75
|
errorCode: (_data$code = (_data = error.data) === null || _data === void 0 ? void 0 : _data.code) !== null && _data$code !== void 0 ? _data$code : undefined,
|
|
75
76
|
errorStatus: (_data$status = (_data2 = error.data) === null || _data2 === void 0 ? void 0 : _data2.status) !== null && _data$status !== void 0 ? _data$status : undefined,
|
|
77
|
+
originalErrorMessage: this.getUGCFreeErrorMessage(error),
|
|
76
78
|
...errorExtraAttributes
|
|
77
79
|
},
|
|
78
80
|
nonPrivacySafeAttributes: {
|
|
@@ -87,6 +89,7 @@ export default class AnalyticsHelper {
|
|
|
87
89
|
attributes: {
|
|
88
90
|
documentAri: this.documentAri,
|
|
89
91
|
errorMessage: 'Error emitted',
|
|
92
|
+
originalErrorMessage: error.message,
|
|
90
93
|
errorCode: error.code,
|
|
91
94
|
mappedError: error
|
|
92
95
|
}
|
|
@@ -115,4 +118,11 @@ export default class AnalyticsHelper {
|
|
|
115
118
|
}
|
|
116
119
|
triggerAnalyticsEvent(event, this.analyticsClient);
|
|
117
120
|
}
|
|
121
|
+
getUGCFreeErrorMessage(error) {
|
|
122
|
+
if (error instanceof Error && loggableErrorName.includes(error.name)) {
|
|
123
|
+
return error.message;
|
|
124
|
+
} else {
|
|
125
|
+
return undefined;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
118
128
|
}
|
|
@@ -10,6 +10,7 @@ import { name as packageName, version as packageVersion } from '../version-wrapp
|
|
|
10
10
|
import { network } from '../connectivity/singleton';
|
|
11
11
|
import { CustomError } from '../errors/custom-errors';
|
|
12
12
|
var EVENT_SUBJECT = 'collab';
|
|
13
|
+
var loggableErrorName = ['RangeError', 'TypeError', 'TransformError'];
|
|
13
14
|
var COLLAB_SERVICE = /*#__PURE__*/function (COLLAB_SERVICE) {
|
|
14
15
|
COLLAB_SERVICE["NCS"] = "ncs";
|
|
15
16
|
COLLAB_SERVICE["SYNCHRONY"] = "synchrony";
|
|
@@ -81,7 +82,8 @@ var AnalyticsHelper = /*#__PURE__*/function () {
|
|
|
81
82
|
errorMessage: errorMessage,
|
|
82
83
|
errorName: error instanceof Error ? error.name : undefined,
|
|
83
84
|
errorCode: (_data$code = (_data = error.data) === null || _data === void 0 ? void 0 : _data.code) !== null && _data$code !== void 0 ? _data$code : undefined,
|
|
84
|
-
errorStatus: (_data$status = (_data2 = error.data) === null || _data2 === void 0 ? void 0 : _data2.status) !== null && _data$status !== void 0 ? _data$status : undefined
|
|
85
|
+
errorStatus: (_data$status = (_data2 = error.data) === null || _data2 === void 0 ? void 0 : _data2.status) !== null && _data$status !== void 0 ? _data$status : undefined,
|
|
86
|
+
originalErrorMessage: this.getUGCFreeErrorMessage(error)
|
|
85
87
|
}, errorExtraAttributes),
|
|
86
88
|
nonPrivacySafeAttributes: {
|
|
87
89
|
error: error
|
|
@@ -97,6 +99,7 @@ var AnalyticsHelper = /*#__PURE__*/function () {
|
|
|
97
99
|
attributes: {
|
|
98
100
|
documentAri: this.documentAri,
|
|
99
101
|
errorMessage: 'Error emitted',
|
|
102
|
+
originalErrorMessage: error.message,
|
|
100
103
|
errorCode: error.code,
|
|
101
104
|
mappedError: error
|
|
102
105
|
}
|
|
@@ -150,6 +153,15 @@ var AnalyticsHelper = /*#__PURE__*/function () {
|
|
|
150
153
|
}
|
|
151
154
|
return sendEvent;
|
|
152
155
|
}()
|
|
156
|
+
}, {
|
|
157
|
+
key: "getUGCFreeErrorMessage",
|
|
158
|
+
value: function getUGCFreeErrorMessage(error) {
|
|
159
|
+
if (error instanceof Error && loggableErrorName.includes(error.name)) {
|
|
160
|
+
return error.message;
|
|
161
|
+
} else {
|
|
162
|
+
return undefined;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
153
165
|
}]);
|
|
154
166
|
return AnalyticsHelper;
|
|
155
167
|
}();
|
|
@@ -10,4 +10,5 @@ export default class AnalyticsHelper {
|
|
|
10
10
|
sendProviderErrorEvent(error: ProviderError): void;
|
|
11
11
|
sendActionEvent(action: ActionAnalyticsEvent['eventAction'], status: EVENT_STATUS, attributes?: Omit<ActionAnalyticsEvent['attributes'], 'documentAri' | 'eventStatus'>): void;
|
|
12
12
|
private sendEvent;
|
|
13
|
+
private getUGCFreeErrorMessage;
|
|
13
14
|
}
|
|
@@ -10,4 +10,5 @@ export default class AnalyticsHelper {
|
|
|
10
10
|
sendProviderErrorEvent(error: ProviderError): void;
|
|
11
11
|
sendActionEvent(action: ActionAnalyticsEvent['eventAction'], status: EVENT_STATUS, attributes?: Omit<ActionAnalyticsEvent['attributes'], 'documentAri' | 'eventStatus'>): void;
|
|
12
12
|
private sendEvent;
|
|
13
|
+
private getUGCFreeErrorMessage;
|
|
13
14
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/collab-provider",
|
|
3
|
-
"version": "9.21.
|
|
3
|
+
"version": "9.21.2",
|
|
4
4
|
"description": "A provider for collaborative editing.",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -35,8 +35,8 @@
|
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@atlaskit/analytics-gas-types": "^5.1.0",
|
|
38
|
-
"@atlaskit/analytics-listeners": "^8.
|
|
39
|
-
"@atlaskit/editor-common": "^76.
|
|
38
|
+
"@atlaskit/analytics-listeners": "^8.9.0",
|
|
39
|
+
"@atlaskit/editor-common": "^76.36.0",
|
|
40
40
|
"@atlaskit/editor-json-transformer": "^8.10.0",
|
|
41
41
|
"@atlaskit/editor-prosemirror": "1.1.0",
|
|
42
42
|
"@atlaskit/ufo": "^0.2.0",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
}
|
|
63
63
|
},
|
|
64
64
|
"devDependencies": {
|
|
65
|
-
"@atlaskit/adf-schema": "^35.
|
|
65
|
+
"@atlaskit/adf-schema": "^35.3.0",
|
|
66
66
|
"@atlassian/atlassian-frontend-prettier-config-1.0.1": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.1",
|
|
67
67
|
"typescript": "~4.9.5"
|
|
68
68
|
},
|