Skip to content
Snippets Groups Projects
Commit aea76e40 authored by Bjarke Madsen's avatar Bjarke Madsen
Browse files

Use correct values

parent 4dc64a67
Branches
Tags
1 merge request!134Refactor
This commit is part of merge request !134. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
compendium-frontend/src/pages/Network/Automation.tsx
+ 1
− 1
View file @ aea76e40
......@@ -85,7 +85,7 @@ function AutomationPage(): React.ReactElement {
{Array.from(dataLookup.entries()).map(([nren, nrenMap]) => (
<tr key={nren}>
<td>{nren}</td>
{["Device Provisioning", "Data Collection", "Configuration Management", "Compliance", "Reporting", "Troubleshooting"].map(column_key => (
{["provisioning", "data_collection", "config_management", "compliance", "reporting", "troubleshooting"].map(column_key => (
<>
<td key={`${nren}-${column_key}-yes`}>
{nrenMap.has("yes") &&
......
compendium-frontend/src/pages/Network/FibreLight.tsx
+ 6
− 6
View file @ aea76e40
......@@ -59,9 +59,9 @@ function FibreLightPage(): React.ReactElement {
{Array.from(dataLookup.entries()).map(([nren, nrenMap]) => (
<tr key={nren}>
<td>{nren}</td>
{["NREN owns and operates equipment",
"NREN owns equipment and operation is outsourced",
"Ownership and management are out-sourced (turn-key model)"].map(column_key => (
{["nren_owns_and_operates",
"nren_owns_outsourced_operation",
"outsourced_ownership_and_operation"].map(column_key => (
<td key={column_key}>
{nrenMap.has(column_key) &&
showYears.map(year => {
......@@ -72,9 +72,9 @@ function FibreLightPage(): React.ReactElement {
</td>
))}
<td>
{Array.from(nrenMap.keys()).filter(key => !["NREN owns and operates equipment",
"NREN owns equipment and operation is outsourced",
"Ownership and management are out-sourced (turn-key model)"].includes(key)).map(other_key => (
{Array.from(nrenMap.keys()).filter(key => !["nren_owns_and_operates",
"nren_owns_outsourced_operation",
"outsourced_ownership_and_operation"].includes(key)).map(other_key => (
<div key={other_key}>
{Array.from(nrenMap.get(other_key)!).map(([year, fibreLight]) => (
<ColorPill key={year} year={year} active={true} tooltip={other_key} rounded />
......
compendium-frontend/src/pages/Network/MonitoringTools.tsx
+ 9
− 9
View file @ aea76e40
......@@ -61,16 +61,16 @@ function MonitoringToolsPage(): React.ReactElement {
{Array.from(toolDescriptionsDataLookup.entries()).map(([nren, nrenMap]) => (
<tr key={nren}>
<td>{nren}</td>
{["Looking Glass",
"Network or services Status Dashboard",
"Historical traffic volume information",
"Netflow analysis tool"].map(column_key => (
{["looking_glass",
"status_dashboard",
"historical_traffic_volumes",
"netflow_analysis"].map(column_key => (
<td key={column_key}>
{nrenMap.has(column_key) &&
showYears.map(year => {
const chargingYears = nrenMap.get(column_key)!;
const yearData = chargingYears.get(year);
const tooltip = column_key === "Netflow analysis tool"
const tooltip = column_key === "netflow_analysis"
&& yearData && yearData.netflow_processing_description
? yearData.netflow_processing_description : "";
return <ColorPill key={year} year={year} active={chargingYears.has(year)} tooltip={tooltip}/>;
......@@ -79,10 +79,10 @@ function MonitoringToolsPage(): React.ReactElement {
</td>
))}
<td>
{Array.from(nrenMap.keys()).filter(key => !["Looking Glass",
"Network or services Status Dashboard",
"Historical traffic volume information",
"Netflow analysis tool"].includes(key)).map(other_key => (
{Array.from(nrenMap.keys()).filter(key => !["looking_glass",
"status_dashboard",
"historical_traffic_volumes",
"netflow_analysis"].includes(key)).map(other_key => (
<div key={other_key}>
{Array.from(nrenMap.get(other_key)!).map(([year, fibreLight]) => (
<ColorPill key={year} year={year} active={true} tooltip={other_key} />
......
compendium-frontend/src/pages/Network/NetworkFunctionVirtualisation.tsx
+ 5
− 5
View file @ aea76e40
......@@ -73,7 +73,7 @@ function NetworkFunctionVirtualisationPage(): React.ReactElement {
{Array.from(dataLookup.entries()).map(([nren, nrenMap]) => (
<tr key={nren}>
<td>{nren}</td>
{["Routers/switches", "Firewalls", "Load balancers", "VPN Concentrator Services"].map(column_key => (
{["routers", "firewalls", "load_balancers", "vpn_concentrators"].map(column_key => (
<>
<td key={`${column_key}-yes`}>
{nrenMap.has(column_key) &&
......@@ -113,8 +113,8 @@ function NetworkFunctionVirtualisationPage(): React.ReactElement {
))}
<td key={`${nren}-other-yes`}>
{Array.from(nrenMap.keys()).filter(key => !["Routers/switches", "Firewalls",
"Load balancers", "VPN Concentrator Services"].includes(key)).map(other_key => (
{Array.from(nrenMap.keys()).filter(key => !["routers", "firewalls",
"load_balancers", "vpn_concentrators"].includes(key)).map(other_key => (
<div key={`${other_key}-yes`}>
{nrenMap.has(other_key) &&
......@@ -136,8 +136,8 @@ function NetworkFunctionVirtualisationPage(): React.ReactElement {
))}
</td>
<td key={`${nren}-other-planned`}>
{Array.from(nrenMap.keys()).filter(key => !["Routers/switches", "Firewalls",
"Load balancers", "VPN Concentrator Services"].includes(key)).map(other_key => (
{Array.from(nrenMap.keys()).filter(key => !["routers", "firewalls",
"load_balancers", "vpn_concentrators"].includes(key)).map(other_key => (
<div key={`${other_key}-planned`}>
{nrenMap.has(other_key) &&
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment