@atlaskit/link-datasource 1.12.3 → 1.13.0

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

@@ -4,7 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mapFieldValuesResponseData = mapFieldValuesResponseData;
+exports.mapFieldValuesToFilterOptions = mapFieldValuesToFilterOptions;
+exports.mapFieldValuesToPageCursor = mapFieldValuesToPageCursor;
+exports.mapFieldValuesToTotalCount = mapFieldValuesToTotalCount;
 exports.mapHydrateResponseData = mapHydrateResponseData;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _types = require("../types");
@@ -38,7 +40,7 @@ function mapNodeToOption(_ref) {
       return _objectSpread(_objectSpread({}, baseProps), {}, {
         optionType: 'avatarLabel',
         avatar: user.picture,
-        isSquare: true
+        isSquare: false
       });
     }
     if (group) {
@@ -88,10 +90,20 @@ function mapHydrateResponseData(_ref2) {
   });
   return transformedHydrateResponseData;
 }
-function mapFieldValuesResponseData(_ref5) {
+function mapFieldValuesToFilterOptions(_ref5) {
   var _data$jira2;
   var data = _ref5.data;
   return (data === null || data === void 0 || (_data$jira2 = data.jira) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.jqlBuilder) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.fieldValues) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.edges) === null || _data$jira2 === void 0 ? void 0 : _data$jira2.map(function (edge) {
     return edge.node ? mapNodeToOption(edge.node) : null;
   }).filter(isNonNullSelectOption)) || [];
+}
+function mapFieldValuesToTotalCount(_ref6) {
+  var _data$jira3;
+  var data = _ref6.data;
+  return (data === null || data === void 0 || (_data$jira3 = data.jira) === null || _data$jira3 === void 0 || (_data$jira3 = _data$jira3.jqlBuilder) === null || _data$jira3 === void 0 || (_data$jira3 = _data$jira3.fieldValues) === null || _data$jira3 === void 0 ? void 0 : _data$jira3.totalCount) || 0;
+}
+function mapFieldValuesToPageCursor(_ref7) {
+  var _data$jira4;
+  var data = _ref7.data;
+  return data === null || data === void 0 || (_data$jira4 = data.jira) === null || _data$jira4 === void 0 || (_data$jira4 = _data$jira4.jqlBuilder) === null || _data$jira4 === void 0 || (_data$jira4 = _data$jira4.fieldValues) === null || _data$jira4 === void 0 || (_data$jira4 = _data$jira4.pageInfo) === null || _data$jira4 === void 0 ? void 0 : _data$jira4.endCursor;
 }

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

@@ -4,11 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.buildJQL = void 0;
+exports.fuzzyCharacter = exports.buildJQL = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jqlAst = require("@atlaskit/jql-ast");
 var fuzzySearchRegExp = /^"(.+)"$/;
 var jiraIssueKeyRegExp = /[A-Z]+-\d+/;
+var fuzzyCharacter = exports.fuzzyCharacter = '*';
 var constructTerminalClause = function constructTerminalClause(field, operator, value) {
   return _jqlAst.creators.terminalClause(_jqlAst.creators.field(field), _jqlAst.creators.operator(operator), _jqlAst.creators.valueOperand(value));
 };
