@atlaskit/link-datasource 2.0.4 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaskit/link-datasource
 
+## 2.1.0
+
+### Minor Changes
+
+-   [#97537](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97537)
+    [`ab7caf1bf7ee`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ab7caf1bf7ee) -
+    Update AssetsConfigModalProps to be aligned with other modals. New fields made available
+    including:
+
+    -   `url`: The url that was used to insert a List of Links
+    -   `viewMode`: 2 viewModes `inline` and `table` for different display.
+    -   `wrappedColumnKeys`: toggle line-wrapping for each column.
+    -   `columnCustomSizes`: allow customized column sizes.
+
+    The new fields are not required for each modal to implement.
+
+### Patch Changes
+
+-   [#98158](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98158)
+    [`2ec887a95a61`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2ec887a95a61) -
+    Minor internal refactor. No expected functional changes.
+
 ## 2.0.4
 
 ### Patch Changes

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.getColumnAction = exports.PlainConfluenceSearchConfigModal = 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"));
@@ -45,6 +45,7 @@ var _siteSelector = require("../../common/modal/site-selector");
 var _issueLikeTable = require("../../issue-like-table");
 var _useColumnResize2 = require("../../issue-like-table/use-column-resize");
 var _useColumnWrapping2 = require("../../issue-like-table/use-column-wrapping");
+var _utils = require("../../issue-like-table/utils");
 var _confluenceSearchContainer = _interopRequireDefault(require("../confluence-search-container"));
 var _confluenceSearchInitialStateSvg = require("./confluence-search-initial-state-svg");
 var _messages = require("./messages");
@@ -61,19 +62,6 @@ 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;
@@ -254,7 +242,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   // 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);
+    var columnAction = (0, _utils.getColumnAction)(visibleColumnKeys || [], newVisibleColumnKeys);
     userInteractionActions.current.add(columnAction);
     visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);

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

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getWidthCss = exports.COLUMN_MIN_WIDTH = exports.COLUMN_BASE_WIDTH = void 0;
+exports.getWidthCss = exports.getColumnAction = exports.COLUMN_MIN_WIDTH = exports.COLUMN_BASE_WIDTH = void 0;
+var _types = require("../../analytics/types");
 var COLUMN_BASE_WIDTH = exports.COLUMN_BASE_WIDTH = 8;
 var COLUMN_MIN_WIDTH = exports.COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 3;
 /**
@@ -23,4 +24,20 @@ var getWidthCss = exports.getWidthCss = function getWidthCss(_ref) {
   } : {
     maxWidth: width
   };
+};
+
+/**
+ * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
+ * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
+ */
+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;
+  }
 };

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

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getColumnAction = exports.PlainJiraIssuesConfigModal = exports.JiraIssuesConfigModal = void 0;
+exports.PlainJiraIssuesConfigModal = exports.JiraIssuesConfigModal = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -50,6 +50,7 @@ var _siteSelector = require("../../common/modal/site-selector");
 var _issueLikeTable = require("../../issue-like-table");
 var _useColumnResize2 = require("../../issue-like-table/use-column-resize");
 var _useColumnWrapping2 = require("../../issue-like-table/use-column-wrapping");
+var _utils2 = require("../../issue-like-table/utils");
 var _ui = require("../basic-filters/ui");
 var _isQueryTooComplex = require("../basic-filters/utils/isQueryTooComplex");
 var _jiraSearchContainer = require("../jira-search-container");
@@ -70,22 +71,6 @@ var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
   return itemCount === 1 ? _types.DatasourceDisplay.INLINE : _types.DatasourceDisplay.DATASOURCE_INLINE;
 };
 var jqlSupportDocumentLink = 'https://support.atlassian.com/jira-service-management-cloud/docs/use-advanced-search-with-jira-query-language-jql/';
-
-/**
- * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
- * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
- */
-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 PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var datasourceId = props.datasourceId,
     initialColumnCustomSizes = props.columnCustomSizes,
