@atlaskit/link-datasource 1.15.0 → 1.15.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 1.15.2
+
+### Patch Changes
+
+- [#42738](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42738) [`95e6223ddb8`](https://bitbucket.org/atlassian/atlassian-frontend/commits/95e6223ddb8) - Add macro inserted analytics event for jlol smart link insertions
+
+## 1.15.1
+
+### Patch Changes
+
+- [#42936](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42936) [`8aab8999a3d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8aab8999a3d) - Update error UI text.
+
 ## 1.15.0
 
 ### Minor Changes

package/dist/cjs/analytics/constants.js

@@ -7,5 +7,5 @@ exports.packageMetaData = exports.EVENT_CHANNEL = void 0;
 var EVENT_CHANNEL = exports.EVENT_CHANNEL = 'media';
 var packageMetaData = exports.packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.15.0"
+  packageVersion: "1.15.2"
 };

package/dist/cjs/ui/issue-like-table/draggable-table-heading.js

@@ -10,14 +10,14 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
-var _closestEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge");
-var _boxWithoutTerminal = require("@atlaskit/pragmatic-drag-and-drop-react-indicator/box-without-terminal");
 var _element = require("@atlaskit/pragmatic-drag-and-drop/adapter/element");
 var _cancelUnhandled = require("@atlaskit/pragmatic-drag-and-drop/addon/cancel-unhandled");
 var _combine = require("@atlaskit/pragmatic-drag-and-drop/util/combine");
 var _disableNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/util/disable-native-drag-preview");
 var _offsetFromPointer = require("@atlaskit/pragmatic-drag-and-drop/util/offset-from-pointer");
 var _setCustomNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/util/set-custom-native-drag-preview");
+var _closestEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge");
+var _boxWithoutTerminal = require("@atlaskit/pragmatic-drag-and-drop-react-indicator/box-without-terminal");
 var _styled = require("./styled");
 var _index = require("./index");
 /** @jsx jsx */

package/dist/cjs/ui/issue-like-table/index.js

@@ -17,11 +17,11 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _tinyInvariant = _interopRequireDefault(require("tiny-invariant"));
 var _heading = _interopRequireDefault(require("@atlaskit/heading"));
 var _linkingCommon = require("@atlaskit/linking-common");
+var _element = require("@atlaskit/pragmatic-drag-and-drop/adapter/element");
+var _combine = require("@atlaskit/pragmatic-drag-and-drop/util/combine");
 var _closestEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge");
 var _reorderWithEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/util/reorder-with-edge");
 var _pragmaticDragAndDropReactBeautifulDndAutoscroll = require("@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll");
-var _element = require("@atlaskit/pragmatic-drag-and-drop/adapter/element");
-var _combine = require("@atlaskit/pragmatic-drag-and-drop/util/combine");
 var _colors = require("@atlaskit/theme/colors");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _ufoExperiences = require("../../analytics/ufoExperiences");

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

@@ -34,20 +34,5 @@ var asyncPopupSelectMessages = exports.asyncPopupSelectMessages = {
     id: 'linkDataSource.basic-filter.assignee.label',
     description: 'Label to be displayed for assignee filter dropdown button.',
     defaultMessage: 'Assignee'
-  },
-  loadingMessage: {
-    id: 'linkDataSource.basic-filter.loading-message',
-    defaultMessage: 'Loading...',
-    description: 'The text for when options are being loaded in dropdown'
-  },
-  noOptionsMessage: {
-    id: 'linkDataSource.basic-filter.no-options-message',
-    defaultMessage: 'No matches found',
-    description: 'The text for when no matches are found in dropdown'
-  },
-  errorMessage: {
-    id: 'linkDataSource.basic-filter.error-message',
-    defaultMessage: "Couldn't retrieve data",
-    description: 'The text for when an error occurs when loading options'
   }
 };

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/menu-list/errorMessage.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _error = _interopRequireDefault(require("@atlaskit/icon/glyph/error"));
 var _colors = require("@atlaskit/theme/colors");
