Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7dacf1bd
Commit
7dacf1bd
authored
Feb 19, 2021
by
Alexander Turinske
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Metric tab not showing up on operations page
- fix broken test - add additional test
parent
3262be6b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue
...pts/vue_shared/alert_details/components/alert_details.vue
+1
-1
changelogs/unreleased/322198-fix-metrics-tab.yml
changelogs/unreleased/322198-fix-metrics-tab.yml
+5
-0
spec/frontend/vue_shared/alert_details/alert_details_spec.js
spec/frontend/vue_shared/alert_details/alert_details_spec.js
+6
-1
No files found.
app/assets/javascripts/vue_shared/alert_details/components/alert_details.vue
View file @
7dacf1bd
...
...
@@ -368,7 +368,7 @@ export default {
<alert-details-table
:alert=
"alert"
:loading=
"loading"
/>
</gl-tab>
<gl-tab
v-if=
"isThreatMonitoringPage"
v-if=
"
!
isThreatMonitoringPage"
:data-testid=
"$options.tabsConfig[1].id"
:title=
"$options.tabsConfig[1].title"
>
...
...
changelogs/unreleased/322198-fix-metrics-tab.yml
0 → 100644
View file @
7dacf1bd
---
title
:
Fix Metric tab not showing up on operations page
merge_request
:
54736
author
:
type
:
fixed
spec/frontend/vue_shared/alert_details/alert_details_spec.js
View file @
7dacf1bd
...
...
@@ -128,6 +128,10 @@ describe('AlertDetails', () => {
expect
(
wrapper
.
findByTestId
(
'
startTimeItem
'
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
findByTestId
(
'
startTimeItem
'
).
props
(
'
time
'
)).
toBe
(
mockAlert
.
startedAt
);
});
it
(
'
renders the metrics tab
'
,
()
=>
{
expect
(
findMetricsTab
().
exists
()).
toBe
(
true
);
});
});
describe
(
'
individual alert fields
'
,
()
=>
{
...
...
@@ -179,7 +183,8 @@ describe('AlertDetails', () => {
describe
(
'
Threat Monitoring details
'
,
()
=>
{
it
(
'
should not render the metrics tab
'
,
()
=>
{
mountComponent
({
data
:
{
alert
:
mockAlert
,
provide
:
{
isThreatMonitoringPage
:
true
}
},
data
:
{
alert
:
mockAlert
},
provide
:
{
isThreatMonitoringPage
:
true
},
});
expect
(
findMetricsTab
().
exists
()).
toBe
(
false
);
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment