diff --git a/public/locales/en-US.json b/public/locales/en-US.json index 4ea5cbcbe..5b295def5 100644 --- a/public/locales/en-US.json +++ b/public/locales/en-US.json @@ -27,10 +27,6 @@ "cardHeading_OpenShift-metrics": "On-Demand subscriptions", "cardHeading_OpenShift-dedicated-metrics": "On-Demand subscriptions", "cardHeading_RHEL": "CPU socket usage", - "cardHeading_RHEL for ARM": "$t(curiosity-graph.cardHeading_RHEL)", - "cardHeading_RHEL for IBM Power": "$t(curiosity-graph.cardHeading_RHEL)", - "cardHeading_RHEL for IBM z": "$t(curiosity-graph.cardHeading_RHEL)", - "cardHeading_RHEL for x86": "$t(curiosity-graph.cardHeading_RHEL)", "cardHeading_Satellite": "CPU socket usage", "cardHeading_Satellite Capsule": "$t(curiosity-graph.cardHeading_Satellite)", "cardHeading_Satellite Server": "$t(curiosity-graph.cardHeading_Satellite)", @@ -135,22 +131,10 @@ "legendTooltip_Sockets_cloud": "Public cloud {{product}} CPU usage, 1 CPU socket per instance.", "legendTooltip_Sockets_hypervisor": "{{product}} CPU socket usage, per socket pair.", "legendTooltip_Sockets_hypervisor_RHEL": "Virtualized {{product}} CPU usage, per socket. Hypervisor guest usage with known host-guest mappings (such as multi-guest VDC subscriptions), per socket pair of the hypervisor host, using the same method as physical {{product}}.", - "legendTooltip_Sockets_hypervisor_RHEL for ARM": "$t(curiosity-graph.legendTooltip_Sockets_hypervisor_RHEL)", - "legendTooltip_Sockets_hypervisor_RHEL for IBM Power": "$t(curiosity-graph.legendTooltip_Sockets_hypervisor_RHEL)", - "legendTooltip_Sockets_hypervisor_RHEL for IBM z": "$t(curiosity-graph.legendTooltip_Sockets_hypervisor_RHEL)", - "legendTooltip_Sockets_hypervisor_RHEL for x86": "$t(curiosity-graph.legendTooltip_Sockets_hypervisor_RHEL)", "legendTooltip_Sockets_physical": "{{product}} CPU socket usage, per socket pair.", "legendTooltip_Sockets_physical_RHEL": "Physical {{product}} CPU usage, per socket pair. Each system's socket count is rounded upwards to the next even number.", - "legendTooltip_Sockets_physical_RHEL for ARM": "$t(curiosity-graph.legendTooltip_Sockets_physical_RHEL)", - "legendTooltip_Sockets_physical_RHEL for IBM Power": "$t(curiosity-graph.legendTooltip_Sockets_physical_RHEL)", - "legendTooltip_Sockets_physical_RHEL for IBM z": "$t(curiosity-graph.legendTooltip_Sockets_physical_RHEL)", - "legendTooltip_Sockets_physical_RHEL for x86": "$t(curiosity-graph.legendTooltip_Sockets_physical_RHEL)", "legendTooltip_Sockets_virtual": "{{product}} CPU socket usage, per socket pair.", "legendTooltip_Sockets_virtual_RHEL": "Virtualized {{product}} CPU usage, per socket. Hypervisor guest usage with known host-guest mappings (such as multi-guest VDC subscriptions), per socket pair of the hypervisor host, using the same method as physical {{product}}.", - "legendTooltip_Sockets_virtual_RHEL for ARM": "$t(curiosity-graph.legendTooltip_Sockets_virtual_RHEL)", - "legendTooltip_Sockets_virtual_RHEL for IBM Power": "$t(curiosity-graph.legendTooltip_Sockets_virtual_RHEL)", - "legendTooltip_Sockets_virtual_RHEL for IBM z": "$t(curiosity-graph.legendTooltip_Sockets_virtual_RHEL)", - "legendTooltip_Sockets_virtual_RHEL for x86": "$t(curiosity-graph.legendTooltip_Sockets_virtual_RHEL)", "legendTooltip_sockets": "{{product}} CPU usage, per CPU socket pair.", "legendTooltip_Storage-gibibytes": "Data storage usage", "legendTooltip_Storage-gibibyte-months": "Data storage usage", @@ -158,10 +142,6 @@ "legendTooltip_threshold_Sockets": "Maximum capacity, based on total {{product}} subscriptions in this account.", "legendTooltip_threshold_Sockets_OpenShift Container Platform": "Maximum capacity, as CPU sockets, based on total {{product}} Annual subscriptions in this account.", "legendTooltip_threshold_Sockets_RHEL": "Maximum capacity, as CPU sockets, based on total {{product}} subscriptions in this account.", - "legendTooltip_threshold_Sockets_RHEL for ARM": "$t(curiosity-graph.legendTooltip_threshold_Sockets_RHEL)", - "legendTooltip_threshold_Sockets_RHEL for IBM Power": "$t(curiosity-graph.legendTooltip_threshold_Sockets_RHEL)", - "legendTooltip_threshold_Sockets_RHEL for IBM z": "$t(curiosity-graph.legendTooltip_threshold_Sockets_RHEL)", - "legendTooltip_threshold_Sockets_RHEL for x86": "$t(curiosity-graph.legendTooltip_threshold_Sockets_RHEL)", "legendTooltip_thresholdCores_OpenShift Container Platform": "Maximum capacity, as CPU cores, based on total {{product}} Annual subscriptions in this account.", "legendTooltip_thresholdSockets": "Maximum capacity, based on total {{product}} subscriptions in this account.", "legendTooltip_thresholdSockets_RHEL": "Maximum capacity, as CPU sockets, based on total {{product}} subscriptions in this account.", @@ -390,10 +370,6 @@ "title_rhosak": "Red Hat OpenShift Streams for Apache Kafka", "subtitle_rhosak": "Monitor your Apache Kafka usage for On-Demand subscriptions. <0>Learn more about {{appName}} reporting", "description_rhosak": "Monitor your Apache Kafka usage for On-Demand subscriptions.", - "title_RHEL for ARM": "Red Hat Enterprise Linux for ARM", - "title_RHEL for IBM Power": "Red Hat Enterprise Linux for IBM Power", - "title_RHEL for IBM z": "Red Hat Enterprise Linux for IBM z", - "title_RHEL for x86": "Red Hat Enterprise Linux for x86", "title_Satellite": "Red Hat Satellite", "title_Satellite Capsule": "Red Hat Satellite Capsule", "title_Satellite Server": "Red Hat Satellite Server" diff --git a/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap b/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap index 0862cf370..4b5cf2767 100644 --- a/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap +++ b/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap @@ -331,42 +331,6 @@ exports[`Authentication Component should return a redirect on 418 error: 418 err "path": "/rhel", "redirect": null, }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-arm", - "path": "/rhel-arm", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-ibmpower", - "path": "/rhel-ibmpower", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-ibmz", - "path": "/rhel-ibmz", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-x86", - "path": "/rhel-x86", - "redirect": null, - }, { "activateOnError": false, "component": "productView/productView", @@ -490,42 +454,6 @@ exports[`Authentication Component should return a redirect on a specific 403 err "path": "/rhel", "redirect": null, }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-arm", - "path": "/rhel-arm", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-ibmpower", - "path": "/rhel-ibmpower", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-ibmz", - "path": "/rhel-ibmz", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-x86", - "path": "/rhel-x86", - "redirect": null, - }, { "activateOnError": false, "component": "productView/productView", @@ -649,42 +577,6 @@ exports[`Authentication Component should return a redirect on a specific 403 err "path": "/rhel", "redirect": null, }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-arm", - "path": "/rhel-arm", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-ibmpower", - "path": "/rhel-ibmpower", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-ibmz", - "path": "/rhel-ibmz", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-x86", - "path": "/rhel-x86", - "redirect": null, - }, { "activateOnError": false, "component": "productView/productView", diff --git a/src/components/router/__tests__/__snapshots__/redirect.test.js.snap b/src/components/router/__tests__/__snapshots__/redirect.test.js.snap index 6138b1cb5..c376d399c 100644 --- a/src/components/router/__tests__/__snapshots__/redirect.test.js.snap +++ b/src/components/router/__tests__/__snapshots__/redirect.test.js.snap @@ -375,42 +375,6 @@ exports[`Redirect Component should render a basic component: basic 1`] = ` "path": "/rhel", "redirect": null, }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-arm", - "path": "/rhel-arm", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-ibmpower", - "path": "/rhel-ibmpower", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-ibmz", - "path": "/rhel-ibmz", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-x86", - "path": "/rhel-x86", - "redirect": null, - }, { "activateOnError": false, "component": "productView/productView", diff --git a/src/components/router/__tests__/__snapshots__/router.test.js.snap b/src/components/router/__tests__/__snapshots__/router.test.js.snap index 06c1d93e2..e89d57849 100644 --- a/src/components/router/__tests__/__snapshots__/router.test.js.snap +++ b/src/components/router/__tests__/__snapshots__/router.test.js.snap @@ -38,9 +38,9 @@ exports[`Router Component should handle unique route settings: settings 1`] = ` exports[`Router Component should pass route context: context 1`] = ` { - "pathParameter": "RHEL for ARM", - "productParameter": "RHEL", - "viewParameter": "viewRHEL", + "pathParameter": "rhods", + "productParameter": "rhods", + "viewParameter": "viewrhods", } `; @@ -68,42 +68,6 @@ exports[`Router Component should render a basic component: basic 1`] = ` "path": "/rhel", "redirect": null, }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-arm", - "path": "/rhel-arm", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-ibmpower", - "path": "/rhel-ibmpower", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-ibmz", - "path": "/rhel-ibmz", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-x86", - "path": "/rhel-x86", - "redirect": null, - }, { "activateOnError": false, "component": "productView/productView", diff --git a/src/components/router/__tests__/__snapshots__/routerHelpers.test.js.snap b/src/components/router/__tests__/__snapshots__/routerHelpers.test.js.snap index ac8550a93..11dcd04d7 100644 --- a/src/components/router/__tests__/__snapshots__/routerHelpers.test.js.snap +++ b/src/components/router/__tests__/__snapshots__/routerHelpers.test.js.snap @@ -96,13 +96,13 @@ exports[`RouterHelpers should return navigation and route details from a path: d exports[`RouterHelpers should return navigation and route details from a path: detail: specific product path 1`] = ` { - "id": "rhel-arm", + "id": "rhods", } `; exports[`RouterHelpers should return navigation and route details from a related name: detail: match related name 1`] = ` { - "id": "rhel-arm", + "id": "rhods", } `; @@ -138,7 +138,7 @@ exports[`RouterHelpers should return navigation and route details that align to exports[`RouterHelpers should return navigation and route details that align to location: detail: specific navigation ID 1`] = ` { - "id": "rhel-arm", + "id": "rhods", } `; @@ -184,10 +184,6 @@ exports[`RouterHelpers should return specific properties: routerHelpers 1`] = ` ], "viewRHEL": [ "RHEL", - "RHEL for ARM", - "RHEL for IBM Power", - "RHEL for IBM z", - "RHEL for x86", ], "viewSatellite": [ "Satellite", @@ -214,42 +210,6 @@ exports[`RouterHelpers should return specific properties: routerHelpers 1`] = ` "path": "/rhel", "redirect": null, }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-arm", - "path": "/rhel-arm", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-ibmpower", - "path": "/rhel-ibmpower", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-ibmz", - "path": "/rhel-ibmz", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "rhel-x86", - "path": "/rhel-x86", - "redirect": null, - }, { "activateOnError": false, "component": "productView/productView", diff --git a/src/components/router/__tests__/router.test.js b/src/components/router/__tests__/router.test.js index 03ef5b5ff..2e7a2a14a 100644 --- a/src/components/router/__tests__/router.test.js +++ b/src/components/router/__tests__/router.test.js @@ -45,14 +45,14 @@ describe('Router Component', () => { const component = await mountHookComponent( - + ); const specificRoute = component.find(Route); expect(specificRoute.length).toBe(1); - expect(specificRoute.props().path).toBe('/rhel-arm'); + expect(specificRoute.props().path).toBe('/rhods'); }); it('should pass route context', async () => { @@ -66,7 +66,7 @@ describe('Router Component', () => { await mountHookComponent( - + diff --git a/src/components/router/__tests__/routerHelpers.test.js b/src/components/router/__tests__/routerHelpers.test.js index 3bb05465c..0a400d09b 100644 --- a/src/components/router/__tests__/routerHelpers.test.js +++ b/src/components/router/__tests__/routerHelpers.test.js @@ -127,7 +127,7 @@ describe('RouterHelpers', () => { }).toMatchSnapshot('detail: specific route ID'); expect({ - id: getRouteConfig({ id: 'rhel-arm' })?.id + id: getRouteConfig({ id: 'rhods' })?.id }).toMatchSnapshot('detail: specific navigation ID'); expect({ @@ -172,7 +172,7 @@ describe('RouterHelpers', () => { }).toMatchSnapshot('detail: match specific path'); expect({ - id: getRouteConfigByPath({ pathName: '/rhel-arm' }).firstMatch?.id + id: getRouteConfigByPath({ pathName: '/rhods' }).firstMatch?.id }).toMatchSnapshot('detail: specific product path'); expect({ @@ -186,7 +186,7 @@ describe('RouterHelpers', () => { it('should return navigation and route details from a related name', () => { expect({ - id: getRouteConfigByPath({ pathName: '/lorem-ipsum/RHEL%20for%20ARM' }).firstMatch?.id + id: getRouteConfigByPath({ pathName: '/lorem-ipsum/RHODS' }).firstMatch?.id }).toMatchSnapshot('detail: match related name'); }); diff --git a/src/config/product.rhel.js b/src/config/product.rhel.js index da4bf3b02..bd58e4886 100644 --- a/src/config/product.rhel.js +++ b/src/config/product.rhel.js @@ -306,6 +306,9 @@ const config = { }, { id: RHSM_API_QUERY_SET_TYPES.CATEGORY + }, + { + id: RHSM_API_QUERY_SET_TYPES.ARCHITECTURE } ] }; diff --git a/src/config/routes.js b/src/config/routes.js index c444a6484..4003357e6 100644 --- a/src/config/routes.js +++ b/src/config/routes.js @@ -24,62 +24,6 @@ const routes = [ default: false, component: 'productView/productView' }, - { - id: 'rhel-arm', - path: '/rhel-arm', - pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.RHEL_ARM], - productParameter: [rhelConfig.productGroup], - productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.RHEL_ARM }], - redirect: null, - isSearchable: false, - aliases: [], - activateOnError: false, - disabled: helpers.UI_DISABLED, - default: false, - component: 'productView/productView' - }, - { - id: 'rhel-ibmpower', - path: '/rhel-ibmpower', - pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.RHEL_IBM_POWER], - productParameter: [rhelConfig.productGroup], - productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.RHEL_IBM_POWER }], - redirect: null, - isSearchable: false, - aliases: [], - activateOnError: false, - disabled: helpers.UI_DISABLED, - default: false, - component: 'productView/productView' - }, - { - id: 'rhel-ibmz', - path: '/rhel-ibmz', - pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.RHEL_IBM_Z], - productParameter: [rhelConfig.productGroup], - productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.RHEL_IBM_Z }], - redirect: null, - isSearchable: false, - aliases: [], - activateOnError: false, - disabled: helpers.UI_DISABLED, - default: false, - component: 'productView/productView' - }, - { - id: 'rhel-x86', - path: '/rhel-x86', - pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.RHEL_X86], - productParameter: [rhelConfig.productGroup], - productConfig: [{ ...rhelConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.RHEL_X86 }], - redirect: null, - isSearchable: false, - aliases: [], - activateOnError: false, - disabled: helpers.UI_DISABLED, - default: false, - component: 'productView/productView' - }, { id: 'openshift-container', path: '/openshift-container',