Merge pull request #892 from betagouv/fiche_reseau_valeurs_zero

Vérification de valeur pour afficher les infos du réseau
betagouv · Oct 15, 2024 · cd6696a · cd6696a
2 parents e63dbd7 + 4bd1099
commit cd6696a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/components/Network/Network.tsx b/src/components/Network/Network.tsx
@@ -2,6 +2,7 @@ import HoverableIcon from '@components/Hoverable/HoverableIcon';
 import Map from '@components/Map/Map';
 import Link from '@components/ui/Link';
 import Text from '@components/ui/Text';
+import { isDefined } from '@utils/core';
 import { getConso } from 'src/services/Map/conso';
 import { createMapConfiguration } from 'src/services/Map/map-configuration';
 import { Network } from 'src/types/Summary/Network';
@@ -92,9 +93,7 @@ const NetworkPanel = ({
                     <div>
                       <b>Taux d’EnR&R</b>
                     </div>
-                    <div>
-                      {network['Taux EnR&R'] !== null && network['Taux EnR&R'] !== undefined ? `${network['Taux EnR&R']}%` : 'Non connu'}
-                    </div>
+                    <div>{isDefined(network['Taux EnR&R']) ? `${network['Taux EnR&R']}%` : 'Non connu'}</div>
                   </BoxContent>
                 )}
                 <BoxContent>
@@ -104,7 +103,7 @@ const NetworkPanel = ({
                       ACV : en analyse du cycle de vie (émissions directes et indirectes).
                     </HoverableIcon>
                   </div>
-                  <div>{network['contenu CO2 ACV'] ? `${network['contenu CO2 ACV'] * 1000} g CO2/kWh` : 'Non connu'}</div>
+                  <div>{isDefined(network['contenu CO2 ACV']) ? `${network['contenu CO2 ACV'] * 1000} g CO2/kWh` : 'Non connu'}</div>
                 </BoxContent>
                 <BoxContent>
                   <div>
@@ -113,7 +112,7 @@ const NetworkPanel = ({
                       Émissions directes
                     </HoverableIcon>
                   </div>
-                  <div>{network['contenu CO2'] ? `${network['contenu CO2'] * 1000} g CO2/kWh` : 'Non connu'}</div>
+                  <div>{isDefined(network['contenu CO2']) ? `${network['contenu CO2'] * 1000} g CO2/kWh` : 'Non connu'}</div>
                 </BoxContent>
               </BlueBox>
             )}

diff --git a/src/services/Map/conso.ts b/src/services/Map/conso.ts
@@ -1,5 +1,7 @@
+import { isDefined } from '@utils/core';
+
 export const getConso = (conso: number) => {
-  if (conso !== null && conso !== undefined) {
+  if (isDefined(conso)) {
     if (conso > 1000) {
       return `${(conso / 1000).toFixed(2)} GWh`;
     }