@atlaskit/smart-card 42.3.3 → 42.3.5

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/smart-card
 
+## 42.3.5
+
+### Patch Changes
+
+- [`0f97c81f07f53`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0f97c81f07f53) -
+  Internal logic change for `placeholderData` (unreleased prop) so it's used exclusively for
+  rendering purposes.
+- [`2d0bdb4a28fef`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2d0bdb4a28fef) -
+  Feature gate cleanup: navx-1834-refactor-resolved-hyperlink
+- Updated dependencies
+
+## 42.3.4
+
+### Patch Changes
+
+- [`be5ef92ed4c0d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/be5ef92ed4c0d) -
+  [ux] Updated Follow space to Follow Project
+
 ## 42.3.3
 
 ### Patch Changes

package/dist/cjs/messages.js

@@ -800,11 +800,6 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: 'Follow to get notifications on this space',
     description: 'Description on what Follow does'
   },
-  follow_projectGalaxia: {
-    id: 'fabric.linking.follow_project-galaxia',
-    defaultMessage: 'Follow space',
-    description: 'Click to follow a project.'
-  },
   follow_project_errorGalaxia: {
     id: 'fabric.linking.follow_project_error-galaxia',
     defaultMessage: 'We encountered an error while trying to follow the space. Check your connection or refresh the page and try again.',
@@ -815,11 +810,6 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: 'Unfollow to stop receiving space notifications',
     description: 'Description on what Unfollow does'
   },
-  unfollow_projectGalaxia: {
-    id: 'fabric.linking.unfollow_project-galaxia',
-    defaultMessage: 'Unfollow space',
-    description: 'Click to unfollow a project.'
-  },
   unfollow_project_errorGalaxia: {
     id: 'fabric.linking.unfollow_project_error-galaxia',
     defaultMessage: 'We encountered an error while trying to unfollow the space. Check your connection or refresh the page and try again.',

package/dist/cjs/state/actions/index.js

@@ -11,14 +11,13 @@ var _react = require("react");
 var _linkProvider = require("@atlaskit/link-provider");
 var _linkingCommon = require("@atlaskit/linking-common");
 var _outboundAuthFlowClient = require("@atlaskit/outbound-auth-flow-client");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _useAnalyticsEvents2 = require("../../common/analytics/generated/use-analytics-events");
 var _constants = require("../../constants");
 var _analytics = require("../analytics");
 var _helpers = require("../helpers");
 var _useInvokeClientAction = _interopRequireDefault(require("../hooks/use-invoke-client-action"));
 var _useResolve = _interopRequireDefault(require("../hooks/use-resolve"));
-var useSmartCardActions = exports.useSmartCardActions = function useSmartCardActions(id, url, placeholderData) {
+var useSmartCardActions = exports.useSmartCardActions = function useSmartCardActions(id, url) {
   var resolveUrl = (0, _useResolve.default)();
   var invokeClientAction = (0, _useInvokeClientAction.default)({});
   var _useAnalyticsEvents = (0, _useAnalyticsEvents2.useAnalyticsEvents)(),
@@ -28,9 +27,8 @@ var useSmartCardActions = exports.useSmartCardActions = function useSmartCardAct
   var getState = store.getState,
     dispatch = store.dispatch;
   var getSmartLinkState = (0, _react.useCallback)(function () {
-    var _ref2, _getState$url;
-    var placeholderObject = (0, _platformFeatureFlags.fg)('platform_initial_data_for_smart_cards') ? placeholderData : undefined;
-    var _ref = (_ref2 = (_getState$url = getState()[url]) !== null && _getState$url !== void 0 ? _getState$url : placeholderObject) !== null && _ref2 !== void 0 ? _ref2 : {
+    var _getState$url;
+    var _ref = (_getState$url = getState()[url]) !== null && _getState$url !== void 0 ? _getState$url : {
         status: _constants.SmartLinkStatus.Pending
       },
       details = _ref.details,
@@ -41,7 +39,7 @@ var useSmartCardActions = exports.useSmartCardActions = function useSmartCardAct
       status: status,
       metadataStatus: metadataStatus
     };
-  }, [getState, url, placeholderData]);
+  }, [getState, url]);
   var setMetadataStatus = (0, _react.useCallback)(function (metadataStatus) {
     dispatch((0, _linkingCommon.cardAction)(_linkingCommon.ACTION_UPDATE_METADATA_STATUS, {
       url: url
@@ -154,7 +152,7 @@ var useSmartCardActions = exports.useSmartCardActions = function useSmartCardAct
     }
   }, [getSmartLinkState, id, reload, fireEvent]);
   var invoke = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(opts, appearance) {
+    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(opts, appearance) {
       var key, action, source;
       return _regenerator.default.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -181,7 +179,7 @@ var useSmartCardActions = exports.useSmartCardActions = function useSmartCardAct
       }, _callee2);
     }));
     return function (_x, _x2) {
-      return _ref4.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }(), [invokeClientAction]);
   return (0, _react.useMemo)(function () {

package/dist/cjs/state/hooks/useSmartLink.js

@@ -12,13 +12,13 @@ var _actions = require("../actions");
 var _config = require("../config");
 var _renderers = require("../renderers");
 var _store = require("../store");
-function useSmartLink(id, url, placeholderData) {
-  var state = (0, _store.useSmartCardState)(url, placeholderData);
+function useSmartLink(id, url) {
+  var state = (0, _store.useSmartCardState)(url);
   var _useSmartLinkContext = (0, _linkProvider.useSmartLinkContext)(),
     store = _useSmartLinkContext.store,
     isPreviewPanelAvailable = _useSmartLinkContext.isPreviewPanelAvailable,
     openPreviewPanel = _useSmartLinkContext.openPreviewPanel;
-  var actions = (0, _actions.useSmartCardActions)(id, url, placeholderData);
+  var actions = (0, _actions.useSmartCardActions)(id, url);
   var config = (0, _config.useSmartLinkConfig)();
   var renderers = (0, _renderers.useSmartLinkRenderers)();
 

package/dist/cjs/state/store/index.js

@@ -6,18 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.useSmartCardState = useSmartCardState;
 var _withSelector = require("use-sync-external-store/shim/with-selector");
 var _linkProvider = require("@atlaskit/link-provider");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var PENDING_STATE = {
   status: 'pending'
 };
-function useSmartCardState(url, placeholderData) {
+function useSmartCardState(url) {
   var _useSmartLinkContext = (0, _linkProvider.useSmartLinkContext)(),
     store = _useSmartLinkContext.store;
   var cardState = (0, _withSelector.useSyncExternalStoreWithSelector)(store.subscribe, store.getState, store.getState, function (state) {
     return state[url];
   });
-  if ((0, _platformFeatureFlags.fg)('platform_initial_data_for_smart_cards')) {
-    return (cardState === null || cardState === void 0 ? void 0 : cardState.status) !== 'resolved' && placeholderData ? placeholderData : cardState !== null && cardState !== void 0 ? cardState : PENDING_STATE;
-  }
   return cardState !== null && cardState !== void 0 ? cardState : PENDING_STATE;
 }

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

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

package/dist/cjs/view/CardWithUrl/component.js

@@ -67,22 +67,9 @@ function Component(_ref) {
   var isFlexibleUi = (0, _react.useMemo)(function () {
     return (0, _flexible.isFlexibleUiCard)(children, ui);
   }, [children, ui]);
-  var structuredPlaceholderData = (0, _platformFeatureFlags.fg)('platform_initial_data_for_smart_cards') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  (0, _react.useMemo)(function () {
-    // execute some basic validation logic to ensure we should consider using placeholder data
-    if (appearance === 'inline' && isValidPlaceholderData(placeholderData)) {
-      var data = {
-        status: 'resolved',
-        metadataStatus: undefined,
-        details: placeholderData
-      };
-      return data;
-    }
-  }, [appearance, placeholderData]) : undefined;
 
   // Get state, actions for this card.
-  var _useSmartLink = (0, _state.useSmartLink)(id, url, (0, _platformFeatureFlags.fg)('platform_initial_data_for_smart_cards') ? structuredPlaceholderData : undefined),
+  var _useSmartLink = (0, _state.useSmartLink)(id, url),
     state = _useSmartLink.state,
     actions = _useSmartLink.actions,
     config = _useSmartLink.config,
@@ -242,6 +229,19 @@ function Component(_ref) {
       display: isFlexibleUi ? 'flexible' : appearance
     });
   }, [id, appearance, definitionId, isFlexibleUi, fireEvent]);
+  var structuredPlaceholderData = (0, _platformFeatureFlags.fg)('platform_initial_data_for_smart_cards') ?
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  (0, _react.useMemo)(function () {
+    // execute some basic validation logic to ensure we should consider using placeholder data
+    if (isFlexibleUi && isValidPlaceholderData(placeholderData)) {
+      var data = {
+        status: 'resolved',
+        metadataStatus: undefined,
+        details: placeholderData
+      };
+      return data;
+    }
+  }, [isFlexibleUi, placeholderData]) : undefined;
   if (isFlexibleUi) {
     var cardState = state;
     if (error) {
@@ -256,6 +256,7 @@ function Component(_ref) {
     return /*#__PURE__*/_react.default.createElement(_FlexibleCard.default, {
       id: id,
       cardState: cardState,
+      placeholderData: (0, _platformFeatureFlags.fg)('platform_initial_data_for_smart_cards') ? structuredPlaceholderData : undefined,
       onAuthorize: services.length && handleAuthorize || undefined,
       onClick: handleClickWrapper,
       origin: "smartLinkCard",

package/dist/cjs/view/FlexibleCard/components/actions/follow-action/index.js

@@ -60,7 +60,7 @@ var FollowAction = function FollowAction(props) {
     data = (0, _objectWithoutProperties2.default)(actionData, _excluded);
   var isStackItem = props.as === 'stack-item';
   var message = value ? _messages.messages.follow : _messages.messages.unfollow;
-  var projectMessage = value ? _featureGateJsClient.default.getExperimentValue('project-terminology-refresh', 'isEnabled', false) ? _messages.messages.follow_projectGalaxia : _messages.messages.follow_project : _featureGateJsClient.default.getExperimentValue('project-terminology-refresh', 'isEnabled', false) ? _messages.messages.unfollow_projectGalaxia : _messages.messages.unfollow_project;
+  var projectMessage = value ? _messages.messages.follow_project : _messages.messages.unfollow_project;
   var goalMessage = value ? _messages.messages.follow_goal : _messages.messages.unfollow_goal;
   var stackMessage = isProject ? projectMessage : goalMessage;
   var label = isStackItem ? stackMessage : message;

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

@@ -9,6 +9,7 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _linkProvider = require("@atlaskit/link-provider");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _useAnalyticsEvents2 = require("../../common/analytics/generated/use-analytics-events");
 var _constants = require("../../constants");
 var _flexibleUiContext = require("../../state/flexible-ui-context");
@@ -17,6 +18,8 @@ var _useResolve = _interopRequireDefault(require("../../state/hooks/use-resolve"
 var _container = _interopRequireDefault(require("./components/container"));
 var _utils = require("./utils");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+var PENDING_LINK_STATUSES = [_constants.SmartLinkStatus.Pending, _constants.SmartLinkStatus.Resolving];
+
 /**
  * This represents a Flexible Card: a link represented by a card with metadata.
  * This is the container in which all Flexible UI Blocks and Elements exist.
@@ -28,6 +31,7 @@ var FlexibleCard = function FlexibleCard(_ref) {
   var _ref$appearance = _ref.appearance,
     appearance = _ref$appearance === void 0 ? 'flexible' : _ref$appearance,
     cardState = _ref.cardState,
+    placeholderData = _ref.placeholderData,
     children = _ref.children,
     id = _ref.id,
     onAuthorize = _ref.onAuthorize,
@@ -52,12 +56,16 @@ var FlexibleCard = function FlexibleCard(_ref) {
   var cardType = cardState.status,
     details = cardState.details;
   var status = cardType;
+  var shouldUsePlaceholderData = PENDING_LINK_STATUSES.includes(status) && placeholderData && (0, _platformFeatureFlags.fg)('platform_initial_data_for_smart_cards');
+  // if we have placeholder data it means we can internally use it
+  // as resolved data until the actual data comes back as one of the final statuses
+  var contextStatus = shouldUsePlaceholderData ? _constants.SmartLinkStatus.Resolved : status;
   var context = (0, _react.useMemo)(function () {
     return (0, _utils.getContextByStatus)({
       aiSummaryConfig: aiSummaryConfig,
       appearance: appearance,
       fireEvent: fireEvent,
-      response: details,
+      response: shouldUsePlaceholderData ? placeholderData.details : details,
       id: id,
       onAuthorize: onAuthorize,
       onClick: onClick,
@@ -65,19 +73,19 @@ var FlexibleCard = function FlexibleCard(_ref) {
       renderers: renderers,
       resolve: resolve,
       actionOptions: actionOptions,
-      status: status,
+      status: shouldUsePlaceholderData ? contextStatus : status,
       url: url,
       isPreviewPanelAvailable: isPreviewPanelAvailable,
       openPreviewPanel: openPreviewPanel
     });
-  }, [aiSummaryConfig, appearance, fireEvent, details, id, onAuthorize, onClick, origin, renderers, resolve, actionOptions, status, url, isPreviewPanelAvailable, openPreviewPanel]);
+  }, [aiSummaryConfig, appearance, fireEvent, shouldUsePlaceholderData, placeholderData === null || placeholderData === void 0 ? void 0 : placeholderData.details, details, id, onAuthorize, onClick, origin, renderers, resolve, actionOptions, contextStatus, status, url, isPreviewPanelAvailable, openPreviewPanel]);
   var flexibleCardContext = (0, _react.useMemo)(function () {
     return {
       data: context,
-      status: status,
+      status: (0, _platformFeatureFlags.fg)('platform_initial_data_for_smart_cards') ? contextStatus : status,
       ui: ui
     };
-  }, [context, status, ui]);
+  }, [context, contextStatus, status, ui]);
   var _ref2 = context || {},
     linkTitle = _ref2.linkTitle;
   var title = linkTitle === null || linkTitle === void 0 ? void 0 : linkTitle.text;

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

@@ -5,24 +5,20 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.HyperlinkWithSmartLinkResolver = void 0;
+exports.HyperlinkWithSmartLinkResolver = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactErrorBoundary = require("react-error-boundary");
 var _reactIntlNext = require("react-intl-next");
-var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
 var _linkExtractors = require("@atlaskit/link-extractors");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _state = require("../../../state");
 var _helpers = require("../../../state/helpers");
 var _useResolveHyperlink2 = _interopRequireDefault(require("../../../state/hooks/use-resolve-hyperlink"));
-var _useResolveHyperlinkValidator = _interopRequireWildcard(require("../../../state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator"));
+var _useResolveHyperlinkValidator = _interopRequireDefault(require("../../../state/hooks/use-resolve-hyperlink/useResolveHyperlinkValidator"));
 var _intlProvider = _interopRequireDefault(require("../../common/intl-provider"));
 var _useSmartLinkEvents = require("../../SmartLinkEvents/useSmartLinkEvents");
 var _Hyperlink = _interopRequireDefault(require("../Hyperlink"));
-var _errorBoundary = _interopRequireDefault(require("./error-boundary"));
-var _resolveHyperlink = require("./resolve-hyperlink");
 var _unauthorizeView = _interopRequireDefault(require("./unauthorize-view"));
 var _excluded = ["onClick"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
@@ -91,23 +87,4 @@ var HyperlinkWithSmartLinkResolver = exports.HyperlinkWithSmartLinkResolver = (0
   enforceContext: false
 }), _Hyperlink.default), {
   FallbackComponent: HyperlinkFallbackComponent
-});
-
-// Remove on navx-1834-refactor-resolved-hyperlink cleanup
-
-var HyperlinkResolver = function HyperlinkResolver(_ref2) {
-  var href = _ref2.href;
-  var hasSmartCardProvider = !!(0, _react.useContext)(_state.SmartCardContext);
-  var isSharePointResolveEnabled = _featureGateJsClient.default.getExperimentValue('platform_editor_resolve_hyperlinks_confluence', 'isEnabled', false) || _featureGateJsClient.default.getExperimentValue('platform_editor_resolve_hyperlinks_jira', 'isEnabled', false);
-  var isGoogleResolveEnabled = _featureGateJsClient.default.getExperimentValue('platform_editor_resolve_google_hyperlinks', 'isEnabled', false);
-  var shouldResolveSharePoint = (0, _useResolveHyperlinkValidator.isSharePointDomain)(href) && isSharePointResolveEnabled;
-  var shouldResolveGoogle = (0, _useResolveHyperlinkValidator.isGoogleDomain)(href) && isGoogleResolveEnabled;
-  var shouldResolveHyperlink = hasSmartCardProvider && (shouldResolveSharePoint || shouldResolveGoogle);
-  if (!shouldResolveHyperlink) {
-    return null;
-  }
-  return /*#__PURE__*/_react.default.createElement(_resolveHyperlink.ResolveHyperlink, {
-    href: href
-  });
-};
-var _default = exports.default = (0, _errorBoundary.default)(HyperlinkResolver);
+});

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

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,19 +12,17 @@ var _reactMagneticDi = require("react-magnetic-di");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
 var _link = _interopRequireDefault(require("@atlaskit/link"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _click = require("../../utils/analytics/click");
 var _LinkAnalyticsContext = require("../../utils/analytics/LinkAnalyticsContext");
 var _Hyperlink = _interopRequireDefault(require("./Hyperlink"));
-var _HyperlinkResolver = _interopRequireWildcard(require("./HyperlinkResolver"));
+var _HyperlinkResolver = require("./HyperlinkResolver");
 var _LinkWarningModal = _interopRequireDefault(require("./LinkWarningModal"));
 var _useLinkWarningModal2 = require("./LinkWarningModal/hooks/use-link-warning-modal");
 var _excluded = ["href", "children", "checkSafety", "onClick", "testId", "isLinkComponent", "enableResolve"],
   _excluded2 = ["isLinkSafe", "showSafetyWarningModal"];
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "0.0.0-development",
+  packageVersion: "42.3.4",
   componentName: 'linkUrl'
 };
 var Anchor = (0, _click.withLinkClickedEvent)('a');
@@ -48,30 +45,28 @@ var LinkUrl = function LinkUrl(_ref) {
     showSafetyWarningModal = _useLinkWarningModal.showSafetyWarningModal,
     linkWarningModalProps = (0, _objectWithoutProperties2.default)(_useLinkWarningModal, _excluded2);
   var resolveHyperlinkFG = _featureGateJsClient.default.checkGate('platform_editor_resolve_hyperlinks_killswitch');
-  if ((0, _platformFeatureFlags.fg)('navx-1834-refactor-resolved-hyperlink')) {
-    if (resolveHyperlinkFG) {
-      var _Link = enableResolve ? _HyperlinkResolver.HyperlinkWithSmartLinkResolver : _Hyperlink.default;
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_LinkAnalyticsContext.LinkAnalyticsContext, {
-        url: href,
-        display: "url"
-      }, /*#__PURE__*/_react.default.createElement(_Link, (0, _extends2.default)({
-        href: href,
-        isLinkComponent: isLinkComponent,
-        onClick: function onClick(e) {
-          if (!checkSafety) {
-            _onClick && _onClick(e);
-            return;
-          }
+  if (resolveHyperlinkFG) {
+    var _Link = enableResolve ? _HyperlinkResolver.HyperlinkWithSmartLinkResolver : _Hyperlink.default;
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_LinkAnalyticsContext.LinkAnalyticsContext, {
+      url: href,
+      display: "url"
+    }, /*#__PURE__*/_react.default.createElement(_Link, (0, _extends2.default)({
+      href: href,
+      isLinkComponent: isLinkComponent,
+      onClick: function onClick(e) {
+        if (!checkSafety) {
+          _onClick && _onClick(e);
+          return;
+        }
 
-          // Only call the onClick if the link is safe
-          if (isLinkSafe(e, href)) {
-            _onClick && _onClick(e);
-          } else {
-            showSafetyWarningModal(e, href);
-          }
+        // Only call the onClick if the link is safe
+        if (isLinkSafe(e, href)) {
+          _onClick && _onClick(e);
+        } else {
+          showSafetyWarningModal(e, href);
         }
-      }, props), children)), checkSafety && /*#__PURE__*/_react.default.createElement(_LinkWarningModal.default, linkWarningModalProps));
-    }
+      }
+    }, props), children)), checkSafety && /*#__PURE__*/_react.default.createElement(_LinkWarningModal.default, linkWarningModalProps));
   }
   var Link = isLinkComponent ? LinkComponent : Anchor;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_LinkAnalyticsContext.LinkAnalyticsContext, {
@@ -96,8 +91,6 @@ var LinkUrl = function LinkUrl(_ref) {
         showSafetyWarningModal(e, href);
       }
     }
-  }, props), children)), checkSafety && /*#__PURE__*/_react.default.createElement(_LinkWarningModal.default, linkWarningModalProps), enableResolve && href && resolveHyperlinkFG && !(0, _platformFeatureFlags.fg)('navx-1834-refactor-resolved-hyperlink') && /*#__PURE__*/_react.default.createElement(_HyperlinkResolver.default, {
-    href: href
-  }));
+  }, props), children)), checkSafety && /*#__PURE__*/_react.default.createElement(_LinkWarningModal.default, linkWarningModalProps));
 };
 var _default = exports.default = (0, _analyticsNext.withAnalyticsContext)(PACKAGE_DATA)(LinkUrl);

package/dist/es2019/messages.js

@@ -794,11 +794,6 @@ export const messages = defineMessages({
     defaultMessage: 'Follow to get notifications on this space',
     description: 'Description on what Follow does'
   },
-  follow_projectGalaxia: {
-    id: 'fabric.linking.follow_project-galaxia',
-    defaultMessage: 'Follow space',
-    description: 'Click to follow a project.'
-  },
   follow_project_errorGalaxia: {
     id: 'fabric.linking.follow_project_error-galaxia',
     defaultMessage: 'We encountered an error while trying to follow the space. Check your connection or refresh the page and try again.',
@@ -809,11 +804,6 @@ export const messages = defineMessages({
     defaultMessage: 'Unfollow to stop receiving space notifications',
     description: 'Description on what Unfollow does'
   },
-  unfollow_projectGalaxia: {
-    id: 'fabric.linking.unfollow_project-galaxia',
-    defaultMessage: 'Unfollow space',
-    description: 'Click to unfollow a project.'
-  },
   unfollow_project_errorGalaxia: {
     id: 'fabric.linking.unfollow_project_error-galaxia',
     defaultMessage: 'We encountered an error while trying to unfollow the space. Check your connection or refresh the page and try again.',

package/dist/es2019/state/actions/index.js

@@ -2,14 +2,13 @@ import { useCallback, useMemo } from 'react';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
 import { ACTION_RESOLVING, ACTION_UPDATE_METADATA_STATUS, cardAction } from '@atlaskit/linking-common';
 import { auth } from '@atlaskit/outbound-auth-flow-client';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { useAnalyticsEvents } from '../../common/analytics/generated/use-analytics-events';
 import { SmartLinkStatus } from '../../constants';
 import { startUfoExperience } from '../analytics';
 import { getByDefinitionId, getDefinitionId, getExtensionKey, getServices } from '../helpers';
 import useInvokeClientAction from '../hooks/use-invoke-client-action';
 import useResolve from '../hooks/use-resolve';
-export const useSmartCardActions = (id, url, placeholderData) => {
+export const useSmartCardActions = (id, url) => {
   const resolveUrl = useResolve();
   const invokeClientAction = useInvokeClientAction({});
   const {
@@ -23,13 +22,12 @@ export const useSmartCardActions = (id, url, placeholderData) => {
     dispatch
   } = store;
   const getSmartLinkState = useCallback(() => {
-    var _ref, _getState$url;
-    const placeholderObject = fg('platform_initial_data_for_smart_cards') ? placeholderData : undefined;
+    var _getState$url;
     const {
       details,
       status,
       metadataStatus
-    } = (_ref = (_getState$url = getState()[url]) !== null && _getState$url !== void 0 ? _getState$url : placeholderObject) !== null && _ref !== void 0 ? _ref : {
+    } = (_getState$url = getState()[url]) !== null && _getState$url !== void 0 ? _getState$url : {
       status: SmartLinkStatus.Pending
     };
     return {
@@ -37,7 +35,7 @@ export const useSmartCardActions = (id, url, placeholderData) => {
       status,
       metadataStatus
     };
-  }, [getState, url, placeholderData]);
+  }, [getState, url]);
   const setMetadataStatus = useCallback(metadataStatus => {
     dispatch(cardAction(ACTION_UPDATE_METADATA_STATUS, {
       url

package/dist/es2019/state/hooks/useSmartLink.js

@@ -4,14 +4,14 @@ import { useSmartCardActions as useSmartLinkActions } from '../actions';
 import { useSmartLinkConfig } from '../config';
 import { useSmartLinkRenderers } from '../renderers';
 import { useSmartCardState as useSmartLinkState } from '../store';
-export function useSmartLink(id, url, placeholderData) {
-  const state = useSmartLinkState(url, placeholderData);
+export function useSmartLink(id, url) {
+  const state = useSmartLinkState(url);
   const {
     store,
     isPreviewPanelAvailable,
     openPreviewPanel
   } = useSmartLinkContext();
-  const actions = useSmartLinkActions(id, url, placeholderData);
+  const actions = useSmartLinkActions(id, url);
   const config = useSmartLinkConfig();
   const renderers = useSmartLinkRenderers();
 

package/dist/es2019/state/store/index.js

@@ -1,16 +1,12 @@
 import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/shim/with-selector';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
-import { fg } from '@atlaskit/platform-feature-flags';
 const PENDING_STATE = {
   status: 'pending'
 };
-export function useSmartCardState(url, placeholderData) {
+export function useSmartCardState(url) {
   const {
     store
   } = useSmartLinkContext();
   const cardState = useSyncExternalStoreWithSelector(store.subscribe, store.getState, store.getState, state => state[url]);
-  if (fg('platform_initial_data_for_smart_cards')) {
-    return (cardState === null || cardState === void 0 ? void 0 : cardState.status) !== 'resolved' && placeholderData ? placeholderData : cardState !== null && cardState !== void 0 ? cardState : PENDING_STATE;
-  }
   return cardState !== null && cardState !== void 0 ? cardState : PENDING_STATE;
 }

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

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

package/dist/es2019/view/CardWithUrl/component.js

@@ -57,19 +57,6 @@ function Component({
     fireEvent
   } = useAnalyticsEvents();
   let isFlexibleUi = useMemo(() => isFlexibleUiCard(children, ui), [children, ui]);
-  const structuredPlaceholderData = fg('platform_initial_data_for_smart_cards') ?
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useMemo(() => {
-    // execute some basic validation logic to ensure we should consider using placeholder data
-    if (appearance === 'inline' && isValidPlaceholderData(placeholderData)) {
-      const data = {
-        status: 'resolved',
-        metadataStatus: undefined,
-        details: placeholderData
-      };
-      return data;
-    }
-  }, [appearance, placeholderData]) : undefined;
 
   // Get state, actions for this card.
   const {
@@ -80,7 +67,7 @@ function Component({
     error,
     isPreviewPanelAvailable,
     openPreviewPanel
-  } = useSmartLink(id, url, fg('platform_initial_data_for_smart_cards') ? structuredPlaceholderData : undefined);
+  } = useSmartLink(id, url);
   const ari = getObjectAri(state.details);
   const name = getObjectName(state.details);
   const definitionId = getDefinitionId(state.details);
@@ -229,6 +216,19 @@ function Component({
       display: isFlexibleUi ? 'flexible' : appearance
     });
   }, [id, appearance, definitionId, isFlexibleUi, fireEvent]);
+  const structuredPlaceholderData = fg('platform_initial_data_for_smart_cards') ?
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useMemo(() => {
+    // execute some basic validation logic to ensure we should consider using placeholder data
+    if (isFlexibleUi && isValidPlaceholderData(placeholderData)) {
+      const data = {
+        status: 'resolved',
+        metadataStatus: undefined,
+        details: placeholderData
+      };
+      return data;
+    }
+  }, [isFlexibleUi, placeholderData]) : undefined;
   if (isFlexibleUi) {
     let cardState = state;
     if (error) {
@@ -243,6 +243,7 @@ function Component({
     return /*#__PURE__*/React.createElement(FlexibleCard, {
       id: id,
       cardState: cardState,
+      placeholderData: fg('platform_initial_data_for_smart_cards') ? structuredPlaceholderData : undefined,
       onAuthorize: services.length && handleAuthorize || undefined,
       onClick: handleClickWrapper,
       origin: "smartLinkCard",

package/dist/es2019/view/FlexibleCard/components/actions/follow-action/index.js

@@ -41,7 +41,7 @@ const FollowAction = props => {
   } = actionData;
   const isStackItem = props.as === 'stack-item';
   const message = value ? messages.follow : messages.unfollow;
-  const projectMessage = value ? FeatureGates.getExperimentValue('project-terminology-refresh', 'isEnabled', false) ? messages.follow_projectGalaxia : messages.follow_project : FeatureGates.getExperimentValue('project-terminology-refresh', 'isEnabled', false) ? messages.unfollow_projectGalaxia : messages.unfollow_project;
+  const projectMessage = value ? messages.follow_project : messages.unfollow_project;
   const goalMessage = value ? messages.follow_goal : messages.unfollow_goal;
   const stackMessage = isProject ? projectMessage : goalMessage;
   const label = isStackItem ? stackMessage : message;