@atlaskit/link-datasource 4.6.1 → 4.7.1
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 +20 -0
- package/dist/cjs/state/actions/index.js +3 -9
- package/dist/cjs/ui/common/modal/search-count/index.js +9 -3
- package/dist/cjs/ui/confluence-search-modal/modal/index.js +5 -1
- package/dist/cjs/ui/jira-issues-modal/modal/index.js +5 -1
- package/dist/es2019/state/actions/index.js +3 -9
- package/dist/es2019/ui/common/modal/search-count/index.js +7 -2
- package/dist/es2019/ui/confluence-search-modal/modal/index.js +5 -1
- package/dist/es2019/ui/jira-issues-modal/modal/index.js +5 -1
- package/dist/esm/state/actions/index.js +3 -9
- package/dist/esm/ui/common/modal/search-count/index.js +9 -3
- package/dist/esm/ui/confluence-search-modal/modal/index.js +5 -1
- package/dist/esm/ui/jira-issues-modal/modal/index.js +5 -1
- package/dist/types/ui/common/modal/search-count/index.d.ts +6 -1
- package/dist/types-ts4.5/ui/common/modal/search-count/index.d.ts +6 -1
- package/package.json +6 -9
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @atlaskit/link-datasource
|
|
2
2
|
|
|
3
|
+
## 4.7.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#145369](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/145369)
|
|
8
|
+
[`995c7b4234127`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/995c7b4234127) -
|
|
9
|
+
Clean up FG enable_datasource_fetch_action_inputs
|
|
10
|
+
|
|
11
|
+
## 4.7.0
|
|
12
|
+
|
|
13
|
+
### Minor Changes
|
|
14
|
+
|
|
15
|
+
- [#144089](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/144089)
|
|
16
|
+
[`fc6dee851ba2a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fc6dee851ba2a) -
|
|
17
|
+
[ux] Behind fg `platform-linking-visual-refresh-sllv` - Updates styles for modal footer
|
|
18
|
+
|
|
19
|
+
### Patch Changes
|
|
20
|
+
|
|
21
|
+
- Updated dependencies
|
|
22
|
+
|
|
3
23
|
## 4.6.1
|
|
4
24
|
|
|
5
25
|
### Patch Changes
|
|
@@ -12,7 +12,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
|
12
12
|
var _react = require("react");
|
|
13
13
|
var _reactSweetState = require("react-sweet-state");
|
|
14
14
|
var _linkClientExtension = require("@atlaskit/link-client-extension");
|
|
15
|
-
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
16
15
|
var _analytics = require("../../analytics");
|
|
17
16
|
var _useErrorLogger2 = _interopRequireDefault(require("../../hooks/useErrorLogger"));
|
|
18
17
|
var _index = require("../index");
|
|
@@ -204,11 +203,9 @@ var useExecuteAtomicAction = exports.useExecuteAtomicAction = function useExecut
|
|
|
204
203
|
_useAtomicUpdateActio3 = _useAtomicUpdateActio2[0],
|
|
205
204
|
schema = _useAtomicUpdateActio3.schema,
|
|
206
205
|
fetchSchema = _useAtomicUpdateActio3.fetchSchema;
|
|
207
|
-
var item = (0,
|
|
208
|
-
// eslint-disable-next-line react-hooks/rules-of-hooks
|
|
209
|
-
(0, _index.useDatasourceItem)({
|
|
206
|
+
var item = (0, _index.useDatasourceItem)({
|
|
210
207
|
id: ari
|
|
211
|
-
})
|
|
208
|
+
});
|
|
212
209
|
var _useDatasourceClientE2 = (0, _linkClientExtension.useDatasourceClientExtension)(),
|
|
213
210
|
executeAction = _useDatasourceClientE2.executeAtomicAction,
|
|
214
211
|
invalidateDatasourceDataCacheByAri = _useDatasourceClientE2.invalidateDatasourceDataCacheByAri;
|
|
@@ -257,10 +254,7 @@ var useExecuteAtomicAction = exports.useExecuteAtomicAction = function useExecut
|
|
|
257
254
|
* controlled inputs are useful for search fields, where a variable query is passed to the fetchAction
|
|
258
255
|
*/
|
|
259
256
|
var inputs = controlledInputs;
|
|
260
|
-
|
|
261
|
-
* When FF is on and `controlledInputs` are not provided we look for required inputs in the fetchSchema
|
|
262
|
-
*/
|
|
263
|
-
if (!Object.keys(inputs).length && fetchSchema.inputs && !!Object.keys(fetchSchema.inputs).length && (0, _platformFeatureFlags.fg)('enable_datasource_fetch_action_inputs')) {
|
|
257
|
+
if (!Object.keys(inputs).length && fetchSchema.inputs && !!Object.keys(fetchSchema.inputs).length) {
|
|
264
258
|
var inputKeys = Object.keys(fetchSchema.inputs);
|
|
265
259
|
/**
|
|
266
260
|
* If present return the input value from the datasource item
|
|
@@ -9,6 +9,7 @@ exports.default = exports.AssetsItemCount = void 0;
|
|
|
9
9
|
require("./index.compiled.css");
|
|
10
10
|
var _runtime = require("@compiled/react/runtime");
|
|
11
11
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
12
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
12
13
|
var _react = _interopRequireDefault(require("react"));
|
|
13
14
|
var _reactIntlNext = require("react-intl-next");
|
|
14
15
|
var _heading = _interopRequireDefault(require("@atlaskit/heading"));
|
|
@@ -18,11 +19,14 @@ var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
|
|
|
18
19
|
var _colors = require("@atlaskit/theme/colors");
|
|
19
20
|
var _messages = require("../../../table-footer/messages");
|
|
20
21
|
var _messages2 = require("./messages");
|
|
22
|
+
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; }
|
|
23
|
+
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
24
|
var styles = {
|
|
22
25
|
searchCountStyles: "_16jlkb7n _1o9zkb7n _i0dlf1ug"
|
|
23
26
|
};
|
|
24
27
|
var ItemCountWrapper = function ItemCountWrapper(_ref) {
|
|
25
28
|
var url = _ref.url,
|
|
29
|
+
additionalStyles = _ref.styles,
|
|
26
30
|
children = _ref.children,
|
|
27
31
|
testId = _ref.testId;
|
|
28
32
|
return /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
|
|
@@ -35,10 +39,10 @@ var ItemCountWrapper = function ItemCountWrapper(_ref) {
|
|
|
35
39
|
testId: "item-count-url"
|
|
36
40
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
37
41
|
,
|
|
38
|
-
style: {
|
|
42
|
+
style: _objectSpread({
|
|
39
43
|
color: (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') ? "var(--ds-text-subtlest, #626F86)" : "var(--ds-text-accent-gray, ".concat(_colors.N800, ")"),
|
|
40
44
|
textDecoration: !url ? 'none' : ''
|
|
41
|
-
}
|
|
45
|
+
}, (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') && additionalStyles)
|
|
42
46
|
}, (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') ? children : /*#__PURE__*/_react.default.createElement(_heading.default, {
|
|
43
47
|
size: "xxsmall"
|
|
44
48
|
}, children)));
|
|
@@ -64,6 +68,7 @@ var AssetsItemCount = exports.AssetsItemCount = function AssetsItemCount(_ref2)
|
|
|
64
68
|
var TableSearchCount = function TableSearchCount(_ref3) {
|
|
65
69
|
var url = _ref3.url,
|
|
66
70
|
searchCount = _ref3.searchCount,
|
|
71
|
+
additionalStyles = _ref3.styles,
|
|
67
72
|
_ref3$testId = _ref3.testId,
|
|
68
73
|
testId = _ref3$testId === void 0 ? 'datasource-table-total-results-count' : _ref3$testId,
|
|
69
74
|
_ref3$prefixTextType = _ref3.prefixTextType,
|
|
@@ -72,7 +77,8 @@ var TableSearchCount = function TableSearchCount(_ref3) {
|
|
|
72
77
|
var messageKey = isIssue && (0, _platformFeatureFlags.fg)('confluence-issue-terminology-refresh') ? 'issueCountTextIssueTermRefresh' : "".concat(prefixTextType, "CountText");
|
|
73
78
|
return /*#__PURE__*/_react.default.createElement(ItemCountWrapper, {
|
|
74
79
|
testId: testId,
|
|
75
|
-
url: url
|
|
80
|
+
url: url,
|
|
81
|
+
styles: additionalStyles
|
|
76
82
|
}, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages2.searchCountMessages[messageKey], {
|
|
77
83
|
values: {
|
|
78
84
|
searchCount: searchCount
|
|
@@ -362,7 +362,11 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
|
|
|
362
362
|
searchCount: totalCount,
|
|
363
363
|
url: confluenceSearchUrl,
|
|
364
364
|
prefixTextType: "result",
|
|
365
|
-
testId: "confluence-search-datasource-modal-total-results-count"
|
|
365
|
+
testId: "confluence-search-datasource-modal-total-results-count",
|
|
366
|
+
styles: (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') ? {
|
|
367
|
+
color: "var(--ds-text, #172B4D)",
|
|
368
|
+
font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
|
|
369
|
+
} : undefined
|
|
366
370
|
}), /*#__PURE__*/_react.default.createElement(_cancelButton.CancelButton, {
|
|
367
371
|
onCancel: onCancel,
|
|
368
372
|
getAnalyticsPayload: getButtonAnalyticsPayload,
|
|
@@ -414,7 +414,11 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
414
414
|
searchCount: totalCount,
|
|
415
415
|
url: jqlUrl,
|
|
416
416
|
prefixTextType: "issue",
|
|
417
|
-
testId: "jira-datasource-modal-total-issues-count"
|
|
417
|
+
testId: "jira-datasource-modal-total-issues-count",
|
|
418
|
+
styles: (0, _platformFeatureFlags.fg)('platform-linking-visual-refresh-sllv') ? {
|
|
419
|
+
color: "var(--ds-text, #172B4D)",
|
|
420
|
+
font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
|
|
421
|
+
} : undefined
|
|
418
422
|
}), /*#__PURE__*/_react.default.createElement(_cancelButton.CancelButton, {
|
|
419
423
|
onCancel: onCancel,
|
|
420
424
|
getAnalyticsPayload: getCancelButtonAnalyticsPayload,
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { useCallback, useMemo } from 'react';
|
|
2
2
|
import { createActionsHook, createHook, createStore } from 'react-sweet-state';
|
|
3
3
|
import { useDatasourceClientExtension } from '@atlaskit/link-client-extension';
|
|
4
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
5
4
|
import { useDatasourceAnalyticsEvents } from '../../analytics';
|
|
6
5
|
import useErrorLogger from '../../hooks/useErrorLogger';
|
|
7
6
|
import { useDatasourceItem } from '../index';
|
|
@@ -186,11 +185,9 @@ export const useExecuteAtomicAction = ({
|
|
|
186
185
|
fieldKey,
|
|
187
186
|
integrationKey
|
|
188
187
|
});
|
|
189
|
-
const item =
|
|
190
|
-
// eslint-disable-next-line react-hooks/rules-of-hooks
|
|
191
|
-
useDatasourceItem({
|
|
188
|
+
const item = useDatasourceItem({
|
|
192
189
|
id: ari
|
|
193
|
-
})
|
|
190
|
+
});
|
|
194
191
|
const {
|
|
195
192
|
executeAtomicAction: executeAction,
|
|
196
193
|
invalidateDatasourceDataCacheByAri
|
|
@@ -242,10 +239,7 @@ export const useExecuteAtomicAction = ({
|
|
|
242
239
|
* controlled inputs are useful for search fields, where a variable query is passed to the fetchAction
|
|
243
240
|
*/
|
|
244
241
|
let inputs = controlledInputs;
|
|
245
|
-
|
|
246
|
-
* When FF is on and `controlledInputs` are not provided we look for required inputs in the fetchSchema
|
|
247
|
-
*/
|
|
248
|
-
if (!Object.keys(inputs).length && fetchSchema.inputs && !!Object.keys(fetchSchema.inputs).length && fg('enable_datasource_fetch_action_inputs')) {
|
|
242
|
+
if (!Object.keys(inputs).length && fetchSchema.inputs && !!Object.keys(fetchSchema.inputs).length) {
|
|
249
243
|
const inputKeys = Object.keys(fetchSchema.inputs);
|
|
250
244
|
/**
|
|
251
245
|
* If present return the input value from the datasource item
|
|
@@ -16,6 +16,7 @@ const styles = {
|
|
|
16
16
|
};
|
|
17
17
|
const ItemCountWrapper = ({
|
|
18
18
|
url,
|
|
19
|
+
styles: additionalStyles,
|
|
19
20
|
children,
|
|
20
21
|
testId
|
|
21
22
|
}) => /*#__PURE__*/React.createElement(Flex, {
|
|
@@ -30,7 +31,9 @@ const ItemCountWrapper = ({
|
|
|
30
31
|
,
|
|
31
32
|
style: {
|
|
32
33
|
color: fg('platform-linking-visual-refresh-sllv') ? "var(--ds-text-subtlest, #626F86)" : `var(--ds-text-accent-gray, ${N800})`,
|
|
33
|
-
textDecoration: !url ? 'none' : ''
|
|
34
|
+
textDecoration: !url ? 'none' : '',
|
|
35
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
36
|
+
...(fg('platform-linking-visual-refresh-sllv') && additionalStyles)
|
|
34
37
|
}
|
|
35
38
|
}, fg('platform-linking-visual-refresh-sllv') ? children : /*#__PURE__*/React.createElement(Heading, {
|
|
36
39
|
size: "xxsmall"
|
|
@@ -57,6 +60,7 @@ export const AssetsItemCount = ({
|
|
|
57
60
|
const TableSearchCount = ({
|
|
58
61
|
url,
|
|
59
62
|
searchCount,
|
|
63
|
+
styles: additionalStyles,
|
|
60
64
|
testId = 'datasource-table-total-results-count',
|
|
61
65
|
prefixTextType = 'issue'
|
|
62
66
|
}) => {
|
|
@@ -64,7 +68,8 @@ const TableSearchCount = ({
|
|
|
64
68
|
const messageKey = isIssue && fg('confluence-issue-terminology-refresh') ? 'issueCountTextIssueTermRefresh' : `${prefixTextType}CountText`;
|
|
65
69
|
return /*#__PURE__*/React.createElement(ItemCountWrapper, {
|
|
66
70
|
testId: testId,
|
|
67
|
-
url: url
|
|
71
|
+
url: url,
|
|
72
|
+
styles: additionalStyles
|
|
68
73
|
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, searchCountMessages[messageKey], {
|
|
69
74
|
values: {
|
|
70
75
|
searchCount
|
|
@@ -343,7 +343,11 @@ export const PlainConfluenceSearchConfigModal = props => {
|
|
|
343
343
|
searchCount: totalCount,
|
|
344
344
|
url: confluenceSearchUrl,
|
|
345
345
|
prefixTextType: "result",
|
|
346
|
-
testId: "confluence-search-datasource-modal-total-results-count"
|
|
346
|
+
testId: "confluence-search-datasource-modal-total-results-count",
|
|
347
|
+
styles: fg('platform-linking-visual-refresh-sllv') ? {
|
|
348
|
+
color: "var(--ds-text, #172B4D)",
|
|
349
|
+
font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
|
|
350
|
+
} : undefined
|
|
347
351
|
}), /*#__PURE__*/React.createElement(CancelButton, {
|
|
348
352
|
onCancel: onCancel,
|
|
349
353
|
getAnalyticsPayload: getButtonAnalyticsPayload,
|
|
@@ -396,7 +396,11 @@ const PlainJiraIssuesConfigModal = props => {
|
|
|
396
396
|
searchCount: totalCount,
|
|
397
397
|
url: jqlUrl,
|
|
398
398
|
prefixTextType: "issue",
|
|
399
|
-
testId: "jira-datasource-modal-total-issues-count"
|
|
399
|
+
testId: "jira-datasource-modal-total-issues-count",
|
|
400
|
+
styles: fg('platform-linking-visual-refresh-sllv') ? {
|
|
401
|
+
color: "var(--ds-text, #172B4D)",
|
|
402
|
+
font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
|
|
403
|
+
} : undefined
|
|
400
404
|
}), /*#__PURE__*/React.createElement(CancelButton, {
|
|
401
405
|
onCancel: onCancel,
|
|
402
406
|
getAnalyticsPayload: getCancelButtonAnalyticsPayload,
|
|
@@ -7,7 +7,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
7
7
|
import { useCallback, useMemo } from 'react';
|
|
8
8
|
import { createActionsHook, createHook, createStore } from 'react-sweet-state';
|
|
9
9
|
import { useDatasourceClientExtension } from '@atlaskit/link-client-extension';
|
|
10
|
-
import { fg } from '@atlaskit/platform-feature-flags';
|
|
11
10
|
import { useDatasourceAnalyticsEvents } from '../../analytics';
|
|
12
11
|
import useErrorLogger from '../../hooks/useErrorLogger';
|
|
13
12
|
import { useDatasourceItem } from '../index';
|
|
@@ -198,11 +197,9 @@ export var useExecuteAtomicAction = function useExecuteAtomicAction(_ref5) {
|
|
|
198
197
|
_useAtomicUpdateActio3 = _useAtomicUpdateActio2[0],
|
|
199
198
|
schema = _useAtomicUpdateActio3.schema,
|
|
200
199
|
fetchSchema = _useAtomicUpdateActio3.fetchSchema;
|
|
201
|
-
var item =
|
|
202
|
-
// eslint-disable-next-line react-hooks/rules-of-hooks
|
|
203
|
-
useDatasourceItem({
|
|
200
|
+
var item = useDatasourceItem({
|
|
204
201
|
id: ari
|
|
205
|
-
})
|
|
202
|
+
});
|
|
206
203
|
var _useDatasourceClientE2 = useDatasourceClientExtension(),
|
|
207
204
|
executeAction = _useDatasourceClientE2.executeAtomicAction,
|
|
208
205
|
invalidateDatasourceDataCacheByAri = _useDatasourceClientE2.invalidateDatasourceDataCacheByAri;
|
|
@@ -251,10 +248,7 @@ export var useExecuteAtomicAction = function useExecuteAtomicAction(_ref5) {
|
|
|
251
248
|
* controlled inputs are useful for search fields, where a variable query is passed to the fetchAction
|
|
252
249
|
*/
|
|
253
250
|
var inputs = controlledInputs;
|
|
254
|
-
|
|
255
|
-
* When FF is on and `controlledInputs` are not provided we look for required inputs in the fetchSchema
|
|
256
|
-
*/
|
|
257
|
-
if (!Object.keys(inputs).length && fetchSchema.inputs && !!Object.keys(fetchSchema.inputs).length && fg('enable_datasource_fetch_action_inputs')) {
|
|
251
|
+
if (!Object.keys(inputs).length && fetchSchema.inputs && !!Object.keys(fetchSchema.inputs).length) {
|
|
258
252
|
var inputKeys = Object.keys(fetchSchema.inputs);
|
|
259
253
|
/**
|
|
260
254
|
* If present return the input value from the datasource item
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
/* index.tsx generated by @compiled/babel-plugin v0.36.1 */
|
|
2
2
|
import _extends from "@babel/runtime/helpers/extends";
|
|
3
|
+
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
3
4
|
import "./index.compiled.css";
|
|
4
5
|
import { ax, ix } from "@compiled/react/runtime";
|
|
6
|
+
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; }
|
|
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; }
|
|
5
8
|
import React from 'react';
|
|
6
9
|
import { FormattedMessage, FormattedNumber } from 'react-intl-next';
|
|
7
10
|
import Heading from '@atlaskit/heading';
|
|
@@ -16,6 +19,7 @@ var styles = {
|
|
|
16
19
|
};
|
|
17
20
|
var ItemCountWrapper = function ItemCountWrapper(_ref) {
|
|
18
21
|
var url = _ref.url,
|
|
22
|
+
additionalStyles = _ref.styles,
|
|
19
23
|
children = _ref.children,
|
|
20
24
|
testId = _ref.testId;
|
|
21
25
|
return /*#__PURE__*/React.createElement(Flex, {
|
|
@@ -28,10 +32,10 @@ var ItemCountWrapper = function ItemCountWrapper(_ref) {
|
|
|
28
32
|
testId: "item-count-url"
|
|
29
33
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
|
|
30
34
|
,
|
|
31
|
-
style: {
|
|
35
|
+
style: _objectSpread({
|
|
32
36
|
color: fg('platform-linking-visual-refresh-sllv') ? "var(--ds-text-subtlest, #626F86)" : "var(--ds-text-accent-gray, ".concat(N800, ")"),
|
|
33
37
|
textDecoration: !url ? 'none' : ''
|
|
34
|
-
}
|
|
38
|
+
}, fg('platform-linking-visual-refresh-sllv') && additionalStyles)
|
|
35
39
|
}, fg('platform-linking-visual-refresh-sllv') ? children : /*#__PURE__*/React.createElement(Heading, {
|
|
36
40
|
size: "xxsmall"
|
|
37
41
|
}, children)));
|
|
@@ -57,6 +61,7 @@ export var AssetsItemCount = function AssetsItemCount(_ref2) {
|
|
|
57
61
|
var TableSearchCount = function TableSearchCount(_ref3) {
|
|
58
62
|
var url = _ref3.url,
|
|
59
63
|
searchCount = _ref3.searchCount,
|
|
64
|
+
additionalStyles = _ref3.styles,
|
|
60
65
|
_ref3$testId = _ref3.testId,
|
|
61
66
|
testId = _ref3$testId === void 0 ? 'datasource-table-total-results-count' : _ref3$testId,
|
|
62
67
|
_ref3$prefixTextType = _ref3.prefixTextType,
|
|
@@ -65,7 +70,8 @@ var TableSearchCount = function TableSearchCount(_ref3) {
|
|
|
65
70
|
var messageKey = isIssue && fg('confluence-issue-terminology-refresh') ? 'issueCountTextIssueTermRefresh' : "".concat(prefixTextType, "CountText");
|
|
66
71
|
return /*#__PURE__*/React.createElement(ItemCountWrapper, {
|
|
67
72
|
testId: testId,
|
|
68
|
-
url: url
|
|
73
|
+
url: url,
|
|
74
|
+
styles: additionalStyles
|
|
69
75
|
}, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, searchCountMessages[messageKey], {
|
|
70
76
|
values: {
|
|
71
77
|
searchCount: searchCount
|
|
@@ -353,7 +353,11 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
|
|
|
353
353
|
searchCount: totalCount,
|
|
354
354
|
url: confluenceSearchUrl,
|
|
355
355
|
prefixTextType: "result",
|
|
356
|
-
testId: "confluence-search-datasource-modal-total-results-count"
|
|
356
|
+
testId: "confluence-search-datasource-modal-total-results-count",
|
|
357
|
+
styles: fg('platform-linking-visual-refresh-sllv') ? {
|
|
358
|
+
color: "var(--ds-text, #172B4D)",
|
|
359
|
+
font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
|
|
360
|
+
} : undefined
|
|
357
361
|
}), /*#__PURE__*/React.createElement(CancelButton, {
|
|
358
362
|
onCancel: onCancel,
|
|
359
363
|
getAnalyticsPayload: getButtonAnalyticsPayload,
|
|
@@ -406,7 +406,11 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
|
|
|
406
406
|
searchCount: totalCount,
|
|
407
407
|
url: jqlUrl,
|
|
408
408
|
prefixTextType: "issue",
|
|
409
|
-
testId: "jira-datasource-modal-total-issues-count"
|
|
409
|
+
testId: "jira-datasource-modal-total-issues-count",
|
|
410
|
+
styles: fg('platform-linking-visual-refresh-sllv') ? {
|
|
411
|
+
color: "var(--ds-text, #172B4D)",
|
|
412
|
+
font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
|
|
413
|
+
} : undefined
|
|
410
414
|
}), /*#__PURE__*/React.createElement(CancelButton, {
|
|
411
415
|
onCancel: onCancel,
|
|
412
416
|
getAnalyticsPayload: getCancelButtonAnalyticsPayload,
|
|
@@ -4,7 +4,12 @@ interface TableSearchCountProps {
|
|
|
4
4
|
prefixTextType: 'issue' | 'result' | 'item';
|
|
5
5
|
searchCount: number;
|
|
6
6
|
testId?: string;
|
|
7
|
+
/**
|
|
8
|
+
* This attribute is only consumed when the fg
|
|
9
|
+
* `platform-linking-visual-refresh-sllv` is enabled.
|
|
10
|
+
*/
|
|
11
|
+
styles?: React.CSSProperties;
|
|
7
12
|
}
|
|
8
13
|
export declare const AssetsItemCount: ({ searchCount, url, testId, }: Pick<TableSearchCountProps, 'testId' | 'url' | 'searchCount'>) => React.JSX.Element;
|
|
9
|
-
declare const TableSearchCount: ({ url, searchCount, testId, prefixTextType, }: TableSearchCountProps) => React.JSX.Element;
|
|
14
|
+
declare const TableSearchCount: ({ url, searchCount, styles: additionalStyles, testId, prefixTextType, }: TableSearchCountProps) => React.JSX.Element;
|
|
10
15
|
export default TableSearchCount;
|
|
@@ -4,7 +4,12 @@ interface TableSearchCountProps {
|
|
|
4
4
|
prefixTextType: 'issue' | 'result' | 'item';
|
|
5
5
|
searchCount: number;
|
|
6
6
|
testId?: string;
|
|
7
|
+
/**
|
|
8
|
+
* This attribute is only consumed when the fg
|
|
9
|
+
* `platform-linking-visual-refresh-sllv` is enabled.
|
|
10
|
+
*/
|
|
11
|
+
styles?: React.CSSProperties;
|
|
7
12
|
}
|
|
8
13
|
export declare const AssetsItemCount: ({ searchCount, url, testId, }: Pick<TableSearchCountProps, 'testId' | 'url' | 'searchCount'>) => React.JSX.Element;
|
|
9
|
-
declare const TableSearchCount: ({ url, searchCount, testId, prefixTextType, }: TableSearchCountProps) => React.JSX.Element;
|
|
14
|
+
declare const TableSearchCount: ({ url, searchCount, styles: additionalStyles, testId, prefixTextType, }: TableSearchCountProps) => React.JSX.Element;
|
|
10
15
|
export default TableSearchCount;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/link-datasource",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.7.1",
|
|
4
4
|
"description": "UI Components to support linking platform dataset feature",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -78,7 +78,7 @@
|
|
|
78
78
|
"@atlaskit/primitives": "^14.4.0",
|
|
79
79
|
"@atlaskit/react-select": "^2.4.0",
|
|
80
80
|
"@atlaskit/select": "^20.4.0",
|
|
81
|
-
"@atlaskit/smart-card": "^36.
|
|
81
|
+
"@atlaskit/smart-card": "^36.10.0",
|
|
82
82
|
"@atlaskit/smart-user-picker": "^8.0.0",
|
|
83
83
|
"@atlaskit/spinner": "^18.0.0",
|
|
84
84
|
"@atlaskit/tag": "^14.0.0",
|
|
@@ -104,13 +104,13 @@
|
|
|
104
104
|
"react-intl-next": "npm:react-intl@^5.18.1"
|
|
105
105
|
},
|
|
106
106
|
"devDependencies": {
|
|
107
|
-
"@af/integration-testing": "
|
|
108
|
-
"@af/visual-regression": "
|
|
107
|
+
"@af/integration-testing": "workspace:^",
|
|
108
|
+
"@af/visual-regression": "workspace:^",
|
|
109
109
|
"@atlaskit/json-ld-types": "^1.2.0",
|
|
110
110
|
"@atlaskit/link-provider": "^2.1.0",
|
|
111
111
|
"@atlaskit/link-test-helpers": "^8.0.0",
|
|
112
|
-
"@atlaskit/ssr": "
|
|
113
|
-
"@atlaskit/visual-regression": "
|
|
112
|
+
"@atlaskit/ssr": "workspace:^",
|
|
113
|
+
"@atlaskit/visual-regression": "workspace:^",
|
|
114
114
|
"@atlassian/feature-flags-test-utils": "^0.3.0",
|
|
115
115
|
"@faker-js/faker": "^7.5.0",
|
|
116
116
|
"@testing-library/dom": "^10.1.0",
|
|
@@ -161,9 +161,6 @@
|
|
|
161
161
|
"./elements": "./src/elements.ts"
|
|
162
162
|
},
|
|
163
163
|
"platform-feature-flags": {
|
|
164
|
-
"enable_datasource_fetch_action_inputs": {
|
|
165
|
-
"type": "boolean"
|
|
166
|
-
},
|
|
167
164
|
"platform-datasources-enable-two-way-sync-statuses": {
|
|
168
165
|
"type": "boolean"
|
|
169
166
|
},
|