@atlaskit/link-datasource 1.17.4 → 1.17.6

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/link-datasource
 
+## 1.17.6
+
+### Patch Changes
+
+- [#43358](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43358) [`d275736284c`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d275736284c) - Add analytics event when basic filter dropdown menu is opened.
+- [#43379](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43379) [`482c025520d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/482c025520d) - ED-20763 Upgrade ADF schema version to 33.2.3 for MBE nodes.
+
+## 1.17.5
+
+### Patch Changes
+
+- [#43340](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43340) [`bb87fcf2e29`](https://bitbucket.org/atlassian/atlassian-frontend/commits/bb87fcf2e29) - Introduce new hook `useHydrateJqlQuery` that returns the JQL hydration state for each basic filter
+- Updated dependencies
+
 ## 1.17.4
 
 ### 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.17.4"
+  packageVersion: "1.17.6"
 };

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

@@ -1,12 +1,74 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useHydrateJqlQuery = void 0;
-var useHydrateJqlQuery = exports.useHydrateJqlQuery = function useHydrateJqlQuery() {
+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 _useBasicFilterAGG2 = require("../../../../services/useBasicFilterAGG");
+var _transformers = require("../utils/transformers");
+var useHydrateJqlQuery = exports.useHydrateJqlQuery = function useHydrateJqlQuery(cloudId, jql) {
+  var _useState = (0, _react.useState)({}),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    hydratedOptions = _useState2[0],
+    setHydratedOptions = _useState2[1];
+  var _useState3 = (0, _react.useState)('empty'),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    status = _useState4[0],
+    setStatus = _useState4[1];
+  var _useState5 = (0, _react.useState)([]),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    errors = _useState6[0],
+    setErrors = _useState6[1];
+  var _useBasicFilterAGG = (0, _useBasicFilterAGG2.useBasicFilterAGG)(),
+    getHydratedJQL = _useBasicFilterAGG.getHydratedJQL;
+  var fetchHydratedJqlOptions = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+    var response;
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          setStatus('loading');
+          _context.next = 4;
+          return getHydratedJQL(cloudId, jql);
+        case 4:
+          response = _context.sent;
+          if (!(response.errors && response.errors.length > 0)) {
+            _context.next = 9;
+            break;
+          }
+          setStatus('rejected');
+          setErrors(response.errors);
+          return _context.abrupt("return");
+        case 9:
+          setHydratedOptions((0, _transformers.mapHydrateResponseData)(response));
+          setStatus('resolved');
+          _context.next = 17;
+          break;
+        case 13:
+          _context.prev = 13;
+          _context.t0 = _context["catch"](0);
+          setErrors([_context.t0]);
+          setStatus('rejected');
+        case 17:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0, 13]]);
+  })), [cloudId, getHydratedJQL, jql]);
+  (0, _react.useEffect)(function () {
+    if (status !== 'rejected' && errors.length !== 0) {
+      setErrors([]);
+    }
+  }, [errors.length, status]);
   return {
-    // TODO: https://product-fabric.atlassian.net/browse/EDM-8119
-    hydratedFields: {}
+    hydratedOptions: hydratedOptions,
+    fetchHydratedJqlOptions: fetchHydratedJqlOptions,
+    status: status,
+    errors: errors
   };
 };

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

@@ -17,6 +17,7 @@ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _reactIntlNext = require("react-intl-next");
 var _useDebounce = require("use-debounce");
 var _select = require("@atlaskit/select");
+var _analytics = require("../../../../../analytics");
 var _useFilterOptions2 = require("../../hooks/useFilterOptions");
 var _menuList = _interopRequireDefault(require("../menu-list"));
 var _control = _interopRequireDefault(require("./control"));
@@ -45,6 +46,8 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useState = (0, _react.useState)(''),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     searchTerm = _useState2[0],
@@ -161,6 +164,12 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       sortOptionsOnPopupOpen();
     }
   }, [fetchFilterOptions, searchTerm, sortOptionsOnPopupOpen, status]);
