@atlaskit/link-datasource 1.12.4 → 1.13.1

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

@@ -1,11 +1,12 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 /** @jsx jsx */
-import React, { useCallback, useMemo, useState } from 'react';
+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 { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { BasicFilters } from '../basic-filters';
+import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { BasicSearchInput } from '../basic-search-input';
 import { JiraJQLEditor } from '../jql-editor';
 import { ModeSwitcher } from '../mode-switcher';
@@ -18,6 +19,7 @@ var inputContainerStyles = css({
   minHeight: '60px'
 });
 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 JiraSearchContainer = function JiraSearchContainer(props) {
   var isSearching = props.isSearching,
@@ -42,14 +44,18 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     jql = _useState6[0],
     setJql = _useState6[1];
-  var _useState7 = useState(),
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    orderKey = _useState8[0],
-    setOrderKey = _useState8[1];
+    isComplexQuery = _useState8[0],
+    setIsComplexQuery = _useState8[1];
   var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    orderDirection = _useState10[0],
-    setOrderDirection = _useState10[1];
+    orderKey = _useState10[0],
+    setOrderKey = _useState10[1];
+  var _useState11 = useState(),
+    _useState12 = _slicedToArray(_useState11, 2),
+    orderDirection = _useState12[0],
+    setOrderDirection = _useState12[1];
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var onSearchMethodChange = useCallback(function (searchMethod) {
@@ -76,7 +82,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     var order = hasOrder ? (_fragments$at3 = fragments.at(-1)) === null || _fragments$at3 === void 0 ? void 0 : _fragments$at3.split(' ').at(-1) : undefined;
 
     // TODO: confirm if these are the only order keys we want to preserve - existing whiteboard logic
-    if (key && ['key', 'summary', 'assignee', 'status'].includes(key)) {
+    if (key && ALLOWED_ORDER_BY_KEYS.includes(key)) {
       setOrderKey(key);
       setOrderDirection(order);
     }
@@ -86,6 +92,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     onSearch({
       jql: jql
     }, currentSearchMethod);
+    setIsComplexQuery(isQueryTooComplex(jql));
     if (currentSearchMethod === 'basic') {
       fireEvent('ui.form.submitted.basicSearch', {});
     } else if (currentSearchMethod === 'jql') {
@@ -98,6 +105,10 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     }
     return false;
   }, []);
+  useEffect(function () {
+    setIsComplexQuery(isQueryTooComplex(jql));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   return jsx("div", {
     css: inputContainerStyles
   }, currentSearchMethod === 'basic' && jsx(React.Fragment, null, jsx(BasicSearchInput, {
@@ -122,7 +133,9 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
       value: 'jql'
     }, {
       label: formatMessage(modeSwitcherMessages.basicTextSearchLabel),
-      value: 'basic'
+      value: 'basic',
+      disabled: isComplexQuery,
+      tooltipText: isComplexQuery ? formatMessage(modeSwitcherMessages.basicModeSwitchDisabledTooltipText) : ''
     }]
   }));
 };

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

@@ -4,5 +4,10 @@ export var modeSwitcherMessages = defineMessages({
     id: 'linkDataSource.jira-issues.configmodal.basicModeText',
     description: 'Display text for basic text search toggle button',
     defaultMessage: 'Basic'
+  },
+  basicModeSwitchDisabledTooltipText: {
+    id: 'linkDataSource.jira-issues.configmodal.basicModeSwitchDisabledTooltipText',
+    description: 'Display tooltip text when basic mode switch is disabled',
+    defaultMessage: "You can't switch to basic for this query."
   }
 });

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

@@ -1,7 +1,9 @@
+import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
 import React from 'react';
 import { css, jsx } from '@emotion/react';
-import { N0, N20, N30A, N700 } from '@atlaskit/theme/colors';
+import { N0, N20, N30A, N60, N700 } from '@atlaskit/theme/colors';
+import Tooltip from '@atlaskit/tooltip';
 var modeSwitcherStyles = css({
   alignItems: 'center',
   background: "var(--ds-background-neutral, ".concat(N20, ")"),
@@ -44,8 +46,12 @@ var modeSwitcherLabelSelectedStyles = css({
   }
 });
 var modeSwitcherLabelDisabledStyles = css({
+  color: "var(--ds-text-disabled, ".concat(N60, ")")
+});
+var modeSwitcherDisabledStyles = css({
   ':hover': {
-    cursor: 'not-allowed'
+    cursor: 'not-allowed',
+    background: 'transparent'
   }
 });
 var compactModeSwitcherLabelStyles = css({
@@ -68,21 +74,27 @@ export var ModeSwitcher = function ModeSwitcher(props) {
     disabled: isDisabled
   }, options.map(function (_ref) {
     var value = _ref.value,
-      label = _ref.label;
+      label = _ref.label,
+      isOptionDisabled = _ref.disabled,
+      tooltipText = _ref.tooltipText;
     var isSelected = value === selectedOptionValue;
-    return jsx("label", {
-      key: value,
-      css: [modeSwitcherLabelStyles, isCompact && compactModeSwitcherLabelStyles, isSelected && modeSwitcherLabelSelectedStyles, isDisabled && modeSwitcherLabelDisabledStyles],
-      "data-testid": "mode-toggle-".concat(value)
-    }, label, jsx("input", {
-      "aria-checked": isSelected,
-      "aria-disabled": isDisabled,
-      checked: isSelected,
-      css: modeInputStyles,
-      disabled: isDisabled,
-      onChange: handleModeChange,
-      type: "radio",
-      value: value
-    }));
+    return jsx(Tooltip, {
+      content: tooltipText
+    }, function (tooltipProps) {
+      return jsx("label", _extends({}, tooltipProps, {
+        key: value,
+        css: [modeSwitcherLabelStyles, isCompact && compactModeSwitcherLabelStyles, isSelected && modeSwitcherLabelSelectedStyles, isDisabled && modeSwitcherDisabledStyles, isOptionDisabled && [modeSwitcherLabelDisabledStyles, modeSwitcherDisabledStyles]],
+        "data-testid": "mode-toggle-".concat(value)
+      }), label, jsx("input", {
+        "aria-checked": isSelected,
+        "aria-disabled": isOptionDisabled,
+        checked: isSelected,
+        css: modeInputStyles,
+        disabled: isOptionDisabled,
+        onChange: handleModeChange,
+        type: "radio",
+        value: value
+      }));
+    });
   })) : null;
 };

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

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import { DropdownIndicatorProps } from '@atlaskit/select';
+import { SelectOption } from '../../types';
+declare const CustomDropdownIndicator: (props: DropdownIndicatorProps<SelectOption, true>) => JSX.Element;
+export default CustomDropdownIndicator;

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

@@ -5,6 +5,7 @@ export interface AsyncPopupSelectProps {
     cloudId: string;
     selection: SelectOption[];
     onSelectionChange?: (selection: SelectOption[]) => void;
+    isDisabled?: boolean;
 }
-declare const AsyncPopupSelect: ({ filterType, cloudId, selection, onSelectionChange, }: AsyncPopupSelectProps) => JSX.Element;
+declare const AsyncPopupSelect: ({ filterType, cloudId, selection, onSelectionChange, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
 export default AsyncPopupSelect;

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

@@ -3,6 +3,7 @@ import { BasicFilterFieldType } from '../../types';
 export interface PopupTriggerProps {
     filterType: BasicFilterFieldType;
     isSelected?: boolean;
+    isDisabled?: boolean;
     onClick?: () => void;
 }
 declare const PopupTrigger: React.ForwardRefExoticComponent<PopupTriggerProps & React.RefAttributes<HTMLElement>>;

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

@@ -0,0 +1,2 @@
+import { Clause } from '@atlaskit/jql-ast';
+export declare const isClauseTooComplex: (clauses: Clause[], key: string) => boolean;

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

@@ -0,0 +1 @@
+export declare const isQueryTooComplex: (jql: string) => boolean;

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

@@ -7,5 +7,6 @@ type BuildJQLInput = {
         [key in BasicFilterFieldType]?: SelectOption[];
     };
 };
+export declare const fuzzyCharacter = "*";
 export declare const buildJQL: (input: BuildJQLInput) => string;
 export {};

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

@@ -1,6 +1,7 @@
 import { jsx } from '@emotion/react';
 import type { JiraSearchMethod } from '../../../common/types';
 import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery } from '../types';
+export declare const ALLOWED_ORDER_BY_KEYS: string[];
 export interface SearchContainerProps {
     isSearching?: boolean;
     onSearch: (query: JiraIssueDatasourceParametersQuery, searchMethod: JiraSearchMethod) => void;

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

@@ -4,4 +4,9 @@ export declare const modeSwitcherMessages: {
         description: string;
         defaultMessage: string;
     };
+    basicModeSwitchDisabledTooltipText: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
 };

package/dist/types/ui/jira-issues-modal/mode-switcher/index.d.ts

@@ -5,6 +5,8 @@ export interface ModeSwitcherProps<T extends string = string> {
     options: {
         label: string;
         value: T;
+        disabled?: boolean;
+        tooltipText?: string;
     }[];
     onOptionValueChange: (selectedOptionValue: T) => void;
     selectedOptionValue?: string;

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

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import { DropdownIndicatorProps } from '@atlaskit/select';
+import { SelectOption } from '../../types';
+declare const CustomDropdownIndicator: (props: DropdownIndicatorProps<SelectOption, true>) => JSX.Element;
+export default CustomDropdownIndicator;

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

@@ -5,6 +5,7 @@ export interface AsyncPopupSelectProps {
     cloudId: string;
     selection: SelectOption[];
     onSelectionChange?: (selection: SelectOption[]) => void;
+    isDisabled?: boolean;
 }
-declare const AsyncPopupSelect: ({ filterType, cloudId, selection, onSelectionChange, }: AsyncPopupSelectProps) => JSX.Element;
+declare const AsyncPopupSelect: ({ filterType, cloudId, selection, onSelectionChange, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
 export default AsyncPopupSelect;

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

@@ -3,6 +3,7 @@ import { BasicFilterFieldType } from '../../types';
 export interface PopupTriggerProps {
     filterType: BasicFilterFieldType;
     isSelected?: boolean;
+    isDisabled?: boolean;
     onClick?: () => void;
 }
 declare const PopupTrigger: React.ForwardRefExoticComponent<PopupTriggerProps & React.RefAttributes<HTMLElement>>;

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

@@ -0,0 +1,2 @@
+import { Clause } from '@atlaskit/jql-ast';
+export declare const isClauseTooComplex: (clauses: Clause[], key: string) => boolean;

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

@@ -0,0 +1 @@
+export declare const isQueryTooComplex: (jql: string) => boolean;

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

@@ -7,5 +7,6 @@ type BuildJQLInput = {
         [key in BasicFilterFieldType]?: SelectOption[];
     };
 };
+export declare const fuzzyCharacter = "*";
 export declare const buildJQL: (input: BuildJQLInput) => string;
 export {};

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

@@ -1,6 +1,7 @@
 import { jsx } from '@emotion/react';
 import type { JiraSearchMethod } from '../../../common/types';
 import { JiraIssueDatasourceParameters, JiraIssueDatasourceParametersQuery } from '../types';
+export declare const ALLOWED_ORDER_BY_KEYS: string[];
 export interface SearchContainerProps {
     isSearching?: boolean;
     onSearch: (query: JiraIssueDatasourceParametersQuery, searchMethod: JiraSearchMethod) => void;

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

@@ -4,4 +4,9 @@ export declare const modeSwitcherMessages: {
         description: string;
         defaultMessage: string;
     };
+    basicModeSwitchDisabledTooltipText: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
 };

package/dist/types-ts4.5/ui/jira-issues-modal/mode-switcher/index.d.ts

@@ -5,6 +5,8 @@ export interface ModeSwitcherProps<T extends string = string> {
     options: {
         label: string;
         value: T;
+        disabled?: boolean;
+        tooltipText?: string;
     }[];
     onOptionValueChange: (selectedOptionValue: T) => void;
     selectedOptionValue?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.12.4",
+  "version": "1.13.1",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -65,7 +65,6 @@
     "@atlaskit/tokens": "^1.28.0",
     "@atlaskit/tooltip": "^17.8.0",
     "@atlaskit/ufo": "^0.2.4",
-    "@atlassianlabs/jql-ast": "^2.1.0",
     "@atlassianlabs/jql-editor": "^2.0.1",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",

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

@@ -1,12 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useIsComplexQuery = void 0;
-var useIsComplexQuery = exports.useIsComplexQuery = function useIsComplexQuery() {
-  return {
-    // https://product-fabric.atlassian.net/browse/EDM-8103
-    isComplexQuery: false
-  };
-};

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

@@ -1,6 +0,0 @@
-export const useIsComplexQuery = () => {
-  return {
-    // https://product-fabric.atlassian.net/browse/EDM-8103
-    isComplexQuery: false
-  };
-};

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

@@ -1,6 +0,0 @@
-export var useIsComplexQuery = function useIsComplexQuery() {
-  return {
-    // https://product-fabric.atlassian.net/browse/EDM-8103
-    isComplexQuery: false
-  };
-};

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

@@ -1,3 +0,0 @@
-export declare const useIsComplexQuery: () => {
-    isComplexQuery: boolean;
-};

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

@@ -1,3 +0,0 @@
-export declare const useIsComplexQuery: () => {
-    isComplexQuery: boolean;
-};