@atlaskit/link-datasource 1.25.0 → 1.25.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/link-datasource
 
+## 1.25.1
+
+### Patch Changes
+
+- [#86770](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/86770) [`67209c8f2921`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/67209c8f2921) - Adds cancel button click analytics event and tests to confluence-search config modal.
+- Updated dependencies
+
 ## 1.25.0
 
 ### Minor Changes

package/dist/cjs/ui/assets-modal/modal/index.js

@@ -31,6 +31,7 @@ var _en = _interopRequireDefault(require("../../../i18n/en"));
 var _cmdbService = require("../../../services/cmdbService.utils");
 var _accessRequired = require("../../../ui/common/error-state/access-required");
 var _modalLoadingError = require("../../common/error-state/modal-loading-error");
+var _cancelButton = require("../../common/modal/cancel-button");
 var _searchContainer = require("../search-container");
 var _loadingState = require("../search-container/loading-state");
 var _messages = require("./messages");
@@ -272,17 +273,6 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       }), consumerEvent);
     }
   }, [aql, schemaId, workspaceId, analyticsPayload, totalCount, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
-  var onCancelClick = (0, _react.useCallback)(function (e, analyticEvent) {
-    analyticEvent.update({
-      eventType: 'ui',
-      actionSubjectId: 'cancel',
-      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
-        searchCount: searchCount.current,
-        actions: Array.from(userInteractionActions.current)
-      })
-    }).fire(_analytics.EVENT_CHANNEL);
-    onCancel();
-  }, [analyticsPayload, onCancel]);
   var handleOnSearch = (0, _react.useCallback)(function (searchAql, searchSchemaId) {
     if (schemaId !== searchSchemaId || aql !== searchAql || status === 'rejected') {
       searchCount.current++;
@@ -336,6 +326,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       });
     }
   }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status]);
