@atlaskit/link-datasource 3.1.5 → 3.2.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/link-datasource
 
+## 3.2.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.2.0
+
+### Minor Changes
+
+- [#147374](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/147374)
+  [`8f647e8fa0041`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8f647e8fa0041) -
+  Introduces basic filters for Jira smart link list view config modal as a permanent feature by
+  removing feature flag platform.linking-platform.datasource.show-jlol-basic-filters
+
 ## 3.1.5
 
 ### Patch Changes

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

@@ -16,7 +16,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
 var _mergeWith = _interopRequireDefault(require("lodash/mergeWith"));
 var _jqlAst = require("@atlaskit/jql-ast");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _jiraSearchContainer = require("../../jira-search-container");
 var _isClauseTooComplex = require("./isClauseTooComplex");
 var _index = require("./index");
@@ -119,7 +118,7 @@ var JqlClauseCollectingVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
   return JqlClauseCollectingVisitor;
 }(_jqlAst.AbstractJastVisitor);
 var isQueryTooComplex = exports.isQueryTooComplex = function isQueryTooComplex(jql) {
-  if (!(0, _platformFeatureFlags.fg)('platform.linking-platform.datasource.show-jlol-basic-filters') || !jql) {
+  if (!jql) {
     return false;
   }
   if (!(0, _index.isValidJql)(jql)) {

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

@@ -13,7 +13,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _useDebounce = require("use-debounce");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _analytics = require("../../../analytics");
 var _basicSearchInput = require("../../common/modal/basic-search-input");
@@ -88,12 +87,6 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
     filterSelections = _useState14[0],
     setFilterSelections = _useState14[1];
-  var showBasicFilters = (0, _react.useMemo)(function () {
-    if ((0, _platformFeatureFlags.fg)('platform.linking-platform.datasource.show-jlol-basic-filters')) {
-      return true;
-    }
-    return false;
-  }, []);
   var modeSwitcherOptionsMap = (0, _react.useMemo)(function () {
     return {
       jql: {
@@ -109,8 +102,8 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     };
   }, [formatMessage, isComplexQuery]);
   var modeSwitcherOptions = (0, _react.useMemo)(function () {
-    return showBasicFilters ? [modeSwitcherOptionsMap.basic, modeSwitcherOptionsMap.jql] : [modeSwitcherOptionsMap.jql, modeSwitcherOptionsMap.basic];
-  }, [modeSwitcherOptionsMap, showBasicFilters]);
+    return [modeSwitcherOptionsMap.basic, modeSwitcherOptionsMap.jql];
+  }, [modeSwitcherOptionsMap]);
   var _useHydrateJqlQuery = (0, _useHydrateJqlQuery2.useHydrateJqlQuery)(cloudId || '', searchBarJql),
     hydratedOptions = _useHydrateJqlQuery.hydratedOptions,
     fetchHydratedJqlOptions = _useHydrateJqlQuery.fetchHydratedJqlOptions,
@@ -160,11 +153,11 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
         isQueryComplex: isCurrentQueryComplex
       });
       setIsComplexQuery(isCurrentQueryComplex);
-      if (showBasicFilters && !isCurrentQueryComplex) {
+      if (!isCurrentQueryComplex) {
         fetchHydratedJqlOptions();
       }
     }