+  var handleMenuOpen = (0, _react.useCallback)(function () {
+    fireEvent('ui.dropdown.opened.basicSearchDropdown', {
+      filterType: filterType,
+      selectionCount: selectedOptions.length
+    });
+  }, [filterType, fireEvent, selectedOptions.length]);
   (0, _react.useEffect)(function () {
     if (status === 'resolved') {
       sortOptionsOnResolve();
@@ -235,6 +244,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     formatOptionLabel: _formatOptionLabel.default,
     onChange: handleOptionSelection,
     onInputChange: handleInputChange,
+    onOpen: handleMenuOpen,
     target: function target(_ref3) {
       var isOpen = _ref3.isOpen,
         triggerProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded);

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.4"
+  packageVersion: "1.17.6"
 };

package/dist/es2019/ui/jira-issues-modal/basic-filters/hooks/useHydrateJqlQuery.js

@@ -1,6 +1,38 @@
-export const useHydrateJqlQuery = () => {
+import { useCallback, useEffect, useState } from 'react';
+import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
+import { mapHydrateResponseData } from '../utils/transformers';
+export const useHydrateJqlQuery = (cloudId, jql) => {
+  const [hydratedOptions, setHydratedOptions] = useState({});
+  const [status, setStatus] = useState('empty');
+  const [errors, setErrors] = useState([]);
+  const {
+    getHydratedJQL
+  } = useBasicFilterAGG();
+  const fetchHydratedJqlOptions = useCallback(async () => {
+    try {
+      setStatus('loading');
+      const response = await getHydratedJQL(cloudId, jql);
+      if (response.errors && response.errors.length > 0) {
+        setStatus('rejected');
+        setErrors(response.errors);
+        return;
+      }
+      setHydratedOptions(mapHydrateResponseData(response));
+      setStatus('resolved');
+    } catch (error) {
+      setErrors([error]);
+      setStatus('rejected');
+    }
+  }, [cloudId, getHydratedJQL, jql]);
+  useEffect(() => {
+    if (status !== 'rejected' && errors.length !== 0) {
+      setErrors([]);
+    }
+  }, [errors.length, status]);
   return {
-    // TODO: https://product-fabric.atlassian.net/browse/EDM-8119
-    hydratedFields: {}
+    hydratedOptions,
+    fetchHydratedJqlOptions,
+    status,
+    errors
   };
 };

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

@@ -4,6 +4,7 @@ import isEqual from 'lodash/isEqual';
 import { useIntl } from 'react-intl-next';
 import { useDebouncedCallback } from 'use-debounce';
 import { CheckboxOption, PopupSelect } from '@atlaskit/select';
+import { useDatasourceAnalyticsEvents } from '../../../../../analytics';
 import { useFilterOptions } from '../../hooks/useFilterOptions';
 import CustomMenuList from '../menu-list';
 import CustomControl from './control';
@@ -26,6 +27,9 @@ const AsyncPopupSelect = ({
   const {
     formatMessage
   } = useIntl();
+  const {
+    fireEvent
+  } = useDatasourceAnalyticsEvents();
   const [searchTerm, setSearchTerm] = useState('');
   const [selectedOptions, setSelectedOptions] = useState(selection);
   const [sortedOptions, setSortedOptions] = useState([]);
@@ -111,6 +115,12 @@ const AsyncPopupSelect = ({
       sortOptionsOnPopupOpen();
     }
   }, [fetchFilterOptions, searchTerm, sortOptionsOnPopupOpen, status]);
+  const handleMenuOpen = useCallback(() => {
+    fireEvent('ui.dropdown.opened.basicSearchDropdown', {
+      filterType,
+      selectionCount: selectedOptions.length
+    });
+  }, [filterType, fireEvent, selectedOptions.length]);
   useEffect(() => {
     if (status === 'resolved') {
       sortOptionsOnResolve();
@@ -185,6 +195,7 @@ const AsyncPopupSelect = ({
     formatOptionLabel: formatOptionLabel,
     onChange: handleOptionSelection,
     onInputChange: handleInputChange,
+    onOpen: handleMenuOpen,
     target: ({
       isOpen,
       ...triggerProps

package/dist/esm/analytics/constants.js

@@ -1,5 +1,5 @@
 export var EVENT_CHANNEL = 'media';
 export var packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.17.4"
+  packageVersion: "1.17.6"
 };

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

@@ -1,6 +1,67 @@
-export var useHydrateJqlQuery = function useHydrateJqlQuery() {
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useCallback, useEffect, useState } from 'react';
+import { useBasicFilterAGG } from '../../../../services/useBasicFilterAGG';
+import { mapHydrateResponseData } from '../utils/transformers';
+export var useHydrateJqlQuery = function useHydrateJqlQuery(cloudId, jql) {
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    hydratedOptions = _useState2[0],
+    setHydratedOptions = _useState2[1];
+  var _useState3 = useState('empty'),
+    _useState4 = _slicedToArray(_useState3, 2),
+    status = _useState4[0],
+    setStatus = _useState4[1];
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    errors = _useState6[0],
+    setErrors = _useState6[1];
+  var _useBasicFilterAGG = useBasicFilterAGG(),
+    getHydratedJQL = _useBasicFilterAGG.getHydratedJQL;
+  var fetchHydratedJqlOptions = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var response;
+    return _regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.prev = 0;
+          setStatus('loading');
+          _context.next = 4;
+          return getHydratedJQL(cloudId, jql);
+        case 4:
+          response = _context.sent;
+          if (!(response.errors && response.errors.length > 0)) {
+            _context.next = 9;
+            break;
+          }
+          setStatus('rejected');
+          setErrors(response.errors);
+          return _context.abrupt("return");
+        case 9:
+          setHydratedOptions(mapHydrateResponseData(response));
+          setStatus('resolved');
+          _context.next = 17;
+          break;
+        case 13:
+          _context.prev = 13;
+          _context.t0 = _context["catch"](0);
+          setErrors([_context.t0]);
+          setStatus('rejected');
+        case 17:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[0, 13]]);
+  })), [cloudId, getHydratedJQL, jql]);
+  useEffect(function () {
+    if (status !== 'rejected' && errors.length !== 0) {
+      setErrors([]);
+    }
+  }, [errors.length, status]);
   return {
-    // TODO: https://product-fabric.atlassian.net/browse/EDM-8119
-    hydratedFields: {}
+    hydratedOptions: hydratedOptions,
+    fetchHydratedJqlOptions: fetchHydratedJqlOptions,
+    status: status,
+    errors: errors
   };
 };

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

@@ -10,6 +10,7 @@ import isEqual from 'lodash/isEqual';
 import { useIntl } from 'react-intl-next';
 import { useDebouncedCallback } from 'use-debounce';
 import { CheckboxOption, PopupSelect } from '@atlaskit/select';
+import { useDatasourceAnalyticsEvents } from '../../../../../analytics';
 import { useFilterOptions } from '../../hooks/useFilterOptions';
 import CustomMenuList from '../menu-list';
 import CustomControl from './control';
@@ -35,6 +36,8 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
+  var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     searchTerm = _useState2[0],
@@ -151,6 +154,12 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       sortOptionsOnPopupOpen();
     }
   }, [fetchFilterOptions, searchTerm, sortOptionsOnPopupOpen, status]);
+  var handleMenuOpen = useCallback(function () {
+    fireEvent('ui.dropdown.opened.basicSearchDropdown', {
+      filterType: filterType,
+      selectionCount: selectedOptions.length
+    });
+  }, [filterType, fireEvent, selectedOptions.length]);
   useEffect(function () {
     if (status === 'resolved') {
       sortOptionsOnResolve();
@@ -225,6 +234,7 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     formatOptionLabel: formatOptionLabel,
     onChange: handleOptionSelection,
     onInputChange: handleInputChange,
+    onOpen: handleMenuOpen,
     target: function target(_ref3) {
       var isOpen = _ref3.isOpen,
         triggerProps = _objectWithoutProperties(_ref3, _excluded);

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::d3722446f615a812f3e336474f9d8d3c>>
+ * @codegen <<SignedSource::f6b92bba98139798dca3a8fe75e32625>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -89,6 +89,10 @@ export type ErrorShownBasicSearchDropdownAttributesType = {
     filterType: 'project' | 'assignee' | 'issuetype' | 'status';
     reason: 'agg' | 'network' | 'unknown';
 };
+export type DropdownOpenedBasicSearchDropdownAttributesType = {
+    filterType: 'project' | 'assignee' | 'issuetype' | 'status';
+    selectionCount: number;
+};
 export type AqlEditorSearchedAttributesType = {};
 export type GetWorkspaceIdSuccessAttributesType = {};
 export type GetWorkspaceIdFailedAttributesType = {
@@ -161,6 +165,9 @@ export type AnalyticsEventAttributes = {
     /**
      * Fired when the basic filter search dropdown shows an error UI */
     'ui.error.shown.basicSearchDropdown': ErrorShownBasicSearchDropdownAttributesType;
+    /**
+     * Fired when the basic filter dropdown is opened */
+    'ui.dropdown.opened.basicSearchDropdown': DropdownOpenedBasicSearchDropdownAttributesType;
     /**
      * Fired when search is initiated via the search icon or enter key press for aql editor input field. */
     'ui.aqlEditor.searched': AqlEditorSearchedAttributesType;

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

@@ -1,3 +1,10 @@
-export declare const useHydrateJqlQuery: () => {
-    hydratedFields: {};
-};
+import { BasicFilterFieldType, SelectOption } from '../types';
+export interface HydrateJqlState {
+    hydratedOptions: {
+        [key in BasicFilterFieldType]?: SelectOption[];
+    };
+    fetchHydratedJqlOptions: () => Promise<void>;
+    status: 'empty' | 'loading' | 'resolved' | 'rejected';
+    errors: unknown[];
+}
+export declare const useHydrateJqlQuery: (cloudId: string, jql: string) => HydrateJqlState;

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::d3722446f615a812f3e336474f9d8d3c>>
+ * @codegen <<SignedSource::f6b92bba98139798dca3a8fe75e32625>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -89,6 +89,10 @@ export type ErrorShownBasicSearchDropdownAttributesType = {
     filterType: 'project' | 'assignee' | 'issuetype' | 'status';
     reason: 'agg' | 'network' | 'unknown';
 };
+export type DropdownOpenedBasicSearchDropdownAttributesType = {
+    filterType: 'project' | 'assignee' | 'issuetype' | 'status';
+    selectionCount: number;
+};
 export type AqlEditorSearchedAttributesType = {};
 export type GetWorkspaceIdSuccessAttributesType = {};
 export type GetWorkspaceIdFailedAttributesType = {
@@ -161,6 +165,9 @@ export type AnalyticsEventAttributes = {
     /**
      * Fired when the basic filter search dropdown shows an error UI */
     'ui.error.shown.basicSearchDropdown': ErrorShownBasicSearchDropdownAttributesType;
+    /**
+     * Fired when the basic filter dropdown is opened */
+    'ui.dropdown.opened.basicSearchDropdown': DropdownOpenedBasicSearchDropdownAttributesType;
     /**
      * Fired when search is initiated via the search icon or enter key press for aql editor input field. */
     'ui.aqlEditor.searched': AqlEditorSearchedAttributesType;

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

@@ -1,3 +1,10 @@
-export declare const useHydrateJqlQuery: () => {
-    hydratedFields: {};
-};
+import { BasicFilterFieldType, SelectOption } from '../types';
+export interface HydrateJqlState {
+    hydratedOptions: {
+        [key in BasicFilterFieldType]?: SelectOption[];
+    };
+    fetchHydratedJqlOptions: () => Promise<void>;
+    status: 'empty' | 'loading' | 'resolved' | 'rejected';
+    errors: unknown[];
+}
+export declare const useHydrateJqlQuery: (cloudId: string, jql: string) => HydrateJqlState;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.17.4",
+  "version": "1.17.6",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -30,7 +30,7 @@
     "analytics:codegen": "yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource --output ./src/analytics/generated"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^32.0.0",
+    "@atlaskit/adf-schema": "^33.2.3",
     "@atlaskit/analytics-next": "^9.1.3",
     "@atlaskit/avatar": "^21.4.0",
     "@atlaskit/badge": "^15.1.16",
@@ -56,9 +56,9 @@
     "@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^0.6.0",
     "@atlaskit/pragmatic-drag-and-drop-react-indicator": "^0.17.0",
     "@atlaskit/primitives": "^1.10.0",
-    "@atlaskit/select": "^16.7.0",
+    "@atlaskit/select": "^17.0.0",
     "@atlaskit/smart-card": "^26.42.0",
-    "@atlaskit/spinner": "^15.6.0",
+    "@atlaskit/spinner": "^16.0.0",
     "@atlaskit/tag": "^12.0.0",
     "@atlaskit/textfield": "5.6.8",
     "@atlaskit/theme": "^12.6.0",