+  var getCancelButtonAnalyticsPayload = (0, _react.useCallback)(function () {
+    return _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+      searchCount: searchCount.current,
+      actions: Array.from(userInteractionActions.current)
+    });
+  }, [analyticsPayload]);
   return (0, _react2.jsx)(_intlMessagesProvider.IntlMessagesProvider, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
@@ -362,11 +358,11 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     columns: columns,
     defaultVisibleColumnKeys: defaultVisibleColumnKeys,
     modalRenderInstanceId: modalRenderInstanceId
-  })), (0, _react2.jsx)(_modalDialog.ModalFooter, null, (0, _react2.jsx)(_standardButton.default, {
-    appearance: "default",
-    onClick: onCancelClick,
+  })), (0, _react2.jsx)(_modalDialog.ModalFooter, null, (0, _react2.jsx)(_cancelButton.CancelButton, {
+    onCancel: onCancel,
+    getAnalyticsPayload: getCancelButtonAnalyticsPayload,
     testId: 'asset-datasource-modal--cancel-button'
-  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.cancelButtonText)), (0, _react2.jsx)(_standardButton.default, {
+  }), (0, _react2.jsx)(_standardButton.default, {
     appearance: "primary",
     onClick: onInsertPressed,
     isDisabled: isDisabled,

package/dist/cjs/ui/assets-modal/modal/messages.js

@@ -6,11 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.modalMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
 var modalMessages = exports.modalMessages = (0, _reactIntlNext.defineMessages)({
-  cancelButtonText: {
-    id: 'linkDataSource.assets.configmodal.cancelButtonText',
-    description: 'Button text to close the modal with no changes being made',
-    defaultMessage: 'Cancel'
-  },
   updateObjectsButtonText: {
     id: 'linkDataSource.assets.configmodal.updateObjectsButtonText',
     description: 'Button text to update the displayed content',

package/dist/cjs/ui/common/modal/cancel-button/index.js

@@ -0,0 +1,31 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CancelButton = void 0;
+var _react = require("react");
+var _react2 = require("@emotion/react");
+var _reactIntlNext = require("react-intl-next");
+var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
+var _analytics = require("../../../../analytics");
+var _messages = require("./messages");
+/** @jsx jsx */
+
+var CancelButton = exports.CancelButton = function CancelButton(_ref) {
+  var getAnalyticsPayload = _ref.getAnalyticsPayload,
+    onCancel = _ref.onCancel,
+    testId = _ref.testId;
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
+  var onCancelClick = (0, _react.useCallback)(function () {
+    fireEvent('ui.button.clicked.cancel', getAnalyticsPayload());
+    onCancel();
+  }, [getAnalyticsPayload, fireEvent, onCancel]);
+  return (0, _react2.jsx)(_standardButton.default, {
+    appearance: "default",
+    onClick: onCancelClick,
+    testId: testId
+  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.cancelButtonMessages.cancelButtonText));
+};

package/dist/cjs/ui/common/modal/cancel-button/messages.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.cancelButtonMessages = void 0;
+var _reactIntlNext = require("react-intl-next");
+var cancelButtonMessages = exports.cancelButtonMessages = (0, _reactIntlNext.defineMessages)({
+  cancelButtonText: {
+    id: 'linkDataSource.configmodal.cancelButtonText',
+    description: 'Button text to close the modal with no changes being made',
+    defaultMessage: 'Cancel'
+  }
+});

package/dist/cjs/ui/confluence-search-modal/modal/index.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ConfluenceSearchConfigModal = void 0;
+exports.PlainConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -16,6 +16,7 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _uuid = require("uuid");
+var _analyticsNext = require("@atlaskit/analytics-next");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
@@ -23,6 +24,8 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
 var _colors = require("@atlaskit/theme/colors");
+var _constants = require("../../../analytics/constants");
+var _types = require("../../../analytics/types");
 var _adf = require("../../../common/utils/adf");
 var _fetchMessagesForLocale = require("../../../common/utils/locale/fetch-messages-for-locale");
 var _useDatasourceTableState = require("../../../hooks/useDatasourceTableState");
@@ -33,6 +36,7 @@ var _modalLoadingError = require("../../common/error-state/modal-loading-error")
 var _noInstances = require("../../common/error-state/no-instances");
 var _noResults = require("../../common/error-state/no-results");
 var _initialStateView = require("../../common/initial-state-view");
+var _cancelButton = require("../../common/modal/cancel-button");
 var _contentContainer = require("../../common/modal/content-container");
 var _siteSelector = require("../../common/modal/site-selector");
 var _issueLikeTable = require("../../issue-like-table");
@@ -52,7 +56,7 @@ var searchCountStyles = (0, _primitives.xcss)({
   flex: 1,
   fontWeight: 600
 });
-var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(props) {
+var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConfigModal(props) {
   var _useRef = (0, _react.useRef)((0, _uuid.v4)()),
     modalRenderInstanceId = _useRef.current;
   var datasourceId = props.datasourceId,
@@ -80,6 +84,10 @@ var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = function
     visibleColumnKeys = _useState8[0],
     setVisibleColumnKeys = _useState8[1];
 
+  // analytics related parameters
+  var searchCount = (0, _react.useRef)(0);
+  var userInteractionActions = (0, _react.useRef)(new Set());
+
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829210
   var parameters = (0, _react.useMemo)(function () {
@@ -106,9 +114,10 @@ var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = function
     columns = _useDatasourceTableSt.columns,
     defaultVisibleColumnKeys = _useDatasourceTableSt.defaultVisibleColumnKeys,
     loadDatasourceDetails = _useDatasourceTableSt.loadDatasourceDetails,
+    totalCount = _useDatasourceTableSt.totalCount,
     _useDatasourceTableSt2 = _useDatasourceTableSt.extensionKey,
     extensionKey = _useDatasourceTableSt2 === void 0 ? null : _useDatasourceTableSt2,
-    totalCount = _useDatasourceTableSt.totalCount;
+    destinationObjectTypes = _useDatasourceTableSt.destinationObjectTypes;
   var hasNoConfluenceSites = availableSites && availableSites.length === 0;
   var selectedConfluenceSite = (0, _react.useMemo)(function () {
     if (cloudId) {
@@ -270,14 +279,24 @@ var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = function
         }
       }]
     }));
-  }, [cloudId, isParametersSet, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
+  }, [isParametersSet, cloudId, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
   var onSearch = (0, _react.useCallback)(function (newSearchString) {
+    searchCount.current++;
+    userInteractionActions.current.add(_types.DatasourceAction.QUERY_UPDATED);
     setSearchString(newSearchString);
     reset({
       shouldForceRequest: true
     });
   }, [reset]);
   var isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
+  var getCancelButtonAnalyticsPayload = (0, _react.useCallback)(function () {
+    return {
+      extensionKey: extensionKey,
+      destinationObjectTypes: destinationObjectTypes,
+      searchCount: searchCount.current,
+      actions: Array.from(userInteractionActions.current)
+    };
+  }, [destinationObjectTypes, extensionKey]);
   return (0, _react2.jsx)(_intlMessagesProvider.IntlMessagesProvider, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
@@ -319,13 +338,24 @@ var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = function
     values: {
       totalCount: totalCount
     }
-  })))), (0, _react2.jsx)(_standardButton.default, {
-    appearance: "default",
-    onClick: onCancel
-  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.confluenceSearchModalMessages.cancelButtonText)), !hasNoConfluenceSites && (0, _react2.jsx)(_standardButton.default, {
+  })))), (0, _react2.jsx)(_cancelButton.CancelButton, {
+    onCancel: onCancel,
+    getAnalyticsPayload: getCancelButtonAnalyticsPayload,
+    testId: "confluence-search-modal--cancel-button"
+  }), !hasNoConfluenceSites && (0, _react2.jsx)(_standardButton.default, {
     appearance: "primary",
     onClick: onInsertPressed,
     isDisabled: isInsertDisabled,
     testId: "confluence-search-datasource-modal--insert-button"
   }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.confluenceSearchModalMessages.insertResultsButtonText)))));
-};
+};
+var analyticsContextAttributes = {
+  dataProvider: 'confluence-search'
+};
+var analyticsContextData = _objectSpread(_objectSpread({}, _constants.componentMetadata.configModal), {}, {
+  source: 'datasourceConfigModal'
+});
+var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
+  attributes: _objectSpread({}, analyticsContextAttributes)
+});
+var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = (0, _analyticsNext.withAnalyticsContext)(contextData)(PlainConfluenceSearchConfigModal);

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

@@ -42,6 +42,7 @@ var _noInstances = require("../../common/error-state/no-instances");
 var _noResults = require("../../common/error-state/no-results");
 var _initialStateView = require("../../common/initial-state-view");
 var _messages2 = require("../../common/initial-state-view/messages");
+var _cancelButton = require("../../common/modal/cancel-button");
 var _contentContainer = require("../../common/modal/content-container");
 var _siteSelector = require("../../common/modal/site-selector");
 var _issueLikeTable = require("../../issue-like-table");
@@ -335,17 +336,6 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
       shouldForceRequest: true
     });
   }, [jql, reset]);
