@atlaskit/link-datasource 1.12.3 → 1.12.4

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/transformers.js

@@ -29,7 +29,7 @@ function mapNodeToOption({
         ...baseProps,
         optionType: 'avatarLabel',
         avatar: user.picture,
-        isSquare: true
+        isSquare: false
       };
     }
     if (group) {
@@ -83,9 +83,21 @@ export function mapHydrateResponseData({
   });
   return transformedHydrateResponseData;
 }
-export function mapFieldValuesResponseData({
+export function mapFieldValuesToFilterOptions({
   data
 }) {
   var _data$jira2, _data$jira2$jqlBuilde, _data$jira2$jqlBuilde2, _data$jira2$jqlBuilde3;
   return (data === null || data === void 0 ? void 0 : (_data$jira2 = data.jira) === null || _data$jira2 === void 0 ? void 0 : (_data$jira2$jqlBuilde = _data$jira2.jqlBuilder) === null || _data$jira2$jqlBuilde === void 0 ? void 0 : (_data$jira2$jqlBuilde2 = _data$jira2$jqlBuilde.fieldValues) === null || _data$jira2$jqlBuilde2 === void 0 ? void 0 : (_data$jira2$jqlBuilde3 = _data$jira2$jqlBuilde2.edges) === null || _data$jira2$jqlBuilde3 === void 0 ? void 0 : _data$jira2$jqlBuilde3.map(edge => edge.node ? mapNodeToOption(edge.node) : null).filter(isNonNullSelectOption)) || [];
+}
+export function mapFieldValuesToTotalCount({
+  data
+}) {
+  var _data$jira3, _data$jira3$jqlBuilde, _data$jira3$jqlBuilde2;
+  return (data === null || data === void 0 ? void 0 : (_data$jira3 = data.jira) === null || _data$jira3 === void 0 ? void 0 : (_data$jira3$jqlBuilde = _data$jira3.jqlBuilder) === null || _data$jira3$jqlBuilde === void 0 ? void 0 : (_data$jira3$jqlBuilde2 = _data$jira3$jqlBuilde.fieldValues) === null || _data$jira3$jqlBuilde2 === void 0 ? void 0 : _data$jira3$jqlBuilde2.totalCount) || 0;
+}
+export function mapFieldValuesToPageCursor({
+  data
+}) {
+  var _data$jira4, _data$jira4$jqlBuilde, _data$jira4$jqlBuilde2, _data$jira4$jqlBuilde3;
+  return data === null || data === void 0 ? void 0 : (_data$jira4 = data.jira) === null || _data$jira4 === void 0 ? void 0 : (_data$jira4$jqlBuilde = _data$jira4.jqlBuilder) === null || _data$jira4$jqlBuilde === void 0 ? void 0 : (_data$jira4$jqlBuilde2 = _data$jira4$jqlBuilde.fieldValues) === null || _data$jira4$jqlBuilde2 === void 0 ? void 0 : (_data$jira4$jqlBuilde3 = _data$jira4$jqlBuilde2.pageInfo) === null || _data$jira4$jqlBuilde3 === void 0 ? void 0 : _data$jira4$jqlBuilde3.endCursor;
 }

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

@@ -93,7 +93,8 @@ export const JiraSearchContainer = props => {
     onSearch: handleSearch,
     searchTerm: basicSearchTerm
   }), showBasicFilters && jsx(BasicFilters, {
-    jql: jql
+    jql: jql,
+    cloudId: cloudId || ''
   })), currentSearchMethod === 'jql' && jsx(JiraJQLEditor, {
     cloudId: cloudId || '',
     isSearching: isSearching,

package/dist/esm/analytics/constants.js

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

package/dist/esm/services/useBasicFilterAGG.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 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';
 var getGraphqlUrl = function getGraphqlUrl(envKey, baseUrlOverride) {
   var baseUrl = baseUrlOverride || getBaseUrl(envKey);
@@ -12,97 +12,55 @@ export var useBasicFilterAGG = function useBasicFilterAGG() {
   var _useSmartLinkContext = useSmartLinkContext(),
     client = _useSmartLinkContext.connections.client;
   var gatewayGraphqlUrl = getGraphqlUrl(client.envKey, client.baseUrlOverride);
-  var aggHeaders = useMemo(function () {
-    return new Headers({
-      'Content-Type': 'application/json',
-      'X-ExperimentalApi': 'JiraJqlBuilder'
-    });
-  }, []);
-  var getHydratedJQL = useCallback( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(cloudId, jql) {
-      var body, request, response;
+  var requestCall = useCallback( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(body) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            body = JSON.stringify({
-              variables: {
-                cloudId: cloudId,
-                jql: jql
-              },
-              operationName: 'hydrate',
-              query: hydrateJQLQuery
-            });
-            request = new Request(gatewayGraphqlUrl, {
-              method: 'POST',
-              headers: aggHeaders,
-              body: body
-            });
-            _context.prev = 2;
-            _context.next = 5;
-            return fetch(request);
-          case 5:
-            response = _context.sent;
-            return _context.abrupt("return", response.json());
-          case 9:
-            _context.prev = 9;
-            _context.t0 = _context["catch"](2);
-            throw new Error(_context.t0);
-          case 12:
+            return _context.abrupt("return", request('post', gatewayGraphqlUrl, body, {
+              'X-ExperimentalApi': 'JiraJqlBuilder'
+            }, [200, 201, 202, 203, 204]));
+          case 1:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 9]]);
+      }, _callee);
     }));
