From feb11f044f85d2508ff6775ea788449241e2b75f Mon Sep 17 00:00:00 2001 From: Samantha Ming Date: Thu, 7 Aug 2025 17:21:07 +0200 Subject: [PATCH] WIP --- app/assets/javascripts/vue_merge_request_widget/index.js | 3 +++ app/views/projects/merge_requests/_widget.html.haml | 3 ++- .../components/pipeline/vulnerability_finding_modal.vue | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/vue_merge_request_widget/index.js b/app/assets/javascripts/vue_merge_request_widget/index.js index 5e9b72e13cfeab..cc2ee5087837d9 100644 --- a/app/assets/javascripts/vue_merge_request_widget/index.js +++ b/app/assets/javascripts/vue_merge_request_widget/index.js @@ -47,6 +47,7 @@ export default () => { ), commitPathTemplate: gl.mrWidgetData.commit_path_template, dismissalDescriptions, + validityChecksEnabled: gl.mrWidgetData.validity_checks_enabled, }, ...MrWidgetOptions, apolloProvider, @@ -55,4 +56,6 @@ export default () => { window.gl.mrWidget = { checkStatus: vm.checkStatus, }; + + console.log('>>>>', gl.mrWidgetData.validity_checks_enabled); }; diff --git a/app/views/projects/merge_requests/_widget.html.haml b/app/views/projects/merge_requests/_widget.html.haml index ea3af550a15377..2244742e2ef569 100644 --- a/app/views/projects/merge_requests/_widget.html.haml +++ b/app/views/projects/merge_requests/_widget.html.haml @@ -22,7 +22,8 @@ window.gl.mrWidgetData.can_view_false_positive = '#{@merge_request.project.licensed_feature_available?(:sast_fp_reduction).to_s}'; window.gl.mrWidgetData.user_preferences_gitpod_path = '#{profile_preferences_path(anchor: 'user_gitpod_enabled')}'; window.gl.mrWidgetData.user_profile_enable_gitpod_path = '#{user_settings_profile_path(user: { gitpod_enabled: true })}'; - window.gl.mrWidgetData.saml_approval_path = window.gl.mrWidgetData.saml_approval_path + window.gl.mrWidgetData.saml_approval_path = window.gl.mrWidgetData.saml_approval_path; + window.gl.mrWidgetData.validity_checks_enabled = '#{@merge_request.project&.security_setting&.validity_checks_enabled&.to_s}'; %h2#merge-request-widgets-heading.gl-sr-only = _("Merge request reports") diff --git a/ee/app/assets/javascripts/security_dashboard/components/pipeline/vulnerability_finding_modal.vue b/ee/app/assets/javascripts/security_dashboard/components/pipeline/vulnerability_finding_modal.vue index 45722d8cbdd8ed..73e3049d3c50f8 100644 --- a/ee/app/assets/javascripts/security_dashboard/components/pipeline/vulnerability_finding_modal.vue +++ b/ee/app/assets/javascripts/security_dashboard/components/pipeline/vulnerability_finding_modal.vue @@ -76,6 +76,11 @@ export default { ResolveWithAiButton, }, mixins: [glAbilitiesMixin()], + inject: { + validity_checks_enabled: { + default: false, + }, + }, props: { findingUuid: { type: String, -- GitLab