@atlaskit/link-datasource 1.19.34 → 1.19.35

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-datasource
 
+## 1.19.35
+
+### Patch Changes
+
+- [#63616](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/63616) [`01ee02f34d54`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/01ee02f34d54) - Fixes issue duplication in list of links after adding columns through the config modal.
+
 ## 1.19.34
 
 ### Patch Changes

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -308,18 +308,26 @@ 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 (options) {
+  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;
     setStatus('empty');
     setResponseItems([]);
     setHasNextPage(true);
     setNextCursor(undefined);
     setTotalCount(undefined);
     setLastRequestedFieldKeys([]);
-    setFullSchema({
+    shouldResetFullSchema && setFullSchema({
       properties: []
     });
-    setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
-    if (options !== null && options !== void 0 && options.shouldResetColumns) {
+    setShouldForceRequest(shouldForceRequest);
+    if (shouldResetColumns) {
       setColumns([]);
       setDefaultVisibleColumnKeys([]);
     }
@@ -354,11 +362,12 @@ 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();
-        void onNextPage({
-          isSchemaFromData: false,
-          shouldRequestFirstPage: true
+        reset({
+          shouldResetFullSchema: false
         });
       }
     }

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -189,18 +189,23 @@ 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 reset = useCallback((options = {}) => {
+    const {
+      shouldResetFullSchema = true,
+      shouldForceRequest = false,
+      shouldResetColumns = false
+    } = options;
     setStatus('empty');
     setResponseItems([]);
     setHasNextPage(true);
     setNextCursor(undefined);
     setTotalCount(undefined);
     setLastRequestedFieldKeys([]);
-    setFullSchema({
+    shouldResetFullSchema && setFullSchema({
       properties: []
     });
-    setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
-    if (options !== null && options !== void 0 && options.shouldResetColumns) {
+    setShouldForceRequest(shouldForceRequest);
+    if (shouldResetColumns) {
       setColumns([]);
       setDefaultVisibleColumnKeys([]);
     }
@@ -231,11 +236,12 @@ 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();
-        void onNextPage({
-          isSchemaFromData: false,
-          shouldRequestFirstPage: true
+        reset({
+          shouldResetFullSchema: false
         });
       }
     }

package/dist/esm/hooks/useDatasourceTableState.js

@@ -301,18 +301,26 @@ 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 (options) {
+  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;
     setStatus('empty');
     setResponseItems([]);
     setHasNextPage(true);
     setNextCursor(undefined);
     setTotalCount(undefined);
     setLastRequestedFieldKeys([]);
-    setFullSchema({
+    shouldResetFullSchema && setFullSchema({
       properties: []
     });
-    setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
-    if (options !== null && options !== void 0 && options.shouldResetColumns) {
+    setShouldForceRequest(shouldForceRequest);
+    if (shouldResetColumns) {
       setColumns([]);
       setDefaultVisibleColumnKeys([]);
     }
@@ -347,11 +355,12 @@ 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();
-        void onNextPage({
-          isSchemaFromData: false,
-          shouldRequestFirstPage: true
+        reset({
+          shouldResetFullSchema: false
         });
       }
     }

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

@@ -10,6 +10,8 @@ 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,6 +10,8 @@ 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.34",
+  "version": "1.19.35",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -62,7 +62,7 @@
     "@atlaskit/tag": "^12.0.0",
     "@atlaskit/textfield": "6.0.0",
     "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.31.0",
+    "@atlaskit/tokens": "^1.32.0",
     "@atlaskit/tooltip": "^18.1.0",
     "@atlaskit/ufo": "^0.2.4",
     "@atlassianlabs/jql-editor": "^2.0.1",