@atlaskit/link-datasource 1.19.15 → 1.19.16

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-datasource
 
+## 1.19.16
+
+### Patch Changes
+
+- [#58204](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58204) [`f800efb5148e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f800efb5148e) - Design/Bug fixes for basic filters(after design review).
+
 ## 1.19.15
 
 ### 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.15"
+  packageVersion: "1.19.16"
 };

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

@@ -117,17 +117,17 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     }
   }, [selectedOptions, filterOptions, sortedOptions]);
   var sortOptionsOnResolve = (0, _react.useCallback)(function () {
-    // sortedOptions is empty initially, this will take care of setting the initial value and bring the selected items to the top
-    if (sortedOptions.length === 0) {
-      return sortOptionsOnPopupOpen();
-    }
-
     // when the user is searching, we want the search result to be displayed as it is, and the select component will take care of marking the selected items
     if (searchTerm) {
       sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
       return setSortedOptions(filterOptions);
     }
 
+    // sortedOptions is empty initially, this will take care of setting the initial value and bring the selected items to the top
+    if (sortedOptions.length === 0) {
+      return sortOptionsOnPopupOpen();
+    }
+
     // this block handles the pagination, where on pagination, we will just append newOptions to the current list
     if (sortPaginatedResults.current) {
       var newOptions = filterOptions.filter(function (option) {

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

@@ -15,6 +15,9 @@ var _errorMessage = _interopRequireDefault(require("./errorMessage"));
 var _loadingMessage = _interopRequireDefault(require("./loadingMessage"));
 var _noOptionsMessage = _interopRequireDefault(require("./noOptionsMessage"));
 var _excluded = ["children"];
+var inlineSpinnerStyles = (0, _primitives.xcss)({
+  paddingTop: "var(--ds-space-075, 6px)"
+});
 var CustomMenuList = function CustomMenuList(_ref) {
   var children = _ref.children,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
@@ -31,7 +34,8 @@ var CustomMenuList = function CustomMenuList(_ref) {
   var isLoadingMoreData = !shouldDisplayShowMore && isLoadingMore;
   var InlineSpinner = function InlineSpinner() {
     return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
-      justifyContent: "center"
+      justifyContent: "center",
+      xcss: inlineSpinnerStyles
     }, /*#__PURE__*/_react.default.createElement(_spinner.default, {
       size: "medium"
     }));

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.DEFAULT_JQL_QUERY = exports.ALLOWED_ORDER_BY_KEYS = void 0;
+exports.JiraSearchContainer = exports.FILTER_SELECTION_DEBOUNCE_MS = exports.DEFAULT_JQL_QUERY = exports.ALLOWED_ORDER_BY_KEYS = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -18,7 +18,6 @@ var _primitives = require("@atlaskit/primitives");
 var _analytics = require("../../../analytics");
 var _basicFilters = require("../basic-filters");
 var _useHydrateJqlQuery2 = require("../basic-filters/hooks/useHydrateJqlQuery");
-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");
@@ -40,7 +39,7 @@ var basicSearchInputContainerStyles = (0, _primitives.xcss)({
 });
 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 FILTER_SELECTION_DEBOUNCE_MS = exports.FILTER_SELECTION_DEBOUNCE_MS = 500;
 var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchContainer(props) {
   var isSearching = props.isSearching,
     parameters = props.parameters,
@@ -164,7 +163,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
         basicFilterSelections: filterSelections,
         isQueryComplex: isCurrentQueryComplex
       });
-    }, _asyncPopupSelect.SEARCH_DEBOUNCE_MS),
+    }, FILTER_SELECTION_DEBOUNCE_MS),
     _useDebouncedCallback2 = (0, _slicedToArray2.default)(_useDebouncedCallback, 1),
     debouncedBasicFilterSelectionChange = _useDebouncedCallback2[0];
   var handleBasicFilterSelectionChange = (0, _react.useCallback)(function (filterType, options) {
@@ -224,7 +223,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     onChange: onQueryChange,
     onSearch: handleSearch,
     query: jql
-  }), (0, _react2.jsx)(JiraSearchMethodSwitcher, {
+  }), (0, _react2.jsx)(_modeSwitcher.ModeSwitcher, {
     onOptionValueChange: onSearchMethodChange,
     selectedOptionValue: currentSearchMethod,
     options: [{

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

@@ -20,7 +20,7 @@ var modeSwitcherStyles = (0, _react2.css)({
   display: 'inline-flex',
   gap: "var(--ds-space-050, 4px)",
   lineHeight: "var(--ds-space-200, 16px)",
-  padding: "var(--ds-space-075, 6px)",
+  padding: "var(--ds-space-050, 4px)",
   '&:disabled': {
     opacity: '0.5'
   },

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.15"
+  packageVersion: "1.19.16"
 };

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

@@ -73,17 +73,17 @@ const AsyncPopupSelect = ({
     }
   }, [selectedOptions, filterOptions, sortedOptions]);
   const sortOptionsOnResolve = useCallback(() => {
-    // sortedOptions is empty initially, this will take care of setting the initial value and bring the selected items to the top
-    if (sortedOptions.length === 0) {
-      return sortOptionsOnPopupOpen();
-    }
-
     // when the user is searching, we want the search result to be displayed as it is, and the select component will take care of marking the selected items
     if (searchTerm) {
       sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
       return setSortedOptions(filterOptions);
     }
 
+    // sortedOptions is empty initially, this will take care of setting the initial value and bring the selected items to the top
+    if (sortedOptions.length === 0) {
+      return sortOptionsOnPopupOpen();
+    }
+
     // this block handles the pagination, where on pagination, we will just append newOptions to the current list
     if (sortPaginatedResults.current) {
       const newOptions = filterOptions.filter(option => !sortedOptions.find(sortedOption => sortedOption.value === option.value));

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

@@ -1,11 +1,14 @@
 import React from 'react';
-import { Flex } from '@atlaskit/primitives';
+import { Flex, xcss } from '@atlaskit/primitives';
 import { components } from '@atlaskit/select';
 import Spinner from '@atlaskit/spinner';
 import ShowMoreButton from '../async-popup-select/showMoreButton';
 import CustomErrorMessage from './errorMessage';
 import CustomDropdownLoadingMessage from './loadingMessage';
 import CustomNoOptionsMessage from './noOptionsMessage';
+const inlineSpinnerStyles = xcss({
+  paddingTop: "var(--ds-space-075, 6px)"
+});
 const CustomMenuList = ({
   children,
   ...props
@@ -23,7 +26,8 @@ const CustomMenuList = ({
   const shouldDisplayShowMore = showMore && !isLoadingMore;
   const isLoadingMoreData = !shouldDisplayShowMore && isLoadingMore;
   const InlineSpinner = () => /*#__PURE__*/React.createElement(Flex, {
-    justifyContent: "center"
+    justifyContent: "center",
+    xcss: inlineSpinnerStyles
   }, /*#__PURE__*/React.createElement(Spinner, {
     size: "medium"
   }));

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

@@ -8,7 +8,6 @@ import { Flex, xcss } from '@atlaskit/primitives';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { BasicFilters } from '../basic-filters';
 import { useHydrateJqlQuery } from '../basic-filters/hooks/useHydrateJqlQuery';
-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';
@@ -25,7 +24,7 @@ const basicSearchInputContainerStyles = xcss({
 });
 export const DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
 export const ALLOWED_ORDER_BY_KEYS = ['key', 'summary', 'assignee', 'status', 'created'];
-const JiraSearchMethodSwitcher = ModeSwitcher;
+export const FILTER_SELECTION_DEBOUNCE_MS = 500;
 export const JiraSearchContainer = props => {
   const {
     isSearching,
@@ -129,7 +128,7 @@ export const JiraSearchContainer = props => {
       basicFilterSelections: filterSelections,
       isQueryComplex: isCurrentQueryComplex
     });
-  }, SEARCH_DEBOUNCE_MS);
+  }, FILTER_SELECTION_DEBOUNCE_MS);
   const handleBasicFilterSelectionChange = useCallback((filterType, options) => {
     const updatedSelection = {
       ...filterSelections,
@@ -192,7 +191,7 @@ export const JiraSearchContainer = props => {
     onChange: onQueryChange,
     onSearch: handleSearch,
     query: jql
-  }), jsx(JiraSearchMethodSwitcher, {
+  }), jsx(ModeSwitcher, {
     onOptionValueChange: onSearchMethodChange,
     selectedOptionValue: currentSearchMethod,
     options: [{

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

@@ -12,7 +12,7 @@ const modeSwitcherStyles = css({
   display: 'inline-flex',
   gap: "var(--ds-space-050, 4px)",
   lineHeight: "var(--ds-space-200, 16px)",
-  padding: "var(--ds-space-075, 6px)",
+  padding: "var(--ds-space-050, 4px)",
   '&:disabled': {
     opacity: '0.5'
   },

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.15"
+  packageVersion: "1.19.16"
 };

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

@@ -107,17 +107,17 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     }
   }, [selectedOptions, filterOptions, sortedOptions]);
   var sortOptionsOnResolve = useCallback(function () {
-    // sortedOptions is empty initially, this will take care of setting the initial value and bring the selected items to the top
-    if (sortedOptions.length === 0) {
-      return sortOptionsOnPopupOpen();
-    }
-
     // when the user is searching, we want the search result to be displayed as it is, and the select component will take care of marking the selected items
     if (searchTerm) {
       sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
       return setSortedOptions(filterOptions);
     }
 
+    // sortedOptions is empty initially, this will take care of setting the initial value and bring the selected items to the top
+    if (sortedOptions.length === 0) {
+      return sortOptionsOnPopupOpen();
+    }
+
     // this block handles the pagination, where on pagination, we will just append newOptions to the current list
     if (sortPaginatedResults.current) {
       var newOptions = filterOptions.filter(function (option) {

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

@@ -1,13 +1,16 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["children"];
 import React from 'react';
-import { Flex } from '@atlaskit/primitives';
+import { Flex, xcss } from '@atlaskit/primitives';
 import { components } from '@atlaskit/select';
 import Spinner from '@atlaskit/spinner';
 import ShowMoreButton from '../async-popup-select/showMoreButton';
 import CustomErrorMessage from './errorMessage';
 import CustomDropdownLoadingMessage from './loadingMessage';
 import CustomNoOptionsMessage from './noOptionsMessage';
+var inlineSpinnerStyles = xcss({
+  paddingTop: "var(--ds-space-075, 6px)"
+});
 var CustomMenuList = function CustomMenuList(_ref) {
   var children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded);
@@ -24,7 +27,8 @@ var CustomMenuList = function CustomMenuList(_ref) {
   var isLoadingMoreData = !shouldDisplayShowMore && isLoadingMore;
   var InlineSpinner = function InlineSpinner() {
     return /*#__PURE__*/React.createElement(Flex, {
-      justifyContent: "center"
+      justifyContent: "center",
+      xcss: inlineSpinnerStyles
     }, /*#__PURE__*/React.createElement(Spinner, {
       size: "medium"
     }));

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

@@ -14,7 +14,6 @@ import { Flex, xcss } from '@atlaskit/primitives';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { BasicFilters } from '../basic-filters';
 import { useHydrateJqlQuery } from '../basic-filters/hooks/useHydrateJqlQuery';
-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';
@@ -31,7 +30,7 @@ var basicSearchInputContainerStyles = xcss({
 });
 export var DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
 export var ALLOWED_ORDER_BY_KEYS = ['key', 'summary', 'assignee', 'status', 'created'];
-var JiraSearchMethodSwitcher = ModeSwitcher;
+export var FILTER_SELECTION_DEBOUNCE_MS = 500;
 export var JiraSearchContainer = function JiraSearchContainer(props) {
   var isSearching = props.isSearching,
     parameters = props.parameters,
@@ -155,7 +154,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
         basicFilterSelections: filterSelections,
         isQueryComplex: isCurrentQueryComplex
       });
-    }, SEARCH_DEBOUNCE_MS),
+    }, FILTER_SELECTION_DEBOUNCE_MS),
     _useDebouncedCallback2 = _slicedToArray(_useDebouncedCallback, 1),
     debouncedBasicFilterSelectionChange = _useDebouncedCallback2[0];
   var handleBasicFilterSelectionChange = useCallback(function (filterType, options) {
@@ -215,7 +214,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     onChange: onQueryChange,
     onSearch: handleSearch,
     query: jql
-  }), jsx(JiraSearchMethodSwitcher, {
+  }), jsx(ModeSwitcher, {
     onOptionValueChange: onSearchMethodChange,
     selectedOptionValue: currentSearchMethod,
     options: [{

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

@@ -12,7 +12,7 @@ var modeSwitcherStyles = css({
   display: 'inline-flex',
   gap: "var(--ds-space-050, 4px)",
   lineHeight: "var(--ds-space-200, 16px)",
-  padding: "var(--ds-space-075, 6px)",
+  padding: "var(--ds-space-050, 4px)",
   '&:disabled': {
     opacity: '0.5'
   },

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

@@ -4,6 +4,7 @@ import { SelectedOptionsMap } from '../basic-filters/types';
 import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery } from '../types';
 export declare const DEFAULT_JQL_QUERY = "created >= -30d order by created DESC";
 export declare const ALLOWED_ORDER_BY_KEYS: string[];
+export declare const FILTER_SELECTION_DEBOUNCE_MS = 500;
 export interface SearchContainerProps {
     isSearching?: boolean;
     onSearch: (query: JiraIssueDatasourceParametersQuery, { searchMethod, basicFilterSelections, }: {

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

@@ -4,6 +4,7 @@ import { SelectedOptionsMap } from '../basic-filters/types';
 import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery } from '../types';
 export declare const DEFAULT_JQL_QUERY = "created >= -30d order by created DESC";
 export declare const ALLOWED_ORDER_BY_KEYS: string[];
+export declare const FILTER_SELECTION_DEBOUNCE_MS = 500;
 export interface SearchContainerProps {
     isSearching?: boolean;
     onSearch: (query: JiraIssueDatasourceParametersQuery, { searchMethod, basicFilterSelections, }: {

package/package.json

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