@atlaskit/link-datasource 6.13.5 → 6.13.6

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/link-datasource
 
+## 6.13.6
+
+### Patch Changes
+
+- [`808ffc3b50fc9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/808ffc3b50fc9) -
+  Show an error with column recovery instructions instead of indefinite loading when results have no
+  available columns, behind platform_datasource_missing_columns_error.
+- Updated dependencies
+
 ## 6.13.5
 
 ### Patch Changes

package/dist/cjs/ui/common/error-state/loading-error.js

@@ -12,14 +12,18 @@ var _react = _interopRequireWildcard(require("react"));
 var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _reactIntl = require("react-intl");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _link = _interopRequireDefault(require("@atlaskit/link/link"));
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _compiled = require("@atlaskit/primitives/compiled");
 var _analytics = require("../../../analytics");
 var _search = require("../../../common/ui/spot/error-state/search");
 var _messages = require("./messages");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+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 styles = {
   errorContainerStyles: "_zulppxbi _4cvr1h6o _6a6z1h6o _195g1wug _18zroahv _1rjcoahv _1e0c11p5 _p12f1kdj _y3gn1h6o",
   errorMessageContainerStyles: "_zulpu2gc _4cvr1h6o _6a6z1h6o _1e0c11p5",
@@ -33,20 +37,37 @@ var isJiraIssuesList = function isJiraIssuesList(url) {
 };
 var LoadingError = exports.LoadingError = function LoadingError(_ref) {
   var onRefresh = _ref.onRefresh,
-    url = _ref.url;
+    url = _ref.url,
+    _ref$errorType = _ref.errorType,
+    errorType = _ref$errorType === void 0 ? 'network' : _ref$errorType,
+    _ref$unavailableColum = _ref.unavailableColumnKeys,
+    unavailableColumnKeys = _ref$unavailableColum === void 0 ? [] : _ref$unavailableColum;
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
+  var effectiveErrorType = (0, _fg.fg)('platform_datasource_missing_columns_error') ? errorType : 'network';
   (0, _react.useEffect)(function () {
-    fireEvent('ui.error.shown', {
-      reason: 'network'
-    });
-  }, [fireEvent]);
-  var connectionErrorMessage = _messages.loadingErrorMessages.checkConnection;
-  if (url && isConfluenceSearch(url)) {
-    connectionErrorMessage = _messages.loadingErrorMessages.checkConnectionConfluence;
-  }
-  if (url && isJiraIssuesList(url)) {
-    connectionErrorMessage = _messages.loadingErrorMessages.checkConnectionJira;
+    if (effectiveErrorType !== 'missing-columns') {
+      fireEvent('ui.error.shown', {
+        reason: 'network'
+      });
+    }
+  }, [fireEvent, effectiveErrorType]);
+  var title = _messages.loadingErrorMessages.unableToLoadResults;
+  var description = _messages.loadingErrorMessages.checkConnection;
+  switch (effectiveErrorType) {
+    case 'missing-columns':
+      title = _messages.missingColumnsMessages.missingColumnsTitle;
+      description = unavailableColumnKeys.length ? _messages.missingColumnsMessages.missingColumnsDescriptionWithNames : _messages.missingColumnsMessages.missingColumnsDescription;
+      break;
+    case 'network':
+    default:
+      if (url && isConfluenceSearch(url)) {
+        description = _messages.loadingErrorMessages.checkConnectionConfluence;
+      }
+      if (url && isJiraIssuesList(url)) {
+        description = _messages.loadingErrorMessages.checkConnectionJira;
+      }
+      break;
   }
   return /*#__PURE__*/React.createElement("div", {
     contentEditable: false
@@ -61,18 +82,22 @@ var LoadingError = exports.LoadingError = function LoadingError(_ref) {
   }, /*#__PURE__*/React.createElement(_compiled.Inline, {
     as: "span",
     xcss: styles.errorMessageStyles
-  }, /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, _messages.loadingErrorMessages.unableToLoadResults)), /*#__PURE__*/React.createElement(_compiled.Text, {
+  }, /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, title)), /*#__PURE__*/React.createElement(_compiled.Text, {
     as: "p"
-  }, /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, (0, _extends2.default)({}, connectionErrorMessage, {
-    values: {
+  }, /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, (0, _extends2.default)({}, description, {
+    values: _objectSpread(_objectSpread({}, effectiveErrorType === 'missing-columns' ? {
+      columns: /*#__PURE__*/React.createElement(_reactIntl.FormattedList, {
+        value: unavailableColumnKeys
+      })
+    } : {}), {}, {
       a: function a(chunks) {
         return /*#__PURE__*/React.createElement(_link.default, {
           href: url || '',
           target: "blank"
         }, chunks);
       }
-    }
-  }))), onRefresh && /*#__PURE__*/React.createElement(_standardButton.default, {
+    })
+  }))), effectiveErrorType !== 'missing-columns' && onRefresh && /*#__PURE__*/React.createElement(_standardButton.default, {
     appearance: "primary",
     onClick: onRefresh
   }, /*#__PURE__*/React.createElement(_reactIntl.FormattedMessage, _messages.loadingErrorMessages.refresh)))));

package/dist/cjs/ui/common/error-state/messages.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.loadingErrorMessages = void 0;
+exports.missingColumnsMessages = exports.loadingErrorMessages = void 0;
 var _reactIntl = require("react-intl");
 var loadingErrorMessages = exports.loadingErrorMessages = (0, _reactIntl.defineMessages)({
   accessInstructionsDuplicate: {
@@ -122,4 +122,21 @@ var loadingErrorMessages = exports.loadingErrorMessages = (0, _reactIntl.defineM
     defaultMessage: 'Connect your {providerName} account to collaborate on work across Atlassian apps.',
     description: 'Description text to be displayed in the auth screen UI.'
   }
+});
+var missingColumnsMessages = exports.missingColumnsMessages = (0, _reactIntl.defineMessages)({
+  missingColumnsTitle: {
+    id: 'link-datasource.common.error-state.missingColumnsTitle',
+    description: 'Error title when results have loaded but no selected columns are available',
+    defaultMessage: "We can't display these columns"
+  },
+  missingColumnsDescription: {
+    id: 'link-datasource.common.error-state.missingColumnsDescription',
+    description: 'Instructions for recovering a table with no available selected columns',
+    defaultMessage: "The selected columns aren't available. Edit this table to select different columns."
+  },
+  missingColumnsDescriptionWithNames: {
+    id: 'link-datasource.common.error-state.missingColumnsDescriptionWithNames',
+    description: 'Instructions for recovering a table, with columns listing the unavailable saved column names or keys',
+    defaultMessage: "These columns aren't available: {columns}. Edit this table to select different columns."
+  }
 });

package/dist/cjs/ui/datasource-table-view/datasourceTableView.js

@@ -209,16 +209,26 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
       url: url
     });
   }
+  var loadingError;
   if (status === 'rejected') {
-    return /*#__PURE__*/React.createElement(_loadingError.LoadingError, {
+    loadingError = /*#__PURE__*/React.createElement(_loadingError.LoadingError, {
       onRefresh: handleErrorRefresh,
       url: url
     });
+    if (!(0, _fg.fg)('platform_datasource_missing_columns_error')) {
+      return loadingError;
+    }
+  } else if ((0, _fg.fg)('platform_datasource_missing_columns_error') && status === 'resolved' && !hasColumns) {
+    loadingError = /*#__PURE__*/React.createElement(_loadingError.LoadingError, {
+      errorType: "missing-columns",
+      unavailableColumnKeys: visibleColumnKeys !== null && visibleColumnKeys !== void 0 && visibleColumnKeys.length ? visibleColumnKeys : defaultVisibleColumnKeys,
+      url: url
+    });
   }
   return /*#__PURE__*/React.createElement(_main.default, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
-  }, /*#__PURE__*/React.createElement("div", {
+  }, loadingError || /*#__PURE__*/React.createElement("div", {
     className: (0, _runtime.ax)(["_2rko1kw7", "datasource-table"])
   }, hasColumns ? /*#__PURE__*/React.createElement(_issueLikeDataTableView.IssueLikeDataTableView, (0, _extends2.default)({
     testId: 'datasource-table-view',

package/dist/es2019/ui/common/error-state/loading-error.js

@@ -4,13 +4,14 @@ import "./loading-error.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 import { useEffect } from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedList, FormattedMessage } from 'react-intl';
 import Button from '@atlaskit/button/standard-button';
 import AKLink from '@atlaskit/link/link';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Box, Inline, Text } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { SpotErrorSearch } from '../../../common/ui/spot/error-state/search';
-import { loadingErrorMessages } from './messages';
+import { loadingErrorMessages, missingColumnsMessages } from './messages';
 const styles = {
   errorContainerStyles: "_zulppxbi _4cvr1h6o _6a6z1h6o _195g1wug _18zroahv _1rjcoahv _1e0c11p5 _p12f1kdj _y3gn1h6o",
   errorMessageContainerStyles: "_zulpu2gc _4cvr1h6o _6a6z1h6o _1e0c11p5",
@@ -20,22 +21,37 @@ const isConfluenceSearch = url => !!url.match(/https:\/\/.*\/wiki\/search/);
 const isJiraIssuesList = url => !!url.match(/https:\/\/.*\/issues\/?\?jql=/);
 export const LoadingError = ({
   onRefresh,
-  url
+  url,
+  errorType = 'network',
+  unavailableColumnKeys = []
 }) => {
   const {
     fireEvent
   } = useDatasourceAnalyticsEvents();
+  const effectiveErrorType = fg('platform_datasource_missing_columns_error') ? errorType : 'network';
   useEffect(() => {
-    fireEvent('ui.error.shown', {
-      reason: 'network'
-    });
-  }, [fireEvent]);
-  let connectionErrorMessage = loadingErrorMessages.checkConnection;
-  if (url && isConfluenceSearch(url)) {
-    connectionErrorMessage = loadingErrorMessages.checkConnectionConfluence;
-  }
-  if (url && isJiraIssuesList(url)) {
-    connectionErrorMessage = loadingErrorMessages.checkConnectionJira;
+    if (effectiveErrorType !== 'missing-columns') {
+      fireEvent('ui.error.shown', {
+        reason: 'network'
+      });
+    }
+  }, [fireEvent, effectiveErrorType]);
+  let title = loadingErrorMessages.unableToLoadResults;
+  let description = loadingErrorMessages.checkConnection;
+  switch (effectiveErrorType) {
+    case 'missing-columns':
+      title = missingColumnsMessages.missingColumnsTitle;
+      description = unavailableColumnKeys.length ? missingColumnsMessages.missingColumnsDescriptionWithNames : missingColumnsMessages.missingColumnsDescription;
+      break;
+    case 'network':
+    default:
+      if (url && isConfluenceSearch(url)) {
+        description = loadingErrorMessages.checkConnectionConfluence;
+      }
+      if (url && isJiraIssuesList(url)) {
+        description = loadingErrorMessages.checkConnectionJira;
+      }
+      break;
   }
   return /*#__PURE__*/React.createElement("div", {
     contentEditable: false
@@ -50,16 +66,21 @@ export const LoadingError = ({
   }, /*#__PURE__*/React.createElement(Inline, {
     as: "span",
     xcss: styles.errorMessageStyles
-  }, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.unableToLoadResults)), /*#__PURE__*/React.createElement(Text, {
+  }, /*#__PURE__*/React.createElement(FormattedMessage, title)), /*#__PURE__*/React.createElement(Text, {
     as: "p"
-  }, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, connectionErrorMessage, {
+  }, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, description, {
     values: {
+      ...(effectiveErrorType === 'missing-columns' ? {
+        columns: /*#__PURE__*/React.createElement(FormattedList, {
+          value: unavailableColumnKeys
+        })
+      } : {}),
       a: chunks => /*#__PURE__*/React.createElement(AKLink, {
         href: url || '',
         target: "blank"
       }, chunks)
     }
-  }))), onRefresh && /*#__PURE__*/React.createElement(Button, {
+  }))), effectiveErrorType !== 'missing-columns' && onRefresh && /*#__PURE__*/React.createElement(Button, {
     appearance: "primary",
     onClick: onRefresh
   }, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.refresh)))));

package/dist/es2019/ui/common/error-state/messages.js

@@ -116,4 +116,21 @@ export const loadingErrorMessages = defineMessages({
     defaultMessage: 'Connect your {providerName} account to collaborate on work across Atlassian apps.',
     description: 'Description text to be displayed in the auth screen UI.'
   }
+});
+export const missingColumnsMessages = defineMessages({
+  missingColumnsTitle: {
+    id: 'link-datasource.common.error-state.missingColumnsTitle',
+    description: 'Error title when results have loaded but no selected columns are available',
+    defaultMessage: "We can't display these columns"
+  },
+  missingColumnsDescription: {
+    id: 'link-datasource.common.error-state.missingColumnsDescription',
+    description: 'Instructions for recovering a table with no available selected columns',
+    defaultMessage: "The selected columns aren't available. Edit this table to select different columns."
+  },
+  missingColumnsDescriptionWithNames: {
+    id: 'link-datasource.common.error-state.missingColumnsDescriptionWithNames',
+    description: 'Instructions for recovering a table, with columns listing the unavailable saved column names or keys',
+    defaultMessage: "These columns aren't available: {columns}. Edit this table to select different columns."
+  }
 });

package/dist/es2019/ui/datasource-table-view/datasourceTableView.js

@@ -194,16 +194,26 @@ const DatasourceTableViewWithoutAnalytics = ({
       url: url
     });
   }
+  let loadingError;
   if (status === 'rejected') {
-    return /*#__PURE__*/React.createElement(LoadingError, {
+    loadingError = /*#__PURE__*/React.createElement(LoadingError, {
       onRefresh: handleErrorRefresh,
       url: url
     });
+    if (!fg('platform_datasource_missing_columns_error')) {
+      return loadingError;
+    }
+  } else if (fg('platform_datasource_missing_columns_error') && status === 'resolved' && !hasColumns) {
+    loadingError = /*#__PURE__*/React.createElement(LoadingError, {
+      errorType: "missing-columns",
+      unavailableColumnKeys: visibleColumnKeys !== null && visibleColumnKeys !== void 0 && visibleColumnKeys.length ? visibleColumnKeys : defaultVisibleColumnKeys,
+      url: url
+    });
   }
   return /*#__PURE__*/React.createElement(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
-  }, /*#__PURE__*/React.createElement("div", {
+  }, loadingError || /*#__PURE__*/React.createElement("div", {
     className: ax(["_2rko1kw7", "datasource-table"])
   }, hasColumns ? /*#__PURE__*/React.createElement(IssueLikeDataTableView, _extends({
     testId: 'datasource-table-view',

package/dist/esm/ui/common/error-state/loading-error.js

@@ -1,16 +1,20 @@
 /* loading-error.tsx generated by @compiled/babel-plugin v3.0.1 */
 import _extends from "@babel/runtime/helpers/extends";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import "./loading-error.compiled.css";
 import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
+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 { useEffect } from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedList, FormattedMessage } from 'react-intl';
 import Button from '@atlaskit/button/standard-button';
 import AKLink from '@atlaskit/link/link';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { Box, Inline, Text } from '@atlaskit/primitives/compiled';
 import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { SpotErrorSearch } from '../../../common/ui/spot/error-state/search';
-import { loadingErrorMessages } from './messages';
+import { loadingErrorMessages, missingColumnsMessages } from './messages';
 var styles = {
   errorContainerStyles: "_zulppxbi _4cvr1h6o _6a6z1h6o _195g1wug _18zroahv _1rjcoahv _1e0c11p5 _p12f1kdj _y3gn1h6o",
   errorMessageContainerStyles: "_zulpu2gc _4cvr1h6o _6a6z1h6o _1e0c11p5",
@@ -24,20 +28,37 @@ var isJiraIssuesList = function isJiraIssuesList(url) {
 };
 export var LoadingError = function LoadingError(_ref) {
   var onRefresh = _ref.onRefresh,
-    url = _ref.url;
+    url = _ref.url,
+    _ref$errorType = _ref.errorType,
+    errorType = _ref$errorType === void 0 ? 'network' : _ref$errorType,
+    _ref$unavailableColum = _ref.unavailableColumnKeys,
+    unavailableColumnKeys = _ref$unavailableColum === void 0 ? [] : _ref$unavailableColum;
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
+  var effectiveErrorType = fg('platform_datasource_missing_columns_error') ? errorType : 'network';
   useEffect(function () {
-    fireEvent('ui.error.shown', {
-      reason: 'network'
-    });
-  }, [fireEvent]);
-  var connectionErrorMessage = loadingErrorMessages.checkConnection;
-  if (url && isConfluenceSearch(url)) {
-    connectionErrorMessage = loadingErrorMessages.checkConnectionConfluence;
-  }
-  if (url && isJiraIssuesList(url)) {
-    connectionErrorMessage = loadingErrorMessages.checkConnectionJira;
+    if (effectiveErrorType !== 'missing-columns') {
+      fireEvent('ui.error.shown', {
+        reason: 'network'
+      });
+    }
+  }, [fireEvent, effectiveErrorType]);
+  var title = loadingErrorMessages.unableToLoadResults;
+  var description = loadingErrorMessages.checkConnection;
+  switch (effectiveErrorType) {
+    case 'missing-columns':
+      title = missingColumnsMessages.missingColumnsTitle;
+      description = unavailableColumnKeys.length ? missingColumnsMessages.missingColumnsDescriptionWithNames : missingColumnsMessages.missingColumnsDescription;
+      break;
+    case 'network':
+    default:
+      if (url && isConfluenceSearch(url)) {
+        description = loadingErrorMessages.checkConnectionConfluence;
+      }
+      if (url && isJiraIssuesList(url)) {
+        description = loadingErrorMessages.checkConnectionJira;
+      }
+      break;
   }
   return /*#__PURE__*/React.createElement("div", {
     contentEditable: false
@@ -52,18 +73,22 @@ export var LoadingError = function LoadingError(_ref) {
   }, /*#__PURE__*/React.createElement(Inline, {
     as: "span",
     xcss: styles.errorMessageStyles
-  }, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.unableToLoadResults)), /*#__PURE__*/React.createElement(Text, {
+  }, /*#__PURE__*/React.createElement(FormattedMessage, title)), /*#__PURE__*/React.createElement(Text, {
     as: "p"
-  }, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, connectionErrorMessage, {
-    values: {
+  }, /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, description, {
+    values: _objectSpread(_objectSpread({}, effectiveErrorType === 'missing-columns' ? {
+      columns: /*#__PURE__*/React.createElement(FormattedList, {
+        value: unavailableColumnKeys
+      })
+    } : {}), {}, {
       a: function a(chunks) {
         return /*#__PURE__*/React.createElement(AKLink, {
           href: url || '',
           target: "blank"
         }, chunks);
       }
-    }
-  }))), onRefresh && /*#__PURE__*/React.createElement(Button, {
+    })
+  }))), effectiveErrorType !== 'missing-columns' && onRefresh && /*#__PURE__*/React.createElement(Button, {
     appearance: "primary",
     onClick: onRefresh
   }, /*#__PURE__*/React.createElement(FormattedMessage, loadingErrorMessages.refresh)))));

package/dist/esm/ui/common/error-state/messages.js

@@ -116,4 +116,21 @@ export var loadingErrorMessages = defineMessages({
     defaultMessage: 'Connect your {providerName} account to collaborate on work across Atlassian apps.',
     description: 'Description text to be displayed in the auth screen UI.'
   }
+});
+export var missingColumnsMessages = defineMessages({
+  missingColumnsTitle: {
+    id: 'link-datasource.common.error-state.missingColumnsTitle',
+    description: 'Error title when results have loaded but no selected columns are available',
+    defaultMessage: "We can't display these columns"
+  },
+  missingColumnsDescription: {
+    id: 'link-datasource.common.error-state.missingColumnsDescription',
+    description: 'Instructions for recovering a table with no available selected columns',
+    defaultMessage: "The selected columns aren't available. Edit this table to select different columns."
+  },
+  missingColumnsDescriptionWithNames: {
+    id: 'link-datasource.common.error-state.missingColumnsDescriptionWithNames',
+    description: 'Instructions for recovering a table, with columns listing the unavailable saved column names or keys',
+    defaultMessage: "These columns aren't available: {columns}. Edit this table to select different columns."
+  }
 });

package/dist/esm/ui/datasource-table-view/datasourceTableView.js

@@ -200,16 +200,26 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
       url: url
     });
   }
+  var loadingError;
   if (status === 'rejected') {
-    return /*#__PURE__*/React.createElement(LoadingError, {
+    loadingError = /*#__PURE__*/React.createElement(LoadingError, {
       onRefresh: handleErrorRefresh,
       url: url
     });
+    if (!fg('platform_datasource_missing_columns_error')) {
+      return loadingError;
+    }
+  } else if (fg('platform_datasource_missing_columns_error') && status === 'resolved' && !hasColumns) {
+    loadingError = /*#__PURE__*/React.createElement(LoadingError, {
+      errorType: "missing-columns",
+      unavailableColumnKeys: visibleColumnKeys !== null && visibleColumnKeys !== void 0 && visibleColumnKeys.length ? visibleColumnKeys : defaultVisibleColumnKeys,
+      url: url
+    });
   }
   return /*#__PURE__*/React.createElement(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
-  }, /*#__PURE__*/React.createElement("div", {
+  }, loadingError || /*#__PURE__*/React.createElement("div", {
     className: ax(["_2rko1kw7", "datasource-table"])
   }, hasColumns ? /*#__PURE__*/React.createElement(IssueLikeDataTableView, _extends({
     testId: 'datasource-table-view',

package/dist/types/ui/common/error-state/loading-error.d.ts

@@ -1,6 +1,8 @@
 interface LoadingErrorProps {
+    errorType?: 'network' | 'missing-columns';
     onRefresh?: () => void;
+    unavailableColumnKeys?: string[];
     url?: string;
 }
-export declare const LoadingError: ({ onRefresh, url }: LoadingErrorProps) => JSX.Element;
+export declare const LoadingError: ({ onRefresh, url, errorType, unavailableColumnKeys, }: LoadingErrorProps) => JSX.Element;
 export {};

package/dist/types/ui/common/error-state/messages.d.ts

@@ -1,112 +1,117 @@
 export declare const loadingErrorMessages: {
-    accessInstructionsDuplicate: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
     accessInstructions: {
-        id: string;
-        description: string;
         defaultMessage: string;
-    };
-    accessRequiredDuplicate: {
-        id: string;
         description: string;
+        id: string;
+    };
+    accessInstructionsDuplicate: {
         defaultMessage: string;
+        description: string;
+        id: string;
     };
     accessRequired: {
-        id: string;
+        defaultMessage: string;
         description: string;
+        id: string;
+    };
+    accessRequiredDuplicate: {
         defaultMessage: string;
+        description: string;
+        id: string;
     };
     accessRequiredWithSite: {
+        defaultMessage: string;
+        description: string;
         id: string;
+    };
+    authConnectButtonText: {
+        defaultMessage: string;
         description: string;
+        id: string;
+    };
+    authScreenDescriptionText: {
         defaultMessage: string;
+        description: string;
+        id: string;
     };
-    checkConnectionDuplicate: {
+    authScreenDescriptionTextAppify: {
+        defaultMessage: string;
+        description: string;
         id: string;
+    };
+    authScreenHeaderText: {
+        defaultMessage: string;
         description: string;
+        id: string;
+    };
+    checkConnection: {
         defaultMessage: string;
+        description: string;
+        id: string;
     };
     checkConnectionConfluence: {
-        id: string;
+        defaultMessage: string;
         description: string;
+        id: string;
+    };
+    checkConnectionDuplicate: {
         defaultMessage: string;
+        description: string;
+        id: string;
     };
     checkConnectionJira: {
-        id: string;
-        description: string;
         defaultMessage: string;
-    };
-    checkConnection: {
-        id: string;
         description: string;
-        defaultMessage: string;
-    };
-    noResultsFound: {
         id: string;
-        description: string;
-        defaultMessage: string;
     };
-    noResultsFoundDescription: {
-        id: string;
-        description: string;
+    learnMoreAboutSmartLinks: {
         defaultMessage: string;
-    };
-    refreshDuplicate: {
-        id: string;
         description: string;
-        defaultMessage: string;
-    };
-    refresh: {
         id: string;
-        description: string;
-        defaultMessage: string;
     };
-    unableToLoadItemsDuplicate: {
-        id: string;
-        description: string;
+    noAccessToJiraSitesDescription: {
         defaultMessage: string;
-    };
-    unableToLoadResults: {
-        id: string;
         description: string;
-        defaultMessage: string;
+        id: string;
     };
     noAccessToJiraSitesTitle: {
-        id: string;
-        description: string;
         defaultMessage: string;
-    };
-    noAccessToJiraSitesDescription: {
-        id: string;
         description: string;
-        defaultMessage: string;
-    };
-    authScreenHeaderText: {
         id: string;
+    };
+    noResultsFound: {
         defaultMessage: string;
         description: string;
-    };
-    authScreenDescriptionText: {
         id: string;
+    };
+    noResultsFoundDescription: {
         defaultMessage: string;
         description: string;
-    };
-    learnMoreAboutSmartLinks: {
         id: string;
+    };
+    refresh: {
         defaultMessage: string;
         description: string;
-    };
-    authConnectButtonText: {
         id: string;
+    };
+    refreshDuplicate: {
         defaultMessage: string;
         description: string;
+        id: string;
     };
-    authScreenDescriptionTextAppify: {
+    unableToLoadItemsDuplicate: {
+        defaultMessage: string;
+        description: string;
         id: string;
+    };
+    unableToLoadResults: {
         defaultMessage: string;
         description: string;
+        id: string;
     };
 };
+export declare const missingColumnsMessages: Record<'missingColumnsDescription' | 'missingColumnsDescriptionWithNames' | 'missingColumnsTitle', {
+    defaultMessage: string;
+    description: string;
+    id: string;
+}>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "6.13.5",
+	"version": "6.13.6",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -146,6 +146,9 @@
 		"platform_datasource_sync_info_boundary_updates": {
 			"type": "boolean"
 		},
+		"platform_datasource_missing_columns_error": {
+			"type": "boolean"
+		},
 		"platform_navx_3298_message_wrapper": {
 			"type": "boolean"
 		},