@@ -422,7 +407,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   }, [onNextPage]);
   var handleVisibleColumnKeysChange = (0, _react.useCallback)(function () {
     var newVisibleColumnKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var columnAction = getColumnAction(visibleColumnKeys || [], newVisibleColumnKeys);
+    var columnAction = (0, _utils2.getColumnAction)(visibleColumnKeys || [], newVisibleColumnKeys);
     userInteractionActions.current.add(columnAction);
     visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);

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

@@ -33,6 +33,7 @@ import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
 import { useColumnResize } from '../../issue-like-table/use-column-resize';
 import { useColumnWrapping } from '../../issue-like-table/use-column-wrapping';
+import { getColumnAction } from '../../issue-like-table/utils';
 import ConfluenceSearchContainer from '../confluence-search-container';
 import { ConfluenceSearchInitialStateSVG } from './confluence-search-initial-state-svg';
 import { confluenceSearchModalMessages } from './messages';
@@ -45,19 +46,6 @@ 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

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

@@ -1,3 +1,4 @@
+import { DatasourceAction } from '../../analytics/types';
 export const COLUMN_BASE_WIDTH = 8;
 export const COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 3;
 /**
@@ -16,4 +17,20 @@ export const getWidthCss = ({
   width
 } : {
   maxWidth: width
+};
+
+/**
+ * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
+ * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
+ */
+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;
+  }
 };

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

@@ -38,6 +38,7 @@ import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
 import { useColumnResize } from '../../issue-like-table/use-column-resize';
 import { useColumnWrapping } from '../../issue-like-table/use-column-wrapping';
+import { getColumnAction } from '../../issue-like-table/utils';
 import { availableBasicFilterTypes } from '../basic-filters/ui';
 import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { JiraSearchContainer } from '../jira-search-container';
@@ -54,22 +55,6 @@ const getDisplayValue = (currentViewMode, itemCount) => {
   return itemCount === 1 ? DatasourceDisplay.INLINE : DatasourceDisplay.DATASOURCE_INLINE;
 };
 const jqlSupportDocumentLink = 'https://support.atlassian.com/jira-service-management-cloud/docs/use-advanced-search-with-jira-query-language-jql/';
-
-/**
- * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
- * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
- */
-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 PlainJiraIssuesConfigModal = props => {
   const {
     datasourceId,

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

@@ -40,6 +40,7 @@ import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
 import { useColumnResize } from '../../issue-like-table/use-column-resize';
 import { useColumnWrapping } from '../../issue-like-table/use-column-wrapping';
+import { getColumnAction } from '../../issue-like-table/utils';
 import ConfluenceSearchContainer from '../confluence-search-container';
 import { ConfluenceSearchInitialStateSVG } from './confluence-search-initial-state-svg';
 import { confluenceSearchModalMessages } from './messages';
@@ -52,19 +53,6 @@ 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;

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

@@ -1,3 +1,4 @@
+import { DatasourceAction } from '../../analytics/types';
 export var COLUMN_BASE_WIDTH = 8;
 export var COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 3;
 /**
@@ -17,4 +18,20 @@ export var getWidthCss = function getWidthCss(_ref) {
   } : {
     maxWidth: width
   };
+};
+
+/**
+ * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
+ * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
+ */
+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;
+  }
 };

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

@@ -45,6 +45,7 @@ import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
 import { useColumnResize } from '../../issue-like-table/use-column-resize';
 import { useColumnWrapping } from '../../issue-like-table/use-column-wrapping';
+import { getColumnAction } from '../../issue-like-table/utils';
 import { availableBasicFilterTypes } from '../basic-filters/ui';
 import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { JiraSearchContainer } from '../jira-search-container';
@@ -61,22 +62,6 @@ var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
   return itemCount === 1 ? DatasourceDisplay.INLINE : DatasourceDisplay.DATASOURCE_INLINE;
 };
 var jqlSupportDocumentLink = 'https://support.atlassian.com/jira-service-management-cloud/docs/use-advanced-search-with-jira-query-language-jql/';
