@atlaskit/link-datasource 1.0.8 → 1.0.10

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 CHANGED
@@ -1,5 +1,17 @@
1
1
  # @atlaskit/link-datasource
2
2
 
3
+ ## 1.0.10
4
+
5
+ ### Patch Changes
6
+
7
+ - [`4994b59823e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4994b59823e) - [ux] Fix assets modal columns to reset when changing schema
8
+
9
+ ## 1.0.9
10
+
11
+ ### Patch Changes
12
+
13
+ - [`ee9ef928b39`](https://bitbucket.org/atlassian/atlassian-frontend/commits/ee9ef928b39) - [ux] Link render types will now render on a new line
14
+
3
15
  ## 1.0.8
4
16
 
5
17
  ### Patch Changes
@@ -203,15 +203,17 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
203
203
  }
204
204
  }, _callee2, null, [[8, 30]]);
205
205
  })), [parameters, fieldKeys, getDatasourceData, datasourceId, nextCursor, applySchemaProperties]);
206
- var reset = (0, _react.useCallback)(function () {
207
- var shouldForceRequest = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
206
+ var reset = (0, _react.useCallback)(function (options) {
208
207
  setStatus('empty');
209
208
  setResponseItems([]);
210
209
  setHasNextPage(true);
211
210
  setNextCursor(undefined);
212
211
  setTotalCount(undefined);
213
212
  setLastRequestedFieldKeys([]);
214
- setShouldForceRequest(shouldForceRequest);
213
+ setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
214
+ if (options !== null && options !== void 0 && options.shouldResetColumns) {
215
+ setColumns([]);
216
+ }
215
217
  }, []);
216
218
 
217
219
  // this takes care of requesting /data initally
@@ -48,6 +48,10 @@ var AssetsConfigModal = function AssetsConfigModal(props) {
48
48
  _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
49
49
  visibleColumnKeys = _useState6[0],
50
50
  setVisibleColumnKeys = _useState6[1];
51
+ var _useState7 = (0, _react.useState)(false),
52
+ _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
53
+ isNewSearch = _useState8[0],
54
+ setIsNewSearch = _useState8[1];
51
55
 
52
56
  // If a workspaceError occurs this is a critical error
53
57
  var _useAssetsClient = (0, _useAssetsClient2.useAssetsClient)(initialParameters),
@@ -66,7 +70,7 @@ var AssetsConfigModal = function AssetsConfigModal(props) {
66
70
  var _useDatasourceTableSt = (0, _useDatasourceTableState.useDatasourceTableState)({
67
71
  datasourceId: datasourceId,
68
72
  parameters: isParametersSet ? parameters : undefined,
69
- fieldKeys: visibleColumnKeys
73
+ fieldKeys: isNewSearch ? [] : visibleColumnKeys
70
74
  }),
71
75
  status = _useDatasourceTableSt.status,
72
76
  onNextPage = _useDatasourceTableSt.onNextPage,
@@ -78,16 +82,28 @@ var AssetsConfigModal = function AssetsConfigModal(props) {
78
82
  defaultVisibleColumnKeys = _useDatasourceTableSt.defaultVisibleColumnKeys;
79
83
  var onVisibleColumnKeysChange = (0, _react.useCallback)(function (visibleColumnKeys) {
80
84
  setVisibleColumnKeys(visibleColumnKeys);
85
+ setIsNewSearch(false);
81
86
  }, []);
82
87
  (0, _react.useEffect)(function () {
83
88
  var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
84
89
  setVisibleColumnKeys(newVisibleColumnKeys);
85
90
  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
91
+ (0, _react.useEffect)(function () {
92
+ var _responseItems = (0, _slicedToArray2.default)(responseItems, 1),
93
+ data = _responseItems[0];
94
+ if (data && isNewSearch) {
95
+ setVisibleColumnKeys(Object.keys(data));
96
+ } else if (data && (visibleColumnKeys || []).length) {
97
+ setVisibleColumnKeys(visibleColumnKeys);
98
+ }
99
+ // Purposely not included 'visibleColumnKeys' as a dependency to prevent infinite loop
100
+ // eslint-disable-next-line react-hooks/exhaustive-deps
101
+ }, [responseItems, isNewSearch]);
86
102
  var isDisabled = !!workspaceError || status === 'rejected' || status === 'loading' || status === 'empty' || !!workspaceError || assetsClientLoading || !aql || !schemaId;
87
103
  var retrieveUrlForSmartCardRender = (0, _react.useCallback)(function () {
88
104
  var _data$key, _data$key$data;
89
- var _responseItems = (0, _slicedToArray2.default)(responseItems, 1),
90
- data = _responseItems[0];
105
+ var _responseItems2 = (0, _slicedToArray2.default)(responseItems, 1),
106
+ data = _responseItems2[0];
91
107
  // agreement with BE that we will use `key` for rendering smartlink
92
108
  return data === null || data === void 0 ? void 0 : (_data$key = data.key) === null || _data$key === void 0 ? void 0 : (_data$key$data = _data$key.data) === null || _data$key$data === void 0 ? void 0 : _data$key$data.url;
93
109
  }, [responseItems]);
@@ -129,11 +145,22 @@ var AssetsConfigModal = function AssetsConfigModal(props) {
129
145
  });
130
146
  }
131
147
  }, [aql, schemaId, workspaceId, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
132
- var handleOnSearch = (0, _react.useCallback)(function (aql, schemaId) {
133
- reset();
134
- setAql(aql);
135
- setSchemaId(schemaId);
136
- }, [reset]);
148
+ var handleOnSearch = (0, _react.useCallback)(function (searchAql, searchSchemaId) {
149
+ if (schemaId !== searchSchemaId) {
150
+ reset({
151
+ shouldResetColumns: true
152
+ });
153
+ setAql(searchAql);
154
+ setSchemaId(searchSchemaId);
155
+ setIsNewSearch(true);
156
+ loadDatasourceDetails();
157
+ }
158
+ if (aql !== searchAql) {
159
+ reset();
160
+ setAql(searchAql);
161
+ setSchemaId(searchSchemaId);
162
+ }
163
+ }, [aql, loadDatasourceDetails, reset, schemaId]);
137
164
  var renderModalTitleContent = (0, _react.useCallback)(function () {
138
165
  if (workspaceError) {
139
166
  return undefined;
@@ -53,7 +53,9 @@ var DatasourceTableView = function DatasourceTableView(_ref) {
53
53
  }
54
54
  }, [visibleColumnKeys, defaultVisibleColumnKeys, onVisibleColumnKeysChange]);
55
55
  var forcedReset = (0, _react.useCallback)(function () {
56
- reset(true);
56
+ reset({
57
+ shouldForceRequest: true
58
+ });
57
59
  }, [reset]);
58
60
  if (status === 'resolved' && !responseItems.length) {
59
61
  return (0, _react2.jsx)(_noResults.NoResults, {
@@ -48,6 +48,7 @@ var fallbackRenderType = function fallbackRenderType(item) {
48
48
  return /*#__PURE__*/_react.default.createElement(_status.default, item.value);
49
49
  case 'string':
50
50
  return /*#__PURE__*/_react.default.createElement(_text.default, {
51
+ key: item.value,
51
52
  text: item.value
52
53
  });
53
54
  case 'tag':
@@ -60,7 +60,7 @@ var LinkRenderType = function LinkRenderType(_ref) {
60
60
  if (!url) {
61
61
  return null;
62
62
  }
63
- return text ? anchor : /*#__PURE__*/_react.default.createElement(SmartCard, null);
63
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, text ? anchor : /*#__PURE__*/_react.default.createElement(SmartCard, null), /*#__PURE__*/_react.default.createElement("br", null));
64
64
  };
65
65
  var _default = /*#__PURE__*/_react.default.memo(LinkRenderType);
66
66
  exports.default = _default;
@@ -160,11 +160,15 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
160
160
  }, [cloudId, selectedJiraSite]);
161
161
  var onSearch = (0, _react.useCallback)(function (newParameters) {
162
162
  setJql(newParameters.jql);
163
- reset(true);
163
+ reset({
164
+ shouldForceRequest: true
165
+ });
164
166
  }, [reset]);
165
167
  var onSiteSelection = (0, _react.useCallback)(function (site) {
166
168
  setCloudId(site.cloudId);
167
- reset(true);
169
+ reset({
170
+ shouldForceRequest: true
171
+ });
168
172
  }, [reset]);
169
173
  var retrieveUrlForSmartCardRender = (0, _react.useCallback)(function () {
170
174
  var _data$key, _data$key$data;
@@ -344,7 +348,7 @@ var analyticsContextAttributes = {
344
348
  };
345
349
  var analyticsContextData = {
346
350
  packageName: "@atlaskit/link-datasource",
347
- packageVersion: "1.0.8",
351
+ packageVersion: "1.0.10",
348
352
  source: 'datasourceConfigModal'
349
353
  };
350
354
  var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
@@ -116,14 +116,17 @@ export const useDatasourceTableState = ({
116
116
  setStatus('rejected');
117
117
  }
118
118
  }, [parameters, fieldKeys, getDatasourceData, datasourceId, nextCursor, applySchemaProperties]);
119
- const reset = useCallback((shouldForceRequest = false) => {
119
+ const reset = useCallback(options => {
120
120
  setStatus('empty');
121
121
  setResponseItems([]);
122
122
  setHasNextPage(true);
123
123
  setNextCursor(undefined);
124
124
  setTotalCount(undefined);
125
125
  setLastRequestedFieldKeys([]);
126
- setShouldForceRequest(shouldForceRequest);
126
+ setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
127
+ if (options !== null && options !== void 0 && options.shouldResetColumns) {
128
+ setColumns([]);
129
+ }
127
130
  }, []);
128
131
 
129
132
  // this takes care of requesting /data initally
@@ -29,6 +29,7 @@ export const AssetsConfigModal = props => {
29
29
  const [aql, setAql] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql);
30
30
  const [schemaId, setSchemaId] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId);
31
31
  const [visibleColumnKeys, setVisibleColumnKeys] = useState(initialVisibleColumnKeys);
32
+ const [isNewSearch, setIsNewSearch] = useState(false);
32
33
 
33
34
  // If a workspaceError occurs this is a critical error
34
35
  const {
@@ -55,15 +56,26 @@ export const AssetsConfigModal = props => {
55
56
  } = useDatasourceTableState({
56
57
  datasourceId,
57
58
  parameters: isParametersSet ? parameters : undefined,
58
- fieldKeys: visibleColumnKeys
59
+ fieldKeys: isNewSearch ? [] : visibleColumnKeys
59
60
  });
60
61
  const onVisibleColumnKeysChange = useCallback(visibleColumnKeys => {
61
62
  setVisibleColumnKeys(visibleColumnKeys);
63
+ setIsNewSearch(false);
62
64
  }, []);
63
65
  useEffect(() => {
64
66
  const newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
65
67
  setVisibleColumnKeys(newVisibleColumnKeys);
66
68
  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
69
+ useEffect(() => {
70
+ const [data] = responseItems;
71
+ if (data && isNewSearch) {
72
+ setVisibleColumnKeys(Object.keys(data));
73
+ } else if (data && (visibleColumnKeys || []).length) {
74
+ setVisibleColumnKeys(visibleColumnKeys);
75
+ }
76
+ // Purposely not included 'visibleColumnKeys' as a dependency to prevent infinite loop
77
+ // eslint-disable-next-line react-hooks/exhaustive-deps
78
+ }, [responseItems, isNewSearch]);
67
79
  const isDisabled = !!workspaceError || status === 'rejected' || status === 'loading' || status === 'empty' || !!workspaceError || assetsClientLoading || !aql || !schemaId;
68
80
  const retrieveUrlForSmartCardRender = useCallback(() => {
69
81
  var _data$key, _data$key$data;
@@ -107,11 +119,22 @@ export const AssetsConfigModal = props => {
107
119
  });
108
120
  }
109
121
  }, [aql, schemaId, workspaceId, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
110
- const handleOnSearch = useCallback((aql, schemaId) => {
111
- reset();
112
- setAql(aql);
113
- setSchemaId(schemaId);
114
- }, [reset]);
122
+ const handleOnSearch = useCallback((searchAql, searchSchemaId) => {
123
+ if (schemaId !== searchSchemaId) {
124
+ reset({
125
+ shouldResetColumns: true
126
+ });
127
+ setAql(searchAql);
128
+ setSchemaId(searchSchemaId);
129
+ setIsNewSearch(true);
130
+ loadDatasourceDetails();
131
+ }
132
+ if (aql !== searchAql) {
133
+ reset();
134
+ setAql(searchAql);
135
+ setSchemaId(searchSchemaId);
136
+ }
137
+ }, [aql, loadDatasourceDetails, reset, schemaId]);
115
138
  const renderModalTitleContent = useCallback(() => {
116
139
  if (workspaceError) {
117
140
  return undefined;
@@ -47,7 +47,9 @@ export const DatasourceTableView = ({
47
47
  }
48
48
  }, [visibleColumnKeys, defaultVisibleColumnKeys, onVisibleColumnKeysChange]);
49
49
  const forcedReset = useCallback(() => {
50
- reset(true);
50
+ reset({
51
+ shouldForceRequest: true
52
+ });
51
53
  }, [reset]);
52
54
  if (status === 'resolved' && !responseItems.length) {
53
55
  return jsx(NoResults, {
@@ -41,6 +41,7 @@ export const fallbackRenderType = item => {
41
41
  return /*#__PURE__*/React.createElement(StatusRenderType, item.value);
42
42
  case 'string':
43
43
  return /*#__PURE__*/React.createElement(StringRenderType, {
44
+ key: item.value,
44
45
  text: item.value
45
46
  });
46
47
  case 'tag':
@@ -42,6 +42,6 @@ const LinkRenderType = ({
42
42
  if (!url) {
43
43
  return null;
44
44
  }
45
- return text ? anchor : /*#__PURE__*/React.createElement(SmartCard, null);
45
+ return /*#__PURE__*/React.createElement(React.Fragment, null, text ? anchor : /*#__PURE__*/React.createElement(SmartCard, null), /*#__PURE__*/React.createElement("br", null));
46
46
  };
47
47
  export default /*#__PURE__*/React.memo(LinkRenderType);
@@ -112,11 +112,15 @@ export const PlainJiraIssuesConfigModal = props => {
112
112
  }, [cloudId, selectedJiraSite]);
113
113
  const onSearch = useCallback(newParameters => {
114
114
  setJql(newParameters.jql);
115
- reset(true);
115
+ reset({
116
+ shouldForceRequest: true
117
+ });
116
118
  }, [reset]);
117
119
  const onSiteSelection = useCallback(site => {
118
120
  setCloudId(site.cloudId);
119
- reset(true);
121
+ reset({
122
+ shouldForceRequest: true
123
+ });
120
124
  }, [reset]);
121
125
  const retrieveUrlForSmartCardRender = useCallback(() => {
122
126
  var _data$key, _data$key$data;
@@ -290,7 +294,7 @@ const analyticsContextAttributes = {
290
294
  };
291
295
  const analyticsContextData = {
292
296
  packageName: "@atlaskit/link-datasource",
293
- packageVersion: "1.0.8",
297
+ packageVersion: "1.0.10",
294
298
  source: 'datasourceConfigModal'
295
299
  };
296
300
  const contextData = {
@@ -196,15 +196,17 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
196
196
  }
197
197
  }, _callee2, null, [[8, 30]]);
198
198
  })), [parameters, fieldKeys, getDatasourceData, datasourceId, nextCursor, applySchemaProperties]);
199
- var reset = useCallback(function () {
200
- var shouldForceRequest = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
199
+ var reset = useCallback(function (options) {
201
200
  setStatus('empty');
202
201
  setResponseItems([]);
203
202
  setHasNextPage(true);
204
203
  setNextCursor(undefined);
205
204
  setTotalCount(undefined);
206
205
  setLastRequestedFieldKeys([]);
207
- setShouldForceRequest(shouldForceRequest);
206
+ setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
207
+ if (options !== null && options !== void 0 && options.shouldResetColumns) {
208
+ setColumns([]);
209
+ }
208
210
  }, []);
209
211
 
210
212
  // this takes care of requesting /data initally
@@ -37,6 +37,10 @@ export var AssetsConfigModal = function AssetsConfigModal(props) {
37
37
  _useState6 = _slicedToArray(_useState5, 2),
38
38
  visibleColumnKeys = _useState6[0],
39
39
  setVisibleColumnKeys = _useState6[1];
40
+ var _useState7 = useState(false),
41
+ _useState8 = _slicedToArray(_useState7, 2),
42
+ isNewSearch = _useState8[0],
43
+ setIsNewSearch = _useState8[1];
40
44
 
41
45
  // If a workspaceError occurs this is a critical error
42
46
  var _useAssetsClient = useAssetsClient(initialParameters),
@@ -55,7 +59,7 @@ export var AssetsConfigModal = function AssetsConfigModal(props) {
55
59
  var _useDatasourceTableSt = useDatasourceTableState({
56
60
  datasourceId: datasourceId,
57
61
  parameters: isParametersSet ? parameters : undefined,
58
- fieldKeys: visibleColumnKeys
62
+ fieldKeys: isNewSearch ? [] : visibleColumnKeys
59
63
  }),
60
64
  status = _useDatasourceTableSt.status,
61
65
  onNextPage = _useDatasourceTableSt.onNextPage,
@@ -67,16 +71,28 @@ export var AssetsConfigModal = function AssetsConfigModal(props) {
67
71
  defaultVisibleColumnKeys = _useDatasourceTableSt.defaultVisibleColumnKeys;
68
72
  var onVisibleColumnKeysChange = useCallback(function (visibleColumnKeys) {
69
73
  setVisibleColumnKeys(visibleColumnKeys);
74
+ setIsNewSearch(false);
70
75
  }, []);
71
76
  useEffect(function () {
72
77
  var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
73
78
  setVisibleColumnKeys(newVisibleColumnKeys);
74
79
  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
80
+ useEffect(function () {
81
+ var _responseItems = _slicedToArray(responseItems, 1),
82
+ data = _responseItems[0];
83
+ if (data && isNewSearch) {
84
+ setVisibleColumnKeys(Object.keys(data));
85
+ } else if (data && (visibleColumnKeys || []).length) {
86
+ setVisibleColumnKeys(visibleColumnKeys);
87
+ }
88
+ // Purposely not included 'visibleColumnKeys' as a dependency to prevent infinite loop
89
+ // eslint-disable-next-line react-hooks/exhaustive-deps
90
+ }, [responseItems, isNewSearch]);
75
91
  var isDisabled = !!workspaceError || status === 'rejected' || status === 'loading' || status === 'empty' || !!workspaceError || assetsClientLoading || !aql || !schemaId;
76
92
  var retrieveUrlForSmartCardRender = useCallback(function () {
77
93
  var _data$key, _data$key$data;
78
- var _responseItems = _slicedToArray(responseItems, 1),
79
- data = _responseItems[0];
94
+ var _responseItems2 = _slicedToArray(responseItems, 1),
95
+ data = _responseItems2[0];
80
96
  // agreement with BE that we will use `key` for rendering smartlink
81
97
  return data === null || data === void 0 ? void 0 : (_data$key = data.key) === null || _data$key === void 0 ? void 0 : (_data$key$data = _data$key.data) === null || _data$key$data === void 0 ? void 0 : _data$key$data.url;
82
98
  }, [responseItems]);
@@ -118,11 +134,22 @@ export var AssetsConfigModal = function AssetsConfigModal(props) {
118
134
  });
119
135
  }
120
136
  }, [aql, schemaId, workspaceId, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
121
- var handleOnSearch = useCallback(function (aql, schemaId) {
122
- reset();
123
- setAql(aql);
124
- setSchemaId(schemaId);
125
- }, [reset]);
137
+ var handleOnSearch = useCallback(function (searchAql, searchSchemaId) {
138
+ if (schemaId !== searchSchemaId) {
139
+ reset({
140
+ shouldResetColumns: true
141
+ });
142
+ setAql(searchAql);
143
+ setSchemaId(searchSchemaId);
144
+ setIsNewSearch(true);
145
+ loadDatasourceDetails();
146
+ }
147
+ if (aql !== searchAql) {
148
+ reset();
149
+ setAql(searchAql);
150
+ setSchemaId(searchSchemaId);
151
+ }
152
+ }, [aql, loadDatasourceDetails, reset, schemaId]);
126
153
  var renderModalTitleContent = useCallback(function () {
127
154
  if (workspaceError) {
128
155
  return undefined;
@@ -45,7 +45,9 @@ export var DatasourceTableView = function DatasourceTableView(_ref) {
45
45
  }
46
46
  }, [visibleColumnKeys, defaultVisibleColumnKeys, onVisibleColumnKeysChange]);
47
47
  var forcedReset = useCallback(function () {
48
- reset(true);
48
+ reset({
49
+ shouldForceRequest: true
50
+ });
49
51
  }, [reset]);
50
52
  if (status === 'resolved' && !responseItems.length) {
51
53
  return jsx(NoResults, {
@@ -41,6 +41,7 @@ export var fallbackRenderType = function fallbackRenderType(item) {
41
41
  return /*#__PURE__*/React.createElement(StatusRenderType, item.value);
42
42
  case 'string':
43
43
  return /*#__PURE__*/React.createElement(StringRenderType, {
44
+ key: item.value,
44
45
  text: item.value
45
46
  });
46
47
  case 'tag':
@@ -49,6 +49,6 @@ var LinkRenderType = function LinkRenderType(_ref) {
49
49
  if (!url) {
50
50
  return null;
51
51
  }
52
- return text ? anchor : /*#__PURE__*/React.createElement(SmartCard, null);
52
+ return /*#__PURE__*/React.createElement(React.Fragment, null, text ? anchor : /*#__PURE__*/React.createElement(SmartCard, null), /*#__PURE__*/React.createElement("br", null));
53
53
  };
54
54
  export default /*#__PURE__*/React.memo(LinkRenderType);
@@ -151,11 +151,15 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
151
151
  }, [cloudId, selectedJiraSite]);
152
152
  var onSearch = useCallback(function (newParameters) {
153
153
  setJql(newParameters.jql);
154
- reset(true);
154
+ reset({
155
+ shouldForceRequest: true
156
+ });
155
157
  }, [reset]);
156
158
  var onSiteSelection = useCallback(function (site) {
157
159
  setCloudId(site.cloudId);
158
- reset(true);
160
+ reset({
161
+ shouldForceRequest: true
162
+ });
159
163
  }, [reset]);
160
164
  var retrieveUrlForSmartCardRender = useCallback(function () {
161
165
  var _data$key, _data$key$data;
@@ -334,7 +338,7 @@ var analyticsContextAttributes = {
334
338
  };
335
339
  var analyticsContextData = {
336
340
  packageName: "@atlaskit/link-datasource",
337
- packageVersion: "1.0.8",
341
+ packageVersion: "1.0.10",
338
342
  source: 'datasourceConfigModal'
339
343
  };
340
344
  var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
@@ -5,10 +5,14 @@ export interface onNextPageProps {
5
5
  shouldForceRequest?: boolean;
6
6
  }
7
7
  export type NextPageType = (requestInfo?: onNextPageProps) => void;
8
+ interface ResetOptions {
9
+ shouldForceRequest?: boolean;
10
+ shouldResetColumns?: boolean;
11
+ }
8
12
  export interface DatasourceTableState {
9
13
  status: DatasourceTableStatusType;
10
14
  onNextPage: NextPageType;
11
- reset: (shouldForceRequest?: boolean) => void;
15
+ reset: (options?: ResetOptions) => void;
12
16
  loadDatasourceDetails: () => void;
13
17
  responseItems: DatasourceDataResponseItem[];
14
18
  hasNextPage: boolean;
@@ -22,3 +26,4 @@ export interface DatasourceTableStateProps {
22
26
  fieldKeys?: string[];
23
27
  }
24
28
  export declare const useDatasourceTableState: ({ datasourceId, parameters, fieldKeys, }: DatasourceTableStateProps) => DatasourceTableState;
29
+ export {};
@@ -5,10 +5,14 @@ export interface onNextPageProps {
5
5
  shouldForceRequest?: boolean;
6
6
  }
7
7
  export type NextPageType = (requestInfo?: onNextPageProps) => void;
8
+ interface ResetOptions {
9
+ shouldForceRequest?: boolean;
10
+ shouldResetColumns?: boolean;
11
+ }
8
12
  export interface DatasourceTableState {
9
13
  status: DatasourceTableStatusType;
10
14
  onNextPage: NextPageType;
11
- reset: (shouldForceRequest?: boolean) => void;
15
+ reset: (options?: ResetOptions) => void;
12
16
  loadDatasourceDetails: () => void;
13
17
  responseItems: DatasourceDataResponseItem[];
14
18
  hasNextPage: boolean;
@@ -22,3 +26,4 @@ export interface DatasourceTableStateProps {
22
26
  fieldKeys?: string[];
23
27
  }
24
28
  export declare const useDatasourceTableState: ({ datasourceId, parameters, fieldKeys, }: DatasourceTableStateProps) => DatasourceTableState;
29
+ export {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/link-datasource",
3
- "version": "1.0.8",
3
+ "version": "1.0.10",
4
4
  "description": "UI Components to support linking platform dataset feature",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -58,7 +58,7 @@
58
58
  "@atlaskit/tag": "^11.5.0",
59
59
  "@atlaskit/textfield": "5.6.5",
60
60
  "@atlaskit/theme": "^12.5.0",
61
- "@atlaskit/tokens": "^1.15.0",
61
+ "@atlaskit/tokens": "^1.17.0",
62
62
  "@atlaskit/tooltip": "^17.8.0",
63
63
  "@atlassianlabs/jql-editor": "^2.0.1",
64
64
  "@babel/runtime": "^7.0.0",