Skip to content

Task badge color for TASK_KILLED is now default (grey) #970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssalinas merged 1 commit into from
Mar 29, 2016
Merged

Task badge color for TASK_KILLED is now default (grey) #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions SingularityUI/app/components/common/atomicDisplayItems/TaskStateLabel.cjsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,7 @@ Utils = require '../../../utils'
TaskStateLabel = React.createClass

getLabelClass: ->
switch @props.prop.taskState
when 'TASK_STARTING', 'TASK_CLEANING'
'warning'
when 'TASK_STAGING', 'TASK_LAUNCHED', 'TASK_RUNNING'
'info'
when 'TASK_FINISHED'
'success'
when 'TASK_KILLED', 'TASK_LOST', 'TASK_FAILED', 'TASK_LOST_WHILE_DOWN'
'danger'
else
'default'
Utils.getLabelClassFromTaskState @props.prop.taskState

getClass: ->
return classNames 'label', "label-#{@getLabelClass()}", @props.prop.className
Expand Down
13 changes: 2 additions & 11 deletions SingularityUI/app/handlebarsHelpers.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Handlebars = require 'handlebars'
moment = require 'moment'
Utils = require './utils'

Handlebars.registerHelper 'appRoot', ->
config.appRoot
Expand Down Expand Up @@ -145,17 +146,7 @@ Handlebars.registerHelper 'filename', (value) ->
value.substring(value.lastIndexOf('/') + 1)

Handlebars.registerHelper 'getLabelClass', (state) ->
switch state
when 'TASK_STARTING', 'TASK_CLEANING'
'warning'
when 'TASK_STAGING', 'TASK_LAUNCHED', 'TASK_RUNNING'
'info'
when 'TASK_FINISHED'
'success'
when 'TASK_KILLED', 'TASK_LOST', 'TASK_FAILED', 'TASK_LOST_WHILE_DOWN'
'danger'
else
'default'
Utils.getLabelClassFromTaskState state

Handlebars.registerHelper 'trimS3File', (filename, taskId) ->
unless config.taskS3LogOmitPrefix
Expand Down
15 changes: 15 additions & 0 deletions SingularityUI/app/utils.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,21 @@ class Utils
text = text[0].toUpperCase() + text.substr 1
return text

@getLabelClassFromTaskState: (state) ->
switch state
when 'TASK_STARTING', 'TASK_CLEANING'
'warning'
when 'TASK_STAGING', 'TASK_LAUNCHED', 'TASK_RUNNING'
'info'
when 'TASK_FINISHED'
'success'
when 'TASK_LOST', 'TASK_FAILED', 'TASK_LOST_WHILE_DOWN'
'danger'
when 'TASK_KILLED'
'default'
else
'default'

@fuzzyAdjustScore: (filter, fuzzyObject) ->
if fuzzyObject.original.id.toLowerCase().startsWith(filter.toLowerCase())
fuzzyObject.score * 10
Expand Down