@atlaskit/link-datasource 1.23.6 → 1.23.8

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 1.23.8
+
+### Patch Changes
+
+- [#80679](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/80679) [`104eb9443b7e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/104eb9443b7e) - ED-22553 Updating adf-schema version to 35.6.0
+
+## 1.23.7
+
+### Patch Changes
+
+- [#79004](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/79004) [`5438920b88ce`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5438920b88ce) - Fixes race conditions/concurrent requests when parameters changing on datasource, behind ff `platform.linking-platform.datasource.enable-abort-controller`.
+
 ## 1.23.6
 
 ### Patch Changes

package/dist/cjs/analytics/generated/analytics.types.js

@@ -1,5 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+"use strict";

package/dist/cjs/analytics/ufoExperiences/types.js

@@ -1,5 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+"use strict";

package/dist/cjs/common/types.js

@@ -1,5 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+"use strict";

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -12,6 +12,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _linkClientExtension = require("@atlaskit/link-client-extension");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../analytics");
 var _useErrorLogger2 = _interopRequireDefault(require("./useErrorLogger"));
 var useDatasourceTableState = exports.useDatasourceTableState = function useDatasourceTableState(_ref) {
@@ -88,6 +89,7 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
     _useState30 = (0, _slicedToArray2.default)(_useState29, 2),
     providerName = _useState30[0],
     setProviderName = _useState30[1];
+  var abortController = (0, _react.useRef)(new AbortController());
   var _useDatasourceClientE = (0, _linkClientExtension.useDatasourceClientExtension)(),
     getDatasourceData = _useDatasourceClientE.getDatasourceData,
     getDatasourceDetails = _useDatasourceClientE.getDatasourceDetails;
@@ -170,7 +172,7 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
 
     /*Jira adds identifier fields like id and key to all data responses
     Since defaultProperties already send back the keyField, we are accounting only
-    for the idField when we are using defaulProperties
+    for the idField when we are using defaultProperties
     */
     if (properties.length > fieldKeys.length + idFieldCount + keyFieldCount && properties.length > defaultProperties.length + idFieldCount) {
       setFullSchema(schema);
@@ -193,6 +195,7 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
   }, [columns, defaultVisibleColumnKeys, lastRequestedFieldKeys]);
   var onNextPage = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
     var requestInfo,
+      currentAbortController,
       _requestInfo$isSchema,
       isSchemaFromData,
       shouldRequestFirstPage,
@@ -212,6 +215,7 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
       nextPageCursor,
       _totalCount,
       schema,
+      _currentAbortControll,
       isUserLoadingNextPage,
       currentLoadedItemCount,
       newlyLoadedItemCount,
@@ -220,12 +224,23 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           requestInfo = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+          if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.enable-abort-controller')) {
+            /**
+             * Abort whichever request was made before this one.
+             */
+            abortController.current.abort();
+            /**
+             * Setup new abort controller for this request.
+             */
+            abortController.current = new AbortController();
+            currentAbortController = abortController.current;
+          }
           if (parameters) {
-            _context2.next = 3;
+            _context2.next = 4;
             break;
           }
           return _context2.abrupt("return");
-        case 3:
+        case 4:
           _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;
           isFullSchemaLoaded = fullSchema.properties.length > 0;
           datasourceDataRequest = {
@@ -236,10 +251,10 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
             includeSchema: isFullSchemaLoaded ? false : isSchemaFromData
           };
           setStatus('loading');
-          _context2.prev = 7;
-          _context2.next = 10;
+          _context2.prev = 8;
+          _context2.next = 11;
           return getDatasourceData(datasourceId, datasourceDataRequest, shouldForceRequest);
-        case 10:
+        case 11:
           _yield$getDatasourceD3 = _context2.sent;
           _yield$getDatasourceD4 = _yield$getDatasourceD3.meta;
           access = _yield$getDatasourceD4.access;
@@ -252,25 +267,38 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
           nextPageCursor = _yield$getDatasourceD5.nextPageCursor;
           _totalCount = _yield$getDatasourceD5.totalCount;
           schema = _yield$getDatasourceD5.schema;
+          if (!(0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.enable-abort-controller')) {
+            _context2.next = 26;
+            break;
+          }
+          if (!((_currentAbortControll = currentAbortController) !== null && _currentAbortControll !== void 0 && _currentAbortControll.signal.aborted)) {
+            _context2.next = 26;
+            break;
+          }
+          throw new Error('Aborted');
+        case 26:
           setExtensionKey(_extensionKey);
           setProviderName(_providerName);
           if (!(access === 'unauthorized' || access === 'forbidden')) {
-            _context2.next = 28;
+            _context2.next = 32;
             break;
           }
           setStatus(access);
           setAuthDetails(auth || initialEmptyArray);
           return _context2.abrupt("return");
-        case 28:
+        case 32:
           setDestinationObjectTypes(_destinationObjectTypes);
           setTotalCount(_totalCount);
           setNextCursor(nextPageCursor);
           setResponseItems(function (currentResponseItems) {
-            // FIXME EDM-8977 (https://product-fabric.atlassian.net/browse/EDM-8977)
-            // once the onNextPage and reset loop issue has been thoroughly investigated
-            // in the above card, remove this isEqual check, ensure onNextPage isn't called twice
-            var hasIdenticalResponseItems = (0, _isEqual.default)(currentResponseItems, items);
-            if (hasIdenticalResponseItems || shouldRequestFirstPage) {
+            if (!(0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.enable-abort-controller')) {
+              var hasIdenticalResponseItems = (0, _isEqual.default)(currentResponseItems, items);
+              if (hasIdenticalResponseItems || shouldRequestFirstPage) {
+                return items;
+              }
+              return [].concat((0, _toConsumableArray2.default)(currentResponseItems), (0, _toConsumableArray2.default)(items));
+            }
+            if (shouldRequestFirstPage) {
               return items;
             }
             return [].concat((0, _toConsumableArray2.default)(currentResponseItems), (0, _toConsumableArray2.default)(items));
@@ -293,32 +321,42 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
             });
           }
           setStatus('resolved');
-          _context2.next = 50;
+          _context2.next = 57;
           break;
-        case 40:
-          _context2.prev = 40;
-          _context2.t0 = _context2["catch"](7);
+        case 44:
+          _context2.prev = 44;
+          _context2.t0 = _context2["catch"](8);
+          if (!(0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.enable-abort-controller')) {
+            _context2.next = 49;
+            break;
+          }
+          if (!(_context2.t0.message === 'Aborted')) {
+            _context2.next = 49;
+            break;
+          }
+          return _context2.abrupt("return");
+        case 49:
           captureError('onNextPage', _context2.t0);
           if (!(_context2.t0 instanceof Response && _context2.t0.status === 401)) {
-            _context2.next = 46;
+            _context2.next = 53;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
-        case 46:
+        case 53:
           if (!(_context2.t0 instanceof Response && _context2.t0.status === 403)) {
-            _context2.next = 49;
+            _context2.next = 56;
             break;
           }
           setStatus('forbidden');
           return _context2.abrupt("return");
-        case 49:
+        case 56:
           setStatus('rejected');
-        case 50:
+        case 57:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[7, 40]]);
+    }, _callee2, null, [[8, 44]]);
   })), [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems, applySchemaProperties, fireEvent, fullSchema, initialEmptyArray]);
   var reset = (0, _react.useCallback)(function (options) {
     setResponseItems(initialEmptyArray);
@@ -349,7 +387,7 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
       });
       setShouldForceRequest(false);
     }
