Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 0 deletions

diff --git a/app/assets/javascripts/security_configuration/utils.js b/app/assets/javascripts/security_configuration/utils.js
index 72e6d870e13..7f0caf1af46 100644
--- a/app/assets/javascripts/security_configuration/utils.js
+++ b/app/assets/javascripts/security_configuration/utils.js
@@ -1,5 +1,6 @@
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { SCANNER_NAMES_MAP } from '~/security_configuration/components/constants';
+import { REPORT_TYPE_DAST } from '~/vue_shared/security_reports/constants';
 
 /**
  * This function takes in 3 arrays of objects, securityFeatures and features.
@@ -29,6 +30,10 @@ export const augmentFeatures = (securityFeatures, features = []) => {
       augmented.secondary = { ...augmented.secondary, ...featuresByType[feature.secondary.type] };
     }
 
+    if (augmented.type === REPORT_TYPE_DAST && !augmented.onDemandAvailable) {
+      delete augmented.badge;
+    }
+
     if (augmented.badge && augmented.metaInfoPath) {
       augmented.badge.badgeHref = augmented.metaInfoPath;
     }