Add location id to the SA result

src/components/results/securityanalysis/security-analysis-result-n.tsx

@@ -30,6 +30,7 @@ export const SecurityAnalysisResultN: FunctionComponent<SecurityAnalysisResultNP
                   const { limitViolation, subjectId } = preContingencyResult;
                   return {
                       subjectId: subjectId,
+                      locationId: limitViolation?.locationId,
                       limitType: intl.formatMessage({
                           id: limitViolation?.limitType,
                       }),

src/components/results/securityanalysis/security-analysis-result-utils.ts

@@ -71,7 +71,8 @@ export const flattenNmKResultsContingencies = (intl: IntlShape, result: Constrai
             const { limitViolation = {} as LimitViolation, subjectId } = constraint || {};
 
             rows.push({
-                subjectId,
+                subjectId: subjectId,
+                locationId: limitViolation.locationId,
                 limitType: limitViolation.limitType
                     ? intl.formatMessage({
                           id: limitViolation.limitType,
@@ -122,6 +123,7 @@ export const flattenNmKResultsConstraints = (intl: IntlShape, result: Contingenc
                     limit: limitViolation.limit,
                     value: limitViolation.value,
                     loading: limitViolation.loading,
+                    locationId: limitViolation.locationId,
                     linkedElementId: subjectId,
                 });
             });
@@ -150,8 +152,8 @@ export const securityAnalysisTableNColumnsDefinition = (
     return [
         makeAgGridCustomHeaderColumn({
             headerName: intl.formatMessage({ id: 'Equipment' }),
-            colId: 'subjectId',
-            field: 'subjectId',
+            colId: 'locationId',
+            field: 'locationId',
             context: {
                 sortParams,
                 filterComponent: CustomAggridComparatorFilter,
@@ -368,6 +370,22 @@ export const securityAnalysisTableNmKContingenciesColumnsDefinition = (
                 },
             },
         }),
+        makeAgGridCustomHeaderColumn({
+            headerName: intl.formatMessage({ id: 'Bus' }),
+            colId: 'locationId',
+            field: 'locationId',
+            context: {
+                sortParams: { ...sortParams, isChildren: true },
+                filterComponent: CustomAggridComparatorFilter,
+                filterComponentParams: {
+                    filterParams: {
+                        dataType: FILTER_DATA_TYPES.TEXT,
+                        comparators: [FILTER_TEXT_COMPARATORS.STARTS_WITH, FILTER_TEXT_COMPARATORS.CONTAINS],
+                        ...filterParams,
+                    },
+                },
+            },
+        }),
         makeAgGridCustomHeaderColumn({
             headerName: intl.formatMessage({ id: 'ViolationType' }),
             colId: 'limitType',
@@ -385,6 +403,7 @@ export const securityAnalysisTableNmKContingenciesColumnsDefinition = (
                 },
             },
         }),
+
         makeAgGridCustomHeaderColumn({
             headerName: intl.formatMessage({ id: 'LimitName' }),
             colId: 'limitName',
@@ -572,6 +591,22 @@ export const securityAnalysisTableNmKConstraintsColumnsDefinition = (
                 },
             },
         }),
+        makeAgGridCustomHeaderColumn({
+            headerName: intl.formatMessage({ id: 'Bus' }),
+            colId: 'locationId',
+            field: 'locationId',
+            context: {
+                sortParams: { ...sortParams, isChildren: true },
+                filterComponent: CustomAggridComparatorFilter,
+                filterComponentParams: {
+                    filterParams: {
+                        dataType: FILTER_DATA_TYPES.TEXT,
+                        comparators: [FILTER_TEXT_COMPARATORS.STARTS_WITH, FILTER_TEXT_COMPARATORS.CONTAINS],
+                        ...filterParams,
+                    },
+                },
+            },
+        }),
         makeAgGridCustomHeaderColumn({
             headerName: intl.formatMessage({ id: 'ViolationType' }),
             colId: 'limitType',
@@ -589,6 +624,7 @@ export const securityAnalysisTableNmKConstraintsColumnsDefinition = (
                 },
             },
         }),
+
         makeAgGridCustomHeaderColumn({
             headerName: intl.formatMessage({ id: 'LimitName' }),
             colId: 'limitName',
@@ -835,6 +871,7 @@ export const useFetchFiltersEnums = () => {
 
 export const FROM_COLUMN_TO_FIELD_N: Record<string, string> = {
     subjectId: 'subjectLimitViolation.subjectId',
+    locationId: 'locationId',
     status: 'result.status',
     limitType: 'limitType',
     limitName: 'limitName',
@@ -847,6 +884,7 @@ export const FROM_COLUMN_TO_FIELD_N: Record<string, string> = {
 
 export const FROM_COLUMN_TO_FIELD_NMK_CONTINGENCIES: Record<string, string> = {
     subjectId: 'contingencyLimitViolations.subjectLimitViolation.subjectId',
+    locationId: 'contingencyLimitViolations.locationId',
     contingencyId: 'contingencyId',
     status: 'status',
     limitType: 'contingencyLimitViolations.limitType',
@@ -860,6 +898,7 @@ export const FROM_COLUMN_TO_FIELD_NMK_CONTINGENCIES: Record<string, string> = {
 
 export const FROM_COLUMN_TO_FIELD_NMK_LIMIT_VIOLATIONS: Record<string, string> = {
     subjectId: 'subjectId',
+    locationId: 'contingencyLimitViolations.locationId',
     contingencyId: 'contingencyLimitViolations.contingency.contingencyId',
     status: 'contingencyLimitViolations.contingency.status',
     limitType: 'contingencyLimitViolations.limitType',

src/components/results/securityanalysis/security-analysis-table.tsx

@@ -28,7 +28,6 @@ export const SecurityAnalysisTable: FunctionComponent<SecurityAnalysisResultProp
         (state: AppState) => state.computingStatus[ComputingType.SECURITY_ANALYSIS]
     );
     const rowsToShow = getRows(rows, securityAnalysisStatus);
-
     const overlayNoRowsTemplate = getNoRowsMessage(
         resultStatusMessages,
         rows,

src/components/results/securityanalysis/security-analysis.type.ts

@@ -21,6 +21,7 @@ export interface LimitViolation {
     loading?: number;
     side?: string;
     value?: number;
+    locationId?: string;
 }
 
 interface Element {
@@ -41,6 +42,7 @@ export interface Contingency {
 
 export interface SecurityAnalysisNmkTableRow {
     subjectId?: string;
+    locationId?: string;
     acceptableDuration?: number | null;
     status?: string;
     contingencyEquipmentsIds?: (string | undefined)[];
@@ -61,7 +63,7 @@ export interface Constraint {
 }
 
 export interface ContingenciesFromConstraintItem {
-    subjectId: string;
+    subjectId?: string;
     contingencies?: Contingency[];
 }
 

src/components/study-pane.jsx

@@ -54,7 +54,6 @@ const StudyPane = ({ studyUuid, currentNode, currentRootNetworkUuid, ...props })
     const { openDiagramView } = useDiagram();
 
     const disabled = !isNodeBuilt(currentNode);
-
     function openVoltageLevelDiagram(vlId) {
         // TODO code factorization for displaying a VL via a hook
         if (vlId) {

src/translations/en.json

@@ -427,6 +427,7 @@
 
     "LimitType": "Limit type",
     "ViolationType": "Violation type",
+    "Bus": "Bus",
     "LimitSide": "Side",
     "LimitName": "Limit name",
     "LimitNameCurrentViolation": "Limit name",

src/translations/fr.json

@@ -426,6 +426,7 @@
 
     "LimitType": "Type de limite",
     "ViolationType": "Type de contrainte",
+    "Bus": "Noeud électrique",
     "LimitSide": "Côté",
     "LimitName": "Nom du seuil",
     "Limit_name": "Seuil",