Finalize front pt 2

johanah29 · johanah29 · commit 75982b51a591 · 2025-03-21T16:15:54.000+01:00
diff --git a/openbas-api/src/main/java/io/openbas/rest/asset/security_platforms/SecurityPlatformApi.java b/openbas-api/src/main/java/io/openbas/rest/asset/security_platforms/SecurityPlatformApi.java
@@ -13,7 +13,9 @@
 import jakarta.transaction.Transactional;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
+
 import java.util.Optional;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
@@ -118,6 +120,15 @@ public SecurityPlatform securityPlatform(
         .orElseThrow(ElementNotFoundException::new);
   }
 
+  @GetMapping(SECURITY_PLATFORM_URI + "/externalReference")
+  @PreAuthorize("isPlanner()")
+  public SecurityPlatform securityPlatformFromExternalReference(
+      @RequestParam @NotBlank final String externalReference) {
+    return this.securityPlatformRepository
+        .findByExternalReference(externalReference)
+        .orElseThrow(ElementNotFoundException::new);
+  }
+
   @PostMapping(SECURITY_PLATFORM_URI + "/search")
   public Page<SecurityPlatform> securityPlatforms(
       @RequestBody @Valid SearchPaginationInput searchPaginationInput) {
diff --git a/openbas-api/src/main/java/io/openbas/rest/inject_expectation_trace/InjectExpectationTraceApi.java b/openbas-api/src/main/java/io/openbas/rest/inject_expectation_trace/InjectExpectationTraceApi.java
@@ -52,5 +52,9 @@ public List<InjectExpectationTrace> getInjectExpectationTracesFromCollector(
         injectExpectationId, collector.getSecurityPlatform().getId());
   }
 
+  @GetMapping("/count")
+  public long getAlertLinksNumber(@RequestParam String injectExpectationId, @RequestParam String sourceId) {
+    return this.injectExpectationTraceService.getAlertLinksNumber(injectExpectationId, sourceId);
+  }
 
 }
