@atlaskit/smart-card 26.43.6 → 26.43.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/dist/cjs/utils/analytics/analytics.js +1 -1
  3. package/dist/cjs/view/BlockCard/index.js +2 -9
  4. package/dist/cjs/view/EmbedCard/index.js +33 -73
  5. package/dist/cjs/view/HoverCard/components/HoverCardContent.js +4 -7
  6. package/dist/cjs/view/InlineCard/ErroredView/index.js +1 -2
  7. package/dist/cjs/view/InlineCard/ForbiddenView/index.js +5 -10
  8. package/dist/cjs/view/InlineCard/index.js +1 -7
  9. package/dist/cjs/view/LinkUrl/index.js +1 -1
  10. package/dist/es2019/utils/analytics/analytics.js +1 -1
  11. package/dist/es2019/view/BlockCard/index.js +2 -9
  12. package/dist/es2019/view/EmbedCard/index.js +33 -73
  13. package/dist/es2019/view/HoverCard/components/HoverCardContent.js +4 -7
  14. package/dist/es2019/view/InlineCard/ErroredView/index.js +1 -2
  15. package/dist/es2019/view/InlineCard/ForbiddenView/index.js +5 -10
  16. package/dist/es2019/view/InlineCard/index.js +1 -7
  17. package/dist/es2019/view/LinkUrl/index.js +1 -1
  18. package/dist/esm/utils/analytics/analytics.js +1 -1
  19. package/dist/esm/view/BlockCard/index.js +2 -9
  20. package/dist/esm/view/EmbedCard/index.js +33 -73
  21. package/dist/esm/view/HoverCard/components/HoverCardContent.js +4 -7
  22. package/dist/esm/view/InlineCard/ErroredView/index.js +1 -2
  23. package/dist/esm/view/InlineCard/ForbiddenView/index.js +5 -10
  24. package/dist/esm/view/InlineCard/index.js +1 -7
  25. package/dist/esm/view/LinkUrl/index.js +1 -1
  26. package/package.json +2 -5
  27. package/dist/cjs/view/BlockCard/views/flexible/FlexibleForbiddenViewOld.js +0 -84
  28. package/dist/cjs/view/BlockCard/views/flexible/FlexibleNotFoundViewOld.js +0 -48
  29. package/dist/cjs/view/EmbedCard/views/ForbiddenView.js +0 -75
  30. package/dist/cjs/view/EmbedCard/views/NotFoundView.js +0 -46
  31. package/dist/cjs/view/EmbedCard/views/UnauthorisedView.js +0 -87
  32. package/dist/es2019/view/BlockCard/views/flexible/FlexibleForbiddenViewOld.js +0 -76
  33. package/dist/es2019/view/BlockCard/views/flexible/FlexibleNotFoundViewOld.js +0 -38
  34. package/dist/es2019/view/EmbedCard/views/ForbiddenView.js +0 -69
  35. package/dist/es2019/view/EmbedCard/views/NotFoundView.js +0 -39
  36. package/dist/es2019/view/EmbedCard/views/UnauthorisedView.js +0 -77
  37. package/dist/esm/view/BlockCard/views/flexible/FlexibleForbiddenViewOld.js +0 -75
  38. package/dist/esm/view/BlockCard/views/flexible/FlexibleNotFoundViewOld.js +0 -42
  39. package/dist/esm/view/EmbedCard/views/ForbiddenView.js +0 -68
  40. package/dist/esm/view/EmbedCard/views/NotFoundView.js +0 -39
  41. package/dist/esm/view/EmbedCard/views/UnauthorisedView.js +0 -77
  42. package/dist/types/view/BlockCard/views/flexible/FlexibleForbiddenViewOld.d.ts +0 -8
  43. package/dist/types/view/BlockCard/views/flexible/FlexibleNotFoundViewOld.d.ts +0 -8
  44. package/dist/types/view/EmbedCard/views/ForbiddenView.d.ts +0 -17
  45. package/dist/types/view/EmbedCard/views/NotFoundView.d.ts +0 -15
  46. package/dist/types/view/EmbedCard/views/UnauthorisedView.d.ts +0 -20
  47. package/dist/types-ts4.5/view/BlockCard/views/flexible/FlexibleForbiddenViewOld.d.ts +0 -8
  48. package/dist/types-ts4.5/view/BlockCard/views/flexible/FlexibleNotFoundViewOld.d.ts +0 -8
  49. package/dist/types-ts4.5/view/EmbedCard/views/ForbiddenView.d.ts +0 -17
  50. package/dist/types-ts4.5/view/EmbedCard/views/NotFoundView.d.ts +0 -15
  51. package/dist/types-ts4.5/view/EmbedCard/views/UnauthorisedView.d.ts +0 -20
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @atlaskit/smart-card
2
2
 
3
+ ## 26.43.8
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies
8
+
9
+ ## 26.43.7
10
+
11
+ ### Patch Changes
12
+
13
+ - [#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
14
+
3
15
  ## 26.43.6
4
16
 
5
17
  ### Patch Changes
@@ -22,7 +22,7 @@ var ANALYTICS_CHANNEL = exports.ANALYTICS_CHANNEL = 'media';
22
22
  var context = exports.context = {
23
23
  componentName: 'smart-cards',
24
24
  packageName: "@atlaskit/smart-card",
25
- packageVersion: "26.43.6"
25
+ packageVersion: "26.43.8"
26
26
  };
27
27
  var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
28
28
  TrackQuickActionType["StatusUpdate"] = "StatusUpdate";
@@ -76,13 +76,10 @@ var _ErroredView = require("./views/ErroredView");
76
76
  var _FlexibleResolvedView = _interopRequireDefault(require("./views/flexible/FlexibleResolvedView"));
77
77
  var _FlexibleUnauthorisedView = _interopRequireDefault(require("./views/flexible/FlexibleUnauthorisedView"));
78
78
  var _FlexibleNotFoundView = _interopRequireDefault(require("./views/flexible/FlexibleNotFoundView"));
79
- var _FlexibleNotFoundViewOld = _interopRequireDefault(require("./views/flexible/FlexibleNotFoundViewOld"));
80
79
  var _FlexibleForbiddenView = _interopRequireDefault(require("./views/flexible/FlexibleForbiddenView"));
81
- var _FlexibleForbiddenViewOld = _interopRequireDefault(require("./views/flexible/FlexibleForbiddenViewOld"));
82
80
  var _FlexibleErroredView = _interopRequireDefault(require("./views/flexible/FlexibleErroredView"));
83
81
  var _react = require("@emotion/react");
84
82
  var _handlers = require("./utils/handlers");
85
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
86
83
  var _PreviewAction = _interopRequireDefault(require("./actions/PreviewAction"));
87
84
  /** @jsx jsx */
88
85
 
@@ -145,15 +142,11 @@ var BlockCard = exports.BlockCard = function BlockCard(_ref) {
145
142
  onAuthorize: handleAuthorize
146
143
  }));
147
144
  case 'forbidden':
