@atlaskit/link-datasource 1.19.16 → 1.19.18
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 +12 -0
- package/dist/cjs/analytics/constants.js +1 -1
- package/dist/cjs/hooks/useDatasourceTableState.js +46 -18
- package/dist/cjs/ui/assets-modal/modal/render-assets-content/index.js +1 -1
- package/dist/cjs/ui/datasource-table-view/datasourceTableView.js +1 -1
- package/dist/cjs/ui/issue-like-table/empty-state/index.js +4 -0
- package/dist/cjs/ui/issue-like-table/index.js +81 -67
- package/dist/cjs/ui/jira-issues-modal/jira-search-container/index.js +34 -36
- package/dist/cjs/ui/jira-issues-modal/modal/index.js +29 -17
- package/dist/es2019/analytics/constants.js +1 -1
- package/dist/es2019/hooks/useDatasourceTableState.js +20 -4
- package/dist/es2019/ui/assets-modal/modal/render-assets-content/index.js +1 -1
- package/dist/es2019/ui/datasource-table-view/datasourceTableView.js +1 -1
- package/dist/es2019/ui/issue-like-table/empty-state/index.js +4 -0
- package/dist/es2019/ui/issue-like-table/index.js +33 -20
- package/dist/es2019/ui/jira-issues-modal/jira-search-container/index.js +19 -19
- package/dist/es2019/ui/jira-issues-modal/modal/index.js +15 -6
- package/dist/esm/analytics/constants.js +1 -1
- package/dist/esm/hooks/useDatasourceTableState.js +46 -18
- package/dist/esm/ui/assets-modal/modal/render-assets-content/index.js +1 -1
- package/dist/esm/ui/datasource-table-view/datasourceTableView.js +1 -1
- package/dist/esm/ui/issue-like-table/empty-state/index.js +4 -0
- package/dist/esm/ui/issue-like-table/index.js +81 -67
- package/dist/esm/ui/jira-issues-modal/jira-search-container/index.js +34 -36
- package/dist/esm/ui/jira-issues-modal/modal/index.js +29 -17
- package/dist/types/ui/issue-like-table/index.d.ts +2 -1
- package/dist/types/ui/jira-issues-modal/jira-search-container/index.d.ts +2 -0
- package/dist/types-ts4.5/ui/issue-like-table/index.d.ts +2 -1
- package/dist/types-ts4.5/ui/jira-issues-modal/jira-search-container/index.d.ts +2 -0
- package/examples-helpers/hoverableContainer.tsx +26 -0
- package/package.json +1 -1
|
@@ -91,13 +91,20 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
|
|
|
91
91
|
_yield$getDatasourceD = _context.sent;
|
|
92
92
|
access = _yield$getDatasourceD.meta.access;
|
|
93
93
|
schema = _yield$getDatasourceD.data.schema;
|
|
94
|
-
if (!(access === '
|
|
94
|
+
if (!(access === 'unauthorized')) {
|
|
95
95
|
_context.next = 11;
|
|
96
96
|
break;
|
|
97
97
|
}
|
|
98
98
|
setStatus('unauthorized');
|
|
99
99
|
return _context.abrupt("return");
|
|
100
100
|
case 11:
|
|
101
|
+
if (!(access === 'forbidden')) {
|
|
102
|
+
_context.next = 14;
|
|
103
|
+
break;
|
|
104
|
+
}
|
|
105
|
+
setStatus('forbidden');
|
|
106
|
+
return _context.abrupt("return");
|
|
107
|
+
case 14:
|
|
101
108
|
isColumnNotPresentInCurrentColumnsList = function isColumnNotPresentInCurrentColumnsList(col) {
|
|
102
109
|
return !columns.find(function (column) {
|
|
103
110
|
return column.key === col.key;
|
|
@@ -106,25 +113,32 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
|
|
|
106
113
|
allColumns = schema.properties;
|
|
107
114
|
newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
|
|
108
115
|
newColumns.length > 0 && setColumns([].concat(_toConsumableArray(columns), _toConsumableArray(newColumns)));
|
|
109
|
-
_context.next =
|
|
116
|
+
_context.next = 30;
|
|
110
117
|
break;
|
|
111
|
-
case
|
|
112
|
-
_context.prev =
|
|
118
|
+
case 20:
|
|
119
|
+
_context.prev = 20;
|
|
113
120
|
_context.t0 = _context["catch"](2);
|
|
114
121
|
captureError('loadDatasourceDetails', _context.t0);
|
|
115
|
-
if (!(_context.t0 instanceof Response &&
|
|
116
|
-
_context.next =
|
|
122
|
+
if (!(_context.t0 instanceof Response && _context.t0.status === 401)) {
|
|
123
|
+
_context.next = 26;
|
|
117
124
|
break;
|
|
118
125
|
}
|
|
119
126
|
setStatus('unauthorized');
|
|
120
127
|
return _context.abrupt("return");
|
|
121
|
-
case
|
|
128
|
+
case 26:
|
|
129
|
+
if (!(_context.t0 instanceof Response && _context.t0.status === 403)) {
|
|
130
|
+
_context.next = 29;
|
|
131
|
+
break;
|
|
132
|
+
}
|
|
133
|
+
setStatus('forbidden');
|
|
134
|
+
return _context.abrupt("return");
|
|
135
|
+
case 29:
|
|
122
136
|
setStatus('rejected');
|
|
123
|
-
case
|
|
137
|
+
case 30:
|
|
124
138
|
case "end":
|
|
125
139
|
return _context.stop();
|
|
126
140
|
}
|
|
127
|
-
}, _callee, null, [[2,
|
|
141
|
+
}, _callee, null, [[2, 20]]);
|
|
128
142
|
})), [captureError, columns, datasourceId, getDatasourceDetails, parameters]);
|
|
129
143
|
var applySchemaProperties = useCallback(function (schema, fieldKeys) {
|
|
130
144
|
var properties = schema.properties,
|
|
@@ -218,13 +232,20 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
|
|
|
218
232
|
nextPageCursor = _yield$getDatasourceD4.nextPageCursor;
|
|
219
233
|
_totalCount = _yield$getDatasourceD4.totalCount;
|
|
220
234
|
schema = _yield$getDatasourceD4.schema;
|
|
221
|
-
if (!(access === '
|
|
235
|
+
if (!(access === 'unauthorized')) {
|
|
222
236
|
_context2.next = 23;
|
|
223
237
|
break;
|
|
224
238
|
}
|
|
225
239
|
setStatus('unauthorized');
|
|
226
240
|
return _context2.abrupt("return");
|
|
227
241
|
case 23:
|
|
242
|
+
if (!(access === 'forbidden')) {
|
|
243
|
+
_context2.next = 26;
|
|
244
|
+
break;
|
|
245
|
+
}
|
|
246
|
+
setStatus('forbidden');
|
|
247
|
+
return _context2.abrupt("return");
|
|
248
|
+
case 26:
|
|
228
249
|
setExtensionKey(_extensionKey);
|
|
229
250
|
setDestinationObjectTypes(_destinationObjectTypes);
|
|
230
251
|
setTotalCount(_totalCount);
|
|
@@ -253,25 +274,32 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
|
|
|
253
274
|
});
|
|
254
275
|
}
|
|
255
276
|
setStatus('resolved');
|
|
256
|
-
_context2.next =
|
|
277
|
+
_context2.next = 49;
|
|
257
278
|
break;
|
|
258
|
-
case
|
|
259
|
-
_context2.prev =
|
|
279
|
+
case 39:
|
|
280
|
+
_context2.prev = 39;
|
|
260
281
|
_context2.t0 = _context2["catch"](7);
|
|
261
282
|
captureError('onNextPage', _context2.t0);
|
|
262
|
-
if (!(_context2.t0 instanceof Response &&
|
|
263
|
-
_context2.next =
|
|
283
|
+
if (!(_context2.t0 instanceof Response && _context2.t0.status === 401)) {
|
|
284
|
+
_context2.next = 45;
|
|
264
285
|
break;
|
|
265
286
|
}
|
|
266
287
|
setStatus('unauthorized');
|
|
267
288
|
return _context2.abrupt("return");
|
|
268
|
-
case
|
|
289
|
+
case 45:
|
|
290
|
+
if (!(_context2.t0 instanceof Response && _context2.t0.status === 403)) {
|
|
291
|
+
_context2.next = 48;
|
|
292
|
+
break;
|
|
293
|
+
}
|
|
294
|
+
setStatus('forbidden');
|
|
295
|
+
return _context2.abrupt("return");
|
|
296
|
+
case 48:
|
|
269
297
|
setStatus('rejected');
|
|
270
|
-
case
|
|
298
|
+
case 49:
|
|
271
299
|
case "end":
|
|
272
300
|
return _context2.stop();
|
|
273
301
|
}
|
|
274
|
-
}, _callee2, null, [[7,
|
|
302
|
+
}, _callee2, null, [[7, 39]]);
|
|
275
303
|
})), [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent, fullSchema]);
|
|
276
304
|
var reset = useCallback(function (options) {
|
|
277
305
|
setStatus('empty');
|
|
@@ -23,7 +23,7 @@ var tableBordersStyles = css({
|
|
|
23
23
|
borderTopLeftRadius: "var(--ds-border-radius-200, 8px)",
|
|
24
24
|
borderTopRightRadius: "var(--ds-border-radius-200, 8px)",
|
|
25
25
|
borderBottom: "2px solid ".concat("var(--ds-background-accent-gray-subtler, ".concat(N40, ")")),
|
|
26
|
-
|
|
26
|
+
backgroundImage: scrollableContainerShadowsCssComponents.backgroundImage,
|
|
27
27
|
backgroundRepeat: scrollableContainerShadowsCssComponents.backgroundRepeat,
|
|
28
28
|
backgroundSize: scrollableContainerShadowsCssComponents.backgroundSize,
|
|
29
29
|
backgroundAttachment: scrollableContainerShadowsCssComponents.backgroundAttachment
|
|
@@ -105,7 +105,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
|
|
|
105
105
|
shouldForceRequest: true
|
|
106
106
|
});
|
|
107
107
|
}, [destinationObjectTypes, extensionKey, fireEvent, reset]);
|
|
108
|
-
if (status === 'resolved' && !responseItems.length) {
|
|
108
|
+
if (status === 'resolved' && !responseItems.length || status === 'forbidden') {
|
|
109
109
|
return jsx(NoResults, {
|
|
110
110
|
onRefresh: reset
|
|
111
111
|
});
|
|
@@ -16,6 +16,9 @@ var SkeletonComponent = function SkeletonComponent(_ref) {
|
|
|
16
16
|
var tableBodyStyles = css({
|
|
17
17
|
borderBottom: 0
|
|
18
18
|
});
|
|
19
|
+
var tableStyles = css({
|
|
20
|
+
background: "var(--ds-elevation-surface-current, #FFF)"
|
|
21
|
+
});
|
|
19
22
|
var padding = "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-100, 8px)");
|
|
20
23
|
var cellStyles = css({
|
|
21
24
|
padding: padding,
|
|
@@ -105,6 +108,7 @@ export default (function (_ref4) {
|
|
|
105
108
|
boxSizing: 'border-box'
|
|
106
109
|
}
|
|
107
110
|
}, jsx("table", {
|
|
111
|
+
css: tableStyles,
|
|
108
112
|
"data-testid": testId
|
|
109
113
|
}, jsx("thead", {
|
|
110
114
|
style: {
|
|
@@ -71,65 +71,79 @@ var tableContainerStyles = css({
|
|
|
71
71
|
var shadowColor = "var(--ds-shadow-overflow-perimeter, rgba(0, 0, 0, 0.1))";
|
|
72
72
|
var shadowColorLight = "var(--ds-shadow-overflow-perimeter, rgba(0, 0, 0, 0.05))";
|
|
73
73
|
var leftWhiteOverrideGradient = {
|
|
74
|
-
|
|
74
|
+
backgroundImage: "\n linear-gradient(\n 90deg,\n ".concat("var(--ds-elevation-surface-current, #FFF)", " 30%,\n rgba(255, 255, 255, 0)\n )"),
|
|
75
|
+
backgroundPosition: 'left center',
|
|
75
76
|
size: "40px 100%",
|
|
76
77
|
attachment: "local"
|
|
77
78
|
};
|
|
78
79
|
var topWhiteOverrideGradient = {
|
|
79
|
-
|
|
80
|
+
backgroundImage: "\n linear-gradient(\n 0deg,\n rgba(255, 255, 255, 0),\n ".concat("var(--ds-elevation-surface-current, #FFF)", " 30%\n )"),
|
|
81
|
+
backgroundPosition: 'top center',
|
|
80
82
|
size: "100% 100px",
|
|
81
83
|
attachment: "local"
|
|
82
84
|
};
|
|
83
85
|
var rightWhiteOverrideGradient = {
|
|
84
|
-
|
|
86
|
+
backgroundImage: "\n linear-gradient(\n 90deg,\n rgba(255, 255, 255, 0),\n ".concat("var(--ds-elevation-surface-current, #FFF)", " 70%\n )"),
|
|
87
|
+
backgroundPosition: 'right center',
|
|
85
88
|
size: "40px 100%",
|
|
86
89
|
attachment: "local"
|
|
87
90
|
};
|
|
88
91
|
var bottomWhiteOverride = {
|
|
89
|
-
|
|
92
|
+
backgroundImage: "\n linear-gradient(\n 0deg,\n ".concat("var(--ds-elevation-surface-current, #FFF)", " 30%,\n rgba(255, 255, 255, 0)\n )"),
|
|
93
|
+
backgroundPosition: 'bottom center',
|
|
90
94
|
size: "100% 40px",
|
|
91
95
|
attachment: "local"
|
|
92
96
|
};
|
|
93
97
|
var leftShadowGradient = {
|
|
94
|
-
|
|
98
|
+
backgroundImage: "\n linear-gradient(\n 90deg,\n ".concat(shadowColor, ",\n rgba(0, 0, 0, 0)\n )"),
|
|
99
|
+
backgroundPosition: 'left center',
|
|
95
100
|
size: "14px 100%",
|
|
96
101
|
attachment: "scroll"
|
|
97
102
|
};
|
|
98
103
|
var topShadowGradient = {
|
|
99
|
-
|
|
104
|
+
backgroundImage: "\n linear-gradient(\n 0deg,\n rgba(0, 0, 0, 0),\n ".concat(shadowColorLight, "\n )"),
|
|
105
|
+
backgroundPosition: '0 52px',
|
|
100
106
|
size: "100% 14px",
|
|
101
107
|
attachment: "scroll"
|
|
102
108
|
};
|
|
103
109
|
var rightShadowGradient = {
|
|
104
|
-
|
|
110
|
+
backgroundImage: "\n linear-gradient(\n 90deg,\n rgba(0, 0, 0, 0),\n ".concat(shadowColor, "\n )"),
|
|
111
|
+
backgroundPosition: 'right center',
|
|
105
112
|
size: "14px 100%",
|
|
106
113
|
attachment: "scroll"
|
|
107
114
|
};
|
|
108
115
|
var bottomShadowGradient = {
|
|
109
|
-
|
|
116
|
+
backgroundImage: "\n linear-gradient(\n 0deg,\n ".concat(shadowColorLight, ",\n rgba(0, 0, 0, 0)\n )"),
|
|
117
|
+
backgroundPosition: 'bottom center',
|
|
110
118
|
size: "100% 10px",
|
|
111
119
|
attachment: "scroll"
|
|
112
120
|
};
|
|
113
121
|
var shadows = [leftWhiteOverrideGradient, leftShadowGradient, rightWhiteOverrideGradient, rightShadowGradient, topWhiteOverrideGradient, topShadowGradient, bottomWhiteOverride, bottomShadowGradient];
|
|
114
122
|
export var scrollableContainerShadowsCssComponents = {
|
|
115
|
-
|
|
116
|
-
var
|
|
117
|
-
return
|
|
123
|
+
backgroundImage: shadows.map(function (_ref) {
|
|
124
|
+
var backgroundImage = _ref.backgroundImage;
|
|
125
|
+
return backgroundImage;
|
|
126
|
+
}).join(','),
|
|
127
|
+
backgroundPosition: shadows.map(function (_ref2) {
|
|
128
|
+
var backgroundPosition = _ref2.backgroundPosition;
|
|
129
|
+
return backgroundPosition;
|
|
118
130
|
}).join(','),
|
|
119
131
|
backgroundRepeat: 'no-repeat',
|
|
120
|
-
backgroundSize: shadows.map(function (
|
|
121
|
-
var size =
|
|
132
|
+
backgroundSize: shadows.map(function (_ref3) {
|
|
133
|
+
var size = _ref3.size;
|
|
122
134
|
return size;
|
|
123
135
|
}).join(','),
|
|
124
|
-
backgroundAttachment: shadows.map(function (
|
|
125
|
-
var attachment =
|
|
136
|
+
backgroundAttachment: shadows.map(function (_ref4) {
|
|
137
|
+
var attachment = _ref4.attachment;
|
|
126
138
|
return attachment;
|
|
127
139
|
}).join(',')
|
|
128
140
|
};
|
|
129
141
|
var scrollableContainerStyles = css({
|
|
130
142
|
overflow: 'auto',
|
|
131
143
|
boxSizing: 'border-box',
|
|
132
|
-
|
|
144
|
+
backgroundColor: "var(--ds-elevation-surface-current, #FFF)",
|
|
145
|
+
backgroundImage: scrollableContainerShadowsCssComponents.backgroundImage,
|
|
146
|
+
backgroundPosition: scrollableContainerShadowsCssComponents.backgroundPosition,
|
|
133
147
|
backgroundRepeat: scrollableContainerShadowsCssComponents.backgroundRepeat,
|
|
134
148
|
backgroundSize: scrollableContainerShadowsCssComponents.backgroundSize,
|
|
135
149
|
backgroundAttachment: scrollableContainerShadowsCssComponents.backgroundAttachment
|
|
@@ -189,23 +203,23 @@ function getDefaultColumnWidth(key, type) {
|
|
|
189
203
|
return DEFAULT_WIDTH;
|
|
190
204
|
}
|
|
191
205
|
}
|
|
192
|
-
export var IssueLikeDataTableView = function IssueLikeDataTableView(
|
|
193
|
-
var testId =
|
|
194
|
-
onNextPage =
|
|
195
|
-
onLoadDatasourceDetails =
|
|
196
|
-
items =
|
|
197
|
-
columns =
|
|
198
|
-
|
|
199
|
-
renderItem =
|
|
200
|
-
visibleColumnKeys =
|
|
201
|
-
onVisibleColumnKeysChange =
|
|
202
|
-
columnCustomSizes =
|
|
203
|
-
onColumnResize =
|
|
204
|
-
status =
|
|
205
|
-
hasNextPage =
|
|
206
|
-
scrollableContainerHeight =
|
|
207
|
-
parentContainerRenderInstanceId =
|
|
208
|
-
extensionKey =
|
|
206
|
+
export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref5) {
|
|
207
|
+
var testId = _ref5.testId,
|
|
208
|
+
onNextPage = _ref5.onNextPage,
|
|
209
|
+
onLoadDatasourceDetails = _ref5.onLoadDatasourceDetails,
|
|
210
|
+
items = _ref5.items,
|
|
211
|
+
columns = _ref5.columns,
|
|
212
|
+
_ref5$renderItem = _ref5.renderItem,
|
|
213
|
+
renderItem = _ref5$renderItem === void 0 ? fallbackRenderType : _ref5$renderItem,
|
|
214
|
+
visibleColumnKeys = _ref5.visibleColumnKeys,
|
|
215
|
+
onVisibleColumnKeysChange = _ref5.onVisibleColumnKeysChange,
|
|
216
|
+
columnCustomSizes = _ref5.columnCustomSizes,
|
|
217
|
+
onColumnResize = _ref5.onColumnResize,
|
|
218
|
+
status = _ref5.status,
|
|
219
|
+
hasNextPage = _ref5.hasNextPage,
|
|
220
|
+
scrollableContainerHeight = _ref5.scrollableContainerHeight,
|
|
221
|
+
parentContainerRenderInstanceId = _ref5.parentContainerRenderInstanceId,
|
|
222
|
+
extensionKey = _ref5.extensionKey;
|
|
209
223
|
var tableId = useMemo(function () {
|
|
210
224
|
return Symbol('unique-id');
|
|
211
225
|
}, []);
|
|
@@ -240,8 +254,8 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref4) {
|
|
|
240
254
|
}, [parentContainerRenderInstanceId, status]);
|
|
241
255
|
var visibleSortedColumns = useMemo(function () {
|
|
242
256
|
return visibleColumnKeys.map(function (visibleKey) {
|
|
243
|
-
return orderedColumns.find(function (
|
|
244
|
-
var key =
|
|
257
|
+
return orderedColumns.find(function (_ref6) {
|
|
258
|
+
var key = _ref6.key;
|
|
245
259
|
return visibleKey === key;
|
|
246
260
|
});
|
|
247
261
|
}).filter(Boolean);
|
|
@@ -256,10 +270,10 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref4) {
|
|
|
256
270
|
return (columnCustomSizes === null || columnCustomSizes === void 0 ? void 0 : columnCustomSizes[key]) || getDefaultColumnWidth(key, type);
|
|
257
271
|
}, [columnCustomSizes]);
|
|
258
272
|
var headerColumns = useMemo(function () {
|
|
259
|
-
return visibleSortedColumns.map(function (
|
|
260
|
-
var key =
|
|
261
|
-
title =
|
|
262
|
-
type =
|
|
273
|
+
return visibleSortedColumns.map(function (_ref7) {
|
|
274
|
+
var key = _ref7.key,
|
|
275
|
+
title = _ref7.title,
|
|
276
|
+
type = _ref7.type;
|
|
263
277
|
return {
|
|
264
278
|
key: key,
|
|
265
279
|
content: title,
|
|
@@ -301,9 +315,9 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref4) {
|
|
|
301
315
|
return;
|
|
302
316
|
}
|
|
303
317
|
return combine(monitorForElements({
|
|
304
|
-
onDragStart: function onDragStart(
|
|
305
|
-
var location =
|
|
306
|
-
source =
|
|
318
|
+
onDragStart: function onDragStart(_ref8) {
|
|
319
|
+
var location = _ref8.location,
|
|
320
|
+
source = _ref8.source;
|
|
307
321
|
initialAutoScrollerClientY.current = location.current.input.clientY;
|
|
308
322
|
if (source.data.type === 'table-header') {
|
|
309
323
|
var _containerRef$current;
|
|
@@ -319,9 +333,9 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref4) {
|
|
|
319
333
|
});
|
|
320
334
|
}
|
|
321
335
|
},
|
|
322
|
-
onDrag: function onDrag(
|
|
323
|
-
var location =
|
|
324
|
-
source =
|
|
336
|
+
onDrag: function onDrag(_ref9) {
|
|
337
|
+
var location = _ref9.location,
|
|
338
|
+
source = _ref9.source;
|
|
325
339
|
if (source.data.type === 'table-header') {
|
|
326
340
|
var _containerRef$current2;
|
|
327
341
|
autoScroller.updateInput({
|
|
@@ -331,9 +345,9 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref4) {
|
|
|
331
345
|
});
|
|
332
346
|
}
|
|
333
347
|
},
|
|
334
|
-
onDrop: function onDrop(
|
|
335
|
-
var source =
|
|
336
|
-
location =
|
|
348
|
+
onDrop: function onDrop(_ref10) {
|
|
349
|
+
var source = _ref10.source,
|
|
350
|
+
location = _ref10.location;
|
|
337
351
|
autoScroller.stop();
|
|
338
352
|
if (location.current.dropTargets.length === 0) {
|
|
339
353
|
return;
|
|
@@ -368,10 +382,10 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref4) {
|
|
|
368
382
|
return items.map(function (newRowData, rowIndex) {
|
|
369
383
|
return {
|
|
370
384
|
key: "".concat(identityColumnKey && newRowData[identityColumnKey] && newRowData[identityColumnKey].data || rowIndex),
|
|
371
|
-
cells: visibleSortedColumns.map(function (
|
|
385
|
+
cells: visibleSortedColumns.map(function (_ref11) {
|
|
372
386
|
var _newRowData$key;
|
|
373
|
-
var key =
|
|
374
|
-
type =
|
|
387
|
+
var key = _ref11.key,
|
|
388
|
+
type = _ref11.type;
|
|
375
389
|
var value = ((_newRowData$key = newRowData[key]) === null || _newRowData$key === void 0 ? void 0 : _newRowData$key.data) || newRowData[key];
|
|
376
390
|
var values = Array.isArray(value) ? value : [value];
|
|
377
391
|
var content = values.map(function (value) {
|
|
@@ -472,10 +486,10 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref4) {
|
|
|
472
486
|
css: [noDefaultBorderStyles, tableHeadStyles]
|
|
473
487
|
}, jsx("tr", {
|
|
474
488
|
ref: tableHeaderRowRef
|
|
475
|
-
}, headerColumns.map(function (
|
|
476
|
-
var key =
|
|
477
|
-
content =
|
|
478
|
-
width =
|
|
489
|
+
}, headerColumns.map(function (_ref13, cellIndex) {
|
|
490
|
+
var key = _ref13.key,
|
|
491
|
+
content = _ref13.content,
|
|
492
|
+
width = _ref13.width;
|
|
479
493
|
var heading = jsx(Tooltip, {
|
|
480
494
|
content: content,
|
|
481
495
|
tag: "span",
|
|
@@ -486,10 +500,10 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref4) {
|
|
|
486
500
|
}, content));
|
|
487
501
|
if (onVisibleColumnKeysChange && hasData) {
|
|
488
502
|
var _containerRef$current3;
|
|
489
|
-
var previewRows = tableRows.map(function (
|
|
490
|
-
var cells =
|
|
491
|
-
var cell = cells.find(function (
|
|
492
|
-
var cellKey =
|
|
503
|
+
var previewRows = tableRows.map(function (_ref14) {
|
|
504
|
+
var cells = _ref14.cells;
|
|
505
|
+
var cell = cells.find(function (_ref15) {
|
|
506
|
+
var cellKey = _ref15.key;
|
|
493
507
|
return cellKey === key;
|
|
494
508
|
});
|
|
495
509
|
if (cell) {
|
|
@@ -531,18 +545,18 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref4) {
|
|
|
531
545
|
})))), jsx("tbody", {
|
|
532
546
|
css: noDefaultBorderStyles,
|
|
533
547
|
"data-testid": testId && "".concat(testId, "--body")
|
|
534
|
-
}, rows.map(function (
|
|
535
|
-
var key =
|
|
536
|
-
cells =
|
|
537
|
-
ref =
|
|
548
|
+
}, rows.map(function (_ref16) {
|
|
549
|
+
var key = _ref16.key,
|
|
550
|
+
cells = _ref16.cells,
|
|
551
|
+
ref = _ref16.ref;
|
|
538
552
|
return jsx("tr", {
|
|
539
553
|
key: key,
|
|
540
554
|
"data-testid": testId && "".concat(testId, "--row-").concat(key),
|
|
541
555
|
ref: ref
|
|
542
|
-
}, cells.map(function (
|
|
543
|
-
var cellKey =
|
|
544
|
-
content =
|
|
545
|
-
width =
|
|
556
|
+
}, cells.map(function (_ref17, cellIndex) {
|
|
557
|
+
var cellKey = _ref17.key,
|
|
558
|
+
content = _ref17.content,
|
|
559
|
+
width = _ref17.width;
|
|
546
560
|
var loadingRowStyle = shouldUseWidth ? {
|
|
547
561
|
width: width
|
|
548
562
|
} : {
|
|
@@ -36,10 +36,12 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
|
|
|
36
36
|
parameters = props.parameters,
|
|
37
37
|
onSearch = props.onSearch,
|
|
38
38
|
onSearchMethodChangeCallback = props.onSearchMethodChange,
|
|
39
|
-
initialSearchMethod = props.initialSearchMethod
|
|
39
|
+
initialSearchMethod = props.initialSearchMethod,
|
|
40
|
+
setSearchBarJql = props.setSearchBarJql,
|
|
41
|
+
_props$searchBarJql = props.searchBarJql,
|
|
42
|
+
searchBarJql = _props$searchBarJql === void 0 ? DEFAULT_JQL_QUERY : _props$searchBarJql;
|
|
40
43
|
var _ref = parameters || {},
|
|
41
|
-
currentCloudId = _ref.cloudId
|
|
42
|
-
initialJql = _ref.jql;
|
|
44
|
+
currentCloudId = _ref.cloudId;
|
|
43
45
|
var _useIntl = useIntl(),
|
|
44
46
|
formatMessage = _useIntl.formatMessage;
|
|
45
47
|
var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
|
|
@@ -52,37 +54,33 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
|
|
|
52
54
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
53
55
|
currentSearchMethod = _useState4[0],
|
|
54
56
|
setCurrentSearchMethod = _useState4[1];
|
|
55
|
-
var _useState5 = useState(
|
|
57
|
+
var _useState5 = useState(currentCloudId),
|
|
56
58
|
_useState6 = _slicedToArray(_useState5, 2),
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
var _useState7 = useState(
|
|
59
|
+
cloudId = _useState6[0],
|
|
60
|
+
setCloudId = _useState6[1];
|
|
61
|
+
var _useState7 = useState(false),
|
|
60
62
|
_useState8 = _slicedToArray(_useState7, 2),
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
var _useState9 = useState(
|
|
63
|
+
isComplexQuery = _useState8[0],
|
|
64
|
+
setIsComplexQuery = _useState8[1];
|
|
65
|
+
var _useState9 = useState(),
|
|
64
66
|
_useState10 = _slicedToArray(_useState9, 2),
|
|
65
|
-
|
|
66
|
-
|
|
67
|
+
orderKey = _useState10[0],
|
|
68
|
+
setOrderKey = _useState10[1];
|
|
67
69
|
var _useState11 = useState(),
|
|
68
70
|
_useState12 = _slicedToArray(_useState11, 2),
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
var _useState13 = useState(),
|
|
71
|
+
orderDirection = _useState12[0],
|
|
72
|
+
setOrderDirection = _useState12[1];
|
|
73
|
+
var _useState13 = useState({}),
|
|
72
74
|
_useState14 = _slicedToArray(_useState13, 2),
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
var _useState15 = useState({}),
|
|
76
|
-
_useState16 = _slicedToArray(_useState15, 2),
|
|
77
|
-
filterSelections = _useState16[0],
|
|
78
|
-
setFilterSelections = _useState16[1];
|
|
75
|
+
filterSelections = _useState14[0],
|
|
76
|
+
setFilterSelections = _useState14[1];
|
|
79
77
|
var showBasicFilters = useMemo(function () {
|
|
80
78
|
if (getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters')) {
|
|
81
79
|
return true;
|
|
82
80
|
}
|
|
83
81
|
return false;
|
|
84
82
|
}, []);
|
|
85
|
-
var _useHydrateJqlQuery = useHydrateJqlQuery(cloudId || '',
|
|
83
|
+
var _useHydrateJqlQuery = useHydrateJqlQuery(cloudId || '', searchBarJql),
|
|
86
84
|
hydratedOptions = _useHydrateJqlQuery.hydratedOptions,
|
|
87
85
|
fetchHydratedJqlOptions = _useHydrateJqlQuery.fetchHydratedJqlOptions,
|
|
88
86
|
basicFilterHydrationStatus = _useHydrateJqlQuery.status;
|
|
@@ -93,13 +91,13 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
|
|
|
93
91
|
var handleBasicSearchChange = useCallback(function (e) {
|
|
94
92
|
var rawSearch = e.currentTarget.value;
|
|
95
93
|
setBasicSearchTerm(rawSearch);
|
|
96
|
-
|
|
94
|
+
setSearchBarJql(buildJQL({
|
|
97
95
|
rawSearch: rawSearch,
|
|
98
96
|
filterValues: filterSelections,
|
|
99
97
|
orderDirection: orderDirection,
|
|
100
98
|
orderKey: orderKey
|
|
101
99
|
}));
|
|
102
|
-
}, [filterSelections, orderDirection, orderKey]);
|
|
100
|
+
}, [setSearchBarJql, filterSelections, orderDirection, orderKey]);
|
|
103
101
|
var onQueryChange = useCallback(function (query) {
|
|
104
102
|
var _query$split$map$filt, _fragments$at, _fragments$at2, _fragments$at3;
|
|
105
103
|
// determine if order keys have been set so they can be saved and persisted when changes occur in basic search
|
|
@@ -115,12 +113,12 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
|
|
|
115
113
|
setOrderKey(key);
|
|
116
114
|
setOrderDirection(order);
|
|
117
115
|
}
|
|
118
|
-
|
|
119
|
-
}, []);
|
|
116
|
+
setSearchBarJql(query);
|
|
117
|
+
}, [setSearchBarJql]);
|
|
120
118
|
var handleSearch = useCallback(function () {
|
|
121
|
-
var isCurrentQueryComplex = isQueryTooComplex(
|
|
119
|
+
var isCurrentQueryComplex = isQueryTooComplex(searchBarJql);
|
|
122
120
|
onSearch({
|
|
123
|
-
jql:
|
|
121
|
+
jql: searchBarJql
|
|
124
122
|
}, {
|
|
125
123
|
searchMethod: currentSearchMethod,
|
|
126
124
|
basicFilterSelections: filterSelections,
|
|
@@ -137,7 +135,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
|
|
|
137
135
|
fetchHydratedJqlOptions();
|
|
138
136
|
}
|
|
139
137
|
}
|
|
140
|
-
}, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent,
|
|
138
|
+
}, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, searchBarJql, onSearch, showBasicFilters]);
|
|
141
139
|
var _useDebouncedCallback = useDebouncedCallback(function (filterValues) {
|
|
142
140
|
var jqlWithFilterValues = buildJQL({
|
|
143
141
|
rawSearch: basicSearchTerm,
|
|
@@ -145,7 +143,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
|
|
|
145
143
|
orderDirection: orderDirection,
|
|
146
144
|
orderKey: orderKey
|
|
147
145
|
});
|
|
148
|
-
|
|
146
|
+
setSearchBarJql(jqlWithFilterValues);
|
|
149
147
|
var isCurrentQueryComplex = isQueryTooComplex(jqlWithFilterValues);
|
|
150
148
|
onSearch({
|
|
151
149
|
jql: jqlWithFilterValues
|
|
@@ -163,9 +161,9 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
|
|
|
163
161
|
debouncedBasicFilterSelectionChange(updatedSelection);
|
|
164
162
|
}, [debouncedBasicFilterSelectionChange, filterSelections]);
|
|
165
163
|
useEffect(function () {
|
|
166
|
-
var isCurrentQueryComplex = isQueryTooComplex(
|
|
164
|
+
var isCurrentQueryComplex = isQueryTooComplex(searchBarJql);
|
|
167
165
|
setIsComplexQuery(isCurrentQueryComplex);
|
|
168
|
-
if (showBasicFilters && !isCurrentQueryComplex &&
|
|
166
|
+
if (showBasicFilters && !isCurrentQueryComplex && searchBarJql !== DEFAULT_JQL_QUERY) {
|
|
169
167
|
fetchHydratedJqlOptions();
|
|
170
168
|
}
|
|
171
169
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
@@ -183,14 +181,14 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
|
|
|
183
181
|
useEffect(function () {
|
|
184
182
|
if (currentCloudId !== cloudId) {
|
|
185
183
|
setBasicSearchTerm('');
|
|
186
|
-
|
|
184
|
+
setSearchBarJql(DEFAULT_JQL_QUERY);
|
|
187
185
|
setIsComplexQuery(false);
|
|
188
186
|
setOrderKey(undefined);
|
|
189
187
|
setOrderDirection(undefined);
|
|
190
188
|
setFilterSelections({});
|
|
191
189
|
setCloudId(currentCloudId);
|
|
192
190
|
}
|
|
193
|
-
}, [currentCloudId, cloudId]);
|
|
191
|
+
}, [currentCloudId, cloudId, setSearchBarJql]);
|
|
194
192
|
return jsx("div", {
|
|
195
193
|
css: inputContainerStyles,
|
|
196
194
|
"data-testid": "jira-search-container"
|
|
@@ -203,7 +201,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
|
|
|
203
201
|
onSearch: handleSearch,
|
|
204
202
|
searchTerm: basicSearchTerm
|
|
205
203
|
}), showBasicFilters && jsx(BasicFilters, {
|
|
206
|
-
jql:
|
|
204
|
+
jql: searchBarJql,
|
|
207
205
|
cloudId: cloudId || '',
|
|
208
206
|
onChange: handleBasicFilterSelectionChange,
|
|
209
207
|
selections: filterSelections,
|
|
@@ -213,7 +211,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
|
|
|
213
211
|
isSearching: isSearching,
|
|
214
212
|
onChange: onQueryChange,
|
|
215
213
|
onSearch: handleSearch,
|
|
216
|
-
query:
|
|
214
|
+
query: searchBarJql
|
|
217
215
|
}), jsx(ModeSwitcher, {
|
|
218
216
|
onOptionValueChange: onSearchMethodChange,
|
|
219
217
|
selectedOptionValue: currentSearchMethod,
|