[frontend/backend] add inject result inside report #1519

MarineLeM · 2024-09-23T15:58:31Z

issue : #1080
Chunk 2

add result inject inside report

codecov · 2024-09-23T16:07:42Z

Codecov Report

Attention: Patch coverage is 53.12500% with 15 lines in your changes missing coverage. Please review.

Project coverage is 33.31%. Comparing base (6ed8b90) to head (be2e849).
Report is 35 commits behind head on master.

Files with missing lines	Patch %	Lines
...rc/main/java/io/openbas/rest/inject/InjectApi.java	0.00%	10 Missing ⚠️
...rc/main/java/io/openbas/rest/report/ReportApi.java	60.00%	0 Missing and 2 partials ⚠️
...rc/main/java/io/openbas/service/InjectService.java	0.00%	2 Missing ⚠️
...bas/rest/report/form/ReportInjectCommentInput.java	66.66%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #1519      +/-   ##
============================================
+ Coverage     32.53%   33.31%   +0.78%     
- Complexity     1464     1616     +152     
============================================
  Files           534      544      +10     
  Lines         13777    15198    +1421     
  Branches        824     1067     +243     
============================================
+ Hits           4482     5063     +581     
- Misses         9086     9909     +823     
- Partials        209      226      +17

Flag	Coverage Δ
	`?`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

openbas-api/src/main/java/io/openbas/service/ReportService.java

RomuDeuxfois · 2024-09-24T14:08:15Z

openbas-front/src/utils/hooks/useDataLoader.js

@@ -18,7 +18,7 @@ const ERROR_30S_DELAY = 30000;
 let sseClient;
 let lastPingDate = new Date().getTime();
 const listeners = new Map();
