@atlaskit/smart-card 26.46.2 → 26.46.4

package/dist/cjs/view/FlexibleCard/components/blocks/ai-summary-block/ai-state-indicator/ai-state-done.js

@@ -0,0 +1,116 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _react = _interopRequireDefault(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _react2 = require("@emotion/react");
+var _panel = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/panel"));
+var _primitives = require("@atlaskit/primitives");
+var _messages = require("../../../../../../messages");
+var _aiIcon = _interopRequireDefault(require("../../../../../common/ai-icon"));
+var _aiIndicatorTooltip = _interopRequireDefault(require("./ai-indicator-tooltip"));
+var _aiIndicatorContainer = _interopRequireDefault(require("./ai-indicator-container"));
+var _aiLearnMoreAnchor = _interopRequireDefault(require("./ai-learn-more-anchor"));
+/** @jsx jsx */
+
+var tooltipMsgStyles = (0, _primitives.xcss)({
+  color: 'color.text',
+  fontSize: '14px',
+  fontWeight: '400',
+  lineHeight: '20px'
+});
+var iconTooltipLinkStyles = (0, _react2.css)({
+  color: "var(--ds-text-subtlest, #626F86)",
+  '&:link, :visited': {
+    color: "var(--ds-text-subtlest, #626F86)"
+  },
+  '&:hover': {
+    color: "var(--ds-text-subtle, #44546F)"
+  },
+  '&:active': {
+    color: "var(--ds-text, #172B4D)"
+  },
+  textDecoration: 'underline'
+});
+var iconTooltipTitleStyles = (0, _primitives.xcss)({
+  color: 'color.text',
+  fontSize: '12px',
+  fontWeight: '400',
+  lineHeight: '16px'
+});
+var iconTooltipDescStyles = (0, _primitives.xcss)({
+  color: 'color.text.subtlest',
+  fontSize: '11px',
+  fontWeight: '400',
+  lineHeight: '14px'
+});
+var AIStateDone = function AIStateDone(_ref) {
+  var appearance = _ref.appearance,
+    testId = _ref.testId;
+  var icon = (0, _react2.jsx)(_aiIcon.default, {
+    label: "AI",
+    size: "small",
+    testId: "".concat(testId, "-done-icon")
+  });
+  switch (appearance) {
+    case 'icon-only':
+      return (0, _react2.jsx)(_aiIndicatorTooltip.default, {
+        content: (0, _react2.jsx)(_primitives.Inline, {
+          alignBlock: "center",
+          space: "space.100"
+        }, (0, _react2.jsx)(_aiIcon.default, {
+          label: "AI",
+          size: "medium",
+          testId: "".concat(testId, "-done-tooltip-icon")
+        }), (0, _react2.jsx)(_primitives.Stack, null, (0, _react2.jsx)(_primitives.Box, {
+          xcss: iconTooltipTitleStyles,
+          testId: "".concat(testId, "-done-tooltip-title")
+        }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.messages.ai_summarized)), (0, _react2.jsx)(_primitives.Box, {
+          xcss: iconTooltipDescStyles
+        }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.messages.ai_summarized_info, {
+          values: {
+            a: function a(chunks) {
+              return (0, _react2.jsx)(_aiLearnMoreAnchor.default, {
+                css: iconTooltipLinkStyles
+              }, chunks);
+            }
+          }
+        }))))),
+        trigger: icon
+      });
+    default:
+      return (0, _react2.jsx)(_aiIndicatorContainer.default, {
+        icon: icon,
+        content: (0, _react2.jsx)(_primitives.Inline, {
+          alignBlock: "center",
+          alignInline: "start",
+          space: "space.050"
+        }, (0, _react2.jsx)(_primitives.Box, {
+          testId: "".concat(testId, "-done-message")
+        }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.messages.ai_summarized)), (0, _react2.jsx)(_aiIndicatorTooltip.default, {
+          content: (0, _react2.jsx)(_primitives.Box, {
+            xcss: tooltipMsgStyles,
+            testId: "".concat(testId, "-done-tooltip")
+          }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.messages.ai_summarized_info, {
+            values: {
+              a: function a(chunks) {
+                return (0, _react2.jsx)(_aiLearnMoreAnchor.default, null, chunks);
+              }
+            }
+          }))),
+          trigger: (0, _react2.jsx)(_panel.default, {
+            label: "Info",
+            size: "small",
+            testId: "".concat(testId, "-done-info")
+          })
+        })),
+        testId: "".concat(testId, "-done")
+      });
+  }
+};
+var _default = exports.default = AIStateDone;

