@atlaskit/smart-card 26.43.6 → 26.43.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/smart-card
 
+## 26.43.7
+
+### Patch Changes
+
+- [#63353](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/63353) [`6e9371645615`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6e9371645615) - Clean up of platform.linking-platform.smart-card.cross-join feature flag
+
 ## 26.43.6
 
 ### Patch Changes

package/dist/cjs/utils/analytics/analytics.js

@@ -22,7 +22,7 @@ var ANALYTICS_CHANNEL = exports.ANALYTICS_CHANNEL = 'media';
 var context = exports.context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.43.6"
+  packageVersion: "26.43.7"
 };
 var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

@@ -76,13 +76,10 @@ var _ErroredView = require("./views/ErroredView");
 var _FlexibleResolvedView = _interopRequireDefault(require("./views/flexible/FlexibleResolvedView"));
 var _FlexibleUnauthorisedView = _interopRequireDefault(require("./views/flexible/FlexibleUnauthorisedView"));
 var _FlexibleNotFoundView = _interopRequireDefault(require("./views/flexible/FlexibleNotFoundView"));
-var _FlexibleNotFoundViewOld = _interopRequireDefault(require("./views/flexible/FlexibleNotFoundViewOld"));
 var _FlexibleForbiddenView = _interopRequireDefault(require("./views/flexible/FlexibleForbiddenView"));
-var _FlexibleForbiddenViewOld = _interopRequireDefault(require("./views/flexible/FlexibleForbiddenViewOld"));
 var _FlexibleErroredView = _interopRequireDefault(require("./views/flexible/FlexibleErroredView"));
 var _react = require("@emotion/react");
 var _handlers = require("./utils/handlers");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _PreviewAction = _interopRequireDefault(require("./actions/PreviewAction"));
 /** @jsx jsx */
 
@@ -145,15 +142,11 @@ var BlockCard = exports.BlockCard = function BlockCard(_ref) {
           onAuthorize: handleAuthorize
         }));
       case 'forbidden':
