Skip to content

Commit

Permalink
refactor(config): sw-722 activate rhel archs filter (#1014)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdcabrera
cdcabrera committed Dec 16, 2022
1 parent 6fc31ed commit a1be13e
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 312 deletions.
24 changes: 0 additions & 24 deletions public/locales/en-US.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down Expand Up @@ -135,33 +131,17 @@
"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",
"legendTooltip_threshold_Cores_OpenShift Container Platform": "Maximum capacity, as CPU cores, based on total {{product}} Annual subscriptions in this account.",
"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.",
Expand Down Expand Up @@ -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</0>",
"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"
Expand Down
108 changes: 0 additions & 108 deletions src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
36 changes: 0 additions & 36 deletions src/components/router/__tests__/__snapshots__/redirect.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
42 changes: 3 additions & 39 deletions src/components/router/__tests__/__snapshots__/router.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
`;

Expand Down Expand Up @@ -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",
Expand Down
46 changes: 3 additions & 43 deletions src/components/router/__tests__/__snapshots__/routerHelpers.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
`;

Expand Down Expand Up @@ -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",
}
`;

Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/components/router/__tests__/router.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ describe('Router Component', () => {

const component = await mountHookComponent(
<Provider store={store}>
<MemoryRouter initialEntries={['/rhel-arm?ipsum=1%202&dolor=sit&dolor=sit&dolor']}>
<MemoryRouter initialEntries={['/rhods?ipsum=1%202&dolor=sit&dolor=sit&dolor']}>
<Router {...props} />
</MemoryRouter>
</Provider>
);
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 () => {
Expand All @@ -66,7 +66,7 @@ describe('Router Component', () => {

await mountHookComponent(
<Provider store={store}>
<MemoryRouter initialEntries={['/rhel-arm']}>
<MemoryRouter initialEntries={['/rhods']}>
<Router {...props} />
</MemoryRouter>
</Provider>
Expand Down
Loading

0 comments on commit a1be13e

Please sign in to comment.