package/dist/cjs/view/FlexibleCard/components/blocks/ai-summary-block/ai-state-indicator/ai-state-loading.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _primitives = require("@atlaskit/primitives");
+var _messages = require("../../../../../../messages");
+var _aiIconLoading = _interopRequireDefault(require("../../../../../common/ai-icon-loading"));
+var _aiIndicatorContainer = _interopRequireDefault(require("./ai-indicator-container"));
+var AIStateLoading = function AIStateLoading(_ref) {
+  var appearance = _ref.appearance,
+    testId = _ref.testId;
+  var icon = /*#__PURE__*/_react.default.createElement(_aiIconLoading.default, {
+    label: "AI",
+    size: "small",
+    testId: "".concat(testId, "-loading-icon")
+  });
+  switch (appearance) {
+    case 'icon-only':
+      return icon;
+    default:
+      return /*#__PURE__*/_react.default.createElement(_aiIndicatorContainer.default, {
+        icon: icon,
+        content: /*#__PURE__*/_react.default.createElement(_primitives.Box, {
+          testId: "".concat(testId, "-loading-message")
+        }, /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.messages.ai_summarizing)),
+        testId: "".concat(testId, "-loading")
+      });
+  }
+};
+var _default = exports.default = AIStateLoading;

package/dist/cjs/view/FlexibleCard/components/blocks/ai-summary-block/ai-state-indicator/index.js

@@ -0,0 +1,35 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = require("@emotion/react");
+var _react2 = _interopRequireDefault(require("react"));
+var _aiStateLoading = _interopRequireDefault(require("./ai-state-loading"));
+var _aiStateDone = _interopRequireDefault(require("./ai-state-done"));
+/** @jsx jsx */
+
+var AIStateIndicator = function AIStateIndicator(_ref) {
+  var state = _ref.state,
+    _ref$appearance = _ref.appearance,
+    appearance = _ref$appearance === void 0 ? 'default' : _ref$appearance,
+    _ref$testId = _ref.testId,
+    testId = _ref$testId === void 0 ? 'ai-state-indicator' : _ref$testId;
+  switch (state) {
+    case 'loading':
+      return (0, _react.jsx)(_aiStateLoading.default, {
+        appearance: appearance,
+        testId: testId
+      });
+    case 'done':
+      return (0, _react.jsx)(_aiStateDone.default, {
+        appearance: appearance,
+        testId: testId
+      });
+    default:
+      return null;
+  }
+};
+var _default = exports.default = AIStateIndicator;

package/dist/cjs/view/FlexibleCard/components/blocks/ai-summary-block/ai-state-indicator/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/view/FlexibleCard/components/blocks/ai-summary-block/resolved/index.js

@@ -8,13 +8,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntlNext = require("react-intl-next");
+var _primitives = require("@atlaskit/primitives");
 var _constants = require("../../../../../../constants");
-var _flexibleUiContext = require("../../../../../../state/flexible-ui-context");
 var _actionGroup = _interopRequireDefault(require("../../action-group"));
 var _block = _interopRequireDefault(require("../../block"));
 var _elementGroup = _interopRequireDefault(require("../../element-group"));
