@atlaskit/link-datasource 4.20.5 → 4.21.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.
Files changed (70) hide show
  1. package/CHANGELOG.md +23 -0
  2. package/dist/cjs/ui/assets-modal/modal/index.js +3 -2
  3. package/dist/cjs/ui/assets-modal/modal/render-assets-content/index.compiled.css +2 -2
  4. package/dist/cjs/ui/assets-modal/modal/render-assets-content/index.js +2 -2
  5. package/dist/cjs/ui/assets-modal/search-container/index.compiled.css +4 -1
  6. package/dist/cjs/ui/assets-modal/search-container/index.js +28 -4
  7. package/dist/cjs/ui/common/modal/content-container/index.compiled.css +2 -2
  8. package/dist/cjs/ui/common/modal/content-container/index.js +1 -1
  9. package/dist/cjs/ui/common/modal/count-view-smart-link/index.compiled.css +1 -1
  10. package/dist/cjs/ui/common/modal/count-view-smart-link/index.js +1 -1
  11. package/dist/cjs/ui/common/modal/popup-select/control.js +1 -1
  12. package/dist/cjs/ui/common/modal/popup-select/dropdownIndicator.js +1 -16
  13. package/dist/cjs/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.compiled.css +1 -1
  14. package/dist/cjs/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.js +1 -1
  15. package/dist/cjs/ui/confluence-search-modal/basic-filters/filters/date-range-picker/index.compiled.css +1 -1
  16. package/dist/cjs/ui/confluence-search-modal/basic-filters/filters/date-range-picker/index.js +2 -2
  17. package/dist/cjs/ui/confluence-search-modal/modal/index.compiled.css +5 -0
  18. package/dist/cjs/ui/confluence-search-modal/modal/index.js +24 -2
  19. package/dist/cjs/ui/issue-like-table/empty-state/index.js +1 -1
  20. package/dist/cjs/ui/issue-like-table/index.compiled.css +1 -1
  21. package/dist/cjs/ui/issue-like-table/index.js +1 -1
  22. package/dist/cjs/ui/jira-issues-modal/modal/index.compiled.css +5 -0
  23. package/dist/cjs/ui/jira-issues-modal/modal/index.js +28 -1
  24. package/dist/es2019/ui/assets-modal/modal/index.js +3 -2
  25. package/dist/es2019/ui/assets-modal/modal/render-assets-content/index.compiled.css +2 -2
  26. package/dist/es2019/ui/assets-modal/modal/render-assets-content/index.js +2 -2
  27. package/dist/es2019/ui/assets-modal/search-container/index.compiled.css +4 -1
  28. package/dist/es2019/ui/assets-modal/search-container/index.js +28 -4
  29. package/dist/es2019/ui/common/modal/content-container/index.compiled.css +2 -2
  30. package/dist/es2019/ui/common/modal/content-container/index.js +1 -1
  31. package/dist/es2019/ui/common/modal/count-view-smart-link/index.compiled.css +1 -1
  32. package/dist/es2019/ui/common/modal/count-view-smart-link/index.js +1 -1
  33. package/dist/es2019/ui/common/modal/popup-select/control.js +1 -1
  34. package/dist/es2019/ui/common/modal/popup-select/dropdownIndicator.js +2 -17
  35. package/dist/es2019/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.compiled.css +1 -1
  36. package/dist/es2019/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.js +1 -1
  37. package/dist/es2019/ui/confluence-search-modal/basic-filters/filters/date-range-picker/index.compiled.css +1 -1
  38. package/dist/es2019/ui/confluence-search-modal/basic-filters/filters/date-range-picker/index.js +2 -2
  39. package/dist/es2019/ui/confluence-search-modal/modal/index.compiled.css +5 -0
  40. package/dist/es2019/ui/confluence-search-modal/modal/index.js +26 -4
  41. package/dist/es2019/ui/issue-like-table/empty-state/index.js +1 -1
  42. package/dist/es2019/ui/issue-like-table/index.compiled.css +1 -1
  43. package/dist/es2019/ui/issue-like-table/index.js +1 -1
  44. package/dist/es2019/ui/jira-issues-modal/modal/index.compiled.css +5 -0
  45. package/dist/es2019/ui/jira-issues-modal/modal/index.js +29 -2
  46. package/dist/esm/ui/assets-modal/modal/index.js +3 -2
  47. package/dist/esm/ui/assets-modal/modal/render-assets-content/index.compiled.css +2 -2
  48. package/dist/esm/ui/assets-modal/modal/render-assets-content/index.js +2 -2
  49. package/dist/esm/ui/assets-modal/search-container/index.compiled.css +4 -1
  50. package/dist/esm/ui/assets-modal/search-container/index.js +28 -4
  51. package/dist/esm/ui/common/modal/content-container/index.compiled.css +2 -2
  52. package/dist/esm/ui/common/modal/content-container/index.js +1 -1
  53. package/dist/esm/ui/common/modal/count-view-smart-link/index.compiled.css +1 -1
  54. package/dist/esm/ui/common/modal/count-view-smart-link/index.js +1 -1
  55. package/dist/esm/ui/common/modal/popup-select/control.js +1 -1
  56. package/dist/esm/ui/common/modal/popup-select/dropdownIndicator.js +2 -17
  57. package/dist/esm/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.compiled.css +1 -1
  58. package/dist/esm/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.js +1 -1
  59. package/dist/esm/ui/confluence-search-modal/basic-filters/filters/date-range-picker/index.compiled.css +1 -1
  60. package/dist/esm/ui/confluence-search-modal/basic-filters/filters/date-range-picker/index.js +2 -2
  61. package/dist/esm/ui/confluence-search-modal/modal/index.compiled.css +5 -0
  62. package/dist/esm/ui/confluence-search-modal/modal/index.js +26 -4
  63. package/dist/esm/ui/issue-like-table/empty-state/index.js +1 -1
  64. package/dist/esm/ui/issue-like-table/index.compiled.css +1 -1
  65. package/dist/esm/ui/issue-like-table/index.js +1 -1
  66. package/dist/esm/ui/jira-issues-modal/modal/index.compiled.css +5 -0
  67. package/dist/esm/ui/jira-issues-modal/modal/index.js +29 -2
  68. package/dist/types/ui/assets-modal/search-container/index.d.ts +1 -0
  69. package/dist/types-ts4.5/ui/assets-modal/search-container/index.d.ts +1 -0
  70. package/package.json +5 -5
