use new createNrenTableLookup function

compendium-frontend/src/pages/Network/AlienWave.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { AlienWave } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorPill from "../../components/ColorPill";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -19,7 +19,7 @@ function AlienWavePage(): React.ReactElement {
         filterSelection.selectedYears.includes(data.year) && filterSelection.selectedNrens.includes(data.nren)
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, 'alien_wave_third_party');
+    const dataLookup = createNrenTableLookup(selectedData, 'alien_wave_third_party');
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Network/AlienWaveInternal.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { AlienWaveInternal } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorPill from "../../components/ColorPill";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -19,7 +19,7 @@ function AlienWaveInternalPage(): React.ReactElement {
         filterSelection.selectedYears.includes(data.year) && filterSelection.selectedNrens.includes(data.nren)
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, 'alien_wave_internal');
+    const dataLookup = createNrenTableLookup(selectedData, 'alien_wave_internal');
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Network/Automation.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { NetworkAutomation } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorPill from "../../components/ColorPill";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -19,7 +19,7 @@ function AutomationPage(): React.ReactElement {
         filterSelection.selectedYears.includes(data.year) && filterSelection.selectedNrens.includes(data.nren)
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, 'network_automation');
+    const dataLookup = createNrenTableLookup(selectedData, 'network_automation');
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Network/FibreLight.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { FibreLight } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorPill from "../../components/ColorPill";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -19,7 +19,7 @@ function FibreLightPage(): React.ReactElement {
         filterSelection.selectedYears.includes(data.year) && filterSelection.selectedNrens.includes(data.nren)
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, 'light_description');
+    const dataLookup = createNrenTableLookup(selectedData, 'light_description');
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Network/OPsAutomation.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { OPsAutomation } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorPill from "../../components/ColorPill";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -19,7 +19,7 @@ function OPsAutomationPage(): React.ReactElement {
         filterSelection.selectedYears.includes(data.year) && filterSelection.selectedNrens.includes(data.nren)
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, 'ops_automation');
+    const dataLookup = createNrenTableLookup(selectedData, 'ops_automation');
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Network/PassiveMonitoring.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { PassiveMonitoring } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorPill from "../../components/ColorPill";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -19,7 +19,7 @@ function PassiveMonitoringPage(): React.ReactElement {
         filterSelection.selectedYears.includes(data.year) && filterSelection.selectedNrens.includes(data.nren)
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, 'monitoring');
+    const dataLookup = createNrenTableLookup(selectedData, 'monitoring');
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Network/PertTeam.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { PertTeam } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorPill from "../../components/ColorPill";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -19,7 +19,7 @@ function PertTeamPage(): React.ReactElement {
         filterSelection.selectedYears.includes(data.year) && filterSelection.selectedNrens.includes(data.nren)
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, 'pert_team');
+    const dataLookup = createNrenTableLookup(selectedData, 'pert_team');
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Network/TrafficUrl.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { TrafficStatistics } from "../../Schema";
-import { createMatrixDataLookup, addHttpIfMissing, getLatestData } from "../../helpers/dataconversion";
+import { createNrenTableLookup, addHttpIfMissing, getLatestData } from "../../helpers/dataconversion";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
 import { Sections } from "../../helpers/constants";
@@ -18,7 +18,7 @@ function TrafficUrlPage(): React.ReactElement {
         filterSelection.selectedNrens.includes(data.nren)
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, 'traffic_statistics');
+    const dataLookup = createNrenTableLookup(selectedData, 'traffic_statistics');
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Network/WeatherMap.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { WeatherMap } from "../../Schema";
-import { createMatrixDataLookup, getLatestData, addHttpIfMissing } from "../../helpers/dataconversion";
+import { createNrenTableLookup, getLatestData, addHttpIfMissing } from "../../helpers/dataconversion";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
 import { Sections } from "../../helpers/constants";