148
- return (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join') ? (0, _react.jsx)(_FlexibleForbiddenView.default, (0, _extends2.default)({}, flexibleBlockCardProps, {
149
- onAuthorize: handleAuthorize
150
- })) : (0, _react.jsx)(_FlexibleForbiddenViewOld.default, (0, _extends2.default)({}, flexibleBlockCardProps, {
145
+ return (0, _react.jsx)(_FlexibleForbiddenView.default, (0, _extends2.default)({}, flexibleBlockCardProps, {
151
146
  onAuthorize: handleAuthorize
152
147
  }));
153
148
  case 'not_found':
154
- return (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join') ? (0, _react.jsx)(_FlexibleNotFoundView.default, (0, _extends2.default)({}, flexibleBlockCardProps, {
155
- onAuthorize: handleAuthorize
156
- })) : (0, _react.jsx)(_FlexibleNotFoundViewOld.default, (0, _extends2.default)({}, flexibleBlockCardProps, {
149
+ return (0, _react.jsx)(_FlexibleNotFoundView.default, (0, _extends2.default)({}, flexibleBlockCardProps, {
157
150
  onAuthorize: handleAuthorize
158
151
  }));
159
152
  case 'fallback':
@@ -7,27 +7,22 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.EmbedCard = void 0;
8
8
  var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
9
9
  var _react = _interopRequireDefault(require("react"));
10
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
11
10
  var _extractAccessContext = require("../../extractors/common/context/extractAccessContext");
12
11
  var _embed = require("../../extractors/embed");
13
12
  var _jsonld = require("../../utils/jsonld");
14
13
  var _inline = require("../../extractors/inline");
15
14
  var _block = require("../../extractors/block");
16
15
  var _helpers = require("../../state/helpers");
17
- var _context = require("../../extractors/common/context");
18
16
  var _BlockCard = require("../BlockCard");
19
17
  var _ResolvedView = require("../InlineCard/ResolvedView");
20
- var _ForbiddenView = require("./views/ForbiddenView");
21
- var _NotFoundView = require("./views/NotFoundView");
22
18
  var _ResolvedView2 = require("./views/ResolvedView");
23
- var _UnauthorisedView = require("./views/UnauthorisedView");
24
19
  var _ErroredView = require("./views/ErroredView");
25
20
  var _forbiddenView = _interopRequireDefault(require("./views/forbidden-view"));
26
21
  var _notFoundView = _interopRequireDefault(require("./views/not-found-view"));
27
22
  var _unauthorizedView = _interopRequireDefault(require("./views/unauthorized-view"));
28
23
  var _analyticsNext = require("@atlaskit/analytics-next");
29
24
  var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(function (_ref, iframeRef) {
30
- var _details$meta, _forbiddenViewProps$c3;
25
+ var _details$meta, _forbiddenViewProps$c, _forbiddenViewProps$c2, _notFoundViewProps$co, _notFoundViewProps$co2;
31
26
  var url = _ref.url,
32
27
  _ref$cardState = _ref.cardState,
33
28
  status = _ref$cardState.status,
@@ -115,30 +110,18 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
115
110
  });
116
111
  }
117
112
  var unauthorisedViewProps = (0, _embed.extractEmbedProps)(data, meta, platform);
118
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join')) {
119
- return /*#__PURE__*/_react.default.createElement(_unauthorizedView.default, {
120
- analytics: analytics,
121
- context: unauthorisedViewProps.context,
122
- extensionKey: extensionKey,
123
- isProductIntegrationSupported: isProductIntegrationSupported,
124
- inheritDimensions: inheritDimensions,
125
- isSelected: isSelected,
126
- onAuthorize: handleAuthorize,
127
- onClick: handleFrameClick,
128
- testId: testId,
129
- url: unauthorisedViewProps.link
130
- });
131
- }
132
- return /*#__PURE__*/_react.default.createElement(_UnauthorisedView.EmbedCardUnauthorisedView, (0, _extends2.default)({}, unauthorisedViewProps, {
133
- isSelected: isSelected,
134
- onAuthorise: handleAuthorize,
135
- inheritDimensions: inheritDimensions,
136
- onClick: handleFrameClick,
113
+ return /*#__PURE__*/_react.default.createElement(_unauthorizedView.default, {
137
114
  analytics: analytics,
115
+ context: unauthorisedViewProps.context,
138
116
  extensionKey: extensionKey,
139
117
  isProductIntegrationSupported: isProductIntegrationSupported,
140
- testId: testId
141
- }));
118
+ inheritDimensions: inheritDimensions,
119
+ isSelected: isSelected,
120
+ onAuthorize: handleAuthorize,
121
+ onClick: handleFrameClick,
122
+ testId: testId,
123
+ url: unauthorisedViewProps.link
124
+ });
142
125
  case 'forbidden':
143
126
  if (onError) {
144
127
  onError({
@@ -158,36 +141,21 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
158
141
  ref: iframeRef
159
142
  }));
160
143
  }
161
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join')) {
162
- var _forbiddenViewProps$c, _forbiddenViewProps$c2;
163
- var accessContext = (0, _extractAccessContext.extractRequestAccessContextImproved)({
164
- jsonLd: cardMetadata,
165
- url: url,
166
- product: (_forbiddenViewProps$c = (_forbiddenViewProps$c2 = forbiddenViewProps.context) === null || _forbiddenViewProps$c2 === void 0 ? void 0 : _forbiddenViewProps$c2.text) !== null && _forbiddenViewProps$c !== void 0 ? _forbiddenViewProps$c : '',
167
- createAnalyticsEvent: createAnalyticsEvent
168
- });
169
- return /*#__PURE__*/_react.default.createElement(_forbiddenView.default, {
170
- context: forbiddenViewProps.context,
171
- inheritDimensions: inheritDimensions,
172
- isSelected: isSelected,
173
- onAuthorize: handleAuthorize,
174
- onClick: handleFrameClick,
175
- accessContext: accessContext,
176
- url: forbiddenViewProps.link
177
- });
178
- }
179
- var requestAccessContext = (0, _context.extractRequestAccessContext)({
144
+ var forbiddenAccessContext = (0, _extractAccessContext.extractRequestAccessContextImproved)({
180
145
  jsonLd: cardMetadata,
181
146
  url: url,
182
- context: (_forbiddenViewProps$c3 = forbiddenViewProps.context) === null || _forbiddenViewProps$c3 === void 0 ? void 0 : _forbiddenViewProps$c3.text
147
+ product: (_forbiddenViewProps$c = (_forbiddenViewProps$c2 = forbiddenViewProps.context) === null || _forbiddenViewProps$c2 === void 0 ? void 0 : _forbiddenViewProps$c2.text) !== null && _forbiddenViewProps$c !== void 0 ? _forbiddenViewProps$c : '',
148
+ createAnalyticsEvent: createAnalyticsEvent
183
149
  });
184
- return /*#__PURE__*/_react.default.createElement(_ForbiddenView.EmbedCardForbiddenView, (0, _extends2.default)({}, forbiddenViewProps, {
185
- isSelected: isSelected,
186
- onAuthorise: handleAuthorize,
150
+ return /*#__PURE__*/_react.default.createElement(_forbiddenView.default, {
151
+ context: forbiddenViewProps.context,
187
152
  inheritDimensions: inheritDimensions,
153
+ isSelected: isSelected,
154
+ onAuthorize: handleAuthorize,
188
155
  onClick: handleFrameClick,
189
- requestAccessContext: requestAccessContext
190
- }));
156
+ accessContext: forbiddenAccessContext,
157
+ url: forbiddenViewProps.link
158
+ });
191
159
  case 'not_found':
192
160
  if (onError) {
193
161
  onError({
@@ -196,28 +164,20 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/_react.default.forwardRef(funct
196
164
  });
197
165
  }
198
166
  var notFoundViewProps = (0, _embed.extractEmbedProps)(data, meta, platform);
199
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join')) {
200
- var _notFoundViewProps$co, _notFoundViewProps$co2;
201
- var _accessContext = details !== null && details !== void 0 && details.meta ? (0, _extractAccessContext.extractRequestAccessContextImproved)({
202
- jsonLd: details === null || details === void 0 ? void 0 : details.meta,
203
- url: url,
204
- product: (_notFoundViewProps$co = (_notFoundViewProps$co2 = notFoundViewProps.context) === null || _notFoundViewProps$co2 === void 0 ? void 0 : _notFoundViewProps$co2.text) !== null && _notFoundViewProps$co !== void 0 ? _notFoundViewProps$co : '',
205
- createAnalyticsEvent: createAnalyticsEvent
206
- }) : undefined;
207
- return /*#__PURE__*/_react.default.createElement(_notFoundView.default, {
208
- context: notFoundViewProps.context,
209
- inheritDimensions: inheritDimensions,
210
- isSelected: isSelected,
211
- onClick: handleFrameClick,
212
- accessContext: _accessContext,
213
- url: notFoundViewProps.link
214
- });
215
- }
216
- return /*#__PURE__*/_react.default.createElement(_NotFoundView.EmbedCardNotFoundView, (0, _extends2.default)({}, notFoundViewProps, {
217
- isSelected: isSelected,
167
+ var notFoundAccessContext = details !== null && details !== void 0 && details.meta ? (0, _extractAccessContext.extractRequestAccessContextImproved)({
168
+ jsonLd: details === null || details === void 0 ? void 0 : details.meta,
169
+ url: url,
170
+ product: (_notFoundViewProps$co = (_notFoundViewProps$co2 = notFoundViewProps.context) === null || _notFoundViewProps$co2 === void 0 ? void 0 : _notFoundViewProps$co2.text) !== null && _notFoundViewProps$co !== void 0 ? _notFoundViewProps$co : '',
171
+ createAnalyticsEvent: createAnalyticsEvent
172
+ }) : undefined;
173
+ return /*#__PURE__*/_react.default.createElement(_notFoundView.default, {
174
+ context: notFoundViewProps.context,
218
175
  inheritDimensions: inheritDimensions,
219
- onClick: handleFrameClick
220
- }));
176
+ isSelected: isSelected,
177
+ onClick: handleFrameClick,
178
+ accessContext: notFoundAccessContext,
179
+ url: notFoundViewProps.link
180
+ });
221
181
  case 'fallback':
222
182
  case 'errored':
223
183
  default:
@@ -27,7 +27,6 @@ var _messages = require("../../../messages");
27
27
  var _click = require("../../../utils/analytics/click");
28
28
  var _store = require("../../../state/store");
29
29
  var _forbidden = _interopRequireDefault(require("./views/forbidden"));
30
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
31
30
  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); }