-  var onCancelClick = (0, _react.useCallback)(function (e, analyticEvent) {
-    analyticEvent.update({
-      eventType: 'ui',
-      actionSubjectId: 'cancel',
-      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
-        searchCount: searchCount.current,
-        actions: Array.from(userInteractionActions.current)
-      })
-    }).fire(_analytics.EVENT_CHANNEL);
-    onCancel();
-  }, [analyticsPayload, onCancel]);
   var onSiteSelection = (0, _react.useCallback)(function (site) {
     userInteractionActions.current.add(_types.DatasourceAction.INSTANCE_UPDATED);
     setJql('');
@@ -547,6 +537,12 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     return issueLikeDataTableView;
   }, [columns.length, currentSearchMethod, issueLikeDataTableView, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? _messages3.modalMessages.insertIssuesTitleManySites : _messages3.modalMessages.insertIssuesTitle;
+  var getCancelButtonAnalyticsPayload = (0, _react.useCallback)(function () {
+    return _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+      searchCount: searchCount.current,
+      actions: Array.from(userInteractionActions.current)
+    });
+  }, [analyticsPayload]);
   return (0, _react2.jsx)(_intlMessagesProvider.IntlMessagesProvider, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
@@ -593,10 +589,11 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     values: {
       totalCount: totalCount
     }
-  })))), (0, _react2.jsx)(_standardButton.default, {
-    appearance: "default",
-    onClick: onCancelClick
-  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages3.modalMessages.cancelButtonText)), !hasNoJiraSites && (0, _react2.jsx)(_standardButton.default, {
+  })))), (0, _react2.jsx)(_cancelButton.CancelButton, {
+    onCancel: onCancel,
+    getAnalyticsPayload: getCancelButtonAnalyticsPayload,
+    testId: "jira-datasource-modal--cancel-button"
+  }), !hasNoJiraSites && (0, _react2.jsx)(_standardButton.default, {
     appearance: "primary",
     onClick: onInsertPressed,
     isDisabled: isInsertDisabled,

package/dist/cjs/ui/jira-issues-modal/modal/messages.js

@@ -6,11 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.modalMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
 var modalMessages = exports.modalMessages = (0, _reactIntlNext.defineMessages)({
-  cancelButtonText: {
-    id: 'linkDataSource.jira-issues.configmodal.cancelButtonText',
-    description: 'Button text to close the modal with no changes being made',
-    defaultMessage: 'Cancel'
-  },
   insertIssuesButtonText: {
     id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText',
     description: 'Button text to insert the displayed content',

package/dist/es2019/ui/assets-modal/modal/index.js

@@ -22,6 +22,7 @@ import i18nEN from '../../../i18n/en';
 import { PermissionError } from '../../../services/cmdbService.utils';
 import { AccessRequired } from '../../../ui/common/error-state/access-required';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
+import { CancelButton } from '../../common/modal/cancel-button';
 import { AssetsSearchContainer } from '../search-container';
 import { AssetsSearchContainerLoading } from '../search-container/loading-state';
 import { modalMessages } from './messages';
@@ -246,18 +247,6 @@ const PlainAssetsConfigModal = props => {
       }), consumerEvent);
     }
   }, [aql, schemaId, workspaceId, analyticsPayload, totalCount, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
-  const onCancelClick = useCallback((e, analyticEvent) => {
-    analyticEvent.update({
-      eventType: 'ui',
-      actionSubjectId: 'cancel',
-      attributes: {
-        ...analyticsPayload,
-        searchCount: searchCount.current,
-        actions: Array.from(userInteractionActions.current)
-      }
-    }).fire(EVENT_CHANNEL);
-    onCancel();
-  }, [analyticsPayload, onCancel]);
   const handleOnSearch = useCallback((searchAql, searchSchemaId) => {
     if (schemaId !== searchSchemaId || aql !== searchAql || status === 'rejected') {
       searchCount.current++;
@@ -311,6 +300,13 @@ const PlainAssetsConfigModal = props => {
       });
     }
   }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status]);
