@atlaskit/link-datasource 1.4.1 → 1.4.3

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.
@@ -8,6 +8,6 @@ var EVENT_CHANNEL = 'media';
8
8
  exports.EVENT_CHANNEL = EVENT_CHANNEL;
9
9
  var packageMetaData = {
10
10
  packageName: "@atlaskit/link-datasource",
11
- packageVersion: "1.4.1"
11
+ packageVersion: "1.4.3"
12
12
  };
13
13
  exports.packageMetaData = packageMetaData;
@@ -231,7 +231,7 @@ var analyticsContextAttributes = {
231
231
  };
232
232
  var analyticsContextData = {
233
233
  packageName: "@atlaskit/link-datasource",
234
- packageVersion: "1.4.1",
234
+ packageVersion: "1.4.3",
235
235
  source: 'datasourceConfigModal'
236
236
  };
237
237
  var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
@@ -0,0 +1,15 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.default = void 0;
8
+ var _react = _interopRequireDefault(require("react"));
9
+ var BasicFilterContainer = function BasicFilterContainer() {
10
+ return /*#__PURE__*/_react.default.createElement("div", {
11
+ "data-testid": "jlol-datasource-basic-filter-container"
12
+ });
13
+ };
14
+ var _default = BasicFilterContainer;
15
+ exports.default = _default;
@@ -10,10 +10,12 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
  var _react2 = require("@emotion/react");
12
12
  var _reactIntlNext = require("react-intl-next");
13
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
13
14
  var _analytics = require("../../../analytics");
14
15
  var _basicSearchInput = require("../basic-search-input");
15
16
  var _jqlEditor = require("../jql-editor");
16
17
  var _modeSwitcher = require("../mode-switcher");
18
+ var _basicFilters = _interopRequireDefault(require("./basic-filters"));
17
19
  var _buildJQL = require("./buildJQL");
18
20
  var _messages = require("./messages");
19
21
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -102,14 +104,20 @@ var JiraSearchContainer = function JiraSearchContainer(props) {
102
104
  fireEvent('ui.jqlEditor.searched', {});
103
105
  }
104
106
  };
