@atlaskit/link-datasource 1.17.0 → 1.17.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 1.17.2
+
+### Patch Changes
+
+- [#43143](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43143) [`de7541cc6ab`](https://bitbucket.org/atlassian/atlassian-frontend/commits/de7541cc6ab) - Reset filter selection when site selection changes and fixes a bug when selecting filter values.
+
+## 1.17.1
+
+### Patch Changes
+
+- [#43132](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43132) [`3e2792d125e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3e2792d125e) - added operational events for Assets Config Modal
+- Updated dependencies
+
 ## 1.17.0
 
 ### Minor 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.17.0"
+  packageVersion: "1.17.2"
 };

package/dist/cjs/hooks/useAssetsClient.js

@@ -9,6 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
+var _analytics = require("../analytics");
 var _cmdbService = require("../services/cmdbService");
 var handleAssetsClientErrors = function handleAssetsClientErrors(errorSetter, error) {
   if (error instanceof Error) {
@@ -50,6 +51,8 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
     _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
     objectSchemasError = _useState16[0],
     setObjectSchemasError = _useState16[1];
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
 
   /*
    * We wrap this in nested try/catch blocks because we want to handle
@@ -66,7 +69,7 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
             setWorkspaceError(undefined);
             _context.prev = 2;
             _context.next = 5;
-            return (0, _cmdbService.getWorkspaceId)();
+            return (0, _cmdbService.getWorkspaceId)(fireEvent);
           case 5:
             _workspaceId = _context.sent;
             setWorkspaceId(_workspaceId);
@@ -77,7 +80,7 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
             }
             _context.prev = 8;
             _context.next = 11;
-            return (0, _cmdbService.fetchObjectSchema)(_workspaceId, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId);
+            return (0, _cmdbService.fetchObjectSchema)(_workspaceId, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId, fireEvent);
           case 11:
             fetchedObjectSchema = _context.sent;
             setExistingObjectSchema(fetchedObjectSchema);
@@ -90,7 +93,7 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
           case 18:
             _context.prev = 18;
             _context.next = 21;
-            return (0, _cmdbService.fetchObjectSchemas)(_workspaceId);
+            return (0, _cmdbService.fetchObjectSchemas)(_workspaceId, undefined, fireEvent);
           case 21:
             fetchedObjectSchemasResponse = _context.sent;
             setObjectSchemas(fetchedObjectSchemasResponse.values);
@@ -118,7 +121,7 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
         }
       }, _callee, null, [[2, 31, 34, 37], [8, 15], [18, 26]]);
     }))();
-  }, [initialParameters]);
+  }, [initialParameters, fireEvent]);
   return {
     workspaceId: workspaceId,
     workspaceError: workspaceError,

package/dist/cjs/hooks/useValidateAqlText.js

@@ -9,6 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
+var _analytics = require("../analytics");
 var _cmdbService = require("../services/cmdbService");
 var useValidateAqlText = exports.useValidateAqlText = function useValidateAqlText(workspaceId) {
   var _useState = (0, _react.useState)(false),
@@ -23,6 +24,8 @@ var useValidateAqlText = exports.useValidateAqlText = function useValidateAqlTex
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     error = _useState6[0],
     setError = _useState6[1];
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var validateAqlText = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(aql) {
       var isValid, message, _validateAqlResponse$, validateAqlResponse;
@@ -37,7 +40,7 @@ var useValidateAqlText = exports.useValidateAqlText = function useValidateAqlTex
             _context.next = 7;
             return (0, _cmdbService.validateAql)(workspaceId, {
               qlQuery: aql
-            });
+            }, fireEvent);
           case 7:
             validateAqlResponse = _context.sent;
             setIsValidAqlText(validateAqlResponse.isValid);
@@ -71,7 +74,7 @@ var useValidateAqlText = exports.useValidateAqlText = function useValidateAqlTex
     return function (_x) {
       return _ref.apply(this, arguments);
     };
-  }(), [workspaceId]);
+  }(), [workspaceId, fireEvent]);
   return {
     isValidAqlText: isValidAqlText,
     validateAqlText: validateAqlText,

package/dist/cjs/services/cmdbService.js

@@ -10,7 +10,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _linkingCommon = require("@atlaskit/linking-common");
 var _cmdbService = require("./cmdbService.utils");
 var getWorkspaceId = exports.getWorkspaceId = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(fireEvent) {
     var url, _workspaceDetailsResp, workspaceDetailsResponse, error;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -27,32 +27,35 @@ var getWorkspaceId = exports.getWorkspaceId = /*#__PURE__*/function () {
           }
           throw new _cmdbService.PermissionError('No workspace results found');
         case 7:
+          fireEvent && fireEvent('operational.getWorkspaceId.success', {});
           return _context.abrupt("return", workspaceDetailsResponse.results[0].id);
-        case 10:
-          _context.prev = 10;
+        case 11:
+          _context.prev = 11;
           _context.t0 = _context["catch"](1);
           error = (0, _cmdbService.mapFetchErrors)(_context.t0);
           if (error instanceof _cmdbService.FetchError) {
-            // TODO Fire error operational event for workspace here before remapping to PermissionError
-            // Only 429 and 5xx errors will be treated as FetchErrors otherwise PermissionError
+            fireEvent && fireEvent('operational.getWorkspaceId.failed', {
+              statusCodeGroup: (0, _cmdbService.getStatusCodeGroup)(error)
+            });
+            // Only 429 and5xx errors will be treated as FetchErrors otherwise PermissionError
             if ((0, _cmdbService.getStatusCodeGroup)(error) !== '5xx' && error.statusCode !== 429) {
               error = new _cmdbService.PermissionError('Failed to fetch workspace');
             }
           }
           throw error;
-        case 15:
+        case 16:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[1, 10]]);
+    }, _callee, null, [[1, 11]]);
   }));
-  return function getWorkspaceId() {
+  return function getWorkspaceId(_x) {
     return _ref.apply(this, arguments);
   };
 }();
 var validateAql = exports.validateAql = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(workspaceId, data) {
-    var url, error;
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(workspaceId, data, fireEvent) {
+    var url, response, error;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -64,31 +67,35 @@ var validateAql = exports.validateAql = /*#__PURE__*/function () {
             context: 'SMART_LINKS'
           }, undefined, [200, 201, 202, 203, 204]);
         case 4:
-          return _context2.abrupt("return", _context2.sent);
-        case 7:
-          _context2.prev = 7;
+          response = _context2.sent;
+          fireEvent && fireEvent('operational.validateAql.success', {});
+          return _context2.abrupt("return", response);
+        case 9:
+          _context2.prev = 9;
           _context2.t0 = _context2["catch"](1);
           error = (0, _cmdbService.mapFetchErrors)(_context2.t0);
           if (error instanceof _cmdbService.FetchError) {
-            // TODO Fire error operational event for aql here before remapping to PermissionError
+            fireEvent && fireEvent('operational.validateAql.failed', {
+              statusCodeGroup: (0, _cmdbService.getStatusCodeGroup)(error)
+            });
             if (error.statusCode === 401 || error.statusCode === 403) {
               error = new _cmdbService.PermissionError('Failed to fetch object schemas');
             }
           }
           throw error;
-        case 12:
+        case 14:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[1, 7]]);
+    }, _callee2, null, [[1, 9]]);
   }));
-  return function validateAql(_x, _x2) {
+  return function validateAql(_x2, _x3, _x4) {
     return _ref2.apply(this, arguments);
   };
 }();
 var fetchObjectSchema = exports.fetchObjectSchema = /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(workspaceId, schemaId) {
-    var url, error;
+  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(workspaceId, schemaId, fireEvent) {
+    var url, response, error;
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -97,31 +104,35 @@ var fetchObjectSchema = exports.fetchObjectSchema = /*#__PURE__*/function () {
           _context3.next = 4;
           return (0, _linkingCommon.request)('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
         case 4:
-          return _context3.abrupt("return", _context3.sent);
-        case 7:
-          _context3.prev = 7;
+          response = _context3.sent;
+          fireEvent && fireEvent('operational.objectSchema.success', {});
+          return _context3.abrupt("return", response);
+        case 9:
+          _context3.prev = 9;
           _context3.t0 = _context3["catch"](1);
           error = (0, _cmdbService.mapFetchErrors)(_context3.t0);
           if (error instanceof _cmdbService.FetchError) {
-            // TODO Fire error operational event for object schema here before remapping to PermissionError
+            fireEvent && fireEvent('operational.objectSchema.failed', {
+              statusCodeGroup: (0, _cmdbService.getStatusCodeGroup)(error)
+            });
             if (error.statusCode === 401 || error.statusCode === 403) {
               error = new _cmdbService.PermissionError('Failed to fetch object schemas');
             }
           }
           throw error;
-        case 12:
+        case 14:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[1, 7]]);
+    }, _callee3, null, [[1, 9]]);
   }));
