@atlaskit/link-datasource 2.11.4 → 2.11.6

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/link-datasource
 
+## 2.11.6
+
+### Patch Changes
+
+- [#130683](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/130683)
+  [`c61bb13127c88`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c61bb13127c88) -
+  Add datasource table inline edit 403 error message behind feature flag
+- [#132566](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/132566)
+  [`3e30b62782282`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3e30b62782282) -
+  Fix datasource modal close on pressing escape (ESC) from inline edit behind feature flag
+
+## 2.11.5
+
+### Patch Changes
+
+- [`2206c4285ada1`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2206c4285ada1) -
+  Fixes bug in Confluence datasource modal found behind ff.
+
 ## 2.11.4
 
 ### Patch Changes

package/dist/cjs/hooks/useDatasourceTableFlag.js

@@ -17,32 +17,35 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 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 && Object.prototype.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; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var getGenericErrorMessage = function getGenericErrorMessage(status) {
+  switch (status) {
+    case 403:
+      return {
+        title: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.issueLikeTableMessages.updateError403Title),
+        description: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.issueLikeTableMessages.updateError403Description)
+      };
+    default:
+      return {
+        title: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.issueLikeTableMessages.updateErrorGenericTitle),
+        description: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.issueLikeTableMessages.updateErrorGenericDescription)
+      };
+  }
+};
 var useDatasourceTableFlag = exports.useDatasourceTableFlag = function useDatasourceTableFlag(options) {
   var _useFlags = (0, _flag.useFlags)(),
     showFlag = _useFlags.showFlag;
-  var actions = (0, _react.useMemo)(function () {
-    var resourceLink = (options === null || options === void 0 ? void 0 : options.url) && {
-      content: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.issueLikeTableMessages.goToResourceLink),
-      href: options === null || options === void 0 ? void 0 : options.url,
-      target: '_blank'
-    };
-    return resourceLink ? [resourceLink] : undefined;
-  }, [options === null || options === void 0 ? void 0 : options.url]);
   var showErrorFlag = (0, _react.useCallback)(function (args) {
-    showFlag(_objectSpread({
-      actions: actions,
-      description: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.issueLikeTableMessages.updateErrorGenericDescription),
-      // We need IconTile (currently in beta) in order to scale the new icon to 24px
+    showFlag(_objectSpread(_objectSpread({
+      // We need IconTile in order to scale the new icon to 24px
       // eslint-disable-next-line @atlaskit/design-system/no-legacy-icons
       icon: /*#__PURE__*/_react.default.createElement(_crossCircle.default, {
         label: "Error",
         primaryColor: "var(--ds-icon-danger, #C9372C)"
       }),
       id: (0, _uuid.default)(),
-      isAutoDismiss: true,
-      title: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.issueLikeTableMessages.updateErrorGenericTitle)
-    }, args));
-  }, [actions, showFlag]);
+      isAutoDismiss: true
+    }, getGenericErrorMessage(args === null || args === void 0 ? void 0 : args.status)), args));
+  }, [showFlag]);
   return {
     showErrorFlag: showErrorFlag
   };

package/dist/cjs/ui/confluence-search-modal/confluence-search-container/index.js

