Commit 1806d094 authored by Dheeraj Joshi's avatar Dheeraj Joshi Committed by Scott Hampton

Remove badges in DAST site validations

Use icons instead of badges for showing
site validation statuses in DAST profile
library page
parent e09c35bb
<script> <script>
import { GlButton, GlIcon, GlTooltipDirective, GlBadge, GlLink } from '@gitlab/ui'; import { GlButton, GlIcon, GlTooltipDirective, GlLink } from '@gitlab/ui';
import { import {
DAST_SITE_VALIDATION_STATUS, DAST_SITE_VALIDATION_STATUS,
DAST_SITE_VALIDATION_STATUS_PROPS, DAST_SITE_VALIDATION_STATUS_PROPS,
...@@ -19,7 +19,6 @@ export default { ...@@ -19,7 +19,6 @@ export default {
components: { components: {
GlButton, GlButton,
GlIcon, GlIcon,
GlBadge,
GlLink, GlLink,
DastSiteValidationModal, DastSiteValidationModal,
ProfilesList, ProfilesList,
...@@ -139,14 +138,8 @@ export default { ...@@ -139,14 +138,8 @@ export default {
</template> </template>
<template #cell(validationStatus)="{ value }"> <template #cell(validationStatus)="{ value }">
<template v-if="shouldShowValidationStatus(value)"> <template v-if="shouldShowValidationStatus(value)">
<gl-badge <gl-icon v-gl-tooltip v-bind="$options.statuses[value]" :size="12" class="gl-mr-3" /><span
v-gl-tooltip >{{ $options.statuses[value].labelText }}</span
size="sm"
:variant="$options.statuses[value].badgeVariant"
:title="$options.statuses[value].tooltipText"
>
<gl-icon :size="12" class="gl-mr-2" :name="$options.statuses[value].badgeIcon" />
{{ $options.statuses[value].label }}</gl-badge
> >
</template> </template>
</template> </template>
......
...@@ -29,28 +29,28 @@ export const DAST_SITE_VALIDATION_STATUS = { ...@@ -29,28 +29,28 @@ export const DAST_SITE_VALIDATION_STATUS = {
}; };
const INPROGRESS_VALIDATION_PROPS = { const INPROGRESS_VALIDATION_PROPS = {
label: s__('DastSiteValidation|Validating...'), labelText: s__('DastSiteValidation|Validating...'),
badgeVariant: 'info', name: 'status-running',
badgeIcon: 'status-running', class: 'gl-text-blue-500',
tooltipText: s__('DastSiteValidation|The validation is in progress. Please wait...'), title: s__('DastSiteValidation|The validation is in progress. Please wait...'),
}; };
export const DAST_SITE_VALIDATION_STATUS_PROPS = { export const DAST_SITE_VALIDATION_STATUS_PROPS = {
[DAST_SITE_VALIDATION_STATUS.PENDING]: INPROGRESS_VALIDATION_PROPS, [DAST_SITE_VALIDATION_STATUS.PENDING]: INPROGRESS_VALIDATION_PROPS,
[DAST_SITE_VALIDATION_STATUS.INPROGRESS]: INPROGRESS_VALIDATION_PROPS, [DAST_SITE_VALIDATION_STATUS.INPROGRESS]: INPROGRESS_VALIDATION_PROPS,
[DAST_SITE_VALIDATION_STATUS.PASSED]: { [DAST_SITE_VALIDATION_STATUS.PASSED]: {
label: s__('DastSiteValidation|Validated'), labelText: s__('DastSiteValidation|Validated'),
badgeVariant: 'success', name: 'status-success',
badgeIcon: 'status-success', class: 'gl-text-green-500',
tooltipText: s__( title: s__(
'DastSiteValidation|Validation succeeded. Both active and passive scans can be run against the target site.', 'DastSiteValidation|Validation succeeded. Both active and passive scans can be run against the target site.',
), ),
}, },
[DAST_SITE_VALIDATION_STATUS.FAILED]: { [DAST_SITE_VALIDATION_STATUS.FAILED]: {
label: s__('DastSiteValidation|Validation failed'), labelText: s__('DastSiteValidation|Validation failed'),
badgeVariant: 'danger', name: 'status-failed',
badgeIcon: 'status-failed', class: 'gl-text-red-500',
tooltipText: s__('DastSiteValidation|The validation has failed. Please try again.'), title: s__('DastSiteValidation|The validation has failed. Please try again.'),
}, },
}; };
......
---
title: Remove badges design from DAST validation statuses
merge_request: 52301
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