@atlaskit/link-datasource 1.19.35 → 1.19.37

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 1.19.37
+
+### Patch Changes
+
+- [#64237](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/64237) [`60749f37a107`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/60749f37a107) - [ux] Revert issue duplication in list of links due to infinite loop bug
+
+## 1.19.36
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.19.35
 
 ### Patch Changes

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -308,26 +308,18 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
       }
     }, _callee2, null, [[7, 39]]);
   })), [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent, fullSchema]);
-  var reset = (0, _react.useCallback)(function () {
-    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _ref4 = options,
-      _ref4$shouldResetFull = _ref4.shouldResetFullSchema,
-      shouldResetFullSchema = _ref4$shouldResetFull === void 0 ? true : _ref4$shouldResetFull,
-      _ref4$shouldForceRequ = _ref4.shouldForceRequest,
-      shouldForceRequest = _ref4$shouldForceRequ === void 0 ? false : _ref4$shouldForceRequ,
-      _ref4$shouldResetColu = _ref4.shouldResetColumns,
-      shouldResetColumns = _ref4$shouldResetColu === void 0 ? false : _ref4$shouldResetColu;
+  var reset = (0, _react.useCallback)(function (options) {
     setStatus('empty');
     setResponseItems([]);
     setHasNextPage(true);
     setNextCursor(undefined);
     setTotalCount(undefined);
     setLastRequestedFieldKeys([]);
-    shouldResetFullSchema && setFullSchema({
+    setFullSchema({
       properties: []
     });
-    setShouldForceRequest(shouldForceRequest);
-    if (shouldResetColumns) {
+    setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
+    if (options !== null && options !== void 0 && options.shouldResetColumns) {
       setColumns([]);
       setDefaultVisibleColumnKeys([]);
     }
@@ -362,12 +354,11 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
           return responseItemKeys.includes(key);
         });
       });
-
-      // if there is no data for the new columns, resetting the state triggers the request of new data (onNextPage)
-      // but the schema should not be reset as it is already loaded
       if (!hasDataForColumns) {
-        reset({
-          shouldResetFullSchema: false
+        reset();
+        void onNextPage({
+          isSchemaFromData: false,
+          shouldRequestFirstPage: true
         });
       }
     }

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -189,23 +189,18 @@ export const useDatasourceTableState = ({
       setStatus('rejected');
     }
   }, [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent, fullSchema]);
-  const reset = useCallback((options = {}) => {
-    const {
-      shouldResetFullSchema = true,
-      shouldForceRequest = false,
-      shouldResetColumns = false
-    } = options;
+  const reset = useCallback(options => {
     setStatus('empty');
     setResponseItems([]);
     setHasNextPage(true);
     setNextCursor(undefined);
     setTotalCount(undefined);
     setLastRequestedFieldKeys([]);
-    shouldResetFullSchema && setFullSchema({
+    setFullSchema({
       properties: []
     });
-    setShouldForceRequest(shouldForceRequest);
-    if (shouldResetColumns) {
+    setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
+    if (options !== null && options !== void 0 && options.shouldResetColumns) {
       setColumns([]);
       setDefaultVisibleColumnKeys([]);
     }
@@ -236,12 +231,11 @@ export const useDatasourceTableState = ({
         const responseItemKeys = Object.keys(responseItem);
         return fieldKeys.every(key => responseItemKeys.includes(key));
       });
-
-      // if there is no data for the new columns, resetting the state triggers the request of new data (onNextPage)
-      // but the schema should not be reset as it is already loaded
       if (!hasDataForColumns) {
-        reset({
-          shouldResetFullSchema: false
+        reset();
+        void onNextPage({
+          isSchemaFromData: false,
+          shouldRequestFirstPage: true
         });
       }
     }

package/dist/esm/hooks/useDatasourceTableState.js

@@ -301,26 +301,18 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       }
     }, _callee2, null, [[7, 39]]);
   })), [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent, fullSchema]);
-  var reset = useCallback(function () {
-    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var _ref4 = options,
-      _ref4$shouldResetFull = _ref4.shouldResetFullSchema,
-      shouldResetFullSchema = _ref4$shouldResetFull === void 0 ? true : _ref4$shouldResetFull,
-      _ref4$shouldForceRequ = _ref4.shouldForceRequest,
-      shouldForceRequest = _ref4$shouldForceRequ === void 0 ? false : _ref4$shouldForceRequ,
-      _ref4$shouldResetColu = _ref4.shouldResetColumns,
-      shouldResetColumns = _ref4$shouldResetColu === void 0 ? false : _ref4$shouldResetColu;
+  var reset = useCallback(function (options) {
     setStatus('empty');
     setResponseItems([]);
     setHasNextPage(true);
     setNextCursor(undefined);
     setTotalCount(undefined);
     setLastRequestedFieldKeys([]);
-    shouldResetFullSchema && setFullSchema({
+    setFullSchema({
       properties: []
     });
-    setShouldForceRequest(shouldForceRequest);
-    if (shouldResetColumns) {
+    setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
+    if (options !== null && options !== void 0 && options.shouldResetColumns) {
       setColumns([]);
       setDefaultVisibleColumnKeys([]);
     }
@@ -355,12 +347,11 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           return responseItemKeys.includes(key);
         });
       });
-
-      // if there is no data for the new columns, resetting the state triggers the request of new data (onNextPage)
-      // but the schema should not be reset as it is already loaded
       if (!hasDataForColumns) {
-        reset({
-          shouldResetFullSchema: false
+        reset();
+        void onNextPage({
+          isSchemaFromData: false,
+          shouldRequestFirstPage: true
         });
       }
     }

package/dist/types/hooks/useDatasourceTableState.d.ts

@@ -10,8 +10,6 @@ interface ResetOptions {
     shouldForceRequest?: boolean;
     /** Resets current column data from a datasource table when issuing the new request */
     shouldResetColumns?: boolean;
-    /** Resets current schema data from a datasource table when issuing the new request */
-    shouldResetFullSchema?: boolean;
 }
 export interface DatasourceTableState {
     /** The current status of the table for rendering of the different UI states (e.g.: loading, error, etc). */

package/dist/types-ts4.5/hooks/useDatasourceTableState.d.ts

@@ -10,8 +10,6 @@ interface ResetOptions {
     shouldForceRequest?: boolean;
     /** Resets current column data from a datasource table when issuing the new request */
     shouldResetColumns?: boolean;
-    /** Resets current schema data from a datasource table when issuing the new request */
-    shouldResetFullSchema?: boolean;
 }
 export interface DatasourceTableState {
     /** The current status of the table for rendering of the different UI states (e.g.: loading, error, etc). */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.19.35",
+  "version": "1.19.37",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
     "@atlaskit/jql-ast": "^3.0.0",
     "@atlaskit/jql-editor-autocomplete-rest": "^2.0.0",
     "@atlaskit/link-client-extension": "^1.8.0",
-    "@atlaskit/linking-common": "^4.21.0",
+    "@atlaskit/linking-common": "^5.1.0",
     "@atlaskit/linking-types": "^8.5.0",
     "@atlaskit/lozenge": "^11.5.0",
     "@atlaskit/modal-dialog": "^12.10.0",