@atlaskit/link-datasource 1.19.8 → 1.19.10

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 1.19.10
+
+### Patch Changes
+
+- [#56769](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/56769) [`dccc142da2de`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/dccc142da2de) - Changing cloud ids with site selector resets previous JiraIssuesModal table results, basic search filters, and jql to default.
+- [#57035](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/57035) [`63ab16a4d4a7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/63ab16a4d4a7) - Update config modal logic to open in basic mode if the query is not complex.
+
+## 1.19.9
+
+### Patch Changes
+
+- [#56564](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/56564) [`b26cc1ff959d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b26cc1ff959d) - Add `Unassigned` option for Assignee filter dropdown.
+
 ## 1.19.8
 
 ### 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.8"
+  packageVersion: "1.19.10"
 };

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

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.filterOptionMessages = void 0;
+var _reactIntlNext = require("react-intl-next");
+var filterOptionMessages = exports.filterOptionMessages = (0, _reactIntlNext.defineMessages)({
+  assigneeUnassignedFilterOption: {
+    id: 'linkDataSource.basic-filter.dropdown.select.assignee.unassigned',
+    description: 'Text to display for Unassigned assignee filter option.',
+    defaultMessage: 'Unassigned'
+  }
+});

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

@@ -4,17 +4,28 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useFilterOptions = void 0;
+exports.useFilterOptions = exports.getAssigneeUnassignedFilterOption = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
+var _reactIntlNext = require("react-intl-next");
 var _useBasicFilterAGG2 = require("../../../../services/useBasicFilterAGG");
 var _transformers = require("../utils/transformers");
+var _messages = require("./messages");
+var getAssigneeUnassignedFilterOption = exports.getAssigneeUnassignedFilterOption = function getAssigneeUnassignedFilterOption(formatMessage) {
+  return {
+    label: formatMessage(_messages.filterOptionMessages.assigneeUnassignedFilterOption),
+    optionType: 'avatarLabel',
+    value: 'empty'
+  };
+};
 var useFilterOptions = exports.useFilterOptions = function useFilterOptions(_ref) {
   var filterType = _ref.filterType,
     cloudId = _ref.cloudId;
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
   var _useState = (0, _react.useState)([]),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     filterOptions = _useState2[0],
@@ -46,6 +57,8 @@ var useFilterOptions = exports.useFilterOptions = function useFilterOptions(_ref
       isRequestLikeInitialSearch,
       initialResponseData,
       response,
+      mappedResponse,
+      mappedTotalCount,
       _args = arguments;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -84,34 +97,45 @@ var useFilterOptions = exports.useFilterOptions = function useFilterOptions(_ref
           setErrors(response.errors);
           return _context.abrupt("return");
         case 18:
+          mappedResponse = (0, _transformers.mapFieldValuesToFilterOptions)(response);
+          mappedTotalCount = (0, _transformers.mapFieldValuesToTotalCount)(response);
           if (isNewSearch) {
-            setFilterOptions((0, _transformers.mapFieldValuesToFilterOptions)(response));
             if (isRequestLikeInitialSearch) {
               /**
                * The initial dataset is used in couple of paths, eg: when a user searches and clears the search text.
                * During these times, we dont want to fetch data again and again, hence a mini cache setup to store and provide the initial dataset
                */
               initialData.current = response;
+
+              /**
+               * For assignee filter option, we want `Unassigned` as an option.
+               * Since `Unassigned/EMPTY` is not returned by the API, we add it manually, but only for the initial list
+               */
+              if (filterType === 'assignee') {
+                mappedResponse.unshift(getAssigneeUnassignedFilterOption(formatMessage));
+                mappedTotalCount += 1;
+              }
             }
+            setFilterOptions(mappedResponse);
           } else {
-            setFilterOptions([].concat((0, _toConsumableArray2.default)(filterOptions), (0, _toConsumableArray2.default)((0, _transformers.mapFieldValuesToFilterOptions)(response))));
+            setFilterOptions([].concat((0, _toConsumableArray2.default)(filterOptions), (0, _toConsumableArray2.default)(mappedResponse)));
           }
-          setTotalCount((0, _transformers.mapFieldValuesToTotalCount)(response));
+          setTotalCount(mappedTotalCount);
           setNextPageCursor((0, _transformers.mapFieldValuesToPageCursor)(response));
           setStatus('resolved');
-          _context.next = 28;
+          _context.next = 30;
           break;
-        case 24:
-          _context.prev = 24;
+        case 26:
+          _context.prev = 26;
           _context.t1 = _context["catch"](5);
           setStatus('rejected');
           setErrors([_context.t1]);
-        case 28:
+        case 30:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 24]]);
-  })), [cloudId, filterOptions, filterType, getFieldValues]);
+    }, _callee, null, [[5, 26]]);
+  })), [cloudId, filterOptions, filterType, formatMessage, getFieldValues]);
   (0, _react.useEffect)(function () {
     if (status !== 'rejected' && errors.length !== 0) {
       setErrors([]);

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

@@ -6,14 +6,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useHydrateJqlQuery = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
+var _reactIntlNext = require("react-intl-next");
+var _jqlAst = require("@atlaskit/jql-ast");
 var _useBasicFilterAGG2 = require("../../../../services/useBasicFilterAGG");
 var _extractValuesFromNonComplexJQL = require("../utils/extractValuesFromNonComplexJQL");
 var _isClauseTooComplex = require("../utils/isClauseTooComplex");
 var _transformers = require("../utils/transformers");
+var _useFilterOptions = require("./useFilterOptions");
+var _excluded = ["assignee"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useHydrateJqlQuery = exports.useHydrateJqlQuery = function useHydrateJqlQuery(cloudId, jql) {
@@ -21,6 +27,8 @@ var useHydrateJqlQuery = exports.useHydrateJqlQuery = function useHydrateJqlQuer
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     hydratedOptions = _useState2[0],
     setHydratedOptions = _useState2[1];
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
   var _useState3 = (0, _react.useState)('empty'),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     status = _useState4[0],
@@ -32,7 +40,7 @@ var useHydrateJqlQuery = exports.useHydrateJqlQuery = function useHydrateJqlQuer
   var _useBasicFilterAGG = (0, _useBasicFilterAGG2.useBasicFilterAGG)(),
     getHydratedJQL = _useBasicFilterAGG.getHydratedJQL;
   var fetchHydratedJqlOptions = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-    var response, _extractValuesFromNon, text, summary, key, _ref2, _ref3, textFieldValue, mappedValues;
+    var response, _mapHydrateResponseDa, mappedHydratedAssigneeValue, restOfMappedHydratedResponse, _extractValuesFromNon, text, summary, key, extractedAssigneeValue, _ref2, _ref3, textFieldValue, mappedValues;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -50,29 +58,36 @@ var useHydrateJqlQuery = exports.useHydrateJqlQuery = function useHydrateJqlQuer
           setErrors(response.errors);
           return _context.abrupt("return");
         case 9:
+          _mapHydrateResponseDa = (0, _transformers.mapHydrateResponseData)(response), mappedHydratedAssigneeValue = _mapHydrateResponseDa.assignee, restOfMappedHydratedResponse = (0, _objectWithoutProperties2.default)(_mapHydrateResponseDa, _excluded);
           /**
            * Hydrate logic does not return text field, hence we parse and extract value from jql
            */
-          _extractValuesFromNon = (0, _extractValuesFromNonComplexJQL.extractValuesFromNonComplexJQL)(jql), text = _extractValuesFromNon.text, summary = _extractValuesFromNon.summary, key = _extractValuesFromNon.key;
+          _extractValuesFromNon = (0, _extractValuesFromNonComplexJQL.extractValuesFromNonComplexJQL)(jql), text = _extractValuesFromNon.text, summary = _extractValuesFromNon.summary, key = _extractValuesFromNon.key, extractedAssigneeValue = _extractValuesFromNon.assignee;
           _ref2 = text || summary || key || [], _ref3 = (0, _slicedToArray2.default)(_ref2, 1), textFieldValue = _ref3[0];
-          mappedValues = _objectSpread(_objectSpread({}, (0, _transformers.mapHydrateResponseData)(response)), textFieldValue ? {
+          mappedValues = _objectSpread(_objectSpread({}, restOfMappedHydratedResponse), {}, {
+            /**
+             * Special handling for assignee as we need to inject Unassigned value if JQL contains EMPTY keyword for assignee
+             */
+            assignee: [].concat((0, _toConsumableArray2.default)(mappedHydratedAssigneeValue || []), (0, _toConsumableArray2.default)(extractedAssigneeValue !== null && extractedAssigneeValue !== void 0 && extractedAssigneeValue.includes(_jqlAst.OPERAND_EMPTY) // checks and adds EMPTY filter option if extracted assignee values from jql contains EMPTY
+            ? [(0, _useFilterOptions.getAssigneeUnassignedFilterOption)(formatMessage)] : []))
+          }, textFieldValue ? {
             basicInputTextValue: (0, _isClauseTooComplex.removeFuzzyCharacter)(textFieldValue)
           } : {});
           setHydratedOptions(mappedValues);
           setStatus('resolved');
-          _context.next = 20;
+          _context.next = 21;
           break;
-        case 16:
-          _context.prev = 16;
+        case 17:
+          _context.prev = 17;
           _context.t0 = _context["catch"](0);
           setErrors([_context.t0]);
           setStatus('rejected');
-        case 20:
+        case 21:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[0, 16]]);
-  })), [cloudId, getHydratedJQL, jql]);
+    }, _callee, null, [[0, 17]]);
+  })), [cloudId, formatMessage, getHydratedJQL, jql]);
   (0, _react.useEffect)(function () {
     if (status !== 'rejected' && errors.length !== 0) {
       setErrors([]);

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js

@@ -41,8 +41,6 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     isJQLHydrating = _ref.isJQLHydrating,
     _ref$onSelectionChang = _ref.onSelectionChange,
     onSelectionChange = _ref$onSelectionChang === void 0 ? function () {} : _ref$onSelectionChang,
-    _ref$onReset = _ref.onReset,
-    resetSelection = _ref$onReset === void 0 ? function () {} : _ref$onReset,
     _ref$isDisabled = _ref.isDisabled,
     isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
@@ -192,9 +190,8 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       setSortedOptions([]);
       setSearchTerm('');
       resetHook();
-      resetSelection();
     }
-  }, [cloudId, resetHook, resetSelection]);
+  }, [cloudId, resetHook]);
   (0, _react.useEffect)(function () {
     if (!(0, _isEqual.default)(selection, selectedOptions)) {
       setSelectedOptions(selection);

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.js

@@ -4,7 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.asyncPopupSelectMessages = void 0;
-var asyncPopupSelectMessages = exports.asyncPopupSelectMessages = {
+var _reactIntlNext = require("react-intl-next");
+var asyncPopupSelectMessages = exports.asyncPopupSelectMessages = (0, _reactIntlNext.defineMessages)({
   selectPlaceholder: {
     id: 'linkDataSource.basic-filter.dropdown.select.placeholder',
     description: 'Placeholder text to be displayed for the search input box.',
@@ -40,4 +41,4 @@ var asyncPopupSelectMessages = exports.asyncPopupSelectMessages = {
     defaultMessage: 'Show more',
     description: 'The text to show more options in dropdown'
   }
-};
+});

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

@@ -16,7 +16,6 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
   var cloudId = _ref.cloudId,
     onChange = _ref.onChange,
     selections = _ref.selections,
-    onReset = _ref.onReset,
     isJQLHydrating = _ref.isJQLHydrating;
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     xcss: basicFilterContainerStyles,
@@ -30,8 +29,7 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
       selection: selections[filter] || [],
       isJQLHydrating: isJQLHydrating,
       isDisabled: !cloudId,
-      onSelectionChange: onChange,
-      onReset: onReset
+      onSelectionChange: onChange
     });
   }));
 };

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/menu-list/messages.js