-  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, searchBarJql, onSearch, showBasicFilters]);
+  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, searchBarJql, onSearch]);
   var _useDebouncedCallback = (0, _useDebounce.useDebouncedCallback)(function (filterValues) {
       var jqlWithFilterValues = (0, _buildJQL.buildJQL)({
         rawSearch: basicSearchTerm,
@@ -192,7 +185,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
   (0, _react.useEffect)(function () {
     var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(searchBarJql);
     setIsComplexQuery(isCurrentQueryComplex);
-    if (showBasicFilters && !isCurrentQueryComplex && searchBarJql !== DEFAULT_JQL_QUERY) {
+    if (!isCurrentQueryComplex && searchBarJql !== DEFAULT_JQL_QUERY) {
       fetchHydratedJqlOptions();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -231,8 +224,8 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     searchTerm: basicSearchTerm,
     placeholder: _messages.basicSearchInputMessages.basicTextSearchLabel,
     testId: "jira-datasource-modal",
-    fullWidth: !showBasicFilters
-  }), showBasicFilters && (0, _react2.jsx)(_basicFilters.BasicFilters, {
+    fullWidth: false
+  }), (0, _react2.jsx)(_basicFilters.BasicFilters, {
     jql: searchBarJql,
     site: site,
     onChange: handleBasicFilterSelectionChange,

package/dist/cjs/ui/jira-issues-modal/modal/ModalOld.js

@@ -103,7 +103,7 @@ var PlainJiraIssuesConfigModalOld = exports.PlainJiraIssuesConfigModalOld = func
   // analytics related parameters
   var searchCount = (0, _react.useRef)(0);
   var userInteractions = (0, _userInteractions.useUserInteractions)();
-  var initialSearchMethod = (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource.show-jlol-basic-filters') && !(0, _isQueryTooComplex.isQueryTooComplex)((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
+  var initialSearchMethod = !(0, _isQueryTooComplex.isQueryTooComplex)((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
   var _useState11 = (0, _react.useState)(initialSearchMethod),
     _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
     currentSearchMethod = _useState12[0],
@@ -430,7 +430,6 @@ var PlainJiraIssuesConfigModalOld = exports.PlainJiraIssuesConfigModalOld = func
       }, !!jql ? (0, _react2.jsx)(_issueLikeTable.EmptyState, {
         testId: "jira-datasource-modal--empty-state"
       }) : (0, _react2.jsx)(_initialStateView.InitialStateView, {
-        showBeta: !(0, _platformFeatureFlags.fg)('platform.linking-platform.datasource.show-jlol-basic-filters'),
         icon: (0, _react2.jsx)(_jiraIssuesInitialStateSvg.JiraInitialStateSVG, null),
         title: _messages3.modalMessages.searchJiraTitle,
         description: currentSearchMethod === 'jql' ? _messages2.initialStateViewMessages.searchDescriptionForJQLSearch : _messages2.initialStateViewMessages.searchDescriptionForBasicSearch,

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

@@ -105,9 +105,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   // analytics related parameters
   var searchCount = (0, _react.useRef)(0);
   var userInteractions = (0, _userInteractions.useUserInteractions)();
-  var initialSearchMethod =
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource.show-jlol-basic-filters') && !(0, _isQueryTooComplex.isQueryTooComplex)(initialJql || '') ? 'basic' : 'jql';
+  var initialSearchMethod = !(0, _isQueryTooComplex.isQueryTooComplex)(initialJql || '') ? 'basic' : 'jql';
   var _useState5 = (0, _react.useState)(initialSearchMethod),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     currentSearchMethod = _useState6[0],
@@ -298,7 +296,6 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
       }, !!jql ? (0, _react2.jsx)(_issueLikeTable.EmptyState, {
         testId: "jira-datasource-modal--empty-state"
       }) : (0, _react2.jsx)(_initialStateView.InitialStateView, {
-        showBeta: !(0, _platformFeatureFlags.fg)('platform.linking-platform.datasource.show-jlol-basic-filters'),
         icon: (0, _react2.jsx)(_jiraIssuesInitialStateSvg.JiraInitialStateSVG, null),
         title: _messages3.modalMessages.searchJiraTitle,
         description: currentSearchMethod === 'jql' ? _messages2.initialStateViewMessages.searchDescriptionForJQLSearch : _messages2.initialStateViewMessages.searchDescriptionForBasicSearch,

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

@@ -1,7 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import mergeWith from 'lodash/mergeWith';
 import { AbstractJastVisitor, COMPOUND_OPERATOR_AND, COMPOUND_OPERATOR_OR, JastBuilder, OPERATOR_EQUALS, OPERATOR_IN, OPERATOR_LIKE } from '@atlaskit/jql-ast';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { ALLOWED_ORDER_BY_KEYS } from '../../jira-search-container';
 import { isClauseTooComplex } from './isClauseTooComplex';
 import { isValidJql } from './index';
@@ -83,7 +82,7 @@ class JqlClauseCollectingVisitor extends AbstractJastVisitor {
   }
 }
 export const isQueryTooComplex = jql => {
-  if (!fg('platform.linking-platform.datasource.show-jlol-basic-filters') || !jql) {
+  if (!jql) {
     return false;
   }
   if (!isValidJql(jql)) {

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

@@ -8,7 +8,6 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
 import { useDebouncedCallback } from 'use-debounce';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex, xcss } from '@atlaskit/primitives';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { BasicSearchInput } from '../../common/modal/basic-search-input';
@@ -58,12 +57,6 @@ export const JiraSearchContainer = props => {
   const [orderKey, setOrderKey] = useState();
   const [orderDirection, setOrderDirection] = useState();
   const [filterSelections, setFilterSelections] = useState({});
-  const showBasicFilters = useMemo(() => {
-    if (fg('platform.linking-platform.datasource.show-jlol-basic-filters')) {
-      return true;
-    }
-    return false;
-  }, []);
   const modeSwitcherOptionsMap = useMemo(() => ({
     jql: {
       label: 'JQL',
@@ -76,7 +69,7 @@ export const JiraSearchContainer = props => {
       tooltipText: isComplexQuery ? formatMessage(modeSwitcherMessages.basicModeSwitchDisabledTooltipText) : ''
     }
   }), [formatMessage, isComplexQuery]);
-  const modeSwitcherOptions = useMemo(() => showBasicFilters ? [modeSwitcherOptionsMap.basic, modeSwitcherOptionsMap.jql] : [modeSwitcherOptionsMap.jql, modeSwitcherOptionsMap.basic], [modeSwitcherOptionsMap, showBasicFilters]);
+  const modeSwitcherOptions = useMemo(() => [modeSwitcherOptionsMap.basic, modeSwitcherOptionsMap.jql], [modeSwitcherOptionsMap]);
   const {
     hydratedOptions,
     fetchHydratedJqlOptions,
@@ -125,11 +118,11 @@ export const JiraSearchContainer = props => {
         isQueryComplex: isCurrentQueryComplex
       });
       setIsComplexQuery(isCurrentQueryComplex);
-      if (showBasicFilters && !isCurrentQueryComplex) {
+      if (!isCurrentQueryComplex) {
         fetchHydratedJqlOptions();
       }
     }
-  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, searchBarJql, onSearch, showBasicFilters]);
+  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, searchBarJql, onSearch]);
   const [debouncedBasicFilterSelectionChange] = useDebouncedCallback(filterValues => {
     const jqlWithFilterValues = buildJQL({
       rawSearch: basicSearchTerm,
@@ -158,7 +151,7 @@ export const JiraSearchContainer = props => {
   useEffect(() => {
     const isCurrentQueryComplex = isQueryTooComplex(searchBarJql);
     setIsComplexQuery(isCurrentQueryComplex);
-    if (showBasicFilters && !isCurrentQueryComplex && searchBarJql !== DEFAULT_JQL_QUERY) {
+    if (!isCurrentQueryComplex && searchBarJql !== DEFAULT_JQL_QUERY) {
       fetchHydratedJqlOptions();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -199,8 +192,8 @@ export const JiraSearchContainer = props => {
     searchTerm: basicSearchTerm,
     placeholder: basicSearchInputMessages.basicTextSearchLabel,
     testId: "jira-datasource-modal",
-    fullWidth: !showBasicFilters
-  }), showBasicFilters && jsx(BasicFilters, {
+    fullWidth: false
+  }), jsx(BasicFilters, {
     jql: searchBarJql,
     site: site,
     onChange: handleBasicFilterSelectionChange,

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

@@ -82,7 +82,7 @@ export const PlainJiraIssuesConfigModalOld = props => {
   // analytics related parameters
   const searchCount = useRef(0);
   const userInteractions = useUserInteractions();
-  const initialSearchMethod = fg('platform.linking-platform.datasource.show-jlol-basic-filters') && !isQueryTooComplex((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
+  const initialSearchMethod = !isQueryTooComplex((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
   const [currentSearchMethod, setCurrentSearchMethod] = useState(initialSearchMethod);
   const searchMethodSearchedWith = useRef(null);
   const visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
@@ -412,7 +412,6 @@ export const PlainJiraIssuesConfigModalOld = props => {
       }, !!jql ? jsx(EmptyState, {
         testId: `jira-datasource-modal--empty-state`
       }) : jsx(InitialStateView, {
-        showBeta: !fg('platform.linking-platform.datasource.show-jlol-basic-filters'),
         icon: jsx(JiraInitialStateSVG, null),
         title: modalMessages.searchJiraTitle,
         description: currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearch : initialStateViewMessages.searchDescriptionForBasicSearch,

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

@@ -99,9 +99,7 @@ const PlainJiraIssuesConfigModal = props => {
   // analytics related parameters
   const searchCount = useRef(0);
   const userInteractions = useUserInteractions();
-  const initialSearchMethod =
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  fg('platform.linking-platform.datasource.show-jlol-basic-filters') && !isQueryTooComplex(initialJql || '') ? 'basic' : 'jql';
+  const initialSearchMethod = !isQueryTooComplex(initialJql || '') ? 'basic' : 'jql';
   const [currentSearchMethod, setCurrentSearchMethod] = useState(initialSearchMethod);
   const searchMethodSearchedWith = useRef(null);
   const basicFilterSelectionsSearchedWith = useRef({});
@@ -285,7 +283,6 @@ const PlainJiraIssuesConfigModal = props => {
       }, !!jql ? jsx(EmptyState, {
         testId: `jira-datasource-modal--empty-state`
       }) : jsx(InitialStateView, {
-        showBeta: !fg('platform.linking-platform.datasource.show-jlol-basic-filters'),
         icon: jsx(JiraInitialStateSVG, null),
         title: modalMessages.searchJiraTitle,
         description: currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearch : initialStateViewMessages.searchDescriptionForBasicSearch,

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

@@ -11,7 +11,6 @@ function _createSuper(t) { var r = _isNativeReflectConstruct(); return function
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import mergeWith from 'lodash/mergeWith';
 import { AbstractJastVisitor, COMPOUND_OPERATOR_AND, COMPOUND_OPERATOR_OR, JastBuilder, OPERATOR_EQUALS, OPERATOR_IN, OPERATOR_LIKE } from '@atlaskit/jql-ast';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { ALLOWED_ORDER_BY_KEYS } from '../../jira-search-container';
 import { isClauseTooComplex } from './isClauseTooComplex';
 import { isValidJql } from './index';
@@ -113,7 +112,7 @@ var JqlClauseCollectingVisitor = /*#__PURE__*/function (_AbstractJastVisitor) {
   return JqlClauseCollectingVisitor;
 }(AbstractJastVisitor);
 export var isQueryTooComplex = function isQueryTooComplex(jql) {
-  if (!fg('platform.linking-platform.datasource.show-jlol-basic-filters') || !jql) {
+  if (!jql) {
     return false;
   }
   if (!isValidJql(jql)) {

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

@@ -14,7 +14,6 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
 import { useDebouncedCallback } from 'use-debounce';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex, xcss } from '@atlaskit/primitives';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { BasicSearchInput } from '../../common/modal/basic-search-input';
@@ -81,12 +80,6 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     filterSelections = _useState14[0],
     setFilterSelections = _useState14[1];
-  var showBasicFilters = useMemo(function () {
-    if (fg('platform.linking-platform.datasource.show-jlol-basic-filters')) {
-      return true;
-    }
-    return false;
-  }, []);
   var modeSwitcherOptionsMap = useMemo(function () {
     return {
       jql: {
@@ -102,8 +95,8 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     };
   }, [formatMessage, isComplexQuery]);
   var modeSwitcherOptions = useMemo(function () {
-    return showBasicFilters ? [modeSwitcherOptionsMap.basic, modeSwitcherOptionsMap.jql] : [modeSwitcherOptionsMap.jql, modeSwitcherOptionsMap.basic];
-  }, [modeSwitcherOptionsMap, showBasicFilters]);
+    return [modeSwitcherOptionsMap.basic, modeSwitcherOptionsMap.jql];
+  }, [modeSwitcherOptionsMap]);
   var _useHydrateJqlQuery = useHydrateJqlQuery(cloudId || '', searchBarJql),
     hydratedOptions = _useHydrateJqlQuery.hydratedOptions,
     fetchHydratedJqlOptions = _useHydrateJqlQuery.fetchHydratedJqlOptions,
@@ -153,11 +146,11 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
         isQueryComplex: isCurrentQueryComplex
       });
       setIsComplexQuery(isCurrentQueryComplex);
-      if (showBasicFilters && !isCurrentQueryComplex) {
+      if (!isCurrentQueryComplex) {
         fetchHydratedJqlOptions();
       }
     }
-  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, searchBarJql, onSearch, showBasicFilters]);
+  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, searchBarJql, onSearch]);
   var _useDebouncedCallback = useDebouncedCallback(function (filterValues) {
       var jqlWithFilterValues = buildJQL({
         rawSearch: basicSearchTerm,
@@ -185,7 +178,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
   useEffect(function () {
     var isCurrentQueryComplex = isQueryTooComplex(searchBarJql);
     setIsComplexQuery(isCurrentQueryComplex);
-    if (showBasicFilters && !isCurrentQueryComplex && searchBarJql !== DEFAULT_JQL_QUERY) {
+    if (!isCurrentQueryComplex && searchBarJql !== DEFAULT_JQL_QUERY) {
       fetchHydratedJqlOptions();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -224,8 +217,8 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     searchTerm: basicSearchTerm,
     placeholder: basicSearchInputMessages.basicTextSearchLabel,
     testId: "jira-datasource-modal",
-    fullWidth: !showBasicFilters
-  }), showBasicFilters && jsx(BasicFilters, {
+    fullWidth: false
+  }), jsx(BasicFilters, {
     jql: searchBarJql,
     site: site,
     onChange: handleBasicFilterSelectionChange,

package/dist/esm/ui/jira-issues-modal/modal/ModalOld.js

@@ -100,7 +100,7 @@ export var PlainJiraIssuesConfigModalOld = function PlainJiraIssuesConfigModalOl
   // analytics related parameters
   var searchCount = useRef(0);
   var userInteractions = useUserInteractions();
-  var initialSearchMethod = fg('platform.linking-platform.datasource.show-jlol-basic-filters') && !isQueryTooComplex((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
+  var initialSearchMethod = !isQueryTooComplex((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
   var _useState11 = useState(initialSearchMethod),
     _useState12 = _slicedToArray(_useState11, 2),
     currentSearchMethod = _useState12[0],
@@ -427,7 +427,6 @@ export var PlainJiraIssuesConfigModalOld = function PlainJiraIssuesConfigModalOl
       }, !!jql ? jsx(EmptyState, {
         testId: "jira-datasource-modal--empty-state"
       }) : jsx(InitialStateView, {
-        showBeta: !fg('platform.linking-platform.datasource.show-jlol-basic-filters'),
         icon: jsx(JiraInitialStateSVG, null),
         title: modalMessages.searchJiraTitle,
         description: currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearch : initialStateViewMessages.searchDescriptionForBasicSearch,

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

@@ -103,9 +103,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   // analytics related parameters
   var searchCount = useRef(0);
   var userInteractions = useUserInteractions();
-  var initialSearchMethod =
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  fg('platform.linking-platform.datasource.show-jlol-basic-filters') && !isQueryTooComplex(initialJql || '') ? 'basic' : 'jql';
+  var initialSearchMethod = !isQueryTooComplex(initialJql || '') ? 'basic' : 'jql';
   var _useState5 = useState(initialSearchMethod),
     _useState6 = _slicedToArray(_useState5, 2),
     currentSearchMethod = _useState6[0],
@@ -296,7 +294,6 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
       }, !!jql ? jsx(EmptyState, {
         testId: "jira-datasource-modal--empty-state"
       }) : jsx(InitialStateView, {
-        showBeta: !fg('platform.linking-platform.datasource.show-jlol-basic-filters'),
         icon: jsx(JiraInitialStateSVG, null),
         title: modalMessages.searchJiraTitle,
         description: currentSearchMethod === 'jql' ? initialStateViewMessages.searchDescriptionForJQLSearch : initialStateViewMessages.searchDescriptionForBasicSearch,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "3.1.5",
+	"version": "3.2.1",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/flag": "^15.8.0",
 		"@atlaskit/form": "^10.5.0",
 		"@atlaskit/heading": "^2.4.0",
-		"@atlaskit/icon": "^22.19.0",
+		"@atlaskit/icon": "^22.20.0",
 		"@atlaskit/icon-object": "^6.5.0",
 		"@atlaskit/image": "^1.3.0",
 		"@atlaskit/inline-edit": "^13.7.0",
@@ -56,7 +56,7 @@
 		"@atlaskit/jql-ast": "^3.3.0",
 		"@atlaskit/jql-editor": "^4.8.0",
 		"@atlaskit/jql-editor-autocomplete-rest": "^2.1.0",
-		"@atlaskit/layering": "^0.4.0",
+		"@atlaskit/layering": "^0.5.0",
 		"@atlaskit/link-client-extension": "^2.4.0",
 		"@atlaskit/linking-common": "^5.11.0",
 		"@atlaskit/linking-types": "^9.0.0",
@@ -65,7 +65,7 @@
 		"@atlaskit/modal-dialog": "^12.17.0",
 		"@atlaskit/outbound-auth-flow-client": "^3.4.5",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/popup": "^1.27.0",
+		"@atlaskit/popup": "^1.28.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.3.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^1.2.0",
@@ -171,9 +171,6 @@
 		"platform.linking-platform.datasource-assets_update_refresh_button_dt3qk": {
 			"type": "boolean"
 		},
-		"platform.linking-platform.datasource.show-jlol-basic-filters": {
-			"type": "boolean"
-		},
 		"platform.linking-platform.datasource.show-clol-basic-filters": {
 			"type": "boolean"
 		},