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
d9fdbde1
Commit
d9fdbde1
authored
Jun 07, 2020
by
Fernando
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
First pass at implementing design
parent
eb770e7f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
36 additions
and
8 deletions
+36
-8
ee/app/assets/javascripts/vue_shared/license_compliance/license_management.vue
...ipts/vue_shared/license_compliance/license_management.vue
+36
-8
No files found.
ee/app/assets/javascripts/vue_shared/license_compliance/license_management.vue
View file @
d9fdbde1
<
script
>
<
script
>
import
{
mapState
,
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
mapState
,
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
GlButton
,
GlLoadingIcon
}
from
'
@gitlab/ui
'
;
import
{
GlButton
,
GlLoadingIcon
,
GlIcon
,
GlPopover
}
from
'
@gitlab/ui
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
s__
}
from
'
~/locale
'
;
import
glFeatureFlagsMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
glFeatureFlagsMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
{
LICENSE_MANAGEMENT
}
from
'
ee/vue_shared/license_compliance/store/constants
'
;
import
{
LICENSE_MANAGEMENT
}
from
'
ee/vue_shared/license_compliance/store/constants
'
;
...
@@ -20,6 +20,8 @@ export default {
...
@@ -20,6 +20,8 @@ export default {
LicenseManagementRow
,
LicenseManagementRow
,
GlButton
,
GlButton
,
GlLoadingIcon
,
GlLoadingIcon
,
GlIcon
,
GlPopover
,
PaginatedList
,
PaginatedList
,
LicenseApprovals
,
LicenseApprovals
,
},
},
...
@@ -77,13 +79,13 @@ export default {
...
@@ -77,13 +79,13 @@ export default {
<
template
>
<
template
>
<gl-loading-icon
v-if=
"showLoadingSpinner"
/>
<gl-loading-icon
v-if=
"showLoadingSpinner"
/>
<div
v-else
class=
"license-management"
>
<div
v-else
class=
"license-management"
>
<delete-confirmation-modal
v-if=
"isAdmin"
/>
<delete-confirmation-modal
v-if=
"
false &&
isAdmin"
/>
<paginated-list
<paginated-list
:list=
"managedLicenses"
:list=
"managedLicenses"
:empty-search-message=
"$options.emptySearchMessage"
:empty-search-message=
"$options.emptySearchMessage"
:empty-message=
"$options.emptyMessage"
:empty-message=
"$options.emptyMessage"
:filterable=
"isAdmin"
:filterable=
"
false &&
isAdmin"
filter=
"name"
filter=
"name"
data-qa-selector=
"license_compliance_list"
data-qa-selector=
"license_compliance_list"
>
>
...
@@ -104,14 +106,40 @@ export default {
...
@@ -104,14 +106,40 @@ export default {
<template
v-else
>
<template
v-else
>
<div
<div
v-for=
"header in tableHeaders"
:key=
"header.label"
class=
"table-section"
class=
"table-section"
:class=
"
header
.className"
:class=
"
tableHeaders[0]
.className"
role=
"rowheader"
role=
"rowheader"
>
>
{{
header
.
label
}}
{{
tableHeaders
[
0
].
label
}}
<gl-icon
ref=
"reportInfo"
name=
"question"
class=
"text-info"
:aria-label=
"__('help')"
:size=
"14"
/>
<gl-popover
:target=
"() => $refs.reportInfo.$el"
placement=
"bottom"
triggers=
"click blur"
:title=
"title"
>
<h5>
Allowed
</h5>
<span
class=
"text-secondary"
>
{{
s__
(
'
Licenses|Acceptable license to be used in the project
'
)
}}
</span>
<h5>
Denied
</h5>
<span
class=
"text-secondary"
>
{{
s__
(
'
Licenses|Dissallow Merge request if detected and will instruct the developer to remove
'
)
}}
</span>
</gl-popover>
</div>
<div
class=
"table-section"
:class=
"tableHeaders[1].className"
role=
"rowheader"
>
{{
tableHeaders
[
1
].
label
}}
</div>
</div>
</
template
>
</
template
>
</template>
</template>
...
@@ -128,7 +156,7 @@ export default {
...
@@ -128,7 +156,7 @@ export default {
<
template
#default=
"{ listItem }"
>
<
template
#default=
"{ listItem }"
>
<admin-license-management-row
<admin-license-management-row
v-if=
"isAdmin"
v-if=
"
false &&
isAdmin"
:license=
"listItem"
:license=
"listItem"
:loading=
"isLicenseBeingUpdated(listItem.id)"
:loading=
"isLicenseBeingUpdated(listItem.id)"
/>
/>
...
...
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