@atlaskit/link-datasource 4.13.6 → 4.14.0

package/dist/es2019/ui/common/modal/search-count/index.js

@@ -4,11 +4,9 @@ import "./index.compiled.css";
 import { ax, ix } from "@compiled/react/runtime";
 import React from 'react';
 import { FormattedMessage, FormattedNumber } from 'react-intl-next';
-import Heading from '@atlaskit/heading';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives/compiled';
 import LinkUrl from '@atlaskit/smart-card/link-url';
-import { N800 } from '@atlaskit/theme/colors';
 import { footerMessages } from '../../../table-footer/messages';
 import { searchCountMessages } from './messages';
 const styles = {
@@ -26,18 +24,15 @@ const ItemCountWrapper = ({
 }, /*#__PURE__*/React.createElement(LinkUrl, {
   href: url,
   target: "_blank",
-  testId: "item-count-url"
-  // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
-  ,
+  testId: "item-count-url",
   style: {
-    color: fg('platform-linking-visual-refresh-sllv') ? "var(--ds-text-subtlest, #626F86)" : `var(--ds-text-accent-gray, ${N800})`,
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+    color: "var(--ds-text-subtlest, #626F86)",
     textDecoration: !url ? 'none' : '',
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
-    ...(fg('platform-linking-visual-refresh-sllv') && additionalStyles)
+    ...additionalStyles
   }
-}, fg('platform-linking-visual-refresh-sllv') ? children : /*#__PURE__*/React.createElement(Heading, {
-  size: "xxsmall"
-}, children)));
+}, children));
 export const AssetsItemCount = ({
   searchCount,
   url,

package/dist/es2019/ui/common/modal/site-selector/index.js

@@ -8,9 +8,8 @@ import { useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button/new';
 import Heading from '@atlaskit/heading';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/compiled';
-import Select, { PopupSelect } from '@atlaskit/select';
+import { PopupSelect } from '@atlaskit/select';
 import { siteSelectorMessages } from './messages';
 const styles = {
   dropdownContainerStyles: "_zulpu2gc _1e0c1txw _4cvr1h6o _1tke1ylp"
@@ -42,12 +41,12 @@ export const SiteSelector = props => {
   };
   return /*#__PURE__*/React.createElement(Box, {
     xcss: styles.dropdownContainerStyles
-  }, fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(Heading, {
+  }, /*#__PURE__*/React.createElement(Heading, {
     size: "medium",
     as: "h1"
-  }, formatMessage(label)) : formatMessage(label), availableSites && availableSites.length > 1 && /*#__PURE__*/React.createElement("span", {
+  }, formatMessage(label)), availableSites && availableSites.length > 1 && /*#__PURE__*/React.createElement("span", {
     "data-testid": `${testId}--trigger`
-  }, fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(PopupSelect, {
+  }, /*#__PURE__*/React.createElement(PopupSelect, {
     searchThreshold: 10,
     maxMenuWidth: 300,
     minMenuWidth: 300,
@@ -70,44 +69,5 @@ export const SiteSelector = props => {
       }),
       testId: `${testId}__control`
     }), (selectedSiteOption === null || selectedSiteOption === void 0 ? void 0 : selectedSiteOption.label) || formatMessage(siteSelectorMessages.chooseSite))
-  }) : /*#__PURE__*/React.createElement(Select, {
-    classNamePrefix: testId,
-    isLoading: !availableSites,
-    onChange: onChange,
-    options: availableSitesOptions,
-    placeholder: formatMessage(siteSelectorMessages.chooseSiteOld)
-    // eslint-disable-next-line @atlaskit/design-system/no-unsafe-style-overrides
-    ,
-    styles: {
-      container: css => ({
-        ...css,
-        font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)",
-        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-        zIndex: 11
-      }),
-      // prevents the popup menu with available sites from being too narrow
-      // if the selected site is much shorter than the other options
-      menu: ({
-        width,
-        ...css
-      }) => ({
-        ...css,
-        minWidth: '100%',
-        width: 'max-content',
-        // font-weight has to be overridden here so that it gets applied after the font styles in teh css element above
-        fontWeight: "var(--ds-font-weight-medium, 500)"
-      }),
-      valueContainer: ({
-        width,
-        ...css
-      }) => ({
-        ...css,
-        // font-weight has to be overridden here so that it gets applied after the font styles in teh css element above
-        fontWeight: "var(--ds-font-weight-medium, 500)"
-      })
-    },
-    testId: testId,
-    value: selectedSiteOption,
-    label: formatMessage(siteSelectorMessages.chooseSiteOld)
   })));
 };

