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
10838732
Commit
10838732
authored
May 10, 2021
by
Alexander Turinske
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dropdown not closing on status update
- added new ref Changelog: added
parent
cc6e4fca
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_status.vue
...hared/alert_details/components/sidebar/sidebar_status.vue
+2
-1
ee/changelogs/unreleased/287755-fix-dropdown-bug.yml
ee/changelogs/unreleased/287755-fix-dropdown-bug.yml
+5
-0
spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_status_spec.js
...shared/alert_details/sidebar/alert_sidebar_status_spec.js
+3
-3
No files found.
app/assets/javascripts/vue_shared/alert_details/components/sidebar/sidebar_status.vue
View file @
10838732
...
@@ -52,7 +52,7 @@ export default {
...
@@ -52,7 +52,7 @@ export default {
},
},
toggleFormDropdown
()
{
toggleFormDropdown
()
{
this
.
isDropdownShowing
=
!
this
.
isDropdownShowing
;
this
.
isDropdownShowing
=
!
this
.
isDropdownShowing
;
const
{
dropdown
}
=
this
.
$
children
[
2
]
.
$refs
.
dropdown
.
$refs
;
const
{
dropdown
}
=
this
.
$
refs
.
status
.
$refs
.
dropdown
.
$refs
;
if
(
dropdown
&&
this
.
isDropdownShowing
)
{
if
(
dropdown
&&
this
.
isDropdownShowing
)
{
dropdown
.
show
();
dropdown
.
show
();
}
}
...
@@ -102,6 +102,7 @@ export default {
...
@@ -102,6 +102,7 @@ export default {
</p>
</p>
<alert-status
<alert-status
ref=
"status"
:alert=
"alert"
:alert=
"alert"
:project-path=
"projectPath"
:project-path=
"projectPath"
:is-dropdown-showing=
"isDropdownShowing"
:is-dropdown-showing=
"isDropdownShowing"
...
...
ee/changelogs/unreleased/287755-fix-dropdown-bug.yml
0 → 100644
View file @
10838732
---
title
:
Fix dropdown not closing on status update
merge_request
:
61404
author
:
type
:
fixed
spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_status_spec.js
View file @
10838732
...
@@ -10,9 +10,9 @@ const mockAlert = mockAlerts[0];
...
@@ -10,9 +10,9 @@ const mockAlert = mockAlerts[0];
describe
(
'
Alert Details Sidebar Status
'
,
()
=>
{
describe
(
'
Alert Details Sidebar Status
'
,
()
=>
{
let
wrapper
;
let
wrapper
;
const
findStatusDropdown
=
()
=>
wrapper
.
find
(
GlDropdown
);
const
findStatusDropdown
=
()
=>
wrapper
.
find
Component
(
GlDropdown
);
const
findStatusDropdownItem
=
()
=>
wrapper
.
find
(
GlDropdownItem
);
const
findStatusDropdownItem
=
()
=>
wrapper
.
find
Component
(
GlDropdownItem
);
const
findStatusLoadingIcon
=
()
=>
wrapper
.
find
(
GlLoadingIcon
);
const
findStatusLoadingIcon
=
()
=>
wrapper
.
find
Component
(
GlLoadingIcon
);
const
findStatusDropdownHeader
=
()
=>
wrapper
.
findByTestId
(
'
dropdown-header
'
);
const
findStatusDropdownHeader
=
()
=>
wrapper
.
findByTestId
(
'
dropdown-header
'
);
const
findAlertStatus
=
()
=>
wrapper
.
findComponent
(
AlertStatus
);
const
findAlertStatus
=
()
=>
wrapper
.
findComponent
(
AlertStatus
);
const
findStatus
=
()
=>
wrapper
.
findByTestId
(
'
status
'
);
const
findStatus
=
()
=>
wrapper
.
findByTestId
(
'
status
'
);
...
...
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