@atlaskit/link-datasource 1.19.9 → 1.19.10

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/link-datasource
 
+## 1.19.10
+
+### Patch Changes
+
+- [#56769](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/56769) [`dccc142da2de`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/dccc142da2de) - Changing cloud ids with site selector resets previous JiraIssuesModal table results, basic search filters, and jql to default.
+- [#57035](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/57035) [`63ab16a4d4a7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/63ab16a4d4a7) - Update config modal logic to open in basic mode if the query is not complex.
+
 ## 1.19.9
 
 ### Patch Changes

package/dist/cjs/analytics/constants.js

@@ -7,5 +7,5 @@ exports.packageMetaData = exports.EVENT_CHANNEL = void 0;
 var EVENT_CHANNEL = exports.EVENT_CHANNEL = 'media';
 var packageMetaData = exports.packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.9"
+  packageVersion: "1.19.10"
 };

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js

@@ -41,8 +41,6 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     isJQLHydrating = _ref.isJQLHydrating,
     _ref$onSelectionChang = _ref.onSelectionChange,
     onSelectionChange = _ref$onSelectionChang === void 0 ? function () {} : _ref$onSelectionChang,
-    _ref$onReset = _ref.onReset,
-    resetSelection = _ref$onReset === void 0 ? function () {} : _ref$onReset,
     _ref$isDisabled = _ref.isDisabled,
     isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
@@ -192,9 +190,8 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       setSortedOptions([]);
       setSearchTerm('');
       resetHook();
-      resetSelection();
     }
-  }, [cloudId, resetHook, resetSelection]);
+  }, [cloudId, resetHook]);
   (0, _react.useEffect)(function () {
     if (!(0, _isEqual.default)(selection, selectedOptions)) {
       setSelectedOptions(selection);

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/index.js

@@ -16,7 +16,6 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
   var cloudId = _ref.cloudId,
     onChange = _ref.onChange,
     selections = _ref.selections,
-    onReset = _ref.onReset,
     isJQLHydrating = _ref.isJQLHydrating;
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     xcss: basicFilterContainerStyles,
@@ -30,8 +29,7 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
       selection: selections[filter] || [],
       isJQLHydrating: isJQLHydrating,
       isDisabled: !cloudId,
-      onSelectionChange: onChange,
-      onReset: onReset
+      onSelectionChange: onChange
     });
   }));
 };

package/dist/cjs/ui/jira-issues-modal/jira-search-container/index.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.JiraSearchContainer = exports.ALLOWED_ORDER_BY_KEYS = void 0;
+exports.JiraSearchContainer = exports.DEFAULT_JQL_QUERY = exports.ALLOWED_ORDER_BY_KEYS = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -39,7 +39,7 @@ var inputContainerStyles = (0, _react2.css)({
 var basicSearchInputContainerStyles = (0, _primitives.xcss)({
   flexGrow: 1
 });
-var DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
+var DEFAULT_JQL_QUERY = exports.DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
 var ALLOWED_ORDER_BY_KEYS = exports.ALLOWED_ORDER_BY_KEYS = ['key', 'summary', 'assignee', 'status', 'created'];
 var JiraSearchMethodSwitcher = _modeSwitcher.ModeSwitcher;
 var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchContainer(props) {
@@ -49,7 +49,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     onSearchMethodChangeCallback = props.onSearchMethodChange,
     initialSearchMethod = props.initialSearchMethod;
   var _ref = parameters || {},
-    cloudId = _ref.cloudId,
+    currentCloudId = _ref.cloudId,
     initialJql = _ref.jql;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
@@ -67,22 +67,26 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     jql = _useState6[0],
     setJql = _useState6[1];
-  var _useState7 = (0, _react.useState)(false),
+  var _useState7 = (0, _react.useState)(currentCloudId),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    isComplexQuery = _useState8[0],
-    setIsComplexQuery = _useState8[1];
-  var _useState9 = (0, _react.useState)(),
+    cloudId = _useState8[0],
+    setCloudId = _useState8[1];
+  var _useState9 = (0, _react.useState)(false),
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-    orderKey = _useState10[0],
-    setOrderKey = _useState10[1];
+    isComplexQuery = _useState10[0],
+    setIsComplexQuery = _useState10[1];
   var _useState11 = (0, _react.useState)(),
     _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-    orderDirection = _useState12[0],
-    setOrderDirection = _useState12[1];
-  var _useState13 = (0, _react.useState)({}),
+    orderKey = _useState12[0],
+    setOrderKey = _useState12[1];
+  var _useState13 = (0, _react.useState)(),
     _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-    filterSelections = _useState14[0],
-    setFilterSelections = _useState14[1];
+    orderDirection = _useState14[0],
+    setOrderDirection = _useState14[1];
+  var _useState15 = (0, _react.useState)({}),
+    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
+    filterSelections = _useState16[0],
+    setFilterSelections = _useState16[1];
   var showBasicFilters = (0, _react.useMemo)(function () {
     if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters')) {
       return true;
@@ -191,11 +195,17 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     setFilterSelections(updatedSelection);
     handleBasicFilterSelectionChange(updatedSelection);
   }, [handleBasicFilterSelectionChange, filterSelections]);
-  var handleBasicFiltersReset = (0, _react.useCallback)(function () {
-    if (Object.keys(filterSelections).length > 0) {
+  (0, _react.useEffect)(function () {
+    if (currentCloudId !== cloudId) {
+      setBasicSearchTerm('');
+      setJql(DEFAULT_JQL_QUERY);
+      setIsComplexQuery(false);
+      setOrderKey(undefined);
+      setOrderDirection(undefined);
       setFilterSelections({});
+      setCloudId(currentCloudId);
     }
-  }, [filterSelections]);
+  }, [currentCloudId, cloudId]);
   return (0, _react2.jsx)("div", {
     css: inputContainerStyles,
     "data-testid": "jira-search-container"
@@ -211,7 +221,6 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     cloudId: cloudId || '',
     onChange: handleSelectionChange,
     selections: filterSelections,
-    onReset: handleBasicFiltersReset,
     isJQLHydrating: basicFilterHydrationStatus === 'loading'
   })), currentSearchMethod === 'jql' && (0, _react2.jsx)(_jqlEditor.JiraJQLEditor, {
     cloudId: cloudId || '',

package/dist/cjs/ui/jira-issues-modal/modal/index.js

@@ -19,6 +19,7 @@ var _uuid = require("uuid");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
 var _colors = require("@atlaskit/theme/colors");
 var _analytics = require("../../../analytics");
@@ -37,6 +38,7 @@ var _noResults = require("../../common/error-state/no-results");
 var _issueLikeTable = require("../../issue-like-table");
 var _link = _interopRequireDefault(require("../../issue-like-table/render-type/link"));
 var _ui = require("../basic-filters/ui");
+var _isQueryTooComplex = require("../basic-filters/utils/isQueryTooComplex");
 var _initialStateView = require("../initial-state-view");
 var _jiraSearchContainer = require("../jira-search-container");
 var _modeSwitcher = require("../mode-switcher");
@@ -138,7 +140,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   // analytics related parameters
   var searchCount = (0, _react.useRef)(0);
   var userInteractionActions = (0, _react.useRef)(new Set());
-  var initialSearchMethod = 'jql'; // TODO EDM-7688 This where we can add feature that decides if it's basic or jql based on JQL content (Regexp)
+  var initialSearchMethod = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters') && !(0, _isQueryTooComplex.isQueryTooComplex)((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
   var _useState11 = (0, _react.useState)(initialSearchMethod),
     _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
     currentSearchMethod = _useState12[0],
@@ -340,6 +342,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   }, [analyticsPayload, onCancel]);
   var onSiteSelection = (0, _react.useCallback)(function (site) {
     userInteractionActions.current.add(_types.DatasourceAction.INSTANCE_UPDATED);
+    setJql('');
     setCloudId(site.cloudId);
     reset({
       shouldForceRequest: true

package/dist/es2019/analytics/constants.js

@@ -1,5 +1,5 @@
 export const EVENT_CHANNEL = 'media';
 export const packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.9"
+  packageVersion: "1.19.10"
 };

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js

@@ -22,7 +22,6 @@ const AsyncPopupSelect = ({
   selection,
   isJQLHydrating,
   onSelectionChange = () => {},
-  onReset: resetSelection = () => {},
   isDisabled = false
 }) => {
   const {
@@ -143,9 +142,8 @@ const AsyncPopupSelect = ({
       setSortedOptions([]);
       setSearchTerm('');
       resetHook();
-      resetSelection();
     }
-  }, [cloudId, resetHook, resetSelection]);
+  }, [cloudId, resetHook]);
   useEffect(() => {
     if (!isEqual(selection, selectedOptions)) {
       setSelectedOptions(selection);

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/index.js

@@ -9,7 +9,6 @@ const BasicFilterContainer = ({
   cloudId,
   onChange,
   selections,
-  onReset,
   isJQLHydrating
 }) => {
   return /*#__PURE__*/React.createElement(Flex, {
@@ -24,8 +23,7 @@ const BasicFilterContainer = ({
       selection: selections[filter] || [],
       isJQLHydrating: isJQLHydrating,
       isDisabled: !cloudId,
-      onSelectionChange: onChange,
-      onReset: onReset
+      onSelectionChange: onChange
     });
   }));
 };

package/dist/es2019/ui/jira-issues-modal/jira-search-container/index.js

@@ -23,7 +23,7 @@ const inputContainerStyles = css({
 const basicSearchInputContainerStyles = xcss({
   flexGrow: 1
 });
-const DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
+export const DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
 export const ALLOWED_ORDER_BY_KEYS = ['key', 'summary', 'assignee', 'status', 'created'];
 const JiraSearchMethodSwitcher = ModeSwitcher;
 export const JiraSearchContainer = props => {
@@ -35,7 +35,7 @@ export const JiraSearchContainer = props => {
     initialSearchMethod
   } = props;
   const {
-    cloudId,
+    cloudId: currentCloudId,
     jql: initialJql
   } = parameters || {};
   const {
@@ -47,6 +47,7 @@ export const JiraSearchContainer = props => {
   const [basicSearchTerm, setBasicSearchTerm] = useState('');
   const [currentSearchMethod, setCurrentSearchMethod] = useState(initialSearchMethod);
   const [jql, setJql] = useState(initialJql || DEFAULT_JQL_QUERY);
+  const [cloudId, setCloudId] = useState(currentCloudId);
   const [isComplexQuery, setIsComplexQuery] = useState(false);
   const [orderKey, setOrderKey] = useState();
   const [orderDirection, setOrderDirection] = useState();
@@ -161,11 +162,17 @@ export const JiraSearchContainer = props => {
     setFilterSelections(updatedSelection);
     handleBasicFilterSelectionChange(updatedSelection);
   }, [handleBasicFilterSelectionChange, filterSelections]);
-  const handleBasicFiltersReset = useCallback(() => {
-    if (Object.keys(filterSelections).length > 0) {
+  useEffect(() => {
+    if (currentCloudId !== cloudId) {
+      setBasicSearchTerm('');
+      setJql(DEFAULT_JQL_QUERY);
+      setIsComplexQuery(false);
+      setOrderKey(undefined);
+      setOrderDirection(undefined);
       setFilterSelections({});
+      setCloudId(currentCloudId);
     }
-  }, [filterSelections]);
+  }, [currentCloudId, cloudId]);
   return jsx("div", {
     css: inputContainerStyles,
     "data-testid": "jira-search-container"
@@ -181,7 +188,6 @@ export const JiraSearchContainer = props => {
     cloudId: cloudId || '',
     onChange: handleSelectionChange,
     selections: filterSelections,
-    onReset: handleBasicFiltersReset,
     isJQLHydrating: basicFilterHydrationStatus === 'loading'
   })), currentSearchMethod === 'jql' && jsx(JiraJQLEditor, {
     cloudId: cloudId || '',

package/dist/es2019/ui/jira-issues-modal/modal/index.js

@@ -7,6 +7,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import LinkUrl from '@atlaskit/smart-card/link-url';
 import { B400, N0, N40, N800 } from '@atlaskit/theme/colors';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
@@ -25,6 +26,7 @@ import { NoResults } from '../../common/error-state/no-results';
 import { EmptyState, IssueLikeDataTableView, scrollableContainerShadowsCssComponents } from '../../issue-like-table';
 import LinkRenderType from '../../issue-like-table/render-type/link';
 import { availableBasicFilterTypes } from '../basic-filters/ui';
+import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { InitialStateView } from '../initial-state-view';
 import { JiraSearchContainer } from '../jira-search-container';
 import { ModeSwitcher } from '../mode-switcher';
@@ -108,7 +110,7 @@ export const PlainJiraIssuesConfigModal = props => {
   // analytics related parameters
   const searchCount = useRef(0);
   const userInteractionActions = useRef(new Set());
-  const initialSearchMethod = 'jql'; // TODO EDM-7688 This where we can add feature that decides if it's basic or jql based on JQL content (Regexp)
+  const initialSearchMethod = getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters') && !isQueryTooComplex((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
   const [currentSearchMethod, setCurrentSearchMethod] = useState(initialSearchMethod);
   const searchMethodSearchedWith = useRef(null);
   const visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
@@ -290,6 +292,7 @@ export const PlainJiraIssuesConfigModal = props => {
   }, [analyticsPayload, onCancel]);
   const onSiteSelection = useCallback(site => {
     userInteractionActions.current.add(DatasourceAction.INSTANCE_UPDATED);
+    setJql('');
     setCloudId(site.cloudId);
     reset({
       shouldForceRequest: true

package/dist/esm/analytics/constants.js

@@ -1,5 +1,5 @@
 export var EVENT_CHANNEL = 'media';
 export var packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.9"
+  packageVersion: "1.19.10"
 };

package/dist/esm/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js

@@ -31,8 +31,6 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     isJQLHydrating = _ref.isJQLHydrating,
     _ref$onSelectionChang = _ref.onSelectionChange,
     onSelectionChange = _ref$onSelectionChang === void 0 ? function () {} : _ref$onSelectionChang,
-    _ref$onReset = _ref.onReset,
-    resetSelection = _ref$onReset === void 0 ? function () {} : _ref$onReset,
     _ref$isDisabled = _ref.isDisabled,
     isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled;
   var _useIntl = useIntl(),
@@ -182,9 +180,8 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       setSortedOptions([]);
       setSearchTerm('');
       resetHook();
-      resetSelection();
     }
-  }, [cloudId, resetHook, resetSelection]);
+  }, [cloudId, resetHook]);
   useEffect(function () {
     if (!isEqual(selection, selectedOptions)) {
       setSelectedOptions(selection);

package/dist/esm/ui/jira-issues-modal/basic-filters/ui/index.js

@@ -9,7 +9,6 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
   var cloudId = _ref.cloudId,
     onChange = _ref.onChange,
     selections = _ref.selections,
-    onReset = _ref.onReset,
     isJQLHydrating = _ref.isJQLHydrating;
   return /*#__PURE__*/React.createElement(Flex, {
     xcss: basicFilterContainerStyles,
@@ -23,8 +22,7 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
       selection: selections[filter] || [],
       isJQLHydrating: isJQLHydrating,
       isDisabled: !cloudId,
-      onSelectionChange: onChange,
-      onReset: onReset
+      onSelectionChange: onChange
     });
   }));
 };

package/dist/esm/ui/jira-issues-modal/jira-search-container/index.js

@@ -29,7 +29,7 @@ var inputContainerStyles = css({
 var basicSearchInputContainerStyles = xcss({
   flexGrow: 1
 });
-var DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
+export var DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
 export var ALLOWED_ORDER_BY_KEYS = ['key', 'summary', 'assignee', 'status', 'created'];
 var JiraSearchMethodSwitcher = ModeSwitcher;
 export var JiraSearchContainer = function JiraSearchContainer(props) {
@@ -39,7 +39,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     onSearchMethodChangeCallback = props.onSearchMethodChange,
     initialSearchMethod = props.initialSearchMethod;
   var _ref = parameters || {},
-    cloudId = _ref.cloudId,
+    currentCloudId = _ref.cloudId,
     initialJql = _ref.jql;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
@@ -57,22 +57,26 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     jql = _useState6[0],
     setJql = _useState6[1];
-  var _useState7 = useState(false),
+  var _useState7 = useState(currentCloudId),
     _useState8 = _slicedToArray(_useState7, 2),
-    isComplexQuery = _useState8[0],
-    setIsComplexQuery = _useState8[1];
-  var _useState9 = useState(),
+    cloudId = _useState8[0],
+    setCloudId = _useState8[1];
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    orderKey = _useState10[0],
-    setOrderKey = _useState10[1];
+    isComplexQuery = _useState10[0],
+    setIsComplexQuery = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    orderDirection = _useState12[0],
-    setOrderDirection = _useState12[1];
-  var _useState13 = useState({}),
+    orderKey = _useState12[0],
+    setOrderKey = _useState12[1];
+  var _useState13 = useState(),
     _useState14 = _slicedToArray(_useState13, 2),
-    filterSelections = _useState14[0],
-    setFilterSelections = _useState14[1];
+    orderDirection = _useState14[0],
+    setOrderDirection = _useState14[1];
+  var _useState15 = useState({}),
+    _useState16 = _slicedToArray(_useState15, 2),
+    filterSelections = _useState16[0],
+    setFilterSelections = _useState16[1];
   var showBasicFilters = useMemo(function () {
     if (getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters')) {
       return true;
@@ -181,11 +185,17 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     setFilterSelections(updatedSelection);
     handleBasicFilterSelectionChange(updatedSelection);
   }, [handleBasicFilterSelectionChange, filterSelections]);
-  var handleBasicFiltersReset = useCallback(function () {
-    if (Object.keys(filterSelections).length > 0) {
+  useEffect(function () {
+    if (currentCloudId !== cloudId) {
+      setBasicSearchTerm('');
+      setJql(DEFAULT_JQL_QUERY);
+      setIsComplexQuery(false);
+      setOrderKey(undefined);
+      setOrderDirection(undefined);
       setFilterSelections({});
+      setCloudId(currentCloudId);
     }
-  }, [filterSelections]);
+  }, [currentCloudId, cloudId]);
   return jsx("div", {
     css: inputContainerStyles,
     "data-testid": "jira-search-container"
@@ -201,7 +211,6 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     cloudId: cloudId || '',
     onChange: handleSelectionChange,
     selections: filterSelections,
-    onReset: handleBasicFiltersReset,
     isJQLHydrating: basicFilterHydrationStatus === 'loading'
   })), currentSearchMethod === 'jql' && jsx(JiraJQLEditor, {
     cloudId: cloudId || '',

package/dist/esm/ui/jira-issues-modal/modal/index.js

@@ -14,6 +14,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import LinkUrl from '@atlaskit/smart-card/link-url';
 import { B400, N0, N40, N800 } from '@atlaskit/theme/colors';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
@@ -32,6 +33,7 @@ import { NoResults } from '../../common/error-state/no-results';
 import { EmptyState, IssueLikeDataTableView, scrollableContainerShadowsCssComponents } from '../../issue-like-table';
 import LinkRenderType from '../../issue-like-table/render-type/link';
 import { availableBasicFilterTypes } from '../basic-filters/ui';
+import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { InitialStateView } from '../initial-state-view';
 import { JiraSearchContainer } from '../jira-search-container';
 import { ModeSwitcher } from '../mode-switcher';
@@ -129,7 +131,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
   // analytics related parameters
   var searchCount = useRef(0);
   var userInteractionActions = useRef(new Set());
-  var initialSearchMethod = 'jql'; // TODO EDM-7688 This where we can add feature that decides if it's basic or jql based on JQL content (Regexp)
+  var initialSearchMethod = getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters') && !isQueryTooComplex((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
   var _useState11 = useState(initialSearchMethod),
     _useState12 = _slicedToArray(_useState11, 2),
     currentSearchMethod = _useState12[0],
@@ -331,6 +333,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
   }, [analyticsPayload, onCancel]);
   var onSiteSelection = useCallback(function (site) {
     userInteractionActions.current.add(DatasourceAction.INSTANCE_UPDATED);
+    setJql('');
     setCloudId(site.cloudId);
     reset({
       shouldForceRequest: true

package/dist/types/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts

@@ -6,9 +6,8 @@ export interface AsyncPopupSelectProps {
     selection: SelectOption[];
     isJQLHydrating: boolean;
     onSelectionChange?: (filterType: BasicFilterFieldType, options: SelectOption[]) => void;
-    onReset?: () => void;
     isDisabled?: boolean;
 }
 export declare const SEARCH_DEBOUNCE_MS = 350;
-declare const AsyncPopupSelect: ({ filterType, cloudId, selection, isJQLHydrating, onSelectionChange, onReset: resetSelection, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
+declare const AsyncPopupSelect: ({ filterType, cloudId, selection, isJQLHydrating, onSelectionChange, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
 export default AsyncPopupSelect;

package/dist/types/ui/jira-issues-modal/basic-filters/ui/index.d.ts

@@ -5,8 +5,7 @@ export interface BasicFilterContainerProps {
     cloudId: string;
     selections: SelectedOptionsMap;
     onChange: (filterType: BasicFilterFieldType, options: SelectOption[]) => void;
-    onReset: () => void;
     isJQLHydrating: boolean;
 }
-declare const BasicFilterContainer: ({ cloudId, onChange, selections, onReset, isJQLHydrating, }: BasicFilterContainerProps) => JSX.Element;
+declare const BasicFilterContainer: ({ cloudId, onChange, selections, isJQLHydrating, }: BasicFilterContainerProps) => JSX.Element;
 export default BasicFilterContainer;

package/dist/types/ui/jira-issues-modal/jira-search-container/index.d.ts

@@ -2,6 +2,7 @@ import { jsx } from '@emotion/react';
 import type { JiraSearchMethod } from '../../../common/types';
 import { SelectedOptionsMap } from '../basic-filters/types';
 import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery } from '../types';
+export declare const DEFAULT_JQL_QUERY = "created >= -30d order by created DESC";
 export declare const ALLOWED_ORDER_BY_KEYS: string[];
 export interface SearchContainerProps {
     isSearching?: boolean;

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts

@@ -6,9 +6,8 @@ export interface AsyncPopupSelectProps {
     selection: SelectOption[];
     isJQLHydrating: boolean;
     onSelectionChange?: (filterType: BasicFilterFieldType, options: SelectOption[]) => void;
-    onReset?: () => void;
     isDisabled?: boolean;
 }
 export declare const SEARCH_DEBOUNCE_MS = 350;
-declare const AsyncPopupSelect: ({ filterType, cloudId, selection, isJQLHydrating, onSelectionChange, onReset: resetSelection, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
+declare const AsyncPopupSelect: ({ filterType, cloudId, selection, isJQLHydrating, onSelectionChange, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
 export default AsyncPopupSelect;

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/index.d.ts

@@ -5,8 +5,7 @@ export interface BasicFilterContainerProps {
     cloudId: string;
     selections: SelectedOptionsMap;
     onChange: (filterType: BasicFilterFieldType, options: SelectOption[]) => void;
-    onReset: () => void;
     isJQLHydrating: boolean;
 }
-declare const BasicFilterContainer: ({ cloudId, onChange, selections, onReset, isJQLHydrating, }: BasicFilterContainerProps) => JSX.Element;
+declare const BasicFilterContainer: ({ cloudId, onChange, selections, isJQLHydrating, }: BasicFilterContainerProps) => JSX.Element;
 export default BasicFilterContainer;

package/dist/types-ts4.5/ui/jira-issues-modal/jira-search-container/index.d.ts

@@ -2,6 +2,7 @@ import { jsx } from '@emotion/react';
 import type { JiraSearchMethod } from '../../../common/types';
 import { SelectedOptionsMap } from '../basic-filters/types';
 import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery } from '../types';
+export declare const DEFAULT_JQL_QUERY = "created >= -30d order by created DESC";
 export declare const ALLOWED_ORDER_BY_KEYS: string[];
 export interface SearchContainerProps {
     isSearching?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.19.9",
+  "version": "1.19.10",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"