Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature 345 summary in reports (part 2) #2782

Merged
merged 64 commits into from
Jan 30, 2024
Merged

Feature 345 summary in reports (part 2) #2782

merged 64 commits into from
Jan 30, 2024

Conversation

zigfridus
Copy link
Contributor

This PR switched from develop to community branch and continiue the #2156.
This PR will close the #345.

zigfridus and others added 30 commits April 10, 2023 14:28
@zigfridus
Add summary table mercedes-benz#345
5100a67
@zigfridus
Add possibility to click on results in the summary table mercedes-ben…
1899d25 
…z#345
@zigfridus
The draft summary table in a HTML report mercedes-benz#345
d4d1a83
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
e120a14
@zigfridus
Merge branch 'feature-345-summary-in-reports' of https://github.com/z…
6b4f0a3 
…igfridus/sechub into feature-345-summary-in-reports
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
8d6f949
@zigfridus
Some improvements and fixes mercedes-benz#345:
8c8badd 
- changed model's scanTypeCount List to Set in the HTMLScanResultReportModelBuilder;
- added tests in the HTMLScanResultReportModelBuilderTest;
- cleaned and added improvements in the ScanTypeCount;
- created tests for the ScanTypeCount;
- modified scanresult.html because of new set from the HTMLScanResultReportModelBuilder.
@zigfridus
Added summary section into report mercedes-benz#345
3b7d863
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
8e73dc2
@zigfridus
Added a details section the child of summary section into report merc…
70ea329 
…edes-benz#345
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
be03972
@zigfridus
Improvement of html and json reports mercedes-benz#345
6446141
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
15e3bbf
@zigfridus
Minor fixes and improvements mercedes-benz#345
0fe8d85
@zigfridus
Enabled github's workflow test mercedes-benz#345
d57c6ee
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
07bf0ee
@zigfridus
Fixed some tests and html templates mercedes-benz#345
a039d35
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
a445501
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
e22c483
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
690dbad
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
4595649
@zigfridus
Modified tests for the new report from mercedes-benz#345
3efa782
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
ee84a7c
@zigfridus
Merge branch 'feature-345-temp' into feature-345-summary-in-reports
9a933f9
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
3b618b3
@zigfridus
Merge remote-tracking branch 'refs/remotes/origin/feature-345-summary…
228dc45 
…-in-reports' into feature-345-summary-in-reports
@zigfridus
Fixed some tests and html templates mercedes-benz#345
983f58d
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
f5406f8
@zigfridus
Merge remote-tracking branch 'refs/remotes/origin/feature-345-summary…
8883070 
…-in-reports' into feature-345-summary-in-reports
@zigfridus @Jeeppler
Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/com…
560b6d4 
…mons/model/SecHubReportMetaDataSummaryDetailsTest.java

Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>
zigfridus and others added 8 commits November 2, 2023 19:56
@zigfridus @Jeeppler
Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/com…
708ee95 
…mons/model/SecHubReportMetaDataSummaryTest.java

Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>
@zigfridus @Jeeppler
Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/com…
98e6464 
…mons/model/SecHubReportMetaDataSummaryTest.java

Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>
@zigfridus @Jeeppler
Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/com…
2888d06 
…mons/model/SecHubReportMetaDataSummaryTest.java

Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>
@zigfridus
Minor modifications in some tests mercedes-benz#345
02fdfa5
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
aaeeedd
@zigfridus
Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports
98bef78
@zigfridus
Fixed bug when critical, info and unclassified findings shown incorre…
6999d6a 
…ctly in the reports. mercedes-benz#345
@zigfridus
Fixed some inaccuracies. mercedes-benz#345
59f4918
@Jeeppler Jeeppler requested a review from de-jcup December 22, 2023 20:23
@zigfridus
Copy link
Contributor Author

@Jeeppler
I little bit confused with switching to the new community branch. At this moment I closed previous PR and created this PR. In my fork the branch still points to the develop branch. And there are a lot of conflicts:
image
I really don't want to destroy my work and I would like to ask for more detailed explanation, what should I do next to resolve those conflicts.
Thanks

@Jeeppler
Copy link
Member

@zigfridus you can ignore the GitHub WebUI message, the message is nonsense. Your branch zigfridus:feature-345-summary-in-reports has only one conflict with the community branch: sechub-api-java/src/main/resources/reduced-openapi3.json and that is expected.

