@atlaskit/link-datasource 4.32.5 → 4.33.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 4.33.0
+
+### Minor Changes
+
+- [`52e8d22762662`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/52e8d22762662) -
+  Adding functionality to update JQL search with latest JQL query input (if valid) before inserting
+  using Jira Work Items Modal in confluence - Insert button remains disabled until search input is
+  valid/well-formed. Gated behind navx-1345-issues-modal-jql-submit-fix
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.32.5
 
 ### Patch Changes

package/dist/cjs/ui/common/modal/insert-button/index.js

@@ -9,6 +9,7 @@ exports.InsertButton = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../../../../analytics");
 var _types = require("../../../../analytics/types");
 var _schemaUtils = require("../../../../common/utils/schema-utils");
@@ -22,7 +23,9 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
   var testId = _ref.testId,
     url = _ref.url,
     getAnalyticsPayload = _ref.getAnalyticsPayload,
-    children = _ref.children;
+    children = _ref.children,
+    onBeforeInsert = _ref.onBeforeInsert,
+    hasErrors = _ref.hasErrors;
   var _useDatasourceContext = (0, _datasourceContext.useDatasourceContext)(),
     datasourceId = _useDatasourceContext.datasourceId,
     parameters = _useDatasourceContext.parameters,
@@ -38,12 +41,17 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
   var userInteractions = (0, _userInteractions.useUserInteractions)();
   var _useViewModeContext = (0, _useViewModeContext2.useViewModeContext)(),
     currentViewMode = _useViewModeContext.currentViewMode;
-  var isInsertDisabled = !isValidParameters(parameters) || status === 'rejected' || status === 'unauthorized' || status === 'loading';
+  var isJqlSubmitFixEnabled = (0, _platformFeatureFlags.fg)('navx-1345-issues-modal-jql-submit-fix');
+  var isInsertDisabled = (isJqlSubmitFixEnabled ? hasErrors : false) || !isValidParameters(parameters) || status === 'rejected' || status === 'unauthorized' || status === 'loading';
   var onInsertPressed = (0, _react.useCallback)(function (_e, analyticsEvent) {
     var _insertButtonClickedE;
     if (!parameters || !isValidParameters(parameters) || !url) {
       return;
     }
+    if (isJqlSubmitFixEnabled) {
+      onBeforeInsert === null || onBeforeInsert === void 0 || onBeforeInsert(parameters);
+    }
+    ;
     var insertButtonClickedEvent = analyticsEvent.update({
       actionSubjectId: 'insert',
       attributes: _objectSpread({
@@ -86,7 +94,7 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
         }]
       }, url), consumerEvent);
     }
-  }, [columnCustomSizes, currentViewMode, datasourceId, getAnalyticsPayload, isValidParameters, onInsert, parameters, totalCount, url, userInteractions, visibleColumnCount, visibleColumnKeys, wrappedColumnKeys]);
+  }, [columnCustomSizes, currentViewMode, datasourceId, getAnalyticsPayload, isValidParameters, onInsert, parameters, totalCount, url, userInteractions, visibleColumnCount, visibleColumnKeys, wrappedColumnKeys, isJqlSubmitFixEnabled, onBeforeInsert]);
   return /*#__PURE__*/_react.default.createElement(_standardButton.default, {
     appearance: "primary",
     onClick: onInsertPressed,

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

@@ -15,6 +15,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _useDebounce = require("use-debounce");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _analytics = require("../../../analytics");
 var _basicSearchInput = require("../../common/modal/basic-search-input");
@@ -48,7 +49,8 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     setSearchBarJql = props.setSearchBarJql,
     _props$searchBarJql = props.searchBarJql,
     searchBarJql = _props$searchBarJql === void 0 ? DEFAULT_JQL_QUERY : _props$searchBarJql,
-    site = props.site;
+    site = props.site,
+    setHasJqlSyntaxErrors = props.setHasJqlSyntaxErrors;
   var _ref = parameters || {},
     currentCloudId = _ref.cloudId;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
@@ -118,8 +120,11 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
       orderKey: orderKey
     }));
   }, [setSearchBarJql, filterSelections, orderDirection, orderKey]);
