Commit f7ef648b authored by Brandon Labuschagne's avatar Brandon Labuschagne

Merge branch 'jnnkl-update-secure-mr-widget-indentation' into 'master'

Update Secure Merge-Request Widget Alignment

See merge request gitlab-org/gitlab!59644
parents eec1fb83 9aa315f2
...@@ -514,6 +514,7 @@ export default { ...@@ -514,6 +514,7 @@ export default {
<div class="mr-widget-grouped-section report-block"> <div class="mr-widget-grouped-section report-block">
<template v-if="hasSastReports"> <template v-if="hasSastReports">
<summary-row <summary-row
:nested-summary="true"
:status-icon="sastStatusIcon" :status-icon="sastStatusIcon"
:popover-options="sastPopover" :popover-options="sastPopover"
class="js-sast-widget" class="js-sast-widget"
...@@ -526,6 +527,7 @@ export default { ...@@ -526,6 +527,7 @@ export default {
<grouped-issues-list <grouped-issues-list
v-if="hasSastIssues" v-if="hasSastIssues"
:nested-level="2"
:unresolved-issues="sast.newIssues" :unresolved-issues="sast.newIssues"
:resolved-issues="sast.resolvedIssues" :resolved-issues="sast.resolvedIssues"
:component="$options.componentNames.SecurityIssueBody" :component="$options.componentNames.SecurityIssueBody"
...@@ -535,6 +537,7 @@ export default { ...@@ -535,6 +537,7 @@ export default {
<template v-if="hasDependencyScanningReports"> <template v-if="hasDependencyScanningReports">
<summary-row <summary-row
:nested-summary="true"
:status-icon="dependencyScanningStatusIcon" :status-icon="dependencyScanningStatusIcon"
:popover-options="dependencyScanningPopover" :popover-options="dependencyScanningPopover"
class="js-dependency-scanning-widget" class="js-dependency-scanning-widget"
...@@ -547,6 +550,7 @@ export default { ...@@ -547,6 +550,7 @@ export default {
<grouped-issues-list <grouped-issues-list
v-if="hasDependencyScanningIssues" v-if="hasDependencyScanningIssues"
:nested-level="2"
:unresolved-issues="dependencyScanning.newIssues" :unresolved-issues="dependencyScanning.newIssues"
:resolved-issues="dependencyScanning.resolvedIssues" :resolved-issues="dependencyScanning.resolvedIssues"
:component="$options.componentNames.SecurityIssueBody" :component="$options.componentNames.SecurityIssueBody"
...@@ -556,6 +560,7 @@ export default { ...@@ -556,6 +560,7 @@ export default {
<template v-if="hasContainerScanningReports"> <template v-if="hasContainerScanningReports">
<summary-row <summary-row
:nested-summary="true"
:status-icon="containerScanningStatusIcon" :status-icon="containerScanningStatusIcon"
:popover-options="containerScanningPopover" :popover-options="containerScanningPopover"
class="js-container-scanning" class="js-container-scanning"
...@@ -568,6 +573,7 @@ export default { ...@@ -568,6 +573,7 @@ export default {
<grouped-issues-list <grouped-issues-list
v-if="hasContainerScanningIssues" v-if="hasContainerScanningIssues"
:nested-level="2"
:unresolved-issues="containerScanning.newIssues" :unresolved-issues="containerScanning.newIssues"
:resolved-issues="containerScanning.resolvedIssues" :resolved-issues="containerScanning.resolvedIssues"
:component="$options.componentNames.SecurityIssueBody" :component="$options.componentNames.SecurityIssueBody"
...@@ -577,6 +583,7 @@ export default { ...@@ -577,6 +583,7 @@ export default {
<template v-if="hasDastReports"> <template v-if="hasDastReports">
<summary-row <summary-row
:nested-summary="true"
:status-icon="dastStatusIcon" :status-icon="dastStatusIcon"
:popover-options="dastPopover" :popover-options="dastPopover"
class="js-dast-widget" class="js-dast-widget"
...@@ -602,6 +609,7 @@ export default { ...@@ -602,6 +609,7 @@ export default {
</summary-row> </summary-row>
<grouped-issues-list <grouped-issues-list
v-if="hasDastIssues" v-if="hasDastIssues"
:nested-level="2"
:unresolved-issues="dast.newIssues" :unresolved-issues="dast.newIssues"
:resolved-issues="dast.resolvedIssues" :resolved-issues="dast.resolvedIssues"
:component="$options.componentNames.SecurityIssueBody" :component="$options.componentNames.SecurityIssueBody"
...@@ -611,6 +619,7 @@ export default { ...@@ -611,6 +619,7 @@ export default {
<template v-if="hasSecretDetectionReports"> <template v-if="hasSecretDetectionReports">
<summary-row <summary-row
:nested-summary="true"
:status-icon="secretDetectionStatusIcon" :status-icon="secretDetectionStatusIcon"
:popover-options="secretScanningPopover" :popover-options="secretScanningPopover"
class="js-secret-scanning" class="js-secret-scanning"
...@@ -623,6 +632,7 @@ export default { ...@@ -623,6 +632,7 @@ export default {
<grouped-issues-list <grouped-issues-list
v-if="hasSecretDetectionIssues" v-if="hasSecretDetectionIssues"
:nested-level="2"
:unresolved-issues="secretDetection.newIssues" :unresolved-issues="secretDetection.newIssues"
:resolved-issues="secretDetection.resolvedIssues" :resolved-issues="secretDetection.resolvedIssues"
:component="$options.componentNames.SecurityIssueBody" :component="$options.componentNames.SecurityIssueBody"
...@@ -632,6 +642,7 @@ export default { ...@@ -632,6 +642,7 @@ export default {
<template v-if="hasCoverageFuzzingReports"> <template v-if="hasCoverageFuzzingReports">
<summary-row <summary-row
:nested-summary="true"
:status-icon="coverageFuzzingStatusIcon" :status-icon="coverageFuzzingStatusIcon"
:popover-options="coverageFuzzingPopover" :popover-options="coverageFuzzingPopover"
class="js-coverage-fuzzing-widget" class="js-coverage-fuzzing-widget"
...@@ -649,6 +660,7 @@ export default { ...@@ -649,6 +660,7 @@ export default {
<grouped-issues-list <grouped-issues-list
v-if="hasCoverageFuzzingIssues" v-if="hasCoverageFuzzingIssues"
:nested-level="2"
:unresolved-issues="coverageFuzzing.newIssues" :unresolved-issues="coverageFuzzing.newIssues"
:resolved-issues="coverageFuzzing.resolvedIssues" :resolved-issues="coverageFuzzing.resolvedIssues"
:component="$options.componentNames.SecurityIssueBody" :component="$options.componentNames.SecurityIssueBody"
...@@ -658,6 +670,7 @@ export default { ...@@ -658,6 +670,7 @@ export default {
<template v-if="hasApiFuzzingReports"> <template v-if="hasApiFuzzingReports">
<summary-row <summary-row
:nested-summary="true"
:status-icon="apiFuzzingStatusIcon" :status-icon="apiFuzzingStatusIcon"
:popover-options="apiFuzzingPopover" :popover-options="apiFuzzingPopover"
class="js-api-fuzzing-widget" class="js-api-fuzzing-widget"
...@@ -677,6 +690,7 @@ export default { ...@@ -677,6 +690,7 @@ export default {
<grouped-issues-list <grouped-issues-list
v-if="hasApiFuzzingIssues" v-if="hasApiFuzzingIssues"
:nested-level="2"
:unresolved-issues="apiFuzzing.newIssues" :unresolved-issues="apiFuzzing.newIssues"
:resolved-issues="apiFuzzing.resolvedIssues" :resolved-issues="apiFuzzing.resolvedIssues"
:component="$options.componentNames.SecurityIssueBody" :component="$options.componentNames.SecurityIssueBody"
......
---
title: Update Secure Merge-Request Widget Alignment
merge_request: 59644
author:
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment