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
e6c191d8
Commit
e6c191d8
authored
May 12, 2021
by
Chloe Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add qa selector to cloud license page
Update frontend spec
parent
2fb5ef0c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
5 deletions
+15
-5
ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_details_history.vue
...loud_licenses/components/subscription_details_history.vue
+1
-0
ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_details_table.vue
.../cloud_licenses/components/subscription_details_table.vue
+9
-1
ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_details_user_info.vue
...ud_licenses/components/subscription_details_user_info.vue
+4
-4
ee/spec/frontend/admin/cloud_licenses/components/subscription_details_table_spec.js
...ud_licenses/components/subscription_details_table_spec.js
+1
-0
No files found.
ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_details_history.vue
View file @
e6c191d8
...
@@ -139,6 +139,7 @@ export default {
...
@@ -139,6 +139,7 @@ export default {
:tbody-tr-class=
"rowClass"
:tbody-tr-class=
"rowClass"
responsive
responsive
stacked=
"sm"
stacked=
"sm"
data-qa-selector=
"subscription_history"
>
>
<template
#cell(type)=
"
{ value }">
<template
#cell(type)=
"
{ value }">
<gl-badge
size=
"md"
variant=
"info"
>
{{
value
}}
</gl-badge>
<gl-badge
size=
"md"
variant=
"info"
>
{{
value
}}
</gl-badge>
...
...
ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_details_table.vue
View file @
e6c191d8
<
script
>
<
script
>
import
{
GlSkeletonLoader
,
GlTable
}
from
'
@gitlab/ui
'
;
import
{
GlSkeletonLoader
,
GlTable
}
from
'
@gitlab/ui
'
;
import
ClipboardButton
from
'
~/vue_shared/components/clipboard_button.vue
'
;
import
ClipboardButton
from
'
~/vue_shared/components/clipboard_button.vue
'
;
import
{
slugifyWithUnderscore
}
from
'
~/lib/utils/text_utility
'
;
import
{
copySubscriptionIdButtonText
}
from
'
../constants
'
;
import
{
copySubscriptionIdButtonText
}
from
'
../constants
'
;
const
placeholderHeightFactor
=
32
;
const
placeholderHeightFactor
=
32
;
...
@@ -60,6 +61,9 @@ export default {
...
@@ -60,6 +61,9 @@ export default {
placeHolderPosition
(
index
)
{
placeHolderPosition
(
index
)
{
return
(
index
-
1
)
*
placeholderHeightFactor
;
return
(
index
-
1
)
*
placeholderHeightFactor
;
},
},
qaSelectorValue
(
label
)
{
return
slugifyWithUnderscore
(
label
.
toLowerCase
());
},
},
},
};
};
</
script
>
</
script
>
...
@@ -73,7 +77,11 @@ export default {
...
@@ -73,7 +77,11 @@ export default {
</
template
>
</
template
>
<
template
#cell(value)=
"{ item, value }"
>
<
template
#cell(value)=
"{ item, value }"
>
<p
class=
"gl-relative"
data-testid=
"details-content"
>
<p
class=
"gl-relative"
data-testid=
"details-content"
:data-qa-selector=
"qaSelectorValue(item.label)"
>
{{
value
||
'
-
'
}}
{{
value
||
'
-
'
}}
<clipboard-button
<clipboard-button
v-if=
"item.canCopy"
v-if=
"item.canCopy"
...
...
ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_details_user_info.vue
View file @
e6c191d8
...
@@ -65,7 +65,7 @@ export default {
...
@@ -65,7 +65,7 @@ export default {
<div
class=
"col-md-6 gl-mb-5"
>
<div
class=
"col-md-6 gl-mb-5"
>
<gl-card
data-testid=
"users-in-subscription"
>
<gl-card
data-testid=
"users-in-subscription"
>
<header>
<header>
<h2>
{{
usersInSubscription
}}
</h2>
<h2
data-qa-selector=
"users_in_subscription"
>
{{
usersInSubscription
}}
</h2>
<h5
class=
"gl-font-weight-normal text-uppercase"
>
<h5
class=
"gl-font-weight-normal text-uppercase"
>
{{
$options
.
i18n
.
usersInSubscriptionTitle
}}
{{
$options
.
i18n
.
usersInSubscriptionTitle
}}
</h5>
</h5>
...
@@ -79,7 +79,7 @@ export default {
...
@@ -79,7 +79,7 @@ export default {
<div
class=
"col-md-6 gl-mb-5"
>
<div
class=
"col-md-6 gl-mb-5"
>
<gl-card
data-testid=
"billable-users"
>
<gl-card
data-testid=
"billable-users"
>
<header>
<header>
<h2>
{{
billableUsers
}}
</h2>
<h2
data-qa-selector=
"billable_users"
>
{{
billableUsers
}}
</h2>
<h5
class=
"gl-font-weight-normal text-uppercase"
>
<h5
class=
"gl-font-weight-normal text-uppercase"
>
{{
$options
.
i18n
.
billableUsersTitle
}}
{{
$options
.
i18n
.
billableUsersTitle
}}
</h5>
</h5>
...
@@ -99,7 +99,7 @@ export default {
...
@@ -99,7 +99,7 @@ export default {
<div
class=
"col-md-6 gl-mb-5"
>
<div
class=
"col-md-6 gl-mb-5"
>
<gl-card
data-testid=
"maximum-users"
>
<gl-card
data-testid=
"maximum-users"
>
<header>
<header>
<h2>
{{ maximumUsers }}
</h2>
<h2
data-qa-selector=
"maximum_users"
>
{{ maximumUsers }}
</h2>
<h5
class=
"gl-font-weight-normal text-uppercase"
>
<h5
class=
"gl-font-weight-normal text-uppercase"
>
{{ $options.i18n.maximumUsersTitle }}
{{ $options.i18n.maximumUsersTitle }}
</h5>
</h5>
...
@@ -113,7 +113,7 @@ export default {
...
@@ -113,7 +113,7 @@ export default {
<div
class=
"col-md-6 gl-mb-5"
>
<div
class=
"col-md-6 gl-mb-5"
>
<gl-card
data-testid=
"users-over-license"
>
<gl-card
data-testid=
"users-over-license"
>
<header>
<header>
<h2>
{{ usersOverSubscription }}
</h2>
<h2
data-qa-selector=
"users_over_subscription"
>
{{ usersOverSubscription }}
</h2>
<h5
class=
"gl-font-weight-normal text-uppercase"
>
<h5
class=
"gl-font-weight-normal text-uppercase"
>
{{ $options.i18n.usersOverSubscriptionTitle }}
{{ $options.i18n.usersOverSubscriptionTitle }}
</h5>
</h5>
...
...
ee/spec/frontend/admin/cloud_licenses/components/subscription_details_table_spec.js
View file @
e6c191d8
...
@@ -60,6 +60,7 @@ describe('Subscription Details Table', () => {
...
@@ -60,6 +60,7 @@ describe('Subscription Details Table', () => {
beforeEach
(()
=>
{
beforeEach
(()
=>
{
createComponent
([
createComponent
([
{
{
label
:
'
label
'
,
value
:
'
Something to copy
'
,
value
:
'
Something to copy
'
,
canCopy
:
true
,
canCopy
:
true
,
},
},
...
...
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