@atlaskit/link-datasource 1.19.3 → 1.19.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 1.19.5
+
+### Patch Changes
+
+- [#43878](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43878) [`0eaf28a90c3`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0eaf28a90c3) - Fix an issue where undefined value for basicInputTextValue was breaking build JQL logic.
+
+## 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

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.3"
+  packageVersion: "1.19.5"
 };

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

@@ -55,9 +55,9 @@ var useHydrateJqlQuery = exports.useHydrateJqlQuery = function useHydrateJqlQuer
            */
           _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)), {}, {
+          mappedValues = _objectSpread(_objectSpread({}, (0, _transformers.mapHydrateResponseData)(response)), textFieldValue ? {
             basicInputTextValue: (0, _isClauseTooComplex.removeFuzzyCharacter)(textFieldValue)
-          });
+          } : {});
           setHydratedOptions(mappedValues);
           setStatus('resolved');
           _context.next = 20;

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

@@ -84,6 +84,13 @@ function mapHydrateResponseData(_ref2) {
     var jqlTerm = _ref3.jqlTerm,
       _ref3$values = _ref3.values,
       values = _ref3$values === void 0 ? [] : _ref3$values;
+    /**
+     * Currently, the hydrate query does not support text field in JQL and returns as {} object.
+     * Hence we check if a valid jqlTerm is available
+     */
+    if (!jqlTerm) {
+      return;
+    }
     var options = values.map(function (_ref4) {
       var values = _ref4.values;
       return values && values[0] ? mapNodeToOption(values[0]) : null;

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.fuzzyCharacter = exports.buildJQL = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jqlAst = require("@atlaskit/jql-ast");
+var _ui = require("../basic-filters/ui");
 var fuzzySearchRegExp = /^"(.+)"$/;
 var jiraIssueKeyRegExp = /[A-Z]+-\d+/;
 var fuzzyCharacter = exports.fuzzyCharacter = '*';
@@ -27,7 +28,15 @@ var buildJQL = exports.buildJQL = function buildJQL(input) {
     orderKey = _input$orderKey === void 0 ? 'created' : _input$orderKey,
     filterValues = input.filterValues;
   var trimmedRawSearch = rawSearch.trim();
-  var hasFilterSelectionValues = filterValues && Object.values(filterValues).some(function (value) {
+  var hasValidFilterSelectionAndValues = filterValues &&
+  // checks if filterValues have only valid keys
+  Object.entries(filterValues).every(function (_ref) {
+    var _ref2 = (0, _slicedToArray2.default)(_ref, 1),
+      key = _ref2[0];
+    return _ui.availableBasicFilterTypes.includes(key);
+  }) &&
+  // checks if atleast one fitler value has some selection object
+  Object.values(filterValues).some(function (value) {
     return value.length > 0;
   });
   if (!query) {
@@ -46,11 +55,11 @@ var buildJQL = exports.buildJQL = function buildJQL(input) {
     var orClause = _jqlAst.creators.compoundClause(_jqlAst.creators.compoundOperator(_jqlAst.COMPOUND_OPERATOR_OR), orClauseFields);
     query.appendClause(orClause, _jqlAst.COMPOUND_OPERATOR_AND);
   }
-  if (hasFilterSelectionValues) {
-    Object.entries(filterValues).forEach(function (_ref) {
-      var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
-        key = _ref2[0],
-        filterFieldValues = _ref2[1];
+  if (hasValidFilterSelectionAndValues) {
+    Object.entries(filterValues).forEach(function (_ref3) {
+      var _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
+        key = _ref4[0],
+        filterFieldValues = _ref4[1];
       if (filterFieldValues.length === 0) {
         return;
       }
@@ -60,7 +69,7 @@ var buildJQL = exports.buildJQL = function buildJQL(input) {
       query.appendClause(filterInClause, _jqlAst.COMPOUND_OPERATOR_AND);
     });
   }
-  if (!trimmedRawSearch && !hasFilterSelectionValues) {
+  if (!trimmedRawSearch && !hasValidFilterSelectionAndValues) {
     var created = constructTerminalClause('created', _jqlAst.OPERATOR_GT_EQUALS, '-30d');
     query.appendClause(created, _jqlAst.COMPOUND_OPERATOR_AND);
   }

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.JiraSearchContainer = exports.ALLOWED_ORDER_BY_KEYS = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
@@ -24,10 +25,12 @@ var _jqlEditor = require("../jql-editor");
 var _modeSwitcher = require("../mode-switcher");
 var _buildJQL = require("./buildJQL");
 var _messages = require("./messages");
+var _excluded = ["basicInputTextValue"];
+/** @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; }
 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; } /** @jsx jsx */
+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 inputContainerStyles = (0, _react2.css)({
   alignItems: 'baseline',
   display: 'flex',
@@ -122,17 +125,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 +153,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),
@@ -170,9 +178,11 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
   }, []);
   (0, _react.useEffect)(function () {
     if (basicFilterHydrationStatus === 'resolved') {
-      setFilterSelections(hydratedOptions);
-      if (hydratedOptions.basicInputTextValue) {
-        setBasicSearchTerm(hydratedOptions.basicInputTextValue);
+      var basicInputTextValue = hydratedOptions.basicInputTextValue,
+        hydratedFilterOptions = (0, _objectWithoutProperties2.default)(hydratedOptions, _excluded);
+      setFilterSelections(hydratedFilterOptions);
+      if (basicInputTextValue) {
+        setBasicSearchTerm(basicInputTextValue);
       }
     }
   }, [hydratedOptions, basicFilterHydrationStatus]);

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.3"
+  packageVersion: "1.19.5"
 };

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

@@ -31,7 +31,9 @@ export const useHydrateJqlQuery = (cloudId, jql) => {
       const [textFieldValue] = text || summary || key || [];
       const mappedValues = {
         ...mapHydrateResponseData(response),
-        basicInputTextValue: removeFuzzyCharacter(textFieldValue)
+        ...(textFieldValue ? {
+          basicInputTextValue: removeFuzzyCharacter(textFieldValue)
+        } : {})
       };
       setHydratedOptions(mappedValues);
       setStatus('resolved');

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

@@ -78,6 +78,13 @@ export function mapHydrateResponseData({
     jqlTerm,
     values = []
   }) => {
+    /**
+     * Currently, the hydrate query does not support text field in JQL and returns as {} object.
+     * Hence we check if a valid jqlTerm is available
+     */
+    if (!jqlTerm) {
+      return;
+    }
     const options = values.map(({
       values
     }) => values && values[0] ? mapNodeToOption(values[0]) : null).filter(isNonNullSelectOption) || [];

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

@@ -1,4 +1,5 @@
 import { COMPOUND_OPERATOR_AND, COMPOUND_OPERATOR_OR, creators, JastBuilder, OPERATOR_EQUALS, OPERATOR_GT_EQUALS, OPERATOR_IN, OPERATOR_LIKE, ORDER_BY_DIRECTION_ASC, ORDER_BY_DIRECTION_DESC, print } from '@atlaskit/jql-ast';
+import { availableBasicFilterTypes } from '../basic-filters/ui';
 const fuzzySearchRegExp = /^"(.+)"$/;
 const jiraIssueKeyRegExp = /[A-Z]+-\d+/;
 export const fuzzyCharacter = '*';
@@ -19,7 +20,11 @@ export const buildJQL = input => {
     filterValues
   } = input;
   const trimmedRawSearch = rawSearch.trim();
-  const hasFilterSelectionValues = filterValues && Object.values(filterValues).some(value => value.length > 0);
+  const hasValidFilterSelectionAndValues = filterValues &&
+  // checks if filterValues have only valid keys
+  Object.entries(filterValues).every(([key]) => availableBasicFilterTypes.includes(key)) &&
+  // checks if atleast one fitler value has some selection object
+  Object.values(filterValues).some(value => value.length > 0);
   if (!query) {
     return '';
   }
@@ -36,7 +41,7 @@ export const buildJQL = input => {
     const orClause = creators.compoundClause(creators.compoundOperator(COMPOUND_OPERATOR_OR), orClauseFields);
     query.appendClause(orClause, COMPOUND_OPERATOR_AND);
   }
-  if (hasFilterSelectionValues) {
+  if (hasValidFilterSelectionAndValues) {
     Object.entries(filterValues).forEach(([key, filterFieldValues]) => {
       if (filterFieldValues.length === 0) {
         return;
@@ -45,7 +50,7 @@ export const buildJQL = input => {
       query.appendClause(filterInClause, COMPOUND_OPERATOR_AND);
     });
   }
-  if (!trimmedRawSearch && !hasFilterSelectionValues) {
+  if (!trimmedRawSearch && !hasValidFilterSelectionAndValues) {
     const created = constructTerminalClause('created', OPERATOR_GT_EQUALS, '-30d');
     query.appendClause(created, COMPOUND_OPERATOR_AND);
   }

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 => {
@@ -138,9 +143,13 @@ export const JiraSearchContainer = props => {
   }, []);
   useEffect(() => {
     if (basicFilterHydrationStatus === 'resolved') {
-      setFilterSelections(hydratedOptions);
-      if (hydratedOptions.basicInputTextValue) {
-        setBasicSearchTerm(hydratedOptions.basicInputTextValue);
+      const {
+        basicInputTextValue,
+        ...hydratedFilterOptions
+      } = hydratedOptions;
+      setFilterSelections(hydratedFilterOptions);
+      if (basicInputTextValue) {
+        setBasicSearchTerm(basicInputTextValue);
       }
     }
   }, [hydratedOptions, basicFilterHydrationStatus]);

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.3"
+  packageVersion: "1.19.5"
 };

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

@@ -48,9 +48,9 @@ export var useHydrateJqlQuery = function useHydrateJqlQuery(cloudId, 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)), {}, {
+          mappedValues = _objectSpread(_objectSpread({}, mapHydrateResponseData(response)), textFieldValue ? {
             basicInputTextValue: removeFuzzyCharacter(textFieldValue)
-          });
+          } : {});
           setHydratedOptions(mappedValues);
           setStatus('resolved');
           _context.next = 20;

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

@@ -74,6 +74,13 @@ export function mapHydrateResponseData(_ref2) {
     var jqlTerm = _ref3.jqlTerm,
       _ref3$values = _ref3.values,
       values = _ref3$values === void 0 ? [] : _ref3$values;
+    /**
+     * Currently, the hydrate query does not support text field in JQL and returns as {} object.
+     * Hence we check if a valid jqlTerm is available
+     */
+    if (!jqlTerm) {
+      return;
+    }
     var options = values.map(function (_ref4) {
       var values = _ref4.values;
       return values && values[0] ? mapNodeToOption(values[0]) : null;

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

@@ -1,5 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import { COMPOUND_OPERATOR_AND, COMPOUND_OPERATOR_OR, creators, JastBuilder, OPERATOR_EQUALS, OPERATOR_GT_EQUALS, OPERATOR_IN, OPERATOR_LIKE, ORDER_BY_DIRECTION_ASC, ORDER_BY_DIRECTION_DESC, print } from '@atlaskit/jql-ast';
+import { availableBasicFilterTypes } from '../basic-filters/ui';
 var fuzzySearchRegExp = /^"(.+)"$/;
 var jiraIssueKeyRegExp = /[A-Z]+-\d+/;
 export var fuzzyCharacter = '*';
@@ -20,7 +21,15 @@ export var buildJQL = function buildJQL(input) {
     orderKey = _input$orderKey === void 0 ? 'created' : _input$orderKey,
     filterValues = input.filterValues;
   var trimmedRawSearch = rawSearch.trim();
-  var hasFilterSelectionValues = filterValues && Object.values(filterValues).some(function (value) {
+  var hasValidFilterSelectionAndValues = filterValues &&
+  // checks if filterValues have only valid keys
+  Object.entries(filterValues).every(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 1),
+      key = _ref2[0];
+    return availableBasicFilterTypes.includes(key);
+  }) &&
+  // checks if atleast one fitler value has some selection object
+  Object.values(filterValues).some(function (value) {
     return value.length > 0;
   });
   if (!query) {
@@ -39,11 +48,11 @@ export var buildJQL = function buildJQL(input) {
     var orClause = creators.compoundClause(creators.compoundOperator(COMPOUND_OPERATOR_OR), orClauseFields);
     query.appendClause(orClause, COMPOUND_OPERATOR_AND);
   }
-  if (hasFilterSelectionValues) {
-    Object.entries(filterValues).forEach(function (_ref) {
-      var _ref2 = _slicedToArray(_ref, 2),
-        key = _ref2[0],
-        filterFieldValues = _ref2[1];
+  if (hasValidFilterSelectionAndValues) {
+    Object.entries(filterValues).forEach(function (_ref3) {
+      var _ref4 = _slicedToArray(_ref3, 2),
+        key = _ref4[0],
+        filterFieldValues = _ref4[1];
       if (filterFieldValues.length === 0) {
         return;
       }
@@ -53,7 +62,7 @@ export var buildJQL = function buildJQL(input) {
       query.appendClause(filterInClause, COMPOUND_OPERATOR_AND);
     });
   }
-  if (!trimmedRawSearch && !hasFilterSelectionValues) {
+  if (!trimmedRawSearch && !hasValidFilterSelectionAndValues) {
     var created = constructTerminalClause('created', OPERATOR_GT_EQUALS, '-30d');
     query.appendClause(created, COMPOUND_OPERATOR_AND);
   }

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

@@ -1,5 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+var _excluded = ["basicInputTextValue"];
 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; }
 /** @jsx jsx */
@@ -113,17 +115,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 +143,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),
@@ -161,9 +168,11 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
   }, []);
   useEffect(function () {
     if (basicFilterHydrationStatus === 'resolved') {
-      setFilterSelections(hydratedOptions);
-      if (hydratedOptions.basicInputTextValue) {
-        setBasicSearchTerm(hydratedOptions.basicInputTextValue);
+      var basicInputTextValue = hydratedOptions.basicInputTextValue,
+        hydratedFilterOptions = _objectWithoutProperties(hydratedOptions, _excluded);
+      setFilterSelections(hydratedFilterOptions);
+      if (basicInputTextValue) {
+        setBasicSearchTerm(basicInputTextValue);
       }
     }
   }, [hydratedOptions, basicFilterHydrationStatus]);

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/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/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.3",
+  "version": "1.19.5",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
     "@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.9.0",