-  }, [lastRequestedFieldKeys, loadDatasourceDetails, onNextPage, parameters, shouldForceRequest, status]);
+  }, [lastRequestedFieldKeys, onNextPage, parameters, shouldForceRequest, status]);
 
   // this takes care of requesting /data when user selects/unselects a column
   (0, _react.useEffect)(function () {
@@ -378,6 +416,13 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
       }
     }
   }, [fieldKeys, lastRequestedFieldKeys, responseItems, reset, onNextPage]);
+  (0, _react.useEffect)(function () {
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.enable-abort-controller')) {
+      return function () {
+        return abortController.current.abort();
+      };
+    }
+  }, []);
   return {
     status: status,
     onNextPage: onNextPage,

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

@@ -1,5 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+"use strict";

package/dist/es2019/analytics/generated/analytics.types.js

@@ -1 +0,0 @@
-export {};

package/dist/es2019/analytics/ufoExperiences/types.js

@@ -1 +0,0 @@
-export {};

package/dist/es2019/common/types.js

@@ -1 +0,0 @@
-export {};

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -1,6 +1,7 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import isEqual from 'lodash/isEqual';
 import { DEFAULT_GET_DATASOURCE_DATA_PAGE_SIZE, useDatasourceClientExtension } from '@atlaskit/link-client-extension';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../analytics';
 import useErrorLogger from './useErrorLogger';
 export const useDatasourceTableState = ({
@@ -35,6 +36,7 @@ export const useDatasourceTableState = ({
   const [destinationObjectTypes, setDestinationObjectTypes] = useState([]);
   const [extensionKey, setExtensionKey] = useState();
   const [providerName, setProviderName] = useState(undefined);
+  const abortController = useRef(new AbortController());
   const {
     getDatasourceData,
     getDatasourceDetails
@@ -92,7 +94,7 @@ export const useDatasourceTableState = ({
 
     /*Jira adds identifier fields like id and key to all data responses
     Since defaultProperties already send back the keyField, we are accounting only
-    for the idField when we are using defaulProperties
+    for the idField when we are using defaultProperties
     */
     if (properties.length > fieldKeys.length + idFieldCount + keyFieldCount && properties.length > defaultProperties.length + idFieldCount) {
       setFullSchema(schema);
@@ -112,6 +114,18 @@ export const useDatasourceTableState = ({
     }
   }, [columns, defaultVisibleColumnKeys, lastRequestedFieldKeys]);
   const onNextPage = useCallback(async (requestInfo = {}) => {
+    let currentAbortController;
+    if (getBooleanFF('platform.linking-platform.datasource.enable-abort-controller')) {
+      /**
+       * Abort whichever request was made before this one.
+       */
+      abortController.current.abort();
+      /**
+       * Setup new abort controller for this request.
+       */
+      abortController.current = new AbortController();
+      currentAbortController = abortController.current;
+    }
     if (!parameters) {
       return;
     }
@@ -145,6 +159,15 @@ export const useDatasourceTableState = ({
           schema
         }
       } = await getDatasourceData(datasourceId, datasourceDataRequest, shouldForceRequest);
+      if (getBooleanFF('platform.linking-platform.datasource.enable-abort-controller')) {
+        var _currentAbortControll;
+        /**
+         * Let the response finish and store in cache, but throw error if signal is aborted
+         */
+        if ((_currentAbortControll = currentAbortController) !== null && _currentAbortControll !== void 0 && _currentAbortControll.signal.aborted) {
+          throw new Error('Aborted');
+        }
+      }
       setExtensionKey(extensionKey);
       setProviderName(providerName);
       if (access === 'unauthorized' || access === 'forbidden') {
@@ -156,11 +179,14 @@ export const useDatasourceTableState = ({
       setTotalCount(totalCount);
       setNextCursor(nextPageCursor);
       setResponseItems(currentResponseItems => {
-        // FIXME EDM-8977 (https://product-fabric.atlassian.net/browse/EDM-8977)
-        // once the onNextPage and reset loop issue has been thoroughly investigated
-        // in the above card, remove this isEqual check, ensure onNextPage isn't called twice
-        const hasIdenticalResponseItems = isEqual(currentResponseItems, items);
-        if (hasIdenticalResponseItems || shouldRequestFirstPage) {
+        if (!getBooleanFF('platform.linking-platform.datasource.enable-abort-controller')) {
+          const hasIdenticalResponseItems = isEqual(currentResponseItems, items);
+          if (hasIdenticalResponseItems || shouldRequestFirstPage) {
+            return items;
+          }
+          return [...currentResponseItems, ...items];
+        }
+        if (shouldRequestFirstPage) {
           return items;
         }
         return [...currentResponseItems, ...items];
@@ -184,6 +210,17 @@ export const useDatasourceTableState = ({
       }
       setStatus('resolved');
     } catch (e) {
+      if (getBooleanFF('platform.linking-platform.datasource.enable-abort-controller')) {
+        if (e.message === 'Aborted') {
+          /**
+           * If the request was aborted, we don't want to change the status of the table
+           * as we are already loading the next request attempt
+           *
+           * Is not an exceptional state, do not need to captureError
+           */
+          return;
+        }
+      }
       captureError('onNextPage', e);
       if (e instanceof Response && e.status === 401) {
         setStatus('unauthorized');
@@ -225,7 +262,7 @@ export const useDatasourceTableState = ({
       });
       setShouldForceRequest(false);
     }
-  }, [lastRequestedFieldKeys, loadDatasourceDetails, onNextPage, parameters, shouldForceRequest, status]);
+  }, [lastRequestedFieldKeys, onNextPage, parameters, shouldForceRequest, status]);
 
   // this takes care of requesting /data when user selects/unselects a column
   useEffect(() => {
@@ -250,6 +287,11 @@ export const useDatasourceTableState = ({
       }
     }
   }, [fieldKeys, lastRequestedFieldKeys, responseItems, reset, onNextPage]);
+  useEffect(() => {
+    if (getBooleanFF('platform.linking-platform.datasource.enable-abort-controller')) {
+      return () => abortController.current.abort();
+    }
+  }, []);
   return {
     status,
     onNextPage,

package/dist/es2019/ui/issue-like-table/empty-state/types.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/analytics/generated/analytics.types.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/analytics/ufoExperiences/types.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/common/types.js

@@ -1 +0,0 @@
-export {};

package/dist/esm/hooks/useDatasourceTableState.js

@@ -2,9 +2,10 @@ import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import isEqual from 'lodash/isEqual';
 import { DEFAULT_GET_DATASOURCE_DATA_PAGE_SIZE, useDatasourceClientExtension } from '@atlaskit/link-client-extension';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../analytics';
 import useErrorLogger from './useErrorLogger';
 export var useDatasourceTableState = function useDatasourceTableState(_ref) {
@@ -81,6 +82,7 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
     _useState30 = _slicedToArray(_useState29, 2),
     providerName = _useState30[0],
     setProviderName = _useState30[1];
+  var abortController = useRef(new AbortController());
   var _useDatasourceClientE = useDatasourceClientExtension(),
     getDatasourceData = _useDatasourceClientE.getDatasourceData,
     getDatasourceDetails = _useDatasourceClientE.getDatasourceDetails;
@@ -163,7 +165,7 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
 
     /*Jira adds identifier fields like id and key to all data responses
     Since defaultProperties already send back the keyField, we are accounting only
-    for the idField when we are using defaulProperties
+    for the idField when we are using defaultProperties
     */
     if (properties.length > fieldKeys.length + idFieldCount + keyFieldCount && properties.length > defaultProperties.length + idFieldCount) {
       setFullSchema(schema);
@@ -186,6 +188,7 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
   }, [columns, defaultVisibleColumnKeys, lastRequestedFieldKeys]);
   var onNextPage = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
     var requestInfo,
+      currentAbortController,
       _requestInfo$isSchema,
       isSchemaFromData,
       shouldRequestFirstPage,
@@ -205,6 +208,7 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       nextPageCursor,
       _totalCount,
       schema,
+      _currentAbortControll,
       isUserLoadingNextPage,
       currentLoadedItemCount,
       newlyLoadedItemCount,
@@ -213,12 +217,23 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           requestInfo = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+          if (getBooleanFF('platform.linking-platform.datasource.enable-abort-controller')) {
+            /**
+             * Abort whichever request was made before this one.
+             */
+            abortController.current.abort();
+            /**
+             * Setup new abort controller for this request.
+             */
+            abortController.current = new AbortController();
+            currentAbortController = abortController.current;
+          }
           if (parameters) {
-            _context2.next = 3;
+            _context2.next = 4;
             break;
           }
           return _context2.abrupt("return");
-        case 3:
+        case 4:
           _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;
           isFullSchemaLoaded = fullSchema.properties.length > 0;
           datasourceDataRequest = {
@@ -229,10 +244,10 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
             includeSchema: isFullSchemaLoaded ? false : isSchemaFromData
           };
           setStatus('loading');
-          _context2.prev = 7;
-          _context2.next = 10;
+          _context2.prev = 8;
+          _context2.next = 11;
           return getDatasourceData(datasourceId, datasourceDataRequest, shouldForceRequest);
-        case 10:
+        case 11:
           _yield$getDatasourceD3 = _context2.sent;
           _yield$getDatasourceD4 = _yield$getDatasourceD3.meta;
           access = _yield$getDatasourceD4.access;
@@ -245,25 +260,38 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           nextPageCursor = _yield$getDatasourceD5.nextPageCursor;
           _totalCount = _yield$getDatasourceD5.totalCount;
           schema = _yield$getDatasourceD5.schema;
+          if (!getBooleanFF('platform.linking-platform.datasource.enable-abort-controller')) {
+            _context2.next = 26;
+            break;
+          }
+          if (!((_currentAbortControll = currentAbortController) !== null && _currentAbortControll !== void 0 && _currentAbortControll.signal.aborted)) {
+            _context2.next = 26;
+            break;
+          }
+          throw new Error('Aborted');
+        case 26:
           setExtensionKey(_extensionKey);
           setProviderName(_providerName);
           if (!(access === 'unauthorized' || access === 'forbidden')) {
-            _context2.next = 28;
+            _context2.next = 32;
             break;
           }
           setStatus(access);
           setAuthDetails(auth || initialEmptyArray);
           return _context2.abrupt("return");
-        case 28:
+        case 32:
           setDestinationObjectTypes(_destinationObjectTypes);
           setTotalCount(_totalCount);
           setNextCursor(nextPageCursor);
           setResponseItems(function (currentResponseItems) {
-            // FIXME EDM-8977 (https://product-fabric.atlassian.net/browse/EDM-8977)
-            // once the onNextPage and reset loop issue has been thoroughly investigated
-            // in the above card, remove this isEqual check, ensure onNextPage isn't called twice
-            var hasIdenticalResponseItems = isEqual(currentResponseItems, items);
-            if (hasIdenticalResponseItems || shouldRequestFirstPage) {
+            if (!getBooleanFF('platform.linking-platform.datasource.enable-abort-controller')) {
+              var hasIdenticalResponseItems = isEqual(currentResponseItems, items);
+              if (hasIdenticalResponseItems || shouldRequestFirstPage) {
+                return items;
+              }
+              return [].concat(_toConsumableArray(currentResponseItems), _toConsumableArray(items));
+            }
+            if (shouldRequestFirstPage) {
               return items;
             }
             return [].concat(_toConsumableArray(currentResponseItems), _toConsumableArray(items));
@@ -286,32 +314,42 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
             });
           }
           setStatus('resolved');
-          _context2.next = 50;
+          _context2.next = 57;
           break;
-        case 40:
-          _context2.prev = 40;
-          _context2.t0 = _context2["catch"](7);
+        case 44:
+          _context2.prev = 44;
+          _context2.t0 = _context2["catch"](8);
+          if (!getBooleanFF('platform.linking-platform.datasource.enable-abort-controller')) {
+            _context2.next = 49;
+            break;
+          }
+          if (!(_context2.t0.message === 'Aborted')) {
+            _context2.next = 49;
+            break;
+          }
+          return _context2.abrupt("return");
+        case 49:
           captureError('onNextPage', _context2.t0);
           if (!(_context2.t0 instanceof Response && _context2.t0.status === 401)) {
-            _context2.next = 46;
+            _context2.next = 53;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
-        case 46:
+        case 53:
           if (!(_context2.t0 instanceof Response && _context2.t0.status === 403)) {
-            _context2.next = 49;
+            _context2.next = 56;
             break;
           }
           setStatus('forbidden');
           return _context2.abrupt("return");
-        case 49:
+        case 56:
           setStatus('rejected');
-        case 50:
+        case 57:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[7, 40]]);
+    }, _callee2, null, [[8, 44]]);
   })), [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems, applySchemaProperties, fireEvent, fullSchema, initialEmptyArray]);
   var reset = useCallback(function (options) {
     setResponseItems(initialEmptyArray);
@@ -342,7 +380,7 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       });
       setShouldForceRequest(false);
     }
-  }, [lastRequestedFieldKeys, loadDatasourceDetails, onNextPage, parameters, shouldForceRequest, status]);
+  }, [lastRequestedFieldKeys, onNextPage, parameters, shouldForceRequest, status]);
 
   // this takes care of requesting /data when user selects/unselects a column
   useEffect(function () {
@@ -371,6 +409,13 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       }
     }
   }, [fieldKeys, lastRequestedFieldKeys, responseItems, reset, onNextPage]);