-const useDataLoader = (loader = () => {}) => {
+const useDataLoader = (loader = () => {}, refetchArg = []) => {


Can you explain this changes ?
Thank you

Let’s return to the exerciseReportContent folder. I need the useDataLoader function to refetch data every time the report changes. To achieve this, I want to pass a refetch argument into the useEffect hook inside the useDataLoader function.

By implementing this approach, I ensure that only the necessary data for the report is loaded, rather than fetching all available data. Whenever I update my report configuration, the useDataLoader function will refetch only the specific data required for the updated report.

Great, thanks for the explanation

openbas-front/src/admin/components/simulations/simulation/reports/InjectReportResult.tsx

openbas-model/src/main/java/io/openbas/database/model/ReportInjectComment.java

MarineLeM · 2024-09-25T10:37:58Z

@RomuDeuxfois ready for a second round

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

openbas-api/src/main/java/io/openbas/service/ReportService.java

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

RomuDeuxfois · 2024-09-27T07:20:13Z

openbas-api/src/main/java/io/openbas/service/ReportService.java

+    }
+
+    private Optional<ReportInjectComment> findReportInjectComment(String reportId, String injectId) {
+        String jpql = "SELECT r FROM ReportInjectComment r WHERE r.report.id = :reportId AND r.inject.id = :injectId";


Could be better to have this directly in the ReportRepository

@Query(value = "SELECT r FROM ReportInjectComment r WHERE r.report.id = :reportId AND r.inject.id = :injectId", nativeQuery = true) Optional<ReportInjectComment> method(@Param("PARAM")...);

RomuDeuxfois · 2024-09-27T07:24:40Z

openbas-front/src/utils/hooks/useDataLoader.js

@@ -18,7 +18,7 @@ const ERROR_30S_DELAY = 30000;
 let sseClient;
 let lastPingDate = new Date().getTime();
 const listeners = new Map();
-const useDataLoader = (loader = () => {}) => {
+const useDataLoader = (loader = () => {}, refetchArg = []) => {


Great, thanks for the explanation

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

openbas-front/src/components/fields/MarkDownField.tsx

openbas-api/src/main/java/io/openbas/rest/report/ReportApi.java

savacano28 · 2024-09-27T08:14:13Z

I have a question about the path: /reports/exerciseId/reportId, maybe could be better: /exercises/exerciseId/reports/reportId ? ty!

savacano28 · 2024-09-27T08:32:23Z

Maybe we could manage better when a report no longer exists. Currently, we have :

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

github-actions bot added the filigran team use to identify PR from the Filigran team label Sep 23, 2024

RomuDeuxfois self-requested a review September 24, 2024 13:38

RomuDeuxfois reviewed Sep 24, 2024

View reviewed changes

MarineLeM self-assigned this Sep 25, 2024

MarineLeM added 4 commits September 26, 2024 09:15

[frontend/backend] add inject result inside report

bd9ae00

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

[frontend] improve code

703a853

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

[frontend/backend] improve code

a3637f4

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

[frontend] add translation key

d357eb8

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

MarineLeM force-pushed the issue/1080-inject-result branch from 12b1e59 to d357eb8 Compare September 26, 2024 07:16

MarineLeM linked an issue Sep 26, 2024 that may be closed by this pull request

Create customizable debrief page - generate a report page with a global note #1080

Closed

savacano28 reviewed Sep 26, 2024

View reviewed changes

openbas-api/src/main/java/io/openbas/service/ReportService.java Outdated Show resolved Hide resolved

MarineLeM added 5 commits September 26, 2024 15:52

[backend] fix PR feedback

e6b0c4b

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

[frontend] improve UI

2453f41

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

[frontend] use markdown for text edition

6872b90

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

[frontend] improve code

e6e1799

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

[frontend] improve code

2526784

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

RomuDeuxfois reviewed Sep 27, 2024

View reviewed changes

[frontend] improve code

fa359c7

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

RomuDeuxfois reviewed Sep 27, 2024

View reviewed changes

openbas-front/src/components/fields/MarkDownField.tsx Show resolved Hide resolved

savacano28 reviewed Sep 27, 2024

View reviewed changes

openbas-api/src/main/java/io/openbas/rest/report/ReportApi.java Show resolved Hide resolved

[frontend/backend] feedback

91f118f

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

savacano28 approved these changes Sep 27, 2024

View reviewed changes

RomuDeuxfois approved these changes Oct 1, 2024

View reviewed changes

[frontend/backend] add global observation (#1080)

be2e849

Signed-off-by: Marine LM <marine.lemezo@filigran.io>

MarineLeM merged commit c936004 into master Oct 3, 2024
7 checks passed

MarineLeM deleted the issue/1080-inject-result branch October 3, 2024 08:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[frontend/backend] add inject result inside report #1519

[frontend/backend] add inject result inside report #1519

MarineLeM commented Sep 23, 2024 •

edited

Loading

codecov bot commented Sep 23, 2024 •

edited

Loading

RomuDeuxfois Sep 24, 2024

MarineLeM Sep 25, 2024

RomuDeuxfois Sep 27, 2024

MarineLeM commented Sep 25, 2024

RomuDeuxfois Sep 27, 2024

RomuDeuxfois Sep 27, 2024

savacano28 commented Sep 27, 2024

savacano28 commented Sep 27, 2024

[frontend/backend] add inject result inside report #1519

[frontend/backend] add inject result inside report #1519

Conversation

MarineLeM commented Sep 23, 2024 • edited Loading

codecov bot commented Sep 23, 2024 • edited Loading

Codecov Report

RomuDeuxfois Sep 24, 2024

Choose a reason for hiding this comment

MarineLeM Sep 25, 2024

Choose a reason for hiding this comment

RomuDeuxfois Sep 27, 2024

Choose a reason for hiding this comment

MarineLeM commented Sep 25, 2024

RomuDeuxfois Sep 27, 2024

Choose a reason for hiding this comment

RomuDeuxfois Sep 27, 2024

Choose a reason for hiding this comment

savacano28 commented Sep 27, 2024

savacano28 commented Sep 27, 2024

MarineLeM commented Sep 23, 2024 •

edited

Loading

codecov bot commented Sep 23, 2024 •

edited

Loading