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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
d81ffeac
Commit
d81ffeac
authored
Nov 16, 2017
by
Filipa Lacerda
Committed by
Kamil Trzcinski
Dec 03, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changes after review - improve UX
parent
6957f939
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
34 deletions
+15
-34
app/assets/javascripts/clusters/clusters_bundle.js
app/assets/javascripts/clusters/clusters_bundle.js
+2
-18
app/views/projects/clusters/gcp/_form.html.haml
app/views/projects/clusters/gcp/_form.html.haml
+1
-1
app/views/projects/clusters/gcp/_show.html.haml
app/views/projects/clusters/gcp/_show.html.haml
+5
-5
app/views/projects/clusters/kubernetes/_form.html.haml
app/views/projects/clusters/kubernetes/_form.html.haml
+2
-2
app/views/projects/clusters/kubernetes/_show.html.haml
app/views/projects/clusters/kubernetes/_show.html.haml
+3
-6
app/views/projects/clusters/show.html.haml
app/views/projects/clusters/show.html.haml
+1
-1
spec/javascripts/clusters/clusters_bundle_spec.js
spec/javascripts/clusters/clusters_bundle_spec.js
+1
-1
No files found.
app/assets/javascripts/clusters/clusters_bundle.js
View file @
d81ffeac
...
@@ -60,8 +60,6 @@ export default class Clusters {
...
@@ -60,8 +60,6 @@ export default class Clusters {
this
.
showTokenButton
=
document
.
querySelector
(
'
.js-show-cluster-token
'
);
this
.
showTokenButton
=
document
.
querySelector
(
'
.js-show-cluster-token
'
);
this
.
tokenField
=
document
.
querySelector
(
'
.js-cluster-token
'
);
this
.
tokenField
=
document
.
querySelector
(
'
.js-cluster-token
'
);
this
.
showTokenButtonHasEventListener
=
false
;
initSettingsPanels
();
initSettingsPanels
();
this
.
initApplications
();
this
.
initApplications
();
...
@@ -102,26 +100,13 @@ export default class Clusters {
...
@@ -102,26 +100,13 @@ export default class Clusters {
addListeners
()
{
addListeners
()
{
this
.
toggleButton
.
addEventListener
(
'
click
'
,
this
.
toggle
);
this
.
toggleButton
.
addEventListener
(
'
click
'
,
this
.
toggle
);
this
.
addEventListenerToken
(
);
if
(
this
.
showTokenButton
)
this
.
showTokenButton
.
addEventListener
(
'
click
'
,
this
.
showToken
);
eventHub
.
$on
(
'
installApplication
'
,
this
.
installApplication
);
eventHub
.
$on
(
'
installApplication
'
,
this
.
installApplication
);
}
}
/**
* This button only exists when the cluster is 'created'.
* Because we are polling cluster status we need to make sure we only set one event listener
*/
addEventListenerToken
()
{
if
(
this
.
showTokenButton
&&
!
this
.
showTokenButtonHasEventListener
)
{
this
.
showTokenButtonHasEventListener
=
true
;
this
.
showTokenButton
.
addEventListener
(
'
click
'
,
this
.
showToken
);
}
}
removeListeners
()
{
removeListeners
()
{
this
.
toggleButton
.
removeEventListener
(
'
click
'
,
this
.
toggle
);
this
.
toggleButton
.
removeEventListener
(
'
click
'
,
this
.
toggle
);
if
(
this
.
showTokenButton
)
{
if
(
this
.
showTokenButton
)
this
.
showTokenButton
.
removeEventListener
(
'
click
'
,
this
.
showToken
);
this
.
showTokenButton
.
removeEventListener
(
'
click
'
,
this
.
showToken
);
this
.
showTokenButtonHasEventListener
=
false
;
}
eventHub
.
$off
(
'
installApplication
'
,
this
.
installApplication
);
eventHub
.
$off
(
'
installApplication
'
,
this
.
installApplication
);
}
}
...
@@ -208,7 +193,6 @@ export default class Clusters {
...
@@ -208,7 +193,6 @@ export default class Clusters {
switch
(
status
)
{
switch
(
status
)
{
case
'
created
'
:
case
'
created
'
:
this
.
successContainer
.
classList
.
remove
(
'
hidden
'
);
this
.
successContainer
.
classList
.
remove
(
'
hidden
'
);
this
.
addEventListenerToken
();
break
;
break
;
case
'
errored
'
:
case
'
errored
'
:
this
.
errorContainer
.
classList
.
remove
(
'
hidden
'
);
this
.
errorContainer
.
classList
.
remove
(
'
hidden
'
);
...
...
app/views/projects/clusters/gcp/_form.html.haml
View file @
d81ffeac
...
@@ -30,4 +30,4 @@
...
@@ -30,4 +30,4 @@
=
provider_gcp_field
.
text_field
:machine_type
,
class:
'form-control'
,
placeholder:
'n1-standard-4'
=
provider_gcp_field
.
text_field
:machine_type
,
class:
'form-control'
,
placeholder:
'n1-standard-4'
.form-group
.form-group
=
field
.
submit
s_
(
'ClusterIntegration|Create cluster'
),
class:
'btn btn-s
ave
'
=
field
.
submit
s_
(
'ClusterIntegration|Create cluster'
),
class:
'btn btn-s
uccess
'
app/views/projects/clusters/gcp/_show.html.haml
View file @
d81ffeac
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
%label
.append-bottom-10
{
for:
'cluster-name'
}
%label
.append-bottom-10
{
for:
'cluster-name'
}
=
s_
(
'ClusterIntegration|Cluster name'
)
=
s_
(
'ClusterIntegration|Cluster name'
)
.input-group
.input-group
%input
.form-control.cluster-name
{
value:
@cluster
.
name
,
readonly:
true
}
%input
.form-control.cluster-name
.js-select-on-focus
{
value:
@cluster
.
name
,
readonly:
true
}
%span
.input-group-btn
%span
.input-group-btn
=
clipboard_button
(
text:
@cluster
.
name
,
title:
s_
(
'ClusterIntegration|Copy cluster name'
),
class:
'btn-default'
)
=
clipboard_button
(
text:
@cluster
.
name
,
title:
s_
(
'ClusterIntegration|Copy cluster name'
),
class:
'btn-default'
)
...
@@ -12,21 +12,21 @@
...
@@ -12,21 +12,21 @@
.form-group
.form-group
=
platform_kubernetes_field
.
label
:api_url
,
s_
(
'ClusterIntegration|API URL'
)
=
platform_kubernetes_field
.
label
:api_url
,
s_
(
'ClusterIntegration|API URL'
)
.input-group
.input-group
=
platform_kubernetes_field
.
text_field
:api_url
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|API URL'
),
readonly:
true
=
platform_kubernetes_field
.
text_field
:api_url
,
class:
'form-control
js-select-on-focus
'
,
placeholder:
s_
(
'ClusterIntegration|API URL'
),
readonly:
true
%span
.input-group-btn
%span
.input-group-btn
=
clipboard_button
(
text:
@cluster
.
platform_kubernetes
.
api_url
,
title:
s_
(
'ClusterIntegration|Copy API URL'
),
class:
'btn-default'
)
=
clipboard_button
(
text:
@cluster
.
platform_kubernetes
.
api_url
,
title:
s_
(
'ClusterIntegration|Copy API URL'
),
class:
'btn-default'
)
.form-group
.form-group
=
platform_kubernetes_field
.
label
:ca_cert
,
s_
(
'ClusterIntegration|CA Certificate'
)
=
platform_kubernetes_field
.
label
:ca_cert
,
s_
(
'ClusterIntegration|CA Certificate'
)
.input-group
.input-group
=
platform_kubernetes_field
.
text_area
:ca_cert
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Certificate Authority bundle (PEM format)'
),
readonly:
true
=
platform_kubernetes_field
.
text_area
:ca_cert
,
class:
'form-control
js-select-on-focus
'
,
placeholder:
s_
(
'ClusterIntegration|Certificate Authority bundle (PEM format)'
),
readonly:
true
%span
.input-group-addon.clipboard-addon
%span
.input-group-addon.clipboard-addon
=
clipboard_button
(
text:
@cluster
.
platform_kubernetes
.
ca_cert
,
title:
s_
(
'ClusterIntegration|Copy CA Certificate'
),
class:
'btn-blank'
)
=
clipboard_button
(
text:
@cluster
.
platform_kubernetes
.
ca_cert
,
title:
s_
(
'ClusterIntegration|Copy CA Certificate'
),
class:
'btn-blank'
)
.form-group
.form-group
=
platform_kubernetes_field
.
label
:token
,
s_
(
'ClusterIntegration|Token'
)
=
platform_kubernetes_field
.
label
:token
,
s_
(
'ClusterIntegration|Token'
)
.input-group
.input-group
=
platform_kubernetes_field
.
text_field
:token
,
class:
'form-control js-cluster-token'
,
type:
'password'
,
placeholder:
s_
(
'ClusterIntegration|Token'
),
readonly:
true
=
platform_kubernetes_field
.
text_field
:token
,
class:
'form-control js-cluster-token
js-select-on-focus
'
,
type:
'password'
,
placeholder:
s_
(
'ClusterIntegration|Token'
),
readonly:
true
%span
.input-group-btn
%span
.input-group-btn
%button
.btn.btn-default.js-show-cluster-token
{
type:
'button'
}
%button
.btn.btn-default.js-show-cluster-token
{
type:
'button'
}
=
s_
(
'ClusterIntegration|Show'
)
=
s_
(
'ClusterIntegration|Show'
)
...
@@ -37,4 +37,4 @@
...
@@ -37,4 +37,4 @@
=
platform_kubernetes_field
.
text_field
:namespace
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Project namespace'
)
=
platform_kubernetes_field
.
text_field
:namespace
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Project namespace'
)
.form-group
.form-group
=
field
.
submit
s_
(
'ClusterIntegration|Save changes'
),
class:
'btn btn-s
ave
'
=
field
.
submit
s_
(
'ClusterIntegration|Save changes'
),
class:
'btn btn-s
uccess
'
app/views/projects/clusters/kubernetes/_form.html.haml
View file @
d81ffeac
...
@@ -15,11 +15,11 @@
...
@@ -15,11 +15,11 @@
.form-group
.form-group
=
platform_kubernetes_field
.
label
:token
,
s_
(
'ClusterIntegration|Token'
)
=
platform_kubernetes_field
.
label
:token
,
s_
(
'ClusterIntegration|Token'
)
=
platform_kubernetes_field
.
text_field
:token
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Service token'
)
=
platform_kubernetes_field
.
text_field
:token
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Service token'
)
,
autocomplete:
'off'
.form-group
.form-group
=
platform_kubernetes_field
.
label
:namespace
,
s_
(
'ClusterIntegration|Project namespace (optional, unique)'
)
=
platform_kubernetes_field
.
label
:namespace
,
s_
(
'ClusterIntegration|Project namespace (optional, unique)'
)
=
platform_kubernetes_field
.
text_field
:namespace
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Project namespace'
)
=
platform_kubernetes_field
.
text_field
:namespace
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Project namespace'
)
.form-group
.form-group
=
field
.
submit
s_
(
'ClusterIntegration|Add cluster'
),
class:
'btn btn-s
ave
'
=
field
.
submit
s_
(
'ClusterIntegration|Add cluster'
),
class:
'btn btn-s
uccess
'
app/views/projects/clusters/kubernetes/_show.html.haml
View file @
d81ffeac
.form-group
.form-group
%label
.append-bottom-10
{
for:
'cluster-name'
}
%label
.append-bottom-10
{
for:
'cluster-name'
}
=
s_
(
'ClusterIntegration|Cluster name'
)
=
s_
(
'ClusterIntegration|Cluster name'
)
.input-group
%input
.form-control.cluster-name
{
value:
@cluster
.
name
}
%input
.form-control.cluster-name
{
value:
@cluster
.
name
}
%span
.input-group-addon.clipboard-addon
=
clipboard_button
(
text:
@cluster
.
name
,
title:
s_
(
'ClusterIntegration|Copy cluster name'
))
=
form_for
@cluster
,
url:
namespace_project_cluster_path
(
@project
.
namespace
,
@project
,
@cluster
),
as: :cluster
do
|
field
|
=
form_for
@cluster
,
url:
namespace_project_cluster_path
(
@project
.
namespace
,
@project
,
@cluster
),
as: :cluster
do
|
field
|
=
form_errors
(
@cluster
)
=
form_errors
(
@cluster
)
...
@@ -20,7 +17,7 @@
...
@@ -20,7 +17,7 @@
.form-group
.form-group
=
platform_kubernetes_field
.
label
:token
,
s_
(
'ClusterIntegration|Token'
)
=
platform_kubernetes_field
.
label
:token
,
s_
(
'ClusterIntegration|Token'
)
.input-group
.input-group
=
platform_kubernetes_field
.
text_field
:token
,
class:
'form-control js-cluster-token'
,
type:
'password'
,
placeholder:
s_
(
'ClusterIntegration|Token'
)
=
platform_kubernetes_field
.
text_field
:token
,
class:
'form-control js-cluster-token'
,
type:
'password'
,
placeholder:
s_
(
'ClusterIntegration|Token'
)
,
autocomplete:
'off'
%span
.input-group-addon.clipboard-addon
%span
.input-group-addon.clipboard-addon
%button
.js-show-cluster-token.btn-blank
{
type:
'button'
}
%button
.js-show-cluster-token.btn-blank
{
type:
'button'
}
=
s_
(
'ClusterIntegration|Show'
)
=
s_
(
'ClusterIntegration|Show'
)
...
@@ -30,4 +27,4 @@
...
@@ -30,4 +27,4 @@
=
platform_kubernetes_field
.
text_field
:namespace
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Project namespace'
)
=
platform_kubernetes_field
.
text_field
:namespace
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Project namespace'
)
.form-group
.form-group
=
field
.
submit
s_
(
'ClusterIntegration|Save changes'
),
class:
'btn btn-s
ave
'
=
field
.
submit
s_
(
'ClusterIntegration|Save changes'
),
class:
'btn btn-s
uccess
'
app/views/projects/clusters/show.html.haml
View file @
d81ffeac
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
=
s_
(
'ClusterIntegration|Cluster is being created on Google Container Engine...'
)
=
s_
(
'ClusterIntegration|Cluster is being created on Google Container Engine...'
)
.hidden.js-cluster-success.alert.alert-success.alert-block.append-bottom-10
{
role:
'alert'
}
.hidden.js-cluster-success.alert.alert-success.alert-block.append-bottom-10
{
role:
'alert'
}
=
s_
(
'ClusterIntegration|Cluster was successfully created on Google Container Engine'
)
=
s_
(
'ClusterIntegration|Cluster was successfully created on Google Container Engine
. Refresh this page to see cluster\'s details
'
)
%p
%p
-
if
@cluster
.
enabled?
-
if
@cluster
.
enabled?
...
...
spec/javascripts/clusters/clusters_bundle_spec.js
View file @
d81ffeac
...
@@ -127,7 +127,7 @@ describe('Clusters', () => {
...
@@ -127,7 +127,7 @@ describe('Clusters', () => {
});
});
describe
(
'
when cluster is created
'
,
()
=>
{
describe
(
'
when cluster is created
'
,
()
=>
{
it
(
'
should show the success container
'
,
()
=>
{
it
(
'
should show the success container
and fresh the page
'
,
()
=>
{
cluster
.
updateContainer
(
null
,
'
created
'
);
cluster
.
updateContainer
(
null
,
'
created
'
);
expect
(
expect
(
...
...
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