@atlaskit/link-datasource 1.17.0 → 1.17.2

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

@@ -5,7 +5,8 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 var _excluded = ["isOpen"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import isEqual from 'lodash/isEqual';
 import { useIntl } from 'react-intl-next';
 import { useDebouncedCallback } from 'use-debounce';
 import { CheckboxOption, PopupSelect } from '@atlaskit/select';
@@ -28,6 +29,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 = useIntl(),
@@ -40,10 +43,13 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectedOptions = _useState4[0],
     setSelectedOptions = _useState4[1];
-  var _useState5 = useState(selectedOptions),
+  var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
     sortedOptions = _useState6[0],
     setSortedOptions = _useState6[1];
+  var currentSiteCloudId = useRef(cloudId);
+  var sortPaginatedResults = useRef(false); // this is to track pagination for sorting purpose
+
   var _useFilterOptions = useFilterOptions({
       filterType: filterType,
       cloudId: cloudId
@@ -53,6 +59,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     totalCount = _useFilterOptions.totalCount,
     status = _useFilterOptions.status,
     pageCursor = _useFilterOptions.pageCursor,
+    resetHook = _useFilterOptions.reset,
     errors = _useFilterOptions.errors;
   var _useDebouncedCallback = useDebouncedCallback(function (searchString) {
       fetchFilterOptions({
@@ -80,14 +87,12 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       return _ref2.apply(this, arguments);
     };
   }(), [handleDebouncedFetchFilterOptions, searchTerm]);
-  var handleOptionSelection = function handleOptionSelection(newValue) {
-    setSelectedOptions(newValue);
+  var handleOptionSelection = useCallback(function (newValue) {
     onSelectionChange(newValue);
-  };
+  }, [onSelectionChange]);
   var sortOptionsOnPopupOpen = useCallback(function () {
     if (selectedOptions.length === 0) {
-      setSortedOptions(filterOptions);
-      return;
+      return setSortedOptions(filterOptions);
     }
     var nonSelectedOptions = filterOptions.filter(function (option) {
       return !selectedOptions.find(function (selectedOption) {
@@ -95,37 +100,41 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       });
     });
     var newOptions = [].concat(_toConsumableArray(selectedOptions), _toConsumableArray(nonSelectedOptions));
-    setSortedOptions(newOptions);
-  }, [selectedOptions, filterOptions]);
+    if (!isEqual(newOptions, sortedOptions)) {
+      setSortedOptions(newOptions);
+    }
+  }, [selectedOptions, filterOptions, sortedOptions]);
   var sortOptionsOnResolve = 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(_toConsumableArray(sortedOptionsFiltered), _toConsumableArray(newOptions)));
+      if (newOptions.length > 0) {
+        setSortedOptions([].concat(_toConsumableArray(sortedOptions), _toConsumableArray(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 = useCallback(function () {
     if (pageCursor) {
+      sortPaginatedResults.current = true;
       fetchFilterOptions({
         pageCursor: pageCursor,
         searchString: searchTerm
@@ -146,15 +155,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
+
+  useEffect(function () {
+    if (currentSiteCloudId.current !== cloudId) {
+      currentSiteCloudId.current = cloudId;
+      setSortedOptions([]);
+      setSearchTerm('');
+      resetHook();
+      resetSelection();
+    }
+  }, [cloudId, resetHook, resetSelection]);
+  useEffect(function () {
+    if (!isEqual(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.createElement(PopupSelect, {
     isMulti: true,
@@ -213,7 +238,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       }));
     },
     footer: shouldShowFooter && /*#__PURE__*/React.createElement(PopupFooter, {
-      currentDisplayCount: filterOptionsLength,
+      currentDisplayCount: popupSelectOptions.length,
       totalCount: totalCount
     })
   });

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

@@ -1,4 +1,7 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+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) { _defineProperty(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; }
 import React, { useCallback, useEffect, useState } from 'react';
 import { Flex, xcss } from '@atlaskit/primitives';
 import { isValidJql } from '../utils';
@@ -10,7 +13,7 @@ var basicFilterContainerStyles = xcss({
 var BasicFilterContainer = function BasicFilterContainer(_ref) {
   var jql = _ref.jql,
     cloudId = _ref.cloudId;
-  var _useState = useState([]),
+  var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     selection = _useState2[0],
     setSelection = _useState2[1];
@@ -19,9 +22,15 @@ var BasicFilterContainer = function BasicFilterContainer(_ref) {
       // hydrate hook call goes in here
     }
   }, [jql]);
-  var handleSelectionChange = useCallback(function (options) {
-    setSelection(options);
-  }, [setSelection]);
+  var handleSelectionChange = useCallback(function (options, filter) {
+    var updatedSelection = _objectSpread(_objectSpread({}, selection), {}, _defineProperty({}, filter, options));
+    setSelection(updatedSelection);
+  }, [selection]);
+  var handleReset = useCallback(function () {
+    if (Object.keys(selection).length > 0) {
+      setSelection({});
+    }
+  }, [selection]);
   return /*#__PURE__*/React.createElement(Flex, {
     xcss: basicFilterContainerStyles,
     gap: "space.100",
@@ -31,9 +40,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/esm/ui/jira-issues-modal/basic-filters/utils/index.js

@@ -1,5 +1,6 @@
 import { JastBuilder } from '@atlaskit/jql-ast';
 export var isValidJql = function isValidJql(jql) {
+  var _jast$errors;
   var jast = new 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/types/analytics/generated/analytics.types.d.ts

@@ -3,7 +3,7 @@
  *
  * Generates Typescript types for analytics events from analytics.spec.yaml
  *
- * @codegen <<SignedSource::ddaee20abebe8b4891d75f243120dce8>>
+ * @codegen <<SignedSource::d3722446f615a812f3e336474f9d8d3c>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -90,6 +90,22 @@ export type ErrorShownBasicSearchDropdownAttributesType = {
     reason: 'agg' | 'network' | 'unknown';
 };
 export type AqlEditorSearchedAttributesType = {};
+export type GetWorkspaceIdSuccessAttributesType = {};
+export type GetWorkspaceIdFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
+export type ValidateAqlSuccessAttributesType = {};
+export type ValidateAqlFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
+export type ObjectSchemaSuccessAttributesType = {};
+export type ObjectSchemaFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
+export type ObjectSchemasSuccessAttributesType = {};
+export type ObjectSchemasFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
 export type AnalyticsEventAttributes = {
     /**
      * Fires when user sees modal dialog. */
@@ -148,5 +164,29 @@ export type AnalyticsEventAttributes = {
     /**
      * Fired when search is initiated via the search icon or enter key press for aql editor input field. */
     'ui.aqlEditor.searched': AqlEditorSearchedAttributesType;
+    /**
+     * Fired when fetching a workspace Id is successful. */
+    'operational.getWorkspaceId.success': GetWorkspaceIdSuccessAttributesType;
+    /**
+     * Fired when fetching a workspace Id fails. */
+    'operational.getWorkspaceId.failed': GetWorkspaceIdFailedAttributesType;
+    /**
+     * Fired when making a request to validateAQL is successful. */
+    'operational.validateAql.success': ValidateAqlSuccessAttributesType;
+    /**
+     * Fired when making a request to validateAQL fails. */
+    'operational.validateAql.failed': ValidateAqlFailedAttributesType;
+    /**
+     * Fired when fetching an object schema is successful. */
+    'operational.objectSchema.success': ObjectSchemaSuccessAttributesType;
+    /**
+     * Fired when fetching an object schema fails. */
+    'operational.objectSchema.failed': ObjectSchemaFailedAttributesType;
+    /**
+     * Fired when fetching object schemas is successful. */
+    'operational.objectSchemas.success': ObjectSchemasSuccessAttributesType;
+    /**
+     * Fired when fetching object schemas fails. */
+    'operational.objectSchemas.failed': ObjectSchemasFailedAttributesType;
 };
 export type EventKey = keyof AnalyticsEventAttributes;

package/dist/types/services/cmdbService.d.ts

@@ -1,7 +1,11 @@
+import { EventKey } from '../analytics/generated/analytics.types';
+import createEventPayload from '../analytics/generated/create-event-payload';
 import { AqlValidateResponse, FetchObjectSchemasResponse } from '../types/assets/types';
-export declare const getWorkspaceId: () => Promise<string>;
+type AnalyticsFireEvent = <K extends EventKey>(...params: Parameters<typeof createEventPayload<K>>) => void;
+export declare const getWorkspaceId: (fireEvent?: AnalyticsFireEvent) => Promise<string>;
 export declare const validateAql: (workspaceId: string, data: {
     qlQuery: string;
-}) => Promise<AqlValidateResponse>;
-export declare const fetchObjectSchema: (workspaceId: string, schemaId: string) => Promise<import("../types/assets/types").ObjectSchema>;
-export declare const fetchObjectSchemas: (workspaceId: string, query?: string) => Promise<FetchObjectSchemasResponse>;
+}, fireEvent?: AnalyticsFireEvent) => Promise<AqlValidateResponse>;
+export declare const fetchObjectSchema: (workspaceId: string, schemaId: string, fireEvent?: AnalyticsFireEvent) => Promise<import("../types/assets/types").ObjectSchema>;
+export declare const fetchObjectSchemas: (workspaceId: string, query?: string, fireEvent?: AnalyticsFireEvent) => Promise<FetchObjectSchemasResponse>;
+export {};

package/dist/types/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.d.ts

@@ -10,6 +10,7 @@ export interface FetchFilterOptionsProps {
 export interface FilterOptionsState {
     filterOptions: SelectOption[];
     fetchFilterOptions: (prop?: FetchFilterOptionsProps) => Promise<void>;
+    reset: () => void;
     totalCount: number;
     pageCursor?: string;
     status: 'empty' | 'loading' | 'resolved' | 'rejected' | 'loadingMore';

package/dist/types/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts

@@ -5,8 +5,9 @@ export interface AsyncPopupSelectProps {
     cloudId: string;
     selection: SelectOption[];
     onSelectionChange?: (selection: SelectOption[]) => void;
+    onReset?: () => void;
     isDisabled?: boolean;
 }
 export declare const SEARCH_DEBOUNCE_MS = 350;
-declare const AsyncPopupSelect: ({ filterType, cloudId, selection, onSelectionChange, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
+declare const AsyncPopupSelect: ({ filterType, cloudId, selection, onSelectionChange, onReset: resetSelection, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
 export default AsyncPopupSelect;

package/dist/types/ui/jira-issues-modal/basic-filters/ui/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-interface BasicFilterContainerProps {
+export interface BasicFilterContainerProps {
     jql: string;
     cloudId: string;
 }

package/dist/types-ts4.5/analytics/generated/analytics.types.d.ts

@@ -3,7 +3,7 @@
  *
  * Generates Typescript types for analytics events from analytics.spec.yaml
  *
- * @codegen <<SignedSource::ddaee20abebe8b4891d75f243120dce8>>
+ * @codegen <<SignedSource::d3722446f615a812f3e336474f9d8d3c>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -90,6 +90,22 @@ export type ErrorShownBasicSearchDropdownAttributesType = {
     reason: 'agg' | 'network' | 'unknown';
 };
 export type AqlEditorSearchedAttributesType = {};
+export type GetWorkspaceIdSuccessAttributesType = {};
+export type GetWorkspaceIdFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
+export type ValidateAqlSuccessAttributesType = {};
+export type ValidateAqlFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
+export type ObjectSchemaSuccessAttributesType = {};
+export type ObjectSchemaFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
+export type ObjectSchemasSuccessAttributesType = {};
+export type ObjectSchemasFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
 export type AnalyticsEventAttributes = {
     /**
      * Fires when user sees modal dialog. */
@@ -148,5 +164,29 @@ export type AnalyticsEventAttributes = {
     /**
      * Fired when search is initiated via the search icon or enter key press for aql editor input field. */
     'ui.aqlEditor.searched': AqlEditorSearchedAttributesType;
+    /**
+     * Fired when fetching a workspace Id is successful. */
+    'operational.getWorkspaceId.success': GetWorkspaceIdSuccessAttributesType;
+    /**
+     * Fired when fetching a workspace Id fails. */
+    'operational.getWorkspaceId.failed': GetWorkspaceIdFailedAttributesType;
+    /**
+     * Fired when making a request to validateAQL is successful. */
+    'operational.validateAql.success': ValidateAqlSuccessAttributesType;
+    /**
+     * Fired when making a request to validateAQL fails. */
+    'operational.validateAql.failed': ValidateAqlFailedAttributesType;
+    /**
+     * Fired when fetching an object schema is successful. */
+    'operational.objectSchema.success': ObjectSchemaSuccessAttributesType;
+    /**
+     * Fired when fetching an object schema fails. */
+    'operational.objectSchema.failed': ObjectSchemaFailedAttributesType;
+    /**
+     * Fired when fetching object schemas is successful. */
+    'operational.objectSchemas.success': ObjectSchemasSuccessAttributesType;
+    /**
+     * Fired when fetching object schemas fails. */
+    'operational.objectSchemas.failed': ObjectSchemasFailedAttributesType;
 };
 export type EventKey = keyof AnalyticsEventAttributes;

package/dist/types-ts4.5/services/cmdbService.d.ts

@@ -1,7 +1,11 @@
+import { EventKey } from '../analytics/generated/analytics.types';
+import createEventPayload from '../analytics/generated/create-event-payload';
 import { AqlValidateResponse, FetchObjectSchemasResponse } from '../types/assets/types';
-export declare const getWorkspaceId: () => Promise<string>;
+type AnalyticsFireEvent = <K extends EventKey>(...params: Parameters<typeof createEventPayload<K>>) => void;
+export declare const getWorkspaceId: (fireEvent?: AnalyticsFireEvent) => Promise<string>;
 export declare const validateAql: (workspaceId: string, data: {
     qlQuery: string;
-}) => Promise<AqlValidateResponse>;
-export declare const fetchObjectSchema: (workspaceId: string, schemaId: string) => Promise<import("../types/assets/types").ObjectSchema>;
-export declare const fetchObjectSchemas: (workspaceId: string, query?: string) => Promise<FetchObjectSchemasResponse>;
+}, fireEvent?: AnalyticsFireEvent) => Promise<AqlValidateResponse>;
+export declare const fetchObjectSchema: (workspaceId: string, schemaId: string, fireEvent?: AnalyticsFireEvent) => Promise<import("../types/assets/types").ObjectSchema>;
+export declare const fetchObjectSchemas: (workspaceId: string, query?: string, fireEvent?: AnalyticsFireEvent) => Promise<FetchObjectSchemasResponse>;
+export {};

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.d.ts

@@ -10,6 +10,7 @@ export interface FetchFilterOptionsProps {
 export interface FilterOptionsState {
     filterOptions: SelectOption[];
     fetchFilterOptions: (prop?: FetchFilterOptionsProps) => Promise<void>;
+    reset: () => void;
     totalCount: number;
     pageCursor?: string;
     status: 'empty' | 'loading' | 'resolved' | 'rejected' | 'loadingMore';

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts

@@ -5,8 +5,9 @@ export interface AsyncPopupSelectProps {
     cloudId: string;
     selection: SelectOption[];
     onSelectionChange?: (selection: SelectOption[]) => void;
+    onReset?: () => void;
     isDisabled?: boolean;
 }
 export declare const SEARCH_DEBOUNCE_MS = 350;
-declare const AsyncPopupSelect: ({ filterType, cloudId, selection, onSelectionChange, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
+declare const AsyncPopupSelect: ({ filterType, cloudId, selection, onSelectionChange, onReset: resetSelection, isDisabled, }: AsyncPopupSelectProps) => JSX.Element;
 export default AsyncPopupSelect;

package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-interface BasicFilterContainerProps {
+export interface BasicFilterContainerProps {
     jql: string;
     cloudId: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.17.0",
+  "version": "1.17.2",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -59,11 +59,11 @@
     "@atlaskit/select": "^16.7.0",
     "@atlaskit/smart-card": "^26.42.0",
     "@atlaskit/spinner": "^15.6.0",
-    "@atlaskit/tag": "^11.6.0",
+    "@atlaskit/tag": "^12.0.0",
     "@atlaskit/textfield": "5.6.8",
     "@atlaskit/theme": "^12.6.0",
     "@atlaskit/tokens": "^1.28.0",
-    "@atlaskit/tooltip": "^17.8.0",
+    "@atlaskit/tooltip": "^18.0.0",
     "@atlaskit/ufo": "^0.2.4",
     "@atlassianlabs/jql-editor": "^2.0.1",
     "@babel/runtime": "^7.0.0",