diff --git a/openbas-api/src/main/java/io/openbas/service/InjectExpectationTraceService.java b/openbas-api/src/main/java/io/openbas/service/InjectExpectationTraceService.java
@@ -25,7 +25,7 @@ public InjectExpectationTrace createInjectExpectationTrace(
       @NotNull InjectExpectationTrace injectExpectationTrace) {
     Optional<InjectExpectationTrace> existingTrace =
         this.injectExpectationTraceRepository
-            .findByAlertLinkAndAlertNameAndCollectorAndInjectExpectation(
+            .findByAlertLinkAndAlertNameAndSecurityPlatformAndInjectExpectation(
                 injectExpectationTrace.getAlertLink(),
                 injectExpectationTrace.getAlertName(),
                 injectExpectationTrace.getSecurityPlatform(),
@@ -40,4 +40,8 @@ public List<InjectExpectationTrace> getInjectExpectationTracesFromCollector(
         injectExpectationId, sourceId);
   }
 
+  public long getAlertLinksNumber(@NotNull String injectExpectationId, @NotNull String sourceId) {
+    return this.injectExpectationTraceRepository.countAlerts(injectExpectationId, sourceId);
+  }
+
 }
diff --git a/openbas-front/src/actions/assets/securityPlatform-actions.ts b/openbas-front/src/actions/assets/securityPlatform-actions.ts
@@ -1,6 +1,6 @@
 import { type Dispatch } from 'redux';
 
-import { delReferential, getReferential, postReferential, putReferential, simplePostCall } from '../../utils/Action';
+import { delReferential, getReferential, postReferential, putReferential, simpleCall, simplePostCall } from '../../utils/Action';
 import { type SearchPaginationInput, type SecurityPlatform, type SecurityPlatformInput } from '../../utils/api-types';
 import { arrayOfSecurityPlatforms, securityPlatform } from './asset-schema';
 
@@ -32,3 +32,8 @@ export const searchSecurityPlatforms = (searchPaginationInput: SearchPaginationI
   const uri = `${SECURITY_PLATFORM_URI}/search`;
   return simplePostCall(uri, data);
 };
+
+export const getSecurityPlatformFromExternalReference = (externalReference: string | undefined) => {
+  const uri = `${SECURITY_PLATFORM_URI}/externalReference?externalReference=${externalReference}`;
+  return simpleCall(uri);
+};
diff --git a/openbas-front/src/actions/atomic_testings/atomic-testing-actions.ts b/openbas-front/src/actions/atomic_testings/atomic-testing-actions.ts
@@ -1,5 +1,5 @@
 import { simpleCall, simpleDelCall, simplePostCall, simplePutCall } from '../../utils/Action';
-import { type AtomicTestingInput, type InjectExpectationTraceInput, type SearchPaginationInput } from '../../utils/api-types';
+import { type AtomicTestingInput, type SearchPaginationInput } from '../../utils/api-types';
 
 const ATOMIC_TESTING_URI = '/api/atomic-testings';
 
@@ -63,8 +63,13 @@ export const searchAtomicTestingTeams = (paginationInput: SearchPaginationInput,
   return simplePostCall(uri, paginationInput);
 };
 
-// -- EXPECTATIONS --
+// -- EXPECTATION TRACES --
 export const fetchExpectationTraces = (injectExpectationId: string, sourceId: string) => {
   const uri = `/api/inject-expectations-traces?injectExpectationId=${injectExpectationId}&sourceId=${sourceId}`;
   return simpleCall(uri);
 };
+
+export const getAlertLinksCount = (injectExpectationId: string, sourceId: string | undefined) => {
+  const uri = `/api/inject-expectations-traces/count?injectExpectationId=${injectExpectationId}&sourceId=${sourceId}`;
+  return simpleCall(uri);
+};
diff --git a/openbas-front/src/admin/components/atomic_testings/atomic_testing/TargetResultAlertNumber.tsx b/openbas-front/src/admin/components/atomic_testings/atomic_testing/TargetResultAlertNumber.tsx
@@ -0,0 +1,37 @@
+import { type FunctionComponent, useEffect, useState } from 'react';
+
+import { getSecurityPlatformFromExternalReference } from '../../../../actions/assets/securityPlatform-actions';
+import { getAlertLinksCount } from '../../../../actions/atomic_testings/atomic-testing-actions';
+import { type InjectExpectationResult, type SecurityPlatform } from '../../../../utils/api-types';
+
+interface Props {
+  injectExpectationId: string;
+  expectationResult: InjectExpectationResult;
+}
+
+const TargetResultAlertNumber: FunctionComponent<Props> = ({
+  injectExpectationId,
+  expectationResult,
+}) => {
+  const [sourceId, setSourceId] = useState<string | undefined>('');
+  const [alertLinksNumber, setAlertLinksNumber] = useState<number | null>(0);
+  if (expectationResult.sourceType === 'collector' && expectationResult.sourceId !== undefined) {
+    useEffect(() => {
+      getSecurityPlatformFromExternalReference(expectationResult.sourceId).then((result: { data: SecurityPlatform }) => setSourceId(result.data.asset_id ?? ''));
+    }, [expectationResult.sourceId]);
+  } else {
+    setSourceId(expectationResult.sourceId);
+  }
+
+  useEffect(() => {
+    getAlertLinksCount(injectExpectationId, sourceId).then((result: { data: number }) => setAlertLinksNumber(result.data ?? 0));
+  }, [injectExpectationId, sourceId]);
+
+  return (
+    <div>
+      {alertLinksNumber}
+    </div>
+  );
+};
+
+export default TargetResultAlertNumber;
diff --git a/openbas-front/src/admin/components/atomic_testings/atomic_testing/TargetResultsDetail.tsx b/openbas-front/src/admin/components/atomic_testings/atomic_testing/TargetResultsDetail.tsx
@@ -40,6 +40,7 @@ import DetectionPreventionExpectationsValidationForm from '../../simulations/sim
 import ManualExpectationsValidationForm from '../../simulations/simulation/validation/expectations/ManualExpectationsValidationForm';
 import { InjectResultOverviewOutputContext, type InjectResultOverviewOutputContextType } from '../InjectResultOverviewOutputContext';
 import ExpirationChip from './ExpirationChip';
+import TargetResultAlertNumber from './TargetResultAlertNumber';
 import TargetResultsSecurityPlatform from './TargetResultsSecurityPlatform';
 import nodeTypes from './types/nodes';
 import { type NodeResultStep } from './types/nodes/NodeResultStep';
@@ -790,10 +791,26 @@ const TargetResultsDetailFlow: FunctionComponent<Props> = ({
                                     <ItemResult label={expectationResult.result} status={expectationResult.result} />
                                   </TableCell>
                                   <TableCell>
-                                    {emptyFilled(nsdt(expectationResult.date))}
+                                    {
+                                      (expectationResult.result === 'Prevented' || expectationResult.result === 'Detected' || expectationResult.result === 'SUCCESS') ? nsdt(expectationResult.date) : '-'
+                                    }
                                   </TableCell>
                                   <TableCell>
-                                    {emptyFilled('3')}
+                                    {
+                                      expectationResult.sourceId && injectExpectation.inject_expectation_agent && (expectationResult.result === 'Prevented' || expectationResult.result === 'Detected') && (
+                                        <TargetResultAlertNumber expectationResult={expectationResult} injectExpectationId={injectExpectation.inject_expectation_id} />
+                                      )
+                                    }
+                                    {
+                                      !injectExpectation.inject_expectation_agent && (
+                                        '-'
+                                      )
+                                    }
+                                    {
+                                      injectExpectation.inject_expectation_agent && (expectationResult.result === 'Not Detected' || expectationResult.result === 'Not Prevented') && (
+                                        '-'
+                                      )
+                                    }
                                   </TableCell>
                                   <TableCell>
                                     <IconButton
diff --git a/openbas-model/src/main/java/io/openbas/database/repository/InjectExpectationTraceRepository.java b/openbas-model/src/main/java/io/openbas/database/repository/InjectExpectationTraceRepository.java
@@ -26,15 +26,19 @@ public interface InjectExpectationTraceRepository
 
   @NotNull
   Optional<InjectExpectationTrace>
-      findByAlertLinkAndAlertNameAndCollectorAndInjectExpectation(
-          String alertLink,
-          String alertName,
-          Collector collector,
-          InjectExpectation injectExpectation);
+  findByAlertLinkAndAlertNameAndSecurityPlatformAndInjectExpectation(
+      String alertLink,
+      String alertName,
+      SecurityPlatform securityPlatform,
+      InjectExpectation injectExpectation);
 
   @Query(
       "select t from InjectExpectationTrace t where t.injectExpectation.id = :expectationId and t.securityPlatform.id = :sourceId")
   List<InjectExpectationTrace> findByExpectationAndSecurityPlatform(
       @Param("expectationId") final String expectationId,
       @Param("sourceId") final String sourceId);
+
+  @Query("select count(distinct t) from InjectExpectationTrace t where t.injectExpectation.id = :expectationId and t.securityPlatform.id = :sourceId")
+  long countAlerts(@Param("expectationId") final String expectationId,
+      @Param("sourceId") final String sourceId);
 }

Original file line number	Diff line number	Diff line change
`@@ -52,5 +52,9 @@ public List<InjectExpectationTrace> getInjectExpectationTracesFromCollector(`
`52`	`52`	`injectExpectationId, collector.getSecurityPlatform().getId());`
`53`	`53`	`}`
`54`	`54`
	`55`	`+ @GetMapping("/count")`
	`56`	`+ public long getAlertLinksNumber(@RequestParam String injectExpectationId, @RequestParam String sourceId) {`
	`57`	`+ return this.injectExpectationTraceService.getAlertLinksNumber(injectExpectationId, sourceId);`
	`58`	`+ }`
`55`	`59`
`56`	`60`	`}`