Merge branch 'master' into test-full-text-search

package.json

@@ -57,7 +57,7 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
     "@redhat-cloud-services/eslint-config-redhat-cloud-services": "^1.3.0",
     "@redhat-cloud-services/frontend-components-config-utilities": "^3.0.4",
-    "@redhat-cloud-services/types": "^1.0.9",
+    "@redhat-cloud-services/types": "^1.0.10",
     "@simonsmith/cypress-image-snapshot": "^8.1.2",
     "@swc/core": "^1.3.102",
     "@swc/jest": "^0.2.29",

src/components/AppFilter/useAppFilter.test.js

@@ -91,7 +91,7 @@ describe('useAppFilter', () => {
     await act(async () => {
       result.current.setIsOpen(true);
     });
-    expect(axiosGetSpy).toHaveBeenCalledTimes(10);
+    expect(axiosGetSpy).toHaveBeenCalledTimes(9);
     for (let index = 0; index < 8; index++) {
       expect(axiosGetSpy.mock.calls[index]).toEqual([
         `/api/chrome-service/v1/static/stable/stage/navigation/${requiredBundles[index]}-navigation.json?ts=666`,

src/components/AppFilter/useAppFilter.ts

@@ -25,26 +25,13 @@ export const requiredBundles = [
   'settings',
   'iam',
   'quay',
-  'business-services',
   'subscriptions',
   ...(!isProd() ? previewBundles : isBeta() ? previewBundles : []),
 ].filter(Boolean);
 
 export const itLessBundles = ['openshift', 'insights', 'settings', 'iam'];
 
-const bundlesOrder = [
-  'application-services',
-  'openshift',
-  'rhel',
-  'edge',
-  'ansible',
-  'settings',
-  'cost-management',
-  'subscriptions',
-  'iam',
-  'quay',
-  'business-services',
-];
+const bundlesOrder = ['application-services', 'openshift', 'rhel', 'edge', 'ansible', 'settings', 'cost-management', 'subscriptions', 'iam', 'quay'];
 
 function findModuleByLink(href: string, { modules }: Pick<ChromeModule, 'modules'> = { modules: [] }) {
   const routes = (modules || [])

src/components/Routes/Routes.tsx

@@ -52,10 +52,6 @@ const redirects = [
     path: '/subscriptions',
     to: '/subscriptions/overview',
   },
-  {
-    path: '/business-services',
-    to: '/business-services/hybrid-committed-spend',
-  },
   {
     path: '/docs',
     to: '/docs/api',

src/pdf/requestPdf.ts

@@ -1,3 +1,4 @@
+import { PDFRequestOptions } from '@redhat-cloud-services/types';
 import axios from 'axios';
 
 const downloadPDF = async (url: string, filename = 'report.pdf') => {
@@ -42,12 +43,12 @@ const pollStatus = async (statusID: string) => {
   });
 };
 
-const requestPdf = async (options: { service: string; template: string; filename?: string; [key: string]: any }) => {
-  const { filename, ...rest } = options;
+const requestPdf = async (options: PDFRequestOptions) => {
+  const { filename, payload } = options;
   try {
     const {
       data: { statusID },
-    } = await axios.post<{ statusID: string }>(`/api/crc-pdf-generator/v2/create`, rest);
+    } = await axios.post<{ statusID: string }>(`/api/crc-pdf-generator/v2/create`, { payload });
     const { status } = await pollStatus(statusID);
     if (status === 'Generated') {
       return downloadPDF(`/api/crc-pdf-generator/v2/download/${statusID}`, filename);