@atlaskit/link-datasource 1.19.17 → 1.19.18

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-datasource
 
+## 1.19.18
+
+### Patch Changes
+
+- [#57736](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/57736) [`d8193e501bcc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d8193e501bcc) - [ux] Changes behavior of datasource modal to persist query changes on insert without needing to click search.
+
 ## 1.19.17
 
 ### Patch Changes

package/dist/cjs/analytics/constants.js

@@ -7,5 +7,5 @@ exports.packageMetaData = exports.EVENT_CHANNEL = void 0;
 var EVENT_CHANNEL = exports.EVENT_CHANNEL = 'media';
 var packageMetaData = exports.packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.17"
+  packageVersion: "1.19.18"
 };

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -98,13 +98,20 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
           _yield$getDatasourceD = _context.sent;
           access = _yield$getDatasourceD.meta.access;
           schema = _yield$getDatasourceD.data.schema;
-          if (!(access === 'forbidden' || access === 'unauthorized')) {
+          if (!(access === 'unauthorized')) {
             _context.next = 11;
             break;
           }
           setStatus('unauthorized');
           return _context.abrupt("return");
         case 11:
+          if (!(access === 'forbidden')) {
+            _context.next = 14;
+            break;
+          }
+          setStatus('forbidden');
+          return _context.abrupt("return");
+        case 14:
           isColumnNotPresentInCurrentColumnsList = function isColumnNotPresentInCurrentColumnsList(col) {
             return !columns.find(function (column) {
               return column.key === col.key;
@@ -113,25 +120,32 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
           allColumns = schema.properties;
           newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
           newColumns.length > 0 && setColumns([].concat((0, _toConsumableArray2.default)(columns), (0, _toConsumableArray2.default)(newColumns)));
-          _context.next = 24;
+          _context.next = 30;
           break;
-        case 17:
-          _context.prev = 17;
+        case 20:
+          _context.prev = 20;
           _context.t0 = _context["catch"](2);
           captureError('loadDatasourceDetails', _context.t0);
-          if (!(_context.t0 instanceof Response && (_context.t0.status === 401 || _context.t0.status === 403))) {
-            _context.next = 23;
+          if (!(_context.t0 instanceof Response && _context.t0.status === 401)) {
+            _context.next = 26;
             break;
           }
           setStatus('unauthorized');
           return _context.abrupt("return");
-        case 23:
+        case 26:
+          if (!(_context.t0 instanceof Response && _context.t0.status === 403)) {
+            _context.next = 29;
+            break;
+          }
+          setStatus('forbidden');
+          return _context.abrupt("return");
+        case 29:
           setStatus('rejected');
-        case 24:
+        case 30:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[2, 17]]);
+    }, _callee, null, [[2, 20]]);
   })), [captureError, columns, datasourceId, getDatasourceDetails, parameters]);
   var applySchemaProperties = (0, _react.useCallback)(function (schema, fieldKeys) {
     var properties = schema.properties,
@@ -225,13 +239,20 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
           nextPageCursor = _yield$getDatasourceD4.nextPageCursor;
           _totalCount = _yield$getDatasourceD4.totalCount;
           schema = _yield$getDatasourceD4.schema;
-          if (!(access === 'forbidden' || access === 'unauthorized')) {
+          if (!(access === 'unauthorized')) {
             _context2.next = 23;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
         case 23:
+          if (!(access === 'forbidden')) {
+            _context2.next = 26;
+            break;
+          }
+          setStatus('forbidden');
+          return _context2.abrupt("return");
+        case 26:
           setExtensionKey(_extensionKey);
           setDestinationObjectTypes(_destinationObjectTypes);
           setTotalCount(_totalCount);
@@ -260,25 +281,32 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
             });
           }
           setStatus('resolved');
-          _context2.next = 43;
+          _context2.next = 49;
           break;
-        case 36:
-          _context2.prev = 36;
+        case 39:
+          _context2.prev = 39;
           _context2.t0 = _context2["catch"](7);
           captureError('onNextPage', _context2.t0);
-          if (!(_context2.t0 instanceof Response && (_context2.t0.status === 401 || _context2.t0.status === 403))) {
-            _context2.next = 42;
+          if (!(_context2.t0 instanceof Response && _context2.t0.status === 401)) {
+            _context2.next = 45;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
-        case 42:
+        case 45:
+          if (!(_context2.t0 instanceof Response && _context2.t0.status === 403)) {
+            _context2.next = 48;
+            break;
+          }
+          setStatus('forbidden');
+          return _context2.abrupt("return");
+        case 48:
           setStatus('rejected');
-        case 43:
+        case 49:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[7, 36]]);
+    }, _callee2, null, [[7, 39]]);
   })), [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent, fullSchema]);
   var reset = (0, _react.useCallback)(function (options) {
     setStatus('empty');

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

@@ -113,7 +113,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
       shouldForceRequest: true
     });
   }, [destinationObjectTypes, extensionKey, fireEvent, reset]);
