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
02ca34d4
Commit
02ca34d4
authored
Feb 04, 2022
by
David O'Regan
Committed by
Mark Florian
Feb 04, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update badges in states table
Addresses
https://gitlab.com/gitlab-org/gitlab/-/issues/350369
.
parent
eb9d5548
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
15 deletions
+4
-15
app/assets/javascripts/terraform/components/states_table.vue
app/assets/javascripts/terraform/components/states_table.vue
+2
-13
spec/frontend/terraform/components/states_table_spec.js
spec/frontend/terraform/components/states_table_spec.js
+2
-2
No files found.
app/assets/javascripts/terraform/components/states_table.vue
View file @
02ca34d4
<
script
>
<
script
>
import
{
import
{
GlAlert
,
GlBadge
,
GlLink
,
GlLoadingIcon
,
GlSprintf
,
GlTable
,
GlTooltip
}
from
'
@gitlab/ui
'
;
GlAlert
,
GlBadge
,
GlIcon
,
GlLink
,
GlLoadingIcon
,
GlSprintf
,
GlTable
,
GlTooltip
,
}
from
'
@gitlab/ui
'
;
import
{
getIdFromGraphQLId
}
from
'
~/graphql_shared/utils
'
;
import
{
getIdFromGraphQLId
}
from
'
~/graphql_shared/utils
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
s__
}
from
'
~/locale
'
;
import
CiBadge
from
'
~/vue_shared/components/ci_badge_link.vue
'
;
import
CiBadge
from
'
~/vue_shared/components/ci_badge_link.vue
'
;
...
@@ -21,7 +12,6 @@ export default {
...
@@ -21,7 +12,6 @@ export default {
CiBadge
,
CiBadge
,
GlAlert
,
GlAlert
,
GlBadge
,
GlBadge
,
GlIcon
,
GlLink
,
GlLink
,
GlLoadingIcon
,
GlLoadingIcon
,
GlSprintf
,
GlSprintf
,
...
@@ -156,8 +146,7 @@ export default {
...
@@ -156,8 +146,7 @@ export default {
:id=
"`terraformLockedBadgeContainer$
{item.name}`"
:id=
"`terraformLockedBadgeContainer$
{item.name}`"
class="gl-mx-3"
class="gl-mx-3"
>
>
<gl-badge
:id=
"`terraformLockedBadge$
{item.name}`">
<gl-badge
:id=
"`terraformLockedBadge$
{item.name}`" icon="lock">
<gl-icon
name=
"lock"
/>
{{
$options
.
i18n
.
locked
}}
{{
$options
.
i18n
.
locked
}}
</gl-badge>
</gl-badge>
...
...
spec/frontend/terraform/components/states_table_spec.js
View file @
02ca34d4
import
{
Gl
Icon
,
GlLoadingIcon
,
GlTooltip
}
from
'
@gitlab/ui
'
;
import
{
Gl
Badge
,
GlLoadingIcon
,
GlTooltip
}
from
'
@gitlab/ui
'
;
import
{
mount
}
from
'
@vue/test-utils
'
;
import
{
mount
}
from
'
@vue/test-utils
'
;
import
{
nextTick
}
from
'
vue
'
;
import
{
nextTick
}
from
'
vue
'
;
import
{
useFakeDate
}
from
'
helpers/fake_date
'
;
import
{
useFakeDate
}
from
'
helpers/fake_date
'
;
...
@@ -139,7 +139,7 @@ describe('StatesTable', () => {
...
@@ -139,7 +139,7 @@ describe('StatesTable', () => {
const
toolTip
=
state
.
find
(
GlTooltip
);
const
toolTip
=
state
.
find
(
GlTooltip
);
expect
(
state
.
text
()).
toContain
(
name
);
expect
(
state
.
text
()).
toContain
(
name
);
expect
(
state
.
find
(
Gl
Icon
).
exists
()).
toBe
(
locked
);
expect
(
state
.
find
(
Gl
Badge
).
exists
()).
toBe
(
locked
);
expect
(
state
.
find
(
GlLoadingIcon
).
exists
()).
toBe
(
loading
);
expect
(
state
.
find
(
GlLoadingIcon
).
exists
()).
toBe
(
loading
);
expect
(
toolTip
.
exists
()).
toBe
(
locked
);
expect
(
toolTip
.
exists
()).
toBe
(
locked
);
...
...
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