@atlaskit/link-datasource 3.11.0 → 3.11.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/cjs/ui/assets-modal/modal/index.js +9 -19
  3. package/dist/es2019/ui/assets-modal/modal/index.js +5 -17
  4. package/dist/esm/ui/assets-modal/modal/index.js +9 -19
  5. package/package.json +3 -6
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/link-datasource
2
2
 
3
+ ## 3.11.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#166969](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/166969)
8
+ [`ba7fe3ec68dad`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ba7fe3ec68dad) -
9
+ Feature flag removed - platform.linking-platform.datasource-assets_add_version_parameter
10
+
3
11
  ## 3.11.0
4
12
 
5
13
  ### Minor Changes
package/dist/cjs/ui/assets-modal/modal/index.js CHANGED
@@ -15,7 +15,6 @@ var _analyticsNext = require("@atlaskit/analytics-next");
15
15
  var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
16
16
  var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
17
17
  var _modalDialog = require("@atlaskit/modal-dialog");
18
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
19
18
  var _analytics = require("../../../analytics");
20
19
  var _constants = require("../../../analytics/constants");
21
20
  var _types = require("../../../analytics/types");
@@ -67,9 +66,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
67
66
  schemaId = _useState4[0],
68
67
  setSchemaId = _useState4[1];
69
68
  var apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
