@atlaskit/link-datasource 1.7.5 → 1.7.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-datasource
 
+## 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.7.6"
 };

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');

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.7.6",
   source: 'datasourceConfigModal'
 };
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {

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] : [];

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.7.6"
 };

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');

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.7.6",
   source: 'datasourceConfigModal'
 };
 const contextData = {

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

@@ -334,9 +334,9 @@ export const PlainJiraIssuesConfigModal = props => {
     userInteractionActions.current.add(DatasourceAction.DISPLAY_VIEW_CHANGED);
     setCurrentViewMode(selectedMode);
   };
-  const handleOnNextPage = useCallback(() => {
+  const handleOnNextPage = useCallback((onNextPageProps = {}) => {
     userInteractionActions.current.add(DatasourceAction.NEXT_PAGE_SCROLLED);
-    onNextPage();
+    onNextPage(onNextPageProps);
   }, [onNextPage]);
   const handleVisibleColumnKeysChange = useCallback((newVisibleColumnKeys = []) => {
     const columnAction = getColumnAction(visibleColumnKeys || [], newVisibleColumnKeys);

package/dist/esm/analytics/constants.js

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

package/dist/esm/hooks/useDatasourceTableState.js

@@ -131,7 +131,6 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       shouldRequestFirstPage,
       _requestInfo$shouldFo,
       shouldForceRequest,
-      sortedFieldKeys,
       datasourceDataRequest,
       _yield$getDatasourceD2,
       _yield$getDatasourceD3,
@@ -158,20 +157,18 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           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 = _toConsumableArray(fieldKeys); // Sort keys to use cached version of response regardless of the order
-          sortedFieldKeys.sort();
           datasourceDataRequest = {
             parameters: parameters,
             pageSize: 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;
@@ -183,12 +180,12 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           _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);
@@ -217,17 +214,17 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
             });
           }
           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 = useCallback(function (options) {
     setStatus('empty');

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

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

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

@@ -379,8 +379,9 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     setCurrentViewMode(selectedMode);
   };
   var handleOnNextPage = useCallback(function () {
+    var onNextPageProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     userInteractionActions.current.add(DatasourceAction.NEXT_PAGE_SCROLLED);
-    onNextPage();
+    onNextPage(onNextPageProps);
   }, [onNextPage]);
   var handleVisibleColumnKeysChange = useCallback(function () {
     var newVisibleColumnKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"