Run now dialog improvements

SingularityUI/app/controllers/Controller.coffee

@@ -1,3 +1,5 @@
+Utils = require '../utils'
+
 # Base controller to be extended by other classes
 class Controller
 
@@ -33,9 +35,9 @@ class Controller
         document.title = pageTitle + ' - ' + config.title
 
     # e.g. `myModel.fetch().error @ignore404`
-    ignore404: (response) -> app.caughtError() if response.status is 404
+    ignore404: Utils.ignore404
 
     # e.g. `myModel.fetch().error @ignore400`
-    ignore400: (response) -> app.caughtError() if response.status is 400
+    ignore400: Utils.ignore400
 
 module.exports = Controller

SingularityUI/app/handlebarsHelpers.coffee

@@ -143,7 +143,7 @@ Handlebars.registerHelper 'substituteTaskId', (value, taskId) ->
     value.replace('$TASK_ID', taskId)
 
 Handlebars.registerHelper 'filename', (value) ->
-    value.substring(value.lastIndexOf('/') + 1)
+    Utils.fileName(value)
 
 Handlebars.registerHelper 'getLabelClass', (state) ->
     Utils.getLabelClassFromTaskState state

SingularityUI/app/models/Request.coffee

@@ -1,6 +1,7 @@
 Model = require './model'
 
 Racks = require '../collections/Racks'
+HistoricalTasks = require '../collections/HistoricalTasks'
 
 pauseTemplate = require '../templates/vex/requestPause'
 scaleTemplate = require '../templates/vex/requestScale'
@@ -13,9 +14,13 @@ exitCooldownTemplate = require '../templates/vex/exitCooldown'
 stepDeployTemplate = require '../templates/vex/stepDeploy'
 cancelDeployTemplate = require '../templates/vex/cancelDeploy'
 TaskHistory = require '../models/TaskHistory'
+TaskPoller = require '../views/TaskPoller'
+
+Utils = require '../utils'
 
 vex = require 'vex.dialog'
 juration = require 'juration'
+uuid = require 'node-uuid'
 
 class Request extends Model
 
@@ -91,7 +96,7 @@ class Request extends Model
             contentType: 'application/json'
             data: JSON.stringify data
 
-    run: (cmdLineArgs, message) ->
+    run: (cmdLineArgs, message, runId) -> #runId will be autogenerated if not provided
         options =
             url: "#{ @url() }/run"
             type: 'POST'
@@ -100,6 +105,8 @@ class Request extends Model
 
         options.data.commandLineArgs = cmdLineArgs
 
+        options.data.runId = runId if runId
+
         if message
             options.data.message = message
         options.data = JSON.stringify(options.data)
@@ -427,69 +434,121 @@ class Request extends Model
                 return unless confirmed
                 @unpause(confirmed).done callback
 
-    promptRun: (callback) =>
-        try
-            lastCommands = JSON.parse(localStorage.getItem(@localStorageCommandLineInputKeyPrefix + @id))
-        catch e
-            console.error('Could not parse previous commands JSON')
-            lastCommands = []
-        vex.dialog.prompt
-            message: "<h3>Run Task</h3>"
-            input: runTemplate
-                id: @get "id"
-                prefix: @localStorageCommandLineInputKeyPrefix
-                commands: if lastCommands? then lastCommands[lastCommands.length - 1] else []
+    getMostRecentlyRunTask: (callback) =>
+        @commands = []
+        historicalTasks = new HistoricalTasks [],
+            params:
+                requestId: @get "id"
+        historicalTasksFetch = historicalTasks.fetch()
+        historicalTasksFetch.success () =>
+            if historicalTasks.models.length
+                taskId = historicalTasks.models[0].attributes.taskId.id
+                task = new TaskHistory {taskId}
+                taskFetch = task.fetch()
+                taskFetch.success () =>
+                    @commands = task.attributes.task.taskRequest.pendingTask.cmdLineArgsList
+                    callback()
+                taskFetch.error () =>
+                    app.caughtError() # Don't actually error if we can't find previous args, just don't populate
+                    callback()
+            else
+                callback() # If this is the first task being run for this reqeust
+        historicalTasksFetch.error () =>
+            app.caughtError()
+            callback() # Don't actually error if we can't find previous args, just don't populate
+
+    promptRun: (callback, task) => #task is an optional parameter - if it's provided this will rerun it, else this will run a new task
+        showDialog = () =>
+            if task
+                commands = task.attributes.task.taskRequest.pendingTask.cmdLineArgsList
+            else
+                commands = @commands
+            vex.dialog.prompt
+                message: "<h3>#{if task then 'Rerun' else 'Run'} Task</h3>"
+                input: runTemplate
+                    id: @get "id"
+                    commands: commands
+                    defaultFileName: Utils.fileName(config.runningTaskLogPath)
 