-
-/**
- * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
- * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
- */
-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 PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var datasourceId = props.datasourceId,
     initialColumnCustomSizes = props.columnCustomSizes,

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

@@ -1,3 +1,3 @@
 /// <reference types="react" />
-import { AssetsConfigModalProps } from '../types';
+import { type AssetsConfigModalProps } from '../types';
 export declare const AssetsConfigModal: import("react").ForwardRefExoticComponent<AssetsConfigModalProps & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;

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

@@ -1,15 +1,11 @@
-import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
-import { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common/types';
+import { type DatasourceAdf, type InlineCardAdf } from '@atlaskit/linking-common/types';
+import { type DatasourceParameters } from '@atlaskit/linking-types';
+import { type ConfigModalProps } from '../../common/types';
 export type AssetsDatasourceParameters = {
     workspaceId: string;
     aql: string;
     schemaId: string;
 };
 export type AssetsDatasourceAdf = DatasourceAdf<AssetsDatasourceParameters>;
-export interface AssetsConfigModalProps {
-    datasourceId: string;
-    visibleColumnKeys?: string[];
-    parameters?: AssetsDatasourceParameters;
-    onCancel: () => void;
-    onInsert: (adf: InlineCardAdf | AssetsDatasourceAdf, analyticsEvent?: UIAnalyticsEvent) => void;
+export interface AssetsConfigModalProps extends ConfigModalProps<InlineCardAdf | AssetsDatasourceAdf, DatasourceParameters | AssetsDatasourceParameters> {
 }

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

@@ -1,7 +1,5 @@
 /// <reference types="react" />
 import { jsx } from '@emotion/react';
-import { DatasourceAction } from '../../../analytics/types';
 import { type 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/ui/confluence-search-modal/types.d.ts

@@ -1,7 +1,8 @@
 import { type DatasourceAdf, type InlineCardAdf } from '@atlaskit/linking-common/types';
+import type { DatasourceParameters } from '@atlaskit/linking-types';
 import { type ConfigModalProps } from '../../common/types';
 import { type DateRangeType } from '../common/modal/popup-select/types';
-export interface ConfluenceSearchConfigModalProps extends ConfigModalProps<InlineCardAdf | ConfluenceSearchDatasourceAdf, ConfluenceSearchDatasourceParameters> {
+export interface ConfluenceSearchConfigModalProps extends ConfigModalProps<InlineCardAdf | ConfluenceSearchDatasourceAdf, DatasourceParameters | ConfluenceSearchDatasourceParameters> {
     disableDisplayDropdown?: boolean;
     overrideParameters?: Pick<ConfluenceSearchDatasourceParameters, 'entityTypes'>;
 }

package/dist/types/ui/issue-like-table/utils.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { DatasourceAction } from '../../analytics/types';
 export declare const COLUMN_BASE_WIDTH = 8;
 export declare const COLUMN_MIN_WIDTH: number;
 export type GetWidthCss = (arg: {
@@ -15,3 +16,8 @@ export type GetWidthCss = (arg: {
  * @param width
  */
 export declare const getWidthCss: GetWidthCss;
+/**
+ * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
+ * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
+ */
+export declare const getColumnAction: (oldVisibleColumnKeys: string[], newVisibleColumnKeys: string[]) => DatasourceAction;

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

@@ -1,11 +1,5 @@
 /// <reference types="react" />
 import { jsx } from '@emotion/react';
-import { DatasourceAction } from '../../../analytics/types';
 import type { JiraConfigModalProps } from '../types';
-/**
- * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
- * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
- */
-export declare const getColumnAction: (oldVisibleColumnKeys: string[], newVisibleColumnKeys: string[]) => DatasourceAction;
 export declare const PlainJiraIssuesConfigModal: (props: JiraConfigModalProps) => jsx.JSX.Element;
 export declare const JiraIssuesConfigModal: import("react").ForwardRefExoticComponent<JiraConfigModalProps & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;

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

@@ -1,3 +1,3 @@
 /// <reference types="react" />
-import { AssetsConfigModalProps } from '../types';
+import { type AssetsConfigModalProps } from '../types';
 export declare const AssetsConfigModal: import("react").ForwardRefExoticComponent<AssetsConfigModalProps & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;

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

@@ -1,15 +1,11 @@
-import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
-import { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common/types';
+import { type DatasourceAdf, type InlineCardAdf } from '@atlaskit/linking-common/types';
+import { type DatasourceParameters } from '@atlaskit/linking-types';
+import { type ConfigModalProps } from '../../common/types';
 export type AssetsDatasourceParameters = {
     workspaceId: string;
     aql: string;
     schemaId: string;
 };
 export type AssetsDatasourceAdf = DatasourceAdf<AssetsDatasourceParameters>;
-export interface AssetsConfigModalProps {
-    datasourceId: string;
-    visibleColumnKeys?: string[];
-    parameters?: AssetsDatasourceParameters;
-    onCancel: () => void;
-    onInsert: (adf: InlineCardAdf | AssetsDatasourceAdf, analyticsEvent?: UIAnalyticsEvent) => void;
+export interface AssetsConfigModalProps extends ConfigModalProps<InlineCardAdf | AssetsDatasourceAdf, DatasourceParameters | AssetsDatasourceParameters> {
 }

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

@@ -1,7 +1,5 @@
 /// <reference types="react" />
 import { jsx } from '@emotion/react';
-import { DatasourceAction } from '../../../analytics/types';
 import { type 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/types.d.ts

@@ -1,7 +1,8 @@
 import { type DatasourceAdf, type InlineCardAdf } from '@atlaskit/linking-common/types';
+import type { DatasourceParameters } from '@atlaskit/linking-types';
 import { type ConfigModalProps } from '../../common/types';
 import { type DateRangeType } from '../common/modal/popup-select/types';
-export interface ConfluenceSearchConfigModalProps extends ConfigModalProps<InlineCardAdf | ConfluenceSearchDatasourceAdf, ConfluenceSearchDatasourceParameters> {
+export interface ConfluenceSearchConfigModalProps extends ConfigModalProps<InlineCardAdf | ConfluenceSearchDatasourceAdf, DatasourceParameters | ConfluenceSearchDatasourceParameters> {
     disableDisplayDropdown?: boolean;
     overrideParameters?: Pick<ConfluenceSearchDatasourceParameters, 'entityTypes'>;
 }

package/dist/types-ts4.5/ui/issue-like-table/utils.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { DatasourceAction } from '../../analytics/types';
 export declare const COLUMN_BASE_WIDTH = 8;
 export declare const COLUMN_MIN_WIDTH: number;
 export type GetWidthCss = (arg: {
@@ -15,3 +16,8 @@ export type GetWidthCss = (arg: {
  * @param width
  */
 export declare const getWidthCss: GetWidthCss;
+/**
+ * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
+ * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
+ */
+export declare const getColumnAction: (oldVisibleColumnKeys: string[], newVisibleColumnKeys: string[]) => DatasourceAction;

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

@@ -1,11 +1,5 @@
 /// <reference types="react" />
 import { jsx } from '@emotion/react';
-import { DatasourceAction } from '../../../analytics/types';
 import type { JiraConfigModalProps } from '../types';
-/**
- * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
- * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
- */
-export declare const getColumnAction: (oldVisibleColumnKeys: string[], newVisibleColumnKeys: string[]) => DatasourceAction;
 export declare const PlainJiraIssuesConfigModal: (props: JiraConfigModalProps) => jsx.JSX.Element;
 export declare const JiraIssuesConfigModal: import("react").ForwardRefExoticComponent<JiraConfigModalProps & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "description": "UI Components to support linking platform dataset feature",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",