[backend/frontend] Use ID instead of label when resolving expectation…

… from OpenBAS
OpenCTI-Platform · Oct 3, 2024 · c60f1b3 · c60f1b3
1 parent c1def1b
commit c60f1b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/opencti-platform/opencti-front/vite.config.mts b/opencti-platform/opencti-front/vite.config.mts
@@ -146,8 +146,7 @@ const depsToOptimize = [
   "@mui/lab/LoadingButton",
   "@mui/material/Breadcrumbs",
   "classnames",
-  "react-draggable",
-  "react-beautiful-dnd"
+  "react-draggable"
 ]
 
 const logger = createLogger()

diff --git a/opencti-platform/opencti-graphql/src/database/xtm-obas.ts b/opencti-platform/opencti-graphql/src/database/xtm-obas.ts
@@ -185,29 +185,29 @@ export const getScenarioResult = async (id: string) => {
       success: 0,
       failure: 0
     } : {
-      unknown: prevention.distribution?.filter((n: { label: string, value: number }) => n.label === 'Pending').at(0).value,
-      success: prevention.distribution?.filter((n: { label: string, value: number }) => n.label === 'Successful').at(0).value,
-      failure: prevention.distribution?.filter((n: { label: string, value: number }) => n.label === 'Failed').at(0).value
+      unknown: prevention.distribution?.filter((n: { id: string, value: number }) => n.id === 'PENDING').at(0)?.value,
+      success: prevention.distribution?.filter((n: { id: string, value: number }) => n.id === 'SUCCESS').at(0)?.value,
+      failure: prevention.distribution?.filter((n: { id: string, value: number }) => n.id === 'FAILED').at(0)?.value
     };
     const detection = exercise.exercise_global_score.filter((n: { type: string, value: number }) => n.type === 'DETECTION').at(0);
     const detectionResult = detection.avgResult === 'UNKNOWN' ? {
       unknown: 1,
       success: 0,
       failure: 0
     } : {
-      unknown: detection.distribution?.filter((n: { label: string, value: number }) => n.label === 'Pending').at(0).value,
-      success: detection.distribution?.filter((n: { label: string, value: number }) => n.label === 'Successful').at(0).value,
-      failure: detection.distribution?.filter((n: { label: string, value: number }) => n.label === 'Failed').at(0).value
+      unknown: detection.distribution?.filter((n: { id: string, value: number }) => n.id === 'PENDING').at(0)?.value,
+      success: detection.distribution?.filter((n: { id: string, value: number }) => n.id === 'SUCCESS').at(0)?.value,
+      failure: detection.distribution?.filter((n: { id: string, value: number }) => n.id === 'FAILED').at(0)?.value
     };
     const humanResponse = exercise.exercise_global_score.filter((n: { type: string, value: number }) => n.type === 'HUMAN_RESPONSE').at(0);
     const humanResponseResult = humanResponse.avgResult === 'UNKNOWN' ? {
       unknown: 1,
       success: 0,
       failure: 0
     } : {
-      unknown: humanResponse.distribution?.filter((n: { label: string, value: number }) => n.label === 'Pending').at(0).value,
-      success: humanResponse.distribution?.filter((n: { label: string, value: number }) => n.label === 'Successful').at(0).value,
-      failure: humanResponse.distribution?.filter((n: { label: string, value: number }) => n.label === 'Failed').at(0).value
+      unknown: humanResponse.distribution?.filter((n: { id: string, value: number }) => n.id === 'PENDING').at(0)?.value,
+      success: humanResponse.distribution?.filter((n: { id: string, value: number }) => n.id === 'SUCCESS').at(0)?.value,
+      failure: humanResponse.distribution?.filter((n: { id: string, value: number }) => n.id === 'FAILED').at(0)?.value
     };
     return {
       prevention: preventionResult,