At the moment keep things how they are. @de-jcup will inform you about the next steps. However, keep in mind that we currently have Christmas/winter holidays and a response might take time.

@Jeeppler
Copy link
Member

@zigfridus one additional note: Do not press the button in the GitHub WebUI and do not sync with the develop branch of mercedes-benz/sechub:develop right now.

@zigfridus
Copy link
Contributor Author

@Jeeppler
Thank you for your advice. Then I'm going to work on another issue.

@zigfridus
Copy link
Contributor Author

@Jeeppler
As I see there is the same problem with reduced-openapi3.json as it was in #2781. Should I fix it as well?

@Jeeppler
Copy link
Member

Jeeppler commented Jan 5, 2024

@zigfridus no, you probably have to run/test the code a couple of times and as a result you will regenerate the reduced-openapi3.json a couple of times. Wait for @de-jcup and what he has to say.

@zigfridus
Copy link
Contributor Author

@Jeeppler
Ok, thank you.

@de-jcup
Copy link
Member

de-jcup commented Jan 16, 2024

Hello @zigfridus,

please do following:

cd $sechubRepositoryFolder
cd sechub-developertools/scripts
./sdc --build-full

With this call, everything - even the generated parts - are full build again.
This includes the generation of the reduced-openapi3.json (it is now always alphabetical sorted, so regeneration makes no problems any longer..).

After the generation is done, please add reduced-openapi3.json and commit + push it.
Then there should be no merge conflicts exist any longer.

Remark: the sdc.sh (SecHub developer console) script is for convenience and has multiple options. With sdc.sh -h you can see an overview.

@de-jcup
Copy link
Member

de-jcup commented Jan 17, 2024 •
edited
Loading

@zigfridus : Another option is to just copy reduced-openapi3.json from develop branch to your branch, commit + push and the merge conflict problem is solved...

@zigfridus
Copy link
Contributor Author

zigfridus commented Jan 17, 2024 •
edited
Loading

@de-jcup
Fixed merge problem with help of your second option. Thank you.

@de-jcup de-jcup merged commit 67273af into mercedes-benz:community Jan 30, 2024
1 check passed
@de-jcup
Copy link
Member

de-jcup commented Jan 30, 2024

@zigfridus : Thank you for your contribution (and your patience).

@de-jcup de-jcup mentioned this pull request Jan 30, 2024
Closed
@de-jcup
Copy link
Member

de-jcup commented Jan 30, 2024

Unfortunately I merged all 62 commits into the community branch instead of doing this by one commit. I will handle this on final commit to develop branch.

de-jcup added a commit that referenced this pull request Jan 30, 2024
@de-jcup
Merge multiple changes from PR# 2782 as one commit
2981ba7 
Squashed following commits:

commit 67273af
Merge: b6c4fcb 03f1b0a
Author: Albert Tregnaghi <de-jcup@users.noreply.github.com>
Date:   Tue Jan 30 08:59:32 2024 +0100

    Merge pull request #2782 from zigfridus/feature-345-summary-in-reports

    Feature 345 summary in reports (part 2)

commit 03f1b0a
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Wed Jan 17 21:15:11 2024 +0200

    Fix merge problem. #345

commit b6c4fcb
Merge: 72ae4a1 1c6e4bb
Author: Jeeppler <Jeeppler@users.noreply.github.com>
Date:   Fri Jan 5 12:24:23 2024 +0100

    Merge pull request #2781 from zigfridus/feature-1139-rename-parts-with-emailAdress

    Feature 1139 rename parts with email adress

commit 1c6e4bb
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Fri Jan 5 12:51:33 2024 +0200

    Refinement 2. Replace with data from community branch. #1139

commit 9c93b3f
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Jan 4 13:09:50 2024 +0200

    Refinement 1. Fixed typo. #1139

commit 95bde06
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Tue Jan 2 18:02:28 2024 +0200

    Fixed typo in the rest modules. #1139

commit 5ad7b40
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Mon Jan 1 21:14:59 2024 +0200

    Fixed typo in the sechub-api-java module. #1139

commit 6b1c75a
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Mon Jan 1 14:44:11 2024 +0200

    Fixed typo in the sechub-notification module. #1139

