@atlaskit/link-datasource 1.25.0 → 1.25.2

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,7 @@
+/// <reference types="react" />
 import { jsx } from '@emotion/react';
+import { DatasourceAction } from '../../../analytics/types';
 import { ConfluenceSearchConfigModalProps } from '../types';
-export declare const ConfluenceSearchConfigModal: (props: ConfluenceSearchConfigModalProps) => jsx.JSX.Element;
+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/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,7 @@
+/// <reference types="react" />
 import { jsx } from '@emotion/react';
+import { DatasourceAction } from '../../../analytics/types';
 import { ConfluenceSearchConfigModalProps } from '../types';
-export declare const ConfluenceSearchConfigModal: (props: ConfluenceSearchConfigModalProps) => jsx.JSX.Element;
+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/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.2",
   "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.10.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",