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
c72cf879
Commit
c72cf879
authored
Nov 05, 2018
by
Mike Greiling
Committed by
Thong Kuah
Nov 08, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Define cluster types in a constant within frontend
parent
1eadb490
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+3
-3
app/assets/javascripts/clusters/constants.js
app/assets/javascripts/clusters/constants.js
+7
-0
No files found.
app/assets/javascripts/clusters/components/applications.vue
View file @
c72cf879
...
@@ -13,7 +13,7 @@ import prometheusLogo from 'images/cluster_app_logos/prometheus.png';
...
@@ -13,7 +13,7 @@ import prometheusLogo from 'images/cluster_app_logos/prometheus.png';
import
{
s__
,
sprintf
}
from
'
../../locale
'
;
import
{
s__
,
sprintf
}
from
'
../../locale
'
;
import
applicationRow
from
'
./application_row.vue
'
;
import
applicationRow
from
'
./application_row.vue
'
;
import
clipboardButton
from
'
../../vue_shared/components/clipboard_button.vue
'
;
import
clipboardButton
from
'
../../vue_shared/components/clipboard_button.vue
'
;
import
{
APPLICATION_STATUS
,
INGRESS
}
from
'
../constants
'
;
import
{
CLUSTER_TYPE
,
APPLICATION_STATUS
,
INGRESS
}
from
'
../constants
'
;
export
default
{
export
default
{
components
:
{
components
:
{
...
@@ -24,7 +24,7 @@ export default {
...
@@ -24,7 +24,7 @@ export default {
type
:
{
type
:
{
type
:
String
,
type
:
String
,
required
:
false
,
required
:
false
,
default
:
'
project_type
'
,
default
:
CLUSTER_TYPE
.
PROJECT
,
},
},
applications
:
{
applications
:
{
type
:
Object
,
type
:
Object
,
...
@@ -65,7 +65,7 @@ export default {
...
@@ -65,7 +65,7 @@ export default {
}),
}),
computed
:
{
computed
:
{
isProjectCluster
()
{
isProjectCluster
()
{
return
this
.
type
===
'
project_type
'
;
return
this
.
type
===
CLUSTER_TYPE
.
PROJECT
;
},
},
helmInstalled
()
{
helmInstalled
()
{
return
(
return
(
...
...
app/assets/javascripts/clusters/constants.js
View file @
c72cf879
// These need to match the enum found in app/models/clusters/cluster.rb
export
const
CLUSTER_TYPE
=
{
INSTANCE
:
'
instance_type
'
,
GROUP
:
'
group_type
'
,
PROJECT
:
'
project_type
'
,
};
// These need to match what is returned from the server
// These need to match what is returned from the server
export
const
APPLICATION_STATUS
=
{
export
const
APPLICATION_STATUS
=
{
NOT_INSTALLABLE
:
'
not_installable
'
,
NOT_INSTALLABLE
:
'
not_installable
'
,
...
...
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