@atlaskit/link-datasource 1.17.2 → 1.17.4

package/dist/esm/i18n/vi.js

@@ -21,28 +21,30 @@ export default {
   'linkDataSource.column-picker.no-all-items-shown-message.line-1': 'Tìm kiếm của bạn trả về quá nhiều kết quả.',
   'linkDataSource.column-picker.no-all-items-shown-message.line-2': 'Hãy thử lại với các từ khóa cụ thể hơn.',
   'linkDataSource.column-picker.search': 'Tìm kiếm trường',
-  'linkDataSource.jira-issues.accessInstructions': 'Hãy liên hệ với quản trị viên để yêu cầu quyền truy cập.',
+  'linkDataSource.column-picker.tooltip': 'Đặt cấu hình cột',
+  'linkDataSource.jira-issues.accessInstructions': 'Để yêu cầu quyền truy cập, hãy liên hệ với quản trị viên trang web của bạn.',
   'linkDataSource.jira-issues.accessRequired': 'Bạn không có quyền truy cập vào trang web này',
-  'linkDataSource.jira-issues.accessRequiredWithSite': 'Bạn không có quyền truy cập vào {siteName}',
+  'linkDataSource.jira-issues.accessRequiredWithSite': 'Bạn không có quyền truy cập vào trang web sau đây:',
   'linkDataSource.jira-issues.checkConnection': 'Kiểm tra kết nối của bạn rồi làm mới hoặc thử lại sau.',
   'linkDataSource.jira-issues.checkConnectionWithSource': 'Kiểm tra kết nối của bạn rồi làm mới hoặc <a>mở truy vấn này trong Jira</a> để xem xét.',
+  'linkDataSource.jira-issues.configmodal.basicModeSwitchDisabledTooltipText': 'Bạn không thể chuyển sang chế độ cơ bản cho truy vấn này.',
   'linkDataSource.jira-issues.configmodal.basicModeText': 'Cơ bản',
-  'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder': 'Tìm kiếm',
+  'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder': 'Tìm kiếm vấn đề theo từ khóa',
   'linkDataSource.jira-issues.configmodal.cancelButtonText': 'Hủy',
+  'linkDataSource.jira-issues.configmodal.chooseSite': 'Chọn trang web',
   'linkDataSource.jira-issues.configmodal.countViewModeLabel': 'Trình xem số lượng',
-  'linkDataSource.jira-issues.configmodal.dropdownChevronLabel': 'Chọn trang jira',
   'linkDataSource.jira-issues.configmodal.insertIssuesButtonText': 'Chèn vấn đề',
   'linkDataSource.jira-issues.configmodal.insertIssuesTitle': 'Chèn vấn đề Jira',
-  'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites': 'Chèn vấn đề Jira từ {siteName}',
+  'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites': 'Chèn vấn đề Jira từ',
   'linkDataSource.jira-issues.configmodal.issue': '{totalCount, plural, other {vấn đề}}',
   'linkDataSource.jira-issues.configmodal.issueViewModeLabel': 'Trình xem Vấn đề',
-  'linkDataSource.jira-issues.configmodal.selectedJiraSiteLabel': 'Đã chọn {siteName}',
   'linkDataSource.jira-issues.noResultsFound': 'Không tìm thấy kết quả',
   'linkDataSource.jira-issues.refresh': 'Làm mới',
   'linkDataSource.jira-issues.unableToLoadItems': 'Không thể tải được các mục',
   'linkDataSource.jira-issues.unableToLoadResults': 'Không tải được kết quả',
-  'linkDataSource.modal-initial-state.learnMoreLink': 'Tìm hiểu thêm về việc tìm kiếm bằng JQL.',
-  'linkDataSource.modal-initial-state.searchDescription': 'Bắt đầu nhập hoặc sử dụng JQL để tìm kiếm.',
+  'linkDataSource.modal-initial-state.beta': 'Beta',
+  'linkDataSource.modal-initial-state.learnMoreLink': 'Tìm hiểu cách tìm kiếm bằng JQL',
+  'linkDataSource.modal-initial-state.searchDescription': 'Sử dụng JQL (Ngôn ngữ Đặt câu hỏi trên Jira) để tìm kiếm các vấn đề.',
   'linkDataSource.modal-initial-state.searchTitle': 'Tìm kiếm vấn đề Jira',
   'linkDataSource.render-type.boolean.false': 'Không',
   'linkDataSource.render-type.boolean.true': 'Có',

package/dist/esm/i18n/zh.js

@@ -21,28 +21,30 @@ export default {
   'linkDataSource.column-picker.no-all-items-shown-message.line-1': '搜索返回的结果过多。',
   'linkDataSource.column-picker.no-all-items-shown-message.line-2': '请使用更具体的关键词重试。',
   'linkDataSource.column-picker.search': '搜索字段',
-  'linkDataSource.jira-issues.accessInstructions': '要申请访问权限，请联系您的管理员。',
+  'linkDataSource.column-picker.tooltip': '配置列',
+  'linkDataSource.jira-issues.accessInstructions': '要申请访问权限，请联系您的站点管理员。',
   'linkDataSource.jira-issues.accessRequired': '您无权访问此站点',
-  'linkDataSource.jira-issues.accessRequiredWithSite': '您无权访问 {siteName}',
+  'linkDataSource.jira-issues.accessRequiredWithSite': '您无权访问以下站点：',
   'linkDataSource.jira-issues.checkConnection': '请检查连接并刷新，或稍后重试。',
   'linkDataSource.jira-issues.checkConnectionWithSource': '请检查连接并刷新，或<a>在 Jira 中打开此查询</a>以进行查看。',
+  'linkDataSource.jira-issues.configmodal.basicModeSwitchDisabledTooltipText': '对于此查询，您无法切换至基本模式。',
   'linkDataSource.jira-issues.configmodal.basicModeText': '基本',
-  'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder': '搜索',
+  'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder': '按关键字搜索事务',
   'linkDataSource.jira-issues.configmodal.cancelButtonText': '取消',
+  'linkDataSource.jira-issues.configmodal.chooseSite': '选择站点',
   'linkDataSource.jira-issues.configmodal.countViewModeLabel': '计数视图',
-  'linkDataSource.jira-issues.configmodal.dropdownChevronLabel': '选取 Jira 站点',
   'linkDataSource.jira-issues.configmodal.insertIssuesButtonText': '插入事务',
   'linkDataSource.jira-issues.configmodal.insertIssuesTitle': '插入 Jira 事务',
-  'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites': '插入 {siteName} 中的 Jira 事务',
+  'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites': '插入以下来源的 Jira 事务：',
   'linkDataSource.jira-issues.configmodal.issue': '{totalCount, plural, other {个事务}}',
   'linkDataSource.jira-issues.configmodal.issueViewModeLabel': '事务视图',
-  'linkDataSource.jira-issues.configmodal.selectedJiraSiteLabel': '已选择 {siteName}',
   'linkDataSource.jira-issues.noResultsFound': '未找到结果',
   'linkDataSource.jira-issues.refresh': '刷新',
   'linkDataSource.jira-issues.unableToLoadItems': '无法加载项目',
   'linkDataSource.jira-issues.unableToLoadResults': '无法加载结果',
-  'linkDataSource.modal-initial-state.learnMoreLink': '详细了解如何使用 JQL 进行搜索。',
-  'linkDataSource.modal-initial-state.searchDescription': '开始输入搜索内容或使用 JQL 进行搜索。',
+  'linkDataSource.modal-initial-state.beta': '测试版',
+  'linkDataSource.modal-initial-state.learnMoreLink': '了解如何使用 JQL 进行搜索',
+  'linkDataSource.modal-initial-state.searchDescription': '使用 JQL（Jira 查询语言）来搜索事务。',
   'linkDataSource.modal-initial-state.searchTitle': '搜索 Jira 事务',
   'linkDataSource.render-type.boolean.false': '否',
   'linkDataSource.render-type.boolean.true': '是',

package/dist/esm/i18n/zh_TW.js

@@ -21,28 +21,30 @@ export default {
   'linkDataSource.column-picker.no-all-items-shown-message.line-1': '您的搜尋傳回過多結果。',
   'linkDataSource.column-picker.no-all-items-shown-message.line-2': '請使用更具體的關鍵字再試一次。',
   'linkDataSource.column-picker.search': '搜尋欄位',
-  'linkDataSource.jira-issues.accessInstructions': '若要要求存取權，請連絡您的管理員。',
+  'linkDataSource.column-picker.tooltip': '設定欄',
+  'linkDataSource.jira-issues.accessInstructions': '若要要求存取權，請連絡您的網站管理員。',
   'linkDataSource.jira-issues.accessRequired': '您無法存取此網站',
-  'linkDataSource.jira-issues.accessRequiredWithSite': '您無法存取 {siteName}',
+  'linkDataSource.jira-issues.accessRequiredWithSite': '您無法存取下列網站：',
   'linkDataSource.jira-issues.checkConnection': '請檢查您的連線並重新整理，或稍後再試一次。',
   'linkDataSource.jira-issues.checkConnectionWithSource': '請檢查您的連線並重新整理，或者<a>在 Jira 中開啟此查詢</a>加以檢閱。',
+  'linkDataSource.jira-issues.configmodal.basicModeSwitchDisabledTooltipText': '您無法針對此查詢切換為基本模式。',
   'linkDataSource.jira-issues.configmodal.basicModeText': '基本',
-  'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder': '搜尋',
+  'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder': '按關鍵字搜尋議題',
   'linkDataSource.jira-issues.configmodal.cancelButtonText': '取消',
+  'linkDataSource.jira-issues.configmodal.chooseSite': '選擇網站',
   'linkDataSource.jira-issues.configmodal.countViewModeLabel': '計數檢視',
-  'linkDataSource.jira-issues.configmodal.dropdownChevronLabel': '挑選 Jira 網站',
   'linkDataSource.jira-issues.configmodal.insertIssuesButtonText': '插入議題',
   'linkDataSource.jira-issues.configmodal.insertIssuesTitle': '插入 Jira 議題',
-  'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites': '從 {siteName} 中插入 Jira 議題',
+  'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites': '從中插入 Jira 議題：',
   'linkDataSource.jira-issues.configmodal.issue': '{totalCount, plural, other {個議題}}',
   'linkDataSource.jira-issues.configmodal.issueViewModeLabel': '議題檢視',
-  'linkDataSource.jira-issues.configmodal.selectedJiraSiteLabel': '已選取 {siteName}',
   'linkDataSource.jira-issues.noResultsFound': '找不到結果',
   'linkDataSource.jira-issues.refresh': '重新整理',
   'linkDataSource.jira-issues.unableToLoadItems': '無法載入項目',
   'linkDataSource.jira-issues.unableToLoadResults': '無法載入結果',
-  'linkDataSource.modal-initial-state.learnMoreLink': '進一步了解如何使用 JQL 進行搜尋。',
-  'linkDataSource.modal-initial-state.searchDescription': '開始輸入或使用 JQL 進行搜尋。',
+  'linkDataSource.modal-initial-state.beta': '測試版',
+  'linkDataSource.modal-initial-state.learnMoreLink': '了解如何使用 JQL 搜尋',
+  'linkDataSource.modal-initial-state.searchDescription': '使用 JQL (Jira 查詢語言) 來搜尋議題。',
   'linkDataSource.modal-initial-state.searchTitle': '搜尋 Jira 議題',
   'linkDataSource.render-type.boolean.false': '否',
   'linkDataSource.render-type.boolean.true': '是',

package/dist/esm/ui/issue-like-table/draggable-table-heading.js

@@ -1,4 +1,7 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+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 */
 import { useEffect, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react';
@@ -199,6 +202,9 @@ export var DraggableTableHeading = function DraggableTableHeading(_ref) {
 
   // Handling column resizing
   useEffect(function () {
+    if (!onWidthChange) {
+      return;
+    }
     var resizeHandle = columnResizeHandleRef.current;
     invariant(resizeHandle);
     var mainHeaderCell = mainHeaderCellRef.current;
@@ -257,18 +263,21 @@ export var DraggableTableHeading = function DraggableTableHeading(_ref) {
   return jsx(TableHeading, {
     ref: mainHeaderCellRef,
     "data-testid": "".concat(id, "-column-heading"),
-    style: {
-      width: width,
+    style: _objectSpread({
       cursor: 'grab'
-    }
-  }, jsx("div", {
+    }, onWidthChange ? {
+      width: width
+    } : {
+      maxWidth: width
+    })
+  }, onWidthChange ? jsx("div", {
     ref: columnResizeHandleRef,
     css: [resizerStyles, state.type === 'resizing' && resizingStyles],
     style: {
       height: "".concat(dndPreviewHeight, "px")
     },
     "data-testid": "column-resize-handle"
-  }), jsx("div", {
+  }) : null, jsx("div", {
     ref: dropTargetRef,
     css: [dropTargetStyles, isDraggingAnyColumn ? null : noPointerEventsStyles],
     style: {

package/dist/esm/ui/issue-like-table/index.js

@@ -50,7 +50,6 @@ var scrollableContainerStyles = css({
   borderRadius: "var(--ds-border-radius-100, 3px)"
 });
 var tableStyles = css({
-  tableLayout: 'fixed',
   // These styles are needed to prevent thead bottom border from scrolling away.
   // This happens because it is sticky. https://stackoverflow.com/questions/50361698/border-style-do-not-work-with-sticky-position-element
   borderCollapse: 'separate',
@@ -365,6 +364,7 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref) {
       }
     }, _callee, null, [[3, 9]]);
   })), [parentContainerRenderInstanceId, extensionKey, hasFullSchema, onLoadDatasourceDetails]);
+  var shouldUseWidth = onColumnResize || columnCustomSizes;
   return jsx("div", {
     /* There is required contentEditable={true} in editor-card-plugin
      * But this brakes how DND works. We set contentEditable={false} to allow DND to work
@@ -378,7 +378,10 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref) {
     } : undefined
   }, jsx(Table, {
     css: tableStyles,
-    "data-testid": testId
+    "data-testid": testId,
+    style: shouldUseWidth ? {
+      tableLayout: 'fixed'
+    } : {}
   }, jsx("thead", {
     "data-testid": testId && "".concat(testId, "--head"),
     css: [noDefaultBorderStyles, tableHeadStyles]
@@ -426,8 +429,10 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref) {
       return jsx(TableHeading, {
         key: key,
         "data-testid": "".concat(key, "-column-heading"),
-        style: {
+        style: shouldUseWidth ? {
           width: width
+        } : {
+          maxWidth: width
         }
       }, heading);
     }
@@ -452,8 +457,10 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref) {
       var cellKey = _ref13.key,
         content = _ref13.content,
         width = _ref13.width;
-      var loadingRowStyle = {
+      var loadingRowStyle = shouldUseWidth ? {
         width: width
+      } : {
+        maxWidth: width
       };
       // extra padding is required around skeleton loader to avoid vertical jumps when data loads
       if (key !== null && key !== void 0 && key.includes('loading')) {

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

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { useCallback, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
 import { mapFieldValuesToFilterOptions, mapFieldValuesToPageCursor, mapFieldValuesToTotalCount } from '../utils/transformers';
 export var useFilterOptions = function useFilterOptions(_ref) {
@@ -97,17 +97,23 @@ export var useFilterOptions = function useFilterOptions(_ref) {
         case 24:
           _context.prev = 24;
           _context.t1 = _context["catch"](5);
-          setErrors([_context.t1]);
           setStatus('rejected');
+          setErrors([_context.t1]);
         case 28:
         case "end":
           return _context.stop();
       }
     }, _callee, null, [[5, 24]]);
   })), [cloudId, filterOptions, filterType, getFieldValues]);
+  useEffect(function () {
+    if (status !== 'rejected' && errors.length !== 0) {
+      setErrors([]);
+    }
+  }, [errors.length, status]);
   var reset = useCallback(function () {
     setStatus('empty');
     setFilterOptions([]);
+    setErrors([]);
     setTotalCount(0);
     setNextPageCursor(undefined);
     initialData.current = undefined;
@@ -118,7 +124,7 @@ export var useFilterOptions = function useFilterOptions(_ref) {
     totalCount: totalCount,
     pageCursor: nextPageCursor,
     status: status,
-    reset: reset,
-    errors: status === 'rejected' ? errors : []
+    errors: errors,
+    reset: reset
   };
 };

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

@@ -1,5 +1,5 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
@@ -198,22 +198,21 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     hideSelectedOptions: false,
     isLoading: isLoading,
     placeholder: formatMessage(asyncPopupSelectMessages.selectPlaceholder),
+    menuListProps: {
+      filterType: filterType,
+      isError: isError,
+      isEmpty: isEmpty,
+      isLoading: isLoading,
+      isLoadingMore: isLoadingMore,
+      handleShowMore: handleShowMore,
+      errors: errors,
+      showMore: shouldDisplayShowMoreButton
+    },
     components: {
       /* @ts-expect-error - This component has stricter OptionType, hence a temp setup untill its made generic */
       Option: CheckboxOption,
       Control: CustomControl,
-      MenuList: function MenuList(props) {
-        return /*#__PURE__*/React.createElement(CustomMenuList, _extends({}, props, {
-          filterType: filterType,
-          isError: isError,
-          isEmpty: isEmpty,
-          isLoading: isLoading,
-          isLoadingMore: isLoadingMore,
-          showMore: shouldDisplayShowMoreButton,
-          handleShowMore: handleShowMore,
-          errors: errors
-        }));
-      },
+      MenuList: CustomMenuList,
       DropdownIndicator: CustomDropdownIndicator,
       LoadingIndicator: undefined,
       // disables the three ... indicator in the searchbox when picker is loading

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

@@ -1,5 +1,5 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["filterType", "isLoading", "isLoadingMore", "isError", "isEmpty", "errors", "showMore", "handleShowMore", "children"];
+var _excluded = ["children"];
 import React from 'react';
 import { Flex } from '@atlaskit/primitives';
 import { components } from '@atlaskit/select';
@@ -9,16 +9,17 @@ import CustomErrorMessage from './errorMessage';
 import CustomDropdownLoadingMessage from './loadingMessage';
 import CustomNoOptionsMessage from './noOptionsMessage';
 var CustomMenuList = function CustomMenuList(_ref) {
-  var filterType = _ref.filterType,
-    isLoading = _ref.isLoading,
-    isLoadingMore = _ref.isLoadingMore,
-    isError = _ref.isError,
-    isEmpty = _ref.isEmpty,
-    errors = _ref.errors,
-    showMore = _ref.showMore,
-    handleShowMore = _ref.handleShowMore,
-    children = _ref.children,
+  var children = _ref.children,
     props = _objectWithoutProperties(_ref, _excluded);
+  var _props$selectProps$me = props.selectProps.menuListProps,
+    filterType = _props$selectProps$me.filterType,
+    isLoading = _props$selectProps$me.isLoading,
+    isLoadingMore = _props$selectProps$me.isLoadingMore,
+    isError = _props$selectProps$me.isError,
+    isEmpty = _props$selectProps$me.isEmpty,
+    errors = _props$selectProps$me.errors,
+    showMore = _props$selectProps$me.showMore,
+    handleShowMore = _props$selectProps$me.handleShowMore;
   var shouldDisplayShowMore = showMore && !isLoadingMore;
   var isLoadingMoreData = !shouldDisplayShowMore && isLoadingMore;
   var InlineSpinner = function InlineSpinner() {

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

@@ -1,8 +1,10 @@
 /** @jsx jsx */
+import { useMemo } from 'react';
 import { css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
 import { LoadingButton } from '@atlaskit/button';
 import SearchIcon from '@atlaskit/icon/glyph/editor/search';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import Textfield from '@atlaskit/textfield';
 import { basicSearchInputMessages } from './messages';
 var searchButtonStyles = css({
@@ -11,6 +13,10 @@ var searchButtonStyles = css({
 var formStyles = css({
   flex: 1
 });
+var formWithMaxWidthStyles = css({
+  flex: 1,
+  maxWidth: 250
+});
 export var BasicSearchInput = function BasicSearchInput(_ref) {
   var isDisabled = _ref.isDisabled,
     isSearching = _ref.isSearching,
@@ -25,8 +31,14 @@ export var BasicSearchInput = function BasicSearchInput(_ref) {
     e.preventDefault();
     onSearch(searchTerm);
   };
+  var showBasicFilters = useMemo(function () {
+    if (getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters')) {
+      return true;
+    }
+    return false;
+  }, []);
   return jsx("form", {
-    css: formStyles,
+    css: showBasicFilters ? formWithMaxWidthStyles : formStyles,
     onSubmit: handleFormSubmit
   }, jsx(Textfield, {
     elemAfterInput: jsx(LoadingButton, {

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

@@ -4,6 +4,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { Flex, xcss } from '@atlaskit/primitives';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { BasicFilters } from '../basic-filters';
 import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
@@ -17,6 +18,9 @@ var inputContainerStyles = css({
   display: 'flex',
   minHeight: '60px'
 });
+var basicSearchInputContainerStyles = xcss({
+  flexGrow: 1
+});
 var DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
 export var ALLOWED_ORDER_BY_KEYS = ['key', 'summary', 'assignee', 'status', 'created'];
 var JiraSearchMethodSwitcher = ModeSwitcher;
@@ -110,7 +114,10 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
   }, []);
   return jsx("div", {
     css: inputContainerStyles
-  }, currentSearchMethod === 'basic' && jsx(React.Fragment, null, jsx(BasicSearchInput, {
+  }, currentSearchMethod === 'basic' && jsx(Flex, {
+    alignItems: "center",
+    xcss: basicSearchInputContainerStyles
+  }, jsx(BasicSearchInput, {
     isSearching: isSearching,
     onChange: handleBasicSearchChange,
     onSearch: handleSearch,

package/dist/types/i18n/cs.d.ts

@@ -19,26 +19,28 @@ declare const _default: {
     'linkDataSource.column-picker.no-all-items-shown-message.line-1': string;
     'linkDataSource.column-picker.no-all-items-shown-message.line-2': string;
     'linkDataSource.column-picker.search': string;
+    'linkDataSource.column-picker.tooltip': string;
     'linkDataSource.jira-issues.accessInstructions': string;
     'linkDataSource.jira-issues.accessRequired': string;
     'linkDataSource.jira-issues.accessRequiredWithSite': string;
     'linkDataSource.jira-issues.checkConnection': string;
     'linkDataSource.jira-issues.checkConnectionWithSource': string;
+    'linkDataSource.jira-issues.configmodal.basicModeSwitchDisabledTooltipText': string;
     'linkDataSource.jira-issues.configmodal.basicModeText': string;
     'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder': string;
     'linkDataSource.jira-issues.configmodal.cancelButtonText': string;
+    'linkDataSource.jira-issues.configmodal.chooseSite': string;
     'linkDataSource.jira-issues.configmodal.countViewModeLabel': string;
-    'linkDataSource.jira-issues.configmodal.dropdownChevronLabel': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesButtonText': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitle': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites': string;
     'linkDataSource.jira-issues.configmodal.issue': string;
     'linkDataSource.jira-issues.configmodal.issueViewModeLabel': string;
-    'linkDataSource.jira-issues.configmodal.selectedJiraSiteLabel': string;
     'linkDataSource.jira-issues.noResultsFound': string;
     'linkDataSource.jira-issues.refresh': string;
     'linkDataSource.jira-issues.unableToLoadItems': string;
     'linkDataSource.jira-issues.unableToLoadResults': string;
+    'linkDataSource.modal-initial-state.beta': string;
     'linkDataSource.modal-initial-state.learnMoreLink': string;
     'linkDataSource.modal-initial-state.searchDescription': string;
     'linkDataSource.modal-initial-state.searchTitle': string;

package/dist/types/i18n/da.d.ts

@@ -19,26 +19,28 @@ declare const _default: {
     'linkDataSource.column-picker.no-all-items-shown-message.line-1': string;
     'linkDataSource.column-picker.no-all-items-shown-message.line-2': string;
     'linkDataSource.column-picker.search': string;
+    'linkDataSource.column-picker.tooltip': string;
     'linkDataSource.jira-issues.accessInstructions': string;
     'linkDataSource.jira-issues.accessRequired': string;
     'linkDataSource.jira-issues.accessRequiredWithSite': string;
     'linkDataSource.jira-issues.checkConnection': string;
     'linkDataSource.jira-issues.checkConnectionWithSource': string;
+    'linkDataSource.jira-issues.configmodal.basicModeSwitchDisabledTooltipText': string;
     'linkDataSource.jira-issues.configmodal.basicModeText': string;
     'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder': string;
     'linkDataSource.jira-issues.configmodal.cancelButtonText': string;
+    'linkDataSource.jira-issues.configmodal.chooseSite': string;
     'linkDataSource.jira-issues.configmodal.countViewModeLabel': string;
-    'linkDataSource.jira-issues.configmodal.dropdownChevronLabel': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesButtonText': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitle': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites': string;
     'linkDataSource.jira-issues.configmodal.issue': string;
     'linkDataSource.jira-issues.configmodal.issueViewModeLabel': string;
-    'linkDataSource.jira-issues.configmodal.selectedJiraSiteLabel': string;
     'linkDataSource.jira-issues.noResultsFound': string;
     'linkDataSource.jira-issues.refresh': string;
     'linkDataSource.jira-issues.unableToLoadItems': string;
     'linkDataSource.jira-issues.unableToLoadResults': string;
+    'linkDataSource.modal-initial-state.beta': string;
     'linkDataSource.modal-initial-state.learnMoreLink': string;
     'linkDataSource.modal-initial-state.searchDescription': string;
     'linkDataSource.modal-initial-state.searchTitle': string;

package/dist/types/i18n/de.d.ts

@@ -19,26 +19,28 @@ declare const _default: {
     'linkDataSource.column-picker.no-all-items-shown-message.line-1': string;
     'linkDataSource.column-picker.no-all-items-shown-message.line-2': string;
     'linkDataSource.column-picker.search': string;
+    'linkDataSource.column-picker.tooltip': string;
     'linkDataSource.jira-issues.accessInstructions': string;
     'linkDataSource.jira-issues.accessRequired': string;
     'linkDataSource.jira-issues.accessRequiredWithSite': string;
     'linkDataSource.jira-issues.checkConnection': string;
     'linkDataSource.jira-issues.checkConnectionWithSource': string;
+    'linkDataSource.jira-issues.configmodal.basicModeSwitchDisabledTooltipText': string;
     'linkDataSource.jira-issues.configmodal.basicModeText': string;
     'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder': string;
     'linkDataSource.jira-issues.configmodal.cancelButtonText': string;
+    'linkDataSource.jira-issues.configmodal.chooseSite': string;
     'linkDataSource.jira-issues.configmodal.countViewModeLabel': string;
-    'linkDataSource.jira-issues.configmodal.dropdownChevronLabel': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesButtonText': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitle': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites': string;
     'linkDataSource.jira-issues.configmodal.issue': string;
     'linkDataSource.jira-issues.configmodal.issueViewModeLabel': string;
-    'linkDataSource.jira-issues.configmodal.selectedJiraSiteLabel': string;
     'linkDataSource.jira-issues.noResultsFound': string;
     'linkDataSource.jira-issues.refresh': string;
     'linkDataSource.jira-issues.unableToLoadItems': string;
     'linkDataSource.jira-issues.unableToLoadResults': string;
+    'linkDataSource.modal-initial-state.beta': string;
     'linkDataSource.modal-initial-state.learnMoreLink': string;
     'linkDataSource.modal-initial-state.searchDescription': string;
     'linkDataSource.modal-initial-state.searchTitle': string;

package/dist/types/i18n/en.d.ts

@@ -25,18 +25,18 @@ declare const _default: {
     'linkDataSource.jira-issues.accessRequiredWithSite': string;
     'linkDataSource.jira-issues.checkConnection': string;
     'linkDataSource.jira-issues.checkConnectionWithSource': string;
+    'linkDataSource.jira-issues.configmodal.basicModeSwitchDisabledTooltipText': string;
     'linkDataSource.jira-issues.configmodal.basicModeText': string;
     'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder': string;
     'linkDataSource.jira-issues.configmodal.cancelButtonText': string;
+    'linkDataSource.jira-issues.configmodal.chooseSite': string;
     'linkDataSource.jira-issues.configmodal.countViewModeLabel': string;
-    'linkDataSource.jira-issues.configmodal.dropdownChevronLabel': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesButtonText': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitle': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites': string;
     'linkDataSource.jira-issues.configmodal.issue': string;
     'linkDataSource.jira-issues.configmodal.issueViewModeLabel': string;
     'linkDataSource.jira-issues.configmodal.placeholder.issues': string;
-    'linkDataSource.jira-issues.configmodal.selectedJiraSiteLabel': string;
     'linkDataSource.jira-issues.noResultsFound': string;
     'linkDataSource.jira-issues.refresh': string;
     'linkDataSource.jira-issues.unableToLoadItems': string;

package/dist/types/i18n/en_GB.d.ts

@@ -25,18 +25,18 @@ declare const _default: {
     'linkDataSource.jira-issues.accessRequiredWithSite': string;
     'linkDataSource.jira-issues.checkConnection': string;
     'linkDataSource.jira-issues.checkConnectionWithSource': string;
+    'linkDataSource.jira-issues.configmodal.basicModeSwitchDisabledTooltipText': string;
     'linkDataSource.jira-issues.configmodal.basicModeText': string;
     'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder': string;
     'linkDataSource.jira-issues.configmodal.cancelButtonText': string;
+    'linkDataSource.jira-issues.configmodal.chooseSite': string;
     'linkDataSource.jira-issues.configmodal.countViewModeLabel': string;
-    'linkDataSource.jira-issues.configmodal.dropdownChevronLabel': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesButtonText': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitle': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites': string;
     'linkDataSource.jira-issues.configmodal.issue': string;
     'linkDataSource.jira-issues.configmodal.issueViewModeLabel': string;
     'linkDataSource.jira-issues.configmodal.placeholder.issues': string;
-    'linkDataSource.jira-issues.configmodal.selectedJiraSiteLabel': string;
     'linkDataSource.jira-issues.noResultsFound': string;
     'linkDataSource.jira-issues.refresh': string;
     'linkDataSource.jira-issues.unableToLoadItems': string;

package/dist/types/i18n/en_ZZ.d.ts

@@ -25,18 +25,18 @@ declare const _default: {
     'linkDataSource.jira-issues.accessRequiredWithSite': string;
     'linkDataSource.jira-issues.checkConnection': string;
     'linkDataSource.jira-issues.checkConnectionWithSource': string;
+    'linkDataSource.jira-issues.configmodal.basicModeSwitchDisabledTooltipText': string;
     'linkDataSource.jira-issues.configmodal.basicModeText': string;
     'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder': string;
     'linkDataSource.jira-issues.configmodal.cancelButtonText': string;
+    'linkDataSource.jira-issues.configmodal.chooseSite': string;
     'linkDataSource.jira-issues.configmodal.countViewModeLabel': string;
-    'linkDataSource.jira-issues.configmodal.dropdownChevronLabel': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesButtonText': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitle': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites': string;
     'linkDataSource.jira-issues.configmodal.issue': string;
     'linkDataSource.jira-issues.configmodal.issueViewModeLabel': string;
     'linkDataSource.jira-issues.configmodal.placeholder.issues': string;
-    'linkDataSource.jira-issues.configmodal.selectedJiraSiteLabel': string;
     'linkDataSource.jira-issues.noResultsFound': string;
     'linkDataSource.jira-issues.refresh': string;
     'linkDataSource.jira-issues.unableToLoadItems': string;

package/dist/types/i18n/es.d.ts

@@ -19,26 +19,28 @@ declare const _default: {
     'linkDataSource.column-picker.no-all-items-shown-message.line-1': string;
     'linkDataSource.column-picker.no-all-items-shown-message.line-2': string;
     'linkDataSource.column-picker.search': string;
+    'linkDataSource.column-picker.tooltip': string;
     'linkDataSource.jira-issues.accessInstructions': string;
     'linkDataSource.jira-issues.accessRequired': string;
     'linkDataSource.jira-issues.accessRequiredWithSite': string;
     'linkDataSource.jira-issues.checkConnection': string;
     'linkDataSource.jira-issues.checkConnectionWithSource': string;
+    'linkDataSource.jira-issues.configmodal.basicModeSwitchDisabledTooltipText': string;
     'linkDataSource.jira-issues.configmodal.basicModeText': string;
     'linkDataSource.jira-issues.configmodal.basicTextSearchPlaceholder': string;
     'linkDataSource.jira-issues.configmodal.cancelButtonText': string;
+    'linkDataSource.jira-issues.configmodal.chooseSite': string;
     'linkDataSource.jira-issues.configmodal.countViewModeLabel': string;
-    'linkDataSource.jira-issues.configmodal.dropdownChevronLabel': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesButtonText': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitle': string;
     'linkDataSource.jira-issues.configmodal.insertIssuesTitleManySites': string;
     'linkDataSource.jira-issues.configmodal.issue': string;
     'linkDataSource.jira-issues.configmodal.issueViewModeLabel': string;
-    'linkDataSource.jira-issues.configmodal.selectedJiraSiteLabel': string;
     'linkDataSource.jira-issues.noResultsFound': string;
     'linkDataSource.jira-issues.refresh': string;
     'linkDataSource.jira-issues.unableToLoadItems': string;
     'linkDataSource.jira-issues.unableToLoadResults': string;
+    'linkDataSource.modal-initial-state.beta': string;
     'linkDataSource.modal-initial-state.learnMoreLink': string;
     'linkDataSource.modal-initial-state.searchDescription': string;
     'linkDataSource.modal-initial-state.searchTitle': string;