-            buttons: [
-                $.extend _.clone(vex.dialog.buttons.YES), text: 'Run now'
-                vex.dialog.buttons.NO
-            ]
+                buttons: [
+                    $.extend _.clone(vex.dialog.buttons.YES), text: 'Run now'
+                    vex.dialog.buttons.NO
+                ]
 
-            beforeClose: =>
-                return if @data is false
-
-                fileName = @data.filename.trim()
-                message = @data.message
-
-                if ((fileName and fileName.length is 0) or not fileName) and @data.autoTail is 'on'
-                    $(window.noFilenameError).removeClass('hide')
-                    return false
-
-                else
-                    if @data.commandLineInput?
-                        try
-                            history = JSON.parse(localStorage.getItem(@localStorageCommandLineInputKeyPrefix + @id))
-                        catch e
-                            console.error('Could not parse previous command history')
-                            history = []
-                        if history and @data.commandLineInput != history[-1]
-                            history.push(@data.commandLineInput)
-                            localStorage.setItem(@localStorageCommandLineInputKeyPrefix + @id, JSON.stringify(history))
-                    localStorage.setItem('taskRunRedirectFilename', fileName) if filename?
-                    localStorage.setItem('taskRunAutoTail', @data.autoTail)
-                    @data.id = @get 'id'
-
-                    @run( @data.commandLineInput, message ).done callback( @data )
-                    return true
-
-            afterOpen: =>
-                $('#filename').val localStorage.getItem('taskRunRedirectFilename')
-                $('#autoTail').prop 'checked', (localStorage.getItem('taskRunAutoTail') is 'on')
-                $('#add-cmd-line-arg').on('click', { removeCmdLineArg: @removeCmdLineArg }, @addCmdLineArg)
-                $('.remove-button').click @removeCmdLineArg
+                beforeClose: =>
+                    return if @data is false
 
-            callback: (data) =>
-                if data.commandLineInput
-                    if typeof data.commandLineInput is 'string'
-                        if data.commandLineInput != ''
-                            data.commandLineInput = [data.commandLineInput.trim()]
-                        else
+                    fileName = @data.filename.trim()
+                    message = @data.message
+
+                    if ((fileName and fileName.length is 0) or not fileName) and @data.afterStart is 'autoTail'
+                        # Error - what file are we supposed to tail if none is provided?
+                        $(window.noFilenameError).removeClass('hide')
+                        return false
+
+                    else
+                        localStorage.setItem('taskRunRedirectFilename', fileName) if filename?
+                        localStorage.setItem('taskRunAfterStart', @data.afterStart)
+                        @data.id = @get 'id'
+
+                        if @data.afterStart in ['browse-to-sandbox', 'autoTail']
+                            @data.runId = uuid.v4()
+
+                        doneFn = =>
+                            if @data.afterStart is 'autoTail'
+                                taskPoller = new TaskPoller({
+                                    runId: @data.runId
+                                    requestId: @id
+                                    autoTailFilename: @data.filename
+                                    taskPollTimestamp: +new Date()
+                                    pollingType: 'autoTail'
+                                })
+
+                                taskPoller.startTaskPolling()
+                            else if @data.afterStart is 'browse-to-sandbox'
+                                taskPoller = new TaskPoller({
+                                    runId: @data.runId
+                                    requestId: @id
+                                    taskPollTimestamp: +new Date()
+                                    pollingType: 'browse-to-sandbox'
+                                })
+
+                                taskPoller.startTaskPolling()
+
+                            callback( @data )
+
+                        @run( @data.commandLineInput, message, @data.runId ).done doneFn
+                        return true
+
+                afterOpen: =>
+                    taskRunAfterStart = localStorage.getItem('taskRunAfterStart')
+                    $('#filename').val localStorage.getItem('taskRunRedirectFilename') or Utils.fileName(config.runningTaskLogPath)
+                    $('#autoTail').prop 'checked', (taskRunAfterStart is 'autoTail')
+                    $('#browse-to-sandbox').prop 'checked', (taskRunAfterStart is 'browse-to-sandbox' or not taskRunAfterStart)
+                    $('#stay-on-page').prop 'checked', (taskRunAfterStart is 'stay-on-page')
+                    $('#add-cmd-line-arg').on('click', { removeCmdLineArg: @removeCmdLineArg }, @addCmdLineArg)
+                    $('.remove-button').click @removeCmdLineArg
+                    $('#stay-on-page').on('click', () => $('#filename').addClass('hide'))
+                    $('#browse-to-sandbox').on('click', () => $('#filename').addClass('hide'))
+                    $('#autoTail').on('click', () => $('#filename').removeClass('hide'))
+                    $('#filename').removeClass('hide') if taskRunAfterStart is 'autoTail'
+
+                callback: (data) =>
+                    if data.commandLineInput
+                        if typeof data.commandLineInput is 'string'
+                            if data.commandLineInput != ''
+                                data.commandLineInput = [data.commandLineInput.trim()]
+                            else
+                                data.commandLineInput = []
+                        if data.commandLineInput.length == 1 and data.commandLineInput[0] == ''
                             data.commandLineInput = []
