@atlaskit/jql-editor 6.3.1 → 6.4.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 +11 -0
- package/analytics/package.json +17 -0
- package/async/package.json +17 -0
- package/components/types/package.json +17 -0
- package/dist/cjs/analytics/util.js +1 -1
- package/dist/cjs/entry-points/analytics.js +24 -0
- package/dist/cjs/entry-points/async.js +18 -0
- package/dist/cjs/entry-points/components-types.js +1 -0
- package/dist/cjs/entry-points/jql-editor-analytics-listener.js +13 -0
- package/dist/cjs/entry-points/jql-editor-layout.js +12 -0
- package/dist/cjs/entry-points/src-types.js +1 -0
- package/dist/cjs/entry-points/state-types.js +1 -0
- package/dist/cjs/entry-points/types.js +1 -0
- package/dist/cjs/entry-points/ui-types.js +1 -0
- package/dist/cjs/entry-points/ui.js +13 -0
- package/dist/cjs/plugins/autocomplete/view.js +2 -3
- package/dist/cjs/plugins/rich-inline-nodes/nodes/goal/goal-icon.js +16 -0
- package/dist/cjs/plugins/rich-inline-nodes/nodes/goal/goal-node.js +1 -1
- package/dist/cjs/plugins/rich-inline-nodes/util/replace-nodes-transaction.js +1 -1
- package/dist/cjs/state/hydration/index.js +2 -2
- package/dist/cjs/state/index.js +5 -5
- package/dist/es2019/analytics/util.js +1 -1
- package/dist/es2019/entry-points/analytics.js +1 -0
- package/dist/es2019/entry-points/async.js +1 -0
- package/dist/es2019/entry-points/components-types.js +0 -0
- package/dist/es2019/entry-points/jql-editor-analytics-listener.js +1 -0
- package/dist/es2019/entry-points/jql-editor-layout.js +1 -0
- package/dist/es2019/entry-points/src-types.js +0 -0
- package/dist/es2019/entry-points/state-types.js +0 -0
- package/dist/es2019/entry-points/types.js +0 -0
- package/dist/es2019/entry-points/ui-types.js +0 -0
- package/dist/es2019/entry-points/ui.js +1 -0
- package/dist/es2019/plugins/autocomplete/view.js +2 -3
- package/dist/es2019/plugins/rich-inline-nodes/nodes/goal/goal-icon.js +16 -0
- package/dist/es2019/plugins/rich-inline-nodes/nodes/goal/goal-node.js +1 -1
- package/dist/es2019/plugins/rich-inline-nodes/util/replace-nodes-transaction.js +1 -1
- package/dist/es2019/state/hydration/index.js +2 -2
- package/dist/es2019/state/index.js +5 -5
- package/dist/esm/analytics/util.js +1 -1
- package/dist/esm/entry-points/analytics.js +1 -0
- package/dist/esm/entry-points/async.js +1 -0
- package/dist/esm/entry-points/components-types.js +0 -0
- package/dist/esm/entry-points/jql-editor-analytics-listener.js +1 -0
- package/dist/esm/entry-points/jql-editor-layout.js +1 -0
- package/dist/esm/entry-points/src-types.js +0 -0
- package/dist/esm/entry-points/state-types.js +0 -0
- package/dist/esm/entry-points/types.js +0 -0
- package/dist/esm/entry-points/ui-types.js +0 -0
- package/dist/esm/entry-points/ui.js +1 -0
- package/dist/esm/plugins/autocomplete/view.js +2 -3
- package/dist/esm/plugins/rich-inline-nodes/nodes/goal/goal-icon.js +16 -0
- package/dist/esm/plugins/rich-inline-nodes/nodes/goal/goal-node.js +1 -1
- package/dist/esm/plugins/rich-inline-nodes/util/replace-nodes-transaction.js +1 -1
- package/dist/esm/state/hydration/index.js +2 -2
- package/dist/esm/state/index.js +5 -5
- package/dist/types/entry-points/analytics.d.ts +2 -0
- package/dist/types/entry-points/async.d.ts +1 -0
- package/dist/types/entry-points/components-types.d.ts +1 -0
- package/dist/types/entry-points/jql-editor-analytics-listener.d.ts +2 -0
- package/dist/types/entry-points/jql-editor-layout.d.ts +1 -0
- package/dist/types/entry-points/src-types.d.ts +1 -0
- package/dist/types/entry-points/state-types.d.ts +1 -0
- package/dist/types/entry-points/types.d.ts +1 -0
- package/dist/types/entry-points/ui-types.d.ts +1 -0
- package/dist/types/entry-points/ui.d.ts +1 -0
- package/dist/types-ts4.5/entry-points/analytics.d.ts +2 -0
- package/dist/types-ts4.5/entry-points/async.d.ts +1 -0
- package/dist/types-ts4.5/entry-points/components-types.d.ts +1 -0
- package/dist/types-ts4.5/entry-points/jql-editor-analytics-listener.d.ts +2 -0
- package/dist/types-ts4.5/entry-points/jql-editor-layout.d.ts +1 -0
- package/dist/types-ts4.5/entry-points/src-types.d.ts +1 -0
- package/dist/types-ts4.5/entry-points/state-types.d.ts +1 -0
- package/dist/types-ts4.5/entry-points/types.d.ts +1 -0
- package/dist/types-ts4.5/entry-points/ui-types.d.ts +1 -0
- package/dist/types-ts4.5/entry-points/ui.d.ts +1 -0
- package/jql-editor-analytics-listener/package.json +17 -0
- package/jql-editor-layout/package.json +17 -0
- package/package.json +10 -13
- package/state/types/package.json +17 -0
- package/types/package.json +17 -0
- package/ui/package.json +17 -0
- package/ui/types/package.json +17 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,16 @@
|
|
|
1
1
|
# @atlaskit/jql-editor
|
|
2
2
|
|
|
3
|
+
## 6.4.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`c56f27a582fec`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c56f27a582fec) -
|
|
8
|
+
Autofix: add explicit package exports (barrel removal)
|
|
9
|
+
|
|
10
|
+
### Patch Changes
|
|
11
|
+
|
|
12
|
+
- Updated dependencies
|
|
13
|
+
|
|
3
14
|
## 6.3.1
|
|
4
15
|
|
|
5
16
|
### Patch Changes
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@atlaskit/jql-editor/analytics",
|
|
3
|
+
"main": "../dist/cjs/entry-points/analytics.js",
|
|
4
|
+
"module": "../dist/esm/entry-points/analytics.js",
|
|
5
|
+
"module:es2019": "../dist/es2019/entry-points/analytics.js",
|
|
6
|
+
"sideEffects": [
|
|
7
|
+
"*.compiled.css"
|
|
8
|
+
],
|
|
9
|
+
"types": "../dist/types/entry-points/analytics.d.ts",
|
|
10
|
+
"typesVersions": {
|
|
11
|
+
">=4.5 <5.9": {
|
|
12
|
+
"*": [
|
|
13
|
+
"../dist/types-ts4.5/entry-points/analytics.d.ts"
|
|
14
|
+
]
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@atlaskit/jql-editor/async",
|
|
3
|
+
"main": "../dist/cjs/entry-points/async.js",
|
|
4
|
+
"module": "../dist/esm/entry-points/async.js",
|
|
5
|
+
"module:es2019": "../dist/es2019/entry-points/async.js",
|
|
6
|
+
"sideEffects": [
|
|
7
|
+
"*.compiled.css"
|
|
8
|
+
],
|
|
9
|
+
"types": "../dist/types/entry-points/async.d.ts",
|
|
10
|
+
"typesVersions": {
|
|
11
|
+
">=4.5 <5.9": {
|
|
12
|
+
"*": [
|
|
13
|
+
"../dist/types-ts4.5/entry-points/async.d.ts"
|
|
14
|
+
]
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@atlaskit/jql-editor/components/types",
|
|
3
|
+
"main": "../../dist/cjs/entry-points/components-types.js",
|
|
4
|
+
"module": "../../dist/esm/entry-points/components-types.js",
|
|
5
|
+
"module:es2019": "../../dist/es2019/entry-points/components-types.js",
|
|
6
|
+
"sideEffects": [
|
|
7
|
+
"*.compiled.css"
|
|
8
|
+
],
|
|
9
|
+
"types": "../../dist/types/entry-points/components-types.d.ts",
|
|
10
|
+
"typesVersions": {
|
|
11
|
+
">=4.5 <5.9": {
|
|
12
|
+
"*": [
|
|
13
|
+
"../../dist/types-ts4.5/entry-points/components-types.d.ts"
|
|
14
|
+
]
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
|
@@ -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
|
};
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
Object.defineProperty(exports, "ANALYTICS_CHANNEL", {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: function get() {
|
|
9
|
+
return _index.ANALYTICS_CHANNEL;
|
|
10
|
+
}
|
|
11
|
+
});
|
|
12
|
+
Object.defineProperty(exports, "EventType", {
|
|
13
|
+
enumerable: true,
|
|
14
|
+
get: function get() {
|
|
15
|
+
return _index.EventType;
|
|
16
|
+
}
|
|
17
|
+
});
|
|
18
|
+
Object.defineProperty(exports, "useJqlPackageAnalytics", {
|
|
19
|
+
enumerable: true,
|
|
20
|
+
get: function get() {
|
|
21
|
+
return _index.useJqlPackageAnalytics;
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
var _index = require("../analytics/index");
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
Object.defineProperty(exports, "JQLEditorAsync", {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: function get() {
|
|
9
|
+
return _async.JQLEditorAsync;
|
|
10
|
+
}
|
|
11
|
+
});
|
|
12
|
+
Object.defineProperty(exports, "preloadJQLEditor", {
|
|
13
|
+
enumerable: true,
|
|
14
|
+
get: function get() {
|
|
15
|
+
return _async.preloadJQLEditor;
|
|
16
|
+
}
|
|
17
|
+
});
|
|
18
|
+
var _async = require("../async");
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"use strict";
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
Object.defineProperty(exports, "JQLEditorAnalyticsListener", {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
get: function get() {
|
|
10
|
+
return _jqlEditorAnalyticsListener.default;
|
|
11
|
+
}
|
|
12
|
+
});
|
|
13
|
+
var _jqlEditorAnalyticsListener = _interopRequireDefault(require("../analytics/listener/jql-editor-analytics-listener"));
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
Object.defineProperty(exports, "JQLEditorReadOnly", {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: function get() {
|
|
9
|
+
return _index.JQLEditorReadOnly;
|
|
10
|
+
}
|
|
11
|
+
});
|
|
12
|
+
var _index = require("../ui/jql-editor-layout/index");
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"use strict";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"use strict";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"use strict";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
"use strict";
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
Object.defineProperty(exports, "JQLEditor", {
|
|
8
|
+
enumerable: true,
|
|
9
|
+
get: function get() {
|
|
10
|
+
return _index.default;
|
|
11
|
+
}
|
|
12
|
+
});
|
|
13
|
+
var _index = _interopRequireDefault(require("../ui/index"));
|
|
@@ -16,7 +16,6 @@ var _model = require("@atlaskit/editor-prosemirror/model");
|
|
|
16
16
|
var _state = require("@atlaskit/editor-prosemirror/state");
|
|
17
17
|
var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
|
|
18
18
|
var _jqlAst = require("@atlaskit/jql-ast");
|
|
19
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
20
19
|
var _getDocumentPosition = _interopRequireDefault(require("../common/get-document-position"));
|
|
21
20
|
var _reactPluginView = _interopRequireDefault(require("../common/react-plugin-view"));
|
|
22
21
|
var _autocomplete = _interopRequireDefault(require("./components/autocomplete"));
|
|
@@ -63,7 +62,7 @@ var AutocompletePluginView = exports.default = /*#__PURE__*/function (_ReactPlug
|
|
|
63
62
|
if (_this.enableRichInlineNodes && option.type === 'value' && option.valueType === 'user') {
|
|
64
63
|
transaction.setMeta('hydrate', true);
|
|
65
64
|
}
|
|
66
|
-
if (_this.enableRichInlineNodes && option.type === 'value' && (option.valueType === 'team' || option.valueType === 'goal' && _featureGateJsClient.default.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || option.valueType === 'project' && (
|
|
65
|
+
if (_this.enableRichInlineNodes && option.type === 'value' && (option.valueType === 'team' || option.valueType === 'goal' && _featureGateJsClient.default.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || option.valueType === 'project' && _featureGateJsClient.default.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1)) {
|
|
67
66
|
transaction.setMeta('hydrate', true);
|
|
68
67
|
}
|
|
69
68
|
var documentFrom = (0, _getDocumentPosition.default)(transaction.doc, from);
|
|
@@ -116,7 +115,7 @@ var AutocompletePluginView = exports.default = /*#__PURE__*/function (_ReactPlug
|
|
|
116
115
|
}
|
|
117
116
|
case 'project':
|
|
118
117
|
{
|
|
119
|
-
if ((
|
|
118
|
+
if (_featureGateJsClient.default.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1) {
|
|
120
119
|
var _attributes2 = {
|
|
121
120
|
type: 'project',
|
|
122
121
|
id: value,
|
|
@@ -24,6 +24,13 @@ var appearanceToColorMap = {
|
|
|
24
24
|
AT_RISK: 'yellow',
|
|
25
25
|
ON_TRACK: 'green'
|
|
26
26
|
};
|
|
27
|
+
var appearanceToNewColorMap = {
|
|
28
|
+
MENU: "var(--ds-icon, #292A2E)",
|
|
29
|
+
DEFAULT: "var(--ds-icon-accent-gray, #7D818A)",
|
|
30
|
+
OFF_TRACK: "var(--ds-icon-danger, #C9372C)",
|
|
31
|
+
AT_RISK: "var(--ds-icon-warning, #E06C00)",
|
|
32
|
+
ON_TRACK: "var(--ds-icon-success, #6A9A23)"
|
|
33
|
+
};
|
|
27
34
|
var keyToIconMap = {
|
|
28
35
|
GOAL: _objective.default,
|
|
29
36
|
OBJECTIVE: _objective.default,
|
|
@@ -37,6 +44,15 @@ var GoalIcon = exports.GoalIcon = function GoalIcon(_ref) {
|
|
|
37
44
|
iconKey = _ref$iconKey === void 0 ? 'GOAL' : _ref$iconKey;
|
|
38
45
|
var Icon = (_keyToIconMap = keyToIconMap[iconKey]) !== null && _keyToIconMap !== void 0 ? _keyToIconMap : keyToIconMap.GOAL;
|
|
39
46
|
var appearance = isGoalAppearance(status) ? status : 'DEFAULT';
|
|
47
|
+
|
|
48
|
+
// Icon tile no longer supports a 16px size
|
|
49
|
+
if (size === 'xsmall') {
|
|
50
|
+
return /*#__PURE__*/_react.default.createElement(Icon, {
|
|
51
|
+
label: "",
|
|
52
|
+
size: "medium",
|
|
53
|
+
color: appearanceToNewColorMap[appearance]
|
|
54
|
+
});
|
|
55
|
+
}
|
|
40
56
|
return /*#__PURE__*/_react.default.createElement(_icon.IconTile, {
|
|
41
57
|
size: size,
|
|
42
58
|
icon: Icon,
|
|
@@ -46,7 +46,7 @@ var GoalNode = exports.GoalNode = function GoalNode(props) {
|
|
|
46
46
|
iconBefore: /*#__PURE__*/_react.default.createElement(_compiled.Box, {
|
|
47
47
|
xcss: styles.iconWrapper
|
|
48
48
|
}, /*#__PURE__*/_react.default.createElement(_goalIcon.GoalIcon, {
|
|
49
|
-
size: "
|
|
49
|
+
size: "xsmall",
|
|
50
50
|
status: (_goal$status = goal === null || goal === void 0 ? void 0 : goal.status) !== null && _goal$status !== void 0 ? _goal$status : 'DEFAULT',
|
|
51
51
|
iconKey: toGoalIconKey(goal === null || goal === void 0 ? void 0 : goal.iconKey)
|
|
52
52
|
})),
|
|
@@ -34,7 +34,7 @@ var replaceRichInlineNodes = exports.replaceRichInlineNodes = function replaceRi
|
|
|
34
34
|
fieldName = _ref2[0],
|
|
35
35
|
values = _ref2[1];
|
|
36
36
|
values.forEach(function (value) {
|
|
37
|
-
if (value.type === 'user' || value.type === 'team' || value.type === 'goal' && _featureGateJsClient.default.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || value.type === 'project' && (
|
|
37
|
+
if (value.type === 'user' || value.type === 'team' || value.type === 'goal' && _featureGateJsClient.default.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || value.type === 'project' && _featureGateJsClient.default.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1) {
|
|
38
38
|
// First try to find as direct value operand (e.g., Team[Team] = uuid)
|
|
39
39
|
var astNodes = getValueNodes(ast, fieldName, value.id);
|
|
40
40
|
|
|
@@ -9,7 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
|
|
|
9
9
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
10
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
11
11
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
12
|
-
var
|
|
12
|
+
var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
|
|
13
13
|
var _jqlAst = require("../../plugins/jql-ast");
|
|
14
14
|
var _replaceNodesTransaction = require("../../plugins/rich-inline-nodes/util/replace-nodes-transaction");
|
|
15
15
|
var _index = require("../index");
|
|
@@ -59,7 +59,7 @@ var hydrateQuery = exports.hydrateQuery = function hydrateQuery() {
|
|
|
59
59
|
var _ref5 = (0, _slicedToArray2.default)(_ref4, 2),
|
|
60
60
|
fieldName = _ref5[0],
|
|
61
61
|
values = _ref5[1];
|
|
62
|
-
var fieldNameToUse = (
|
|
62
|
+
var fieldNameToUse = _featureGateJsClient.default.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1 ? (0, _util.normaliseHydrationKey)(fieldName) : fieldName;
|
|
63
63
|
var valueMap = new Map(oldHydratedValues[fieldNameToUse]);
|
|
64
64
|
values.forEach(function (value) {
|
|
65
65
|
valueMap.set(value.id, value);
|
package/dist/cjs/state/index.js
CHANGED
|
@@ -16,9 +16,9 @@ var _merge = require("rxjs/observable/merge");
|
|
|
16
16
|
var _tap = require("rxjs/operators/tap");
|
|
17
17
|
var _uuid = require("uuid");
|
|
18
18
|
var _view = require("@atlaskit/editor-prosemirror/view");
|
|
19
|
+
var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
|
|
19
20
|
var _jqlAst = require("@atlaskit/jql-ast");
|
|
20
21
|
var _jqlAutocomplete = require("@atlaskit/jql-autocomplete");
|
|
21
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
22
22
|
var _analytics = require("../analytics");
|
|
23
23
|
var _selectErrorCommand = require("../commands/select-error-command");
|
|
24
24
|
var _constants = require("../common/constants");
|
|
@@ -907,7 +907,7 @@ var useHydratedValue = exports.useHydratedValue = (0, _reactSweetState.createHoo
|
|
|
907
907
|
var _state$hydratedValues2;
|
|
908
908
|
var id = _ref38.id,
|
|
909
909
|
fieldName = _ref38.fieldName;
|
|
910
|
-
if ((
|
|
910
|
+
if (_featureGateJsClient.default.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1) {
|
|
911
911
|
var _state$hydratedValues;
|
|
912
912
|
return (_state$hydratedValues = state.hydratedValues[(0, _util.normaliseHydrationKey)(fieldName)]) === null || _state$hydratedValues === void 0 ? void 0 : _state$hydratedValues.get((0, _jqlAst.normaliseJqlString)(id));
|
|
913
913
|
}
|
|
@@ -919,7 +919,7 @@ var useHydratedUser = exports.useHydratedUser = (0, _reactSweetState.createHook)
|
|
|
919
919
|
var _state$hydratedValues3, _state$hydratedValues4;
|
|
920
920
|
var id = _ref39.id,
|
|
921
921
|
fieldName = _ref39.fieldName;
|
|
922
|
-
var user = (
|
|
922
|
+
var user = _featureGateJsClient.default.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1 ? (_state$hydratedValues3 = state.hydratedValues[(0, _util.normaliseHydrationKey)(fieldName)]) === null || _state$hydratedValues3 === void 0 ? void 0 : _state$hydratedValues3.get((0, _jqlAst.normaliseJqlString)(id)) : (_state$hydratedValues4 = state.hydratedValues[fieldName]) === null || _state$hydratedValues4 === void 0 ? void 0 : _state$hydratedValues4.get(id);
|
|
923
923
|
return user && user.type === 'user' ? user : undefined;
|
|
924
924
|
}
|
|
925
925
|
});
|
|
@@ -928,7 +928,7 @@ var useHydratedTeam = exports.useHydratedTeam = (0, _reactSweetState.createHook)
|
|
|
928
928
|
var _state$hydratedValues5, _state$hydratedValues6;
|
|
929
929
|
var id = _ref40.id,
|
|
930
930
|
fieldName = _ref40.fieldName;
|
|
931
|
-
var team = (
|
|
931
|
+
var team = _featureGateJsClient.default.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1 ? (_state$hydratedValues5 = state.hydratedValues[(0, _util.normaliseHydrationKey)(fieldName)]) === null || _state$hydratedValues5 === void 0 ? void 0 : _state$hydratedValues5.get((0, _jqlAst.normaliseJqlString)(id)) : (_state$hydratedValues6 = state.hydratedValues[fieldName]) === null || _state$hydratedValues6 === void 0 ? void 0 : _state$hydratedValues6.get(id);
|
|
932
932
|
return team && team.type === 'team' ? team : undefined;
|
|
933
933
|
}
|
|
934
934
|
});
|
|
@@ -937,7 +937,7 @@ var useHydratedProject = exports.useHydratedProject = (0, _reactSweetState.creat
|
|
|
937
937
|
var _state$hydratedValues7, _state$hydratedValues8;
|
|
938
938
|
var id = _ref41.id,
|
|
939
939
|
fieldName = _ref41.fieldName;
|
|
940
|
-
var project = (
|
|
940
|
+
var project = _featureGateJsClient.default.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1 ? (_state$hydratedValues7 = state.hydratedValues[(0, _util.normaliseHydrationKey)(fieldName)]) === null || _state$hydratedValues7 === void 0 ? void 0 : _state$hydratedValues7.get((0, _jqlAst.normaliseJqlString)(id)) : (_state$hydratedValues8 = state.hydratedValues[(0, _jqlAst.normaliseJqlString)(fieldName)]) === null || _state$hydratedValues8 === void 0 ? void 0 : _state$hydratedValues8.get((0, _jqlAst.normaliseJqlString)(id));
|
|
941
941
|
return project && project.type === 'project' ? project : undefined;
|
|
942
942
|
}
|
|
943
943
|
});
|
|
@@ -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
|
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { ANALYTICS_CHANNEL, useJqlPackageAnalytics, EventType } from '../analytics/index';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { JQLEditorAsync, preloadJQLEditor } from '../async';
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default as JQLEditorAnalyticsListener } from '../analytics/listener/jql-editor-analytics-listener';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { JQLEditorReadOnly } from '../ui/jql-editor-layout/index';
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default as JQLEditor } from '../ui/index';
|
|
@@ -3,7 +3,6 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
|
|
|
3
3
|
import { TextSelection } from '@atlaskit/editor-prosemirror/state';
|
|
4
4
|
import FeatureGates from '@atlaskit/feature-gate-js-client';
|
|
5
5
|
import { isListOperator } from '@atlaskit/jql-ast';
|
|
6
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
7
6
|
import getDocumentPosition from '../common/get-document-position';
|
|
8
7
|
import ReactPluginView from '../common/react-plugin-view';
|
|
9
8
|
import Autocomplete from './components/autocomplete';
|
|
@@ -46,7 +45,7 @@ export default class AutocompletePluginView extends ReactPluginView {
|
|
|
46
45
|
if (this.enableRichInlineNodes && option.type === 'value' && option.valueType === 'user') {
|
|
47
46
|
transaction.setMeta('hydrate', true);
|
|
48
47
|
}
|
|
49
|
-
if (this.enableRichInlineNodes && option.type === 'value' && (option.valueType === 'team' || option.valueType === 'goal' && FeatureGates.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || option.valueType === 'project' &&
|
|
48
|
+
if (this.enableRichInlineNodes && option.type === 'value' && (option.valueType === 'team' || option.valueType === 'goal' && FeatureGates.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || option.valueType === 'project' && FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1)) {
|
|
50
49
|
transaction.setMeta('hydrate', true);
|
|
51
50
|
}
|
|
52
51
|
const documentFrom = getDocumentPosition(transaction.doc, from);
|
|
@@ -101,7 +100,7 @@ export default class AutocompletePluginView extends ReactPluginView {
|
|
|
101
100
|
}
|
|
102
101
|
case 'project':
|
|
103
102
|
{
|
|
104
|
-
if (
|
|
103
|
+
if (FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1) {
|
|
105
104
|
const attributes = {
|
|
106
105
|
type: 'project',
|
|
107
106
|
id: value,
|
|
@@ -13,6 +13,13 @@ const appearanceToColorMap = {
|
|
|
13
13
|
AT_RISK: 'yellow',
|
|
14
14
|
ON_TRACK: 'green'
|
|
15
15
|
};
|
|
16
|
+
const appearanceToNewColorMap = {
|
|
17
|
+
MENU: "var(--ds-icon, #292A2E)",
|
|
18
|
+
DEFAULT: "var(--ds-icon-accent-gray, #7D818A)",
|
|
19
|
+
OFF_TRACK: "var(--ds-icon-danger, #C9372C)",
|
|
20
|
+
AT_RISK: "var(--ds-icon-warning, #E06C00)",
|
|
21
|
+
ON_TRACK: "var(--ds-icon-success, #6A9A23)"
|
|
22
|
+
};
|
|
16
23
|
const keyToIconMap = {
|
|
17
24
|
GOAL: ObjectiveIcon,
|
|
18
25
|
OBJECTIVE: ObjectiveIcon,
|
|
@@ -26,6 +33,15 @@ export const GoalIcon = ({
|
|
|
26
33
|
var _keyToIconMap;
|
|
27
34
|
const Icon = (_keyToIconMap = keyToIconMap[iconKey]) !== null && _keyToIconMap !== void 0 ? _keyToIconMap : keyToIconMap.GOAL;
|
|
28
35
|
const appearance = isGoalAppearance(status) ? status : 'DEFAULT';
|
|
36
|
+
|
|
37
|
+
// Icon tile no longer supports a 16px size
|
|
38
|
+
if (size === 'xsmall') {
|
|
39
|
+
return /*#__PURE__*/React.createElement(Icon, {
|
|
40
|
+
label: "",
|
|
41
|
+
size: "medium",
|
|
42
|
+
color: appearanceToNewColorMap[appearance]
|
|
43
|
+
});
|
|
44
|
+
}
|
|
29
45
|
return /*#__PURE__*/React.createElement(IconTile, {
|
|
30
46
|
size: size,
|
|
31
47
|
icon: Icon,
|
|
@@ -36,7 +36,7 @@ export const GoalNode = props => {
|
|
|
36
36
|
iconBefore: /*#__PURE__*/React.createElement(Box, {
|
|
37
37
|
xcss: styles.iconWrapper
|
|
38
38
|
}, /*#__PURE__*/React.createElement(GoalIcon, {
|
|
39
|
-
size: "
|
|
39
|
+
size: "xsmall",
|
|
40
40
|
status: (_goal$status = goal === null || goal === void 0 ? void 0 : goal.status) !== null && _goal$status !== void 0 ? _goal$status : 'DEFAULT',
|
|
41
41
|
iconKey: toGoalIconKey(goal === null || goal === void 0 ? void 0 : goal.iconKey)
|
|
42
42
|
})),
|
|
@@ -13,7 +13,7 @@ export const replaceRichInlineNodes = (editorState, hydratedValues) => {
|
|
|
13
13
|
transaction.setMeta('addToHistory', false);
|
|
14
14
|
Object.entries(hydratedValues).forEach(([fieldName, values]) => {
|
|
15
15
|
values.forEach(value => {
|
|
16
|
-
if (value.type === 'user' || value.type === 'team' || value.type === 'goal' && FeatureGates.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || value.type === 'project' &&
|
|
16
|
+
if (value.type === 'user' || value.type === 'team' || value.type === 'goal' && FeatureGates.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || value.type === 'project' && FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1) {
|
|
17
17
|
// First try to find as direct value operand (e.g., Team[Team] = uuid)
|
|
18
18
|
let astNodes = getValueNodes(ast, fieldName, value.id);
|
|
19
19
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import FeatureGates from '@atlaskit/feature-gate-js-client';
|
|
2
2
|
import { getJastFromState } from '../../plugins/jql-ast';
|
|
3
3
|
import { replaceRichInlineNodes } from '../../plugins/rich-inline-nodes/util/replace-nodes-transaction';
|
|
4
4
|
import { actions } from '../index';
|
|
@@ -40,7 +40,7 @@ export const hydrateQuery = () => async ({
|
|
|
40
40
|
// (e.g. '"project[atlassianproject]"'). normaliseHydrationKey ensures both storage and lookup use
|
|
41
41
|
// the same key format. See normaliseHydrationKey in ./util.ts.
|
|
42
42
|
const hydratedValuesMap = Object.entries(newHydratedValues).reduce((map, [fieldName, values]) => {
|
|
43
|
-
const fieldNameToUse =
|
|
43
|
+
const fieldNameToUse = FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1 ? normaliseHydrationKey(fieldName) : fieldName;
|
|
44
44
|
const valueMap = new Map(oldHydratedValues[fieldNameToUse]);
|
|
45
45
|
values.forEach(value => {
|
|
46
46
|
valueMap.set(value.id, value);
|
|
@@ -7,9 +7,9 @@ import { tap } from 'rxjs/operators/tap';
|
|
|
7
7
|
// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
8
8
|
import { v4 as uuidv4 } from 'uuid';
|
|
9
9
|
import { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
10
|
+
import FeatureGates from '@atlaskit/feature-gate-js-client';
|
|
10
11
|
import { computeJqlInsights, isListOperator, normaliseJqlString } from '@atlaskit/jql-ast';
|
|
11
12
|
import { JQLAutocomplete } from '@atlaskit/jql-autocomplete';
|
|
12
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
13
13
|
import { ActionSubject, ActionSubjectId, Action as AnalyticsAction, EventType } from '../analytics';
|
|
14
14
|
import { selectErrorCommand } from '../commands/select-error-command';
|
|
15
15
|
import { JQL_EDITOR_MAIN_ID } from '../common/constants';
|
|
@@ -880,7 +880,7 @@ export const useHydratedValue = createHook(Store, {
|
|
|
880
880
|
fieldName
|
|
881
881
|
}) => {
|
|
882
882
|
var _state$hydratedValues2;
|
|
883
|
-
if (
|
|
883
|
+
if (FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1) {
|
|
884
884
|
var _state$hydratedValues;
|
|
885
885
|
return (_state$hydratedValues = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues === void 0 ? void 0 : _state$hydratedValues.get(normaliseJqlString(id));
|
|
886
886
|
}
|
|
@@ -893,7 +893,7 @@ export const useHydratedUser = createHook(Store, {
|
|
|
893
893
|
fieldName
|
|
894
894
|
}) => {
|
|
895
895
|
var _state$hydratedValues3, _state$hydratedValues4;
|
|
896
|
-
const user =
|
|
896
|
+
const user = FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1 ? (_state$hydratedValues3 = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues3 === void 0 ? void 0 : _state$hydratedValues3.get(normaliseJqlString(id)) : (_state$hydratedValues4 = state.hydratedValues[fieldName]) === null || _state$hydratedValues4 === void 0 ? void 0 : _state$hydratedValues4.get(id);
|
|
897
897
|
return user && user.type === 'user' ? user : undefined;
|
|
898
898
|
}
|
|
899
899
|
});
|
|
@@ -903,7 +903,7 @@ export const useHydratedTeam = createHook(Store, {
|
|
|
903
903
|
fieldName
|
|
904
904
|
}) => {
|
|
905
905
|
var _state$hydratedValues5, _state$hydratedValues6;
|
|
906
|
-
const team =
|
|
906
|
+
const team = FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1 ? (_state$hydratedValues5 = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues5 === void 0 ? void 0 : _state$hydratedValues5.get(normaliseJqlString(id)) : (_state$hydratedValues6 = state.hydratedValues[fieldName]) === null || _state$hydratedValues6 === void 0 ? void 0 : _state$hydratedValues6.get(id);
|
|
907
907
|
return team && team.type === 'team' ? team : undefined;
|
|
908
908
|
}
|
|
909
909
|
});
|
|
@@ -913,7 +913,7 @@ export const useHydratedProject = createHook(Store, {
|
|
|
913
913
|
fieldName
|
|
914
914
|
}) => {
|
|
915
915
|
var _state$hydratedValues7, _state$hydratedValues8;
|
|
916
|
-
const project =
|
|
916
|
+
const project = FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1 ? (_state$hydratedValues7 = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues7 === void 0 ? void 0 : _state$hydratedValues7.get(normaliseJqlString(id)) : (_state$hydratedValues8 = state.hydratedValues[normaliseJqlString(fieldName)]) === null || _state$hydratedValues8 === void 0 ? void 0 : _state$hydratedValues8.get(normaliseJqlString(id));
|
|
917
917
|
return project && project.type === 'project' ? project : undefined;
|
|
918
918
|
}
|
|
919
919
|
});
|
|
@@ -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
|
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { ANALYTICS_CHANNEL, useJqlPackageAnalytics, EventType } from '../analytics/index';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { JQLEditorAsync, preloadJQLEditor } from '../async';
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default as JQLEditorAnalyticsListener } from '../analytics/listener/jql-editor-analytics-listener';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { JQLEditorReadOnly } from '../ui/jql-editor-layout/index';
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default as JQLEditor } from '../ui/index';
|
|
@@ -11,7 +11,6 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
|
|
|
11
11
|
import { TextSelection } from '@atlaskit/editor-prosemirror/state';
|
|
12
12
|
import FeatureGates from '@atlaskit/feature-gate-js-client';
|
|
13
13
|
import { isListOperator } from '@atlaskit/jql-ast';
|
|
14
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
15
14
|
import getDocumentPosition from '../common/get-document-position';
|
|
16
15
|
import ReactPluginView from '../common/react-plugin-view';
|
|
17
16
|
import Autocomplete from './components/autocomplete';
|
|
@@ -57,7 +56,7 @@ var AutocompletePluginView = /*#__PURE__*/function (_ReactPluginView) {
|
|
|
57
56
|
if (_this.enableRichInlineNodes && option.type === 'value' && option.valueType === 'user') {
|
|
58
57
|
transaction.setMeta('hydrate', true);
|
|
59
58
|
}
|
|
60
|
-
if (_this.enableRichInlineNodes && option.type === 'value' && (option.valueType === 'team' || option.valueType === 'goal' && FeatureGates.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || option.valueType === 'project' &&
|
|
59
|
+
if (_this.enableRichInlineNodes && option.type === 'value' && (option.valueType === 'team' || option.valueType === 'goal' && FeatureGates.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || option.valueType === 'project' && FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1)) {
|
|
61
60
|
transaction.setMeta('hydrate', true);
|
|
62
61
|
}
|
|
63
62
|
var documentFrom = getDocumentPosition(transaction.doc, from);
|
|
@@ -110,7 +109,7 @@ var AutocompletePluginView = /*#__PURE__*/function (_ReactPluginView) {
|
|
|
110
109
|
}
|
|
111
110
|
case 'project':
|
|
112
111
|
{
|
|
113
|
-
if (
|
|
112
|
+
if (FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1) {
|
|
114
113
|
var _attributes2 = {
|
|
115
114
|
type: 'project',
|
|
116
115
|
id: value,
|
|
@@ -17,6 +17,13 @@ var appearanceToColorMap = {
|
|
|
17
17
|
AT_RISK: 'yellow',
|
|
18
18
|
ON_TRACK: 'green'
|
|
19
19
|
};
|
|
20
|
+
var appearanceToNewColorMap = {
|
|
21
|
+
MENU: "var(--ds-icon, #292A2E)",
|
|
22
|
+
DEFAULT: "var(--ds-icon-accent-gray, #7D818A)",
|
|
23
|
+
OFF_TRACK: "var(--ds-icon-danger, #C9372C)",
|
|
24
|
+
AT_RISK: "var(--ds-icon-warning, #E06C00)",
|
|
25
|
+
ON_TRACK: "var(--ds-icon-success, #6A9A23)"
|
|
26
|
+
};
|
|
20
27
|
var keyToIconMap = {
|
|
21
28
|
GOAL: ObjectiveIcon,
|
|
22
29
|
OBJECTIVE: ObjectiveIcon,
|
|
@@ -30,6 +37,15 @@ export var GoalIcon = function GoalIcon(_ref) {
|
|
|
30
37
|
iconKey = _ref$iconKey === void 0 ? 'GOAL' : _ref$iconKey;
|
|
31
38
|
var Icon = (_keyToIconMap = keyToIconMap[iconKey]) !== null && _keyToIconMap !== void 0 ? _keyToIconMap : keyToIconMap.GOAL;
|
|
32
39
|
var appearance = isGoalAppearance(status) ? status : 'DEFAULT';
|
|
40
|
+
|
|
41
|
+
// Icon tile no longer supports a 16px size
|
|
42
|
+
if (size === 'xsmall') {
|
|
43
|
+
return /*#__PURE__*/React.createElement(Icon, {
|
|
44
|
+
label: "",
|
|
45
|
+
size: "medium",
|
|
46
|
+
color: appearanceToNewColorMap[appearance]
|
|
47
|
+
});
|
|
48
|
+
}
|
|
33
49
|
return /*#__PURE__*/React.createElement(IconTile, {
|
|
34
50
|
size: size,
|
|
35
51
|
icon: Icon,
|
|
@@ -39,7 +39,7 @@ export var GoalNode = function GoalNode(props) {
|
|
|
39
39
|
iconBefore: /*#__PURE__*/React.createElement(Box, {
|
|
40
40
|
xcss: styles.iconWrapper
|
|
41
41
|
}, /*#__PURE__*/React.createElement(GoalIcon, {
|
|
42
|
-
size: "
|
|
42
|
+
size: "xsmall",
|
|
43
43
|
status: (_goal$status = goal === null || goal === void 0 ? void 0 : goal.status) !== null && _goal$status !== void 0 ? _goal$status : 'DEFAULT',
|
|
44
44
|
iconKey: toGoalIconKey(goal === null || goal === void 0 ? void 0 : goal.iconKey)
|
|
45
45
|
})),
|
|
@@ -27,7 +27,7 @@ export var replaceRichInlineNodes = function replaceRichInlineNodes(editorState,
|
|
|
27
27
|
fieldName = _ref2[0],
|
|
28
28
|
values = _ref2[1];
|
|
29
29
|
values.forEach(function (value) {
|
|
30
|
-
if (value.type === 'user' || value.type === 'team' || value.type === 'goal' && FeatureGates.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || value.type === 'project' &&
|
|
30
|
+
if (value.type === 'user' || value.type === 'team' || value.type === 'goal' && FeatureGates.getExperimentValue('anip-1095-goals-in-harmonised-filter', 'isEnabled', false) || value.type === 'project' && FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1) {
|
|
31
31
|
// First try to find as direct value operand (e.g., Team[Team] = uuid)
|
|
32
32
|
var astNodes = getValueNodes(ast, fieldName, value.id);
|
|
33
33
|
|
|
@@ -4,7 +4,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
|
|
|
4
4
|
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
5
5
|
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; }
|
|
6
6
|
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; }
|
|
7
|
-
import
|
|
7
|
+
import FeatureGates from '@atlaskit/feature-gate-js-client';
|
|
8
8
|
import { getJastFromState } from '../../plugins/jql-ast';
|
|
9
9
|
import { replaceRichInlineNodes } from '../../plugins/rich-inline-nodes/util/replace-nodes-transaction';
|
|
10
10
|
import { actions } from '../index';
|
|
@@ -52,7 +52,7 @@ export var hydrateQuery = function hydrateQuery() {
|
|
|
52
52
|
var _ref5 = _slicedToArray(_ref4, 2),
|
|
53
53
|
fieldName = _ref5[0],
|
|
54
54
|
values = _ref5[1];
|
|
55
|
-
var fieldNameToUse =
|
|
55
|
+
var fieldNameToUse = FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1 ? normaliseHydrationKey(fieldName) : fieldName;
|
|
56
56
|
var valueMap = new Map(oldHydratedValues[fieldNameToUse]);
|
|
57
57
|
values.forEach(function (value) {
|
|
58
58
|
valueMap.set(value.id, value);
|
package/dist/esm/state/index.js
CHANGED
|
@@ -12,9 +12,9 @@ import { tap } from 'rxjs/operators/tap';
|
|
|
12
12
|
// eslint-disable-next-line @atlaskit/platform/prefer-crypto-random-uuid -- Use crypto.randomUUID instead
|
|
13
13
|
import { v4 as uuidv4 } from 'uuid';
|
|
14
14
|
import { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
15
|
+
import FeatureGates from '@atlaskit/feature-gate-js-client';
|
|
15
16
|
import { computeJqlInsights, isListOperator, normaliseJqlString } from '@atlaskit/jql-ast';
|
|
16
17
|
import { JQLAutocomplete } from '@atlaskit/jql-autocomplete';
|
|
17
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
18
18
|
import { ActionSubject, ActionSubjectId, Action as AnalyticsAction, EventType } from '../analytics';
|
|
19
19
|
import { selectErrorCommand } from '../commands/select-error-command';
|
|
20
20
|
import { JQL_EDITOR_MAIN_ID } from '../common/constants';
|
|
@@ -901,7 +901,7 @@ export var useHydratedValue = createHook(Store, {
|
|
|
901
901
|
var _state$hydratedValues2;
|
|
902
902
|
var id = _ref38.id,
|
|
903
903
|
fieldName = _ref38.fieldName;
|
|
904
|
-
if (
|
|
904
|
+
if (FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1) {
|
|
905
905
|
var _state$hydratedValues;
|
|
906
906
|
return (_state$hydratedValues = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues === void 0 ? void 0 : _state$hydratedValues.get(normaliseJqlString(id));
|
|
907
907
|
}
|
|
@@ -913,7 +913,7 @@ export var useHydratedUser = createHook(Store, {
|
|
|
913
913
|
var _state$hydratedValues3, _state$hydratedValues4;
|
|
914
914
|
var id = _ref39.id,
|
|
915
915
|
fieldName = _ref39.fieldName;
|
|
916
|
-
var user =
|
|
916
|
+
var user = FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1 ? (_state$hydratedValues3 = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues3 === void 0 ? void 0 : _state$hydratedValues3.get(normaliseJqlString(id)) : (_state$hydratedValues4 = state.hydratedValues[fieldName]) === null || _state$hydratedValues4 === void 0 ? void 0 : _state$hydratedValues4.get(id);
|
|
917
917
|
return user && user.type === 'user' ? user : undefined;
|
|
918
918
|
}
|
|
919
919
|
});
|
|
@@ -922,7 +922,7 @@ export var useHydratedTeam = createHook(Store, {
|
|
|
922
922
|
var _state$hydratedValues5, _state$hydratedValues6;
|
|
923
923
|
var id = _ref40.id,
|
|
924
924
|
fieldName = _ref40.fieldName;
|
|
925
|
-
var team =
|
|
925
|
+
var team = FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1 ? (_state$hydratedValues5 = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues5 === void 0 ? void 0 : _state$hydratedValues5.get(normaliseJqlString(id)) : (_state$hydratedValues6 = state.hydratedValues[fieldName]) === null || _state$hydratedValues6 === void 0 ? void 0 : _state$hydratedValues6.get(id);
|
|
926
926
|
return team && team.type === 'team' ? team : undefined;
|
|
927
927
|
}
|
|
928
928
|
});
|
|
@@ -931,7 +931,7 @@ export var useHydratedProject = createHook(Store, {
|
|
|
931
931
|
var _state$hydratedValues7, _state$hydratedValues8;
|
|
932
932
|
var id = _ref41.id,
|
|
933
933
|
fieldName = _ref41.fieldName;
|
|
934
|
-
var project =
|
|
934
|
+
var project = FeatureGates.getExperimentValue('atlassian_projects_-_native_integration', 'releaseVersion', -1) >= 1 ? (_state$hydratedValues7 = state.hydratedValues[normaliseHydrationKey(fieldName)]) === null || _state$hydratedValues7 === void 0 ? void 0 : _state$hydratedValues7.get(normaliseJqlString(id)) : (_state$hydratedValues8 = state.hydratedValues[normaliseJqlString(fieldName)]) === null || _state$hydratedValues8 === void 0 ? void 0 : _state$hydratedValues8.get(normaliseJqlString(id));
|
|
935
935
|
return project && project.type === 'project' ? project : undefined;
|
|
936
936
|
}
|
|
937
937
|
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { JQLEditorAsync, preloadJQLEditor } from '../async';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type { AutocompleteOption, AutocompleteValueType, AutocompleteOptions, AutocompleteProvider, } from '../plugins/autocomplete/components/types';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { JQLEditorReadOnly } from '../ui/jql-editor-layout/index';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type { JQLClause } from '../types';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type { ExternalMessage, ExternalError, ExternalWarning, ExternalInfo, CustomComponents, } from '../state/types';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type { JQLEditorUIProps, HydratedValue, HydratedValues, HydratedUser, HydratedTeam, HydratedProject, HydratedGoal, } from '../ui/jql-editor/types';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type { JQLEditorProps } from '../ui/types';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default as JQLEditor } from '../ui/index';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { JQLEditorAsync, preloadJQLEditor } from '../async';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type { AutocompleteOption, AutocompleteValueType, AutocompleteOptions, AutocompleteProvider, } from '../plugins/autocomplete/components/types';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { JQLEditorReadOnly } from '../ui/jql-editor-layout/index';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type { JQLClause } from '../types';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type { ExternalMessage, ExternalError, ExternalWarning, ExternalInfo, CustomComponents, } from '../state/types';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type { JQLEditorUIProps, HydratedValue, HydratedValues, HydratedUser, HydratedTeam, HydratedProject, HydratedGoal, } from '../ui/jql-editor/types';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export type { JQLEditorProps } from '../ui/types';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default as JQLEditor } from '../ui/index';
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@atlaskit/jql-editor/jql-editor-analytics-listener",
|
|
3
|
+
"main": "../dist/cjs/entry-points/jql-editor-analytics-listener.js",
|
|
4
|
+
"module": "../dist/esm/entry-points/jql-editor-analytics-listener.js",
|
|
5
|
+
"module:es2019": "../dist/es2019/entry-points/jql-editor-analytics-listener.js",
|
|
6
|
+
"sideEffects": [
|
|
7
|
+
"*.compiled.css"
|
|
8
|
+
],
|
|
9
|
+
"types": "../dist/types/entry-points/jql-editor-analytics-listener.d.ts",
|
|
10
|
+
"typesVersions": {
|
|
11
|
+
">=4.5 <5.9": {
|
|
12
|
+
"*": [
|
|
13
|
+
"../dist/types-ts4.5/entry-points/jql-editor-analytics-listener.d.ts"
|
|
14
|
+
]
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@atlaskit/jql-editor/jql-editor-layout",
|
|
3
|
+
"main": "../dist/cjs/entry-points/jql-editor-layout.js",
|
|
4
|
+
"module": "../dist/esm/entry-points/jql-editor-layout.js",
|
|
5
|
+
"module:es2019": "../dist/es2019/entry-points/jql-editor-layout.js",
|
|
6
|
+
"sideEffects": [
|
|
7
|
+
"*.compiled.css"
|
|
8
|
+
],
|
|
9
|
+
"types": "../dist/types/entry-points/jql-editor-layout.d.ts",
|
|
10
|
+
"typesVersions": {
|
|
11
|
+
">=4.5 <5.9": {
|
|
12
|
+
"*": [
|
|
13
|
+
"../dist/types-ts4.5/entry-points/jql-editor-layout.d.ts"
|
|
14
|
+
]
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/jql-editor",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.4.0",
|
|
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",
|
|
@@ -46,15 +46,15 @@
|
|
|
46
46
|
"@atlaskit/button": "^23.11.0",
|
|
47
47
|
"@atlaskit/css": "^0.19.0",
|
|
48
48
|
"@atlaskit/editor-prosemirror": "^7.3.0",
|
|
49
|
-
"@atlaskit/emoji": "^70.
|
|
49
|
+
"@atlaskit/emoji": "^70.6.0",
|
|
50
50
|
"@atlaskit/feature-gate-js-client": "^5.5.0",
|
|
51
51
|
"@atlaskit/form": "^15.5.0",
|
|
52
|
-
"@atlaskit/icon": "^34.
|
|
53
|
-
"@atlaskit/icon-lab": "^6.
|
|
52
|
+
"@atlaskit/icon": "^34.5.0",
|
|
53
|
+
"@atlaskit/icon-lab": "^6.9.0",
|
|
54
54
|
"@atlaskit/jql-ast": "^3.4.0",
|
|
55
|
-
"@atlaskit/jql-autocomplete": "^2.
|
|
56
|
-
"@atlaskit/jql-editor-common": "^3.
|
|
57
|
-
"@atlaskit/jql-parser": "^2.
|
|
55
|
+
"@atlaskit/jql-autocomplete": "^2.1.0",
|
|
56
|
+
"@atlaskit/jql-editor-common": "^3.3.0",
|
|
57
|
+
"@atlaskit/jql-parser": "^2.1.0",
|
|
58
58
|
"@atlaskit/link": "^3.4.0",
|
|
59
59
|
"@atlaskit/platform-feature-flags": "^1.1.0",
|
|
60
60
|
"@atlaskit/popper": "^7.2.0",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"@atlaskit/teams-avatar": "^2.6.0",
|
|
65
65
|
"@atlaskit/theme": "^23.2.0",
|
|
66
66
|
"@atlaskit/tokens": "^13.0.0",
|
|
67
|
-
"@atlaskit/tooltip": "^22.
|
|
67
|
+
"@atlaskit/tooltip": "^22.2.0",
|
|
68
68
|
"@atlaskit/townsquare-emoji-provider": "^1.0.0",
|
|
69
69
|
"@babel/runtime": "^7.0.0",
|
|
70
70
|
"@emotion/react": "^11.7.1",
|
|
@@ -89,8 +89,8 @@
|
|
|
89
89
|
"@af/integration-testing": "workspace:^",
|
|
90
90
|
"@af/visual-regression": "workspace:^",
|
|
91
91
|
"@atlaskit/docs": "^11.8.0",
|
|
92
|
-
"@atlaskit/jql-editor-autocomplete-rest": "^3.
|
|
93
|
-
"@atlassian/feature-flags-storybook-utils": "^0.
|
|
92
|
+
"@atlaskit/jql-editor-autocomplete-rest": "^3.3.0",
|
|
93
|
+
"@atlassian/feature-flags-storybook-utils": "^0.4.0",
|
|
94
94
|
"@atlassian/feature-flags-test-utils": "^1.1.0",
|
|
95
95
|
"@atlassian/react-compiler-gating": "workspace:^",
|
|
96
96
|
"@storybook/addon-actions": "^8.6.14",
|
|
@@ -157,9 +157,6 @@
|
|
|
157
157
|
"jira_ai_agent_avatar_with_apptype_for_jql": {
|
|
158
158
|
"type": "boolean"
|
|
159
159
|
},
|
|
160
|
-
"projects_in_jira_eap_drop2": {
|
|
161
|
-
"type": "boolean"
|
|
162
|
-
},
|
|
163
160
|
"empanda_jql-editor_fix_tab_select_in_popup": {
|
|
164
161
|
"type": "boolean"
|
|
165
162
|
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@atlaskit/jql-editor/state/types",
|
|
3
|
+
"main": "../../dist/cjs/entry-points/state-types.js",
|
|
4
|
+
"module": "../../dist/esm/entry-points/state-types.js",
|
|
5
|
+
"module:es2019": "../../dist/es2019/entry-points/state-types.js",
|
|
6
|
+
"sideEffects": [
|
|
7
|
+
"*.compiled.css"
|
|
8
|
+
],
|
|
9
|
+
"types": "../../dist/types/entry-points/state-types.d.ts",
|
|
10
|
+
"typesVersions": {
|
|
11
|
+
">=4.5 <5.9": {
|
|
12
|
+
"*": [
|
|
13
|
+
"../../dist/types-ts4.5/entry-points/state-types.d.ts"
|
|
14
|
+
]
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@atlaskit/jql-editor/types",
|
|
3
|
+
"main": "../dist/cjs/entry-points/types.js",
|
|
4
|
+
"module": "../dist/esm/entry-points/types.js",
|
|
5
|
+
"module:es2019": "../dist/es2019/entry-points/types.js",
|
|
6
|
+
"sideEffects": [
|
|
7
|
+
"*.compiled.css"
|
|
8
|
+
],
|
|
9
|
+
"types": "../dist/types/entry-points/types.d.ts",
|
|
10
|
+
"typesVersions": {
|
|
11
|
+
">=4.5 <5.9": {
|
|
12
|
+
"*": [
|
|
13
|
+
"../dist/types-ts4.5/entry-points/types.d.ts"
|
|
14
|
+
]
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
package/ui/package.json
ADDED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@atlaskit/jql-editor/ui",
|
|
3
|
+
"main": "../dist/cjs/entry-points/ui.js",
|
|
4
|
+
"module": "../dist/esm/entry-points/ui.js",
|
|
5
|
+
"module:es2019": "../dist/es2019/entry-points/ui.js",
|
|
6
|
+
"sideEffects": [
|
|
7
|
+
"*.compiled.css"
|
|
8
|
+
],
|
|
9
|
+
"types": "../dist/types/entry-points/ui.d.ts",
|
|
10
|
+
"typesVersions": {
|
|
11
|
+
">=4.5 <5.9": {
|
|
12
|
+
"*": [
|
|
13
|
+
"../dist/types-ts4.5/entry-points/ui.d.ts"
|
|
14
|
+
]
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@atlaskit/jql-editor/ui/types",
|
|
3
|
+
"main": "../../dist/cjs/entry-points/ui-types.js",
|
|
4
|
+
"module": "../../dist/esm/entry-points/ui-types.js",
|
|
5
|
+
"module:es2019": "../../dist/es2019/entry-points/ui-types.js",
|
|
6
|
+
"sideEffects": [
|
|
7
|
+
"*.compiled.css"
|
|
8
|
+
],
|
|
9
|
+
"types": "../../dist/types/entry-points/ui-types.d.ts",
|
|
10
|
+
"typesVersions": {
|
|
11
|
+
">=4.5 <5.9": {
|
|
12
|
+
"*": [
|
|
13
|
+
"../../dist/types-ts4.5/entry-points/ui-types.d.ts"
|
|
14
|
+
]
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|