front: rename filteredAndSortedSearchRestuls -> searchResultsFilteredByCh

Signed-off-by: Clara Ni <clara.ni@outlook.fr>

Author: clarani

front/src/common/Map/Search/MapSearchOperationalPoint.tsx

@@ -29,7 +29,7 @@ const MapSearchOperationalPoint = ({
     searchTerm,
     chCodeFilter,
     searchResults,
-    filteredAndSortedSearchResults,
+    searchResultsFilteredByCh,
     mainOperationalPointsOnly,
     setSearchTerm,
     setChCodeFilter,
@@ -136,13 +136,13 @@ const MapSearchOperationalPoint = ({
         {searchResults.length > 100
           ? t('resultsCountTooMuch')
           : t('resultsCount', {
-              count: filteredAndSortedSearchResults.length,
+              count: searchResultsFilteredByCh.length,
             })}
       </h2>
       <div className="search-results">
         {searchResults.length > 0 &&
           searchResults.length <= 100 &&
-          filteredAndSortedSearchResults.map((searchResult, index) => (
+          searchResultsFilteredByCh.map((searchResult, index) => (
             <button
               id={`result-${index}`}
               type="button"

front/src/common/Map/Search/useSearchOperationalPoint.tsx

@@ -153,18 +153,19 @@ export default function useSearchOperationalPoint({
     [infraID, isStdcm, isSuperUser]
   );
 
-  const filteredAndSortedSearchResults = useMemo(
-    () =>
-      searchResults.filter((result) => {
-        if (mainOperationalPointsOnly || (chCodeFilter && MAIN_OP_CH_CODES.includes(chCodeFilter)))
-          return MAIN_OP_CH_CODES.includes(result.ch);
+  /** Filter operational points on secondary code (ch), if provided */
+  const searchResultsFilteredByCh = useMemo(() => {
+    if (
+      mainOperationalPointsOnly ||
+      (chCodeFilter !== undefined && MAIN_OP_CH_CODES.includes(chCodeFilter))
+    )
+      return searchResults.filter((result) => MAIN_OP_CH_CODES.includes(result.ch));
 
-        if (chCodeFilter === undefined) return true;
+    if (!chCodeFilter) return searchResults;
 
-        return result.ch.toLocaleLowerCase().includes(chCodeFilter.trim().toLowerCase());
-      }),
-    [searchResults, chCodeFilter, mainOperationalPointsOnly]
-  );
+    const chFilter = chCodeFilter.trim().toLowerCase();
+    return searchResults.filter((result) => result.ch.toLocaleLowerCase().includes(chFilter));
+  }, [searchResults, chCodeFilter, mainOperationalPointsOnly]);
 
   useEffect(() => {
     if (debouncedSearchTerm) {
@@ -183,7 +184,7 @@ export default function useSearchOperationalPoint({
   return {
     searchTerm,
     chCodeFilter,
-    filteredAndSortedSearchResults,
+    searchResultsFilteredByCh,
     mainOperationalPointsOnly,
     searchResults,
     searchOperationalPoints,