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
b68bcd1e
Commit
b68bcd1e
authored
Sep 23, 2020
by
Emily Ring
Committed by
Bob Van Landuyt
Sep 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable new cluster list design
parent
243aa5ab
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
49 additions
and
10 deletions
+49
-10
app/assets/javascripts/clusters_list/components/clusters.vue
app/assets/javascripts/clusters_list/components/clusters.vue
+7
-1
app/views/clusters/clusters/index.html.haml
app/views/clusters/clusters/index.html.haml
+2
-2
changelogs/unreleased/220182-remove-feature-flag.yml
changelogs/unreleased/220182-remove-feature-flag.yml
+5
-0
config/feature_flags/development/clusters_list_redesign.yml
config/feature_flags/development/clusters_list_redesign.yml
+4
-4
spec/features/projects/clusters_spec.rb
spec/features/projects/clusters_spec.rb
+31
-3
No files found.
app/assets/javascripts/clusters_list/components/clusters.vue
View file @
b68bcd1e
...
...
@@ -201,7 +201,13 @@ export default {
<section
v-else
>
<ancestor-notice
/>
<gl-table
:items=
"clusters"
:fields=
"fields"
stacked=
"md"
class=
"qa-clusters-table"
>
<gl-table
:items=
"clusters"
:fields=
"fields"
stacked=
"md"
class=
"qa-clusters-table"
data-testid=
"cluster_list_table"
>
<template
#cell(name)=
"
{ item }">
<div
:class=
"[contentAlignClasses, 'js-status']"
>
<img
...
...
app/views/clusters/clusters/index.html.haml
View file @
b68bcd1e
...
...
@@ -12,7 +12,7 @@
=
s_
(
'ClusterIntegration|Kubernetes clusters can be used to deploy applications and to provide Review Apps for this project'
)
=
render
'clusters/clusters/buttons'
-
if
Feature
.
enabled?
(
:clusters_list_redesign
)
-
if
Feature
.
enabled?
(
:clusters_list_redesign
,
default_enabled:
true
)
#js-clusters-list-app
{
data:
js_clusters_list_data
(
clusterable
.
index_path
(
format: :json
))
}
-
else
-
if
@has_ancestor_clusters
...
...
@@ -20,7 +20,7 @@
=
s_
(
'ClusterIntegration|Clusters are utilized by selecting the nearest ancestor with a matching environment scope. For example, project clusters will override group clusters.'
)
%strong
=
link_to
_
(
'More information'
),
help_page_path
(
'user/group/clusters/index'
,
anchor:
'cluster-precedence'
)
.clusters-table.js-clusters-list
.clusters-table.js-clusters-list
{
data:
{
testid:
'cluster_list_table'
}
}
.gl-responsive-table-row.table-row-header
{
role:
"row"
}
.table-section.section-60
{
role:
"rowheader"
}
=
s_
(
"ClusterIntegration|Kubernetes cluster"
)
...
...
changelogs/unreleased/220182-remove-feature-flag.yml
0 → 100644
View file @
b68bcd1e
---
title
:
Display cluster list node information
merge_request
:
42396
author
:
type
:
added
config/feature_flags/development/clusters_list_redesign.yml
View file @
b68bcd1e
---
name
:
clusters_list_redesign
introduced_by_url
:
rollout_issue_url
:
group
:
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/220182
group
:
Configure
type
:
development
default_enabled
:
fals
e
default_enabled
:
tru
e
spec/features/projects/clusters_spec.rb
View file @
b68bcd1e
...
...
@@ -11,6 +11,10 @@ RSpec.describe 'Clusters', :js do
before
do
project
.
add_maintainer
(
user
)
gitlab_sign_in
(
user
)
end
context
'when clusters_list_redesign feature flag is disabled'
do
before
do
stub_feature_flags
(
clusters_list_redesign:
false
)
end
...
...
@@ -25,6 +29,31 @@ RSpec.describe 'Clusters', :js do
end
end
context
'when user has a cluster and visits cluster index page'
do
let!
(
:cluster
)
{
create
(
:cluster
,
:project
,
:provided_by_gcp
)
}
let
(
:project
)
{
cluster
.
project
}
before
do
visit
project_clusters_path
(
project
)
end
it
'user sees a table with one cluster'
do
expect
(
page
).
to
have_selector
(
'[data-testid="cluster_list_table"] .card-body'
,
count:
1
)
end
end
end
context
'when user does not have a cluster and visits cluster index page'
do
before
do
visit
project_clusters_path
(
project
)
end
it
'sees empty state'
do
expect
(
page
).
to
have_link
(
'Add Kubernetes cluster'
)
expect
(
page
).
to
have_selector
(
'.empty-state'
)
end
end
context
'when user has a cluster'
do
before
do
allow_any_instance_of
(
Clusters
::
Cluster
).
to
receive
(
:retrieve_connection_status
).
and_return
(
:connected
)
...
...
@@ -196,8 +225,7 @@ RSpec.describe 'Clusters', :js do
end
it
'user sees a table with one cluster'
do
# One is the header row, the other the cluster row
expect
(
page
).
to
have_selector
(
'.gl-responsive-table-row'
,
count:
2
)
expect
(
page
).
to
have_selector
(
'[data-testid="cluster_list_table"] tbody tr'
,
count:
1
)
end
context
'when user clicks on a cluster'
do
...
...
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