Fix job consolidation in store

Author: Lothiraldan

app/jobs/actions.js

@@ -41,7 +41,13 @@ export function GetJobDetails(job_id) {
 }
 
 export function JobReturn(job_id, job) {
-    store.set(['jobs', job_id], JobEventToJobStore(job.data));
+    let path = ['jobs', job_id];
+    let job_to_store = JobEventToJobStore(job.data);
+    if(store.exists(path)) {
+        store.merge(path, job_to_store);
+    } else {
+        store.set(path, job_to_store);
+    }
 }
 
 export function UpdateModuleFunctionList(job_id, minion, job) {
@@ -91,6 +97,18 @@ export function RunJob(matcher, minions, module_function, args, add_to_runned_jo
                 store.apply(['session', 'runned_jobs'], _.partial(last10, job_id));
             }
 
+            // Add to store informations we have
+            let job = {Function: module_function, jid: job_id,
+                       Target: minions, Arguments: args,
+                       'Target-type': matcher}
+
+            let path = ['jobs', job_id]
+            if(store.exists(path)) {
+                store.merge(path, job);
+            } else {
+                store.set(path, job);
+            }
+
             return job_id;
         });
 }

app/jobs/utils.js

@@ -12,7 +12,7 @@ export var JobEventToJobStore = function(job) {
                    'StartTime': moment(job['_stamp'], moment.ISO_8601).unix(), 'Target': job['tgt'],
                    'Target-type': job['tgt_type'], 'Arguments': ArgParser(job['arg']),
                    'Minions': job['minions'], 'Return': job['return']}
-    return _.omit(new_job, _.isUndefined);
+    return _.omitBy(new_job, _.isUndefined);
 }
 
 export var ArgSpecParser = function(argspec) {