@atlaskit/link-datasource 1.5.3 → 1.6.1

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

@@ -4,24 +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 buildJQL = function buildJQL(input) {
+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());
-};
-exports.buildJQL = buildJQL;
+  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/cjs/ui/jira-issues-modal/jira-search-container/index.js

@@ -30,11 +30,10 @@ var inputContainerStyles = (0, _react2.css)({
 });
 var DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
 var JiraSearchMethodSwitcher = _modeSwitcher.ModeSwitcher;
-var getInitialSearchMethod = function getInitialSearchMethod(initialJql) {
+var getInitialSearchMethod = exports.getInitialSearchMethod = function getInitialSearchMethod(initialJql) {
   return initialJql ? 'jql' : 'basic';
 };
-exports.getInitialSearchMethod = getInitialSearchMethod;
-var JiraSearchContainer = function JiraSearchContainer(props) {
+var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchContainer(props) {
   var isSearching = props.isSearching,
     parameters = props.parameters,
     onSearch = props.onSearch;
@@ -134,5 +133,4 @@ var JiraSearchContainer = function JiraSearchContainer(props) {
       value: 'jql'
     }]
   }));
-};
-exports.JiraSearchContainer = JiraSearchContainer;
+};

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

@@ -5,11 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.modeSwitcherMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
-var modeSwitcherMessages = (0, _reactIntlNext.defineMessages)({
+var modeSwitcherMessages = exports.modeSwitcherMessages = (0, _reactIntlNext.defineMessages)({
   basicTextSearchLabel: {
     id: 'linkDataSource.jira-issues.configmodal.basicModeText',
     description: 'Display text for basic text search toggle button',
     defaultMessage: 'Basic'
   }
-});
-exports.modeSwitcherMessages = modeSwitcherMessages;
+});

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

@@ -12,7 +12,7 @@ var _makeGetJqlAutocompleteData = require("../../../services/makeGetJqlAutocompl
 var _makeGetJqlSuggestionsData = require("../../../services/makeGetJqlSuggestionsData");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var JiraJQLEditor = function JiraJQLEditor(props) {
+var JiraJQLEditor = exports.JiraJQLEditor = function JiraJQLEditor(props) {
   var cloudId = props.cloudId,
     isSearching = props.isSearching,
     onChange = props.onChange,
@@ -27,7 +27,7 @@ var JiraJQLEditor = function JiraJQLEditor(props) {
   (0, _react.useEffect)(function () {
     requestAnimationFrame(function () {
       var _inputRef$current;
-      (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+      (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.focus();
     });
   }, []);
   var searchIfValidJql = function searchIfValidJql(_, jast) {
@@ -44,5 +44,4 @@ var JiraJQLEditor = function JiraJQLEditor(props) {
     inputRef: inputRef,
     query: query
   });
-};
-exports.JiraJQLEditor = JiraJQLEditor;
+};

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

@@ -79,7 +79,7 @@ var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
  * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
  * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
  */
-var getColumnAction = function getColumnAction(oldVisibleColumnKeys, newVisibleColumnKeys) {
+var getColumnAction = exports.getColumnAction = function getColumnAction(oldVisibleColumnKeys, newVisibleColumnKeys) {
   var newColumnSize = newVisibleColumnKeys.length;
   var oldColumnSize = oldVisibleColumnKeys.length;
   if (newColumnSize > oldColumnSize) {
@@ -90,8 +90,7 @@ var getColumnAction = function getColumnAction(oldVisibleColumnKeys, newVisibleC
     return _types.DatasourceAction.COLUMN_REORDERED;
   }
 };
-exports.getColumnAction = getColumnAction;
-var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
+var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var datasourceId = props.datasourceId,
     initialParameters = props.parameters,
     initialVisibleColumnKeys = props.visibleColumnKeys,
@@ -310,11 +309,11 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     });
   }, [reset]);
   var retrieveUrlForSmartCardRender = (0, _react.useCallback)(function () {
-    var _data$key, _data$key$data;
+    var _data$key;
     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 ? void 0 : (_data$key = data.key) === null || _data$key === void 0 ? void 0 : (_data$key$data = _data$key.data) === null || _data$key$data === void 0 ? void 0 : _data$key$data.url;
+    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]);
   var onInsertPressed = (0, _react.useCallback)(function (e, analyticsEvent) {
     var _insertButtonClickedE;
@@ -518,7 +517,6 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     testId: 'jira-jql-datasource-modal--insert-button'
   }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.insertIssuesButtonText)))));
 };
