Improve banner and content options

jfrog · Oct 29, 2023 · 4338057 · 4338057
1 parent 5d0e9da
commit 4338057
Show file tree

Hide file tree

Showing 25 changed files with 155 additions and 85 deletions.
diff --git a/testdata/messages/summarycomment/structure/fix_mr_not_entitled.md b/testdata/messages/summarycomment/structure/fix_mr_not_entitled.md
@@ -9,7 +9,8 @@
 some content
 ```
 <details>
-<summary>Note</summary>
+<summary> <b>Note:</b> </summary>
+
 
 ---
 <div align='center'>
@@ -18,8 +19,10 @@ some content
 
 </div>
 
+
 </details>
 
+
 ---
 <div align='center'>
 

diff --git a/testdata/messages/summarycomment/structure/fix_pr_not_entitled.md b/testdata/messages/summarycomment/structure/fix_pr_not_entitled.md
@@ -9,7 +9,8 @@
 some content
 ```
 <details>
-<summary>Note</summary>
+<summary> <b>Note:</b> </summary>
+
 
 ---
 <div align='center'>
@@ -18,8 +19,10 @@ some content
 
 </div>
 
+
 </details>
 
+
 ---
 <div align='center'>
 

diff --git a/testdata/messages/summarycomment/structure/fix_simplified_not_entitled.md b/testdata/messages/summarycomment/structure/fix_simplified_not_entitled.md
@@ -4,8 +4,11 @@
 some content
 ```
 
+---
 Note:
 
+---
+
 ---
 **Frogbot** also supports **Contextual Analysis, Secret Detection, IaC and SAST Vulnerabilities Scanning**. This features are included as part of the [JFrog Advanced Security](https://jfrog.com/advanced-security) package, which isn't enabled on your system.
 

diff --git a/...ure/summary_comment_mr_issues_entitled.md → ...ure/summary_comment_issues_mr_entitled.md b/...ure/summary_comment_mr_issues_entitled.md → ...ure/summary_comment_issues_mr_entitled.md
diff --git a/..._comment_mr_issues_entitled_with_title.md → ..._comment_issues_mr_entitled_with_title.md b/..._comment_mr_issues_entitled_with_title.md → ..._comment_issues_mr_entitled_with_title.md
@@ -4,7 +4,7 @@
 
 </div>
 
-## Test Build
+## **Custom title**
 
 ```
 some content

diff --git a/...summary_comment_mr_issues_not_entitled.md → ...summary_comment_issues_mr_not_entitled.md b/...summary_comment_mr_issues_not_entitled.md → ...summary_comment_issues_mr_not_entitled.md
@@ -9,7 +9,8 @@
 some content
 ```
 <details>
-<summary>Note</summary>
+<summary> <b>Note:</b> </summary>
+
 
 ---
 <div align='center'>
@@ -18,8 +19,10 @@ some content
 
 </div>
 
+
 </details>
 
+
 ---
 <div align='center'>
 

diff --git a/...ure/summary_comment_pr_issues_entitled.md → ...ure/summary_comment_issues_pr_entitled.md b/...ure/summary_comment_pr_issues_entitled.md → ...ure/summary_comment_issues_pr_entitled.md
diff --git a/...summary_comment_pr_issues_not_entitled.md → ...summary_comment_issues_pr_not_entitled.md b/...summary_comment_pr_issues_not_entitled.md → ...summary_comment_issues_pr_not_entitled.md
@@ -9,7 +9,8 @@
 some content
 ```
 <details>
-<summary>Note</summary>
+<summary> <b>Note:</b> </summary>
+
 
 ---
 <div align='center'>
@@ -18,8 +19,10 @@ some content
 
 </div>
 
+
 </details>
 
+
 ---
 <div align='center'>
 

