@atlaskit/link-datasource 1.12.3 → 1.13.0

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

@@ -0,0 +1,105 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import mergeWith from 'lodash/mergeWith';
+import { AbstractJastVisitor, COMPOUND_OPERATOR_AND, COMPOUND_OPERATOR_OR, JastBuilder, OPERATOR_EQUALS, OPERATOR_GT_EQUALS, OPERATOR_IN, OPERATOR_LIKE } from '@atlaskit/jql-ast';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { ALLOWED_ORDER_BY_KEYS } from '../../jira-search-container';
+import { isClauseTooComplex } from './isClauseTooComplex';
+import { isValidJql } from './index';
+
+// Map of field keys to their respective clauses in the Jast
+
+const allowedFields = [
+// basic filter fields
+'assignee', 'issuetype', 'project', 'status',
+// search input fields
+'text', 'summary', 'key',
+// orderby field
+'created'];
+const fallbackOperators = [OPERATOR_IN];
+const fieldSpecificOperators = {
+  text: [OPERATOR_LIKE, OPERATOR_EQUALS],
+  summary: [OPERATOR_LIKE, OPERATOR_EQUALS],
+  key: [OPERATOR_EQUALS],
+  created: [OPERATOR_GT_EQUALS],
+  project: [OPERATOR_IN, OPERATOR_EQUALS],
+  issuetype: [OPERATOR_IN, OPERATOR_EQUALS],
+  status: [OPERATOR_IN, OPERATOR_EQUALS],
+  assignee: [OPERATOR_IN, OPERATOR_EQUALS]
+};
+class JqlClauseCollectingVisitorError extends Error {}
+
+/**
+ * Rather than having to navigate the entire tree structure ourself, we extend AbstractJastVisitor
+ * class and implement visitor functions for node types that we wish to process.
+ * A list of available visitor can be viewed in packages/jql/jql-ast/src/types/api/jast-visitor.ts
+ * more info - https://atlaskit.atlassian.com/packages/jql/jql-ast/docs/traversing-the-ast
+ * */
+class JqlClauseCollectingVisitor extends AbstractJastVisitor {
+  constructor() {
+    super();
+    _defineProperty(this, "visitNotClause", () => {
+      throw new JqlClauseCollectingVisitorError('Visited an unsupported node while traversing the AST');
+    });
+    _defineProperty(this, "visitOrderByField", orderByField => {
+      var _orderByField$field$v;
+      const fieldValue = (_orderByField$field$v = orderByField.field.value) === null || _orderByField$field$v === void 0 ? void 0 : _orderByField$field$v.toLowerCase();
+      if (fieldValue && !ALLOWED_ORDER_BY_KEYS.includes(fieldValue)) {
+        throw new JqlClauseCollectingVisitorError(`query with order by field '${fieldValue}' is not supported`);
+      }
+      return {};
+    });
+    _defineProperty(this, "visitCompoundClause", compoundClause => {
+      const clauseMap = {};
+      const operator = compoundClause.operator.value;
+      if (operator === COMPOUND_OPERATOR_AND) {
+        return compoundClause.clauses.reduce((result, clause) => this.aggregateResult(clause.accept(this), result), clauseMap);
+      }
+      if (operator === COMPOUND_OPERATOR_OR) {
+        // this is delt with in isClauseTooComplex
+        return this.aggregateResult({
+          text: [compoundClause]
+        }, clauseMap);
+      }
+      throw new JqlClauseCollectingVisitorError(`Compound clauses using the operator '${operator}' is not supported`);
+    });
+    _defineProperty(this, "visitTerminalClause", terminalClause => {
+      var _terminalClause$opera;
+      const fieldName = terminalClause.field.value.toLowerCase();
+      if (!allowedFields.includes(fieldName)) {
+        throw new JqlClauseCollectingVisitorError(`Field with name '${fieldName}' of type ${terminalClause.clauseType} is not supported`);
+      }
+      const operator = (_terminalClause$opera = terminalClause.operator) === null || _terminalClause$opera === void 0 ? void 0 : _terminalClause$opera.value;
+      const allowedOperators = fieldSpecificOperators[fieldName] || fallbackOperators;
+      if (operator && !allowedOperators.includes(operator.toLowerCase())) {
+        throw new JqlClauseCollectingVisitorError(`Field with name '${fieldName}' using operator ${operator} is not supported`);
+      }
+      return {
+        [terminalClause.field.value.toLowerCase()]: [terminalClause]
+      };
+    });
+  }
+  aggregateResult(aggregate, nextResult) {
+    return mergeWith(aggregate, nextResult, (destValue, srcValue) => srcValue.concat(destValue !== null && destValue !== void 0 ? destValue : []));
+  }
+  defaultResult() {
+    return {};
+  }
+}
+export const isQueryTooComplex = jql => {
+  if (!getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters') || !jql) {
+    return false;
+  }
+  if (!isValidJql(jql)) {
+    return true;
+  }
+  const jast = new JastBuilder().build(jql);
+  try {
+    const jqlClauseCollectingVisitor = new JqlClauseCollectingVisitor();
+    const clauseMap = jast.query ? jast.query.accept(jqlClauseCollectingVisitor) : {}; // jast.query is defined as void | Query, hence the fallback
+
+    const hasAnyKeyWithComplexClause = Object.entries(clauseMap).some(([key, clauses]) => isClauseTooComplex(clauses, key));
+    return hasAnyKeyWithComplexClause;
+  } catch (error) {
+    return true;
+  }
+};

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