@@ -4,7 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.asyncPopupSelectMessages = void 0;
-var asyncPopupSelectMessages = exports.asyncPopupSelectMessages = {
+var _reactIntlNext = require("react-intl-next");
+var asyncPopupSelectMessages = exports.asyncPopupSelectMessages = (0, _reactIntlNext.defineMessages)({
   loadingMessage: {
     id: 'linkDataSource.basic-filter.loading-message',
     defaultMessage: 'Loading...',
@@ -20,4 +21,4 @@ var asyncPopupSelectMessages = exports.asyncPopupSelectMessages = {
     defaultMessage: 'Something went wrong',
     description: 'The text for when an error occurs when loading options'
   }
-};
+});

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

@@ -20,11 +20,19 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 // Map of field keys to their respective clauses in the Jast
 
 var getFieldValues = function getFieldValues(operand) {
+  var mapValuesFromList = function mapValuesFromList(value) {
+    if (value.operandType === _jqlAst.OPERAND_TYPE_VALUE) {
+      return value.value;
+    }
+    // we only support EMPTY keyword atm, hence making sure if operandType is a KEYWORD, then its an EMPTY keyword
+    if (value.operandType === _jqlAst.OPERAND_TYPE_KEYWORD && value.value === _jqlAst.OPERAND_EMPTY) {
+      return value.value;
+    }
+    return undefined;
+  };
   switch (operand.operandType) {
     case _jqlAst.OPERAND_TYPE_LIST:
-      return operand.values.map(function (value) {
-        return value.operandType === _jqlAst.OPERAND_TYPE_VALUE && value.value || undefined;
-      }).filter(function (value) {
+      return operand.values.map(mapValuesFromList).filter(function (value) {
         return !!value;
       });
     case _jqlAst.OPERAND_TYPE_VALUE:

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

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.JiraSearchContainer = exports.ALLOWED_ORDER_BY_KEYS = void 0;
+exports.JiraSearchContainer = exports.DEFAULT_JQL_QUERY = 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"));
@@ -39,7 +39,7 @@ var inputContainerStyles = (0, _react2.css)({
 var basicSearchInputContainerStyles = (0, _primitives.xcss)({
   flexGrow: 1
 });
-var DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
+var DEFAULT_JQL_QUERY = exports.DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
 var ALLOWED_ORDER_BY_KEYS = exports.ALLOWED_ORDER_BY_KEYS = ['key', 'summary', 'assignee', 'status', 'created'];
 var JiraSearchMethodSwitcher = _modeSwitcher.ModeSwitcher;
 var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchContainer(props) {
@@ -49,7 +49,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     onSearchMethodChangeCallback = props.onSearchMethodChange,
     initialSearchMethod = props.initialSearchMethod;
   var _ref = parameters || {},
-    cloudId = _ref.cloudId,
+    currentCloudId = _ref.cloudId,
     initialJql = _ref.jql;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
@@ -67,22 +67,26 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     jql = _useState6[0],
     setJql = _useState6[1];
-  var _useState7 = (0, _react.useState)(false),
+  var _useState7 = (0, _react.useState)(currentCloudId),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    isComplexQuery = _useState8[0],
-    setIsComplexQuery = _useState8[1];
-  var _useState9 = (0, _react.useState)(),
+    cloudId = _useState8[0],
+    setCloudId = _useState8[1];
+  var _useState9 = (0, _react.useState)(false),
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-    orderKey = _useState10[0],
-    setOrderKey = _useState10[1];
+    isComplexQuery = _useState10[0],
+    setIsComplexQuery = _useState10[1];
   var _useState11 = (0, _react.useState)(),
     _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-    orderDirection = _useState12[0],
-    setOrderDirection = _useState12[1];
-  var _useState13 = (0, _react.useState)({}),
+    orderKey = _useState12[0],
+    setOrderKey = _useState12[1];
+  var _useState13 = (0, _react.useState)(),
     _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-    filterSelections = _useState14[0],
-    setFilterSelections = _useState14[1];
+    orderDirection = _useState14[0],
+    setOrderDirection = _useState14[1];
+  var _useState15 = (0, _react.useState)({}),
+    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
+    filterSelections = _useState16[0],
+    setFilterSelections = _useState16[1];
   var showBasicFilters = (0, _react.useMemo)(function () {
     if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters')) {
       return true;
@@ -191,11 +195,17 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     setFilterSelections(updatedSelection);
     handleBasicFilterSelectionChange(updatedSelection);
   }, [handleBasicFilterSelectionChange, filterSelections]);
-  var handleBasicFiltersReset = (0, _react.useCallback)(function () {
-    if (Object.keys(filterSelections).length > 0) {
+  (0, _react.useEffect)(function () {
+    if (currentCloudId !== cloudId) {
+      setBasicSearchTerm('');
+      setJql(DEFAULT_JQL_QUERY);
+      setIsComplexQuery(false);
+      setOrderKey(undefined);
+      setOrderDirection(undefined);
       setFilterSelections({});
+      setCloudId(currentCloudId);
     }
-  }, [filterSelections]);
+  }, [currentCloudId, cloudId]);
   return (0, _react2.jsx)("div", {
     css: inputContainerStyles,
     "data-testid": "jira-search-container"
@@ -211,7 +221,6 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     cloudId: cloudId || '',
     onChange: handleSelectionChange,
     selections: filterSelections,
-    onReset: handleBasicFiltersReset,
     isJQLHydrating: basicFilterHydrationStatus === 'loading'
   })), currentSearchMethod === 'jql' && (0, _react2.jsx)(_jqlEditor.JiraJQLEditor, {
     cloudId: cloudId || '',

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

@@ -19,6 +19,7 @@ var _uuid = require("uuid");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
 var _colors = require("@atlaskit/theme/colors");
 var _analytics = require("../../../analytics");
@@ -37,6 +38,7 @@ var _noResults = require("../../common/error-state/no-results");
 var _issueLikeTable = require("../../issue-like-table");
 var _link = _interopRequireDefault(require("../../issue-like-table/render-type/link"));
 var _ui = require("../basic-filters/ui");
+var _isQueryTooComplex = require("../basic-filters/utils/isQueryTooComplex");
 var _initialStateView = require("../initial-state-view");
 var _jiraSearchContainer = require("../jira-search-container");
 var _modeSwitcher = require("../mode-switcher");
@@ -138,7 +140,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   // analytics related parameters
   var searchCount = (0, _react.useRef)(0);
   var userInteractionActions = (0, _react.useRef)(new Set());
-  var initialSearchMethod = 'jql'; // TODO EDM-7688 This where we can add feature that decides if it's basic or jql based on JQL content (Regexp)
+  var initialSearchMethod = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters') && !(0, _isQueryTooComplex.isQueryTooComplex)((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
   var _useState11 = (0, _react.useState)(initialSearchMethod),
     _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
     currentSearchMethod = _useState12[0],
@@ -340,6 +342,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   }, [analyticsPayload, onCancel]);
   var onSiteSelection = (0, _react.useCallback)(function (site) {
     userInteractionActions.current.add(_types.DatasourceAction.INSTANCE_UPDATED);
+    setJql('');
     setCloudId(site.cloudId);
     reset({
       shouldForceRequest: true

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.8"
+  packageVersion: "1.19.10"
 };

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

@@ -0,0 +1,8 @@
+import { defineMessages } from 'react-intl-next';
+export const filterOptionMessages = defineMessages({
+  assigneeUnassignedFilterOption: {
+    id: 'linkDataSource.basic-filter.dropdown.select.assignee.unassigned',
+    description: 'Text to display for Unassigned assignee filter option.',
+    defaultMessage: 'Unassigned'
+  }
+});

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

@@ -1,10 +1,20 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
+import { useIntl } from 'react-intl-next';
 import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
 import { mapFieldValuesToFilterOptions, mapFieldValuesToPageCursor, mapFieldValuesToTotalCount } from '../utils/transformers';
+import { filterOptionMessages } from './messages';
+export const getAssigneeUnassignedFilterOption = formatMessage => ({
+  label: formatMessage(filterOptionMessages.assigneeUnassignedFilterOption),
+  optionType: 'avatarLabel',
+  value: 'empty'
+});
 export const useFilterOptions = ({
   filterType,
   cloudId
 }) => {
+  const {
+    formatMessage
+  } = useIntl();
   const [filterOptions, setFilterOptions] = useState([]);
   const [totalCount, setTotalCount] = useState(0);
   const [status, setStatus] = useState('empty');
@@ -37,26 +47,37 @@ export const useFilterOptions = ({
         setErrors(response.errors);
         return;
       }
+      const mappedResponse = mapFieldValuesToFilterOptions(response);
+      let mappedTotalCount = mapFieldValuesToTotalCount(response);
       if (isNewSearch) {
-        setFilterOptions(mapFieldValuesToFilterOptions(response));
         if (isRequestLikeInitialSearch) {
           /**
            * The initial dataset is used in couple of paths, eg: when a user searches and clears the search text.
            * During these times, we dont want to fetch data again and again, hence a mini cache setup to store and provide the initial dataset
            */
           initialData.current = response;
+
+          /**
+           * For assignee filter option, we want `Unassigned` as an option.
+           * Since `Unassigned/EMPTY` is not returned by the API, we add it manually, but only for the initial list
+           */
+          if (filterType === 'assignee') {
+            mappedResponse.unshift(getAssigneeUnassignedFilterOption(formatMessage));
+            mappedTotalCount += 1;
+          }
         }
+        setFilterOptions(mappedResponse);
       } else {
-        setFilterOptions([...filterOptions, ...mapFieldValuesToFilterOptions(response)]);
+        setFilterOptions([...filterOptions, ...mappedResponse]);
       }
-      setTotalCount(mapFieldValuesToTotalCount(response));
+      setTotalCount(mappedTotalCount);
       setNextPageCursor(mapFieldValuesToPageCursor(response));
       setStatus('resolved');
     } catch (error) {
       setStatus('rejected');
       setErrors([error]);
     }
-  }, [cloudId, filterOptions, filterType, getFieldValues]);
+  }, [cloudId, filterOptions, filterType, formatMessage, getFieldValues]);
   useEffect(() => {
     if (status !== 'rejected' && errors.length !== 0) {
       setErrors([]);

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

@@ -1,10 +1,16 @@
 import { useCallback, useEffect, useState } from 'react';
+import { useIntl } from 'react-intl-next';
+import { OPERAND_EMPTY } from '@atlaskit/jql-ast';
 import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
 import { extractValuesFromNonComplexJQL } from '../utils/extractValuesFromNonComplexJQL';
 import { removeFuzzyCharacter } from '../utils/isClauseTooComplex';
 import { mapHydrateResponseData } from '../utils/transformers';
+import { getAssigneeUnassignedFilterOption } from './useFilterOptions';
 export const useHydrateJqlQuery = (cloudId, jql) => {
   const [hydratedOptions, setHydratedOptions] = useState({});
+  const {
+    formatMessage
+  } = useIntl();
   const [status, setStatus] = useState('empty');
   const [errors, setErrors] = useState([]);
   const {
@@ -19,6 +25,10 @@ export const useHydrateJqlQuery = (cloudId, jql) => {
         setErrors(response.errors);
         return;
       }
+      const {
+        assignee: mappedHydratedAssigneeValue,
+        ...restOfMappedHydratedResponse
+      } = mapHydrateResponseData(response);
 
       /**
        * Hydrate logic does not return text field, hence we parse and extract value from jql
@@ -26,11 +36,19 @@ export const useHydrateJqlQuery = (cloudId, jql) => {
       const {
         text,
         summary,
-        key
+        key,
+        assignee: extractedAssigneeValue
       } = extractValuesFromNonComplexJQL(jql);
       const [textFieldValue] = text || summary || key || [];
       const mappedValues = {
-        ...mapHydrateResponseData(response),
+        ...restOfMappedHydratedResponse,
+        /**
+         * Special handling for assignee as we need to inject Unassigned value if JQL contains EMPTY keyword for assignee
+         */
+        assignee: [...(mappedHydratedAssigneeValue || []),
+        // all values provided by the hydrate API for assignee
+        ...(extractedAssigneeValue !== null && extractedAssigneeValue !== void 0 && extractedAssigneeValue.includes(OPERAND_EMPTY) // checks and adds EMPTY filter option if extracted assignee values from jql contains EMPTY
+        ? [getAssigneeUnassignedFilterOption(formatMessage)] : [])],
         ...(textFieldValue ? {
           basicInputTextValue: removeFuzzyCharacter(textFieldValue)
         } : {})
@@ -41,7 +59,7 @@ export const useHydrateJqlQuery = (cloudId, jql) => {
       setErrors([error]);
       setStatus('rejected');
     }
-  }, [cloudId, getHydratedJQL, jql]);
+  }, [cloudId, formatMessage, getHydratedJQL, jql]);
   useEffect(() => {
     if (status !== 'rejected' && errors.length !== 0) {
       setErrors([]);

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js

@@ -22,7 +22,6 @@ const AsyncPopupSelect = ({
   selection,
   isJQLHydrating,
   onSelectionChange = () => {},
-  onReset: resetSelection = () => {},
   isDisabled = false
 }) => {
   const {
@@ -143,9 +142,8 @@ const AsyncPopupSelect = ({
       setSortedOptions([]);
       setSearchTerm('');
       resetHook();
-      resetSelection();
     }
-  }, [cloudId, resetHook, resetSelection]);
+  }, [cloudId, resetHook]);
   useEffect(() => {
     if (!isEqual(selection, selectedOptions)) {
       setSelectedOptions(selection);

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.js

@@ -1,4 +1,5 @@
-export const asyncPopupSelectMessages = {
+import { defineMessages } from 'react-intl-next';
+export const asyncPopupSelectMessages = defineMessages({
   selectPlaceholder: {
     id: 'linkDataSource.basic-filter.dropdown.select.placeholder',
     description: 'Placeholder text to be displayed for the search input box.',
@@ -34,4 +35,4 @@ export const asyncPopupSelectMessages = {
     defaultMessage: 'Show more',
     description: 'The text to show more options in dropdown'
   }
-};
+});

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

@@ -9,7 +9,6 @@ const BasicFilterContainer = ({
   cloudId,
   onChange,
   selections,
-  onReset,
   isJQLHydrating
 }) => {
   return /*#__PURE__*/React.createElement(Flex, {
@@ -24,8 +23,7 @@ const BasicFilterContainer = ({
       selection: selections[filter] || [],
       isJQLHydrating: isJQLHydrating,
       isDisabled: !cloudId,
-      onSelectionChange: onChange,
-      onReset: onReset
+      onSelectionChange: onChange
     });
   }));
 };