-var _messages = require("../async-popup-select/messages");
+var _messages = require("./messages");
 var _selectMessage = _interopRequireDefault(require("./selectMessage"));
 var CustomErrorMessage = function CustomErrorMessage() {
   return /*#__PURE__*/_react.default.createElement(_selectMessage.default, {

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/menu-list/loadingMessage.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
-var _messages = require("../async-popup-select/messages");
+var _messages = require("./messages");
 var _selectMessage = _interopRequireDefault(require("./selectMessage"));
 var CustomDropdownLoadingMessage = function CustomDropdownLoadingMessage() {
   return /*#__PURE__*/_react.default.createElement(_selectMessage.default, {

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/menu-list/messages.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.asyncPopupSelectMessages = void 0;
+var asyncPopupSelectMessages = exports.asyncPopupSelectMessages = {
+  loadingMessage: {
+    id: 'linkDataSource.basic-filter.loading-message',
+    defaultMessage: 'Loading...',
+    description: 'The text for when options are being loaded in dropdown'
+  },
+  noOptionsMessage: {
+    id: 'linkDataSource.basic-filter.no-options-message',
+    defaultMessage: 'No matches found',
+    description: 'The text for when no matches are found in dropdown'
+  },
+  errorMessage: {
+    id: 'linkDataSource.basic-filter.error-message',
+    defaultMessage: 'Something went wrong',
+    description: 'The text for when an error occurs when loading options'
+  }
+};

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/menu-list/noOptionsMessage.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _questionCircle = _interopRequireDefault(require("@atlaskit/icon/glyph/question-circle"));
 var _colors = require("@atlaskit/theme/colors");
-var _messages = require("../async-popup-select/messages");
+var _messages = require("./messages");
 var _selectMessage = _interopRequireDefault(require("./selectMessage"));
 var CustomNoOptionsMessage = function CustomNoOptionsMessage() {
   return /*#__PURE__*/_react.default.createElement(_selectMessage.default, {

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

@@ -350,10 +350,28 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
       }),
       eventType: 'ui'
     });
+
+    // additional event for tracking in confluence against JIM
+    var macroInsertedEvent = analyticsEvent.clone();
+    macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.update({
+      eventType: 'track',
+      action: 'inserted',
+      actionSubject: 'macro',
+      actionSubjectId: 'jlol',
+      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+        totalItemCount: totalCount || 0,
+        displayedColumnCount: visibleColumnCount.current,
+        display: getDisplayValue(currentViewMode, totalCount || 0),
+        searchCount: searchCount.current,
+        searchMethod: (0, _utils.mapSearchMethod)(searchMethodSearchedWith.current),
+        actions: Array.from(userInteractionActions.current)
+      })
+    });
     var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
     insertButtonClickedEvent.fire(_analytics.EVENT_CHANNEL);
     var firstIssueUrl = retrieveUrlForSmartCardRender();
     if (currentViewMode === 'count') {
+      macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(_analytics.EVENT_CHANNEL);
       onInsert({
         type: 'inlineCard',
         attrs: {
@@ -361,6 +379,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
         }
       }, consumerEvent);
     } else if (responseItems.length === 1 && firstIssueUrl) {
+      macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(_analytics.EVENT_CHANNEL);
       onInsert({
         type: 'inlineCard',
         attrs: {

package/dist/es2019/analytics/constants.js

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

package/dist/es2019/ui/issue-like-table/draggable-table-heading.js

@@ -3,14 +3,14 @@ import { useEffect, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import ReactDOM from 'react-dom';
 import invariant from 'tiny-invariant';
-import { attachClosestEdge, extractClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge';
-import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-indicator/box-without-terminal';
 import { draggable, dropTargetForElements, monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/element';
 import { cancelUnhandled } from '@atlaskit/pragmatic-drag-and-drop/addon/cancel-unhandled';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/util/combine';
 import { disableNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/util/disable-native-drag-preview';
 import { offsetFromPointer } from '@atlaskit/pragmatic-drag-and-drop/util/offset-from-pointer';
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/util/set-custom-native-drag-preview';
+import { attachClosestEdge, extractClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge';
+import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-indicator/box-without-terminal';
 import { TableHeading } from './styled';
 import { COLUMN_MIN_WIDTH } from './index';
 const verticallyAlignedStyles = css({

package/dist/es2019/ui/issue-like-table/index.js

@@ -5,11 +5,11 @@ import styled from '@emotion/styled';
 import invariant from 'tiny-invariant';
 import Heading from '@atlaskit/heading';
 import { Skeleton } from '@atlaskit/linking-common';
+import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/element';
+import { combine } from '@atlaskit/pragmatic-drag-and-drop/util/combine';
 import { extractClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge';
 import { reorderWithEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/util/reorder-with-edge';
 import { autoScroller } from '@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll';
-import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/element';
-import { combine } from '@atlaskit/pragmatic-drag-and-drop/util/combine';
 import { N40 } from '@atlaskit/theme/colors';
 import Tooltip from '@atlaskit/tooltip';
 import { startUfoExperience, succeedUfoExperience } from '../../analytics/ufoExperiences';

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

@@ -28,20 +28,5 @@ export const asyncPopupSelectMessages = {
     id: 'linkDataSource.basic-filter.assignee.label',
     description: 'Label to be displayed for assignee filter dropdown button.',
     defaultMessage: 'Assignee'
-  },
-  loadingMessage: {
-    id: 'linkDataSource.basic-filter.loading-message',
-    defaultMessage: 'Loading...',
-    description: 'The text for when options are being loaded in dropdown'
-  },
-  noOptionsMessage: {
-    id: 'linkDataSource.basic-filter.no-options-message',
-    defaultMessage: 'No matches found',
-    description: 'The text for when no matches are found in dropdown'
-  },
-  errorMessage: {
-    id: 'linkDataSource.basic-filter.error-message',
-    defaultMessage: "Couldn't retrieve data",
-    description: 'The text for when an error occurs when loading options'
   }
 };

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/menu-list/errorMessage.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import ErrorIcon from '@atlaskit/icon/glyph/error';
 import { N500 } from '@atlaskit/theme/colors';
-import { asyncPopupSelectMessages } from '../async-popup-select/messages';
+import { asyncPopupSelectMessages } from './messages';
 import CustomSelectMessage from './selectMessage';
 const CustomErrorMessage = () => {
   return /*#__PURE__*/React.createElement(CustomSelectMessage, {

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/menu-list/loadingMessage.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import Spinner from '@atlaskit/spinner';
-import { asyncPopupSelectMessages } from '../async-popup-select/messages';
+import { asyncPopupSelectMessages } from './messages';
 import CustomSelectMessage from './selectMessage';
 const CustomDropdownLoadingMessage = () => {
   return /*#__PURE__*/React.createElement(CustomSelectMessage, {

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/menu-list/messages.js

@@ -0,0 +1,17 @@
+export const asyncPopupSelectMessages = {
+  loadingMessage: {
+    id: 'linkDataSource.basic-filter.loading-message',
+    defaultMessage: 'Loading...',
+    description: 'The text for when options are being loaded in dropdown'
+  },
+  noOptionsMessage: {
+    id: 'linkDataSource.basic-filter.no-options-message',
+    defaultMessage: 'No matches found',
+    description: 'The text for when no matches are found in dropdown'
+  },
+  errorMessage: {
+    id: 'linkDataSource.basic-filter.error-message',
+    defaultMessage: 'Something went wrong',
+    description: 'The text for when an error occurs when loading options'
+  }
+};

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/menu-list/noOptionsMessage.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import QuestionCircleIcon from '@atlaskit/icon/glyph/question-circle';
 import { N500 } from '@atlaskit/theme/colors';
-import { asyncPopupSelectMessages } from '../async-popup-select/messages';
+import { asyncPopupSelectMessages } from './messages';
 import CustomSelectMessage from './selectMessage';
 const CustomNoOptionsMessage = () => {
   return /*#__PURE__*/React.createElement(CustomSelectMessage, {

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

@@ -299,10 +299,29 @@ export const PlainJiraIssuesConfigModal = props => {
       },
       eventType: 'ui'
     });
+
+    // additional event for tracking in confluence against JIM
+    const macroInsertedEvent = analyticsEvent.clone();
+    macroInsertedEvent === null || macroInsertedEvent === void 0 ? void 0 : macroInsertedEvent.update({
+      eventType: 'track',
+      action: 'inserted',
+      actionSubject: 'macro',
+      actionSubjectId: 'jlol',
+      attributes: {
+        ...analyticsPayload,
+        totalItemCount: totalCount || 0,
+        displayedColumnCount: visibleColumnCount.current,
+        display: getDisplayValue(currentViewMode, totalCount || 0),
+        searchCount: searchCount.current,
+        searchMethod: mapSearchMethod(searchMethodSearchedWith.current),
+        actions: Array.from(userInteractionActions.current)
+      }
+    });
     const consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
     insertButtonClickedEvent.fire(EVENT_CHANNEL);
     const firstIssueUrl = retrieveUrlForSmartCardRender();
     if (currentViewMode === 'count') {
+      macroInsertedEvent === null || macroInsertedEvent === void 0 ? void 0 : macroInsertedEvent.fire(EVENT_CHANNEL);
       onInsert({
         type: 'inlineCard',
         attrs: {
@@ -310,6 +329,7 @@ export const PlainJiraIssuesConfigModal = props => {
         }
       }, consumerEvent);
     } else if (responseItems.length === 1 && firstIssueUrl) {
+      macroInsertedEvent === null || macroInsertedEvent === void 0 ? void 0 : macroInsertedEvent.fire(EVENT_CHANNEL);
       onInsert({
         type: 'inlineCard',
         attrs: {

package/dist/esm/analytics/constants.js

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

package/dist/esm/ui/issue-like-table/draggable-table-heading.js

@@ -4,14 +4,14 @@ import { useEffect, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import ReactDOM from 'react-dom';
 import invariant from 'tiny-invariant';
-import { attachClosestEdge, extractClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge';
-import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-indicator/box-without-terminal';
 import { draggable, dropTargetForElements, monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/element';
 import { cancelUnhandled } from '@atlaskit/pragmatic-drag-and-drop/addon/cancel-unhandled';
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/util/combine';
 import { disableNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/util/disable-native-drag-preview';
 import { offsetFromPointer } from '@atlaskit/pragmatic-drag-and-drop/util/offset-from-pointer';
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/util/set-custom-native-drag-preview';
+import { attachClosestEdge, extractClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge';
+import { DropIndicator } from '@atlaskit/pragmatic-drag-and-drop-react-indicator/box-without-terminal';
 import { TableHeading } from './styled';
 import { COLUMN_MIN_WIDTH } from './index';
 var verticallyAlignedStyles = css({

package/dist/esm/ui/issue-like-table/index.js

@@ -14,11 +14,11 @@ import styled from '@emotion/styled';
 import invariant from 'tiny-invariant';
 import Heading from '@atlaskit/heading';
 import { Skeleton } from '@atlaskit/linking-common';
+import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/element';
+import { combine } from '@atlaskit/pragmatic-drag-and-drop/util/combine';
 import { extractClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/addon/closest-edge';
 import { reorderWithEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/util/reorder-with-edge';
 import { autoScroller } from '@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll';
-import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/element';
-import { combine } from '@atlaskit/pragmatic-drag-and-drop/util/combine';
 import { N40 } from '@atlaskit/theme/colors';
 import Tooltip from '@atlaskit/tooltip';
 import { startUfoExperience, succeedUfoExperience } from '../../analytics/ufoExperiences';

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

@@ -28,20 +28,5 @@ export var asyncPopupSelectMessages = {
     id: 'linkDataSource.basic-filter.assignee.label',
     description: 'Label to be displayed for assignee filter dropdown button.',
     defaultMessage: 'Assignee'
-  },
-  loadingMessage: {
-    id: 'linkDataSource.basic-filter.loading-message',
-    defaultMessage: 'Loading...',
-    description: 'The text for when options are being loaded in dropdown'
-  },
-  noOptionsMessage: {
-    id: 'linkDataSource.basic-filter.no-options-message',
-    defaultMessage: 'No matches found',
-    description: 'The text for when no matches are found in dropdown'
-  },
-  errorMessage: {
-    id: 'linkDataSource.basic-filter.error-message',
-    defaultMessage: "Couldn't retrieve data",
-    description: 'The text for when an error occurs when loading options'
   }
 };

package/dist/esm/ui/jira-issues-modal/basic-filters/ui/menu-list/errorMessage.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import ErrorIcon from '@atlaskit/icon/glyph/error';
 import { N500 } from '@atlaskit/theme/colors';
-import { asyncPopupSelectMessages } from '../async-popup-select/messages';
+import { asyncPopupSelectMessages } from './messages';
 import CustomSelectMessage from './selectMessage';
 var CustomErrorMessage = function CustomErrorMessage() {
   return /*#__PURE__*/React.createElement(CustomSelectMessage, {

package/dist/esm/ui/jira-issues-modal/basic-filters/ui/menu-list/loadingMessage.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import Spinner from '@atlaskit/spinner';
-import { asyncPopupSelectMessages } from '../async-popup-select/messages';
+import { asyncPopupSelectMessages } from './messages';
 import CustomSelectMessage from './selectMessage';
 var CustomDropdownLoadingMessage = function CustomDropdownLoadingMessage() {
   return /*#__PURE__*/React.createElement(CustomSelectMessage, {

package/dist/esm/ui/jira-issues-modal/basic-filters/ui/menu-list/messages.js

@@ -0,0 +1,17 @@
+export var asyncPopupSelectMessages = {
+  loadingMessage: {
+    id: 'linkDataSource.basic-filter.loading-message',
+    defaultMessage: 'Loading...',
+    description: 'The text for when options are being loaded in dropdown'
+  },
+  noOptionsMessage: {
+    id: 'linkDataSource.basic-filter.no-options-message',
+    defaultMessage: 'No matches found',
+    description: 'The text for when no matches are found in dropdown'
+  },
+  errorMessage: {
+    id: 'linkDataSource.basic-filter.error-message',
+    defaultMessage: 'Something went wrong',
+    description: 'The text for when an error occurs when loading options'
+  }
+};

package/dist/esm/ui/jira-issues-modal/basic-filters/ui/menu-list/noOptionsMessage.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import QuestionCircleIcon from '@atlaskit/icon/glyph/question-circle';
 import { N500 } from '@atlaskit/theme/colors';
-import { asyncPopupSelectMessages } from '../async-popup-select/messages';
+import { asyncPopupSelectMessages } from './messages';
 import CustomSelectMessage from './selectMessage';
 var CustomNoOptionsMessage = function CustomNoOptionsMessage() {
   return /*#__PURE__*/React.createElement(CustomSelectMessage, {

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

@@ -341,10 +341,28 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
       }),
       eventType: 'ui'
     });
+
+    // additional event for tracking in confluence against JIM
+    var macroInsertedEvent = analyticsEvent.clone();
+    macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.update({
+      eventType: 'track',
+      action: 'inserted',
+      actionSubject: 'macro',
+      actionSubjectId: 'jlol',
+      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+        totalItemCount: totalCount || 0,
+        displayedColumnCount: visibleColumnCount.current,
+        display: getDisplayValue(currentViewMode, totalCount || 0),
+        searchCount: searchCount.current,
+        searchMethod: mapSearchMethod(searchMethodSearchedWith.current),
+        actions: Array.from(userInteractionActions.current)
+      })
+    });
     var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
     insertButtonClickedEvent.fire(EVENT_CHANNEL);
     var firstIssueUrl = retrieveUrlForSmartCardRender();
     if (currentViewMode === 'count') {
+      macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(EVENT_CHANNEL);
       onInsert({
         type: 'inlineCard',
         attrs: {
@@ -352,6 +370,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
         }
       }, consumerEvent);
     } else if (responseItems.length === 1 && firstIssueUrl) {
+      macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(EVENT_CHANNEL);
       onInsert({
         type: 'inlineCard',
         attrs: {

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

@@ -29,19 +29,4 @@ export declare const asyncPopupSelectMessages: {
         description: string;
         defaultMessage: string;
     };
-    loadingMessage: {
-        id: string;
-        defaultMessage: string;
-        description: string;
-    };
-    noOptionsMessage: {
-        id: string;
-        defaultMessage: string;
-        description: string;
-    };
-    errorMessage: {
-        id: string;
-        defaultMessage: string;
-        description: string;
-    };
 };

package/dist/types/ui/jira-issues-modal/basic-filters/ui/menu-list/messages.d.ts

@@ -0,0 +1,17 @@
+export declare const asyncPopupSelectMessages: {
+    loadingMessage: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    noOptionsMessage: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    errorMessage: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+};

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

@@ -29,19 +29,4 @@ export declare const asyncPopupSelectMessages: {
         description: string;
         defaultMessage: string;
     };
-    loadingMessage: {
-        id: string;
-        defaultMessage: string;
-        description: string;
-    };
-    noOptionsMessage: {
-        id: string;
-        defaultMessage: string;
-        description: string;
-    };
-    errorMessage: {
-        id: string;
-        defaultMessage: string;
-        description: string;
-    };
 };

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

@@ -0,0 +1,17 @@
+export declare const asyncPopupSelectMessages: {
+    loadingMessage: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    noOptionsMessage: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    errorMessage: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.15.0",
+  "version": "1.15.2",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -33,7 +33,7 @@
     "@atlaskit/adf-schema": "^32.0.0",
     "@atlaskit/analytics-next": "^9.1.3",
     "@atlaskit/avatar": "^21.4.0",
-    "@atlaskit/button": "^16.13.0",
+    "@atlaskit/button": "^16.14.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
     "@atlaskit/empty-state": "^7.5.0",
     "@atlaskit/form": "^9.0.0",
@@ -54,7 +54,7 @@
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^0.12.0",
     "@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.9.0",
+    "@atlaskit/primitives": "^1.10.0",
     "@atlaskit/select": "^16.7.0",
     "@atlaskit/smart-card": "^26.42.0",
     "@atlaskit/spinner": "^15.6.0",