commit f3779b0
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Sun Dec 31 19:13:43 2023 +0200

    Fixed typo in the sechub-shared-kernel module. #1139

commit 1de965f
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Sun Dec 31 18:39:33 2023 +0200

    Fixed typo in the sechub-administration and sechub-server modules. #1139

commit c4ca1ad
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Fri Dec 22 08:50:11 2023 +0200

    Fixed typo in the SignupJsonInput class and in the classes that depends on it. #1139

commit fcd4d5f
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Tue Dec 19 10:19:31 2023 +0200

    Fixed typo in the UserMessage class and in the classes that depends on it. #1139

commit 30c80ad
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Tue Dec 19 09:42:32 2023 +0200

    Fixed typo in the adm_user table and in the classes that depends on it. #1139

commit 34d998c
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Wed Dec 13 18:19:30 2023 +0200

    Fixed typo in the adm_user_selfregistration table and in the classes that depends on it. #1139

commit 59f4918
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Tue Nov 28 22:30:27 2023 +0200

    Fixed some inaccuracies. #345

commit 6999d6a
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Sun Nov 26 23:33:13 2023 +0200

    Fixed bug when critical, info and unclassified findings shown incorrectly in the reports. #345

commit 98bef78
Merge: aaeeedd 1d23920
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Sun Nov 26 23:17:48 2023 +0200

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit aaeeedd
Merge: 02fdfa5 caae24b
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Wed Nov 22 18:17:59 2023 +0200

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit 02fdfa5
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 21:55:33 2023 +0200

    Minor modifications in some tests #345

commit 2888d06
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:58:03 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 98e6464
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:57:26 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 708ee95
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:56:58 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit a9e8bdb
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:56:37 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit d1295a9
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:56:17 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit a9bdd22
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:55:41 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 8d49cc8
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:55:16 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 6472fce
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:54:52 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 48b0359
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:54:27 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 9b83ae7
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:53:52 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 106ed2f
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:53:24 2023 +0200

    Update sechub-scan/src/main/resources/templates/report/html/scanresult.html

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 72b4d82
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:48:35 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 2e32976
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:48:06 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 8c6fad0
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:47:25 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit fc221ff
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:46:51 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryDetailsTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit f4cbf11
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:46:08 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 5b22630
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:45:00 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryDetailsTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit c6fcc75
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:44:30 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryDetailsTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 01d06c5
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:42:56 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryDetailsTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 30c719c
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:42:20 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryDetailsTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 7f791c9
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 19:41:15 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryDetailsTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 8c5a8b0
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 18:51:29 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryDetailsTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 1b33a68
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 18:50:55 2023 +0200

    Update sechub-scan/src/main/resources/templates/report/html/scanresult.html

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit fa7fed8
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 18:50:40 2023 +0200

    Update sechub-scan/src/main/resources/templates/report/html/scanresult.html

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit a9af1db
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 18:47:47 2023 +0200

    Update sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/ScanTypeCountTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 145b073
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 18:45:57 2023 +0200

    Update sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/ScanTypeCountTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit de9a510
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 18:45:38 2023 +0200

    Update sechub-scan/src/test/java/com/mercedesbenz/sechub/domain/scan/ScanTypeCountTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 2119dd0
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 18:45:07 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryDetailsTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 560b6d4
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 18:44:36 2023 +0200

    Update sechub-commons-model/src/test/java/com/mercedesbenz/sechub/commons/model/SecHubReportMetaDataSummaryDetailsTest.java

    Co-authored-by: Jeeppler <Jeeppler@users.noreply.github.com>

commit 8883070
Merge: 983f58d f5406f8
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 14:43:20 2023 +0200

    Merge remote-tracking branch 'refs/remotes/origin/feature-345-summary-in-reports' into feature-345-summary-in-reports

commit f5406f8
Merge: 3b618b3 fe871ae
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 14:42:34 2023 +0200

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit 983f58d
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Nov 2 14:38:15 2023 +0200

    Fixed some tests and html templates #345

commit 228dc45
Merge: 9a933f9 3b618b3
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Mon Oct 30 18:44:43 2023 +0200

    Merge remote-tracking branch 'refs/remotes/origin/feature-345-summary-in-reports' into feature-345-summary-in-reports