diff --git a/...ment_pr_issues_not_entitled_with_title.md → ...ment_issues_pr_not_entitled_with_title.md b/...ment_pr_issues_not_entitled_with_title.md → ...ment_issues_pr_not_entitled_with_title.md
@@ -4,13 +4,14 @@
 
 </div>
 
-## Test Build
+## **Custom title**
 
 ```
 some content
 ```
 <details>
-<summary>Note</summary>
+<summary> <b>Note:</b> </summary>
+
 
 ---
 <div align='center'>
@@ -19,8 +20,10 @@ some content
 
 </div>
 
+
 </details>
 
+
 ---
 <div align='center'>
 

diff --git a/...ary_comment_simplified_issues_entitled.md → ...ary_comment_issues_simplified_entitled.md b/...ary_comment_simplified_issues_entitled.md → ...ary_comment_issues_simplified_entitled.md
diff --git a/..._simplified_issues_entitled_with_title.md → ..._issues_simplified_entitled_with_title.md b/..._simplified_issues_entitled_with_title.md → ..._issues_simplified_entitled_with_title.md
@@ -1,6 +1,9 @@
 **🚨 Frogbot scanned this pull request and found the below:**
 
-**Test Build**
+---
+## **Custom title**
+
+---
 
 ```
 some content

diff --git a/...comment_simplified_issues_not_entitled.md → ...comment_issues_simplified_not_entitled.md b/...comment_simplified_issues_not_entitled.md → ...comment_issues_simplified_not_entitled.md
@@ -4,8 +4,11 @@
 some content
 ```
 
+---
 Note:
 
