diff --git a/app/assets/javascripts/vue_merge_request_widget/components/widget/app.vue b/app/assets/javascripts/vue_merge_request_widget/components/widget/app.vue index 258fa4edcdac836f507a2d57e68b24a74c2e5f99..9bb39ba22e0297a3622c5c11489cd04a88eaa20c 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/widget/app.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/widget/app.vue @@ -5,8 +5,9 @@ export default { import( '~/vue_merge_request_widget/extensions/security_reports/mr_widget_security_reports.vue' ), - MrTerraformWidget: () => import('~/vue_merge_request_widget/extensions/terraform/index.vue'), + MrCodeQualityWidget: () => + import('~/vue_merge_request_widget/extensions/code_quality/index.vue'), }, props: { @@ -21,8 +22,14 @@ export default { return this.mr.terraformReportsPath && 'MrTerraformWidget'; }, + codeQualityWidget() { + return this.mr.codequalityReportsPath ? 'MrCodeQualityWidget' : undefined; + }, + widgets() { - return [this.terraformPlansWidget, 'MrSecurityWidget'].filter((w) => w); + return [this.codeQualityWidget, this.terraformPlansWidget, 'MrSecurityWidget'].filter( + (w) => w, + ); }, }, }; diff --git a/ee/app/assets/javascripts/vue_merge_request_widget/components/widget/app.vue b/ee/app/assets/javascripts/vue_merge_request_widget/components/widget/app.vue index 1551e5d962f7880b5ec5c69d77d1c7af1b88b296..3ce9584e79f6fad2406d9a50f4bd64c23224cf93 100644 --- a/ee/app/assets/javascripts/vue_merge_request_widget/components/widget/app.vue +++ b/ee/app/assets/javascripts/vue_merge_request_widget/components/widget/app.vue @@ -13,8 +13,6 @@ export default { ), MrStatusChecksWidget: () => import('ee/vue_merge_request_widget/extensions/status_checks/index.vue'), - MrCodeQualityWidget: () => - import('~/vue_merge_request_widget/extensions/code_quality/index.vue'), }, extends: CEWidgetApp, @@ -30,10 +28,6 @@ export default { return this.mr.canReadVulnerabilities ? 'MrSecurityWidgetEE' : 'MrSecurityWidgetCE'; }, - codeQualityWidget() { - return this.mr.codequalityReportsPath ? 'MrCodeQualityWidget' : undefined; - }, - widgets() { return [ this.codeQualityWidget, diff --git a/spec/frontend/vue_merge_request_widget/mock_data.js b/spec/frontend/vue_merge_request_widget/mock_data.js index 9da687c0ff8860f719d7b160cd8d14d2196821d6..5b3f533f34e84dd85cbb012570eab507ecc3c75f 100644 --- a/spec/frontend/vue_merge_request_widget/mock_data.js +++ b/spec/frontend/vue_merge_request_widget/mock_data.js @@ -332,7 +332,7 @@ export default { base_path: 'blob_path', head_path: 'blob_path', }, - codequality_reports_path: 'codequality_reports.json', + codequality_reports_path: '', codequality_help_path: 'code_quality.html', target_branch_path: '/root/acets-app/branches/main', source_branch_path: '/root/acets-app/branches/daaaa',