From ea01f10643dcda91f63fd7ba673bd69ebdf51c3a Mon Sep 17 00:00:00 2001
From: Sadman Anik <sadmana@synopsys.com>
Date: Tue, 8 Oct 2024 17:02:40 +0600
Subject: [PATCH 1/3] UI fix

---
 .../security/scan/extension/SecurityScan.java |   2 -
 .../freestyle/SecurityScanFreestyle.java      | 125 ++++-
 .../extension/pipeline/SecurityScanStep.java  | 132 ++++-
 .../scan/global/ApplicationConstants.java     |   1 -
 .../security/scan/input/polaris/Polaris.java  |  11 -
 .../scan/service/ParameterMappingService.java |   2 -
 .../polaris/PolarisParametersService.java     |  11 -
 .../SecurityScanFreestyle/config.jelly        | 461 +++++++++++-------
 ...elp-blackducksca_include_diagnostics.html} |   0
 ... help-blackducksca_mark_build_status.html} |   0
 .../help-coverity_include_diagnostics.html}   |   0
 .../help-coverity_local.html                  |   2 +-
 .../help-coverity_mark_build_status.html}     |   0
 .../help-polaris_include_diagnostics.html     |   3 +
 .../help-polaris_mark_build_status.html       |   4 +
 .../help-polaris_triage.html                  |   3 -
 .../help-srm_include_diagnostics.html         |   3 +
 .../help-srm_mark_build_status.html           |   4 +
 .../global/ScannerGlobalConfig/config.jelly   |  88 +++-
 .../pipeline/SecurityScanStep/config.jelly    | 445 +++++++++++------
 ...help-blackducksca_include_diagnostics.html |   3 +
 .../help-blackducksca_mark_build_status.html  |   4 +
 .../help-coverity_include_diagnostics.html    |   3 +
 .../SecurityScanStep/help-coverity_local.html |   2 +-
 .../help-coverity_mark_build_status.html      |   4 +
 .../help-polaris_include_diagnostics.html     |   3 +
 .../help-polaris_mark_build_status.html       |   4 +
 .../SecurityScanStep/help-polaris_triage.html |   3 -
 .../help-srm_include_diagnostics.html         |   3 +
 .../help-srm_mark_build_status.html           |   4 +
 .../service/ParameterMappingServiceTest.java  |   2 -
 .../polaris/PolarisParametersServiceTest.java |   6 -
 32 files changed, 950 insertions(+), 388 deletions(-)
 rename src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/{help-include_diagnostics.html => help-blackducksca_include_diagnostics.html} (100%)
 rename src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/{help-mark_build_status.html => help-blackducksca_mark_build_status.html} (100%)
 rename src/main/resources/io/jenkins/plugins/security/scan/extension/{pipeline/SecurityScanStep/help-include_diagnostics.html => freestyle/SecurityScanFreestyle/help-coverity_include_diagnostics.html} (100%)
 rename src/main/resources/io/jenkins/plugins/security/scan/extension/{pipeline/SecurityScanStep/help-mark_build_status.html => freestyle/SecurityScanFreestyle/help-coverity_mark_build_status.html} (100%)
 create mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-polaris_include_diagnostics.html
 create mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-polaris_mark_build_status.html
 delete mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-polaris_triage.html
 create mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-srm_include_diagnostics.html
 create mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-srm_mark_build_status.html
 create mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-blackducksca_include_diagnostics.html
 create mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-blackducksca_mark_build_status.html
 create mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-coverity_include_diagnostics.html
 create mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-coverity_mark_build_status.html
 create mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-polaris_include_diagnostics.html
 create mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-polaris_mark_build_status.html
 delete mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-polaris_triage.html
 create mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-srm_include_diagnostics.html
 create mode 100644 src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-srm_mark_build_status.html

