diff --git a/public/locales/en-US.json b/public/locales/en-US.json index df0cc1f39..b858f0829 100644 --- a/public/locales/en-US.json +++ b/public/locales/en-US.json @@ -28,8 +28,6 @@ "cardHeading_OpenShift-dedicated-metrics": "On-Demand subscriptions", "cardHeading_RHEL": "CPU socket usage", "cardHeading_Satellite": "CPU socket usage", - "cardHeading_Satellite Capsule": "$t(curiosity-graph.cardHeading_Satellite)", - "cardHeading_Satellite Server": "$t(curiosity-graph.cardHeading_Satellite)", "cardHeadingDescription": "...", "cardHeadingDescription_Cores": "vCPU hours usage in hours", "cardHeadingDescription_Instance-hours": "Instance hours usage in hours", @@ -370,8 +368,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_Satellite": "Red Hat Satellite", - "title_Satellite Capsule": "Red Hat Satellite Capsule", - "title_Satellite Server": "Red Hat Satellite Server" + "title_Satellite": "Red Hat Satellite" } } diff --git a/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap b/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap index 4b5cf2767..cfd49a79a 100644 --- a/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap +++ b/src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap @@ -385,24 +385,6 @@ exports[`Authentication Component should return a redirect on 418 error: 418 err "path": "/satellite", "redirect": null, }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "satellite-capsule", - "path": "/satellite-capsule", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "satellite-server", - "path": "/satellite-server", - "redirect": null, - }, { "activateOnError": true, "component": "optinView/optinView", @@ -508,24 +490,6 @@ exports[`Authentication Component should return a redirect on a specific 403 err "path": "/satellite", "redirect": null, }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "satellite-capsule", - "path": "/satellite-capsule", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "satellite-server", - "path": "/satellite-server", - "redirect": null, - }, { "activateOnError": true, "component": "optinView/optinView", @@ -631,24 +595,6 @@ exports[`Authentication Component should return a redirect on a specific 403 err "path": "/satellite", "redirect": null, }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "satellite-capsule", - "path": "/satellite-capsule", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "satellite-server", - "path": "/satellite-server", - "redirect": null, - }, { "activateOnError": true, "component": "optinView/optinView", diff --git a/src/components/router/__tests__/__snapshots__/redirect.test.js.snap b/src/components/router/__tests__/__snapshots__/redirect.test.js.snap index ff553dac0..862e3b1e0 100644 --- a/src/components/router/__tests__/__snapshots__/redirect.test.js.snap +++ b/src/components/router/__tests__/__snapshots__/redirect.test.js.snap @@ -421,24 +421,6 @@ exports[`Redirect Component should render a basic component: basic 1`] = ` "path": "/satellite", "redirect": null, }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "satellite-capsule", - "path": "/satellite-capsule", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "satellite-server", - "path": "/satellite-server", - "redirect": null, - }, { "activateOnError": true, "component": "optinView/optinView", diff --git a/src/components/router/__tests__/__snapshots__/router.test.js.snap b/src/components/router/__tests__/__snapshots__/router.test.js.snap index e89d57849..05ad6a9ec 100644 --- a/src/components/router/__tests__/__snapshots__/router.test.js.snap +++ b/src/components/router/__tests__/__snapshots__/router.test.js.snap @@ -122,24 +122,6 @@ exports[`Router Component should render a basic component: basic 1`] = ` "path": "/satellite", "redirect": null, }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "satellite-capsule", - "path": "/satellite-capsule", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "satellite-server", - "path": "/satellite-server", - "redirect": null, - }, { "activateOnError": true, "component": "optinView/optinView", diff --git a/src/components/router/__tests__/__snapshots__/routerHelpers.test.js.snap b/src/components/router/__tests__/__snapshots__/routerHelpers.test.js.snap index 11dcd04d7..b3fb585e1 100644 --- a/src/components/router/__tests__/__snapshots__/routerHelpers.test.js.snap +++ b/src/components/router/__tests__/__snapshots__/routerHelpers.test.js.snap @@ -187,8 +187,6 @@ exports[`RouterHelpers should return specific properties: routerHelpers 1`] = ` ], "viewSatellite": [ "Satellite", - "Satellite Capsule", - "Satellite Server", ], "viewrhacs": [ "rhacs", @@ -264,24 +262,6 @@ exports[`RouterHelpers should return specific properties: routerHelpers 1`] = ` "path": "/satellite", "redirect": null, }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "satellite-capsule", - "path": "/satellite-capsule", - "redirect": null, - }, - { - "activateOnError": false, - "component": "productView/productView", - "disabled": false, - "exact": true, - "id": "satellite-server", - "path": "/satellite-server", - "redirect": null, - }, { "activateOnError": true, "component": "optinView/optinView", diff --git a/src/config/product.satellite.js b/src/config/product.satellite.js index e2944f952..8dea9186e 100644 --- a/src/config/product.satellite.js +++ b/src/config/product.satellite.js @@ -219,6 +219,9 @@ const config = { { id: RHSM_API_QUERY_SET_TYPES.USAGE, selected: true + }, + { + id: RHSM_API_QUERY_SET_TYPES.VARIANT } ], initialSecondaryToolbarFilters: [ diff --git a/src/config/routes.js b/src/config/routes.js index 4003357e6..d88b26901 100644 --- a/src/config/routes.js +++ b/src/config/routes.js @@ -108,34 +108,6 @@ const routes = [ default: false, component: 'productView/productView' }, - { - id: 'satellite-capsule', - path: '/satellite-capsule', - pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.SATELLITE_CAPSULE], - productParameter: [satelliteProductConfig.productGroup], - productConfig: [{ ...satelliteProductConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.SATELLITE_CAPSULE }], - redirect: null, - isSearchable: false, - aliases: [], - activateOnError: false, - disabled: helpers.UI_DISABLED, - default: false, - component: 'productView/productView' - }, - { - id: 'satellite-server', - path: '/satellite-server', - pathParameter: [RHSM_API_PATH_PRODUCT_TYPES.SATELLITE_SERVER], - productParameter: [satelliteProductConfig.productGroup], - productConfig: [{ ...satelliteProductConfig, productId: RHSM_API_PATH_PRODUCT_TYPES.SATELLITE_SERVER }], - redirect: null, - isSearchable: false, - aliases: [], - activateOnError: false, - disabled: helpers.UI_DISABLED, - default: false, - component: 'productView/productView' - }, { id: 'optin', path: '/optin',