package/CHANGELOG.md CHANGED
@@ -1,5 +1,28 @@
1
1
  # @atlaskit/link-datasource
2
2
 
3
+ ## 4.21.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [`e5001e144b74e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e5001e144b74e) -
8
+ Internal changes to how border radius is applied.
9
+ - Updated dependencies
10
+
11
+ ## 4.21.0
12
+
13
+ ### Minor Changes
14
+
15
+ - [`6ce6f7249075d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6ce6f7249075d) -
16
+ [ux] NAVX-1483 using the ADS modal built in hasCloseButton for LP components to adhere to a11y
17
+
18
+ ### Patch Changes
19
+
20
+ - [`d28c4180ae756`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d28c4180ae756) -
21
+ Internal changes to how border radius is applied.
22
+ - [`fe80630362c42`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fe80630362c42) -
23
+ NAVX-1379 Cleaning up navx-1184-fix-smart-link-a-11-y-interactive-states
24
+ - Updated dependencies
25
+
3
26
  ## 4.20.5
4
27
 
5
28
  ### Patch Changes
@@ -324,10 +324,11 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
324
324
  },
325
325
  onSearch: handleOnSearch,
326
326
  modalTitle: AssetsModalTitle,
327
- isSearching: status === 'loading'
327
+ isSearching: status === 'loading',
328
+ onCancel: onCancel
328
329
  });
329
330
  }
330
- }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status]);
331
+ }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status, onCancel]);
331
332
  var getCancelButtonAnalyticsPayload = (0, _react.useCallback)(function () {
332
333
  return _objectSpread(_objectSpread({}, analyticsPayload), {}, {
333
334
  searchCount: searchCount.current,
@@ -1,7 +1,7 @@
1
1
 
2
2
  ._19itn8v0{border:var(--_vzvmm2)}
3
3
  ._n7zl1oe8{border-bottom:var(--_cfwo9c)}._12vemgnk{background-repeat:no-repeat}
4
- ._13lipd34{border-top-left-radius:var(--ds-border-radius-200,8px)}
4
+ ._13li1mok{border-top-left-radius:var(--ds-radius-large,8px)}
5
5
  ._18m915vq{overflow-y:hidden}
6
6
  ._18m91wug{overflow-y:auto}
7
7
  ._1e0c11p5{display:grid}
@@ -11,4 +11,4 @@
11
11
  ._1reo1wug{overflow-x:auto}
12
12
  ._4t3i1pna{height:420px}
13
13
  ._qmxj1c00{background-attachment:local,scroll,local,scroll,local,scroll,local,scroll}
14
- ._qrwqpd34{border-top-right-radius:var(--ds-border-radius-200,8px)}
14
+ ._qrwq1mok{border-top-right-radius:var(--ds-radius-large,8px)}
@@ -45,7 +45,7 @@ var NoResultsView = function NoResultsView() {
45
45
  };
46
46
  var LoadingView = function LoadingView() {
47
47
  return /*#__PURE__*/React.createElement("div", {
48
- className: (0, _runtime.ax)(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19itn8v0 _n7zl1oe8 _13lipd34 _qrwqpd34 _1itk1bg1 _12vemgnk _1lrw1sd4 _qmxj1c00", "_1reo15vq _18m915vq"]),
48
+ className: (0, _runtime.ax)(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19itn8v0 _n7zl1oe8 _13li1mok _qrwq1mok _1itk1bg1 _12vemgnk _1lrw1sd4 _qmxj1c00", "_1reo15vq _18m915vq"]),
49
49
  style: {
50
50
  "--_vzvmm2": (0, _runtime.ix)("1px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")"))),
51
51
  "--_cfwo9c": (0, _runtime.ix)("2px solid ".concat("var(--ds-background-accent-gray-subtler, ".concat(_colors.N40, ")"))),
@@ -70,7 +70,7 @@ var RenderAssetsContent = exports.RenderAssetsContent = function RenderAssetsCon
70
70
  var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
71
71
  var issueLikeDataTableView = (0, _react.useMemo)(function () {
72
72
  return /*#__PURE__*/React.createElement("div", {
73
- className: (0, _runtime.ax)(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19itn8v0 _n7zl1oe8 _13lipd34 _qrwqpd34 _1itk1bg1 _12vemgnk _1lrw1sd4 _qmxj1c00"]),
73
+ className: (0, _runtime.ax)(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19itn8v0 _n7zl1oe8 _13li1mok _qrwq1mok _1itk1bg1 _12vemgnk _1lrw1sd4 _qmxj1c00"]),
74
74
  style: {
75
75
  "--_vzvmm2": (0, _runtime.ix)("1px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")"))),
76
76
  "--_cfwo9c": (0, _runtime.ix)("2px solid ".concat("var(--ds-background-accent-gray-subtler, ".concat(_colors.N40, ")"))),
@@ -1,4 +1,7 @@
1
- ._1bsb1osq{width:100%}
1
+
2
+ ._zulppxbi{gap:var(--ds-space-200,1pc)}._1bsb1osq{width:100%}
2
3
  ._1e0c11p5{display:grid}
3
4
  ._1p57pxbi{row-gap:var(--ds-space-200,1pc)}
5
+ ._2lx21sbv{flex-direction:row-reverse}
6
+ ._4cvr1h6o{align-items:center}
4
7
  ._p12ffkat{max-width:386px}
@@ -14,6 +14,9 @@ var _runtime = require("@compiled/react/runtime");
14
14
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
15
15
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
16
16
  var _form = _interopRequireDefault(require("@atlaskit/form"));
17
+ var _modalDialog = require("@atlaskit/modal-dialog");
18
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
19
+ var _compiled = require("@atlaskit/primitives/compiled");
17
20
  var _analytics = require("../../../analytics");
18
21
  var _aqlSearchInput = require("./aql-search-input");
19
22
  var _objectSchemaSelect = require("./object-schema-select");
@@ -21,6 +24,10 @@ var _styled = require("./styled");
21
24
  var _excluded = ["as", "style"],
22
25
  _excluded2 = ["as", "style"];
23
26
  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); }
27
+ var styles = {
28
+ modalTitleContainer: "_zulppxbi _4cvr1h6o",
29
+ flexStyles: "_2lx21sbv _1bsb1osq"
30
+ };
24
31
  var DEFAULT_AQL_QUERY = '';
25
32
  var SEARCH_FORM_ID = 'linkDataSource.assets.configModal.searchContainer-form';
26
33
 
@@ -60,7 +67,8 @@ var AssetsSearchContainer = exports.AssetsSearchContainer = function AssetsSearc
60
67
  workspaceId = props.workspaceId,
61
68
  initialSearchData = props.initialSearchData,
62
69
  modalTitle = props.modalTitle,
63
- isSearching = props.isSearching;
70
+ isSearching = props.isSearching,
71
+ onCancel = props.onCancel;
64
72
  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
65
73
  fireEvent = _useDatasourceAnalyti.fireEvent;
66
74
  var onFormSubmit = function onFormSubmit(searchFormValues) {
@@ -75,18 +83,34 @@ var AssetsSearchContainer = exports.AssetsSearchContainer = function AssetsSearc
75
83
  return /*#__PURE__*/React.createElement(_form.default, {
76
84
  onSubmit: onFormSubmit
77
85
  }, function (_ref3) {
78
- var _initialSearchData$ob, _initialSearchData$ob2, _initialSearchData$aq;
86
+ var _initialSearchData$ob, _initialSearchData$ob2, _initialSearchData$ob3, _initialSearchData$ob4, _initialSearchData$aq;
79
87
  var formProps = _ref3.formProps;
80
88
  return /*#__PURE__*/React.createElement(FormContainer, (0, _extends2.default)({}, formProps, {
81
89
  id: SEARCH_FORM_ID
82
90
  }), /*#__PURE__*/React.createElement(_styled.FormRowContainer, {
83
91
  isNarrowGap: true
84
- }, modalTitle, /*#__PURE__*/React.createElement(SchemaSelectContainer, null, /*#__PURE__*/React.createElement(_objectSchemaSelect.AssetsObjectSchemaSelect, {
92
+ }, (0, _platformFeatureFlags.fg)('navx-1483-a11y-close-button-in-modal-updates') ? /*#__PURE__*/React.createElement(_compiled.Flex, {
93
+ gap: "space.200",
94
+ justifyContent: "space-between",
95
+ xcss: styles.flexStyles
96
+ }, /*#__PURE__*/React.createElement(_compiled.Flex, {
97
+ justifyContent: "end"
98
+ }, /*#__PURE__*/React.createElement(_modalDialog.CloseButton, {
99
+ onClick: onCancel
100
+ })), /*#__PURE__*/React.createElement(_compiled.Flex, {
101
+ justifyContent: "start",
102
+ xcss: styles.modalTitleContainer
103
+ }, modalTitle, /*#__PURE__*/React.createElement(_objectSchemaSelect.AssetsObjectSchemaSelect, {
85
104
  value: (_initialSearchData$ob = initialSearchData.objectSchema) !== null && _initialSearchData$ob !== void 0 ? _initialSearchData$ob : undefined,
86
105
  workspaceId: workspaceId,
87
106
  initialObjectSchemas: (_initialSearchData$ob2 = initialSearchData.objectSchemas) !== null && _initialSearchData$ob2 !== void 0 ? _initialSearchData$ob2 : undefined,
88
107
  classNamePrefix: "assets-datasource-modal--object-schema-select"
89
- }))), /*#__PURE__*/React.createElement(_styled.FormRowContainer, null, /*#__PURE__*/React.createElement(_aqlSearchInput.AqlSearchInput, {
108
+ }))) : /*#__PURE__*/React.createElement("div", null, modalTitle, /*#__PURE__*/React.createElement(SchemaSelectContainer, null, /*#__PURE__*/React.createElement(_objectSchemaSelect.AssetsObjectSchemaSelect, {
109
+ value: (_initialSearchData$ob3 = initialSearchData.objectSchema) !== null && _initialSearchData$ob3 !== void 0 ? _initialSearchData$ob3 : undefined,
110
+ workspaceId: workspaceId,
111
+ initialObjectSchemas: (_initialSearchData$ob4 = initialSearchData.objectSchemas) !== null && _initialSearchData$ob4 !== void 0 ? _initialSearchData$ob4 : undefined,
112
+ classNamePrefix: "assets-datasource-modal--object-schema-select"
113
+ })))), /*#__PURE__*/React.createElement(_styled.FormRowContainer, null, /*#__PURE__*/React.createElement(_aqlSearchInput.AqlSearchInput, {
90
114
  value: (_initialSearchData$aq = initialSearchData.aql) !== null && _initialSearchData$aq !== void 0 ? _initialSearchData$aq : DEFAULT_AQL_QUERY,
91
115
  workspaceId: workspaceId,
92
116
  isSearching: isSearching
@@ -5,7 +5,7 @@
5
5
  ._n7zl8e97{border-bottom:var(--ds-border-width-outline,2px) solid var(--ds-border,#dfe1e6)}
6
6
  ._n7zlglyw{border-bottom:none}
7
7
  ._x3do1x13{border-top:var(--ds-border-width,1px) solid var(--ds-border,#dfe1e6)}._12vemgnk{background-repeat:no-repeat}
8
- ._13lipd34{border-top-left-radius:var(--ds-border-radius-200,8px)}
8
+ ._13li1mok{border-top-left-radius:var(--ds-radius-large,8px)}
9
9
  ._18m91wug{overflow-y:auto}
10
10
  ._1e0c11p5{display:grid}
11
11
  ._1itk1sfv{background-image:linear-gradient(90deg,var(--ds-elevation-surface-current,#fff) 30%,hsla(0,0%,100%,0)),linear-gradient(90deg,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.1)),transparent),linear-gradient(90deg,hsla(0,0%,100%,0),var(--ds-elevation-surface-current,#fff) 70%),linear-gradient(90deg,transparent,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.1))),linear-gradient(0deg,hsla(0,0%,100%,0),var(--ds-elevation-surface-current,#fff) 30%),linear-gradient(0deg,transparent,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.05))),linear-gradient(0deg,var(--ds-elevation-surface-current,#fff) 30%,hsla(0,0%,100%,0)),linear-gradient(0deg,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.05)),transparent)}
@@ -14,4 +14,4 @@
14
14
  ._c71l1pna{max-height:420px}
15
15
  ._ouxlbac2{background-position:0,0,100%,100%,top,0 52px,bottom,bottom}
16
16
  ._qmxj1c00{background-attachment:local,scroll,local,scroll,local,scroll,local,scroll}
17
- ._qrwqpd34{border-top-right-radius:var(--ds-border-radius-200,8px)}
17
+ ._qrwq1mok{border-top-right-radius:var(--ds-radius-large,8px)}
@@ -13,7 +13,7 @@ var _css = require("@atlaskit/css");
13
13
  var _compiled = require("@atlaskit/primitives/compiled");
14
14
  var _colors = require("@atlaskit/theme/colors");
15
15
  var styles = {
16
- tableContainerStyles: "_n7zl1x13 _x3do1x13 _1kl71x13 _1s7z1x13 _13lipd34 _qrwqpd34",
16
+ tableContainerStyles: "_n7zl1x13 _x3do1x13 _1kl71x13 _1s7z1x13 _13li1mok _qrwq1mok",
17
17
  contentContainerStyles: "_1reo1wug _18m91wug _n7zl8e97 _1e0c11p5 _c71l1pna _1itk1sfv _ouxlbac2 _12vemgnk _1lrw1sd4 _qmxj1c00",
18
18
  contentContainerRemoveBorderStyles: "_n7zlglyw"
19
19
  };
@@ -1,5 +1,5 @@
1
1
 
2
- ._2rko16jk{border-radius:var(--ds-border-radius-200,3px)}._16qszucj{box-shadow:var(--ds-shadow-raised,0 1px 1px #091e4240,0 0 1px #091e424f)}
2
+ ._2rko18qm{border-radius:var(--ds-radius-large,3px)}._16qszucj{box-shadow:var(--ds-shadow-raised,0 1px 1px #091e4240,0 0 1px #091e424f)}
3
3
  ._19bvv77o{padding-left:var(--ds-space-025,2px)}
4
4
  ._ca0qze3t{padding-top:var(--ds-space-0,0)}
5
5
  ._n3tdze3t{padding-bottom:var(--ds-space-0,0)}
@@ -13,7 +13,7 @@ var _reactIntlNext = require("react-intl-next");
13
13
  var _compiled = require("@atlaskit/primitives/compiled");
14
14
  var _link = _interopRequireDefault(require("../../../issue-like-table/render-type/link"));
15
15
  var styles = {
16
- placeholderSmartLinkStyles: "_2rko16jk _syaz1e6v _ca0qze3t _n3tdze3t _19bvv77o _u5f3v77o _16qszucj",
16
+ placeholderSmartLinkStyles: "_2rko18qm _syaz1e6v _ca0qze3t _n3tdze3t _19bvv77o _u5f3v77o _16qszucj",
17
17
  smartLinkContainerStyles: "_19bvv77o"
18
18
  };
19
19
  var SmartCardPlaceholder = exports.SmartCardPlaceholder = function SmartCardPlaceholder(_ref) {
@@ -18,7 +18,7 @@ var getPopupCustomControlStyles = function getPopupCustomControlStyles() {
18
18
  return {
19
19
  display: 'flex',
20
20
  // eslint-disable-next-line @atlaskit/design-system/no-unsafe-design-token-usage
21
- borderRadius: "var(--ds-border-radius-100, 3px)",
21
+ borderRadius: "var(--ds-radius-small, 3px)",
22
22
  border: "solid 1px ".concat("var(--ds-border-input, #8C8F97)"),
23
23
  minHeight: 'auto'
24
24
  };
@@ -11,7 +11,6 @@ var _runtime = require("@compiled/react/runtime");
11
11
  var _react = _interopRequireDefault(require("react"));
12
12
  var _crossCircle = _interopRequireDefault(require("@atlaskit/icon/core/cross-circle"));
13
13
  var _search = _interopRequireDefault(require("@atlaskit/icon/core/search"));
14
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
15
14
  var _compiled = require("@atlaskit/primitives/compiled");
16
15
  var _select = require("@atlaskit/select");
17
16
  var styles = {
@@ -20,7 +19,7 @@ var styles = {
20
19
  };
21
20
  var CustomDropdownIndicator = function CustomDropdownIndicator(props) {
22
21
  var selectProps = props.selectProps;
23
- return /*#__PURE__*/_react.default.createElement(_select.components.DropdownIndicator, props, (0, _platformFeatureFlags.fg)('navx-1184-fix-smart-link-a11y-interactive-states') ? /*#__PURE__*/_react.default.createElement(_compiled.Pressable, {
22
+ return /*#__PURE__*/_react.default.createElement(_select.components.DropdownIndicator, props, /*#__PURE__*/_react.default.createElement(_compiled.Pressable, {
24
23
  xcss: styles.customDropdownIndicatorStyles,
25
24
  onClick: function onClick() {
26
25
  if (selectProps.inputValue) {
@@ -34,20 +33,6 @@ var CustomDropdownIndicator = function CustomDropdownIndicator(props) {
34
33
  label: ""
35
34
  }) : /*#__PURE__*/_react.default.createElement(_search.default, {
36
35
  label: ""
37
- })) : /*#__PURE__*/_react.default.createElement(_compiled.Box, {
38
- xcss: styles.customDropdownIndicatorStylesOld,
39
- onClick: function onClick() {
40
- if (selectProps.inputValue) {
41
- selectProps.onInputChange && selectProps.onInputChange('', {
42
- action: 'input-change',
43
- prevInputValue: selectProps.inputValue
44
- });
45
- }
46
- }
47
- }, selectProps.inputValue ? /*#__PURE__*/_react.default.createElement(_crossCircle.default, {
48
- label: ""
49
- }) : /*#__PURE__*/_react.default.createElement(_search.default, {
50
- label: ""
51
36
  })));
52
37
  };
53
38
  var _default = exports.default = CustomDropdownIndicator;
@@ -1,5 +1,5 @@
1
1
 
2
- ._2rkoiti9{border-radius:var(--ds-border-radius-100,4px)}._16jlkb7n{flex-grow:1}
2
+ ._2rko12b0{border-radius:var(--ds-radius-small,4px)}._16jlkb7n{flex-grow:1}
3
3
  ._16qs1sus{box-shadow:var(--ds-shadow-overlay,0 0 1px 0 rgba(9,30,66,.31),0 3px 5px 0 rgba(9,30,66,.2))}
4
4
  ._18m9ewfl{overflow-y:visible}
5
5
  ._1e0c1ule{display:block}
@@ -24,7 +24,7 @@ var PopupComponentContainer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref
24
24
  return /*#__PURE__*/_react.default.createElement(C, (0, _extends2.default)({}, __cmplp, {
25
25
  style: __cmpls,
26
26
  ref: __cmplr,
27
- className: (0, _runtime.ax)(["_16jlkb7n _1o9zkb7n _i0dl1wug _1reoewfl _18m9ewfl _2rkoiti9 _vchhusvi _1e0c1ule _bfhk1j9a _16qs1sus _nt751r31 _49pcglyw _1hvw1o36", __cmplp.className])
27
+ className: (0, _runtime.ax)(["_16jlkb7n _1o9zkb7n _i0dl1wug _1reoewfl _18m9ewfl _2rko12b0 _vchhusvi _1e0c1ule _bfhk1j9a _16qs1sus _nt751r31 _49pcglyw _1hvw1o36", __cmplp.className])
28
28
  }));
29
29
  });
30
30
  if (process.env.NODE_ENV !== 'production') {
@@ -1,7 +1,7 @@
1
1
  ._11c81kw7{font:inherit}
2
2
  ._11c8dcr7{font:var(--ds-font-body-UNSAFE_small,normal 400 9pt/1pc ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif)}
3
3
  ._19itglyw{border:none}
4
- ._2rkoiti9{border-radius:var(--ds-border-radius-100,4px)}
4
+ ._2rko12b0{border-radius:var(--ds-radius-small,4px)}
5
5
  ._zulpv77o{gap:var(--ds-space-025,2px)}
6
6
  ._16qs1sus{box-shadow:var(--ds-shadow-overlay,0 0 1px 0 rgba(9,30,66,.31),0 3px 5px 0 rgba(9,30,66,.2))}
7
7
  ._19bvutpp{padding-left:var(--ds-space-150,9pt)}
@@ -59,7 +59,7 @@ var CustomDropdown = (0, _react.forwardRef)(function (_ref2, __cmplr) {
59
59
  return /*#__PURE__*/_react.default.createElement(C, (0, _extends2.default)({}, __cmplp, {
60
60
  style: __cmpls,
61
61
  ref: __cmplr,
62
- className: (0, _runtime.ax)(["_2rkoiti9 _1bsb5x59 _bfhk1j9a _16qs1sus _1pby16oo", __cmplp.className])
62
+ className: (0, _runtime.ax)(["_2rko12b0 _1bsb5x59 _bfhk1j9a _16qs1sus _1pby16oo", __cmplp.className])
63
63
  }));
64
64
  });
65
65
 
@@ -75,7 +75,7 @@ var SelectDateRangeButton = (0, _react.forwardRef)(function (_ref3, __cmplr) {
75
75
  return /*#__PURE__*/_react.default.createElement(C, (0, _extends2.default)({}, __cmplp, {
76
76
  style: __cmpls,
77
77
  ref: __cmplr,
78
- className: (0, _runtime.ax)(["_19itglyw _11c81kw7 _2rkoiti9 _bfhk1y9p _1bsbymf6 _4t3i1ylp _19pkutpp _irr3134c _d0altlke", __cmplp.className])
78
+ className: (0, _runtime.ax)(["_19itglyw _11c81kw7 _2rko12b0 _bfhk1y9p _1bsbymf6 _4t3i1ylp _19pkutpp _irr3134c _d0altlke", __cmplp.className])
79
79
  }));
80
80
  });
81
81
 
@@ -1,3 +1,8 @@
1
+
2
+ ._zulppxbi{gap:var(--ds-space-200,1pc)}
3
+ ._zulpu2gc{gap:var(--ds-space-100,8px)}._1bsb1osq{width:100%}
1
4
  ._1e0c1txw{display:flex}
2
5
  ._1tket9kd{min-height:72px}
6
+ ._2lx21sbv{flex-direction:row-reverse}
7
+ ._4cvr1h6o{align-items:center}
3
8
  ._4cvr1q9y{align-items:baseline}
@@ -16,6 +16,7 @@ var _reactIntlNext = require("react-intl-next");
16
16
  var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
17
17
  var _link = _interopRequireDefault(require("@atlaskit/link"));
18
18
  var _modalDialog = require("@atlaskit/modal-dialog");
19
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
19
20
  var _compiled = require("@atlaskit/primitives/compiled");
20
21
  var _analytics = require("../../../analytics");
21
22
  var _types = require("../../../analytics/types");
@@ -49,7 +50,10 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
49
50
  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; }
50
51
  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 @atlaskit/platform/ensure-feature-flag-prefix */
51
52
  var styles = {
52
- inputContainerStyles: "_4cvr1q9y _1e0c1txw _1tket9kd"
53
+ inputContainerStyles: "_4cvr1q9y _1e0c1txw _1tket9kd",
54
+ modalTitleContainer: "_zulppxbi _4cvr1h6o",
55
+ flexStyles: "_2lx21sbv _1bsb1osq",
56
+ viewModeContainer: "_zulpu2gc _4cvr1h6o"
53
57
  };
54
58
  var isValidParameters = function isValidParameters(parameters) {
55
59
  return !!(parameters && parameters.cloudId && Object.values(parameters).filter(function (v) {
@@ -330,7 +334,25 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
330
334
  }, /*#__PURE__*/_react.default.createElement(_datasourceModal.DatasourceModal, {
331
335
  testId: "confluence-search-datasource-modal",
332
336
  onClose: onCancel
333
- }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
337
+ }, (0, _platformFeatureFlags.fg)('navx-1483-a11y-close-button-in-modal-updates') ? /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
338
+ gap: "space.200",
339
+ justifyContent: "space-between",
340
+ xcss: styles.flexStyles
341
+ }, /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
342
+ justifyContent: "end",
343
+ xcss: styles.viewModeContainer
344
+ }, !hasNoConfluenceSites && /*#__PURE__*/_react.default.createElement(_modeSwitcher.DatasourceViewModeDropDown, null), /*#__PURE__*/_react.default.createElement(_modalDialog.CloseButton, {
345
+ onClick: onCancel
346
+ })), /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
347
+ justifyContent: "start",
348
+ xcss: styles.modalTitleContainer
349
+ }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
350
+ availableSites: availableSites,
351
+ onSiteSelection: onSiteSelection,
352
+ selectedSite: selectedConfluenceSite,
353
+ testId: "confluence-search-datasource-modal--site-selector",
354
+ label: siteSelectorLabel
355
+ }))))) : /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
334
356
  availableSites: availableSites,
335
357
  onSiteSelection: onSiteSelection,
336
358
  selectedSite: selectedConfluenceSite,
@@ -22,7 +22,7 @@ var SkeletonComponent = function SkeletonComponent(_ref) {
22
22
  var width = _ref.width,
23
23
  itemName = _ref.itemName;
24
24
  return /*#__PURE__*/React.createElement(_linkingCommon.Skeleton, {
25
- borderRadius: "var(--ds-border-radius-100, 8px)",
25
+ borderRadius: "var(--ds-radius-small, 8px)",
26
26
  testId: "".concat(itemName, "-empty-state-skeleton"),
27
27
  height: 14,
28
28
  width: width
@@ -84,5 +84,5 @@
84
84
  ._x3fxnil1 font{medium:normal 400 14px/20px ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif}
85
85
  ._yq5hus1c{border-collapse:separate}
86
86
  ._zzcc4f4w font{large:normal 400 1pc/24px ui-sans-serif,-apple-system,BlinkMacSystemFont,"Segoe UI",Ubuntu,"Helvetica Neue",sans-serif}
87
- ._8vu416jk:hover{border-radius:var(--ds-border-radius-200,3px)}
87
+ ._8vu418qm:hover{border-radius:var(--ds-radius-large,3px)}
88
88
  ._irr31d5g:hover{background-color:var(--ds-background-input-hovered,#f7f8f9)}
@@ -507,7 +507,7 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
507
507
  var isHeadingOutsideButton = !isEditable || !onWrappedColumnChange;
508
508
  if (isHeadingOutsideButton) {
509
509
  heading = /*#__PURE__*/React.createElement("div", {
510
- className: (0, _runtime.ax)(["_1e0c1txw _4cvr1h6o _o5721q9c _8vu416jk _irr31d5g"])
510
+ className: (0, _runtime.ax)(["_1e0c1txw _4cvr1h6o _o5721q9c _8vu418qm _irr31d5g"])
511
511
  }, heading);
512
512
  }
513
513
  if (isEditable) {
@@ -0,0 +1,5 @@
1
+
2
+ ._zulppxbi{gap:var(--ds-space-200,1pc)}
3
+ ._zulpu2gc{gap:var(--ds-space-100,8px)}._1bsb1osq{width:100%}
4
+ ._2lx21sbv{flex-direction:row-reverse}
5
+ ._4cvr1h6o{align-items:center}
@@ -1,3 +1,4 @@
1
+ /* index.tsx generated by @compiled/babel-plugin v0.36.1 */
1
2
  "use strict";
2
3
 
3
4
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -6,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
6
7
  value: true
7
8
  });
8
9
  exports.JiraIssuesConfigModalNoSuspense = exports.JiraIssuesConfigModal = void 0;
10
+ require("./index.compiled.css");
11
+ var _runtime = require("@compiled/react/runtime");
9
12
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
10
13
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
11
14
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -15,6 +18,7 @@ var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
15
18
  var _link = _interopRequireDefault(require("@atlaskit/link"));
16
19
  var _modalDialog = require("@atlaskit/modal-dialog");
17
20
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
21
+ var _compiled = require("@atlaskit/primitives/compiled");
18
22
  var _analytics = require("../../../analytics");
19
23
  var _constants = require("../../../analytics/constants");
20
24
  var _types = require("../../../analytics/types");
@@ -56,6 +60,11 @@ var _messages3 = require("./messages");
56
60
  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); }
57
61
  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; }
58
62
  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 @atlaskit/platform/no-preconditioning */ /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
63
+ var styles = {
64
+ modalTitleContainer: "_zulppxbi _4cvr1h6o",
65
+ viewModeContainer: "_zulpu2gc _4cvr1h6o",
66
+ flexStyles: "_2lx21sbv _1bsb1osq"
67
+ };
59
68
  var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
60
69
  if (currentViewMode === 'table') {
61
70
  return _types.DatasourceDisplay.DATASOURCE_TABLE;
@@ -371,7 +380,25 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
371
380
  testId: "jira-datasource-modal",
372
381
  onClose: onCancel,
373
382
  shouldReturnFocus: shouldReturnFocus
374
- }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
383
+ }, (0, _platformFeatureFlags.fg)('navx-1483-a11y-close-button-in-modal-updates') ? /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
384
+ gap: "space.200",
385
+ justifyContent: "space-between",
386
+ xcss: styles.flexStyles
387
+ }, /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
388
+ justifyContent: "end",
389
+ xcss: styles.viewModeContainer
390
+ }, !hasNoJiraSites && /*#__PURE__*/_react.default.createElement(_modeSwitcher.DatasourceViewModeDropDown, null), /*#__PURE__*/_react.default.createElement(_modalDialog.CloseButton, {
391
+ onClick: onCancel
392
+ })), /*#__PURE__*/_react.default.createElement(_compiled.Flex, {
393
+ justifyContent: "start",
394
+ xcss: styles.modalTitleContainer
395
+ }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
396
+ availableSites: availableSites,
397
+ onSiteSelection: onSiteSelection,
398
+ selectedSite: selectedJiraSite,
399
+ testId: "jira-datasource-modal--site-selector",
400
+ label: siteSelectorLabel
401
+ }))))) : /*#__PURE__*/_react.default.createElement(_modalDialog.ModalHeader, null, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTitle, null, /*#__PURE__*/_react.default.createElement(_siteSelector.SiteSelector, {
375
402
  availableSites: availableSites,
376
403
  onSiteSelection: onSiteSelection,
377
404
  selectedSite: selectedJiraSite,
@@ -297,10 +297,11 @@ const PlainAssetsConfigModal = props => {
297
297
  },
298
298
  onSearch: handleOnSearch,
299
299
  modalTitle: AssetsModalTitle,
300
- isSearching: status === 'loading'
300
+ isSearching: status === 'loading',
301
+ onCancel: onCancel
301
302
  });
302
303
  }
303
- }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status]);
304
+ }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status, onCancel]);
304
305
  const getCancelButtonAnalyticsPayload = useCallback(() => {
305
306
  return {
306
307
  ...analyticsPayload,
@@ -1,7 +1,7 @@
1
1
 
2
2
  ._19ith6cr{border:1px solid var(--ds-border,#dfe1e6)}
3
3
  ._n7zl17u4{border-bottom:2px solid var(--ds-background-accent-gray-subtler,#dfe1e6)}._12vemgnk{background-repeat:no-repeat}
4
- ._13lipd34{border-top-left-radius:var(--ds-border-radius-200,8px)}
4
+ ._13li1mok{border-top-left-radius:var(--ds-radius-large,8px)}
5
5
  ._18m915vq{overflow-y:hidden}
6
6
  ._18m91wug{overflow-y:auto}
7
7
  ._1e0c11p5{display:grid}
@@ -11,4 +11,4 @@
11
11
  ._1reo1wug{overflow-x:auto}
12
12
  ._4t3i1pna{height:420px}
13
13
  ._qmxj1c00{background-attachment:local,scroll,local,scroll,local,scroll,local,scroll}
14
- ._qrwqpd34{border-top-right-radius:var(--ds-border-radius-200,8px)}
14
+ ._qrwq1mok{border-top-right-radius:var(--ds-radius-large,8px)}
@@ -28,7 +28,7 @@ const NoResultsView = () => /*#__PURE__*/React.createElement("div", {
28
28
  className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5"])
29
29
  }, /*#__PURE__*/React.createElement(NoResults, null));
30
30
  const LoadingView = () => /*#__PURE__*/React.createElement("div", {
31
- className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19ith6cr _n7zl17u4 _13lipd34 _qrwqpd34 _1itkwoh3 _12vemgnk _1lrw1sd4 _qmxj1c00", "_1reo15vq _18m915vq"])
31
+ className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19ith6cr _n7zl17u4 _13li1mok _qrwq1mok _1itkwoh3 _12vemgnk _1lrw1sd4 _qmxj1c00", "_1reo15vq _18m915vq"])
32
32
  }, /*#__PURE__*/React.createElement(EmptyState, {
33
33
  testId: "assets-aql-datasource-modal--loading-state"
34
34
  }));
@@ -48,7 +48,7 @@ export const RenderAssetsContent = props => {
48
48
  } = props;
49
49
  const resolvedWithNoResults = status === 'resolved' && !responseItems.length;
50
50
  const issueLikeDataTableView = useMemo(() => /*#__PURE__*/React.createElement("div", {
51
- className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19ith6cr _n7zl17u4 _13lipd34 _qrwqpd34 _1itkwoh3 _12vemgnk _1lrw1sd4 _qmxj1c00"])
51
+ className: ax(["_1reo1wug _18m91wug _4t3i1pna _1e0c11p5", "_19ith6cr _n7zl17u4 _13li1mok _qrwq1mok _1itkwoh3 _12vemgnk _1lrw1sd4 _qmxj1c00"])
52
52
  }, /*#__PURE__*/React.createElement(IssueLikeDataTableView, {
53
53
  testId: "asset-datasource-table",
54
54
  status: status,
@@ -1,4 +1,7 @@
1
- ._1bsb1osq{width:100%}
1
+
2
+ ._zulppxbi{gap:var(--ds-space-200,1pc)}._1bsb1osq{width:100%}
2
3
  ._1e0c11p5{display:grid}
3
4
  ._1p57pxbi{row-gap:var(--ds-space-200,1pc)}
5
+ ._2lx21sbv{flex-direction:row-reverse}
6
+ ._4cvr1h6o{align-items:center}
4
7
  ._p12ffkat{max-width:386px}
@@ -5,10 +5,17 @@ import { forwardRef } from 'react';
5
5
  import * as React from 'react';
6
6
  import { ax, ix } from "@compiled/react/runtime";
7
7
  import Form from '@atlaskit/form';
8
+ import { CloseButton } from '@atlaskit/modal-dialog';
9
+ import { fg } from '@atlaskit/platform-feature-flags';
10
+ import { Flex } from '@atlaskit/primitives/compiled';
8
11
  import { useDatasourceAnalyticsEvents } from '../../../analytics';
9
12
  import { AqlSearchInput } from './aql-search-input';
10
13
  import { AssetsObjectSchemaSelect } from './object-schema-select';
11
14
  import { FormRowContainer } from './styled';
15
+ const styles = {
16
+ modalTitleContainer: "_zulppxbi _4cvr1h6o",
17
+ flexStyles: "_2lx21sbv _1bsb1osq"
18
+ };
12
19
  const DEFAULT_AQL_QUERY = '';
13
20
  const SEARCH_FORM_ID = 'linkDataSource.assets.configModal.searchContainer-form';
14
21
 
@@ -49,7 +56,8 @@ export const AssetsSearchContainer = props => {
49
56
  workspaceId,
50
57
  initialSearchData,
51
58
  modalTitle,
52
- isSearching
59
+ isSearching,
60
+ onCancel
53
61
  } = props;
54
62
  const {
55
63
  fireEvent
@@ -70,17 +78,33 @@ export const AssetsSearchContainer = props => {
70
78
  }, ({
71
79
  formProps
72
80
  }) => {
73
- var _initialSearchData$ob, _initialSearchData$ob2, _initialSearchData$aq;
81
+ var _initialSearchData$ob, _initialSearchData$ob2, _initialSearchData$ob3, _initialSearchData$ob4, _initialSearchData$aq;
74
82
  return /*#__PURE__*/React.createElement(FormContainer, _extends({}, formProps, {
75
83
  id: SEARCH_FORM_ID
76
84
  }), /*#__PURE__*/React.createElement(FormRowContainer, {
77
85
  isNarrowGap: true
78
- }, modalTitle, /*#__PURE__*/React.createElement(SchemaSelectContainer, null, /*#__PURE__*/React.createElement(AssetsObjectSchemaSelect, {
86
+ }, fg('navx-1483-a11y-close-button-in-modal-updates') ? /*#__PURE__*/React.createElement(Flex, {
87
+ gap: "space.200",
88
+ justifyContent: "space-between",
89
+ xcss: styles.flexStyles
90
+ }, /*#__PURE__*/React.createElement(Flex, {
91
+ justifyContent: "end"
92
+ }, /*#__PURE__*/React.createElement(CloseButton, {
93
+ onClick: onCancel
94
+ })), /*#__PURE__*/React.createElement(Flex, {
95
+ justifyContent: "start",
96
+ xcss: styles.modalTitleContainer
97
+ }, modalTitle, /*#__PURE__*/React.createElement(AssetsObjectSchemaSelect, {
79
98
  value: (_initialSearchData$ob = initialSearchData.objectSchema) !== null && _initialSearchData$ob !== void 0 ? _initialSearchData$ob : undefined,
80
99
  workspaceId: workspaceId,
81
100
  initialObjectSchemas: (_initialSearchData$ob2 = initialSearchData.objectSchemas) !== null && _initialSearchData$ob2 !== void 0 ? _initialSearchData$ob2 : undefined,
82
101
  classNamePrefix: "assets-datasource-modal--object-schema-select"
83
- }))), /*#__PURE__*/React.createElement(FormRowContainer, null, /*#__PURE__*/React.createElement(AqlSearchInput, {
102
+ }))) : /*#__PURE__*/React.createElement("div", null, modalTitle, /*#__PURE__*/React.createElement(SchemaSelectContainer, null, /*#__PURE__*/React.createElement(AssetsObjectSchemaSelect, {
103
+ value: (_initialSearchData$ob3 = initialSearchData.objectSchema) !== null && _initialSearchData$ob3 !== void 0 ? _initialSearchData$ob3 : undefined,
104
+ workspaceId: workspaceId,
105
+ initialObjectSchemas: (_initialSearchData$ob4 = initialSearchData.objectSchemas) !== null && _initialSearchData$ob4 !== void 0 ? _initialSearchData$ob4 : undefined,
106
+ classNamePrefix: "assets-datasource-modal--object-schema-select"
107
+ })))), /*#__PURE__*/React.createElement(FormRowContainer, null, /*#__PURE__*/React.createElement(AqlSearchInput, {
84
108
  value: (_initialSearchData$aq = initialSearchData.aql) !== null && _initialSearchData$aq !== void 0 ? _initialSearchData$aq : DEFAULT_AQL_QUERY,
85
109
  workspaceId: workspaceId,
86
110
  isSearching: isSearching
@@ -5,7 +5,7 @@
5
5
  ._n7zl8e97{border-bottom:var(--ds-border-width-outline,2px) solid var(--ds-border,#dfe1e6)}
6
6
  ._n7zlglyw{border-bottom:none}
7
7
  ._x3do1x13{border-top:var(--ds-border-width,1px) solid var(--ds-border,#dfe1e6)}._12vemgnk{background-repeat:no-repeat}
8
- ._13lipd34{border-top-left-radius:var(--ds-border-radius-200,8px)}
8
+ ._13li1mok{border-top-left-radius:var(--ds-radius-large,8px)}
9
9
  ._18m91wug{overflow-y:auto}
10
10
  ._1e0c11p5{display:grid}
11
11
  ._1itk1sfv{background-image:linear-gradient(90deg,var(--ds-elevation-surface-current,#fff) 30%,hsla(0,0%,100%,0)),linear-gradient(90deg,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.1)),transparent),linear-gradient(90deg,hsla(0,0%,100%,0),var(--ds-elevation-surface-current,#fff) 70%),linear-gradient(90deg,transparent,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.1))),linear-gradient(0deg,hsla(0,0%,100%,0),var(--ds-elevation-surface-current,#fff) 30%),linear-gradient(0deg,transparent,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.05))),linear-gradient(0deg,var(--ds-elevation-surface-current,#fff) 30%,hsla(0,0%,100%,0)),linear-gradient(0deg,var(--ds-shadow-overflow-perimeter,rgba(0,0,0,.05)),transparent)}
@@ -14,4 +14,4 @@
14
14
  ._c71l1pna{max-height:420px}
15
15
  ._ouxlbac2{background-position:0,0,100%,100%,top,0 52px,bottom,bottom}
16
16
  ._qmxj1c00{background-attachment:local,scroll,local,scroll,local,scroll,local,scroll}
17
- ._qrwqpd34{border-top-right-radius:var(--ds-border-radius-200,8px)}
17
+ ._qrwq1mok{border-top-right-radius:var(--ds-radius-large,8px)}
@@ -6,7 +6,7 @@ import { cx } from '@atlaskit/css';
6
6
  import { Box } from '@atlaskit/primitives/compiled';
7
7
  import { N40 } from '@atlaskit/theme/colors';
8
8
  const styles = {
9
- tableContainerStyles: "_n7zl1x13 _x3do1x13 _1kl71x13 _1s7z1x13 _13lipd34 _qrwqpd34",
9
+ tableContainerStyles: "_n7zl1x13 _x3do1x13 _1kl71x13 _1s7z1x13 _13li1mok _qrwq1mok",
10
10
  contentContainerStyles: "_1reo1wug _18m91wug _n7zl8e97 _1e0c11p5 _c71l1pna _1itk1sfv _ouxlbac2 _12vemgnk _1lrw1sd4 _qmxj1c00",
11
11
  contentContainerRemoveBorderStyles: "_n7zlglyw"
12
12
  };
@@ -1,5 +1,5 @@
1
1
 
2
- ._2rko16jk{border-radius:var(--ds-border-radius-200,3px)}._16qszucj{box-shadow:var(--ds-shadow-raised,0 1px 1px #091e4240,0 0 1px #091e424f)}
2
+ ._2rko18qm{border-radius:var(--ds-radius-large,3px)}._16qszucj{box-shadow:var(--ds-shadow-raised,0 1px 1px #091e4240,0 0 1px #091e424f)}
3
3
  ._19bvv77o{padding-left:var(--ds-space-025,2px)}
4
4
  ._ca0qze3t{padding-top:var(--ds-space-0,0)}
5
5
  ._n3tdze3t{padding-bottom:var(--ds-space-0,0)}