@atlaskit/link-datasource 1.25.2 → 1.25.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 1.25.4
+
+### Patch Changes
+
+- [#88354](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88354) [`4c87d9b4f0c2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/4c87d9b4f0c2) - The internal composition of this component has changed. There is no expected change in behavior.
+- Updated dependencies
+
+## 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

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/jira-issues-modal/basic-filters/ui/index.js

@@ -14,7 +14,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var availableBasicFilterTypes = exports.availableBasicFilterTypes = ['project', 'type', 'status', 'assignee'];
 var basicFilterContainerStyles = (0, _primitives.xcss)({
-  paddingLeft: "var(--ds-space-100, 8px)"
+  paddingLeft: 'space.100'
 });
 var BasicFilterContainer = function BasicFilterContainer(_ref) {
   var jql = _ref.jql,

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

@@ -16,11 +16,11 @@ var _loadingMessage = _interopRequireDefault(require("./loadingMessage"));
 var _noOptionsMessage = _interopRequireDefault(require("./noOptionsMessage"));
 var _excluded = ["children"];
 var inlineSpinnerStyles = (0, _primitives.xcss)({
-  paddingTop: "var(--ds-space-075, 6px)"
+  paddingTop: 'space.075'
 });
 var showMoreButtonBoxStyles = (0, _primitives.xcss)({
-  paddingLeft: "var(--ds-space-075, 6px)",
-  paddingTop: "var(--ds-space-100, 8px)"
+  paddingLeft: 'space.075',
+  paddingTop: 'space.100'
 });
 var CustomMenuList = function CustomMenuList(_ref) {
   var children = _ref.children,

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

@@ -11,7 +11,7 @@ var _heading = _interopRequireDefault(require("@atlaskit/heading"));
 var _primitives = require("@atlaskit/primitives");
 var boxStyles = (0, _primitives.xcss)({
   height: "var(--ds-space-800, 64px)",
-  marginBottom: "var(--ds-space-200, 16px)"
+  marginBottom: 'space.200'
 });
 var stackStyles = (0, _primitives.xcss)({
   paddingTop: 'space.100',

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/cjs/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.js

@@ -19,8 +19,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 var dropDownItemGroupStyles = (0, _primitives.xcss)({
   width: '320px',
   height: '140px',
-  paddingTop: "var(--ds-space-050, 4px)",
-  paddingBottom: "var(--ds-space-050, 4px)",
+  paddingTop: 'space.050',
+  paddingBottom: 'space.050',
   borderRadius: 'border.radius'
 });
 var InlineIcon = (0, _react.jsx)("svg", {

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/jira-issues-modal/basic-filters/ui/index.js

@@ -4,7 +4,7 @@ import { extractValuesFromNonComplexJQL } from '../utils/extractValuesFromNonCom
 import AsyncPopupSelect from './async-popup-select';
 export const availableBasicFilterTypes = ['project', 'type', 'status', 'assignee'];
 const basicFilterContainerStyles = xcss({
-  paddingLeft: "var(--ds-space-100, 8px)"
+  paddingLeft: 'space.100'
 });
 const BasicFilterContainer = ({
   jql,

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

@@ -7,11 +7,11 @@ import CustomErrorMessage from './errorMessage';
 import CustomDropdownLoadingMessage from './loadingMessage';
 import CustomNoOptionsMessage from './noOptionsMessage';
 const inlineSpinnerStyles = xcss({
-  paddingTop: "var(--ds-space-075, 6px)"
+  paddingTop: 'space.075'
 });
 const showMoreButtonBoxStyles = xcss({
-  paddingLeft: "var(--ds-space-075, 6px)",
-  paddingTop: "var(--ds-space-100, 8px)"
+  paddingLeft: 'space.075',
+  paddingTop: 'space.100'
 });
 const CustomMenuList = ({
   children,

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

@@ -4,7 +4,7 @@ import Heading from '@atlaskit/heading';
 import { Flex, Stack, xcss } from '@atlaskit/primitives';
 const boxStyles = xcss({
   height: "var(--ds-space-800, 64px)",
-  marginBottom: "var(--ds-space-200, 16px)"
+  marginBottom: 'space.200'
 });
 const stackStyles = xcss({
   paddingTop: 'space.100',

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/es2019/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.js

@@ -8,8 +8,8 @@ import { modalMessages } from '../messages';
 const dropDownItemGroupStyles = xcss({
   width: '320px',
   height: '140px',
-  paddingTop: "var(--ds-space-050, 4px)",
-  paddingBottom: "var(--ds-space-050, 4px)",
+  paddingTop: 'space.050',
+  paddingBottom: 'space.050',
   borderRadius: 'border.radius'
 });
 const InlineIcon = jsx("svg", {

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/jira-issues-modal/basic-filters/ui/index.js

@@ -4,7 +4,7 @@ import { extractValuesFromNonComplexJQL } from '../utils/extractValuesFromNonCom
 import AsyncPopupSelect from './async-popup-select';
 export var availableBasicFilterTypes = ['project', 'type', 'status', 'assignee'];
 var basicFilterContainerStyles = xcss({
-  paddingLeft: "var(--ds-space-100, 8px)"
+  paddingLeft: 'space.100'
 });
 var BasicFilterContainer = function BasicFilterContainer(_ref) {
   var jql = _ref.jql,

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

@@ -9,11 +9,11 @@ import CustomErrorMessage from './errorMessage';
 import CustomDropdownLoadingMessage from './loadingMessage';
 import CustomNoOptionsMessage from './noOptionsMessage';
 var inlineSpinnerStyles = xcss({
-  paddingTop: "var(--ds-space-075, 6px)"
+  paddingTop: 'space.075'
 });
 var showMoreButtonBoxStyles = xcss({
-  paddingLeft: "var(--ds-space-075, 6px)",
-  paddingTop: "var(--ds-space-100, 8px)"
+  paddingLeft: 'space.075',
+  paddingTop: 'space.100'
 });
 var CustomMenuList = function CustomMenuList(_ref) {
   var children = _ref.children,

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

@@ -4,7 +4,7 @@ import Heading from '@atlaskit/heading';
 import { Flex, Stack, xcss } from '@atlaskit/primitives';
 var boxStyles = xcss({
   height: "var(--ds-space-800, 64px)",
-  marginBottom: "var(--ds-space-200, 16px)"
+  marginBottom: 'space.200'
 });
 var stackStyles = xcss({
   paddingTop: 'space.100',

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/esm/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.js

@@ -8,8 +8,8 @@ import { modalMessages } from '../messages';
 var dropDownItemGroupStyles = xcss({
   width: '320px',
   height: '140px',
-  paddingTop: "var(--ds-space-050, 4px)",
-  paddingBottom: "var(--ds-space-050, 4px)",
+  paddingTop: 'space.050',
+  paddingBottom: 'space.050',
   borderRadius: 'border.radius'
 });
 var InlineIcon = jsx("svg", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.25.2",
+  "version": "1.25.4",
   "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.10.0",
+    "@atlaskit/button": "^17.11.0",
     "@atlaskit/dropdown-menu": "^12.8.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/empty-state": "^7.7.0",
@@ -61,7 +61,7 @@
     "@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/select": "^17.6.0",
     "@atlaskit/smart-card": "^26.52.0",
     "@atlaskit/spinner": "^16.0.0",
     "@atlaskit/tag": "^12.0.0",