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
121e9022
Commit
121e9022
authored
Jan 22, 2019
by
Sam Beckham
Committed by
Phil Hughes
Jan 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Fix hover state of License Management dropdown"
parent
4d7f3df2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
22 deletions
+23
-22
ee/app/assets/javascripts/vue_shared/license_management/components/license_management_row.vue
.../license_management/components/license_management_row.vue
+17
-21
ee/changelogs/unreleased/7066-fix-hover-state-of-license-management-dropdown.yml
...d/7066-fix-hover-state-of-license-management-dropdown.yml
+5
-0
ee/spec/javascripts/license_management/components/license_management_row_spec.js
...ense_management/components/license_management_row_spec.js
+1
-1
No files found.
ee/app/assets/javascripts/vue_shared/license_management/components/license_management_row.vue
View file @
121e9022
<
script
>
import
{
mapActions
}
from
'
vuex
'
;
import
{
GlDropdown
,
GlDropdownItem
}
from
'
@gitlab/ui
'
;
import
{
s__
}
from
'
~/locale
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
IssueStatusIcon
from
'
~/reports/components/issue_status_icon.vue
'
;
...
...
@@ -13,6 +14,8 @@ const invisibleClass = 'invisible';
export
default
{
name
:
'
LicenseManagementRow
'
,
components
:
{
GlDropdown
,
GlDropdownItem
,
Icon
,
IssueStatusIcon
,
},
...
...
@@ -56,27 +59,20 @@ export default {
<span
class=
"js-license-name"
>
{{
license
.
name
}}
</span>
<div
class=
"float-right"
>
<div
class=
"d-flex"
>
<div
class=
"dropdown"
>
<button
class=
"btn btn-secondary dropdown-toggle"
type=
"button"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
<icon
class=
"float-right"
name=
"chevron-down"
/>
{{
dropdownText
}}
</button>
<div
class=
"dropdown-menu dropdown-menu-right"
>
<button
class=
"dropdown-item"
type=
"button"
@
click=
"approveLicense(license)"
>
<icon
:class=
"approveIconClass"
name=
"mobile-issue-close"
/>
{{
$options
[
$options
.
LICENSE_APPROVAL_STATUS
.
APPROVED
]
}}
</button>
<button
class=
"dropdown-item"
type=
"button"
@
click=
"blacklistLicense(license)"
>
<icon
:class=
"blacklistIconClass"
name=
"mobile-issue-close"
/>
{{
$options
[
$options
.
LICENSE_APPROVAL_STATUS
.
BLACKLISTED
]
}}
</button>
</div>
</div>
<gl-dropdown
:text=
"dropdownText"
toggle-class=
"d-flex justify-content-between align-items-center"
right
>
<gl-dropdown-item
@
click=
"approveLicense(license)"
>
<icon
:class=
"approveIconClass"
name=
"mobile-issue-close"
/>
{{
$options
[
$options
.
LICENSE_APPROVAL_STATUS
.
APPROVED
]
}}
</gl-dropdown-item>
<gl-dropdown-item
@
click=
"blacklistLicense(license)"
>
<icon
:class=
"blacklistIconClass"
name=
"mobile-issue-close"
/>
{{
$options
[
$options
.
LICENSE_APPROVAL_STATUS
.
BLACKLISTED
]
}}
</gl-dropdown-item>
</gl-dropdown>
<button
class=
"btn btn-blank js-remove-button"
type=
"button"
...
...
ee/changelogs/unreleased/7066-fix-hover-state-of-license-management-dropdown.yml
0 → 100644
View file @
121e9022
---
title
:
Uses GLDropdown for licence management
merge_request
:
9237
author
:
type
:
other
ee/spec/javascripts/license_management/components/license_management_row_spec.js
View file @
121e9022
...
...
@@ -156,7 +156,7 @@ describe('LicenseManagementRow', () => {
});
it
(
'
renders computed property dropdownText into dropdown toggle
'
,
()
=>
{
const
dropdownEl
=
vm
.
$el
.
querySelector
(
'
.dropdown
[data-toggle="dropdown"]
'
);
const
dropdownEl
=
vm
.
$el
.
querySelector
(
'
.dropdown
-toggle
'
);
expect
(
dropdownEl
.
innerText
.
trim
()).
toBe
(
vm
.
dropdownText
);
});
...
...
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