@atlaskit/link-datasource 4.20.4 → 4.21.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 +23 -0
- package/dist/cjs/index.js +2 -2
- package/dist/cjs/ui/assets-modal/modal/index.js +5 -4
- package/dist/cjs/ui/assets-modal/modal/render-assets-content/index.compiled.css +2 -2
- package/dist/cjs/ui/assets-modal/modal/render-assets-content/index.js +2 -2
- package/dist/cjs/ui/assets-modal/search-container/index.compiled.css +4 -1
- package/dist/cjs/ui/assets-modal/search-container/index.js +28 -4
- package/dist/cjs/ui/common/modal/content-container/index.compiled.css +2 -2
- package/dist/cjs/ui/common/modal/content-container/index.js +1 -1
- package/dist/cjs/ui/common/modal/count-view-smart-link/index.compiled.css +1 -1
- package/dist/cjs/ui/common/modal/count-view-smart-link/index.js +1 -1
- package/dist/cjs/ui/common/modal/insert-button/index.js +2 -2
- package/dist/cjs/ui/common/modal/popup-select/dropdownIndicator.js +1 -16
- package/dist/cjs/ui/confluence-search-modal/modal/index.compiled.css +5 -0
- package/dist/cjs/ui/confluence-search-modal/modal/index.js +24 -2
- package/dist/cjs/ui/issue-like-table/index.compiled.css +1 -1
- package/dist/cjs/ui/issue-like-table/index.js +1 -1
- package/dist/cjs/ui/jira-issues-modal/modal/index.compiled.css +5 -0
- package/dist/cjs/ui/jira-issues-modal/modal/index.js +28 -1
- package/dist/es2019/index.js +1 -1
- package/dist/es2019/ui/assets-modal/modal/index.js +4 -3
- package/dist/es2019/ui/assets-modal/modal/render-assets-content/index.compiled.css +2 -2
- package/dist/es2019/ui/assets-modal/modal/render-assets-content/index.js +2 -2
- package/dist/es2019/ui/assets-modal/search-container/index.compiled.css +4 -1
- package/dist/es2019/ui/assets-modal/search-container/index.js +28 -4
- package/dist/es2019/ui/common/modal/content-container/index.compiled.css +2 -2
- package/dist/es2019/ui/common/modal/content-container/index.js +1 -1
- package/dist/es2019/ui/common/modal/count-view-smart-link/index.compiled.css +1 -1
- package/dist/es2019/ui/common/modal/count-view-smart-link/index.js +1 -1
- package/dist/es2019/ui/common/modal/insert-button/index.js +1 -1
- package/dist/es2019/ui/common/modal/popup-select/dropdownIndicator.js +2 -17
- package/dist/es2019/ui/confluence-search-modal/modal/index.compiled.css +5 -0
- package/dist/es2019/ui/confluence-search-modal/modal/index.js +26 -4
- package/dist/es2019/ui/issue-like-table/index.compiled.css +1 -1
- package/dist/es2019/ui/issue-like-table/index.js +1 -1
- package/dist/es2019/ui/jira-issues-modal/modal/index.compiled.css +5 -0
- package/dist/es2019/ui/jira-issues-modal/modal/index.js +29 -2
- package/dist/esm/index.js +1 -1
- package/dist/esm/ui/assets-modal/modal/index.js +4 -3
- package/dist/esm/ui/assets-modal/modal/render-assets-content/index.compiled.css +2 -2
- package/dist/esm/ui/assets-modal/modal/render-assets-content/index.js +2 -2
- package/dist/esm/ui/assets-modal/search-container/index.compiled.css +4 -1
- package/dist/esm/ui/assets-modal/search-container/index.js +28 -4
- package/dist/esm/ui/common/modal/content-container/index.compiled.css +2 -2
- package/dist/esm/ui/common/modal/content-container/index.js +1 -1
- package/dist/esm/ui/common/modal/count-view-smart-link/index.compiled.css +1 -1
- package/dist/esm/ui/common/modal/count-view-smart-link/index.js +1 -1
- package/dist/esm/ui/common/modal/insert-button/index.js +1 -1
- package/dist/esm/ui/common/modal/popup-select/dropdownIndicator.js +2 -17
- package/dist/esm/ui/confluence-search-modal/modal/index.compiled.css +5 -0
- package/dist/esm/ui/confluence-search-modal/modal/index.js +26 -4
- package/dist/esm/ui/issue-like-table/index.compiled.css +1 -1
- package/dist/esm/ui/issue-like-table/index.js +1 -1
- package/dist/esm/ui/jira-issues-modal/modal/index.compiled.css +5 -0
- package/dist/esm/ui/jira-issues-modal/modal/index.js +29 -2
- package/dist/types/index.d.ts +1 -1
- package/dist/types/ui/assets-modal/search-container/index.d.ts +1 -0
- package/dist/types-ts4.5/index.d.ts +1 -1
- package/dist/types-ts4.5/ui/assets-modal/search-container/index.d.ts +1 -0
- package/package.json +5 -5
- /package/dist/cjs/common/utils/{adf.js → schema-utils.js} +0 -0
- /package/dist/es2019/common/utils/{adf.js → schema-utils.js} +0 -0
- /package/dist/esm/common/utils/{adf.js → schema-utils.js} +0 -0
- /package/dist/types/common/utils/{adf.d.ts → schema-utils.d.ts} +0 -0
- /package/dist/types-ts4.5/common/utils/{adf.d.ts → schema-utils.d.ts} +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,28 @@
|
|
|
1
1
|
# @atlaskit/link-datasource
|
|
2
2
|
|
|
3
|
+
## 4.21.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- [`6ce6f7249075d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6ce6f7249075d) -
|
|
8
|
+
[ux] NAVX-1483 using the ADS modal built in hasCloseButton for LP components to adhere to a11y
|
|
9
|
+
|
|
10
|
+
### Patch Changes
|
|
11
|
+
|
|
12
|
+
- [`d28c4180ae756`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d28c4180ae756) -
|
|
13
|
+
Internal changes to how border radius is applied.
|
|
14
|
+
- [`fe80630362c42`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fe80630362c42) -
|
|
15
|
+
NAVX-1379 Cleaning up navx-1184-fix-smart-link-a-11-y-interactive-states
|
|
16
|
+
- Updated dependencies
|
|
17
|
+
|
|
18
|
+
## 4.20.5
|
|
19
|
+
|
|
20
|
+
### Patch Changes
|
|
21
|
+
|
|
22
|
+
- [`e1a8efa3d658f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e1a8efa3d658f) -
|
|
23
|
+
Rename adf.ts to schema-utils.ts
|
|
24
|
+
- Updated dependencies
|
|
25
|
+
|
|
3
26
|
## 4.20.4
|
|
4
27
|
|
|
5
28
|
### Patch Changes
|
package/dist/cjs/index.js
CHANGED
|
@@ -62,13 +62,13 @@ Object.defineProperty(exports, "LazyLoadedDatasourceRenderFailedAnalyticsWrapper
|
|
|
62
62
|
Object.defineProperty(exports, "buildDatasourceAdf", {
|
|
63
63
|
enumerable: true,
|
|
64
64
|
get: function get() {
|
|
65
|
-
return
|
|
65
|
+
return _schemaUtils.buildDatasourceAdf;
|
|
66
66
|
}
|
|
67
67
|
});
|
|
68
68
|
var _confluenceSearchModal = _interopRequireWildcard(require("./ui/confluence-search-modal"));
|
|
69
69
|
var _jiraIssuesModal = _interopRequireWildcard(require("./ui/jira-issues-modal"));
|
|
70
70
|
var _assetsModal = _interopRequireWildcard(require("./ui/assets-modal"));
|
|
71
71
|
var _datasourceTableView = _interopRequireDefault(require("./ui/datasource-table-view"));
|
|
72
|
-
var
|
|
72
|
+
var _schemaUtils = require("./common/utils/schema-utils");
|
|
73
73
|
var _renderFailed = require("./analytics/wrappers/render-failed");
|
|
74
74
|
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); }
|
|
@@ -25,8 +25,8 @@ var _types = require("../../../analytics/types");
|
|
|
25
25
|
var _ufoExperiences = require("../../../analytics/ufoExperiences");
|
|
26
26
|
var _useColumnPickerRenderedFailedUfoExperience = require("../../../analytics/ufoExperiences/hooks/useColumnPickerRenderedFailedUfoExperience");
|
|
27
27
|
var _useDataRenderedUfoExperience = require("../../../analytics/ufoExperiences/hooks/useDataRenderedUfoExperience");
|
|
28
|
-
var _adf = require("../../../common/utils/adf");
|
|
29
28
|
var _fetchMessagesForLocale = require("../../../common/utils/locale/fetch-messages-for-locale");
|
|
29
|
+
var _schemaUtils = require("../../../common/utils/schema-utils");
|
|
30
30
|
var _datasourceExperienceId = require("../../../contexts/datasource-experience-id");
|
|
31
31
|
var _userInteractions = require("../../../contexts/user-interactions");
|
|
32
32
|
var _useAssetsClient2 = require("../../../hooks/useAssetsClient");
|
|
@@ -254,7 +254,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
|
|
|
254
254
|
}
|
|
255
255
|
}, consumerEvent);
|
|
256
256
|
} else {
|
|
257
|
-
onInsert((0,
|
|
257
|
+
onInsert((0, _schemaUtils.buildDatasourceAdf)({
|
|
258
258
|
id: datasourceId,
|
|
259
259
|
parameters: {
|
|
260
260
|
workspaceId: workspaceId,
|
|
@@ -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
|
-
.
|
|
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
|
-
.
|
|
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
|
|
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
|
|
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, ")"))),
|
|
@@ -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
|
-
},
|
|
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(
|
|
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
|
-
.
|
|
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
|
-
.
|
|
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
|
|
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
|
-
.
|
|
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: "
|
|
16
|
+
placeholderSmartLinkStyles: "_2rko18qm _syaz1e6v _ca0qze3t _n3tdze3t _19bvv77o _u5f3v77o _16qszucj",
|
|
17
17
|
smartLinkContainerStyles: "_19bvv77o"
|
|
18
18
|
};
|
|
19
19
|
var SmartCardPlaceholder = exports.SmartCardPlaceholder = function SmartCardPlaceholder(_ref) {
|
|
@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
11
11
|
var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
|
|
12
12
|
var _analytics = require("../../../../analytics");
|
|
13
13
|
var _types = require("../../../../analytics/types");
|
|
14
|
-
var
|
|
14
|
+
var _schemaUtils = require("../../../../common/utils/schema-utils");
|
|
15
15
|
var _userInteractions = require("../../../../contexts/user-interactions");
|
|
16
16
|
var _datasourceContext = require("../datasource-context");
|
|
17
17
|
var _useViewModeContext2 = require("../mode-switcher/useViewModeContext");
|
|
@@ -65,7 +65,7 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
|
|
|
65
65
|
}
|
|
66
66
|
}, consumerEvent);
|
|
67
67
|
} else {
|
|
68
|
-
onInsert((0,
|
|
68
|
+
onInsert((0, _schemaUtils.buildDatasourceAdf)({
|
|
69
69
|
id: datasourceId,
|
|
70
70
|
parameters: parameters,
|
|
71
71
|
views: [{
|
|
@@ -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,
|
|
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,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
|
-
},
|
|
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,
|
|
@@ -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
|
-
.
|
|
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
|
|
510
|
+
className: (0, _runtime.ax)(["_1e0c1txw _4cvr1h6o _o5721q9c _8vu418qm _irr31d5g"])
|
|
511
511
|
}, heading);
|
|
512
512
|
}
|
|
513
513
|
if (isEditable) {
|
|
@@ -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
|
-
},
|
|
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,
|
package/dist/es2019/index.js
CHANGED
|
@@ -3,7 +3,7 @@ export { default as JiraIssuesConfigModal } from './ui/jira-issues-modal';
|
|
|
3
3
|
export { default as AssetsConfigModal } from './ui/assets-modal';
|
|
4
4
|
export { default as DatasourceTableView } from './ui/datasource-table-view';
|
|
5
5
|
export { default as JSMAssetsConfigModal } from './ui/assets-modal';
|
|
6
|
-
export { buildDatasourceAdf } from './common/utils/
|
|
6
|
+
export { buildDatasourceAdf } from './common/utils/schema-utils';
|
|
7
7
|
export { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from './ui/jira-issues-modal';
|
|
8
8
|
export { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from './ui/assets-modal';
|
|
9
9
|
export { CONFLUENCE_SEARCH_DATASOURCE_ID } from './ui/confluence-search-modal';
|
|
@@ -15,8 +15,8 @@ import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../
|
|
|
15
15
|
import { startUfoExperience } from '../../../analytics/ufoExperiences';
|
|
16
16
|
import { useColumnPickerRenderedFailedUfoExperience } from '../../../analytics/ufoExperiences/hooks/useColumnPickerRenderedFailedUfoExperience';
|
|
17
17
|
import { useDataRenderedUfoExperience } from '../../../analytics/ufoExperiences/hooks/useDataRenderedUfoExperience';
|
|
18
|
-
import { buildDatasourceAdf } from '../../../common/utils/adf';
|
|
19
18
|
import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
|
|
19
|
+
import { buildDatasourceAdf } from '../../../common/utils/schema-utils';
|
|
20
20
|
import { DatasourceExperienceIdProvider, useDatasourceExperienceId } from '../../../contexts/datasource-experience-id';
|
|
21
21
|
import { UserInteractionsProvider, useUserInteractions } from '../../../contexts/user-interactions';
|
|
22
22
|
import { useAssetsClient } from '../../../hooks/useAssetsClient';
|
|
@@ -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
|
-
.
|
|
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
|
-
.
|
|
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
|
|
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
|
|
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,
|
|
@@ -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
|
-
},
|
|
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(
|
|
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
|
-
.
|
|
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
|
-
.
|
|
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
|
|
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
|
};
|