Finalize ability to trigger jobs from UI

api/lib/schedule.js

@@ -11,10 +11,8 @@ class Schedule {
     static async event(pool, event) {
         if (event.type === 'collect') {
             await Schedule.collect();
-        } else if (event.type === 'fabric') {
-            await Schedule.fabric();
-        } else if (event.type === 'sources') {
-            await Schedule.sources(pool);
+        } else if (['fabric', 'collect', 'sources'].includes(event.type)) {
+            await Schedule.batch(event.type);
         } else if (event.type === 'close') {
             await Schedule.close(pool);
         } else if (event.type === 'level') {
@@ -32,23 +30,17 @@ class Schedule {
         }
     }
 
-    static async collect() {
+    /**
+     * Generic function for triggering a batch job
+     * @param {String} type Type of batch job to trigger
+     */
+    static async batch(type) {
         try {
             return await batch.trigger({
-                type: 'collect'
+                type: type
             });
         } catch (err) {
-            throw new Err(500, err, 'failed to submit collect job to batch');
-        }
-    }
-
-    static async collect() {
-        try {
-            return await batch.trigger({
-                type: 'fabric'
-            });
-        } catch (err) {
-            throw new Err(500, err, 'failed to submit fabric job to batch');
+            throw new Err(500, err, 'Failed to submit job to batch');
         }
     }
 
@@ -62,18 +54,6 @@ class Schedule {
         }
     }
 
-    static async sources(pool) {
-        await JobError.clear(pool);
-
-        try {
-            return await batch.trigger({
-                type: 'sources'
-            });
-        }  catch (err) {
-            throw new Err(500, err, 'failed to submit sources job to batch');
-        }
-    }
-
     static async close(pool) {
         // TODO Close old run/jobs