@atlaskit/smart-card 23.9.0 → 23.9.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/smart-card
 
+## 23.9.1
+
+### Patch Changes
+
+- [`484be3ed430`](https://bitbucket.org/atlassian/atlassian-frontend/commits/484be3ed430) - This adds onResolve back to Flexible Block Card
+
 ## 23.9.0
 
 ### Minor Changes

package/dist/cjs/utils/mocks.js

@@ -139,6 +139,25 @@ var mocks = {
       url: 'https://some.url'
     }
   },
+  forbiddenWithNoAuth: {
+    meta: {
+      visibility: 'restricted',
+      access: 'forbidden',
+      auth: [],
+      definitionId: 'd1',
+      key: 'object-provider'
+    },
+    data: {
+      '@context': {
+        '@vocab': 'https://www.w3.org/ns/activitystreams#',
+        atlassian: 'https://schema.atlassian.com/ns/vocabulary#',
+        schema: 'http://schema.org/'
+      },
+      '@type': 'Object',
+      name: 'I love cheese',
+      url: 'https://some.url'
+    }
+  },
   unauthorized: {
     meta: {
       visibility: 'restricted',
@@ -162,6 +181,25 @@ var mocks = {
       url: 'https://some.url'
     }
   },
+  unauthorizedWithNoAuth: {
+    meta: {
+      visibility: 'restricted',
+      access: 'unauthorized',
+      auth: [],
+      definitionId: 'd1',
+      key: 'object-provider'
+    },
+    data: {
+      '@context': {
+        '@vocab': 'https://www.w3.org/ns/activitystreams#',
+        atlassian: 'https://schema.atlassian.com/ns/vocabulary#',
+        schema: 'http://schema.org/'
+      },
+      '@type': 'Object',
+      name: 'I love cheese',
+      url: 'https://some.url'
+    }
+  },
   actionSuccess: {
     meta: {
       visibility: 'public',

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "23.9.0",
+	"version": "23.9.1",
 	"sideEffects": false
 }

package/dist/cjs/view/BlockCard/actions/flexible/AuthorizeAction.js

@@ -32,7 +32,8 @@ var AuthorizeAction = function AuthorizeAction(onAuthorize, providerName) {
         context: providerName
       }
     })) : /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.messages.connect_link_account_card),
-    onClick: onAuthorize
+    onClick: onAuthorize,
+    testId: 'smart-action-connect-account'
   };
 };
 

package/dist/cjs/view/BlockCard/actions/flexible/ForbiddenAction.js

@@ -33,7 +33,8 @@ var ForbiddenAction = function ForbiddenAction(onClick, content, context) {
         context: context
       }
     })),
-    onClick: onClick
+    onClick: onClick,
+    testId: 'smart-action-connect-other-account'
   };
 };
 

package/dist/cjs/view/BlockCard/actions/flexible/RetryAction.js

@@ -25,7 +25,8 @@ var RetryAction = function RetryAction(onRetry) {
   return {
     name: _constants.ActionName.CustomAction,
     onClick: onRetry,
-    content: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.messages.try_again)
+    content: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.messages.try_again),
+    testId: 'smart-action-try-again'
   };
 };
 

package/dist/cjs/view/BlockCard/index.js

