@atlaskit/smart-card 26.34.2 → 26.34.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/smart-card
 
+## 26.34.3
+
+### Patch Changes
+
+- [#41344](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/41344) [`b2772a33471`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b2772a33471) - [ux] Added forbidden state to redesigned inline card
+
 ## 26.34.2
 
 ### 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.34.2"
+  packageVersion: "26.34.3"
 };
 var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

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

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

@@ -66,10 +66,13 @@ 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: {
-            context: _this.props.context
-          }
+          values: values
         }));
       }
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.messages.invalid_permissions, function (formattedMessage) {
@@ -77,15 +80,19 @@ var InlineCardForbiddenView = exports.InlineCardForbiddenView = /*#__PURE__*/fun
       }));
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "renderActionButton", function () {
+      var _this$props$requestAc;
       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",
           onClick: _this.handleRetry,
           component: _styled.IconStyledButton,
           testId: "button-connect-other-account",
-          role: "button"
+          role: "button",
+          isDisabled: isButtonDisabled
         }, _this.renderForbiddenAccessMessage());
       }
       if (onAuthorise) {

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

@@ -40,6 +40,7 @@ var _react = _interopRequireDefault(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");
 var _ForbiddenView = require("./ForbiddenView");
@@ -49,8 +50,9 @@ 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 InlineCard = exports.InlineCard = function InlineCard(_ref) {
-  var _details$meta;
+  var _details$meta, _providerForbidden$te;
   var analytics = _ref.analytics,
     id = _ref.id,
     url = _ref.url,
@@ -132,7 +134,11 @@ var InlineCard = exports.InlineCard = function InlineCard(_ref) {
       }
       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, _context.extractRequestAccessContext)({
+      var requestAccessContext = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join') ? (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 : ''
+      }) : (0, _context.extractRequestAccessContext)({
         jsonLd: cardMetadata,
         url: url,
         context: providerForbidden === null || providerForbidden === void 0 ? void 0 : providerForbidden.text

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.34.2"
+  packageVersion: "26.34.3"
 };
 export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

@@ -8,7 +8,7 @@ import LinkWarningModal from './LinkWarningModal';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 const PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.34.2",
+  packageVersion: "26.34.3",
   componentName: 'linkUrl'
 };
 const Link = withLinkClickedEvent('a');

package/dist/es2019/view/RedesignedInlineCard/ForbiddenView/index.js

@@ -48,10 +48,13 @@ export class InlineCardForbiddenView extends React.Component {
         const {
           callToActionMessageKey
         } = this.props.requestAccessContext;
+        const values = getBooleanFF('platform.linking-platform.smart-card.cross-join') ? {
+          product: this.props.context
+        } : {
+          context: this.props.context
+        };
         return /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages[callToActionMessageKey], {
-          values: {
-            context: this.props.context
-          }
+          values: values
         }));
       }
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormattedMessage, messages.invalid_permissions, formattedMessage => {
@@ -59,17 +62,21 @@ export class InlineCardForbiddenView extends React.Component {
       }));
     });
     _defineProperty(this, "renderActionButton", () => {
+      var _this$props$requestAc2;
       const {
         onAuthorise
       } = this.props;
       const ActionButton = withFrameStyleControl(Button, this.frameRef);
+      const accessType = (_this$props$requestAc2 = this.props.requestAccessContext) === null || _this$props$requestAc2 === void 0 ? void 0 : _this$props$requestAc2.accessType;
+      const isButtonDisabled = getBooleanFF('platform.linking-platform.smart-card.cross-join') && accessType === 'PENDING_REQUEST_EXISTS';
       if (this.state.hasRequestAccessContextMessage) {
         return /*#__PURE__*/React.createElement(ActionButton, {
           spacing: "none",
           onClick: this.handleRetry,
           component: IconStyledButton,
           testId: "button-connect-other-account",
-          role: "button"
+          role: "button",
+          isDisabled: isButtonDisabled
         }, this.renderForbiddenAccessMessage());
       }
       if (onAuthorise) {

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

@@ -3,6 +3,7 @@ import React from 'react';
 import { getEmptyJsonLd, getForbiddenJsonLd } from '../../utils/jsonld';
 import { extractInlineProps } from '../../extractors/inline';
 import { extractRequestAccessContext } from '../../extractors/common/context';
+import { extractRequestAccessContextImproved } from '../../extractors/common/context/extractAccessContext';
 import { CardLinkView } from '../LinkView';
 import { InlineCardErroredView } from './ErroredView';
 import { InlineCardForbiddenView } from './ForbiddenView';
@@ -12,6 +13,7 @@ import { InlineCardUnauthorizedView } from './UnauthorisedView';
 import { extractProvider } from '@atlaskit/link-extractors';
 import { useFeatureFlag } from '@atlaskit/link-provider';
 import { getExtensionKey } from '../../state/helpers';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export { InlineCardResolvedView, InlineCardResolvingView, InlineCardErroredView, InlineCardForbiddenView, InlineCardUnauthorizedView };
 export const InlineCard = ({
   analytics,
@@ -30,7 +32,7 @@ export const InlineCard = ({
   showAuthTooltip,
   showServerActions
 }) => {
-  var _details$meta;
+  var _details$meta, _providerForbidden$te;
   const {
     status,
     details
@@ -99,7 +101,11 @@ export const InlineCard = ({
       }
       const providerForbidden = extractProvider(cardDetails);
       const cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : getForbiddenJsonLd().meta;
-      const requestAccessContext = extractRequestAccessContext({
+      const requestAccessContext = getBooleanFF('platform.linking-platform.smart-card.cross-join') ? extractRequestAccessContextImproved({
+        jsonLd: cardMetadata,
+        url,
+        product: (_providerForbidden$te = providerForbidden === null || providerForbidden === void 0 ? void 0 : providerForbidden.text) !== null && _providerForbidden$te !== void 0 ? _providerForbidden$te : ''
+      }) : extractRequestAccessContext({
         jsonLd: cardMetadata,
         url,
         context: providerForbidden === null || providerForbidden === void 0 ? void 0 : providerForbidden.text

package/dist/esm/utils/analytics/analytics.js

@@ -15,7 +15,7 @@ export var ANALYTICS_CHANNEL = 'media';
 export var context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.34.2"
+  packageVersion: "26.34.3"
 };
 export var TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

@@ -11,7 +11,7 @@ import LinkWarningModal from './LinkWarningModal';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 var PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "26.34.2",
+  packageVersion: "26.34.3",
   componentName: 'linkUrl'
 };
 var Link = withLinkClickedEvent('a');

package/dist/esm/view/RedesignedInlineCard/ForbiddenView/index.js

@@ -59,10 +59,13 @@ export var InlineCardForbiddenView = /*#__PURE__*/function (_React$Component) {
       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 = getBooleanFF('platform.linking-platform.smart-card.cross-join') ? {
+          product: _this.props.context
+        } : {
+          context: _this.props.context
+        };
         return /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages[callToActionMessageKey], {
-          values: {
-            context: _this.props.context
-          }
+          values: values
         }));
       }
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormattedMessage, messages.invalid_permissions, function (formattedMessage) {
@@ -70,15 +73,19 @@ export var InlineCardForbiddenView = /*#__PURE__*/function (_React$Component) {
       }));
     });
     _defineProperty(_assertThisInitialized(_this), "renderActionButton", function () {
+      var _this$props$requestAc;
       var onAuthorise = _this.props.onAuthorise;
       var ActionButton = withFrameStyleControl(Button, _this.frameRef);
+      var accessType = (_this$props$requestAc = _this.props.requestAccessContext) === null || _this$props$requestAc === void 0 ? void 0 : _this$props$requestAc.accessType;
+      var isButtonDisabled = getBooleanFF('platform.linking-platform.smart-card.cross-join') && accessType === 'PENDING_REQUEST_EXISTS';
       if (_this.state.hasRequestAccessContextMessage) {
         return /*#__PURE__*/React.createElement(ActionButton, {
           spacing: "none",
           onClick: _this.handleRetry,
           component: IconStyledButton,
           testId: "button-connect-other-account",
-          role: "button"
+          role: "button",
+          isDisabled: isButtonDisabled
         }, _this.renderForbiddenAccessMessage());
       }
       if (onAuthorise) {

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

@@ -3,6 +3,7 @@ import React from 'react';
 import { getEmptyJsonLd, getForbiddenJsonLd } from '../../utils/jsonld';
 import { extractInlineProps } from '../../extractors/inline';
 import { extractRequestAccessContext } from '../../extractors/common/context';
+import { extractRequestAccessContextImproved } from '../../extractors/common/context/extractAccessContext';
 import { CardLinkView } from '../LinkView';
 import { InlineCardErroredView } from './ErroredView';
 import { InlineCardForbiddenView } from './ForbiddenView';
@@ -12,9 +13,10 @@ import { InlineCardUnauthorizedView } from './UnauthorisedView';
 import { extractProvider } from '@atlaskit/link-extractors';
 import { useFeatureFlag } from '@atlaskit/link-provider';
 import { getExtensionKey } from '../../state/helpers';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export { InlineCardResolvedView, InlineCardResolvingView, InlineCardErroredView, InlineCardForbiddenView, InlineCardUnauthorizedView };
 export var InlineCard = function InlineCard(_ref) {
-  var _details$meta;
+  var _details$meta, _providerForbidden$te;
   var analytics = _ref.analytics,
     id = _ref.id,
     url = _ref.url,
@@ -96,7 +98,11 @@ export var InlineCard = function InlineCard(_ref) {
       }
       var providerForbidden = extractProvider(cardDetails);
       var cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : getForbiddenJsonLd().meta;
-      var requestAccessContext = extractRequestAccessContext({
+      var requestAccessContext = getBooleanFF('platform.linking-platform.smart-card.cross-join') ? extractRequestAccessContextImproved({
+        jsonLd: cardMetadata,
+        url: url,
+        product: (_providerForbidden$te = providerForbidden === null || providerForbidden === void 0 ? void 0 : providerForbidden.text) !== null && _providerForbidden$te !== void 0 ? _providerForbidden$te : ''
+      }) : extractRequestAccessContext({
         jsonLd: cardMetadata,
         url: url,
         context: providerForbidden === null || providerForbidden === void 0 ? void 0 : providerForbidden.text

package/package.json

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

package/dist/types-ts4.5/__fixtures__/atlas-project.d.ts

@@ -1,3 +0,0 @@
-import { JsonLd } from 'json-ld-types';
-declare const _default: JsonLd.Response<JsonLd.Data.BaseData>;
-export default _default;

package/dist/types-ts4.5/__fixtures__/bitbucket-pull-request.d.ts

@@ -1,73 +0,0 @@
-declare const _default: {
-    meta: {
-        visibility: string;
-        access: string;
-        resourceType: string;
-        key: string;
-    };
-    data: {
-        '@id': string;
-        '@context': {
-            '@vocab': string;
-            atlassian: string;
-            schema: string;
-        };
-        '@type': string[];
-        url: string;
-        attributedTo: {
-            '@type': string;
-            name: string;
-            icon: string;
-        };
-        'schema:dateCreated': string;
-        generator: {
-            '@type': string;
-            name: string;
-            icon: {
-                '@type': string;
-                url: string;
-            };
-        };
-        icon: {
-            '@type': string;
-            url: string;
-        };
-        name: string;
-        summary: string;
-        'atlassian:mergeSource': {
-            '@type': string;
-            href: string;
-            name: string;
-        };
-        'atlassian:mergeDestination': {
-            '@type': string;
-            href: string;
-            name: string;
-        };
-        updated: string;
-        'atlassian:internalId': string;
-        'atlassian:isMerged': boolean;
-        'atlassian:state': string;
-        'atlassian:reviewer': {
-            '@type': string;
-            name: string;
-            icon: string;
-        }[];
-        'atlassian:updatedBy': {
-            '@type': string;
-            name: string;
-            icon: string;
-        };
-        audience: {
-            '@type': string;
-            name: string;
-            icon: string;
-        }[];
-        context: {
-            '@type': string;
-            name: string;
-            url: string;
-        };
-    };
-};
-export default _default;

package/dist/types-ts4.5/__fixtures__/confluence-blog.d.ts

@@ -1,49 +0,0 @@
-declare const _default: {
-    meta: {
-        auth: never[];
-        definitionId: string;
-        visibility: string;
-        access: string;
-        resourceType: string;
-        key: string;
-    };
-    data: {
-        '@context': {
-            '@vocab': string;
-            atlassian: string;
-            schema: string;
-        };
-        generator: {
-            '@type': string;
-            '@id': string;
-            name: string;
-        };
-        '@type': string[];
-        url: string;
-        name: string;
-        'atlassian:state': string;
-        summary: string;
-        'schema:commentCount': number;
-        'atlassian:subscriberCount': number;
-        'atlassian:titlePrefix': {
-            text: string;
-            '@type': string;
-        };
-        'atlassian:attributedTo': {
-            '@type': string;
-            name: string;
-            icon: string;
-        };
-        'atlassian:ownedBy': {
-            '@type': string;
-            name: string;
-            icon: string;
-        };
-        preview: {
-            '@type': string;
-            href: string;
-            'atlassian:supportedPlatforms': string[];
-        };
-    };
-};
-export default _default;

package/dist/types-ts4.5/__fixtures__/confluence-page.d.ts

@@ -1,49 +0,0 @@
-declare const _default: {
-    meta: {
-        auth: never[];
-        definitionId: string;
-        visibility: string;
-        access: string;
-        resourceType: string;
-        key: string;
-    };
-    data: {
-        '@context': {
-            '@vocab': string;
-            atlassian: string;
-            schema: string;
-        };
-        generator: {
-            '@type': string;
-            '@id': string;
-            name: string;
-        };
-        '@type': string[];
-        url: string;
-        name: string;
-        'atlassian:state': string;
-        summary: string;
-        'schema:commentCount': number;
-        'atlassian:subscriberCount': number;
-        'atlassian:titlePrefix': {
-            text: string;
-            '@type': string;
-        };
-        'atlassian:attributedTo': {
-            '@type': string;
-            name: string;
-            icon: string;
-        };
-        'atlassian:ownedBy': {
-            '@type': string;
-            name: string;
-            icon: string;
-        };
-        preview: {
-            '@type': string;
-            href: string;
-            'atlassian:supportedPlatforms': string[];
-        };
-    };
-};
-export default _default;

package/dist/types-ts4.5/__fixtures__/confluence-space.d.ts

@@ -1,36 +0,0 @@
-declare const _default: {
-    meta: {
-        auth: never[];
-        definitionId: string;
-        visibility: string;
-        access: string;
-        resourceType: string;
-        key: string;
-    };
-    data: {
-        '@context': {
-            '@vocab': string;
-            atlassian: string;
-            schema: string;
-        };
-        generator: {
-            '@type': string;
-            '@id': string;
-            name: string;
-        };
-        '@type': string[];
-        url: string;
-        icon: {
-            '@type': string;
-            url: string;
-        };
-        name: string;
-        'atlassian:state': string;
-        summary: string;
-        'atlassian:titlePrefix': {
-            text: string;
-            '@type': string;
-        };
-    };
-};
-export default _default;

package/dist/types-ts4.5/__fixtures__/confluence-template.d.ts

@@ -1,31 +0,0 @@
-declare const _default: {
-    data: {
-        '@context': {
-            '@vocab': string;
-            atlassian: string;
-            schema: string;
-        };
-        '@type': string[];
-        generator: {
-            '@id': string;
-            '@type': string;
-            name: string;
-        };
-        icon: undefined;
-        name: string;
-        summary: string;
-        'atlassian:titlePrefix': {
-            '@type': string;
-            text: string;
-        };
-        url: string;
-    };
-    meta: {
-        access: string;
-        auth: never[];
-        definitionId: string;
-        resourceType: string;
-        visibility: string;
-    };
-};
-export default _default;

package/dist/types-ts4.5/__fixtures__/figma.d.ts

@@ -1,43 +0,0 @@
-declare const _default: {
-    meta: {
-        access: string;
-        visibility: string;
-        auth: {
-            key: string;
-            displayName: string;
-            url: string;
-        }[];
-        definitionId: string;
-        key: string;
-        resourceType: string;
-        version: string;
-    };
-    data: {
-        url: string;
-        '@context': {
-            '@vocab': string;
-            atlassian: string;
-            schema: string;
-        };
-        '@type': string;
-        name: string;
-        updated: string;
-        image: {
-            '@type': string;
-            url: string;
-        };
-        generator: {
-            '@type': string;
-            name: string;
-            icon: {
-                '@type': string;
-                url: string;
-            };
-        };
-        preview: {
-            '@type': string;
-            href: string;
-        };
-    };
-};
-export default _default;

package/dist/types-ts4.5/__fixtures__/flexible-ui-data-context.d.ts

@@ -1,3 +0,0 @@
-import { FlexibleUiDataContext } from '../state/flexible-ui-context/types';
-declare const context: FlexibleUiDataContext;
-export default context;

package/dist/types-ts4.5/__fixtures__/jira-roadmap.d.ts

@@ -1,35 +0,0 @@
-declare const _default: {
-    meta: {
-        auth: never[];
-        definitionId: string;
-        visibility: string;
-        access: string;
-        resourceType: string;
-        key: string;
-    };
-    data: {
-        '@context': {
-            '@vocab': string;
-            atlassian: string;
-            schema: string;
-        };
-        generator: {
-            '@type': string;
-            '@id': string;
-            name: string;
-        };
-        '@type': string[];
-        url: string;
-        name: string;
-        summary: string;
-        icon: {
-            '@type': string;
-            url: string;
-        };
-        preview: {
-            href: string;
-            'atlassian:supportedPlatforms': string[];
-        };
-    };
-};
-export default _default;