@atlaskit/link-datasource 1.7.5 → 1.8.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 1.8.0
+
+### Minor Changes
+
+- [#41368](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41368) [`1daa2514bcc`](https://bitbucket.org/atlassian/atlassian-frontend/commits/1daa2514bcc) - [ux] Updates empty state and loading row skeletons to prevent visual jumps once data loads.
+
+## 1.7.6
+
+### Patch Changes
+
+- [#41377](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41377) [`6191c789222`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6191c789222) - Fix bug where on next page load sorts the column in alphabetical order.
+
 ## 1.7.5
 
 ### Patch Changes

package/dist/cjs/analytics/constants.js

@@ -7,5 +7,5 @@ exports.packageMetaData = exports.EVENT_CHANNEL = void 0;
 var EVENT_CHANNEL = exports.EVENT_CHANNEL = 'media';
 var packageMetaData = exports.packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.7.5"
+  packageVersion: "1.8.0"
 };

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -138,7 +138,6 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
       shouldRequestFirstPage,
       _requestInfo$shouldFo,
       shouldForceRequest,
-      sortedFieldKeys,
       datasourceDataRequest,
       _yield$getDatasourceD2,
       _yield$getDatasourceD3,
@@ -165,20 +164,18 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
           return _context2.abrupt("return");
         case 3:
           _requestInfo$isSchema = requestInfo.isSchemaFromData, isSchemaFromData = _requestInfo$isSchema === void 0 ? true : _requestInfo$isSchema, shouldRequestFirstPage = requestInfo.shouldRequestFirstPage, _requestInfo$shouldFo = requestInfo.shouldForceRequest, shouldForceRequest = _requestInfo$shouldFo === void 0 ? false : _requestInfo$shouldFo;
-          sortedFieldKeys = (0, _toConsumableArray2.default)(fieldKeys); // Sort keys to use cached version of response regardless of the order
-          sortedFieldKeys.sort();
           datasourceDataRequest = {
             parameters: parameters,
             pageSize: _linkClientExtension.DEFAULT_GET_DATASOURCE_DATA_PAGE_SIZE,
             pageCursor: shouldRequestFirstPage ? undefined : nextCursor,
-            fields: sortedFieldKeys,
+            fields: fieldKeys,
             includeSchema: isSchemaFromData
           };
           setStatus('loading');
-          _context2.prev = 8;
-          _context2.next = 11;
+          _context2.prev = 6;
+          _context2.next = 9;
           return getDatasourceData(datasourceId, datasourceDataRequest, shouldForceRequest);
-        case 11:
+        case 9:
           _yield$getDatasourceD2 = _context2.sent;
           _yield$getDatasourceD3 = _yield$getDatasourceD2.meta;
           access = _yield$getDatasourceD3.access;
@@ -190,12 +187,12 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
           _totalCount = _yield$getDatasourceD4.totalCount;
           schema = _yield$getDatasourceD4.schema;
           if (!(access === 'forbidden' || access === 'unauthorized')) {
-            _context2.next = 24;
+            _context2.next = 22;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
-        case 24:
+        case 22:
           setExtensionKey(_extensionKey);
           setDestinationObjectTypes(_destinationObjectTypes);
           setTotalCount(_totalCount);
@@ -224,17 +221,17 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
             });
           }
           setStatus('resolved');
-          _context2.next = 40;
+          _context2.next = 38;
           break;
-        case 37:
-          _context2.prev = 37;
-          _context2.t0 = _context2["catch"](8);
+        case 35:
+          _context2.prev = 35;
+          _context2.t0 = _context2["catch"](6);
           setStatus('rejected');
