@atlaskit/link-datasource 1.19.4 → 1.19.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @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

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.4"
+  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',
@@ -175,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/es2019/analytics/constants.js

@@ -1,5 +1,5 @@
 export const EVENT_CHANNEL = 'media';
 export const packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.4"
+  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

@@ -143,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/esm/analytics/constants.js

@@ -1,5 +1,5 @@
 export var EVENT_CHANNEL = 'media';
 export var packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.4"
+  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 */
@@ -166,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.19.4",
+  "version": "1.19.5",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"