+var _aiStateIndicator = _interopRequireDefault(require("../ai-state-indicator"));
 var _utils = require("../../utils");
 var _messages = require("../../../../../../messages");
 var _aiIcon = _interopRequireDefault(require("../../../../../common/ai-icon"));
@@ -29,29 +31,32 @@ var AISummaryBlockResolvedView = function AISummaryBlockResolvedView(props) {
     onAIActionChange = props.onAIActionChange,
     _props$size = props.size,
     size = _props$size === void 0 ? _constants.SmartLinkSize.Medium : _props$size;
-  var context = (0, _flexibleUiContext.useFlexibleUiContext)();
+  var _useState = (0, _react.useState)('ready'),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    aiState = _useState2[0],
+    setAIState = _useState2[1];
   var metadataElements = (0, _utils.renderElementItems)(metadata);
   var onAIActionClick = (0, _react.useCallback)(function () {
+    setAIState('loading');
     if (onAIActionChange) {
-      onAIActionChange();
+      onAIActionChange('loading');
     }
   }, [onAIActionChange]);
   var combinedActions = (0, _react.useMemo)(function () {
-    var aiAction = {
-      content: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.messages.ai_summarize),
-      name: _constants.ActionName.CustomAction,
-      onClick: onAIActionClick,
-      testId: "".concat(testId, "-ai-summary-action"),
-      icon: /*#__PURE__*/_react.default.createElement(_aiIcon.default, {
-        label: "AiIcon"
-      })
-    };
-    return [aiAction].concat((0, _toConsumableArray2.default)(actions));
-  }, [actions, onAIActionClick, testId]);
-  var hasActions = (0, _react.useMemo)(function () {
-    var _filterActionItems;
-    return ((_filterActionItems = (0, _utils.filterActionItems)(combinedActions, context)) === null || _filterActionItems === void 0 ? void 0 : _filterActionItems.length) > 0;
-  }, [combinedActions, context]);
+    if (aiState === 'ready') {
+      var aiAction = {
+        content: /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, _messages.messages.ai_summarize),
+        name: _constants.ActionName.CustomAction,
+        onClick: onAIActionClick,
+        testId: "".concat(testId, "-ai-summary-action"),
+        icon: /*#__PURE__*/_react.default.createElement(_aiIcon.default, {
+          label: "AiIcon"
+        })
+      };
+      return [aiAction].concat((0, _toConsumableArray2.default)(actions));
+    }
+    return actions;
+  }, [actions, aiState, onAIActionClick, testId]);
   var onDropdownOpenChange = (0, _react.useCallback)(function (isOpen) {
     if (onActionMenuOpenChange) {
       onActionMenuOpenChange({
@@ -61,17 +66,21 @@ var AISummaryBlockResolvedView = function AISummaryBlockResolvedView(props) {
   }, [onActionMenuOpenChange]);
   return /*#__PURE__*/_react.default.createElement(_block.default, (0, _extends2.default)({}, props, {
     testId: "".concat(testId, "-resolved-view")
-  }), /*#__PURE__*/_react.default.createElement(_elementGroup.default, {
-    width: _constants.SmartLinkWidth.Flexible
-  }, metadataElements), hasActions && /*#__PURE__*/_react.default.createElement(_elementGroup.default, {
-    testId: "smart-element-group-actions",
-    align: _constants.SmartLinkAlignment.Right,
-    overrideCss: (0, _utils.getActionGroupStyles)(size),
-    width: _constants.SmartLinkWidth.Flexible
-  }, /*#__PURE__*/_react.default.createElement(_actionGroup.default, {
+  }), /*#__PURE__*/_react.default.createElement(_primitives.Inline, {
+    alignBlock: "center",
+    alignInline: "end",
+    grow: "fill",
+    spread: "space-between"
+  }, /*#__PURE__*/_react.default.createElement(_primitives.Box, null, aiState === 'loading' || aiState === 'done' ? /*#__PURE__*/_react.default.createElement(_aiStateIndicator.default, {
+    state: aiState,
+    testId: testId
+  }) : /*#__PURE__*/_react.default.createElement(_elementGroup.default, {
+    width: _constants.SmartLinkWidth.FitToContent
+  }, metadataElements)), /*#__PURE__*/_react.default.createElement(_primitives.Box, null, /*#__PURE__*/_react.default.createElement(_actionGroup.default, {
     onDropdownOpenChange: onDropdownOpenChange,
     items: combinedActions,
-    appearance: "default"
-  })));
+    appearance: "default",
+    size: size
+  }))));
 };
 var _default = exports.default = AISummaryBlockResolvedView;

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.2",
+  packageVersion: "26.46.4",
   componentName: 'linkUrl'
 };
 var Link = (0, _click.withLinkClickedEvent)('a');

