@atlaskit/link-datasource 1.25.1 → 1.25.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 1.25.3
+
+### Patch Changes
+
+- [#88297](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88297) [`0b8748a0e0fc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0b8748a0e0fc) - Add search action analytics events for confluence datasource modal.
+
+## 1.25.2
+
+### Patch Changes
+
+- [#87128](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/87128) [`2b6b715884a0`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2b6b715884a0) - Adds Insert button click analytics event and tests to confluence-search config modal.
+- Updated dependencies
+
 ## 1.25.1
 
 ### Patch Changes

package/dist/cjs/ui/common/modal/basic-search-input/index.js

@@ -12,6 +12,7 @@ var _button = require("@atlaskit/button");
 var _search = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/search"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _textfield = _interopRequireDefault(require("@atlaskit/textfield"));
+var _analytics = require("../../../../analytics");
 var _messages = require("./messages");
 /** @jsx jsx */
 
@@ -36,9 +37,15 @@ var BasicSearchInput = exports.BasicSearchInput = function BasicSearchInput(_ref
     placeholder = _ref.placeholder;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
+  var handleSearchWithAnalytics = function handleSearchWithAnalytics() {
+    fireEvent('ui.form.submitted.basicSearch', {});
+    onSearch(searchTerm);
+  };
   var handleFormSubmit = function handleFormSubmit(e) {
     e.preventDefault();
-    onSearch(searchTerm);
+    handleSearchWithAnalytics();
   };
   var showBasicFilters = (0, _react.useMemo)(function () {
     if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters')) {
@@ -60,9 +67,7 @@ var BasicSearchInput = exports.BasicSearchInput = function BasicSearchInput(_ref
       }),
       isDisabled: isDisabled,
       isLoading: isSearching,
-      onClick: function onClick() {
-        return onSearch(searchTerm);
-      },
+      onClick: handleSearchWithAnalytics,
       spacing: "none",
       testId: "".concat(testId, "--basic-search-button")
     }),

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.PlainConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = void 0;
+exports.getColumnAction = 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"));
@@ -24,6 +24,7 @@ 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 _analytics = require("../../../analytics");
 var _constants = require("../../../analytics/constants");
 var _types = require("../../../analytics/types");
 var _adf = require("../../../common/utils/adf");
@@ -56,6 +57,19 @@ var searchCountStyles = (0, _primitives.xcss)({
   flex: 1,
   fontWeight: 600
 });
+
+// TODO: common functionality of all modals refactor in EDM-9573
+var getColumnAction = exports.getColumnAction = function getColumnAction(oldVisibleColumnKeys, newVisibleColumnKeys) {
+  var newColumnSize = newVisibleColumnKeys.length;
+  var oldColumnSize = oldVisibleColumnKeys.length;
+  if (newColumnSize > oldColumnSize) {
+    return _types.DatasourceAction.COLUMN_ADDED;
+  } else if (newColumnSize < oldColumnSize) {
+    return _types.DatasourceAction.COLUMN_REMOVED;
+  } else {
+    return _types.DatasourceAction.COLUMN_REORDERED;
+  }
+};
 var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConfigModal(props) {
   var _useRef = (0, _react.useRef)((0, _uuid.v4)()),
     modalRenderInstanceId = _useRef.current;
@@ -87,6 +101,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   // analytics related parameters
   var searchCount = (0, _react.useRef)(0);
   var userInteractionActions = (0, _react.useRef)(new Set());
+  var visibleColumnCount = (0, _react.useRef)((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
 
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829210
@@ -179,6 +194,11 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     }();
     void fetchSiteDisplayNames();
   }, []);
+  (0, _react.useEffect)(function () {
+    var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
+    visibleColumnCount.current = newVisibleColumnKeys.length;
+    setVisibleColumnKeys(newVisibleColumnKeys);
+  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? _messages.confluenceSearchModalMessages.insertIssuesTitleManySites : _messages.confluenceSearchModalMessages.insertIssuesTitle;
   var _useState9 = (0, _react.useState)(initialColumnCustomSizes),
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
@@ -201,6 +221,15 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     setWrappedColumnKeys(Array.from(set));
   }, [wrappedColumnKeys]);
 
+  // TODO: common functionality of all modals refactor in EDM-9573
+  var handleVisibleColumnKeysChange = (0, _react.useCallback)(function () {
+    var newVisibleColumnKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var columnAction = getColumnAction(visibleColumnKeys || [], newVisibleColumnKeys);
+    userInteractionActions.current.add(columnAction);
+    visibleColumnCount.current = newVisibleColumnKeys.length;
+    setVisibleColumnKeys(newVisibleColumnKeys);
+  }, [visibleColumnKeys]);
+
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6798258
   var confluenceSearchTable = (0, _react.useMemo)(function () {
@@ -215,7 +244,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
       visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
       onNextPage: onNextPage,
       onLoadDatasourceDetails: loadDatasourceDetails,
-      onVisibleColumnKeysChange: setVisibleColumnKeys,
+      onVisibleColumnKeysChange: handleVisibleColumnKeysChange,
       parentContainerRenderInstanceId: modalRenderInstanceId,
       extensionKey: extensionKey,
       columnCustomSizes: columnCustomSizes,
@@ -223,11 +252,19 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
       wrappedColumnKeys: wrappedColumnKeys,
       onWrappedColumnChange: (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-word_wrap') ? onWrappedColumnChange : undefined
     }));
-  }, [status, columns, responseItems, hasNextPage, visibleColumnKeys, defaultVisibleColumnKeys, onNextPage, loadDatasourceDetails, setVisibleColumnKeys, modalRenderInstanceId, extensionKey, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange]);
+  }, [status, columns, responseItems, hasNextPage, visibleColumnKeys, defaultVisibleColumnKeys, onNextPage, loadDatasourceDetails, handleVisibleColumnKeysChange, modalRenderInstanceId, extensionKey, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange]);
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   var hasConfluenceSearchParams = selectedConfluenceSite && searchString;
   var selectedConfluenceSiteUrl = selectedConfluenceSite === null || selectedConfluenceSite === void 0 ? void 0 : selectedConfluenceSite.url;
   var confluenceSearchUrl = selectedConfluenceSiteUrl && searchString !== undefined && "".concat(selectedConfluenceSiteUrl, "/wiki/search/?text=").concat(encodeURI(searchString));