107
+ var showBasicFilters = (0, _react.useMemo)(function () {
108
+ if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters')) {
109
+ return true;
110
+ }
111
+ return false;
112
+ }, []);
105
113
  return (0, _react2.jsx)("div", {
106
114
  css: inputContainerStyles
107
- }, currentSearchMethod === 'basic' && (0, _react2.jsx)(_basicSearchInput.BasicSearchInput, {
115
+ }, currentSearchMethod === 'basic' && (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_basicSearchInput.BasicSearchInput, {
108
116
  isSearching: isSearching,
109
117
  onChange: handleBasicSearchChange,
110
118
  onSearch: handleSearch,
111
119
  searchTerm: basicSearchTerm
112
- }), currentSearchMethod === 'jql' && (0, _react2.jsx)(_jqlEditor.JiraJQLEditor, {
120
+ }), showBasicFilters && (0, _react2.jsx)(_basicFilters.default, null)), currentSearchMethod === 'jql' && (0, _react2.jsx)(_jqlEditor.JiraJQLEditor, {
113
121
  cloudId: cloudId || '',
114
122
  isSearching: isSearching,
115
123
  onChange: onQueryChange,
@@ -174,7 +174,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
174
174
  }, [destinationObjectTypes, extensionKey]);
175
175
  var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
176
176
  var jqlUrl = selectedJiraSite && jql && "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURI(jql));
177
- var isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading' || resolvedWithNoResults;
177
+ var isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
178
178
  var shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'issue';
179
179
  var isDataReady = (visibleColumnKeys || []).length > 0;
180
180
  (0, _react.useEffect)(function () {
@@ -1,5 +1,5 @@
1
1
  export const EVENT_CHANNEL = 'media';
2
2
  export const packageMetaData = {
3
3
  packageName: "@atlaskit/link-datasource",
4
- packageVersion: "1.4.1"
4
+ packageVersion: "1.4.3"
5
5
  };
@@ -205,7 +205,7 @@ const analyticsContextAttributes = {
205
205
  };
206
206
  const analyticsContextData = {
207
207
  packageName: "@atlaskit/link-datasource",
208
- packageVersion: "1.4.1",
208
+ packageVersion: "1.4.3",
209
209
  source: 'datasourceConfigModal'
210
210
  };
211
211
  const contextData = {
@@ -0,0 +1,7 @@
1
+ import React from 'react';
2
+ const BasicFilterContainer = () => {
3
+ return /*#__PURE__*/React.createElement("div", {
4
+ "data-testid": "jlol-datasource-basic-filter-container"
5
+ });
6
+ };
7
+ export default BasicFilterContainer;
@@ -1,11 +1,13 @@
1
1
  /** @jsx jsx */
2
- import React, { useState } from 'react';
2
+ import React, { useMemo, useState } from 'react';
3
3
  import { css, jsx } from '@emotion/react';
4
4
  import { useIntl } from 'react-intl-next';
5
+ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
5
6
  import { useDatasourceAnalyticsEvents } from '../../../analytics';
6
7
  import { BasicSearchInput } from '../basic-search-input';
7
8
  import { JiraJQLEditor } from '../jql-editor';
8
9
  import { ModeSwitcher } from '../mode-switcher';
10
+ import BasicFilterContainer from './basic-filters';
9
11
  import { buildJQL } from './buildJQL';
10
12
  import { modeSwitcherMessages } from './messages';
11
13
  const inputContainerStyles = css({
@@ -77,14 +79,20 @@ export const JiraSearchContainer = props => {
77
79
  fireEvent('ui.jqlEditor.searched', {});
78
80
  }
79
81
  };
82
+ const showBasicFilters = useMemo(() => {
83
+ if (getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters')) {
84
+ return true;
85
+ }
86
+ return false;
87
+ }, []);
80
88
  return jsx("div", {
81
89
  css: inputContainerStyles
82
- }, currentSearchMethod === 'basic' && jsx(BasicSearchInput, {
90
+ }, currentSearchMethod === 'basic' && jsx(React.Fragment, null, jsx(BasicSearchInput, {
83
91
  isSearching: isSearching,
84
92
  onChange: handleBasicSearchChange,
85
93
  onSearch: handleSearch,
86
94
  searchTerm: basicSearchTerm
87
- }), currentSearchMethod === 'jql' && jsx(JiraJQLEditor, {
95
+ }), showBasicFilters && jsx(BasicFilterContainer, null)), currentSearchMethod === 'jql' && jsx(JiraJQLEditor, {
88
96
  cloudId: cloudId || '',
89
97
  isSearching: isSearching,
90
98
  onChange: onQueryChange,
@@ -142,7 +142,7 @@ export const PlainJiraIssuesConfigModal = props => {
142
142
  }, [destinationObjectTypes, extensionKey]);
143
143
  const resolvedWithNoResults = status === 'resolved' && !responseItems.length;
144
144
  const jqlUrl = selectedJiraSite && jql && `${selectedJiraSite.url}/issues/?jql=${encodeURI(jql)}`;
145
- const isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading' || resolvedWithNoResults;
145
+ const isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
146
146
  const shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'issue';
147
147
  const isDataReady = (visibleColumnKeys || []).length > 0;
148
148
  useEffect(() => {
@@ -1,5 +1,5 @@
1
1
  export var EVENT_CHANNEL = 'media';
2
2
  export var packageMetaData = {
3
3
  packageName: "@atlaskit/link-datasource",
4
- packageVersion: "1.4.1"
4
+ packageVersion: "1.4.3"
5
5
  };
@@ -222,7 +222,7 @@ var analyticsContextAttributes = {
222
222
  };
223
223
  var analyticsContextData = {
224
224
  packageName: "@atlaskit/link-datasource",
225
- packageVersion: "1.4.1",
225
+ packageVersion: "1.4.3",
226
226
  source: 'datasourceConfigModal'
227
227
  };
228
228
  var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
@@ -0,0 +1,7 @@
1
+ import React from 'react';
2
+ var BasicFilterContainer = function BasicFilterContainer() {
3
+ return /*#__PURE__*/React.createElement("div", {
4
+ "data-testid": "jlol-datasource-basic-filter-container"
5
+ });
6
+ };
7
+ export default BasicFilterContainer;
@@ -1,12 +1,14 @@
1
1
  import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
2
2
  /** @jsx jsx */
3
- import React, { useState } from 'react';
3
+ import React, { useMemo, useState } from 'react';
4
4
  import { css, jsx } from '@emotion/react';
5
5
  import { useIntl } from 'react-intl-next';
6
+ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
6
7
  import { useDatasourceAnalyticsEvents } from '../../../analytics';
7
8
  import { BasicSearchInput } from '../basic-search-input';
8
9
  import { JiraJQLEditor } from '../jql-editor';
9
10
  import { ModeSwitcher } from '../mode-switcher';
11
+ import BasicFilterContainer from './basic-filters';
10
12
  import { buildJQL } from './buildJQL';
11
13
  import { modeSwitcherMessages } from './messages';
12
14
  var inputContainerStyles = css({
@@ -90,14 +92,20 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
90
92
  fireEvent('ui.jqlEditor.searched', {});
91
93
  }
92
94
  };
95
+ var showBasicFilters = useMemo(function () {
96
+ if (getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters')) {
97
+ return true;
98
+ }
99
+ return false;
100
+ }, []);
93
101
  return jsx("div", {
94
102
  css: inputContainerStyles
95
- }, currentSearchMethod === 'basic' && jsx(BasicSearchInput, {
103
+ }, currentSearchMethod === 'basic' && jsx(React.Fragment, null, jsx(BasicSearchInput, {
96
104
  isSearching: isSearching,
97
105
  onChange: handleBasicSearchChange,
98
106
  onSearch: handleSearch,
99
107
  searchTerm: basicSearchTerm
100
- }), currentSearchMethod === 'jql' && jsx(JiraJQLEditor, {
108
+ }), showBasicFilters && jsx(BasicFilterContainer, null)), currentSearchMethod === 'jql' && jsx(JiraJQLEditor, {
101
109
  cloudId: cloudId || '',
102
110
  isSearching: isSearching,
103
111
  onChange: onQueryChange,
@@ -164,7 +164,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
164
164
  }, [destinationObjectTypes, extensionKey]);
165
165
  var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
166
166
  var jqlUrl = selectedJiraSite && jql && "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURI(jql));
167
- var isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading' || resolvedWithNoResults;
167
+ var isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
168
168
  var shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'issue';
169
169
  var isDataReady = (visibleColumnKeys || []).length > 0;
170
170
  useEffect(function () {
@@ -0,0 +1,3 @@
1
+ /// <reference types="react" />
2
+ declare const BasicFilterContainer: () => JSX.Element;
3
+ export default BasicFilterContainer;
@@ -0,0 +1,3 @@
1
+ /// <reference types="react" />
2
+ declare const BasicFilterContainer: () => JSX.Element;
3
+ export default BasicFilterContainer;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/link-datasource",
3
- "version": "1.4.1",
3
+ "version": "1.4.3",
4
4
  "description": "UI Components to support linking platform dataset feature",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -45,15 +45,16 @@
45
45
  "@atlaskit/jql-editor-autocomplete-rest": "^2.0.0",
46
46
  "@atlaskit/link-client-extension": "^1.7.0",
47
47
  "@atlaskit/linking-common": "^4.10.0",
48
- "@atlaskit/linking-types": "^8.3.0",
48
+ "@atlaskit/linking-types": "^8.4.0",
49
49
  "@atlaskit/lozenge": "^11.4.0",
50
50
  "@atlaskit/modal-dialog": "^12.7.0",
51
+ "@atlaskit/platform-feature-flags": "^0.2.4",
51
52
  "@atlaskit/pragmatic-drag-and-drop": "^0.23.0",
52
53
  "@atlaskit/pragmatic-drag-and-drop-hitbox": "^0.11.0",
53
54
  "@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^0.6.0",
54
55
  "@atlaskit/pragmatic-drag-and-drop-react-indicator": "^0.16.0",
55
56
  "@atlaskit/select": "^16.7.0",
56
- "@atlaskit/smart-card": "^26.28.0",
57
+ "@atlaskit/smart-card": "^26.29.0",
57
58
  "@atlaskit/spinner": "^15.6.0",
58
59
  "@atlaskit/tag": "^11.6.0",
59
60
  "@atlaskit/textfield": "5.6.7",
@@ -83,6 +84,7 @@
83
84
  "@atlaskit/ssr": "*",
84
85
  "@atlaskit/visual-regression": "*",
85
86
  "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0",
87
+ "@atlassian/feature-flags-test-utils": "^0.1.2",
86
88
  "@faker-js/faker": "^7.5.0",
87
89
  "@testing-library/dom": "^8.17.1",
88
90
  "@testing-library/react": "^12.1.5",
@@ -127,5 +129,10 @@
127
129
  "af:exports": {
128
130
  ".": "./src/index.ts"
129
131
  },
130
- "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0"
132
+ "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0",
133
+ "platform-feature-flags": {
134
+ "platform.linking-platform.datasource.show-jlol-basic-filters": {
135
+ "type": "boolean"
136
+ }
137
+ }
131
138
  }