32
31
  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; }
33
32
  /** @jsx jsx */
@@ -182,12 +181,10 @@ var HoverCardContent = function HoverCardContent(_ref) {
182
181
  url: url
183
182
  });
184
183
  }
185
- if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join')) {
186
- if (cardState.status === 'forbidden' || cardState.status === 'not_found') {
187
- return (0, _react.jsx)(_forbidden.default, {
188
- flexibleCardProps: flexibleCardProps
189
- });
190
- }
184
+ if (cardState.status === 'forbidden' || cardState.status === 'not_found') {
185
+ return (0, _react.jsx)(_forbidden.default, {
186
+ flexibleCardProps: flexibleCardProps
187
+ });
191
188
  }
192
189
  if (cardState.status === 'resolved') {
193
190
  return (0, _react.jsx)(_resolved.default, {
@@ -24,7 +24,6 @@ var _reactIntlNext = require("react-intl-next");
24
24
  var _styled = require("../styled");
25
25
  var _withFrameStyleControl = _interopRequireDefault(require("../utils/withFrameStyleControl"));
26
26
  var _HoverCard = require("../../HoverCard");
27
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
28
27
  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); }; }
29
28
  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; } }
30
29
  var InlineCardErroredView = exports.InlineCardErroredView = /*#__PURE__*/function (_React$Component) {
@@ -85,7 +84,7 @@ var InlineCardErroredView = exports.InlineCardErroredView = /*#__PURE__*/functio
85
84
  onClick: onClick,
86
85
  rightSide: message
87
86
  }), this.renderActionButton());
88
- if (this.props.showHoverPreview && (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join')) {
87
+ if (this.props.showHoverPreview) {
89
88
  return /*#__PURE__*/_react.default.createElement(_HoverCard.HoverCard, {
90
89
  url: url
91
90
  }, content);
@@ -27,7 +27,6 @@ var _lozenge = _interopRequireDefault(require("@atlaskit/lozenge"));
27
27
  var _styled2 = require("../IconAndTitleLayout/styled");
28
28
  var _withFrameStyleControl = _interopRequireDefault(require("../utils/withFrameStyleControl"));
29
29
  var _HoverCard = require("../../HoverCard");
30
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
31
30
  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); }; }
