Skip to content
Snippets Groups Projects
Unverified Commit 2c056e66 authored by Alexander Turinske's avatar Alexander Turinske :gay_pride_flag:
Browse files

Update alert UI per designs

- update tests
parent c59d8b0d
No related branches found
No related tags found
1 merge request!59821Create incident column for threat alerts
doc/user/application_security/threat_monitoring/img/threat_monitoring_policy_alert_list_v13_12.png

49.2 KiB | W: 999px | H: 253px

doc/user/application_security/threat_monitoring/img/threat_monitoring_policy_alert_list_v13_12.png

18.6 KiB | W: 999px | H: 254px

doc/user/application_security/threat_monitoring/img/threat_monitoring_policy_alert_list_v13_12.png
doc/user/application_security/threat_monitoring/img/threat_monitoring_policy_alert_list_v13_12.png
doc/user/application_security/threat_monitoring/img/threat_monitoring_policy_alert_list_v13_12.png
doc/user/application_security/threat_monitoring/img/threat_monitoring_policy_alert_list_v13_12.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -131,7 +131,7 @@ export default {
getIssueMeta({ issue: { iid, state } }) {
return {
state: state === 'closed' ? `(${this.$options.i18n.CLOSED})` : '',
link: joinPaths('/', this.projectPath, '-', 'issues/incident', iid),
link: joinPaths(gon.relative_url_root, 'issues/incident', iid),
};
},
handleAlertError(msg) {
......@@ -223,7 +223,6 @@ export default {
>
#{{ item.issue.iid }} {{ getIssueMeta(item).state }}
</gl-link>
<div v-else data-testid="threat-alerts-issue">{{ __('None') }}</div>
</template>
<template #cell(status)="{ item }">
......
......@@ -46,7 +46,7 @@ describe('AlertsList component', () => {
const findEventCountColumn = () => wrapper.findByTestId('threat-alerts-event-count');
const findIssueColumn = () => wrapper.findByTestId('threat-alerts-issue');
const findIssueColumnTextAt = (id) =>
wrapper.findAll('[data-testid="threat-alerts-issue"').at(id).text();
wrapper.findAllByTestId('threat-alerts-issue').at(id).text();
const findStatusColumn = () => wrapper.findComponent(AlertStatus);
const findStatusColumnHeader = () => wrapper.findByTestId('threat-alerts-status-header');
const findEmptyState = () => wrapper.findByTestId('threat-alerts-empty-state');
......@@ -177,11 +177,14 @@ describe('AlertsList component', () => {
});
describe('issue column', () => {
it('only displays text when an issue is created', () => {
expect(wrapper.findAllByTestId('threat-alerts-issue').length).toBe(2);
});
it.each`
description | id | text
${'when an issue is created and is open'} | ${0} | ${'#5'}
${'when an issue is created and is closed'} | ${1} | ${'#6 (closed)'}
${'when an issue is not created'} | ${2} | ${'None'}
`('displays the correct text $description', ({ id, text }) => {
expect(findIssueColumnTextAt(id)).toBe(text);
});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment