@atlaskit/link-datasource 1.19.8 → 1.19.10

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/menu-list/messages.js

@@ -1,4 +1,5 @@
-export const asyncPopupSelectMessages = {
+import { defineMessages } from 'react-intl-next';
+export const asyncPopupSelectMessages = defineMessages({
   loadingMessage: {
     id: 'linkDataSource.basic-filter.loading-message',
     defaultMessage: 'Loading...',
@@ -14,4 +15,4 @@ export const asyncPopupSelectMessages = {
     defaultMessage: 'Something went wrong',
     description: 'The text for when an error occurs when loading options'
   }
-};
+});

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

@@ -6,9 +6,19 @@ import { isQueryTooComplex } from './isQueryTooComplex';
 // Map of field keys to their respective clauses in the Jast
 
 const getFieldValues = operand => {
+  const mapValuesFromList = value => {
+    if (value.operandType === OPERAND_TYPE_VALUE) {
+      return value.value;
+    }
+    // we only support EMPTY keyword atm, hence making sure if operandType is a KEYWORD, then its an EMPTY keyword
+    if (value.operandType === OPERAND_TYPE_KEYWORD && value.value === OPERAND_EMPTY) {
+      return value.value;
+    }
+    return undefined;
+  };
   switch (operand.operandType) {
     case OPERAND_TYPE_LIST:
-      return operand.values.map(value => value.operandType === OPERAND_TYPE_VALUE && value.value || undefined).filter(value => !!value);
+      return operand.values.map(mapValuesFromList).filter(value => !!value);
     case OPERAND_TYPE_VALUE:
       return operand.value ? [operand.value] : [];
     case OPERAND_TYPE_KEYWORD:

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.8"
+  packageVersion: "1.19.10"
 };

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

@@ -0,0 +1,8 @@
+import { defineMessages } from 'react-intl-next';
+export var filterOptionMessages = defineMessages({
+  assigneeUnassignedFilterOption: {
+    id: 'linkDataSource.basic-filter.dropdown.select.assignee.unassigned',
+    description: 'Text to display for Unassigned assignee filter option.',
+    defaultMessage: 'Unassigned'
+  }
+});

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

@@ -3,11 +3,22 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useCallback, useEffect, useRef, useState } from 'react';
+import { useIntl } from 'react-intl-next';
 import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
 import { mapFieldValuesToFilterOptions, mapFieldValuesToPageCursor, mapFieldValuesToTotalCount } from '../utils/transformers';
+import { filterOptionMessages } from './messages';
+export var getAssigneeUnassignedFilterOption = function getAssigneeUnassignedFilterOption(formatMessage) {
+  return {
+    label: formatMessage(filterOptionMessages.assigneeUnassignedFilterOption),
+    optionType: 'avatarLabel',
+    value: 'empty'
+  };
+};
 export var useFilterOptions = function useFilterOptions(_ref) {
   var filterType = _ref.filterType,
     cloudId = _ref.cloudId;
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     filterOptions = _useState2[0],
@@ -39,6 +50,8 @@ export var useFilterOptions = function useFilterOptions(_ref) {
       isRequestLikeInitialSearch,
       initialResponseData,
       response,
+      mappedResponse,
+      mappedTotalCount,
       _args = arguments;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -77,34 +90,45 @@ export var useFilterOptions = function useFilterOptions(_ref) {
           setErrors(response.errors);
           return _context.abrupt("return");
         case 18:
+          mappedResponse = mapFieldValuesToFilterOptions(response);
+          mappedTotalCount = mapFieldValuesToTotalCount(response);
           if (isNewSearch) {
-            setFilterOptions(mapFieldValuesToFilterOptions(response));
             if (isRequestLikeInitialSearch) {
               /**
                * The initial dataset is used in couple of paths, eg: when a user searches and clears the search text.
                * During these times, we dont want to fetch data again and again, hence a mini cache setup to store and provide the initial dataset
                */
               initialData.current = response;
+
+              /**
+               * For assignee filter option, we want `Unassigned` as an option.
+               * Since `Unassigned/EMPTY` is not returned by the API, we add it manually, but only for the initial list
+               */
+              if (filterType === 'assignee') {
+                mappedResponse.unshift(getAssigneeUnassignedFilterOption(formatMessage));
+                mappedTotalCount += 1;
+              }
             }
+            setFilterOptions(mappedResponse);
           } else {
-            setFilterOptions([].concat(_toConsumableArray(filterOptions), _toConsumableArray(mapFieldValuesToFilterOptions(response))));
+            setFilterOptions([].concat(_toConsumableArray(filterOptions), _toConsumableArray(mappedResponse)));
           }
-          setTotalCount(mapFieldValuesToTotalCount(response));
+          setTotalCount(mappedTotalCount);
           setNextPageCursor(mapFieldValuesToPageCursor(response));
           setStatus('resolved');
-          _context.next = 28;
+          _context.next = 30;
           break;
-        case 24:
-          _context.prev = 24;
+        case 26:
+          _context.prev = 26;
           _context.t1 = _context["catch"](5);
           setStatus('rejected');
           setErrors([_context.t1]);
-        case 28:
+        case 30:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 24]]);
-  })), [cloudId, filterOptions, filterType, getFieldValues]);
+    }, _callee, null, [[5, 26]]);
+  })), [cloudId, filterOptions, filterType, formatMessage, getFieldValues]);
   useEffect(function () {
     if (status !== 'rejected' && errors.length !== 0) {
       setErrors([]);

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

@@ -1,19 +1,27 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+var _excluded = ["assignee"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { useCallback, useEffect, useState } from 'react';
+import { useIntl } from 'react-intl-next';
+import { OPERAND_EMPTY } from '@atlaskit/jql-ast';
 import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
 import { extractValuesFromNonComplexJQL } from '../utils/extractValuesFromNonComplexJQL';
 import { removeFuzzyCharacter } from '../utils/isClauseTooComplex';
 import { mapHydrateResponseData } from '../utils/transformers';
+import { getAssigneeUnassignedFilterOption } from './useFilterOptions';
 export var useHydrateJqlQuery = function useHydrateJqlQuery(cloudId, jql) {
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     hydratedOptions = _useState2[0],
     setHydratedOptions = _useState2[1];
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
   var _useState3 = useState('empty'),
     _useState4 = _slicedToArray(_useState3, 2),
     status = _useState4[0],
@@ -25,7 +33,7 @@ export var useHydrateJqlQuery = function useHydrateJqlQuery(cloudId, jql) {
   var _useBasicFilterAGG = useBasicFilterAGG(),
     getHydratedJQL = _useBasicFilterAGG.getHydratedJQL;
   var fetchHydratedJqlOptions = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var response, _extractValuesFromNon, text, summary, key, _ref2, _ref3, textFieldValue, mappedValues;
+    var response, _mapHydrateResponseDa, mappedHydratedAssigneeValue, restOfMappedHydratedResponse, _extractValuesFromNon, text, summary, key, extractedAssigneeValue, _ref2, _ref3, textFieldValue, mappedValues;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -43,29 +51,36 @@ export var useHydrateJqlQuery = function useHydrateJqlQuery(cloudId, jql) {
           setErrors(response.errors);
           return _context.abrupt("return");
         case 9:
+          _mapHydrateResponseDa = mapHydrateResponseData(response), mappedHydratedAssigneeValue = _mapHydrateResponseDa.assignee, restOfMappedHydratedResponse = _objectWithoutProperties(_mapHydrateResponseDa, _excluded);
           /**
            * Hydrate logic does not return text field, hence we parse and extract value from jql
            */
-          _extractValuesFromNon = extractValuesFromNonComplexJQL(jql), text = _extractValuesFromNon.text, summary = _extractValuesFromNon.summary, key = _extractValuesFromNon.key;
+          _extractValuesFromNon = extractValuesFromNonComplexJQL(jql), text = _extractValuesFromNon.text, summary = _extractValuesFromNon.summary, key = _extractValuesFromNon.key, extractedAssigneeValue = _extractValuesFromNon.assignee;
           _ref2 = text || summary || key || [], _ref3 = _slicedToArray(_ref2, 1), textFieldValue = _ref3[0];
-          mappedValues = _objectSpread(_objectSpread({}, mapHydrateResponseData(response)), textFieldValue ? {
+          mappedValues = _objectSpread(_objectSpread({}, restOfMappedHydratedResponse), {}, {
+            /**
+             * Special handling for assignee as we need to inject Unassigned value if JQL contains EMPTY keyword for assignee
+             */
+            assignee: [].concat(_toConsumableArray(mappedHydratedAssigneeValue || []), _toConsumableArray(extractedAssigneeValue !== null && extractedAssigneeValue !== void 0 && extractedAssigneeValue.includes(OPERAND_EMPTY) // checks and adds EMPTY filter option if extracted assignee values from jql contains EMPTY
+            ? [getAssigneeUnassignedFilterOption(formatMessage)] : []))
+          }, textFieldValue ? {
             basicInputTextValue: removeFuzzyCharacter(textFieldValue)
           } : {});
           setHydratedOptions(mappedValues);
           setStatus('resolved');
-          _context.next = 20;
+          _context.next = 21;
           break;
-        case 16:
-          _context.prev = 16;
+        case 17:
+          _context.prev = 17;
           _context.t0 = _context["catch"](0);
           setErrors([_context.t0]);
           setStatus('rejected');
-        case 20:
+        case 21:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 16]]);
-  })), [cloudId, getHydratedJQL, jql]);
+    }, _callee, null, [[0, 17]]);
+  })), [cloudId, formatMessage, getHydratedJQL, jql]);
   useEffect(function () {
     if (status !== 'rejected' && errors.length !== 0) {
       setErrors([]);

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/async-popup-select/messages.js

@@ -1,4 +1,5 @@
-export var asyncPopupSelectMessages = {
+import { defineMessages } from 'react-intl-next';
+export var asyncPopupSelectMessages = defineMessages({
   selectPlaceholder: {
     id: 'linkDataSource.basic-filter.dropdown.select.placeholder',
     description: 'Placeholder text to be displayed for the search input box.',
@@ -34,4 +35,4 @@ export var asyncPopupSelectMessages = {
     defaultMessage: 'Show more',
     description: 'The text to show more options in dropdown'
   }
-};
+});

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/basic-filters/ui/menu-list/messages.js

@@ -1,4 +1,5 @@
-export var asyncPopupSelectMessages = {
+import { defineMessages } from 'react-intl-next';
+export var asyncPopupSelectMessages = defineMessages({
   loadingMessage: {
     id: 'linkDataSource.basic-filter.loading-message',
     defaultMessage: 'Loading...',
@@ -14,4 +15,4 @@ export var asyncPopupSelectMessages = {
     defaultMessage: 'Something went wrong',
     description: 'The text for when an error occurs when loading options'
   }
-};
+});

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

@@ -14,11 +14,19 @@ import { isQueryTooComplex } from './isQueryTooComplex';
 // Map of field keys to their respective clauses in the Jast
 
 var getFieldValues = function getFieldValues(operand) {
+  var mapValuesFromList = function mapValuesFromList(value) {
+    if (value.operandType === OPERAND_TYPE_VALUE) {
+      return value.value;
+    }
+    // we only support EMPTY keyword atm, hence making sure if operandType is a KEYWORD, then its an EMPTY keyword
+    if (value.operandType === OPERAND_TYPE_KEYWORD && value.value === OPERAND_EMPTY) {
+      return value.value;
+    }
+    return undefined;
+  };
   switch (operand.operandType) {
     case OPERAND_TYPE_LIST:
-      return operand.values.map(function (value) {
-        return value.operandType === OPERAND_TYPE_VALUE && value.value || undefined;
-      }).filter(function (value) {
+      return operand.values.map(mapValuesFromList).filter(function (value) {
         return !!value;
       });
     case OPERAND_TYPE_VALUE:

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/hooks/messages.d.ts

@@ -0,0 +1,7 @@
+export declare const filterOptionMessages: {
+    assigneeUnassignedFilterOption: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+};

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

@@ -1,4 +1,5 @@
-import { BasicFilterFieldType, SelectOption } from '../types';
+import { IntlShape } from 'react-intl-next';
+import { AvatarLabelOption, BasicFilterFieldType, SelectOption } from '../types';
 interface FilterOptionsProps {
     filterType: BasicFilterFieldType;
     cloudId: string;
@@ -16,5 +17,6 @@ export interface FilterOptionsState {
     status: 'empty' | 'loading' | 'resolved' | 'rejected' | 'loadingMore';
     errors: unknown[];
 }
+export declare const getAssigneeUnassignedFilterOption: (formatMessage: IntlShape['formatMessage']) => AvatarLabelOption;
 export declare const useFilterOptions: ({ filterType, cloudId, }: FilterOptionsProps) => FilterOptionsState;
 export {};

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/hooks/messages.d.ts

@@ -0,0 +1,7 @@
+export declare const filterOptionMessages: {
+    assigneeUnassignedFilterOption: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+};

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

@@ -1,4 +1,5 @@
-import { BasicFilterFieldType, SelectOption } from '../types';
+import { IntlShape } from 'react-intl-next';
+import { AvatarLabelOption, BasicFilterFieldType, SelectOption } from '../types';
 interface FilterOptionsProps {
     filterType: BasicFilterFieldType;
     cloudId: string;
@@ -16,5 +17,6 @@ export interface FilterOptionsState {
     status: 'empty' | 'loading' | 'resolved' | 'rejected' | 'loadingMore';
     errors: unknown[];
 }
+export declare const getAssigneeUnassignedFilterOption: (formatMessage: IntlShape['formatMessage']) => AvatarLabelOption;
 export declare const useFilterOptions: ({ filterType, cloudId, }: FilterOptionsProps) => FilterOptionsState;
 export {};

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.8",
+  "version": "1.19.10",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"