@atlaskit/link-datasource 1.4.0 → 1.4.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-datasource
 
+## 1.4.1
+
+### Patch Changes
+
+- [`c8a7c9e33a8`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c8a7c9e33a8) - [ux] Fixed columns not updating on reinsertion with new columns
+
 ## 1.4.0
 
 ### Minor Changes

package/dist/cjs/analytics/constants.js

@@ -8,6 +8,6 @@ var EVENT_CHANNEL = 'media';
 exports.EVENT_CHANNEL = EVENT_CHANNEL;
 var packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.4.0"
+  packageVersion: "1.4.1"
 };
 exports.packageMetaData = packageMetaData;

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -10,6 +10,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _linkClientExtension = require("@atlaskit/link-client-extension");
 var _analytics = require("../analytics");
 var useDatasourceTableState = function useDatasourceTableState(_ref) {
@@ -114,7 +115,7 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
     }, _callee, null, [[2, 17]]);
   })), [columns, datasourceId, getDatasourceDetails, parameters]);
   var applySchemaProperties = (0, _react.useCallback)(function (properties) {
-    if (columns.length === 0) {
+    if (!(0, _isEqual.default)(columns, properties)) {
       setColumns(properties);
     }
     var defaultProperties = properties.map(function (prop) {
@@ -123,13 +124,13 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
 
     // when loading for the first time, we will need to set default visible props as /data does not give you that info
     // also, since we dont pass any fields, we will need to set this info as lastRequestedFieldKeys
-    if (defaultVisibleColumnKeys.length === 0) {
+    if (!(0, _isEqual.default)(defaultVisibleColumnKeys, defaultProperties)) {
       setDefaultVisibleColumnKeys(defaultProperties);
     }
-    if (lastRequestedFieldKeys.length === 0) {
+    if (!(0, _isEqual.default)(lastRequestedFieldKeys, defaultProperties)) {
       setLastRequestedFieldKeys(defaultProperties);
     }
-  }, [columns.length, defaultVisibleColumnKeys.length, lastRequestedFieldKeys === null || lastRequestedFieldKeys === void 0 ? void 0 : lastRequestedFieldKeys.length]);
+  }, [columns, defaultVisibleColumnKeys, lastRequestedFieldKeys]);
   var onNextPage = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
     var requestInfo,
       _requestInfo$isSchema,

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

@@ -231,7 +231,7 @@ var analyticsContextAttributes = {
 };
 var analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.4.0",
+  packageVersion: "1.4.1",
   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.4.0"
+  packageVersion: "1.4.1"
 };

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
+import isEqual from 'lodash/isEqual';
 import { DEFAULT_GET_DATASOURCE_DATA_PAGE_SIZE, useDatasourceClientExtension } from '@atlaskit/link-client-extension';
 import { useDatasourceAnalyticsEvents } from '../analytics';
 export const useDatasourceTableState = ({
@@ -52,20 +53,20 @@ export const useDatasourceTableState = ({
     }
   }, [columns, datasourceId, getDatasourceDetails, parameters]);
   const applySchemaProperties = useCallback(properties => {
-    if (columns.length === 0) {
+    if (!isEqual(columns, properties)) {
       setColumns(properties);
     }
     const defaultProperties = properties.map(prop => prop.key);
 
     // when loading for the first time, we will need to set default visible props as /data does not give you that info
     // also, since we dont pass any fields, we will need to set this info as lastRequestedFieldKeys
-    if (defaultVisibleColumnKeys.length === 0) {
+    if (!isEqual(defaultVisibleColumnKeys, defaultProperties)) {
       setDefaultVisibleColumnKeys(defaultProperties);
     }
-    if (lastRequestedFieldKeys.length === 0) {
+    if (!isEqual(lastRequestedFieldKeys, defaultProperties)) {
       setLastRequestedFieldKeys(defaultProperties);
     }
-  }, [columns.length, defaultVisibleColumnKeys.length, lastRequestedFieldKeys === null || lastRequestedFieldKeys === void 0 ? void 0 : lastRequestedFieldKeys.length]);
+  }, [columns, defaultVisibleColumnKeys, lastRequestedFieldKeys]);
   const onNextPage = useCallback(async (requestInfo = {}) => {
     if (!parameters) {
       return;

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

@@ -205,7 +205,7 @@ const analyticsContextAttributes = {
 };
 const analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.4.0",
+  packageVersion: "1.4.1",
   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.4.0"
+  packageVersion: "1.4.1"
 };

package/dist/esm/hooks/useDatasourceTableState.js

@@ -3,6 +3,7 @@ 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 isEqual from 'lodash/isEqual';
 import { DEFAULT_GET_DATASOURCE_DATA_PAGE_SIZE, useDatasourceClientExtension } from '@atlaskit/link-client-extension';
 import { useDatasourceAnalyticsEvents } from '../analytics';
 export var useDatasourceTableState = function useDatasourceTableState(_ref) {
@@ -107,7 +108,7 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
     }, _callee, null, [[2, 17]]);
   })), [columns, datasourceId, getDatasourceDetails, parameters]);
   var applySchemaProperties = useCallback(function (properties) {
-    if (columns.length === 0) {
+    if (!isEqual(columns, properties)) {
       setColumns(properties);
     }
     var defaultProperties = properties.map(function (prop) {
@@ -116,13 +117,13 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
 
     // when loading for the first time, we will need to set default visible props as /data does not give you that info
     // also, since we dont pass any fields, we will need to set this info as lastRequestedFieldKeys
-    if (defaultVisibleColumnKeys.length === 0) {
+    if (!isEqual(defaultVisibleColumnKeys, defaultProperties)) {
       setDefaultVisibleColumnKeys(defaultProperties);
     }
-    if (lastRequestedFieldKeys.length === 0) {
+    if (!isEqual(lastRequestedFieldKeys, defaultProperties)) {
       setLastRequestedFieldKeys(defaultProperties);
     }
-  }, [columns.length, defaultVisibleColumnKeys.length, lastRequestedFieldKeys === null || lastRequestedFieldKeys === void 0 ? void 0 : lastRequestedFieldKeys.length]);
+  }, [columns, defaultVisibleColumnKeys, lastRequestedFieldKeys]);
   var onNextPage = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
     var requestInfo,
       _requestInfo$isSchema,

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -67,6 +67,7 @@
     "@emotion/react": "^11.7.1",
     "@emotion/styled": "^11.0.0",
     "debounce-promise": "^3.1.2",
+    "lodash": "^4.17.21",
     "react-dom": "^16.8.0",
     "tiny-invariant": "^1.2.0",
     "uuid": "^3.1.0"