diff --git a/src/main/java/io/jenkins/plugins/security/scan/extension/SecurityScan.java b/src/main/java/io/jenkins/plugins/security/scan/extension/SecurityScan.java
index 780899af..92d17829 100644
--- a/src/main/java/io/jenkins/plugins/security/scan/extension/SecurityScan.java
+++ b/src/main/java/io/jenkins/plugins/security/scan/extension/SecurityScan.java
@@ -135,8 +135,6 @@ public interface SecurityScan {
 
     public String getPolaris_assessment_types();
 
-    public String getPolaris_triage();
-
     public String getPolaris_branch_name();
 
     public String getPolaris_prComment_severities();
diff --git a/src/main/java/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle.java b/src/main/java/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle.java
index 21937db6..d79e9500 100644
--- a/src/main/java/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle.java
+++ b/src/main/java/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle.java
@@ -64,7 +64,6 @@ public class SecurityScanFreestyle extends Builder implements SecurityScan, Free
     private String polaris_application_name;
     private String polaris_project_name;
     private String polaris_assessment_types;
-    private String polaris_triage;
     private String polaris_branch_name;
     private String polaris_branch_parent_name;
     private String polaris_prComment_severities;
@@ -121,9 +120,17 @@ public class SecurityScanFreestyle extends Builder implements SecurityScan, Free
     private String bridgecli_download_version;
     private String bridgecli_install_directory;
     private Boolean include_diagnostics;
+    private Boolean coverity_include_diagnostics;
+    private Boolean blackducksca_include_diagnostics;
+    private Boolean polaris_include_diagnostics;
+    private Boolean srm_include_diagnostics;
     private Boolean network_airgap;
 
     private String mark_build_status;
+    private String blackducksca_mark_build_status;
+    private String coverity_mark_build_status;
+    private String polaris_mark_build_status;
+    private String srm_mark_build_status;
 
     @DataBoundConstructor
     public SecurityScanFreestyle() {
@@ -362,10 +369,6 @@ public String getPolaris_assessment_types() {
         return polaris_assessment_types;
     }
 
-    public String getPolaris_triage() {
-        return polaris_triage;
-    }
-
     public String getPolaris_branch_name() {
         return polaris_branch_name;
     }
@@ -526,6 +529,22 @@ public Boolean isInclude_diagnostics() {
         return include_diagnostics;
     }
 
+    public Boolean isCoverity_include_diagnostics() {
+        return coverity_include_diagnostics;
+    }
+
+    public Boolean isBlackducksca_include_diagnostics() {
+        return blackducksca_include_diagnostics;
+    }
+
+    public Boolean isPolaris_include_diagnostics() {
+        return polaris_include_diagnostics;
+    }
+
+    public Boolean isSrm_include_diagnostics() {
+        return srm_include_diagnostics;
+    }
+
     public Boolean isNetwork_airgap() {
         return network_airgap;
     }
@@ -534,6 +553,22 @@ public String getMark_build_status() {
         return mark_build_status;
     }
 
+    public String getBlackducksca_mark_build_status() {
+        return blackducksca_mark_build_status;
+    }
+
+    public String getCoverity_mark_build_status() {
+        return coverity_mark_build_status;
+    }
+
+    public String getPolaris_mark_build_status() {
+        return polaris_mark_build_status;
+    }
+
+    public String getSrm_mark_build_status() {
+        return srm_mark_build_status;
+    }
+
     public String getSrm_url() {
         return srm_url;
     }
@@ -785,11 +820,6 @@ public void setPolaris_assessment_types(String polaris_assessment_types) {
         this.polaris_assessment_types = Util.fixEmptyAndTrim(polaris_assessment_types);
     }
 
-    @DataBoundSetter
-    public void setPolaris_triage(String polaris_triage) {
-        this.polaris_triage = Util.fixEmptyAndTrim(polaris_triage);
-    }
-
     @DataBoundSetter
     public void setPolaris_branch_name(String polaris_branch_name) {
         this.polaris_branch_name = Util.fixEmptyAndTrim(polaris_branch_name);
@@ -967,6 +997,30 @@ public void setInclude_diagnostics(Boolean include_diagnostics) {
         this.include_diagnostics = include_diagnostics ? true : null;
     }
 
+    @DataBoundSetter
+    public void setCoverity_include_diagnostics(Boolean coverity_include_diagnostics) {
+        if (getProduct().contentEquals(SecurityProduct.COVERITY.name().toLowerCase()))
+            this.include_diagnostics = coverity_include_diagnostics ? true : null;
+    }
+
+    @DataBoundSetter
+    public void setBlackducksca_include_diagnostics(Boolean blackducksca_include_diagnostics) {
+        if (getProduct().contentEquals(SecurityProduct.BLACKDUCKSCA.name().toLowerCase()))
+            this.include_diagnostics = blackducksca_include_diagnostics ? true : null;
+    }
+
+    @DataBoundSetter
+    public void setPolaris_include_diagnostics(Boolean polaris_include_diagnostics) {
+        if (getProduct().contentEquals(SecurityProduct.POLARIS.name().toLowerCase()))
+            this.include_diagnostics = polaris_include_diagnostics ? true : null;
+    }
+
+    @DataBoundSetter
+    public void setSrm_include_diagnostics(Boolean srm_include_diagnostics) {
+        if (getProduct().contentEquals(SecurityProduct.SRM.name().toLowerCase()))
+            this.include_diagnostics = srm_include_diagnostics ? true : null;
+    }
+
     @DataBoundSetter
     public void setNetwork_airgap(Boolean network_airgap) {
         this.network_airgap = network_airgap ? true : null;
@@ -977,6 +1031,31 @@ public void setMark_build_status(String mark_build_status) {
         this.mark_build_status = mark_build_status;
     }
 
+    @DataBoundSetter
+    public void setCoverity_mark_build_status(String coverity_mark_build_status) {
+        if (getProduct().contentEquals(SecurityProduct.COVERITY.name().toLowerCase()))
+            this.coverity_mark_build_status = this.mark_build_status = Util.fixEmptyAndTrim(coverity_mark_build_status);
+    }
+
+    @DataBoundSetter
+    public void setBlackducksca_mark_build_status(String blackducksca_mark_build_status) {
+        if (getProduct().contentEquals(SecurityProduct.BLACKDUCKSCA.name().toLowerCase()))
+            this.blackducksca_mark_build_status =
+                    this.mark_build_status = Util.fixEmptyAndTrim(blackducksca_mark_build_status);
+    }
+
+    @DataBoundSetter
+    public void setPolaris_mark_build_status(String polaris_mark_build_status) {
+        if (getProduct().contentEquals(SecurityProduct.POLARIS.name().toLowerCase()))
+            this.polaris_mark_build_status = this.mark_build_status = Util.fixEmptyAndTrim(polaris_mark_build_status);
+    }
+
+    @DataBoundSetter
+    public void setSrm_mark_build_status(String srm_mark_build_status) {
+        if (getProduct().contentEquals(SecurityProduct.SRM.name().toLowerCase()))
+            this.srm_mark_build_status = this.mark_build_status = Util.fixEmptyAndTrim(srm_mark_build_status);
+    }
+
     @DataBoundSetter
     public void setSrm_url(String srm_url) {
         this.srm_url = srm_url;
@@ -1153,7 +1232,31 @@ public ListBoxModel doFillProductItems() {
         }
 
         @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
-        public ListBoxModel doFillMark_build_statusItems() {
+        public ListBoxModel doFillBlackducksca_mark_build_statusItems() {
+            ListBoxModel items = new ListBoxModel();
+            items.add(ApplicationConstants.DEFAULT_DROPDOWN_OPTION_NAME, "");
+            items.addAll(ParameterMappingService.getMarkBuildStatusItems());
+            return items;
+        }
+
+        @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
+        public ListBoxModel doFillPolaris_mark_build_statusItems() {
+            ListBoxModel items = new ListBoxModel();
+            items.add(ApplicationConstants.DEFAULT_DROPDOWN_OPTION_NAME, "");
+            items.addAll(ParameterMappingService.getMarkBuildStatusItems());
+            return items;
+        }
+
+        @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
+        public ListBoxModel doFillCoverity_mark_build_statusItems() {
+            ListBoxModel items = new ListBoxModel();
+            items.add(ApplicationConstants.DEFAULT_DROPDOWN_OPTION_NAME, "");
+            items.addAll(ParameterMappingService.getMarkBuildStatusItems());
+            return items;
+        }
+
+        @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
+        public ListBoxModel doFillSrm_mark_build_statusItems() {
             ListBoxModel items = new ListBoxModel();
             items.add(ApplicationConstants.DEFAULT_DROPDOWN_OPTION_NAME, "");
             items.addAll(ParameterMappingService.getMarkBuildStatusItems());
diff --git a/src/main/java/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep.java b/src/main/java/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep.java
index 9912a09a..d4f1eb44 100644
--- a/src/main/java/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep.java
+++ b/src/main/java/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep.java
@@ -104,7 +104,6 @@ public class SecurityScanStep extends Step implements SecurityScan, PrCommentSca
     private String polaris_application_name;
     private String polaris_project_name;
     private String polaris_assessment_types;
-    private String polaris_triage;
     private String polaris_branch_name;
     private String polaris_branch_parent_name;
     private Boolean polaris_prComment_enabled;
@@ -152,12 +151,20 @@ public class SecurityScanStep extends Step implements SecurityScan, PrCommentSca
     private String synopsys_bridge_download_version;
     private String synopsys_bridge_install_directory;
     private Boolean include_diagnostics;
+    private Boolean coverity_include_diagnostics;
+    private Boolean blackducksca_include_diagnostics;
+    private Boolean polaris_include_diagnostics;
+    private Boolean srm_include_diagnostics;
     private Boolean network_airgap;
     /*
     By default, the plugin will always return a status code even if there is error.
      */
     private Boolean return_status = true;
     private String mark_build_status;
+    private String blackducksca_mark_build_status;
+    private String coverity_mark_build_status;
+    private String polaris_mark_build_status;
+    private String srm_mark_build_status;
 
     @DataBoundConstructor
     public SecurityScanStep() {
@@ -420,10 +427,6 @@ public String getPolaris_assessment_types() {
         return polaris_assessment_types;
     }
 
-    public String getPolaris_triage() {
-        return polaris_triage;
-    }
-
     public String getPolaris_branch_name() {
         return polaris_branch_name;
     }
@@ -544,6 +547,26 @@ public Boolean isInclude_diagnostics() {
         return include_diagnostics;
     }
 
+    @Nullable
+    public Boolean isCoverity_include_diagnostics() {
+        return null;
+    }
+
+    @Nullable
+    public Boolean isBlackducksca_include_diagnostics() {
+        return null;
+    }
+
+    @Nullable
+    public Boolean isPolaris_include_diagnostics() {
+        return null;
+    }
+
+    @Nullable
+    public Boolean isSrm_include_diagnostics() {
+        return null;
+    }
+
     public Boolean isNetwork_airgap() {
         return network_airgap;
     }
@@ -556,6 +579,26 @@ public String getMark_build_status() {
         return mark_build_status;
     }
 
+    @Nullable
+    public String getBlackducksca_mark_build_status() {
+        return null;
+    }
+
+    @Nullable
+    public String getCoverity_mark_build_status() {
+        return null;
+    }
+
+    @Nullable
+    public String getPolaris_mark_build_status() {
+        return null;
+    }
+
+    @Nullable
+    public String getSrm_mark_build_status() {
+        return null;
+    }
+
     public String getProject_directory() {
         return project_directory;
     }
@@ -915,11 +958,6 @@ public void setPolaris_assessment_types(String polaris_assessment_types) {
         this.polaris_assessment_types = Util.fixEmptyAndTrim(polaris_assessment_types);
     }
 
-    @DataBoundSetter
-    public void setPolaris_triage(String polaris_triage) {
-        this.polaris_triage = Util.fixEmptyAndTrim(polaris_triage);
-    }
-
     @DataBoundSetter
     public void setPolaris_branch_name(String polaris_branch_name) {
         this.polaris_branch_name = Util.fixEmptyAndTrim(polaris_branch_name);
@@ -1045,6 +1083,30 @@ public void setInclude_diagnostics(Boolean include_diagnostics) {
         this.include_diagnostics = include_diagnostics ? true : null;
     }
 
+    @DataBoundSetter
+    public void setCoverity_include_diagnostics(Boolean coverity_include_diagnostics) {
+        if (getProduct().contentEquals(SecurityProduct.COVERITY.name().toLowerCase()))
+            this.include_diagnostics = coverity_include_diagnostics ? true : null;
+    }
+
+    @DataBoundSetter
+    public void setBlackducksca_include_diagnostics(Boolean blackducksca_include_diagnostics) {
+        if (getProduct().contentEquals(SecurityProduct.BLACKDUCKSCA.name().toLowerCase()))
+            this.include_diagnostics = blackducksca_include_diagnostics ? true : null;
+    }
+
+    @DataBoundSetter
+    public void setPolaris_include_diagnostics(Boolean polaris_include_diagnostics) {
+        if (getProduct().contentEquals(SecurityProduct.POLARIS.name().toLowerCase()))
+            this.include_diagnostics = polaris_include_diagnostics ? true : null;
+    }
+
+    @DataBoundSetter
+    public void setSrm_include_diagnostics(Boolean srm_include_diagnostics) {
+        if (getProduct().contentEquals(SecurityProduct.SRM.name().toLowerCase()))
+            this.include_diagnostics = srm_include_diagnostics ? true : null;
+    }
+
     @DataBoundSetter
     public void setProject_directory(String project_directory) {
         this.project_directory = Util.fixEmptyAndTrim(project_directory);
@@ -1139,6 +1201,30 @@ public void setMark_build_status(String mark_build_status) {
         this.mark_build_status = Util.fixEmptyAndTrim(mark_build_status);
     }
 
+    @DataBoundSetter
+    public void setCoverity_mark_build_status(String coverity_mark_build_status) {
+        if (getProduct().contentEquals(SecurityProduct.COVERITY.name().toLowerCase()))
+            this.mark_build_status = Util.fixEmptyAndTrim(coverity_mark_build_status);
+    }
+
+    @DataBoundSetter
+    public void setBlackducksca_mark_build_status(String blackducksca_mark_build_status) {
+        if (getProduct().contentEquals(SecurityProduct.BLACKDUCKSCA.name().toLowerCase()))
+            this.mark_build_status = Util.fixEmptyAndTrim(blackducksca_mark_build_status);
+    }
+
+    @DataBoundSetter
+    public void setPolaris_mark_build_status(String polaris_mark_build_status) {
+        if (getProduct().contentEquals(SecurityProduct.POLARIS.name().toLowerCase()))
+            this.mark_build_status = Util.fixEmptyAndTrim(polaris_mark_build_status);
+    }
+
+    @DataBoundSetter
+    public void setSrm_mark_build_status(String srm_mark_build_status) {
+        if (getProduct().contentEquals(SecurityProduct.SRM.name().toLowerCase()))
+            this.mark_build_status = Util.fixEmptyAndTrim(srm_mark_build_status);
+    }
+
     private Map<String, Object> getParametersMap(FilePath workspace, TaskListener listener)
             throws PluginExceptionHandler {
         return ParameterMappingService.preparePipelineParametersMap(
@@ -1178,7 +1264,31 @@ public ListBoxModel doFillProductItems() {
         }
 
         @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
-        public ListBoxModel doFillMark_build_statusItems() {
+        public ListBoxModel doFillBlackducksca_mark_build_statusItems() {
+            ListBoxModel items = new ListBoxModel();
+            items.add(ApplicationConstants.DEFAULT_DROPDOWN_OPTION_NAME, "");
+            items.addAll(ParameterMappingService.getMarkBuildStatusItems());
+            return items;
+        }
+
+        @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
+        public ListBoxModel doFillPolaris_mark_build_statusItems() {
+            ListBoxModel items = new ListBoxModel();
+            items.add(ApplicationConstants.DEFAULT_DROPDOWN_OPTION_NAME, "");
+            items.addAll(ParameterMappingService.getMarkBuildStatusItems());
+            return items;
+        }
+
+        @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
+        public ListBoxModel doFillCoverity_mark_build_statusItems() {
+            ListBoxModel items = new ListBoxModel();
+            items.add(ApplicationConstants.DEFAULT_DROPDOWN_OPTION_NAME, "");
+            items.addAll(ParameterMappingService.getMarkBuildStatusItems());
+            return items;
+        }
+
+        @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
+        public ListBoxModel doFillSrm_mark_build_statusItems() {
             ListBoxModel items = new ListBoxModel();
             items.add(ApplicationConstants.DEFAULT_DROPDOWN_OPTION_NAME, "");
             items.addAll(ParameterMappingService.getMarkBuildStatusItems());
diff --git a/src/main/java/io/jenkins/plugins/security/scan/global/ApplicationConstants.java b/src/main/java/io/jenkins/plugins/security/scan/global/ApplicationConstants.java
index 0146733f..40c39034 100644
--- a/src/main/java/io/jenkins/plugins/security/scan/global/ApplicationConstants.java
+++ b/src/main/java/io/jenkins/plugins/security/scan/global/ApplicationConstants.java
@@ -132,7 +132,6 @@ public class ApplicationConstants {
     public static final String POLARIS_APPLICATION_NAME_KEY = "polaris_application_name";
     public static final String POLARIS_PROJECT_NAME_KEY = "polaris_project_name";
     public static final String POLARIS_ASSESSMENT_TYPES_KEY = "polaris_assessment_types";
-    public static final String POLARIS_TRIAGE_KEY = "polaris_triage";
     public static final String POLARIS_BRANCH_NAME_KEY = "polaris_branch_name";
     public static final String POLARIS_PRCOMMENT_ENABLED_KEY = "polaris_prComment_enabled";
     public static final String POLARIS_PRCOMMENT_SEVERITIES_KEY = "polaris_prComment_severities";
diff --git a/src/main/java/io/jenkins/plugins/security/scan/input/polaris/Polaris.java b/src/main/java/io/jenkins/plugins/security/scan/input/polaris/Polaris.java
index c7c9cd8b..0dfe6797 100644
--- a/src/main/java/io/jenkins/plugins/security/scan/input/polaris/Polaris.java
+++ b/src/main/java/io/jenkins/plugins/security/scan/input/polaris/Polaris.java
@@ -20,9 +20,6 @@ public class Polaris {
     @JsonProperty("assessment")
     private AssessmentTypes assessmentTypes;
 
-    @JsonProperty("triage")
-    private String triage;
-
     @JsonProperty("branch")
     private Branch branch;
 
@@ -85,14 +82,6 @@ public void setServerUrl(String serverUrl) {
         this.serverUrl = serverUrl;
     }
 
-    public String getTriage() {
-        return triage;
-    }
-
-    public void setTriage(String triage) {
-        this.triage = triage;
-    }
-
     public Branch getBranch() {
         return branch;
     }
diff --git a/src/main/java/io/jenkins/plugins/security/scan/service/ParameterMappingService.java b/src/main/java/io/jenkins/plugins/security/scan/service/ParameterMappingService.java
index 5453eb64..b8ae807b 100644
--- a/src/main/java/io/jenkins/plugins/security/scan/service/ParameterMappingService.java
+++ b/src/main/java/io/jenkins/plugins/security/scan/service/ParameterMappingService.java
@@ -378,8 +378,6 @@ public static Map<String, Object> preparePolarisParametersMap(SecurityScan secur
                 polarisParametersMap,
                 ApplicationConstants.POLARIS_ASSESSMENT_TYPES_KEY,
                 securityScan.getPolaris_assessment_types());
-        addParameterIfNotBlank(
-                polarisParametersMap, ApplicationConstants.POLARIS_TRIAGE_KEY, securityScan.getPolaris_triage());
         addParameterIfNotBlank(
                 polarisParametersMap,
                 ApplicationConstants.POLARIS_BRANCH_NAME_KEY,
diff --git a/src/main/java/io/jenkins/plugins/security/scan/service/scan/polaris/PolarisParametersService.java b/src/main/java/io/jenkins/plugins/security/scan/service/scan/polaris/PolarisParametersService.java
index 64b95d44..18c1fade 100644
--- a/src/main/java/io/jenkins/plugins/security/scan/service/scan/polaris/PolarisParametersService.java
+++ b/src/main/java/io/jenkins/plugins/security/scan/service/scan/polaris/PolarisParametersService.java
@@ -128,8 +128,6 @@ public Polaris preparePolarisObjectForBridge(Map<String, Object> polarisParamete
         setApplicationName(polarisParameters, polaris);
         setProjectName(polarisParameters, polaris);
         setBranchName(polarisParameters, polaris);
-
-        setTriage(polarisParameters, polaris);
         setTestScaType(polarisParameters, polaris);
         setPolarisPrCommentInputs(polarisParameters, prcomment, polaris);
         setAssessmentMode(polarisParameters, polaris);
@@ -219,15 +217,6 @@ private void setBranchName(Map<String, Object> polarisParameters, Polaris polari
         }
     }
 
-    private void setTriage(Map<String, Object> polarisParameters, Polaris polaris) {
-        if (polarisParameters.containsKey(ApplicationConstants.POLARIS_TRIAGE_KEY)) {
-            polaris.setTriage(polarisParameters
-                    .get(ApplicationConstants.POLARIS_TRIAGE_KEY)
-                    .toString()
-                    .trim());
-        }
-    }
-
     private void setTestScaType(Map<String, Object> polarisParameters, Polaris polaris) {
         if (polarisParameters.containsKey(ApplicationConstants.POLARIS_TEST_SCA_TYPE_KEY)) {
             Test test = new Test();
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/config.jelly b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/config.jelly
index 6e68a12c..6385923b 100644
--- a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/config.jelly
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/config.jelly
@@ -2,273 +2,338 @@
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
 
     <div id="product">
-        <f:entry field="product" title="Select Security Product">
+        <f:entry field="product" title="Select Product">
             <f:select/>
             <div id="error_product_name" style="display: block;" class="error error-margin" >No Product is selected!</div>
         </f:entry>
     </div>
 
     <div id="blackducksca" style="display: none;">
-        <f:section title="Black Duck SCA Parameters">
-            <f:entry field="blackducksca_scan_failure_severities" title="Black Duck SCA Scan Failure Severities (Optional)">
+        <f:section title="Scan Configuration">
+            <f:entry field="blackduck_project_directory" title="Project Directory (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="detect_download_url" title="Detect Download URL (Optional)">
-                <f:textbox/>
+            <f:entry field="blackducksca_mark_build_status" title="Mark Build Status (Optional)">
+                <f:select/>
             </f:entry>
-            <f:entry field="detect_scan_full" title="Detect Full Scan (Optional)">
-                <f:checkbox checked="${instance.isDetect_scan_full() == true}"/>
+            <f:entry field="blackducksca_include_diagnostics" title="Include Diagnostics (Optional)">
+                <f:checkbox checked="${instance.isInclude_diagnostics() == true}"/>
             </f:entry>
-            <f:entry field="blackducksca_waitForScan" title="Black Duck SCA Wait For Scan Completion (Optional)">
+            <f:entry field="blackducksca_waitForScan" title="Wait For Scan Completion (Optional)">
                 <f:checkbox checked="${instance.isBlackducksca_waitForScan() == null || instance.isBlackducksca_waitForScan() == true}"/>
             </f:entry>
-            <f:entry field="blackduck_project_directory" title="Project Directory (Optional)">
-                <f:textbox/>
-            </f:entry>
         </f:section>
 
-        <f:section title="SARIF Report Options">
-            <f:entry field="blackducksca_reports_sarif_create" title="Generate SARIF Report for Black Duck SCA Issues (Optional)">
-                <f:checkbox checked="${instance.isBlackducksca_reports_sarif_create() == true}"/>
-            </f:entry>
-            <f:entry field="blackduck_reports_sarif_groupSCAIssues" title="Group SCA Issues by Component (Optional)">
-                <f:checkbox checked="${instance.isBlackducksca_reports_sarif_groupSCAIssues() == null || instance.isBlackducksca_reports_sarif_groupSCAIssues() == true}"/>
+        <f:advanced title="Scan Options">
+            <f:entry field="detect_scan_full" title="Full Scan (Optional)">
+                <f:checkbox checked="${instance.isDetect_scan_full() == true}"/>
             </f:entry>
-            <f:entry field="blackducksca_reports_sarif_file_path" title="Black Duck SCA SARIF Report File Path (Optional)">
+            <f:entry field="blackducksca_scan_failure_severities" title="Scan Failure Severities (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="blackducksca_reports_sarif_severities" title="Black Duck SCA SARIF Report Severities (Optional)">
+            <f:entry field="detect_download_url" title="Detect Download URL (Optional)">
                 <f:textbox/>
             </f:entry>
-        </f:section>
+        </f:advanced>
+
+        <div id="blackducksca_sarif_report_sec">
+            <f:advanced title="SARIF Report Options">
+                <f:entry class="sarif-checkbox" field="blackducksca_reports_sarif_create" title="Generate SARIF Report (Optional)">
+                    <f:checkbox checked="${instance.isBlackducksca_reports_sarif_create() == true}"/>
+                </f:entry>
+                <div id="blackducksca_sarif_params">
+                    <f:entry field="blackducksca_reports_sarif_groupSCAIssues" title="Group SCA Issues by Component (Optional)">
+                        <f:checkbox checked="${instance.isBlackducksca_reports_sarif_groupSCAIssues() == null || instance.isBlackducksca_reports_sarif_groupSCAIssues() == true}"/>
+                    </f:entry>
+                    <f:entry field="blackducksca_reports_sarif_file_path" title="SARIF Report File Path (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                    <f:entry field="blackducksca_reports_sarif_severities" title="SARIF Report Severities (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                </div>
+            </f:advanced>
+        </div>
+
+        <div id="blackducksca_tool_configuration_sec">
+            <f:advanced title="Detect (SCA) Tool Options">
+                <f:entry field="detect_search_depth" title="Search Depth (Optional)">
+                    <f:textbox/>
+                </f:entry>
+                <f:entry field="detect_config_path" title="Config File Path (Optional)">
+                    <f:textbox/>
+                </f:entry>
+                <f:entry field="detect_args" title="Additional Arguments (Optional)">
+                    <f:textbox/>
+                </f:entry>
+            </f:advanced>
+        </div>
 
-        <f:section title="Black Duck SCA Tool Configuration Options">
-            <f:entry field="detect_search_depth" title="Detect Search Depth (Optional)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="detect_config_path" title="Detect Config File Path (Optional)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="detect_args" title="Detect Additional Arguments (Optional)">
-                <f:textbox/>
-            </f:entry>
-        </f:section>
     </div>
 
     <div id="coverity" style="display: none;">
-        <f:section title="Coverity Parameters">
-            <f:entry field="coverity_project_name" title="Coverity Project Name">
+        <f:section title="Scan Configuration">
+            <f:entry field="coverity_project_name" title="Coverity Project (Mandatory)">
                 <f:textbox/>
                 <div id="error_coverity_project_name" style="display: block;" class="error error-margin">Coverity Project Name is missing</div>
             </f:entry>
-            <f:entry field="coverity_stream_name" title="Coverity Stream Name">
+            <f:entry field="coverity_stream_name" title="Coverity Stream (Mandatory)">
                 <f:textbox/>
                 <div id="error_coverity_stream_name" style="display: block;" class="error error-margin">Coverity Stream Name is missing</div>
             </f:entry>
             <f:entry field="coverity_policy_view" title="Coverity Policy View (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="coverity_version" title="Coverity Version Number (Optional)">
+            <f:entry field="coverity_version" title="Coverity Version (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="coverity_waitForScan" title="Coverity Wait For Scan Completion (Optional)">
-                <f:checkbox checked="${instance.isCoverity_waitForScan() == null || instance.isCoverity_waitForScan() == true}" />
-            </f:entry>
-            <f:entry field="coverity_local" title="Coverity Local Analysis (Optional)">
-                <f:checkbox checked="${instance.isCoverity_local() == true}"/>
-            </f:entry>
             <f:entry field="coverity_project_directory" title="Project Directory (Optional)">
                 <f:textbox/>
             </f:entry>
-        </f:section>
-
-        <f:section title="Coverity (SAST) Tool Configuration Options">
-            <f:entry field="coverity_build_command" title="Coverity Build Command (Optional)">
-                <f:textbox/>
+            <f:entry field="coverity_mark_build_status" title="Mark Build Status (Optional)">
+                <f:select/>
             </f:entry>
-            <f:entry field="coverity_clean_command" title="Coverity Clean Command (Optional)">
-                <f:textbox/>
+            <f:entry field="coverity_local" title="Using Coverity Connect? (Optional)">
+                <f:checkbox checked="${instance.isCoverity_local() == true}"/>
             </f:entry>
-            <f:entry field="coverity_config_path" title="Coverity Config File Path (Optional)">
-                <f:textbox/>
+            <f:entry field="coverity_include_diagnostics" title="Include Diagnostics (Optional)">
+                <f:checkbox checked="${instance.isInclude_diagnostics() == true}"/>
             </f:entry>
-            <f:entry field="coverity_args" title="Coverity Additional Arguments (Optional)">
-                <f:textbox/>
+            <f:entry field="coverity_waitForScan" title="Wait For Scan Completion (Optional)">
+                <f:checkbox checked="${instance.isCoverity_waitForScan() == null || instance.isCoverity_waitForScan() == true}" />
             </f:entry>
         </f:section>
+
+        <div id="coverity_tool_configuration_sec">
+            <f:advanced title="Coverity (SAST) Tool Options">
+                <f:entry field="coverity_build_command" title="Build Command (Optional)">
+                    <f:textbox/>
+                </f:entry>
+                <f:entry field="coverity_clean_command" title="Clean Command (Optional)">
+                    <f:textbox/>
+                </f:entry>
+                <f:entry field="coverity_config_path" title="Config File Path (Optional)">
+                    <f:textbox/>
+                </f:entry>
+                <f:entry field="coverity_args" title="Additional Arguments (Optional)">
+                    <f:textbox/>
+                </f:entry>
+            </f:advanced>
+        </div>
+
     </div>
 
     <div id="polaris" style="display: none;">
-        <f:section title="Polaris Parameters">
-            <f:entry field="polaris_application_name" title="Polaris Application Name (Mandatory)">
+        <f:section title="Scan Configuration">
+            <f:entry field="polaris_assessment_types" title="Assessment Types (Mandatory)">
                 <f:textbox/>
-                <div id="error_polaris_application_name" style="display: block;" class="error error-margin">Polaris Application Name is missing</div>
+                <div id="error_polaris_assessment_types" style="display: block;" class="error error-margin">Polaris Assessment Types are missing</div>
             </f:entry>
-            <f:entry field="polaris_project_name" title="Polaris Project Name (Mandatory)">
+            <f:entry field="polaris_application_name" title="Polaris Application (Mandatory)">
                 <f:textbox/>
-                <div id="error_polaris_project_name" style="display: block;" class="error error-margin">Polaris Project Name is missing</div>
+                <div id="error_polaris_application_name" style="display: block;" class="error error-margin">Polaris Application Name is missing</div>
             </f:entry>
-            <f:entry field="polaris_assessment_types" title="Polaris Assessment Types (Mandatory)">
+            <f:entry field="polaris_project_name" title="Polaris Project (Mandatory)">
                 <f:textbox/>
-                <div id="error_polaris_assessment_types" style="display: block;" class="error error-margin">Polaris Assessment Types are missing</div>
+                <div id="error_polaris_project_name" style="display: block;" class="error error-margin">Polaris Project Name is missing</div>
             </f:entry>
-            <f:entry field="polaris_branch_name" title="Polaris Branch Name (Mandatory)">
+            <f:entry field="polaris_branch_name" title="Polaris Branch (Mandatory)">
                 <f:textbox/>
                 <div id="error_polaris_branch_name" style="display: block;" class="error error-margin">Polaris Branch Name is missing</div>
             </f:entry>
-            <f:entry field="polaris_waitForScan" title="Polaris Wait For Scan Completion (Optional)">
-                <f:checkbox checked="${instance.isPolaris_waitForScan() == null || instance.isPolaris_waitForScan() == true}" />
-            </f:entry>
-            <f:entry field="polaris_triage" title="Polaris Triage (Optional)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="polaris_test_sca_type" title="Polaris Test SCA Type (Optional)">
+            <f:entry field="polaris_test_sca_type" title="SCA Test Type (Optional)">
                 <f:textbox/>
             </f:entry>
             <f:entry field="polaris_project_directory" title="Project Directory (Optional)">
                 <f:textbox/>
             </f:entry>
-        </f:section>
-
-        <div id="polaris_assessment_mode">
-            <f:entry field="polaris_assessment_mode" title="Polaris Assessment Mode (Optional)">
+            <f:entry field="polaris_mark_build_status" title="Mark Build Status (Optional)">
                 <f:select/>
             </f:entry>
+            <f:entry field="polaris_include_diagnostics" title="Include Diagnostics (Optional)">
+                <f:checkbox checked="${instance.isInclude_diagnostics() == true}"/>
+            </f:entry>
+            <f:entry field="polaris_waitForScan" title="Wait For Scan Completion (Optional)">
+                <f:checkbox checked="${instance.isPolaris_waitForScan() == null || instance.isPolaris_waitForScan() == true}" />
+            </f:entry>
+        </f:section>
+
+        <div id="polaris_assessment_mode_sec">
+            <f:advanced title="Scan Options">
+                <div id="polaris_assessment_mode">
+                    <f:entry field="polaris_assessment_mode" title="Assessment Mode (Optional)">
+                        <f:select/>
+                    </f:entry>
+                </div>
+
+                <div id="source_upload" style="display: none;">
+                    <f:section title="Source Code Upload Options">
+                        <f:entry field="project_source_archive" title="Upload Archive Instead Of Project Directory (Optional)">
+                            <f:textbox/>
+                        </f:entry>
+                        <f:entry field="project_source_excludes" title="Project Source Excludes (Optional)">
+                            <f:textbox/>
+                        </f:entry>
+                        <f:entry field="project_source_preserveSymLinks" title="Project Source Preserve Sym Links (Optional)">
+                            <f:checkbox checked="${instance.isProject_source_preserveSymLinks() == true}"/>
+                        </f:entry>
+                    </f:section>
+                </div>
+            </f:advanced>
         </div>
 
-        <div id="source_upload" style="display: none;">
-            <f:section title="Source Code Upload Options">
-                <f:entry field="project_source_archive" title="Upload Archive Instead Of Project Directory (Optional)">
+        <div id="polaris_sarif_report_sec">
+            <f:advanced title="SARIF Report Options">
+                <f:entry class="sarif-checkbox" field="polaris_reports_sarif_create" title="Generate SARIF Report(Optional)">
+                    <f:checkbox checked="${instance.isPolaris_reports_sarif_create() == true}"/>
+                </f:entry>
+                <div id="polaris_sarif_params">
+                    <f:entry field="polaris_reports_sarif_groupSCAIssues" title="Group SCA Issues by Component (Optional)">
+                        <f:checkbox checked="${instance.isPolaris_reports_sarif_groupSCAIssues() == null || instance.isPolaris_reports_sarif_groupSCAIssues() == true}"/>
+                    </f:entry>
+                    <f:entry field="polaris_reports_sarif_file_path" title="SARIF Report File Path (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                    <f:entry field="polaris_reports_sarif_severities" title="SARIF Report Severities (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                    <f:entry field="polaris_reports_sarif_issue_types" title="SARIF Report Issue Types (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                </div>
+            </f:advanced>
+        </div>
+
+        <div id="polaris_tool_configuration_sec">
+            <f:advanced title="Coverity (SAST) Tool Options">
+                <f:entry field="polaris_sast_build_command" title="Coverity Build Command (Optional)">
+                    <f:textbox/>
+                </f:entry>
+                <f:entry field="polaris_sast_clean_command" title="Clean Command (Optional)">
                     <f:textbox/>
                 </f:entry>
-                <f:entry field="project_source_excludes" title="Project Source Excludes (Optional)">
+                <f:entry field="polaris_sast_config_path" title="Config File Path (Optional)">
                     <f:textbox/>
                 </f:entry>
-                <f:entry field="project_source_preserveSymLinks" title="Project Source Preserve Sym Links (Optional)">
-                    <f:checkbox checked="${instance.isProject_source_preserveSymLinks() == true}"/>
+                <f:entry field="polaris_sast_args" title="Additional Arguments (Optional)">
+                    <f:textbox/>
                 </f:entry>
-            </f:section>
+            </f:advanced>
+
+            <f:advanced title="Detect (SCA) Tool Options">
+                    <f:entry field="polaris_sca_search_depth" title="Search Depth (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                    <f:entry field="polaris_sca_config_path" title="Config File Path (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                    <f:entry field="polaris_sca_args" title="Additional Arguments (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+            </f:advanced>
         </div>
 
-        <f:section title="SARIF Report Options">
-            <f:entry field="polaris_reports_sarif_create" title="Generate SARIF Report for Polaris Issues (Optional)">
-                <f:checkbox checked="${instance.isPolaris_reports_sarif_create() == true}"/>
-            </f:entry>
-            <f:entry field="polaris_reports_sarif_groupSCAIssues" title="Group SCA Issues by Component (Optional)">
-                <f:checkbox checked="${instance.isPolaris_reports_sarif_groupSCAIssues() == null || instance.isPolaris_reports_sarif_groupSCAIssues() == true}"/>
-            </f:entry>
-            <f:entry field="polaris_reports_sarif_file_path" title="Polaris SARIF Report File Path (Optional)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="polaris_reports_sarif_issue_types" title="Polaris SARIF Report Issue Types (Optional)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="polaris_reports_sarif_severities" title="Polaris SARIF Report Severities (Optional)">
-                <f:textbox/>
-            </f:entry>
-        </f:section>
-
-        <f:section title="Coverity (SAST) Tool Configuration Options">
-            <f:entry field="polaris_sast_build_command" title="Coverity Build Command (Optional)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="polaris_sast_clean_command" title="Coverity Clean Command (Optional)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="polaris_sast_config_path" title="Coverity Config File Path (Optional)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="polaris_sast_args" title="Coverity Additional Arguments (Optional)">
-                <f:textbox/>
-            </f:entry>
-        </f:section>
-
-        <f:section title="Black Duck (SCA) Tool Configuration Options">
-            <f:entry field="polaris_sca_search_depth" title="Detect Search Depth (Optional)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="polaris_sca_config_path" title="Detect Config File Path (Optional)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="polaris_sca_args" title="Detect Additional Arguments (Optional)">
-                <f:textbox/>
-            </f:entry>
-        </f:section>
-
     </div>
 
     <div id="srm" style="display: none;">
-        <f:section title="SRM Parameters">
-            <f:entry field="srm_assessment_types" title="SRM Assessment Types (Mandatory)">
+        <f:section title="Scan Configuration">
+            <f:entry field="srm_assessment_types" title="Assessment Types (Mandatory)">
                 <f:textbox/>
                 <div id="error_srm_assessment_types" style="display: block;" class="error error-margin">SRM Assessment Types are missing</div>
             </f:entry>
-            <f:entry field="srm_project_name" title="SRM Project Name (Mandatory)">
+            <f:entry field="srm_project_name" title="SRM Project (Mandatory)">
                 <f:textbox/>
                 <div id="error_srm_project_name" style="display: block;" class="error error-margin">SRM Project Name is missing</div>
             </f:entry>
-            <f:entry field="srm_project_id" title="SRM Project Id (Mandatory)">
+            <f:entry field="srm_project_id" title="Project ID (Mandatory)">
                 <f:textbox/>
-                <div id="error_srm_project_id" style="display: block;" class="error error-margin">SRM Project Id is missing</div>
+                <div id="error_srm_project_id" style="display: block;" class="error error-margin">SRM Project ID is missing</div>
             </f:entry>
-            <f:entry field="srm_branch_name" title="SRM Branch Name (Optional)">
+            <f:entry field="srm_branch_name" title="SRM Branch (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="srm_branch_parent" title="SRM Parent Branch Name (Optional)">
+            <f:entry field="srm_branch_parent" title="SRM Parent Branch (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="srm_waitForScan" title="SRM Wait For Scan Completion (Optional)">
-                <f:checkbox checked="${instance.isSrm_waitForScan() == null || instance.isSrm_waitForScan() == true}" />
-            </f:entry>
             <f:entry field="srm_project_directory" title="Project Directory (Optional)">
                 <f:textbox/>
             </f:entry>
+            <f:entry field="srm_include_diagnostics" title="Include Diagnostics (Optional)">
+                <f:checkbox/>
+            </f:entry>
+            <f:entry field="srm_mark_build_status" title="Mark Build Status (Optional)">
+                <f:select/>
+            </f:entry>
+            <f:entry field="srm_waitForScan" title="Wait For Scan Completion (Optional)">
+                <f:checkbox checked="${instance.isSrm_waitForScan() == null || instance.isSrm_waitForScan() == true}" />
+            </f:entry>
         </f:section>
 
-        <f:section title="Coverity (SAST) Tool Configuration Options">
-            <f:entry field="srm_sast_build_command" title="Coverity Build Command (Optional)">
+        <f:advanced title="Coverity (SAST) Tool Options">
+            <f:entry field="srm_sast_build_command" title="Build Command (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="srm_sast_clean_command" title="Coverity Clean Command (Optional)">
+            <f:entry field="srm_sast_clean_command" title="Clean Command (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="srm_sast_config_path" title="Coverity Config File Path (Optional)">
+            <f:entry field="srm_sast_config_path" title="Config File Path (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="srm_sast_args" title="Coverity Additional Arguments (Optional)">
+            <f:entry field="srm_sast_args" title="Additional Arguments (Optional)">
                 <f:textbox/>
             </f:entry>
-        </f:section>
+        </f:advanced>
 
-        <f:section title="Black Duck (SCA) Tool Configuration Options">
-            <f:entry field="srm_sca_search_depth" title="Detect Search Depth (Optional)">
+        <f:advanced title="Detect (SCA) Tool Options">
+            <f:entry field="srm_sca_search_depth" title="Search Depth (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="srm_sca_config_path" title="Detect Config File Path (Optional)">
+            <f:entry field="srm_sca_config_path" title="Config File Path (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="srm_sca_args" title="Detect Additional Arguments (Optional)">
+            <f:entry field="srm_sca_args" title="Additional Arguments (Optional)">
                 <f:textbox/>
             </f:entry>
-        </f:section>
+        </f:advanced>
     </div>
 
-    <f:section title="Additional Options">
-        <f:entry field="include_diagnostics" title="Include Diagnostics (Optional)">
-            <f:checkbox checked="${instance.isInclude_diagnostics() == true}"/>
-        </f:entry>
-        <f:entry field="network_airgap" title="Network Airgap (Optional)">
-            <f:checkbox checked="${instance.isNetwork_airgap() == true}"/>
-        </f:entry>
-        <f:entry field="mark_build_status" title="Mark Build Status (Optional)">
-            <f:select/>
-        </f:entry>
-    </f:section>
+    <div id="bridge_cli_sec" style="display: none">
+        <f:advanced title="Bridge CLI Options">
+            <f:entry field="network_airgap" title="Network Airgap (Optional)">
+                <f:checkbox checked="${instance.isNetwork_airgap() == true}"/>
+            </f:entry>
+        </f:advanced>
+    </div>
 
     <style>
         .error-margin {
             margin-top: 4px;
         }
+
+        /* Styling for the checkbox entry */
+        .sarif-checkbox {
+        display: block;
+        margin-bottom: 25px; /* Space below the checkbox entry */
+        }
+
+        /* Style for the nested div to be indented */
+        #polaris_sarif_params,
+        #blackducksca_sarif_params,
+        #source_upload {
+        margin-left: 10px;
+        border-left: 2.23px solid #C3CCD1;
+        padding-left: 10px;
+        }
+
+        /* Style for entries within the nested div */
+        #polaris_sarif_params .f\:entry,
+        #blackducksca_sarif_params .f\:entry {
+        margin-bottom: 10px; /* Space below each entry */
+        }
+
+        .advancedButton {
+        font-size: 17px;    /* Increases the font size */
+        }
     </style>
 
     <script type="text/javascript">
@@ -278,13 +343,20 @@
 
         if (selectedOption &amp;&amp; selectedOption !== 'select') {
             document.getElementById(selectedOption).style.display = 'block';
+            document.getElementById('bridge_cli_sec').style.display = 'block';
+
             validateProductField();
             validateCoverityFields();
             validatePolarisFields();
             validateSrmFields();
-
-            if (selectedOption === 'polaris' &amp;&amp; polarisAssessmentModeOption === 'SOURCE_UPLOAD') {
-                showParticularDiv(sourceUploadDiv);
+            if (selectedOption === 'polaris') {
+                toggleSarifParamsDivs();
+                if(polarisAssessmentModeOption === 'SOURCE_UPLOAD'){
+                    showParticularDiv(sourceUploadDiv);
+                }
+            }else if(selectedOption === 'blackducksca') {
+                toggleSarifParamsDivs();
+                handleSarifReportSectionVisibility();
             }
         }
 
@@ -302,32 +374,23 @@
 
         function clearInputFields(div) {
             if (div) {
-                var inputFields = div.querySelectorAll('input[type="text"], input[type="checkbox"]');
+                var inputFields = div.querySelectorAll('input[type="text"], input[type="checkbox"], select');
                 inputFields.forEach(function (field) {
-                    if (field.type === 'text') {
+                    if (field.type === 'text' || field.tagName.toLowerCase() === 'select') {
                         field.value = '';
                     } else if (field.type === 'checkbox') {
-                        if (field.name !== "_.srm_waitForScan" &amp;&amp; field.name !== "_.polaris_waitForScan" &amp;&amp; field.name !== "_.blackduck_waitForScan" &amp;&amp; field.name !== "_.coverity_waitForScan" &amp;&amp; field.name !== "_.polaris_reports_sarif_groupSCAIssues" &amp;&amp; field.name !== "_.blackduck_reports_sarif_groupSCAIssues") {
+                        if (field.name !== "_.srm_waitForScan" &amp;&amp; field.name !== "_.polaris_waitForScan" &amp;&amp; field.name !== "_.blackducksca_waitForScan" &amp;&amp; field.name !== "_.coverity_waitForScan" &amp;&amp; field.name !== "_.polaris_reports_sarif_groupSCAIssues" &amp;&amp; field.name !== "_.blackducksca_reports_sarif_groupSCAIssues") {
                             field.checked = false;
                         }
                     }
                 });
-                // clears polaris assessment mode dropdown value
-                var selectedOption = document.querySelector('select[name="_.product"]')?.value;
-                if (selectedOption !== 'polaris') {
-                    var polarisAssessmentModeOption = document.querySelector('select[name="_.polaris_assessment_mode"]');
-                    if (polarisAssessmentModeOption) {
-                        polarisAssessmentModeOption.value = ""
-                    }
-                }
             }
         }
 
-
         document.addEventListener('change', function () {
             var selectedOption = document.querySelector('select[name="_.product"]')?.value;
             var polarisAssessmentModeOption = document.querySelector('select[name="_.polaris_assessment_mode"]')?.value;
-
+            var bridgeCliSecDiv = document.getElementById('bridge_cli_sec');
             var blackduckscaDiv = document.getElementById('blackducksca');
             var coverityDiv = document.getElementById('coverity');
             var polarisDiv = document.getElementById('polaris');
@@ -352,6 +415,9 @@
                 hideParticularDiv(srmDiv);
                 showParticularDiv(blackduckscaDiv);
                 validateProductField();
+                toggleSarifParamsDivs();
+                handleSarifReportSectionVisibility();
+                showParticularDiv(bridgeCliSecDiv);
             } else if (selectedOption === 'coverity') {
                 clearInputFields(blackduckscaDiv);
                 hideParticularDiv(blackduckscaDiv);
@@ -362,6 +428,7 @@
                 showParticularDiv(coverityDiv);
                 validateProductField();
                 validateCoverityFields();
+                showParticularDiv(bridgeCliSecDiv);
             } else if (selectedOption === 'polaris') {
                 clearInputFields(blackduckscaDiv);
                 hideParticularDiv(blackduckscaDiv);
@@ -372,6 +439,9 @@
                 showParticularDiv(polarisDiv);
                 validateProductField();
                 validatePolarisFields();
+                toggleSarifParamsDivs();
+                handleSarifReportSectionVisibility();
+                showParticularDiv(bridgeCliSecDiv);
             } else if (selectedOption === 'srm') {
                 clearInputFields(blackduckscaDiv);
                 hideParticularDiv(blackduckscaDiv);
@@ -382,6 +452,7 @@
                 showParticularDiv(srmDiv);
                 validateProductField();
                 validateSrmFields();
+                showParticularDiv(bridgeCliSecDiv);
             } else if (selectedOption === 'select') {
                 clearInputFields(blackduckscaDiv);
                 clearInputFields(coverityDiv);
@@ -391,6 +462,7 @@
                 hideParticularDiv(coverityDiv);
                 hideParticularDiv(polarisDiv);
                 hideParticularDiv(srmDiv);
+                hideParticularDiv(bridgeCliSecDiv);
                 validateProductField();
             }
 
@@ -484,6 +556,53 @@
             }
         }
 
+        function toggleSarifParamsDivs() {
+            var blackduckCheckbox = document.querySelector('input[name="_.blackducksca_reports_sarif_create"]')
+            var polarisCheckbox = document.querySelector('input[name="_.polaris_reports_sarif_create"]')
+
+            var blackduckSarifParamSection = document.getElementById('blackducksca_sarif_params')
+            var polarisSarifParamSection = document.getElementById('polaris_sarif_params')
+
+            if (polarisCheckbox.checked) {
+                polarisSarifParamSection.style.display = 'block';
+            } else {
+                polarisSarifParamSection.style.display = 'none';
+                clearInputFields(polarisSarifParamSection);
+            }
+
+            if (blackduckCheckbox.checked) {
+                blackduckSarifParamSection.style.display = 'block';
+            } else {
+                blackduckSarifParamSection.style.display = 'none';
+                clearInputFields(blackduckSarifParamSection);
+            }
+        }
+
+        function handleSarifReportSectionVisibility() {
+            var selectedOption = document.querySelector('select[name="_.product"]')?.value;
+            var blackduckscaWaitForScanEnabled = document.querySelector('input[name="_.blackducksca_waitForScan"]').checked;
+            var polarisWaitForScanEnabled = document.querySelector('input[name="_.polaris_waitForScan"]').checked;
+
+            if (selectedOption === 'blackducksca'){
+                var blackduckSACSarif_section = document.getElementById('blackducksca_sarif_report_sec');
+                if(blackduckscaWaitForScanEnabled == false){
+                    hideParticularDiv(blackduckSACSarif_section);
+                    clearInputFields(blackduckSACSarif_section);
+                }else if(blackduckscaWaitForScanEnabled == true){
+                    showParticularDiv(blackduckSACSarif_section);
+                }
+            }else if (selectedOption === 'polaris'){
+                var polarisSarif_section = document.getElementById('polaris_sarif_report_sec');
+                if(polarisWaitForScanEnabled == false){
+                    hideParticularDiv(polarisSarif_section);
+                    clearInputFields(polarisSarif_section);
+                }else if(polarisWaitForScanEnabled == true){
+                    showParticularDiv(polarisSarif_section);
+                }
+            }
+
+        }
+
     </script>
 
 </j:jelly>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-include_diagnostics.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-blackducksca_include_diagnostics.html
similarity index 100%
rename from src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-include_diagnostics.html
rename to src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-blackducksca_include_diagnostics.html
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-mark_build_status.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-blackducksca_mark_build_status.html
similarity index 100%
rename from src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-mark_build_status.html
rename to src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-blackducksca_mark_build_status.html
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-include_diagnostics.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-coverity_include_diagnostics.html
similarity index 100%
rename from src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-include_diagnostics.html
rename to src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-coverity_include_diagnostics.html
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-coverity_local.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-coverity_local.html
index 3ebf41c1..09d11080 100644
--- a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-coverity_local.html
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-coverity_local.html
@@ -1,3 +1,3 @@
 <div>
-    Coverity Local Analysis. Supported values: <code>true</code> or <code>false</code>
+    Check this box if you are using Coverity Connect. Defaults to Cloud Native Coverity
 </div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-mark_build_status.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-coverity_mark_build_status.html
similarity index 100%
rename from src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-mark_build_status.html
rename to src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-coverity_mark_build_status.html
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-polaris_include_diagnostics.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-polaris_include_diagnostics.html
new file mode 100644
index 00000000..38b547be
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-polaris_include_diagnostics.html
@@ -0,0 +1,3 @@
+<div>
+    Bridge diagnostics will be uploaded in Jenkins Archive Artifact. Supported values: <code>true</code> or <code>false</code>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-polaris_mark_build_status.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-polaris_mark_build_status.html
new file mode 100644
index 00000000..da8690e5
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-polaris_mark_build_status.html
@@ -0,0 +1,4 @@
+<div>
+    Specify the build status to use if policy violating issues are found. Default value: <code>FAILURE</code>.
+    Supported values: <code>FAILURE</code>, <code>UNSTABLE</code>, <code>SUCCESS</code>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-polaris_triage.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-polaris_triage.html
deleted file mode 100644
index 428e8d00..00000000
--- a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-polaris_triage.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-    Polaris Triage. Supported values: <code>REQUIRED</code> or <code>NOT_REQUIRED</code> or <code>NOT_ENTITLED</code>
-</div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-srm_include_diagnostics.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-srm_include_diagnostics.html
new file mode 100644
index 00000000..38b547be
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-srm_include_diagnostics.html
@@ -0,0 +1,3 @@
+<div>
+    Bridge diagnostics will be uploaded in Jenkins Archive Artifact. Supported values: <code>true</code> or <code>false</code>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-srm_mark_build_status.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-srm_mark_build_status.html
new file mode 100644
index 00000000..da8690e5
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/help-srm_mark_build_status.html
@@ -0,0 +1,4 @@
+<div>
+    Specify the build status to use if policy violating issues are found. Default value: <code>FAILURE</code>.
+    Supported values: <code>FAILURE</code>, <code>UNSTABLE</code>, <code>SUCCESS</code>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/global/ScannerGlobalConfig/config.jelly b/src/main/resources/io/jenkins/plugins/security/scan/extension/global/ScannerGlobalConfig/config.jelly
index fef80636..c771bfdd 100644
--- a/src/main/resources/io/jenkins/plugins/security/scan/extension/global/ScannerGlobalConfig/config.jelly
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/global/ScannerGlobalConfig/config.jelly
@@ -102,17 +102,42 @@
         </div>
 
         <div>
-            <f:entry field="bitbucketCredentialsId" title="Bitbucket Token / Username and App Password (Optional)">
-                <c:select/>
-            </f:entry>
+            <!-- Place a single info line above the tabs -->
+            <div class="tab-info-os">Configure Source Code Management Token</div>
+
+            <!-- Tab Container -->
+            <div class="tab-container-box">
+                <!-- Mac Tab -->
+                <div class="scm-token-tab-box" onclick="showScmToken('bitbucket-section')">BitBucket</div>
+                <!-- Linux Tab -->
+                <div class="scm-token-tab-box" onclick="showScmToken('github-section')">Github</div>
+                <!-- Windows Tab -->
+                <div class="scm-token-tab-box" onclick="showScmToken('gitlab-section')">Gitlab</div>
+
+            </div>
+
+            <!-- Bitbucket Token Configuration -->
+            <div class="scm-token-section" id="bitbucket-section" style="display: none;">
+                <f:entry field="bitbucketCredentialsId" title="Bitbucket Token / Username and App Password (Optional)">
+                    <c:select/>
+                </f:entry>
+            </div>
+
+            <!-- Github Token Configuration -->
+            <div class="scm-token-section" id="github-section" style="display: none;">
+                <f:entry field="githubCredentialsId" title="GitHub Token (Optional)">
+                    <c:select/>
+                </f:entry>
+            </div>
+
+            <!-- gitlab Token Configuration -->
+            <div class="scm-token-section" id="gitlab-section" style="display: none;">
+                <f:entry field="gitlabCredentialsId" title="GitLab Token (Optional)">
+                    <c:select/>
+                </f:entry>
+            </div>
 
-            <f:entry field="githubCredentialsId" title="GitHub Token (Optional)">
-                <c:select/>
-            </f:entry>
 
-            <f:entry field="gitlabCredentialsId" title="GitLab Token (Optional)">
-                <c:select/>
-            </f:entry>
 
             <!-- Place a single info line above the tabs -->
             <div class="tab-info-os">Configure Bridge CLI download URL for different platforms</div>
@@ -164,7 +189,7 @@
         margin-bottom: 10px;
         }
 
-        .scan-tab-box, .os-tab-box {
+        .scan-tab-box, .os-tab-box, .scm-token-tab-box {
         cursor: pointer;
         padding: 10px;
         border: 1px solid #ccc;
@@ -278,6 +303,31 @@
             }
         }
 
+        function showScmToken(sectionId) {
+            // Hide all sections
+            var sections = document.querySelectorAll('.scm-token-section');
+            sections.forEach(function (section) {
+                section.style.display = 'none';
+            });
+
+            // Show the selected section
+            var scanTypeSection = document.getElementById(sectionId);
+            if (scanTypeSection) {
+                scanTypeSection.style.display = "block";
+            }
+
+            // Highlight the selected tab
+            var tabs = document.querySelectorAll('.scm-token-tab-box');
+            tabs.forEach(function (tab) {
+                tab.style.backgroundColor = '';
+            });
+
+            var selectedTab = document.querySelector('.tab-container-box [onclick*="' + sectionId + '"]');
+            if (selectedTab) {
+                selectedTab.style.backgroundColor = '#f1f1f1';
+            }
+        }
+
         // Function to clear all input fields except those with a specific class
         function clearAllTabFieldsAndTestConnectionMessages(sectionId) {
             // Clear tab fields
@@ -311,6 +361,10 @@
             let bridgeCliDownloadUrlForLinux = document.querySelector("input[name='bridgeDownloadUrlForLinux']").value;
             let bridgeCliDownloadUrlForMac = document.querySelector("input[name='bridgeDownloadUrlForMac']").value;
 
+            let bitbucketCredentialsId = document.querySelector("select[name='_.bitbucketCredentialsId']").value;
+            let githubCredentialsId = document.querySelector("select[name='_.githubCredentialsId']").value;
+            let gitlabCredentialsId = document.querySelector("select[name='_.gitlabCredentialsId']").value;
+
             // Check the values of blackDuckSCAUrl, coverityConnectUrl, and polarisServerUrl
             // and select the appropriate scan type based on their values
             if (blackDuckSCAUrl) {
@@ -335,10 +389,22 @@
             } else if (bridgeCliDownloadUrlForWindows) {
                 showOSType("windows-section");
             } else {
-                console.log("here" )
                 // If none of the URLs have a value, default to MAC
                 showOSType("mac-section");
             }
+
+            // Check the values of bitbucketCredentialsId, githubCredentialsId, and gitlabCredentialsId
+            // and select the appropriate SCM Token tab based on their values
+            if (bitbucketCredentialsId) {
+                showOSType("bitbucket-section");
+            } else if (githubCredentialsId) {
+                showOSType("github-section");
+            } else if (gitlabCredentialsId) {
+                showOSType("gitlab-section");
+            } else {
+                // If none of the URLs have a value, default to bitbucket
+                showOSType("bitbucket-section");
+            }
         }
 
         // Add an event listener to call the checkExistingFieldValues function on page load
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/config.jelly b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/config.jelly
index 6afb2222..3d976fee 100644
--- a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/config.jelly
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/config.jelly
@@ -1,226 +1,306 @@
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
-
     <div id="product">
-        <f:entry field="product" title="Select Security Product">
+        <f:entry field="product" title="Select Product">
             <f:select/>
         </f:entry>
     </div>
 
     <div id="blackducksca" style="display: none;">
-        <f:section title="Black Duck SCA Parameters">
-            <f:entry field="blackducksca_scan_failure_severities" title="Black Duck SCA Scan Failure Severities (Optional)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="detect_download_url" title="Detect Download URL (Optional)">
+        <f:section title="Scan Configuration">
+            <f:entry field="blackducksca_project_directory" title="Project Directory (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="detect_scan_full" title="Detect Full Scan (Optional)">
+            <f:entry field="blackducksca_include_diagnostics" title="Include Diagnostics (Optional)">
                 <f:checkbox/>
             </f:entry>
-            <f:entry field="blackducksca_waitForScan" title="Black Duck SCA Wait For Scan Completion (Optional)">
-                <f:checkbox/>
+            <f:entry field="blackducksca_mark_build_status" title="Mark Build Status (Optional)">
+                <f:select/>
             </f:entry>
-            <f:entry field="blackducksca_prComment_enabled" title="Add Comments to Pull Requests (Optional)">
+            <f:entry field="blackducksca_waitForScan" title="Wait For Scan Completion (Optional)">
                 <f:checkbox/>
             </f:entry>
-            <f:entry field="blackducksca_project_directory" title="Project Directory (Optional)">
-                <f:textbox/>
-            </f:entry>
         </f:section>
 
-        <f:section title="SARIF Report Options">
-            <f:entry field="blackducksca_reports_sarif_create" title="Generate SARIF Report for Black Duck SCA Issues (Optional)">
-                <f:checkbox/>
-            </f:entry>
-            <f:entry field="blackducksca_reports_sarif_groupSCAIssues" title="Group SCA Issues by Component (Optional)">
+        <f:advanced title="Scan Options">
+            <f:entry field="detect_scan_full" title="Full Scan (Optional)">
                 <f:checkbox/>
             </f:entry>
-            <f:entry field="blackducksca_reports_sarif_file_path" title="Black Duck SCA SARIF Report File Path (Optional)">
+            <f:entry field="blackducksca_scan_failure_severities" title="Scan Failure Severities (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="blackducksca_reports_sarif_severities" title="Black Duck SCA SARIF Report Severities (Optional)">
+            <f:entry field="detect_download_url" title="Detect Download URL (Optional)">
                 <f:textbox/>
             </f:entry>
-        </f:section>
+        </f:advanced>
+
+        <div id="blackducksca_pr_comment_sec">
+            <f:advanced title="Pull Request Comment Options">
+                <f:entry field="blackducksca_prComment_enabled" title="Add Comments to Pull Requests (Optional)">
+                    <f:checkbox/>
+                </f:entry>
+            </f:advanced>
+        </div>
+
+        <div id="blackducksca_sarif_report_sec">
+            <f:advanced title="SARIF Report Options">
+                <f:entry field="blackducksca_reports_sarif_create" title="Generate SARIF Report(Optional)">
+                    <f:checkbox/>
+                </f:entry>
+                <div id="blackducksca_sarif_params">
+                    <f:entry field="blackducksca_reports_sarif_groupSCAIssues" title="Group SCA Issues by Component (Optional)">
+                        <f:checkbox default="true"/>
+                    </f:entry>
+                    <f:entry field="blackducksca_reports_sarif_file_path" title="SARIF Report File Path (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                    <f:entry field="blackducksca_reports_sarif_severities" title="SARIF Report Severities (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                </div>
+            </f:advanced>
+        </div>
     </div>
 
     <div id="coverity" style="display: none;">
-        <f:section title="Coverity Parameters">
-            <f:entry field="coverity_project_name" title="Coverity Project Name">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="coverity_stream_name" title="Coverity Stream Name">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="coverity_policy_view" title="Coverity Policy View (Optional)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="coverity_version" title="Coverity Version Number (Optional)">
+        <f:section title="Scan Configuration">
+            <f:entry field="coverity_project_directory" title="Project Directory (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="coverity_waitForScan" title="Coverity Wait For Scan Completion (Optional)">
+            <f:entry field="coverity_local" title="Using Coverity Connect? (Optional)">
                 <f:checkbox/>
             </f:entry>
-            <f:entry field="coverity_prComment_enabled" title="Add Comments to Pull Requests (Optional)">
+            <f:entry field="coverity_include_diagnostics" title="Include Diagnostics (Optional)">
                 <f:checkbox/>
             </f:entry>
-            <f:entry field="coverity_local" title="Coverity Local Analysis (Optional)">
-                <f:checkbox/>
+            <f:entry field="coverity_mark_build_status" title="Mark Build Status (Optional)">
+                <f:select/>
             </f:entry>
-            <f:entry field="coverity_project_directory" title="Project Directory (Optional)">
-                <f:textbox/>
+            <f:entry field="coverity_waitForScan" title="Wait For Scan Completion (Optional)">
+                <f:checkbox/>
             </f:entry>
         </f:section>
-    </div>
 
-    <div id="polaris" style="display: none;">
-        <f:section title="Polaris Parameters">
-            <f:entry field="polaris_application_name" title="Polaris Application Name (Optional)">
+        <f:advanced title="Scan Options">
+            <f:entry field="coverity_project_name" title="Coverity Project">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="polaris_project_name" title="Polaris Project Name (Optional)">
+            <f:entry field="coverity_stream_name" title="Coverity Stream">
+                <f:textbox/>
+            </f:entry>
+            <f:entry field="coverity_policy_view" title="Coverity Policy View (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="polaris_assessment_types" title="Polaris Assessment Types (Mandatory)">
+            <f:entry field="coverity_version" title="Coverity Version (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="polaris_branch_name" title="Polaris Branch Name (Optional)">
+        </f:advanced>
+
+        <div id="coverity_pr_comment_sec">
+            <f:advanced title="Pull Request Comment Options">
+                <f:entry field="coverity_prComment_enabled" title="Add Comments to Pull Requests (Optional)">
+                    <f:checkbox/>
+                </f:entry>
+            </f:advanced>
+        </div>
+    </div>
+
+    <div id="polaris" style="display: none;">
+        <f:section title="Scan Configuration">
+            <f:entry field="polaris_assessment_types" title="Assessment Types (Mandatory)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="polaris_branch_parent_name" title="Polaris Parent Branch Name (Optional)">
+            <f:entry field="polaris_test_sca_type" title="SCA Test Type (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="polaris_waitForScan" title="Polaris Wait For Scan Completion (Optional)">
-                <f:checkbox/>
+            <f:entry field="polaris_project_directory" title="Project Directory (Optional)">
+                <f:textbox/>
             </f:entry>
-            <f:entry field="polaris_prComment_enabled" title="Add Comments to Pull Requests (Optional)">
+            <f:entry field="polaris_include_diagnostics" title="Include Diagnostics (Optional)">
                 <f:checkbox/>
             </f:entry>
-            <f:entry field="polaris_prComment_severities" title="Polaris PR Comment Severities (Optional)">
-                <f:textbox/>
+            <f:entry field="polaris_mark_build_status" title="Mark Build Status (Optional)">
+                <f:select/>
             </f:entry>
-            <f:entry field="polaris_triage" title="Polaris Triage (Optional)">
+            <f:entry field="polaris_waitForScan" title="Wait For Scan Completion (Optional)">
+                <f:checkbox/>
+            </f:entry>
+        </f:section>
+
+        <f:advanced title="Scan Options">
+            <f:entry field="polaris_application_name" title="Application Name (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="polaris_test_sca_type" title="Polaris Test SCA Type (Optional)">
+            <f:entry field="polaris_project_name" title="Polaris Project (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="polaris_project_directory" title="Project Directory (Optional)">
+            <f:entry field="polaris_branch_name" title="Polaris Branch (Optional)">
                 <f:textbox/>
             </f:entry>
-        </f:section>
+            <div id="polaris_assessment_mode">
+                <f:entry field="polaris_assessment_mode" title="Assessment Mode (Optional)">
+                    <f:select/>
+                </f:entry>
+            </div>
 
-        <div id="polaris_assessment_mode">
-            <f:entry field="polaris_assessment_mode" title="Polaris Assessment Mode (Optional)">
-                <f:select/>
-            </f:entry>
-        </div>
+            <div id="source_upload" style="display: none;">
+                <f:section title="Source Code Upload Options">
+                    <f:entry field="project_source_archive" title="Upload Archive Instead Of Project Directory (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                    <f:entry field="project_source_excludes" title="Project Source Excludes (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                    <f:entry field="project_source_preserveSymLinks" title="Project Source Preserve Sym Links (Optional)">
+                        <f:checkbox/>
+                    </f:entry>
+                </f:section>
+            </div>
+        </f:advanced>
 
-        <div id="source_upload" style="display: none;">
-            <f:section title="Source Code Upload Options">
-                <f:entry field="project_source_archive" title="Upload Archive Instead Of Project Directory (Optional)">
-                    <f:textbox/>
-                </f:entry>
-                <f:entry field="project_source_excludes" title="Project Source Excludes (Optional)">
-                    <f:textbox/>
+
+        <div id="polaris_pr_comment_sec">
+            <f:advanced title="Pull Request Comment Options">
+                <f:entry field="polaris_prComment_enabled" title="Add Comments to Pull Requests (Optional)">
+                    <f:checkbox/>
                 </f:entry>
-                <f:entry field="project_source_preserveSymLinks" title="Project Source Preserve Sym Links (Optional)">
+                <div id="polaris_pr_comment_params">
+                    <f:entry field="polaris_prComment_severities" title="PR Comment Severities (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                    <f:entry field="polaris_branch_parent_name" title="Parent Branch Name (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                </div>
+            </f:advanced>
+        </div>
+
+        <div id="polaris_sarif_report_sec">
+            <f:advanced title="SARIF Report Options">
+                <f:entry field="polaris_reports_sarif_create" title="Generate SARIF Report(Optional)">
                     <f:checkbox/>
                 </f:entry>
-            </f:section>
+                <div id="polaris_sarif_params">
+                    <f:entry field="polaris_reports_sarif_groupSCAIssues" title="Group SCA Issues by Component (Optional)">
+                        <f:checkbox default="true"/>
+                    </f:entry>
+                    <f:entry field="polaris_reports_sarif_file_path" title="Polaris SARIF Report File Path (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                    <f:entry field="polaris_reports_sarif_issue_types" title="Polaris SARIF Report Issue Types (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                    <f:entry field="polaris_reports_sarif_severities" title="Polaris SARIF Report Severities (Optional)">
+                        <f:textbox/>
+                    </f:entry>
+                </div>
+            </f:advanced>
         </div>
+    </div>
 
-        <f:section title="SARIF Report Options">
-            <f:entry field="polaris_reports_sarif_create" title="Generate SARIF Report for Polaris Issues (Optional)">
-                <f:checkbox/>
-            </f:entry>
-            <f:entry field="polaris_reports_sarif_groupSCAIssues" title="Group SCA Issues by Component (Optional)">
-                <f:checkbox/>
-            </f:entry>
-            <f:entry field="polaris_reports_sarif_file_path" title="Polaris SARIF Report File Path (Optional)">
+    <div id="srm" style="display: none;">
+        <f:section title="Scan Configuration">
+            <f:entry field="srm_assessment_types" title="Assessment Types (Mandatory)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="polaris_reports_sarif_issue_types" title="Polaris SARIF Report Issue Types (Optional)">
+            <f:entry field="srm_project_directory" title="Project Directory (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="polaris_reports_sarif_severities" title="Polaris SARIF Report Severities (Optional)">
-                <f:textbox/>
+            <f:entry field="srm_include_diagnostics" title="Include Diagnostics (Optional)">
+                <f:checkbox/>
+            </f:entry>
+            <f:entry field="srm_mark_build_status" title="Mark Build Status (Optional)">
+                <f:select/>
+            </f:entry>
+            <f:entry field="srm_waitForScan" title="Wait For Scan Completion (Optional)">
+                <f:checkbox/>
             </f:entry>
         </f:section>
-    </div>
 
-    <div id="srm" style="display: none;">
-        <f:section title="SRM Parameters">
-            <f:entry field="srm_assessment_types" title="SRM Assessment Types (Mandatory)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="srm_project_name" title="SRM Project Name">
+        <f:advanced title="Scan Options">
+            <f:entry field="srm_project_name" title="Project Name">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="srm_project_id" title="SRM Project Id (Optional)">
+            <f:entry field="srm_project_id" title="Project ID (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="srm_branch_name" title="SRM Branch Name (Optional)">
+            <f:entry field="srm_branch_name" title="Branch Name (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="srm_branch_parent" title="SRM Parent Branch Name (Optional)">
+            <f:entry field="srm_branch_parent" title="Parent Branch Name (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="srm_waitForScan" title="SRM Wait For Scan Completion (Optional)">
-                <f:checkbox/>
-            </f:entry>
-            <f:entry field="srm_project_directory" title="Project Directory (Optional)">
-                <f:textbox/>
-            </f:entry>
-        </f:section>
+        </f:advanced>
     </div>
 
-    <div id="coverity-tool-configuration" style="display: none;">
-        <f:section title="Coverity (SAST) Tool Configuration Options">
-            <f:entry field="coverity_build_command" title="Coverity Build Command (Optional)">
-                <f:textbox/>
-            </f:entry>
-            <f:entry field="coverity_clean_command" title="Coverity Clean Command (Optional)">
+    <div id="blackducksca-tool-configuration" style="display: none;">
+        <f:advanced title="Detect (SCA) Tool Options">
+            <f:entry field="detect_search_depth" title="Search Depth (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="coverity_config_path" title="Coverity Config File Path (Optional)">
+            <f:entry field="detect_config_path" title="Config File Path (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="coverity_args" title="Coverity Additional Arguments (Optional)">
+            <f:entry field="detect_args" title="Additional Arguments (Optional)">
                 <f:textbox/>
             </f:entry>
-        </f:section>
+        </f:advanced>
     </div>
 
-    <div id="blackducksca-tool-configuration" style="display: none;">
-        <f:section title="Black Duck (SCA) Tool Configuration Options">
-            <f:entry field="detect_search_depth" title="Detect Search Depth (Optional)">
+    <div id="coverity-tool-configuration" style="display: none;">
+        <f:advanced title="Coverity (SAST) Tool Options">
+            <f:entry field="coverity_build_command" title="Build Command (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="detect_config_path" title="Detect Config File Path (Optional)">
+            <f:entry field="coverity_clean_command" title="Clean Command (Optional)">
                 <f:textbox/>
             </f:entry>
-            <f:entry field="detect_args" title="Detect Additional Arguments (Optional)">
+            <f:entry field="coverity_config_path" title="Config File Path (Optional)">
                 <f:textbox/>
             </f:entry>
-        </f:section>
+            <f:entry field="coverity_args" title="Additional Arguments (Optional)">
+                <f:textbox/>
+            </f:entry>
+        </f:advanced>
     </div>
 
-    <f:section title="Additional Options">
-        <f:entry field="include_diagnostics" title="Include Diagnostics (Optional)">
-            <f:checkbox/>
-        </f:entry>
+<div id="bridge_cli_sec" style="display: none">
+    <f:advanced title="Bridge CLI Options">
         <f:entry field="network_airgap" title="Network Airgap (Optional)">
             <f:checkbox/>
         </f:entry>
-        <f:entry field="mark_build_status" title="Mark Build Status (Optional)">
-            <f:select/>
-        </f:entry>
-<!--        <f:entry field="return_status" title="Return Status Code (Optional)">-->
-<!--            <f:checkbox/>-->
-<!--        </f:entry>-->
-    </f:section>
+        <!--        <f:entry field="return_status" title="Return Status Code (Optional)">-->
+        <!--            <f:checkbox/>-->
+        <!--        </f:entry>-->
+    </f:advanced>
+</div>
+
+    <style>
+        /* Styling for the checkbox entry */
+        .sarif-checkbox {
+        display: block;
+        margin-bottom: 25px; /* Space below the checkbox entry */
+        }
+
+        /* Style for the nested div to be indented */
+        #polaris_sarif_params,
+        #blackducksca_sarif_params,
+        #source_upload {
+            margin-left: 10px;
+            border-left: 2.23px solid #C3CCD1;
+            padding-left: 10px;
+        }
+
+        .advancedButton {
+            font-size: 17px;    /* Increases the font size */
+        }
+
+        /* Style for entries within the nested div */
+        #polaris_sarif_params .f\:entry,
+        #blackducksca_sarif_params .f\:entry {
+            margin-bottom: 10px; /* Space below each entry */
+        }
+    </style>
 
     <script type="text/javascript">
         var securityProduct = document.querySelector('select[name="_.product"]');
@@ -230,8 +310,10 @@
         var srmDiv = document.getElementById('srm');
         var blackduckscaToolConfigDiv = document.getElementById('blackducksca-tool-configuration');
         var coverityToolConfigDiv = document.getElementById('coverity-tool-configuration');
+        var bridgeCliSecDiv = document.getElementById('bridge_cli_sec');
 
         function hideAllDivs() {
+            bridgeCliSecDiv.style.display = 'none';
             blackduckscaDiv.style.display = 'none';
             coverityDiv.style.display = 'none';
             polarisDiv.style.display = 'none';
@@ -256,29 +338,21 @@
         }
 
         function hideParticularDiv(div) {
-            if(div) {
+            if (div) {
                 div.style.display = 'none';
             }
         }
 
         function clearInputFields(div) {
             if (div) {
-                var inputFields = div.querySelectorAll('input[type="text"], input[type="checkbox"]');
-                inputFields.forEach(function (field) {
-                    if (field.type === 'text') {
+                var inputFields = div.querySelectorAll('input[type="text"], input[type="checkbox"], select');
+                inputFields.forEach(function(field) {
+                    if (field.type === 'text' || field.tagName.toLowerCase() === 'select') {
                         field.value = '';
                     } else if (field.type === 'checkbox') {
                         field.checked = false;
                     }
                 });
-                // clears polaris assessment mode dropdown value
-                var selectedOption = document.querySelector('select[name="_.product"]')?.value;
-                if(selectedOption !== 'polaris') {
-                    var polarisAssessmentModeOption = document.querySelector('select[name="_.polaris_assessment_mode"]');
-                    if(polarisAssessmentModeOption) {
-                        polarisAssessmentModeOption.value = ""
-                    }
-                }
             }
         }
 
@@ -287,11 +361,12 @@
                 var checkbox = document.getElementsByName(name);
                 if (checkbox &amp;&amp; checkbox.length > 0) {
                     checkbox[0].checked = true;
+
                 }
             });
         }
 
-        securityProduct.addEventListener('change', function () {
+        securityProduct.addEventListener('change', function() {
             var selectedOption = securityProduct.value;
             clearAllFields();
             if (selectedOption == 'blackducksca') {
@@ -301,6 +376,7 @@
                 showParticularDiv(blackduckscaDiv);
                 hideParticularDiv(coverityToolConfigDiv);
                 showParticularDiv(blackduckscaToolConfigDiv);
+                showParticularDiv(bridgeCliSecDiv);
                 setCheckboxToDefaultTrue(['_.blackducksca_reports_sarif_groupSCAIssues', '_.blackducksca_waitForScan']);
             } else if (selectedOption == 'coverity') {
                 hideParticularDiv(blackduckscaDiv);
@@ -309,6 +385,7 @@
                 showParticularDiv(coverityDiv);
                 hideParticularDiv(blackduckscaToolConfigDiv);
                 showParticularDiv(coverityToolConfigDiv);
+                showParticularDiv(bridgeCliSecDiv);
                 setCheckboxToDefaultTrue(['_.coverity_waitForScan']);
             } else if (selectedOption == 'polaris') {
                 hideParticularDiv(blackduckscaDiv);
@@ -317,6 +394,7 @@
                 showParticularDiv(polarisDiv);
                 showParticularDiv(blackduckscaToolConfigDiv);
                 showParticularDiv(coverityToolConfigDiv);
+                showParticularDiv(bridgeCliSecDiv);
                 setCheckboxToDefaultTrue(['_.polaris_reports_sarif_groupSCAIssues', '_.polaris_waitForScan']);
             } else if (selectedOption == 'srm') {
                 hideParticularDiv(blackduckscaDiv);
@@ -325,26 +403,111 @@
                 showParticularDiv(srmDiv);
                 showParticularDiv(blackduckscaToolConfigDiv);
                 showParticularDiv(coverityToolConfigDiv);
+                showParticularDiv(bridgeCliSecDiv);
                 setCheckboxToDefaultTrue(['_.srm_waitForScan']);
             } else if (selectedOption == '') {
                 hideAllDivs();
             }
         });
 
-        document.addEventListener('change', function () {
+        document.addEventListener('change', function() {
             var polarisAssessmentModeOption = document.querySelector('select[name="_.polaris_assessment_mode"]')?.value;
             var sourceUploadDiv = document.getElementById('source_upload');
 
-            if(polarisAssessmentModeOption === 'SOURCE_UPLOAD') {
+            if (polarisAssessmentModeOption === 'SOURCE_UPLOAD') {
                 showParticularDiv(sourceUploadDiv);
             }
 
-            if(polarisAssessmentModeOption === 'CI' || polarisAssessmentModeOption === '') {
+            if (polarisAssessmentModeOption === 'CI' || polarisAssessmentModeOption === '') {
                 clearInputFields(sourceUploadDiv);
                 hideParticularDiv(sourceUploadDiv);
             }
+
+            toggleSarifParamsDivs();
+            togglePrCommentDivs();
+            handlePostMergeWorkflowSectionsVisibility();
         });
 
-    </script>
+        function toggleSarifParamsDivs() {
+            var selectedOption = securityProduct.value;
+            if (selectedOption == "blackducksca") {
+                var blackduckCheckbox = document.querySelector('input[name="_.blackducksca_reports_sarif_create"]')
+                var blackduckSarifParamSection = document.getElementById('blackducksca_sarif_params')
+                if (blackduckCheckbox.checked) {
+                    blackduckSarifParamSection.style.display = 'block';
+                } else {
+                    blackduckSarifParamSection.style.display = 'none';
+                    clearInputFields(blackduckSarifParamSection);
+                }
+            } else if (selectedOption == "polaris") {
+                var polarisCheckbox = document.querySelector('input[name="_.polaris_reports_sarif_create"]')
+                var polarisSarifParamSection = document.getElementById('polaris_sarif_params')
+
+                if (polarisCheckbox.checked) {
+                    polarisSarifParamSection.style.display = 'block';
+                } else {
+                    polarisSarifParamSection.style.display = 'none';
+                    clearInputFields(polarisSarifParamSection);
+                }
+            }
 
+        }
+
+        function togglePrCommentDivs() {
+            var selectedOption = securityProduct.value;
+            if (selectedOption == "polaris") {
+                var polarisPrEnabledCheckbox = document.querySelector('input[name="_.polaris_prComment_enabled"]')
+                var polarisPrCommentSection = document.getElementById('polaris_pr_comment_params')
+                if (polarisPrEnabledCheckbox.checked) {
+                    polarisPrCommentSection.style.display = 'block';
+                } else {
+                    polarisPrCommentSection.style.display = 'none';
+                    clearInputFields(polarisPrCommentSection);
+                }
+            }
+
+        }
+
+        function handlePostMergeWorkflowSectionsVisibility() {
+            var selectedOption = securityProduct.value;
+            var blackduckscaWaitForScanEnabled = document.querySelector('input[name="_.blackducksca_waitForScan"]').checked;
+            var polarisWaitForScanEnabled = document.querySelector('input[name="_.polaris_waitForScan"]').checked;
+            var coverityWaitForScanEnabled = document.querySelector('input[name="_.coverity_waitForScan"]').checked;
+
+            if (selectedOption === 'blackducksca') {
+                var blackduckSCASarif_section = document.getElementById('blackducksca_sarif_report_sec');
+                var blackduckSCAPRComment_section = document.getElementById('blackducksca_pr_comment_sec');
+                if (blackduckscaWaitForScanEnabled == false) {
+                    hideParticularDiv(blackduckSCASarif_section);
+                    hideParticularDiv(blackduckSCAPRComment_section);
+                    clearInputFields(blackduckSCASarif_section);
+                    clearInputFields(blackduckSCAPRComment_section);
+                } else if (blackduckscaWaitForScanEnabled == true) {
+                    showParticularDiv(blackduckSCASarif_section);
+                    showParticularDiv(blackduckSCAPRComment_section);
+                }
+            } else if (selectedOption === 'polaris') {
+                var polarisSarif_section = document.getElementById('polaris_sarif_report_sec');
+                var polarisPRComment_section = document.getElementById('polaris_pr_comment_sec');
+                if (polarisWaitForScanEnabled == false) {
+                    hideParticularDiv(polarisSarif_section);
+                    hideParticularDiv(polarisPRComment_section);
+                    clearInputFields(polarisSarif_section);
+                    clearInputFields(polarisPRComment_section);
+                } else if (polarisWaitForScanEnabled == true) {
+                    showParticularDiv(polarisSarif_section);
+                    showParticularDiv(polarisPRComment_section);
+                }
+            } else if (selectedOption === 'coverity') {
+                var coverityPRComment_section = document.getElementById('coverity_pr_comment_sec');
+                if (coverityWaitForScanEnabled == false) {
+                    hideParticularDiv(coverityPRComment_section);
+                    clearInputFields(coverityPRComment_section);
+                } else if (coverityWaitForScanEnabled == true) {
+                    showParticularDiv(coverityPRComment_section);
+                }
+            }
+
+        }
+    </script>
 </j:jelly>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-blackducksca_include_diagnostics.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-blackducksca_include_diagnostics.html
new file mode 100644
index 00000000..38b547be
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-blackducksca_include_diagnostics.html
@@ -0,0 +1,3 @@
+<div>
+    Bridge diagnostics will be uploaded in Jenkins Archive Artifact. Supported values: <code>true</code> or <code>false</code>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-blackducksca_mark_build_status.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-blackducksca_mark_build_status.html
new file mode 100644
index 00000000..da8690e5
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-blackducksca_mark_build_status.html
@@ -0,0 +1,4 @@
+<div>
+    Specify the build status to use if policy violating issues are found. Default value: <code>FAILURE</code>.
+    Supported values: <code>FAILURE</code>, <code>UNSTABLE</code>, <code>SUCCESS</code>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-coverity_include_diagnostics.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-coverity_include_diagnostics.html
new file mode 100644
index 00000000..38b547be
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-coverity_include_diagnostics.html
@@ -0,0 +1,3 @@
+<div>
+    Bridge diagnostics will be uploaded in Jenkins Archive Artifact. Supported values: <code>true</code> or <code>false</code>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-coverity_local.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-coverity_local.html
index 3ebf41c1..09d11080 100644
--- a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-coverity_local.html
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-coverity_local.html
@@ -1,3 +1,3 @@
 <div>
-    Coverity Local Analysis. Supported values: <code>true</code> or <code>false</code>
+    Check this box if you are using Coverity Connect. Defaults to Cloud Native Coverity
 </div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-coverity_mark_build_status.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-coverity_mark_build_status.html
new file mode 100644
index 00000000..da8690e5
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-coverity_mark_build_status.html
@@ -0,0 +1,4 @@
+<div>
+    Specify the build status to use if policy violating issues are found. Default value: <code>FAILURE</code>.
+    Supported values: <code>FAILURE</code>, <code>UNSTABLE</code>, <code>SUCCESS</code>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-polaris_include_diagnostics.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-polaris_include_diagnostics.html
new file mode 100644
index 00000000..38b547be
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-polaris_include_diagnostics.html
@@ -0,0 +1,3 @@
+<div>
+    Bridge diagnostics will be uploaded in Jenkins Archive Artifact. Supported values: <code>true</code> or <code>false</code>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-polaris_mark_build_status.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-polaris_mark_build_status.html
new file mode 100644
index 00000000..da8690e5
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-polaris_mark_build_status.html
@@ -0,0 +1,4 @@
+<div>
+    Specify the build status to use if policy violating issues are found. Default value: <code>FAILURE</code>.
+    Supported values: <code>FAILURE</code>, <code>UNSTABLE</code>, <code>SUCCESS</code>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-polaris_triage.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-polaris_triage.html
deleted file mode 100644
index 428e8d00..00000000
--- a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-polaris_triage.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-    Polaris Triage. Supported values: <code>REQUIRED</code> or <code>NOT_REQUIRED</code> or <code>NOT_ENTITLED</code>
-</div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-srm_include_diagnostics.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-srm_include_diagnostics.html
new file mode 100644
index 00000000..38b547be
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-srm_include_diagnostics.html
@@ -0,0 +1,3 @@
+<div>
+    Bridge diagnostics will be uploaded in Jenkins Archive Artifact. Supported values: <code>true</code> or <code>false</code>
+</div>
\ No newline at end of file
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-srm_mark_build_status.html b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-srm_mark_build_status.html
new file mode 100644
index 00000000..da8690e5
--- /dev/null
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/help-srm_mark_build_status.html
@@ -0,0 +1,4 @@
+<div>
+    Specify the build status to use if policy violating issues are found. Default value: <code>FAILURE</code>.
+    Supported values: <code>FAILURE</code>, <code>UNSTABLE</code>, <code>SUCCESS</code>
+</div>
\ No newline at end of file
diff --git a/src/test/java/io/jenkins/plugins/security/scan/service/ParameterMappingServiceTest.java b/src/test/java/io/jenkins/plugins/security/scan/service/ParameterMappingServiceTest.java
index 792fe0d0..ae3b5dff 100644
--- a/src/test/java/io/jenkins/plugins/security/scan/service/ParameterMappingServiceTest.java
+++ b/src/test/java/io/jenkins/plugins/security/scan/service/ParameterMappingServiceTest.java
@@ -292,7 +292,6 @@ public void preparePolarisParametersMapForMultibranchTest() {
         securityScanStep.setPolaris_application_name("fake-application-name");
         securityScanStep.setPolaris_project_name("fake-project-name");
         securityScanStep.setPolaris_assessment_types("SCA");
-        securityScanStep.setPolaris_triage("REQUIRED");
         securityScanStep.setPolaris_branch_name("test");
         securityScanStep.setPolaris_branch_parent_name("master");
         securityScanStep.setPolaris_prComment_enabled(true);
@@ -313,7 +312,6 @@ public void preparePolarisParametersMapForMultibranchTest() {
                 polarisParametersMap.get(ApplicationConstants.POLARIS_SERVER_URL_KEY));
         assertEquals("fake-access-token", polarisParametersMap.get(ApplicationConstants.POLARIS_ACCESS_TOKEN_KEY));
         assertEquals("test", polarisParametersMap.get(ApplicationConstants.POLARIS_BRANCH_NAME_KEY));
-        assertEquals("REQUIRED", polarisParametersMap.get(ApplicationConstants.POLARIS_TRIAGE_KEY));
         assertEquals("master", polarisParametersMap.get(ApplicationConstants.POLARIS_BRANCH_PARENT_NAME_KEY));
         assertEquals(true, polarisParametersMap.get(ApplicationConstants.POLARIS_PRCOMMENT_ENABLED_KEY));
         assertEquals("high, critical", polarisParametersMap.get(ApplicationConstants.POLARIS_PRCOMMENT_SEVERITIES_KEY));
diff --git a/src/test/java/io/jenkins/plugins/security/scan/service/scan/polaris/PolarisParametersServiceTest.java b/src/test/java/io/jenkins/plugins/security/scan/service/scan/polaris/PolarisParametersServiceTest.java
index a9b7d2c1..2ea988bc 100644
--- a/src/test/java/io/jenkins/plugins/security/scan/service/scan/polaris/PolarisParametersServiceTest.java
+++ b/src/test/java/io/jenkins/plugins/security/scan/service/scan/polaris/PolarisParametersServiceTest.java
@@ -84,7 +84,6 @@ void preparePolarisObjectForBridge_inNonPPContextTest() {
         polarisParameters.put(ApplicationConstants.POLARIS_APPLICATION_NAME_KEY, TEST_APPLICATION_NAME);
         polarisParameters.put(ApplicationConstants.POLARIS_PROJECT_NAME_KEY, "fake-project-name");
         polarisParameters.put(ApplicationConstants.POLARIS_ASSESSMENT_TYPES_KEY, "SAST");
-        polarisParameters.put(ApplicationConstants.POLARIS_TRIAGE_KEY, "REQUIRED");
         polarisParameters.put(ApplicationConstants.POLARIS_BRANCH_NAME_KEY, "test-branch");
         polarisParameters.put(ApplicationConstants.POLARIS_BRANCH_PARENT_NAME_KEY, "test-parent-branch");
         polarisParameters.put(ApplicationConstants.POLARIS_PRCOMMENT_ENABLED_KEY, true);
@@ -99,7 +98,6 @@ void preparePolarisObjectForBridge_inNonPPContextTest() {
         assertEquals(polaris.getApplicationName().getName(), TEST_APPLICATION_NAME);
         assertEquals(polaris.getPolarisProject().getName(), "fake-project-name");
         assertEquals(polaris.getAssessmentTypes().getTypes(), List.of("SAST"));
-        assertEquals(polaris.getTriage(), "REQUIRED");
         assertEquals(polaris.getBranch().getName(), "test-branch");
         assertEquals(polaris.getTest().getSca().getType(), "SCA-PACKAGE");
         assertNull(polaris.getBranch().getParent());
@@ -116,7 +114,6 @@ void preparePolarisObjectForBridge_inNonPPContext_withSarifParametersTest() {
         polarisParameters.put(ApplicationConstants.POLARIS_APPLICATION_NAME_KEY, TEST_APPLICATION_NAME);
         polarisParameters.put(ApplicationConstants.POLARIS_PROJECT_NAME_KEY, "fake-project-name");
         polarisParameters.put(ApplicationConstants.POLARIS_ASSESSMENT_TYPES_KEY, "SAST");
-        polarisParameters.put(ApplicationConstants.POLARIS_TRIAGE_KEY, "REQUIRED");
         polarisParameters.put(ApplicationConstants.POLARIS_BRANCH_NAME_KEY, "test-branch");
         polarisParameters.put(ApplicationConstants.POLARIS_BRANCH_PARENT_NAME_KEY, "test-parent-branch");
         polarisParameters.put(ApplicationConstants.POLARIS_PRCOMMENT_ENABLED_KEY, true);
@@ -135,7 +132,6 @@ void preparePolarisObjectForBridge_inNonPPContext_withSarifParametersTest() {
         assertEquals(polaris.getApplicationName().getName(), TEST_APPLICATION_NAME);
         assertEquals(polaris.getPolarisProject().getName(), "fake-project-name");
         assertEquals(polaris.getAssessmentTypes().getTypes(), List.of("SAST"));
-        assertEquals(polaris.getTriage(), "REQUIRED");
         assertEquals(polaris.getBranch().getName(), "test-branch");
         assertEquals(polaris.getTest().getSca().getType(), "SCA-PACKAGE");
         assertNull(polaris.getBranch().getParent());
@@ -159,7 +155,6 @@ void preparePolarisObjectForBridge_inPPContextTest() {
         polarisParameters.put(ApplicationConstants.POLARIS_APPLICATION_NAME_KEY, TEST_APPLICATION_NAME);
         polarisParameters.put(ApplicationConstants.POLARIS_PROJECT_NAME_KEY, "fake-project-name");
         polarisParameters.put(ApplicationConstants.POLARIS_ASSESSMENT_TYPES_KEY, "SAST");
-        polarisParameters.put(ApplicationConstants.POLARIS_TRIAGE_KEY, "REQUIRED");
         polarisParameters.put(ApplicationConstants.POLARIS_BRANCH_NAME_KEY, "test-branch");
         polarisParameters.put(ApplicationConstants.POLARIS_BRANCH_PARENT_NAME_KEY, "test-parent-branch");
         polarisParameters.put(ApplicationConstants.POLARIS_PRCOMMENT_ENABLED_KEY, true);
@@ -176,7 +171,6 @@ void preparePolarisObjectForBridge_inPPContextTest() {
         assertEquals(polaris.getApplicationName().getName(), TEST_APPLICATION_NAME);
         assertEquals(polaris.getPolarisProject().getName(), "fake-project-name");
         assertEquals(polaris.getAssessmentTypes().getTypes(), List.of("SAST"));
-        assertEquals(polaris.getTriage(), "REQUIRED");
         assertEquals(polaris.getBranch().getName(), "test-branch");
         assertEquals(polaris.getBranch().getParent().getName(), "test-parent-branch");
         assertEquals(polaris.getPrcomment().getEnabled(), true);

From 0da86519bcf3b66cade06807eadc7406d1863a5d Mon Sep 17 00:00:00 2001
From: Sadman Anik <sadmana@synopsys.com>
Date: Mon, 14 Oct 2024 23:26:02 +0600
Subject: [PATCH 2/3] New UI changes

---
 .../SecurityScanFreestyle/config.jelly        | 20 ++++++----------
 .../pipeline/SecurityScanStep/config.jelly    | 24 +++++++++----------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/config.jelly b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/config.jelly
index 6385923b..5c5fb302 100644
--- a/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/config.jelly
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/freestyle/SecurityScanFreestyle/config.jelly
@@ -38,7 +38,7 @@
 
         <div id="blackducksca_sarif_report_sec">
             <f:advanced title="SARIF Report Options">
-                <f:entry class="sarif-checkbox" field="blackducksca_reports_sarif_create" title="Generate SARIF Report (Optional)">
+                <f:entry field="blackducksca_reports_sarif_create" title="Generate SARIF Report (Optional)">
                     <f:checkbox checked="${instance.isBlackducksca_reports_sarif_create() == true}"/>
                 </f:entry>
                 <div id="blackducksca_sarif_params">
@@ -184,7 +184,7 @@
 
         <div id="polaris_sarif_report_sec">
             <f:advanced title="SARIF Report Options">
-                <f:entry class="sarif-checkbox" field="polaris_reports_sarif_create" title="Generate SARIF Report(Optional)">
+                <f:entry field="polaris_reports_sarif_create" title="Generate SARIF Report(Optional)">
                     <f:checkbox checked="${instance.isPolaris_reports_sarif_create() == true}"/>
                 </f:entry>
                 <div id="polaris_sarif_params">
@@ -310,29 +310,23 @@
             margin-top: 4px;
         }
 
-        /* Styling for the checkbox entry */
-        .sarif-checkbox {
-        display: block;
-        margin-bottom: 25px; /* Space below the checkbox entry */
-        }
-
         /* Style for the nested div to be indented */
         #polaris_sarif_params,
         #blackducksca_sarif_params,
         #source_upload {
-        margin-left: 10px;
-        border-left: 2.23px solid #C3CCD1;
-        padding-left: 10px;
+            margin-left: 10px;
+            border-left: 2.23px solid #C3CCD1;
+            padding-left: 10px;
         }
 
         /* Style for entries within the nested div */
         #polaris_sarif_params .f\:entry,
         #blackducksca_sarif_params .f\:entry {
-        margin-bottom: 10px; /* Space below each entry */
+            margin-bottom: 10px;
         }
 
         .advancedButton {
-        font-size: 17px;    /* Increases the font size */
+            font-size: 17px;
         }
     </style>
 
diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/config.jelly b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/config.jelly
index 3d976fee..8c3d2d1b 100644
--- a/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/config.jelly
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/pipeline/SecurityScanStep/config.jelly
@@ -49,7 +49,7 @@
                 </f:entry>
                 <div id="blackducksca_sarif_params">
                     <f:entry field="blackducksca_reports_sarif_groupSCAIssues" title="Group SCA Issues by Component (Optional)">
-                        <f:checkbox default="true"/>
+                        <f:checkbox/>
                     </f:entry>
                     <f:entry field="blackducksca_reports_sarif_file_path" title="SARIF Report File Path (Optional)">
                         <f:textbox/>
@@ -182,7 +182,7 @@
                 </f:entry>
                 <div id="polaris_sarif_params">
                     <f:entry field="polaris_reports_sarif_groupSCAIssues" title="Group SCA Issues by Component (Optional)">
-                        <f:checkbox default="true"/>
+                        <f:checkbox/>
                     </f:entry>
                     <f:entry field="polaris_reports_sarif_file_path" title="Polaris SARIF Report File Path (Optional)">
                         <f:textbox/>
@@ -276,12 +276,6 @@
 </div>
 
     <style>
-        /* Styling for the checkbox entry */
-        .sarif-checkbox {
-        display: block;
-        margin-bottom: 25px; /* Space below the checkbox entry */
-        }
-
         /* Style for the nested div to be indented */
         #polaris_sarif_params,
         #blackducksca_sarif_params,
@@ -292,13 +286,13 @@
         }
 
         .advancedButton {
-            font-size: 17px;    /* Increases the font size */
+            font-size: 17px;
         }
 
         /* Style for entries within the nested div */
         #polaris_sarif_params .f\:entry,
         #blackducksca_sarif_params .f\:entry {
-            margin-bottom: 10px; /* Space below each entry */
+            margin-bottom: 10px;
         }
     </style>
 
@@ -410,7 +404,7 @@
             }
         });
 
-        document.addEventListener('change', function() {
+        document.addEventListener('change', function(event) {
             var polarisAssessmentModeOption = document.querySelector('select[name="_.polaris_assessment_mode"]')?.value;
             var sourceUploadDiv = document.getElementById('source_upload');
 
@@ -423,7 +417,7 @@
                 hideParticularDiv(sourceUploadDiv);
             }
 
-            toggleSarifParamsDivs();
+            toggleSarifParamsDivs(event);
             togglePrCommentDivs();
             handlePostMergeWorkflowSectionsVisibility();
         });
@@ -439,6 +433,9 @@
                     blackduckSarifParamSection.style.display = 'none';
                     clearInputFields(blackduckSarifParamSection);
                 }
+                if(event.target.name == "_.blackducksca_reports_sarif_create" ){
+                    setCheckboxToDefaultTrue(['_.blackducksca_reports_sarif_groupSCAIssues']);
+                }
             } else if (selectedOption == "polaris") {
                 var polarisCheckbox = document.querySelector('input[name="_.polaris_reports_sarif_create"]')
                 var polarisSarifParamSection = document.getElementById('polaris_sarif_params')
@@ -449,6 +446,9 @@
                     polarisSarifParamSection.style.display = 'none';
                     clearInputFields(polarisSarifParamSection);
                 }
+                if(event.target.name == "_.polaris_reports_sarif_create"){
+                    setCheckboxToDefaultTrue(['_.polaris_reports_sarif_groupSCAIssues']);
+                }
             }
 
         }

From 89b304bb1b0a2cde461d7167c86fa57547d07c43 Mon Sep 17 00:00:00 2001
From: Sadman Anik <sadmana@synopsys.com>
Date: Tue, 15 Oct 2024 00:41:58 +0600
Subject: [PATCH 3/3] Fixed UI js code errors

---
 .../global/ScannerGlobalConfig/config.jelly   |  8 +++----
 .../webapp/scripts/ScannerGlobalConfig.js     | 23 +++++++++----------
 .../scripts/SecurityScanFreestyleConfig.js    |  6 ++---
 .../webapp/scripts/SecurityScanStepConfig.js  |  4 ++--
 .../webapp/styles/scanner-global-config.css   |  2 +-
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/io/jenkins/plugins/security/scan/extension/global/ScannerGlobalConfig/config.jelly b/src/main/resources/io/jenkins/plugins/security/scan/extension/global/ScannerGlobalConfig/config.jelly
index a8b3dbd3..b75bc305 100644
--- a/src/main/resources/io/jenkins/plugins/security/scan/extension/global/ScannerGlobalConfig/config.jelly
+++ b/src/main/resources/io/jenkins/plugins/security/scan/extension/global/ScannerGlobalConfig/config.jelly
@@ -8,7 +8,7 @@
         <!-- Tab Container -->
         <div class="tab-container-box">
             <!-- Black Duck Tab -->
-            <div class="scan-tab-box" id="blackduck-tab">Black Duck SCA</div>
+            <div class="scan-tab-box" id="blackducksca-tab">Black Duck SCA</div>
             <!-- Coverity Tab -->
             <div class="scan-tab-box" id="coverity-tab">Coverity</div>
             <!-- Polaris Tab -->
@@ -108,11 +108,11 @@
             <!-- Tab Container -->
             <div class="tab-container-box">
                 <!-- Mac Tab -->
-                <div class="scm-token-tab-box" id="bitbucket-scm-tab">BitBucket</div>
+                <div class="scm-token-tab-box" id="bitbucket-tab">BitBucket</div>
                 <!-- Linux Tab -->
-                <div class="scm-token-tab-box" id="github-scm-tab">Github</div>
+                <div class="scm-token-tab-box" id="github-tab">Github</div>
                 <!-- Windows Tab -->
-                <div class="scm-token-tab-box" id="gitlab-scm-tab">Gitlab</div>
+                <div class="scm-token-tab-box" id="gitlab-tab">Gitlab</div>
             </div>
 
             <!-- Bitbucket Token Configuration -->
diff --git a/src/main/webapp/scripts/ScannerGlobalConfig.js b/src/main/webapp/scripts/ScannerGlobalConfig.js
index 04dca611..d4046602 100644
--- a/src/main/webapp/scripts/ScannerGlobalConfig.js
+++ b/src/main/webapp/scripts/ScannerGlobalConfig.js
@@ -17,7 +17,7 @@ function showProductType(sectionId) {
         tab.style.backgroundColor = '';
     });
 
-    var selectedTab = document.querySelector('.tab-container-box [onclick*="' + sectionId + '"]');
+    var selectedTab = document.getElementById(sectionId.replace("section", "tab"));
     if (selectedTab) {
         selectedTab.style.backgroundColor = '#f1f1f1';
     }
@@ -41,8 +41,7 @@ function showOSType(sectionId) {
     tabs.forEach(function (tab) {
         tab.style.backgroundColor = '';
     });
-
-    var selectedTab = document.querySelector('.tab-container-box [onclick*="' + sectionId + '"]');
+    var selectedTab = document.getElementById(sectionId.replace("section", "tab"));
     if (selectedTab) {
         selectedTab.style.backgroundColor = '#f1f1f1';
     }
@@ -67,7 +66,7 @@ function showScmToken(sectionId) {
         tab.style.backgroundColor = '';
     });
 
-    var selectedTab = document.querySelector('.tab-container-box [onclick*="' + sectionId + '"]');
+    var selectedTab = document.getElementById(sectionId.replace("section", "tab"));
     if (selectedTab) {
         selectedTab.style.backgroundColor = '#f1f1f1';
     }
@@ -141,14 +140,14 @@ function checkExistingFieldValues() {
     // Check the values of bitbucketCredentialsId, githubCredentialsId, and gitlabCredentialsId
     // and select the appropriate SCM Token tab based on their values
     if (bitbucketCredentialsId) {
-        showOSType("bitbucket-section");
+        showScmToken("bitbucket-section");
     } else if (githubCredentialsId) {
-        showOSType("github-section");
+        showScmToken("github-section");
     } else if (gitlabCredentialsId) {
-        showOSType("gitlab-section");
+        showScmToken("gitlab-section");
     } else {
         // If none of the URLs have a value, default to bitbucket
-        showOSType("bitbucket-section");
+        showScmToken("bitbucket-section");
     }
 }
 
@@ -157,7 +156,7 @@ window.addEventListener("load", function() {
     checkExistingFieldValues();
 
     // Add event listeners for the tabs
-    document.getElementById('blackduck-tab').addEventListener('click', function() {
+    document.getElementById('blackducksca-tab').addEventListener('click', function() {
         showProductType('blackducksca-section');
     });
 
@@ -186,15 +185,15 @@ window.addEventListener("load", function() {
         showOSType('windows-section');
     });
 
-    document.getElementById('bitbucket-scm-tab').addEventListener('click', function() {
+    document.getElementById('bitbucket-tab').addEventListener('click', function() {
         showScmToken('bitbucket-section');
     });
 
-    document.getElementById('github-scm-tab').addEventListener('click', function() {
+    document.getElementById('github-tab').addEventListener('click', function() {
         showScmToken('github-section');
     });
 
-    document.getElementById('gitlab-scm-tab').addEventListener('click', function() {
+    document.getElementById('gitlab-tab').addEventListener('click', function() {
         showScmToken('gitlab-section');
     });
 
diff --git a/src/main/webapp/scripts/SecurityScanFreestyleConfig.js b/src/main/webapp/scripts/SecurityScanFreestyleConfig.js
index 2a552f7a..a79437b4 100644
--- a/src/main/webapp/scripts/SecurityScanFreestyleConfig.js
+++ b/src/main/webapp/scripts/SecurityScanFreestyleConfig.js
@@ -2,7 +2,7 @@ var selectedOption = document.querySelector('select[name="_.product"]')?.value;
 var polarisAssessmentModeOption = document.querySelector('select[name="_.polaris_assessment_mode"]')?.value;
 var sourceUploadDiv = document.getElementById('source_upload');
 
-if (selectedOption &amp;&amp; selectedOption !== 'select') {
+if (selectedOption && selectedOption !== 'select') {
     document.getElementById(selectedOption).style.display = 'block';
     document.getElementById('bridge_cli_sec').style.display = 'block';
 
@@ -40,7 +40,7 @@ function clearInputFields(div) {
             if (field.type === 'text' || field.tagName.toLowerCase() === 'select') {
                 field.value = '';
             } else if (field.type === 'checkbox') {
-                if (field.name !== "_.srm_waitForScan" &amp;&amp; field.name !== "_.polaris_waitForScan" &amp;&amp; field.name !== "_.blackducksca_waitForScan" &amp;&amp; field.name !== "_.coverity_waitForScan" &amp;&amp; field.name !== "_.polaris_reports_sarif_groupSCAIssues" &amp;&amp; field.name !== "_.blackducksca_reports_sarif_groupSCAIssues") {
+                if (field.name !== "_.srm_waitForScan" && field.name !== "_.polaris_waitForScan" && field.name !== "_.blackducksca_waitForScan" && field.name !== "_.coverity_waitForScan" && field.name !== "_.polaris_reports_sarif_groupSCAIssues" && field.name !== "_.blackducksca_reports_sarif_groupSCAIssues") {
                     field.checked = false;
                 }
             }
@@ -202,7 +202,7 @@ function validateSrmFields() {
     var errorSrmProjectIdDiv = document.getElementById("error_srm_project_id");
     var errorSrmAssessmentTypesDiv = document.getElementById("error_srm_assessment_types");
 
-    if (!srmProjectName &amp;&amp; !srmProjectId) {
+    if (!srmProjectName && !srmProjectId) {
         errorSrmProjectNameDiv.style.display = "block";
         errorSrmProjectIdDiv.style.display = "block";
     } else {
diff --git a/src/main/webapp/scripts/SecurityScanStepConfig.js b/src/main/webapp/scripts/SecurityScanStepConfig.js
index 8621dbcf..bf4c0d7d 100644
--- a/src/main/webapp/scripts/SecurityScanStepConfig.js
+++ b/src/main/webapp/scripts/SecurityScanStepConfig.js
@@ -54,7 +54,7 @@ function clearInputFields(div) {
 function setCheckboxToDefaultTrue(names) {
     names.forEach(function(name) {
         var checkbox = document.getElementsByName(name);
-        if (checkbox &amp;&amp; checkbox.length > 0) {
+        if (checkbox && checkbox.length > 0) {
             checkbox[0].checked = true;
 
         }
@@ -123,7 +123,7 @@ document.addEventListener('change', function(event) {
     handlePostMergeWorkflowSectionsVisibility();
 });
 
-function toggleSarifParamsDivs() {
+function toggleSarifParamsDivs(event) {
     var selectedOption = securityProduct.value;
     if (selectedOption == "blackducksca") {
         var blackduckCheckbox = document.querySelector('input[name="_.blackducksca_reports_sarif_create"]')
diff --git a/src/main/webapp/styles/scanner-global-config.css b/src/main/webapp/styles/scanner-global-config.css
index 7f8de1f3..91863f50 100644
--- a/src/main/webapp/styles/scanner-global-config.css
+++ b/src/main/webapp/styles/scanner-global-config.css
@@ -11,7 +11,7 @@
     margin-right: 10px;
 }
 
-.tab:hover {
+.scan-tab-box:hover, .os-tab-box:hover, .scm-token-tab-box:hover {
     background-color: #f1f1f1;
 }