@@ -30,7 +31,7 @@ var buildJQL = exports.buildJQL = function buildJQL(input) {
     return '';
   }
   if (trimmedRawSearch) {
-    var fuzzy = !trimmedRawSearch.match(fuzzySearchRegExp) ? '*' : '';
+    var fuzzy = !trimmedRawSearch.match(fuzzySearchRegExp) ? fuzzyCharacter : '';
     var basicSearch = trimmedRawSearch.replace(/['"?*]+/g, '');
     var text = constructTerminalClause('text', _jqlAst.OPERATOR_LIKE, "".concat(basicSearch).concat(fuzzy));
     var summary = constructTerminalClause('summary', _jqlAst.OPERATOR_LIKE, "".concat(basicSearch).concat(fuzzy));

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 = void 0;
+exports.JiraSearchContainer = exports.ALLOWED_ORDER_BY_KEYS = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
@@ -13,6 +13,7 @@ var _reactIntlNext = require("react-intl-next");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../../../analytics");
 var _basicFilters = require("../basic-filters");
+var _isQueryTooComplex = require("../basic-filters/utils/isQueryTooComplex");
 var _basicSearchInput = require("../basic-search-input");
 var _jqlEditor = require("../jql-editor");
 var _modeSwitcher = require("../mode-switcher");
@@ -29,6 +30,7 @@ var inputContainerStyles = (0, _react2.css)({
   minHeight: '60px'
 });
 var 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) {
   var isSearching = props.isSearching,
@@ -53,14 +55,18 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     jql = _useState6[0],
     setJql = _useState6[1];
-  var _useState7 = (0, _react.useState)(),
+  var _useState7 = (0, _react.useState)(false),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    orderKey = _useState8[0],
-    setOrderKey = _useState8[1];
+    isComplexQuery = _useState8[0],
+    setIsComplexQuery = _useState8[1];
   var _useState9 = (0, _react.useState)(),
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-    orderDirection = _useState10[0],
-    setOrderDirection = _useState10[1];
+    orderKey = _useState10[0],
+    setOrderKey = _useState10[1];
+  var _useState11 = (0, _react.useState)(),
+    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+    orderDirection = _useState12[0],
+    setOrderDirection = _useState12[1];
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var onSearchMethodChange = (0, _react.useCallback)(function (searchMethod) {
@@ -87,7 +93,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     var order = hasOrder ? (_fragments$at3 = fragments.at(-1)) === null || _fragments$at3 === void 0 ? void 0 : _fragments$at3.split(' ').at(-1) : undefined;
 
     // TODO: confirm if these are the only order keys we want to preserve - existing whiteboard logic
-    if (key && ['key', 'summary', 'assignee', 'status'].includes(key)) {
+    if (key && ALLOWED_ORDER_BY_KEYS.includes(key)) {
       setOrderKey(key);
       setOrderDirection(order);
     }
@@ -97,6 +103,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     onSearch({
       jql: jql
     }, currentSearchMethod);
+    setIsComplexQuery((0, _isQueryTooComplex.isQueryTooComplex)(jql));
     if (currentSearchMethod === 'basic') {
       fireEvent('ui.form.submitted.basicSearch', {});
     } else if (currentSearchMethod === 'jql') {
@@ -109,6 +116,10 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     }
     return false;
   }, []);
+  (0, _react.useEffect)(function () {
+    setIsComplexQuery((0, _isQueryTooComplex.isQueryTooComplex)(jql));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   return (0, _react2.jsx)("div", {
     css: inputContainerStyles
   }, currentSearchMethod === 'basic' && (0, _react2.jsx)(_react.default.Fragment, null, (0, _react2.jsx)(_basicSearchInput.BasicSearchInput, {
@@ -117,7 +128,8 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     onSearch: handleSearch,
     searchTerm: basicSearchTerm
   }), showBasicFilters && (0, _react2.jsx)(_basicFilters.BasicFilters, {
-    jql: jql
+    jql: jql,
+    cloudId: cloudId || ''
   })), currentSearchMethod === 'jql' && (0, _react2.jsx)(_jqlEditor.JiraJQLEditor, {
     cloudId: cloudId || '',
     isSearching: isSearching,
@@ -132,7 +144,9 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
       value: 'jql'
     }, {
       label: formatMessage(_messages.modeSwitcherMessages.basicTextSearchLabel),
-      value: 'basic'
+      value: 'basic',
+      disabled: isComplexQuery,
+      tooltipText: isComplexQuery ? formatMessage(_messages.modeSwitcherMessages.basicModeSwitchDisabledTooltipText) : ''
     }]
   }));
 };

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

@@ -10,5 +10,10 @@ var modeSwitcherMessages = exports.modeSwitcherMessages = (0, _reactIntlNext.def
     id: 'linkDataSource.jira-issues.configmodal.basicModeText',
     description: 'Display text for basic text search toggle button',
     defaultMessage: 'Basic'
+  },
+  basicModeSwitchDisabledTooltipText: {
+    id: 'linkDataSource.jira-issues.configmodal.basicModeSwitchDisabledTooltipText',
+    description: 'Display tooltip text when basic mode switch is disabled',
+    defaultMessage: "You can't switch to basic for this query."
   }
 });

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

@@ -5,9 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ModeSwitcher = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _colors = require("@atlaskit/theme/colors");
+var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 /** @jsx jsx */
 
 var modeSwitcherStyles = (0, _react2.css)({
@@ -52,8 +54,12 @@ var modeSwitcherLabelSelectedStyles = (0, _react2.css)({
   }
 });
 var modeSwitcherLabelDisabledStyles = (0, _react2.css)({
+  color: "var(--ds-text-disabled, ".concat(_colors.N60, ")")
+});
+var modeSwitcherDisabledStyles = (0, _react2.css)({
   ':hover': {
-    cursor: 'not-allowed'
+    cursor: 'not-allowed',
+    background: 'transparent'
   }
 });
 var compactModeSwitcherLabelStyles = (0, _react2.css)({
@@ -76,21 +82,27 @@ var ModeSwitcher = exports.ModeSwitcher = function ModeSwitcher(props) {
     disabled: isDisabled
   }, options.map(function (_ref) {
     var value = _ref.value,
-      label = _ref.label;
+      label = _ref.label,
+      isOptionDisabled = _ref.disabled,
+      tooltipText = _ref.tooltipText;
     var isSelected = value === selectedOptionValue;
-    return (0, _react2.jsx)("label", {
-      key: value,
-      css: [modeSwitcherLabelStyles, isCompact && compactModeSwitcherLabelStyles, isSelected && modeSwitcherLabelSelectedStyles, isDisabled && modeSwitcherLabelDisabledStyles],
-      "data-testid": "mode-toggle-".concat(value)
-    }, label, (0, _react2.jsx)("input", {
-      "aria-checked": isSelected,
-      "aria-disabled": isDisabled,
-      checked: isSelected,
-      css: modeInputStyles,
-      disabled: isDisabled,
-      onChange: handleModeChange,
-      type: "radio",
-      value: value
-    }));
+    return (0, _react2.jsx)(_tooltip.default, {
+      content: tooltipText
+    }, function (tooltipProps) {
+      return (0, _react2.jsx)("label", (0, _extends2.default)({}, tooltipProps, {
+        key: value,
+        css: [modeSwitcherLabelStyles, isCompact && compactModeSwitcherLabelStyles, isSelected && modeSwitcherLabelSelectedStyles, isDisabled && modeSwitcherDisabledStyles, isOptionDisabled && [modeSwitcherLabelDisabledStyles, modeSwitcherDisabledStyles]],
+        "data-testid": "mode-toggle-".concat(value)
+      }), label, (0, _react2.jsx)("input", {
+        "aria-checked": isSelected,
+        "aria-disabled": isOptionDisabled,
+        checked: isSelected,
+        css: modeInputStyles,
+        disabled: isOptionDisabled,
+        onChange: handleModeChange,
+        type: "radio",
+        value: value
+      }));
+    });
   })) : null;
 };

package/dist/es2019/analytics/constants.js

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

package/dist/es2019/services/useBasicFilterAGG.js

@@ -1,6 +1,6 @@
 import { useCallback, useMemo } from 'react';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
-import { getBaseUrl } from '@atlaskit/linking-common';
+import { getBaseUrl, request } from '@atlaskit/linking-common';
 import { fieldValuesQuery, hydrateJQLQuery } from './utils';
 const getGraphqlUrl = (envKey, baseUrlOverride) => {
   const baseUrl = baseUrlOverride || getBaseUrl(envKey);
@@ -13,58 +13,35 @@ export const useBasicFilterAGG = () => {
     }
   } = useSmartLinkContext();
   const gatewayGraphqlUrl = getGraphqlUrl(client.envKey, client.baseUrlOverride);
-  const aggHeaders = useMemo(() => {
-    return new Headers({
-      'Content-Type': 'application/json',
-      'X-ExperimentalApi': 'JiraJqlBuilder'
-    });
-  }, []);
-  const getHydratedJQL = useCallback(async (cloudId, jql) => {
-    const body = JSON.stringify({
-      variables: {
-        cloudId,
-        jql
-      },
-      operationName: 'hydrate',
-      query: hydrateJQLQuery
-    });
-    const request = new Request(gatewayGraphqlUrl, {
-      method: 'POST',
-      headers: aggHeaders,
-      body
-    });
-    try {
-      const response = await fetch(request);
-      return response.json();
-    } catch (e) {
-      throw new Error(e);
-    }
-  }, [gatewayGraphqlUrl, aggHeaders]);
-  const getFieldValues = useCallback(async (cloudId, jql, jqlTerm, searchString, pageCursor) => {
-    const body = JSON.stringify({
-      variables: {
-        cloudId,
-        jql,
-        first: 10,
-        jqlTerm,
-        searchString,
-        after: pageCursor
-      },
-      operationName: 'fieldValues',
-      query: fieldValuesQuery
-    });
-    const request = new Request(gatewayGraphqlUrl, {
-      method: 'POST',
-      headers: aggHeaders,
-      body
-    });
-    try {
-      const response = await fetch(request);
-      return await response.json();
-    } catch (e) {
-      throw new Error(e);
-    }
-  }, [gatewayGraphqlUrl, aggHeaders]);
+  const requestCall = useCallback(async body => request('post', gatewayGraphqlUrl, body, {
+    'X-ExperimentalApi': 'JiraJqlBuilder'
+  }, [200, 201, 202, 203, 204]), [gatewayGraphqlUrl]);
+  const getHydratedJQL = useCallback((cloudId, jql) => requestCall({
+    variables: {
+      cloudId,
+      jql
+    },
+    operationName: 'hydrate',
+    query: hydrateJQLQuery
+  }), [requestCall]);
+  const getFieldValues = useCallback(({
+    cloudId,
+    jql = '',
+    jqlTerm,
+    searchString = '',
+    pageCursor
+  }) => requestCall({
+    variables: {
+      cloudId,
+      jql,
+      first: 10,
+      jqlTerm,
+      searchString,
+      after: pageCursor
+    },
+    operationName: 'fieldValues',
+    query: fieldValuesQuery
+  }), [requestCall]);
   return useMemo(() => ({
     getHydratedJQL,
     getFieldValues

package/dist/es2019/services/utils.js

@@ -58,7 +58,7 @@ export const hydrateJQLQuery = `query hydrate($cloudId: ID!, $jql: String!) {
     }
   }
 }`;
-export const fieldValuesQuery = `query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String, $projectOptions: JiraProjectOptions) {
+export const fieldValuesQuery = `query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String) {
   jira {
     jqlBuilder(cloudId: $cloudId) {
       fieldValues(

package/dist/es2019/ui/issue-like-table/draggable-table-heading.js

@@ -13,17 +13,6 @@ import { offsetFromPointer } from '@atlaskit/pragmatic-drag-and-drop/util/offset
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/util/set-custom-native-drag-preview';
 import { TableHeading } from './styled';
 import { COLUMN_MIN_WIDTH } from './index';
-const tableHeadingStatusStyles = {
-  idle: css({
-    ':hover': {
-      background: "var(--ds-surface-hovered, #091E4224)"
-    }
-  }),
-  dragging: css({
-    background: "var(--ds-background-disabled, #091E4224)",
-    color: "var(--ds-text-disabled, #091E424F)"
-  })
-};
 const verticallyAlignedStyles = css({
   display: 'flex',
   alignItems: 'center',
@@ -264,7 +253,6 @@ export const DraggableTableHeading = ({
   }, [id, index, onWidthChange, state, tableId, width]);
   return jsx(TableHeading, {
     ref: mainHeaderCellRef,
-    css: [tableHeadingStatusStyles[state.type]],
     "data-testid": `${id}-column-heading`,
     style: {
       width,

package/dist/es2019/ui/issue-like-table/styled.js

@@ -7,13 +7,25 @@ export const Table = styled.table`
 `;
 export const TableHeading = styled.th`
   position: relative;
-  padding-block: ${"var(--ds-space-300, 24px)"} ${"var(--ds-space-100, 8px)"};
   line-height: ${"var(--ds-font-lineHeight-300, 16px)"};
   border-bottom: 2px solid ${`var(--ds-background-accent-gray-subtler, ${N40})`};
+  height: calc(52px - ${"var(--ds-space-050, 4px)"} * 2 - 2px);
+  vertical-align: bottom;
+
   & [data-testid='datasource-header-content--container'] {
-    margin-top: 0;
+    width: 100%;
+    padding: ${"var(--ds-space-100, 4px)"} ${"var(--ds-space-050, 2px)"};
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    white-space: normal;
     overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    max-height: 2.5rem;
+    word-wrap: break-word;
+
+    &:hover {
+      background: ${"var(--ds-background-input-hovered, #F7F8F9)"};
+      border-radius: 3px;
+    }
   }
 `;

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

@@ -0,0 +1,52 @@
+import { useCallback, useState } from 'react';
+import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
+import { mapFieldValuesToFilterOptions, mapFieldValuesToPageCursor, mapFieldValuesToTotalCount } from '../utils/transformers';
+export const useFilterOptions = ({
+  filterType,
+  cloudId
+}) => {
+  const [filterOptions, setFilterOptions] = useState([]);
+  const [totalCount, setTotalCount] = useState(0);
+  const [status, setStatus] = useState('empty');
+  const [nextPageCursor, setNextPageCursor] = useState(undefined);
+  const {
+    getFieldValues
+  } = useBasicFilterAGG();
+  const fetchFilterOptions = useCallback(async ({
+    pageCursor,
+    searchString
+  } = {}) => {
+    setStatus('loading');
+    try {
+      const response = await getFieldValues({
+        cloudId,
+        jql: '',
+        jqlTerm: filterType,
+        searchString,
+        pageCursor
+      });
+      if (response.errors && response.errors.length > 0) {
+        setStatus('rejected');
+        return;
+      }
+      const isNewSearch = !pageCursor;
+      if (isNewSearch) {
+        setFilterOptions(mapFieldValuesToFilterOptions(response));
+      } else {
+        setFilterOptions([...filterOptions, ...mapFieldValuesToFilterOptions(response)]);
+      }
+      setTotalCount(mapFieldValuesToTotalCount(response));
+      setNextPageCursor(mapFieldValuesToPageCursor(response));
+      setStatus('resolved');
+    } catch (error) {
+      setStatus('rejected');
+    }
+  }, [cloudId, filterOptions, filterType, getFieldValues]);
+  return {
+    filterOptions,
+    fetchFilterOptions,
+    totalCount,
+    pageCursor: nextPageCursor,
+    status
+  };
+};

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

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useIntl } from 'react-intl-next';
 import { CheckboxOption, PopupSelect } from '@atlaskit/select';
-import { useFieldValues } from '../../hooks/useFieldValues';
+import { useFilterOptions } from '../../hooks/useFilterOptions';
 import CustomControl from './control';
 import PopupFooter from './footer';
 import formatOptionLabel from './formatOptionLabel';
@@ -12,6 +12,7 @@ import PopupTrigger from './trigger';
 const noFilterOptions = () => true;
 const AsyncPopupSelect = ({
   filterType,
+  cloudId,
   selection,
   onSelectionChange = () => {}
 }) => {
@@ -26,8 +27,9 @@ const AsyncPopupSelect = ({
     fetchFilterOptions,
     totalCount,
     status
-  } = useFieldValues({
-    filterType
+  } = useFilterOptions({
+    filterType,
+    cloudId
   });
   const handleInputChange = useCallback((searchString, actionMeta) => {
     if (actionMeta.action === 'input-change' && searchString !== searchTerm) {
@@ -40,7 +42,7 @@ const AsyncPopupSelect = ({
   };
   const handleOpenPopup = useCallback(async () => {
     if (status === 'empty') {
-      fetchFilterOptions();
+      await fetchFilterOptions();
     }
   }, [fetchFilterOptions, status]);
   useEffect(() => {
@@ -50,18 +52,24 @@ const AsyncPopupSelect = ({
       pickerRef === null || pickerRef === void 0 ? void 0 : (_pickerRef$current = pickerRef.current) === null || _pickerRef$current === void 0 ? void 0 : (_pickerRef$current$se = _pickerRef$current.selectRef) === null || _pickerRef$current$se === void 0 ? void 0 : (_pickerRef$current$se2 = _pickerRef$current$se.inputRef) === null || _pickerRef$current$se2 === void 0 ? void 0 : _pickerRef$current$se2.focus();
     }
   }, [status]);
+  const isLoading = status === 'loading' || status === 'empty';
   return /*#__PURE__*/React.createElement(PopupSelect, {
     isMulti: true,
     maxMenuWidth: 300,
     minMenuWidth: 300,
     ref: pickerRef,
     testId: "jlol-basic-filter-popup-select",
-    inputId: "jlol-basic-filter-popup-select--input",
-    searchThreshold: 0,
+    inputId: "jlol-basic-filter-popup-select--input"
+    /*
+      this threshold controls the display of the search control (input field for search)
+      if this threshold is less than 0, when typing a search string that returns no results it will not remove the search control
+      if this threshold is 0 or higher, it will remove the search control when there are no results, the user will be unable to clear the search to see more results
+    */,
+    searchThreshold: -1,
     inputValue: searchTerm,
     closeMenuOnSelect: false,
     hideSelectedOptions: false,
-    isLoading: status === 'loading',
+    isLoading: isLoading,
     placeholder: formatMessage(asyncPopupSelectMessages.selectPlaceholder),
     components: {
       /* @ts-expect-error - This component has stricter OptionType, hence a temp setup untill its made generic */

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

@@ -4,7 +4,8 @@ import { isValidJql } from '../utils';
 import AsyncPopupSelect from './async-popup-select';
 const availableBasicFilterTypes = ['project', 'issuetype', 'status', 'assignee'];
 const BasicFilterContainer = ({
-  jql
+  jql,
+  cloudId
 }) => {
   const [selection] = useState([]);
   useEffect(() => {
@@ -17,6 +18,7 @@ const BasicFilterContainer = ({
     gap: "space.100",
     testId: "jlol-basic-filter-container"
   }, availableBasicFilterTypes.map(filter => /*#__PURE__*/React.createElement(AsyncPopupSelect, {
+    cloudId: cloudId,
     filterType: filter,
     key: filter,
     selection: selection,

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

@@ -0,0 +1,77 @@
+import { CLAUSE_TYPE_COMPOUND, CLAUSE_TYPE_TERMINAL, OPERAND_TYPE_VALUE } from '@atlaskit/jql-ast';
+import { fuzzyCharacter } from '../../jira-search-container/buildJQL';
+const removeFuzzyCharacter = value => {
+  if (value !== null && value !== void 0 && value.endsWith(fuzzyCharacter)) {
+    return value.slice(0, -1);
+  }
+  return value;
+};
+const getValueFromTerminalClause = clause => {
+  const {
+    operand
+  } = clause;
+  return operand !== undefined && operand.operandType === OPERAND_TYPE_VALUE && removeFuzzyCharacter(operand.value) || undefined;
+};
+const areClauseFieldValuesEqual = (clauseA, clauseB, clauseC) => {
+  const valueA = clauseA && getValueFromTerminalClause(clauseA);
+  const valueB = clauseB && getValueFromTerminalClause(clauseB);
+  const valueC = clauseC && getValueFromTerminalClause(clauseC);
+  const values = [valueA, valueB, valueC].filter(Boolean);
+
+  // checks if valid fields, text, summary and key have the same value, if not, its a complex query and cannnot be recreated in basic mode
+  return values.length > 1 && values.every(value => value === values[0]);
+};
+const areClauseFieldKeysAllowed = (clauseA, clauseB, clauseC) => {
+  const fieldA = clauseA.field.value;
+  const fieldB = clauseB.field.value;
+  const fieldC = clauseC === null || clauseC === void 0 ? void 0 : clauseC.field.value; // clauseC only if jql with 3 OR clauses, 'text ~ "EDM-6023*" or summary ~ "EDM-6023*" or key = EDM-6023 ORDER BY created DESC',
+
+  return [fieldA, fieldB, fieldC].filter(Boolean).every(field => ['summary', 'text', 'key'].includes(field));
+};
+const doesCompoundClauseContainAllTerminalClauses = clauses => {
+  return clauses.every(clauses => clauses.clauseType === CLAUSE_TYPE_TERMINAL);
+};
+export const isClauseTooComplex = (clauses, key) => {
+  if (key === 'text') {
+    const [clause] = clauses;
+    if (clause.clauseType === CLAUSE_TYPE_COMPOUND) {
+      const textClauses = clause.clauses;
+
+      /**
+       * valid: text ~ "test*" or summary ~ "test*" ORDER BY created DESC
+       * valid: text ~ "EDM-6023*" or summary ~ "EDM-6023*" or key = EDM-6023 ORDER BY created DESC
+       * invalid: assignee = "me" or text ~ "EDM-6023*" or summary ~ "EDM-6023*" or key = EDM-6023 ORDER BY created DESC
+       */
+      if (textClauses.length !== 2 && textClauses.length !== 3) {
+        return true;
+      }
+
+      /**
+       * valid: text ~ "test*" or summary ~ "test*"
+       * invalid: text ~ "test" or (summary ~ "test" or key = "test")
+       */
+      if (!doesCompoundClauseContainAllTerminalClauses(textClauses)) {
+        return true;
+      }
+      const [clauseA, clauseB, clauseC] = textClauses;
+
+      /**
+       * valid: text ~ "EDM-6023*" or summary ~ "EDM-6023*" or key = EDM-6023 ORDER BY created DESC
+       * invalid: text ~ "EDM-6023*" or summary ~ "anotherValue" ORDER BY created DESC
+       * invalid: text ~ "EDM-6023*" or text ~ "anotherValue" ORDER BY created DESC
+       */
+      if (!areClauseFieldValuesEqual(clauseA, clauseB, clauseC)) {
+        return true;
+      }
+
+      /**
+       * valid: text ~ "EDM-6023*" ORDER BY created DESC
+       * invalid: resolution = 40134 ORDER BY created DESC
+       */
+      if (!areClauseFieldKeysAllowed(clauseA, clauseB, clauseC)) {
+        return true;
+      }
+    }
+  }
+  return clauses.length > 1;
+};