@atlaskit/link-datasource 1.7.0 → 1.7.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 1.7.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.7.1
+
+### Patch Changes
+
+- [#40897](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/40897) [`04a55cb2bec`](https://bitbucket.org/atlassian/atlassian-frontend/commits/04a55cb2bec) - Preventing refetch if newly selected columns already have data
+
 ## 1.7.0
 
 ### Minor 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.0"
+  packageVersion: "1.7.2"
 };

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -271,14 +271,24 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
       if (!hasNewColumns) {
         return;
       }
-      reset();
-      void onNextPage({
-        isSchemaFromData: false,
-        // since this is not inital load, we will already have schema
-        shouldRequestFirstPage: true
+
+      // check if each fieldKey already appears at least once in the object keys of each response item
+      var hasDataForColumns = responseItems.some(function (responseItem) {
+        var responseItemKeys = Object.keys(responseItem);
+        return fieldKeys.every(function (key) {
+          return responseItemKeys.includes(key);
+        });
       });
+      if (!hasDataForColumns) {
+        reset();
+        void onNextPage({
+          isSchemaFromData: false,
+          // since this is not inital load, we will already have schema
+          shouldRequestFirstPage: true
+        });
+      }
     }
-  }, [fieldKeys, lastRequestedFieldKeys, onNextPage, reset]);
+  }, [fieldKeys, lastRequestedFieldKeys, responseItems, reset, onNextPage]);
   return {
     status: status,
     onNextPage: onNextPage,

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

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

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.0"
+  packageVersion: "1.7.2"
 };

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -170,14 +170,22 @@ export const useDatasourceTableState = ({
       if (!hasNewColumns) {
         return;
       }
-      reset();
-      void onNextPage({
-        isSchemaFromData: false,
-        // since this is not inital load, we will already have schema
-        shouldRequestFirstPage: true
+
+      // check if each fieldKey already appears at least once in the object keys of each response item
+      const hasDataForColumns = responseItems.some(responseItem => {
+        const responseItemKeys = Object.keys(responseItem);
+        return fieldKeys.every(key => responseItemKeys.includes(key));
       });
+      if (!hasDataForColumns) {
+        reset();
+        void onNextPage({
+          isSchemaFromData: false,
+          // since this is not inital load, we will already have schema
+          shouldRequestFirstPage: true
+        });
+      }
     }
-  }, [fieldKeys, lastRequestedFieldKeys, onNextPage, reset]);
+  }, [fieldKeys, lastRequestedFieldKeys, responseItems, reset, onNextPage]);
   return {
     status,
     onNextPage,

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

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

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.0"
+  packageVersion: "1.7.2"
 };

package/dist/esm/hooks/useDatasourceTableState.js

@@ -264,14 +264,24 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       if (!hasNewColumns) {
         return;
       }
-      reset();
-      void onNextPage({
-        isSchemaFromData: false,
-        // since this is not inital load, we will already have schema
-        shouldRequestFirstPage: true
+
+      // check if each fieldKey already appears at least once in the object keys of each response item
+      var hasDataForColumns = responseItems.some(function (responseItem) {
+        var responseItemKeys = Object.keys(responseItem);
+        return fieldKeys.every(function (key) {
+          return responseItemKeys.includes(key);
+        });
       });
+      if (!hasDataForColumns) {
+        reset();
+        void onNextPage({
+          isSchemaFromData: false,
+          // since this is not inital load, we will already have schema
+          shouldRequestFirstPage: true
+        });
+      }
     }
-  }, [fieldKeys, lastRequestedFieldKeys, onNextPage, reset]);
+  }, [fieldKeys, lastRequestedFieldKeys, responseItems, reset, onNextPage]);
   return {
     status: status,
     onNextPage: onNextPage,

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -34,7 +34,7 @@
     "@atlaskit/analytics-next": "^9.1.3",
     "@atlaskit/avatar": "^21.4.0",
     "@atlaskit/button": "^16.10.0",
-    "@atlaskit/dropdown-menu": "^11.14.0",
+    "@atlaskit/dropdown-menu": "^12.0.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
     "@atlaskit/empty-state": "^7.5.0",
     "@atlaskit/form": "^8.11.0",