32
31
  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; } }
33
32
  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
66
65
  var _this$props3;
67
66
  if ((_this$props3 = _this.props) !== null && _this$props3 !== void 0 && (_this$props3 = _this$props3.requestAccessContext) !== null && _this$props3 !== void 0 && _this$props3.callToActionMessageKey) {
68
67
  var callToActionMessageKey = _this.props.requestAccessContext.callToActionMessageKey;
69
- var values = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join') ? {
70
- product: _this.props.context
71
- } : {
72
- context: _this.props.context
73
- };
74
68
  return /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.messages[callToActionMessageKey], {
75
- values: values
69
+ values: {
70
+ product: _this.props.context
71
+ }
76
72
  }));
77
73
  }
78
74
  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
84
80
  var onAuthorise = _this.props.onAuthorise;
85
81
  var ActionButton = (0, _withFrameStyleControl.default)(_customThemeButton.default, _this.frameRef);
86
82
  var accessType = (_this$props$requestAc = _this.props.requestAccessContext) === null || _this$props$requestAc === void 0 ? void 0 : _this$props$requestAc.accessType;
87
- var isButtonDisabled = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join') && accessType === 'PENDING_REQUEST_EXISTS';
88
83
  if (_this.state.hasRequestAccessContextMessage) {
89
84
  return /*#__PURE__*/_react.default.createElement(ActionButton, {
90
85
  spacing: "none",
@@ -92,7 +87,7 @@ var InlineCardForbiddenView = exports.InlineCardForbiddenView = /*#__PURE__*/fun
92
87
  component: _styled.IconStyledButton,
93
88
  testId: "button-connect-other-account",
94
89
  role: "button",
95
- isDisabled: isButtonDisabled
90
+ isDisabled: accessType === 'PENDING_REQUEST_EXISTS'
96
91
  }, _this.renderForbiddenAccessMessage());
97
92
  }
98
93
  if (onAuthorise) {
@@ -131,7 +126,7 @@ var InlineCardForbiddenView = exports.InlineCardForbiddenView = /*#__PURE__*/fun
131
126
  onClick: onClick,
132
127
  titleColor: "var(--ds-text-subtle, ".concat(_colors.N500, ")")
133
128
  }), this.renderActionButton());
