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
0c27de5f
Commit
0c27de5f
authored
Nov 07, 2017
by
Eric Eastwood
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update Cluster application install to be enabled when errored
parent
68a92295
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/clusters/components/application_row.vue
...ssets/javascripts/clusters/components/application_row.vue
+1
-1
spec/javascripts/clusters/components/application_row_spec.js
spec/javascripts/clusters/components/application_row_spec.js
+2
-2
No files found.
app/assets/javascripts/clusters/components/application_row.vue
View file @
0c27de5f
...
@@ -66,7 +66,7 @@ export default {
...
@@ -66,7 +66,7 @@ export default {
// Avoid the potential for the real-time data to say APPLICATION_INSTALLABLE but
// Avoid the potential for the real-time data to say APPLICATION_INSTALLABLE but
// we already made a request to install and are just waiting for the real-time
// we already made a request to install and are just waiting for the real-time
// to sync up.
// to sync up.
return
this
.
status
!==
APPLICATION_INSTALLABLE
||
return
(
this
.
status
!==
APPLICATION_INSTALLABLE
&&
this
.
status
!==
APPLICATION_ERROR
)
||
this
.
requestStatus
===
REQUEST_LOADING
||
this
.
requestStatus
===
REQUEST_LOADING
||
this
.
requestStatus
===
REQUEST_SUCCESS
;
this
.
requestStatus
===
REQUEST_SUCCESS
;
},
},
...
...
spec/javascripts/clusters/components/application_row_spec.js
View file @
0c27de5f
...
@@ -117,7 +117,7 @@ describe('Application Row', () => {
...
@@ -117,7 +117,7 @@ describe('Application Row', () => {
expect
(
vm
.
installButtonDisabled
).
toEqual
(
true
);
expect
(
vm
.
installButtonDisabled
).
toEqual
(
true
);
});
});
it
(
'
has
dis
abled "Install" when APPLICATION_ERROR
'
,
()
=>
{
it
(
'
has
en
abled "Install" when APPLICATION_ERROR
'
,
()
=>
{
vm
=
mountComponent
(
ApplicationRow
,
{
vm
=
mountComponent
(
ApplicationRow
,
{
...
DEFAULT_APPLICATION_STATE
,
...
DEFAULT_APPLICATION_STATE
,
status
:
APPLICATION_ERROR
,
status
:
APPLICATION_ERROR
,
...
@@ -125,7 +125,7 @@ describe('Application Row', () => {
...
@@ -125,7 +125,7 @@ describe('Application Row', () => {
expect
(
vm
.
installButtonLabel
).
toEqual
(
'
Install
'
);
expect
(
vm
.
installButtonLabel
).
toEqual
(
'
Install
'
);
expect
(
vm
.
installButtonLoading
).
toEqual
(
false
);
expect
(
vm
.
installButtonLoading
).
toEqual
(
false
);
expect
(
vm
.
installButtonDisabled
).
toEqual
(
tru
e
);
expect
(
vm
.
installButtonDisabled
).
toEqual
(
fals
e
);
});
});
it
(
'
has loading "Install" when REQUEST_LOADING
'
,
()
=>
{
it
(
'
has loading "Install" when REQUEST_LOADING
'
,
()
=>
{
...
...
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