@atlaskit/jql-editor 5.8.0 → 5.8.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/util.js +1 -1
- package/dist/cjs/plugins/autocomplete/view.js +15 -0
- package/dist/cjs/plugins/rich-inline-nodes/nodes/team/index.js +7 -4
- package/dist/cjs/plugins/rich-inline-nodes/nodes/team/styled.js +1 -12
- package/dist/cjs/plugins/rich-inline-nodes/util/react-node-view.js +2 -1
- package/dist/cjs/state/index.js +2 -1
- package/dist/cjs/ui/jql-editor-controls-content/base-syntax-help/index.js +1 -1
- package/dist/es2019/analytics/util.js +1 -1
- package/dist/es2019/plugins/autocomplete/view.js +15 -0
- package/dist/es2019/plugins/rich-inline-nodes/nodes/team/index.js +7 -4
- package/dist/es2019/plugins/rich-inline-nodes/nodes/team/styled.js +1 -12
- package/dist/es2019/plugins/rich-inline-nodes/util/react-node-view.js +2 -0
- package/dist/es2019/state/index.js +2 -0
- package/dist/es2019/ui/jql-editor-controls-content/base-syntax-help/index.js +1 -1
- package/dist/esm/analytics/util.js +1 -1
- package/dist/esm/plugins/autocomplete/view.js +15 -0
- package/dist/esm/plugins/rich-inline-nodes/nodes/team/index.js +7 -4
- package/dist/esm/plugins/rich-inline-nodes/nodes/team/styled.js +1 -12
- package/dist/esm/plugins/rich-inline-nodes/util/react-node-view.js +2 -0
- package/dist/esm/state/index.js +2 -0
- package/dist/esm/ui/jql-editor-controls-content/base-syntax-help/index.js +1 -1
- package/package.json +5 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @atlaskit/jql-editor
|
|
2
2
|
|
|
3
|
+
## 5.8.2
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies
|
|
8
|
+
|
|
9
|
+
## 5.8.1
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- [`9b64a2eecf044`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9b64a2eecf044) -
|
|
14
|
+
Fix for team rich node on autocomplete
|
|
15
|
+
- Updated dependencies
|
|
16
|
+
|
|
3
17
|
## 5.8.0
|
|
4
18
|
|
|
5
19
|
### Minor Changes
|
|
@@ -6,5 +6,5 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.useJqlEditorAnalytics = void 0;
|
|
7
7
|
var _jqlEditorCommon = require("@atlaskit/jql-editor-common");
|
|
8
8
|
var useJqlEditorAnalytics = exports.useJqlEditorAnalytics = function useJqlEditorAnalytics(analyticsSource) {
|
|
9
|
-
return (0, _jqlEditorCommon.useJqlPackageAnalytics)(analyticsSource, "@atlaskit/jql-editor", "
|
|
9
|
+
return (0, _jqlEditorCommon.useJqlPackageAnalytics)(analyticsSource, "@atlaskit/jql-editor", "0.0.0-development", _jqlEditorCommon.ANALYTICS_CHANNEL);
|
|
10
10
|
};
|
|
@@ -102,6 +102,21 @@ var AutocompletePluginView = exports.default = /*#__PURE__*/function (_ReactPlug
|
|
|
102
102
|
nodes.push(_this.view.state.schema.nodes.user.create(attributes, textContent));
|
|
103
103
|
break;
|
|
104
104
|
}
|
|
105
|
+
case 'team':
|
|
106
|
+
{
|
|
107
|
+
if ((0, _platformFeatureFlags.fg)('jira_update_jql_teams')) {
|
|
108
|
+
var _attributes = {
|
|
109
|
+
type: 'team',
|
|
110
|
+
id: value,
|
|
111
|
+
name: nameOnRichInlineNode !== null && nameOnRichInlineNode !== void 0 ? nameOnRichInlineNode : name,
|
|
112
|
+
fieldName: context === null || context === void 0 ? void 0 : context.field
|
|
113
|
+
};
|
|
114
|
+
nodes.push(_this.view.state.schema.nodes.team.create(_attributes, textContent));
|
|
115
|
+
} else {
|
|
116
|
+
nodes.push(textContent);
|
|
117
|
+
}
|
|
118
|
+
break;
|
|
119
|
+
}
|
|
105
120
|
default:
|
|
106
121
|
{
|
|
107
122
|
nodes.push(textContent);
|
|
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
exports.team = void 0;
|
|
8
8
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
9
9
|
var _react = _interopRequireDefault(require("react"));
|
|
10
|
-
var
|
|
10
|
+
var _teamsAvatar = _interopRequireDefault(require("@atlaskit/teams-avatar"));
|
|
11
11
|
var _state = require("../../../../state");
|
|
12
12
|
var _styled = require("./styled");
|
|
13
13
|
var Team = function Team(_ref) {
|
|
@@ -25,11 +25,14 @@ var Team = function Team(_ref) {
|
|
|
25
25
|
return /*#__PURE__*/_react.default.createElement(_styled.TeamContainer, {
|
|
26
26
|
selected: selected,
|
|
27
27
|
error: error
|
|
28
|
-
}, /*#__PURE__*/_react.default.createElement(_styled.AvatarWrapper,
|
|
28
|
+
}, /*#__PURE__*/_react.default.createElement(_styled.AvatarWrapper, {
|
|
29
|
+
"data-testid": "team-avatar-wrapper"
|
|
30
|
+
}, /*#__PURE__*/_react.default.createElement(_teamsAvatar.default, {
|
|
31
|
+
teamId: id,
|
|
29
32
|
src: team === null || team === void 0 ? void 0 : team.avatarUrl,
|
|
30
|
-
appearance: "square",
|
|
31
33
|
borderColor: "transparent",
|
|
32
|
-
size: "xsmall"
|
|
34
|
+
size: "xsmall",
|
|
35
|
+
compact: true
|
|
33
36
|
})), /*#__PURE__*/_react.default.createElement(_styled.NameContainer, null, name));
|
|
34
37
|
};
|
|
35
38
|
var team = exports.team = {
|
|
@@ -84,16 +84,5 @@ var NameContainer = exports.NameContainer = _styled.default.span({
|
|
|
84
84
|
var AvatarWrapper = exports.AvatarWrapper = _styled.default.div({
|
|
85
85
|
height: "var(--ds-space-200, 16px)",
|
|
86
86
|
width: "var(--ds-space-200, 16px)",
|
|
87
|
-
alignSelf: 'center'
|
|
88
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
89
|
-
'> div span': {
|
|
90
|
-
margin: "var(--ds-space-0, 0px)"
|
|
91
|
-
},
|
|
92
|
-
// Fix fallback icon alignment by targeting the outer AvatarContent span
|
|
93
|
-
// This contains the icon background and needs to move as a unit
|
|
94
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
95
|
-
'> div > span:has(> span)': {
|
|
96
|
-
position: 'relative',
|
|
97
|
-
top: '-2px'
|
|
98
|
-
}
|
|
87
|
+
alignSelf: 'center'
|
|
99
88
|
});
|
|
@@ -18,7 +18,7 @@ var _state = require("../../../state");
|
|
|
18
18
|
var _constants = require("../constants");
|
|
19
19
|
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); }
|
|
20
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; }
|
|
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; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
22
22
|
var ReactNodeView = exports.ReactNodeView = /*#__PURE__*/function () {
|
|
23
23
|
function ReactNodeView(component, portalActions, _node) {
|
|
24
24
|
var _this = this;
|
|
@@ -113,6 +113,7 @@ var ReactNodeView = exports.ReactNodeView = /*#__PURE__*/function () {
|
|
|
113
113
|
// Generate unique portal identifier
|
|
114
114
|
// If you read this comment in the future and TypeScript has added support for Symbols as object keys, please do
|
|
115
115
|
// JQL Editor a favor and replace this library with the native JS functionality that TS was supposed to support.
|
|
116
|
+
// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
116
117
|
this.portalKey = (0, _uuid.v4)();
|
|
117
118
|
// Creating span under the assumption that all node views will be inline elements in JQL Editor
|
|
118
119
|
this.dom = document.createElement('span');
|
package/dist/cjs/state/index.js
CHANGED
|
@@ -30,7 +30,7 @@ var _autocomplete = require("./autocomplete");
|
|
|
30
30
|
var _hydration = require("./hydration");
|
|
31
31
|
var _util = require("./util");
|
|
32
32
|
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; }
|
|
33
|
-
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; }
|
|
33
|
+
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; } // eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
34
34
|
var initialIntl = (0, _reactIntlNext.createIntl)({
|
|
35
35
|
locale: 'en'
|
|
36
36
|
});
|
|
@@ -972,6 +972,7 @@ var EditorStateContainer = exports.EditorStateContainer = (0, _reactSweetState.c
|
|
|
972
972
|
autocompleteProvider: autocompleteProvider,
|
|
973
973
|
enableRichInlineNodes: enableRichInlineNodes,
|
|
974
974
|
// Generate unique identifiers for each JQL editor instance
|
|
975
|
+
// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
975
976
|
idPrefix: (0, _uuid.v4)(),
|
|
976
977
|
resizeObserver: window.ResizeObserver !== undefined ? new window.ResizeObserver(function () {
|
|
977
978
|
var _getState$editorViewC;
|
|
@@ -38,7 +38,7 @@ var BaseSyntaxHelp = exports.BaseSyntaxHelp = function BaseSyntaxHelp(_ref) {
|
|
|
38
38
|
href: "https://confluence.atlassian.com/display/SERVICEDESKCLOUD/Advanced+searching",
|
|
39
39
|
icon: function icon(iconProps) {
|
|
40
40
|
return /*#__PURE__*/_react.default.createElement(_questionCircle.default, (0, _extends2.default)({}, iconProps, {
|
|
41
|
-
color: "var(--ds-icon-subtle, #
|
|
41
|
+
color: "var(--ds-icon-subtle, #505258)"
|
|
42
42
|
}));
|
|
43
43
|
}
|
|
44
44
|
}) : /*#__PURE__*/_react.default.createElement(_styled.SyntaxHelpContainer, null, /*#__PURE__*/_react.default.createElement(_button.default, {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ANALYTICS_CHANNEL, useJqlPackageAnalytics } from '@atlaskit/jql-editor-common';
|
|
2
2
|
export const useJqlEditorAnalytics = analyticsSource => {
|
|
3
|
-
return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "
|
|
3
|
+
return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "0.0.0-development", ANALYTICS_CHANNEL);
|
|
4
4
|
};
|
|
@@ -87,6 +87,21 @@ export default class AutocompletePluginView extends ReactPluginView {
|
|
|
87
87
|
nodes.push(this.view.state.schema.nodes.user.create(attributes, textContent));
|
|
88
88
|
break;
|
|
89
89
|
}
|
|
90
|
+
case 'team':
|
|
91
|
+
{
|
|
92
|
+
if (fg('jira_update_jql_teams')) {
|
|
93
|
+
const attributes = {
|
|
94
|
+
type: 'team',
|
|
95
|
+
id: value,
|
|
96
|
+
name: nameOnRichInlineNode !== null && nameOnRichInlineNode !== void 0 ? nameOnRichInlineNode : name,
|
|
97
|
+
fieldName: context === null || context === void 0 ? void 0 : context.field
|
|
98
|
+
};
|
|
99
|
+
nodes.push(this.view.state.schema.nodes.team.create(attributes, textContent));
|
|
100
|
+
} else {
|
|
101
|
+
nodes.push(textContent);
|
|
102
|
+
}
|
|
103
|
+
break;
|
|
104
|
+
}
|
|
90
105
|
default:
|
|
91
106
|
{
|
|
92
107
|
nodes.push(textContent);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import
|
|
2
|
+
import TeamsAvatar from '@atlaskit/teams-avatar';
|
|
3
3
|
import { useHydratedTeam } from '../../../../state';
|
|
4
4
|
import { AvatarWrapper, NameContainer, TeamContainer } from './styled';
|
|
5
5
|
const Team = ({
|
|
@@ -16,11 +16,14 @@ const Team = ({
|
|
|
16
16
|
return /*#__PURE__*/React.createElement(TeamContainer, {
|
|
17
17
|
selected: selected,
|
|
18
18
|
error: error
|
|
19
|
-
}, /*#__PURE__*/React.createElement(AvatarWrapper,
|
|
19
|
+
}, /*#__PURE__*/React.createElement(AvatarWrapper, {
|
|
20
|
+
"data-testid": "team-avatar-wrapper"
|
|
21
|
+
}, /*#__PURE__*/React.createElement(TeamsAvatar, {
|
|
22
|
+
teamId: id,
|
|
20
23
|
src: team === null || team === void 0 ? void 0 : team.avatarUrl,
|
|
21
|
-
appearance: "square",
|
|
22
24
|
borderColor: "transparent",
|
|
23
|
-
size: "xsmall"
|
|
25
|
+
size: "xsmall",
|
|
26
|
+
compact: true
|
|
24
27
|
})), /*#__PURE__*/React.createElement(NameContainer, null, name));
|
|
25
28
|
};
|
|
26
29
|
export const team = {
|
|
@@ -76,16 +76,5 @@ export const NameContainer = styled.span({
|
|
|
76
76
|
export const AvatarWrapper = styled.div({
|
|
77
77
|
height: "var(--ds-space-200, 16px)",
|
|
78
78
|
width: "var(--ds-space-200, 16px)",
|
|
79
|
-
alignSelf: 'center'
|
|
80
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
81
|
-
'> div span': {
|
|
82
|
-
margin: "var(--ds-space-0, 0px)"
|
|
83
|
-
},
|
|
84
|
-
// Fix fallback icon alignment by targeting the outer AvatarContent span
|
|
85
|
-
// This contains the icon background and needs to move as a unit
|
|
86
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
87
|
-
'> div > span:has(> span)': {
|
|
88
|
-
position: 'relative',
|
|
89
|
-
top: '-2px'
|
|
90
|
-
}
|
|
79
|
+
alignSelf: 'center'
|
|
91
80
|
});
|
|
@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
|
|
|
2
2
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
3
3
|
import React, { useEffect, useLayoutEffect, useState } from 'react';
|
|
4
4
|
import { Subject } from 'rxjs/Subject';
|
|
5
|
+
// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
5
6
|
import { v4 as uuid } from 'uuid';
|
|
6
7
|
import { useEditorViewHasFocus } from '../../../state';
|
|
7
8
|
import { ERROR_NODE, SELECTED_NODE } from '../constants';
|
|
@@ -90,6 +91,7 @@ export class ReactNodeView {
|
|
|
90
91
|
// Generate unique portal identifier
|
|
91
92
|
// If you read this comment in the future and TypeScript has added support for Symbols as object keys, please do
|
|
92
93
|
// JQL Editor a favor and replace this library with the native JS functionality that TS was supposed to support.
|
|
94
|
+
// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
93
95
|
this.portalKey = uuid();
|
|
94
96
|
// Creating span under the assumption that all node views will be inline elements in JQL Editor
|
|
95
97
|
this.dom = document.createElement('span');
|
|
@@ -4,6 +4,7 @@ import { createIntl } from 'react-intl-next';
|
|
|
4
4
|
import { createContainer, createHook, createSelector, createStore } from 'react-sweet-state';
|
|
5
5
|
import { merge } from 'rxjs/observable/merge';
|
|
6
6
|
import { tap } from 'rxjs/operators/tap';
|
|
7
|
+
// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
7
8
|
import { v4 as uuidv4 } from 'uuid';
|
|
8
9
|
import { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
9
10
|
import { computeJqlInsights, isListOperator } from '@atlaskit/jql-ast';
|
|
@@ -941,6 +942,7 @@ export const EditorStateContainer = createContainer(Store, {
|
|
|
941
942
|
autocompleteProvider,
|
|
942
943
|
enableRichInlineNodes,
|
|
943
944
|
// Generate unique identifiers for each JQL editor instance
|
|
945
|
+
// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
944
946
|
idPrefix: uuidv4(),
|
|
945
947
|
resizeObserver: window.ResizeObserver !== undefined ? new window.ResizeObserver(() => {
|
|
946
948
|
var _getState$editorViewC;
|
|
@@ -31,7 +31,7 @@ export const BaseSyntaxHelp = ({
|
|
|
31
31
|
target: "blank",
|
|
32
32
|
href: "https://confluence.atlassian.com/display/SERVICEDESKCLOUD/Advanced+searching",
|
|
33
33
|
icon: iconProps => /*#__PURE__*/React.createElement(QuestionCircleIcon, _extends({}, iconProps, {
|
|
34
|
-
color: "var(--ds-icon-subtle, #
|
|
34
|
+
color: "var(--ds-icon-subtle, #505258)"
|
|
35
35
|
}))
|
|
36
36
|
}) : /*#__PURE__*/React.createElement(SyntaxHelpContainer, null, /*#__PURE__*/React.createElement(Button, {
|
|
37
37
|
"aria-describedby": describedby,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ANALYTICS_CHANNEL, useJqlPackageAnalytics } from '@atlaskit/jql-editor-common';
|
|
2
2
|
export var useJqlEditorAnalytics = function useJqlEditorAnalytics(analyticsSource) {
|
|
3
|
-
return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "
|
|
3
|
+
return useJqlPackageAnalytics(analyticsSource, "@atlaskit/jql-editor", "0.0.0-development", ANALYTICS_CHANNEL);
|
|
4
4
|
};
|
|
@@ -96,6 +96,21 @@ var AutocompletePluginView = /*#__PURE__*/function (_ReactPluginView) {
|
|
|
96
96
|
nodes.push(_this.view.state.schema.nodes.user.create(attributes, textContent));
|
|
97
97
|
break;
|
|
98
98
|
}
|
|
99
|
+
case 'team':
|
|
100
|
+
{
|
|
101
|
+
if (fg('jira_update_jql_teams')) {
|
|
102
|
+
var _attributes = {
|
|
103
|
+
type: 'team',
|
|
104
|
+
id: value,
|
|
105
|
+
name: nameOnRichInlineNode !== null && nameOnRichInlineNode !== void 0 ? nameOnRichInlineNode : name,
|
|
106
|
+
fieldName: context === null || context === void 0 ? void 0 : context.field
|
|
107
|
+
};
|
|
108
|
+
nodes.push(_this.view.state.schema.nodes.team.create(_attributes, textContent));
|
|
109
|
+
} else {
|
|
110
|
+
nodes.push(textContent);
|
|
111
|
+
}
|
|
112
|
+
break;
|
|
113
|
+
}
|
|
99
114
|
default:
|
|
100
115
|
{
|
|
101
116
|
nodes.push(textContent);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
2
2
|
import React from 'react';
|
|
3
|
-
import
|
|
3
|
+
import TeamsAvatar from '@atlaskit/teams-avatar';
|
|
4
4
|
import { useHydratedTeam } from '../../../../state';
|
|
5
5
|
import { AvatarWrapper, NameContainer, TeamContainer } from './styled';
|
|
6
6
|
var Team = function Team(_ref) {
|
|
@@ -18,11 +18,14 @@ var Team = function Team(_ref) {
|
|
|
18
18
|
return /*#__PURE__*/React.createElement(TeamContainer, {
|
|
19
19
|
selected: selected,
|
|
20
20
|
error: error
|
|
21
|
-
}, /*#__PURE__*/React.createElement(AvatarWrapper,
|
|
21
|
+
}, /*#__PURE__*/React.createElement(AvatarWrapper, {
|
|
22
|
+
"data-testid": "team-avatar-wrapper"
|
|
23
|
+
}, /*#__PURE__*/React.createElement(TeamsAvatar, {
|
|
24
|
+
teamId: id,
|
|
22
25
|
src: team === null || team === void 0 ? void 0 : team.avatarUrl,
|
|
23
|
-
appearance: "square",
|
|
24
26
|
borderColor: "transparent",
|
|
25
|
-
size: "xsmall"
|
|
27
|
+
size: "xsmall",
|
|
28
|
+
compact: true
|
|
26
29
|
})), /*#__PURE__*/React.createElement(NameContainer, null, name));
|
|
27
30
|
};
|
|
28
31
|
export var team = {
|
|
@@ -75,16 +75,5 @@ export var NameContainer = styled.span({
|
|
|
75
75
|
export var AvatarWrapper = styled.div({
|
|
76
76
|
height: "var(--ds-space-200, 16px)",
|
|
77
77
|
width: "var(--ds-space-200, 16px)",
|
|
78
|
-
alignSelf: 'center'
|
|
79
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
|
|
80
|
-
'> div span': {
|
|
81
|
-
margin: "var(--ds-space-0, 0px)"
|
|
82
|
-
},
|
|
83
|
-
// Fix fallback icon alignment by targeting the outer AvatarContent span
|
|
84
|
-
// This contains the icon background and needs to move as a unit
|
|
85
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
|
|
86
|
-
'> div > span:has(> span)': {
|
|
87
|
-
position: 'relative',
|
|
88
|
-
top: '-2px'
|
|
89
|
-
}
|
|
78
|
+
alignSelf: 'center'
|
|
90
79
|
});
|
|
@@ -7,6 +7,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
|
|
|
7
7
|
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) { _defineProperty(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; }
|
|
8
8
|
import React, { useEffect, useLayoutEffect, useState } from 'react';
|
|
9
9
|
import { Subject } from 'rxjs/Subject';
|
|
10
|
+
// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
10
11
|
import { v4 as uuid } from 'uuid';
|
|
11
12
|
import { useEditorViewHasFocus } from '../../../state';
|
|
12
13
|
import { ERROR_NODE, SELECTED_NODE } from '../constants';
|
|
@@ -104,6 +105,7 @@ export var ReactNodeView = /*#__PURE__*/function () {
|
|
|
104
105
|
// Generate unique portal identifier
|
|
105
106
|
// If you read this comment in the future and TypeScript has added support for Symbols as object keys, please do
|
|
106
107
|
// JQL Editor a favor and replace this library with the native JS functionality that TS was supposed to support.
|
|
108
|
+
// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
107
109
|
this.portalKey = uuid();
|
|
108
110
|
// Creating span under the assumption that all node views will be inline elements in JQL Editor
|
|
109
111
|
this.dom = document.createElement('span');
|
package/dist/esm/state/index.js
CHANGED
|
@@ -9,6 +9,7 @@ import { createIntl } from 'react-intl-next';
|
|
|
9
9
|
import { createContainer, createHook, createSelector, createStore } from 'react-sweet-state';
|
|
10
10
|
import { merge } from 'rxjs/observable/merge';
|
|
11
11
|
import { tap } from 'rxjs/operators/tap';
|
|
12
|
+
// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
12
13
|
import { v4 as uuidv4 } from 'uuid';
|
|
13
14
|
import { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
14
15
|
import { computeJqlInsights, isListOperator } from '@atlaskit/jql-ast';
|
|
@@ -965,6 +966,7 @@ export var EditorStateContainer = createContainer(Store, {
|
|
|
965
966
|
autocompleteProvider: autocompleteProvider,
|
|
966
967
|
enableRichInlineNodes: enableRichInlineNodes,
|
|
967
968
|
// Generate unique identifiers for each JQL editor instance
|
|
969
|
+
// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
968
970
|
idPrefix: uuidv4(),
|
|
969
971
|
resizeObserver: window.ResizeObserver !== undefined ? new window.ResizeObserver(function () {
|
|
970
972
|
var _getState$editorViewC;
|
|
@@ -31,7 +31,7 @@ export var BaseSyntaxHelp = function BaseSyntaxHelp(_ref) {
|
|
|
31
31
|
href: "https://confluence.atlassian.com/display/SERVICEDESKCLOUD/Advanced+searching",
|
|
32
32
|
icon: function icon(iconProps) {
|
|
33
33
|
return /*#__PURE__*/React.createElement(QuestionCircleIcon, _extends({}, iconProps, {
|
|
34
|
-
color: "var(--ds-icon-subtle, #
|
|
34
|
+
color: "var(--ds-icon-subtle, #505258)"
|
|
35
35
|
}));
|
|
36
36
|
}
|
|
37
37
|
}) : /*#__PURE__*/React.createElement(SyntaxHelpContainer, null, /*#__PURE__*/React.createElement(Button, {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/jql-editor",
|
|
3
|
-
"version": "5.8.
|
|
3
|
+
"version": "5.8.2",
|
|
4
4
|
"description": "This package allows consumers to render an advanced JQL editor component to enable autocomplete-assisted authoring and validation of JQL queries.",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@atlaskit/analytics-gas-types": "^5.1.0",
|
|
37
37
|
"@atlaskit/analytics-next": "^11.1.0",
|
|
38
38
|
"@atlaskit/avatar": "^25.5.0",
|
|
39
|
-
"@atlaskit/button": "^23.
|
|
39
|
+
"@atlaskit/button": "^23.6.0",
|
|
40
40
|
"@atlaskit/editor-prosemirror": "7.0.0",
|
|
41
41
|
"@atlaskit/form": "^14.2.0",
|
|
42
42
|
"@atlaskit/icon": "^28.5.0",
|
|
@@ -51,9 +51,10 @@
|
|
|
51
51
|
"@atlaskit/primitives": "^16.1.0",
|
|
52
52
|
"@atlaskit/prosemirror-history": "^0.2.0",
|
|
53
53
|
"@atlaskit/spinner": "^19.0.0",
|
|
54
|
+
"@atlaskit/teams-avatar": "^2.4.0",
|
|
54
55
|
"@atlaskit/theme": "^21.0.0",
|
|
55
|
-
"@atlaskit/tokens": "^
|
|
56
|
-
"@atlaskit/tooltip": "^20.
|
|
56
|
+
"@atlaskit/tokens": "^8.0.0",
|
|
57
|
+
"@atlaskit/tooltip": "^20.8.0",
|
|
57
58
|
"@babel/runtime": "^7.0.0",
|
|
58
59
|
"@emotion/react": "^11.7.1",
|
|
59
60
|
"@emotion/styled": "^11.0.0",
|