@@ -19,7 +19,7 @@ function NetworkWeatherMapPage(): React.ReactElement {
         filterSelection.selectedNrens.includes(data.nren)
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, 'weather_map');
+    const dataLookup = createNrenTableLookup(selectedData, 'weather_map');
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Organization/ChargingStructure.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { ChargingStructure } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorPill from "../../components/ColorPill";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -19,7 +19,7 @@ function ChargingStructurePage(): React.ReactElement {
         filterSelection.selectedYears.includes(data.year) && filterSelection.selectedNrens.includes(data.nren)
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, 'fee_type');
+    const dataLookup = createNrenTableLookup(selectedData, 'fee_type');
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Services/Services.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { Service, ServiceCategory } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorBadgeService from "../../components/ColorBadgeService";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -44,7 +44,7 @@ function ServicesPage({ category }: inputProps): React.ReactElement {
     });
     const servicesList = Object.entries(servicesDict).sort((a, b) => a[0].toLowerCase() < b[0].toLowerCase() ? -1 : 1);
 
-    const dataLookup = createMatrixDataLookup(selectedData, 'service_name');
+    const dataLookup = createNrenTableLookup(selectedData, 'service_name');
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Standards&Policies/Audits.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { Standards } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorPill from "../../components/ColorPill";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -21,7 +21,7 @@ function AuditsPage(): React.ReactElement {
         filterSelection.selectedYears.includes(data.year) && filterSelection.selectedNrens.includes(data.nren) && data[dataField] !== null
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, dataField);
+    const dataLookup = createNrenTableLookup(selectedData, dataField);
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Standards&Policies/BusinessContinuity.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { Standards } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorPill from "../../components/ColorPill";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -21,7 +21,7 @@ function BusinessContinuityPage(): React.ReactElement {
         filterSelection.selectedYears.includes(data.year) && filterSelection.selectedNrens.includes(data.nren) && data[dataField] !== null
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, dataField);
+    const dataLookup = createNrenTableLookup(selectedData, dataField);
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Standards&Policies/CrisisManagement.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { Standards } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorPill from "../../components/ColorPill";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -24,7 +24,7 @@ function CrisisManagementPage(): React.ReactElement {
         filterSelection.selectedYears.includes(data.year) && filterSelection.selectedNrens.includes(data.nren) && validityCheck(data)
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, dataField);
+    const dataLookup = createNrenTableLookup(selectedData, dataField);
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Standards&Policies/ServiceLevelTargets.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { ServiceManagement } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorPill from "../../components/ColorPill";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -21,7 +21,7 @@ function ServiceLevelTargetsPage(): React.ReactElement {
         filterSelection.selectedYears.includes(data.year) && filterSelection.selectedNrens.includes(data.nren) && data[dataField] !== null
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, dataField);
+    const dataLookup = createNrenTableLookup(selectedData, dataField);
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}

compendium-frontend/src/pages/Standards&Policies/ServiceManagementFramework.tsx

@@ -2,7 +2,7 @@ import React, { useContext } from "react";
 import { Table } from "react-bootstrap";
 
 import { ServiceManagement } from "../../Schema";
-import { createMatrixDataLookup } from "../../helpers/dataconversion";
+import { createNrenTableLookup } from "../../helpers/dataconversion";
 import ColorPill from "../../components/ColorPill";
 import DataPage from "../../components/DataPage";
 import Filter from "../../components/graphing/Filter";
@@ -21,7 +21,7 @@ function ServiceManagementFrameworkPage(): React.ReactElement {
         filterSelection.selectedYears.includes(data.year) && filterSelection.selectedNrens.includes(data.nren) && data[dataField] !== null
     );
 
-    const dataLookup = createMatrixDataLookup(selectedData, dataField);
+    const dataLookup = createNrenTableLookup(selectedData, dataField);
 
     const filterNode = <Filter
         filterOptions={{ availableYears: [...years], availableNrens: [...nrens.values()] }}