@atlaskit/link-datasource 2.0.3 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,41 @@
 # @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
+
+-   [#97036](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97036)
+    [`e5916b757500`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e5916b757500) -
+    Power by Assets FF cleanup
+-   [#98096](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98096)
+    [`56ced02c4cfe`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/56ced02c4cfe) -
+    Minor internal refactor to column resizing. No expected functional changes.
+-   [#97626](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97626)
+    [`6cce587bf7c2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6cce587bf7c2) -
+    Minor internal refactor to column wrapping. No expected functional changes.
+
 ## 2.0.3
 
 ### 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"));
@@ -43,6 +43,9 @@ var _countViewSmartLink = require("../../common/modal/count-view-smart-link");
 var _displayViewDropDown = require("../../common/modal/display-view-dropdown/display-view-drop-down");
 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");
@@ -59,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;
@@ -242,31 +232,17 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? _messages.confluenceSearchModalMessages.insertIssuesTitleManySites : _messages.confluenceSearchModalMessages.insertIssuesTitle;
-  var _useState15 = (0, _react.useState)(initialColumnCustomSizes),
-    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-    columnCustomSizes = _useState16[0],
-    setColumnCustomSizes = _useState16[1];
-  var onColumnResize = (0, _react.useCallback)(function (key, width) {
-    setColumnCustomSizes(_objectSpread(_objectSpread({}, columnCustomSizes), {}, (0, _defineProperty2.default)({}, key, width)));
-  }, [columnCustomSizes]);
-  var _useState17 = (0, _react.useState)(initialWrappedColumnKeys),
-    _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
-    wrappedColumnKeys = _useState18[0],
-    setWrappedColumnKeys = _useState18[1];
-  var onWrappedColumnChange = (0, _react.useCallback)(function (key, isWrapped) {
-    var set = new Set(wrappedColumnKeys);
-    if (isWrapped) {
-      set.add(key);
-    } else {
-      set.delete(key);
-    }
-    setWrappedColumnKeys(Array.from(set));
-  }, [wrappedColumnKeys]);
+  var _useColumnResize = (0, _useColumnResize2.useColumnResize)(initialColumnCustomSizes),
+    columnCustomSizes = _useColumnResize.columnCustomSizes,
+    onColumnResize = _useColumnResize.onColumnResize;
+  var _useColumnWrapping = (0, _useColumnWrapping2.useColumnWrapping)(initialWrappedColumnKeys),
+    wrappedColumnKeys = _useColumnWrapping.wrappedColumnKeys,
+    onWrappedColumnChange = _useColumnWrapping.onWrappedColumnChange;
 
   // 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/use-column-resize/index.js

@@ -0,0 +1,25 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useColumnResize = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var useColumnResize = exports.useColumnResize = function useColumnResize(initialColumnCustomSizes) {
+  var _useState = (0, _react.useState)(initialColumnCustomSizes),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    columnCustomSizes = _useState2[0],
+    setColumnCustomSizes = _useState2[1];
+  var onColumnResize = (0, _react.useCallback)(function (key, width) {
+    setColumnCustomSizes(_objectSpread(_objectSpread({}, columnCustomSizes), {}, (0, _defineProperty2.default)({}, key, width)));
+  }, [columnCustomSizes]);
+  return {
+    columnCustomSizes: columnCustomSizes,
+    onColumnResize: onColumnResize
+  };
+};

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

@@ -0,0 +1,29 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useColumnWrapping = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var useColumnWrapping = exports.useColumnWrapping = function useColumnWrapping() {
+  var initialWrappedColumnKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var _useState = (0, _react.useState)(initialWrappedColumnKeys),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    wrappedColumnKeys = _useState2[0],
+    setWrappedColumnKeys = _useState2[1];
+  var onWrappedColumnChange = (0, _react.useCallback)(function (key, isWrapped) {
+    var set = new Set(wrappedColumnKeys);
+    if (isWrapped) {
+      set.add(key);
+    } else {
+      set.delete(key);
+    }
+    setWrappedColumnKeys(Array.from(set));
+  }, [wrappedColumnKeys]);
+  return {
+    wrappedColumnKeys: wrappedColumnKeys,
+    onWrappedColumnChange: onWrappedColumnChange
+  };
+};

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,12 +5,12 @@ 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"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
@@ -48,6 +48,9 @@ var _countViewSmartLink = require("../../common/modal/count-view-smart-link");
 var _displayViewDropDown = require("../../common/modal/display-view-dropdown/display-view-drop-down");
 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");
@@ -68,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,
@@ -139,26 +126,12 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     } : undefined;
   }, [cloudId, jql]);
   var isParametersSet = !!(jql && cloudId);
-  var _useState15 = (0, _react.useState)(initialColumnCustomSizes),
-    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-    columnCustomSizes = _useState16[0],
-    setColumnCustomSizes = _useState16[1];
-  var onColumnResize = (0, _react.useCallback)(function (key, width) {
-    setColumnCustomSizes(_objectSpread(_objectSpread({}, columnCustomSizes), {}, (0, _defineProperty2.default)({}, key, width)));
-  }, [columnCustomSizes]);
-  var _useState17 = (0, _react.useState)(initialWrappedColumnKeys),
-    _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
-    wrappedColumnKeys = _useState18[0],
-    setWrappedColumnKeys = _useState18[1];
-  var onWrappedColumnChange = (0, _react.useCallback)(function (key, isWrapped) {
-    var set = new Set(wrappedColumnKeys);
-    if (isWrapped) {
-      set.add(key);
-    } else {
-      set.delete(key);
-    }
-    setWrappedColumnKeys(Array.from(set));
-  }, [wrappedColumnKeys]);
+  var _useColumnResize = (0, _useColumnResize2.useColumnResize)(initialColumnCustomSizes),
+    columnCustomSizes = _useColumnResize.columnCustomSizes,
+    onColumnResize = _useColumnResize.onColumnResize;
+  var _useColumnWrapping = (0, _useColumnWrapping2.useColumnWrapping)(initialWrappedColumnKeys),
+    wrappedColumnKeys = _useColumnWrapping.wrappedColumnKeys,
+    onWrappedColumnChange = _useColumnWrapping.onWrappedColumnChange;
   var _useDatasourceTableSt = (0, _useDatasourceTableState.useDatasourceTableState)({
       datasourceId: datasourceId,
       parameters: isParametersSet ? parameters : undefined,
@@ -434,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/cjs/ui/table-footer/index.js

@@ -14,7 +14,6 @@ var _reactIntlNext = require("react-intl-next");
 var _button = _interopRequireDefault(require("@atlaskit/button"));
 var _heading = _interopRequireDefault(require("@atlaskit/heading"));
 var _refresh = _interopRequireDefault(require("@atlaskit/icon/glyph/refresh"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
 var _colors = require("@atlaskit/theme/colors");
 var _assetsModal = require("../assets-modal");
@@ -92,7 +91,7 @@ var TableFooter = exports.TableFooter = function TableFooter(_ref) {
     values: {
       itemCount: itemCount
     }
-  }))))), (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-assets_objects_add_jsm_promotional_tag') && datasourceId === _assetsModal.ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? (0, _react2.jsx)(_poweredByJsmAssets.PoweredByJSMAssets, {
+  }))))), datasourceId === _assetsModal.ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? (0, _react2.jsx)(_poweredByJsmAssets.PoweredByJSMAssets, {
     text: intl.formatMessage(_messages.footerMessages.powerByJSM)
   }) : null, (0, _react2.jsx)(SyncWrapper, null, onRefresh && (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(SyncTextWrapper, {
     "data-testid": "sync-text"

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

@@ -31,6 +31,9 @@ import { SmartCardPlaceholder, SmartLink } from '../../common/modal/count-view-s
 import { DisplayViewDropDown } from '../../common/modal/display-view-dropdown/display-view-drop-down';
 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';
@@ -43,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
@@ -182,23 +172,14 @@ export const PlainConfluenceSearchConfigModal = props => {
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   const siteSelectorLabel = availableSites && availableSites.length > 1 ? confluenceSearchModalMessages.insertIssuesTitleManySites : confluenceSearchModalMessages.insertIssuesTitle;
-  const [columnCustomSizes, setColumnCustomSizes] = useState(initialColumnCustomSizes);
-  const onColumnResize = useCallback((key, width) => {
-    setColumnCustomSizes({
-      ...columnCustomSizes,
-      [key]: width
-    });
-  }, [columnCustomSizes]);
-  const [wrappedColumnKeys, setWrappedColumnKeys] = useState(initialWrappedColumnKeys);
-  const onWrappedColumnChange = useCallback((key, isWrapped) => {
-    const set = new Set(wrappedColumnKeys);
-    if (isWrapped) {
-      set.add(key);
-    } else {
-      set.delete(key);
-    }
-    setWrappedColumnKeys(Array.from(set));
-  }, [wrappedColumnKeys]);
+  const {
+    columnCustomSizes,
+    onColumnResize
+  } = useColumnResize(initialColumnCustomSizes);
+  const {
+    wrappedColumnKeys,
+    onWrappedColumnChange
+  } = useColumnWrapping(initialWrappedColumnKeys);
 
   // TODO: common functionality of all modals refactor in EDM-9573
   const handleVisibleColumnKeysChange = useCallback((newVisibleColumnKeys = []) => {

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

@@ -0,0 +1,14 @@
+import { useCallback, useState } from 'react';
+export const useColumnResize = initialColumnCustomSizes => {
+  const [columnCustomSizes, setColumnCustomSizes] = useState(initialColumnCustomSizes);
+  const onColumnResize = useCallback((key, width) => {
+    setColumnCustomSizes({
+      ...columnCustomSizes,
+      [key]: width
+    });
+  }, [columnCustomSizes]);
+  return {
+    columnCustomSizes,
+    onColumnResize
+  };
+};

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

@@ -0,0 +1,17 @@
+import { useCallback, useState } from 'react';
+export const useColumnWrapping = (initialWrappedColumnKeys = []) => {
+  const [wrappedColumnKeys, setWrappedColumnKeys] = useState(initialWrappedColumnKeys);
+  const onWrappedColumnChange = useCallback((key, isWrapped) => {
+    const set = new Set(wrappedColumnKeys);
+    if (isWrapped) {
+      set.add(key);
+    } else {
+      set.delete(key);
+    }
+    setWrappedColumnKeys(Array.from(set));
+  }, [wrappedColumnKeys]);
+  return {
+    wrappedColumnKeys,
+    onWrappedColumnChange
+  };
+};

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

@@ -36,6 +36,9 @@ import { SmartCardPlaceholder, SmartLink } from '../../common/modal/count-view-s
 import { DisplayViewDropDown } from '../../common/modal/display-view-dropdown/display-view-drop-down';
 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';
@@ -52,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,
@@ -101,23 +88,14 @@ export const PlainJiraIssuesConfigModal = props => {
     jql: jql || ''
   } : undefined, [cloudId, jql]);
   const isParametersSet = !!(jql && cloudId);
-  const [columnCustomSizes, setColumnCustomSizes] = useState(initialColumnCustomSizes);
-  const onColumnResize = useCallback((key, width) => {
-    setColumnCustomSizes({
-      ...columnCustomSizes,
-      [key]: width
-    });
-  }, [columnCustomSizes]);
-  const [wrappedColumnKeys, setWrappedColumnKeys] = useState(initialWrappedColumnKeys);
-  const onWrappedColumnChange = useCallback((key, isWrapped) => {
-    const set = new Set(wrappedColumnKeys);
-    if (isWrapped) {
-      set.add(key);
-    } else {
-      set.delete(key);
-    }
-    setWrappedColumnKeys(Array.from(set));
-  }, [wrappedColumnKeys]);
+  const {
+    columnCustomSizes,
+    onColumnResize
+  } = useColumnResize(initialColumnCustomSizes);
+  const {
+    wrappedColumnKeys,
+    onWrappedColumnChange
+  } = useColumnWrapping(initialWrappedColumnKeys);
   const {
     reset,
     status,

package/dist/es2019/ui/table-footer/index.js

@@ -7,7 +7,6 @@ import { FormattedMessage, FormattedNumber, useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button';
 import Heading from '@atlaskit/heading';
 import RefreshIcon from '@atlaskit/icon/glyph/refresh';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import LinkUrl from '@atlaskit/smart-card/link-url';
 import { N0, N40, N800, N90 } from '@atlaskit/theme/colors';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '../assets-modal';
@@ -81,7 +80,7 @@ export const TableFooter = ({
     values: {
       itemCount
     }
-  }))))), getBooleanFF('platform.linking-platform.datasource-assets_objects_add_jsm_promotional_tag') && datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? jsx(PoweredByJSMAssets, {
+  }))))), datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? jsx(PoweredByJSMAssets, {
     text: intl.formatMessage(footerMessages.powerByJSM)
   }) : null, jsx(SyncWrapper, null, onRefresh && jsx(Fragment, null, jsx(SyncTextWrapper, {
     "data-testid": "sync-text"

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

@@ -38,6 +38,9 @@ import { SmartCardPlaceholder, SmartLink } from '../../common/modal/count-view-s
 import { DisplayViewDropDown } from '../../common/modal/display-view-dropdown/display-view-drop-down';
 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';
@@ -50,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;
@@ -233,26 +223,12 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? confluenceSearchModalMessages.insertIssuesTitleManySites : confluenceSearchModalMessages.insertIssuesTitle;
-  var _useState15 = useState(initialColumnCustomSizes),
-    _useState16 = _slicedToArray(_useState15, 2),
-    columnCustomSizes = _useState16[0],
-    setColumnCustomSizes = _useState16[1];
-  var onColumnResize = useCallback(function (key, width) {
-    setColumnCustomSizes(_objectSpread(_objectSpread({}, columnCustomSizes), {}, _defineProperty({}, key, width)));
-  }, [columnCustomSizes]);
-  var _useState17 = useState(initialWrappedColumnKeys),
-    _useState18 = _slicedToArray(_useState17, 2),
-    wrappedColumnKeys = _useState18[0],
-    setWrappedColumnKeys = _useState18[1];
-  var onWrappedColumnChange = useCallback(function (key, isWrapped) {
-    var set = new Set(wrappedColumnKeys);
-    if (isWrapped) {
-      set.add(key);
-    } else {
-      set.delete(key);
-    }
-    setWrappedColumnKeys(Array.from(set));
-  }, [wrappedColumnKeys]);
+  var _useColumnResize = useColumnResize(initialColumnCustomSizes),
+    columnCustomSizes = _useColumnResize.columnCustomSizes,
+    onColumnResize = _useColumnResize.onColumnResize;
+  var _useColumnWrapping = useColumnWrapping(initialWrappedColumnKeys),
+    wrappedColumnKeys = _useColumnWrapping.wrappedColumnKeys,
+    onWrappedColumnChange = _useColumnWrapping.onWrappedColumnChange;
 
   // TODO: common functionality of all modals refactor in EDM-9573
   var handleVisibleColumnKeysChange = useCallback(function () {

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

@@ -0,0 +1,18 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import { useCallback, useState } from 'react';
+export var useColumnResize = function useColumnResize(initialColumnCustomSizes) {
+  var _useState = useState(initialColumnCustomSizes),
+    _useState2 = _slicedToArray(_useState, 2),
+    columnCustomSizes = _useState2[0],
+    setColumnCustomSizes = _useState2[1];
+  var onColumnResize = useCallback(function (key, width) {
+    setColumnCustomSizes(_objectSpread(_objectSpread({}, columnCustomSizes), {}, _defineProperty({}, key, width)));
+  }, [columnCustomSizes]);
+  return {
+    columnCustomSizes: columnCustomSizes,
+    onColumnResize: onColumnResize
+  };
+};

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

@@ -0,0 +1,22 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import { useCallback, useState } from 'react';
+export var useColumnWrapping = function useColumnWrapping() {
+  var initialWrappedColumnKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var _useState = useState(initialWrappedColumnKeys),
+    _useState2 = _slicedToArray(_useState, 2),
+    wrappedColumnKeys = _useState2[0],
+    setWrappedColumnKeys = _useState2[1];
+  var onWrappedColumnChange = useCallback(function (key, isWrapped) {
+    var set = new Set(wrappedColumnKeys);
+    if (isWrapped) {
+      set.add(key);
+    } else {
+      set.delete(key);
+    }
+    setWrappedColumnKeys(Array.from(set));
+  }, [wrappedColumnKeys]);
+  return {
+    wrappedColumnKeys: wrappedColumnKeys,
+    onWrappedColumnChange: onWrappedColumnChange
+  };
+};

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

@@ -1,11 +1,11 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 /** @jsx jsx */
 import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react';
@@ -43,6 +43,9 @@ import { SmartCardPlaceholder, SmartLink } from '../../common/modal/count-view-s
 import { DisplayViewDropDown } from '../../common/modal/display-view-dropdown/display-view-drop-down';
 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';
@@ -59,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,
@@ -130,26 +117,12 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     } : undefined;
   }, [cloudId, jql]);
   var isParametersSet = !!(jql && cloudId);
-  var _useState15 = useState(initialColumnCustomSizes),
-    _useState16 = _slicedToArray(_useState15, 2),
-    columnCustomSizes = _useState16[0],
-    setColumnCustomSizes = _useState16[1];
-  var onColumnResize = useCallback(function (key, width) {
-    setColumnCustomSizes(_objectSpread(_objectSpread({}, columnCustomSizes), {}, _defineProperty({}, key, width)));
-  }, [columnCustomSizes]);
-  var _useState17 = useState(initialWrappedColumnKeys),
-    _useState18 = _slicedToArray(_useState17, 2),
-    wrappedColumnKeys = _useState18[0],
-    setWrappedColumnKeys = _useState18[1];
-  var onWrappedColumnChange = useCallback(function (key, isWrapped) {
-    var set = new Set(wrappedColumnKeys);
-    if (isWrapped) {
-      set.add(key);
-    } else {
-      set.delete(key);
-    }
-    setWrappedColumnKeys(Array.from(set));
-  }, [wrappedColumnKeys]);
+  var _useColumnResize = useColumnResize(initialColumnCustomSizes),
+    columnCustomSizes = _useColumnResize.columnCustomSizes,
+    onColumnResize = _useColumnResize.onColumnResize;
+  var _useColumnWrapping = useColumnWrapping(initialWrappedColumnKeys),
+    wrappedColumnKeys = _useColumnWrapping.wrappedColumnKeys,
+    onWrappedColumnChange = _useColumnWrapping.onWrappedColumnChange;
   var _useDatasourceTableSt = useDatasourceTableState({
       datasourceId: datasourceId,
       parameters: isParametersSet ? parameters : undefined,

package/dist/esm/ui/table-footer/index.js

@@ -8,7 +8,6 @@ import { FormattedMessage, FormattedNumber, useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button';
 import Heading from '@atlaskit/heading';
 import RefreshIcon from '@atlaskit/icon/glyph/refresh';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import LinkUrl from '@atlaskit/smart-card/link-url';
 import { N0, N40, N800, N90 } from '@atlaskit/theme/colors';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '../assets-modal';
@@ -84,7 +83,7 @@ export var TableFooter = function TableFooter(_ref) {
     values: {
       itemCount: itemCount
     }
-  }))))), getBooleanFF('platform.linking-platform.datasource-assets_objects_add_jsm_promotional_tag') && datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? jsx(PoweredByJSMAssets, {
+  }))))), datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? jsx(PoweredByJSMAssets, {
     text: intl.formatMessage(footerMessages.powerByJSM)
   }) : null, jsx(SyncWrapper, null, onRefresh && jsx(Fragment, null, jsx(SyncTextWrapper, {
     "data-testid": "sync-text"

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/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-import { DatasourceDataResponseItem, DatasourceResponseSchemaProperty, DatasourceTableStatusType, DatasourceType } from '@atlaskit/linking-types';
-import { NextPageType } from '../../hooks/useDatasourceTableState';
+import type { DatasourceDataResponseItem, DatasourceResponseSchemaProperty, DatasourceTableStatusType, DatasourceType } from '@atlaskit/linking-types';
+import type { NextPageType } from '../../hooks/useDatasourceTableState';
 export type DatasourceTypeWithOnlyValues = {
     [K in DatasourceType['type']]: {
         type: K;

package/dist/types/ui/issue-like-table/use-column-resize/index.d.ts

@@ -0,0 +1,5 @@
+import { type ColumnSizesMap } from '../types';
+export declare const useColumnResize: (initialColumnCustomSizes: ColumnSizesMap | undefined) => {
+    columnCustomSizes: ColumnSizesMap | undefined;
+    onColumnResize: (key: string, width: number) => void;
+};

package/dist/types/ui/issue-like-table/use-column-wrapping/index.d.ts

@@ -0,0 +1,4 @@
+export declare const useColumnWrapping: (initialWrappedColumnKeys?: string[]) => {
+    wrappedColumnKeys: string[];
+    onWrappedColumnChange: (key: string, isWrapped: boolean) => void;
+};

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 { 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;
+import type { JiraConfigModalProps } from '../types';
 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/types.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-import { DatasourceDataResponseItem, DatasourceResponseSchemaProperty, DatasourceTableStatusType, DatasourceType } from '@atlaskit/linking-types';
-import { NextPageType } from '../../hooks/useDatasourceTableState';
+import type { DatasourceDataResponseItem, DatasourceResponseSchemaProperty, DatasourceTableStatusType, DatasourceType } from '@atlaskit/linking-types';
+import type { NextPageType } from '../../hooks/useDatasourceTableState';
 export type DatasourceTypeWithOnlyValues = {
     [K in DatasourceType['type']]: {
         type: K;

package/dist/types-ts4.5/ui/issue-like-table/use-column-resize/index.d.ts

@@ -0,0 +1,5 @@
+import { type ColumnSizesMap } from '../types';
+export declare const useColumnResize: (initialColumnCustomSizes: ColumnSizesMap | undefined) => {
+    columnCustomSizes: ColumnSizesMap | undefined;
+    onColumnResize: (key: string, width: number) => void;
+};

package/dist/types-ts4.5/ui/issue-like-table/use-column-wrapping/index.d.ts

@@ -0,0 +1,4 @@
+export declare const useColumnWrapping: (initialWrappedColumnKeys?: string[]) => {
+    wrappedColumnKeys: string[];
+    onWrappedColumnChange: (key: string, isWrapped: boolean) => void;
+};

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 { 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;
+import type { JiraConfigModalProps } from '../types';
 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/examples-helpers/useCommonTableProps.tsx

@@ -1,9 +1,11 @@
-import { useCallback, useState } from 'react';
+import { useState } from 'react';
 
 import { defaultInitialVisibleJiraColumnKeys } from '@atlaskit/link-test-helpers/datasource';
 
-import { DatasourceTableViewProps } from '../src/ui/datasource-table-view/types';
-import { ColumnSizesMap } from '../src/ui/issue-like-table/types';
+import type { DatasourceTableViewProps } from '../src/ui/datasource-table-view/types';
+import type { ColumnSizesMap } from '../src/ui/issue-like-table/types';
+import { useColumnResize } from '../src/ui/issue-like-table/use-column-resize';
+import { useColumnWrapping } from '../src/ui/issue-like-table/use-column-wrapping';
 
 export const useCommonTableProps = (
   props: { defaultColumnCustomSizes?: ColumnSizesMap } = {},
@@ -22,29 +24,11 @@ export const useCommonTableProps = (
     defaultInitialVisibleJiraColumnKeys,
   );
 
-  const [columnCustomSizes, setColumnCustomSizes] = useState<
-    ColumnSizesMap | undefined
-  >(props.defaultColumnCustomSizes);
-
-  const onColumnResize = useCallback(
-    (key: string, width: number) => {
-      setColumnCustomSizes({ ...columnCustomSizes, [key]: width });
-    },
-    [columnCustomSizes],
+  const { columnCustomSizes, onColumnResize } = useColumnResize(
+    props.defaultColumnCustomSizes,
   );
 
-  const [wrappedColumnKeys, setWrappedColumnKeys] = useState<string[]>([]);
-
-  const onWrappedColumnChange = useCallback(
-    (key: string, shouldWrap: boolean) => {
-      if (shouldWrap) {
-        setWrappedColumnKeys([...wrappedColumnKeys, key]);
-      } else {
-        setWrappedColumnKeys(wrappedColumnKeys.filter(k => k !== key));
-      }
-    },
-    [wrappedColumnKeys],
-  );
+  const { wrappedColumnKeys, onWrappedColumnChange } = useColumnWrapping([]);
 
   return {
     visibleColumnKeys,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "UI Components to support linking platform dataset feature",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^35.12.2",
     "@atlaskit/analytics-next": "^9.3.0",
-    "@atlaskit/avatar": "^21.7.0",
+    "@atlaskit/avatar": "^21.8.0",
     "@atlaskit/avatar-group": "^9.6.0",
     "@atlaskit/badge": "^16.1.0",
     "@atlaskit/button": "^17.14.0",
@@ -167,9 +167,6 @@
     },
     "platform.editor-update-tag-link-and-color_x6hcf": {
       "type": "boolean"
-    },
-    "platform.linking-platform.datasource-assets_objects_add_jsm_promotional_tag": {
-      "type": "boolean"
     }
   }
 }