-    return function (_x, _x2) {
+    return function (_x) {
       return _ref.apply(this, arguments);
     };
-  }(), [gatewayGraphqlUrl, aggHeaders]);
-  var getFieldValues = useCallback( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(cloudId, jql, jqlTerm, searchString, pageCursor) {
-      var body, request, response;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            body = JSON.stringify({
-              variables: {
-                cloudId: cloudId,
-                jql: jql,
-                first: 10,
-                jqlTerm: jqlTerm,
-                searchString: searchString,
-                after: pageCursor
-              },
-              operationName: 'fieldValues',
-              query: fieldValuesQuery
-            });
-            request = new Request(gatewayGraphqlUrl, {
-              method: 'POST',
-              headers: aggHeaders,
-              body: body
-            });
-            _context2.prev = 2;
-            _context2.next = 5;
-            return fetch(request);
-          case 5:
-            response = _context2.sent;
-            _context2.next = 8;
-            return response.json();
-          case 8:
-            return _context2.abrupt("return", _context2.sent);
-          case 11:
-            _context2.prev = 11;
-            _context2.t0 = _context2["catch"](2);
-            throw new Error(_context2.t0);
-          case 14:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2, null, [[2, 11]]);
-    }));
-    return function (_x3, _x4, _x5, _x6, _x7) {
-      return _ref2.apply(this, arguments);
-    };
-  }(), [gatewayGraphqlUrl, aggHeaders]);
+  }(), [gatewayGraphqlUrl]);
+  var getHydratedJQL = useCallback(function (cloudId, jql) {
+    return requestCall({
+      variables: {
+        cloudId: cloudId,
+        jql: jql
+      },
+      operationName: 'hydrate',
+      query: hydrateJQLQuery
+    });
+  }, [requestCall]);
+  var getFieldValues = useCallback(function (_ref2) {
+    var cloudId = _ref2.cloudId,
+      _ref2$jql = _ref2.jql,
+      jql = _ref2$jql === void 0 ? '' : _ref2$jql,
+      jqlTerm = _ref2.jqlTerm,
+      _ref2$searchString = _ref2.searchString,
+      searchString = _ref2$searchString === void 0 ? '' : _ref2$searchString,
+      pageCursor = _ref2.pageCursor;
+    return requestCall({
+      variables: {
+        cloudId: cloudId,
+        jql: jql,
+        first: 10,
+        jqlTerm: jqlTerm,
+        searchString: searchString,
+        after: pageCursor
+      },
+      operationName: 'fieldValues',
+      query: fieldValuesQuery
+    });
+  }, [requestCall]);
   return useMemo(function () {
     return {
       getHydratedJQL: getHydratedJQL,

package/dist/esm/services/utils.js

@@ -1,2 +1,2 @@
 export var hydrateJQLQuery = "query hydrate($cloudId: ID!, $jql: String!) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      hydrateJqlQuery(query: $jql) {\n        ... on JiraJqlHydratedQuery {\n          fields {\n            ... on JiraJqlQueryHydratedField {\n              jqlTerm\n              values {\n                ... on JiraJqlQueryHydratedValue {\n                  values {\n                    ... on JiraJqlProjectFieldValue {\n                      jqlTerm\n                      displayName\n                      project {\n                        avatar {\n                          small\n                        }\n                      }\n                    }\n                    ... on JiraJqlStatusFieldValue {\n                      jqlTerm\n                      displayName\n                      statusCategory {\n                        colorName\n                      }\n                    }\n                    ... on JiraJqlIssueTypeFieldValue {\n                      jqlTerm\n                      displayName\n                      issueTypes {\n                        avatar {\n                          small\n                        }\n                      }\n                    }\n                    ... on JiraJqlUserFieldValue {\n                      jqlTerm\n                      displayName\n                      user {\n                        picture\n                      }\n                    }\n                    ... on JiraJqlGroupFieldValue {\n                      jqlTerm\n                      displayName\n                      group {\n                        name\n                      }\n                    }\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";
-export var fieldValuesQuery = "query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String, $projectOptions: JiraProjectOptions) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      fieldValues(\n        first: $first\n        jqlTerm: $jqlTerm\n        jqlContext: $jql\n        searchString: $searchString\n        after: $after\n      ) {\n        totalCount\n        pageInfo {\n          endCursor\n        }\n        edges {\n          node {\n            jqlTerm\n            displayName\n            ... on JiraJqlProjectFieldValue {\n              project {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlIssueTypeFieldValue {\n              issueTypes {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlStatusFieldValue {\n              statusCategory {\n                colorName\n              }\n            }\n            ... on JiraJqlUserFieldValue {\n              user {\n                picture\n              }\n            }\n            ... on JiraJqlGroupFieldValue {\n              group {\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";
+export var fieldValuesQuery = "query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      fieldValues(\n        first: $first\n        jqlTerm: $jqlTerm\n        jqlContext: $jql\n        searchString: $searchString\n        after: $after\n      ) {\n        totalCount\n        pageInfo {\n          endCursor\n        }\n        edges {\n          node {\n            jqlTerm\n            displayName\n            ... on JiraJqlProjectFieldValue {\n              project {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlIssueTypeFieldValue {\n              issueTypes {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlStatusFieldValue {\n              statusCategory {\n                colorName\n              }\n            }\n            ... on JiraJqlUserFieldValue {\n              user {\n                picture\n              }\n            }\n            ... on JiraJqlGroupFieldValue {\n              group {\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";

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

@@ -14,17 +14,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';
-var tableHeadingStatusStyles = {
-  idle: css({
-    ':hover': {
-      background: "var(--ds-surface-hovered, #091E4224)"
-    }
-  }),
-  dragging: css({
-    background: "var(--ds-background-disabled, #091E4224)",
-    color: "var(--ds-text-disabled, #091E424F)"
-  })
-};
 var verticallyAlignedStyles = css({
   display: 'flex',
   alignItems: 'center',
@@ -267,7 +256,6 @@ export var DraggableTableHeading = function DraggableTableHeading(_ref) {
   }, [id, index, onWidthChange, state, tableId, width]);
   return jsx(TableHeading, {
     ref: mainHeaderCellRef,
-    css: [tableHeadingStatusStyles[state.type]],
     "data-testid": "".concat(id, "-column-heading"),
     style: {
       width: width,

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

@@ -5,4 +5,4 @@ import { N40 } from '@atlaskit/theme/colors';
 export var ScrollableContainerHeight = 590;
 export var FieldTextFontSize = '14px';
 export var Table = styled.table(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 100%;\n"])));
-export var TableHeading = styled.th(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: relative;\n  padding-block: ", " ", ";\n  line-height: ", ";\n  border-bottom: 2px solid ", ";\n  & [data-testid='datasource-header-content--container'] {\n    margin-top: 0;\n    overflow: hidden;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n  }\n"])), "var(--ds-space-300, 24px)", "var(--ds-space-100, 8px)", "var(--ds-font-lineHeight-300, 16px)", "var(--ds-background-accent-gray-subtler, ".concat(N40, ")"));
+export var TableHeading = styled.th(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: relative;\n  line-height: ", ";\n  border-bottom: 2px solid ", ";\n  height: calc(52px - ", " * 2 - 2px);\n  vertical-align: bottom;\n\n  & [data-testid='datasource-header-content--container'] {\n    width: 100%;\n    padding: ", " ", ";\n    display: -webkit-box;\n    -webkit-line-clamp: 2;\n    -webkit-box-orient: vertical;\n    white-space: normal;\n    overflow: hidden;\n    max-height: 2.5rem;\n    word-wrap: break-word;\n\n    &:hover {\n      background: ", ";\n      border-radius: 3px;\n    }\n  }\n"])), "var(--ds-font-lineHeight-300, 16px)", "var(--ds-background-accent-gray-subtler, ".concat(N40, ")"), "var(--ds-space-050, 4px)", "var(--ds-space-100, 4px)", "var(--ds-space-050, 2px)", "var(--ds-background-input-hovered, #F7F8F9)");

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

@@ -0,0 +1,87 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useCallback, useState } from 'react';
+import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
+import { mapFieldValuesToFilterOptions, mapFieldValuesToPageCursor, mapFieldValuesToTotalCount } from '../utils/transformers';
+export var useFilterOptions = function useFilterOptions(_ref) {
+  var filterType = _ref.filterType,
+    cloudId = _ref.cloudId;
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    filterOptions = _useState2[0],
+    setFilterOptions = _useState2[1];
+  var _useState3 = useState(0),
+    _useState4 = _slicedToArray(_useState3, 2),
+    totalCount = _useState4[0],
+    setTotalCount = _useState4[1];
+  var _useState5 = useState('empty'),
+    _useState6 = _slicedToArray(_useState5, 2),
+    status = _useState6[0],
+    setStatus = _useState6[1];
+  var _useState7 = useState(undefined),
+    _useState8 = _slicedToArray(_useState7, 2),
+    nextPageCursor = _useState8[0],
+    setNextPageCursor = _useState8[1];
+  var _useBasicFilterAGG = useBasicFilterAGG(),
+    getFieldValues = _useBasicFilterAGG.getFieldValues;
+  var fetchFilterOptions = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var _ref3,
+      pageCursor,
+      searchString,
+      response,
+      isNewSearch,
+      _args = arguments;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _ref3 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, pageCursor = _ref3.pageCursor, searchString = _ref3.searchString;
+          setStatus('loading');
+          _context.prev = 2;
+          _context.next = 5;
+          return getFieldValues({
+            cloudId: cloudId,
+            jql: '',
+            jqlTerm: filterType,
+            searchString: searchString,
+            pageCursor: pageCursor
+          });
+        case 5:
+          response = _context.sent;
+          if (!(response.errors && response.errors.length > 0)) {
+            _context.next = 9;
+            break;
+          }
+          setStatus('rejected');
+          return _context.abrupt("return");
+        case 9:
+          isNewSearch = !pageCursor;
+          if (isNewSearch) {
+            setFilterOptions(mapFieldValuesToFilterOptions(response));
+          } else {
+            setFilterOptions([].concat(_toConsumableArray(filterOptions), _toConsumableArray(mapFieldValuesToFilterOptions(response))));
+          }
+          setTotalCount(mapFieldValuesToTotalCount(response));
+          setNextPageCursor(mapFieldValuesToPageCursor(response));
+          setStatus('resolved');
+          _context.next = 19;
+          break;
+        case 16:
+          _context.prev = 16;
+          _context.t0 = _context["catch"](2);
+          setStatus('rejected');
+        case 19:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[2, 16]]);
+  })), [cloudId, filterOptions, filterType, getFieldValues]);
+  return {
+    filterOptions: filterOptions,
+    fetchFilterOptions: fetchFilterOptions,
+    totalCount: totalCount,
+    pageCursor: nextPageCursor,
+    status: status
+  };
+};

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

@@ -7,7 +7,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 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';
@@ -19,6 +19,7 @@ var noFilterOptions = function noFilterOptions() {
 };
 var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
   var filterType = _ref.filterType,
+    cloudId = _ref.cloudId,
     selection = _ref.selection,
     _ref$onSelectionChang = _ref.onSelectionChange,
     onSelectionChange = _ref$onSelectionChang === void 0 ? function () {} : _ref$onSelectionChang;
@@ -33,13 +34,14 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectedOptions = _useState4[0],
     setSelectedOptions = _useState4[1];
-  var _useFieldValues = useFieldValues({
-      filterType: filterType
+  var _useFilterOptions = useFilterOptions({
+      filterType: filterType,
+      cloudId: cloudId
     }),
-    filterOptions = _useFieldValues.filterOptions,
-    fetchFilterOptions = _useFieldValues.fetchFilterOptions,
-    totalCount = _useFieldValues.totalCount,
-    status = _useFieldValues.status;
+    filterOptions = _useFilterOptions.filterOptions,
+    fetchFilterOptions = _useFilterOptions.fetchFilterOptions,
+    totalCount = _useFilterOptions.totalCount,
+    status = _useFilterOptions.status;
   var handleInputChange = useCallback(function (searchString, actionMeta) {
     if (actionMeta.action === 'input-change' && searchString !== searchTerm) {
       setSearchTerm(searchString);
@@ -53,10 +55,13 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (status === 'empty') {
-            fetchFilterOptions();
+          if (!(status === 'empty')) {
+            _context.next = 3;
+            break;
           }
-        case 1:
+          _context.next = 3;
+          return fetchFilterOptions();
+        case 3:
         case "end":
           return _context.stop();
       }
@@ -69,18 +74,24 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       pickerRef === null || pickerRef === void 0 || (_pickerRef$current = pickerRef.current) === null || _pickerRef$current === void 0 || (_pickerRef$current = _pickerRef$current.selectRef) === null || _pickerRef$current === void 0 || (_pickerRef$current = _pickerRef$current.inputRef) === null || _pickerRef$current === void 0 || _pickerRef$current.focus();
     }
   }, [status]);
+  var 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/esm/ui/jira-issues-modal/basic-filters/ui/index.js

@@ -5,7 +5,8 @@ import { isValidJql } from '../utils';
 import AsyncPopupSelect from './async-popup-select';
 var availableBasicFilterTypes = ['project', 'issuetype', 'status', 'assignee'];
 var BasicFilterContainer = function BasicFilterContainer(_ref) {
-  var jql = _ref.jql;
+  var jql = _ref.jql,
+    cloudId = _ref.cloudId;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 1),
     selection = _useState2[0];
@@ -20,6 +21,7 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
     testId: "jlol-basic-filter-container"
   }, availableBasicFilterTypes.map(function (filter) {
     return /*#__PURE__*/React.createElement(AsyncPopupSelect, {
+      cloudId: cloudId,
       filterType: filter,
       key: filter,
       selection: selection,

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

@@ -30,7 +30,7 @@ function mapNodeToOption(_ref) {
       return _objectSpread(_objectSpread({}, baseProps), {}, {
         optionType: 'avatarLabel',
         avatar: user.picture,
-        isSquare: true
+        isSquare: false
       });
     }
     if (group) {
@@ -80,10 +80,20 @@ export function mapHydrateResponseData(_ref2) {
   });
   return transformedHydrateResponseData;
 }
-export function mapFieldValuesResponseData(_ref5) {
+export 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)) || [];
+}
+export 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;
+}
+export 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/esm/ui/jira-issues-modal/jira-search-container/index.js

@@ -106,7 +106,8 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     onSearch: handleSearch,
     searchTerm: basicSearchTerm
   }), showBasicFilters && jsx(BasicFilters, {
-    jql: jql
+    jql: jql,
+    cloudId: cloudId || ''
   })), currentSearchMethod === 'jql' && jsx(JiraJQLEditor, {
     cloudId: cloudId || '',
     isSearching: isSearching,

package/dist/types/services/useBasicFilterAGG.d.ts

@@ -1,5 +1,13 @@
 import { BasicFilterFieldType, FieldValuesResponse, HydrateResponse } from '../ui/jira-issues-modal/basic-filters/types';
+interface GetFieldValuesProps {
+    cloudId: string;
+    jql: string;
+    jqlTerm: BasicFilterFieldType;
+    searchString: string;
+    pageCursor?: string;
+}
 export declare const useBasicFilterAGG: () => {
     getHydratedJQL: (cloudId: string, jql: string) => Promise<HydrateResponse>;
-    getFieldValues: (cloudId: string, jql: string, jqlTerm: BasicFilterFieldType, searchString: string, pageCursor?: string) => Promise<FieldValuesResponse>;
+    getFieldValues: ({ cloudId, jql, jqlTerm, searchString, pageCursor, }: GetFieldValuesProps) => Promise<FieldValuesResponse>;
 };
+export {};

package/dist/types/services/utils.d.ts

@@ -1,2 +1,2 @@
 export declare const hydrateJQLQuery = "query hydrate($cloudId: ID!, $jql: String!) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      hydrateJqlQuery(query: $jql) {\n        ... on JiraJqlHydratedQuery {\n          fields {\n            ... on JiraJqlQueryHydratedField {\n              jqlTerm\n              values {\n                ... on JiraJqlQueryHydratedValue {\n                  values {\n                    ... on JiraJqlProjectFieldValue {\n                      jqlTerm\n                      displayName\n                      project {\n                        avatar {\n                          small\n                        }\n                      }\n                    }\n                    ... on JiraJqlStatusFieldValue {\n                      jqlTerm\n                      displayName\n                      statusCategory {\n                        colorName\n                      }\n                    }\n                    ... on JiraJqlIssueTypeFieldValue {\n                      jqlTerm\n                      displayName\n                      issueTypes {\n                        avatar {\n                          small\n                        }\n                      }\n                    }\n                    ... on JiraJqlUserFieldValue {\n                      jqlTerm\n                      displayName\n                      user {\n                        picture\n                      }\n                    }\n                    ... on JiraJqlGroupFieldValue {\n                      jqlTerm\n                      displayName\n                      group {\n                        name\n                      }\n                    }\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";
-export declare const fieldValuesQuery = "query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String, $projectOptions: JiraProjectOptions) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      fieldValues(\n        first: $first\n        jqlTerm: $jqlTerm\n        jqlContext: $jql\n        searchString: $searchString\n        after: $after\n      ) {\n        totalCount\n        pageInfo {\n          endCursor\n        }\n        edges {\n          node {\n            jqlTerm\n            displayName\n            ... on JiraJqlProjectFieldValue {\n              project {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlIssueTypeFieldValue {\n              issueTypes {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlStatusFieldValue {\n              statusCategory {\n                colorName\n              }\n            }\n            ... on JiraJqlUserFieldValue {\n              user {\n                picture\n              }\n            }\n            ... on JiraJqlGroupFieldValue {\n              group {\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";
+export declare const fieldValuesQuery = "query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      fieldValues(\n        first: $first\n        jqlTerm: $jqlTerm\n        jqlContext: $jql\n        searchString: $searchString\n        after: $after\n      ) {\n        totalCount\n        pageInfo {\n          endCursor\n        }\n        edges {\n          node {\n            jqlTerm\n            displayName\n            ... on JiraJqlProjectFieldValue {\n              project {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlIssueTypeFieldValue {\n              issueTypes {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlStatusFieldValue {\n              statusCategory {\n                colorName\n              }\n            }\n            ... on JiraJqlUserFieldValue {\n              user {\n                picture\n              }\n            }\n            ... on JiraJqlGroupFieldValue {\n              group {\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";