70
- var _useState5 = (0, _react.useState)(
71
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
72
- (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
69
+ var _useState5 = (0, _react.useState)(apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
73
70
  _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
74
71
  visibleColumnKeys = _useState6[0],
75
72
  setVisibleColumnKeys = _useState6[1];
@@ -124,13 +121,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
124
121
  /* ------------------------------ END PERMISSIONS ------------------------------ */
125
122
 
126
123
  var parameters = (0, _react.useMemo)(function () {
127
- return _objectSpread({
124
+ return {
128
125
  aql: aql || '',
129
126
  schemaId: schemaId || '',
130
- workspaceId: workspaceId || ''
131
- }, (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter') ? {
127
+ workspaceId: workspaceId || '',
132
128
  version: VERSION_TWO
133
- } : {});
129
+ };
134
130
  }, [aql, schemaId, workspaceId]);
135
131
  var isParametersSet = !!(aql && workspaceId && schemaId);
136
132
  var _useDatasourceTableSt = (0, _useDatasourceTableState.useDatasourceTableState)({
@@ -213,13 +209,8 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
213
209
  setIsNewSearch(false);
214
210
  }, []);
215
211
  (0, _react.useEffect)(function () {
216
- if ((0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter')) {
217
- var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
218
- setVisibleColumnKeys(newVisibleColumnKeys);
219
- } else {
220
- var _newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
221
- setVisibleColumnKeys(_newVisibleColumnKeys);
222
- }
212
+ var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
213
+ setVisibleColumnKeys(newVisibleColumnKeys);
223
214
  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys, apiVersion]);
224
215
  (0, _react.useEffect)(function () {
225
216
  if (isNewSearch) {
@@ -268,13 +259,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
268
259
  } else {
269
260
  onInsert((0, _adf.buildDatasourceAdf)({
270
261
  id: datasourceId,
271
- parameters: _objectSpread({
262
+ parameters: {
272
263
  workspaceId: workspaceId,
273
264
  aql: aql,
274
- schemaId: schemaId
275
- }, (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter') ? {
265
+ schemaId: schemaId,
276
266
  version: VERSION_TWO
277
- } : {}),
267
+ },
278
268
  views: [{
279
269
  type: 'table',
280
270
  properties: {
package/dist/es2019/ui/assets-modal/modal/index.js CHANGED
@@ -12,7 +12,6 @@ import { withAnalyticsContext } from '@atlaskit/analytics-next';
12
12
  import Button from '@atlaskit/button/standard-button';
13
13
  import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
14
14
  import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
15
- import { fg } from '@atlaskit/platform-feature-flags';
16
15
  import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
17
16
  import { componentMetadata } from '../../../analytics/constants';
18
17
  import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -55,9 +54,7 @@ const PlainAssetsConfigModal = props => {
55
54
  const [aql, setAql] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql);
56
55
  const [schemaId, setSchemaId] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId);
57
56
  const apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
58
- const [visibleColumnKeys, setVisibleColumnKeys] = useState(
59
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
60
- fg('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys);
57
+ const [visibleColumnKeys, setVisibleColumnKeys] = useState(apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys);
61
58
  const [isNewSearch, setIsNewSearch] = useState(false);
62
59
  const [errorState, setErrorState] = useState();
63
60
  const {
@@ -108,9 +105,7 @@ const PlainAssetsConfigModal = props => {
108
105
  aql: aql || '',
109
106
  schemaId: schemaId || '',
110
107
  workspaceId: workspaceId || '',
111
- ...(fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
112
- version: VERSION_TWO
113
- } : {})
108
+ version: VERSION_TWO
114
109
  }), [aql, schemaId, workspaceId]);
115
110
  const isParametersSet = !!(aql && workspaceId && schemaId);
116
111
  const {
@@ -194,13 +189,8 @@ const PlainAssetsConfigModal = props => {
194
189
  setIsNewSearch(false);
195
190
  }, []);
196
191
  useEffect(() => {
197
- if (fg('platform.linking-platform.datasource-assets_add_version_parameter')) {
198
- const newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
199
- setVisibleColumnKeys(newVisibleColumnKeys);
200
- } else {
201
- const newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
202
- setVisibleColumnKeys(newVisibleColumnKeys);
203
- }
192
+ const newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
193
+ setVisibleColumnKeys(newVisibleColumnKeys);
204
194
  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys, apiVersion]);
205
195
  useEffect(() => {
206
196
  if (isNewSearch) {
@@ -253,9 +243,7 @@ const PlainAssetsConfigModal = props => {
253
243
  workspaceId,
254
244
  aql,
255
245
  schemaId,
256
- ...(fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
257
- version: VERSION_TWO
258
- } : {})
246
+ version: VERSION_TWO
259
247
  },
260
248
  views: [{
261
249
  type: 'table',
package/dist/esm/ui/assets-modal/modal/index.js CHANGED
@@ -16,7 +16,6 @@ import { withAnalyticsContext } from '@atlaskit/analytics-next';
16
16
  import Button from '@atlaskit/button/standard-button';
17
17
  import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
18
18
  import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
19
- import { fg } from '@atlaskit/platform-feature-flags';
20
19
  import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
21
20
  import { componentMetadata } from '../../../analytics/constants';
22
21
  import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -63,9 +62,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
63
62
  schemaId = _useState4[0],
64
63
  setSchemaId = _useState4[1];
65
64
  var apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
66
- var _useState5 = useState(
67
- // eslint-disable-next-line @atlaskit/platform/no-preconditioning
68
- fg('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
65
+ var _useState5 = useState(apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
69
66
  _useState6 = _slicedToArray(_useState5, 2),
70
67
  visibleColumnKeys = _useState6[0],
71
68
  setVisibleColumnKeys = _useState6[1];
@@ -120,13 +117,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
120
117
  /* ------------------------------ END PERMISSIONS ------------------------------ */
121
118
 
122
119
  var parameters = useMemo(function () {
123
- return _objectSpread({
120
+ return {
124
121
  aql: aql || '',
125
122
  schemaId: schemaId || '',
126
- workspaceId: workspaceId || ''
127
- }, fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
123
+ workspaceId: workspaceId || '',
128
124
  version: VERSION_TWO
129
- } : {});
125
+ };
130
126
  }, [aql, schemaId, workspaceId]);
131
127
  var isParametersSet = !!(aql && workspaceId && schemaId);
132
128
  var _useDatasourceTableSt = useDatasourceTableState({
@@ -209,13 +205,8 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
209
205
  setIsNewSearch(false);
210
206
  }, []);
211
207
  useEffect(function () {
212
- if (fg('platform.linking-platform.datasource-assets_add_version_parameter')) {
213
- var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
214
- setVisibleColumnKeys(newVisibleColumnKeys);
215
- } else {
216
- var _newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
217
- setVisibleColumnKeys(_newVisibleColumnKeys);
218
- }
208
+ var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
209
+ setVisibleColumnKeys(newVisibleColumnKeys);
219
210
  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys, apiVersion]);
220
211
  useEffect(function () {
221
212
  if (isNewSearch) {
@@ -264,13 +255,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
264
255
  } else {
265
256
  onInsert(buildDatasourceAdf({
266
257
  id: datasourceId,
267
- parameters: _objectSpread({
258
+ parameters: {
268
259
  workspaceId: workspaceId,
269
260
  aql: aql,
270
- schemaId: schemaId
271
- }, fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
261
+ schemaId: schemaId,
272
262
  version: VERSION_TWO
273
- } : {}),
263
+ },
274
264
  views: [{
275
265
  type: 'table',
276
266
  properties: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/link-datasource",
3
- "version": "3.11.0",
3
+ "version": "3.11.1",
4
4
  "description": "UI Components to support linking platform dataset feature",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -48,7 +48,7 @@
48
48
  "@atlaskit/flag": "^15.8.0",
49
49
  "@atlaskit/form": "^10.5.0",
50
50
  "@atlaskit/heading": "^3.1.0",
51
- "@atlaskit/icon": "^22.24.0",
51
+ "@atlaskit/icon": "^22.25.0",
52
52
  "@atlaskit/icon-object": "^6.7.0",
53
53
  "@atlaskit/image": "^1.3.0",
54
54
  "@atlaskit/inline-edit": "^13.7.0",
@@ -71,7 +71,7 @@
71
71
  "@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^1.2.0",
72
72
  "@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
73
73
  "@atlaskit/primitives": "^13.2.0",
74
- "@atlaskit/react-select": "^1.3.0",
74
+ "@atlaskit/react-select": "^1.4.0",
75
75
  "@atlaskit/select": "^18.5.0",
76
76
  "@atlaskit/smart-card": "^30.3.0",
77
77
  "@atlaskit/smart-user-picker": "6.11.2",
@@ -171,9 +171,6 @@
171
171
  "platform-datasources-enable-two-way-sync-priority": {
172
172
  "type": "boolean"
173
173
  },
174
- "platform.linking-platform.datasource-assets_add_version_parameter": {
175
- "type": "boolean"
176
- },
177
174
  "platform.linking-platform.datasource-assets_update_refresh_button_dt3qk": {
178
175
  "type": "boolean"
179
176
  },