package/dist/cjs/view/common/ai-icon-loading/index.js

@@ -0,0 +1,60 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
+var _react = require("@emotion/react");
+var _svg = _interopRequireDefault(require("@atlaskit/icon/svg"));
+var _constants = require("../ai-prism/constants");
+var _templateObject;
+/** @jsx jsx */
+/**
+ * The bulk of this file is originally from
+ * https://bitbucket.org/atlassian/barrel/src/master/ui/platform/ui-kit/ai
+ * with modifications
+ */
+
+var bounce = (0, _react.keyframes)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  from {\n    transform: translateY(0);\n  }\n\n  // 200ms of 1200ms = 16.67%\n  16.67% {\n    transform: translateY(-2px);\n  }\n\n  // 400ms of 1200ms = 33.33%\n  33.33% {\n    transform: translateY(0px);\n  }\n"])));
+var BASE_DELAY = 400;
+var QUEUE_DELAY = 200;
+var animationStyles = (0, _react.css)({
+  animation: "".concat(bounce, " 1.2s linear infinite normal")
+});
+var firstDelayStyles = (0, _react.css)({
+  animationDelay: "".concat(BASE_DELAY + QUEUE_DELAY, "ms")
+});
+var secondDelayStyles = (0, _react.css)({
+  animationDelay: "".concat(BASE_DELAY + QUEUE_DELAY * 2, "ms")
+});
+var thirdDelayStyles = (0, _react.css)({
+  animationDelay: "".concat(BASE_DELAY + QUEUE_DELAY * 3, "ms")
+});
+
+/**
+ * this icon is theme agnostic, no need for tokens
+ */
+var AIIconLoading = function AIIconLoading(props) {
+  return (0, _react.jsx)(_svg.default, props, (0, _react.jsx)("circle", {
+    css: [animationStyles, firstDelayStyles],
+    cx: "6",
+    cy: "12",
+    r: "1.5",
+    fill: _constants.aiThemeTokens.blue700
+  }), (0, _react.jsx)("circle", {
+    css: [animationStyles, secondDelayStyles],
+    cx: "12",
+    cy: "12",
+    r: "1.5",
+    fill: _constants.aiThemeTokens.blue600
+  }), (0, _react.jsx)("circle", {
+    css: [animationStyles, thirdDelayStyles],
+    cx: "17.5",
+    cy: "12",
+    r: "1.5",
+    fill: _constants.aiThemeTokens.blue500
+  }));
+};
+var _default = exports.default = AIIconLoading;

package/dist/es2019/constants.js

@@ -1,6 +1,6 @@
 export const CONTENT_URL_SECURITY_AND_PERMISSIONS = 'https://support.atlassian.com/confluence-cloud/docs/insert-links-and-anchors/#Smart-links';
 export const CONTENT_URL_3P_ACCOUNT_AUTH = 'https://support.atlassian.com/confluence-cloud/docs/what-data-is-sent-and-received-when-pasting-a-smart-link/';
-
+export const CONTENT_URL_AI = 'https://www.atlassian.com/trust/atlassian-intelligence';
 /**
  * The alignment of Flexible UI component.
  */

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;