-  var onQueryChange = (0, _react.useCallback)(function (query) {
+  var onQueryChange = (0, _react.useCallback)(function (query, jast) {
     var _query$split$map$filt, _fragments$at, _fragments$at2, _fragments$at3;
+    if ((0, _platformFeatureFlags.fg)('navx-1345-issues-modal-jql-submit-fix')) {
+      setHasJqlSyntaxErrors === null || setHasJqlSyntaxErrors === void 0 || setHasJqlSyntaxErrors(jast.errors.length > 0);
+    }
     // determine if order keys have been set so they can be saved and persisted when changes occur in basic search
     var fragments = (_query$split$map$filt = query === null || query === void 0 ? void 0 : query.split(/(^| )(order by)( |$)/i).map(function (item) {
       return item.trim();
@@ -134,7 +139,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
       setOrderDirection(order);
     }
     setSearchBarJql(query);
-  }, [setSearchBarJql]);
+  }, [setSearchBarJql, setHasJqlSyntaxErrors]);
   var handleSearch = (0, _react.useCallback)(function () {
     var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(searchBarJql);
     onSearch({

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

@@ -100,24 +100,30 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var _useState = (0, _react.useState)(jql),
     _useState2 = (0, _slicedToArray2.default)(_useState, 1),
     initialJql = _useState2[0];
+  var isJqlSubmitFixEnabled = (0, _platformFeatureFlags.fg)('navx-1345-issues-modal-jql-submit-fix');
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    hasJqlSyntaxErrors = _useState4[0],
+    setHasJqlSyntaxErrors = _useState4[1]; // Tracks if current jql input has syntax errors
+
   var _useViewModeContext = (0, _useViewModeContext2.useViewModeContext)(),
     currentViewMode = _useViewModeContext.currentViewMode;
   var _useAvailableSites = (0, _useAvailableSites2.useAvailableSites)('jira', cloudId),
     availableSites = _useAvailableSites.availableSites,
     selectedJiraSite = _useAvailableSites.selectedSite;
-  var _useState3 = (0, _react.useState)(jql),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    searchBarJql = _useState4[0],
-    setSearchBarJql = _useState4[1];
+  var _useState5 = (0, _react.useState)(jql),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    searchBarJql = _useState6[0],
+    setSearchBarJql = _useState6[1];
 
   // analytics related parameters
   var searchCount = (0, _react.useRef)(0);
   var userInteractions = (0, _userInteractions.useUserInteractions)();
   var initialSearchMethod = !(0, _isQueryTooComplex.isQueryTooComplex)(initialJql || '') ? 'basic' : 'jql';
-  var _useState5 = (0, _react.useState)(initialSearchMethod),
-    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    currentSearchMethod = _useState6[0],
-    setCurrentSearchMethod = _useState6[1];
+  var _useState7 = (0, _react.useState)(initialSearchMethod),
+    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+    currentSearchMethod = _useState8[0],
+    setCurrentSearchMethod = _useState8[1];
   var searchMethodSearchedWith = (0, _react.useRef)(null);
   var basicFilterSelectionsSearchedWith = (0, _react.useRef)({});
   var isSearchedWithComplexQuery = (0, _react.useRef)(false);
@@ -374,6 +380,9 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     var upToDateJqlUrl = "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURIComponent(jql));
     return currentViewMode === 'inline' && responseItems.length === 1 ? retrieveUrlForSmartCardRender() : upToDateJqlUrl;
   }, [currentViewMode, parameters === null || parameters === void 0 ? void 0 : parameters.jql, responseItems, retrieveUrlForSmartCardRender, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url]);
+  var updateParametersJql = (0, _react.useCallback)(function (parameters) {
+    parameters.jql = searchBarJql;
+  }, [searchBarJql]);
   return /*#__PURE__*/_react.default.createElement(_intlMessagesProvider.IntlMessagesProvider, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
@@ -402,6 +411,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   }))))), /*#__PURE__*/_react.default.createElement(_modalDialog.ModalBody, null, !hasNoJiraSites ? /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_jiraSearchContainer.JiraSearchContainer, {
     setSearchBarJql: setSearchBarJql,
     searchBarJql: searchBarJql,
+    setHasJqlSyntaxErrors: isJqlSubmitFixEnabled ? setHasJqlSyntaxErrors : undefined,
     isSearching: status === 'loading',
     parameters: parameters,
     onSearch: onSearch,
@@ -425,11 +435,14 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     onCancel: onCancel,
     getAnalyticsPayload: getCancelButtonAnalyticsPayload,
     testId: "jira-datasource-modal--cancel-button"
-  }), !hasNoJiraSites && /*#__PURE__*/_react.default.createElement(_insertButton.InsertButton, {
+  }), !hasNoJiraSites && /*#__PURE__*/_react.default.createElement(_insertButton.InsertButton, (0, _extends2.default)({
     testId: "jira-datasource-modal--insert-button",
     url: urlToInsert,
     getAnalyticsPayload: getInsertButtonAnalyticsPayload
-  }, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages3.modalMessages.insertIssuesButtonTextIssueTermSllv))))));
+  }, isJqlSubmitFixEnabled ? {
+    onBeforeInsert: updateParametersJql,
+    hasErrors: hasJqlSyntaxErrors
+  } : {}), /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages3.modalMessages.insertIssuesButtonTextIssueTermSllv))))));
 };
 var ConnectedJiraIssueConfigModal = (0, _createDatasourceModal.createDatasourceModal)({
   isValidParameters: isValidParameters,

package/dist/es2019/ui/common/modal/insert-button/index.js

@@ -1,5 +1,6 @@
 import React, { useCallback } from 'react';
 import Button from '@atlaskit/button/standard-button';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { EVENT_CHANNEL } from '../../../../analytics';
 import { DatasourceDisplay, DatasourceSearchMethod } from '../../../../analytics/types';
 import { buildDatasourceAdf } from '../../../../common/utils/schema-utils';
@@ -10,7 +11,9 @@ export const InsertButton = ({
   testId,
   url,
   getAnalyticsPayload,
-  children
+  children,
+  onBeforeInsert,
+  hasErrors
 }) => {
   const {
     datasourceId,
@@ -30,12 +33,17 @@ export const InsertButton = ({
   const {
     currentViewMode
   } = useViewModeContext();
-  const isInsertDisabled = !isValidParameters(parameters) || status === 'rejected' || status === 'unauthorized' || status === 'loading';
+  const isJqlSubmitFixEnabled = fg('navx-1345-issues-modal-jql-submit-fix');
+  const isInsertDisabled = (isJqlSubmitFixEnabled ? hasErrors : false) || !isValidParameters(parameters) || status === 'rejected' || status === 'unauthorized' || status === 'loading';
   const onInsertPressed = useCallback((_e, analyticsEvent) => {
     var _insertButtonClickedE;
     if (!parameters || !isValidParameters(parameters) || !url) {
       return;
     }
+    if (isJqlSubmitFixEnabled) {
+      onBeforeInsert === null || onBeforeInsert === void 0 ? void 0 : onBeforeInsert(parameters);
+    }
+    ;
     const insertButtonClickedEvent = analyticsEvent.update({
       actionSubjectId: 'insert',
       attributes: {
@@ -81,7 +89,7 @@ export const InsertButton = ({
         }]
       }, url), consumerEvent);
     }
-  }, [columnCustomSizes, currentViewMode, datasourceId, getAnalyticsPayload, isValidParameters, onInsert, parameters, totalCount, url, userInteractions, visibleColumnCount, visibleColumnKeys, wrappedColumnKeys]);
+  }, [columnCustomSizes, currentViewMode, datasourceId, getAnalyticsPayload, isValidParameters, onInsert, parameters, totalCount, url, userInteractions, visibleColumnCount, visibleColumnKeys, wrappedColumnKeys, isJqlSubmitFixEnabled, onBeforeInsert]);
   return /*#__PURE__*/React.createElement(Button, {
     appearance: "primary",
     onClick: onInsertPressed,

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

@@ -4,6 +4,7 @@ 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';
@@ -33,7 +34,8 @@ export const JiraSearchContainer = props => {
     initialSearchMethod,
     setSearchBarJql,
     searchBarJql = DEFAULT_JQL_QUERY,
-    site
+    site,
+    setHasJqlSyntaxErrors
   } = props;
   const {
     cloudId: currentCloudId
@@ -83,8 +85,11 @@ export const JiraSearchContainer = props => {
       orderKey
     }));
   }, [setSearchBarJql, filterSelections, orderDirection, orderKey]);
-  const onQueryChange = useCallback(query => {
+  const onQueryChange = useCallback((query, jast) => {
     var _query$split$map$filt, _fragments$at, _fragments$at2, _fragments$at3;
+    if (fg('navx-1345-issues-modal-jql-submit-fix')) {
+      setHasJqlSyntaxErrors === null || setHasJqlSyntaxErrors === void 0 ? void 0 : setHasJqlSyntaxErrors(jast.errors.length > 0);
+    }
     // determine if order keys have been set so they can be saved and persisted when changes occur in basic search
     const fragments = (_query$split$map$filt = query === null || query === void 0 ? void 0 : query.split(/(^| )(order by)( |$)/i).map(item => item.trim()).filter(Boolean)) !== null && _query$split$map$filt !== void 0 ? _query$split$map$filt : [];
     const hasOrder = ((_fragments$at = fragments.at(-2)) === null || _fragments$at === void 0 ? void 0 : _fragments$at.toLowerCase()) === 'order by';
@@ -97,7 +102,7 @@ export const JiraSearchContainer = props => {
       setOrderDirection(order);
     }
     setSearchBarJql(query);
-  }, [setSearchBarJql]);
+  }, [setSearchBarJql, setHasJqlSyntaxErrors]);
   const handleSearch = useCallback(() => {
     const isCurrentQueryComplex = isQueryTooComplex(searchBarJql);
     onSearch({

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

@@ -89,6 +89,9 @@ const PlainJiraIssuesConfigModal = props => {
     jql
   } = parameters !== null && parameters !== void 0 ? parameters : {};
   const [initialJql] = useState(jql);
+  const isJqlSubmitFixEnabled = fg('navx-1345-issues-modal-jql-submit-fix');
+  const [hasJqlSyntaxErrors, setHasJqlSyntaxErrors] = useState(false); // Tracks if current jql input has syntax errors
+
   const {
     currentViewMode
   } = useViewModeContext();
@@ -360,6 +363,9 @@ const PlainJiraIssuesConfigModal = props => {
     const upToDateJqlUrl = `${selectedJiraSite.url}/issues/?jql=${encodeURIComponent(jql)}`;
     return currentViewMode === 'inline' && responseItems.length === 1 ? retrieveUrlForSmartCardRender() : upToDateJqlUrl;
   }, [currentViewMode, parameters === null || parameters === void 0 ? void 0 : parameters.jql, responseItems, retrieveUrlForSmartCardRender, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url]);
+  const updateParametersJql = useCallback(parameters => {
+    parameters.jql = searchBarJql;
+  }, [searchBarJql]);
   return /*#__PURE__*/React.createElement(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
@@ -388,6 +394,7 @@ const PlainJiraIssuesConfigModal = props => {
   }))))), /*#__PURE__*/React.createElement(ModalBody, null, !hasNoJiraSites ? /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(JiraSearchContainer, {
     setSearchBarJql: setSearchBarJql,
     searchBarJql: searchBarJql,
+    setHasJqlSyntaxErrors: isJqlSubmitFixEnabled ? setHasJqlSyntaxErrors : undefined,
     isSearching: status === 'loading',
     parameters: parameters,
     onSearch: onSearch,
@@ -411,11 +418,14 @@ const PlainJiraIssuesConfigModal = props => {
     onCancel: onCancel,
     getAnalyticsPayload: getCancelButtonAnalyticsPayload,
     testId: "jira-datasource-modal--cancel-button"
-  }), !hasNoJiraSites && /*#__PURE__*/React.createElement(InsertButton, {
+  }), !hasNoJiraSites && /*#__PURE__*/React.createElement(InsertButton, _extends({
     testId: "jira-datasource-modal--insert-button",
     url: urlToInsert,
     getAnalyticsPayload: getInsertButtonAnalyticsPayload
-  }, /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermSllv))))));
+  }, isJqlSubmitFixEnabled ? {
+    onBeforeInsert: updateParametersJql,
+    hasErrors: hasJqlSyntaxErrors
+  } : {}), /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermSllv))))));
 };
 const ConnectedJiraIssueConfigModal = createDatasourceModal({
   isValidParameters,

package/dist/esm/ui/common/modal/insert-button/index.js

@@ -3,6 +3,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 import React, { useCallback } from 'react';
 import Button from '@atlaskit/button/standard-button';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { EVENT_CHANNEL } from '../../../../analytics';
 import { DatasourceDisplay, DatasourceSearchMethod } from '../../../../analytics/types';
 import { buildDatasourceAdf } from '../../../../common/utils/schema-utils';
@@ -13,7 +14,9 @@ export var InsertButton = function InsertButton(_ref) {
   var testId = _ref.testId,
     url = _ref.url,
     getAnalyticsPayload = _ref.getAnalyticsPayload,
-    children = _ref.children;
+    children = _ref.children,
+    onBeforeInsert = _ref.onBeforeInsert,
+    hasErrors = _ref.hasErrors;
   var _useDatasourceContext = useDatasourceContext(),
     datasourceId = _useDatasourceContext.datasourceId,
     parameters = _useDatasourceContext.parameters,
@@ -29,12 +32,17 @@ export var InsertButton = function InsertButton(_ref) {
   var userInteractions = useUserInteractions();
   var _useViewModeContext = useViewModeContext(),
     currentViewMode = _useViewModeContext.currentViewMode;
-  var isInsertDisabled = !isValidParameters(parameters) || status === 'rejected' || status === 'unauthorized' || status === 'loading';
+  var isJqlSubmitFixEnabled = fg('navx-1345-issues-modal-jql-submit-fix');
+  var isInsertDisabled = (isJqlSubmitFixEnabled ? hasErrors : false) || !isValidParameters(parameters) || status === 'rejected' || status === 'unauthorized' || status === 'loading';
   var onInsertPressed = useCallback(function (_e, analyticsEvent) {
     var _insertButtonClickedE;
     if (!parameters || !isValidParameters(parameters) || !url) {
       return;
     }
+    if (isJqlSubmitFixEnabled) {
+      onBeforeInsert === null || onBeforeInsert === void 0 || onBeforeInsert(parameters);
+    }
+    ;
     var insertButtonClickedEvent = analyticsEvent.update({
       actionSubjectId: 'insert',
       attributes: _objectSpread({
@@ -77,7 +85,7 @@ export var InsertButton = function InsertButton(_ref) {
         }]
       }, url), consumerEvent);
     }
-  }, [columnCustomSizes, currentViewMode, datasourceId, getAnalyticsPayload, isValidParameters, onInsert, parameters, totalCount, url, userInteractions, visibleColumnCount, visibleColumnKeys, wrappedColumnKeys]);
+  }, [columnCustomSizes, currentViewMode, datasourceId, getAnalyticsPayload, isValidParameters, onInsert, parameters, totalCount, url, userInteractions, visibleColumnCount, visibleColumnKeys, wrappedColumnKeys, isJqlSubmitFixEnabled, onBeforeInsert]);
   return /*#__PURE__*/React.createElement(Button, {
     appearance: "primary",
     onClick: onInsertPressed,

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

@@ -10,6 +10,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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';
@@ -39,7 +40,8 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     setSearchBarJql = props.setSearchBarJql,
     _props$searchBarJql = props.searchBarJql,
     searchBarJql = _props$searchBarJql === void 0 ? DEFAULT_JQL_QUERY : _props$searchBarJql,
-    site = props.site;
+    site = props.site,
+    setHasJqlSyntaxErrors = props.setHasJqlSyntaxErrors;
   var _ref = parameters || {},
     currentCloudId = _ref.cloudId;
   var _useIntl = useIntl(),
@@ -109,8 +111,11 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
       orderKey: orderKey
     }));
   }, [setSearchBarJql, filterSelections, orderDirection, orderKey]);
