From b899b90b5ea3f918cf5875b3bc84b267c4a0716d Mon Sep 17 00:00:00 2001
From: basseche <bassel.el-cheikh_externe@rte-france.com>
Date: Fri, 13 Feb 2026 12:19:28 +0100
Subject: [PATCH 1/4] Fix Charging status for Limits violation results.

Signed-off-by: basseche <bassel.el-cheikh_externe@rte-france.com>
---
 src/components/results/loadflow/limit-violation-result.tsx | 2 +-
 src/components/results/loadflow/load-flow-result-tab.tsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/results/loadflow/limit-violation-result.tsx b/src/components/results/loadflow/limit-violation-result.tsx
index 4b0501701a..b4462c12b3 100644
--- a/src/components/results/loadflow/limit-violation-result.tsx
+++ b/src/components/results/loadflow/limit-violation-result.tsx
@@ -74,7 +74,7 @@ export const LimitViolationResult: FunctionComponent<LimitViolationResultProps>
     const messages = useIntlResultStatusMessages(intl);
 
     const renderLoadFlowLimitViolations = () => {
-        const message = getNoRowsMessage(messages, result, loadFlowStatus, !isLoadingResult);
+        const message = getNoRowsMessage(messages, result, loadFlowStatus, !isLoadingResult && result !== undefined);
         const rowsToShow = getRows(result, loadFlowStatus);
 
         return (
diff --git a/src/components/results/loadflow/load-flow-result-tab.tsx b/src/components/results/loadflow/load-flow-result-tab.tsx
index e35c9951e4..0896735a47 100644
--- a/src/components/results/loadflow/load-flow-result-tab.tsx
+++ b/src/components/results/loadflow/load-flow-result-tab.tsx
@@ -241,7 +241,7 @@ export const LoadFlowResultTab: FunctionComponent<LoadFlowTabProps> = ({
 
     const result = useMemo(() => {
         if (!loadflowResult) {
-            return [];
+            return undefined;
         }
         if (tabIndex === 0 || tabIndex === 1) {
             return makeData(loadflowResult, intl);

From 9e98e8655e6ea13bd8099ec4d1d35d7cca1705b5 Mon Sep 17 00:00:00 2001
From: basseche <bassel.el-cheikh_externe@rte-france.com>
Date: Fri, 13 Feb 2026 12:34:33 +0100
Subject: [PATCH 2/4] Fix Charging status security analysis result

Signed-off-by: basseche <bassel.el-cheikh_externe@rte-france.com>
---
 .../results/securityanalysis/security-analysis-result-n.tsx   | 4 ++--
 .../results/securityanalysis/security-analysis-result-tab.tsx | 2 +-
 .../results/securityanalysis/security-analysis-table.tsx      | 2 +-
 .../results/securityanalysis/security-analysis.type.ts        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/results/securityanalysis/security-analysis-result-n.tsx b/src/components/results/securityanalysis/security-analysis-result-n.tsx
index 67b3ebcc81..3d6b187473 100644
--- a/src/components/results/securityanalysis/security-analysis-result-n.tsx
+++ b/src/components/results/securityanalysis/security-analysis-result-n.tsx
@@ -26,7 +26,7 @@ export const SecurityAnalysisResultN: FunctionComponent<SecurityAnalysisResultNP
     const intl: IntlShape = useIntl();
 
     const rows = useMemo(() => {
-        return result?.length // check if it's not Page object
+        return result !== undefined // check if it's not Page object
             ? (result?.map((preContingencyResult: PreContingencyResult) => {
                   const { limitViolation, subjectId } = preContingencyResult;
                   return {
@@ -52,7 +52,7 @@ export const SecurityAnalysisResultN: FunctionComponent<SecurityAnalysisResultNP
                               : limitViolation?.upcomingAcceptableDuration,
                   } as SecurityAnalysisNTableRow;
               }) ?? [])
-            : [];
+            : undefined;
     }, [intl, result]);
 
     return (
diff --git a/src/components/results/securityanalysis/security-analysis-result-tab.tsx b/src/components/results/securityanalysis/security-analysis-result-tab.tsx
index cbb977d4fe..6048ccaae3 100644
--- a/src/components/results/securityanalysis/security-analysis-result-tab.tsx
+++ b/src/components/results/securityanalysis/security-analysis-result-tab.tsx
@@ -199,7 +199,7 @@ export const SecurityAnalysisResultTab: FunctionComponent<SecurityAnalysisTabPro
     });
 
     const resetResultStates = useCallback(() => {
-        setResult(null);
+        setResult(undefined);
         setCount(0);
     }, [setResult]);
 
diff --git a/src/components/results/securityanalysis/security-analysis-table.tsx b/src/components/results/securityanalysis/security-analysis-table.tsx
index e182ca8f41..edd415c37d 100644
--- a/src/components/results/securityanalysis/security-analysis-table.tsx
+++ b/src/components/results/securityanalysis/security-analysis-table.tsx
@@ -33,7 +33,7 @@ export const SecurityAnalysisTable: FunctionComponent<SecurityAnalysisResultProp
         resultStatusMessages,
         rows,
         securityAnalysisStatus,
-        !isLoadingResult
+        !isLoadingResult && rows !== undefined
     );
     const onGridReady = useAgGridInitialColumnFilters(FilterType.SecurityAnalysis, computationSubType);
 
diff --git a/src/components/results/securityanalysis/security-analysis.type.ts b/src/components/results/securityanalysis/security-analysis.type.ts
index 3b1ab13261..d514ac53bf 100644
--- a/src/components/results/securityanalysis/security-analysis.type.ts
+++ b/src/components/results/securityanalysis/security-analysis.type.ts
@@ -145,7 +145,7 @@ export interface SecurityAnalysisNTableRow {
 }
 
 export interface SecurityAnalysisResultProps {
-    rows: SecurityAnalysisNTableRow[] | SecurityAnalysisNmkTableRow[];
+    rows: SecurityAnalysisNTableRow[] | SecurityAnalysisNmkTableRow[] | undefined;
     columnDefs: ColDef[];
     isLoadingResult: boolean;
     agGridProps?: AgGridReactProps;

From 5a778e541c69ce705829689c0666fccb49fcc634 Mon Sep 17 00:00:00 2001
From: basseche <bassel.el-cheikh_externe@rte-france.com>
Date: Fri, 13 Feb 2026 13:39:05 +0100
Subject: [PATCH 3/4] change undefined to null

Signed-off-by: basseche <bassel.el-cheikh_externe@rte-france.com>
---
 .../results/loadflow/limit-violation-result.tsx           | 2 +-
 src/components/results/loadflow/load-flow-result-tab.tsx  | 2 +-
 .../securityanalysis/security-analysis-result-n.tsx       | 8 ++++----
 .../securityanalysis/security-analysis-result-tab.tsx     | 2 +-
 .../results/securityanalysis/security-analysis-table.tsx  | 2 +-
 .../results/securityanalysis/security-analysis.type.ts    | 2 +-
 src/components/utils/aggrid-rows-handler.ts               | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/results/loadflow/limit-violation-result.tsx b/src/components/results/loadflow/limit-violation-result.tsx
index b4462c12b3..01e4fd0b34 100644
--- a/src/components/results/loadflow/limit-violation-result.tsx
+++ b/src/components/results/loadflow/limit-violation-result.tsx
@@ -74,7 +74,7 @@ export const LimitViolationResult: FunctionComponent<LimitViolationResultProps>
     const messages = useIntlResultStatusMessages(intl);
 
     const renderLoadFlowLimitViolations = () => {
-        const message = getNoRowsMessage(messages, result, loadFlowStatus, !isLoadingResult && result !== undefined);
+        const message = getNoRowsMessage(messages, result, loadFlowStatus, !isLoadingResult && !!result);
         const rowsToShow = getRows(result, loadFlowStatus);
 
         return (
diff --git a/src/components/results/loadflow/load-flow-result-tab.tsx b/src/components/results/loadflow/load-flow-result-tab.tsx
index 0896735a47..327966cce8 100644
--- a/src/components/results/loadflow/load-flow-result-tab.tsx
+++ b/src/components/results/loadflow/load-flow-result-tab.tsx
@@ -241,7 +241,7 @@ export const LoadFlowResultTab: FunctionComponent<LoadFlowTabProps> = ({
 
     const result = useMemo(() => {
         if (!loadflowResult) {
-            return undefined;
+            return null;
         }
         if (tabIndex === 0 || tabIndex === 1) {
             return makeData(loadflowResult, intl);
diff --git a/src/components/results/securityanalysis/security-analysis-result-n.tsx b/src/components/results/securityanalysis/security-analysis-result-n.tsx
index 3d6b187473..afbd8a7176 100644
--- a/src/components/results/securityanalysis/security-analysis-result-n.tsx
+++ b/src/components/results/securityanalysis/security-analysis-result-n.tsx
@@ -26,8 +26,9 @@ export const SecurityAnalysisResultN: FunctionComponent<SecurityAnalysisResultNP
     const intl: IntlShape = useIntl();
 
     const rows = useMemo(() => {
-        return result !== undefined // check if it's not Page object
-            ? (result?.map((preContingencyResult: PreContingencyResult) => {
+        return !result
+            ? null
+            : (result?.map((preContingencyResult: PreContingencyResult) => {
                   const { limitViolation, subjectId } = preContingencyResult;
                   return {
                       subjectId: subjectId,
@@ -51,8 +52,7 @@ export const SecurityAnalysisResultN: FunctionComponent<SecurityAnalysisResultNP
                               ? null
                               : limitViolation?.upcomingAcceptableDuration,
                   } as SecurityAnalysisNTableRow;
-              }) ?? [])
-            : undefined;
+              }) ?? []);
     }, [intl, result]);
 
     return (
diff --git a/src/components/results/securityanalysis/security-analysis-result-tab.tsx b/src/components/results/securityanalysis/security-analysis-result-tab.tsx
index 6048ccaae3..cbb977d4fe 100644
--- a/src/components/results/securityanalysis/security-analysis-result-tab.tsx
+++ b/src/components/results/securityanalysis/security-analysis-result-tab.tsx
@@ -199,7 +199,7 @@ export const SecurityAnalysisResultTab: FunctionComponent<SecurityAnalysisTabPro
     });
 
     const resetResultStates = useCallback(() => {
-        setResult(undefined);
+        setResult(null);
         setCount(0);
     }, [setResult]);
 
diff --git a/src/components/results/securityanalysis/security-analysis-table.tsx b/src/components/results/securityanalysis/security-analysis-table.tsx
index edd415c37d..cbcfa95774 100644
--- a/src/components/results/securityanalysis/security-analysis-table.tsx
+++ b/src/components/results/securityanalysis/security-analysis-table.tsx
@@ -33,7 +33,7 @@ export const SecurityAnalysisTable: FunctionComponent<SecurityAnalysisResultProp
         resultStatusMessages,
         rows,
         securityAnalysisStatus,
-        !isLoadingResult && rows !== undefined
+        !isLoadingResult && !!rows
     );
     const onGridReady = useAgGridInitialColumnFilters(FilterType.SecurityAnalysis, computationSubType);
 
diff --git a/src/components/results/securityanalysis/security-analysis.type.ts b/src/components/results/securityanalysis/security-analysis.type.ts
index d514ac53bf..7ae7ba808e 100644
--- a/src/components/results/securityanalysis/security-analysis.type.ts
+++ b/src/components/results/securityanalysis/security-analysis.type.ts
@@ -145,7 +145,7 @@ export interface SecurityAnalysisNTableRow {
 }
 
 export interface SecurityAnalysisResultProps {
-    rows: SecurityAnalysisNTableRow[] | SecurityAnalysisNmkTableRow[] | undefined;
+    rows: SecurityAnalysisNTableRow[] | SecurityAnalysisNmkTableRow[] | null;
     columnDefs: ColDef[];
     isLoadingResult: boolean;
     agGridProps?: AgGridReactProps;
diff --git a/src/components/utils/aggrid-rows-handler.ts b/src/components/utils/aggrid-rows-handler.ts
index 86d73c291b..acb1b5964d 100644
--- a/src/components/utils/aggrid-rows-handler.ts
+++ b/src/components/utils/aggrid-rows-handler.ts
@@ -20,7 +20,7 @@ export interface RunningStatusMessage {
 
 export function getNoRowsMessage(
     messages: RunningStatusMessage,
-    rows: any[] | undefined,
+    rows: any[] | undefined | null,
     status: string,
     isDataReady?: boolean
 ): string | undefined {
@@ -43,7 +43,7 @@ export function getNoRowsMessage(
     }
 }
 
-export function getRows(rows: any[] | undefined, status: string): any[] {
+export function getRows(rows: any[] | null, status: string): any[] {
     return status === RunningStatus.SUCCEED && rows ? rows : [];
 }
 export const useIntlResultStatusMessages = (

From 0c1e3b1a63432fe10680681ef6178f6e26707d9e Mon Sep 17 00:00:00 2001
From: basseche <bassel.el-cheikh_externe@rte-france.com>
Date: Fri, 13 Feb 2026 16:05:49 +0100
Subject: [PATCH 4/4] review

Signed-off-by: basseche <bassel.el-cheikh_externe@rte-france.com>
---
 .../results/loadflow/limit-violation-result.tsx           | 2 +-
 src/components/results/loadflow/load-flow-result-tab.tsx  | 2 +-
 .../securityanalysis/security-analysis-result-n.tsx       | 2 +-
 .../results/securityanalysis/security-analysis-table.tsx  | 2 +-
 .../results/securityanalysis/security-analysis.type.ts    | 2 +-
 src/components/utils/aggrid-rows-handler.ts               | 8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/results/loadflow/limit-violation-result.tsx b/src/components/results/loadflow/limit-violation-result.tsx
index 01e4fd0b34..4b0501701a 100644
--- a/src/components/results/loadflow/limit-violation-result.tsx
+++ b/src/components/results/loadflow/limit-violation-result.tsx
@@ -74,7 +74,7 @@ export const LimitViolationResult: FunctionComponent<LimitViolationResultProps>
     const messages = useIntlResultStatusMessages(intl);
 
     const renderLoadFlowLimitViolations = () => {
-        const message = getNoRowsMessage(messages, result, loadFlowStatus, !isLoadingResult && !!result);
+        const message = getNoRowsMessage(messages, result, loadFlowStatus, !isLoadingResult);
         const rowsToShow = getRows(result, loadFlowStatus);
 
         return (
diff --git a/src/components/results/loadflow/load-flow-result-tab.tsx b/src/components/results/loadflow/load-flow-result-tab.tsx
index 327966cce8..0896735a47 100644
--- a/src/components/results/loadflow/load-flow-result-tab.tsx
+++ b/src/components/results/loadflow/load-flow-result-tab.tsx
@@ -241,7 +241,7 @@ export const LoadFlowResultTab: FunctionComponent<LoadFlowTabProps> = ({
 
     const result = useMemo(() => {
         if (!loadflowResult) {
-            return null;
+            return undefined;
         }
         if (tabIndex === 0 || tabIndex === 1) {
             return makeData(loadflowResult, intl);
diff --git a/src/components/results/securityanalysis/security-analysis-result-n.tsx b/src/components/results/securityanalysis/security-analysis-result-n.tsx
index afbd8a7176..32e115b51f 100644
--- a/src/components/results/securityanalysis/security-analysis-result-n.tsx
+++ b/src/components/results/securityanalysis/security-analysis-result-n.tsx
@@ -27,7 +27,7 @@ export const SecurityAnalysisResultN: FunctionComponent<SecurityAnalysisResultNP
 
     const rows = useMemo(() => {
         return !result
-            ? null
+            ? undefined
             : (result?.map((preContingencyResult: PreContingencyResult) => {
                   const { limitViolation, subjectId } = preContingencyResult;
                   return {
diff --git a/src/components/results/securityanalysis/security-analysis-table.tsx b/src/components/results/securityanalysis/security-analysis-table.tsx
index cbcfa95774..e182ca8f41 100644
--- a/src/components/results/securityanalysis/security-analysis-table.tsx
+++ b/src/components/results/securityanalysis/security-analysis-table.tsx
@@ -33,7 +33,7 @@ export const SecurityAnalysisTable: FunctionComponent<SecurityAnalysisResultProp
         resultStatusMessages,
         rows,
         securityAnalysisStatus,
-        !isLoadingResult && !!rows
+        !isLoadingResult
     );
     const onGridReady = useAgGridInitialColumnFilters(FilterType.SecurityAnalysis, computationSubType);
 
diff --git a/src/components/results/securityanalysis/security-analysis.type.ts b/src/components/results/securityanalysis/security-analysis.type.ts
index 7ae7ba808e..d514ac53bf 100644
--- a/src/components/results/securityanalysis/security-analysis.type.ts
+++ b/src/components/results/securityanalysis/security-analysis.type.ts
@@ -145,7 +145,7 @@ export interface SecurityAnalysisNTableRow {
 }
 
 export interface SecurityAnalysisResultProps {
-    rows: SecurityAnalysisNTableRow[] | SecurityAnalysisNmkTableRow[] | null;
+    rows: SecurityAnalysisNTableRow[] | SecurityAnalysisNmkTableRow[] | undefined;
     columnDefs: ColDef[];
     isLoadingResult: boolean;
     agGridProps?: AgGridReactProps;
diff --git a/src/components/utils/aggrid-rows-handler.ts b/src/components/utils/aggrid-rows-handler.ts
index acb1b5964d..8ad09172a8 100644
--- a/src/components/utils/aggrid-rows-handler.ts
+++ b/src/components/utils/aggrid-rows-handler.ts
@@ -20,7 +20,7 @@ export interface RunningStatusMessage {
 
 export function getNoRowsMessage(
     messages: RunningStatusMessage,
-    rows: any[] | undefined | null,
+    rows: any[] | undefined,
     status: string,
     isDataReady?: boolean
 ): string | undefined {
@@ -32,9 +32,9 @@ export function getNoRowsMessage(
         case RunningStatus.FAILED:
             return messages.failed;
         case RunningStatus.SUCCEED:
-            if (!isDataReady) {
+            if (!isDataReady || !rows) {
                 return messages.fetching;
-            } else if (!rows || rows?.length === 0) {
+            } else if (rows && rows.length === 0) {
                 return messages.noData ? messages.noData : messages.noLimitViolation;
             }
             return undefined;
@@ -43,7 +43,7 @@ export function getNoRowsMessage(
     }
 }
 
-export function getRows(rows: any[] | null, status: string): any[] {
+export function getRows(rows: any[] | undefined, status: string): any[] {
     return status === RunningStatus.SUCCEED && rows ? rows : [];
 }
 export const useIntlResultStatusMessages = (