@@ -1,6 +1,7 @@
 import { COMPOUND_OPERATOR_AND, COMPOUND_OPERATOR_OR, creators, JastBuilder, OPERATOR_EQUALS, OPERATOR_GT_EQUALS, OPERATOR_IN, OPERATOR_LIKE, ORDER_BY_DIRECTION_ASC, ORDER_BY_DIRECTION_DESC, print } from '@atlaskit/jql-ast';
 const fuzzySearchRegExp = /^"(.+)"$/;
 const jiraIssueKeyRegExp = /[A-Z]+-\d+/;
+export const fuzzyCharacter = '*';
 const constructTerminalClause = (field, operator, value) => creators.terminalClause(creators.field(field), creators.operator(operator), creators.valueOperand(value));
 export const buildJQL = input => {
   /**
@@ -22,7 +23,7 @@ export const buildJQL = input => {
     return '';
   }
   if (trimmedRawSearch) {
-    const fuzzy = !trimmedRawSearch.match(fuzzySearchRegExp) ? '*' : '';
+    const fuzzy = !trimmedRawSearch.match(fuzzySearchRegExp) ? fuzzyCharacter : '';
     const basicSearch = trimmedRawSearch.replace(/['"?*]+/g, '');
     const text = constructTerminalClause('text', OPERATOR_LIKE, `${basicSearch}${fuzzy}`);
     const summary = constructTerminalClause('summary', OPERATOR_LIKE, `${basicSearch}${fuzzy}`);

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

@@ -1,10 +1,11 @@
 /** @jsx jsx */
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { BasicFilters } from '../basic-filters';
+import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { BasicSearchInput } from '../basic-search-input';
 import { JiraJQLEditor } from '../jql-editor';
 import { ModeSwitcher } from '../mode-switcher';
@@ -17,6 +18,7 @@ const inputContainerStyles = css({
   minHeight: '60px'
 });
 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 => {
   const {
@@ -36,6 +38,7 @@ export const JiraSearchContainer = props => {
   const [basicSearchTerm, setBasicSearchTerm] = useState('');
   const [currentSearchMethod, setCurrentSearchMethod] = useState(initialSearchMethod);
   const [jql, setJql] = useState(initialJql || DEFAULT_JQL_QUERY);
+  const [isComplexQuery, setIsComplexQuery] = useState(false);
   const [orderKey, setOrderKey] = useState();
   const [orderDirection, setOrderDirection] = useState();
   const {
@@ -63,7 +66,7 @@ export const JiraSearchContainer = props => {
     const 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);
     }
@@ -73,6 +76,7 @@ export const JiraSearchContainer = props => {
     onSearch({
       jql
     }, currentSearchMethod);
+    setIsComplexQuery(isQueryTooComplex(jql));
     if (currentSearchMethod === 'basic') {
       fireEvent('ui.form.submitted.basicSearch', {});
     } else if (currentSearchMethod === 'jql') {
@@ -85,6 +89,10 @@ export const JiraSearchContainer = props => {
     }
     return false;
   }, []);
+  useEffect(() => {
+    setIsComplexQuery(isQueryTooComplex(jql));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   return jsx("div", {
     css: inputContainerStyles
   }, currentSearchMethod === 'basic' && jsx(React.Fragment, null, jsx(BasicSearchInput, {
@@ -93,7 +101,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,
@@ -108,7 +117,9 @@ export const JiraSearchContainer = props => {
       value: 'jql'
     }, {
       label: formatMessage(modeSwitcherMessages.basicTextSearchLabel),
-      value: 'basic'
+      value: 'basic',
+      disabled: isComplexQuery,
+      tooltipText: isComplexQuery ? formatMessage(modeSwitcherMessages.basicModeSwitchDisabledTooltipText) : ''
     }]
   }));
 };

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

@@ -4,5 +4,10 @@ export const modeSwitcherMessages = defineMessages({
     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/es2019/ui/jira-issues-modal/mode-switcher/index.js

@@ -1,7 +1,9 @@
+import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
 import React from 'react';
 import { css, jsx } from '@emotion/react';
-import { N0, N20, N30A, N700 } from '@atlaskit/theme/colors';
+import { N0, N20, N30A, N60, N700 } from '@atlaskit/theme/colors';
+import Tooltip from '@atlaskit/tooltip';
 const modeSwitcherStyles = css({
   alignItems: 'center',
   background: `var(--ds-background-neutral, ${N20})`,
@@ -44,8 +46,12 @@ const modeSwitcherLabelSelectedStyles = css({
   }
 });
 const modeSwitcherLabelDisabledStyles = css({
+  color: `var(--ds-text-disabled, ${N60})`
+});
+const modeSwitcherDisabledStyles = css({
   ':hover': {
-    cursor: 'not-allowed'
+    cursor: 'not-allowed',
+    background: 'transparent'
   }
 });
 const compactModeSwitcherLabelStyles = css({
@@ -69,22 +75,26 @@ export const ModeSwitcher = props => {
     disabled: isDisabled
   }, options.map(({
     value,
-    label
+    label,
+    disabled: isOptionDisabled,
+    tooltipText
   }) => {
     const isSelected = value === selectedOptionValue;
-    return jsx("label", {
+    return jsx(Tooltip, {
+      content: tooltipText
+    }, tooltipProps => jsx("label", _extends({}, tooltipProps, {
       key: value,
-      css: [modeSwitcherLabelStyles, isCompact && compactModeSwitcherLabelStyles, isSelected && modeSwitcherLabelSelectedStyles, isDisabled && modeSwitcherLabelDisabledStyles],
+      css: [modeSwitcherLabelStyles, isCompact && compactModeSwitcherLabelStyles, isSelected && modeSwitcherLabelSelectedStyles, isDisabled && modeSwitcherDisabledStyles, isOptionDisabled && [modeSwitcherLabelDisabledStyles, modeSwitcherDisabledStyles]],
       "data-testid": `mode-toggle-${value}`
-    }, label, jsx("input", {
+    }), label, jsx("input", {
       "aria-checked": isSelected,
-      "aria-disabled": isDisabled,
+      "aria-disabled": isOptionDisabled,
       checked: isSelected,
       css: modeInputStyles,
-      disabled: isDisabled,
+      disabled: isOptionDisabled,
       onChange: handleModeChange,
       type: "radio",
       value: value
-    }));
+    })));
   })) : null;
 };

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.13.0"
 };

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
+  };
+};