commit 3b618b3
Merge: ee84a7c 160f3c5
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Mon Oct 30 17:52:30 2023 +0200

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit 9a933f9
Merge: ee84a7c 3efa782
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Sat Oct 28 12:28:39 2023 +0300

    Merge branch 'feature-345-temp' into feature-345-summary-in-reports

commit ee84a7c
Merge: 4595649 0c45046
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Fri Oct 27 18:56:06 2023 +0300

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit 3efa782
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Fri Oct 27 18:52:13 2023 +0300

    Modified tests for the new report from #345

commit 4595649
Merge: 690dbad bad047a
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Tue Oct 10 21:37:35 2023 +0300

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit 690dbad
Merge: e22c483 602f380
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Fri Oct 6 12:14:21 2023 +0300

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit e22c483
Merge: a445501 639f6ab
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Fri Sep 8 14:38:32 2023 +0300

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit a445501
Merge: a039d35 5453138
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Aug 24 16:07:10 2023 +0300

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit a039d35
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Wed Aug 16 16:51:46 2023 +0300

    Fixed some tests and html templates #345

commit 07bf0ee
Merge: d57c6ee 2f57762
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Wed Aug 16 16:24:42 2023 +0300

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit d57c6ee
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Sun Aug 6 02:25:28 2023 +0300

    Enabled github's workflow test #345

commit 0fe8d85
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Fri Aug 4 18:15:09 2023 +0300

    Minor fixes and improvements #345

commit 15e3bbf
Merge: 6446141 4b55871
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Fri Aug 4 18:10:01 2023 +0300

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit 6446141
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Wed Jul 19 14:03:18 2023 +0300

    Improvement of html and json reports #345

commit be03972
Merge: 70ea329 0fa4f20
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Wed Jul 19 13:48:43 2023 +0300

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit 70ea329
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Fri May 26 10:33:05 2023 +0300

    Added a details section the child of summary section into report #345

commit 8e73dc2
Merge: 3b7d863 1e40e7b
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Fri May 26 10:13:01 2023 +0300

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit 3b7d863
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Wed May 24 09:03:39 2023 +0300

    Added summary section into report #345

commit 8c8badd
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Tue May 16 17:21:20 2023 +0300

    Some improvements and fixes #345:

    - changed model's scanTypeCount List to Set in the HTMLScanResultReportModelBuilder;
    - added tests in the HTMLScanResultReportModelBuilderTest;
    - cleaned and added improvements in the ScanTypeCount;
    - created tests for the ScanTypeCount;
    - modified scanresult.html because of new set from the HTMLScanResultReportModelBuilder.

commit 8d6f949
Merge: 6b4f0a3 3e14a1e
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Tue May 16 14:35:54 2023 +0300

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit 6b4f0a3
Merge: d4d1a83 e120a14
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Apr 27 16:17:46 2023 +0300

    Merge branch 'feature-345-summary-in-reports' of https://github.com/zigfridus/sechub into feature-345-summary-in-reports

commit e120a14
Merge: 1899d25 07811d6
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Apr 27 16:08:56 2023 +0300

    Merge branch 'mercedes-benz:develop' into feature-345-summary-in-reports

commit d4d1a83
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Thu Apr 27 16:05:15 2023 +0300

    The draft summary table in a HTML report #345

commit 1899d25
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Mon Apr 10 16:03:49 2023 +0300

    Add possibility to click on results in the summary table #345

commit 5100a67
Author: Valentyn Grygoriev <zigfridus@gmail.com>
Date:   Mon Apr 10 14:12:56 2023 +0300

    Add summary table #345
@de-jcup
Copy link
Member

de-jcup commented Jan 30, 2024

Created final PR at #2873.
Contains all changes from @zigfridus - final merge to develop will be squashed.

@zigfridus
Copy link
Contributor Author

@de-jcup
Thank you for merge this PR.
Have a nice day.

@Jeeppler
Copy link
Member

@zigfridus thank you for your contribution.

@zigfridus zigfridus deleted the feature-345-summary-in-reports branch February 26, 2024 15:05
@Jeeppler
Copy link
Member

Jeeppler commented May 3, 2024

@zigfridus thank you again for your valuable contribution. The summary allows security experts to so much faster understand what security issues are in the report. It is a real time saver. Thank you again for your good work 👍.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@de-jcup de-jcup Awaiting requested review from de-jcup

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zigfridus @Jeeppler @de-jcup