diff options
Diffstat (limited to 'app/client')
| -rw-r--r-- | app/client/dashboard/tasklist.component.js | 16 | ||||
| -rw-r--r-- | app/client/modules/samplernn/samplernn.tasks.js | 5 | ||||
| -rw-r--r-- | app/client/modules/samplernn/views/samplernn.show.js | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/app/client/dashboard/tasklist.component.js b/app/client/dashboard/tasklist.component.js index 56bb50b..8817096 100644 --- a/app/client/dashboard/tasklist.component.js +++ b/app/client/dashboard/tasklist.component.js @@ -1,6 +1,7 @@ import { h, Component } from 'preact' import { bindActionCreators } from 'redux' import { connect } from 'react-redux' +import { Link } from 'react-router-dom'; import util from '../util' import actions from '../actions' @@ -15,16 +16,15 @@ class TaskList extends Component { const { mapFn, sortFn } = util.sort.orderByFn('date desc') const taskList = tasks.map(mapFn).sort(sortFn).map(pair => { const task = pair[1] - let dataset_type, dataset_name - if (task.dataset.indexOf('/') !== -1) { - [dataset_type, dataset_name] = task.dataset.split('/') - } else { - dataset_name = task.dataset - } + console.log(task) + const { dataset } = task + const href = '/' + task.module + + '/' + (task.module === 'samplernn' ? 'datasets' : 'sequences') + + '/' + task.folder_id + '/' return ( <div class='row'> - <div class='activity'>{task.activity} {task.module} {dataset_type}</div> - <div class='dataset'>{dataset_name}</div> + <div class='activity'>{task.activity} {task.module}</div> + <div class='dataset'><Link to={href}>{dataset}</Link></div> <div className={"age " + util.carbon_date(task.updated_at)}>{util.get_age(task.updated_at)}</div> <div class='options'> <span class='destroy' onClick={() => this.handleDestroy(task)}>x</span> diff --git a/app/client/modules/samplernn/samplernn.tasks.js b/app/client/modules/samplernn/samplernn.tasks.js index ee26347..bb22791 100644 --- a/app/client/modules/samplernn/samplernn.tasks.js +++ b/app/client/modules/samplernn/samplernn.tasks.js @@ -12,8 +12,8 @@ export const train_task = (dataset, folder_id, epochs=1) => dispatch => { dataset: dataset.name, epoch: dataset.checkpoints.length ? dataset.checkpoints[0].epoch || 0 : 0, epochs: epochs, + folder_id: folder_id, opt: { - folder_id: folder_id, sample_length: 44100 * 5, n_samples: 6, keep_old_checkpoints: false, @@ -22,12 +22,13 @@ export const train_task = (dataset, folder_id, epochs=1) => dispatch => { console.log(task) return actions.queue.add_task(task) } -export const fetch_task = (url, file_id, dataset) => dispatch => { +export const fetch_task = (url, folder_id, file_id, dataset) => dispatch => { if (! url) return console.log('input file inaccessible (no url)') const task = { module: 'samplernn', activity: 'fetch', dataset: dataset, + folder_id: folder_id, opt: { url, file_id, diff --git a/app/client/modules/samplernn/views/samplernn.show.js b/app/client/modules/samplernn/views/samplernn.show.js index 8ea37f6..7585e6c 100644 --- a/app/client/modules/samplernn/views/samplernn.show.js +++ b/app/client/modules/samplernn/views/samplernn.show.js @@ -103,7 +103,7 @@ class SampleRNNShow extends Component { {'fetching'} </div> : <div class='subtext'> - <span class='link' onClick={() => remote.fetch_task(input.url, input.id, dataset.name)}>fetch</span> + <span class='link' onClick={() => remote.fetch_task(input.url, samplernn.folder_id, input.id, dataset.name)}>fetch</span> </div> } </div> |