-                    if data.commandLineInput.length == 1 and data.commandLineInput[0] == ''
+                    else
                         data.commandLineInput = []
-                else
-                    data.commandLineInput = []
-                @data = data
+                    @data = data
+        if task
+            showDialog()
+        else
+            @getMostRecentlyRunTask showDialog
 
     addCmdLineArg: (event) ->
         event.preventDefault()
@@ -506,58 +565,6 @@ class Request extends Model
         event.preventDefault()
         $(event.currentTarget).parent().remove()
 
-    promptRerun: (taskId, callback) =>
-        task = new TaskHistory {taskId}
-        task.fetch()
-            .done =>
-                commands = task.attributes.task.taskRequest.pendingTask.cmdLineArgsList
-                vex.dialog.prompt
-                    message: "<h3>Rerun Task</h3>"
-                    input: runTemplate
-                        id: @get "id"
-                        commands: commands
-                    buttons: [
-                        $.extend _.clone(vex.dialog.buttons.YES), text: 'Run now'
-                        vex.dialog.buttons.NO
-                    ]
-
-                    beforeClose: =>
-                        return if @data is false
-
-                        fileName = @data.filename.trim()
-                        message = @data.message
-
-                        if ((fileName and fileName.length is 0) or not fileName) and @data.autoTail is 'on'
-                            $(window.noFilenameError).removeClass('hide')
-                            return false
-
-                        else
-                            localStorage.setItem('taskRunRedirectFilename', fileName) if filename?
-                            localStorage.setItem('taskRunAutoTail', @data.autoTail)
-                            @data.id = @get 'id'
-
-                            @run( @data.commandLineInput, message ).done callback( @data )
-                            return true
-
-                    afterOpen: =>
-                        $('#filename').val localStorage.getItem('taskRunRedirectFilename')
-                        $('#autoTail').prop 'checked', (localStorage.getItem('taskRunAutoTail') is 'on')
-                        $('#add-cmd-line-arg').on('click', { removeCmdLineArg: @removeCmdLineArg }, @addCmdLineArg)
-                        $('.remove-button').click @removeCmdLineArg
-
-                    callback: (data) =>
-                        if data.commandLineInput
-                            if typeof data.commandLineInput is 'string'
-                                if data.commandLineInput != ''
-                                    data.commandLineInput = [data.commandLineInput.trim()]
-                                else
-                                    data.commandLineInput = []
-                            if data.commandLineInput.length == 1 and data.commandLineInput[0] == ''
-                                data.commandLineInput = []
-                        else
-                            data.commandLineInput = []
-                        @data = data
-
     promptRemove: (callback) =>
         vex.dialog.confirm
             message: removeTemplate id: @get "id"