@@ -94,7 +94,7 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     }
   }, [cloudId, resetHydrationHook]);
   var showBasicFilters = (0, _react.useMemo)(function () {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-clol-basic-filters')) {
+    if ((0, _platformFeatureFlags.fg)('platform.linking-platform.datasource.show-clol-basic-filters')) {
       return true;
     }
     return false;

package/dist/cjs/ui/confluence-search-modal/modal/index.js

@@ -318,7 +318,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   }, (0, _react2.jsx)(_confluenceSearchContainer.default, {
     isSearching: status === 'loading',
     onSearch: onSearch,
-    parameters: parameters && isValidParameters(parameters) ? parameters : {
+    parameters: parameters !== null && parameters !== void 0 ? parameters : {
       cloudId: ''
     }
   })), currentViewMode === 'inline' ? renderInlineLinkModalContent() : renderTableModalContent()) : (0, _react2.jsx)(_noInstances.NoInstancesView, {

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

@@ -7,12 +7,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
+var _layering = require("@atlaskit/layering");
 var _textfield = _interopRequireDefault(require("@atlaskit/textfield"));
 var TextEditType = function TextEditType(props) {
-  return /*#__PURE__*/_react.default.createElement(_textfield.default, (0, _extends2.default)({}, props, {
+  return /*#__PURE__*/_react.default.createElement(_layering.UNSAFE_LAYERING, {
+    isDisabled: false
+  }, /*#__PURE__*/_react.default.createElement(_textfield.default, (0, _extends2.default)({}, props, {
     autoFocus: true,
     isCompact: true,
     testId: "inline-edit-text"
-  }));
+  })));
 };
 var _default = exports.default = TextEditType;

package/dist/cjs/ui/issue-like-table/messages.js

@@ -6,18 +6,23 @@ Object.defineProperty(exports, "__esModule", {
 exports.issueLikeTableMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
 var issueLikeTableMessages = exports.issueLikeTableMessages = (0, _reactIntlNext.defineMessages)({
-  goToResourceLink: {
-    id: 'linkDataSource.issue-line-table.go-to-resource.nonfinal',
-    description: 'Link to navigate to the resource page',
-    defaultMessage: 'Go to item'
+  updateError403Description: {
+    id: 'linkDataSource.issue-line-table.error-403-description',
+    description: 'Generic error message description shown when updating issue field fails due to user does not have permission to update.',
+    defaultMessage: 'You need the right permissions to edit this item.'
+  },
+  updateError403Title: {
+    id: 'linkDataSource.issue-line-table.error-403-title',
+    description: 'Generic error message title shown when updating issue field fails due to user does not have permission to update.',
+    defaultMessage: 'Changes not saved'
   },
   updateErrorGenericDescription: {
-    id: 'linkDataSource.issue-line-table.error-generic-description.nonfinal',
+    id: 'linkDataSource.issue-line-table.error-generic-description',
     description: 'Generic error message description shown when updating issue field fails',
-    defaultMessage: 'We had an issue trying to complete the update. Refresh the page and try again.'
+    defaultMessage: 'We had an issue trying to complete the update. Wait a few minutes, then try again. Contact support if this keeps happening.'
   },
   updateErrorGenericTitle: {
-    id: 'linkDataSource.issue-line-table.error-generic-title.nonfinal',
+    id: 'linkDataSource.issue-line-table.error-generic-title',
     description: 'Generic error message title shown when updating issue field fails',
     defaultMessage: 'Something went wrong'
   },

package/dist/cjs/ui/issue-like-table/table-cell-content/inline-edit.js

@@ -1,23 +1,23 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _typeof3 = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InlineEdit = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _inlineEdit = _interopRequireDefault(require("@atlaskit/inline-edit"));
 var _primitives = require("@atlaskit/primitives");
-var _responseItem = require("../../../common/utils/response-item");
 var _useDatasourceTableFlag = require("../../../hooks/useDatasourceTableFlag");
 var _state = require("../../../state");
 var _editType = require("../edit-type");
 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 && Object.prototype.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; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(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 && Object.prototype.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; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var containerStyles = (0, _primitives.xcss)({
@@ -49,10 +49,7 @@ var InlineEdit = exports.InlineEdit = function InlineEdit(_ref) {
   var item = (0, _state.useDatasourceItem)({
     id: ari
   });
-  var url = (0, _responseItem.getResourceUrl)(item === null || item === void 0 ? void 0 : item.data);
-  var _useDatasourceTableFl = (0, _useDatasourceTableFlag.useDatasourceTableFlag)({
-      url: url
-    }),
+  var _useDatasourceTableFl = (0, _useDatasourceTableFlag.useDatasourceTableFlag)(),
     showErrorFlag = _useDatasourceTableFl.showErrorFlag;
   var _useDatasourceActions = (0, _state.useDatasourceActions)(),
     onUpdateItem = _useDatasourceActions.onUpdateItem;
@@ -69,7 +66,10 @@ var InlineEdit = exports.InlineEdit = function InlineEdit(_ref) {
     }
     onUpdateItem(ari, newItem);
     execute(value).catch(function (error) {
-      showErrorFlag();
+      var status = error && (0, _typeof2.default)(error) === 'object' ? error.status : undefined;
+      showErrorFlag({
+        status: status
+      });
       onUpdateItem(ari, existingData);
     });
     setIsEditing(false);

package/dist/es2019/hooks/useDatasourceTableFlag.js

@@ -1,26 +1,30 @@
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback } from 'react';
 import { FormattedMessage } from 'react-intl-next';
 import uuid from 'uuid';
 import { useFlags } from '@atlaskit/flag';
 import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
 import { issueLikeTableMessages } from '../ui/issue-like-table/messages';
+const getGenericErrorMessage = status => {
+  switch (status) {
+    case 403:
+      return {
+        title: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.updateError403Title),
+        description: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.updateError403Description)
+      };
+    default:
+      return {
+        title: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.updateErrorGenericTitle),
+        description: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.updateErrorGenericDescription)
+      };
+  }
+};
 export const useDatasourceTableFlag = options => {
   const {
     showFlag
   } = useFlags();
-  const actions = useMemo(() => {
-    const resourceLink = (options === null || options === void 0 ? void 0 : options.url) && {
-      content: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.goToResourceLink),
-      href: options === null || options === void 0 ? void 0 : options.url,
-      target: '_blank'
-    };
-    return resourceLink ? [resourceLink] : undefined;
-  }, [options === null || options === void 0 ? void 0 : options.url]);
   const showErrorFlag = useCallback(args => {
     showFlag({
-      actions,
-      description: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.updateErrorGenericDescription),
-      // We need IconTile (currently in beta) in order to scale the new icon to 24px
+      // We need IconTile in order to scale the new icon to 24px
       // eslint-disable-next-line @atlaskit/design-system/no-legacy-icons
       icon: /*#__PURE__*/React.createElement(CrossCircleIcon, {
         label: "Error",
@@ -28,10 +32,10 @@ export const useDatasourceTableFlag = options => {
       }),
       id: uuid(),
       isAutoDismiss: true,
-      title: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.updateErrorGenericTitle),
+      ...getGenericErrorMessage(args === null || args === void 0 ? void 0 : args.status),
       ...args
     });
-  }, [actions, showFlag]);
+  }, [showFlag]);
   return {
     showErrorFlag
   };

package/dist/es2019/ui/confluence-search-modal/confluence-search-container/index.js

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useDebouncedCallback } from 'use-debounce';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex, xcss } from '@atlaskit/primitives';
 import { BasicSearchInput } from '../../common/modal/basic-search-input';
 import { FILTER_SELECTION_DEBOUNCE_MS } from '../../common/modal/popup-select/constants';
@@ -73,7 +73,7 @@ const ConfluenceSearchContainer = ({
     }
   }, [cloudId, resetHydrationHook]);
   const showBasicFilters = useMemo(() => {
-    if (getBooleanFF('platform.linking-platform.datasource.show-clol-basic-filters')) {
+    if (fg('platform.linking-platform.datasource.show-clol-basic-filters')) {
       return true;
     }
     return false;

package/dist/es2019/ui/confluence-search-modal/modal/index.js

@@ -305,7 +305,7 @@ export const PlainConfluenceSearchConfigModal = props => {
   }, jsx(ConfluenceSearchContainer, {
     isSearching: status === 'loading',
     onSearch: onSearch,
-    parameters: parameters && isValidParameters(parameters) ? parameters : {
+    parameters: parameters !== null && parameters !== void 0 ? parameters : {
       cloudId: ''
     }
   })), currentViewMode === 'inline' ? renderInlineLinkModalContent() : renderTableModalContent()) : jsx(NoInstancesView, {

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

@@ -1,9 +1,12 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
+import { UNSAFE_LAYERING } from '@atlaskit/layering';
 import Textfield from '@atlaskit/textfield';
-const TextEditType = props => /*#__PURE__*/React.createElement(Textfield, _extends({}, props, {
+const TextEditType = props => /*#__PURE__*/React.createElement(UNSAFE_LAYERING, {
+  isDisabled: false
+}, /*#__PURE__*/React.createElement(Textfield, _extends({}, props, {
   autoFocus: true,
   isCompact: true,
   testId: "inline-edit-text"
-}));
+})));
 export default TextEditType;

package/dist/es2019/ui/issue-like-table/messages.js

@@ -1,17 +1,22 @@
 import { defineMessages } from 'react-intl-next';
 export const issueLikeTableMessages = defineMessages({
-  goToResourceLink: {
-    id: 'linkDataSource.issue-line-table.go-to-resource.nonfinal',
-    description: 'Link to navigate to the resource page',
-    defaultMessage: 'Go to item'
+  updateError403Description: {
+    id: 'linkDataSource.issue-line-table.error-403-description',
+    description: 'Generic error message description shown when updating issue field fails due to user does not have permission to update.',
+    defaultMessage: 'You need the right permissions to edit this item.'
+  },
+  updateError403Title: {
+    id: 'linkDataSource.issue-line-table.error-403-title',
+    description: 'Generic error message title shown when updating issue field fails due to user does not have permission to update.',
+    defaultMessage: 'Changes not saved'
   },
   updateErrorGenericDescription: {
-    id: 'linkDataSource.issue-line-table.error-generic-description.nonfinal',
+    id: 'linkDataSource.issue-line-table.error-generic-description',
     description: 'Generic error message description shown when updating issue field fails',
-    defaultMessage: 'We had an issue trying to complete the update. Refresh the page and try again.'
+    defaultMessage: 'We had an issue trying to complete the update. Wait a few minutes, then try again. Contact support if this keeps happening.'
   },
   updateErrorGenericTitle: {
-    id: 'linkDataSource.issue-line-table.error-generic-title.nonfinal',
+    id: 'linkDataSource.issue-line-table.error-generic-title',
     description: 'Generic error message title shown when updating issue field fails',
     defaultMessage: 'Something went wrong'
   },

package/dist/es2019/ui/issue-like-table/table-cell-content/inline-edit.js

@@ -2,7 +2,6 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useCallback, useState } from 'react';
 import AKInlineEdit from '@atlaskit/inline-edit';
 import { Box, xcss } from '@atlaskit/primitives';
-import { getResourceUrl } from '../../../common/utils/response-item';
 import { useDatasourceTableFlag } from '../../../hooks/useDatasourceTableFlag';
 import { useDatasourceActions, useDatasourceItem } from '../../../state';
 import { editType } from '../edit-type';
@@ -36,12 +35,9 @@ export const InlineEdit = ({
   const item = useDatasourceItem({
     id: ari
   });
-  const url = getResourceUrl(item === null || item === void 0 ? void 0 : item.data);
   const {
     showErrorFlag
-  } = useDatasourceTableFlag({
-    url
-  });
+  } = useDatasourceTableFlag();
   const {
     onUpdateItem
   } = useDatasourceActions();
@@ -58,7 +54,10 @@ export const InlineEdit = ({
     }
     onUpdateItem(ari, newItem);
     execute(value).catch(error => {
-      showErrorFlag();
+      const status = error && typeof error === 'object' ? error.status : undefined;
+      showErrorFlag({
+        status
+      });
       onUpdateItem(ari, existingData);
     });
     setIsEditing(false);

package/dist/esm/hooks/useDatasourceTableFlag.js

@@ -1,38 +1,41 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback } from 'react';
 import { FormattedMessage } from 'react-intl-next';
 import uuid from 'uuid';
 import { useFlags } from '@atlaskit/flag';
 import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
 import { issueLikeTableMessages } from '../ui/issue-like-table/messages';
+var getGenericErrorMessage = function getGenericErrorMessage(status) {
+  switch (status) {
+    case 403:
+      return {
+        title: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.updateError403Title),
+        description: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.updateError403Description)
+      };
+    default:
+      return {
+        title: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.updateErrorGenericTitle),
+        description: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.updateErrorGenericDescription)
+      };
+  }
+};
 export var useDatasourceTableFlag = function useDatasourceTableFlag(options) {
   var _useFlags = useFlags(),
     showFlag = _useFlags.showFlag;
-  var actions = useMemo(function () {
-    var resourceLink = (options === null || options === void 0 ? void 0 : options.url) && {
-      content: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.goToResourceLink),
-      href: options === null || options === void 0 ? void 0 : options.url,
-      target: '_blank'
-    };
-    return resourceLink ? [resourceLink] : undefined;
-  }, [options === null || options === void 0 ? void 0 : options.url]);
   var showErrorFlag = useCallback(function (args) {
-    showFlag(_objectSpread({
-      actions: actions,
-      description: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.updateErrorGenericDescription),
-      // We need IconTile (currently in beta) in order to scale the new icon to 24px
+    showFlag(_objectSpread(_objectSpread({
+      // We need IconTile in order to scale the new icon to 24px
       // eslint-disable-next-line @atlaskit/design-system/no-legacy-icons
       icon: /*#__PURE__*/React.createElement(CrossCircleIcon, {
         label: "Error",
         primaryColor: "var(--ds-icon-danger, #C9372C)"
       }),
       id: uuid(),
-      isAutoDismiss: true,
-      title: /*#__PURE__*/React.createElement(FormattedMessage, issueLikeTableMessages.updateErrorGenericTitle)
-    }, args));
-  }, [actions, showFlag]);
+      isAutoDismiss: true
+    }, getGenericErrorMessage(args === null || args === void 0 ? void 0 : args.status)), args));
+  }, [showFlag]);
   return {
     showErrorFlag: showErrorFlag
   };