+  const getCancelButtonAnalyticsPayload = useCallback(() => {
+    return {
+      ...analyticsPayload,
+      searchCount: searchCount.current,
+      actions: Array.from(userInteractionActions.current)
+    };
+  }, [analyticsPayload]);
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
@@ -337,11 +333,11 @@ const PlainAssetsConfigModal = props => {
     columns: columns,
     defaultVisibleColumnKeys: defaultVisibleColumnKeys,
     modalRenderInstanceId: modalRenderInstanceId
-  })), jsx(ModalFooter, null, jsx(Button, {
-    appearance: "default",
-    onClick: onCancelClick,
+  })), jsx(ModalFooter, null, jsx(CancelButton, {
+    onCancel: onCancel,
+    getAnalyticsPayload: getCancelButtonAnalyticsPayload,
     testId: 'asset-datasource-modal--cancel-button'
-  }, jsx(FormattedMessage, modalMessages.cancelButtonText)), jsx(Button, {
+  }), jsx(Button, {
     appearance: "primary",
     onClick: onInsertPressed,
     isDisabled: isDisabled,

package/dist/es2019/ui/assets-modal/modal/messages.js

@@ -1,10 +1,5 @@
 import { defineMessages } from 'react-intl-next';
 export const modalMessages = defineMessages({
-  cancelButtonText: {
-    id: 'linkDataSource.assets.configmodal.cancelButtonText',
-    description: 'Button text to close the modal with no changes being made',
-    defaultMessage: 'Cancel'
-  },
   updateObjectsButtonText: {
     id: 'linkDataSource.assets.configmodal.updateObjectsButtonText',
     description: 'Button text to update the displayed content',

package/dist/es2019/ui/common/modal/cancel-button/index.js

@@ -0,0 +1,25 @@
+/** @jsx jsx */
+import { useCallback } from 'react';
+import { jsx } from '@emotion/react';
+import { FormattedMessage } from 'react-intl-next';
+import Button from '@atlaskit/button/standard-button';
+import { useDatasourceAnalyticsEvents } from '../../../../analytics';
+import { cancelButtonMessages } from './messages';
+export const CancelButton = ({
+  getAnalyticsPayload,
+  onCancel,
+  testId
+}) => {
+  const {
+    fireEvent
+  } = useDatasourceAnalyticsEvents();
+  const onCancelClick = useCallback(() => {
+    fireEvent('ui.button.clicked.cancel', getAnalyticsPayload());
+    onCancel();
+  }, [getAnalyticsPayload, fireEvent, onCancel]);
+  return jsx(Button, {
+    appearance: "default",
+    onClick: onCancelClick,
+    testId: testId
+  }, jsx(FormattedMessage, cancelButtonMessages.cancelButtonText));
+};

package/dist/es2019/ui/common/modal/cancel-button/messages.js

@@ -0,0 +1,8 @@
+import { defineMessages } from 'react-intl-next';
+export const cancelButtonMessages = defineMessages({
+  cancelButtonText: {
+    id: 'linkDataSource.configmodal.cancelButtonText',
+    description: 'Button text to close the modal with no changes being made',
+    defaultMessage: 'Cancel'
+  }
+});

package/dist/es2019/ui/confluence-search-modal/modal/index.js

@@ -4,6 +4,7 @@ import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'rea
 import { jsx } from '@emotion/react';
 import { FormattedMessage, FormattedNumber } from 'react-intl-next';
 import { v4 as uuidv4 } from 'uuid';
+import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
@@ -11,6 +12,8 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import LinkUrl from '@atlaskit/smart-card/link-url';
 import { N800 } from '@atlaskit/theme/colors';
+import { componentMetadata } from '../../../analytics/constants';
+import { DatasourceAction } from '../../../analytics/types';
 import { buildDatasourceAdf } from '../../../common/utils/adf';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
@@ -21,6 +24,7 @@ import { ModalLoadingError } from '../../common/error-state/modal-loading-error'
 import { NoInstancesView } from '../../common/error-state/no-instances';
 import { NoResults } from '../../common/error-state/no-results';
 import { InitialStateView } from '../../common/initial-state-view';
+import { CancelButton } from '../../common/modal/cancel-button';
 import { ContentContainer } from '../../common/modal/content-container';
 import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
@@ -36,7 +40,7 @@ const searchCountStyles = xcss({
   flex: 1,
   fontWeight: 600
 });
-export const ConfluenceSearchConfigModal = props => {
+export const PlainConfluenceSearchConfigModal = props => {
   const {
     current: modalRenderInstanceId
   } = useRef(uuidv4());
@@ -55,6 +59,10 @@ export const ConfluenceSearchConfigModal = props => {
   const [searchString, setSearchString] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString);
   const [visibleColumnKeys, setVisibleColumnKeys] = useState(initialVisibleColumnKeys);
 
+  // analytics related parameters
+  const searchCount = useRef(0);
+  const userInteractionActions = useRef(new Set());
+
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829210
   const parameters = useMemo(() => ({
@@ -72,8 +80,9 @@ export const ConfluenceSearchConfigModal = props => {
     columns,
     defaultVisibleColumnKeys,
     loadDatasourceDetails,
+    totalCount,
     extensionKey = null,
-    totalCount
+    destinationObjectTypes
   } = useDatasourceTableState({
     datasourceId,
     parameters: isParametersSet ? parameters : undefined,
@@ -215,14 +224,24 @@ export const ConfluenceSearchConfigModal = props => {
         }
       }]
     }));
-  }, [cloudId, isParametersSet, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
+  }, [isParametersSet, cloudId, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
   const onSearch = useCallback(newSearchString => {
+    searchCount.current++;
+    userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
     setSearchString(newSearchString);
     reset({
       shouldForceRequest: true
     });
   }, [reset]);
   const isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
+  const getCancelButtonAnalyticsPayload = useCallback(() => {
+    return {
+      extensionKey,
+      destinationObjectTypes,
+      searchCount: searchCount.current,
+      actions: Array.from(userInteractionActions.current)
+    };
+  }, [destinationObjectTypes, extensionKey]);
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
@@ -264,13 +283,28 @@ export const ConfluenceSearchConfigModal = props => {
     values: {
       totalCount
     }
-  })))), jsx(Button, {
-    appearance: "default",
-    onClick: onCancel
-  }, jsx(FormattedMessage, confluenceSearchModalMessages.cancelButtonText)), !hasNoConfluenceSites && jsx(Button, {
+  })))), jsx(CancelButton, {
+    onCancel: onCancel,
+    getAnalyticsPayload: getCancelButtonAnalyticsPayload,
+    testId: "confluence-search-modal--cancel-button"
+  }), !hasNoConfluenceSites && jsx(Button, {
     appearance: "primary",
     onClick: onInsertPressed,
     isDisabled: isInsertDisabled,
     testId: "confluence-search-datasource-modal--insert-button"
   }, jsx(FormattedMessage, confluenceSearchModalMessages.insertResultsButtonText)))));
