@atlaskit/link-datasource 1.6.0 → 1.6.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 1.6.2
+
+### Patch Changes
+
+- [#40759](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/40759) [`2e42297cee1`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2e42297cee1) - Reset default visible column keys when `shouldResetColumns` is `true`
+
+## 1.6.1
+
+### Patch Changes
+
+- [#40923](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/40923) [`1eaceeae0b0`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1eaceeae0b0) - Use jql-ast to build jql
+
 ## 1.6.0
 
 ### Minor 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.6.0"
+  packageVersion: "1.6.2"
 };

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -246,6 +246,7 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
     setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
     if (options !== null && options !== void 0 && options.shouldResetColumns) {
       setColumns([]);
+      setDefaultVisibleColumnKeys([]);
     }
   }, []);
 

package/dist/cjs/ui/assets-modal/modal/index.js

@@ -6,8 +6,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AssetsConfigModal = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
@@ -94,24 +96,18 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   (0, _react.useEffect)(function () {
-    var _responseItems = (0, _slicedToArray2.default)(responseItems, 1),
-      data = _responseItems[0];
-    if (data && isNewSearch) {
-      setVisibleColumnKeys(Object.keys(data));
-    } else if (data && (visibleColumnKeys || []).length) {
-      setVisibleColumnKeys(visibleColumnKeys);
+    if (isNewSearch) {
+      setVisibleColumnKeys(defaultVisibleColumnKeys);
     }
-    // Purposely not included 'visibleColumnKeys' as a dependency to prevent infinite loop
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [responseItems, isNewSearch]);
+  }, [defaultVisibleColumnKeys, isNewSearch]);
   (0, _react.useEffect)(function () {
     fireEvent('screen.datasourceModalDialog.viewed', {});
   }, [fireEvent]);
   var isDisabled = !!workspaceError || status === 'rejected' || status === 'loading' || status === 'empty' || !!workspaceError || assetsClientLoading || !aql || !schemaId;
   var retrieveUrlForSmartCardRender = (0, _react.useCallback)(function () {
     var _data$key;
-    var _responseItems2 = (0, _slicedToArray2.default)(responseItems, 1),
-      data = _responseItems2[0];
+    var _responseItems = (0, _slicedToArray2.default)(responseItems, 1),
+      data = _responseItems[0];
     // agreement with BE that we will use `key` for rendering smartlink
     return data === null || data === void 0 || (_data$key = data.key) === null || _data$key === void 0 || (_data$key = _data$key.data) === null || _data$key === void 0 ? void 0 : _data$key.url;
   }, [responseItems]);