@@ -153,6 +153,7 @@ var BlockCard = function BlockCard(_ref) {
       url: url,
       testId: testId,
       onError: onError,
+      onResolve: onResolve,
       renderers: renderers,
       ui: ui,
       analytics: analytics,
@@ -162,6 +163,12 @@ var BlockCard = function BlockCard(_ref) {
     switch (status) {
       case 'pending':
       case 'resolving':
+        return (0, _react.jsx)("div", {
+          css: flexibleBlockCardElevationStyle
+        }, (0, _react.jsx)(_FlexibleResolvedView.default, (0, _extends2.default)({}, flexibleProps, {
+          testId: 'smart-block-resolving-view'
+        })));
+
       case 'resolved':
         return (0, _react.jsx)("div", {
           css: flexibleBlockCardElevationStyle
@@ -190,6 +197,23 @@ var BlockCard = function BlockCard(_ref) {
 
       case 'fallback':
       case 'errored':
+      default:
+        if (onError) {
+          onError({
+            url: url,
+            status: status
+          });
+        }
+
+        if (authFlow && authFlow === 'disabled') {
+          return (0, _react.jsx)(_LinkView.CardLinkView, {
+            link: url,
+            isSelected: isSelected,
+            onClick: handleFrameClick,
+            testId: "".concat(testId, "-").concat(status)
+          });
+        }
+
         return (0, _react.jsx)("div", {
           css: flexibleBlockCardElevationStyle
         }, (0, _react.jsx)(_FlexibleErroredView.default, (0, _extends2.default)({}, flexibleProps, {

package/dist/cjs/view/BlockCard/views/flexible/FlexibleResolvedView.js

@@ -37,6 +37,7 @@ var FlexibleResolvedView = function FlexibleResolvedView(_ref) {
       cardState = _ref.cardState,
       onClick = _ref.onClick,
       onError = _ref.onError,
+      onResolve = _ref.onResolve,
       _ref$testId = _ref.testId,
       testId = _ref$testId === void 0 ? 'smart-block-resolved-view' : _ref$testId,
       ui = _ref.ui,
@@ -63,6 +64,7 @@ var FlexibleResolvedView = function FlexibleResolvedView(_ref) {
     cardState: cardState,
     onClick: onClick,
     onError: onError,
+    onResolve: onResolve,
     testId: testId,
     ui: ui,
     url: url
@@ -98,7 +100,7 @@ var FlexibleResolvedView = function FlexibleResolvedView(_ref) {
       name: _constants.ElementName.DueOn
     }],
     maxLines: 1
-  }), /*#__PURE__*/_react.default.createElement(_blocks.MetadataBlock, null), /*#__PURE__*/_react.default.createElement(_blocks.SnippetBlock, null), !isPreviewBlockErrored ? /*#__PURE__*/_react.default.createElement(_blocks.PreviewBlock, {
+  }), /*#__PURE__*/_react.default.createElement(_blocks.SnippetBlock, null), !isPreviewBlockErrored ? /*#__PURE__*/_react.default.createElement(_blocks.PreviewBlock, {
     placement: _constants.MediaPlacement.Right,
     ignoreContainerPadding: true,
     onError: function onError() {

package/dist/es2019/utils/mocks.js

@@ -107,6 +107,25 @@ export const mocks = {
       url: 'https://some.url'
     }
   },
+  forbiddenWithNoAuth: {
+    meta: {
+      visibility: 'restricted',
+      access: 'forbidden',
+      auth: [],
+      definitionId: 'd1',
+      key: 'object-provider'
+    },
+    data: {
+      '@context': {
+        '@vocab': 'https://www.w3.org/ns/activitystreams#',
+        atlassian: 'https://schema.atlassian.com/ns/vocabulary#',
+        schema: 'http://schema.org/'
+      },
+      '@type': 'Object',
+      name: 'I love cheese',
+      url: 'https://some.url'
+    }
+  },
   unauthorized: {
     meta: {
       visibility: 'restricted',
@@ -130,6 +149,25 @@ export const mocks = {
       url: 'https://some.url'
     }
   },
+  unauthorizedWithNoAuth: {
+    meta: {
+      visibility: 'restricted',
+      access: 'unauthorized',
+      auth: [],
+      definitionId: 'd1',
+      key: 'object-provider'
+    },
+    data: {
+      '@context': {
+        '@vocab': 'https://www.w3.org/ns/activitystreams#',
+        atlassian: 'https://schema.atlassian.com/ns/vocabulary#',
+        schema: 'http://schema.org/'
+      },
+      '@type': 'Object',
+      name: 'I love cheese',
+      url: 'https://some.url'
+    }
+  },
   actionSuccess: {
     meta: {
       visibility: 'public',

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "23.9.0",
+	"version": "23.9.1",
 	"sideEffects": false
 }

package/dist/es2019/view/BlockCard/actions/flexible/AuthorizeAction.js

@@ -18,5 +18,6 @@ export const AuthorizeAction = (onAuthorize, providerName) => ({
       context: providerName
     }
   })) : /*#__PURE__*/React.createElement(FormattedMessage, messages.connect_link_account_card),
-  onClick: onAuthorize
+  onClick: onAuthorize,
+  testId: 'smart-action-connect-account'
 });

package/dist/es2019/view/BlockCard/actions/flexible/ForbiddenAction.js

@@ -19,5 +19,6 @@ export const ForbiddenAction = (onClick, content, context) => ({
       context
     }
   })),
-  onClick: onClick
+  onClick,
+  testId: 'smart-action-connect-other-account'
 });

package/dist/es2019/view/BlockCard/actions/flexible/RetryAction.js

@@ -12,5 +12,6 @@ import { messages } from '../../../../messages';
 export const RetryAction = onRetry => ({
   name: ActionName.CustomAction,
   onClick: onRetry,
-  content: /*#__PURE__*/React.createElement(FormattedMessage, messages.try_again)
+  content: /*#__PURE__*/React.createElement(FormattedMessage, messages.try_again),
+  testId: 'smart-action-try-again'
 });

package/dist/es2019/view/BlockCard/index.js

@@ -73,6 +73,7 @@ export const BlockCard = ({
       url,
       testId,
       onError,
+      onResolve,
       renderers,
       ui,
       analytics,
@@ -82,6 +83,12 @@ export const BlockCard = ({
     switch (status) {
       case 'pending':
       case 'resolving':
+        return jsx("div", {
+          css: flexibleBlockCardElevationStyle
+        }, jsx(FlexibleResolvedView, _extends({}, flexibleProps, {
+          testId: 'smart-block-resolving-view'
+        })));
+
       case 'resolved':
         return jsx("div", {
           css: flexibleBlockCardElevationStyle
@@ -110,6 +117,23 @@ export const BlockCard = ({
 
       case 'fallback':
       case 'errored':
+      default:
+        if (onError) {
+          onError({
+            url,
+            status
+          });
+        }
+
+        if (authFlow && authFlow === 'disabled') {
+          return jsx(CardLinkView, {
+            link: url,
+            isSelected: isSelected,
+            onClick: handleFrameClick,
+            testId: `${testId}-${status}`
+          });
+        }
+
         return jsx("div", {
           css: flexibleBlockCardElevationStyle
         }, jsx(FlexibleErroredView, _extends({}, flexibleProps, {

package/dist/es2019/view/BlockCard/views/flexible/FlexibleResolvedView.js

@@ -15,6 +15,7 @@ const FlexibleResolvedView = ({
   cardState,
   onClick,
   onError,
+  onResolve,
   testId = 'smart-block-resolved-view',
   ui,
   url,
@@ -30,6 +31,7 @@ const FlexibleResolvedView = ({
     cardState: cardState,
     onClick: onClick,
     onError: onError,
+    onResolve: onResolve,
     testId: testId,
     ui: ui,
     url: url
@@ -65,7 +67,7 @@ const FlexibleResolvedView = ({
       name: ElementName.DueOn
     }],
     maxLines: 1
-  }), /*#__PURE__*/React.createElement(MetadataBlock, null), /*#__PURE__*/React.createElement(SnippetBlock, null), !isPreviewBlockErrored ? /*#__PURE__*/React.createElement(PreviewBlock, {
+  }), /*#__PURE__*/React.createElement(SnippetBlock, null), !isPreviewBlockErrored ? /*#__PURE__*/React.createElement(PreviewBlock, {
     placement: MediaPlacement.Right,
     ignoreContainerPadding: true,
     onError: () => {

package/dist/esm/utils/mocks.js

@@ -119,6 +119,25 @@ export var mocks = {
       url: 'https://some.url'
     }
   },
+  forbiddenWithNoAuth: {
+    meta: {
+      visibility: 'restricted',
+      access: 'forbidden',
+      auth: [],
+      definitionId: 'd1',
+      key: 'object-provider'
+    },
+    data: {
+      '@context': {
+        '@vocab': 'https://www.w3.org/ns/activitystreams#',
+        atlassian: 'https://schema.atlassian.com/ns/vocabulary#',
+        schema: 'http://schema.org/'
+      },
+      '@type': 'Object',
+      name: 'I love cheese',
+      url: 'https://some.url'
+    }
+  },
   unauthorized: {
     meta: {
       visibility: 'restricted',
@@ -142,6 +161,25 @@ export var mocks = {
       url: 'https://some.url'
     }
   },
+  unauthorizedWithNoAuth: {
+    meta: {
+      visibility: 'restricted',
+      access: 'unauthorized',
+      auth: [],
+      definitionId: 'd1',
+      key: 'object-provider'
+    },
+    data: {
+      '@context': {
+        '@vocab': 'https://www.w3.org/ns/activitystreams#',
+        atlassian: 'https://schema.atlassian.com/ns/vocabulary#',
+        schema: 'http://schema.org/'
+      },
+      '@type': 'Object',
+      name: 'I love cheese',
+      url: 'https://some.url'
+    }
+  },
   actionSuccess: {
     meta: {
       visibility: 'public',

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "23.9.0",
+	"version": "23.9.1",
 	"sideEffects": false
 }

package/dist/esm/view/BlockCard/actions/flexible/AuthorizeAction.js

@@ -19,6 +19,7 @@ export var AuthorizeAction = function AuthorizeAction(onAuthorize, providerName)
         context: providerName
       }
     })) : /*#__PURE__*/React.createElement(FormattedMessage, messages.connect_link_account_card),
-    onClick: onAuthorize
+    onClick: onAuthorize,
+    testId: 'smart-action-connect-account'
   };
 };

package/dist/esm/view/BlockCard/actions/flexible/ForbiddenAction.js

@@ -20,6 +20,7 @@ export var ForbiddenAction = function ForbiddenAction(onClick, content, context)
         context: context
       }
     })),
-    onClick: onClick
+    onClick: onClick,
+    testId: 'smart-action-connect-other-account'
   };
 };

package/dist/esm/view/BlockCard/actions/flexible/RetryAction.js

@@ -13,6 +13,7 @@ export var RetryAction = function RetryAction(onRetry) {
   return {
     name: ActionName.CustomAction,
     onClick: onRetry,
-    content: /*#__PURE__*/React.createElement(FormattedMessage, messages.try_again)
+    content: /*#__PURE__*/React.createElement(FormattedMessage, messages.try_again),
+    testId: 'smart-action-try-again'
   };
 };

package/dist/esm/view/BlockCard/index.js

@@ -69,6 +69,7 @@ export var BlockCard = function BlockCard(_ref) {
       url: url,
       testId: testId,
       onError: onError,
+      onResolve: onResolve,
       renderers: renderers,
       ui: ui,
       analytics: analytics,
@@ -78,6 +79,12 @@ export var BlockCard = function BlockCard(_ref) {
     switch (status) {
       case 'pending':
       case 'resolving':
+        return jsx("div", {
+          css: flexibleBlockCardElevationStyle
+        }, jsx(FlexibleResolvedView, _extends({}, flexibleProps, {
+          testId: 'smart-block-resolving-view'
+        })));
+
       case 'resolved':
         return jsx("div", {
           css: flexibleBlockCardElevationStyle
@@ -106,6 +113,23 @@ export var BlockCard = function BlockCard(_ref) {
 
       case 'fallback':
       case 'errored':
+      default:
+        if (onError) {
+          onError({
+            url: url,
+            status: status
+          });
+        }
+
+        if (authFlow && authFlow === 'disabled') {
+          return jsx(CardLinkView, {
+            link: url,
+            isSelected: isSelected,
+            onClick: handleFrameClick,
+            testId: "".concat(testId, "-").concat(status)
+          });
+        }
+
         return jsx("div", {
           css: flexibleBlockCardElevationStyle
         }, jsx(FlexibleErroredView, _extends({}, flexibleProps, {

package/dist/esm/view/BlockCard/views/flexible/FlexibleResolvedView.js

@@ -16,6 +16,7 @@ var FlexibleResolvedView = function FlexibleResolvedView(_ref) {
       cardState = _ref.cardState,
       onClick = _ref.onClick,
       onError = _ref.onError,
+      onResolve = _ref.onResolve,
       _ref$testId = _ref.testId,
       testId = _ref$testId === void 0 ? 'smart-block-resolved-view' : _ref$testId,
       ui = _ref.ui,
@@ -42,6 +43,7 @@ var FlexibleResolvedView = function FlexibleResolvedView(_ref) {
     cardState: cardState,
     onClick: onClick,
     onError: onError,
+    onResolve: onResolve,
     testId: testId,
     ui: ui,
     url: url
@@ -77,7 +79,7 @@ var FlexibleResolvedView = function FlexibleResolvedView(_ref) {
       name: ElementName.DueOn
     }],
     maxLines: 1
-  }), /*#__PURE__*/React.createElement(MetadataBlock, null), /*#__PURE__*/React.createElement(SnippetBlock, null), !isPreviewBlockErrored ? /*#__PURE__*/React.createElement(PreviewBlock, {
+  }), /*#__PURE__*/React.createElement(SnippetBlock, null), !isPreviewBlockErrored ? /*#__PURE__*/React.createElement(PreviewBlock, {
     placement: MediaPlacement.Right,
     ignoreContainerPadding: true,
     onError: function onError() {

package/dist/types/utils/mocks.d.ts

@@ -9,7 +9,9 @@ export declare const mocks: {
     success: JsonLd.Response<JsonLd.Data.BaseData>;
     notFound: JsonLd.Response<JsonLd.Data.BaseData>;
     forbidden: JsonLd.Response<JsonLd.Data.BaseData>;
+    forbiddenWithNoAuth: JsonLd.Response<JsonLd.Data.BaseData>;
     unauthorized: JsonLd.Response<JsonLd.Data.BaseData>;
+    unauthorizedWithNoAuth: JsonLd.Response<JsonLd.Data.BaseData>;
     actionSuccess: {
         meta: {
             visibility: string;

package/dist/types/view/BlockCard/views/flexible/FlexibleResolvedView.d.ts

@@ -5,5 +5,5 @@ import { FlexibleBlockCardProps } from './types';
  * @see SmartLinkStatus
  * @see FlexibleCardProps
  */
-declare const FlexibleResolvedView: ({ id, cardState, onClick, onError, testId, ui, url, analytics, }: FlexibleBlockCardProps) => JSX.Element;
+declare const FlexibleResolvedView: ({ id, cardState, onClick, onError, onResolve, testId, ui, url, analytics, }: FlexibleBlockCardProps) => JSX.Element;
 export default FlexibleResolvedView;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/smart-card",
-  "version": "23.9.0",
+  "version": "23.9.1",
   "description": "Smart card component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"