@atlaskit/link-datasource 1.19.2 → 1.19.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 1.19.4
+
+### Patch Changes
+
+- [#43869](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43869) [`a46528b1133`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a46528b1133) - Update jql searched and insert click analytics events with isQueryComplex attribute.
+
+## 1.19.3
+
+### Patch Changes
+
+- [#43787](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43787) [`a9738b4c894`](https://bitbucket.org/atlassian/atlassian-frontend/commits/a9738b4c894) - Logic to parse text value from JQL and pre-populate input box in basic mode.
+- Updated dependencies
+
 ## 1.19.2
 
 ### Patch Changes

package/dist/cjs/analytics/constants.js

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

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

@@ -6,11 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useHydrateJqlQuery = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _useBasicFilterAGG2 = require("../../../../services/useBasicFilterAGG");
+var _extractValuesFromNonComplexJQL = require("../utils/extractValuesFromNonComplexJQL");
+var _isClauseTooComplex = require("../utils/isClauseTooComplex");
 var _transformers = require("../utils/transformers");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useHydrateJqlQuery = exports.useHydrateJqlQuery = function useHydrateJqlQuery(cloudId, jql) {
   var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -27,7 +32,7 @@ var useHydrateJqlQuery = exports.useHydrateJqlQuery = function useHydrateJqlQuer
   var _useBasicFilterAGG = (0, _useBasicFilterAGG2.useBasicFilterAGG)(),
     getHydratedJQL = _useBasicFilterAGG.getHydratedJQL;
   var fetchHydratedJqlOptions = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-    var response;
+    var response, _extractValuesFromNon, text, summary, key, _ref2, _ref3, textFieldValue, mappedValues;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -45,20 +50,28 @@ var useHydrateJqlQuery = exports.useHydrateJqlQuery = function useHydrateJqlQuer
           setErrors(response.errors);
           return _context.abrupt("return");
         case 9:
-          setHydratedOptions((0, _transformers.mapHydrateResponseData)(response));
+          /**
+           * Hydrate logic does not return text field, hence we parse and extract value from jql
+           */
+          _extractValuesFromNon = (0, _extractValuesFromNonComplexJQL.extractValuesFromNonComplexJQL)(jql), text = _extractValuesFromNon.text, summary = _extractValuesFromNon.summary, key = _extractValuesFromNon.key;
+          _ref2 = text || summary || key || [], _ref3 = (0, _slicedToArray2.default)(_ref2, 1), textFieldValue = _ref3[0];
+          mappedValues = _objectSpread(_objectSpread({}, (0, _transformers.mapHydrateResponseData)(response)), {}, {
+            basicInputTextValue: (0, _isClauseTooComplex.removeFuzzyCharacter)(textFieldValue)
+          });
+          setHydratedOptions(mappedValues);
           setStatus('resolved');
-          _context.next = 17;
+          _context.next = 20;
           break;
-        case 13:
-          _context.prev = 13;
+        case 16:
+          _context.prev = 16;
           _context.t0 = _context["catch"](0);
           setErrors([_context.t0]);
           setStatus('rejected');
-        case 17:
+        case 20:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 13]]);
+    }, _callee, null, [[0, 16]]);
   })), [cloudId, getHydratedJQL, jql]);
   (0, _react.useEffect)(function () {
     if (status !== 'rejected' && errors.length !== 0) {

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

@@ -0,0 +1,93 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.extractValuesFromNonComplexJQL = void 0;
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _mergeWith = _interopRequireDefault(require("lodash/mergeWith"));
+var _jqlAst = require("@atlaskit/jql-ast");
+var _isQueryTooComplex = require("./isQueryTooComplex");
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+// Map of field keys to their respective clauses in the Jast
+
+var getFieldValues = function getFieldValues(operand) {
+  switch (operand.operandType) {
+    case _jqlAst.OPERAND_TYPE_LIST:
+      return operand.values.map(function (value) {
+        return value.operandType === _jqlAst.OPERAND_TYPE_VALUE && value.value || undefined;
+      }).filter(function (value) {
+        return !!value;
+      });
+    case _jqlAst.OPERAND_TYPE_VALUE:
+      return operand.value ? [operand.value] : [];
+    case _jqlAst.OPERAND_TYPE_KEYWORD:
+      return operand.value === _jqlAst.OPERAND_EMPTY ? [operand.value] : [];
+    default:
+      return [];
+  }
+};
+
+/**
+ * Rather than having to navigate the entire tree structure ourself, we extend AbstractJastVisitor
+ * class and implement visitField to walk through each field and value.
+ * */
+var JqlClauseCollectingVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
+  (0, _inherits2.default)(JqlClauseCollectingVisitor, _AbstractJastVisitor);
+  var _super = _createSuper(JqlClauseCollectingVisitor);
+  function JqlClauseCollectingVisitor() {
+    var _this;
+    (0, _classCallCheck2.default)(this, JqlClauseCollectingVisitor);
+    _this = _super.call(this);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "visitField", function (field) {
+      var _field$value;
+      var fieldName = (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.toLowerCase();
+      var fieldParent = field.parent;
+      if (!fieldParent) {
+        return;
+      }
+
+      // we do not want to parse and store the order by field+value
+      var fieldGrandParent = fieldParent.parent;
+      if (fieldGrandParent.type === _jqlAst.NODE_TYPE_ORDER_BY) {
+        return;
+      }
+      var operand = fieldParent.operand;
+      var fieldValues = operand && getFieldValues(operand) || [];
+      return (0, _defineProperty2.default)({}, fieldName, fieldValues);
+    });
+    return _this;
+  }
+  (0, _createClass2.default)(JqlClauseCollectingVisitor, [{
+    key: "aggregateResult",
+    value: function aggregateResult(aggregate, nextResult) {
+      return (0, _mergeWith.default)(aggregate, nextResult, function (destValue, srcValue) {
+        return srcValue.concat(destValue !== null && destValue !== void 0 ? destValue : []);
+      });
+    }
+  }, {
+    key: "defaultResult",
+    value: function defaultResult() {
+      return {};
+    }
+  }]);
+  return JqlClauseCollectingVisitor;
+}(_jqlAst.AbstractJastVisitor);
+var extractValuesFromNonComplexJQL = exports.extractValuesFromNonComplexJQL = function extractValuesFromNonComplexJQL(jql) {
+  if ((0, _isQueryTooComplex.isQueryTooComplex)(jql)) {
+    return {};
+  }
+  var jast = new _jqlAst.JastBuilder().build(jql);
+  var jqlClauseCollectingVisitor = new JqlClauseCollectingVisitor();
+  var mappedValues = jast.query ? jast.query.accept(jqlClauseCollectingVisitor) || {} : {}; // jast.query is defined as void | Query, hence the fallback
+
+  return mappedValues;
+};

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

@@ -4,11 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isClauseTooComplex = void 0;
+exports.removeFuzzyCharacter = exports.isClauseTooComplex = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jqlAst = require("@atlaskit/jql-ast");
 var _buildJQL = require("../../jira-search-container/buildJQL");
-var removeFuzzyCharacter = function removeFuzzyCharacter(value) {
+var removeFuzzyCharacter = exports.removeFuzzyCharacter = function removeFuzzyCharacter(value) {
   if (value !== null && value !== void 0 && value.endsWith(_buildJQL.fuzzyCharacter)) {
     return value.slice(0, -1);
   }

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

@@ -122,17 +122,20 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     setJql(query);
   }, []);
   var handleSearch = (0, _react.useCallback)(function () {
+    var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(jql);
     onSearch({
       jql: jql
     }, {
       searchMethod: currentSearchMethod,
-      basicFilterSelections: filterSelections
+      basicFilterSelections: filterSelections,
+      isQueryComplex: isCurrentQueryComplex
     });
     if (currentSearchMethod === 'basic') {
       fireEvent('ui.form.submitted.basicSearch', {});
     } else if (currentSearchMethod === 'jql') {
-      fireEvent('ui.jqlEditor.searched', {});
-      var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(jql);
+      fireEvent('ui.jqlEditor.searched', {
+        isQueryComplex: isCurrentQueryComplex
+      });
       setIsComplexQuery(isCurrentQueryComplex);
       if (showBasicFilters && !isCurrentQueryComplex) {
         fetchHydratedJqlOptions();
@@ -147,11 +150,13 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
         orderKey: orderKey
       });
       setJql(jqlWithFilterValues);
+      var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(jqlWithFilterValues);
       onSearch({
         jql: jqlWithFilterValues
       }, {
         searchMethod: currentSearchMethod,
-        basicFilterSelections: filterSelections
+        basicFilterSelections: filterSelections,
+        isQueryComplex: isCurrentQueryComplex
       });
     }, _asyncPopupSelect.SEARCH_DEBOUNCE_MS),
     _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),
@@ -171,6 +176,9 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
   (0, _react.useEffect)(function () {
     if (basicFilterHydrationStatus === 'resolved') {
       setFilterSelections(hydratedOptions);
+      if (hydratedOptions.basicInputTextValue) {
+        setBasicSearchTerm(hydratedOptions.basicInputTextValue);
+      }
     }
   }, [hydratedOptions, basicFilterHydrationStatus]);
   var handleSelectionChange = (0, _react.useCallback)(function (filterType, options) {

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

@@ -142,6 +142,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   var searchMethodSearchedWith = (0, _react.useRef)(null);
   var visibleColumnCount = (0, _react.useRef)((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
   var basicFilterSelectionsSearchedWith = (0, _react.useRef)({});
+  var isSearchedWithComplexQuery = (0, _react.useRef)(false);
   var parameters = (0, _react.useMemo)(function () {
     return !!cloudId ? {
       cloudId: cloudId,
@@ -308,10 +309,12 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   (0, _useColumnPickerRenderedFailedUfoExperience.useColumnPickerRenderedFailedUfoExperience)(status, modalRenderInstanceId);
   var onSearch = (0, _react.useCallback)(function (newParameters, _ref2) {
     var searchMethod = _ref2.searchMethod,
-      basicFilterSelections = _ref2.basicFilterSelections;
+      basicFilterSelections = _ref2.basicFilterSelections,
+      isQueryComplex = _ref2.isQueryComplex;
     searchCount.current++;
     searchMethodSearchedWith.current = searchMethod;
     basicFilterSelectionsSearchedWith.current = basicFilterSelections;
+    isSearchedWithComplexQuery.current = isQueryComplex;
     if (jql !== newParameters.jql) {
       userInteractionActions.current.add(_types.DatasourceAction.QUERY_UPDATED);
     }
@@ -362,7 +365,8 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
         display: getDisplayValue(currentViewMode, totalCount || 0),
         searchCount: searchCount.current,
         searchMethod: (0, _utils.mapSearchMethod)(searchMethodSearchedWith.current),
-        actions: Array.from(userInteractionActions.current)
+        actions: Array.from(userInteractionActions.current),
+        isQueryComplex: isSearchedWithComplexQuery.current
       }, searchMethodSearchedWith.current === 'basic' ? _objectSpread({}, filterSelectionCount) : {}),
       eventType: 'ui'
     });

package/dist/es2019/analytics/constants.js

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

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

@@ -1,5 +1,7 @@
 import { useCallback, useEffect, useState } from 'react';
 import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
+import { extractValuesFromNonComplexJQL } from '../utils/extractValuesFromNonComplexJQL';
+import { removeFuzzyCharacter } from '../utils/isClauseTooComplex';
 import { mapHydrateResponseData } from '../utils/transformers';
 export const useHydrateJqlQuery = (cloudId, jql) => {
   const [hydratedOptions, setHydratedOptions] = useState({});
@@ -17,7 +19,21 @@ export const useHydrateJqlQuery = (cloudId, jql) => {
         setErrors(response.errors);
         return;
       }
-      setHydratedOptions(mapHydrateResponseData(response));
+
+      /**
+       * Hydrate logic does not return text field, hence we parse and extract value from jql
+       */
+      const {
+        text,
+        summary,
+        key
+      } = extractValuesFromNonComplexJQL(jql);
+      const [textFieldValue] = text || summary || key || [];
+      const mappedValues = {
+        ...mapHydrateResponseData(response),
+        basicInputTextValue: removeFuzzyCharacter(textFieldValue)
+      };
+      setHydratedOptions(mappedValues);
       setStatus('resolved');
     } catch (error) {
       setErrors([error]);

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

@@ -0,0 +1,64 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import mergeWith from 'lodash/mergeWith';
+import { AbstractJastVisitor, JastBuilder, NODE_TYPE_ORDER_BY, OPERAND_EMPTY, OPERAND_TYPE_KEYWORD, OPERAND_TYPE_LIST, OPERAND_TYPE_VALUE } from '@atlaskit/jql-ast';
+import { isQueryTooComplex } from './isQueryTooComplex';
+
+// Map of field keys to their respective clauses in the Jast
+
+const getFieldValues = operand => {
+  switch (operand.operandType) {
+    case OPERAND_TYPE_LIST:
+      return operand.values.map(value => value.operandType === OPERAND_TYPE_VALUE && value.value || undefined).filter(value => !!value);
+    case OPERAND_TYPE_VALUE:
+      return operand.value ? [operand.value] : [];
+    case OPERAND_TYPE_KEYWORD:
+      return operand.value === OPERAND_EMPTY ? [operand.value] : [];
+    default:
+      return [];
+  }
+};
+
+/**
+ * Rather than having to navigate the entire tree structure ourself, we extend AbstractJastVisitor
+ * class and implement visitField to walk through each field and value.
+ * */
+class JqlClauseCollectingVisitor extends AbstractJastVisitor {
+  constructor() {
+    super();
+    _defineProperty(this, "visitField", field => {
+      var _field$value;
+      const fieldName = (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.toLowerCase();
+      const fieldParent = field.parent;
+      if (!fieldParent) {
+        return;
+      }
+
+      // we do not want to parse and store the order by field+value
+      const fieldGrandParent = fieldParent.parent;
+      if (fieldGrandParent.type === NODE_TYPE_ORDER_BY) {
+        return;
+      }
+      const operand = fieldParent.operand;
+      const fieldValues = operand && getFieldValues(operand) || [];
+      return {
+        [fieldName]: fieldValues
+      };
+    });
+  }
+  aggregateResult(aggregate, nextResult) {
+    return mergeWith(aggregate, nextResult, (destValue, srcValue) => srcValue.concat(destValue !== null && destValue !== void 0 ? destValue : []));
+  }
+  defaultResult() {
+    return {};
+  }
+}
+export const extractValuesFromNonComplexJQL = jql => {
+  if (isQueryTooComplex(jql)) {
+    return {};
+  }
+  const jast = new JastBuilder().build(jql);
+  const jqlClauseCollectingVisitor = new JqlClauseCollectingVisitor();
+  const mappedValues = jast.query ? jast.query.accept(jqlClauseCollectingVisitor) || {} : {}; // jast.query is defined as void | Query, hence the fallback
+
+  return mappedValues;
+};

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

@@ -1,6 +1,6 @@
 import { CLAUSE_TYPE_COMPOUND, CLAUSE_TYPE_TERMINAL, OPERAND_TYPE_VALUE } from '@atlaskit/jql-ast';
 import { fuzzyCharacter } from '../../jira-search-container/buildJQL';
-const removeFuzzyCharacter = value => {
+export const removeFuzzyCharacter = value => {
   if (value !== null && value !== void 0 && value.endsWith(fuzzyCharacter)) {
     return value.slice(0, -1);
   }

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

@@ -92,17 +92,20 @@ export const JiraSearchContainer = props => {
     setJql(query);
   }, []);
   const handleSearch = useCallback(() => {
+    const isCurrentQueryComplex = isQueryTooComplex(jql);
     onSearch({
       jql
     }, {
       searchMethod: currentSearchMethod,
-      basicFilterSelections: filterSelections
+      basicFilterSelections: filterSelections,
+      isQueryComplex: isCurrentQueryComplex
     });
     if (currentSearchMethod === 'basic') {
       fireEvent('ui.form.submitted.basicSearch', {});
     } else if (currentSearchMethod === 'jql') {
-      fireEvent('ui.jqlEditor.searched', {});
-      const isCurrentQueryComplex = isQueryTooComplex(jql);
+      fireEvent('ui.jqlEditor.searched', {
+        isQueryComplex: isCurrentQueryComplex
+      });
       setIsComplexQuery(isCurrentQueryComplex);
       if (showBasicFilters && !isCurrentQueryComplex) {
         fetchHydratedJqlOptions();
@@ -117,11 +120,13 @@ export const JiraSearchContainer = props => {
       orderKey
     });
     setJql(jqlWithFilterValues);
+    const isCurrentQueryComplex = isQueryTooComplex(jqlWithFilterValues);
     onSearch({
       jql: jqlWithFilterValues
     }, {
       searchMethod: currentSearchMethod,
-      basicFilterSelections: filterSelections
+      basicFilterSelections: filterSelections,
+      isQueryComplex: isCurrentQueryComplex
     });
   }, SEARCH_DEBOUNCE_MS);
   const handleBasicFilterSelectionChange = useCallback(filterValues => {
@@ -139,6 +144,9 @@ export const JiraSearchContainer = props => {
   useEffect(() => {
     if (basicFilterHydrationStatus === 'resolved') {
       setFilterSelections(hydratedOptions);
+      if (hydratedOptions.basicInputTextValue) {
+        setBasicSearchTerm(hydratedOptions.basicInputTextValue);
+      }
     }
   }, [hydratedOptions, basicFilterHydrationStatus]);
   const handleSelectionChange = useCallback((filterType, options) => {

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

@@ -109,6 +109,7 @@ export const PlainJiraIssuesConfigModal = props => {
   const searchMethodSearchedWith = useRef(null);
   const visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
   const basicFilterSelectionsSearchedWith = useRef({});
+  const isSearchedWithComplexQuery = useRef(false);
   const parameters = useMemo(() => !!cloudId ? {
     cloudId,
     jql: jql || ''
@@ -256,11 +257,13 @@ export const PlainJiraIssuesConfigModal = props => {
   useColumnPickerRenderedFailedUfoExperience(status, modalRenderInstanceId);
   const onSearch = useCallback((newParameters, {
     searchMethod,
-    basicFilterSelections
+    basicFilterSelections,
+    isQueryComplex
   }) => {
     searchCount.current++;
     searchMethodSearchedWith.current = searchMethod;
     basicFilterSelectionsSearchedWith.current = basicFilterSelections;
+    isSearchedWithComplexQuery.current = isQueryComplex;
     if (jql !== newParameters.jql) {
       userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
     }
@@ -316,6 +319,7 @@ export const PlainJiraIssuesConfigModal = props => {
         searchCount: searchCount.current,
         searchMethod: mapSearchMethod(searchMethodSearchedWith.current),
         actions: Array.from(userInteractionActions.current),
+        isQueryComplex: isSearchedWithComplexQuery.current,
         ...(searchMethodSearchedWith.current === 'basic' ? {
           ...filterSelectionCount
         } : {})

package/dist/esm/analytics/constants.js

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

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

@@ -1,8 +1,13 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { useCallback, useEffect, useState } from 'react';
 import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
+import { extractValuesFromNonComplexJQL } from '../utils/extractValuesFromNonComplexJQL';
+import { removeFuzzyCharacter } from '../utils/isClauseTooComplex';
 import { mapHydrateResponseData } from '../utils/transformers';
 export var useHydrateJqlQuery = function useHydrateJqlQuery(cloudId, jql) {
   var _useState = useState({}),
@@ -20,7 +25,7 @@ export var useHydrateJqlQuery = function useHydrateJqlQuery(cloudId, jql) {
   var _useBasicFilterAGG = useBasicFilterAGG(),
     getHydratedJQL = _useBasicFilterAGG.getHydratedJQL;
   var fetchHydratedJqlOptions = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var response;
+    var response, _extractValuesFromNon, text, summary, key, _ref2, _ref3, textFieldValue, mappedValues;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -38,20 +43,28 @@ export var useHydrateJqlQuery = function useHydrateJqlQuery(cloudId, jql) {
           setErrors(response.errors);
           return _context.abrupt("return");
         case 9:
-          setHydratedOptions(mapHydrateResponseData(response));
+          /**
+           * Hydrate logic does not return text field, hence we parse and extract value from jql
+           */
+          _extractValuesFromNon = extractValuesFromNonComplexJQL(jql), text = _extractValuesFromNon.text, summary = _extractValuesFromNon.summary, key = _extractValuesFromNon.key;
+          _ref2 = text || summary || key || [], _ref3 = _slicedToArray(_ref2, 1), textFieldValue = _ref3[0];
+          mappedValues = _objectSpread(_objectSpread({}, mapHydrateResponseData(response)), {}, {
+            basicInputTextValue: removeFuzzyCharacter(textFieldValue)
+          });
+          setHydratedOptions(mappedValues);
           setStatus('resolved');
-          _context.next = 17;
+          _context.next = 20;
           break;
-        case 13:
-          _context.prev = 13;
+        case 16:
+          _context.prev = 16;
           _context.t0 = _context["catch"](0);
           setErrors([_context.t0]);
           setStatus('rejected');
-        case 17:
+        case 20:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 13]]);
+    }, _callee, null, [[0, 16]]);
   })), [cloudId, getHydratedJQL, jql]);
   useEffect(function () {
     if (status !== 'rejected' && errors.length !== 0) {

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

@@ -0,0 +1,87 @@
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+import mergeWith from 'lodash/mergeWith';
+import { AbstractJastVisitor, JastBuilder, NODE_TYPE_ORDER_BY, OPERAND_EMPTY, OPERAND_TYPE_KEYWORD, OPERAND_TYPE_LIST, OPERAND_TYPE_VALUE } from '@atlaskit/jql-ast';
+import { isQueryTooComplex } from './isQueryTooComplex';
+
+// Map of field keys to their respective clauses in the Jast
+
+var getFieldValues = function getFieldValues(operand) {
+  switch (operand.operandType) {
+    case OPERAND_TYPE_LIST:
+      return operand.values.map(function (value) {
+        return value.operandType === OPERAND_TYPE_VALUE && value.value || undefined;
+      }).filter(function (value) {
+        return !!value;
+      });
+    case OPERAND_TYPE_VALUE:
+      return operand.value ? [operand.value] : [];
+    case OPERAND_TYPE_KEYWORD:
+      return operand.value === OPERAND_EMPTY ? [operand.value] : [];
+    default:
+      return [];
+  }
+};
+
+/**
+ * Rather than having to navigate the entire tree structure ourself, we extend AbstractJastVisitor
+ * class and implement visitField to walk through each field and value.
+ * */
+var JqlClauseCollectingVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
+  _inherits(JqlClauseCollectingVisitor, _AbstractJastVisitor);
+  var _super = _createSuper(JqlClauseCollectingVisitor);
+  function JqlClauseCollectingVisitor() {
+    var _this;
+    _classCallCheck(this, JqlClauseCollectingVisitor);
+    _this = _super.call(this);
+    _defineProperty(_assertThisInitialized(_this), "visitField", function (field) {
+      var _field$value;
+      var fieldName = (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.toLowerCase();
+      var fieldParent = field.parent;
+      if (!fieldParent) {
+        return;
+      }
+
+      // we do not want to parse and store the order by field+value
+      var fieldGrandParent = fieldParent.parent;
+      if (fieldGrandParent.type === NODE_TYPE_ORDER_BY) {
+        return;
+      }
+      var operand = fieldParent.operand;
+      var fieldValues = operand && getFieldValues(operand) || [];
+      return _defineProperty({}, fieldName, fieldValues);
+    });
+    return _this;
+  }
+  _createClass(JqlClauseCollectingVisitor, [{
+    key: "aggregateResult",
+    value: function aggregateResult(aggregate, nextResult) {
+      return mergeWith(aggregate, nextResult, function (destValue, srcValue) {
+        return srcValue.concat(destValue !== null && destValue !== void 0 ? destValue : []);
+      });
+    }
+  }, {
+    key: "defaultResult",
+    value: function defaultResult() {
+      return {};
+    }
+  }]);
+  return JqlClauseCollectingVisitor;
+}(AbstractJastVisitor);
+export var extractValuesFromNonComplexJQL = function extractValuesFromNonComplexJQL(jql) {
+  if (isQueryTooComplex(jql)) {
+    return {};
+  }
+  var jast = new JastBuilder().build(jql);
+  var jqlClauseCollectingVisitor = new JqlClauseCollectingVisitor();
+  var mappedValues = jast.query ? jast.query.accept(jqlClauseCollectingVisitor) || {} : {}; // jast.query is defined as void | Query, hence the fallback
+
+  return mappedValues;
+};

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

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { CLAUSE_TYPE_COMPOUND, CLAUSE_TYPE_TERMINAL, OPERAND_TYPE_VALUE } from '@atlaskit/jql-ast';
 import { fuzzyCharacter } from '../../jira-search-container/buildJQL';
-var removeFuzzyCharacter = function removeFuzzyCharacter(value) {
+export var removeFuzzyCharacter = function removeFuzzyCharacter(value) {
   if (value !== null && value !== void 0 && value.endsWith(fuzzyCharacter)) {
     return value.slice(0, -1);
   }

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

@@ -113,17 +113,20 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     setJql(query);
   }, []);
   var handleSearch = useCallback(function () {
+    var isCurrentQueryComplex = isQueryTooComplex(jql);
     onSearch({
       jql: jql
     }, {
       searchMethod: currentSearchMethod,
-      basicFilterSelections: filterSelections
+      basicFilterSelections: filterSelections,
+      isQueryComplex: isCurrentQueryComplex
     });
     if (currentSearchMethod === 'basic') {
       fireEvent('ui.form.submitted.basicSearch', {});
     } else if (currentSearchMethod === 'jql') {
-      fireEvent('ui.jqlEditor.searched', {});
-      var isCurrentQueryComplex = isQueryTooComplex(jql);
+      fireEvent('ui.jqlEditor.searched', {
+        isQueryComplex: isCurrentQueryComplex
+      });
       setIsComplexQuery(isCurrentQueryComplex);
       if (showBasicFilters && !isCurrentQueryComplex) {
         fetchHydratedJqlOptions();
@@ -138,11 +141,13 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
         orderKey: orderKey
       });
       setJql(jqlWithFilterValues);
+      var isCurrentQueryComplex = isQueryTooComplex(jqlWithFilterValues);
       onSearch({
         jql: jqlWithFilterValues
       }, {
         searchMethod: currentSearchMethod,
-        basicFilterSelections: filterSelections
+        basicFilterSelections: filterSelections,
+        isQueryComplex: isCurrentQueryComplex
       });
     }, SEARCH_DEBOUNCE_MS),
     _useDebouncedCallback2 = _slicedToArray(_useDebouncedCallback, 1),
@@ -162,6 +167,9 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
   useEffect(function () {
     if (basicFilterHydrationStatus === 'resolved') {
       setFilterSelections(hydratedOptions);
+      if (hydratedOptions.basicInputTextValue) {
+        setBasicSearchTerm(hydratedOptions.basicInputTextValue);
+      }
     }
   }, [hydratedOptions, basicFilterHydrationStatus]);
   var handleSelectionChange = useCallback(function (filterType, options) {

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

@@ -133,6 +133,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
   var searchMethodSearchedWith = useRef(null);
   var visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
   var basicFilterSelectionsSearchedWith = useRef({});
+  var isSearchedWithComplexQuery = useRef(false);
   var parameters = useMemo(function () {
     return !!cloudId ? {
       cloudId: cloudId,
@@ -299,10 +300,12 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
   useColumnPickerRenderedFailedUfoExperience(status, modalRenderInstanceId);
   var onSearch = useCallback(function (newParameters, _ref2) {
     var searchMethod = _ref2.searchMethod,
-      basicFilterSelections = _ref2.basicFilterSelections;
+      basicFilterSelections = _ref2.basicFilterSelections,
+      isQueryComplex = _ref2.isQueryComplex;
     searchCount.current++;
     searchMethodSearchedWith.current = searchMethod;
     basicFilterSelectionsSearchedWith.current = basicFilterSelections;
+    isSearchedWithComplexQuery.current = isQueryComplex;
     if (jql !== newParameters.jql) {
       userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
     }
@@ -353,7 +356,8 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
         display: getDisplayValue(currentViewMode, totalCount || 0),
         searchCount: searchCount.current,
         searchMethod: mapSearchMethod(searchMethodSearchedWith.current),
-        actions: Array.from(userInteractionActions.current)
+        actions: Array.from(userInteractionActions.current),
+        isQueryComplex: isSearchedWithComplexQuery.current
       }, searchMethodSearchedWith.current === 'basic' ? _objectSpread({}, filterSelectionCount) : {}),
       eventType: 'ui'
     });

package/dist/types/analytics/generated/analytics.types.d.ts

@@ -3,7 +3,7 @@
  *
  * Generates Typescript types for analytics events from analytics.spec.yaml
  *
- * @codegen <<SignedSource::650bd05729c6d9d8eb143f643a8c34c2>>
+ * @codegen <<SignedSource::32dd97482f811937fcb07590b84179dd>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -21,7 +21,9 @@ export type ModalReadyDatasourceAttributesType = {
     instancesCount: number | null;
     schemasCount: number | null;
 };
-export type JqlEditorSearchedAttributesType = {};
+export type JqlEditorSearchedAttributesType = {
+    isQueryComplex: boolean;
+};
 export type FormSubmittedBasicSearchAttributesType = {};
 export type EmptyResultShownDatasourceAttributesType = {};
 export type ErrorShownAttributesType = {
@@ -40,6 +42,7 @@ export type ButtonClickedInsertAttributesType = {
     searchMethod: 'datasource_search_query' | 'datasource_basic_filter' | 'datasource_saved_filter' | null;
     extensionKey: string | null;
     actions: unknown[];
+    isQueryComplex: boolean;
 };
 export type ButtonClickedCancelAttributesType = {
     searchCount: number;

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

@@ -1,6 +1,8 @@
 import { SelectedOptionsMap } from '../types';
 export interface HydrateJqlState {
-    hydratedOptions: SelectedOptionsMap;
+    hydratedOptions: SelectedOptionsMap & {
+        basicInputTextValue?: string;
+    };
     fetchHydratedJqlOptions: () => Promise<void>;
     status: 'empty' | 'loading' | 'resolved' | 'rejected';
     errors: unknown[];

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

@@ -0,0 +1,4 @@
+export type ResultMap = {
+    [k: string]: string[];
+};
+export declare const extractValuesFromNonComplexJQL: (jql: string) => ResultMap;

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

@@ -1,2 +1,3 @@
 import { Clause } from '@atlaskit/jql-ast';
+export declare const removeFuzzyCharacter: (value?: string) => string | undefined;
 export declare const isClauseTooComplex: (clauses: Clause[], key: string) => boolean;

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

@@ -8,6 +8,7 @@ export interface SearchContainerProps {
     onSearch: (query: JiraIssueDatasourceParametersQuery, { searchMethod, basicFilterSelections, }: {
         searchMethod: JiraSearchMethod;
         basicFilterSelections: SelectedOptionsMap;
+        isQueryComplex: boolean;
     }) => void;
     initialSearchMethod: JiraSearchMethod;
     onSearchMethodChange: (searchMethod: JiraSearchMethod) => void;

package/dist/types-ts4.5/analytics/generated/analytics.types.d.ts

@@ -3,7 +3,7 @@
  *
  * Generates Typescript types for analytics events from analytics.spec.yaml
  *
- * @codegen <<SignedSource::650bd05729c6d9d8eb143f643a8c34c2>>
+ * @codegen <<SignedSource::32dd97482f811937fcb07590b84179dd>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -21,7 +21,9 @@ export type ModalReadyDatasourceAttributesType = {
     instancesCount: number | null;
     schemasCount: number | null;
 };
-export type JqlEditorSearchedAttributesType = {};
+export type JqlEditorSearchedAttributesType = {
+    isQueryComplex: boolean;
+};
 export type FormSubmittedBasicSearchAttributesType = {};
 export type EmptyResultShownDatasourceAttributesType = {};
 export type ErrorShownAttributesType = {
@@ -40,6 +42,7 @@ export type ButtonClickedInsertAttributesType = {
     searchMethod: 'datasource_search_query' | 'datasource_basic_filter' | 'datasource_saved_filter' | null;
     extensionKey: string | null;
     actions: unknown[];
+    isQueryComplex: boolean;
 };
 export type ButtonClickedCancelAttributesType = {
     searchCount: number;

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

@@ -1,6 +1,8 @@
 import { SelectedOptionsMap } from '../types';
 export interface HydrateJqlState {
-    hydratedOptions: SelectedOptionsMap;
+    hydratedOptions: SelectedOptionsMap & {
+        basicInputTextValue?: string;
+    };
     fetchHydratedJqlOptions: () => Promise<void>;
     status: 'empty' | 'loading' | 'resolved' | 'rejected';
     errors: unknown[];

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

@@ -0,0 +1,4 @@
+export type ResultMap = {
+    [k: string]: string[];
+};
+export declare const extractValuesFromNonComplexJQL: (jql: string) => ResultMap;

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

@@ -1,2 +1,3 @@
 import { Clause } from '@atlaskit/jql-ast';
+export declare const removeFuzzyCharacter: (value?: string) => string | undefined;
 export declare const isClauseTooComplex: (clauses: Clause[], key: string) => boolean;

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

@@ -8,6 +8,7 @@ export interface SearchContainerProps {
     onSearch: (query: JiraIssueDatasourceParametersQuery, { searchMethod, basicFilterSelections, }: {
         searchMethod: JiraSearchMethod;
         basicFilterSelections: SelectedOptionsMap;
+        isQueryComplex: boolean;
     }) => void;
     initialSearchMethod: JiraSearchMethod;
     onSearchMethodChange: (searchMethod: JiraSearchMethod) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.19.2",
+  "version": "1.19.4",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,10 +46,10 @@
     "@atlaskit/jql-ast": "^3.0.0",
     "@atlaskit/jql-editor-autocomplete-rest": "^2.0.0",
     "@atlaskit/link-client-extension": "^1.8.0",
-    "@atlaskit/linking-common": "^4.20.0",
+    "@atlaskit/linking-common": "^4.21.0",
     "@atlaskit/linking-types": "^8.5.0",
     "@atlaskit/lozenge": "^11.4.0",
-    "@atlaskit/modal-dialog": "^12.8.0",
+    "@atlaskit/modal-dialog": "^12.9.0",
     "@atlaskit/platform-feature-flags": "^0.2.4",
     "@atlaskit/pragmatic-drag-and-drop": "^0.24.0",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^0.12.0",