+---
+
 ---
 **Frogbot** also supports **Contextual Analysis, Secret Detection, IaC and SAST Vulnerabilities Scanning**. This features are included as part of the [JFrog Advanced Security](https://jfrog.com/advanced-security) package, which isn't enabled on your system.
 

diff --git a/.../summary_comment_mr_no_issues_entitled.md → .../summary_comment_no_issues_mr_entitled.md b/.../summary_comment_mr_no_issues_entitled.md → .../summary_comment_no_issues_mr_entitled.md
diff --git a/...mary_comment_mr_no_issues_not_entitled.md → ...mary_comment_no_issues_mr_not_entitled.md b/...mary_comment_mr_no_issues_not_entitled.md → ...mary_comment_no_issues_mr_not_entitled.md
@@ -5,7 +5,8 @@
 </div>
 
 <details>
-<summary>Note</summary>
+<summary> <b>Note:</b> </summary>
+
 
 ---
 <div align='center'>
@@ -14,8 +15,10 @@
 
 </div>
 
+
 </details>
 
+
 ---
 <div align='center'>
 

diff --git a/.../summary_comment_pr_no_issues_entitled.md → .../summary_comment_no_issues_pr_entitled.md b/.../summary_comment_pr_no_issues_entitled.md → .../summary_comment_no_issues_pr_entitled.md
diff --git a/...mary_comment_pr_no_issues_not_entitled.md → ...mary_comment_no_issues_pr_not_entitled.md b/...mary_comment_pr_no_issues_not_entitled.md → ...mary_comment_no_issues_pr_not_entitled.md
@@ -5,7 +5,8 @@
 </div>
 
 <details>
-<summary>Note</summary>
+<summary> <b>Note:</b> </summary>
+
 
 ---
 <div align='center'>
@@ -14,8 +15,10 @@
 
 </div>
 
+
 </details>
 
+
 ---
 <div align='center'>
 

diff --git a/...ummarycomment/structure/summary_comment_no_issues_pr_not_entitled_with_title.md b/...ummarycomment/structure/summary_comment_no_issues_pr_not_entitled_with_title.md
@@ -0,0 +1,28 @@
+<div align='center'>
+
+[![](https://raw.githubusercontent.com/jfrog/frogbot/master/resources/v2/noVulnerabilityBannerPR.png)](https://github.com/jfrog/frogbot#readme)
+
+</div>
+
+## **Custom title**
+<details>
+<summary> <b>Note:</b> </summary>
+
+
+---
+<div align='center'>
+
+**Frogbot** also supports **Contextual Analysis, Secret Detection, IaC and SAST Vulnerabilities Scanning**. This features are included as part of the [JFrog Advanced Security](https://jfrog.com/advanced-security) package, which isn't enabled on your system.
+
+</div>
+
+
+</details>
+
+
+---
+<div align='center'>
+
+[🐸 JFrog Frogbot](https://github.com/jfrog/frogbot#readme)
+
+</div>
diff --git a/..._comment_simplified_no_issues_entitled.md → ..._comment_no_issues_simplified_entitled.md b/..._comment_simplified_no_issues_entitled.md → ..._comment_no_issues_simplified_entitled.md
diff --git a/...ment_simplified_no_issues_not_entitled.md → ...ment_no_issues_simplified_not_entitled.md b/...ment_simplified_no_issues_not_entitled.md → ...ment_no_issues_simplified_not_entitled.md
@@ -1,7 +1,10 @@
 **👍 Frogbot scanned this pull request and found that it did not add vulnerable dependencies.**
 
+---
 Note:
 
+---
+
 ---
 **Frogbot** also supports **Contextual Analysis, Secret Detection, IaC and SAST Vulnerabilities Scanning**. This features are included as part of the [JFrog Advanced Security](https://jfrog.com/advanced-security) package, which isn't enabled on your system.
 

diff --git a/...mment/structure/summary_comment_no_issues_simplified_not_entitled_with_title.md b/...mment/structure/summary_comment_no_issues_simplified_not_entitled_with_title.md
@@ -0,0 +1,17 @@
+**👍 Frogbot scanned this pull request and found that it did not add vulnerable dependencies.**
+
+---
+## **Custom title**
+
+---
+
+---
+Note:
+
+---
+
+---
+**Frogbot** also supports **Contextual Analysis, Secret Detection, IaC and SAST Vulnerabilities Scanning**. This features are included as part of the [JFrog Advanced Security](https://jfrog.com/advanced-security) package, which isn't enabled on your system.
+
+---
+[🐸 JFrog Frogbot](https://github.com/jfrog/frogbot#readme)
diff --git a/utils/outputwriter/outputcontent.go b/utils/outputwriter/outputcontent.go
@@ -31,7 +31,7 @@ func GetPRSummaryContent(content string, issuesExists, isComment bool, writer Ou
 	comment.WriteString(writer.Image(getPRSummaryBanner(issuesExists, isComment, writer.VcsProvider())))
 	customCommentTitle := writer.PullRequestCommentTitle()
 	if customCommentTitle != "" {
-		comment.WriteString(customCommentTitle)
+		WriteContent(&comment, writer.MarkAsTitle(MarkAsBold(customCommentTitle), 2))
 	}
 	if issuesExists {
 		WriteContent(&comment, content)
@@ -84,7 +84,7 @@ func untitledForJasMsg(writer OutputWriter) string {
 	if writer.AvoidExtraMessages() || writer.IsEntitledForJas() {
 		return ""
 	}
-	return writer.MarkAsCollapsible("Note", fmt.Sprintf("%s\n%s", SectionDivider(), writer.MarkInCenter(jasFeaturesMsgWhenNotEnabled)))
+	return writer.MarkAsDetails("Note:", 0, fmt.Sprintf("%s\n%s", SectionDivider(), writer.MarkInCenter(jasFeaturesMsgWhenNotEnabled)))
 }
 
 func footer(writer OutputWriter) string {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,8 +4,11 @@ @@
     some content
     ```
+    ---
     Note:
+    ---
     ---
     **Frogbot** also supports **Contextual Analysis, Secret Detection, IaC and SAST Vulnerabilities Scanning**. This features are included as part of the [JFrog Advanced Security](https://jfrog.com/advanced-security) package, which isn't enabled on your system.
@@ Expand Down @@