Merge branch 'master' into scalprum-update

package.json

@@ -114,7 +114,7 @@
     "swc-loader": "^0.2.3",
     "terser-webpack-plugin": "^5.3.6",
     "typescript": "^4.9.5",
-    "url": "^0.11.0",
+    "url": "^0.11.3",
     "utility-types": "^3.10.0",
     "wait-on": "^7.0.1",
     "webpack": "^5.76.1",

src/components/AppFilter/useAppFilter.ts

@@ -12,7 +12,7 @@ export type AppFilterBucket = {
   links: NavItem[];
 };
 
-const previewBundles = ['business-services', 'subscriptions'];
+const previewBundles = ['subscriptions'];
 
 export const requiredBundles = [
   'application-services',
@@ -23,6 +23,7 @@ export const requiredBundles = [
   'settings',
   'iam',
   'quay',
+  'business-services',
   ...(!isProd() ? previewBundles : isBeta() ? previewBundles : []),
 ];
 

src/components/Feedback/FeedbackModal.tsx

@@ -22,8 +22,10 @@ import FeedbackSuccess from './FeedbackSuccess';
 import messages from '../../locales/Messages';
 import FeedbackError from './FeedbackError';
 
-import './Feedback.scss';
 import InternalChromeContext from '../../utils/internalChromeContext';
+import LibtJWTContext from '../LibJWTContext';
+import { createSupportCase } from '../../utils/createCase';
+import './Feedback.scss';
 
 export type FeedbackModalProps = {
   user: DeepRequired<ChromeUser>;
@@ -46,6 +48,7 @@ const FeedbackModal = memo(({ user }: FeedbackModalProps) => {
   const dispatch = useDispatch();
   const [modalPage, setModalPage] = useState<FeedbackPages>('feedbackHome');
   const { getEnvironment } = useContext(InternalChromeContext);
+  const libjwt = useContext(LibtJWTContext);
   const env = getEnvironment();
   const isAvailable = env === 'prod' || env === 'stage';
   const setIsModalOpen = (isOpen: boolean) => dispatch(toggleFeedbackModal(isOpen));
@@ -73,13 +76,7 @@ const FeedbackModal = memo(({ user }: FeedbackModalProps) => {
                 <CardBody>{intl.formatMessage(messages.describeBugUrgentCases)}</CardBody>
               </Card>
               <br />
-              <Card
-                isSelectableRaised
-                isCompact
-                onClick={() => {
-                  window.open('https://access.redhat.com/support/cases/#/case/new/open-case?caseCreate=true', '_blank');
-                }}
-              >
+              <Card isSelectableRaised isCompact onClick={() => createSupportCase(user.identity, libjwt)}>
                 <CardTitle className="chr-c-feedback-card-title">
                   <Text>
                     {intl.formatMessage(messages.openSupportCase)} <ExternalLinkAltIcon />

src/components/Header/ToolbarToggle.tsx

@@ -60,7 +60,7 @@ const ToolbarToggle = (props: ToolbarToggleProps) => {
         <DropdownItem
           key={title}
           ouiaId={title}
-          disabled={isDisabled}
+          isDisabled={isDisabled}
           component={
             appId && url
               ? ({ className: itemClassName }) => (

src/components/Header/Tools.tsx

@@ -131,33 +131,33 @@ const Tools = () => {
   /* list out the items for the about menu */
   const aboutMenuDropdownItems = [
     {
-      title: `${intl.formatMessage(messages.apiDocumentation)}`,
+      title: intl.formatMessage(messages.apiDocumentation),
       onClick: () => window.open('https://developers.redhat.com/api-catalog/', '_blank'),
       isHidden: isITLessEnv,
     },
     {
-      title: `${intl.formatMessage(messages.openSupportCase)}`,
+      title: intl.formatMessage(messages.openSupportCase),
       onClick: () => createSupportCase(user.identity, libjwt),
       isDisabled: window.location.href.includes('/application-services') && !isRhosakEntitled,
       isHidden: isITLessEnv,
     },
     {
-      title: `${intl.formatMessage(messages.statusPage)}`,
+      title: intl.formatMessage(messages.statusPage),
       onClick: () => window.open('https://status.redhat.com/', '_blank'),
       isHidden: isITLessEnv,
     },
     {
-      title: `${intl.formatMessage(messages.supportOptions)}`,
+      title: intl.formatMessage(messages.supportOptions),
       url: isITLessEnv ? 'https://redhatgov.servicenowservices.com/css' : 'https://access.redhat.com/support',
     },
     {
-      title: `${intl.formatMessage(messages.insightsRhelDocumentation)}`,
+      title: intl.formatMessage(messages.insightsRhelDocumentation),
       onClick: () => window.open('https://access.redhat.com/documentation/en-us/red_hat_insights', '_blank'),
       isHidden: getSection() !== 'insights' || isITLessEnv,
     },
 
     {
-      title: `${intl.formatMessage(messages.demoMode)}`,
+      title: intl.formatMessage(messages.demoMode),
       onClick: () => cookie.set('cs_demo', 'true') && window.location.reload(),
       isHidden: !isDemoAcc,
     },

src/components/Routes/Routes.tsx

@@ -33,6 +33,14 @@ const redirects = [
     path: '/subscriptions',
     to: '/subscriptions/overview',
   },
+  {
+    path: '/business-services',
+    to: '/business-services/hybrid-committed-spend',
+  },
+  {
+    path: '/docs',
+    to: '/docs/api',
+  },
 ];
 
 export type RoutesProps = {

src/utils/createCase.ts

@@ -77,7 +77,9 @@ export async function createSupportCase(
   }
 ) {
   const currentProduct = registerProduct() || 'Other';
-  const { src_hash, app_name } = await getProductData();
+  const productData = await getProductData();
+  // a temporary fallback to getUrl() until all apps are redeployed, which will fix getProductData() - remove after some time
+  const { src_hash, app_name } = { src_hash: productData?.src_hash, app_name: productData?.app_name ?? getUrl('app') };
   const portalUrl = `${getEnvDetails()?.portal}`;
   const caseUrl = `${portalUrl}${HYDRA_ENDPOINT}`;