-  return function fetchObjectSchema(_x3, _x4) {
+  return function fetchObjectSchema(_x5, _x6, _x7) {
     return _ref3.apply(this, arguments);
   };
 }();
 var fetchObjectSchemas = exports.fetchObjectSchemas = /*#__PURE__*/function () {
-  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(workspaceId, query) {
-    var queryParams, url, error;
+  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(workspaceId, query, fireEvent) {
+    var queryParams, url, response, error;
     return _regenerator.default.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -134,25 +145,29 @@ var fetchObjectSchemas = exports.fetchObjectSchemas = /*#__PURE__*/function () {
           _context4.next = 8;
           return (0, _linkingCommon.request)('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
         case 8:
-          return _context4.abrupt("return", _context4.sent);
-        case 11:
-          _context4.prev = 11;
+          response = _context4.sent;
+          fireEvent && fireEvent('operational.objectSchemas.success', {});
+          return _context4.abrupt("return", response);
+        case 13:
+          _context4.prev = 13;
           _context4.t0 = _context4["catch"](5);
           error = (0, _cmdbService.mapFetchErrors)(_context4.t0);
           if (error instanceof _cmdbService.FetchError) {
-            // TODO Fire error operational event for object schemas here before remapping to PermissionError
+            fireEvent && fireEvent('operational.objectSchemas.failed', {
+              statusCodeGroup: (0, _cmdbService.getStatusCodeGroup)(error)
+            });
             if (error.statusCode === 401 || error.statusCode === 403) {
               error = new _cmdbService.PermissionError('Failed to fetch object schemas');
             }
           }
           throw error;
-        case 16:
+        case 18:
         case "end":
           return _context4.stop();
       }
-    }, _callee4, null, [[5, 11]]);
+    }, _callee4, null, [[5, 13]]);
   }));
-  return function fetchObjectSchemas(_x5, _x6) {
+  return function fetchObjectSchemas(_x8, _x9, _x10) {
     return _ref4.apply(this, arguments);
   };
 }();

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

@@ -112,12 +112,20 @@ var useFilterOptions = exports.useFilterOptions = function useFilterOptions(_ref
       }
     }, _callee, null, [[5, 24]]);
   })), [cloudId, filterOptions, filterType, getFieldValues]);
+  var reset = (0, _react.useCallback)(function () {
+    setStatus('empty');
+    setFilterOptions([]);
+    setTotalCount(0);
+    setNextPageCursor(undefined);
+    initialData.current = undefined;
+  }, []);
   return {
     filterOptions: filterOptions,
     fetchFilterOptions: fetchFilterOptions,
     totalCount: totalCount,
     pageCursor: nextPageCursor,
     status: status,
+    reset: reset,
     errors: status === 'rejected' ? errors : []
   };
 };

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

@@ -13,6 +13,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _reactIntlNext = require("react-intl-next");
 var _useDebounce = require("use-debounce");
 var _select = require("@atlaskit/select");
@@ -38,6 +39,8 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     selection = _ref.selection,
     _ref$onSelectionChang = _ref.onSelectionChange,
     onSelectionChange = _ref$onSelectionChang === void 0 ? function () {} : _ref$onSelectionChang,
+    _ref$onReset = _ref.onReset,
+    resetSelection = _ref$onReset === void 0 ? function () {} : _ref$onReset,
     _ref$isDisabled = _ref.isDisabled,
     isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
@@ -50,10 +53,13 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     selectedOptions = _useState4[0],
     setSelectedOptions = _useState4[1];
-  var _useState5 = (0, _react.useState)(selectedOptions),
+  var _useState5 = (0, _react.useState)([]),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     sortedOptions = _useState6[0],
     setSortedOptions = _useState6[1];
