@atlaskit/link-datasource 5.6.0 → 5.6.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/link-datasource
 
+## 5.6.1
+
+### Patch Changes
+
+- [`c7fb26d1c5d03`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c7fb26d1c5d03) -
+  Fixing read-only SLLV sorting problems with default type losing the label visually and introducing
+  third state of sorting - going back to default
+
 ## 5.6.0
 
 ### Minor Changes

package/dist/cjs/ui/datasource-table-view/datasource-column-sort.js

@@ -10,10 +10,13 @@ var _jiraIssuesModal = require("../jira-issues-modal");
 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 getNextSortDirection = function getNextSortDirection(columnKey, currentSort) {
-  if ((currentSort === null || currentSort === void 0 ? void 0 : currentSort.key) === columnKey) {
-    return currentSort.direction === 'ASC' ? 'DESC' : 'ASC';
+  if ((currentSort === null || currentSort === void 0 ? void 0 : currentSort.key) !== columnKey) {
+    return 'ASC';
   }
-  return 'ASC';
+  if (currentSort.direction === 'ASC') {
+    return 'DESC';
+  }
+  return undefined;
 };
 // Match and remove an existing trailing ORDER BY clause before appending the next sort:
 // - (?:^|\\s+) allows ORDER BY at the start of the JQL or after whitespace.
@@ -27,15 +30,21 @@ var getJiraColumnSortParameters = function getJiraColumnSortParameters(_ref) {
   var parameters = _ref.parameters,
     columnKey = _ref.columnKey,
     currentSort = _ref.currentSort;
+  var direction = getNextSortDirection(columnKey, currentSort);
+  if (!direction) {
+    return {
+      parameters: parameters,
+      sort: undefined
+    };
+  }
   if (typeof parameters.jql !== 'string') {
     return undefined;
   }
-  var direction = getNextSortDirection(columnKey, currentSort);
   var jqlWithoutOrder = parameters.jql.replace(JIRA_ORDER_BY_PATTERN, '').trim();
   var nextOrderByClause = "ORDER BY ".concat(columnKey, " ").concat(direction);
   return {
     parameters: _objectSpread(_objectSpread({}, parameters), {}, {
-      jql: "".concat(jqlWithoutOrder, " ").concat(nextOrderByClause)
+      jql: [jqlWithoutOrder, nextOrderByClause].filter(Boolean).join(' ')
     }),
     sort: {
       key: columnKey,

package/dist/cjs/ui/datasource-table-view/datasourceTableView.js

@@ -186,7 +186,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   var onColumnSort = (0, _react.useCallback)(function (columnKey) {
     // Build next params/sort atomically so UI state and query state stay in sync.
     var result = columnSortGetter === null || columnSortGetter === void 0 ? void 0 : columnSortGetter({
-      parameters: sessionParameters,
+      parameters: sessionBaseParametersRef.current,
       columnKey: columnKey,
       currentSort: sortState
     });
@@ -195,7 +195,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
     }
     setSortState(result.sort);
     setSessionParameters(result.parameters);
-  }, [columnSortGetter, sessionParameters, sortState]);
+  }, [columnSortGetter, sortState]);
   var handleErrorRefresh = (0, _react.useCallback)(function () {
     reset({
       shouldForceRequest: true

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

@@ -37,7 +37,6 @@ var _ufoExperiences = require("../../analytics/ufoExperiences");
 var _datasourceExperienceId = require("../../contexts/datasource-experience-id");
 var _useIsInPDFRender = require("../../hooks/useIsInPDFRender");
 var _columnPicker = require("./column-picker");
-var _customIcons = require("./custom-icons");
 var _dragColumnPreview = require("./drag-column-preview");
 var _draggableTableHeading = require("./draggable-table-heading");
 var _emptyState = _interopRequireDefault(require("./empty-state"));
@@ -318,7 +317,8 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
             height: 14,
             testId: "issues-table-row-loading"
           })),
-          key: column.key
+          key: column.key,
+          width: column.width
         };
       })
     };
