Commit 84d76ca2 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '230558-add-reverting-vulnerability-on-vulnerability-page' into 'master'

Add reverting vulnerability to detected on single vulnerability page

See merge request gitlab-org/gitlab!41794
parents b643c452 2a5db75f
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
<template> <template>
<gl-dropdown <gl-dropdown
ref="dropdown" ref="dropdown"
menu-class="p-0" menu-class="gl-p-0 dropdown-extended-height"
toggle-class="text-capitalize" toggle-class="text-capitalize"
:text="initialState" :text="initialState"
:right="true" :right="true"
......
import { s__ } from '~/locale'; import { s__ } from '~/locale';
export const VULNERABILITY_STATE_OBJECTS = { export const VULNERABILITY_STATE_OBJECTS = {
detected: {
action: 'revert',
state: 'detected',
statusBoxStyle: 'expired',
displayName: s__('VulnerabilityManagement|Detected'),
description: s__('VulnerabilityManagement|Needs triage'),
},
dismissed: { dismissed: {
action: 'dismiss', action: 'dismiss',
state: 'dismissed', state: 'dismissed',
......
---
title: Add ability to revert vulnerability to detected state on single vulnerability
page
merge_request: 41794
author:
type: added
...@@ -11,7 +11,8 @@ import { VULNERABILITY_STATE_OBJECTS, VULNERABILITY_STATES } from 'ee/vulnerabil ...@@ -11,7 +11,8 @@ import { VULNERABILITY_STATE_OBJECTS, VULNERABILITY_STATES } from 'ee/vulnerabil
import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
const NON_DETECTED_STATES = Object.keys(VULNERABILITY_STATE_OBJECTS); const { detected, ...NON_DETECTED_STATE_OBJECTS } = VULNERABILITY_STATE_OBJECTS;
const NON_DETECTED_STATES = Object.keys(NON_DETECTED_STATE_OBJECTS);
const ALL_STATES = Object.keys(VULNERABILITY_STATES); const ALL_STATES = Object.keys(VULNERABILITY_STATES);
describe('Vulnerability status description component', () => { describe('Vulnerability status description component', () => {
......
...@@ -28362,6 +28362,12 @@ msgstr "" ...@@ -28362,6 +28362,12 @@ msgstr ""
msgid "VulnerabilityManagement|Could not process %{issueReference}: %{errorMessage}." msgid "VulnerabilityManagement|Could not process %{issueReference}: %{errorMessage}."
msgstr "" msgstr ""
msgid "VulnerabilityManagement|Detected"
msgstr ""
msgid "VulnerabilityManagement|Needs triage"
msgstr ""
msgid "VulnerabilityManagement|Something went wrong while trying to delete the comment. Please try again later." msgid "VulnerabilityManagement|Something went wrong while trying to delete the comment. Please try again later."
msgstr "" msgstr ""
......
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