@atlaskit/link-datasource 1.19.16 → 1.19.18

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

@@ -65,7 +65,8 @@ var contentContainerStyles = (0, _react2.css)({
   maxHeight: '420px',
   overflow: 'auto',
   borderBottom: "2px solid ".concat("var(--ds-background-accent-gray-subtler, ".concat(_colors.N40, ")")),
-  background: _issueLikeTable.scrollableContainerShadowsCssComponents.background,
+  backgroundImage: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundImage,
+  backgroundPosition: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundPosition,
   backgroundRepeat: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundRepeat,
   backgroundSize: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundSize,
   backgroundAttachment: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundAttachment
@@ -132,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)({});
@@ -156,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]);
@@ -360,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));
@@ -402,7 +412,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
       onInsert({
         type: 'inlineCard',
         attrs: {
-          url: jqlUrl
+          url: upToDateJqlUrl
         }
       }, consumerEvent);
     } else if (responseItems.length === 1 && firstIssueUrl) {
@@ -417,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: [{
@@ -440,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);
@@ -508,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
@@ -554,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.16"
+  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/assets-modal/modal/render-assets-content/index.js

@@ -23,7 +23,7 @@ const tableBordersStyles = css({
   borderTopLeftRadius: "var(--ds-border-radius-200, 8px)",
   borderTopRightRadius: "var(--ds-border-radius-200, 8px)",
   borderBottom: `2px solid ${`var(--ds-background-accent-gray-subtler, ${N40})`}`,
-  background: scrollableContainerShadowsCssComponents.background,
+  backgroundImage: scrollableContainerShadowsCssComponents.backgroundImage,
   backgroundRepeat: scrollableContainerShadowsCssComponents.backgroundRepeat,
   backgroundSize: scrollableContainerShadowsCssComponents.backgroundSize,
   backgroundAttachment: scrollableContainerShadowsCssComponents.backgroundAttachment

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/issue-like-table/empty-state/index.js

@@ -15,6 +15,9 @@ const SkeletonComponent = ({
 const tableBodyStyles = css({
   borderBottom: 0
 });
+const tableStyles = css({
+  background: "var(--ds-elevation-surface-current, #FFF)"
+});
 const padding = `${"var(--ds-space-100, 8px)"} ${"var(--ds-space-100, 8px)"}`;
 const cellStyles = css({
   padding,
@@ -105,6 +108,7 @@ export default (({
       boxSizing: 'border-box'
     }
   }, jsx("table", {
+    css: tableStyles,
     "data-testid": testId
   }, jsx("thead", {
     style: {

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

@@ -82,90 +82,101 @@ const tableContainerStyles = css({
 const shadowColor = "var(--ds-shadow-overflow-perimeter, rgba(0, 0, 0, 0.1))";
 const shadowColorLight = "var(--ds-shadow-overflow-perimeter, rgba(0, 0, 0, 0.05))";
 const leftWhiteOverrideGradient = {
-  background: `
+  backgroundImage: `
   linear-gradient(
     90deg,
     ${"var(--ds-elevation-surface-current, #FFF)"} 30%,
     rgba(255, 255, 255, 0)
-  ) left center`,
+  )`,
+  backgroundPosition: 'left center',
   size: `40px 100%`,
   attachment: `local`
 };
 const topWhiteOverrideGradient = {
-  background: `
+  backgroundImage: `
   linear-gradient(
     0deg,
     rgba(255, 255, 255, 0),
     ${"var(--ds-elevation-surface-current, #FFF)"} 30%
-  ) top center`,
+  )`,
+  backgroundPosition: 'top center',
   size: `100% 100px`,
   attachment: `local`
 };
 const rightWhiteOverrideGradient = {
-  background: `
+  backgroundImage: `
   linear-gradient(
     90deg,
     rgba(255, 255, 255, 0),
     ${"var(--ds-elevation-surface-current, #FFF)"} 70%
-  ) right center`,
+  )`,
+  backgroundPosition: 'right center',
   size: `40px 100%`,
   attachment: `local`
 };
 const bottomWhiteOverride = {
-  background: `
+  backgroundImage: `
   linear-gradient(
     0deg,
     ${"var(--ds-elevation-surface-current, #FFF)"} 30%,
     rgba(255, 255, 255, 0)
-  ) bottom center`,
+  )`,
+  backgroundPosition: 'bottom center',
   size: `100% 40px`,
   attachment: `local`
 };
 const leftShadowGradient = {
-  background: `
+  backgroundImage: `
   linear-gradient(
     90deg,
     ${shadowColor},
     rgba(0, 0, 0, 0)
-  ) left center`,
+  )`,
+  backgroundPosition: 'left center',
   size: `14px 100%`,
   attachment: `scroll`
 };
 const topShadowGradient = {
-  background: `
+  backgroundImage: `
   linear-gradient(
     0deg,
     rgba(0, 0, 0, 0),
     ${shadowColorLight}
-  ) 0 52px`,
+  )`,
+  backgroundPosition: '0 52px',
   size: `100% 14px`,
   attachment: `scroll`
 };
 const rightShadowGradient = {
-  background: `
+  backgroundImage: `
   linear-gradient(
     90deg,
     rgba(0, 0, 0, 0),
     ${shadowColor}
-  ) right center`,
+  )`,
+  backgroundPosition: 'right center',
   size: `14px 100%`,
   attachment: `scroll`
 };
 const bottomShadowGradient = {
-  background: `
+  backgroundImage: `
   linear-gradient(
     0deg,
     ${shadowColorLight},
     rgba(0, 0, 0, 0)
-  ) bottom center`,
+  )`,
+  backgroundPosition: 'bottom center',
   size: `100% 10px`,
   attachment: `scroll`
 };
 const shadows = [leftWhiteOverrideGradient, leftShadowGradient, rightWhiteOverrideGradient, rightShadowGradient, topWhiteOverrideGradient, topShadowGradient, bottomWhiteOverride, bottomShadowGradient];
 export const scrollableContainerShadowsCssComponents = {
-  background: shadows.map(({
-    background
-  }) => background).join(','),
+  backgroundImage: shadows.map(({
+    backgroundImage
+  }) => backgroundImage).join(','),
+  backgroundPosition: shadows.map(({
+    backgroundPosition
+  }) => backgroundPosition).join(','),
   backgroundRepeat: 'no-repeat',
   backgroundSize: shadows.map(({
     size
@@ -177,7 +188,9 @@ export const scrollableContainerShadowsCssComponents = {
 const scrollableContainerStyles = css({
   overflow: 'auto',
   boxSizing: 'border-box',
-  background: scrollableContainerShadowsCssComponents.background,
+  backgroundColor: "var(--ds-elevation-surface-current, #FFF)",
+  backgroundImage: scrollableContainerShadowsCssComponents.backgroundImage,
+  backgroundPosition: scrollableContainerShadowsCssComponents.backgroundPosition,
   backgroundRepeat: scrollableContainerShadowsCssComponents.backgroundRepeat,
   backgroundSize: scrollableContainerShadowsCssComponents.backgroundSize,
   backgroundAttachment: scrollableContainerShadowsCssComponents.backgroundAttachment

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

@@ -49,7 +49,8 @@ const contentContainerStyles = css({
   maxHeight: '420px',
   overflow: 'auto',
   borderBottom: `2px solid ${`var(--ds-background-accent-gray-subtler, ${N40})`}`,
-  background: scrollableContainerShadowsCssComponents.background,
+  backgroundImage: scrollableContainerShadowsCssComponents.backgroundImage,
+  backgroundPosition: scrollableContainerShadowsCssComponents.backgroundPosition,
   backgroundRepeat: scrollableContainerShadowsCssComponents.backgroundRepeat,
   backgroundSize: scrollableContainerShadowsCssComponents.backgroundSize,
   backgroundAttachment: scrollableContainerShadowsCssComponents.backgroundAttachment
@@ -105,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
@@ -309,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 {
@@ -359,7 +366,7 @@ export const PlainJiraIssuesConfigModal = props => {
       onInsert({
         type: 'inlineCard',
         attrs: {
-          url: jqlUrl
+          url: upToDateJqlUrl
         }
       }, consumerEvent);
     } else if (responseItems.length === 1 && firstIssueUrl) {
@@ -374,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: [{
@@ -395,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);
@@ -459,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
@@ -505,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.16"
+  packageVersion: "1.19.18"
 };