-};
+};
+const analyticsContextAttributes = {
+  dataProvider: 'confluence-search'
+};
+const analyticsContextData = {
+  ...componentMetadata.configModal,
+  source: 'datasourceConfigModal'
+};
+const contextData = {
+  ...analyticsContextData,
+  attributes: {
+    ...analyticsContextAttributes
+  }
+};
+export const ConfluenceSearchConfigModal = withAnalyticsContext(contextData)(PlainConfluenceSearchConfigModal);

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

@@ -30,6 +30,7 @@ import { NoInstancesView } from '../../common/error-state/no-instances';
 import { NoResults } from '../../common/error-state/no-results';
 import { InitialStateView } from '../../common/initial-state-view';
 import { initialStateViewMessages } from '../../common/initial-state-view/messages';
+import { CancelButton } from '../../common/modal/cancel-button';
 import { ContentContainer } from '../../common/modal/content-container';
 import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
@@ -161,12 +162,10 @@ export const PlainJiraIssuesConfigModal = props => {
       return (availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(jiraSite => jiraSite.url === currentlyLoggedInSiteUrl)) || (availableSites === null || availableSites === void 0 ? void 0 : availableSites[0]);
     }
   }, [availableSites, cloudId]);
-  const analyticsPayload = useMemo(() => {
-    return {
-      extensionKey: extensionKey,
-      destinationObjectTypes: destinationObjectTypes
-    };
-  }, [destinationObjectTypes, extensionKey]);
+  const analyticsPayload = useMemo(() => ({
+    extensionKey,
+    destinationObjectTypes
+  }), [destinationObjectTypes, extensionKey]);
   const resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   const jqlUrl = selectedJiraSite && jql && `${selectedJiraSite.url}/issues/?jql=${encodeURI(jql)}`;
   const isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
@@ -277,18 +276,6 @@ export const PlainJiraIssuesConfigModal = props => {
       shouldForceRequest: true
     });
   }, [jql, reset]);
-  const onCancelClick = useCallback((e, analyticEvent) => {
-    analyticEvent.update({
-      eventType: 'ui',
-      actionSubjectId: 'cancel',
-      attributes: {
-        ...analyticsPayload,
-        searchCount: searchCount.current,
-        actions: Array.from(userInteractionActions.current)
-      }
-    }).fire(EVENT_CHANNEL);
-    onCancel();
-  }, [analyticsPayload, onCancel]);
   const onSiteSelection = useCallback(site => {
     userInteractionActions.current.add(DatasourceAction.INSTANCE_UPDATED);
     setJql('');
@@ -493,6 +480,13 @@ export const PlainJiraIssuesConfigModal = props => {
     return issueLikeDataTableView;
   }, [columns.length, currentSearchMethod, issueLikeDataTableView, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
   const siteSelectorLabel = availableSites && availableSites.length > 1 ? modalMessages.insertIssuesTitleManySites : modalMessages.insertIssuesTitle;
+  const getCancelButtonAnalyticsPayload = useCallback(() => {
+    return {
+      ...analyticsPayload,
+      searchCount: searchCount.current,
+      actions: Array.from(userInteractionActions.current)
+    };
+  }, [analyticsPayload]);
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
@@ -539,10 +533,11 @@ export const PlainJiraIssuesConfigModal = props => {
     values: {
       totalCount
     }
-  })))), jsx(Button, {
-    appearance: "default",
-    onClick: onCancelClick
-  }, jsx(FormattedMessage, modalMessages.cancelButtonText)), !hasNoJiraSites && jsx(Button, {
+  })))), jsx(CancelButton, {
+    onCancel: onCancel,
+    getAnalyticsPayload: getCancelButtonAnalyticsPayload,
+    testId: "jira-datasource-modal--cancel-button"
+  }), !hasNoJiraSites && jsx(Button, {
     appearance: "primary",
     onClick: onInsertPressed,
     isDisabled: isInsertDisabled,

package/dist/es2019/ui/jira-issues-modal/modal/messages.js

@@ -1,10 +1,5 @@
 import { defineMessages } from 'react-intl-next';
 export const modalMessages = defineMessages({
-  cancelButtonText: {
-    id: 'linkDataSource.jira-issues.configmodal.cancelButtonText',
-    description: 'Button text to close the modal with no changes being made',
-    defaultMessage: 'Cancel'
-  },
   insertIssuesButtonText: {
     id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText',
     description: 'Button text to insert the displayed content',

package/dist/esm/ui/assets-modal/modal/index.js

@@ -26,6 +26,7 @@ import i18nEN from '../../../i18n/en';
 import { PermissionError } from '../../../services/cmdbService.utils';
 import { AccessRequired } from '../../../ui/common/error-state/access-required';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
+import { CancelButton } from '../../common/modal/cancel-button';
 import { AssetsSearchContainer } from '../search-container';
 import { AssetsSearchContainerLoading } from '../search-container/loading-state';
 import { modalMessages } from './messages';
@@ -263,17 +264,6 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       }), consumerEvent);
     }
   }, [aql, schemaId, workspaceId, analyticsPayload, totalCount, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
-  var onCancelClick = useCallback(function (e, analyticEvent) {
-    analyticEvent.update({
-      eventType: 'ui',
-      actionSubjectId: 'cancel',
-      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
-        searchCount: searchCount.current,
-        actions: Array.from(userInteractionActions.current)
-      })
-    }).fire(EVENT_CHANNEL);
-    onCancel();
-  }, [analyticsPayload, onCancel]);
   var handleOnSearch = useCallback(function (searchAql, searchSchemaId) {
     if (schemaId !== searchSchemaId || aql !== searchAql || status === 'rejected') {
       searchCount.current++;
@@ -327,6 +317,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       });
     }
   }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status]);
