Skip to content

Commit

Permalink
refactor(config): sw-722 activate satellite variant filter
Browse files Browse the repository at this point in the history
  • Loading branch information
cdcabrera committed Dec 12, 2022
1 parent d6aa807 commit fba4af1
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 143 deletions.
6 changes: 1 addition & 5 deletions public/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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</0>",
"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"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -429,24 +429,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",
Expand Down
18 changes: 0 additions & 18 deletions src/components/router/__tests__/__snapshots__/router.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@ exports[`RouterHelpers should return specific properties: routerHelpers 1`] = `
],
"viewSatellite": [
"Satellite",
"Satellite Capsule",
"Satellite Server",
],
"viewrhacs": [
"rhacs",
Expand Down Expand Up @@ -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",
Expand Down
3 changes: 3 additions & 0 deletions src/config/product.satellite.js
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@ const config = {
{
id: RHSM_API_QUERY_SET_TYPES.USAGE,
selected: true
},
{
id: RHSM_API_QUERY_SET_TYPES.VARIANT
}
]
};
Expand Down
28 changes: 0 additions & 28 deletions src/config/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit fba4af1

Please sign in to comment.