-exports.PlainJiraIssuesConfigModal = PlainJiraIssuesConfigModal;
 var analyticsContextAttributes = {
   dataProvider: 'jira-issues'
 };
@@ -528,5 +526,4 @@ var analyticsContextData = _objectSpread(_objectSpread({}, _constants.packageMet
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });
-var JiraIssuesConfigModal = (0, _analyticsNext.withAnalyticsContext)(contextData)(PlainJiraIssuesConfigModal);
-exports.JiraIssuesConfigModal = JiraIssuesConfigModal;
+var JiraIssuesConfigModal = exports.JiraIssuesConfigModal = (0, _analyticsNext.withAnalyticsContext)(contextData)(PlainJiraIssuesConfigModal);

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.modalMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
-var modalMessages = (0, _reactIntlNext.defineMessages)({
+var modalMessages = exports.modalMessages = (0, _reactIntlNext.defineMessages)({
   cancelButtonText: {
     id: 'linkDataSource.jira-issues.configmodal.cancelButtonText',
     description: 'Button text to close the modal with no changes being made',
@@ -46,5 +46,4 @@ var modalMessages = (0, _reactIntlNext.defineMessages)({
     description: 'Text that appears after issue count number.',
     defaultMessage: '{totalCount, plural, one {issue} other {issues}}'
   }
-});
-exports.modalMessages = modalMessages;
+});

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

@@ -59,7 +59,7 @@ var modeSwitcherLabelDisabledStyles = (0, _react2.css)({
 var compactModeSwitcherLabelStyles = (0, _react2.css)({
   padding: "var(--ds-space-025, 2px)".concat(" ", "var(--ds-space-050, 4px)")
 });
-var ModeSwitcher = function ModeSwitcher(props) {
+var ModeSwitcher = exports.ModeSwitcher = function ModeSwitcher(props) {
   var _options$;
   var isCompact = props.isCompact,
     isDisabled = props.isDisabled,
@@ -93,5 +93,4 @@ var ModeSwitcher = function ModeSwitcher(props) {
       value: value
     }));
   })) : null;
-};
-exports.ModeSwitcher = ModeSwitcher;
+};

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

@@ -18,7 +18,7 @@ var _excluded = ["triggerRef"];
 /** @jsx jsx */
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var JiraSiteSelector = function JiraSiteSelector(props) {
+var JiraSiteSelector = exports.JiraSiteSelector = function JiraSiteSelector(props) {
   var availableSites = props.availableSites,
     onSiteSelection = props.onSiteSelection,
     selectedJiraSite = props.selectedJiraSite,
@@ -52,5 +52,4 @@ var JiraSiteSelector = function JiraSiteSelector(props) {
       testId: testId && "".concat(testId, "--dropdown-item").concat(isSelected ? '__selected' : '')
     }, displayName);
   })));
-};
-exports.JiraSiteSelector = JiraSiteSelector;
+};

package/dist/cjs/ui/jira-issues-modal/site-selector/messages.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.siteSelectorMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
-var siteSelectorMessages = (0, _reactIntlNext.defineMessages)({
+var siteSelectorMessages = exports.siteSelectorMessages = (0, _reactIntlNext.defineMessages)({
   dropdownChevronLabel: {
     id: 'linkDataSource.jira-issues.configmodal.dropdownChevronLabel',
     description: 'Label for button that reveals more available site options to choose from',
@@ -16,5 +16,4 @@ var siteSelectorMessages = (0, _reactIntlNext.defineMessages)({
     description: 'Label for a check icon declaring which option is selected',
     defaultMessage: '{siteName} is selected'
   }
-});
-exports.siteSelectorMessages = siteSelectorMessages;
+});

package/dist/cjs/ui/table-footer/index.js

@@ -26,7 +26,7 @@ var TopBorderWrapper = _styled.default.div(_templateObject2 || (_templateObject2
 var ItemCounterWrapper = _styled.default.div(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  align-self: center;\n"])));
 var SyncWrapper = _styled.default.div(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  align-items: center;\n  color: ", ";\n"])), "var(--ds-text-accent-gray, ".concat(_colors.N90, ")"));
 var SyncTextWrapper = _styled.default.div(_templateObject5 || (_templateObject5 = (0, _taggedTemplateLiteral2.default)(["\n  margin-right: 5px;\n  font-size: 12px;\n"])));
-var TableFooter = function TableFooter(_ref) {
+var TableFooter = exports.TableFooter = function TableFooter(_ref) {
   var itemCount = _ref.itemCount,
     onRefresh = _ref.onRefresh,
     isLoading = _ref.isLoading,
@@ -79,5 +79,4 @@ var TableFooter = function TableFooter(_ref) {
     isDisabled: isLoading,
     testId: "refresh-button"
   }))))) : null;
-};
-exports.TableFooter = TableFooter;
+};

package/dist/cjs/ui/table-footer/messages.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.footerMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
-var footerMessages = (0, _reactIntlNext.defineMessages)({
+var footerMessages = exports.footerMessages = (0, _reactIntlNext.defineMessages)({
   itemText: {
     id: 'linkDataSource.table-footer.item',
     description: 'Text that appears after item count number.',
@@ -21,5 +21,4 @@ var footerMessages = (0, _reactIntlNext.defineMessages)({
     description: 'Label for refresh icon',
     defaultMessage: 'Refresh'
   }
-});
-exports.footerMessages = footerMessages;
+});

package/dist/cjs/ui/table-footer/sync-info/index.js

@@ -24,7 +24,7 @@ var WithUpdatedLabel = function WithUpdatedLabel(formattedDate) {
     }
   }));
 };
-var SyncInfo = function SyncInfo(_ref) {
+var SyncInfo = exports.SyncInfo = function SyncInfo(_ref) {
   var lastSyncTime = _ref.lastSyncTime;
   var calculateTimeDiff = (0, _react.useCallback)(function () {
     return Math.floor((Date.now() - lastSyncTime.getTime()) / 1000);
@@ -75,5 +75,4 @@ var SyncInfo = function SyncInfo(_ref) {
     }, WithUpdatedLabel);
   }
   return WithUpdatedLabel();
-};
-exports.SyncInfo = SyncInfo;
+};

package/dist/cjs/ui/table-footer/sync-info/messages.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.messages = void 0;
 var _reactIntlNext = require("react-intl-next");
-var messages = (0, _reactIntlNext.defineMessages)({
+var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
   underOneMinuteText: {
     id: 'linkDataSource.table-footer.date_formatter.under_one_minute',
     defaultMessage: 'Synced just now',
@@ -16,5 +16,4 @@ var messages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: 'Synced {date}',
     description: 'A text to indicate the last data fetch time was over a minute.'
   }
-});
-exports.messages = messages;
+});

package/dist/es2019/analytics/constants.js

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

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

@@ -205,7 +205,7 @@ const analyticsContextAttributes = {
 };
 const analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.5.3",
+  packageVersion: "1.6.1",
   source: 'datasourceConfigModal'
 };
 const contextData = {

package/dist/es2019/ui/datasource-table-view/datasourceTableView.js

@@ -52,7 +52,8 @@ const DatasourceTableViewWithoutAnalytics = ({
       mechanism of initial loading. Use of ref here makes it basically work as a `componentDidUpdate` but not `componentDidMount`
    */
   const isInitialRender = useRef(true);
-  const isDataReady = columns.length > 0 && responseItems.length > 0 && totalCount && totalCount > 0;
+  const hasColumns = !!columns.length;
+  const isDataReady = hasColumns && responseItems.length > 0 && totalCount && totalCount > 0;
   visibleColumnCount.current = (visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0;
   useEffect(() => {
     if (!isInitialRender.current) {
@@ -118,7 +119,7 @@ const DatasourceTableViewWithoutAnalytics = ({
     // datasource-table classname is to exclude all children from being commentable - exclude list is in CFE
     jsx("div", {
       className: "datasource-table"
-    }, isDataReady ? jsx(IssueLikeDataTableView, {
+    }, hasColumns ? jsx(IssueLikeDataTableView, {
       testId: 'datasource-table-view',
       hasNextPage: hasNextPage,
       items: responseItems,

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

@@ -363,7 +363,7 @@ export const IssueLikeDataTableView = ({
         }
       }, heading);
     }
-  }), onVisibleColumnKeysChange && hasData && jsx(ColumnPickerHeader, null, jsx(ColumnPicker, {
+  }), onVisibleColumnKeysChange && jsx(ColumnPickerHeader, null, jsx(ColumnPicker, {
     columns: hasFullSchema ? orderedColumns : [],
     selectedColumnKeys: hasFullSchema ? visibleColumnKeys : [],
     onSelectedColumnKeysChange: onSelectedColumnKeysChange,

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.5.3"
+  packageVersion: "1.6.1"
 };

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

@@ -100,11 +100,11 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
   }, [fireEvent]);
   var isDisabled = !!workspaceError || status === 'rejected' || status === 'loading' || status === 'empty' || !!workspaceError || assetsClientLoading || !aql || !schemaId;
   var retrieveUrlForSmartCardRender = useCallback(function () {
-    var _data$key, _data$key$data;
+    var _data$key;
     var _responseItems2 = _slicedToArray(responseItems, 1),
       data = _responseItems2[0];
     // agreement with BE that we will use `key` for rendering smartlink
-    return data === null || data === void 0 ? void 0 : (_data$key = data.key) === null || _data$key === void 0 ? void 0 : (_data$key$data = _data$key.data) === null || _data$key$data === void 0 ? void 0 : _data$key$data.url;
+    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]);
   var onInsertPressed = useCallback(function () {
     if (!aql || !schemaId || !workspaceId) {
@@ -222,7 +222,7 @@ var analyticsContextAttributes = {
 };
 var analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.5.3",
+  packageVersion: "1.6.1",
   source: 'datasourceConfigModal'
 };
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {

package/dist/esm/ui/datasource-table-view/datasourceTableView.js

@@ -49,7 +49,8 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
       mechanism of initial loading. Use of ref here makes it basically work as a `componentDidUpdate` but not `componentDidMount`
    */
   var isInitialRender = useRef(true);
-  var isDataReady = columns.length > 0 && responseItems.length > 0 && totalCount && totalCount > 0;
+  var hasColumns = !!columns.length;
+  var isDataReady = hasColumns && responseItems.length > 0 && totalCount && totalCount > 0;
   visibleColumnCount.current = (visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0;
   useEffect(function () {
     if (!isInitialRender.current) {
@@ -115,7 +116,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
     // datasource-table classname is to exclude all children from being commentable - exclude list is in CFE
     jsx("div", {
       className: "datasource-table"
-    }, isDataReady ? jsx(IssueLikeDataTableView, {
+    }, hasColumns ? jsx(IssueLikeDataTableView, {
       testId: 'datasource-table-view',
       hasNextPage: hasNextPage,
       items: responseItems,

package/dist/esm/ui/issue-like-table/column-picker/index.js

@@ -92,9 +92,9 @@ export var ColumnPicker = function ColumnPicker(_ref) {
   };
   useEffect(function () {
     if (allOptions.length) {
-      var _pickerRef$current, _pickerRef$current$se, _pickerRef$current$se2;
+      var _pickerRef$current;
       // necessary to refocus the search input after the loading state
-      pickerRef === null || pickerRef === void 0 ? void 0 : (_pickerRef$current = pickerRef.current) === null || _pickerRef$current === void 0 ? void 0 : (_pickerRef$current$se = _pickerRef$current.selectRef) === null || _pickerRef$current$se === void 0 ? void 0 : (_pickerRef$current$se2 = _pickerRef$current$se.inputRef) === null || _pickerRef$current$se2 === void 0 ? void 0 : _pickerRef$current$se2.focus();
+      pickerRef === null || pickerRef === void 0 || (_pickerRef$current = pickerRef.current) === null || _pickerRef$current === void 0 || (_pickerRef$current = _pickerRef$current.selectRef) === null || _pickerRef$current === void 0 || (_pickerRef$current = _pickerRef$current.inputRef) === null || _pickerRef$current === void 0 || _pickerRef$current.focus();
     }
   }, [allOptions]);
   useEffect(function () {

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

@@ -258,7 +258,7 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
             indexOfTarget: indexOfTarget,
             axis: 'horizontal'
           });
-          onVisibleColumnKeysChange === null || onVisibleColumnKeysChange === void 0 ? void 0 : onVisibleColumnKeysChange(_toConsumableArray(newColumnKeyOrder));
+          onVisibleColumnKeysChange === null || onVisibleColumnKeysChange === void 0 || onVisibleColumnKeysChange(_toConsumableArray(newColumnKeyOrder));
 
           // We sort columns (whole objects) according to their key order presented in newColumnKeyOrder
           setOrderedColumns(function (columns) {
@@ -300,7 +300,7 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
     return [].concat(_toConsumableArray(tableRows), _toConsumableArray(status === 'loading' ? [loadingRow] : []));
   }, [loadingRow, status, tableRows]);
   var onSelectedColumnKeysChange = useCallback(function (newSelectedColumnKeys) {
-    onVisibleColumnKeysChange === null || onVisibleColumnKeysChange === void 0 ? void 0 : onVisibleColumnKeysChange(newSelectedColumnKeys);
+    onVisibleColumnKeysChange === null || onVisibleColumnKeysChange === void 0 || onVisibleColumnKeysChange(newSelectedColumnKeys);
   }, [onVisibleColumnKeysChange]);
   var handlePickerOpen = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -395,7 +395,7 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref2) {
         }
       }, heading);
     }
-  }), onVisibleColumnKeysChange && hasData && jsx(ColumnPickerHeader, null, jsx(ColumnPicker, {
+  }), onVisibleColumnKeysChange && jsx(ColumnPickerHeader, null, jsx(ColumnPicker, {
     columns: hasFullSchema ? orderedColumns : [],
     selectedColumnKeys: hasFullSchema ? visibleColumnKeys : [],
     onSelectedColumnKeysChange: onSelectedColumnKeysChange,

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/dist/esm/ui/jira-issues-modal/jql-editor/index.js

@@ -18,7 +18,7 @@ export var JiraJQLEditor = function JiraJQLEditor(props) {
   useEffect(function () {
     requestAnimationFrame(function () {
       var _inputRef$current;
-      (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+      (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.focus();
     });
   }, []);
   var searchIfValidJql = function searchIfValidJql(_, jast) {

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

@@ -300,11 +300,11 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     });
   }, [reset]);
   var retrieveUrlForSmartCardRender = useCallback(function () {
-    var _data$key, _data$key$data;
+    var _data$key;
     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 ? void 0 : (_data$key = data.key) === null || _data$key === void 0 ? void 0 : (_data$key$data = _data$key.data) === null || _data$key$data === void 0 ? void 0 : _data$key$data.url;
+    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]);
   var onInsertPressed = useCallback(function (e, analyticsEvent) {
     var _insertButtonClickedE;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.5.3",
+  "version": "1.6.1",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -42,6 +42,7 @@
     "@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",
@@ -54,7 +55,7 @@
     "@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^0.6.0",
     "@atlaskit/pragmatic-drag-and-drop-react-indicator": "^0.16.0",
     "@atlaskit/select": "^16.7.0",
-    "@atlaskit/smart-card": "^26.31.0",
+    "@atlaskit/smart-card": "^26.33.0",
     "@atlaskit/spinner": "^15.6.0",
     "@atlaskit/tag": "^11.6.0",
     "@atlaskit/textfield": "5.6.8",
@@ -78,6 +79,7 @@
     "react-intl-next": "npm:react-intl@^5.18.1"
   },
   "devDependencies": {
+    "@af/integration-testing": "*",
     "@af/visual-regression": "*",
     "@atlaskit/link-provider": "^1.6.0",
     "@atlaskit/link-test-helpers": "^6.1.0",