-  if (status === 'resolved' && !responseItems.length) {
+  if (status === 'resolved' && !responseItems.length || status === 'forbidden') {
     return (0, _react2.jsx)(_noResults.NoResults, {
       onRefresh: reset
     });

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

@@ -45,10 +45,12 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     parameters = props.parameters,
     onSearch = props.onSearch,
     onSearchMethodChangeCallback = props.onSearchMethodChange,
-    initialSearchMethod = props.initialSearchMethod;
+    initialSearchMethod = props.initialSearchMethod,
+    setSearchBarJql = props.setSearchBarJql,
+    _props$searchBarJql = props.searchBarJql,
+    searchBarJql = _props$searchBarJql === void 0 ? DEFAULT_JQL_QUERY : _props$searchBarJql;
   var _ref = parameters || {},
-    currentCloudId = _ref.cloudId,
-    initialJql = _ref.jql;
+    currentCloudId = _ref.cloudId;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
@@ -61,37 +63,33 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     currentSearchMethod = _useState4[0],
     setCurrentSearchMethod = _useState4[1];
-  var _useState5 = (0, _react.useState)(initialJql || DEFAULT_JQL_QUERY),
+  var _useState5 = (0, _react.useState)(currentCloudId),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    jql = _useState6[0],
-    setJql = _useState6[1];
-  var _useState7 = (0, _react.useState)(currentCloudId),
+    cloudId = _useState6[0],
+    setCloudId = _useState6[1];
+  var _useState7 = (0, _react.useState)(false),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    cloudId = _useState8[0],
-    setCloudId = _useState8[1];
-  var _useState9 = (0, _react.useState)(false),
+    isComplexQuery = _useState8[0],
+    setIsComplexQuery = _useState8[1];
+  var _useState9 = (0, _react.useState)(),
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-    isComplexQuery = _useState10[0],
-    setIsComplexQuery = _useState10[1];
+    orderKey = _useState10[0],
+    setOrderKey = _useState10[1];
   var _useState11 = (0, _react.useState)(),
     _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-    orderKey = _useState12[0],
-    setOrderKey = _useState12[1];
-  var _useState13 = (0, _react.useState)(),
+    orderDirection = _useState12[0],
+    setOrderDirection = _useState12[1];
+  var _useState13 = (0, _react.useState)({}),
     _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-    orderDirection = _useState14[0],
-    setOrderDirection = _useState14[1];
-  var _useState15 = (0, _react.useState)({}),
-    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-    filterSelections = _useState16[0],
-    setFilterSelections = _useState16[1];
+    filterSelections = _useState14[0],
+    setFilterSelections = _useState14[1];
   var showBasicFilters = (0, _react.useMemo)(function () {
     if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters')) {
       return true;
     }
     return false;
   }, []);
-  var _useHydrateJqlQuery = (0, _useHydrateJqlQuery2.useHydrateJqlQuery)(cloudId || '', jql),
+  var _useHydrateJqlQuery = (0, _useHydrateJqlQuery2.useHydrateJqlQuery)(cloudId || '', searchBarJql),
     hydratedOptions = _useHydrateJqlQuery.hydratedOptions,
     fetchHydratedJqlOptions = _useHydrateJqlQuery.fetchHydratedJqlOptions,
     basicFilterHydrationStatus = _useHydrateJqlQuery.status;
@@ -102,13 +100,13 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
   var handleBasicSearchChange = (0, _react.useCallback)(function (e) {
     var rawSearch = e.currentTarget.value;
     setBasicSearchTerm(rawSearch);
-    setJql((0, _buildJQL.buildJQL)({
+    setSearchBarJql((0, _buildJQL.buildJQL)({
       rawSearch: rawSearch,
       filterValues: filterSelections,
       orderDirection: orderDirection,
       orderKey: orderKey
     }));
-  }, [filterSelections, orderDirection, orderKey]);
+  }, [setSearchBarJql, filterSelections, orderDirection, orderKey]);
   var onQueryChange = (0, _react.useCallback)(function (query) {
     var _query$split$map$filt, _fragments$at, _fragments$at2, _fragments$at3;
     // determine if order keys have been set so they can be saved and persisted when changes occur in basic search
@@ -124,12 +122,12 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
       setOrderKey(key);
       setOrderDirection(order);
     }
-    setJql(query);
-  }, []);
+    setSearchBarJql(query);
+  }, [setSearchBarJql]);
   var handleSearch = (0, _react.useCallback)(function () {
-    var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(jql);
+    var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(searchBarJql);
     onSearch({
-      jql: jql
+      jql: searchBarJql
     }, {
       searchMethod: currentSearchMethod,
       basicFilterSelections: filterSelections,
@@ -146,7 +144,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
         fetchHydratedJqlOptions();
       }
     }
-  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, jql, onSearch, showBasicFilters]);
+  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, searchBarJql, onSearch, showBasicFilters]);
   var _useDebouncedCallback = (0, _useDebounce.useDebouncedCallback)(function (filterValues) {
       var jqlWithFilterValues = (0, _buildJQL.buildJQL)({
         rawSearch: basicSearchTerm,
@@ -154,7 +152,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
         orderDirection: orderDirection,
         orderKey: orderKey
       });
-      setJql(jqlWithFilterValues);
+      setSearchBarJql(jqlWithFilterValues);
       var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(jqlWithFilterValues);
       onSearch({
         jql: jqlWithFilterValues
@@ -172,9 +170,9 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     debouncedBasicFilterSelectionChange(updatedSelection);
   }, [debouncedBasicFilterSelectionChange, filterSelections]);
   (0, _react.useEffect)(function () {
-    var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(jql);
+    var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(searchBarJql);
     setIsComplexQuery(isCurrentQueryComplex);
-    if (showBasicFilters && !isCurrentQueryComplex && jql !== DEFAULT_JQL_QUERY) {
+    if (showBasicFilters && !isCurrentQueryComplex && searchBarJql !== DEFAULT_JQL_QUERY) {
       fetchHydratedJqlOptions();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -192,14 +190,14 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
   (0, _react.useEffect)(function () {
     if (currentCloudId !== cloudId) {
       setBasicSearchTerm('');
-      setJql(DEFAULT_JQL_QUERY);
+      setSearchBarJql(DEFAULT_JQL_QUERY);
       setIsComplexQuery(false);
       setOrderKey(undefined);
       setOrderDirection(undefined);
       setFilterSelections({});
       setCloudId(currentCloudId);
     }
-  }, [currentCloudId, cloudId]);
+  }, [currentCloudId, cloudId, setSearchBarJql]);
   return (0, _react2.jsx)("div", {
     css: inputContainerStyles,
     "data-testid": "jira-search-container"
@@ -212,7 +210,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     onSearch: handleSearch,
     searchTerm: basicSearchTerm
   }), showBasicFilters && (0, _react2.jsx)(_basicFilters.BasicFilters, {
-    jql: jql,
+    jql: searchBarJql,
     cloudId: cloudId || '',
     onChange: handleBasicFilterSelectionChange,
     selections: filterSelections,
@@ -222,7 +220,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     isSearching: isSearching,
     onChange: onQueryChange,
     onSearch: handleSearch,
-    query: jql
+    query: searchBarJql
   }), (0, _react2.jsx)(_modeSwitcher.ModeSwitcher, {
     onOptionValueChange: onSearchMethodChange,
     selectedOptionValue: currentSearchMethod,

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

@@ -133,19 +133,23 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
     jql = _useState8[0],
     setJql = _useState8[1];
-  var _useState9 = (0, _react.useState)(initialVisibleColumnKeys),
+  var _useState9 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql),
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-    visibleColumnKeys = _useState10[0],
-    setVisibleColumnKeys = _useState10[1];
+    searchBarJql = _useState10[0],
+    setSearchBarJql = _useState10[1];
+  var _useState11 = (0, _react.useState)(initialVisibleColumnKeys),
+    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+    visibleColumnKeys = _useState12[0],
+    setVisibleColumnKeys = _useState12[1];
 
   // analytics related parameters
   var searchCount = (0, _react.useRef)(0);
   var userInteractionActions = (0, _react.useRef)(new Set());
   var initialSearchMethod = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters') && !(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],
-    setCurrentSearchMethod = _useState12[1];
+  var _useState13 = (0, _react.useState)(initialSearchMethod),
+    _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
+    currentSearchMethod = _useState14[0],
+    setCurrentSearchMethod = _useState14[1];
   var searchMethodSearchedWith = (0, _react.useRef)(null);
   var visibleColumnCount = (0, _react.useRef)((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
   var basicFilterSelectionsSearchedWith = (0, _react.useRef)({});
@@ -157,10 +161,10 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     } : undefined;
   }, [cloudId, jql]);
   var isParametersSet = !!(jql && cloudId);
-  var _useState13 = (0, _react.useState)(initialColumnCustomSizes),
-    _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-    columnCustomSizes = _useState14[0],
-    setColumnCustomSizes = _useState14[1];
+  var _useState15 = (0, _react.useState)(initialColumnCustomSizes),
+    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
+    columnCustomSizes = _useState16[0],
+    setColumnCustomSizes = _useState16[1];
   var onColumnResize = (0, _react.useCallback)(function (key, width) {
     setColumnCustomSizes(_objectSpread(_objectSpread({}, columnCustomSizes), {}, (0, _defineProperty2.default)({}, key, width)));
   }, [columnCustomSizes]);
@@ -361,6 +365,11 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     if (!isParametersSet || !jql || !selectedJiraSite) {
       return;
     }
+
+    // During insertion, we want the JQL of the datasource to be whatever is in the search bar,
+    // even if the user didn't previously click search
+    var upToDateJql = searchBarJql !== null && searchBarJql !== void 0 ? searchBarJql : jql;
+    var upToDateJqlUrl = selectedJiraSite && jql && "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURI(upToDateJql));
     var filterSelectionCount = _ui.availableBasicFilterTypes.reduce(function (current, filter) {
       var _basicFilterSelection;
       return _objectSpread(_objectSpread({}, current), {}, (0, _defineProperty2.default)({}, "".concat(filter, "BasicFilterSelectionCount"), ((_basicFilterSelection = basicFilterSelectionsSearchedWith.current[filter]) === null || _basicFilterSelection === void 0 ? void 0 : _basicFilterSelection.length) || 0));
@@ -403,7 +412,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
       onInsert({
         type: 'inlineCard',
         attrs: {
-          url: jqlUrl
+          url: upToDateJqlUrl
         }
       }, consumerEvent);
     } else if (responseItems.length === 1 && firstIssueUrl) {
@@ -418,12 +427,12 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
       onInsert({
         type: 'blockCard',
         attrs: {
-          url: jqlUrl,
+          url: upToDateJqlUrl,
           datasource: {
             id: datasourceId,
             parameters: {
               cloudId: cloudId,
-              jql: jql // TODO support non JQL type
+              jql: upToDateJql // TODO support non JQL type
             },
 
             views: [{
@@ -441,7 +450,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
         }
       }, consumerEvent);
     }
-  }, [isParametersSet, jql, selectedJiraSite, analyticsPayload, totalCount, visibleColumnKeys, currentViewMode, retrieveUrlForSmartCardRender, responseItems.length, onInsert, jqlUrl, datasourceId, cloudId, columnCustomSizes]);
+  }, [isParametersSet, jql, selectedJiraSite, analyticsPayload, totalCount, visibleColumnKeys, currentViewMode, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, cloudId, columnCustomSizes, searchBarJql]);
   var handleViewModeChange = function handleViewModeChange(selectedMode) {
     userInteractionActions.current.add(_types.DatasourceAction.DISPLAY_VIEW_CHANGED);
     setCurrentViewMode(selectedMode);
@@ -509,7 +518,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
       return (0, _react2.jsx)(_accessRequired.AccessRequired, {
         url: selectedJiraSiteUrl || urlBeingEdited
       });
-    } else if (resolvedWithNoResults) {
+    } else if (resolvedWithNoResults || status === 'forbidden') {
       return (0, _react2.jsx)(_noResults.NoResults, null);
     } else if (status === 'empty' || !columns.length) {
       // persist the empty state when making the initial /data request which contains the columns
@@ -555,6 +564,8 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     onOptionValueChange: handleViewModeChange,
     selectedOptionValue: currentViewMode
   })), (0, _react2.jsx)(_modalDialog.ModalBody, null, !hasNoJiraSites ? (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_jiraSearchContainer.JiraSearchContainer, {
+    setSearchBarJql: setSearchBarJql,
+    searchBarJql: searchBarJql,
     isSearching: status === 'loading',
     parameters: parameters,
     onSearch: onSearch,

package/dist/es2019/analytics/constants.js

@@ -1,5 +1,5 @@
 export const EVENT_CHANNEL = 'media';
 export const packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.17"
+  packageVersion: "1.19.18"
 };

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -49,20 +49,28 @@ export const useDatasourceTableState = ({
       } = await getDatasourceDetails(datasourceId, {
         parameters
       });
-      if (access === 'forbidden' || access === 'unauthorized') {
+      if (access === 'unauthorized') {
         setStatus('unauthorized');
         return;
       }
+      if (access === 'forbidden') {
+        setStatus('forbidden');
+        return;
+      }
       const isColumnNotPresentInCurrentColumnsList = col => !columns.find(column => column.key === col.key);
       const allColumns = schema.properties;
       const newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
       newColumns.length > 0 && setColumns([...columns, ...newColumns]);
     } catch (e) {
       captureError('loadDatasourceDetails', e);
-      if (e instanceof Response && (e.status === 401 || e.status === 403)) {
+      if (e instanceof Response && e.status === 401) {
         setStatus('unauthorized');
         return;
       }
+      if (e instanceof Response && e.status === 403) {
+        setStatus('forbidden');
+        return;
+      }
       setStatus('rejected');
     }
   }, [captureError, columns, datasourceId, getDatasourceDetails, parameters]);
@@ -132,10 +140,14 @@ export const useDatasourceTableState = ({
           schema
         }
       } = await getDatasourceData(datasourceId, datasourceDataRequest, shouldForceRequest);
-      if (access === 'forbidden' || access === 'unauthorized') {
+      if (access === 'unauthorized') {
         setStatus('unauthorized');
         return;
       }
+      if (access === 'forbidden') {
+        setStatus('forbidden');
+        return;
+      }
       setExtensionKey(extensionKey);
       setDestinationObjectTypes(destinationObjectTypes);
       setTotalCount(totalCount);
@@ -166,10 +178,14 @@ export const useDatasourceTableState = ({
       setStatus('resolved');
     } catch (e) {
       captureError('onNextPage', e);
-      if (e instanceof Response && (e.status === 401 || e.status === 403)) {
+      if (e instanceof Response && e.status === 401) {
         setStatus('unauthorized');
         return;
       }
+      if (e instanceof Response && e.status === 403) {
+        setStatus('forbidden');
+        return;
+      }
       setStatus('rejected');
     }
   }, [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent, fullSchema]);

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

@@ -108,7 +108,7 @@ const DatasourceTableViewWithoutAnalytics = ({
       shouldForceRequest: true
     });
   }, [destinationObjectTypes, extensionKey, fireEvent, reset]);
-  if (status === 'resolved' && !responseItems.length) {
+  if (status === 'resolved' && !responseItems.length || status === 'forbidden') {
     return jsx(NoResults, {
       onRefresh: reset
     });

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

@@ -31,11 +31,12 @@ export const JiraSearchContainer = props => {
     parameters,
     onSearch,
     onSearchMethodChange: onSearchMethodChangeCallback,
-    initialSearchMethod
+    initialSearchMethod,
+    setSearchBarJql,
+    searchBarJql = DEFAULT_JQL_QUERY
   } = props;
   const {
-    cloudId: currentCloudId,
-    jql: initialJql
+    cloudId: currentCloudId
   } = parameters || {};
   const {
     formatMessage
@@ -45,7 +46,6 @@ export const JiraSearchContainer = props => {
   } = useDatasourceAnalyticsEvents();
   const [basicSearchTerm, setBasicSearchTerm] = useState('');
   const [currentSearchMethod, setCurrentSearchMethod] = useState(initialSearchMethod);
-  const [jql, setJql] = useState(initialJql || DEFAULT_JQL_QUERY);
   const [cloudId, setCloudId] = useState(currentCloudId);
   const [isComplexQuery, setIsComplexQuery] = useState(false);
   const [orderKey, setOrderKey] = useState();
@@ -61,7 +61,7 @@ export const JiraSearchContainer = props => {
     hydratedOptions,
     fetchHydratedJqlOptions,
     status: basicFilterHydrationStatus
-  } = useHydrateJqlQuery(cloudId || '', jql);
+  } = useHydrateJqlQuery(cloudId || '', searchBarJql);
   const onSearchMethodChange = useCallback(searchMethod => {
     onSearchMethodChangeCallback(searchMethod);
     setCurrentSearchMethod(searchMethod);
@@ -69,13 +69,13 @@ export const JiraSearchContainer = props => {
   const handleBasicSearchChange = useCallback(e => {
     const rawSearch = e.currentTarget.value;
     setBasicSearchTerm(rawSearch);
-    setJql(buildJQL({
+    setSearchBarJql(buildJQL({
       rawSearch,
       filterValues: filterSelections,
       orderDirection,
       orderKey
     }));
-  }, [filterSelections, orderDirection, orderKey]);
+  }, [setSearchBarJql, filterSelections, orderDirection, orderKey]);
   const onQueryChange = useCallback(query => {
     var _query$split$map$filt, _fragments$at, _fragments$at2, _fragments$at3;
     // determine if order keys have been set so they can be saved and persisted when changes occur in basic search
@@ -89,12 +89,12 @@ export const JiraSearchContainer = props => {
       setOrderKey(key);
       setOrderDirection(order);
     }
-    setJql(query);
-  }, []);
+    setSearchBarJql(query);
+  }, [setSearchBarJql]);
   const handleSearch = useCallback(() => {
-    const isCurrentQueryComplex = isQueryTooComplex(jql);
+    const isCurrentQueryComplex = isQueryTooComplex(searchBarJql);
     onSearch({
-      jql
+      jql: searchBarJql
     }, {
       searchMethod: currentSearchMethod,
       basicFilterSelections: filterSelections,
@@ -111,7 +111,7 @@ export const JiraSearchContainer = props => {
         fetchHydratedJqlOptions();
       }
     }
-  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, jql, onSearch, showBasicFilters]);
+  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, searchBarJql, onSearch, showBasicFilters]);
   const [debouncedBasicFilterSelectionChange] = useDebouncedCallback(filterValues => {
     const jqlWithFilterValues = buildJQL({
       rawSearch: basicSearchTerm,
@@ -119,7 +119,7 @@ export const JiraSearchContainer = props => {
       orderDirection,
       orderKey
     });
-    setJql(jqlWithFilterValues);
+    setSearchBarJql(jqlWithFilterValues);
     const isCurrentQueryComplex = isQueryTooComplex(jqlWithFilterValues);
     onSearch({
       jql: jqlWithFilterValues
@@ -138,9 +138,9 @@ export const JiraSearchContainer = props => {
     debouncedBasicFilterSelectionChange(updatedSelection);
   }, [debouncedBasicFilterSelectionChange, filterSelections]);
   useEffect(() => {
-    const isCurrentQueryComplex = isQueryTooComplex(jql);
+    const isCurrentQueryComplex = isQueryTooComplex(searchBarJql);
     setIsComplexQuery(isCurrentQueryComplex);
-    if (showBasicFilters && !isCurrentQueryComplex && jql !== DEFAULT_JQL_QUERY) {
+    if (showBasicFilters && !isCurrentQueryComplex && searchBarJql !== DEFAULT_JQL_QUERY) {
       fetchHydratedJqlOptions();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -160,14 +160,14 @@ export const JiraSearchContainer = props => {
   useEffect(() => {
     if (currentCloudId !== cloudId) {
       setBasicSearchTerm('');
-      setJql(DEFAULT_JQL_QUERY);
+      setSearchBarJql(DEFAULT_JQL_QUERY);
       setIsComplexQuery(false);
       setOrderKey(undefined);
       setOrderDirection(undefined);
       setFilterSelections({});
       setCloudId(currentCloudId);
     }
-  }, [currentCloudId, cloudId]);
+  }, [currentCloudId, cloudId, setSearchBarJql]);
   return jsx("div", {
     css: inputContainerStyles,
     "data-testid": "jira-search-container"
@@ -180,7 +180,7 @@ export const JiraSearchContainer = props => {
     onSearch: handleSearch,
     searchTerm: basicSearchTerm
   }), showBasicFilters && jsx(BasicFilters, {
-    jql: jql,
+    jql: searchBarJql,
     cloudId: cloudId || '',
     onChange: handleBasicFilterSelectionChange,
     selections: filterSelections,
@@ -190,7 +190,7 @@ export const JiraSearchContainer = props => {
     isSearching: isSearching,
     onChange: onQueryChange,
     onSearch: handleSearch,
-    query: jql
+    query: searchBarJql
   }), jsx(ModeSwitcher, {
     onOptionValueChange: onSearchMethodChange,
     selectedOptionValue: currentSearchMethod,

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

@@ -106,6 +106,7 @@ export const PlainJiraIssuesConfigModal = props => {
   const [currentViewMode, setCurrentViewMode] = useState(viewMode);
   const [cloudId, setCloudId] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId);
   const [jql, setJql] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql);
+  const [searchBarJql, setSearchBarJql] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql);
   const [visibleColumnKeys, setVisibleColumnKeys] = useState(initialVisibleColumnKeys);
 
   // analytics related parameters
@@ -310,6 +311,11 @@ export const PlainJiraIssuesConfigModal = props => {
     if (!isParametersSet || !jql || !selectedJiraSite) {
       return;
     }
+
+    // During insertion, we want the JQL of the datasource to be whatever is in the search bar,
+    // even if the user didn't previously click search
+    const upToDateJql = searchBarJql !== null && searchBarJql !== void 0 ? searchBarJql : jql;
+    const upToDateJqlUrl = selectedJiraSite && jql && `${selectedJiraSite.url}/issues/?jql=${encodeURI(upToDateJql)}`;
     const filterSelectionCount = availableBasicFilterTypes.reduce((current, filter) => {
       var _basicFilterSelection;
       return {
@@ -360,7 +366,7 @@ export const PlainJiraIssuesConfigModal = props => {
       onInsert({
         type: 'inlineCard',
         attrs: {
-          url: jqlUrl
+          url: upToDateJqlUrl
         }
       }, consumerEvent);
     } else if (responseItems.length === 1 && firstIssueUrl) {
@@ -375,12 +381,12 @@ export const PlainJiraIssuesConfigModal = props => {
       onInsert({
         type: 'blockCard',
         attrs: {
-          url: jqlUrl,
+          url: upToDateJqlUrl,
           datasource: {
             id: datasourceId,
             parameters: {
               cloudId,
-              jql // TODO support non JQL type
+              jql: upToDateJql // TODO support non JQL type
             },
 
             views: [{
@@ -396,7 +402,7 @@ export const PlainJiraIssuesConfigModal = props => {
         }
       }, consumerEvent);
     }
-  }, [isParametersSet, jql, selectedJiraSite, analyticsPayload, totalCount, visibleColumnKeys, currentViewMode, retrieveUrlForSmartCardRender, responseItems.length, onInsert, jqlUrl, datasourceId, cloudId, columnCustomSizes]);
+  }, [isParametersSet, jql, selectedJiraSite, analyticsPayload, totalCount, visibleColumnKeys, currentViewMode, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, cloudId, columnCustomSizes, searchBarJql]);
   const handleViewModeChange = selectedMode => {
     userInteractionActions.current.add(DatasourceAction.DISPLAY_VIEW_CHANGED);
     setCurrentViewMode(selectedMode);
@@ -460,7 +466,7 @@ export const PlainJiraIssuesConfigModal = props => {
       return jsx(AccessRequired, {
         url: selectedJiraSiteUrl || urlBeingEdited
       });
-    } else if (resolvedWithNoResults) {
+    } else if (resolvedWithNoResults || status === 'forbidden') {
       return jsx(NoResults, null);
     } else if (status === 'empty' || !columns.length) {
       // persist the empty state when making the initial /data request which contains the columns
@@ -506,6 +512,8 @@ export const PlainJiraIssuesConfigModal = props => {
     onOptionValueChange: handleViewModeChange,
     selectedOptionValue: currentViewMode
   })), jsx(ModalBody, null, !hasNoJiraSites ? jsx(Fragment, null, jsx(JiraSearchContainer, {
+    setSearchBarJql: setSearchBarJql,
+    searchBarJql: searchBarJql,
     isSearching: status === 'loading',
     parameters: parameters,
     onSearch: onSearch,

package/dist/esm/analytics/constants.js

@@ -1,5 +1,5 @@
 export var EVENT_CHANNEL = 'media';
 export var packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.17"
+  packageVersion: "1.19.18"
 };

package/dist/esm/hooks/useDatasourceTableState.js

@@ -91,13 +91,20 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           _yield$getDatasourceD = _context.sent;
           access = _yield$getDatasourceD.meta.access;
           schema = _yield$getDatasourceD.data.schema;
-          if (!(access === 'forbidden' || access === 'unauthorized')) {
+          if (!(access === 'unauthorized')) {
             _context.next = 11;
             break;
           }
           setStatus('unauthorized');
           return _context.abrupt("return");
         case 11:
+          if (!(access === 'forbidden')) {
+            _context.next = 14;
+            break;
+          }
+          setStatus('forbidden');
+          return _context.abrupt("return");
+        case 14:
           isColumnNotPresentInCurrentColumnsList = function isColumnNotPresentInCurrentColumnsList(col) {
             return !columns.find(function (column) {
               return column.key === col.key;
@@ -106,25 +113,32 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           allColumns = schema.properties;
           newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
           newColumns.length > 0 && setColumns([].concat(_toConsumableArray(columns), _toConsumableArray(newColumns)));
-          _context.next = 24;
+          _context.next = 30;
           break;
-        case 17:
-          _context.prev = 17;
+        case 20:
+          _context.prev = 20;
           _context.t0 = _context["catch"](2);
           captureError('loadDatasourceDetails', _context.t0);
-          if (!(_context.t0 instanceof Response && (_context.t0.status === 401 || _context.t0.status === 403))) {
-            _context.next = 23;
+          if (!(_context.t0 instanceof Response && _context.t0.status === 401)) {
+            _context.next = 26;
             break;
           }
           setStatus('unauthorized');
           return _context.abrupt("return");
-        case 23:
+        case 26:
+          if (!(_context.t0 instanceof Response && _context.t0.status === 403)) {
+            _context.next = 29;
+            break;
+          }
+          setStatus('forbidden');
+          return _context.abrupt("return");
+        case 29:
           setStatus('rejected');
-        case 24:
+        case 30:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[2, 17]]);
+    }, _callee, null, [[2, 20]]);
   })), [captureError, columns, datasourceId, getDatasourceDetails, parameters]);
   var applySchemaProperties = useCallback(function (schema, fieldKeys) {
     var properties = schema.properties,
@@ -218,13 +232,20 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           nextPageCursor = _yield$getDatasourceD4.nextPageCursor;
           _totalCount = _yield$getDatasourceD4.totalCount;
           schema = _yield$getDatasourceD4.schema;
-          if (!(access === 'forbidden' || access === 'unauthorized')) {
+          if (!(access === 'unauthorized')) {
             _context2.next = 23;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
         case 23:
+          if (!(access === 'forbidden')) {
+            _context2.next = 26;
+            break;
+          }
+          setStatus('forbidden');
+          return _context2.abrupt("return");
+        case 26:
           setExtensionKey(_extensionKey);
           setDestinationObjectTypes(_destinationObjectTypes);
           setTotalCount(_totalCount);
@@ -253,25 +274,32 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
             });
           }
           setStatus('resolved');
-          _context2.next = 43;
+          _context2.next = 49;
           break;
-        case 36:
-          _context2.prev = 36;
+        case 39:
+          _context2.prev = 39;
           _context2.t0 = _context2["catch"](7);
           captureError('onNextPage', _context2.t0);
-          if (!(_context2.t0 instanceof Response && (_context2.t0.status === 401 || _context2.t0.status === 403))) {
-            _context2.next = 42;
+          if (!(_context2.t0 instanceof Response && _context2.t0.status === 401)) {
+            _context2.next = 45;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
-        case 42:
+        case 45:
+          if (!(_context2.t0 instanceof Response && _context2.t0.status === 403)) {
+            _context2.next = 48;
+            break;
+          }
+          setStatus('forbidden');
+          return _context2.abrupt("return");
+        case 48:
           setStatus('rejected');
-        case 43:
+        case 49:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[7, 36]]);
+    }, _callee2, null, [[7, 39]]);
   })), [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent, fullSchema]);
   var reset = useCallback(function (options) {
     setStatus('empty');

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

@@ -105,7 +105,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
       shouldForceRequest: true
     });
   }, [destinationObjectTypes, extensionKey, fireEvent, reset]);
-  if (status === 'resolved' && !responseItems.length) {
+  if (status === 'resolved' && !responseItems.length || status === 'forbidden') {
     return jsx(NoResults, {
       onRefresh: reset
     });

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

@@ -36,10 +36,12 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     parameters = props.parameters,
     onSearch = props.onSearch,
     onSearchMethodChangeCallback = props.onSearchMethodChange,
-    initialSearchMethod = props.initialSearchMethod;
+    initialSearchMethod = props.initialSearchMethod,
+    setSearchBarJql = props.setSearchBarJql,
+    _props$searchBarJql = props.searchBarJql,
+    searchBarJql = _props$searchBarJql === void 0 ? DEFAULT_JQL_QUERY : _props$searchBarJql;
   var _ref = parameters || {},
-    currentCloudId = _ref.cloudId,
-    initialJql = _ref.jql;
+    currentCloudId = _ref.cloudId;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
@@ -52,37 +54,33 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     currentSearchMethod = _useState4[0],
     setCurrentSearchMethod = _useState4[1];
-  var _useState5 = useState(initialJql || DEFAULT_JQL_QUERY),
+  var _useState5 = useState(currentCloudId),
     _useState6 = _slicedToArray(_useState5, 2),
-    jql = _useState6[0],
-    setJql = _useState6[1];
-  var _useState7 = useState(currentCloudId),
+    cloudId = _useState6[0],
+    setCloudId = _useState6[1];
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    cloudId = _useState8[0],
-    setCloudId = _useState8[1];
-  var _useState9 = useState(false),
+    isComplexQuery = _useState8[0],
+    setIsComplexQuery = _useState8[1];
+  var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    isComplexQuery = _useState10[0],
-    setIsComplexQuery = _useState10[1];
+    orderKey = _useState10[0],
+    setOrderKey = _useState10[1];
   var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    orderKey = _useState12[0],
-    setOrderKey = _useState12[1];
-  var _useState13 = useState(),
+    orderDirection = _useState12[0],
+    setOrderDirection = _useState12[1];
+  var _useState13 = useState({}),
     _useState14 = _slicedToArray(_useState13, 2),
-    orderDirection = _useState14[0],
-    setOrderDirection = _useState14[1];
-  var _useState15 = useState({}),
-    _useState16 = _slicedToArray(_useState15, 2),
-    filterSelections = _useState16[0],
-    setFilterSelections = _useState16[1];
+    filterSelections = _useState14[0],
+    setFilterSelections = _useState14[1];
   var showBasicFilters = useMemo(function () {
     if (getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters')) {
       return true;
     }
     return false;
   }, []);
-  var _useHydrateJqlQuery = useHydrateJqlQuery(cloudId || '', jql),
+  var _useHydrateJqlQuery = useHydrateJqlQuery(cloudId || '', searchBarJql),
     hydratedOptions = _useHydrateJqlQuery.hydratedOptions,
     fetchHydratedJqlOptions = _useHydrateJqlQuery.fetchHydratedJqlOptions,
     basicFilterHydrationStatus = _useHydrateJqlQuery.status;
@@ -93,13 +91,13 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
   var handleBasicSearchChange = useCallback(function (e) {
     var rawSearch = e.currentTarget.value;
     setBasicSearchTerm(rawSearch);
-    setJql(buildJQL({
+    setSearchBarJql(buildJQL({
       rawSearch: rawSearch,
       filterValues: filterSelections,
       orderDirection: orderDirection,
       orderKey: orderKey
     }));
-  }, [filterSelections, orderDirection, orderKey]);
+  }, [setSearchBarJql, filterSelections, orderDirection, orderKey]);
   var onQueryChange = useCallback(function (query) {
     var _query$split$map$filt, _fragments$at, _fragments$at2, _fragments$at3;
     // determine if order keys have been set so they can be saved and persisted when changes occur in basic search
@@ -115,12 +113,12 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
       setOrderKey(key);
       setOrderDirection(order);
     }
-    setJql(query);
-  }, []);
+    setSearchBarJql(query);
+  }, [setSearchBarJql]);
   var handleSearch = useCallback(function () {
-    var isCurrentQueryComplex = isQueryTooComplex(jql);
+    var isCurrentQueryComplex = isQueryTooComplex(searchBarJql);
     onSearch({
-      jql: jql
+      jql: searchBarJql
     }, {
       searchMethod: currentSearchMethod,
       basicFilterSelections: filterSelections,
@@ -137,7 +135,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
         fetchHydratedJqlOptions();
       }
     }
-  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, jql, onSearch, showBasicFilters]);
+  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, searchBarJql, onSearch, showBasicFilters]);
   var _useDebouncedCallback = useDebouncedCallback(function (filterValues) {
       var jqlWithFilterValues = buildJQL({
         rawSearch: basicSearchTerm,
@@ -145,7 +143,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
         orderDirection: orderDirection,
         orderKey: orderKey
       });
-      setJql(jqlWithFilterValues);
+      setSearchBarJql(jqlWithFilterValues);
       var isCurrentQueryComplex = isQueryTooComplex(jqlWithFilterValues);
       onSearch({
         jql: jqlWithFilterValues
@@ -163,9 +161,9 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     debouncedBasicFilterSelectionChange(updatedSelection);
   }, [debouncedBasicFilterSelectionChange, filterSelections]);
   useEffect(function () {
-    var isCurrentQueryComplex = isQueryTooComplex(jql);
+    var isCurrentQueryComplex = isQueryTooComplex(searchBarJql);
     setIsComplexQuery(isCurrentQueryComplex);
-    if (showBasicFilters && !isCurrentQueryComplex && jql !== DEFAULT_JQL_QUERY) {
+    if (showBasicFilters && !isCurrentQueryComplex && searchBarJql !== DEFAULT_JQL_QUERY) {
       fetchHydratedJqlOptions();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -183,14 +181,14 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
   useEffect(function () {
     if (currentCloudId !== cloudId) {
       setBasicSearchTerm('');
-      setJql(DEFAULT_JQL_QUERY);
+      setSearchBarJql(DEFAULT_JQL_QUERY);
       setIsComplexQuery(false);
       setOrderKey(undefined);
       setOrderDirection(undefined);
       setFilterSelections({});
       setCloudId(currentCloudId);
     }
-  }, [currentCloudId, cloudId]);
+  }, [currentCloudId, cloudId, setSearchBarJql]);
   return jsx("div", {
     css: inputContainerStyles,
     "data-testid": "jira-search-container"
@@ -203,7 +201,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     onSearch: handleSearch,
     searchTerm: basicSearchTerm
   }), showBasicFilters && jsx(BasicFilters, {
-    jql: jql,
+    jql: searchBarJql,
     cloudId: cloudId || '',
     onChange: handleBasicFilterSelectionChange,
     selections: filterSelections,
@@ -213,7 +211,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
     isSearching: isSearching,
     onChange: onQueryChange,
     onSearch: handleSearch,
-    query: jql
+    query: searchBarJql
   }), jsx(ModeSwitcher, {
     onOptionValueChange: onSearchMethodChange,
     selectedOptionValue: currentSearchMethod,

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

@@ -124,19 +124,23 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     _useState8 = _slicedToArray(_useState7, 2),
     jql = _useState8[0],
     setJql = _useState8[1];
-  var _useState9 = useState(initialVisibleColumnKeys),
+  var _useState9 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql),
     _useState10 = _slicedToArray(_useState9, 2),
-    visibleColumnKeys = _useState10[0],
-    setVisibleColumnKeys = _useState10[1];
+    searchBarJql = _useState10[0],
+    setSearchBarJql = _useState10[1];
+  var _useState11 = useState(initialVisibleColumnKeys),
+    _useState12 = _slicedToArray(_useState11, 2),
+    visibleColumnKeys = _useState12[0],
+    setVisibleColumnKeys = _useState12[1];
 
   // analytics related parameters
   var searchCount = useRef(0);
   var userInteractionActions = useRef(new Set());
   var initialSearchMethod = getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters') && !isQueryTooComplex((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
-  var _useState11 = useState(initialSearchMethod),
-    _useState12 = _slicedToArray(_useState11, 2),
-    currentSearchMethod = _useState12[0],
-    setCurrentSearchMethod = _useState12[1];
+  var _useState13 = useState(initialSearchMethod),
+    _useState14 = _slicedToArray(_useState13, 2),
+    currentSearchMethod = _useState14[0],
+    setCurrentSearchMethod = _useState14[1];
   var searchMethodSearchedWith = useRef(null);
   var visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
   var basicFilterSelectionsSearchedWith = useRef({});
@@ -148,10 +152,10 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     } : undefined;
   }, [cloudId, jql]);
   var isParametersSet = !!(jql && cloudId);
-  var _useState13 = useState(initialColumnCustomSizes),
-    _useState14 = _slicedToArray(_useState13, 2),
-    columnCustomSizes = _useState14[0],
-    setColumnCustomSizes = _useState14[1];
+  var _useState15 = useState(initialColumnCustomSizes),
+    _useState16 = _slicedToArray(_useState15, 2),
+    columnCustomSizes = _useState16[0],
+    setColumnCustomSizes = _useState16[1];
   var onColumnResize = useCallback(function (key, width) {
     setColumnCustomSizes(_objectSpread(_objectSpread({}, columnCustomSizes), {}, _defineProperty({}, key, width)));
   }, [columnCustomSizes]);
@@ -352,6 +356,11 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     if (!isParametersSet || !jql || !selectedJiraSite) {
       return;
     }
+
+    // During insertion, we want the JQL of the datasource to be whatever is in the search bar,
+    // even if the user didn't previously click search
+    var upToDateJql = searchBarJql !== null && searchBarJql !== void 0 ? searchBarJql : jql;
+    var upToDateJqlUrl = selectedJiraSite && jql && "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURI(upToDateJql));
     var filterSelectionCount = availableBasicFilterTypes.reduce(function (current, filter) {
       var _basicFilterSelection;
       return _objectSpread(_objectSpread({}, current), {}, _defineProperty({}, "".concat(filter, "BasicFilterSelectionCount"), ((_basicFilterSelection = basicFilterSelectionsSearchedWith.current[filter]) === null || _basicFilterSelection === void 0 ? void 0 : _basicFilterSelection.length) || 0));
@@ -394,7 +403,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
       onInsert({
         type: 'inlineCard',
         attrs: {
-          url: jqlUrl
+          url: upToDateJqlUrl
         }
       }, consumerEvent);
     } else if (responseItems.length === 1 && firstIssueUrl) {
@@ -409,12 +418,12 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
       onInsert({
         type: 'blockCard',
         attrs: {
-          url: jqlUrl,
+          url: upToDateJqlUrl,
           datasource: {
             id: datasourceId,
             parameters: {
               cloudId: cloudId,
-              jql: jql // TODO support non JQL type
+              jql: upToDateJql // TODO support non JQL type
             },
 
             views: [{
@@ -432,7 +441,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
         }
       }, consumerEvent);
     }
-  }, [isParametersSet, jql, selectedJiraSite, analyticsPayload, totalCount, visibleColumnKeys, currentViewMode, retrieveUrlForSmartCardRender, responseItems.length, onInsert, jqlUrl, datasourceId, cloudId, columnCustomSizes]);
+  }, [isParametersSet, jql, selectedJiraSite, analyticsPayload, totalCount, visibleColumnKeys, currentViewMode, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, cloudId, columnCustomSizes, searchBarJql]);
   var handleViewModeChange = function handleViewModeChange(selectedMode) {
     userInteractionActions.current.add(DatasourceAction.DISPLAY_VIEW_CHANGED);
     setCurrentViewMode(selectedMode);
@@ -500,7 +509,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
       return jsx(AccessRequired, {
         url: selectedJiraSiteUrl || urlBeingEdited
       });
-    } else if (resolvedWithNoResults) {
+    } else if (resolvedWithNoResults || status === 'forbidden') {
       return jsx(NoResults, null);
     } else if (status === 'empty' || !columns.length) {
       // persist the empty state when making the initial /data request which contains the columns
@@ -546,6 +555,8 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     onOptionValueChange: handleViewModeChange,
     selectedOptionValue: currentViewMode
   })), jsx(ModalBody, null, !hasNoJiraSites ? jsx(Fragment, null, jsx(JiraSearchContainer, {
+    setSearchBarJql: setSearchBarJql,
+    searchBarJql: searchBarJql,
     isSearching: status === 'loading',
     parameters: parameters,
     onSearch: onSearch,

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

@@ -15,5 +15,7 @@ export interface SearchContainerProps {
     initialSearchMethod: JiraSearchMethod;
     onSearchMethodChange: (searchMethod: JiraSearchMethod) => void;
     parameters?: JiraIssueDatasourceParameters;
+    searchBarJql?: string;
+    setSearchBarJql: (jql: string) => void;
 }
 export declare const JiraSearchContainer: (props: SearchContainerProps) => jsx.JSX.Element;

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

@@ -15,5 +15,7 @@ export interface SearchContainerProps {
     initialSearchMethod: JiraSearchMethod;
     onSearchMethodChange: (searchMethod: JiraSearchMethod) => void;
     parameters?: JiraIssueDatasourceParameters;
+    searchBarJql?: string;
+    setSearchBarJql: (jql: string) => void;
 }
 export declare const JiraSearchContainer: (props: SearchContainerProps) => jsx.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.19.17",
+  "version": "1.19.18",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"