package/dist/esm/ui/confluence-search-modal/confluence-search-container/index.js

@@ -4,7 +4,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useDebouncedCallback } from 'use-debounce';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex, xcss } from '@atlaskit/primitives';
 import { BasicSearchInput } from '../../common/modal/basic-search-input';
 import { FILTER_SELECTION_DEBOUNCE_MS } from '../../common/modal/popup-select/constants';
@@ -84,7 +84,7 @@ var ConfluenceSearchContainer = function ConfluenceSearchContainer(_ref) {
     }
   }, [cloudId, resetHydrationHook]);
   var showBasicFilters = useMemo(function () {
-    if (getBooleanFF('platform.linking-platform.datasource.show-clol-basic-filters')) {
+    if (fg('platform.linking-platform.datasource.show-clol-basic-filters')) {
       return true;
     }
     return false;

package/dist/esm/ui/confluence-search-modal/modal/index.js

@@ -315,7 +315,7 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   }, jsx(ConfluenceSearchContainer, {
     isSearching: status === 'loading',
     onSearch: onSearch,
-    parameters: parameters && isValidParameters(parameters) ? parameters : {
+    parameters: parameters !== null && parameters !== void 0 ? parameters : {
       cloudId: ''
     }
   })), currentViewMode === 'inline' ? renderInlineLinkModalContent() : renderTableModalContent()) : jsx(NoInstancesView, {

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

@@ -1,11 +1,14 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
+import { UNSAFE_LAYERING } from '@atlaskit/layering';
 import Textfield from '@atlaskit/textfield';
 var TextEditType = function TextEditType(props) {
-  return /*#__PURE__*/React.createElement(Textfield, _extends({}, props, {
+  return /*#__PURE__*/React.createElement(UNSAFE_LAYERING, {
+    isDisabled: false
+  }, /*#__PURE__*/React.createElement(Textfield, _extends({}, props, {
     autoFocus: true,
     isCompact: true,
     testId: "inline-edit-text"
-  }));
+  })));
 };
 export default TextEditType;

package/dist/esm/ui/issue-like-table/messages.js

@@ -1,17 +1,22 @@
 import { defineMessages } from 'react-intl-next';
 export var issueLikeTableMessages = defineMessages({
-  goToResourceLink: {
-    id: 'linkDataSource.issue-line-table.go-to-resource.nonfinal',
-    description: 'Link to navigate to the resource page',
-    defaultMessage: 'Go to item'
+  updateError403Description: {
+    id: 'linkDataSource.issue-line-table.error-403-description',
+    description: 'Generic error message description shown when updating issue field fails due to user does not have permission to update.',
+    defaultMessage: 'You need the right permissions to edit this item.'
+  },
+  updateError403Title: {
+    id: 'linkDataSource.issue-line-table.error-403-title',
+    description: 'Generic error message title shown when updating issue field fails due to user does not have permission to update.',
+    defaultMessage: 'Changes not saved'
   },
   updateErrorGenericDescription: {
-    id: 'linkDataSource.issue-line-table.error-generic-description.nonfinal',
+    id: 'linkDataSource.issue-line-table.error-generic-description',
     description: 'Generic error message description shown when updating issue field fails',
-    defaultMessage: 'We had an issue trying to complete the update. Refresh the page and try again.'
+    defaultMessage: 'We had an issue trying to complete the update. Wait a few minutes, then try again. Contact support if this keeps happening.'
   },
   updateErrorGenericTitle: {
-    id: 'linkDataSource.issue-line-table.error-generic-title.nonfinal',
+    id: 'linkDataSource.issue-line-table.error-generic-title',
     description: 'Generic error message title shown when updating issue field fails',
     defaultMessage: 'Something went wrong'
   },

package/dist/esm/ui/issue-like-table/table-cell-content/inline-edit.js

@@ -1,4 +1,5 @@
 import _extends from "@babel/runtime/helpers/extends";
+import _typeof from "@babel/runtime/helpers/typeof";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -6,7 +7,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React, { useCallback, useState } from 'react';
 import AKInlineEdit from '@atlaskit/inline-edit';
 import { Box, xcss } from '@atlaskit/primitives';
-import { getResourceUrl } from '../../../common/utils/response-item';
 import { useDatasourceTableFlag } from '../../../hooks/useDatasourceTableFlag';
 import { useDatasourceActions, useDatasourceItem } from '../../../state';
 import { editType } from '../edit-type';
@@ -39,10 +39,7 @@ export var InlineEdit = function InlineEdit(_ref) {
   var item = useDatasourceItem({
     id: ari
   });
-  var url = getResourceUrl(item === null || item === void 0 ? void 0 : item.data);
-  var _useDatasourceTableFl = useDatasourceTableFlag({
-      url: url
-    }),
+  var _useDatasourceTableFl = useDatasourceTableFlag(),
     showErrorFlag = _useDatasourceTableFl.showErrorFlag;
   var _useDatasourceActions = useDatasourceActions(),
     onUpdateItem = _useDatasourceActions.onUpdateItem;
@@ -59,7 +56,10 @@ export var InlineEdit = function InlineEdit(_ref) {
     }
     onUpdateItem(ari, newItem);
     execute(value).catch(function (error) {
-      showErrorFlag();
+      var status = error && _typeof(error) === 'object' ? error.status : undefined;
+      showErrorFlag({
+        status: status
+      });
       onUpdateItem(ari, existingData);
     });
     setIsEditing(false);

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

@@ -3,6 +3,8 @@ interface DatasourceTableFlagOptions {
     url?: string;
 }
 export declare const useDatasourceTableFlag: (options?: DatasourceTableFlagOptions) => {
-    showErrorFlag: (args?: Partial<CreateFlagArgs>) => void;
+    showErrorFlag: (args?: Partial<CreateFlagArgs> & {
+        status?: number;
+    }) => void;
 };
 export {};

package/dist/types/ui/issue-like-table/messages.d.ts

@@ -1,5 +1,10 @@
 export declare const issueLikeTableMessages: {
-    goToResourceLink: {
+    updateError403Description: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    updateError403Title: {
         id: string;
         description: string;
         defaultMessage: string;

package/dist/types-ts4.5/hooks/useDatasourceTableFlag.d.ts

@@ -3,6 +3,8 @@ interface DatasourceTableFlagOptions {
     url?: string;
 }
 export declare const useDatasourceTableFlag: (options?: DatasourceTableFlagOptions) => {
-    showErrorFlag: (args?: Partial<CreateFlagArgs>) => void;
+    showErrorFlag: (args?: Partial<CreateFlagArgs> & {
+        status?: number;
+    }) => void;
 };
 export {};

package/dist/types-ts4.5/ui/issue-like-table/messages.d.ts

@@ -1,5 +1,10 @@
 export declare const issueLikeTableMessages: {
-    goToResourceLink: {
+    updateError403Description: {
+        id: string;
+        description: string;
+        defaultMessage: string;
+    };
+    updateError403Title: {
         id: string;
         description: string;
         defaultMessage: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "2.11.4",
+	"version": "2.11.6",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -52,11 +52,12 @@
 		"@atlaskit/icon": "^22.14.0",
 		"@atlaskit/icon-object": "^6.5.0",
 		"@atlaskit/image": "^1.3.0",
-		"@atlaskit/inline-edit": "^13.6.0",
+		"@atlaskit/inline-edit": "^13.7.0",
 		"@atlaskit/intl-messages-provider": "^1.0.0",
 		"@atlaskit/jql-ast": "^3.3.0",
 		"@atlaskit/jql-editor": "^4.5.0",
 		"@atlaskit/jql-editor-autocomplete-rest": "^2.0.0",
+		"@atlaskit/layering": "^0.4.0",
 		"@atlaskit/link-client-extension": "^2.1.0",
 		"@atlaskit/linking-common": "^5.11.0",
 		"@atlaskit/linking-types": "^9.0.0",
@@ -101,7 +102,7 @@
 		"@af/integration-testing": "*",
 		"@af/visual-regression": "*",
 		"@atlaskit/link-provider": "^1.14.0",
-		"@atlaskit/link-test-helpers": "^7.4.0",
+		"@atlaskit/link-test-helpers": "^7.5.0",
 		"@atlaskit/ssr": "*",
 		"@atlaskit/visual-regression": "*",
 		"@atlassian/feature-flags-test-utils": "^0.2.0",

package/dist/cjs/common/utils/response-item.js

@@ -1,18 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getResourceUrl = void 0;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var isLink = function isLink(data) {
-  return (0, _typeof2.default)(data) === 'object' && 'url' in data;
-};
-var getLinkTypeUrl = function getLinkTypeUrl(data) {
-  return isLink(data) ? data.url : undefined;
-};
-var getResourceUrl = exports.getResourceUrl = function getResourceUrl(data) {
-  var _data$key, _data$title;
-  return getLinkTypeUrl(data === null || data === void 0 || (_data$key = data['key']) === null || _data$key === void 0 ? void 0 : _data$key.data) || getLinkTypeUrl(data === null || data === void 0 || (_data$title = data['title']) === null || _data$title === void 0 ? void 0 : _data$title.data);
-};

package/dist/es2019/common/utils/response-item.js

@@ -1,6 +0,0 @@
-const isLink = data => typeof data === 'object' && 'url' in data;
-const getLinkTypeUrl = data => isLink(data) ? data.url : undefined;
-export const getResourceUrl = data => {
-  var _data$key, _data$title;
-  return getLinkTypeUrl(data === null || data === void 0 ? void 0 : (_data$key = data['key']) === null || _data$key === void 0 ? void 0 : _data$key.data) || getLinkTypeUrl(data === null || data === void 0 ? void 0 : (_data$title = data['title']) === null || _data$title === void 0 ? void 0 : _data$title.data);
-};

package/dist/esm/common/utils/response-item.js

@@ -1,11 +0,0 @@
-import _typeof from "@babel/runtime/helpers/typeof";
-var isLink = function isLink(data) {
-  return _typeof(data) === 'object' && 'url' in data;
-};
-var getLinkTypeUrl = function getLinkTypeUrl(data) {
-  return isLink(data) ? data.url : undefined;
-};
-export var getResourceUrl = function getResourceUrl(data) {
-  var _data$key, _data$title;
-  return getLinkTypeUrl(data === null || data === void 0 || (_data$key = data['key']) === null || _data$key === void 0 ? void 0 : _data$key.data) || getLinkTypeUrl(data === null || data === void 0 || (_data$title = data['title']) === null || _data$title === void 0 ? void 0 : _data$title.data);
-};

package/dist/types/common/utils/response-item.d.ts

@@ -1,2 +0,0 @@
-import type { DatasourceDataResponseItem } from '@atlaskit/linking-types';
-export declare const getResourceUrl: (data?: DatasourceDataResponseItem) => string | undefined;

package/dist/types-ts4.5/common/utils/response-item.d.ts

@@ -1,2 +0,0 @@
-import type { DatasourceDataResponseItem } from '@atlaskit/linking-types';
-export declare const getResourceUrl: (data?: DatasourceDataResponseItem) => string | undefined;