From 2f0fd83837f9d728b384b033e0b9b2b8570df2de Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 26 Jun 2018 16:09:33 +0200
Subject: agh

---
 app/client/modules/morph/morph.reducer.js   | 10 ++++++++++
 app/client/modules/morph/views/morph.app.js |  1 +
 app/server/db/model.js                      |  7 ++++---
 app/server/db/models.js                     |  6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/client/modules/morph/morph.reducer.js b/app/client/modules/morph/morph.reducer.js
index 92cbc9e..99e2001 100644
--- a/app/client/modules/morph/morph.reducer.js
+++ b/app/client/modules/morph/morph.reducer.js
@@ -27,6 +27,16 @@ const morphReducer = (state = morphInitialState, action) => {
         ...state,
         app: action.app,
       }
+    case types.file.create:
+      console.log(action)
+      if (action.data.module !== 'morph') return state
+      return {
+        ...state,
+        app: state.app && {
+          ...state.app,
+          files: [action.data].concat(state.app.files)
+        }
+      }
     default:
       return state
   }
diff --git a/app/client/modules/morph/views/morph.app.js b/app/client/modules/morph/views/morph.app.js
index 09294a3..5848616 100644
--- a/app/client/modules/morph/views/morph.app.js
+++ b/app/client/modules/morph/views/morph.app.js
@@ -141,6 +141,7 @@ class MorphResults extends Component {
             </Group>
           </div>
 
+          <h3>morphed videos</h3>
           <FileList
             linkFiles
             files={files}
diff --git a/app/server/db/model.js b/app/server/db/model.js
index c5faf03..dd851bf 100644
--- a/app/server/db/model.js
+++ b/app/server/db/model.js
@@ -108,9 +108,10 @@ module.exports = function modelScope(type, db_model, _props) {
     
     create: (data) => {
       return new Promise( (resolve, reject) => {
-        crud.create( model.sanitize(data) ).then( (data) => {
-          resolve(data.toJSON())
-          props.afterCreate && props.afterCreate(data)
+        const should_relay = data.should_relay === 'true'
+        crud.create( model.sanitize(data) ).then( (rec) => {
+          resolve(rec.toJSON())
+          props.afterCreate && props.afterCreate(rec, should_relay)
         }).catch( (e) => {
           console.error('error creating', e)
           reject()
diff --git a/app/server/db/models.js b/app/server/db/models.js
index 24be774..f37a7bf 100644
--- a/app/server/db/models.js
+++ b/app/server/db/models.js
@@ -1,6 +1,7 @@
 
 let model = require('./model')
 let bookshelf = require("./bookshelf").bookshelf
+const client = require('../bridge').client
 
 let Folder = bookshelf.Model.extend({
   tableName: 'folders',
@@ -42,9 +43,12 @@ module.exports = {
   }),
   file: model('file', File, {
     fields: "folder_id username name url mime datatype duration analysis size stars activity module checkpoint dataset epoch processed generated opt created_at updated_at".split(" "),
-    afterCreate: (file) => {
+    afterCreate: (file, should_relay) => {
       console.log('created file')
       // bridge.processFiles()
+      if (should_relay) { // if this came from an automated command...
+        client.emit('api_res', { type: 'create', datatype: 'file', data: file.toJSON() })
+      }
     }
   }),
   task: model('task', Task, {
-- 
cgit v1.2.3-70-g09d2