+  useEffect(function () {
+    if (getBooleanFF('platform.linking-platform.datasource.enable-abort-controller')) {
+      return function () {
+        return abortController.current.abort();
+      };
+    }
+  }, []);
   return {
     status: status,
     onNextPage: onNextPage,

package/dist/esm/ui/issue-like-table/empty-state/types.js

@@ -1 +0,0 @@
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.23.6",
+  "version": "1.23.8",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -31,7 +31,7 @@
     "analytics:codegen": "yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource --output ./src/analytics/generated"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.5.2",
+    "@atlaskit/adf-schema": "^35.6.0",
     "@atlaskit/analytics-next": "^9.2.0",
     "@atlaskit/avatar": "^21.5.0",
     "@atlaskit/avatar-group": "^9.5.0",
@@ -41,7 +41,7 @@
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/empty-state": "^7.7.0",
     "@atlaskit/form": "^9.0.3",
-    "@atlaskit/heading": "^1.7.0",
+    "@atlaskit/heading": "^1.8.0",
     "@atlaskit/icon": "^22.1.0",
     "@atlaskit/icon-object": "^6.3.0",
     "@atlaskit/image": "^1.1.0",
@@ -60,7 +60,7 @@
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
     "@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^1.0.0",
     "@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.0.0",
-    "@atlaskit/primitives": "^4.0.0",
+    "@atlaskit/primitives": "^4.1.0",
     "@atlaskit/select": "^17.3.0",
     "@atlaskit/smart-card": "^26.49.0",
     "@atlaskit/spinner": "^16.0.0",
@@ -146,6 +146,9 @@
     },
     "platform.linking-platform.datasources.enable-sentry-client": {
       "type": "boolean"
+    },
+    "platform.linking-platform.datasource.enable-abort-controller": {
+      "type": "boolean"
     }
   }
 }