@atlaskit/link-datasource 1.12.2 → 1.12.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 1.12.4
+
+### Patch Changes
+
+- [#42612](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42612) [`eb39b74b03b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/eb39b74b03b) - Adds hook to get field values from graphQL for basic filters.
+- [#42598](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42598) [`6105d017042`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6105d017042) - [ux] Updated styles of the table header.
+
+## 1.12.3
+
+### Patch Changes
+
+- [#42706](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42706) [`c3c9a5ec9c9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c3c9a5ec9c9) - Fix a problem where when column dragging start on top of a label - it drags whole table
+
 ## 1.12.2
 
 ### 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.12.2"
+  packageVersion: "1.12.4"
 };

package/dist/cjs/services/useBasicFilterAGG.js

@@ -19,97 +19,55 @@ var useBasicFilterAGG = exports.useBasicFilterAGG = function useBasicFilterAGG()
   var _useSmartLinkContext = (0, _linkProvider.useSmartLinkContext)(),
     client = _useSmartLinkContext.connections.client;
   var gatewayGraphqlUrl = getGraphqlUrl(client.envKey, client.baseUrlOverride);
-  var aggHeaders = (0, _react.useMemo)(function () {
-    return new Headers({
-      'Content-Type': 'application/json',
-      'X-ExperimentalApi': 'JiraJqlBuilder'
-    });
-  }, []);
-  var getHydratedJQL = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(cloudId, jql) {
-      var body, request, response;
+  var requestCall = (0, _react.useCallback)( /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(body) {
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            body = JSON.stringify({
-              variables: {
-                cloudId: cloudId,
-                jql: jql
-              },
-              operationName: 'hydrate',
-              query: _utils.hydrateJQLQuery
-            });
-            request = new Request(gatewayGraphqlUrl, {
-              method: 'POST',
-              headers: aggHeaders,
-              body: body
-            });
-            _context.prev = 2;
-            _context.next = 5;
-            return fetch(request);
-          case 5:
-            response = _context.sent;
-            return _context.abrupt("return", response.json());
-          case 9:
-            _context.prev = 9;
-            _context.t0 = _context["catch"](2);
-            throw new Error(_context.t0);
-          case 12:
+            return _context.abrupt("return", (0, _linkingCommon.request)('post', gatewayGraphqlUrl, body, {
+              'X-ExperimentalApi': 'JiraJqlBuilder'
+            }, [200, 201, 202, 203, 204]));
+          case 1:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 9]]);
+      }, _callee);
     }));
-    return function (_x, _x2) {
+    return function (_x) {
       return _ref.apply(this, arguments);
     };
-  }(), [gatewayGraphqlUrl, aggHeaders]);
-  var getFieldValues = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(cloudId, jql, jqlTerm, searchString, pageCursor) {
-      var body, request, response;
-      return _regenerator.default.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            body = JSON.stringify({
-              variables: {
-                cloudId: cloudId,
-                jql: jql,
-                first: 10,
-                jqlTerm: jqlTerm,
-                searchString: searchString,
-                after: pageCursor
-              },
-              operationName: 'fieldValues',
-              query: _utils.fieldValuesQuery
-            });
-            request = new Request(gatewayGraphqlUrl, {
-              method: 'POST',
-              headers: aggHeaders,
-              body: body
-            });
-            _context2.prev = 2;
-            _context2.next = 5;
-            return fetch(request);
-          case 5:
-            response = _context2.sent;
-            _context2.next = 8;
-            return response.json();
-          case 8:
-            return _context2.abrupt("return", _context2.sent);
-          case 11:
-            _context2.prev = 11;
-            _context2.t0 = _context2["catch"](2);
-            throw new Error(_context2.t0);
-          case 14:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2, null, [[2, 11]]);
-    }));
-    return function (_x3, _x4, _x5, _x6, _x7) {
-      return _ref2.apply(this, arguments);
-    };
-  }(), [gatewayGraphqlUrl, aggHeaders]);
+  }(), [gatewayGraphqlUrl]);
+  var getHydratedJQL = (0, _react.useCallback)(function (cloudId, jql) {
+    return requestCall({
+      variables: {
+        cloudId: cloudId,
+        jql: jql
+      },
+      operationName: 'hydrate',
+      query: _utils.hydrateJQLQuery
+    });
+  }, [requestCall]);
+  var getFieldValues = (0, _react.useCallback)(function (_ref2) {
+    var cloudId = _ref2.cloudId,
+      _ref2$jql = _ref2.jql,
+      jql = _ref2$jql === void 0 ? '' : _ref2$jql,
+      jqlTerm = _ref2.jqlTerm,
+      _ref2$searchString = _ref2.searchString,
+      searchString = _ref2$searchString === void 0 ? '' : _ref2$searchString,
+      pageCursor = _ref2.pageCursor;
+    return requestCall({
+      variables: {
+        cloudId: cloudId,
+        jql: jql,
+        first: 10,
+        jqlTerm: jqlTerm,
+        searchString: searchString,
+        after: pageCursor
+      },
+      operationName: 'fieldValues',
+      query: _utils.fieldValuesQuery
+    });
+  }, [requestCall]);
   return (0, _react.useMemo)(function () {
     return {
       getHydratedJQL: getHydratedJQL,

package/dist/cjs/services/utils.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.hydrateJQLQuery = exports.fieldValuesQuery = void 0;
 var hydrateJQLQuery = exports.hydrateJQLQuery = "query hydrate($cloudId: ID!, $jql: String!) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      hydrateJqlQuery(query: $jql) {\n        ... on JiraJqlHydratedQuery {\n          fields {\n            ... on JiraJqlQueryHydratedField {\n              jqlTerm\n              values {\n                ... on JiraJqlQueryHydratedValue {\n                  values {\n                    ... on JiraJqlProjectFieldValue {\n                      jqlTerm\n                      displayName\n                      project {\n                        avatar {\n                          small\n                        }\n                      }\n                    }\n                    ... on JiraJqlStatusFieldValue {\n                      jqlTerm\n                      displayName\n                      statusCategory {\n                        colorName\n                      }\n                    }\n                    ... on JiraJqlIssueTypeFieldValue {\n                      jqlTerm\n                      displayName\n                      issueTypes {\n                        avatar {\n                          small\n                        }\n                      }\n                    }\n                    ... on JiraJqlUserFieldValue {\n                      jqlTerm\n                      displayName\n                      user {\n                        picture\n                      }\n                    }\n                    ... on JiraJqlGroupFieldValue {\n                      jqlTerm\n                      displayName\n                      group {\n                        name\n                      }\n                    }\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";
-var fieldValuesQuery = exports.fieldValuesQuery = "query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String, $projectOptions: JiraProjectOptions) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      fieldValues(\n        first: $first\n        jqlTerm: $jqlTerm\n        jqlContext: $jql\n        searchString: $searchString\n        after: $after\n      ) {\n        totalCount\n        pageInfo {\n          endCursor\n        }\n        edges {\n          node {\n            jqlTerm\n            displayName\n            ... on JiraJqlProjectFieldValue {\n              project {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlIssueTypeFieldValue {\n              issueTypes {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlStatusFieldValue {\n              statusCategory {\n                colorName\n              }\n            }\n            ... on JiraJqlUserFieldValue {\n              user {\n                picture\n              }\n            }\n            ... on JiraJqlGroupFieldValue {\n              group {\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";
+var fieldValuesQuery = exports.fieldValuesQuery = "query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String) {\n  jira {\n    jqlBuilder(cloudId: $cloudId) {\n      fieldValues(\n        first: $first\n        jqlTerm: $jqlTerm\n        jqlContext: $jql\n        searchString: $searchString\n        after: $after\n      ) {\n        totalCount\n        pageInfo {\n          endCursor\n        }\n        edges {\n          node {\n            jqlTerm\n            displayName\n            ... on JiraJqlProjectFieldValue {\n              project {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlIssueTypeFieldValue {\n              issueTypes {\n                avatar {\n                  small\n                }\n              }\n            }\n            ... on JiraJqlStatusFieldValue {\n              statusCategory {\n                colorName\n              }\n            }\n            ... on JiraJqlUserFieldValue {\n              user {\n                picture\n              }\n            }\n            ... on JiraJqlGroupFieldValue {\n              group {\n                name\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}";

package/dist/cjs/ui/issue-like-table/draggable-table-heading.js

@@ -22,17 +22,6 @@ var _styled = require("./styled");
 var _index = require("./index");
 /** @jsx jsx */
 
-var tableHeadingStatusStyles = {
-  idle: (0, _react2.css)({
-    ':hover': {
-      background: "var(--ds-surface-hovered, #091E4224)"
-    }
-  }),
-  dragging: (0, _react2.css)({
-    background: "var(--ds-background-disabled, #091E4224)",
-    color: "var(--ds-text-disabled, #091E424F)"
-  })
-};
 var verticallyAlignedStyles = (0, _react2.css)({
   display: 'flex',
   alignItems: 'center',
@@ -275,7 +264,6 @@ var DraggableTableHeading = exports.DraggableTableHeading = function DraggableTa
   }, [id, index, onWidthChange, state, tableId, width]);
   return (0, _react2.jsx)(_styled.TableHeading, {
     ref: mainHeaderCellRef,
-    css: [tableHeadingStatusStyles[state.type]],
     "data-testid": "".concat(id, "-column-heading"),
     style: {
       width: width,

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

@@ -373,6 +373,11 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     }, _callee, null, [[3, 9]]);
   })), [parentContainerRenderInstanceId, extensionKey, hasFullSchema, onLoadDatasourceDetails]);
   return (0, _react2.jsx)("div", {
+    /* There is required contentEditable={true} in editor-card-plugin
+     * But this brakes how DND works. We set contentEditable={false} to allow DND to work
+     * when dragging is initiated on top of a column label.
+     */
+    contentEditable: false,
     ref: containerRef,
     css: scrollableContainerHeight ? scrollableContainerStyles : null,
     style: scrollableContainerHeight ? {

package/dist/cjs/ui/issue-like-table/styled.js

@@ -12,4 +12,4 @@ var _templateObject, _templateObject2;
 var ScrollableContainerHeight = exports.ScrollableContainerHeight = 590;
 var FieldTextFontSize = exports.FieldTextFontSize = '14px';
 var Table = exports.Table = _styled.default.table(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  width: 100%;\n"])));
-var TableHeading = exports.TableHeading = _styled.default.th(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  position: relative;\n  padding-block: ", " ", ";\n  line-height: ", ";\n  border-bottom: 2px solid ", ";\n  & [data-testid='datasource-header-content--container'] {\n    margin-top: 0;\n    overflow: hidden;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n  }\n"])), "var(--ds-space-300, 24px)", "var(--ds-space-100, 8px)", "var(--ds-font-lineHeight-300, 16px)", "var(--ds-background-accent-gray-subtler, ".concat(_colors.N40, ")"));
+var TableHeading = exports.TableHeading = _styled.default.th(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  position: relative;\n  line-height: ", ";\n  border-bottom: 2px solid ", ";\n  height: calc(52px - ", " * 2 - 2px);\n  vertical-align: bottom;\n\n  & [data-testid='datasource-header-content--container'] {\n    width: 100%;\n    padding: ", " ", ";\n    display: -webkit-box;\n    -webkit-line-clamp: 2;\n    -webkit-box-orient: vertical;\n    white-space: normal;\n    overflow: hidden;\n    max-height: 2.5rem;\n    word-wrap: break-word;\n\n    &:hover {\n      background: ", ";\n      border-radius: 3px;\n    }\n  }\n"])), "var(--ds-font-lineHeight-300, 16px)", "var(--ds-background-accent-gray-subtler, ".concat(_colors.N40, ")"), "var(--ds-space-050, 4px)", "var(--ds-space-100, 4px)", "var(--ds-space-050, 2px)", "var(--ds-background-input-hovered, #F7F8F9)");

package/dist/cjs/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.js

@@ -0,0 +1,94 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useFilterOptions = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _useBasicFilterAGG2 = require("../../../../services/useBasicFilterAGG");
+var _transformers = require("../utils/transformers");
+var useFilterOptions = exports.useFilterOptions = function useFilterOptions(_ref) {
+  var filterType = _ref.filterType,
+    cloudId = _ref.cloudId;
+  var _useState = (0, _react.useState)([]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    filterOptions = _useState2[0],
+    setFilterOptions = _useState2[1];
+  var _useState3 = (0, _react.useState)(0),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    totalCount = _useState4[0],
+    setTotalCount = _useState4[1];
+  var _useState5 = (0, _react.useState)('empty'),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    status = _useState6[0],
+    setStatus = _useState6[1];
+  var _useState7 = (0, _react.useState)(undefined),
+    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+    nextPageCursor = _useState8[0],
+    setNextPageCursor = _useState8[1];
+  var _useBasicFilterAGG = (0, _useBasicFilterAGG2.useBasicFilterAGG)(),
+    getFieldValues = _useBasicFilterAGG.getFieldValues;
+  var fetchFilterOptions = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+    var _ref3,
+      pageCursor,
+      searchString,
+      response,
+      isNewSearch,
+      _args = arguments;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _ref3 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, pageCursor = _ref3.pageCursor, searchString = _ref3.searchString;
+          setStatus('loading');
+          _context.prev = 2;
+          _context.next = 5;
+          return getFieldValues({
+            cloudId: cloudId,
+            jql: '',
+            jqlTerm: filterType,
+            searchString: searchString,
+            pageCursor: pageCursor
+          });
+        case 5:
+          response = _context.sent;
+          if (!(response.errors && response.errors.length > 0)) {
+            _context.next = 9;
+            break;
+          }
+          setStatus('rejected');
+          return _context.abrupt("return");
+        case 9:
+          isNewSearch = !pageCursor;
+          if (isNewSearch) {
+            setFilterOptions((0, _transformers.mapFieldValuesToFilterOptions)(response));
+          } else {
+            setFilterOptions([].concat((0, _toConsumableArray2.default)(filterOptions), (0, _toConsumableArray2.default)((0, _transformers.mapFieldValuesToFilterOptions)(response))));
+          }
+          setTotalCount((0, _transformers.mapFieldValuesToTotalCount)(response));
+          setNextPageCursor((0, _transformers.mapFieldValuesToPageCursor)(response));
+          setStatus('resolved');
+          _context.next = 19;
+          break;
+        case 16:
+          _context.prev = 16;
+          _context.t0 = _context["catch"](2);
+          setStatus('rejected');
+        case 19:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[2, 16]]);
+  })), [cloudId, filterOptions, filterType, getFieldValues]);
+  return {
+    filterOptions: filterOptions,
+    fetchFilterOptions: fetchFilterOptions,
+    totalCount: totalCount,
+    pageCursor: nextPageCursor,
+    status: status
+  };
+};

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js

@@ -14,7 +14,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _select = require("@atlaskit/select");
-var _useFieldValues2 = require("../../hooks/useFieldValues");
+var _useFilterOptions2 = require("../../hooks/useFilterOptions");
 var _control = _interopRequireDefault(require("./control"));
 var _footer = _interopRequireDefault(require("./footer"));
 var _formatOptionLabel = _interopRequireDefault(require("./formatOptionLabel"));
@@ -29,6 +29,7 @@ var noFilterOptions = function noFilterOptions() {
 };
 var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
   var filterType = _ref.filterType,
+    cloudId = _ref.cloudId,
     selection = _ref.selection,
     _ref$onSelectionChang = _ref.onSelectionChange,
     onSelectionChange = _ref$onSelectionChang === void 0 ? function () {} : _ref$onSelectionChang;
@@ -43,13 +44,14 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     selectedOptions = _useState4[0],
     setSelectedOptions = _useState4[1];
-  var _useFieldValues = (0, _useFieldValues2.useFieldValues)({
-      filterType: filterType
+  var _useFilterOptions = (0, _useFilterOptions2.useFilterOptions)({
+      filterType: filterType,
+      cloudId: cloudId
     }),
-    filterOptions = _useFieldValues.filterOptions,
-    fetchFilterOptions = _useFieldValues.fetchFilterOptions,
-    totalCount = _useFieldValues.totalCount,
-    status = _useFieldValues.status;
+    filterOptions = _useFilterOptions.filterOptions,
+    fetchFilterOptions = _useFilterOptions.fetchFilterOptions,
+    totalCount = _useFilterOptions.totalCount,
+    status = _useFilterOptions.status;
   var handleInputChange = (0, _react.useCallback)(function (searchString, actionMeta) {
     if (actionMeta.action === 'input-change' && searchString !== searchTerm) {
       setSearchTerm(searchString);
@@ -63,10 +65,13 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (status === 'empty') {
-            fetchFilterOptions();
+          if (!(status === 'empty')) {
+            _context.next = 3;
+            break;
           }
-        case 1:
+          _context.next = 3;
+          return fetchFilterOptions();
+        case 3:
         case "end":
           return _context.stop();
       }
@@ -79,18 +84,24 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       pickerRef === null || pickerRef === void 0 || (_pickerRef$current = pickerRef.current) === null || _pickerRef$current === void 0 || (_pickerRef$current = _pickerRef$current.selectRef) === null || _pickerRef$current === void 0 || (_pickerRef$current = _pickerRef$current.inputRef) === null || _pickerRef$current === void 0 || _pickerRef$current.focus();
     }
   }, [status]);
+  var isLoading = status === 'loading' || status === 'empty';
   return /*#__PURE__*/_react.default.createElement(_select.PopupSelect, {
     isMulti: true,
     maxMenuWidth: 300,
     minMenuWidth: 300,
     ref: pickerRef,
     testId: "jlol-basic-filter-popup-select",
-    inputId: "jlol-basic-filter-popup-select--input",
-    searchThreshold: 0,
+    inputId: "jlol-basic-filter-popup-select--input"
+    /*
+      this threshold controls the display of the search control (input field for search)
+      if this threshold is less than 0, when typing a search string that returns no results it will not remove the search control
+      if this threshold is 0 or higher, it will remove the search control when there are no results, the user will be unable to clear the search to see more results
+    */,
+    searchThreshold: -1,
     inputValue: searchTerm,
     closeMenuOnSelect: false,
     hideSelectedOptions: false,
-    isLoading: status === 'loading',
+    isLoading: isLoading,
     placeholder: formatMessage(_messages.asyncPopupSelectMessages.selectPlaceholder),
     components: {
       /* @ts-expect-error - This component has stricter OptionType, hence a temp setup untill its made generic */

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

@@ -15,7 +15,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var availableBasicFilterTypes = ['project', 'issuetype', 'status', 'assignee'];
 var BasicFilterContainer = function BasicFilterContainer(_ref) {
-  var jql = _ref.jql;
+  var jql = _ref.jql,
+    cloudId = _ref.cloudId;
   var _useState = (0, _react.useState)([]),
     _useState2 = (0, _slicedToArray2.default)(_useState, 1),
     selection = _useState2[0];
@@ -30,6 +31,7 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
     testId: "jlol-basic-filter-container"
   }, availableBasicFilterTypes.map(function (filter) {
     return /*#__PURE__*/_react.default.createElement(_asyncPopupSelect.default, {
+      cloudId: cloudId,
       filterType: filter,
       key: filter,
       selection: selection,

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

@@ -4,7 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mapFieldValuesResponseData = mapFieldValuesResponseData;
+exports.mapFieldValuesToFilterOptions = mapFieldValuesToFilterOptions;
+exports.mapFieldValuesToPageCursor = mapFieldValuesToPageCursor;
+exports.mapFieldValuesToTotalCount = mapFieldValuesToTotalCount;
 exports.mapHydrateResponseData = mapHydrateResponseData;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _types = require("../types");
@@ -38,7 +40,7 @@ function mapNodeToOption(_ref) {
       return _objectSpread(_objectSpread({}, baseProps), {}, {
         optionType: 'avatarLabel',
         avatar: user.picture,
-        isSquare: true
+        isSquare: false
       });
     }
     if (group) {
@@ -88,10 +90,20 @@ function mapHydrateResponseData(_ref2) {
   });
   return transformedHydrateResponseData;
 }
-function mapFieldValuesResponseData(_ref5) {
+function mapFieldValuesToFilterOptions(_ref5) {
   var _data$jira2;
   var data = _ref5.data;
   return (data === null || data === void 0 || (_data$jira2 = data.jira) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.jqlBuilder) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.fieldValues) === null || _data$jira2 === void 0 || (_data$jira2 = _data$jira2.edges) === null || _data$jira2 === void 0 ? void 0 : _data$jira2.map(function (edge) {
     return edge.node ? mapNodeToOption(edge.node) : null;
   }).filter(isNonNullSelectOption)) || [];
+}
+function mapFieldValuesToTotalCount(_ref6) {
+  var _data$jira3;
+  var data = _ref6.data;
+  return (data === null || data === void 0 || (_data$jira3 = data.jira) === null || _data$jira3 === void 0 || (_data$jira3 = _data$jira3.jqlBuilder) === null || _data$jira3 === void 0 || (_data$jira3 = _data$jira3.fieldValues) === null || _data$jira3 === void 0 ? void 0 : _data$jira3.totalCount) || 0;
+}
+function mapFieldValuesToPageCursor(_ref7) {
+  var _data$jira4;
+  var data = _ref7.data;
+  return data === null || data === void 0 || (_data$jira4 = data.jira) === null || _data$jira4 === void 0 || (_data$jira4 = _data$jira4.jqlBuilder) === null || _data$jira4 === void 0 || (_data$jira4 = _data$jira4.fieldValues) === null || _data$jira4 === void 0 || (_data$jira4 = _data$jira4.pageInfo) === null || _data$jira4 === void 0 ? void 0 : _data$jira4.endCursor;
 }

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

@@ -117,7 +117,8 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     onSearch: handleSearch,
     searchTerm: basicSearchTerm
   }), showBasicFilters && (0, _react2.jsx)(_basicFilters.BasicFilters, {
-    jql: jql
+    jql: jql,
+    cloudId: cloudId || ''
   })), currentSearchMethod === 'jql' && (0, _react2.jsx)(_jqlEditor.JiraJQLEditor, {
     cloudId: cloudId || '',
     isSearching: isSearching,

package/dist/es2019/analytics/constants.js

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

package/dist/es2019/services/useBasicFilterAGG.js

@@ -1,6 +1,6 @@
 import { useCallback, useMemo } from 'react';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
-import { getBaseUrl } from '@atlaskit/linking-common';
+import { getBaseUrl, request } from '@atlaskit/linking-common';
 import { fieldValuesQuery, hydrateJQLQuery } from './utils';
 const getGraphqlUrl = (envKey, baseUrlOverride) => {
   const baseUrl = baseUrlOverride || getBaseUrl(envKey);
@@ -13,58 +13,35 @@ export const useBasicFilterAGG = () => {
     }
   } = useSmartLinkContext();
   const gatewayGraphqlUrl = getGraphqlUrl(client.envKey, client.baseUrlOverride);
-  const aggHeaders = useMemo(() => {
-    return new Headers({
-      'Content-Type': 'application/json',
-      'X-ExperimentalApi': 'JiraJqlBuilder'
-    });
-  }, []);
-  const getHydratedJQL = useCallback(async (cloudId, jql) => {
-    const body = JSON.stringify({
-      variables: {
-        cloudId,
-        jql
-      },
-      operationName: 'hydrate',
-      query: hydrateJQLQuery
-    });
-    const request = new Request(gatewayGraphqlUrl, {
-      method: 'POST',
-      headers: aggHeaders,
-      body
-    });
-    try {
-      const response = await fetch(request);
-      return response.json();
-    } catch (e) {
-      throw new Error(e);
-    }
-  }, [gatewayGraphqlUrl, aggHeaders]);
-  const getFieldValues = useCallback(async (cloudId, jql, jqlTerm, searchString, pageCursor) => {
-    const body = JSON.stringify({
-      variables: {
-        cloudId,
-        jql,
-        first: 10,
-        jqlTerm,
-        searchString,
-        after: pageCursor
-      },
-      operationName: 'fieldValues',
-      query: fieldValuesQuery
-    });
-    const request = new Request(gatewayGraphqlUrl, {
-      method: 'POST',
-      headers: aggHeaders,
-      body
-    });
-    try {
-      const response = await fetch(request);
-      return await response.json();
-    } catch (e) {
-      throw new Error(e);
-    }
-  }, [gatewayGraphqlUrl, aggHeaders]);
+  const requestCall = useCallback(async body => request('post', gatewayGraphqlUrl, body, {
+    'X-ExperimentalApi': 'JiraJqlBuilder'
+  }, [200, 201, 202, 203, 204]), [gatewayGraphqlUrl]);
+  const getHydratedJQL = useCallback((cloudId, jql) => requestCall({
+    variables: {
+      cloudId,
+      jql
+    },
+    operationName: 'hydrate',
+    query: hydrateJQLQuery
+  }), [requestCall]);
+  const getFieldValues = useCallback(({
+    cloudId,
+    jql = '',
+    jqlTerm,
+    searchString = '',
+    pageCursor
+  }) => requestCall({
+    variables: {
+      cloudId,
+      jql,
+      first: 10,
+      jqlTerm,
+      searchString,
+      after: pageCursor
+    },
+    operationName: 'fieldValues',
+    query: fieldValuesQuery
+  }), [requestCall]);
   return useMemo(() => ({
     getHydratedJQL,
     getFieldValues

package/dist/es2019/services/utils.js

@@ -58,7 +58,7 @@ export const hydrateJQLQuery = `query hydrate($cloudId: ID!, $jql: String!) {
     }
   }
 }`;
-export const fieldValuesQuery = `query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String, $projectOptions: JiraProjectOptions) {
+export const fieldValuesQuery = `query fieldValues($cloudId: ID!, $first: Int = 10, $jqlTerm: String!, $jql: String!, $searchString: String!, $after: String) {
   jira {
     jqlBuilder(cloudId: $cloudId) {
       fieldValues(

package/dist/es2019/ui/issue-like-table/draggable-table-heading.js

@@ -13,17 +13,6 @@ import { offsetFromPointer } from '@atlaskit/pragmatic-drag-and-drop/util/offset
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/util/set-custom-native-drag-preview';
 import { TableHeading } from './styled';
 import { COLUMN_MIN_WIDTH } from './index';
-const tableHeadingStatusStyles = {
-  idle: css({
-    ':hover': {
-      background: "var(--ds-surface-hovered, #091E4224)"
-    }
-  }),
-  dragging: css({
-    background: "var(--ds-background-disabled, #091E4224)",
-    color: "var(--ds-text-disabled, #091E424F)"
-  })
-};
 const verticallyAlignedStyles = css({
   display: 'flex',
   alignItems: 'center',
@@ -264,7 +253,6 @@ export const DraggableTableHeading = ({
   }, [id, index, onWidthChange, state, tableId, width]);
   return jsx(TableHeading, {
     ref: mainHeaderCellRef,
-    css: [tableHeadingStatusStyles[state.type]],
     "data-testid": `${id}-column-heading`,
     style: {
       width,

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

@@ -326,6 +326,11 @@ export const IssueLikeDataTableView = ({
     }
   }, [parentContainerRenderInstanceId, extensionKey, hasFullSchema, onLoadDatasourceDetails]);
   return jsx("div", {
+    /* There is required contentEditable={true} in editor-card-plugin
+     * But this brakes how DND works. We set contentEditable={false} to allow DND to work
+     * when dragging is initiated on top of a column label.
+     */
+    contentEditable: false,
     ref: containerRef,
     css: scrollableContainerHeight ? scrollableContainerStyles : null,
     style: scrollableContainerHeight ? {