+  var getCancelButtonAnalyticsPayload = useCallback(function () {
+    return _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+      searchCount: searchCount.current,
+      actions: Array.from(userInteractionActions.current)
+    });
+  }, [analyticsPayload]);
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
@@ -353,11 +349,11 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     columns: columns,
     defaultVisibleColumnKeys: defaultVisibleColumnKeys,
     modalRenderInstanceId: modalRenderInstanceId
-  })), jsx(ModalFooter, null, jsx(Button, {
-    appearance: "default",
-    onClick: onCancelClick,
+  })), jsx(ModalFooter, null, jsx(CancelButton, {
+    onCancel: onCancel,
+    getAnalyticsPayload: getCancelButtonAnalyticsPayload,
     testId: 'asset-datasource-modal--cancel-button'
-  }, jsx(FormattedMessage, modalMessages.cancelButtonText)), jsx(Button, {
+  }), jsx(Button, {
     appearance: "primary",
     onClick: onInsertPressed,
     isDisabled: isDisabled,

package/dist/esm/ui/assets-modal/modal/messages.js

@@ -1,10 +1,5 @@
 import { defineMessages } from 'react-intl-next';
 export var modalMessages = defineMessages({
-  cancelButtonText: {
-    id: 'linkDataSource.assets.configmodal.cancelButtonText',
-    description: 'Button text to close the modal with no changes being made',
-    defaultMessage: 'Cancel'
-  },
   updateObjectsButtonText: {
     id: 'linkDataSource.assets.configmodal.updateObjectsButtonText',
     description: 'Button text to update the displayed content',

package/dist/esm/ui/common/modal/cancel-button/index.js

@@ -0,0 +1,23 @@
+/** @jsx jsx */
+import { useCallback } from 'react';
+import { jsx } from '@emotion/react';
+import { FormattedMessage } from 'react-intl-next';
+import Button from '@atlaskit/button/standard-button';
+import { useDatasourceAnalyticsEvents } from '../../../../analytics';
+import { cancelButtonMessages } from './messages';
+export var CancelButton = function CancelButton(_ref) {
+  var getAnalyticsPayload = _ref.getAnalyticsPayload,
+    onCancel = _ref.onCancel,
+    testId = _ref.testId;
+  var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
+  var onCancelClick = useCallback(function () {
+    fireEvent('ui.button.clicked.cancel', getAnalyticsPayload());
+    onCancel();
+  }, [getAnalyticsPayload, fireEvent, onCancel]);
+  return jsx(Button, {
+    appearance: "default",
+    onClick: onCancelClick,
+    testId: testId
+  }, jsx(FormattedMessage, cancelButtonMessages.cancelButtonText));
+};

package/dist/esm/ui/common/modal/cancel-button/messages.js

@@ -0,0 +1,8 @@
+import { defineMessages } from 'react-intl-next';
+export var cancelButtonMessages = defineMessages({
+  cancelButtonText: {
+    id: 'linkDataSource.configmodal.cancelButtonText',
+    description: 'Button text to close the modal with no changes being made',
+    defaultMessage: 'Cancel'
+  }
+});

package/dist/esm/ui/confluence-search-modal/modal/index.js

@@ -11,6 +11,7 @@ import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'rea
 import { jsx } from '@emotion/react';
 import { FormattedMessage, FormattedNumber } from 'react-intl-next';
 import { v4 as uuidv4 } from 'uuid';
+import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
@@ -18,6 +19,8 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import LinkUrl from '@atlaskit/smart-card/link-url';
 import { N800 } from '@atlaskit/theme/colors';
+import { componentMetadata } from '../../../analytics/constants';
+import { DatasourceAction } from '../../../analytics/types';
 import { buildDatasourceAdf } from '../../../common/utils/adf';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
@@ -28,6 +31,7 @@ import { ModalLoadingError } from '../../common/error-state/modal-loading-error'
 import { NoInstancesView } from '../../common/error-state/no-instances';
 import { NoResults } from '../../common/error-state/no-results';
 import { InitialStateView } from '../../common/initial-state-view';
+import { CancelButton } from '../../common/modal/cancel-button';
 import { ContentContainer } from '../../common/modal/content-container';
 import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
@@ -43,7 +47,7 @@ var searchCountStyles = xcss({
   flex: 1,
   fontWeight: 600
 });
-export var ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(props) {
+export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConfigModal(props) {
   var _useRef = useRef(uuidv4()),
     modalRenderInstanceId = _useRef.current;
   var datasourceId = props.datasourceId,
@@ -71,6 +75,10 @@ export var ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(pr
     visibleColumnKeys = _useState8[0],
     setVisibleColumnKeys = _useState8[1];
 
+  // analytics related parameters
+  var searchCount = useRef(0);
+  var userInteractionActions = useRef(new Set());
+
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829210
   var parameters = useMemo(function () {
@@ -97,9 +105,10 @@ export var ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(pr
     columns = _useDatasourceTableSt.columns,
     defaultVisibleColumnKeys = _useDatasourceTableSt.defaultVisibleColumnKeys,
     loadDatasourceDetails = _useDatasourceTableSt.loadDatasourceDetails,
+    totalCount = _useDatasourceTableSt.totalCount,
     _useDatasourceTableSt2 = _useDatasourceTableSt.extensionKey,
     extensionKey = _useDatasourceTableSt2 === void 0 ? null : _useDatasourceTableSt2,
-    totalCount = _useDatasourceTableSt.totalCount;
+    destinationObjectTypes = _useDatasourceTableSt.destinationObjectTypes;
   var hasNoConfluenceSites = availableSites && availableSites.length === 0;
   var selectedConfluenceSite = useMemo(function () {
     if (cloudId) {
@@ -261,14 +270,24 @@ export var ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(pr
         }
       }]
     }));
-  }, [cloudId, isParametersSet, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
+  }, [isParametersSet, cloudId, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
   var onSearch = useCallback(function (newSearchString) {
+    searchCount.current++;
+    userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
     setSearchString(newSearchString);
     reset({
       shouldForceRequest: true
     });
   }, [reset]);
   var isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
+  var getCancelButtonAnalyticsPayload = useCallback(function () {
+    return {
+      extensionKey: extensionKey,
+      destinationObjectTypes: destinationObjectTypes,
+      searchCount: searchCount.current,
+      actions: Array.from(userInteractionActions.current)
+    };
+  }, [destinationObjectTypes, extensionKey]);
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
@@ -310,13 +329,24 @@ export var ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(pr
     values: {
       totalCount: totalCount
     }
-  })))), jsx(Button, {
-    appearance: "default",
-    onClick: onCancel
-  }, jsx(FormattedMessage, confluenceSearchModalMessages.cancelButtonText)), !hasNoConfluenceSites && jsx(Button, {
+  })))), jsx(CancelButton, {
+    onCancel: onCancel,
+    getAnalyticsPayload: getCancelButtonAnalyticsPayload,
+    testId: "confluence-search-modal--cancel-button"
+  }), !hasNoConfluenceSites && jsx(Button, {
     appearance: "primary",
     onClick: onInsertPressed,
     isDisabled: isInsertDisabled,
     testId: "confluence-search-datasource-modal--insert-button"
   }, jsx(FormattedMessage, confluenceSearchModalMessages.insertResultsButtonText)))));
