@atlaskit/link-datasource 3.9.0 → 3.9.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 3.9.1
+
+### Patch Changes
+
+- [#164965](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/164965)
+  [`99d00d17f1e68`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/99d00d17f1e68) -
+  Internal refactor behind ff - Fixes `executeFetch` being fired after selecting item from dropdpwn
+  list
+- [#164465](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/164465)
+  [`ef019ecbcb056`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ef019ecbcb056) -
+  Feature flag removed - platform.linking-platform.datasource.limit-total-results_8wqcd
+- Updated dependencies
+
 ## 3.9.0
 
 ### Minor Changes

package/dist/cjs/state/actions/index.js

@@ -206,12 +206,15 @@ var useExecuteAtomicAction = exports.useExecuteAtomicAction = function useExecut
   var _useDatasourceClientE2 = (0, _linkClientExtension.useDatasourceClientExtension)(),
     executeAction = _useDatasourceClientE2.executeAtomicAction,
     invalidateDatasourceDataCacheByAri = _useDatasourceClientE2.invalidateDatasourceDataCacheByAri;
-  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
-    fireEvent = _useDatasourceAnalyti.fireEvent;
-  var _useErrorLogger = (0, _useErrorLogger2.default)({
+  var loggerProps = (0, _react.useMemo)(function () {
+    return {
       integrationKey: integrationKey
-    }),
+    };
+  }, [integrationKey]);
+  var _useErrorLogger = (0, _useErrorLogger2.default)(loggerProps),
     captureError = _useErrorLogger.captureError;
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var execute = (0, _react.useCallback)(function (value) {
     if (!schema) {
       throw new Error('No action schema found.');

package/dist/cjs/ui/issue-like-table/edit-type/status/index.js

@@ -23,7 +23,9 @@ var StatusEditType = function StatusEditType(props) {
   var _currentValue$values;
   var currentValue = props.currentValue,
     executeFetch = props.executeFetch;
-  var _useStatusOptions = useStatusOptions(currentValue, executeFetch),
+  var _useStatusOptions = useStatusOptions({
+      executeFetch: executeFetch
+    }),
     options = _useStatusOptions.options,
     isLoading = _useStatusOptions.isLoading,
     hasFailed = _useStatusOptions.hasFailed;
@@ -71,7 +73,9 @@ var StatusEditType = function StatusEditType(props) {
 var filterOption = function filterOption(option, inputValue) {
   return option.data.text.toLowerCase().includes(inputValue.toLowerCase());
 };
-var useStatusOptions = function useStatusOptions(currentValue, executeFetch) {
+var useStatusOptions = function useStatusOptions(_ref) {
+  var fetchInputs = _ref.fetchInputs,
+    executeFetch = _ref.executeFetch;
   var _useState = (0, _react.useState)({
       isLoading: true,
       options: [],
@@ -85,7 +89,7 @@ var useStatusOptions = function useStatusOptions(currentValue, executeFetch) {
     setOptions = _useState2[1];
   (0, _react.useEffect)(function () {
     var isMounted = true;
-    loadOptions(currentValue, executeFetch).then(function (options) {
+    loadOptions(fetchInputs, executeFetch).then(function (options) {
       if (isMounted) {
         setOptions({
           isLoading: false,
@@ -103,7 +107,7 @@ var useStatusOptions = function useStatusOptions(currentValue, executeFetch) {
     return function () {
       isMounted = false;
     };
-  }, [currentValue, executeFetch]);
+  }, [fetchInputs, executeFetch]);
   return {
     options: options,
     isLoading: isLoading,
@@ -111,28 +115,35 @@ var useStatusOptions = function useStatusOptions(currentValue, executeFetch) {
   };
 };
 var loadOptions = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(currentValue, executeFetch) {
-    var result, operationStatus, entities;
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+    var fetchInputs,
+      executeFetch,
+      result,
+      operationStatus,
+      entities,
+      _args = arguments;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          fetchInputs = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+          executeFetch = _args.length > 1 ? _args[1] : undefined;
           if (!executeFetch) {
-            _context.next = 9;
+            _context.next = 11;
             break;
           }
-          _context.next = 3;
-          return executeFetch({});
-        case 3:
+          _context.next = 5;
+          return executeFetch(fetchInputs);
+        case 5:
           result = _context.sent;
           operationStatus = result.operationStatus, entities = result.entities;
           if (!(operationStatus === _linkingTypes.ActionOperationStatus.FAILURE)) {
-            _context.next = 7;
+            _context.next = 9;
             break;
           }
           throw new Error('Failed to fetch status options');
-        case 7:
+        case 9:
           if (!entities) {
-            _context.next = 9;
+            _context.next = 11;
             break;
           }
           return _context.abrupt("return", entities.map(function (entity) {
@@ -143,16 +154,16 @@ var loadOptions = /*#__PURE__*/function () {
               transitionId: entity.transitionId
             };
           }));
-        case 9:
+        case 11:
           return _context.abrupt("return", []);
-        case 10:
+        case 12:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return function loadOptions(_x, _x2) {
-    return _ref.apply(this, arguments);
+  return function loadOptions() {
+    return _ref2.apply(this, arguments);
   };
 }();
 var _default = exports.default = StatusEditType;

package/dist/cjs/ui/table-footer/index.js

@@ -13,7 +13,6 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _reactIntlNext = require("react-intl-next");
 var _button = _interopRequireDefault(require("@atlaskit/button"));
 var _refresh = _interopRequireDefault(require("@atlaskit/icon/core/migration/refresh"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _colors = require("@atlaskit/theme/colors");
 var _assetsModal = require("../assets-modal");
@@ -85,7 +84,7 @@ var TableFooter = exports.TableFooter = function TableFooter(_ref) {
   // ensure correct positioning since 'justify-content: space-between' is used).
   return onRefresh || showItemCount ? (0, _react2.jsx)(FooterWrapper, {
     "data-testid": "table-footer"
-  }, (0, _react2.jsx)(TopBorderWrapper, null, showItemCount && (0, _react2.jsx)(_primitives.Flex, null, datasourceId === _assetsModal.ASSETS_LIST_OF_LINKS_DATASOURCE_ID && (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource.limit-total-results_8wqcd') ? (0, _react2.jsx)(_searchCount.AssetsItemCount, {
+  }, (0, _react2.jsx)(TopBorderWrapper, null, showItemCount && (0, _react2.jsx)(_primitives.Flex, null, datasourceId === _assetsModal.ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? (0, _react2.jsx)(_searchCount.AssetsItemCount, {
     searchCount: itemCount,
     url: url,
     testId: "item-count"

package/dist/es2019/state/actions/index.js

@@ -189,14 +189,15 @@ export const useExecuteAtomicAction = ({
     executeAtomicAction: executeAction,
     invalidateDatasourceDataCacheByAri
   } = useDatasourceClientExtension();
+  const loggerProps = useMemo(() => ({
+    integrationKey
+  }), [integrationKey]);
+  const {
+    captureError
+  } = useErrorLogger(loggerProps);
   const {
     fireEvent
   } = useDatasourceAnalyticsEvents();
-  const {
-    captureError
-  } = useErrorLogger({
-    integrationKey
-  });
   const execute = useCallback(value => {
     if (!schema) {
       throw new Error('No action schema found.');

package/dist/es2019/ui/issue-like-table/edit-type/status/index.js

@@ -16,7 +16,9 @@ const StatusEditType = props => {
     options,
     isLoading,
     hasFailed
-  } = useStatusOptions(currentValue, executeFetch);
+  } = useStatusOptions({
+    executeFetch
+  });
   const experienceId = useDatasourceExperienceId();
   useEffect(() => {
     if (!experienceId) {
@@ -53,7 +55,10 @@ const StatusEditType = props => {
   }));
 };
 const filterOption = (option, inputValue) => option.data.text.toLowerCase().includes(inputValue.toLowerCase());
-const useStatusOptions = (currentValue, executeFetch) => {
+const useStatusOptions = ({
+  fetchInputs,
+  executeFetch
+}) => {
   const [{
     options,
     isLoading,
@@ -65,7 +70,7 @@ const useStatusOptions = (currentValue, executeFetch) => {
   });
   useEffect(() => {
     let isMounted = true;
-    loadOptions(currentValue, executeFetch).then(options => {
+    loadOptions(fetchInputs, executeFetch).then(options => {
       if (isMounted) {
         setOptions({
           isLoading: false,
@@ -83,16 +88,16 @@ const useStatusOptions = (currentValue, executeFetch) => {
     return () => {
       isMounted = false;
     };
-  }, [currentValue, executeFetch]);
+  }, [fetchInputs, executeFetch]);
   return {
     options,
     isLoading,
     hasFailed
   };
 };
-const loadOptions = async (currentValue, executeFetch) => {
+const loadOptions = async (fetchInputs = {}, executeFetch) => {
   if (executeFetch) {
-    const result = await executeFetch({});
+    const result = await executeFetch(fetchInputs);
     const {
       operationStatus,
       entities

package/dist/es2019/ui/table-footer/index.js

@@ -11,7 +11,6 @@ import styled from '@emotion/styled';
 import { FormattedMessage, useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button';
 import RefreshIcon from '@atlaskit/icon/core/migration/refresh';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
 import { N0, N40, N90 } from '@atlaskit/theme/colors';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '../assets-modal';
@@ -70,7 +69,7 @@ export const TableFooter = ({
   // ensure correct positioning since 'justify-content: space-between' is used).
   return onRefresh || showItemCount ? jsx(FooterWrapper, {
     "data-testid": "table-footer"
-  }, jsx(TopBorderWrapper, null, showItemCount && jsx(Flex, null, datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID && fg('platform.linking-platform.datasource.limit-total-results_8wqcd') ? jsx(AssetsItemCount, {
+  }, jsx(TopBorderWrapper, null, showItemCount && jsx(Flex, null, datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? jsx(AssetsItemCount, {
     searchCount: itemCount,
     url: url,
     testId: "item-count"

package/dist/esm/state/actions/index.js

@@ -200,12 +200,15 @@ export var useExecuteAtomicAction = function useExecuteAtomicAction(_ref5) {
   var _useDatasourceClientE2 = useDatasourceClientExtension(),
     executeAction = _useDatasourceClientE2.executeAtomicAction,
     invalidateDatasourceDataCacheByAri = _useDatasourceClientE2.invalidateDatasourceDataCacheByAri;
-  var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
-    fireEvent = _useDatasourceAnalyti.fireEvent;
-  var _useErrorLogger = useErrorLogger({
+  var loggerProps = useMemo(function () {
+    return {
       integrationKey: integrationKey
-    }),
+    };
+  }, [integrationKey]);
+  var _useErrorLogger = useErrorLogger(loggerProps),
     captureError = _useErrorLogger.captureError;
+  var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var execute = useCallback(function (value) {
     if (!schema) {
       throw new Error('No action schema found.');

package/dist/esm/ui/issue-like-table/edit-type/status/index.js

@@ -13,7 +13,9 @@ var StatusEditType = function StatusEditType(props) {
   var _currentValue$values;
   var currentValue = props.currentValue,
     executeFetch = props.executeFetch;
-  var _useStatusOptions = useStatusOptions(currentValue, executeFetch),
+  var _useStatusOptions = useStatusOptions({
+      executeFetch: executeFetch
+    }),
     options = _useStatusOptions.options,
     isLoading = _useStatusOptions.isLoading,
     hasFailed = _useStatusOptions.hasFailed;
@@ -61,7 +63,9 @@ var StatusEditType = function StatusEditType(props) {
 var filterOption = function filterOption(option, inputValue) {
   return option.data.text.toLowerCase().includes(inputValue.toLowerCase());
 };
-var useStatusOptions = function useStatusOptions(currentValue, executeFetch) {
+var useStatusOptions = function useStatusOptions(_ref) {
+  var fetchInputs = _ref.fetchInputs,
+    executeFetch = _ref.executeFetch;
   var _useState = useState({
       isLoading: true,
       options: [],
@@ -75,7 +79,7 @@ var useStatusOptions = function useStatusOptions(currentValue, executeFetch) {
     setOptions = _useState2[1];
   useEffect(function () {
     var isMounted = true;
-    loadOptions(currentValue, executeFetch).then(function (options) {
+    loadOptions(fetchInputs, executeFetch).then(function (options) {
       if (isMounted) {
         setOptions({
           isLoading: false,
@@ -93,7 +97,7 @@ var useStatusOptions = function useStatusOptions(currentValue, executeFetch) {
     return function () {
       isMounted = false;
     };
-  }, [currentValue, executeFetch]);
+  }, [fetchInputs, executeFetch]);
   return {
     options: options,
     isLoading: isLoading,
@@ -101,28 +105,35 @@ var useStatusOptions = function useStatusOptions(currentValue, executeFetch) {
   };
 };
 var loadOptions = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(currentValue, executeFetch) {
-    var result, operationStatus, entities;
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var fetchInputs,
+      executeFetch,
+      result,
+      operationStatus,
+      entities,
+      _args = arguments;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          fetchInputs = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+          executeFetch = _args.length > 1 ? _args[1] : undefined;
           if (!executeFetch) {
-            _context.next = 9;
+            _context.next = 11;
             break;
           }
-          _context.next = 3;
-          return executeFetch({});
-        case 3:
+          _context.next = 5;
+          return executeFetch(fetchInputs);
+        case 5:
           result = _context.sent;
           operationStatus = result.operationStatus, entities = result.entities;
           if (!(operationStatus === ActionOperationStatus.FAILURE)) {
-            _context.next = 7;
+            _context.next = 9;
             break;
           }
           throw new Error('Failed to fetch status options');
-        case 7:
+        case 9:
           if (!entities) {
-            _context.next = 9;
+            _context.next = 11;
             break;
           }
           return _context.abrupt("return", entities.map(function (entity) {
@@ -133,16 +144,16 @@ var loadOptions = /*#__PURE__*/function () {
               transitionId: entity.transitionId
             };
           }));
-        case 9:
+        case 11:
           return _context.abrupt("return", []);
-        case 10:
+        case 12:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return function loadOptions(_x, _x2) {
-    return _ref.apply(this, arguments);
+  return function loadOptions() {
+    return _ref2.apply(this, arguments);
   };
 }();
 export default StatusEditType;

package/dist/esm/ui/table-footer/index.js

@@ -12,7 +12,6 @@ import styled from '@emotion/styled';
 import { FormattedMessage, useIntl } from 'react-intl-next';
 import Button from '@atlaskit/button';
 import RefreshIcon from '@atlaskit/icon/core/migration/refresh';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives';
 import { N0, N40, N90 } from '@atlaskit/theme/colors';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '../assets-modal';
@@ -73,7 +72,7 @@ export var TableFooter = function TableFooter(_ref) {
   // ensure correct positioning since 'justify-content: space-between' is used).
   return onRefresh || showItemCount ? jsx(FooterWrapper, {
     "data-testid": "table-footer"
-  }, jsx(TopBorderWrapper, null, showItemCount && jsx(Flex, null, datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID && fg('platform.linking-platform.datasource.limit-total-results_8wqcd') ? jsx(AssetsItemCount, {
+  }, jsx(TopBorderWrapper, null, showItemCount && jsx(Flex, null, datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID ? jsx(AssetsItemCount, {
     searchCount: itemCount,
     url: url,
     testId: "item-count"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "3.9.0",
+	"version": "3.9.1",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -70,7 +70,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^1.2.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
-		"@atlaskit/primitives": "^13.1.0",
+		"@atlaskit/primitives": "^13.2.0",
 		"@atlaskit/react-select": "^1.3.0",
 		"@atlaskit/select": "^18.5.0",
 		"@atlaskit/smart-card": "^30.2.0",
@@ -174,9 +174,6 @@
 		"platform.linking-platform.datasource-assets_update_refresh_button_dt3qk": {
 			"type": "boolean"
 		},
-		"platform.linking-platform.datasource.limit-total-results_8wqcd": {
-			"type": "boolean"
-		},
 		"platform-datasources-use-refactored-config-modal": {
 			"type": "boolean"
 		}