@atlaskit/link-datasource 1.17.12 → 1.18.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/link-datasource
 
+## 1.18.0
+
+### Minor Changes
+
+- [#43374](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43374) [`0d93cf12d25`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0d93cf12d25) - Selecting and unselecting filters causes search to occur and datasource table to refresh
+
+### Patch Changes
+
+- [#43417](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43417) [`3f3c17f0273`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3f3c17f0273) - ED-20971 Upgrade adf-schema package to ^34.0.0
+
+## 1.17.13
+
+### Patch Changes
+
+- [#43512](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43512) [`b84de957bd4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b84de957bd4) - Add analytics event when basic filter dropdown show more button is clicked.
+
 ## 1.17.12
 
 ### 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.17.12"
+  packageVersion: "1.18.0"
 };

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

@@ -101,8 +101,8 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     };
   }(), [handleDebouncedFetchFilterOptions, searchTerm]);
   var handleOptionSelection = (0, _react.useCallback)(function (newValue) {
-    onSelectionChange(newValue);
-  }, [onSelectionChange]);
+    onSelectionChange(filterType, newValue);
+  }, [filterType, onSelectionChange]);
   var sortOptionsOnPopupOpen = (0, _react.useCallback)(function () {
     if (selectedOptions.length === 0) {
       return setSortedOptions(filterOptions);
@@ -152,8 +152,12 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
         pageCursor: pageCursor,
         searchString: searchTerm
       });
+      fireEvent('ui.button.clicked.basicSearchDropdown', {
+        filterType: filterType,
+        type: 'showMore'
+      });
     }
-  }, [fetchFilterOptions, pageCursor, searchTerm]);
+  }, [fetchFilterOptions, filterType, fireEvent, pageCursor, searchTerm]);
   var handleMenuOpen = (0, _react.useCallback)(function () {
     if (status === 'empty' || status === 'rejected') {
       // if user searches and gets status as rejected, we want the dropdown to try load the request with searchString when the user reopens the dropdown

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

@@ -22,7 +22,8 @@ var basicFilterContainerStyles = (0, _primitives.xcss)({
 });
 var BasicFilterContainer = function BasicFilterContainer(_ref) {
   var jql = _ref.jql,
-    cloudId = _ref.cloudId;
+    cloudId = _ref.cloudId,
+    onChange = _ref.onChange;
   var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     selection = _useState2[0],
@@ -32,10 +33,11 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
       // hydrate hook call goes in here
     }
   }, [jql]);
-  var handleSelectionChange = (0, _react.useCallback)(function (options, filter) {
-    var updatedSelection = _objectSpread(_objectSpread({}, selection), {}, (0, _defineProperty2.default)({}, filter, options));
+  var handleSelectionChange = (0, _react.useCallback)(function (filterType, options) {
+    var updatedSelection = _objectSpread(_objectSpread({}, selection), {}, (0, _defineProperty2.default)({}, filterType, options));
     setSelection(updatedSelection);
-  }, [selection]);
+    onChange(updatedSelection);
+  }, [onChange, selection]);
   var handleReset = (0, _react.useCallback)(function () {
     if (Object.keys(selection).length > 0) {
       setSelection({});
@@ -52,9 +54,7 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
       key: filter,
       selection: selection[filter] || [],
       isDisabled: !cloudId,
-      onSelectionChange: function onSelectionChange(options) {
-        return handleSelectionChange(options, filter);
-      },
+      onSelectionChange: handleSelectionChange,
       onReset: handleReset
     });
   }));

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