-        case 40:
+        case 38:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[8, 37]]);
+    }, _callee2, null, [[6, 35]]);
   })), [parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent]);
   var reset = (0, _react.useCallback)(function (options) {
     setStatus('empty');
@@ -283,7 +280,6 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
         reset();
         void onNextPage({
           isSchemaFromData: false,
-          // since this is not inital load, we will already have schema
           shouldRequestFirstPage: true
         });
       }

package/dist/cjs/ui/assets-modal/modal/index.js

@@ -234,7 +234,7 @@ var analyticsContextAttributes = {
 };
 var analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.7.5",
+  packageVersion: "1.8.0",
   source: 'datasourceConfigModal'
 };
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {

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

@@ -15,6 +15,7 @@ var _ufoExperiences = require("../../analytics/ufoExperiences");
 var _useColumnPickerRenderedFailedUfoExperience = require("../../analytics/ufoExperiences/hooks/useColumnPickerRenderedFailedUfoExperience");
 var _useDataRenderedUfoExperience = require("../../analytics/ufoExperiences/hooks/useDataRenderedUfoExperience");
 var _useDatasourceTableState = require("../../hooks/useDatasourceTableState");
+var _styled = require("../../ui/issue-like-table/styled");
 var _accessRequired = require("../common/error-state/access-required");
 var _loadingError = require("../common/error-state/loading-error");
 var _noResults = require("../common/error-state/no-results");
@@ -134,13 +135,12 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
       columns: columns,
       visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
       onVisibleColumnKeysChange: onVisibleColumnKeysChange,
-      scrollableContainerHeight: 590,
+      scrollableContainerHeight: _styled.ScrollableContainerHeight,
       parentContainerRenderInstanceId: tableRenderInstanceId,
       extensionKey: extensionKey
     }) : (0, _react2.jsx)(_emptyState.default, {
       testId: "datasource-table-view-skeleton",
-      isCompact: true,
-      isLoading: !isDataReady || status === 'loading'
+      isCompact: true
     }), (0, _react2.jsx)(_tableFooter.TableFooter, {
       itemCount: isDataReady ? totalCount : undefined,
       onRefresh: forcedReset,

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

@@ -1,33 +1,46 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _react = require("@emotion/react");
 var _linkingCommon = require("@atlaskit/linking-common");
-var _user = _interopRequireDefault(require("../render-type/user"));
 var _styled = require("../styled");
-var _priority = _interopRequireDefault(require("./priority"));
-var _type = _interopRequireDefault(require("./type"));
 /** @jsx jsx */
 
+var SkeletonComponent = function SkeletonComponent(_ref) {
+  var width = _ref.width,
+    itemName = _ref.itemName;
+  return (0, _react.jsx)(_linkingCommon.Skeleton, {
+    borderRadius: 8,
+    testId: "".concat(itemName, "-empty-state-skeleton"),
+    height: 14,
+    width: width
+  });
+};
+var tableSidePadding = "var(--ds-space-200, 16px)";
 var tableBodyStyles = (0, _react.css)({
   borderBottom: 0
 });
+var cellStyles = (0, _react.css)({
+  paddingBlock: "var(--ds-space-100, 12px)",
+  '&:last-child': {
+    paddingRight: "var(--ds-space-100, 8px)"
+  }
+});
 var baseColumns = [{
   key: 'type',
-  width: 50
+  width: 35
 }, {
   key: 'issue',
   width: 50
 }, {
   key: 'summary',
-  width: 70
+  width: 100
 }, {
   key: 'assignee',
-  width: 100
+  width: 70
 }, {
   key: 'priority',
   width: 60
@@ -44,91 +57,64 @@ var baseColumns = [{
   key: 'due',
   width: 50
 }];
-var priorities = ['low', 'medium', 'high', 'medium', 'low', 'blocker', 'medium', 'blocker', 'high', 'low'];
-var types = ['task', 'story', 'commit', 'epic', 'bug', 'task', 'story', 'commit', 'issue', 'epic'];
-var summaryColumnWidths = [141, 208, 186, 212, 212, 151, 212, 182, 180, 147];
-var statusColumnWidths = [75, 54, 66, 73, 52, 73, 55, 80, 66, 59];
-var rows = new Array(10).fill(null).map(function (_, index) {
-  return {
-    id: index,
-    priority: priorities[index],
-    type: types[index],
-    summaryWidth: summaryColumnWidths[index],
-    statusWidth: statusColumnWidths[index]
-  };
-});
-var cellStyles = (0, _react.css)({
-  '&:first-child': {
-    paddingLeft: "var(--ds-space-100, 8px)"
-  },
-  '&:last-child': {
-    paddingRight: "var(--ds-space-100, 8px)"
-  }
-});
-var renderItem = function renderItem(_ref, _ref2, isShimmering) {
-  var key = _ref.key,
-    width = _ref.width;
-  var priority = _ref2.priority,
-    type = _ref2.type,
-    summaryWidth = _ref2.summaryWidth,
-    statusWidth = _ref2.statusWidth;
+var longColumnWidths = [141, 208, 186, 212, 212, 151, 212, 182, 180, 163, 172, 211, 145, 190];
+var shortColumnWidths = [75, 54, 66, 73, 52, 73, 55, 80, 67, 76, 58, 65, 56, 76];
+var renderItem = function renderItem(_ref2, _ref3) {
+  var key = _ref2.key,
+    width = _ref2.width;
+  var longWidth = _ref3.longWidth,
+    shortWidth = _ref3.shortWidth;
   switch (key) {
-    case 'assignee':
-      return (0, _react.jsx)(_user.default, null, (0, _react.jsx)(_linkingCommon.Skeleton, {
-        borderRadius: 8,
-        testId: "empty-state-skeleton",
-        height: 13,
-        isShimmering: isShimmering,
-        width: width
-      }));
-    case 'priority':
-      return (0, _react.jsx)(_priority.default, {
-        priority: priority
-      });
-    case 'type':
-      return (0, _react.jsx)(_type.default, {
-        type: type
+    case 'status':
+      return (0, _react.jsx)(SkeletonComponent, {
+        width: shortWidth,
+        itemName: key
       });
     case 'summary':
-      return (0, _react.jsx)(_linkingCommon.Skeleton, {
-        appearance: "blue",
-        borderRadius: 10,
-        testId: "empty-state-skeleton",
-        height: 13,
-        isShimmering: isShimmering,
-        width: summaryWidth
-      });
-    case 'status':
-      return (0, _react.jsx)(_linkingCommon.Skeleton, {
-        appearance: "blue",
-        borderRadius: 3,
-        testId: "empty-state-skeleton",
-        height: 16,
-        isShimmering: isShimmering,
-        width: statusWidth
+      return (0, _react.jsx)(SkeletonComponent, {
+        width: longWidth,
+        itemName: key
       });
     default:
-      return (0, _react.jsx)(_linkingCommon.Skeleton, {
-        borderRadius: 8,
-        testId: "empty-state-skeleton",
-        height: 13,
-        isShimmering: isShimmering,
-        width: width
+      return (0, _react.jsx)(SkeletonComponent, {
+        width: width,
+        itemName: key
       });
   }
 };
-var _default = exports.default = function _default(_ref3) {
-  var isCompact = _ref3.isCompact,
-    _ref3$isLoading = _ref3.isLoading,
-    isLoading = _ref3$isLoading === void 0 ? false : _ref3$isLoading,
-    testId = _ref3.testId;
+var _default = exports.default = function _default(_ref4) {
+  var isCompact = _ref4.isCompact,
+    testId = _ref4.testId;
   var columnsToRender = isCompact ? baseColumns.slice(0, 6) : baseColumns;
-  return (0, _react.jsx)("table", {
+  // if it is compact (non-modal), there is room for 14 rows
+  // if it is modal (not compact), there is only room for 10 rows
+  var rowsNumber = isCompact ? 14 : 10;
+  var rows = new Array(rowsNumber).fill(null).map(function (_, index) {
+    return {
+      id: index,
+      longWidth: longColumnWidths[index],
+      shortWidth: shortColumnWidths[index]
+    };
+  });
+  return (0, _react.jsx)("div", {
+    style: {
+      // the IssueLikeDataTableView wraps the table in a container with the styling below while modal doesn't
+      // the isCompact prop is applied to non-modal empty states which require additional padding
+      // this maxHeight comes from scrollableContainerHeight
+      maxHeight: _styled.ScrollableContainerHeight,
+      padding: isCompact ? "0 ".concat(tableSidePadding, " 0 ").concat(tableSidePadding) : '0',
+      boxSizing: 'border-box'
+    }
+  }, (0, _react.jsx)("table", {
     "data-testid": testId
-  }, (0, _react.jsx)("thead", null, (0, _react.jsx)("tr", null, columnsToRender.map(function (_ref4) {
-    var key = _ref4.key,
-      width = _ref4.width;
-    return (0, _react.jsx)(_styled.EmptyStateTableHeading, {
+  }, (0, _react.jsx)("thead", {
+    style: {
+      borderBottom: 0
+    }
+  }, (0, _react.jsx)("tr", null, columnsToRender.map(function (_ref5) {
+    var key = _ref5.key,
+      width = _ref5.width;
+    return (0, _react.jsx)(_styled.TableHeading, {
       key: key,
       style: {
         width: width
@@ -137,8 +123,7 @@ var _default = exports.default = function _default(_ref3) {
       appearance: "darkGray",
       borderRadius: 8,
       testId: "empty-state-skeleton",
-      isShimmering: isLoading,
-      height: 13,
+      height: 12,
       width: width
     }));
   }))), (0, _react.jsx)("tbody", {
@@ -150,7 +135,7 @@ var _default = exports.default = function _default(_ref3) {
       return (0, _react.jsx)("td", {
         css: cellStyles,
         key: column.key
-      }, renderItem(column, row, isLoading));
+      }, renderItem(column, row));
     }));
-  })));
+  }))));
 };

package/dist/cjs/ui/issue-like-table/empty-state/type.js

@@ -15,7 +15,7 @@ var _4 = _interopRequireDefault(require("@atlaskit/icon-object/glyph/issue/16"))
 var _5 = _interopRequireDefault(require("@atlaskit/icon-object/glyph/story/16"));
 var _6 = _interopRequireDefault(require("@atlaskit/icon-object/glyph/task/16"));
 var _templateObject;
-var IconWrapper = _styled.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  align-items: center;\n  justify-content: center;\n"])));
+var IconWrapper = _styled.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  align-items: center;\n  justify-content: left;\n"])));
 var _default = exports.default = function _default(_ref) {
   var type = _ref.type;
   var TypeIcon = function TypeIcon() {

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

@@ -93,8 +93,7 @@ function getColumnWidth(key, type) {
     priority: BASE_WIDTH * 8,
     status: BASE_WIDTH * 18,
     summary: BASE_WIDTH * 45,
-    description: BASE_WIDTH * 31.25,
-    type: BASE_WIDTH * 8
+    description: BASE_WIDTH * 31.25
   };
   if (keyBasedWidth[key]) {
     return keyBasedWidth[key];
@@ -174,9 +173,10 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
       cells: visibleSortedColumns.map(function (_ref3) {
         var key = _ref3.key;
         var content = (0, _react2.jsx)(_linkingCommon.Skeleton, {
-          borderRadius: "var(--ds-border-radius-100, 3px)",
-          width: '100%',
-          height: '20px'
+          borderRadius: 8,
+          width: "100%",
+          height: 14,
+          testId: "issues-table-row-loading"
         });
         return {
           key: key,
@@ -302,8 +302,24 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     });
   }, [identityColumnKey, renderItem, items, visibleSortedColumns]);
   var rows = (0, _react.useMemo)(function () {
-    return [].concat((0, _toConsumableArray2.default)(tableRows), (0, _toConsumableArray2.default)(status === 'loading' ? [loadingRow] : []));
-  }, [loadingRow, status, tableRows]);
+    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), {}, {
+        key: "loading-".concat(tableRows.length)
+      })]);
+    }
+    // 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;
+    return (0, _toConsumableArray2.default)(Array(loadingRowsCount)).map(function (_, index) {
+      return _objectSpread(_objectSpread({}, loadingRow), {}, {
+        key: "loading-".concat(index)
+      });
+    });
+  }, [loadingRow, status, tableRows, scrollableContainerHeight]);
   var onSelectedColumnKeysChange = (0, _react.useCallback)(function (newSelectedColumnKeys) {
     onVisibleColumnKeysChange === null || onVisibleColumnKeysChange === void 0 || onVisibleColumnKeysChange(newSelectedColumnKeys);
   }, [onVisibleColumnKeysChange]);
@@ -396,6 +412,8 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
         key: key,
         "data-testid": "".concat(key, "-column-heading"),
         style: {
+          // this keeps the column headers from collapsing horizontally during loading states
+          minWidth: maxWidth,
           maxWidth: maxWidth
         }
       }, heading);
@@ -421,14 +439,21 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
       var cellKey = _ref14.key,
         content = _ref14.content,
         maxWidth = _ref14.maxWidth;
+      var loadingRowStyle = {
+        maxWidth: maxWidth
+      };
+      // extra padding is required around skeleton loader to avoid vertical jumps when data loads
+      if (key !== null && key !== void 0 && key.includes('loading')) {
+        loadingRowStyle = _objectSpread(_objectSpread({}, loadingRowStyle), {}, {
+          paddingBlock: "var(--ds-space-100, 12px)"
+        });
+      }
       return (0, _react2.jsx)("td", {
         key: cellKey,
         "data-testid": testId && "".concat(testId, "--cell-").concat(cellIndex),
         colSpan: cellIndex + 1 === cells.length ? 2 : undefined,
         css: truncatedCellStyles,
-        style: {
-          maxWidth: maxWidth
-        }
+        style: loadingRowStyle
       }, content);
     }));
   }))));

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