-};
+};
+var analyticsContextAttributes = {
+  dataProvider: 'confluence-search'
+};
+var analyticsContextData = _objectSpread(_objectSpread({}, componentMetadata.configModal), {}, {
+  source: 'datasourceConfigModal'
+});
+var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
+  attributes: _objectSpread({}, analyticsContextAttributes)
+});
+export var ConfluenceSearchConfigModal = withAnalyticsContext(contextData)(PlainConfluenceSearchConfigModal);

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

@@ -37,6 +37,7 @@ import { NoInstancesView } from '../../common/error-state/no-instances';
 import { NoResults } from '../../common/error-state/no-results';
 import { InitialStateView } from '../../common/initial-state-view';
 import { initialStateViewMessages } from '../../common/initial-state-view/messages';
+import { CancelButton } from '../../common/modal/cancel-button';
 import { ContentContainer } from '../../common/modal/content-container';
 import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
@@ -326,17 +327,6 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
       shouldForceRequest: true
     });
   }, [jql, reset]);
-  var onCancelClick = useCallback(function (e, analyticEvent) {
-    analyticEvent.update({
-      eventType: 'ui',
-      actionSubjectId: 'cancel',
-      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
-        searchCount: searchCount.current,
-        actions: Array.from(userInteractionActions.current)
-      })
-    }).fire(EVENT_CHANNEL);
-    onCancel();
-  }, [analyticsPayload, onCancel]);
   var onSiteSelection = useCallback(function (site) {
     userInteractionActions.current.add(DatasourceAction.INSTANCE_UPDATED);
     setJql('');
@@ -538,6 +528,12 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     return issueLikeDataTableView;
   }, [columns.length, currentSearchMethod, issueLikeDataTableView, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? modalMessages.insertIssuesTitleManySites : modalMessages.insertIssuesTitle;
+  var getCancelButtonAnalyticsPayload = useCallback(function () {
+    return _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+      searchCount: searchCount.current,
+      actions: Array.from(userInteractionActions.current)
+    });
+  }, [analyticsPayload]);
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
@@ -584,10 +580,11 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     values: {
       totalCount: totalCount
     }