package/dist/es2019/ui/common/modal/site-selector/messages.js

@@ -1,19 +1,8 @@
 import { defineMessages } from 'react-intl-next';
 export const siteSelectorMessages = defineMessages({
-  chooseSiteDuplicate: {
-    id: 'linkDataSource.site-selector.configmodal.chooseSite',
-    description: 'Label for input letting user know they have to choose a site',
-    defaultMessage: 'Choose site'
-  },
-  // delete this and remove duplicate from above once EDM-9407 is merged
   chooseSite: {
     id: 'linkDataSource.jira-issues.configmodal.chooseSite',
     description: 'Label for input letting user know they have to choose a site',
     defaultMessage: 'Select a site'
-  },
-  chooseSiteOld: {
-    id: 'linkDataSource.jira-issues.configmodal.chooseSiteOld',
-    description: 'Label for input letting user know they have to choose a site',
-    defaultMessage: 'Choose site'
   }
 });

package/dist/es2019/ui/confluence-search-modal/basic-filters/filters/date-range-picker/trigger.js

@@ -1,10 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import NewButton from '@atlaskit/button/new';
-import Button from '@atlaskit/button/standard-button';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
-import ChevronDownIconOld from '@atlaskit/icon/core/migration/chevron-down';
-import { fg } from '@atlaskit/platform-feature-flags';
 export const PopupTrigger = ({
   triggerProps,
   isSelected,
@@ -12,35 +9,14 @@ export const PopupTrigger = ({
   selectedLabel,
   onClick
 }) => {
-  if (fg('platform-linking-visual-refresh-sllv')) {
-    return /*#__PURE__*/React.createElement(NewButton, _extends({}, triggerProps, {
-      testId: 'confluence-search-modal--date-range-button',
-      onClick: onClick,
-      isSelected: isSelected,
-      iconAfter: () => /*#__PURE__*/React.createElement(ChevronDownIcon, {
-        label: "",
-        color: "currentColor",
-        size: "small"
-      })
-    }), labelPrefix, selectedLabel ? `: ${selectedLabel}` : '');
-  }
-  return /*#__PURE__*/React.createElement(Button, _extends({}, triggerProps, {
+  return /*#__PURE__*/React.createElement(NewButton, _extends({}, triggerProps, {
     testId: 'confluence-search-modal--date-range-button',
     onClick: onClick,
     isSelected: isSelected,
-    iconAfter:
-    /*#__PURE__*/
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
-    React.createElement("span", {
-      style: {
-        display: 'flex',
-        alignItems: 'center'
-      }
-    }, /*#__PURE__*/React.createElement(ChevronDownIconOld, {
-      LEGACY_size: "medium",
+    iconAfter: () => /*#__PURE__*/React.createElement(ChevronDownIcon, {
       label: "",
       color: "currentColor",
       size: "small"
-    }))
+    })
   }), labelPrefix, selectedLabel ? `: ${selectedLabel}` : '');
 };

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

@@ -4,7 +4,6 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useIntl } from 'react-intl-next';
 import { useDebouncedCallback } from 'use-debounce';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Flex, Text } from '@atlaskit/primitives/compiled';
 import { BasicSearchInput } from '../../common/modal/basic-search-input';
 import { FILTER_SELECTION_DEBOUNCE_MS } from '../../common/modal/popup-select/constants';
@@ -105,7 +104,6 @@ const ConfluenceSearchContainer = ({
     onChange: handleSearchChange,
     onSearch: onSearch,
     searchTerm: searchBarSearchString,
-    placeholder: searchMessages.searchLabel,
     ariaLabel: searchMessages.searchLabel,
     fullWidth: false
   }), /*#__PURE__*/React.createElement(BasicFilters, {
@@ -113,7 +111,7 @@ const ConfluenceSearchContainer = ({
     selections: filterSelections,
     onChange: handleBasicFilterSelectionChange,
     isHydrating: status === 'loading'
-  })), fg('platform-linking-visual-refresh-sllv') && /*#__PURE__*/React.createElement(Text, {
+  })), /*#__PURE__*/React.createElement(Text, {
     size: "small",
     color: "color.text.subtlest",
     testId: "confluence-search-placeholder"

package/dist/es2019/ui/confluence-search-modal/modal/index.js

@@ -8,7 +8,6 @@ import { FormattedMessage, useIntl } from 'react-intl-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import LinkComponent from '@atlaskit/link';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { DatasourceAction, DatasourceSearchMethod } from '../../../analytics/types';
@@ -207,7 +206,7 @@ export const PlainConfluenceSearchConfigModal = props => {
   }, [currentViewMode, fireInlineViewedEvent, fireTableViewedEvent, status]);
   const renderTableModalContent = useCallback(() => {
     if (status === 'rejected') {
-      if (selectedConfluenceSite && fg('platform-linking-visual-refresh-sllv')) {
+      if (selectedConfluenceSite) {
         return /*#__PURE__*/React.createElement(ModalLoadingError, {
           errorMessage: /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, confluenceSearchModalMessages.checkConnectionWithSource, {
             values: {
@@ -338,10 +337,10 @@ export const PlainConfluenceSearchConfigModal = props => {
     url: confluenceSearchUrl,
     prefixTextType: "result",
     testId: "confluence-search-datasource-modal-total-results-count",
-    styles: fg('platform-linking-visual-refresh-sllv') ? {
+    styles: {
       color: "var(--ds-text, #172B4D)",
       font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
-    } : undefined
+    }
   }), /*#__PURE__*/React.createElement(CancelButton, {
     onCancel: onCancel,
     getAnalyticsPayload: getButtonAnalyticsPayload,

package/dist/es2019/ui/datasource-table-view/datasourceTableView.js

@@ -1,12 +1,10 @@
 /* datasourceTableView.tsx generated by @compiled/babel-plugin v0.36.1 */
-import _extends from "@babel/runtime/helpers/extends";
 import "./datasourceTableView.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useEffect, useRef } from 'react';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../../analytics';
 import { componentMetadata } from '../../analytics/constants';
 import { startUfoExperience } from '../../analytics/ufoExperiences';
@@ -129,9 +127,7 @@ const DatasourceTableViewWithoutAnalytics = ({
     });
   }, [reset]);
   if (status === 'resolved' && !responseItems.length || status === 'forbidden') {
-    return /*#__PURE__*/React.createElement(NoResults, !fg('platform-linking-visual-refresh-sllv') && {
-      onRefresh: handleErrorRefresh
-    });
+    return /*#__PURE__*/React.createElement(NoResults, null);
   }
   if (status === 'unauthorized') {
     return authDetails !== null && authDetails !== void 0 && authDetails.length && authDetails.length > 0 ? /*#__PURE__*/React.createElement(ProviderAuthRequired, {
@@ -146,11 +142,10 @@ const DatasourceTableViewWithoutAnalytics = ({
     });
   }
   if (status === 'rejected') {
-    return /*#__PURE__*/React.createElement(LoadingError, _extends({
-      onRefresh: handleErrorRefresh
-    }, fg('platform-linking-visual-refresh-sllv') && {
-      url
-    }));
+    return /*#__PURE__*/React.createElement(LoadingError, {
+      onRefresh: handleErrorRefresh,
+      url: url
+    });
   }
   return /*#__PURE__*/React.createElement(IntlMessagesProvider, {
     defaultMessages: i18nEN,

package/dist/es2019/ui/issue-like-table/column-picker/index.js

@@ -7,11 +7,8 @@ import { useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button/new';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import CustomizeIcon from '@atlaskit/icon/core/customize';
-import BoardIcon from '@atlaskit/icon/core/migration/board';
-import ChevronDownIconOld from '@atlaskit/icon/core/migration/chevron-down';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box } from '@atlaskit/primitives/compiled';
-import { CheckboxOption, createFilter, PopupSelect } from '@atlaskit/select';
+import { createFilter, PopupSelect } from '@atlaskit/select';
 import Tooltip from '@atlaskit/tooltip';
 import { succeedUfoExperience } from '../../../analytics/ufoExperiences';
 import { useDatasourceExperienceId } from '../../../contexts/datasource-experience-id';
@@ -98,12 +95,11 @@ export const ColumnPicker = ({
       }
     }
   }, [allOptions, experienceId]);
-  const MenuOption = fg('platform-linking-visual-refresh-sllv') ? MenuItem : CheckboxOption;
   return /*#__PURE__*/React.createElement(PopupSelect, {
     classNamePrefix: 'column-picker-popup',
     testId: 'column-picker-popup',
     components: {
-      Option: MenuOption,
+      Option: MenuItem,
       MenuList: ConcatenatedMenuList
     },
     filterOption: createFilter({
@@ -133,27 +129,16 @@ export const ColumnPicker = ({
     }, tooltipProps => /*#__PURE__*/React.createElement(Button, _extends({}, tooltipProps, triggerProps, {
       isSelected: isOpen,
       spacing: "compact",
-      appearance: fg('platform-linking-visual-refresh-sllv') ? 'default' : 'subtle',
+      appearance: 'default',
       testId: "column-picker-trigger-button",
       iconBefore: () => /*#__PURE__*/React.createElement(Box, {
         as: "span",
         xcss: styles.chevronIconStyles
-      }, fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(CustomizeIcon, {
+      }, /*#__PURE__*/React.createElement(CustomizeIcon, {
         label: "customize"
-      }) : /*#__PURE__*/React.createElement(BoardIcon, {
-        color: "currentColor",
-        label: "board",
-        LEGACY_size: "medium",
-        spacing: "spacious",
-        LEGACY_margin: "0 0 0 4px"
-      }), fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(ChevronDownIcon, {
+      }), /*#__PURE__*/React.createElement(ChevronDownIcon, {
         label: "down",
         size: "small"
-      }) : /*#__PURE__*/React.createElement(ChevronDownIconOld, {
-        color: "currentColor",
-        label: "down",
-        LEGACY_size: "medium",
-        size: "small"
       }))
     }), ''))
   });

package/dist/es2019/ui/issue-like-table/render-type/link/index.js

@@ -1,6 +1,4 @@
-import _extends from "@babel/runtime/helpers/extends";
 import React, { useMemo } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Card } from '@atlaskit/smart-card';
 import { HoverCard } from '@atlaskit/smart-card/hover-card';
 import LinkUrl from '@atlaskit/smart-card/link-url';
@@ -25,19 +23,16 @@ const LinkRenderType = ({
   }, [style]);
   const anchor = useMemo(() => /*#__PURE__*/React.createElement(HoverCard, {
     url: url
-  }, /*#__PURE__*/React.createElement(LinkUrl, _extends({
+  }, /*#__PURE__*/React.createElement(LinkUrl, {
     href: url
     // NOTE: This will no longer apply styles to `@atlaskit/link` when platform_editor_hyperlink_underline is enabled.
     // Wrap `@atlaskit/link` in a Text component to provide font styles to Link
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
-  }, fg('platform-linking-visual-refresh-sllv') ? {} : {
-    style: {
-      ...linkStyle
-    }
-  }, {
+    ,
+    style: linkStyle,
     "data-testid": testId,
     target: "_blank"
-  }), text || url)), [linkStyle, url, text, testId]);
+  }, text || url)), [linkStyle, url, text, testId]);
   const SmartCard = () => {
     const handleClick = e => {
       e.preventDefault();

package/dist/es2019/ui/issue-like-table/shared-components/icon/index.js

@@ -2,7 +2,6 @@
 import "./index.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Flex, Inline } from '@atlaskit/primitives/compiled';
 const styles = {
   labelStyles: "_1reo15vq _18m915vq _1bto1l2s _1bsb1osq",
@@ -25,13 +24,7 @@ export function SharedIconComponent({
   }, /*#__PURE__*/React.createElement(Inline, null, /*#__PURE__*/React.createElement("img", {
     src: iconUrl,
     alt: (label === null || label === void 0 ? void 0 : label.toLowerCase()) !== (text === null || text === void 0 ? void 0 : text.toLowerCase()) ? label : '',
-    // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
-    style: fg('platform-linking-visual-refresh-sllv') ? {} : {
-      minWidth: '24px',
-      maxWidth: '24px'
-    } // having just width: '24px' shrinks it when table width is reduced
-    ,
-    className: ax([fg('platform-linking-visual-refresh-sllv') && styles.iconStyles])
+    className: ax([styles.iconStyles])
   })), text && /*#__PURE__*/React.createElement(Box, {
     xcss: styles.labelStyles,
     testId: `${testId}-text`

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

@@ -2,7 +2,6 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import isEqual from 'lodash/isEqual';
 import { useIntl } from 'react-intl-next';
 import { useDebouncedCallback } from 'use-debounce';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { FilterPopupSelect } from '../../../../common/modal/popup-select';
 import { SEARCH_DEBOUNCE_MS } from '../../../../common/modal/popup-select/constants';
 import { useFilterOptions } from '../../hooks/useFilterOptions';
@@ -86,7 +85,7 @@ const AsyncPopupSelect = ({
   const filterName = `jlol-basic-filter-${filterType}`;
   const shouldShowFooter = (status === 'resolved' || isLoadingMore) && filterOptionsLength > 0; // footer should not disappear when there is an inline spinner for loading more data
   const shouldDisplayShowMoreButton = status === 'resolved' && !!pageCursor && !areAllResultsLoaded;
-  const triggerButtonLabel = formatMessage(!fg('platform-linking-visual-refresh-sllv') && filterType === 'type' ? asyncPopupSelectMessages.typeLabelOld : asyncPopupSelectMessages[`${filterType}Label`]);
+  const triggerButtonLabel = formatMessage(asyncPopupSelectMessages[`${filterType}Label`]);
   return /*#__PURE__*/React.createElement(FilterPopupSelect, {
     filterName: filterName,
     status: status,
@@ -98,7 +97,7 @@ const AsyncPopupSelect = ({
     selectedOptions: selectedOptions,
     options: popupSelectOptions,
     buttonLabel: triggerButtonLabel,
-    searchPlaceholder: fg('platform-linking-visual-refresh-sllv') ? formatMessage(asyncPopupSelectMessages[`${filterType}SearchPlaceholder`]) : undefined,
+    searchPlaceholder: formatMessage(asyncPopupSelectMessages[`${filterType}SearchPlaceholder`]),
     onInputChange: handleInputChange,
     onSelectionChange: handleOptionSelection,
     onMenuOpen: handleMenuOpen,

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

@@ -3,5 +3,4 @@
 ._1bsb1osq{width:100%}
 ._1e0c1txw{display:flex}
 ._1tket9kd{min-height:72px}
-._4cvr1q9y{align-items:baseline}
 ._4cvr1y6m{align-items:flex-start}

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

@@ -4,7 +4,6 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useIntl } from 'react-intl-next';
 import { useDebouncedCallback } from 'use-debounce';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, Flex, Text } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { BasicSearchInput } from '../../common/modal/basic-search-input';
@@ -20,7 +19,6 @@ import { modeSwitcherMessages } from './messages';
 const styles = {
   basicSearchInputBoxStyles: "_1bsb1osq",
   basicSearchInputContainerStyles: "_16jlkb7n",
-  inputContainerStylesOld: "_4cvr1q9y _1e0c1txw _1tket9kd",
   inputContainerStyles: "_4cvr1y6m _1e0c1txw _1tket9kd",
   modeSwitcherContainerStyles: "_19pk1b66"
 };
@@ -175,52 +173,12 @@ export const JiraSearchContainer = props => {
       setCloudId(currentCloudId);
     }
   }, [currentCloudId, cloudId, setSearchBarJql]);
-  if (fg('platform-linking-visual-refresh-sllv')) {
-    return /*#__PURE__*/React.createElement("div", {
-      "data-testid": "jira-search-container",
-      className: ax([styles.inputContainerStyles])
-    }, currentSearchMethod === 'basic' && /*#__PURE__*/React.createElement(Box, {
-      xcss: styles.basicSearchInputBoxStyles
-    }, /*#__PURE__*/React.createElement(Flex, {
-      alignItems: "center",
-      xcss: styles.basicSearchInputContainerStyles
-    }, /*#__PURE__*/React.createElement(BasicSearchInput, {
-      isSearching: isSearching,
-      onChange: handleBasicSearchChange,
-      onSearch: handleSearch,
-      searchTerm: basicSearchTerm,
-      placeholder: basicSearchInputMessages.basicTextSearchLabel,
-      ariaLabel: basicSearchInputMessages.basicTextSearchLabel,
-      testId: "jira-datasource-modal",
-      fullWidth: false
-    }), /*#__PURE__*/React.createElement(BasicFilters, {
-      jql: searchBarJql,
-      site: site,
-      onChange: handleBasicFilterSelectionChange,
-      selections: filterSelections,
-      isJQLHydrating: basicFilterHydrationStatus === 'loading'
-    })), currentSearchMethod === 'basic' && /*#__PURE__*/React.createElement(Text, {
-      size: "small",
-      color: "color.text.subtlest",
-      testId: "jira-search-placeholder"
-    }, formatMessage(basicSearchInputMessages.basicTextSearchLabel))), currentSearchMethod === 'jql' && /*#__PURE__*/React.createElement(JiraJQLEditor, {
-      cloudId: cloudId || '',
-      isSearching: isSearching,
-      onChange: onQueryChange,
-      onSearch: handleSearch,
-      query: searchBarJql
-    }), /*#__PURE__*/React.createElement(Box, {
-      xcss: styles.modeSwitcherContainerStyles
-    }, /*#__PURE__*/React.createElement(ModeSwitcher, {
-      onOptionValueChange: onSearchMethodChange,
-      selectedOptionValue: currentSearchMethod,
-      options: modeSwitcherOptions
-    })));
-  }
   return /*#__PURE__*/React.createElement("div", {
     "data-testid": "jira-search-container",
-    className: ax([styles.inputContainerStylesOld])
-  }, currentSearchMethod === 'basic' && /*#__PURE__*/React.createElement(Flex, {
+    className: ax([styles.inputContainerStyles])
+  }, currentSearchMethod === 'basic' && /*#__PURE__*/React.createElement(Box, {
+    xcss: styles.basicSearchInputBoxStyles
+  }, /*#__PURE__*/React.createElement(Flex, {
     alignItems: "center",
     xcss: styles.basicSearchInputContainerStyles
   }, /*#__PURE__*/React.createElement(BasicSearchInput, {
@@ -228,7 +186,6 @@ export const JiraSearchContainer = props => {
     onChange: handleBasicSearchChange,
     onSearch: handleSearch,
     searchTerm: basicSearchTerm,
-    placeholder: basicSearchInputMessages.basicTextSearchLabel,
     ariaLabel: basicSearchInputMessages.basicTextSearchLabel,
     testId: "jira-datasource-modal",
     fullWidth: false
@@ -238,15 +195,21 @@ export const JiraSearchContainer = props => {
     onChange: handleBasicFilterSelectionChange,
     selections: filterSelections,
     isJQLHydrating: basicFilterHydrationStatus === 'loading'
-  })), currentSearchMethod === 'jql' && /*#__PURE__*/React.createElement(JiraJQLEditor, {
+  })), currentSearchMethod === 'basic' && /*#__PURE__*/React.createElement(Text, {
+    size: "small",
+    color: "color.text.subtlest",
+    testId: "jira-search-placeholder"
+  }, formatMessage(basicSearchInputMessages.basicTextSearchLabel))), currentSearchMethod === 'jql' && /*#__PURE__*/React.createElement(JiraJQLEditor, {
     cloudId: cloudId || '',
     isSearching: isSearching,
     onChange: onQueryChange,
     onSearch: handleSearch,
     query: searchBarJql
-  }), /*#__PURE__*/React.createElement(ModeSwitcher, {
+  }), /*#__PURE__*/React.createElement(Box, {
+    xcss: styles.modeSwitcherContainerStyles
+  }, /*#__PURE__*/React.createElement(ModeSwitcher, {
     onOptionValueChange: onSearchMethodChange,
     selectedOptionValue: currentSearchMethod,
     options: modeSwitcherOptions
-  }));
+  })));
 };

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

@@ -256,8 +256,8 @@ const PlainJiraIssuesConfigModal = props => {
   const renderIssuesModeContent = useCallback(() => {
     const selectedJiraSiteUrl = selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url;
     const getDescriptionMessage = () => {
-      if (currentSearchMethod === 'basic' && fg('platform-linking-visual-refresh-sllv')) {
-        return initialStateViewMessages.searchDescriptionForBasicSearchVisualRefreshSllv;
+      if (currentSearchMethod === 'basic') {
+        return initialStateViewMessages.searchDescriptionForBasicSearchSllv;
       }
       if (fg('confluence-issue-terminology-refresh')) {
         return currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearchIssueTermRefresh : initialStateViewMessages.searchDescriptionForBasicSearchIssueTermRefresh;
@@ -265,33 +265,17 @@ const PlainJiraIssuesConfigModal = props => {
       return currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearch : initialStateViewMessages.searchDescriptionForBasicSearch;
     };
     if (status === 'rejected' && jqlUrl) {
-      if (fg('platform-linking-visual-refresh-sllv')) {
-        return /*#__PURE__*/React.createElement(ModalLoadingError, {
-          errorMessage: jqlUrl ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, modalMessages.checkConnectionWithSourceVisualRefreshSllv, {
-            values: {
-              a: urlText => /*#__PURE__*/React.createElement(LinkComponent, {
-                href: jqlUrl
-              }, urlText)
-            }
-          })) : undefined,
-          onRefresh: () => reset({
-            shouldForceRequest: true
-          })
-        });
-      }
       return /*#__PURE__*/React.createElement(ModalLoadingError, {
-        errorMessage: jqlUrl ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, modalMessages.checkConnectionWithSource, {
+        errorMessage: jqlUrl ? /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, modalMessages.checkConnectionWithSourceVisualRefreshSllv, {
           values: {
-            a: urlText => fg('dst-a11y__replace-anchor-with-link__linking-platfo') ? /*#__PURE__*/React.createElement(LinkComponent, {
-              href: jqlUrl
-            }, urlText) :
-            /*#__PURE__*/
-            // eslint-disable-next-line @atlaskit/design-system/no-html-anchor
-            React.createElement("a", {
+            a: urlText => /*#__PURE__*/React.createElement(LinkComponent, {
               href: jqlUrl
             }, urlText)
           }
-        })) : undefined
+        })) : undefined,
+        onRefresh: () => reset({
+          shouldForceRequest: true
+        })
       });
     } else if (status === 'unauthorized') {
       return /*#__PURE__*/React.createElement(AccessRequired, {
@@ -315,10 +299,10 @@ const PlainJiraIssuesConfigModal = props => {
         learnMoreLink: currentSearchMethod === 'jql' ? {
           href: jqlSupportDocumentLink,
           text: initialStateViewMessages.learnMoreLinkOld
-        } : fg('platform-linking-visual-refresh-sllv') ? {
+        } : {
           href: jqlSupportDocumentLink,
           text: initialStateViewMessages.learnMoreLink
-        } : undefined
+        }
       }));
     }
     return /*#__PURE__*/React.createElement(ContentContainer, {
@@ -396,10 +380,10 @@ const PlainJiraIssuesConfigModal = props => {
     url: jqlUrl,
     prefixTextType: "issue",
     testId: "jira-datasource-modal-total-issues-count",
-    styles: fg('platform-linking-visual-refresh-sllv') ? {
+    styles: {
       color: "var(--ds-text, #172B4D)",
       font: "var(--ds-font-heading-xxsmall, normal 600 12px/16px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, \"Helvetica Neue\", sans-serif)"
-    } : undefined
+    }
   }), /*#__PURE__*/React.createElement(CancelButton, {
     onCancel: onCancel,
     getAnalyticsPayload: getCancelButtonAnalyticsPayload,
@@ -408,7 +392,7 @@ const PlainJiraIssuesConfigModal = props => {
     testId: "jira-datasource-modal--insert-button",
     url: urlToInsert,
     getAnalyticsPayload: getInsertButtonAnalyticsPayload
-  }, fg('platform-linking-visual-refresh-sllv') ? /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermSllv) : fg('confluence-issue-terminology-refresh') ? /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermRefresh) : /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonText))))));
+  }, /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermSllv))))));
 };
 const ConnectedJiraIssueConfigModal = createDatasourceModal({
   isValidParameters,

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

@@ -96,11 +96,6 @@ export const modalMessages = defineMessages({
     description: 'Instructions to let the user know how to resolve the error that occured, or click the link provided to open the query in Jira',
     defaultMessage: 'Check your connection and refresh, or <a>open this project in Jira</a> to review.'
   },
-  insertIssuesButtonTextIssueTermRefresh: {
-    id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText-issue-term-refresh',
-    description: 'Button text to insert the displayed content',
-    defaultMessage: 'Insert work items'
-  },
   insertIssuesButtonTextIssueTermSllv: {
     id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText-issue-term-sllv',
     description: 'Button text to insert the displayed content',