Fixed pipeline syntax UI

synopsys-sig · Sep 21, 2023 · d7bfce8 · d7bfce8
1 parent 7c089aa
commit d7bfce8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/src/main/java/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep.java b/src/main/java/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep.java
@@ -392,13 +392,14 @@ public ListBoxModel doFillSynopsys_security_productItems() {
             Map<String, String> customLabels = new HashMap<>();
 
             items.add(new Option("Select", "Select"));
-            customLabels.put(SecurityProduct.BLACKDUCK.toString().toLowerCase(), "Black Duck");
-            customLabels.put(SecurityProduct.COVERITY.toString().toLowerCase(), "Coverity");
-            customLabels.put(SecurityProduct.POLARIS.toString().toLowerCase(), "Polaris");
+            customLabels.put(SecurityProduct.BLACKDUCK.name().toLowerCase(), "Black Duck");
+            customLabels.put(SecurityProduct.COVERITY.name().toLowerCase(), "Coverity");
+            customLabels.put(SecurityProduct.POLARIS.name().toLowerCase(), "Polaris");
 
             for (SecurityProduct product : SecurityProduct.values()) {
-                String label = customLabels.getOrDefault(product, product.name());
-                items.add(new Option(label, product.name()));
+                String value = product.name().toLowerCase();
+                String label = customLabels.getOrDefault(value, product.name()); // Use product.name() for label
+                items.add(new Option(label, value));
             }
             return items;
         }

diff --git a/...es/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/config.jelly b/...es/com/synopsys/integration/jenkins/scan/extension/pipeline/SecurityScanStep/config.jelly
@@ -105,28 +105,26 @@
                 var inputFields = div.querySelectorAll('input[type="text"], input[type="checkbox"]');
                 inputFields.forEach(function (field) {
                     if (field.type === 'text') {
-                        field.value = ''; // Clear text fields
+                        field.value = '';
                     } else if (field.type === 'checkbox') {
-                        field.checked = false; // Uncheck checkboxes
+                        field.checked = false;
                     }
                 });
             }
         }
 
         synopsysSecurityProduct.addEventListener('change', function () {
-            hideAllDivs(); // Hide all divs initially
-            // Determine the selected option value
+            hideAllDivs();
             var selectedOption = synopsysSecurityProduct.value;
-            // Show the corresponding div based on the selected option
-            if (selectedOption == 'BLACKDUCK') {
+            if (selectedOption == 'blackduck') {
                 clearInputFields(coverityDiv);
                 clearInputFields(polarisDiv);
                 showDiv(blackduckDiv);
-            } else if (selectedOption == 'COVERITY') {
+            } else if (selectedOption == 'coverity') {
                 clearInputFields(blackduckDiv);
                 clearInputFields(polarisDiv);
                 showDiv(coverityDiv);
-            } else if (selectedOption == 'POLARIS') {
+            } else if (selectedOption == 'polaris') {
                 clearInputFields(blackduckDiv);
                 clearInputFields(coverityDiv);
                 showDiv(polarisDiv);