-        return (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join') ? (0, _react.jsx)(_FlexibleForbiddenView.default, (0, _extends2.default)({}, flexibleBlockCardProps, {
-          onAuthorize: handleAuthorize
-        })) : (0, _react.jsx)(_FlexibleForbiddenViewOld.default, (0, _extends2.default)({}, flexibleBlockCardProps, {
+        return (0, _react.jsx)(_FlexibleForbiddenView.default, (0, _extends2.default)({}, flexibleBlockCardProps, {
           onAuthorize: handleAuthorize
         }));
       case 'not_found':
-        return (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join') ? (0, _react.jsx)(_FlexibleNotFoundView.default, (0, _extends2.default)({}, flexibleBlockCardProps, {
-          onAuthorize: handleAuthorize
-        })) : (0, _react.jsx)(_FlexibleNotFoundViewOld.default, (0, _extends2.default)({}, flexibleBlockCardProps, {
+        return (0, _react.jsx)(_FlexibleNotFoundView.default, (0, _extends2.default)({}, flexibleBlockCardProps, {
           onAuthorize: handleAuthorize
         }));
       case 'fallback':

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

@@ -7,27 +7,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.EmbedCard = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _extractAccessContext = require("../../extractors/common/context/extractAccessContext");
 var _embed = require("../../extractors/embed");
 var _jsonld = require("../../utils/jsonld");
 var _inline = require("../../extractors/inline");
 var _block = require("../../extractors/block");
 var _helpers = require("../../state/helpers");
-var _context = require("../../extractors/common/context");
 var _BlockCard = require("../BlockCard");
 var _ResolvedView = require("../InlineCard/ResolvedView");
-var _ForbiddenView = require("./views/ForbiddenView");
-var _NotFoundView = require("./views/NotFoundView");
 var _ResolvedView2 = require("./views/ResolvedView");
-var _UnauthorisedView = require("./views/UnauthorisedView");
 var _ErroredView = require("./views/ErroredView");
 var _forbiddenView = _interopRequireDefault(require("./views/forbidden-view"));
 var _notFoundView = _interopRequireDefault(require("./views/not-found-view"));
 var _unauthorizedView = _interopRequireDefault(require("./views/unauthorized-view"));
 var _analyticsNext = require("@atlaskit/analytics-next");
 var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(function (_ref, iframeRef) {
-  var _details$meta, _forbiddenViewProps$c3;
+  var _details$meta, _forbiddenViewProps$c, _forbiddenViewProps$c2, _notFoundViewProps$co, _notFoundViewProps$co2;
   var url = _ref.url,
     _ref$cardState = _ref.cardState,
     status = _ref$cardState.status,
@@ -115,30 +110,18 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
         });
       }
       var unauthorisedViewProps = (0, _embed.extractEmbedProps)(data, meta, platform);
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join')) {
-        return /*#__PURE__*/_react.default.createElement(_unauthorizedView.default, {
-          analytics: analytics,
-          context: unauthorisedViewProps.context,
-          extensionKey: extensionKey,
-          isProductIntegrationSupported: isProductIntegrationSupported,
-          inheritDimensions: inheritDimensions,
-          isSelected: isSelected,
-          onAuthorize: handleAuthorize,
-          onClick: handleFrameClick,
-          testId: testId,
-          url: unauthorisedViewProps.link
-        });
-      }
-      return /*#__PURE__*/_react.default.createElement(_UnauthorisedView.EmbedCardUnauthorisedView, (0, _extends2.default)({}, unauthorisedViewProps, {
-        isSelected: isSelected,
-        onAuthorise: handleAuthorize,
-        inheritDimensions: inheritDimensions,
-        onClick: handleFrameClick,
+      return /*#__PURE__*/_react.default.createElement(_unauthorizedView.default, {
         analytics: analytics,
+        context: unauthorisedViewProps.context,
         extensionKey: extensionKey,
         isProductIntegrationSupported: isProductIntegrationSupported,
-        testId: testId
-      }));
+        inheritDimensions: inheritDimensions,
+        isSelected: isSelected,
+        onAuthorize: handleAuthorize,
+        onClick: handleFrameClick,
+        testId: testId,
+        url: unauthorisedViewProps.link
+      });
     case 'forbidden':
       if (onError) {
         onError({
@@ -158,36 +141,21 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
           ref: iframeRef
         }));
       }
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join')) {
-        var _forbiddenViewProps$c, _forbiddenViewProps$c2;
-        var accessContext = (0, _extractAccessContext.extractRequestAccessContextImproved)({
-          jsonLd: cardMetadata,
-          url: url,
-          product: (_forbiddenViewProps$c = (_forbiddenViewProps$c2 = forbiddenViewProps.context) === null || _forbiddenViewProps$c2 === void 0 ? void 0 : _forbiddenViewProps$c2.text) !== null && _forbiddenViewProps$c !== void 0 ? _forbiddenViewProps$c : '',
-          createAnalyticsEvent: createAnalyticsEvent
-        });
-        return /*#__PURE__*/_react.default.createElement(_forbiddenView.default, {
-          context: forbiddenViewProps.context,
-          inheritDimensions: inheritDimensions,
-          isSelected: isSelected,
-          onAuthorize: handleAuthorize,
-          onClick: handleFrameClick,
-          accessContext: accessContext,
-          url: forbiddenViewProps.link
-        });
-      }
-      var requestAccessContext = (0, _context.extractRequestAccessContext)({
+      var forbiddenAccessContext = (0, _extractAccessContext.extractRequestAccessContextImproved)({
         jsonLd: cardMetadata,
         url: url,
-        context: (_forbiddenViewProps$c3 = forbiddenViewProps.context) === null || _forbiddenViewProps$c3 === void 0 ? void 0 : _forbiddenViewProps$c3.text
+        product: (_forbiddenViewProps$c = (_forbiddenViewProps$c2 = forbiddenViewProps.context) === null || _forbiddenViewProps$c2 === void 0 ? void 0 : _forbiddenViewProps$c2.text) !== null && _forbiddenViewProps$c !== void 0 ? _forbiddenViewProps$c : '',
+        createAnalyticsEvent: createAnalyticsEvent
       });
-      return /*#__PURE__*/_react.default.createElement(_ForbiddenView.EmbedCardForbiddenView, (0, _extends2.default)({}, forbiddenViewProps, {
-        isSelected: isSelected,
-        onAuthorise: handleAuthorize,
+      return /*#__PURE__*/_react.default.createElement(_forbiddenView.default, {
+        context: forbiddenViewProps.context,
         inheritDimensions: inheritDimensions,
+        isSelected: isSelected,
+        onAuthorize: handleAuthorize,
         onClick: handleFrameClick,
-        requestAccessContext: requestAccessContext
-      }));
+        accessContext: forbiddenAccessContext,
+        url: forbiddenViewProps.link
+      });
     case 'not_found':
       if (onError) {
         onError({
@@ -196,28 +164,20 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
         });
       }
       var notFoundViewProps = (0, _embed.extractEmbedProps)(data, meta, platform);
-      if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join')) {
-        var _notFoundViewProps$co, _notFoundViewProps$co2;
-        var _accessContext = details !== null && details !== void 0 && details.meta ? (0, _extractAccessContext.extractRequestAccessContextImproved)({
-          jsonLd: details === null || details === void 0 ? void 0 : details.meta,
-          url: url,
-          product: (_notFoundViewProps$co = (_notFoundViewProps$co2 = notFoundViewProps.context) === null || _notFoundViewProps$co2 === void 0 ? void 0 : _notFoundViewProps$co2.text) !== null && _notFoundViewProps$co !== void 0 ? _notFoundViewProps$co : '',
-          createAnalyticsEvent: createAnalyticsEvent
-        }) : undefined;
-        return /*#__PURE__*/_react.default.createElement(_notFoundView.default, {
-          context: notFoundViewProps.context,
-          inheritDimensions: inheritDimensions,
-          isSelected: isSelected,
-          onClick: handleFrameClick,
-          accessContext: _accessContext,
-          url: notFoundViewProps.link
-        });
-      }
-      return /*#__PURE__*/_react.default.createElement(_NotFoundView.EmbedCardNotFoundView, (0, _extends2.default)({}, notFoundViewProps, {
-        isSelected: isSelected,
+      var notFoundAccessContext = details !== null && details !== void 0 && details.meta ? (0, _extractAccessContext.extractRequestAccessContextImproved)({
+        jsonLd: details === null || details === void 0 ? void 0 : details.meta,
+        url: url,
+        product: (_notFoundViewProps$co = (_notFoundViewProps$co2 = notFoundViewProps.context) === null || _notFoundViewProps$co2 === void 0 ? void 0 : _notFoundViewProps$co2.text) !== null && _notFoundViewProps$co !== void 0 ? _notFoundViewProps$co : '',
+        createAnalyticsEvent: createAnalyticsEvent
+      }) : undefined;
+      return /*#__PURE__*/_react.default.createElement(_notFoundView.default, {
+        context: notFoundViewProps.context,
         inheritDimensions: inheritDimensions,
-        onClick: handleFrameClick
-      }));
+        isSelected: isSelected,
+        onClick: handleFrameClick,
+        accessContext: notFoundAccessContext,
+        url: notFoundViewProps.link
+      });
     case 'fallback':
     case 'errored':
     default:

package/dist/cjs/view/HoverCard/components/HoverCardContent.js

@@ -27,7 +27,6 @@ var _messages = require("../../../messages");
 var _click = require("../../../utils/analytics/click");
 var _store = require("../../../state/store");
 var _forbidden = _interopRequireDefault(require("./views/forbidden"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /** @jsx jsx */
@@ -182,12 +181,10 @@ var HoverCardContent = function HoverCardContent(_ref) {
         url: url
       });
     }
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join')) {
-      if (cardState.status === 'forbidden' || cardState.status === 'not_found') {
-        return (0, _react.jsx)(_forbidden.default, {
-          flexibleCardProps: flexibleCardProps
-        });
-      }
+    if (cardState.status === 'forbidden' || cardState.status === 'not_found') {
+      return (0, _react.jsx)(_forbidden.default, {
+        flexibleCardProps: flexibleCardProps
+      });
     }
     if (cardState.status === 'resolved') {
       return (0, _react.jsx)(_resolved.default, {

package/dist/cjs/view/InlineCard/ErroredView/index.js

@@ -24,7 +24,6 @@ var _reactIntlNext = require("react-intl-next");
 var _styled = require("../styled");
 var _withFrameStyleControl = _interopRequireDefault(require("../utils/withFrameStyleControl"));
 var _HoverCard = require("../../HoverCard");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var InlineCardErroredView = exports.InlineCardErroredView = /*#__PURE__*/function (_React$Component) {
@@ -85,7 +84,7 @@ var InlineCardErroredView = exports.InlineCardErroredView = /*#__PURE__*/functio
         onClick: onClick,
         rightSide: message
       }), this.renderActionButton());
-      if (this.props.showHoverPreview && (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join')) {
+      if (this.props.showHoverPreview) {
         return /*#__PURE__*/_react.default.createElement(_HoverCard.HoverCard, {
           url: url
         }, content);

package/dist/cjs/view/InlineCard/ForbiddenView/index.js

@@ -27,7 +27,6 @@ var _lozenge = _interopRequireDefault(require("@atlaskit/lozenge"));
 var _styled2 = require("../IconAndTitleLayout/styled");
 var _withFrameStyleControl = _interopRequireDefault(require("../utils/withFrameStyleControl"));
 var _HoverCard = require("../../HoverCard");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var FallbackForbiddenIcon = /*#__PURE__*/_react.default.createElement(_Icon.AKIconWrapper, null, /*#__PURE__*/_react.default.createElement(_lockFilled.default, {
@@ -66,13 +65,10 @@ var InlineCardForbiddenView = exports.InlineCardForbiddenView = /*#__PURE__*/fun
       var _this$props3;
       if ((_this$props3 = _this.props) !== null && _this$props3 !== void 0 && (_this$props3 = _this$props3.requestAccessContext) !== null && _this$props3 !== void 0 && _this$props3.callToActionMessageKey) {
         var callToActionMessageKey = _this.props.requestAccessContext.callToActionMessageKey;
-        var values = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join') ? {
-          product: _this.props.context
-        } : {
-          context: _this.props.context
-        };
         return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.messages[callToActionMessageKey], {
-          values: values
+          values: {
+            product: _this.props.context
+          }
         }));
       }
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.messages.invalid_permissions, function (formattedMessage) {
@@ -84,7 +80,6 @@ var InlineCardForbiddenView = exports.InlineCardForbiddenView = /*#__PURE__*/fun
       var onAuthorise = _this.props.onAuthorise;
       var ActionButton = (0, _withFrameStyleControl.default)(_customThemeButton.default, _this.frameRef);
       var accessType = (_this$props$requestAc = _this.props.requestAccessContext) === null || _this$props$requestAc === void 0 ? void 0 : _this$props$requestAc.accessType;
-      var isButtonDisabled = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join') && accessType === 'PENDING_REQUEST_EXISTS';
       if (_this.state.hasRequestAccessContextMessage) {
         return /*#__PURE__*/_react.default.createElement(ActionButton, {
           spacing: "none",
@@ -92,7 +87,7 @@ var InlineCardForbiddenView = exports.InlineCardForbiddenView = /*#__PURE__*/fun
           component: _styled.IconStyledButton,
           testId: "button-connect-other-account",
           role: "button",
-          isDisabled: isButtonDisabled
+          isDisabled: accessType === 'PENDING_REQUEST_EXISTS'
         }, _this.renderForbiddenAccessMessage());
       }
       if (onAuthorise) {
@@ -131,7 +126,7 @@ var InlineCardForbiddenView = exports.InlineCardForbiddenView = /*#__PURE__*/fun
         onClick: onClick,
         titleColor: "var(--ds-text-subtle, ".concat(_colors.N500, ")")
       }), this.renderActionButton());
-      if (this.props.showHoverPreview && (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join')) {
+      if (this.props.showHoverPreview) {
         return /*#__PURE__*/_react.default.createElement(_HoverCard.HoverCard, {
           url: url
         }, content);

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

@@ -40,7 +40,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _react = _interopRequireWildcard(require("react"));
 var _jsonld = require("../../utils/jsonld");
 var _inline = require("../../extractors/inline");
-var _context = require("../../extractors/common/context");
 var _extractAccessContext = require("../../extractors/common/context/extractAccessContext");
 var _LinkView = require("../LinkView");
 var _ErroredView = require("./ErroredView");
@@ -51,7 +50,6 @@ var _UnauthorisedView = require("./UnauthorisedView");
 var _linkExtractors = require("@atlaskit/link-extractors");
 var _linkProvider = require("@atlaskit/link-provider");
 var _helpers = require("../../state/helpers");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _constants = require("../../constants");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -147,15 +145,11 @@ var InlineCard = exports.InlineCard = function InlineCard(_ref) {
     case 'forbidden':
       var providerForbidden = (0, _linkExtractors.extractProvider)(cardDetails);
       var cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : (0, _jsonld.getForbiddenJsonLd)().meta;
-      var requestAccessContext = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join') ? (0, _extractAccessContext.extractRequestAccessContextImproved)({
+      var requestAccessContext = (0, _extractAccessContext.extractRequestAccessContextImproved)({
         jsonLd: cardMetadata,
         url: url,
         product: (_providerForbidden$te = providerForbidden === null || providerForbidden === void 0 ? void 0 : providerForbidden.text) !== null && _providerForbidden$te !== void 0 ? _providerForbidden$te : '',
         createAnalyticsEvent: createAnalyticsEvent
-      }) : (0, _context.extractRequestAccessContext)({
-        jsonLd: cardMetadata,
-        url: url,
-        context: providerForbidden === null || providerForbidden === void 0 ? void 0 : providerForbidden.text
       });
       return /*#__PURE__*/_react.default.createElement(_ForbiddenView.InlineCardForbiddenView, {
         url: url,

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

@@ -17,7 +17,7 @@ var _excluded = ["href", "children", "checkSafety", "onClick", "testId"],
   _excluded2 = ["isLinkSafe", "showSafetyWarningModal"];
 var PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.43.6",
+  packageVersion: "26.43.7",
   componentName: 'linkUrl'
 };
 var Link = (0, _click.withLinkClickedEvent)('a');

package/dist/es2019/utils/analytics/analytics.js

@@ -4,7 +4,7 @@ export const ANALYTICS_CHANNEL = 'media';
 export const context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.43.6"
+  packageVersion: "26.43.7"
 };
 export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

@@ -17,13 +17,10 @@ import { ErroredView as BlockCardErroredView } from './views/ErroredView';
 import FlexibleResolvedView from './views/flexible/FlexibleResolvedView';
 import FlexibleUnauthorisedView from './views/flexible/FlexibleUnauthorisedView';
 import FlexibleNotFoundView from './views/flexible/FlexibleNotFoundView';
-import FlexibleNotFoundViewOld from './views/flexible/FlexibleNotFoundViewOld';
 import FlexibleForbiddenView from './views/flexible/FlexibleForbiddenView';
-import FlexibleForbiddenViewOld from './views/flexible/FlexibleForbiddenViewOld';
 import FlexibleErroredView from './views/flexible/FlexibleErroredView';
 import { jsx } from '@emotion/react';
 import { handleClickCommon } from './utils/handlers';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export { default as PreviewAction } from './actions/PreviewAction';
 export { ForbiddenAction, AuthorizeAction, BlockCardResolvedView, BlockCardResolvingView, BlockCardUnauthorisedView, BlockCardForbiddenView, BlockCardErroredView, BlockCardNotFoundView };
 export const BlockCard = ({
@@ -86,15 +83,11 @@ export const BlockCard = ({
           onAuthorize: handleAuthorize
         }));
       case 'forbidden':
-        return getBooleanFF('platform.linking-platform.smart-card.cross-join') ? jsx(FlexibleForbiddenView, _extends({}, flexibleBlockCardProps, {
-          onAuthorize: handleAuthorize
-        })) : jsx(FlexibleForbiddenViewOld, _extends({}, flexibleBlockCardProps, {
+        return jsx(FlexibleForbiddenView, _extends({}, flexibleBlockCardProps, {
           onAuthorize: handleAuthorize
         }));
       case 'not_found':
-        return getBooleanFF('platform.linking-platform.smart-card.cross-join') ? jsx(FlexibleNotFoundView, _extends({}, flexibleBlockCardProps, {
-          onAuthorize: handleAuthorize
-        })) : jsx(FlexibleNotFoundViewOld, _extends({}, flexibleBlockCardProps, {
+        return jsx(FlexibleNotFoundView, _extends({}, flexibleBlockCardProps, {
           onAuthorize: handleAuthorize
         }));
       case 'fallback':

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

@@ -1,19 +1,14 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { extractRequestAccessContextImproved } from '../../extractors/common/context/extractAccessContext';
 import { extractEmbedProps } from '../../extractors/embed';
 import { getEmptyJsonLd, getForbiddenJsonLd } from '../../utils/jsonld';
 import { extractInlineProps } from '../../extractors/inline';
 import { extractBlockProps } from '../../extractors/block';
 import { getExtensionKey, hasAuthScopeOverrides } from '../../state/helpers';
-import { extractRequestAccessContext } from '../../extractors/common/context';
 import { BlockCardResolvedView, BlockCardResolvingView } from '../BlockCard';
 import { InlineCardResolvedView } from '../InlineCard/ResolvedView';
-import { EmbedCardForbiddenView } from './views/ForbiddenView';
-import { EmbedCardNotFoundView } from './views/NotFoundView';
 import { EmbedCardResolvedView } from './views/ResolvedView';
-import { EmbedCardUnauthorisedView } from './views/UnauthorisedView';
 import { EmbedCardErroredView } from './views/ErroredView';
 import ForbiddenView from './views/forbidden-view';
 import NotFoundView from './views/not-found-view';
@@ -43,7 +38,7 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
   onIframeFocus,
   iframeUrlType
 }, iframeRef) => {
-  var _details$meta, _forbiddenViewProps$c3;
+  var _details$meta, _forbiddenViewProps$c, _forbiddenViewProps$c2, _notFoundViewProps$co, _notFoundViewProps$co2;
   const {
     createAnalyticsEvent
   } = useAnalyticsEvents();
@@ -111,30 +106,18 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
         });
       }
       const unauthorisedViewProps = extractEmbedProps(data, meta, platform);
-      if (getBooleanFF('platform.linking-platform.smart-card.cross-join')) {
-        return /*#__PURE__*/React.createElement(UnauthorizedView, {
-          analytics: analytics,
-          context: unauthorisedViewProps.context,
-          extensionKey: extensionKey,
-          isProductIntegrationSupported: isProductIntegrationSupported,
-          inheritDimensions: inheritDimensions,
-          isSelected: isSelected,
-          onAuthorize: handleAuthorize,
-          onClick: handleFrameClick,
-          testId: testId,
-          url: unauthorisedViewProps.link
-        });
-      }
-      return /*#__PURE__*/React.createElement(EmbedCardUnauthorisedView, _extends({}, unauthorisedViewProps, {
-        isSelected: isSelected,
-        onAuthorise: handleAuthorize,
-        inheritDimensions: inheritDimensions,
-        onClick: handleFrameClick,
+      return /*#__PURE__*/React.createElement(UnauthorizedView, {
         analytics: analytics,
+        context: unauthorisedViewProps.context,
         extensionKey: extensionKey,
         isProductIntegrationSupported: isProductIntegrationSupported,
-        testId: testId
-      }));
+        inheritDimensions: inheritDimensions,
+        isSelected: isSelected,
+        onAuthorize: handleAuthorize,
+        onClick: handleFrameClick,
+        testId: testId,
+        url: unauthorisedViewProps.link
+      });
     case 'forbidden':
       if (onError) {
         onError({
@@ -154,36 +137,21 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
           ref: iframeRef
         }));
       }
-      if (getBooleanFF('platform.linking-platform.smart-card.cross-join')) {
-        var _forbiddenViewProps$c, _forbiddenViewProps$c2;
-        const accessContext = extractRequestAccessContextImproved({
-          jsonLd: cardMetadata,
-          url,
-          product: (_forbiddenViewProps$c = (_forbiddenViewProps$c2 = forbiddenViewProps.context) === null || _forbiddenViewProps$c2 === void 0 ? void 0 : _forbiddenViewProps$c2.text) !== null && _forbiddenViewProps$c !== void 0 ? _forbiddenViewProps$c : '',
-          createAnalyticsEvent
-        });
-        return /*#__PURE__*/React.createElement(ForbiddenView, {
-          context: forbiddenViewProps.context,
-          inheritDimensions: inheritDimensions,
-          isSelected: isSelected,
-          onAuthorize: handleAuthorize,
-          onClick: handleFrameClick,
-          accessContext: accessContext,
-          url: forbiddenViewProps.link
-        });
-      }
-      const requestAccessContext = extractRequestAccessContext({
+      const forbiddenAccessContext = extractRequestAccessContextImproved({
         jsonLd: cardMetadata,
         url,
-        context: (_forbiddenViewProps$c3 = forbiddenViewProps.context) === null || _forbiddenViewProps$c3 === void 0 ? void 0 : _forbiddenViewProps$c3.text
+        product: (_forbiddenViewProps$c = (_forbiddenViewProps$c2 = forbiddenViewProps.context) === null || _forbiddenViewProps$c2 === void 0 ? void 0 : _forbiddenViewProps$c2.text) !== null && _forbiddenViewProps$c !== void 0 ? _forbiddenViewProps$c : '',
+        createAnalyticsEvent
       });
-      return /*#__PURE__*/React.createElement(EmbedCardForbiddenView, _extends({}, forbiddenViewProps, {
-        isSelected: isSelected,
-        onAuthorise: handleAuthorize,
+      return /*#__PURE__*/React.createElement(ForbiddenView, {
+        context: forbiddenViewProps.context,
         inheritDimensions: inheritDimensions,
+        isSelected: isSelected,
+        onAuthorize: handleAuthorize,
         onClick: handleFrameClick,
-        requestAccessContext: requestAccessContext
-      }));
+        accessContext: forbiddenAccessContext,
+        url: forbiddenViewProps.link
+      });
     case 'not_found':
       if (onError) {
         onError({
@@ -192,28 +160,20 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
         });
       }
       const notFoundViewProps = extractEmbedProps(data, meta, platform);
-      if (getBooleanFF('platform.linking-platform.smart-card.cross-join')) {
-        var _notFoundViewProps$co, _notFoundViewProps$co2;
-        const accessContext = details !== null && details !== void 0 && details.meta ? extractRequestAccessContextImproved({
-          jsonLd: details === null || details === void 0 ? void 0 : details.meta,
-          url,
-          product: (_notFoundViewProps$co = (_notFoundViewProps$co2 = notFoundViewProps.context) === null || _notFoundViewProps$co2 === void 0 ? void 0 : _notFoundViewProps$co2.text) !== null && _notFoundViewProps$co !== void 0 ? _notFoundViewProps$co : '',
-          createAnalyticsEvent
-        }) : undefined;
-        return /*#__PURE__*/React.createElement(NotFoundView, {
-          context: notFoundViewProps.context,
-          inheritDimensions: inheritDimensions,
-          isSelected: isSelected,
-          onClick: handleFrameClick,
-          accessContext: accessContext,
-          url: notFoundViewProps.link
-        });
-      }
-      return /*#__PURE__*/React.createElement(EmbedCardNotFoundView, _extends({}, notFoundViewProps, {
-        isSelected: isSelected,
+      const notFoundAccessContext = details !== null && details !== void 0 && details.meta ? extractRequestAccessContextImproved({
+        jsonLd: details === null || details === void 0 ? void 0 : details.meta,
+        url,
+        product: (_notFoundViewProps$co = (_notFoundViewProps$co2 = notFoundViewProps.context) === null || _notFoundViewProps$co2 === void 0 ? void 0 : _notFoundViewProps$co2.text) !== null && _notFoundViewProps$co !== void 0 ? _notFoundViewProps$co : '',
+        createAnalyticsEvent
+      }) : undefined;
+      return /*#__PURE__*/React.createElement(NotFoundView, {
+        context: notFoundViewProps.context,
         inheritDimensions: inheritDimensions,
-        onClick: handleFrameClick
-      }));
+        isSelected: isSelected,
+        onClick: handleFrameClick,
+        accessContext: notFoundAccessContext,
+        url: notFoundViewProps.link
+      });
     case 'fallback':
     case 'errored':
     default:

package/dist/es2019/view/HoverCard/components/HoverCardContent.js

@@ -18,7 +18,6 @@ import { messages } from '../../../messages';
 import { fireLinkClickedEvent } from '../../../utils/analytics/click';
 import { useSmartCardState } from '../../../state/store';
 import HoverCardForbiddenView from './views/forbidden';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export const hoverCardClassName = 'smart-links-hover-preview';
 export const getCopyAction = url => ({
   name: ActionName.CustomAction,
@@ -143,12 +142,10 @@ const HoverCardContent = ({
         url: url
       });
     }
-    if (getBooleanFF('platform.linking-platform.smart-card.cross-join')) {
-      if (cardState.status === 'forbidden' || cardState.status === 'not_found') {
-        return jsx(HoverCardForbiddenView, {
-          flexibleCardProps: flexibleCardProps
-        });
-      }
+    if (cardState.status === 'forbidden' || cardState.status === 'not_found') {
+      return jsx(HoverCardForbiddenView, {
+        flexibleCardProps: flexibleCardProps
+      });
     }
     if (cardState.status === 'resolved') {
       return jsx(HoverCardResolvedView, {

package/dist/es2019/view/InlineCard/ErroredView/index.js

@@ -11,7 +11,6 @@ import { FormattedMessage } from 'react-intl-next';
 import { IconStyledButton } from '../styled';
 import withFrameStyleControl from '../utils/withFrameStyleControl';
 import { HoverCard } from '../../HoverCard';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export class InlineCardErroredView extends React.Component {
   constructor(...args) {
     super(...args);
@@ -64,7 +63,7 @@ export class InlineCardErroredView extends React.Component {
       onClick: onClick,
       rightSide: message
     }), this.renderActionButton());
-    if (this.props.showHoverPreview && getBooleanFF('platform.linking-platform.smart-card.cross-join')) {
+    if (this.props.showHoverPreview) {
       return /*#__PURE__*/React.createElement(HoverCard, {
         url: url
       }, content);