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
5e079725
Commit
5e079725
authored
Oct 27, 2021
by
anna_vovchenko
Committed by
Nicolò Maria Mezzopera
Oct 29, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implemented suggested change after FE review
parent
00d9a468
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
34 deletions
+15
-34
app/assets/javascripts/clusters_list/components/clusters.vue
app/assets/javascripts/clusters_list/components/clusters.vue
+4
-4
app/assets/javascripts/clusters_list/components/clusters_empty_state.vue
...scripts/clusters_list/components/clusters_empty_state.vue
+3
-7
app/views/clusters/clusters/_cluster_list.html.haml
app/views/clusters/clusters/_cluster_list.html.haml
+8
-7
spec/frontend/clusters_list/components/clusters_empty_state_spec.js
...end/clusters_list/components/clusters_empty_state_spec.js
+0
-1
spec/frontend/clusters_list/components/clusters_spec.js
spec/frontend/clusters_list/components/clusters_spec.js
+0
-15
No files found.
app/assets/javascripts/clusters_list/components/clusters.vue
View file @
5e079725
...
...
@@ -247,7 +247,7 @@ export default {
<gl-skeleton-loading
v-else-if=
"loadingNodes"
:lines=
"1"
:class=
"contentAlignClasses"
/>
<
NodeErrorHelpT
ext
<
node-error-help-t
ext
v-else-if=
"item.kubernetes_errors"
:class=
"contentAlignClasses"
:error-type=
"item.kubernetes_errors.connection_error"
...
...
@@ -268,7 +268,7 @@ export default {
<gl-skeleton-loading
v-else-if=
"loadingNodes"
:lines=
"1"
:class=
"contentAlignClasses"
/>
<
NodeErrorHelpT
ext
<
node-error-help-t
ext
v-else-if=
"item.kubernetes_errors"
:class=
"contentAlignClasses"
:error-type=
"item.kubernetes_errors.node_connection_error"
...
...
@@ -289,7 +289,7 @@ export default {
<gl-skeleton-loading
v-else-if=
"loadingNodes"
:lines=
"1"
:class=
"contentAlignClasses"
/>
<
NodeErrorHelpT
ext
<
node-error-help-t
ext
v-else-if=
"item.kubernetes_errors"
:class=
"contentAlignClasses"
:error-type=
"item.kubernetes_errors.metrics_connection_error"
...
...
@@ -304,7 +304,7 @@ export default {
</
template
>
</gl-table>
<
ClustersEmptyS
tate
v-else
/>
<
clusters-empty-s
tate
v-else
/>
<gl-pagination
v-if=
"hasClustersPerPage"
...
...
app/assets/javascripts/clusters_list/components/clusters_empty_state.vue
View file @
5e079725
...
...
@@ -23,7 +23,7 @@ export default {
:title=
"s__('ClusterIntegration|Integrate Kubernetes with a cluster certificate')"
>
<template
#description
>
<p
class=
"
mw-460 gl-mx-auto
gl-text-left"
>
<p
class=
"gl-text-left"
>
{{
s__
(
'
ClusterIntegration|Kubernetes clusters allow you to use review apps, deploy your applications, run your pipelines, and much more in an easy way.
'
,
...
...
@@ -31,15 +31,11 @@ export default {
}}
</p>
<p
v-if=
"emptyStateHelpText"
class=
"mw-460 gl-mx-auto gl-text-left"
data-testid=
"clusters-empty-state-text"
>
<p
v-if=
"emptyStateHelpText"
class=
"gl-text-left"
data-testid=
"clusters-empty-state-text"
>
{{
emptyStateHelpText
}}
</p>
<p
class=
"mw-460 gl-mx-auto"
>
<p>
<gl-link
:href=
"$options.learnMoreHelpUrl"
target=
"_blank"
data-testid=
"clusters-docs-link"
>
{{
s__
(
'
ClusterIntegration|Learn more about Kubernetes
'
)
}}
</gl-link>
...
...
app/views/clusters/clusters/_cluster_list.html.haml
View file @
5e079725
.top-area.adjust
.gl-display-block.gl-text-right.gl-my-4.gl-w-full
-
if
clusterable
.
can_add_cluster?
=
link_to
s_
(
'ClusterIntegration|Connect cluster with certificate'
),
clusterable
.
new_path
,
class:
'btn gl-button btn-confirm js-add-cluster gl-py-2'
,
qa_selector: :integrate_kubernetes_cluster_button
-
else
%span
.btn.gl-button.btn-confirm.js-add-cluster.disabled.gl-py-2
=
s_
(
"ClusterIntegration|Connect cluster with certificate"
)
-
if
!
clusters
.
empty?
.top-area.adjust
.gl-display-block.gl-text-right.gl-my-4.gl-w-full
-
if
clusterable
.
can_add_cluster?
=
link_to
s_
(
'ClusterIntegration|Connect cluster with certificate'
),
clusterable
.
new_path
,
class:
'btn gl-button btn-confirm js-add-cluster gl-py-2'
,
qa_selector: :integrate_kubernetes_cluster_button
-
else
%span
.btn.gl-button.btn-confirm.js-add-cluster.disabled.gl-py-2
=
s_
(
"ClusterIntegration|Connect cluster with certificate"
)
#js-clusters-list-app
{
data:
js_clusters_list_data
(
clusterable
)
}
spec/frontend/clusters_list/components/clusters_empty_state_spec.js
View file @
5e079725
...
...
@@ -62,7 +62,6 @@ describe('ClustersEmptyStateComponent', () => {
});
it
(
'
should show the empty state text
'
,
()
=>
{
expect
(
findEmptyStateText
().
exists
()).
toBe
(
true
);
expect
(
findEmptyStateText
().
text
()).
toBe
(
emptyStateHelpText
);
});
});
...
...
spec/frontend/clusters_list/components/clusters_spec.js
View file @
5e079725
...
...
@@ -95,21 +95,6 @@ describe('Clusters', () => {
it
(
'
displays a table component
'
,
()
=>
{
expect
(
findTable
().
exists
()).
toBe
(
true
);
});
it
(
'
renders the correct table headers
'
,
()
=>
{
const
tableHeaders
=
wrapper
.
vm
.
fields
;
const
headers
=
findTable
().
findAll
(
'
th
'
);
expect
(
headers
.
length
).
toBe
(
tableHeaders
.
length
);
tableHeaders
.
forEach
((
headerText
,
i
)
=>
expect
(
headers
.
at
(
i
).
text
()).
toEqual
(
headerText
.
label
),
);
});
it
(
'
should stack on smaller devices
'
,
()
=>
{
expect
(
findTable
().
classes
()).
toContain
(
'
b-table-stacked-md
'
);
});
});
describe
(
'
when there are no clusters
'
,
()
=>
{
...
...
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