Skip to content

G
gitlab-ce
Commit 3c8faad1 authored by Natalia Tepluhina's avatar Natalia Tepluhina
Browse files
Options

Merge branch 'migrate-to-vslot' into 'master' 

Refactor deprecated named slots in Vue

See merge request gitlab-org/gitlab!24069
parents 21559c8f 0a52537d
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 103 deletions
ee/app/assets/javascripts/vue_shared/security_reports/grouped_security_reports_app.vue
View file @ 3c8faad1
...@@ -279,118 +279,120 @@ export default { ...@@ -279,118 +279,120 @@ export default {
class="mr-widget-border-top grouped-security-reports mr-report" class="mr-widget-border-top grouped-security-reports mr-report"
data-qa-selector="vulnerability_report_grouped" data-qa-selector="vulnerability_report_grouped"
> >
<div v-if="pipelinePath" slot="actionButtons"> <template v-if="pipelinePath" #actionButtons>
<a <div>
:href="securityTab" <a
target="_blank" :href="securityTab"
class="btn btn-default btn-sm float-right append-right-default" target="_blank"
> class="btn btn-default btn-sm float-right append-right-default"
<span>{{ s__('ciReport|View full report') }}</span> >
<icon :size="16" name="external-link" /> <span>{{ s__('ciReport|View full report') }}</span>
</a> <icon :size="16" name="external-link" />
</div> </a>
</div>
</template>
<div <template v-if="isMRActive && isBaseSecurityReportOutOfDate" #subHeading>
v-if="isMRActive && isBaseSecurityReportOutOfDate" <div class="text-secondary-700 text-1">
slot="subHeading" <span>{{ subHeadingText }}</span>
class="text-secondary-700 text-1" </div>
> </template>
<span>{{ subHeadingText }}</span>
</div>
<div slot="body" class="mr-widget-grouped-section report-block"> <template #body>
<template v-if="hasSastReports"> <div class="mr-widget-grouped-section report-block">
<summary-row <template v-if="hasSastReports">
:summary="groupedSastText" <summary-row
:status-icon="sastStatusIcon" :summary="groupedSastText"
:popover-options="sastPopover" :status-icon="sastStatusIcon"
class="js-sast-widget" :popover-options="sastPopover"
data-qa-selector="sast_scan_report" class="js-sast-widget"
/> data-qa-selector="sast_scan_report"
/>
<issues-list <issues-list
v-if="sast.newIssues.length || sast.resolvedIssues.length" v-if="sast.newIssues.length || sast.resolvedIssues.length"
:unresolved-issues="sast.newIssues" :unresolved-issues="sast.newIssues"
:resolved-issues="sast.resolvedIssues" :resolved-issues="sast.resolvedIssues"
:all-issues="sast.allIssues" :all-issues="sast.allIssues"
:component="$options.componentNames.SastIssueBody" :component="$options.componentNames.SastIssueBody"
class="js-sast-issue-list report-block-group-list" class="js-sast-issue-list report-block-group-list"
/> />
</template> </template>
<template v-if="hasDependencyScanningReports"> <template v-if="hasDependencyScanningReports">
<summary-row <summary-row
:summary="groupedDependencyText" :summary="groupedDependencyText"
:status-icon="dependencyScanningStatusIcon" :status-icon="dependencyScanningStatusIcon"
:popover-options="dependencyScanningPopover" :popover-options="dependencyScanningPopover"
class="js-dependency-scanning-widget" class="js-dependency-scanning-widget"
data-qa-selector="dependency_scan_report" data-qa-selector="dependency_scan_report"
/> />
<issues-list <issues-list
v-if="dependencyScanning.newIssues.length || dependencyScanning.resolvedIssues.length" v-if="dependencyScanning.newIssues.length || dependencyScanning.resolvedIssues.length"
:unresolved-issues="dependencyScanning.newIssues" :unresolved-issues="dependencyScanning.newIssues"
:resolved-issues="dependencyScanning.resolvedIssues" :resolved-issues="dependencyScanning.resolvedIssues"
:component="$options.componentNames.SastIssueBody" :component="$options.componentNames.SastIssueBody"
class="js-dss-issue-list report-block-group-list" class="js-dss-issue-list report-block-group-list"
/> />
</template> </template>
<template v-if="hasContainerScanningReports"> <template v-if="hasContainerScanningReports">
<summary-row <summary-row
:summary="groupedContainerScanningText" :summary="groupedContainerScanningText"
:status-icon="containerScanningStatusIcon" :status-icon="containerScanningStatusIcon"
:popover-options="containerScanningPopover" :popover-options="containerScanningPopover"
class="js-container-scanning" class="js-container-scanning"
data-qa-selector="container_scan_report" data-qa-selector="container_scan_report"
/> />
<issues-list <issues-list
v-if="containerScanning.newIssues.length || containerScanning.resolvedIssues.length" v-if="containerScanning.newIssues.length || containerScanning.resolvedIssues.length"
:unresolved-issues="containerScanning.newIssues" :unresolved-issues="containerScanning.newIssues"
:resolved-issues="containerScanning.resolvedIssues" :resolved-issues="containerScanning.resolvedIssues"
:component="$options.componentNames.ContainerScanningIssueBody" :component="$options.componentNames.ContainerScanningIssueBody"
class="report-block-group-list" class="report-block-group-list"
/> />
</template> </template>
<template v-if="hasDastReports"> <template v-if="hasDastReports">
<summary-row <summary-row
:summary="groupedDastText" :summary="groupedDastText"
:status-icon="dastStatusIcon" :status-icon="dastStatusIcon"
:popover-options="dastPopover" :popover-options="dastPopover"
class="js-dast-widget" class="js-dast-widget"
data-qa-selector="dast_scan_report" data-qa-selector="dast_scan_report"
/> />
<issues-list <issues-list
v-if="dast.newIssues.length || dast.resolvedIssues.length" v-if="dast.newIssues.length || dast.resolvedIssues.length"
:unresolved-issues="dast.newIssues" :unresolved-issues="dast.newIssues"
:resolved-issues="dast.resolvedIssues" :resolved-issues="dast.resolvedIssues"
:component="$options.componentNames.DastIssueBody" :component="$options.componentNames.DastIssueBody"
class="report-block-group-list" class="report-block-group-list"
/> />
</template> </template>
<issue-modal <issue-modal
:modal="modal" :modal="modal"
:vulnerability-feedback-help-path="vulnerabilityFeedbackHelpPath" :vulnerability-feedback-help-path="vulnerabilityFeedbackHelpPath"
:can-create-issue="canCreateIssue" :can-create-issue="canCreateIssue"
:can-create-merge-request="canCreateMergeRequest" :can-create-merge-request="canCreateMergeRequest"
:can-dismiss-vulnerability="canDismissVulnerability" :can-dismiss-vulnerability="canDismissVulnerability"
@closeDismissalCommentBox="closeDismissalCommentBox()" @closeDismissalCommentBox="closeDismissalCommentBox()"
@createMergeRequest="createMergeRequest" @createMergeRequest="createMergeRequest"
@createNewIssue="createNewIssue" @createNewIssue="createNewIssue"
@dismissVulnerability="dismissVulnerability" @dismissVulnerability="dismissVulnerability"
@openDismissalCommentBox="openDismissalCommentBox()" @openDismissalCommentBox="openDismissalCommentBox()"
@editVulnerabilityDismissalComment="openDismissalCommentBox()" @editVulnerabilityDismissalComment="openDismissalCommentBox()"
@revertDismissVulnerability="revertDismissVulnerability" @revertDismissVulnerability="revertDismissVulnerability"
@downloadPatch="downloadPatch" @downloadPatch="downloadPatch"
@addDismissalComment="addDismissalComment({ comment: $event })" @addDismissalComment="addDismissalComment({ comment: $event })"
@deleteDismissalComment="deleteDismissalComment" @deleteDismissalComment="deleteDismissalComment"
@showDismissalDeleteButtons="showDismissalDeleteButtons" @showDismissalDeleteButtons="showDismissalDeleteButtons"
@hideDismissalDeleteButtons="hideDismissalDeleteButtons" @hideDismissalDeleteButtons="hideDismissalDeleteButtons"
/> />
</div> </div>
</template>
</report-section> </report-section>
</template> </template>
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7