@atlaskit/link-datasource 3.11.0 → 3.12.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/link-datasource
 
+## 3.12.0
+
+### Minor Changes
+
+- [#166988](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/166988)
+  [`0950f1f3c353f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0950f1f3c353f) -
+  [ux] EDM-11263 Add UFO metrics to inline-edit icon field
+
+## 3.11.1
+
+### Patch Changes
+
+- [#166969](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/166969)
+  [`ba7fe3ec68dad`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ba7fe3ec68dad) -
+  Feature flag removed - platform.linking-platform.datasource-assets_add_version_parameter
+
 ## 3.11.0
 
 ### Minor Changes

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

@@ -15,7 +15,6 @@ var _analyticsNext = require("@atlaskit/analytics-next");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
 var _modalDialog = require("@atlaskit/modal-dialog");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../../../analytics");
 var _constants = require("../../../analytics/constants");
 var _types = require("../../../analytics/types");
@@ -67,9 +66,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     schemaId = _useState4[0],
     setSchemaId = _useState4[1];
   var apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
-  var _useState5 = (0, _react.useState)(
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
+  var _useState5 = (0, _react.useState)(apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     visibleColumnKeys = _useState6[0],
     setVisibleColumnKeys = _useState6[1];
@@ -124,13 +121,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
   /* ------------------------------ END PERMISSIONS ------------------------------ */
 
   var parameters = (0, _react.useMemo)(function () {
-    return _objectSpread({
+    return {
       aql: aql || '',
       schemaId: schemaId || '',
-      workspaceId: workspaceId || ''
-    }, (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+      workspaceId: workspaceId || '',
       version: VERSION_TWO
-    } : {});
+    };
   }, [aql, schemaId, workspaceId]);
   var isParametersSet = !!(aql && workspaceId && schemaId);
   var _useDatasourceTableSt = (0, _useDatasourceTableState.useDatasourceTableState)({
@@ -213,13 +209,8 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     setIsNewSearch(false);
   }, []);
   (0, _react.useEffect)(function () {
-    if ((0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter')) {
-      var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
-      setVisibleColumnKeys(newVisibleColumnKeys);
-    } else {
-      var _newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-      setVisibleColumnKeys(_newVisibleColumnKeys);
-    }
+    var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
+    setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys, apiVersion]);
   (0, _react.useEffect)(function () {
     if (isNewSearch) {
@@ -268,13 +259,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     } else {
       onInsert((0, _adf.buildDatasourceAdf)({
         id: datasourceId,
-        parameters: _objectSpread({
+        parameters: {
           workspaceId: workspaceId,
           aql: aql,
-          schemaId: schemaId
-        }, (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+          schemaId: schemaId,
           version: VERSION_TWO
-        } : {}),
+        },
         views: [{
           type: 'table',
           properties: {

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

@@ -13,7 +13,11 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _react = _interopRequireWildcard(require("react"));
 var _linkingTypes = require("@atlaskit/linking-types");
 var _select = _interopRequireDefault(require("@atlaskit/select"));
+var _ufoExperiences = require("../../../../analytics/ufoExperiences");
+var _datasourceExperienceId = require("../../../../contexts/datasource-experience-id");
+var _useDatasourceTableFlag = require("../../../../hooks/useDatasourceTableFlag");
 var _icon = require("../../shared-components/icon");
+var _inlineEdit = require("../../table-cell-content/inline-edit");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 // FilterOptionOption is used in the filterOption function which is part of the public API, but the type itself is not exported
@@ -28,7 +32,23 @@ var IconEditType = function IconEditType(props) {
     executeFetch = props.executeFetch;
   var _usePriorityOptions = usePriorityOptions(currentValue, executeFetch),
     options = _usePriorityOptions.options,
-    isLoading = _usePriorityOptions.isLoading;
+    isLoading = _usePriorityOptions.isLoading,
+    hasFailed = _usePriorityOptions.hasFailed;
+  var experienceId = (0, _datasourceExperienceId.useDatasourceExperienceId)();
+  (0, _react.useEffect)(function () {
+    if (!experienceId) {
+      return;
+    }
+    if (hasFailed) {
+      (0, _ufoExperiences.failUfoExperience)({
+        name: _inlineEdit.InlineEditUFOExperience
+      }, experienceId);
+    } else if (!isLoading) {
+      (0, _ufoExperiences.succeedUfoExperience)({
+        name: _inlineEdit.InlineEditUFOExperience
+      }, experienceId);
+    }
+  }, [experienceId, isLoading, hasFailed]);
   return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_select.default, (0, _extends2.default)({}, props, {
     testId: "inline-edit-priority",
     autoFocus: true,
@@ -66,30 +86,45 @@ var filterOption = function filterOption(option, inputValue) {
 var usePriorityOptions = function usePriorityOptions(currentValue, executeFetch) {
   var _useState = (0, _react.useState)({
       isLoading: true,
-      options: []
+      options: [],
+      hasFailed: false
     }),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     _useState2$ = _useState2[0],
     options = _useState2$.options,
     isLoading = _useState2$.isLoading,
+    hasFailed = _useState2$.hasFailed,
     setOptions = _useState2[1];
+  var _useDatasourceTableFl = (0, _useDatasourceTableFlag.useDatasourceTableFlag)({
+      isFetchAction: true
+    }),
+    showErrorFlag = _useDatasourceTableFl.showErrorFlag;
   (0, _react.useEffect)(function () {
     var isMounted = true;
     loadOptions(currentValue, executeFetch).then(function (options) {
       if (isMounted) {
         setOptions({
           isLoading: false,
-          options: options
+          options: options,
+          hasFailed: false
         });
       }
+    }).catch(function (err) {
+      showErrorFlag();
+      setOptions({
+        isLoading: false,
+        options: [],
+        hasFailed: true
+      });
     });
     return function () {
       isMounted = false;
     };
-  }, [currentValue, executeFetch]);
+  }, [currentValue, executeFetch, showErrorFlag]);
   return {
     options: options,
-    isLoading: isLoading
+    isLoading: isLoading,
+    hasFailed: hasFailed
   };
 };
 
@@ -114,14 +149,20 @@ var loadOptions = /*#__PURE__*/function () {
           _yield$executeFetch = _context.sent;
           operationStatus = _yield$executeFetch.operationStatus;
           entities = _yield$executeFetch.entities;
-          if (!(operationStatus === _linkingTypes.ActionOperationStatus.SUCCESS && entities)) {
+          if (!(operationStatus === _linkingTypes.ActionOperationStatus.FAILURE)) {
             _context.next = 9;
             break;
           }
-          return _context.abrupt("return", entities);
+          throw new Error('Failed to fetch icon options');
         case 9:
+          if (!(operationStatus === _linkingTypes.ActionOperationStatus.SUCCESS && entities)) {
+            _context.next = 11;
+            break;
+          }
+          return _context.abrupt("return", entities);
+        case 11:
           return _context.abrupt("return", []);
-        case 10:
+        case 12:
         case "end":
           return _context.stop();
       }

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

@@ -12,7 +12,6 @@ import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -55,9 +54,7 @@ const PlainAssetsConfigModal = props => {
   const [aql, setAql] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql);
   const [schemaId, setSchemaId] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId);
   const apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
-  const [visibleColumnKeys, setVisibleColumnKeys] = useState(
-  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  fg('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys);
+  const [visibleColumnKeys, setVisibleColumnKeys] = useState(apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys);
   const [isNewSearch, setIsNewSearch] = useState(false);
   const [errorState, setErrorState] = useState();
   const {
@@ -108,9 +105,7 @@ const PlainAssetsConfigModal = props => {
     aql: aql || '',
     schemaId: schemaId || '',
     workspaceId: workspaceId || '',
-    ...(fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
-      version: VERSION_TWO
-    } : {})
+    version: VERSION_TWO
   }), [aql, schemaId, workspaceId]);
   const isParametersSet = !!(aql && workspaceId && schemaId);
   const {
@@ -194,13 +189,8 @@ const PlainAssetsConfigModal = props => {
     setIsNewSearch(false);
   }, []);
   useEffect(() => {
-    if (fg('platform.linking-platform.datasource-assets_add_version_parameter')) {
-      const newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
-      setVisibleColumnKeys(newVisibleColumnKeys);
-    } else {
-      const newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-      setVisibleColumnKeys(newVisibleColumnKeys);
-    }
+    const newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
+    setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys, apiVersion]);
   useEffect(() => {
     if (isNewSearch) {
@@ -253,9 +243,7 @@ const PlainAssetsConfigModal = props => {
           workspaceId,
           aql,
           schemaId,
-          ...(fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
-            version: VERSION_TWO
-          } : {})
+          version: VERSION_TWO
         },
         views: [{
           type: 'table',

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

@@ -5,7 +5,11 @@ import { ActionOperationStatus } from '@atlaskit/linking-types';
 // eslint-disable-next-line import/no-extraneous-dependencies,no-restricted-imports
 
 import Select from '@atlaskit/select';
+import { failUfoExperience, succeedUfoExperience } from '../../../../analytics/ufoExperiences';
+import { useDatasourceExperienceId } from '../../../../contexts/datasource-experience-id';
+import { useDatasourceTableFlag } from '../../../../hooks/useDatasourceTableFlag';
 import { SharedIconComponent } from '../../shared-components/icon';
+import { InlineEditUFOExperience } from '../../table-cell-content/inline-edit';
 /**
  * Should be gated by FF rollout of platform-datasources-enable-two-way-sync-priority
  */
@@ -17,8 +21,24 @@ const IconEditType = props => {
   } = props;
   const {
     options,
-    isLoading
+    isLoading,
+    hasFailed
   } = usePriorityOptions(currentValue, executeFetch);
+  const experienceId = useDatasourceExperienceId();
+  useEffect(() => {
+    if (!experienceId) {
+      return;
+    }
+    if (hasFailed) {
+      failUfoExperience({
+        name: InlineEditUFOExperience
+      }, experienceId);
+    } else if (!isLoading) {
+      succeedUfoExperience({
+        name: InlineEditUFOExperience
+      }, experienceId);
+    }
+  }, [experienceId, isLoading, hasFailed]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, _extends({}, props, {
     testId: "inline-edit-priority",
     autoFocus: true,
@@ -49,10 +69,17 @@ const filterOption = (option, inputValue) => option.label.toLowerCase().includes
 const usePriorityOptions = (currentValue, executeFetch) => {
   const [{
     options,
-    isLoading
+    isLoading,
+    hasFailed
   }, setOptions] = useState({
     isLoading: true,
-    options: []
+    options: [],
+    hasFailed: false
+  });
+  const {
+    showErrorFlag
+  } = useDatasourceTableFlag({
+    isFetchAction: true
   });
   useEffect(() => {
     let isMounted = true;
@@ -60,17 +87,26 @@ const usePriorityOptions = (currentValue, executeFetch) => {
       if (isMounted) {
         setOptions({
           isLoading: false,
-          options
+          options,
+          hasFailed: false
         });
       }
+    }).catch(err => {
+      showErrorFlag();
+      setOptions({
+        isLoading: false,
+        options: [],
+        hasFailed: true
+      });
     });
     return () => {
       isMounted = false;
     };
-  }, [currentValue, executeFetch]);
+  }, [currentValue, executeFetch, showErrorFlag]);
   return {
     options,
-    isLoading
+    isLoading,
+    hasFailed
   };
 };
 
@@ -85,6 +121,9 @@ const loadOptions = async (_currentValue, executeFetch) => {
     operationStatus,
     entities
   } = await executeFetch({});
+  if (operationStatus === ActionOperationStatus.FAILURE) {
+    throw new Error('Failed to fetch icon options');
+  }
   if (operationStatus === ActionOperationStatus.SUCCESS && entities) {
     // Map entities here if the backend type is different from the type required by the select
     return entities;

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

@@ -16,7 +16,6 @@ import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -63,9 +62,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     schemaId = _useState4[0],
     setSchemaId = _useState4[1];
   var apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
-  var _useState5 = useState(
-    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-    fg('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
+  var _useState5 = useState(apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
     _useState6 = _slicedToArray(_useState5, 2),
     visibleColumnKeys = _useState6[0],
     setVisibleColumnKeys = _useState6[1];
@@ -120,13 +117,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
   /* ------------------------------ END PERMISSIONS ------------------------------ */
 
   var parameters = useMemo(function () {
-    return _objectSpread({
+    return {
       aql: aql || '',
       schemaId: schemaId || '',
-      workspaceId: workspaceId || ''
-    }, fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+      workspaceId: workspaceId || '',
       version: VERSION_TWO
-    } : {});
+    };
   }, [aql, schemaId, workspaceId]);
   var isParametersSet = !!(aql && workspaceId && schemaId);
   var _useDatasourceTableSt = useDatasourceTableState({
@@ -209,13 +205,8 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     setIsNewSearch(false);
   }, []);
   useEffect(function () {
-    if (fg('platform.linking-platform.datasource-assets_add_version_parameter')) {
-      var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
-      setVisibleColumnKeys(newVisibleColumnKeys);
-    } else {
-      var _newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-      setVisibleColumnKeys(_newVisibleColumnKeys);
-    }
+    var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
+    setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys, apiVersion]);
   useEffect(function () {
     if (isNewSearch) {
@@ -264,13 +255,12 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     } else {
       onInsert(buildDatasourceAdf({
         id: datasourceId,
-        parameters: _objectSpread({
+        parameters: {
           workspaceId: workspaceId,
           aql: aql,
-          schemaId: schemaId
-        }, fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+          schemaId: schemaId,
           version: VERSION_TWO
-        } : {}),
+        },
         views: [{
           type: 'table',
           properties: {

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

@@ -8,7 +8,11 @@ import { ActionOperationStatus } from '@atlaskit/linking-types';
 // eslint-disable-next-line import/no-extraneous-dependencies,no-restricted-imports
 
 import Select from '@atlaskit/select';
+import { failUfoExperience, succeedUfoExperience } from '../../../../analytics/ufoExperiences';
+import { useDatasourceExperienceId } from '../../../../contexts/datasource-experience-id';
+import { useDatasourceTableFlag } from '../../../../hooks/useDatasourceTableFlag';
 import { SharedIconComponent } from '../../shared-components/icon';
+import { InlineEditUFOExperience } from '../../table-cell-content/inline-edit';
 /**
  * Should be gated by FF rollout of platform-datasources-enable-two-way-sync-priority
  */
@@ -18,7 +22,23 @@ var IconEditType = function IconEditType(props) {
     executeFetch = props.executeFetch;
   var _usePriorityOptions = usePriorityOptions(currentValue, executeFetch),
     options = _usePriorityOptions.options,
-    isLoading = _usePriorityOptions.isLoading;
+    isLoading = _usePriorityOptions.isLoading,
+    hasFailed = _usePriorityOptions.hasFailed;
+  var experienceId = useDatasourceExperienceId();
+  useEffect(function () {
+    if (!experienceId) {
+      return;
+    }
+    if (hasFailed) {
+      failUfoExperience({
+        name: InlineEditUFOExperience
+      }, experienceId);
+    } else if (!isLoading) {
+      succeedUfoExperience({
+        name: InlineEditUFOExperience
+      }, experienceId);
+    }
+  }, [experienceId, isLoading, hasFailed]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, _extends({}, props, {
     testId: "inline-edit-priority",
     autoFocus: true,
@@ -56,30 +76,45 @@ var filterOption = function filterOption(option, inputValue) {
 var usePriorityOptions = function usePriorityOptions(currentValue, executeFetch) {
   var _useState = useState({
       isLoading: true,
-      options: []
+      options: [],
+      hasFailed: false
     }),
     _useState2 = _slicedToArray(_useState, 2),
     _useState2$ = _useState2[0],
     options = _useState2$.options,
     isLoading = _useState2$.isLoading,
+    hasFailed = _useState2$.hasFailed,
     setOptions = _useState2[1];
+  var _useDatasourceTableFl = useDatasourceTableFlag({
+      isFetchAction: true
+    }),
+    showErrorFlag = _useDatasourceTableFl.showErrorFlag;
   useEffect(function () {
     var isMounted = true;
     loadOptions(currentValue, executeFetch).then(function (options) {
       if (isMounted) {
         setOptions({
           isLoading: false,
-          options: options
+          options: options,
+          hasFailed: false
         });
       }
+    }).catch(function (err) {
+      showErrorFlag();
+      setOptions({
+        isLoading: false,
+        options: [],
+        hasFailed: true
+      });
     });
     return function () {
       isMounted = false;
     };
-  }, [currentValue, executeFetch]);
+  }, [currentValue, executeFetch, showErrorFlag]);
   return {
     options: options,
-    isLoading: isLoading
+    isLoading: isLoading,
+    hasFailed: hasFailed
   };
 };
 
@@ -104,14 +139,20 @@ var loadOptions = /*#__PURE__*/function () {
           _yield$executeFetch = _context.sent;
           operationStatus = _yield$executeFetch.operationStatus;
           entities = _yield$executeFetch.entities;
-          if (!(operationStatus === ActionOperationStatus.SUCCESS && entities)) {
+          if (!(operationStatus === ActionOperationStatus.FAILURE)) {
             _context.next = 9;
             break;
           }
-          return _context.abrupt("return", entities);
+          throw new Error('Failed to fetch icon options');
         case 9:
+          if (!(operationStatus === ActionOperationStatus.SUCCESS && entities)) {
+            _context.next = 11;
+            break;
+          }
+          return _context.abrupt("return", entities);
+        case 11:
           return _context.abrupt("return", []);
-        case 10:
+        case 12:
         case "end":
           return _context.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "3.11.0",
+	"version": "3.12.0",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/flag": "^15.8.0",
 		"@atlaskit/form": "^10.5.0",
 		"@atlaskit/heading": "^3.1.0",
-		"@atlaskit/icon": "^22.24.0",
+		"@atlaskit/icon": "^22.25.0",
 		"@atlaskit/icon-object": "^6.7.0",
 		"@atlaskit/image": "^1.3.0",
 		"@atlaskit/inline-edit": "^13.7.0",
@@ -71,7 +71,7 @@
 		"@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.2.0",
-		"@atlaskit/react-select": "^1.3.0",
+		"@atlaskit/react-select": "^1.4.0",
 		"@atlaskit/select": "^18.5.0",
 		"@atlaskit/smart-card": "^30.3.0",
 		"@atlaskit/smart-user-picker": "6.11.2",
@@ -171,9 +171,6 @@
 		"platform-datasources-enable-two-way-sync-priority": {
 			"type": "boolean"
 		},
-		"platform.linking-platform.datasource-assets_add_version_parameter": {
-			"type": "boolean"
-		},
 		"platform.linking-platform.datasource-assets_update_refresh_button_dt3qk": {
 			"type": "boolean"
 		},