SingularityUI/app/models/Task.coffee

@@ -63,7 +63,12 @@ class Task extends Model
 
     promptRun: (callback) =>
         # We tell the Request to run
-        requestModel = new Request id: @get('request').id
+        request = @get('request')
+        if request
+            id = request.id
+        else # Pending tasks don't have a request attribute
+            id = @get('pendingTask').pendingTaskId.requestId
+        requestModel = new Request id: id
         requestModel.promptRun => callback()
 
 

SingularityUI/app/models/TaskHistoryItem.coffee

@@ -6,7 +6,19 @@ class TaskHistoryItem extends Model
 
     ignoreAttributes: ['id', 'canBeRunNow']
 
-    initialize: ({ @taskId, @updatedAt, @lastTaskState }) ->
+    url: () ->
+        if @requestId and @runId
+            "#{ config.apiRoot }/history/request/#{ @requestId }/run/#{ @runId }"
+        else
+            # Currently the above URL is the ONLY place to fetch this model.
+            # If you don't have access to request ID and run ID use the TaskHistory
+            # model instead.
+            throw new Error """
+                    Insufficient data for a meaningful answer.
+                    Cannot fetch individual TaskHistoryItem without #{'requestId' unless @requestId}#{if @requestId or @runId then '' else ' and '}#{if @runId then '' else 'runId'}.
+                """
+
+    initialize: ({ @taskId, @updatedAt, @lastTaskState, @requestId, @runId }) ->
 
 
 module.exports = TaskHistoryItem

SingularityUI/app/styles/main.styl

@@ -99,15 +99,15 @@ code
     fieldset
         display table-cell
 
-.auto-tail-checklist
+.wait-for-checklist
     margin-top 10px
-    .auto-tail-task-start
+    .wait-for-task-start
         font-weight bolder
 
     &.waiting-for-file
-        .auto-tail-task-start
+        .wait-for-task-start
             font-weight normal
-        .auto-tail-file-exists
+        .wait-for-file-exists
             font-weight bolder
 
 .vex.vex-theme-default .vex-dialog-form .vex-dialog-input.expiration-input

SingularityUI/app/templates/vex/requestRun.hbs

@@ -24,9 +24,13 @@
     <input name="message" id="run-message" type="text" />
 </div>
 <hr class='border-color-light-gray'>
-
-<p><label class='label-light'><input id="autoTail" name="autoTail" type="checkbox"> Wait for task to start, then start tailing:</label></p>
+<strong>After triggering the run:</strong>
+<p>
+    <label class='label-light'><input id="stay-on-page" name="afterStart" type="radio" value="stay-on-page"> Stay on this page</label>
+    <label class='label-light'><input id="browse-to-sandbox" name="afterStart" type="radio" value="browse-to-sandbox"> Wait for task to start, then browse its sandbox</label>
+    <label class='label-light'><input id="autoTail" name="afterStart" type="radio" value="autoTail"> Wait for task to start, then start tailing</label>
+</p>
 <div id="noFilenameError" class="alert alert-warning hide" role="alert">Please enter a filename or uncheck the box</div>
 <div class="vex-dialog-input">
-    <input id='filename' name="filename" type="text" class="vex-dialog-prompt-input" placeholder="e.g. service.log" value="">
+    <input id='filename' name="filename" type="text" class="vex-dialog-prompt-input hide" placeholder="e.g. {{ defaultFileName }}" value="">
 </div>

SingularityUI/app/templates/vex/taskPollerWaiting.hbs

@@ -0,0 +1,6 @@
+<h3>Launching</h3>
+<ol class="task-poller-checklist wait-for-checklist">
+    <li class="wait-for-task-start">Waiting for task to launch</li>
+    <li class="wait-for-file-exists">Waiting for <code>{{ autoTailFilename }}</code> to exist</li>
+</ol>
+<div class='page-loader centered cushy'></div>

SingularityUI/app/templates/vex/taskPollingFailure.hbs

@@ -0,0 +1,2 @@
+<h3>Failure</h3>
+{{#if autoTailFilename}}<code>{{ autoTailFilename }}</code>{{else}}Task{{/if}} did not exist after {{ timeout }} minute(s).