-  var onQueryChange = useCallback(function (query) {
+  var onQueryChange = useCallback(function (query, jast) {
     var _query$split$map$filt, _fragments$at, _fragments$at2, _fragments$at3;
+    if (fg('navx-1345-issues-modal-jql-submit-fix')) {
+      setHasJqlSyntaxErrors === null || setHasJqlSyntaxErrors === void 0 || setHasJqlSyntaxErrors(jast.errors.length > 0);
+    }
     // determine if order keys have been set so they can be saved and persisted when changes occur in basic search
     var fragments = (_query$split$map$filt = query === null || query === void 0 ? void 0 : query.split(/(^| )(order by)( |$)/i).map(function (item) {
       return item.trim();
@@ -125,7 +130,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
       setOrderDirection(order);
     }
     setSearchBarJql(query);
-  }, [setSearchBarJql]);
+  }, [setSearchBarJql, setHasJqlSyntaxErrors]);
   var handleSearch = useCallback(function () {
     var isCurrentQueryComplex = isQueryTooComplex(searchBarJql);
     onSearch({

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

@@ -92,24 +92,30 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var _useState = useState(jql),
     _useState2 = _slicedToArray(_useState, 1),
     initialJql = _useState2[0];
+  var isJqlSubmitFixEnabled = fg('navx-1345-issues-modal-jql-submit-fix');
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    hasJqlSyntaxErrors = _useState4[0],
+    setHasJqlSyntaxErrors = _useState4[1]; // Tracks if current jql input has syntax errors
+
   var _useViewModeContext = useViewModeContext(),
     currentViewMode = _useViewModeContext.currentViewMode;
   var _useAvailableSites = useAvailableSites('jira', cloudId),
     availableSites = _useAvailableSites.availableSites,
     selectedJiraSite = _useAvailableSites.selectedSite;
-  var _useState3 = useState(jql),
-    _useState4 = _slicedToArray(_useState3, 2),
-    searchBarJql = _useState4[0],
-    setSearchBarJql = _useState4[1];
+  var _useState5 = useState(jql),
+    _useState6 = _slicedToArray(_useState5, 2),
+    searchBarJql = _useState6[0],
+    setSearchBarJql = _useState6[1];
 
   // analytics related parameters
   var searchCount = useRef(0);
   var userInteractions = useUserInteractions();
   var initialSearchMethod = !isQueryTooComplex(initialJql || '') ? 'basic' : 'jql';
-  var _useState5 = useState(initialSearchMethod),
-    _useState6 = _slicedToArray(_useState5, 2),
-    currentSearchMethod = _useState6[0],
-    setCurrentSearchMethod = _useState6[1];
+  var _useState7 = useState(initialSearchMethod),
+    _useState8 = _slicedToArray(_useState7, 2),
+    currentSearchMethod = _useState8[0],
+    setCurrentSearchMethod = _useState8[1];
   var searchMethodSearchedWith = useRef(null);
   var basicFilterSelectionsSearchedWith = useRef({});
   var isSearchedWithComplexQuery = useRef(false);
@@ -366,6 +372,9 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     var upToDateJqlUrl = "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURIComponent(jql));
     return currentViewMode === 'inline' && responseItems.length === 1 ? retrieveUrlForSmartCardRender() : upToDateJqlUrl;
   }, [currentViewMode, parameters === null || parameters === void 0 ? void 0 : parameters.jql, responseItems, retrieveUrlForSmartCardRender, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url]);
+  var updateParametersJql = useCallback(function (parameters) {
+    parameters.jql = searchBarJql;
+  }, [searchBarJql]);
   return /*#__PURE__*/React.createElement(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
@@ -394,6 +403,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   }))))), /*#__PURE__*/React.createElement(ModalBody, null, !hasNoJiraSites ? /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(JiraSearchContainer, {
     setSearchBarJql: setSearchBarJql,
     searchBarJql: searchBarJql,
+    setHasJqlSyntaxErrors: isJqlSubmitFixEnabled ? setHasJqlSyntaxErrors : undefined,
     isSearching: status === 'loading',
     parameters: parameters,
     onSearch: onSearch,
@@ -417,11 +427,14 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     onCancel: onCancel,
     getAnalyticsPayload: getCancelButtonAnalyticsPayload,
     testId: "jira-datasource-modal--cancel-button"
-  }), !hasNoJiraSites && /*#__PURE__*/React.createElement(InsertButton, {
+  }), !hasNoJiraSites && /*#__PURE__*/React.createElement(InsertButton, _extends({
     testId: "jira-datasource-modal--insert-button",
     url: urlToInsert,
     getAnalyticsPayload: getInsertButtonAnalyticsPayload
-  }, /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermSllv))))));
+  }, isJqlSubmitFixEnabled ? {
+    onBeforeInsert: updateParametersJql,
+    hasErrors: hasJqlSyntaxErrors
+  } : {}), /*#__PURE__*/React.createElement(FormattedMessage, modalMessages.insertIssuesButtonTextIssueTermSllv))))));
 };
 var ConnectedJiraIssueConfigModal = createDatasourceModal({
   isValidParameters: isValidParameters,

package/dist/types/ui/common/modal/insert-button/index.d.ts

@@ -1,8 +1,10 @@
 import React, { type PropsWithChildren } from 'react';
 import { type DatasourceParameters } from '@atlaskit/linking-types';
-export type InsertButtonProps<_Parameters extends DatasourceParameters> = PropsWithChildren<{
+export type InsertButtonProps<Parameters extends DatasourceParameters> = PropsWithChildren<{
     getAnalyticsPayload: () => Record<string, any>;
+    hasErrors?: boolean;
+    onBeforeInsert?: (parameters: Parameters) => void;
     testId?: string;
     url: string | undefined;
 }>;
-export declare const InsertButton: <Parameters extends DatasourceParameters>({ testId, url, getAnalyticsPayload, children, }: InsertButtonProps<Parameters>) => React.JSX.Element;
+export declare const InsertButton: <Parameters extends DatasourceParameters>({ testId, url, getAnalyticsPayload, children, onBeforeInsert, hasErrors, }: InsertButtonProps<Parameters>) => React.JSX.Element;

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

@@ -14,6 +14,7 @@ export interface SearchContainerProps {
     onSearchMethodChange: (searchMethod: JiraSearchMethod) => void;
     parameters?: JiraIssueDatasourceParameters;
     searchBarJql?: string;
+    setHasJqlSyntaxErrors?: (hasErrors: boolean) => void;
     setSearchBarJql: (jql: string) => void;
     site?: Site;
 }

package/dist/types/ui/jira-issues-modal/jql-editor/index.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
+import { type Jast } from '@atlaskit/jql-ast';
 export interface JiraJQLEditorProps {
     cloudId: string;
     isSearching?: boolean;
-    onChange?: (query: string) => void;
+    onChange?: (query: string, jast: Jast) => void;
     onSearch: () => void;
     query: string;
 }

package/dist/types-ts4.5/ui/common/modal/insert-button/index.d.ts

@@ -1,8 +1,10 @@
 import React, { type PropsWithChildren } from 'react';
 import { type DatasourceParameters } from '@atlaskit/linking-types';
-export type InsertButtonProps<_Parameters extends DatasourceParameters> = PropsWithChildren<{
+export type InsertButtonProps<Parameters extends DatasourceParameters> = PropsWithChildren<{
     getAnalyticsPayload: () => Record<string, any>;
+    hasErrors?: boolean;
+    onBeforeInsert?: (parameters: Parameters) => void;
     testId?: string;
     url: string | undefined;
 }>;
-export declare const InsertButton: <Parameters extends DatasourceParameters>({ testId, url, getAnalyticsPayload, children, }: InsertButtonProps<Parameters>) => React.JSX.Element;
+export declare const InsertButton: <Parameters extends DatasourceParameters>({ testId, url, getAnalyticsPayload, children, onBeforeInsert, hasErrors, }: InsertButtonProps<Parameters>) => React.JSX.Element;

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

@@ -14,6 +14,7 @@ export interface SearchContainerProps {
     onSearchMethodChange: (searchMethod: JiraSearchMethod) => void;
     parameters?: JiraIssueDatasourceParameters;
     searchBarJql?: string;
+    setHasJqlSyntaxErrors?: (hasErrors: boolean) => void;
     setSearchBarJql: (jql: string) => void;
     site?: Site;
 }

package/dist/types-ts4.5/ui/jira-issues-modal/jql-editor/index.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
+import { type Jast } from '@atlaskit/jql-ast';
 export interface JiraJQLEditorProps {
     cloudId: string;
     isSearching?: boolean;
-    onChange?: (query: string) => void;
+    onChange?: (query: string, jast: Jast) => void;
     onSearch: () => void;
     query: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "4.32.5",
+	"version": "4.33.0",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -80,10 +80,10 @@
 		"@atlaskit/primitives": "^17.1.0",
 		"@atlaskit/react-select": "^3.13.0",
 		"@atlaskit/select": "^21.7.0",
-		"@atlaskit/smart-card": "^43.22.0",
+		"@atlaskit/smart-card": "^43.23.0",
 		"@atlaskit/smart-user-picker": "^8.9.0",
 		"@atlaskit/spinner": "^19.0.0",
-		"@atlaskit/tag": "^14.2.0",
+		"@atlaskit/tag": "^14.3.0",
 		"@atlaskit/textfield": "^8.2.0",
 		"@atlaskit/theme": "^21.0.0",
 		"@atlaskit/tokens": "^10.1.0",
@@ -176,6 +176,9 @@
 		"navx-1895-new-logo-design": {
 			"type": "boolean"
 		},
+		"navx-1345-issues-modal-jql-submit-fix": {
+			"type": "boolean"
+		},
 		"platform_navx_jira_sllv_rich_text_gate": {
 			"type": "boolean"
 		},