@atlaskit/smart-card 26.46.3 → 26.46.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/smart-card
 
+## 26.46.4
+
+### Patch Changes
+
+- [#71105](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/71105) [`5db622ca5865`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5db622ca5865) - Align cross join messages across smart card
+
 ## 26.46.3
 
 ### Patch Changes

package/dist/cjs/extractors/common/context/extractAccessContext.js

@@ -16,42 +16,45 @@ var extractRequestAccessContext = exports.extractRequestAccessContext = function
   var _jsonLd$requestAccess;
   var jsonLd = _ref.jsonLd,
     url = _ref.url,
-    context = _ref.context;
+    product = _ref.product;
+  var requestAccess = jsonLd !== null && jsonLd !== void 0 && jsonLd.requestAccess ? _objectSpread(_objectSpread({}, jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess), {}, {
+    hostname: (0, _extractHostname.default)(url)
+  }) : undefined;
   switch (jsonLd === null || jsonLd === void 0 || (_jsonLd$requestAccess = jsonLd.requestAccess) === null || _jsonLd$requestAccess === void 0 ? void 0 : _jsonLd$requestAccess.accessType) {
     case 'DIRECT_ACCESS':
-      return _objectSpread(_objectSpread({}, jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess), {}, {
+      return _objectSpread(_objectSpread({}, requestAccess), {}, {
         callToActionMessageKey: 'click_to_join',
         descriptiveMessageKey: 'click_to_join_description',
         action: (0, _ForbiddenAction.ForbiddenAction)(function () {
           return window.open(url);
         }, 'click_to_join', _messages.messages.click_to_join, {
-          context: context
+          context: product
         })
       });
     case 'REQUEST_ACCESS':
-      return _objectSpread(_objectSpread({}, jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess), {}, {
+      return _objectSpread(_objectSpread({}, requestAccess), {}, {
         callToActionMessageKey: 'request_access',
         descriptiveMessageKey: 'request_access_description',
         action: (0, _ForbiddenAction.ForbiddenAction)(function () {
           return window.open(url);
         }, 'request_access', _messages.messages.request_access, {
-          context: context
+          product: product
         })
       });
     case 'PENDING_REQUEST_EXISTS':
-      return _objectSpread(_objectSpread({}, jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess), {}, {
+      return _objectSpread(_objectSpread({}, requestAccess), {}, {
         descriptiveMessageKey: 'request_access_pending_description'
       });
     case 'FORBIDDEN':
-      return _objectSpread(_objectSpread({}, jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess), {}, {
+      return _objectSpread(_objectSpread({}, requestAccess), {}, {
         descriptiveMessageKey: 'forbidden_description'
       });
     case 'DENIED_REQUEST_EXISTS':
-      return _objectSpread(_objectSpread({}, jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess), {}, {
+      return _objectSpread(_objectSpread({}, requestAccess), {}, {
         descriptiveMessageKey: 'request_denied_description'
       });
     default:
-      return jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess;
+      return requestAccess;
   }
 };
 var extractRequestAccessContextImproved = exports.extractRequestAccessContextImproved = function extractRequestAccessContextImproved(_ref2) {
@@ -66,9 +69,9 @@ var extractRequestAccessContextImproved = exports.extractRequestAccessContextImp
   switch (jsonLd === null || jsonLd === void 0 || (_jsonLd$requestAccess2 = jsonLd.requestAccess) === null || _jsonLd$requestAccess2 === void 0 ? void 0 : _jsonLd$requestAccess2.accessType) {
     case 'DIRECT_ACCESS':
       return _objectSpread(_objectSpread({}, requestAccess), {}, {
-        titleMessageKey: 'direct_access_title_crossjoin',
-        descriptiveMessageKey: 'direct_access_description_crossjoin',
-        callToActionMessageKey: 'direct_access_crossjoin',
+        titleMessageKey: 'direct_access_title',
+        descriptiveMessageKey: 'direct_access_description',
+        callToActionMessageKey: 'direct_access',
         action: (0, _ForbiddenAction.ForbiddenAction)(function () {
           createAnalyticsEvent({
             action: 'clicked',
@@ -77,15 +80,15 @@ var extractRequestAccessContextImproved = exports.extractRequestAccessContextImp
             eventType: 'ui'
           }).fire(_analytics.ANALYTICS_CHANNEL);
           window.open(url);
-        }, 'direct_access', _messages.messages.direct_access_crossjoin, {
+        }, 'direct_access', _messages.messages.direct_access, {
           product: product
         })
       });
     case 'REQUEST_ACCESS':
       return _objectSpread(_objectSpread({}, requestAccess), {}, {
-        titleMessageKey: 'default_no_access_title_crossjoin',
-        descriptiveMessageKey: 'request_access_description_crossjoin',
-        callToActionMessageKey: 'request_access_crossjoin',
+        titleMessageKey: 'default_no_access_title',
+        descriptiveMessageKey: 'request_access_description',
+        callToActionMessageKey: 'request_access',
         action: (0, _ForbiddenAction.ForbiddenAction)(function () {
           createAnalyticsEvent({
             action: 'clicked',
@@ -94,34 +97,34 @@ var extractRequestAccessContextImproved = exports.extractRequestAccessContextImp
             eventType: 'ui'
           }).fire(_analytics.ANALYTICS_CHANNEL);
           window.open(url);
-        }, 'request_access', _messages.messages.request_access_crossjoin)
+        }, 'request_access', _messages.messages.request_access)
       });
     case 'PENDING_REQUEST_EXISTS':
       return _objectSpread(_objectSpread({}, requestAccess), {}, {
-        titleMessageKey: 'request_access_pending_title_crossjoin',
-        descriptiveMessageKey: 'request_access_pending_description_crossjoin',
-        callToActionMessageKey: 'request_access_pending_crossjoin',
+        titleMessageKey: 'request_access_pending_title',
+        descriptiveMessageKey: 'request_access_pending_description',
+        callToActionMessageKey: 'request_access_pending',
         action: (0, _ForbiddenAction.ForbiddenAction)(function () {
           return window.open(url);
-        }, 'request_access_pending', _messages.messages.request_access_pending_crossjoin),
+        }, 'request_access_pending', _messages.messages.request_access_pending),
         buttonDisabled: true
       });
     case 'DENIED_REQUEST_EXISTS':
       return _objectSpread(_objectSpread({}, requestAccess), {}, {
-        titleMessageKey: 'forbidden_title_crossjoin',
-        descriptiveMessageKey: 'request_denied_description_crossjoin'
+        titleMessageKey: 'forbidden_title',
+        descriptiveMessageKey: 'request_denied_description'
       });
     case 'ACCESS_EXISTS':
       if ((jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.visibility) === 'not_found') {
         return _objectSpread(_objectSpread({}, requestAccess), {}, {
-          titleMessageKey: 'not_found_title_crossjoin',
-          descriptiveMessageKey: 'not_found_description_crossjoin'
+          titleMessageKey: 'not_found_title',
+          descriptiveMessageKey: 'not_found_description'
         });
       }
       return _objectSpread(_objectSpread({}, requestAccess), {}, {
-        titleMessageKey: 'forbidden_title_crossjoin',
-        descriptiveMessageKey: 'access_exists_description_crossjoin',
-        callToActionMessageKey: 'request_access_crossjoin',
+        titleMessageKey: 'forbidden_title',
+        descriptiveMessageKey: 'access_exists_description',
+        callToActionMessageKey: 'request_access',
         action: (0, _ForbiddenAction.ForbiddenAction)(function () {
           createAnalyticsEvent({
             action: 'clicked',
@@ -130,12 +133,12 @@ var extractRequestAccessContextImproved = exports.extractRequestAccessContextImp
             eventType: 'ui'
           }).fire(_analytics.ANALYTICS_CHANNEL);
           window.open(url);
-        }, 'access_exists', _messages.messages.request_access_crossjoin)
+        }, 'access_exists', _messages.messages.request_access)
       });
     case 'FORBIDDEN':
       return _objectSpread(_objectSpread({}, requestAccess), {}, {
-        titleMessageKey: 'forbidden_title_crossjoin',
-        descriptiveMessageKey: 'forbidden_description_crossjoin'
+        titleMessageKey: 'forbidden_title',
+        descriptiveMessageKey: 'forbidden_description'
       });
     default:
       return requestAccess;

package/dist/cjs/messages.js

@@ -5,9 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.messages = void 0;
 var _reactIntlNext = require("react-intl-next");
-// | 'forbidden_access_crossjoin'
-// | 'forbidden_description_crossjoin';
-
 var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
   actions: {
     id: 'fabric.linking.actions',
@@ -174,11 +171,6 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: 'Follow',
     description: 'Click to follow a project.'
   },
-  forbidden_description: {
-    id: 'fabric.linking.forbidden_description',
-    defaultMessage: 'You don’t have access to this preview. Contact the site admin if you need access.',
-    description: 'Informs the user that they cannot view this content.'
-  },
   go_back: {
     id: 'fabric.linking.go_back',
     defaultMessage: 'Go back',
@@ -234,16 +226,6 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: 'More actions',
     description: 'Allows the users to see more link actions'
   },
-  not_found_description: {
-    id: 'fabric.linking.not_found_description',
-    defaultMessage: "We couldn't find the link. Check the url and try editing or paste again.",
-    description: 'Error case for when a provided item is not found within the list of items'
-  },
-  not_found_title: {
-    id: 'fabric.linking.not_found_title',
-    defaultMessage: "Uh oh. We can't find this link!",
-    description: 'Error case for when a provided link is not found'
-  },
   open_issue_in_jira: {
     id: 'fabric.linking.open_issue_in_jira',
     defaultMessage: 'Open issue in Jira',
@@ -354,26 +336,6 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: 'Restricted link, try another account',
     description: 'Message shown when a user does not have permissions to view an item'
   },
-  request_access: {
-    id: 'fabric.linking.request_access',
-    defaultMessage: 'Request access',
-    description: 'Allows the user to request access to a product or service'
-  },
-  request_access_description: {
-    id: 'fabric.linking.request_access_description',
-    defaultMessage: 'Request access to {context} view this preview.',
-    description: 'Allows the user to request access to a product'
-  },
-  request_access_pending: {
-    id: 'fabric.linking.request_access_pending',
-    defaultMessage: 'Access pending',
-    description: 'Allows the user to try an action again with their current account'
-  },
-  request_access_pending_description: {
-    id: 'fabric.linking.request_access_pending_description',
-    defaultMessage: 'Your access request is pending.',
-    description: 'Informs the user that their request to view this content is pending'
-  },
   request_access_to_view: {
     id: 'fabric.linking.request_access_to_view',
     defaultMessage: 'Request access to {context} to view this issue',
@@ -384,11 +346,6 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: 'Your access request was denied',
     description: 'The user had request access but the request was denied by a product or service'
   },
-  request_denied_description: {
-    id: 'fabric.linking.request_denied_description',
-    defaultMessage: 'Your access request was denied. Contact the site admin if you still need access.',
-    description: 'Informs the user that their request to view this content was denied'
-  },
   retry: {
     id: 'fabric.linking.retry',
     defaultMessage: 'Retry',
@@ -489,82 +446,78 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: 'View Original',
     description: "We have a link in our preview modals to the original document. This is for when we don't know the provider name"
   },
-  /**
-   * Temp messages to put behind a feature flag for the cross join stream, replace the messages with the message of the same
-   * title (without _crossjoin) during cleanup in EDM-7977 [https://product-fabric.atlassian.net/browse/EDM-7977].
-   */
-  default_no_access_title_crossjoin: {
-    id: 'fabric.linking.no_access_title_crossjoin',
+  default_no_access_title: {
+    id: 'fabric.linking.no_access_title',
     defaultMessage: 'Join {product} to view this content',
     description: 'Informs the user that they dont have access to certain content'
   },
-  direct_access_title_crossjoin: {
-    id: 'fabric.linking.direct_access_title_crossjoin',
+  direct_access_title: {
+    id: 'fabric.linking.direct_access_title',
     defaultMessage: 'Join {product} to view this content',
     description: 'Informs the user that they have access to this product, and can sign up or join right away.'
   },
-  direct_access_description_crossjoin: {
-    id: 'fabric.linking.direct_access_description_crossjoin',
+  direct_access_description: {
+    id: 'fabric.linking.direct_access_description',
     defaultMessage: 'Your team uses {product} to collaborate and you can start using it right away!',
     description: 'Informs the user that they have access to this product, and can sign up or join right away.'
   },
-  direct_access_crossjoin: {
-    id: 'fabric.linking.direct_access_crossjoin',
+  direct_access: {
+    id: 'fabric.linking.direct_access',
     defaultMessage: 'Join now',
     description: 'Allows the user join the product or service immediately'
   },
-  request_access_description_crossjoin: {
-    id: 'fabric.linking.request_access_description_crossjoin',
+  request_access_description: {
+    id: 'fabric.linking.request_access_description',
     defaultMessage: 'Your team uses {product} to collaborate. Send your admin a request for access.',
     description: 'Informs the user to request access to a product by talking to the website administrator'
   },
-  request_access_crossjoin: {
-    id: 'fabric.linking.request_access_crossjoin',
+  request_access: {
+    id: 'fabric.linking.request_access',
     defaultMessage: 'Request access',
     description: 'Allows the user to request access to a product or service'
   },
-  request_access_pending_title_crossjoin: {
-    id: 'fabric.linking.request_access_pending_title_crossjoin',
+  request_access_pending_title: {
+    id: 'fabric.linking.request_access_pending_title',
     defaultMessage: 'Access to {product} is pending',
     description: 'Informs the user that their request to view this content is pending'
   },
-  request_access_pending_description_crossjoin: {
-    id: 'fabric.linking.request_access_pending_description_crossjoin',
+  request_access_pending_description: {
+    id: 'fabric.linking.request_access_pending_description',
     defaultMessage: 'Your request to access {hostname} is awaiting admin approval.',
     description: 'Informs the user that their request to view this content is pending website administrator approval'
   },
-  request_access_pending_crossjoin: {
-    id: 'fabric.linking.request_access_pending_crossjoin',
+  request_access_pending: {
+    id: 'fabric.linking.request_access_pending',
     defaultMessage: 'Pending approval',
     description: 'Informs the user that their request to view this content is pending'
   },
-  request_denied_description_crossjoin: {
-    id: 'fabric.linking.request_denied_description_crossjoin',
+  request_denied_description: {
+    id: 'fabric.linking.request_denied_description',
     defaultMessage: "Your admin didn't approve your request to view {product} pages from {hostname}.",
     description: 'Informs the user that their request to view this content was denied'
   },
-  access_exists_description_crossjoin: {
+  access_exists_description: {
     id: 'fabric.linking.access_exists_description',
     defaultMessage: 'Request access to view this content from {hostname}.',
     description: 'Informs the user to contact the website administrator to request access to a product'
   },
-  not_found_description_crossjoin: {
-    id: 'fabric.linking.not_found_description_crossjoin',
+  not_found_description: {
+    id: 'fabric.linking.not_found_description',
     defaultMessage: "The page doesn't exist or it may have changed after this link was added.",
     description: 'Error case for when a provided item is not found within the list of items'
   },
-  not_found_title_crossjoin: {
-    id: 'fabric.linking.not_found_title_crossjoin',
+  not_found_title: {
+    id: 'fabric.linking.not_found_title',
     defaultMessage: "We can't show you this {product} page",
     description: 'Error case for when a provided link is not found'
   },
-  forbidden_title_crossjoin: {
-    id: 'fabric.linking.forbidden_title_crossjoin',
+  forbidden_title: {
+    id: 'fabric.linking.forbidden_title',
     defaultMessage: "You don't have access to this content",
     description: 'Informs the user that they do not have access to the linked content.'
   },
-  forbidden_description_crossjoin: {
-    id: 'fabric.linking.forbidden_description_crossjoin',
+  forbidden_description: {
+    id: 'fabric.linking.forbidden_description',
     defaultMessage: 'Contact your admin to request access to {hostname}.',
     description: 'Informs the user that they must contact the site administrator for access.'
   },

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.46.3"
+  packageVersion: "26.46.4"
 };
 var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

@@ -218,7 +218,7 @@ var BlockCard = exports.BlockCard = function BlockCard(_ref) {
       var requestAccessContext = (0, _context.extractRequestAccessContext)({
         jsonLd: cardMetadata,
         url: url,
-        context: (_forbiddenViewProps$c = forbiddenViewProps.context) === null || _forbiddenViewProps$c === void 0 ? void 0 : _forbiddenViewProps$c.text
+        product: (_forbiddenViewProps$c = forbiddenViewProps.context) === null || _forbiddenViewProps$c === void 0 ? void 0 : _forbiddenViewProps$c.text
       });
       return (0, _react.jsx)(_ForbiddenView.ForbiddenView, (0, _extends2.default)({}, forbiddenViewProps, {
         isSelected: isSelected,

package/dist/cjs/view/BlockCard/views/ForbiddenView.js

@@ -49,7 +49,9 @@ var ForbiddenView = exports.ForbiddenView = function ForbiddenView(_ref) {
   };
   var action = requestAccessContext.action,
     _requestAccessContext = requestAccessContext.descriptiveMessageKey,
-    descriptiveMessageKey = _requestAccessContext === void 0 ? 'invalid_permissions_description' : _requestAccessContext;
+    descriptiveMessageKey = _requestAccessContext === void 0 ? 'invalid_permissions_description' : _requestAccessContext,
+    _requestAccessContext2 = requestAccessContext.hostname,
+    hostname = _requestAccessContext2 === void 0 ? '' : _requestAccessContext2;
   var items = action ? [].concat((0, _toConsumableArray2.default)(actions), [action]) : actions;
   return (0, _react.jsx)(_Frame.Frame, {
     isSelected: isSelected,
@@ -74,7 +76,9 @@ var ForbiddenView = exports.ForbiddenView = function ForbiddenView(_ref) {
     }),
     text: (0, _react.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.messages[descriptiveMessageKey], {
       values: {
-        context: context.text
+        product: context.text,
+        context: context.text,
+        hostname: hostname
       }
     }))
   }))), (0, _react.jsx)(_ContentFooter.ContentFooter, null, (0, _react.jsx)(_Provider.Provider, {

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

@@ -39,13 +39,13 @@ var FlexibleNotFoundView = function FlexibleNotFoundView(_ref) {
     return (_provider$text = provider === null || provider === void 0 ? void 0 : provider.text) !== null && _provider$text !== void 0 ? _provider$text : '';
   }, [cardState === null || cardState === void 0 || (_cardState$details2 = cardState.details) === null || _cardState$details2 === void 0 ? void 0 : _cardState$details2.data]);
   var title = (0, _react.useMemo)(function () {
-    return intl.formatMessage(_messages.messages.not_found_title_crossjoin, {
+    return intl.formatMessage(_messages.messages.not_found_title, {
       product: product
     });
   }, [intl, product]);
   var description = (0, _react.useMemo)(function () {
     return {
-      descriptor: _messages.messages.not_found_description_crossjoin
+      descriptor: _messages.messages.not_found_description
     };
   }, []);
   return /*#__PURE__*/_react.default.createElement(_unresolvedView.default, (0, _extends2.default)({}, props, {

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

@@ -79,7 +79,7 @@ var getRetryOptions = exports.getRetryOptions = function getRetryOptions(url, st
       var access = (0, _context.extractRequestAccessContext)({
         jsonLd: meta,
         url: url,
-        context: context
+        product: context
       });
       var messageKey = getForbiddenMessageKey(meta);
       var descriptor = _messages.messages[messageKey];

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

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

package/dist/es2019/extractors/common/context/extractAccessContext.js

@@ -5,45 +5,49 @@ import { ANALYTICS_CHANNEL } from '../../../utils/analytics';
 export const extractRequestAccessContext = ({
   jsonLd,
   url,
-  context
+  product
 }) => {
   var _jsonLd$requestAccess;
+  const requestAccess = jsonLd !== null && jsonLd !== void 0 && jsonLd.requestAccess ? {
+    ...(jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess),
+    hostname: extractHostname(url)
+  } : undefined;
   switch (jsonLd === null || jsonLd === void 0 ? void 0 : (_jsonLd$requestAccess = jsonLd.requestAccess) === null || _jsonLd$requestAccess === void 0 ? void 0 : _jsonLd$requestAccess.accessType) {
     case 'DIRECT_ACCESS':
       return {
-        ...(jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess),
+        ...requestAccess,
         callToActionMessageKey: 'click_to_join',
         descriptiveMessageKey: 'click_to_join_description',
         action: ForbiddenAction(() => window.open(url), 'click_to_join', messages.click_to_join, {
-          context
+          context: product
         })
       };
     case 'REQUEST_ACCESS':
       return {
-        ...(jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess),
+        ...requestAccess,
         callToActionMessageKey: 'request_access',
         descriptiveMessageKey: 'request_access_description',
         action: ForbiddenAction(() => window.open(url), 'request_access', messages.request_access, {
-          context
+          product
         })
       };
     case 'PENDING_REQUEST_EXISTS':
       return {
-        ...(jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess),
+        ...requestAccess,
         descriptiveMessageKey: 'request_access_pending_description'
       };
     case 'FORBIDDEN':
       return {
-        ...(jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess),
+        ...requestAccess,
         descriptiveMessageKey: 'forbidden_description'
       };
     case 'DENIED_REQUEST_EXISTS':
       return {
-        ...(jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess),
+        ...requestAccess,
         descriptiveMessageKey: 'request_denied_description'
       };
     default:
-      return jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.requestAccess;
+      return requestAccess;
   }
 };
 export const extractRequestAccessContextImproved = ({
@@ -61,9 +65,9 @@ export const extractRequestAccessContextImproved = ({
     case 'DIRECT_ACCESS':
       return {
         ...requestAccess,
-        titleMessageKey: 'direct_access_title_crossjoin',
-        descriptiveMessageKey: 'direct_access_description_crossjoin',
-        callToActionMessageKey: 'direct_access_crossjoin',
+        titleMessageKey: 'direct_access_title',
+        descriptiveMessageKey: 'direct_access_description',
+        callToActionMessageKey: 'direct_access',
         action: ForbiddenAction(() => {
           createAnalyticsEvent({
             action: 'clicked',
@@ -72,16 +76,16 @@ export const extractRequestAccessContextImproved = ({
             eventType: 'ui'
           }).fire(ANALYTICS_CHANNEL);
           window.open(url);
-        }, 'direct_access', messages.direct_access_crossjoin, {
+        }, 'direct_access', messages.direct_access, {
           product
         })
       };
     case 'REQUEST_ACCESS':
       return {
         ...requestAccess,
-        titleMessageKey: 'default_no_access_title_crossjoin',
-        descriptiveMessageKey: 'request_access_description_crossjoin',
-        callToActionMessageKey: 'request_access_crossjoin',
+        titleMessageKey: 'default_no_access_title',
+        descriptiveMessageKey: 'request_access_description',
+        callToActionMessageKey: 'request_access',
         action: ForbiddenAction(() => {
           createAnalyticsEvent({
             action: 'clicked',
@@ -90,36 +94,36 @@ export const extractRequestAccessContextImproved = ({
             eventType: 'ui'
           }).fire(ANALYTICS_CHANNEL);
           window.open(url);
-        }, 'request_access', messages.request_access_crossjoin)
+        }, 'request_access', messages.request_access)
       };
     case 'PENDING_REQUEST_EXISTS':
       return {
         ...requestAccess,
-        titleMessageKey: 'request_access_pending_title_crossjoin',
-        descriptiveMessageKey: 'request_access_pending_description_crossjoin',
-        callToActionMessageKey: 'request_access_pending_crossjoin',
-        action: ForbiddenAction(() => window.open(url), 'request_access_pending', messages.request_access_pending_crossjoin),
+        titleMessageKey: 'request_access_pending_title',
+        descriptiveMessageKey: 'request_access_pending_description',
+        callToActionMessageKey: 'request_access_pending',
+        action: ForbiddenAction(() => window.open(url), 'request_access_pending', messages.request_access_pending),
         buttonDisabled: true
       };
     case 'DENIED_REQUEST_EXISTS':
       return {
         ...requestAccess,
-        titleMessageKey: 'forbidden_title_crossjoin',
-        descriptiveMessageKey: 'request_denied_description_crossjoin'
+        titleMessageKey: 'forbidden_title',
+        descriptiveMessageKey: 'request_denied_description'
       };
     case 'ACCESS_EXISTS':
       if ((jsonLd === null || jsonLd === void 0 ? void 0 : jsonLd.visibility) === 'not_found') {
         return {
           ...requestAccess,
-          titleMessageKey: 'not_found_title_crossjoin',
-          descriptiveMessageKey: 'not_found_description_crossjoin'
+          titleMessageKey: 'not_found_title',
+          descriptiveMessageKey: 'not_found_description'
         };
       }
       return {
         ...requestAccess,
-        titleMessageKey: 'forbidden_title_crossjoin',
-        descriptiveMessageKey: 'access_exists_description_crossjoin',
-        callToActionMessageKey: 'request_access_crossjoin',
+        titleMessageKey: 'forbidden_title',
+        descriptiveMessageKey: 'access_exists_description',
+        callToActionMessageKey: 'request_access',
         action: ForbiddenAction(() => {
           createAnalyticsEvent({
             action: 'clicked',
@@ -128,13 +132,13 @@ export const extractRequestAccessContextImproved = ({
             eventType: 'ui'
           }).fire(ANALYTICS_CHANNEL);
           window.open(url);
-        }, 'access_exists', messages.request_access_crossjoin)
+        }, 'access_exists', messages.request_access)
       };
     case 'FORBIDDEN':
       return {
         ...requestAccess,
-        titleMessageKey: 'forbidden_title_crossjoin',
-        descriptiveMessageKey: 'forbidden_description_crossjoin'
+        titleMessageKey: 'forbidden_title',
+        descriptiveMessageKey: 'forbidden_description'
       };
     default:
       return requestAccess;