+  var analyticsPayload = (0, _react.useMemo)(function () {
+    return {
+      extensionKey: extensionKey,
+      destinationObjectTypes: destinationObjectTypes,
+      searchCount: searchCount.current,
+      actions: Array.from(userInteractionActions.current)
+    };
+  }, [destinationObjectTypes, extensionKey]);
   var renderModalContent = (0, _react.useCallback)(function () {
     if (status === 'rejected') {
       return (0, _react2.jsx)(_modalLoadingError.ModalLoadingError, null);
@@ -253,10 +290,25 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     return confluenceSearchTable;
   }, [columns.length, selectedConfluenceSiteUrl, confluenceSearchTable, resolvedWithNoResults, status, urlBeingEdited, hasConfluenceSearchParams]);
   var shouldShowResultsCount = !!totalCount && totalCount !== 1;
-  var onInsertPressed = (0, _react.useCallback)(function () {
+  var onInsertPressed = (0, _react.useCallback)(function (e, analyticsEvent) {
+    var _insertButtonClickedE;
     if (!isParametersSet || !cloudId) {
       return;
     }
+    var insertButtonClickedEvent = analyticsEvent.update({
+      actionSubjectId: 'insert',
+      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+        totalItemCount: totalCount || 0,
+        displayedColumnCount: visibleColumnCount.current,
+        display: _types.DatasourceDisplay.DATASOURCE_TABLE,
+        searchCount: searchCount.current,
+        searchMethod: _types.DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
+        actions: Array.from(userInteractionActions.current)
+      }),
+      eventType: 'ui'
+    });
+    var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
+    insertButtonClickedEvent.fire(_analytics.EVENT_CHANNEL);
     onInsert((0, _adf.buildDatasourceAdf)({
       id: datasourceId,
       parameters: _objectSpread(_objectSpread({}, parameters), {}, {
@@ -278,8 +330,8 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
           })
         }
       }]
-    }));
-  }, [isParametersSet, cloudId, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
+    }), consumerEvent);
+  }, [isParametersSet, cloudId, analyticsPayload, totalCount, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
   var onSearch = (0, _react.useCallback)(function (newSearchString) {
     searchCount.current++;
     userInteractionActions.current.add(_types.DatasourceAction.QUERY_UPDATED);

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

@@ -152,9 +152,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
       basicFilterSelections: filterSelections,
       isQueryComplex: isCurrentQueryComplex
     });
-    if (currentSearchMethod === 'basic') {
-      fireEvent('ui.form.submitted.basicSearch', {});
-    } else if (currentSearchMethod === 'jql') {
+    if (currentSearchMethod === 'jql') {
       fireEvent('ui.jqlEditor.searched', {
         isQueryComplex: isCurrentQueryComplex
       });

package/dist/es2019/ui/common/modal/basic-search-input/index.js

@@ -6,6 +6,7 @@ import { LoadingButton } from '@atlaskit/button';
 import SearchIcon from '@atlaskit/icon/glyph/editor/search';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import Textfield from '@atlaskit/textfield';
+import { useDatasourceAnalyticsEvents } from '../../../../analytics';
 import { basicSearchInputMessages } from './messages';
 const searchButtonStyles = css({
   marginRight: "var(--ds-space-075, 6px)"
@@ -30,9 +31,16 @@ export const BasicSearchInput = ({
   const {
     formatMessage
   } = useIntl();
+  const {
+    fireEvent
+  } = useDatasourceAnalyticsEvents();
+  const handleSearchWithAnalytics = () => {
+    fireEvent('ui.form.submitted.basicSearch', {});
+    onSearch(searchTerm);
+  };
   const handleFormSubmit = e => {
     e.preventDefault();
-    onSearch(searchTerm);
+    handleSearchWithAnalytics();
   };
   const showBasicFilters = useMemo(() => {
     if (getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters')) {
@@ -54,7 +62,7 @@ export const BasicSearchInput = ({
       }),
       isDisabled: isDisabled,
       isLoading: isSearching,
-      onClick: () => onSearch(searchTerm),
+      onClick: handleSearchWithAnalytics,
       spacing: "none",
       testId: `${testId}--basic-search-button`
     }),

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

@@ -12,8 +12,9 @@ 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 { EVENT_CHANNEL } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
-import { DatasourceAction } from '../../../analytics/types';
+import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
 import { buildDatasourceAdf } from '../../../common/utils/adf';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
@@ -40,6 +41,19 @@ const searchCountStyles = xcss({
   flex: 1,
   fontWeight: 600
 });
+
+// TODO: common functionality of all modals refactor in EDM-9573
+export const getColumnAction = (oldVisibleColumnKeys, newVisibleColumnKeys) => {
+  const newColumnSize = newVisibleColumnKeys.length;
+  const oldColumnSize = oldVisibleColumnKeys.length;
+  if (newColumnSize > oldColumnSize) {
+    return DatasourceAction.COLUMN_ADDED;
+  } else if (newColumnSize < oldColumnSize) {
+    return DatasourceAction.COLUMN_REMOVED;
+  } else {
+    return DatasourceAction.COLUMN_REORDERED;
+  }
+};
 export const PlainConfluenceSearchConfigModal = props => {
   const {
     current: modalRenderInstanceId
@@ -62,6 +76,7 @@ export const PlainConfluenceSearchConfigModal = props => {
   // analytics related parameters
   const searchCount = useRef(0);
   const userInteractionActions = useRef(new Set());
+  const visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
 
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829210
@@ -126,6 +141,11 @@ export const PlainConfluenceSearchConfigModal = props => {
     };
     void fetchSiteDisplayNames();
   }, []);
+  useEffect(() => {
+    const newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
+    visibleColumnCount.current = newVisibleColumnKeys.length;
+    setVisibleColumnKeys(newVisibleColumnKeys);
+  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   const siteSelectorLabel = availableSites && availableSites.length > 1 ? confluenceSearchModalMessages.insertIssuesTitleManySites : confluenceSearchModalMessages.insertIssuesTitle;
   const [columnCustomSizes, setColumnCustomSizes] = useState(initialColumnCustomSizes);
   const onColumnResize = useCallback((key, width) => {
@@ -145,6 +165,14 @@ export const PlainConfluenceSearchConfigModal = props => {
     setWrappedColumnKeys(Array.from(set));
   }, [wrappedColumnKeys]);
 
+  // TODO: common functionality of all modals refactor in EDM-9573
+  const handleVisibleColumnKeysChange = useCallback((newVisibleColumnKeys = []) => {
+    const columnAction = getColumnAction(visibleColumnKeys || [], newVisibleColumnKeys);
+    userInteractionActions.current.add(columnAction);
+    visibleColumnCount.current = newVisibleColumnKeys.length;
+    setVisibleColumnKeys(newVisibleColumnKeys);
+  }, [visibleColumnKeys]);
+
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6798258
   const confluenceSearchTable = useMemo(() => jsx(ContentContainer, {
@@ -158,18 +186,24 @@ export const PlainConfluenceSearchConfigModal = props => {
     visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
     onNextPage: onNextPage,
     onLoadDatasourceDetails: loadDatasourceDetails,
-    onVisibleColumnKeysChange: setVisibleColumnKeys,
+    onVisibleColumnKeysChange: handleVisibleColumnKeysChange,
     parentContainerRenderInstanceId: modalRenderInstanceId,
     extensionKey: extensionKey,
     columnCustomSizes: columnCustomSizes,
     onColumnResize: onColumnResize,
     wrappedColumnKeys: wrappedColumnKeys,
     onWrappedColumnChange: getBooleanFF('platform.linking-platform.datasource-word_wrap') ? onWrappedColumnChange : undefined
-  })), [status, columns, responseItems, hasNextPage, visibleColumnKeys, defaultVisibleColumnKeys, onNextPage, loadDatasourceDetails, setVisibleColumnKeys, modalRenderInstanceId, extensionKey, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange]);
+  })), [status, columns, responseItems, hasNextPage, visibleColumnKeys, defaultVisibleColumnKeys, onNextPage, loadDatasourceDetails, handleVisibleColumnKeysChange, modalRenderInstanceId, extensionKey, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange]);
   const resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   const hasConfluenceSearchParams = selectedConfluenceSite && searchString;
   const selectedConfluenceSiteUrl = selectedConfluenceSite === null || selectedConfluenceSite === void 0 ? void 0 : selectedConfluenceSite.url;
   const confluenceSearchUrl = selectedConfluenceSiteUrl && searchString !== undefined && `${selectedConfluenceSiteUrl}/wiki/search/?text=${encodeURI(searchString)}`;
+  const analyticsPayload = useMemo(() => ({
+    extensionKey,
+    destinationObjectTypes,
+    searchCount: searchCount.current,
+    actions: Array.from(userInteractionActions.current)
+  }), [destinationObjectTypes, extensionKey]);
   const renderModalContent = useCallback(() => {
     if (status === 'rejected') {
       return jsx(ModalLoadingError, null);
@@ -195,10 +229,26 @@ export const PlainConfluenceSearchConfigModal = props => {
     return confluenceSearchTable;
   }, [columns.length, selectedConfluenceSiteUrl, confluenceSearchTable, resolvedWithNoResults, status, urlBeingEdited, hasConfluenceSearchParams]);
   const shouldShowResultsCount = !!totalCount && totalCount !== 1;
-  const onInsertPressed = useCallback(() => {
+  const onInsertPressed = useCallback((e, analyticsEvent) => {
+    var _insertButtonClickedE;
     if (!isParametersSet || !cloudId) {
       return;
     }
+    const insertButtonClickedEvent = analyticsEvent.update({
+      actionSubjectId: 'insert',
+      attributes: {
+        ...analyticsPayload,
+        totalItemCount: totalCount || 0,
+        displayedColumnCount: visibleColumnCount.current,
+        display: DatasourceDisplay.DATASOURCE_TABLE,
+        searchCount: searchCount.current,
+        searchMethod: DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
+        actions: Array.from(userInteractionActions.current)
+      },
+      eventType: 'ui'
+    });
+    const consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
+    insertButtonClickedEvent.fire(EVENT_CHANNEL);
     onInsert(buildDatasourceAdf({
       id: datasourceId,
       parameters: {
@@ -223,8 +273,8 @@ export const PlainConfluenceSearchConfigModal = props => {
           })
         }
       }]
-    }));
-  }, [isParametersSet, cloudId, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
+    }), consumerEvent);
+  }, [isParametersSet, cloudId, analyticsPayload, totalCount, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
   const onSearch = useCallback(newSearchString => {
     searchCount.current++;
     userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);

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

@@ -115,9 +115,7 @@ export const JiraSearchContainer = props => {
       basicFilterSelections: filterSelections,
       isQueryComplex: isCurrentQueryComplex
     });
-    if (currentSearchMethod === 'basic') {
-      fireEvent('ui.form.submitted.basicSearch', {});
-    } else if (currentSearchMethod === 'jql') {
+    if (currentSearchMethod === 'jql') {
       fireEvent('ui.jqlEditor.searched', {
         isQueryComplex: isCurrentQueryComplex
       });

package/dist/esm/ui/common/modal/basic-search-input/index.js

@@ -6,6 +6,7 @@ import { LoadingButton } from '@atlaskit/button';
 import SearchIcon from '@atlaskit/icon/glyph/editor/search';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import Textfield from '@atlaskit/textfield';
+import { useDatasourceAnalyticsEvents } from '../../../../analytics';
 import { basicSearchInputMessages } from './messages';
 var searchButtonStyles = css({
   marginRight: "var(--ds-space-075, 6px)"
@@ -28,9 +29,15 @@ export var BasicSearchInput = function BasicSearchInput(_ref) {
     placeholder = _ref.placeholder;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
+  var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
+  var handleSearchWithAnalytics = function handleSearchWithAnalytics() {
+    fireEvent('ui.form.submitted.basicSearch', {});
+    onSearch(searchTerm);
+  };
   var handleFormSubmit = function handleFormSubmit(e) {
     e.preventDefault();
-    onSearch(searchTerm);
+    handleSearchWithAnalytics();
   };
   var showBasicFilters = useMemo(function () {
     if (getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters')) {
@@ -52,9 +59,7 @@ export var BasicSearchInput = function BasicSearchInput(_ref) {
       }),
       isDisabled: isDisabled,
       isLoading: isSearching,
-      onClick: function onClick() {
-        return onSearch(searchTerm);
-      },
+      onClick: handleSearchWithAnalytics,
       spacing: "none",
       testId: "".concat(testId, "--basic-search-button")
     }),

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

@@ -19,8 +19,9 @@ 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 { EVENT_CHANNEL } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
-import { DatasourceAction } from '../../../analytics/types';
+import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
 import { buildDatasourceAdf } from '../../../common/utils/adf';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
@@ -47,6 +48,19 @@ var searchCountStyles = xcss({
   flex: 1,
   fontWeight: 600
 });
+
+// TODO: common functionality of all modals refactor in EDM-9573
+export var getColumnAction = function getColumnAction(oldVisibleColumnKeys, newVisibleColumnKeys) {
+  var newColumnSize = newVisibleColumnKeys.length;
+  var oldColumnSize = oldVisibleColumnKeys.length;
+  if (newColumnSize > oldColumnSize) {
+    return DatasourceAction.COLUMN_ADDED;
+  } else if (newColumnSize < oldColumnSize) {
+    return DatasourceAction.COLUMN_REMOVED;
+  } else {
+    return DatasourceAction.COLUMN_REORDERED;
+  }
+};
 export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConfigModal(props) {
   var _useRef = useRef(uuidv4()),
     modalRenderInstanceId = _useRef.current;
@@ -78,6 +92,7 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   // analytics related parameters
   var searchCount = useRef(0);
   var userInteractionActions = useRef(new Set());
+  var visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
 
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829210
@@ -170,6 +185,11 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     }();
     void fetchSiteDisplayNames();
   }, []);
+  useEffect(function () {
+    var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
+    visibleColumnCount.current = newVisibleColumnKeys.length;
+    setVisibleColumnKeys(newVisibleColumnKeys);
+  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? confluenceSearchModalMessages.insertIssuesTitleManySites : confluenceSearchModalMessages.insertIssuesTitle;
   var _useState9 = useState(initialColumnCustomSizes),
     _useState10 = _slicedToArray(_useState9, 2),
@@ -192,6 +212,15 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     setWrappedColumnKeys(Array.from(set));
   }, [wrappedColumnKeys]);
 
+  // TODO: common functionality of all modals refactor in EDM-9573
+  var handleVisibleColumnKeysChange = useCallback(function () {
+    var newVisibleColumnKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var columnAction = getColumnAction(visibleColumnKeys || [], newVisibleColumnKeys);
+    userInteractionActions.current.add(columnAction);
+    visibleColumnCount.current = newVisibleColumnKeys.length;
+    setVisibleColumnKeys(newVisibleColumnKeys);
+  }, [visibleColumnKeys]);
+
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6798258
   var confluenceSearchTable = useMemo(function () {
@@ -206,7 +235,7 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
       visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
       onNextPage: onNextPage,
       onLoadDatasourceDetails: loadDatasourceDetails,
-      onVisibleColumnKeysChange: setVisibleColumnKeys,
+      onVisibleColumnKeysChange: handleVisibleColumnKeysChange,
       parentContainerRenderInstanceId: modalRenderInstanceId,
       extensionKey: extensionKey,
       columnCustomSizes: columnCustomSizes,
@@ -214,11 +243,19 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
       wrappedColumnKeys: wrappedColumnKeys,
       onWrappedColumnChange: getBooleanFF('platform.linking-platform.datasource-word_wrap') ? onWrappedColumnChange : undefined
     }));
-  }, [status, columns, responseItems, hasNextPage, visibleColumnKeys, defaultVisibleColumnKeys, onNextPage, loadDatasourceDetails, setVisibleColumnKeys, modalRenderInstanceId, extensionKey, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange]);
+  }, [status, columns, responseItems, hasNextPage, visibleColumnKeys, defaultVisibleColumnKeys, onNextPage, loadDatasourceDetails, handleVisibleColumnKeysChange, modalRenderInstanceId, extensionKey, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange]);
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   var hasConfluenceSearchParams = selectedConfluenceSite && searchString;
   var selectedConfluenceSiteUrl = selectedConfluenceSite === null || selectedConfluenceSite === void 0 ? void 0 : selectedConfluenceSite.url;
   var confluenceSearchUrl = selectedConfluenceSiteUrl && searchString !== undefined && "".concat(selectedConfluenceSiteUrl, "/wiki/search/?text=").concat(encodeURI(searchString));
+  var analyticsPayload = useMemo(function () {
+    return {
+      extensionKey: extensionKey,
+      destinationObjectTypes: destinationObjectTypes,
+      searchCount: searchCount.current,
+      actions: Array.from(userInteractionActions.current)
+    };
+  }, [destinationObjectTypes, extensionKey]);
   var renderModalContent = useCallback(function () {
     if (status === 'rejected') {
       return jsx(ModalLoadingError, null);
@@ -244,10 +281,25 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     return confluenceSearchTable;
   }, [columns.length, selectedConfluenceSiteUrl, confluenceSearchTable, resolvedWithNoResults, status, urlBeingEdited, hasConfluenceSearchParams]);
   var shouldShowResultsCount = !!totalCount && totalCount !== 1;
-  var onInsertPressed = useCallback(function () {
+  var onInsertPressed = useCallback(function (e, analyticsEvent) {
+    var _insertButtonClickedE;
     if (!isParametersSet || !cloudId) {
       return;
     }
+    var insertButtonClickedEvent = analyticsEvent.update({
+      actionSubjectId: 'insert',
+      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+        totalItemCount: totalCount || 0,
+        displayedColumnCount: visibleColumnCount.current,
+        display: DatasourceDisplay.DATASOURCE_TABLE,
+        searchCount: searchCount.current,
+        searchMethod: DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
+        actions: Array.from(userInteractionActions.current)
+      }),
+      eventType: 'ui'
+    });
+    var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
+    insertButtonClickedEvent.fire(EVENT_CHANNEL);
     onInsert(buildDatasourceAdf({
       id: datasourceId,
       parameters: _objectSpread(_objectSpread({}, parameters), {}, {
@@ -269,8 +321,8 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
           })
         }
       }]
-    }));
-  }, [isParametersSet, cloudId, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
+    }), consumerEvent);
+  }, [isParametersSet, cloudId, analyticsPayload, totalCount, onInsert, datasourceId, parameters, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
   var onSearch = useCallback(function (newSearchString) {
     searchCount.current++;
     userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);

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

@@ -143,9 +143,7 @@ export var JiraSearchContainer = function JiraSearchContainer(props) {
       basicFilterSelections: filterSelections,
       isQueryComplex: isCurrentQueryComplex
     });
-    if (currentSearchMethod === 'basic') {
-      fireEvent('ui.form.submitted.basicSearch', {});
-    } else if (currentSearchMethod === 'jql') {
+    if (currentSearchMethod === 'jql') {
       fireEvent('ui.jqlEditor.searched', {
         isQueryComplex: isCurrentQueryComplex
       });

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

@@ -1,5 +1,7 @@
 /// <reference types="react" />
 import { jsx } from '@emotion/react';
+import { DatasourceAction } from '../../../analytics/types';
 import { ConfluenceSearchConfigModalProps } from '../types';
+export declare const getColumnAction: (oldVisibleColumnKeys: string[], newVisibleColumnKeys: string[]) => DatasourceAction;
 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/confluence-search-modal/modal/index.d.ts

@@ -1,5 +1,7 @@
 /// <reference types="react" />
 import { jsx } from '@emotion/react';
+import { DatasourceAction } from '../../../analytics/types';
 import { ConfluenceSearchConfigModalProps } from '../types';
+export declare const getColumnAction: (oldVisibleColumnKeys: string[], newVisibleColumnKeys: string[]) => DatasourceAction;
 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.25.1",
+  "version": "1.25.3",
   "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.9.0",
+    "@atlaskit/button": "^17.10.0",
     "@atlaskit/dropdown-menu": "^12.8.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/empty-state": "^7.7.0",