@atlaskit/link-datasource 1.19.16 → 1.19.18

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

@@ -56,7 +56,8 @@ var contentContainerStyles = css({
   maxHeight: '420px',
   overflow: 'auto',
   borderBottom: "2px solid ".concat("var(--ds-background-accent-gray-subtler, ".concat(N40, ")")),
-  background: scrollableContainerShadowsCssComponents.background,
+  backgroundImage: scrollableContainerShadowsCssComponents.backgroundImage,
+  backgroundPosition: scrollableContainerShadowsCssComponents.backgroundPosition,
   backgroundRepeat: scrollableContainerShadowsCssComponents.backgroundRepeat,
   backgroundSize: scrollableContainerShadowsCssComponents.backgroundSize,
   backgroundAttachment: scrollableContainerShadowsCssComponents.backgroundAttachment
@@ -123,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({});
@@ -147,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]);
@@ -351,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));
@@ -393,7 +403,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
       onInsert({
         type: 'inlineCard',
         attrs: {
-          url: jqlUrl
+          url: upToDateJqlUrl
         }
       }, consumerEvent);
     } else if (responseItems.length === 1 && firstIssueUrl) {
@@ -408,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: [{
@@ -431,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);
@@ -499,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
@@ -545,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/issue-like-table/index.d.ts

@@ -4,7 +4,8 @@ import { jsx } from '@emotion/react';
 import { DatasourceResponseSchemaProperty } from '@atlaskit/linking-types/datasource';
 import { IssueLikeDataTableViewProps } from './types';
 export declare const scrollableContainerShadowsCssComponents: {
-    background: string;
+    backgroundImage: string;
+    backgroundPosition: string;
     backgroundRepeat: string;
     backgroundSize: string;
     backgroundAttachment: string;

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/issue-like-table/index.d.ts

@@ -4,7 +4,8 @@ import { jsx } from '@emotion/react';
 import { DatasourceResponseSchemaProperty } from '@atlaskit/linking-types/datasource';
 import { IssueLikeDataTableViewProps } from './types';
 export declare const scrollableContainerShadowsCssComponents: {
-    background: string;
+    backgroundImage: string;
+    backgroundPosition: string;
     backgroundRepeat: string;
     backgroundSize: string;
     backgroundAttachment: string;

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/examples-helpers/hoverableContainer.tsx

@@ -0,0 +1,26 @@
+/** @jsx jsx */
+import React from 'react';
+
+import { jsx } from '@emotion/react';
+
+import { Box, xcss } from '@atlaskit/primitives';
+
+const containerStyles = xcss({
+  height: '100%',
+  backgroundColor: 'elevation.surface.overlay',
+  padding: 'space.400',
+  ':hover': {
+    backgroundColor: 'elevation.surface.overlay.hovered',
+  },
+});
+
+// To simulate Jira description's hover background wrapper
+export const HoverableContainer = ({
+  children,
+}: React.PropsWithChildren<{}>) => {
+  return (
+    <Box testId="examples-hoverable-container" xcss={containerStyles}>
+      {children}
+    </Box>
+  );
+};

package/package.json

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