@atlaskit/link-datasource 1.0.2 → 1.0.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-datasource
 
+## 1.0.3
+
+### Patch Changes
+
+- [`513a4e98543`](https://bitbucket.org/atlassian/atlassian-frontend/commits/513a4e98543) - [ux] links will now fallback to rendering as an anchor if smart-card fails to resolve
+
 ## 1.0.2
 
 ### Patch Changes

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fallbackRenderType = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _boolean = _interopRequireDefault(require("./boolean"));
 var _dateTime = _interopRequireDefault(require("./date-time"));
@@ -17,7 +18,7 @@ var _tag = _interopRequireDefault(require("./tag"));
 var _text = _interopRequireDefault(require("./text"));
 var _user = _interopRequireDefault(require("./user"));
 var fallbackRenderType = function fallbackRenderType(item) {
-  var _item$value, _item$value2;
+  var _item$value, _item$value2, _item$value3;
   switch (item.type) {
     case 'boolean':
       return /*#__PURE__*/_react.default.createElement(_boolean.default, {
@@ -36,7 +37,9 @@ var fallbackRenderType = function fallbackRenderType(item) {
     case 'icon':
       return /*#__PURE__*/_react.default.createElement(_icon.default, item.value);
     case 'link':
-      return /*#__PURE__*/_react.default.createElement(_link.default, item.value);
+      return /*#__PURE__*/_react.default.createElement(_link.default, (0, _extends2.default)({
+        key: (_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.url
+      }, item.value));
     case 'number':
       return /*#__PURE__*/_react.default.createElement(_number.default, {
         number: item.value
@@ -49,7 +52,7 @@ var fallbackRenderType = function fallbackRenderType(item) {
       });
     case 'tag':
       return /*#__PURE__*/_react.default.createElement(_tag.default, {
-        key: ((_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.id) || ((_item$value2 = item.value) === null || _item$value2 === void 0 ? void 0 : _item$value2.text),
+        key: ((_item$value2 = item.value) === null || _item$value2 === void 0 ? void 0 : _item$value2.id) || ((_item$value3 = item.value) === null || _item$value3 === void 0 ? void 0 : _item$value3.text),
         tag: item.value
       });
     case 'time':

package/dist/cjs/ui/issue-like-table/render-type/link/index.js

@@ -8,7 +8,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.LINK_TYPE_TEST_ID = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
-var _reactErrorBoundary = require("react-error-boundary");
 var _smartCard = require("@atlaskit/smart-card");
 var _linkUrl = _interopRequireDefault(require("@atlaskit/smart-card/link-url"));
 var _colors = require("@atlaskit/theme/colors");
@@ -44,14 +43,20 @@ var LinkRenderType = function LinkRenderType(_ref) {
     }, text || url);
   }, [linkStyle, url, text, testId]);
   var SmartCard = function SmartCard() {
-    return /*#__PURE__*/_react.default.createElement(_reactErrorBoundary.ErrorBoundary, {
-      fallback: anchor
-    }, /*#__PURE__*/_react.default.createElement(_smartCard.Card, {
+    return /*#__PURE__*/_react.default.createElement(_smartCard.Card, {
       appearance: "inline",
       url: url,
-      testId: testId
-    }));
+      testId: testId,
+      fallbackComponent: function fallbackComponent() {
+        return anchor;
+      }
+    });
   };
+
+  // url can be undefined before data is fetched whilst adding new link column to display
+  if (!url) {
+    return null;
+  }
   return text ? anchor : /*#__PURE__*/_react.default.createElement(SmartCard, null);
 };
 var _default = /*#__PURE__*/_react.default.memo(LinkRenderType);

package/dist/cjs/ui/jira-issues-modal/modal/index.js

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

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

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import BooleanRenderType from './boolean';
 import DateTimeRenderType from './date-time';
@@ -10,7 +11,7 @@ import TagRenderType from './tag';
 import StringRenderType from './text';
 import UserRenderType from './user';
 export const fallbackRenderType = item => {
-  var _item$value, _item$value2;
+  var _item$value, _item$value2, _item$value3;
   switch (item.type) {
     case 'boolean':
       return /*#__PURE__*/React.createElement(BooleanRenderType, {
@@ -29,7 +30,9 @@ export const fallbackRenderType = item => {
     case 'icon':
       return /*#__PURE__*/React.createElement(IconRenderType, item.value);
     case 'link':
-      return /*#__PURE__*/React.createElement(LinkRenderType, item.value);
+      return /*#__PURE__*/React.createElement(LinkRenderType, _extends({
+        key: (_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.url
+      }, item.value));
     case 'number':
       return /*#__PURE__*/React.createElement(NumberRenderType, {
         number: item.value
@@ -42,7 +45,7 @@ export const fallbackRenderType = item => {
       });
     case 'tag':
       return /*#__PURE__*/React.createElement(TagRenderType, {
-        key: ((_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.id) || ((_item$value2 = item.value) === null || _item$value2 === void 0 ? void 0 : _item$value2.text),
+        key: ((_item$value2 = item.value) === null || _item$value2 === void 0 ? void 0 : _item$value2.id) || ((_item$value3 = item.value) === null || _item$value3 === void 0 ? void 0 : _item$value3.text),
         tag: item.value
       });
     case 'time':

package/dist/es2019/ui/issue-like-table/render-type/link/index.js

@@ -1,5 +1,4 @@
 import React, { useMemo } from 'react';
-import { ErrorBoundary } from 'react-error-boundary';
 import { Card } from '@atlaskit/smart-card';
 import LinkUrl from '@atlaskit/smart-card/link-url';
 import { N300 } from '@atlaskit/theme/colors';
@@ -28,13 +27,17 @@ const LinkRenderType = ({
     "data-testid": testId,
     target: "_blank"
   }, text || url), [linkStyle, url, text, testId]);
-  const SmartCard = () => /*#__PURE__*/React.createElement(ErrorBoundary, {
-    fallback: anchor
-  }, /*#__PURE__*/React.createElement(Card, {
+  const SmartCard = () => /*#__PURE__*/React.createElement(Card, {
     appearance: "inline",
     url: url,
-    testId: testId
-  }));
+    testId: testId,
+    fallbackComponent: () => anchor
+  });
+
+  // url can be undefined before data is fetched whilst adding new link column to display
+  if (!url) {
+    return null;
+  }
   return text ? anchor : /*#__PURE__*/React.createElement(SmartCard, null);
 };
 export default /*#__PURE__*/React.memo(LinkRenderType);

package/dist/es2019/ui/jira-issues-modal/modal/index.js

@@ -290,7 +290,7 @@ const analyticsContextAttributes = {
 };
 const analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.0.2",
+  packageVersion: "1.0.3",
   source: 'datasourceConfigModal'
 };
 const contextData = {

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

@@ -1,3 +1,4 @@
+import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
 import BooleanRenderType from './boolean';
 import DateTimeRenderType from './date-time';
@@ -10,7 +11,7 @@ import TagRenderType from './tag';
 import StringRenderType from './text';
 import UserRenderType from './user';
 export var fallbackRenderType = function fallbackRenderType(item) {
-  var _item$value, _item$value2;
+  var _item$value, _item$value2, _item$value3;
   switch (item.type) {
     case 'boolean':
       return /*#__PURE__*/React.createElement(BooleanRenderType, {
@@ -29,7 +30,9 @@ export var fallbackRenderType = function fallbackRenderType(item) {
     case 'icon':
       return /*#__PURE__*/React.createElement(IconRenderType, item.value);
     case 'link':
-      return /*#__PURE__*/React.createElement(LinkRenderType, item.value);
+      return /*#__PURE__*/React.createElement(LinkRenderType, _extends({
+        key: (_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.url
+      }, item.value));
     case 'number':
       return /*#__PURE__*/React.createElement(NumberRenderType, {
         number: item.value
@@ -42,7 +45,7 @@ export var fallbackRenderType = function fallbackRenderType(item) {
       });
     case 'tag':
       return /*#__PURE__*/React.createElement(TagRenderType, {
-        key: ((_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.id) || ((_item$value2 = item.value) === null || _item$value2 === void 0 ? void 0 : _item$value2.text),
+        key: ((_item$value2 = item.value) === null || _item$value2 === void 0 ? void 0 : _item$value2.id) || ((_item$value3 = item.value) === null || _item$value3 === void 0 ? void 0 : _item$value3.text),
         tag: item.value
       });
     case 'time':

package/dist/esm/ui/issue-like-table/render-type/link/index.js

@@ -2,7 +2,6 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import React, { useMemo } from 'react';
-import { ErrorBoundary } from 'react-error-boundary';
 import { Card } from '@atlaskit/smart-card';
 import LinkUrl from '@atlaskit/smart-card/link-url';
 import { N300 } from '@atlaskit/theme/colors';
@@ -33,14 +32,20 @@ var LinkRenderType = function LinkRenderType(_ref) {
     }, text || url);
   }, [linkStyle, url, text, testId]);
   var SmartCard = function SmartCard() {
-    return /*#__PURE__*/React.createElement(ErrorBoundary, {
-      fallback: anchor
-    }, /*#__PURE__*/React.createElement(Card, {
+    return /*#__PURE__*/React.createElement(Card, {
       appearance: "inline",
       url: url,
-      testId: testId
-    }));
+      testId: testId,
+      fallbackComponent: function fallbackComponent() {
+        return anchor;
+      }
+    });
   };
+
+  // url can be undefined before data is fetched whilst adding new link column to display
+  if (!url) {
+    return null;
+  }
   return text ? anchor : /*#__PURE__*/React.createElement(SmartCard, null);
 };
 export default /*#__PURE__*/React.memo(LinkRenderType);

package/dist/esm/ui/jira-issues-modal/modal/index.js

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

package/dist/types/ui/issue-like-table/render-type/link/index.d.ts

@@ -4,5 +4,5 @@ interface LinkProps extends Link {
     testId?: string;
 }
 export declare const LINK_TYPE_TEST_ID = "link-datasource-render-type--link";
-declare const _default: React.MemoExoticComponent<({ style, url, text, testId, }: LinkProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ style, url, text, testId, }: LinkProps) => JSX.Element | null>;
 export default _default;

package/dist/types-ts4.5/ui/issue-like-table/render-type/link/index.d.ts

@@ -4,5 +4,5 @@ interface LinkProps extends Link {
     testId?: string;
 }
 export declare const LINK_TYPE_TEST_ID = "link-datasource-render-type--link";
-declare const _default: React.MemoExoticComponent<({ style, url, text, testId, }: LinkProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ style, url, text, testId, }: LinkProps) => JSX.Element | null>;
 export default _default;

package/examples-helpers/smartLinkCustomClient.ts

@@ -1,6 +1,7 @@
 import { JsonLd } from 'json-ld-types';
 
 import { CardClient } from '@atlaskit/link-provider';
+import { APIError } from '@atlaskit/linking-common';
 
 import { mockJqlSmartLinkData } from './mockJqlSmartLinkData';
 import { mocks } from './mockSmartLinkData';
@@ -15,6 +16,13 @@ class SmartLinkClient extends CardClient {
         return Promise.resolve(mocks.resolved);
       case 'https://link-that-does-not-resolve.com':
         return Promise.reject(`Can't resolve from ${url}`);
+      case 'https://link-that-is-unsupported.com':
+        throw new APIError(
+          'fatal',
+          new URL(url).hostname,
+          'received unsupported error',
+          'ResolveUnsupportedError',
+        );
       case jqlUrlRegExp.test(url) ? url : undefined:
         return Promise.resolve(mockJqlSmartLinkData.resolved);
       default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -66,7 +66,6 @@
     "@emotion/styled": "^11.0.0",
     "debounce-promise": "^3.1.2",
     "react-dom": "^16.8.0",
-    "react-error-boundary": "^3.1.3",
     "tiny-invariant": "^1.2.0"
   },
   "peerDependencies": {