134
- if (this.props.showHoverPreview && (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join')) {
129
+ if (this.props.showHoverPreview) {
135
130
  return /*#__PURE__*/_react.default.createElement(_HoverCard.HoverCard, {
136
131
  url: url
137
132
  }, content);
@@ -40,7 +40,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
40
40
  var _react = _interopRequireWildcard(require("react"));
41
41
  var _jsonld = require("../../utils/jsonld");
42
42
  var _inline = require("../../extractors/inline");
43
- var _context = require("../../extractors/common/context");
44
43
  var _extractAccessContext = require("../../extractors/common/context/extractAccessContext");
45
44
  var _LinkView = require("../LinkView");
46
45
  var _ErroredView = require("./ErroredView");
@@ -51,7 +50,6 @@ var _UnauthorisedView = require("./UnauthorisedView");
51
50
  var _linkExtractors = require("@atlaskit/link-extractors");
52
51
  var _linkProvider = require("@atlaskit/link-provider");
53
52
  var _helpers = require("../../state/helpers");
54
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
55
53
  var _analyticsNext = require("@atlaskit/analytics-next");
56
54
  var _constants = require("../../constants");
57
55
  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) {
147
145
  case 'forbidden':
148
146
  var providerForbidden = (0, _linkExtractors.extractProvider)(cardDetails);
149
147
  var cardMetadata = (_details$meta = details === null || details === void 0 ? void 0 : details.meta) !== null && _details$meta !== void 0 ? _details$meta : (0, _jsonld.getForbiddenJsonLd)().meta;
150
- var requestAccessContext = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.smart-card.cross-join') ? (0, _extractAccessContext.extractRequestAccessContextImproved)({
148
+ var requestAccessContext = (0, _extractAccessContext.extractRequestAccessContextImproved)({
151
149
  jsonLd: cardMetadata,
152
150
  url: url,
153
151
  product: (_providerForbidden$te = providerForbidden === null || providerForbidden === void 0 ? void 0 : providerForbidden.text) !== null && _providerForbidden$te !== void 0 ? _providerForbidden$te : '',
154
152
  createAnalyticsEvent: createAnalyticsEvent
155
- }) : (0, _context.extractRequestAccessContext)({
156
- jsonLd: cardMetadata,
157
- url: url,
158
- context: providerForbidden === null || providerForbidden === void 0 ? void 0 : providerForbidden.text
159
153
  });
160
154
  return /*#__PURE__*/_react.default.createElement(_ForbiddenView.InlineCardForbiddenView, {
161
155
  url: url,
@@ -17,7 +17,7 @@ var _excluded = ["href", "children", "checkSafety", "onClick", "testId"],
17
17
  _excluded2 = ["isLinkSafe", "showSafetyWarningModal"];
18
18
  var PACKAGE_DATA = {
19
19
  packageName: "@atlaskit/smart-card",
20
- packageVersion: "26.43.6",
20
+ packageVersion: "26.43.8",
21
21
  componentName: 'linkUrl'
22
22
  };
23
23
  var Link = (0, _click.withLinkClickedEvent)('a');
@@ -4,7 +4,7 @@ export const ANALYTICS_CHANNEL = 'media';
4
4
  export const context = {
5
5
  componentName: 'smart-cards',
6
6
  packageName: "@atlaskit/smart-card",
7
- packageVersion: "26.43.6"
7
+ packageVersion: "26.43.8"
8
8
  };
9
9
  export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
10
10
  TrackQuickActionType["StatusUpdate"] = "StatusUpdate";
@@ -17,13 +17,10 @@ import { ErroredView as BlockCardErroredView } from './views/ErroredView';
17
17
  import FlexibleResolvedView from './views/flexible/FlexibleResolvedView';
18
18
  import FlexibleUnauthorisedView from './views/flexible/FlexibleUnauthorisedView';
19
19
  import FlexibleNotFoundView from './views/flexible/FlexibleNotFoundView';
20
- import FlexibleNotFoundViewOld from './views/flexible/FlexibleNotFoundViewOld';
21
20
  import FlexibleForbiddenView from './views/flexible/FlexibleForbiddenView';
22
- import FlexibleForbiddenViewOld from './views/flexible/FlexibleForbiddenViewOld';
23
21
  import FlexibleErroredView from './views/flexible/FlexibleErroredView';
24
22
  import { jsx } from '@emotion/react';
25
23
  import { handleClickCommon } from './utils/handlers';
26
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
27
24
  export { default as PreviewAction } from './actions/PreviewAction';
28
25
  export { ForbiddenAction, AuthorizeAction, BlockCardResolvedView, BlockCardResolvingView, BlockCardUnauthorisedView, BlockCardForbiddenView, BlockCardErroredView, BlockCardNotFoundView };
29
26
  export const BlockCard = ({
@@ -86,15 +83,11 @@ export const BlockCard = ({
86
83
  onAuthorize: handleAuthorize
87
84
  }));
88
85
  case 'forbidden':
89
- return getBooleanFF('platform.linking-platform.smart-card.cross-join') ? jsx(FlexibleForbiddenView, _extends({}, flexibleBlockCardProps, {
90
- onAuthorize: handleAuthorize
91
- })) : jsx(FlexibleForbiddenViewOld, _extends({}, flexibleBlockCardProps, {
86
+ return jsx(FlexibleForbiddenView, _extends({}, flexibleBlockCardProps, {
92
87
  onAuthorize: handleAuthorize
93
88
  }));
94
89
  case 'not_found':
95
- return getBooleanFF('platform.linking-platform.smart-card.cross-join') ? jsx(FlexibleNotFoundView, _extends({}, flexibleBlockCardProps, {
96
- onAuthorize: handleAuthorize
97
- })) : jsx(FlexibleNotFoundViewOld, _extends({}, flexibleBlockCardProps, {
90
+ return jsx(FlexibleNotFoundView, _extends({}, flexibleBlockCardProps, {
98
91
  onAuthorize: handleAuthorize
99
92
  }));
100
93
  case 'fallback':
@@ -1,19 +1,14 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import React from 'react';
3
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
4
3
  import { extractRequestAccessContextImproved } from '../../extractors/common/context/extractAccessContext';
5
4
  import { extractEmbedProps } from '../../extractors/embed';
6
5
  import { getEmptyJsonLd, getForbiddenJsonLd } from '../../utils/jsonld';
7
6
  import { extractInlineProps } from '../../extractors/inline';
8
7
  import { extractBlockProps } from '../../extractors/block';
9
8
  import { getExtensionKey, hasAuthScopeOverrides } from '../../state/helpers';
10
- import { extractRequestAccessContext } from '../../extractors/common/context';
11
9
  import { BlockCardResolvedView, BlockCardResolvingView } from '../BlockCard';
12
10
  import { InlineCardResolvedView } from '../InlineCard/ResolvedView';
13
- import { EmbedCardForbiddenView } from './views/ForbiddenView';
14
- import { EmbedCardNotFoundView } from './views/NotFoundView';
15
11
  import { EmbedCardResolvedView } from './views/ResolvedView';
16
- import { EmbedCardUnauthorisedView } from './views/UnauthorisedView';
17
12
  import { EmbedCardErroredView } from './views/ErroredView';
18
13
  import ForbiddenView from './views/forbidden-view';
19
14
  import NotFoundView from './views/not-found-view';
@@ -43,7 +38,7 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
43
38
  onIframeFocus,
44
39
  iframeUrlType
45
40
  }, iframeRef) => {
46
- var _details$meta, _forbiddenViewProps$c3;
41
+ var _details$meta, _forbiddenViewProps$c, _forbiddenViewProps$c2, _notFoundViewProps$co, _notFoundViewProps$co2;
47
42
  const {
48
43
  createAnalyticsEvent
49
44
  } = useAnalyticsEvents();
@@ -111,30 +106,18 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
111
106
  });
112
107
  }
113
108
  const unauthorisedViewProps = extractEmbedProps(data, meta, platform);
114
- if (getBooleanFF('platform.linking-platform.smart-card.cross-join')) {
115
- return /*#__PURE__*/React.createElement(UnauthorizedView, {
116
- analytics: analytics,
117
- context: unauthorisedViewProps.context,
118
- extensionKey: extensionKey,
119
- isProductIntegrationSupported: isProductIntegrationSupported,
120
- inheritDimensions: inheritDimensions,
121
- isSelected: isSelected,
122
- onAuthorize: handleAuthorize,
123
- onClick: handleFrameClick,
124
- testId: testId,
125
- url: unauthorisedViewProps.link
126
- });
127
- }
128
- return /*#__PURE__*/React.createElement(EmbedCardUnauthorisedView, _extends({}, unauthorisedViewProps, {
129
- isSelected: isSelected,
130
- onAuthorise: handleAuthorize,
131
- inheritDimensions: inheritDimensions,
132
- onClick: handleFrameClick,
109
+ return /*#__PURE__*/React.createElement(UnauthorizedView, {
133
110
  analytics: analytics,
111
+ context: unauthorisedViewProps.context,
134
112
  extensionKey: extensionKey,
135
113
  isProductIntegrationSupported: isProductIntegrationSupported,
136
- testId: testId
137
- }));
114
+ inheritDimensions: inheritDimensions,
115
+ isSelected: isSelected,
116
+ onAuthorize: handleAuthorize,
117
+ onClick: handleFrameClick,
118
+ testId: testId,
119
+ url: unauthorisedViewProps.link
120
+ });
138
121
  case 'forbidden':
139
122
  if (onError) {
140
123
  onError({
@@ -154,36 +137,21 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
154
137
  ref: iframeRef
155
138
  }));
156
139
  }
157
- if (getBooleanFF('platform.linking-platform.smart-card.cross-join')) {
158
- var _forbiddenViewProps$c, _forbiddenViewProps$c2;
159
- const accessContext = extractRequestAccessContextImproved({
160
- jsonLd: cardMetadata,
161
- url,
162
- product: (_forbiddenViewProps$c = (_forbiddenViewProps$c2 = forbiddenViewProps.context) === null || _forbiddenViewProps$c2 === void 0 ? void 0 : _forbiddenViewProps$c2.text) !== null && _forbiddenViewProps$c !== void 0 ? _forbiddenViewProps$c : '',
163
- createAnalyticsEvent
164
- });
165
- return /*#__PURE__*/React.createElement(ForbiddenView, {
166
- context: forbiddenViewProps.context,
167
- inheritDimensions: inheritDimensions,
168
- isSelected: isSelected,
169
- onAuthorize: handleAuthorize,
170
- onClick: handleFrameClick,
171
- accessContext: accessContext,
172
- url: forbiddenViewProps.link
173
- });
174
- }
175
- const requestAccessContext = extractRequestAccessContext({
140
+ const forbiddenAccessContext = extractRequestAccessContextImproved({
176
141
  jsonLd: cardMetadata,
177
142
  url,
178
- context: (_forbiddenViewProps$c3 = forbiddenViewProps.context) === null || _forbiddenViewProps$c3 === void 0 ? void 0 : _forbiddenViewProps$c3.text
143
+ product: (_forbiddenViewProps$c = (_forbiddenViewProps$c2 = forbiddenViewProps.context) === null || _forbiddenViewProps$c2 === void 0 ? void 0 : _forbiddenViewProps$c2.text) !== null && _forbiddenViewProps$c !== void 0 ? _forbiddenViewProps$c : '',
144
+ createAnalyticsEvent
179
145
  });
180
- return /*#__PURE__*/React.createElement(EmbedCardForbiddenView, _extends({}, forbiddenViewProps, {
181
- isSelected: isSelected,
182
- onAuthorise: handleAuthorize,
146
+ return /*#__PURE__*/React.createElement(ForbiddenView, {
147
+ context: forbiddenViewProps.context,
183
148
  inheritDimensions: inheritDimensions,
149
+ isSelected: isSelected,
150
+ onAuthorize: handleAuthorize,
184
151
  onClick: handleFrameClick,
185
- requestAccessContext: requestAccessContext
186
- }));
152
+ accessContext: forbiddenAccessContext,
153
+ url: forbiddenViewProps.link
154
+ });
187
155
  case 'not_found':
188
156
  if (onError) {
189
157
  onError({
@@ -192,28 +160,20 @@ export const EmbedCard = /*#__PURE__*/React.forwardRef(({
192
160
  });
193
161
  }
194
162
  const notFoundViewProps = extractEmbedProps(data, meta, platform);
195
- if (getBooleanFF('platform.linking-platform.smart-card.cross-join')) {
196
- var _notFoundViewProps$co, _notFoundViewProps$co2;
197
- const accessContext = details !== null && details !== void 0 && details.meta ? extractRequestAccessContextImproved({
198
- jsonLd: details === null || details === void 0 ? void 0 : details.meta,
199
- url,
200
- product: (_notFoundViewProps$co = (_notFoundViewProps$co2 = notFoundViewProps.context) === null || _notFoundViewProps$co2 === void 0 ? void 0 : _notFoundViewProps$co2.text) !== null && _notFoundViewProps$co !== void 0 ? _notFoundViewProps$co : '',
201
- createAnalyticsEvent
202
- }) : undefined;
203
- return /*#__PURE__*/React.createElement(NotFoundView, {
204
- context: notFoundViewProps.context,
205
- inheritDimensions: inheritDimensions,
206
- isSelected: isSelected,
207
- onClick: handleFrameClick,
208
- accessContext: accessContext,
209
- url: notFoundViewProps.link
210
- });
211
- }
212
- return /*#__PURE__*/React.createElement(EmbedCardNotFoundView, _extends({}, notFoundViewProps, {
213
- isSelected: isSelected,
163
+ const notFoundAccessContext = details !== null && details !== void 0 && details.meta ? extractRequestAccessContextImproved({
164
+ jsonLd: details === null || details === void 0 ? void 0 : details.meta,
165
+ url,
166
+ product: (_notFoundViewProps$co = (_notFoundViewProps$co2 = notFoundViewProps.context) === null || _notFoundViewProps$co2 === void 0 ? void 0 : _notFoundViewProps$co2.text) !== null && _notFoundViewProps$co !== void 0 ? _notFoundViewProps$co : '',
167
+ createAnalyticsEvent
168
+ }) : undefined;
169
+ return /*#__PURE__*/React.createElement(NotFoundView, {
170
+ context: notFoundViewProps.context,
214
171
  inheritDimensions: inheritDimensions,
215
- onClick: handleFrameClick
216
- }));
172
+ isSelected: isSelected,
173
+ onClick: handleFrameClick,
174
+ accessContext: notFoundAccessContext,
175
+ url: notFoundViewProps.link
176
+ });
217
177
  case 'fallback':
218
178
  case 'errored':
219
179
  default:
@@ -18,7 +18,6 @@ import { messages } from '../../../messages';
18
18
  import { fireLinkClickedEvent } from '../../../utils/analytics/click';
19
19
  import { useSmartCardState } from '../../../state/store';
20
20
  import HoverCardForbiddenView from './views/forbidden';
21
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
22
21
  export const hoverCardClassName = 'smart-links-hover-preview';
23
22
  export const getCopyAction = url => ({
24
23
  name: ActionName.CustomAction,
@@ -143,12 +142,10 @@ const HoverCardContent = ({
143
142
  url: url
144
143
  });
145
144
  }
146
- if (getBooleanFF('platform.linking-platform.smart-card.cross-join')) {
147
- if (cardState.status === 'forbidden' || cardState.status === 'not_found') {
148
- return jsx(HoverCardForbiddenView, {
149
- flexibleCardProps: flexibleCardProps
150
- });
151
- }
145
+ if (cardState.status === 'forbidden' || cardState.status === 'not_found') {
146
+ return jsx(HoverCardForbiddenView, {
147
+ flexibleCardProps: flexibleCardProps
148
+ });
152
149
  }
153
150
  if (cardState.status === 'resolved') {
154
151
  return jsx(HoverCardResolvedView, {
@@ -11,7 +11,6 @@ import { FormattedMessage } from 'react-intl-next';
11
11
  import { IconStyledButton } from '../styled';
12
12
  import withFrameStyleControl from '../utils/withFrameStyleControl';
13
13
  import { HoverCard } from '../../HoverCard';
14
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
15
14
  export class InlineCardErroredView extends React.Component {
16
15
  constructor(...args) {
17
16
  super(...args);
@@ -64,7 +63,7 @@ export class InlineCardErroredView extends React.Component {
64
63
  onClick: onClick,
65
64
  rightSide: message
66
65
  }), this.renderActionButton());
67
- if (this.props.showHoverPreview && getBooleanFF('platform.linking-platform.smart-card.cross-join')) {
66
+ if (this.props.showHoverPreview) {
68
67
  return /*#__PURE__*/React.createElement(HoverCard, {
69
68
  url: url
70
69
  }, content);