summaryrefslogtreecommitdiff
path: root/app/client/dashboard
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-06-25 13:25:02 +0200
committerJules Laplace <julescarbon@gmail.com>2018-06-25 13:25:02 +0200
commit237a32c596f37a38c07902332adc1af4c0c43609 (patch)
tree58b3a91372be4c0fa0d13c8f7f242cd87285e091 /app/client/dashboard
parent9359758ce631528ae2b0deb82df05f908d5c42a2 (diff)
app bugz
Diffstat (limited to 'app/client/dashboard')
-rw-r--r--app/client/dashboard/dashboard.actions.js12
-rw-r--r--app/client/dashboard/dashboard.component.js10
2 files changed, 13 insertions, 9 deletions
diff --git a/app/client/dashboard/dashboard.actions.js b/app/client/dashboard/dashboard.actions.js
index 567f2cb..ae54f02 100644
--- a/app/client/dashboard/dashboard.actions.js
+++ b/app/client/dashboard/dashboard.actions.js
@@ -6,12 +6,13 @@ export const load = () => (dispatch) => {
util.allProgress([
actions.task.index({ limit: 40, orderBy: 'created_at desc', }),
actions.folder.index({ activity: 'dataset', }),
- actions.file.index({ module: 'samplernn', generated: 1, limit: 10, orderBy: 'created_at desc', })
+ actions.file.index({ module: 'samplernn', generated: 1, limit: 15, orderBy: 'created_at desc', }),
+ actions.file.index({ module: 'pix2pixhd', generated: 1, limit: 15, orderBy: 'created_at desc', }),
], (percent, i, n) => {
console.log('dashboard load progress', i, n)
dispatch({ type: types.app.load_progress, progress: { i, n }})
}).then(res => {
- const [ tasks, folders, sampleRNNrenders ] = res
+ const [ tasks, folders, samplernn, pix2pixhd ] = res
const { mapFn, sortFn } = util.sort.orderByFn('date desc')
const foldersByModule = folders.map(mapFn).sort(sortFn).reduce((a,b) => {
const module = b[1].module
@@ -24,10 +25,13 @@ export const load = () => (dispatch) => {
data: {
tasks,
folders,
- sampleRNNrenders,
+ renders: {
+ samplernn,
+ pix2pixhd,
+ },
foldersByModule,
},
})
})
-} \ No newline at end of file
+}
diff --git a/app/client/dashboard/dashboard.component.js b/app/client/dashboard/dashboard.component.js
index 1e037bc..58795ee 100644
--- a/app/client/dashboard/dashboard.component.js
+++ b/app/client/dashboard/dashboard.component.js
@@ -30,7 +30,7 @@ class Dashboard extends Component {
// this.props.actions.list_epochs(nextProps.opt.checkpoint_name)
}
render(){
- const { site, foldersByModule, sampleRNNrenders, queue, images } = this.props
+ const { site, foldersByModule, renders, queue, images } = this.props
const { tasks } = queue
const folders = foldersByModule && Object.keys(modules).sort().map(key => {
if (! foldersByModule[key]) return null
@@ -42,10 +42,10 @@ class Dashboard extends Component {
</div>
)
})
- const files = key === 'samplernn' && (
+ let files = renders[key] && (
<FileList
linkFiles
- files={sampleRNNrenders}
+ files={renders[key]}
orderBy='date desc'
fields={'name date epoch size'}
onClick={(file, e) => {
@@ -55,7 +55,7 @@ class Dashboard extends Component {
this.handlePick(file)
}}
/>
- )
+ );
return (
<div className='dashboardModule' key={key}>
@@ -100,7 +100,7 @@ class Dashboard extends Component {
const mapStateToProps = state => ({
site: state.system.site,
foldersByModule: state.dashboard.data.foldersByModule,
- sampleRNNrenders: state.dashboard.data.sampleRNNrenders,
+ renders: state.dashboard.data.renders,
images: state.dashboard.images,
files: state.dashboard.files,
queue: state.queue,