@@ -153,22 +149,29 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       });
     }
   }, [aql, schemaId, workspaceId, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
-  var handleOnSearch = (0, _react.useCallback)(function (searchAql, searchSchemaId) {
-    if (schemaId !== searchSchemaId) {
-      reset({
-        shouldResetColumns: true
-      });
-      setAql(searchAql);
-      setSchemaId(searchSchemaId);
-      setIsNewSearch(true);
-      loadDatasourceDetails();
-    }
-    if (aql !== searchAql) {
-      reset();
-      setAql(searchAql);
-      setSchemaId(searchSchemaId);
-    }
-  }, [aql, loadDatasourceDetails, reset, schemaId]);
+  var handleOnSearch = (0, _react.useCallback)( /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(searchAql, searchSchemaId) {
+      return _regenerator.default.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (schemaId !== searchSchemaId || aql !== searchAql) {
+              reset({
+                shouldResetColumns: true
+              });
+              setAql(searchAql);
+              setSchemaId(searchSchemaId);
+              setIsNewSearch(true);
+            }
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }(), [aql, reset, schemaId]);
   var renderModalTitleContent = (0, _react.useCallback)(function () {
     if (workspaceError) {
       return undefined;
@@ -231,7 +234,7 @@ var analyticsContextAttributes = {
 };
 var analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.6.0",
+  packageVersion: "1.6.2",
   source: 'datasourceConfigModal'
 };
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {

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

@@ -4,23 +4,46 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.buildJQL = void 0;
+var _jqlAst = require("@atlaskit/jql-ast");
 var fuzzySearchRegExp = /^"(.+)"$/;
 var jiraIssueKeyRegExp = /[A-Z]+-\d+/;
+var constructTerminalClause = function constructTerminalClause(field, operator, value) {
+  return _jqlAst.creators.terminalClause(_jqlAst.creators.field(field), _jqlAst.creators.operator(operator), _jqlAst.creators.valueOperand(value));
+};
 var buildJQL = exports.buildJQL = function buildJQL(input) {
+  /**
+   * Jql ast - Transforming the ast
+   * https://atlaskit.atlassian.com/packages/jql/jql-ast/docs/transforming-the-ast
+   */
+  var jast = new _jqlAst.JastBuilder().build('');
+  var query = jast.query;
   var rawSearch = input.rawSearch,
     _input$orderDirection = input.orderDirection,
-    orderDirection = _input$orderDirection === void 0 ? 'DESC' : _input$orderDirection,
+    orderDirection = _input$orderDirection === void 0 ? _jqlAst.ORDER_BY_DIRECTION_DESC : _input$orderDirection,
     _input$orderKey = input.orderKey,
     orderKey = _input$orderKey === void 0 ? 'created' : _input$orderKey;
-  var fuzzy = !rawSearch.match(fuzzySearchRegExp) ? '*' : '';
-  var basicSearch = rawSearch.replace(/['"?*]+/g, '');
-  var baseQueryParts = rawSearch.trim() ? ["text ~ \"".concat(basicSearch).concat(fuzzy, "\""), "summary ~ \"".concat(basicSearch).concat(fuzzy, "\"")] : [];
-  if (jiraIssueKeyRegExp.test(rawSearch)) {
-    baseQueryParts.push("key = \"".concat(basicSearch, "\""));
+  var trimmedRawSearch = rawSearch.trim();
+  if (!query) {
+    return '';
   }
-  var baseQueryContent = baseQueryParts.join(' OR ');
-  var baseQuery = baseQueryContent ? "(".concat(baseQueryContent, ")") : '';
-  var limiter = rawSearch !== null && rawSearch !== void 0 && rawSearch.trim() ? '' : "created >= -30d";
-  var query = [baseQuery, limiter].filter(Boolean).join(' AND ');
-  return "".concat(query, " order by ").concat(orderKey, " ").concat(orderDirection.toUpperCase());
+  if (trimmedRawSearch) {
+    var fuzzy = !trimmedRawSearch.match(fuzzySearchRegExp) ? '*' : '';
+    var basicSearch = trimmedRawSearch.replace(/['"?*]+/g, '');
+    var text = constructTerminalClause('text', _jqlAst.OPERATOR_LIKE, "".concat(basicSearch).concat(fuzzy));
+    var summary = constructTerminalClause('summary', _jqlAst.OPERATOR_LIKE, "".concat(basicSearch).concat(fuzzy));
+    var orClauseFields = [text, summary];
+    if (jiraIssueKeyRegExp.test(trimmedRawSearch)) {
+      var key = constructTerminalClause('key', _jqlAst.OPERATOR_EQUALS, basicSearch);
+      orClauseFields.push(key);
+    }
+    var orClause = _jqlAst.creators.compoundClause(_jqlAst.creators.compoundOperator(_jqlAst.COMPOUND_OPERATOR_OR), orClauseFields);
+    query.appendClause(orClause, _jqlAst.COMPOUND_OPERATOR_AND);
+  } else {
+    var created = constructTerminalClause('created', _jqlAst.OPERATOR_GT_EQUALS, '-30d');
+    query.appendClause(created, _jqlAst.COMPOUND_OPERATOR_AND);
+  }
+  var orderField = _jqlAst.creators.orderByField(_jqlAst.creators.field(orderKey));
+  query.prependOrderField(orderField);
+  query.setOrderDirection(_jqlAst.creators.orderByDirection(orderDirection.toLowerCase() === 'asc' ? _jqlAst.ORDER_BY_DIRECTION_ASC : _jqlAst.ORDER_BY_DIRECTION_DESC));
+  return (0, _jqlAst.print)(jast);
 };

package/dist/es2019/analytics/constants.js

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

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -147,6 +147,7 @@ export const useDatasourceTableState = ({
     setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
     if (options !== null && options !== void 0 && options.shouldResetColumns) {
       setColumns([]);
+      setDefaultVisibleColumnKeys([]);
     }
   }, []);
 

package/dist/es2019/ui/assets-modal/modal/index.js

@@ -72,15 +72,10 @@ const PlainAssetsConfigModal = props => {
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   useEffect(() => {
-    const [data] = responseItems;
-    if (data && isNewSearch) {
-      setVisibleColumnKeys(Object.keys(data));
-    } else if (data && (visibleColumnKeys || []).length) {
-      setVisibleColumnKeys(visibleColumnKeys);
+    if (isNewSearch) {
+      setVisibleColumnKeys(defaultVisibleColumnKeys);
     }
-    // Purposely not included 'visibleColumnKeys' as a dependency to prevent infinite loop
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [responseItems, isNewSearch]);
+  }, [defaultVisibleColumnKeys, isNewSearch]);
   useEffect(() => {
     fireEvent('screen.datasourceModalDialog.viewed', {});
   }, [fireEvent]);
@@ -127,22 +122,16 @@ const PlainAssetsConfigModal = props => {
       });
     }
   }, [aql, schemaId, workspaceId, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
-  const handleOnSearch = useCallback((searchAql, searchSchemaId) => {
-    if (schemaId !== searchSchemaId) {
+  const handleOnSearch = useCallback(async (searchAql, searchSchemaId) => {
+    if (schemaId !== searchSchemaId || aql !== searchAql) {
       reset({
         shouldResetColumns: true
       });
       setAql(searchAql);
       setSchemaId(searchSchemaId);
       setIsNewSearch(true);
-      loadDatasourceDetails();
-    }
-    if (aql !== searchAql) {
-      reset();
-      setAql(searchAql);
-      setSchemaId(searchSchemaId);
     }
-  }, [aql, loadDatasourceDetails, reset, schemaId]);
+  }, [aql, reset, schemaId]);
   const renderModalTitleContent = useCallback(() => {
     if (workspaceError) {
       return undefined;
@@ -205,7 +194,7 @@ const analyticsContextAttributes = {
 };
 const analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.6.0",
+  packageVersion: "1.6.2",
   source: 'datasourceConfigModal'
 };
 const contextData = {

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

@@ -1,20 +1,43 @@
+import { COMPOUND_OPERATOR_AND, COMPOUND_OPERATOR_OR, creators, JastBuilder, OPERATOR_EQUALS, OPERATOR_GT_EQUALS, OPERATOR_LIKE, ORDER_BY_DIRECTION_ASC, ORDER_BY_DIRECTION_DESC, print } from '@atlaskit/jql-ast';
 const fuzzySearchRegExp = /^"(.+)"$/;
 const jiraIssueKeyRegExp = /[A-Z]+-\d+/;
+const constructTerminalClause = (field, operator, value) => creators.terminalClause(creators.field(field), creators.operator(operator), creators.valueOperand(value));
 export const buildJQL = input => {
+  /**
+   * Jql ast - Transforming the ast
+   * https://atlaskit.atlassian.com/packages/jql/jql-ast/docs/transforming-the-ast
+   */
+  const jast = new JastBuilder().build('');
+  const {
+    query
+  } = jast;
   const {
     rawSearch,
-    orderDirection = 'DESC',
+    orderDirection = ORDER_BY_DIRECTION_DESC,
     orderKey = 'created'
   } = input;
-  const fuzzy = !rawSearch.match(fuzzySearchRegExp) ? '*' : '';
-  const basicSearch = rawSearch.replace(/['"?*]+/g, '');
-  const baseQueryParts = rawSearch.trim() ? [`text ~ "${basicSearch}${fuzzy}"`, `summary ~ "${basicSearch}${fuzzy}"`] : [];
-  if (jiraIssueKeyRegExp.test(rawSearch)) {
-    baseQueryParts.push(`key = "${basicSearch}"`);
+  const trimmedRawSearch = rawSearch.trim();
+  if (!query) {
+    return '';
+  }
+  if (trimmedRawSearch) {
+    const fuzzy = !trimmedRawSearch.match(fuzzySearchRegExp) ? '*' : '';
+    const basicSearch = trimmedRawSearch.replace(/['"?*]+/g, '');
+    const text = constructTerminalClause('text', OPERATOR_LIKE, `${basicSearch}${fuzzy}`);
+    const summary = constructTerminalClause('summary', OPERATOR_LIKE, `${basicSearch}${fuzzy}`);
+    const orClauseFields = [text, summary];
+    if (jiraIssueKeyRegExp.test(trimmedRawSearch)) {
+      const key = constructTerminalClause('key', OPERATOR_EQUALS, basicSearch);
+      orClauseFields.push(key);
+    }
+    const orClause = creators.compoundClause(creators.compoundOperator(COMPOUND_OPERATOR_OR), orClauseFields);
+    query.appendClause(orClause, COMPOUND_OPERATOR_AND);
+  } else {
+    const created = constructTerminalClause('created', OPERATOR_GT_EQUALS, '-30d');
+    query.appendClause(created, COMPOUND_OPERATOR_AND);
   }
-  const baseQueryContent = baseQueryParts.join(' OR ');
-  const baseQuery = baseQueryContent ? `(${baseQueryContent})` : '';
-  const limiter = rawSearch !== null && rawSearch !== void 0 && rawSearch.trim() ? '' : `created >= -30d`;
-  const query = [baseQuery, limiter].filter(Boolean).join(' AND ');
-  return `${query} order by ${orderKey} ${orderDirection.toUpperCase()}`;
+  const orderField = creators.orderByField(creators.field(orderKey));
+  query.prependOrderField(orderField);
+  query.setOrderDirection(creators.orderByDirection(orderDirection.toLowerCase() === 'asc' ? ORDER_BY_DIRECTION_ASC : ORDER_BY_DIRECTION_DESC));
+  return print(jast);
 };

package/dist/esm/analytics/constants.js

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

package/dist/esm/hooks/useDatasourceTableState.js

@@ -239,6 +239,7 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
     setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
     if (options !== null && options !== void 0 && options.shouldResetColumns) {
       setColumns([]);
+      setDefaultVisibleColumnKeys([]);
     }
   }, []);
 

package/dist/esm/ui/assets-modal/modal/index.js

@@ -1,8 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _extends from "@babel/runtime/helpers/extends";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 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 _regeneratorRuntime from "@babel/runtime/regenerator";
 /** @jsx jsx */
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { css, jsx } from '@emotion/react';
@@ -85,24 +87,18 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   useEffect(function () {
-    var _responseItems = _slicedToArray(responseItems, 1),
-      data = _responseItems[0];
-    if (data && isNewSearch) {
-      setVisibleColumnKeys(Object.keys(data));
-    } else if (data && (visibleColumnKeys || []).length) {
-      setVisibleColumnKeys(visibleColumnKeys);
+    if (isNewSearch) {
+      setVisibleColumnKeys(defaultVisibleColumnKeys);
     }
-    // Purposely not included 'visibleColumnKeys' as a dependency to prevent infinite loop
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [responseItems, isNewSearch]);
+  }, [defaultVisibleColumnKeys, isNewSearch]);
   useEffect(function () {
     fireEvent('screen.datasourceModalDialog.viewed', {});
   }, [fireEvent]);
   var isDisabled = !!workspaceError || status === 'rejected' || status === 'loading' || status === 'empty' || !!workspaceError || assetsClientLoading || !aql || !schemaId;
   var retrieveUrlForSmartCardRender = useCallback(function () {
     var _data$key;
-    var _responseItems2 = _slicedToArray(responseItems, 1),
-      data = _responseItems2[0];
+    var _responseItems = _slicedToArray(responseItems, 1),
+      data = _responseItems[0];
     // agreement with BE that we will use `key` for rendering smartlink
     return data === null || data === void 0 || (_data$key = data.key) === null || _data$key === void 0 || (_data$key = _data$key.data) === null || _data$key === void 0 ? void 0 : _data$key.url;
   }, [responseItems]);
@@ -144,22 +140,29 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       });
     }
   }, [aql, schemaId, workspaceId, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
-  var handleOnSearch = useCallback(function (searchAql, searchSchemaId) {
-    if (schemaId !== searchSchemaId) {
-      reset({
-        shouldResetColumns: true
-      });
-      setAql(searchAql);
-      setSchemaId(searchSchemaId);
-      setIsNewSearch(true);
-      loadDatasourceDetails();
-    }
-    if (aql !== searchAql) {
-      reset();
-      setAql(searchAql);
-      setSchemaId(searchSchemaId);
-    }
-  }, [aql, loadDatasourceDetails, reset, schemaId]);
+  var handleOnSearch = useCallback( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(searchAql, searchSchemaId) {
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (schemaId !== searchSchemaId || aql !== searchAql) {
+              reset({
+                shouldResetColumns: true
+              });
+              setAql(searchAql);
+              setSchemaId(searchSchemaId);
+              setIsNewSearch(true);
+            }
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }(), [aql, reset, schemaId]);
   var renderModalTitleContent = useCallback(function () {
     if (workspaceError) {
       return undefined;
@@ -222,7 +225,7 @@ var analyticsContextAttributes = {
 };
 var analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.6.0",
+  packageVersion: "1.6.2",
   source: 'datasourceConfigModal'
 };
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {

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

@@ -1,20 +1,43 @@
+import { COMPOUND_OPERATOR_AND, COMPOUND_OPERATOR_OR, creators, JastBuilder, OPERATOR_EQUALS, OPERATOR_GT_EQUALS, OPERATOR_LIKE, ORDER_BY_DIRECTION_ASC, ORDER_BY_DIRECTION_DESC, print } from '@atlaskit/jql-ast';
 var fuzzySearchRegExp = /^"(.+)"$/;
 var jiraIssueKeyRegExp = /[A-Z]+-\d+/;
+var constructTerminalClause = function constructTerminalClause(field, operator, value) {
+  return creators.terminalClause(creators.field(field), creators.operator(operator), creators.valueOperand(value));
+};
 export var buildJQL = function buildJQL(input) {
+  /**
+   * Jql ast - Transforming the ast
+   * https://atlaskit.atlassian.com/packages/jql/jql-ast/docs/transforming-the-ast
+   */
+  var jast = new JastBuilder().build('');
+  var query = jast.query;
   var rawSearch = input.rawSearch,
     _input$orderDirection = input.orderDirection,
-    orderDirection = _input$orderDirection === void 0 ? 'DESC' : _input$orderDirection,
+    orderDirection = _input$orderDirection === void 0 ? ORDER_BY_DIRECTION_DESC : _input$orderDirection,
     _input$orderKey = input.orderKey,
     orderKey = _input$orderKey === void 0 ? 'created' : _input$orderKey;
-  var fuzzy = !rawSearch.match(fuzzySearchRegExp) ? '*' : '';
-  var basicSearch = rawSearch.replace(/['"?*]+/g, '');
-  var baseQueryParts = rawSearch.trim() ? ["text ~ \"".concat(basicSearch).concat(fuzzy, "\""), "summary ~ \"".concat(basicSearch).concat(fuzzy, "\"")] : [];
-  if (jiraIssueKeyRegExp.test(rawSearch)) {
-    baseQueryParts.push("key = \"".concat(basicSearch, "\""));
+  var trimmedRawSearch = rawSearch.trim();
+  if (!query) {
+    return '';
   }
-  var baseQueryContent = baseQueryParts.join(' OR ');
-  var baseQuery = baseQueryContent ? "(".concat(baseQueryContent, ")") : '';
-  var limiter = rawSearch !== null && rawSearch !== void 0 && rawSearch.trim() ? '' : "created >= -30d";
-  var query = [baseQuery, limiter].filter(Boolean).join(' AND ');
-  return "".concat(query, " order by ").concat(orderKey, " ").concat(orderDirection.toUpperCase());
+  if (trimmedRawSearch) {
+    var fuzzy = !trimmedRawSearch.match(fuzzySearchRegExp) ? '*' : '';
+    var basicSearch = trimmedRawSearch.replace(/['"?*]+/g, '');
+    var text = constructTerminalClause('text', OPERATOR_LIKE, "".concat(basicSearch).concat(fuzzy));
+    var summary = constructTerminalClause('summary', OPERATOR_LIKE, "".concat(basicSearch).concat(fuzzy));
+    var orClauseFields = [text, summary];
+    if (jiraIssueKeyRegExp.test(trimmedRawSearch)) {
+      var key = constructTerminalClause('key', OPERATOR_EQUALS, basicSearch);
+      orClauseFields.push(key);
+    }
+    var orClause = creators.compoundClause(creators.compoundOperator(COMPOUND_OPERATOR_OR), orClauseFields);
+    query.appendClause(orClause, COMPOUND_OPERATOR_AND);
+  } else {
+    var created = constructTerminalClause('created', OPERATOR_GT_EQUALS, '-30d');
+    query.appendClause(created, COMPOUND_OPERATOR_AND);
+  }
+  var orderField = creators.orderByField(creators.field(orderKey));
+  query.prependOrderField(orderField);
+  query.setOrderDirection(creators.orderByDirection(orderDirection.toLowerCase() === 'asc' ? ORDER_BY_DIRECTION_ASC : ORDER_BY_DIRECTION_DESC));
+  return print(jast);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -42,12 +42,13 @@
     "@atlaskit/icon": "^21.12.0",
     "@atlaskit/icon-object": "^6.3.0",
     "@atlaskit/image": "^1.1.0",
+    "@atlaskit/jql-ast": "^3.0.0",
     "@atlaskit/jql-editor-autocomplete-rest": "^2.0.0",
     "@atlaskit/link-client-extension": "^1.7.0",
-    "@atlaskit/linking-common": "^4.10.0",
+    "@atlaskit/linking-common": "^4.11.0",
     "@atlaskit/linking-types": "^8.4.0",
     "@atlaskit/lozenge": "^11.4.0",
-    "@atlaskit/modal-dialog": "^12.7.0",
+    "@atlaskit/modal-dialog": "^12.8.0",
     "@atlaskit/platform-feature-flags": "^0.2.4",
     "@atlaskit/pragmatic-drag-and-drop": "^0.23.0",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^0.11.0",