-  })))), jsx(Button, {
-    appearance: "default",
-    onClick: onCancelClick
-  }, jsx(FormattedMessage, modalMessages.cancelButtonText)), !hasNoJiraSites && jsx(Button, {
+  })))), jsx(CancelButton, {
+    onCancel: onCancel,
+    getAnalyticsPayload: getCancelButtonAnalyticsPayload,
+    testId: "jira-datasource-modal--cancel-button"
+  }), !hasNoJiraSites && jsx(Button, {
     appearance: "primary",
     onClick: onInsertPressed,
     isDisabled: isInsertDisabled,

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

@@ -1,10 +1,5 @@
 import { defineMessages } from 'react-intl-next';
 export var modalMessages = defineMessages({
-  cancelButtonText: {
-    id: 'linkDataSource.jira-issues.configmodal.cancelButtonText',
-    description: 'Button text to close the modal with no changes being made',
-    defaultMessage: 'Cancel'
-  },
   insertIssuesButtonText: {
     id: 'linkDataSource.jira-issues.configmodal.insertIssuesButtonText',
     description: 'Button text to insert the displayed content',

package/dist/types/analytics/generated/analytics.types.d.ts

@@ -13,7 +13,7 @@ export type AnalyticsContextType = {
     source: 'datasourceConfigModal';
 };
 export type AnalyticsContextAttributesType = {
-    dataProvider: 'jira-issues' | 'jsm-assets';
+    dataProvider: 'jira-issues' | 'jsm-assets' | 'confluence-search';
 };
 export type DatasourceModalDialogViewedAttributesType = {};
 export type ModalReadyDatasourceAttributesType = {

package/dist/types/ui/assets-modal/modal/messages.d.ts

@@ -1,9 +1,4 @@
 export declare const modalMessages: {
-    cancelButtonText: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
     updateObjectsButtonText: {
         id: string;
         description: string;

package/dist/types/ui/common/modal/cancel-button/index.d.ts

@@ -0,0 +1,8 @@
+import { jsx } from '@emotion/react';
+import { ButtonClickedCancelAttributesType } from '../../../../analytics/generated/analytics.types';
+export interface CancelButtonProps {
+    getAnalyticsPayload: () => ButtonClickedCancelAttributesType;
+    onCancel: () => void;
+    testId: string;
+}
+export declare const CancelButton: ({ getAnalyticsPayload, onCancel, testId, }: CancelButtonProps) => jsx.JSX.Element;

package/dist/types/ui/common/modal/cancel-button/messages.d.ts

@@ -0,0 +1,7 @@
+export declare const cancelButtonMessages: {
+    cancelButtonText: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+};

package/dist/types/ui/confluence-search-modal/modal/index.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="react" />
 import { jsx } from '@emotion/react';
 import { ConfluenceSearchConfigModalProps } from '../types';
-export declare const ConfluenceSearchConfigModal: (props: ConfluenceSearchConfigModalProps) => jsx.JSX.Element;
+export declare const PlainConfluenceSearchConfigModal: (props: ConfluenceSearchConfigModalProps) => jsx.JSX.Element;
+export declare const ConfluenceSearchConfigModal: import("react").ForwardRefExoticComponent<ConfluenceSearchConfigModalProps & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;

package/dist/types/ui/jira-issues-modal/modal/messages.d.ts

@@ -1,9 +1,4 @@
 export declare const modalMessages: {
-    cancelButtonText: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
     insertIssuesButtonText: {
         id: string;
         description: string;

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

@@ -13,7 +13,7 @@ export type AnalyticsContextType = {
     source: 'datasourceConfigModal';
 };
 export type AnalyticsContextAttributesType = {
-    dataProvider: 'jira-issues' | 'jsm-assets';
+    dataProvider: 'jira-issues' | 'jsm-assets' | 'confluence-search';
 };
 export type DatasourceModalDialogViewedAttributesType = {};
 export type ModalReadyDatasourceAttributesType = {

package/dist/types-ts4.5/ui/assets-modal/modal/messages.d.ts

@@ -1,9 +1,4 @@
 export declare const modalMessages: {
-    cancelButtonText: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
     updateObjectsButtonText: {
         id: string;
         description: string;

package/dist/types-ts4.5/ui/common/modal/cancel-button/index.d.ts

@@ -0,0 +1,8 @@
+import { jsx } from '@emotion/react';
+import { ButtonClickedCancelAttributesType } from '../../../../analytics/generated/analytics.types';
+export interface CancelButtonProps {
+    getAnalyticsPayload: () => ButtonClickedCancelAttributesType;
+    onCancel: () => void;
+    testId: string;
+}
+export declare const CancelButton: ({ getAnalyticsPayload, onCancel, testId, }: CancelButtonProps) => jsx.JSX.Element;

package/dist/types-ts4.5/ui/common/modal/cancel-button/messages.d.ts

@@ -0,0 +1,7 @@
+export declare const cancelButtonMessages: {
+    cancelButtonText: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+};

package/dist/types-ts4.5/ui/confluence-search-modal/modal/index.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="react" />
 import { jsx } from '@emotion/react';
 import { ConfluenceSearchConfigModalProps } from '../types';
-export declare const ConfluenceSearchConfigModal: (props: ConfluenceSearchConfigModalProps) => jsx.JSX.Element;
+export declare const PlainConfluenceSearchConfigModal: (props: ConfluenceSearchConfigModalProps) => jsx.JSX.Element;
+export declare const ConfluenceSearchConfigModal: import("react").ForwardRefExoticComponent<ConfluenceSearchConfigModalProps & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;

package/dist/types-ts4.5/ui/jira-issues-modal/modal/messages.d.ts

@@ -1,9 +1,4 @@
 export declare const modalMessages: {
-    cancelButtonText: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
     insertIssuesButtonText: {
         id: string;
         description: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.25.0",
+  "version": "1.25.1",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -36,7 +36,7 @@
     "@atlaskit/avatar": "^21.5.0",
     "@atlaskit/avatar-group": "^9.5.0",
     "@atlaskit/badge": "^15.3.0",
-    "@atlaskit/button": "^17.8.0",
+    "@atlaskit/button": "^17.9.0",
     "@atlaskit/dropdown-menu": "^12.8.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/empty-state": "^7.7.0",
@@ -58,8 +58,8 @@
     "@atlaskit/platform-feature-flags": "^0.2.4",
     "@atlaskit/pragmatic-drag-and-drop": "^1.1.0",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
-    "@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^1.0.0",
-    "@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.0.0",
+    "@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^1.1.0",
+    "@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
     "@atlaskit/primitives": "^5.5.0",
     "@atlaskit/select": "^17.5.0",
     "@atlaskit/smart-card": "^26.52.0",