@@ -34,7 +34,9 @@ function mapNodeToOption(_ref) {
   try {
     var baseProps = {
       label: displayName,
-      value: jqlTerm
+      // this ensures that the returned value is not wrapped in single and double quotes
+      // e.g. '"value"' -> 'value'
+      value: decodeURIComponent(jqlTerm).replace(/^"|"$/g, '')
     };
     if (user) {
       return _objectSpread(_objectSpread({}, baseProps), {}, {

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

@@ -10,10 +10,12 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
+var _useDebounce = require("use-debounce");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _analytics = require("../../../analytics");
 var _basicFilters = require("../basic-filters");
+var _asyncPopupSelect = require("../basic-filters/ui/async-popup-select");
 var _isQueryTooComplex = require("../basic-filters/utils/isQueryTooComplex");
 var _basicSearchInput = require("../basic-search-input");
 var _jqlEditor = require("../jql-editor");
@@ -46,6 +48,8 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     initialJql = _ref.jql;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useState = (0, _react.useState)(''),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     basicSearchTerm = _useState2[0],
@@ -70,8 +74,10 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
     orderDirection = _useState12[0],
     setOrderDirection = _useState12[1];
-  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
-    fireEvent = _useDatasourceAnalyti.fireEvent;
+  var _useState13 = (0, _react.useState)({}),
+    _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
+    filters = _useState14[0],
+    setFilters = _useState14[1];
   var onSearchMethodChange = (0, _react.useCallback)(function (searchMethod) {
     onSearchMethodChangeCallback(searchMethod);
     setCurrentSearchMethod(searchMethod);
@@ -81,10 +87,11 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     setBasicSearchTerm(rawSearch);
     setJql((0, _buildJQL.buildJQL)({
       rawSearch: rawSearch,
+      filterValues: filters,
       orderDirection: orderDirection,
       orderKey: orderKey
     }));
-  }, [orderDirection, orderKey]);
+  }, [filters, orderDirection, orderKey]);
   var onQueryChange = (0, _react.useCallback)(function (query) {
     var _query$split$map$filt, _fragments$at, _fragments$at2, _fragments$at3;
     // determine if order keys have been set so they can be saved and persisted when changes occur in basic search
@@ -113,16 +120,34 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
       fireEvent('ui.jqlEditor.searched', {});
     }
   }, [currentSearchMethod, fireEvent, jql, onSearch]);
+  var _useDebouncedCallback = (0, _useDebounce.useDebouncedCallback)(function (filterValues) {
+      var jqlWithFilterValues = (0, _buildJQL.buildJQL)({
+        rawSearch: basicSearchTerm,
+        filterValues: filterValues,
+        orderDirection: orderDirection,
+        orderKey: orderKey
+      });
+      setJql(jqlWithFilterValues);
+      onSearch({
+        jql: jqlWithFilterValues
+      }, currentSearchMethod);
+    }, _asyncPopupSelect.SEARCH_DEBOUNCE_MS),
+    _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),
+    debouncedBasicFilterSelectionChange = _useDebouncedCallback2[0];
+  var handleBasicFilterSelectionChange = (0, _react.useCallback)(function (filterValues) {
+    setFilters(filterValues);
+    debouncedBasicFilterSelectionChange(filterValues);
+  }, [debouncedBasicFilterSelectionChange]);
+  (0, _react.useEffect)(function () {
+    setIsComplexQuery((0, _isQueryTooComplex.isQueryTooComplex)(jql));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   var showBasicFilters = (0, _react.useMemo)(function () {
     if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters')) {
       return true;
     }
     return false;
   }, []);
-  (0, _react.useEffect)(function () {
-    setIsComplexQuery((0, _isQueryTooComplex.isQueryTooComplex)(jql));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
   return (0, _react2.jsx)("div", {
     css: inputContainerStyles
   }, currentSearchMethod === 'basic' && (0, _react2.jsx)(_primitives.Flex, {
@@ -135,7 +160,8 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     searchTerm: basicSearchTerm
   }), showBasicFilters && (0, _react2.jsx)(_basicFilters.BasicFilters, {
     jql: jql,
-    cloudId: cloudId || ''
+    cloudId: cloudId || '',
+    onChange: handleBasicFilterSelectionChange
   })), currentSearchMethod === 'jql' && (0, _react2.jsx)(_jqlEditor.JiraJQLEditor, {
     cloudId: cloudId || '',
     isSearching: isSearching,

package/dist/es2019/analytics/constants.js

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

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

@@ -60,8 +60,8 @@ const AsyncPopupSelect = ({
     }
   }, [handleDebouncedFetchFilterOptions, searchTerm]);
   const handleOptionSelection = useCallback(newValue => {
-    onSelectionChange(newValue);
-  }, [onSelectionChange]);
+    onSelectionChange(filterType, newValue);
+  }, [filterType, onSelectionChange]);
   const sortOptionsOnPopupOpen = useCallback(() => {
     if (selectedOptions.length === 0) {
       return setSortedOptions(filterOptions);
@@ -103,8 +103,12 @@ const AsyncPopupSelect = ({
         pageCursor,
         searchString: searchTerm
       });
+      fireEvent('ui.button.clicked.basicSearchDropdown', {
+        filterType,
+        type: 'showMore'
+      });
     }
-  }, [fetchFilterOptions, pageCursor, searchTerm]);
+  }, [fetchFilterOptions, filterType, fireEvent, pageCursor, searchTerm]);
   const handleMenuOpen = useCallback(() => {
     if (status === 'empty' || status === 'rejected') {
       // if user searches and gets status as rejected, we want the dropdown to try load the request with searchString when the user reopens the dropdown

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

@@ -8,7 +8,8 @@ const basicFilterContainerStyles = xcss({
 });
 const BasicFilterContainer = ({
   jql,
-  cloudId
+  cloudId,
+  onChange
 }) => {
   const [selection, setSelection] = useState({});
   useEffect(() => {
@@ -16,13 +17,14 @@ const BasicFilterContainer = ({
       // hydrate hook call goes in here
     }
   }, [jql]);
-  const handleSelectionChange = useCallback((options, filter) => {
+  const handleSelectionChange = useCallback((filterType, options) => {
     const updatedSelection = {
       ...selection,
-      [filter]: options
+      [filterType]: options
     };
     setSelection(updatedSelection);
-  }, [selection]);
+    onChange(updatedSelection);
+  }, [onChange, selection]);
   const handleReset = useCallback(() => {
     if (Object.keys(selection).length > 0) {
       setSelection({});
@@ -38,7 +40,7 @@ const BasicFilterContainer = ({
     key: filter,
     selection: selection[filter] || [],
     isDisabled: !cloudId,
-    onSelectionChange: options => handleSelectionChange(options, filter),
+    onSelectionChange: handleSelectionChange,
     onReset: handleReset
   })));
 };

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

@@ -22,7 +22,9 @@ function mapNodeToOption({
   try {
     const baseProps = {
       label: displayName,
-      value: jqlTerm
+      // this ensures that the returned value is not wrapped in single and double quotes
+      // e.g. '"value"' -> 'value'
+      value: decodeURIComponent(jqlTerm).replace(/^"|"$/g, '')
     };
     if (user) {
       return {

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

@@ -2,10 +2,12 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
+import { useDebouncedCallback } from 'use-debounce';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Flex, xcss } from '@atlaskit/primitives';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { BasicFilters } from '../basic-filters';
+import { SEARCH_DEBOUNCE_MS } from '../basic-filters/ui/async-popup-select';
 import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { BasicSearchInput } from '../basic-search-input';
 import { JiraJQLEditor } from '../jql-editor';
@@ -38,15 +40,16 @@ export const JiraSearchContainer = props => {
   const {
     formatMessage
   } = useIntl();
+  const {
+    fireEvent
+  } = useDatasourceAnalyticsEvents();
   const [basicSearchTerm, setBasicSearchTerm] = useState('');
   const [currentSearchMethod, setCurrentSearchMethod] = useState(initialSearchMethod);
   const [jql, setJql] = useState(initialJql || DEFAULT_JQL_QUERY);
   const [isComplexQuery, setIsComplexQuery] = useState(false);
   const [orderKey, setOrderKey] = useState();
   const [orderDirection, setOrderDirection] = useState();
-  const {
-    fireEvent
-  } = useDatasourceAnalyticsEvents();
+  const [filters, setFilters] = useState({});
   const onSearchMethodChange = useCallback(searchMethod => {
     onSearchMethodChangeCallback(searchMethod);
     setCurrentSearchMethod(searchMethod);
@@ -56,10 +59,11 @@ export const JiraSearchContainer = props => {
     setBasicSearchTerm(rawSearch);
     setJql(buildJQL({
       rawSearch,
+      filterValues: filters,
       orderDirection,
       orderKey
     }));
-  }, [orderDirection, orderKey]);
+  }, [filters, orderDirection, orderKey]);
   const onQueryChange = useCallback(query => {
     var _query$split$map$filt, _fragments$at, _fragments$at2, _fragments$at3;
     // determine if order keys have been set so they can be saved and persisted when changes occur in basic search
@@ -86,16 +90,32 @@ export const JiraSearchContainer = props => {
       fireEvent('ui.jqlEditor.searched', {});
     }
   }, [currentSearchMethod, fireEvent, jql, onSearch]);
+  const [debouncedBasicFilterSelectionChange] = useDebouncedCallback(filterValues => {
+    const jqlWithFilterValues = buildJQL({
+      rawSearch: basicSearchTerm,
+      filterValues,
+      orderDirection,
+      orderKey
+    });
+    setJql(jqlWithFilterValues);
+    onSearch({
+      jql: jqlWithFilterValues
+    }, currentSearchMethod);
+  }, SEARCH_DEBOUNCE_MS);
+  const handleBasicFilterSelectionChange = useCallback(filterValues => {
+    setFilters(filterValues);
+    debouncedBasicFilterSelectionChange(filterValues);
+  }, [debouncedBasicFilterSelectionChange]);
+  useEffect(() => {
+    setIsComplexQuery(isQueryTooComplex(jql));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   const showBasicFilters = useMemo(() => {
     if (getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters')) {
       return true;
     }
     return false;
   }, []);
-  useEffect(() => {
-    setIsComplexQuery(isQueryTooComplex(jql));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
   return jsx("div", {
     css: inputContainerStyles
   }, currentSearchMethod === 'basic' && jsx(Flex, {
@@ -108,7 +128,8 @@ export const JiraSearchContainer = props => {
     searchTerm: basicSearchTerm
   }), showBasicFilters && jsx(BasicFilters, {
     jql: jql,
-    cloudId: cloudId || ''
+    cloudId: cloudId || '',
+    onChange: handleBasicFilterSelectionChange
   })), currentSearchMethod === 'jql' && jsx(JiraJQLEditor, {
     cloudId: cloudId || '',
     isSearching: isSearching,

package/dist/esm/analytics/constants.js

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

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

@@ -91,8 +91,8 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     };
   }(), [handleDebouncedFetchFilterOptions, searchTerm]);
   var handleOptionSelection = useCallback(function (newValue) {
-    onSelectionChange(newValue);
-  }, [onSelectionChange]);
+    onSelectionChange(filterType, newValue);
+  }, [filterType, onSelectionChange]);
   var sortOptionsOnPopupOpen = useCallback(function () {
     if (selectedOptions.length === 0) {
       return setSortedOptions(filterOptions);
@@ -142,8 +142,12 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
         pageCursor: pageCursor,
         searchString: searchTerm
       });
+      fireEvent('ui.button.clicked.basicSearchDropdown', {
+        filterType: filterType,
+        type: 'showMore'
+      });
     }
-  }, [fetchFilterOptions, pageCursor, searchTerm]);
+  }, [fetchFilterOptions, filterType, fireEvent, pageCursor, searchTerm]);
   var handleMenuOpen = useCallback(function () {
     if (status === 'empty' || status === 'rejected') {
       // if user searches and gets status as rejected, we want the dropdown to try load the request with searchString when the user reopens the dropdown

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

@@ -12,7 +12,8 @@ var basicFilterContainerStyles = xcss({
 });
 var BasicFilterContainer = function BasicFilterContainer(_ref) {
   var jql = _ref.jql,
-    cloudId = _ref.cloudId;
+    cloudId = _ref.cloudId,
+    onChange = _ref.onChange;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     selection = _useState2[0],
@@ -22,10 +23,11 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
       // hydrate hook call goes in here
     }
   }, [jql]);
-  var handleSelectionChange = useCallback(function (options, filter) {
-    var updatedSelection = _objectSpread(_objectSpread({}, selection), {}, _defineProperty({}, filter, options));
+  var handleSelectionChange = useCallback(function (filterType, options) {
+    var updatedSelection = _objectSpread(_objectSpread({}, selection), {}, _defineProperty({}, filterType, options));
     setSelection(updatedSelection);
-  }, [selection]);
+    onChange(updatedSelection);
+  }, [onChange, selection]);
   var handleReset = useCallback(function () {
     if (Object.keys(selection).length > 0) {
       setSelection({});
@@ -42,9 +44,7 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
       key: filter,
       selection: selection[filter] || [],
       isDisabled: !cloudId,
-      onSelectionChange: function onSelectionChange(options) {
-        return handleSelectionChange(options, filter);
-      },
+      onSelectionChange: handleSelectionChange,
       onReset: handleReset
     });
   }));

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

@@ -24,7 +24,9 @@ function mapNodeToOption(_ref) {
   try {
     var baseProps = {
       label: displayName,
-      value: jqlTerm
+      // this ensures that the returned value is not wrapped in single and double quotes
+      // e.g. '"value"' -> 'value'
+      value: decodeURIComponent(jqlTerm).replace(/^"|"$/g, '')
     };
     if (user) {
       return _objectSpread(_objectSpread({}, baseProps), {}, {

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

@@ -3,10 +3,12 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
+import { useDebouncedCallback } from 'use-debounce';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Flex, xcss } from '@atlaskit/primitives';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { BasicFilters } from '../basic-filters';
+import { SEARCH_DEBOUNCE_MS } from '../basic-filters/ui/async-popup-select';
 import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { BasicSearchInput } from '../basic-search-input';
 import { JiraJQLEditor } from '../jql-editor';
@@ -35,6 +37,8 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     initialJql = _ref.jql;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
+  var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     basicSearchTerm = _useState2[0],
@@ -59,8 +63,10 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     _useState12 = _slicedToArray(_useState11, 2),
     orderDirection = _useState12[0],
     setOrderDirection = _useState12[1];
-  var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
-    fireEvent = _useDatasourceAnalyti.fireEvent;
+  var _useState13 = useState({}),
+    _useState14 = _slicedToArray(_useState13, 2),
+    filters = _useState14[0],
+    setFilters = _useState14[1];
   var onSearchMethodChange = useCallback(function (searchMethod) {
     onSearchMethodChangeCallback(searchMethod);
     setCurrentSearchMethod(searchMethod);
@@ -70,10 +76,11 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     setBasicSearchTerm(rawSearch);
     setJql(buildJQL({
       rawSearch: rawSearch,
+      filterValues: filters,
       orderDirection: orderDirection,
       orderKey: orderKey
     }));
-  }, [orderDirection, orderKey]);
+  }, [filters, orderDirection, orderKey]);
   var onQueryChange = useCallback(function (query) {
     var _query$split$map$filt, _fragments$at, _fragments$at2, _fragments$at3;
     // determine if order keys have been set so they can be saved and persisted when changes occur in basic search
@@ -102,16 +109,34 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
       fireEvent('ui.jqlEditor.searched', {});
     }
   }, [currentSearchMethod, fireEvent, jql, onSearch]);
+  var _useDebouncedCallback = useDebouncedCallback(function (filterValues) {
+      var jqlWithFilterValues = buildJQL({
+        rawSearch: basicSearchTerm,
+        filterValues: filterValues,
+        orderDirection: orderDirection,
+        orderKey: orderKey
+      });
+      setJql(jqlWithFilterValues);
+      onSearch({
+        jql: jqlWithFilterValues
+      }, currentSearchMethod);
+    }, SEARCH_DEBOUNCE_MS),
+    _useDebouncedCallback2 = _slicedToArray(_useDebouncedCallback, 1),
+    debouncedBasicFilterSelectionChange = _useDebouncedCallback2[0];
+  var handleBasicFilterSelectionChange = useCallback(function (filterValues) {
+    setFilters(filterValues);
+    debouncedBasicFilterSelectionChange(filterValues);
+  }, [debouncedBasicFilterSelectionChange]);
+  useEffect(function () {
+    setIsComplexQuery(isQueryTooComplex(jql));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   var showBasicFilters = useMemo(function () {
     if (getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters')) {
       return true;
     }
     return false;
   }, []);
-  useEffect(function () {
-    setIsComplexQuery(isQueryTooComplex(jql));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
   return jsx("div", {
     css: inputContainerStyles
   }, currentSearchMethod === 'basic' && jsx(Flex, {
@@ -124,7 +149,8 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     searchTerm: basicSearchTerm
   }), showBasicFilters && jsx(BasicFilters, {
     jql: jql,
-    cloudId: cloudId || ''
+    cloudId: cloudId || '',
+    onChange: handleBasicFilterSelectionChange
   })), currentSearchMethod === 'jql' && jsx(JiraJQLEditor, {
     cloudId: cloudId || '',
     isSearching: isSearching,

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::7b6bf74dbad7e14356c81bb8d6285cbe>>
+ * @codegen <<SignedSource::ccda345ed2d15f3bbe167f871f676090>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -97,6 +97,10 @@ export type DropdownClosedBasicSearchDropdownAttributesType = {
     filterType: 'project' | 'assignee' | 'issuetype' | 'status';
     selectionCount: number;
 };
+export type ButtonClickedBasicSearchDropdownAttributesType = {
+    filterType: 'project' | 'assignee' | 'issuetype' | 'status';
+    type: 'showMore';
+};
 export type AqlEditorSearchedAttributesType = {};
 export type GetWorkspaceIdSuccessAttributesType = {};
 export type GetWorkspaceIdFailedAttributesType = {
@@ -175,6 +179,9 @@ export type AnalyticsEventAttributes = {
     /**
      * Fired when the basic filter dropdown is closed */
     'ui.dropdown.closed.basicSearchDropdown': DropdownClosedBasicSearchDropdownAttributesType;
+    /**
+     * Fired when the “show more” button inside the dropdown menu is clicked */
+    'ui.button.clicked.basicSearchDropdown': ButtonClickedBasicSearchDropdownAttributesType;
     /**
      * Fired when search is initiated via the search icon or enter key press for aql editor input field. */
     'ui.aqlEditor.searched': AqlEditorSearchedAttributesType;

package/dist/types/ui/jira-issues-modal/basic-filters/hooks/useHydrateJqlQuery.d.ts

@@ -1,8 +1,6 @@
-import { BasicFilterFieldType, SelectOption } from '../types';
+import { SelectedOptionsMap } from '../types';
 export interface HydrateJqlState {
-    hydratedOptions: {
-        [key in BasicFilterFieldType]?: SelectOption[];
-    };
+    hydratedOptions: SelectedOptionsMap;
     fetchHydratedJqlOptions: () => Promise<void>;
     status: 'empty' | 'loading' | 'resolved' | 'rejected';
     errors: unknown[];

package/dist/types/ui/jira-issues-modal/basic-filters/types.d.ts

@@ -20,6 +20,9 @@ export type AvatarLabelOption = OptionBase & {
     isGroup?: boolean;
 };
 export type SelectOption = IconLabelOption | LozengeLabelOption | AvatarLabelOption;
+export type SelectedOptionsMap = {
+    [key in BasicFilterFieldType]?: SelectOption[];
+};
 export type FormatOptionLabel = (option: SelectOption) => ReactElement;
 export declare const appearanceMap: {
     readonly BLUE_GRAY: "default";

package/dist/types/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts

@@ -4,7 +4,7 @@ export interface AsyncPopupSelectProps {
     filterType: BasicFilterFieldType;
     cloudId: string;
     selection: SelectOption[];
-    onSelectionChange?: (selection: SelectOption[]) => void;
+    onSelectionChange?: (filterType: BasicFilterFieldType, options: SelectOption[]) => void;
     onReset?: () => void;
     isDisabled?: boolean;
 }

package/dist/types/ui/jira-issues-modal/basic-filters/ui/index.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="react" />
+import type { SelectedOptionsMap } from '../types';
 export interface BasicFilterContainerProps {
     jql: string;
     cloudId: string;
+    onChange: (selection: SelectedOptionsMap) => void;
 }
-declare const BasicFilterContainer: ({ jql, cloudId }: BasicFilterContainerProps) => JSX.Element;
+declare const BasicFilterContainer: ({ jql, cloudId, onChange, }: BasicFilterContainerProps) => JSX.Element;
 export default BasicFilterContainer;

package/dist/types/ui/jira-issues-modal/basic-filters/utils/transformers.d.ts

@@ -1,10 +1,5 @@
-import { FieldValuesResponse, HydrateResponse, SelectOption } from '../types';
-export declare function mapHydrateResponseData({ data }: HydrateResponse): {
-    project?: SelectOption[] | undefined;
-    assignee?: SelectOption[] | undefined;
-    issuetype?: SelectOption[] | undefined;
-    status?: SelectOption[] | undefined;
-};
+import { FieldValuesResponse, HydrateResponse, SelectedOptionsMap, SelectOption } from '../types';
+export declare function mapHydrateResponseData({ data }: HydrateResponse): SelectedOptionsMap;
 export declare function mapFieldValuesToFilterOptions({ data, }: FieldValuesResponse): SelectOption[];
 export declare function mapFieldValuesToTotalCount({ data, }: FieldValuesResponse): number;
 export declare function mapFieldValuesToPageCursor({ data, }: FieldValuesResponse): string | undefined;

package/dist/types/ui/jira-issues-modal/jira-search-container/buildJQL.d.ts

@@ -1,11 +1,9 @@
-import { BasicFilterFieldType, SelectOption } from '../basic-filters/types';
+import { SelectedOptionsMap } from '../basic-filters/types';
 type BuildJQLInput = {
     rawSearch: string;
     orderDirection?: string;
     orderKey?: string;
-    filterValues?: {
-        [key in BasicFilterFieldType]?: SelectOption[];
-    };
+    filterValues?: SelectedOptionsMap;
 };
 export declare const fuzzyCharacter = "*";
 export declare const buildJQL: (input: BuildJQLInput) => string;

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::7b6bf74dbad7e14356c81bb8d6285cbe>>
+ * @codegen <<SignedSource::ccda345ed2d15f3bbe167f871f676090>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -97,6 +97,10 @@ export type DropdownClosedBasicSearchDropdownAttributesType = {
     filterType: 'project' | 'assignee' | 'issuetype' | 'status';
     selectionCount: number;
 };
+export type ButtonClickedBasicSearchDropdownAttributesType = {
+    filterType: 'project' | 'assignee' | 'issuetype' | 'status';
+    type: 'showMore';
+};
 export type AqlEditorSearchedAttributesType = {};
 export type GetWorkspaceIdSuccessAttributesType = {};
 export type GetWorkspaceIdFailedAttributesType = {
@@ -175,6 +179,9 @@ export type AnalyticsEventAttributes = {
     /**
      * Fired when the basic filter dropdown is closed */
     'ui.dropdown.closed.basicSearchDropdown': DropdownClosedBasicSearchDropdownAttributesType;
+    /**
+     * Fired when the “show more” button inside the dropdown menu is clicked */
+    'ui.button.clicked.basicSearchDropdown': ButtonClickedBasicSearchDropdownAttributesType;
     /**
      * Fired when search is initiated via the search icon or enter key press for aql editor input field. */
     'ui.aqlEditor.searched': AqlEditorSearchedAttributesType;

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/hooks/useHydrateJqlQuery.d.ts

@@ -1,8 +1,6 @@
-import { BasicFilterFieldType, SelectOption } from '../types';
+import { SelectedOptionsMap } from '../types';
 export interface HydrateJqlState {
-    hydratedOptions: {
-        [key in BasicFilterFieldType]?: SelectOption[];
-    };
+    hydratedOptions: SelectedOptionsMap;
     fetchHydratedJqlOptions: () => Promise<void>;
     status: 'empty' | 'loading' | 'resolved' | 'rejected';
     errors: unknown[];

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/types.d.ts

@@ -20,6 +20,9 @@ export type AvatarLabelOption = OptionBase & {
     isGroup?: boolean;
 };
 export type SelectOption = IconLabelOption | LozengeLabelOption | AvatarLabelOption;
+export type SelectedOptionsMap = {
+    [key in BasicFilterFieldType]?: SelectOption[];
+};
 export type FormatOptionLabel = (option: SelectOption) => ReactElement;
 export declare const appearanceMap: {
     readonly BLUE_GRAY: "default";

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts

@@ -4,7 +4,7 @@ export interface AsyncPopupSelectProps {
     filterType: BasicFilterFieldType;
     cloudId: string;
     selection: SelectOption[];
-    onSelectionChange?: (selection: SelectOption[]) => void;
+    onSelectionChange?: (filterType: BasicFilterFieldType, options: SelectOption[]) => void;
     onReset?: () => void;
     isDisabled?: boolean;
 }

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/index.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="react" />
+import type { SelectedOptionsMap } from '../types';
 export interface BasicFilterContainerProps {
     jql: string;
     cloudId: string;
+    onChange: (selection: SelectedOptionsMap) => void;
 }
-declare const BasicFilterContainer: ({ jql, cloudId }: BasicFilterContainerProps) => JSX.Element;
+declare const BasicFilterContainer: ({ jql, cloudId, onChange, }: BasicFilterContainerProps) => JSX.Element;
 export default BasicFilterContainer;

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/utils/transformers.d.ts

@@ -1,10 +1,5 @@
-import { FieldValuesResponse, HydrateResponse, SelectOption } from '../types';
-export declare function mapHydrateResponseData({ data }: HydrateResponse): {
-    project?: SelectOption[] | undefined;
-    assignee?: SelectOption[] | undefined;
-    issuetype?: SelectOption[] | undefined;
-    status?: SelectOption[] | undefined;
-};
+import { FieldValuesResponse, HydrateResponse, SelectedOptionsMap, SelectOption } from '../types';
+export declare function mapHydrateResponseData({ data }: HydrateResponse): SelectedOptionsMap;
 export declare function mapFieldValuesToFilterOptions({ data, }: FieldValuesResponse): SelectOption[];
 export declare function mapFieldValuesToTotalCount({ data, }: FieldValuesResponse): number;
 export declare function mapFieldValuesToPageCursor({ data, }: FieldValuesResponse): string | undefined;

package/dist/types-ts4.5/ui/jira-issues-modal/jira-search-container/buildJQL.d.ts

@@ -1,11 +1,9 @@
-import { BasicFilterFieldType, SelectOption } from '../basic-filters/types';
+import { SelectedOptionsMap } from '../basic-filters/types';
 type BuildJQLInput = {
     rawSearch: string;
     orderDirection?: string;
     orderKey?: string;
-    filterValues?: {
-        [key in BasicFilterFieldType]?: SelectOption[];
-    };
+    filterValues?: SelectedOptionsMap;
 };
 export declare const fuzzyCharacter = "*";
 export declare const buildJQL: (input: BuildJQLInput) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.17.12",
+  "version": "1.18.0",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -30,7 +30,7 @@
     "analytics:codegen": "yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource --output ./src/analytics/generated"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^33.2.3",
+    "@atlaskit/adf-schema": "^34.0.0",
     "@atlaskit/analytics-next": "^9.1.3",
     "@atlaskit/avatar": "^21.4.0",
     "@atlaskit/badge": "^15.1.16",