@@ -4,12 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TableHeading = exports.Table = exports.FieldTextFontSize = exports.EmptyStateTableHeading = void 0;
+exports.TableHeading = exports.Table = exports.ScrollableContainerHeight = exports.FieldTextFontSize = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _colors = require("@atlaskit/theme/colors");
-var _templateObject, _templateObject2, _templateObject3;
+var _templateObject, _templateObject2;
+var ScrollableContainerHeight = exports.ScrollableContainerHeight = 590;
 var FieldTextFontSize = exports.FieldTextFontSize = '14px';
 var Table = exports.Table = _styled.default.table(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  width: 100%;\n"])));
-var TableHeading = exports.TableHeading = _styled.default.th(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  position: relative;\n  padding-block: ", " ", ";\n  line-height: ", ";\n  border-bottom: 2px solid ", ";\n  & [data-testid='datasource-header-content--container'] {\n    margin-top: 0;\n    overflow: hidden;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n  }\n"])), "var(--ds-space-300, 24px)", "var(--ds-space-100, 8px)", "var(--ds-font-lineHeight-300, 16px)", "var(--ds-background-accent-gray-subtler, ".concat(_colors.N40, ")"));
-var EmptyStateTableHeading = exports.EmptyStateTableHeading = (0, _styled.default)(TableHeading)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n  &:first-child {\n    padding-left: ", ";\n  }\n"])), "var(--ds-space-100, 8px)");
+var TableHeading = exports.TableHeading = _styled.default.th(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  position: relative;\n  padding-block: ", " ", ";\n  line-height: ", ";\n  border-bottom: 2px solid ", ";\n  & [data-testid='datasource-header-content--container'] {\n    margin-top: 0;\n    overflow: hidden;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n  }\n"])), "var(--ds-space-300, 24px)", "var(--ds-space-100, 8px)", "var(--ds-font-lineHeight-300, 16px)", "var(--ds-background-accent-gray-subtler, ".concat(_colors.N40, ")"));

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

@@ -388,8 +388,9 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     setCurrentViewMode(selectedMode);
   };
   var handleOnNextPage = (0, _react.useCallback)(function () {
+    var onNextPageProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     userInteractionActions.current.add(_types.DatasourceAction.NEXT_PAGE_SCROLLED);
-    onNextPage();
+    onNextPage(onNextPageProps);
   }, [onNextPage]);
   var handleVisibleColumnKeysChange = (0, _react.useCallback)(function () {
     var newVisibleColumnKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -453,8 +454,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
       return (0, _react2.jsx)("div", {
         css: contentContainerStyles
       }, !!jql ? (0, _react2.jsx)(_issueLikeTable.EmptyState, {
-        testId: "jira-jql-datasource-modal--empty-state",
-        isLoading: true
+        testId: "jira-jql-datasource-modal--empty-state"
       }) : (0, _react2.jsx)(_initialStateView.InitialStateView, {
         searchMethod: currentSearchMethod
       }));

package/dist/es2019/analytics/constants.js

@@ -1,5 +1,5 @@
 export const EVENT_CHANNEL = 'media';
 export const packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.7.5"
+  packageVersion: "1.8.0"
 };

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -76,14 +76,11 @@ export const useDatasourceTableState = ({
       shouldRequestFirstPage,
       shouldForceRequest = false
     } = requestInfo;
-    const sortedFieldKeys = [...fieldKeys];
-    // Sort keys to use cached version of response regardless of the order
-    sortedFieldKeys.sort();
     const datasourceDataRequest = {
       parameters,
       pageSize: DEFAULT_GET_DATASOURCE_DATA_PAGE_SIZE,
       pageCursor: shouldRequestFirstPage ? undefined : nextCursor,
-      fields: sortedFieldKeys,
+      fields: fieldKeys,
       includeSchema: isSchemaFromData
     };
     setStatus('loading');
@@ -180,7 +177,6 @@ export const useDatasourceTableState = ({
         reset();
         void onNextPage({
           isSchemaFromData: false,
-          // since this is not inital load, we will already have schema
           shouldRequestFirstPage: true
         });
       }

package/dist/es2019/ui/assets-modal/modal/index.js

@@ -194,7 +194,7 @@ const analyticsContextAttributes = {
 };
 const analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.7.5",
+  packageVersion: "1.8.0",
   source: 'datasourceConfigModal'
 };
 const contextData = {

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

@@ -9,6 +9,7 @@ import { startUfoExperience } from '../../analytics/ufoExperiences';
 import { useColumnPickerRenderedFailedUfoExperience } from '../../analytics/ufoExperiences/hooks/useColumnPickerRenderedFailedUfoExperience';
 import { useDataRenderedUfoExperience } from '../../analytics/ufoExperiences/hooks/useDataRenderedUfoExperience';
 import { useDatasourceTableState } from '../../hooks/useDatasourceTableState';
+import { ScrollableContainerHeight } from '../../ui/issue-like-table/styled';
 import { AccessRequired } from '../common/error-state/access-required';
 import { LoadingError } from '../common/error-state/loading-error';
 import { NoResults } from '../common/error-state/no-results';
@@ -129,13 +130,12 @@ const DatasourceTableViewWithoutAnalytics = ({
       columns: columns,
       visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
       onVisibleColumnKeysChange: onVisibleColumnKeysChange,
-      scrollableContainerHeight: 590,
+      scrollableContainerHeight: ScrollableContainerHeight,
       parentContainerRenderInstanceId: tableRenderInstanceId,
       extensionKey: extensionKey
     }) : jsx(EmptyState, {
       testId: "datasource-table-view-skeleton",
-      isCompact: true,
-      isLoading: !isDataReady || status === 'loading'
+      isCompact: true
     }), jsx(TableFooter, {
       itemCount: isDataReady ? totalCount : undefined,
       onRefresh: forcedReset,