diff --git a/src/components/graph/menus/root-network/root-network-panel-search.tsx b/src/components/graph/menus/root-network/root-network-panel-search.tsx index e4c0ef6780..367b17e7cf 100644 --- a/src/components/graph/menus/root-network/root-network-panel-search.tsx +++ b/src/components/graph/menus/root-network/root-network-panel-search.tsx @@ -30,12 +30,7 @@ interface RootNetworkSearchPanelProps { } function getModificationResultsCount(results: ModificationsSearchResult[]): number { - return results.reduce((sum, node) => { - const countForNode = node.modifications.reduce((innerSum, modif) => { - return innerSum + modif.impactedEquipmentIds.length; - }, 0); - return sum + countForNode; - }, 0); + return results.reduce((sum, r) => sum + r.modifications.length, 0); } function getNodeResultsCount(results: string[]): number { @@ -132,11 +127,14 @@ const RootNetworkSearchPanel: React.FC = ({ setIsSe @@ -149,21 +147,14 @@ const RootNetworkSearchPanel: React.FC = ({ setIsSe )} {showResultsCount && ( - {isNodeTab(tabValue) ? ( - - ) : ( - - )} + )} diff --git a/src/components/graph/menus/root-network/root-network-search-bar.tsx b/src/components/graph/menus/root-network/root-network-search-bar.tsx index bc8fce27d5..91cbf1879e 100644 --- a/src/components/graph/menus/root-network/root-network-search-bar.tsx +++ b/src/components/graph/menus/root-network/root-network-search-bar.tsx @@ -13,11 +13,12 @@ import React from 'react'; interface SearchBarProps { readonly placeholder: string; readonly value: string; + readonly label?: string; readonly onChange: (e: React.ChangeEvent) => void; readonly onClear: () => void; } -export default function SearchBar({ placeholder, value, onChange, onClear }: SearchBarProps) { +export default function SearchBar({ placeholder, value, label, onChange, onClear }: SearchBarProps) { return ( <> ", diff --git a/src/translations/fr.json b/src/translations/fr.json index 9bfad863e2..896db37b83 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -1448,12 +1448,11 @@ "importCaseFailure": "Impossible d'importer la situation", "modificationActivationByRootNetworkError": "Une erreur est survenue lors de l'activation / désactivation de la modification par réseau racine", "rootNetwork.modificationsInfos": "Seules les modifications dans les nœuds réalisés et leurs nœuds parents apparaitront dans les résultats.", - "rootNetwork.searchPlaceholder.modifications": "Rechercher un ouvrage modifié…", - "rootNetwork.searchPlaceholder.nodes": "Rechercher un nœud...", + "rootNetwork.searchLabel.modifications": "Rechercher un ouvrage", + "rootNetwork.searchLabel.nodes": "Rechercher un nœud", "rootNetwork.modificationTab": "Modifications", "rootNetwork.nodeTab": "Nœuds", - "rootNetwork.nodeResults": "{count, plural, =0 {Aucun résultat} =1 {# résultat} other {# résultats}}", - "rootNetwork.modificationResults": "{count, plural, =0 {Aucun ouvrage trouvé} =1 {# ouvrage trouvé} other {# ouvrages trouvés}}", + "rootNetwork.results": "{count, plural, =0 {Aucun résultat} =1 {# résultat} other {# résultats}}", "rootNetwork.loading": "Chargement...", "rootNetwork.originalNotFound": "La situation d'origine est introuvable", "rootNetwork.unknownPath": "",