+  var currentSiteCloudId = (0, _react.useRef)(cloudId);
+  var sortPaginatedResults = (0, _react.useRef)(false); // this is to track pagination for sorting purpose
+
   var _useFilterOptions = (0, _useFilterOptions2.useFilterOptions)({
       filterType: filterType,
       cloudId: cloudId
@@ -63,6 +69,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     totalCount = _useFilterOptions.totalCount,
     status = _useFilterOptions.status,
     pageCursor = _useFilterOptions.pageCursor,
+    resetHook = _useFilterOptions.reset,
     errors = _useFilterOptions.errors;
   var _useDebouncedCallback = (0, _useDebounce.useDebouncedCallback)(function (searchString) {
       fetchFilterOptions({
@@ -90,14 +97,12 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       return _ref2.apply(this, arguments);
     };
   }(), [handleDebouncedFetchFilterOptions, searchTerm]);
-  var handleOptionSelection = function handleOptionSelection(newValue) {
-    setSelectedOptions(newValue);
+  var handleOptionSelection = (0, _react.useCallback)(function (newValue) {
     onSelectionChange(newValue);
-  };
+  }, [onSelectionChange]);
   var sortOptionsOnPopupOpen = (0, _react.useCallback)(function () {
     if (selectedOptions.length === 0) {
-      setSortedOptions(filterOptions);
-      return;
+      return setSortedOptions(filterOptions);
     }
     var nonSelectedOptions = filterOptions.filter(function (option) {
       return !selectedOptions.find(function (selectedOption) {
@@ -105,37 +110,41 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       });
     });
     var newOptions = [].concat((0, _toConsumableArray2.default)(selectedOptions), (0, _toConsumableArray2.default)(nonSelectedOptions));
-    setSortedOptions(newOptions);
-  }, [selectedOptions, filterOptions]);
+    if (!(0, _isEqual.default)(newOptions, sortedOptions)) {
+      setSortedOptions(newOptions);
+    }
+  }, [selectedOptions, filterOptions, sortedOptions]);
   var sortOptionsOnResolve = (0, _react.useCallback)(function () {
-    var newOptions = filterOptions.filter(function (option) {
-      return !sortedOptions.find(function (sortedOption) {
-        return sortedOption.value === option.value;
-      });
-    });
-    var shouldSetSortOptions = false;
-    if (sortedOptions.length !== filterOptions.length) {
-      shouldSetSortOptions = true;
-    } else {
-      sortedOptions.forEach(function (sortedOption) {
-        if (!filterOptions.some(function (filterOption) {
-          return filterOption.value === sortedOption.value;
-        })) {
-          shouldSetSortOptions = true;
-        }
-      });
+    // sortedOptions is empty initially, this will take care of setting the initial value and bring the selected items to the top
+    if (sortedOptions.length === 0) {
+      return sortOptionsOnPopupOpen();
+    }
+
+    // when the user is searching, we want the search result to be displayed as it is, and the select component will take care of marking the selected items
+    if (searchTerm) {
+      sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
+      return setSortedOptions(filterOptions);
     }
-    if (shouldSetSortOptions) {
-      var sortedOptionsFiltered = sortedOptions.filter(function (sortedOption) {
-        return filterOptions.some(function (filterOption) {
-          return filterOption.value === sortedOption.value;
+
+    // this block handles the pagination, where on pagination, we will just append newOptions to the current list
+    if (sortPaginatedResults.current) {
+      var newOptions = filterOptions.filter(function (option) {
+        return !sortedOptions.find(function (sortedOption) {
+          return sortedOption.value === option.value;
         });
       });
-      setSortedOptions([].concat((0, _toConsumableArray2.default)(sortedOptionsFiltered), (0, _toConsumableArray2.default)(newOptions)));
+      if (newOptions.length > 0) {
+        setSortedOptions([].concat((0, _toConsumableArray2.default)(sortedOptions), (0, _toConsumableArray2.default)(newOptions)));
+      }
+      sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
+      return;
     }
-  }, [filterOptions, sortedOptions]);
+    sortPaginatedResults.current = false; // set to false to indicate pagination resolve action is completed from the sorting perspective
+    sortOptionsOnPopupOpen();
+  }, [filterOptions, searchTerm, sortOptionsOnPopupOpen, sortedOptions]);
   var handleShowMore = (0, _react.useCallback)(function () {
     if (pageCursor) {
+      sortPaginatedResults.current = true;
       fetchFilterOptions({
         pageCursor: pageCursor,
         searchString: searchTerm
@@ -156,15 +165,31 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     if (status === 'resolved') {
       sortOptionsOnResolve();
     }
-  }, [sortOptionsOnResolve, status]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [status]); // we only want the sortOptionsOnResolve to run when there is a status change
+
+  (0, _react.useEffect)(function () {
+    if (currentSiteCloudId.current !== cloudId) {
+      currentSiteCloudId.current = cloudId;
+      setSortedOptions([]);
+      setSearchTerm('');
+      resetHook();
+      resetSelection();
+    }
+  }, [cloudId, resetHook, resetSelection]);
+  (0, _react.useEffect)(function () {
+    if (!(0, _isEqual.default)(selection, selectedOptions)) {
+      setSelectedOptions(selection);
+    }
+  }, [selectedOptions, selection]);
   var filterOptionsLength = filterOptions.length;
   var isError = status === 'rejected';
   var isLoading = status === 'loading' || status === 'empty';
   var isLoadingMore = status === 'loadingMore';
   var isEmpty = status === 'resolved' && filterOptionsLength === 0;
   var popupSelectOptions = isLoading || isError ? [] : sortedOptions; // if not set to [], then on loading, no loading UI will be shown
-  var areAllResultsLoaded = filterOptions.length === totalCount;
-  var shouldShowFooter = (status === 'resolved' || isLoadingMore) && filterOptions.length > 0; // footer should not disappear when there is an inline spinner for loading more data
+  var areAllResultsLoaded = filterOptionsLength === totalCount;
+  var shouldShowFooter = (status === 'resolved' || isLoadingMore) && filterOptionsLength > 0; // footer should not disappear when there is an inline spinner for loading more data
   var shouldDisplayShowMoreButton = status === 'resolved' && !!pageCursor && !areAllResultsLoaded;
   return /*#__PURE__*/_react.default.createElement(_select.PopupSelect, {
     isMulti: true,
@@ -223,7 +248,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       }));
     },
     footer: shouldShowFooter && /*#__PURE__*/_react.default.createElement(_footer.default, {
-      currentDisplayCount: filterOptionsLength,
+      currentDisplayCount: popupSelectOptions.length,
       totalCount: totalCount
     })
   });

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _primitives = require("@atlaskit/primitives");
@@ -13,6 +14,8 @@ var _utils = require("../utils");
 var _asyncPopupSelect = _interopRequireDefault(require("./async-popup-select"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 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; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var availableBasicFilterTypes = ['project', 'issuetype', 'status', 'assignee'];
 var basicFilterContainerStyles = (0, _primitives.xcss)({
   paddingLeft: "var(--ds-space-100, 8px)"
@@ -20,7 +23,7 @@ var basicFilterContainerStyles = (0, _primitives.xcss)({
 var BasicFilterContainer = function BasicFilterContainer(_ref) {
   var jql = _ref.jql,
     cloudId = _ref.cloudId;
-  var _useState = (0, _react.useState)([]),
+  var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     selection = _useState2[0],
     setSelection = _useState2[1];
@@ -29,9 +32,15 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
       // hydrate hook call goes in here
     }
   }, [jql]);
-  var handleSelectionChange = (0, _react.useCallback)(function (options) {
-    setSelection(options);
-  }, [setSelection]);
+  var handleSelectionChange = (0, _react.useCallback)(function (options, filter) {
+    var updatedSelection = _objectSpread(_objectSpread({}, selection), {}, (0, _defineProperty2.default)({}, filter, options));
+    setSelection(updatedSelection);
+  }, [selection]);
+  var handleReset = (0, _react.useCallback)(function () {
+    if (Object.keys(selection).length > 0) {
+      setSelection({});
+    }
+  }, [selection]);
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     xcss: basicFilterContainerStyles,
     gap: "space.100",
@@ -41,9 +50,12 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
       cloudId: cloudId,
       filterType: filter,
       key: filter,
-      selection: selection,
+      selection: selection[filter] || [],
       isDisabled: !cloudId,
-      onSelectionChange: handleSelectionChange
+      onSelectionChange: function onSelectionChange(options) {
+        return handleSelectionChange(options, filter);
+      },
+      onReset: handleReset
     });
   }));
 };

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.isValidJql = void 0;
 var _jqlAst = require("@atlaskit/jql-ast");
 var isValidJql = exports.isValidJql = function isValidJql(jql) {
+  var _jast$errors;
   var jast = new _jqlAst.JastBuilder().build(jql);
-  return jast.errors.length === 0;
+  return (jast === null || jast === void 0 || (_jast$errors = jast.errors) === null || _jast$errors === void 0 ? void 0 : _jast$errors.length) === 0;
 };

package/dist/es2019/analytics/constants.js

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

package/dist/es2019/hooks/useAssetsClient.js

@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
+import { useDatasourceAnalyticsEvents } from '../analytics';
 import { fetchObjectSchema, fetchObjectSchemas, getWorkspaceId } from '../services/cmdbService';
 const handleAssetsClientErrors = (errorSetter, error) => {
   if (error instanceof Error) {
@@ -16,6 +17,9 @@ export const useAssetsClient = initialParameters => {
   const [objectSchemas, setObjectSchemas] = useState();
   const [totalObjectSchemas, setTotalObjectSchemas] = useState();
   const [objectSchemasError, setObjectSchemasError] = useState();
+  const {
+    fireEvent
+  } = useDatasourceAnalyticsEvents();
 
   /*
    * We wrap this in nested try/catch blocks because we want to handle
@@ -27,19 +31,19 @@ export const useAssetsClient = initialParameters => {
       setLoading(true);
       setWorkspaceError(undefined);
       try {
-        const workspaceId = await getWorkspaceId();
+        const workspaceId = await getWorkspaceId(fireEvent);
         setWorkspaceId(workspaceId);
         // Check schema from initial parameters still exists and fetch name/permissions for schema select
         if (initialParameters !== null && initialParameters !== void 0 && initialParameters.schemaId) {
           try {
-            const fetchedObjectSchema = await fetchObjectSchema(workspaceId, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId);
+            const fetchedObjectSchema = await fetchObjectSchema(workspaceId, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId, fireEvent);
             setExistingObjectSchema(fetchedObjectSchema);
           } catch (fetchObjectSchemaError) {
             handleAssetsClientErrors(setExistingObjectSchemaError, fetchObjectSchemaError);
           }
         }
         try {
-          const fetchedObjectSchemasResponse = await fetchObjectSchemas(workspaceId);
+          const fetchedObjectSchemasResponse = await fetchObjectSchemas(workspaceId, undefined, fireEvent);
           setObjectSchemas(fetchedObjectSchemasResponse.values);
           setTotalObjectSchemas(fetchedObjectSchemasResponse.total);
         } catch (fetchObjectSchemasError) {
@@ -51,7 +55,7 @@ export const useAssetsClient = initialParameters => {
         setLoading(false);
       }
     })();
-  }, [initialParameters]);
+  }, [initialParameters, fireEvent]);
   return {
     workspaceId,
     workspaceError,

package/dist/es2019/hooks/useValidateAqlText.js

@@ -1,9 +1,13 @@
 import { useCallback, useState } from 'react';
+import { useDatasourceAnalyticsEvents } from '../analytics';
 import { validateAql } from '../services/cmdbService';
 export const useValidateAqlText = workspaceId => {
   const [loading, setLoading] = useState(false);
   const [isValidAqlText, setIsValidAqlText] = useState(false);
   const [error, setError] = useState();
+  const {
+    fireEvent
+  } = useDatasourceAnalyticsEvents();
   const validateAqlText = useCallback(async aql => {
     setLoading(true);
     setError(undefined);
@@ -13,7 +17,7 @@ export const useValidateAqlText = workspaceId => {
       var _validateAqlResponse$;
       const validateAqlResponse = await validateAql(workspaceId, {
         qlQuery: aql
-      });
+      }, fireEvent);
       setIsValidAqlText(validateAqlResponse.isValid);
       isValid = validateAqlResponse.isValid;
       message = ((_validateAqlResponse$ = validateAqlResponse.errors) === null || _validateAqlResponse$ === void 0 ? void 0 : _validateAqlResponse$.iql) || null;
@@ -30,7 +34,7 @@ export const useValidateAqlText = workspaceId => {
       isValid,
       message
     };
-  }, [workspaceId]);
+  }, [workspaceId, fireEvent]);
   return {
     isValidAqlText,
     validateAqlText,