@@ -442,10 +442,25 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
       };
     });
   }, [items, itemIds, renderItem, wrappedColumnKeys, visibleSortedColumns, getColumnWidth]);
+  var previousRealRowsCountRef = (0, _react.useRef)(undefined);
+  (0, _react.useEffect)(function () {
+    if (tableRows.length > 0) {
+      previousRealRowsCountRef.current = tableRows.length;
+    }
+  }, [tableRows.length]);
   var rows = (0, _react.useMemo)(function () {
-    if (status !== 'loading') {
-      return tableRows;
+    if ((0, _platformFeatureFlags.fg)('platform_lp_jira_sllv_renderer_column_sorting')) {
+      var hasPreviousRealRows = !!previousRealRowsCountRef.current;
+      var isLoadingState = status === 'loading' || status === 'empty' && hasPreviousRealRows;
+      if (!isLoadingState) {
+        return tableRows;
+      }
+    } else {
+      if (status !== 'loading') {
+        return tableRows;
+      }
     }
+
     // if there are table rows, only add 1 loading row
     if (tableRows.length > 0) {
       return [].concat((0, _toConsumableArray2.default)(tableRows), [_objectSpread(_objectSpread({}, loadingRow), {}, {
@@ -455,6 +470,14 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     // if there are no table rows add 14 rows if it is compact (has scrollableContainerHeight or non-modal)
     // add 10 rows if it is modal (no scrollableContainerHeight)
     var loadingRowsCount = scrollableContainerHeight ? 14 : 10;
+    if ((0, _platformFeatureFlags.fg)('platform_lp_jira_sllv_renderer_column_sorting')) {
+      var defaultLoadingRowsCount = scrollableContainerHeight ? 14 : 10;
+      var previousRealRowsCount = previousRealRowsCountRef.current;
+      loadingRowsCount = defaultLoadingRowsCount;
+      if (previousRealRowsCount && previousRealRowsCount < defaultLoadingRowsCount) {
+        loadingRowsCount = previousRealRowsCount;
+      }
+    }
     return (0, _toConsumableArray2.default)(Array(loadingRowsCount)).map(function (_, index) {
       return _objectSpread(_objectSpread({}, loadingRow), {}, {
         key: "loading-".concat(index)
@@ -550,28 +573,30 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     if (shouldEnableColumnSort) {
       var sortedDirection = (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key ? sortState.direction : undefined;
       // Use directional icon only for the active sort column; keep width stable otherwise.
-      var SortIcon = sortedDirection ? sortedDirection === 'ASC' ? _sortAscending.default : _sortDescending.default : _customIcons.GlyphPlaceholder;
+      var SortIcon = sortedDirection ? sortedDirection === 'ASC' ? _sortAscending.default : _sortDescending.default : null;
       var sortLabel = typeof content === 'string' ? content : key;
       var sortButtonAriaLabel = sortedDirection === 'ASC' ? formatMessage(_messages.issueLikeTableMessages.sortByColumnDescendingAction, {
         column: sortLabel
       }) : formatMessage(_messages.issueLikeTableMessages.sortByColumnAscendingAction, {
         column: sortLabel
       });
-      heading = /*#__PURE__*/React.createElement(SortableHeaderParent, null, /*#__PURE__*/React.createElement(_new.default, {
+      heading = /*#__PURE__*/React.createElement(SortableHeaderParent, null, /*#__PURE__*/React.createElement(_new.default, (0, _extends2.default)({
         appearance: "subtle",
         spacing: "compact",
         shouldFitContainer: true,
         testId: "".concat(key, "-column-sort-button"),
-        "aria-label": sortButtonAriaLabel,
+        "aria-label": sortButtonAriaLabel
+      }, SortIcon ? {
         iconAfter: function iconAfter(iconProps) {
           return /*#__PURE__*/React.createElement(SortIcon, (0, _extends2.default)({}, iconProps, {
             size: "small"
           }));
-        },
+        }
+      } : {}, {
         onClick: function onClick() {
           return onColumnSort === null || onColumnSort === void 0 ? void 0 : onColumnSort(key);
         }
-      }, heading));
+      }), heading));
     } else if (isHeadingOutsideButton) {
       heading = /*#__PURE__*/React.createElement("div", {
         className: (0, _runtime.ax)(["_1e0c1txw _4cvr1h6o _o5721q9c _8vu418qm _irr3l4ek"])

package/dist/es2019/ui/datasource-table-view/datasource-column-sort.js

@@ -1,9 +1,12 @@
 import { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '../jira-issues-modal';
 const getNextSortDirection = (columnKey, currentSort) => {
-  if ((currentSort === null || currentSort === void 0 ? void 0 : currentSort.key) === columnKey) {
-    return currentSort.direction === 'ASC' ? 'DESC' : 'ASC';
+  if ((currentSort === null || currentSort === void 0 ? void 0 : currentSort.key) !== columnKey) {
+    return 'ASC';
   }
-  return 'ASC';
+  if (currentSort.direction === 'ASC') {
+    return 'DESC';
+  }
+  return undefined;
 };
 // Match and remove an existing trailing ORDER BY clause before appending the next sort:
 // - (?:^|\\s+) allows ORDER BY at the start of the JQL or after whitespace.
@@ -18,16 +21,22 @@ const getJiraColumnSortParameters = ({
   columnKey,
   currentSort
 }) => {
+  const direction = getNextSortDirection(columnKey, currentSort);
+  if (!direction) {
+    return {
+      parameters,
+      sort: undefined
+    };
+  }
   if (typeof parameters.jql !== 'string') {
     return undefined;
   }
-  const direction = getNextSortDirection(columnKey, currentSort);
   const jqlWithoutOrder = parameters.jql.replace(JIRA_ORDER_BY_PATTERN, '').trim();
   const nextOrderByClause = `ORDER BY ${columnKey} ${direction}`;
   return {
     parameters: {
       ...parameters,
-      jql: `${jqlWithoutOrder} ${nextOrderByClause}`
+      jql: [jqlWithoutOrder, nextOrderByClause].filter(Boolean).join(' ')
     },
     sort: {
       key: columnKey,

package/dist/es2019/ui/datasource-table-view/datasourceTableView.js

@@ -167,7 +167,7 @@ const DatasourceTableViewWithoutAnalytics = ({
   const onColumnSort = useCallback(columnKey => {
     // Build next params/sort atomically so UI state and query state stay in sync.
     const result = columnSortGetter === null || columnSortGetter === void 0 ? void 0 : columnSortGetter({
-      parameters: sessionParameters,
+      parameters: sessionBaseParametersRef.current,
       columnKey,
       currentSort: sortState
     });
@@ -176,7 +176,7 @@ const DatasourceTableViewWithoutAnalytics = ({
     }
     setSortState(result.sort);
     setSessionParameters(result.parameters);
-  }, [columnSortGetter, sessionParameters, sortState]);
+  }, [columnSortGetter, sortState]);
   const handleErrorRefresh = useCallback(() => {
     reset({
       shouldForceRequest: true

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

@@ -26,7 +26,6 @@ import { startUfoExperience, succeedUfoExperience } from '../../analytics/ufoExp
 import { useDatasourceExperienceId } from '../../contexts/datasource-experience-id';
 import { useIsInPDFRender } from '../../hooks/useIsInPDFRender';
 import { ColumnPicker } from './column-picker';
-import { GlyphPlaceholder } from './custom-icons';
 import { DragColumnPreview } from './drag-column-preview';
 import { DraggableTableHeading } from './draggable-table-heading';
 import TableEmptyState from './empty-state';
@@ -269,7 +268,8 @@ export const IssueLikeDataTableView = ({
         height: 14,
         testId: "issues-table-row-loading"
       })),
-      key: column.key
+      key: column.key,
+      width: column.width
     }))
   }), [headerColumns]);
   useEffect(() => {
@@ -391,10 +391,25 @@ export const IssueLikeDataTableView = ({
       ref: rowIndex === items.length - 1 ? el => setLastRowElement(el) : undefined
     };
   }), [items, itemIds, renderItem, wrappedColumnKeys, visibleSortedColumns, getColumnWidth]);
+  const previousRealRowsCountRef = useRef(undefined);
+  useEffect(() => {
+    if (tableRows.length > 0) {
+      previousRealRowsCountRef.current = tableRows.length;
+    }
+  }, [tableRows.length]);
   const rows = useMemo(() => {
-    if (status !== 'loading') {
-      return tableRows;
+    if (fg('platform_lp_jira_sllv_renderer_column_sorting')) {
+      const hasPreviousRealRows = !!previousRealRowsCountRef.current;
+      const isLoadingState = status === 'loading' || status === 'empty' && hasPreviousRealRows;
+      if (!isLoadingState) {
+        return tableRows;
+      }
+    } else {
+      if (status !== 'loading') {
+        return tableRows;
+      }
     }
+
     // if there are table rows, only add 1 loading row
     if (tableRows.length > 0) {
       return [...tableRows, {
@@ -404,7 +419,15 @@ export const IssueLikeDataTableView = ({
     }
     // if there are no table rows add 14 rows if it is compact (has scrollableContainerHeight or non-modal)
     // add 10 rows if it is modal (no scrollableContainerHeight)
-    const loadingRowsCount = scrollableContainerHeight ? 14 : 10;
+    let loadingRowsCount = scrollableContainerHeight ? 14 : 10;
+    if (fg('platform_lp_jira_sllv_renderer_column_sorting')) {
+      const defaultLoadingRowsCount = scrollableContainerHeight ? 14 : 10;
+      const previousRealRowsCount = previousRealRowsCountRef.current;
+      loadingRowsCount = defaultLoadingRowsCount;
+      if (previousRealRowsCount && previousRealRowsCount < defaultLoadingRowsCount) {
+        loadingRowsCount = previousRealRowsCount;
+      }
+    }
     return [...Array(loadingRowsCount)].map((_, index) => ({
       ...loadingRow,
       key: `loading-${index}`
@@ -483,24 +506,26 @@ export const IssueLikeDataTableView = ({
     if (shouldEnableColumnSort) {
       const sortedDirection = (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key ? sortState.direction : undefined;
       // Use directional icon only for the active sort column; keep width stable otherwise.
-      const SortIcon = sortedDirection ? sortedDirection === 'ASC' ? SortAscendingIcon : SortDescendingIcon : GlyphPlaceholder;
+      const SortIcon = sortedDirection ? sortedDirection === 'ASC' ? SortAscendingIcon : SortDescendingIcon : null;
       const sortLabel = typeof content === 'string' ? content : key;
       const sortButtonAriaLabel = sortedDirection === 'ASC' ? formatMessage(issueLikeTableMessages.sortByColumnDescendingAction, {
         column: sortLabel
       }) : formatMessage(issueLikeTableMessages.sortByColumnAscendingAction, {
         column: sortLabel
       });
-      heading = /*#__PURE__*/React.createElement(SortableHeaderParent, null, /*#__PURE__*/React.createElement(Button, {
+      heading = /*#__PURE__*/React.createElement(SortableHeaderParent, null, /*#__PURE__*/React.createElement(Button, _extends({
         appearance: "subtle",
         spacing: "compact",
         shouldFitContainer: true,
         testId: `${key}-column-sort-button`,
-        "aria-label": sortButtonAriaLabel,
+        "aria-label": sortButtonAriaLabel
+      }, SortIcon ? {
         iconAfter: iconProps => /*#__PURE__*/React.createElement(SortIcon, _extends({}, iconProps, {
           size: "small"
-        })),
+        }))
+      } : {}, {
         onClick: () => onColumnSort === null || onColumnSort === void 0 ? void 0 : onColumnSort(key)
-      }, heading));
+      }), heading));
     } else if (isHeadingOutsideButton) {
       heading = /*#__PURE__*/React.createElement("div", {
         className: ax(["_1e0c1txw _4cvr1h6o _o5721q9c _8vu418qm _irr3l4ek"])

package/dist/esm/ui/datasource-table-view/datasource-column-sort.js

@@ -3,10 +3,13 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from '../jira-issues-modal';
 var getNextSortDirection = function getNextSortDirection(columnKey, currentSort) {
-  if ((currentSort === null || currentSort === void 0 ? void 0 : currentSort.key) === columnKey) {
-    return currentSort.direction === 'ASC' ? 'DESC' : 'ASC';
+  if ((currentSort === null || currentSort === void 0 ? void 0 : currentSort.key) !== columnKey) {
+    return 'ASC';
   }
-  return 'ASC';
+  if (currentSort.direction === 'ASC') {
+    return 'DESC';
+  }
+  return undefined;
 };
 // Match and remove an existing trailing ORDER BY clause before appending the next sort:
 // - (?:^|\\s+) allows ORDER BY at the start of the JQL or after whitespace.
@@ -20,15 +23,21 @@ var getJiraColumnSortParameters = function getJiraColumnSortParameters(_ref) {
   var parameters = _ref.parameters,
     columnKey = _ref.columnKey,
     currentSort = _ref.currentSort;
+  var direction = getNextSortDirection(columnKey, currentSort);
+  if (!direction) {
+    return {
+      parameters: parameters,
+      sort: undefined
+    };
+  }
   if (typeof parameters.jql !== 'string') {
     return undefined;
   }
-  var direction = getNextSortDirection(columnKey, currentSort);
   var jqlWithoutOrder = parameters.jql.replace(JIRA_ORDER_BY_PATTERN, '').trim();
   var nextOrderByClause = "ORDER BY ".concat(columnKey, " ").concat(direction);
   return {
     parameters: _objectSpread(_objectSpread({}, parameters), {}, {
-      jql: "".concat(jqlWithoutOrder, " ").concat(nextOrderByClause)
+      jql: [jqlWithoutOrder, nextOrderByClause].filter(Boolean).join(' ')
     }),
     sort: {
       key: columnKey,

package/dist/esm/ui/datasource-table-view/datasourceTableView.js

@@ -177,7 +177,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   var onColumnSort = useCallback(function (columnKey) {
     // Build next params/sort atomically so UI state and query state stay in sync.
     var result = columnSortGetter === null || columnSortGetter === void 0 ? void 0 : columnSortGetter({
-      parameters: sessionParameters,
+      parameters: sessionBaseParametersRef.current,
       columnKey: columnKey,
       currentSort: sortState
     });
@@ -186,7 +186,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
     }
     setSortState(result.sort);
     setSessionParameters(result.parameters);
-  }, [columnSortGetter, sessionParameters, sortState]);
+  }, [columnSortGetter, sortState]);
   var handleErrorRefresh = useCallback(function () {
     reset({
       shouldForceRequest: true

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

@@ -39,7 +39,6 @@ import { startUfoExperience, succeedUfoExperience } from '../../analytics/ufoExp
 import { useDatasourceExperienceId } from '../../contexts/datasource-experience-id';
 import { useIsInPDFRender } from '../../hooks/useIsInPDFRender';
 import { ColumnPicker } from './column-picker';
-import { GlyphPlaceholder } from './custom-icons';
 import { DragColumnPreview } from './drag-column-preview';
 import { DraggableTableHeading } from './draggable-table-heading';
 import TableEmptyState from './empty-state';
@@ -311,7 +310,8 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref6) {
             height: 14,
             testId: "issues-table-row-loading"
           })),
-          key: column.key
+          key: column.key,
+          width: column.width
         };
       })
     };
@@ -435,10 +435,25 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref6) {
       };
     });
   }, [items, itemIds, renderItem, wrappedColumnKeys, visibleSortedColumns, getColumnWidth]);
+  var previousRealRowsCountRef = useRef(undefined);
+  useEffect(function () {
+    if (tableRows.length > 0) {
+      previousRealRowsCountRef.current = tableRows.length;
+    }
+  }, [tableRows.length]);
   var rows = useMemo(function () {
-    if (status !== 'loading') {
-      return tableRows;
+    if (fg('platform_lp_jira_sllv_renderer_column_sorting')) {
+      var hasPreviousRealRows = !!previousRealRowsCountRef.current;
+      var isLoadingState = status === 'loading' || status === 'empty' && hasPreviousRealRows;
+      if (!isLoadingState) {
+        return tableRows;
+      }
+    } else {
+      if (status !== 'loading') {
+        return tableRows;
+      }
     }
+
     // if there are table rows, only add 1 loading row
     if (tableRows.length > 0) {
       return [].concat(_toConsumableArray(tableRows), [_objectSpread(_objectSpread({}, loadingRow), {}, {
@@ -448,6 +463,14 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref6) {
     // if there are no table rows add 14 rows if it is compact (has scrollableContainerHeight or non-modal)
     // add 10 rows if it is modal (no scrollableContainerHeight)
     var loadingRowsCount = scrollableContainerHeight ? 14 : 10;
+    if (fg('platform_lp_jira_sllv_renderer_column_sorting')) {
+      var defaultLoadingRowsCount = scrollableContainerHeight ? 14 : 10;
+      var previousRealRowsCount = previousRealRowsCountRef.current;
+      loadingRowsCount = defaultLoadingRowsCount;
+      if (previousRealRowsCount && previousRealRowsCount < defaultLoadingRowsCount) {
+        loadingRowsCount = previousRealRowsCount;
+      }
+    }
     return _toConsumableArray(Array(loadingRowsCount)).map(function (_, index) {
       return _objectSpread(_objectSpread({}, loadingRow), {}, {
         key: "loading-".concat(index)
@@ -543,28 +566,30 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref6) {
     if (shouldEnableColumnSort) {
       var sortedDirection = (sortState === null || sortState === void 0 ? void 0 : sortState.key) === key ? sortState.direction : undefined;
       // Use directional icon only for the active sort column; keep width stable otherwise.
-      var SortIcon = sortedDirection ? sortedDirection === 'ASC' ? SortAscendingIcon : SortDescendingIcon : GlyphPlaceholder;
+      var SortIcon = sortedDirection ? sortedDirection === 'ASC' ? SortAscendingIcon : SortDescendingIcon : null;
       var sortLabel = typeof content === 'string' ? content : key;
       var sortButtonAriaLabel = sortedDirection === 'ASC' ? formatMessage(issueLikeTableMessages.sortByColumnDescendingAction, {
         column: sortLabel
       }) : formatMessage(issueLikeTableMessages.sortByColumnAscendingAction, {
         column: sortLabel
       });
-      heading = /*#__PURE__*/React.createElement(SortableHeaderParent, null, /*#__PURE__*/React.createElement(Button, {
+      heading = /*#__PURE__*/React.createElement(SortableHeaderParent, null, /*#__PURE__*/React.createElement(Button, _extends({
         appearance: "subtle",
         spacing: "compact",
         shouldFitContainer: true,
         testId: "".concat(key, "-column-sort-button"),
-        "aria-label": sortButtonAriaLabel,
+        "aria-label": sortButtonAriaLabel
+      }, SortIcon ? {
         iconAfter: function iconAfter(iconProps) {
           return /*#__PURE__*/React.createElement(SortIcon, _extends({}, iconProps, {
             size: "small"
           }));
-        },
+        }
+      } : {}, {
         onClick: function onClick() {
           return onColumnSort === null || onColumnSort === void 0 ? void 0 : onColumnSort(key);
         }
-      }, heading));
+      }), heading));
     } else if (isHeadingOutsideButton) {
       heading = /*#__PURE__*/React.createElement("div", {
         className: ax(["_1e0c1txw _4cvr1h6o _o5721q9c _8vu418qm _irr3l4ek"])

package/dist/types/ui/datasource-table-view/datasource-column-sort.d.ts

@@ -7,6 +7,6 @@ export type DatasourceColumnSortGetter = ({ parameters, columnKey, currentSort,
     parameters: DatasourceParameters;
 }) => {
     parameters: DatasourceParameters;
-    sort: DatasourceTableSortState;
+    sort?: DatasourceTableSortState;
 } | undefined;
 export declare const getDatasourceColumnSortGetter: (datasourceId: string) => DatasourceColumnSortGetter | undefined;

package/dist/types-ts4.5/ui/datasource-table-view/datasource-column-sort.d.ts

@@ -7,6 +7,6 @@ export type DatasourceColumnSortGetter = ({ parameters, columnKey, currentSort,
     parameters: DatasourceParameters;
 }) => {
     parameters: DatasourceParameters;
-    sort: DatasourceTableSortState;
+    sort?: DatasourceTableSortState;
 } | undefined;
 export declare const getDatasourceColumnSortGetter: (datasourceId: string) => DatasourceColumnSortGetter | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "5.6.0",
+	"version": "5.6.1",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -43,9 +43,9 @@
 		"ak-postbuild": "ls -d dist/* | xargs -n 1 copyfiles -u 1 -V src/**/*.{svg,png}"
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^52.15.0",
+		"@atlaskit/adf-schema": "^52.16.0",
 		"@atlaskit/afm-i18n-platform-linking-platform-link-datasource": "2.7.0",
-		"@atlaskit/analytics-next": "^11.2.0",
+		"@atlaskit/analytics-next": "^11.3.0",
 		"@atlaskit/atlassian-context": "^0.9.0",
 		"@atlaskit/avatar": "^25.15.0",
 		"@atlaskit/avatar-group": "^12.10.0",
@@ -60,18 +60,18 @@
 		"@atlaskit/flag": "^17.12.0",
 		"@atlaskit/form": "^15.5.0",
 		"@atlaskit/heading": "^5.4.0",
-		"@atlaskit/icon": "^35.3.0",
+		"@atlaskit/icon": "^35.4.0",
 		"@atlaskit/image": "^3.0.0",
 		"@atlaskit/inline-edit": "^15.6.0",
 		"@atlaskit/intl-messages-provider": "^3.3.0",
 		"@atlaskit/jql-ast": "^3.5.0",
 		"@atlaskit/jql-editor": "^6.4.0",
 		"@atlaskit/jql-editor-autocomplete-rest": "^3.3.0",
-		"@atlaskit/layering": "^3.7.0",
+		"@atlaskit/layering": "^3.8.0",
 		"@atlaskit/link": "^3.4.0",
 		"@atlaskit/link-client-extension": "^6.1.0",
-		"@atlaskit/link-provider": "^4.4.0",
-		"@atlaskit/linking-common": "^9.12.0",
+		"@atlaskit/link-provider": "^4.5.0",
+		"@atlaskit/linking-common": "^9.13.0",
 		"@atlaskit/linking-types": "^14.4.0",
 		"@atlaskit/logo": "^20.1.0",
 		"@atlaskit/lozenge": "^13.8.0",
@@ -81,20 +81,20 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/popup": "^4.23.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.8.0",
-		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
+		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.2.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^2.0.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^19.0.0",
 		"@atlaskit/react-select": "^3.16.0",
 		"@atlaskit/select": "^21.12.0",
-		"@atlaskit/smart-card": "^44.20.0",
+		"@atlaskit/smart-card": "^44.21.0",
 		"@atlaskit/smart-user-picker": "^10.2.0",
 		"@atlaskit/spinner": "^19.1.0",
 		"@atlaskit/tag": "^14.15.0",
 		"@atlaskit/textfield": "^8.3.0",
 		"@atlaskit/theme": "^25.0.0",
 		"@atlaskit/tokens": "^13.1.0",
-		"@atlaskit/tooltip": "^22.5.0",
+		"@atlaskit/tooltip": "^22.6.0",
 		"@atlaskit/ufo": "^0.5.0",
 		"@atlaskit/width-detector": "^5.1.0",
 		"@atlassian/assets-workspace-host": "^0.5.0",