Make JobEditorForm.job non-nullable

Author: AustinShalit

db/src/main/kotlin/edu/wpi/axon/db/JobDb.kt

@@ -51,7 +51,16 @@ internal object Jobs : IntIdTable() {
     }
 }
 
-typealias JobCallback = (Job) -> Unit
+/**
+ * The operations that you can do with a Job and the DB.
+ */
+sealed class JobDbOp {
+    object Create : JobDbOp()
+    object Update : JobDbOp()
+    object Remove : JobDbOp()
+}
+
+typealias JobCallback = (JobDbOp, Job) -> Unit
 
 class JobDb(private val database: Database) {
 
@@ -85,7 +94,7 @@ class JobDb(private val database: Database) {
         }
 
         val newJob = job.copy(id = newId)
-        observers.forEach { it(newJob) }
+        observers.forEach { it(JobDbOp.Create, newJob) }
 
         return newJob
     }
@@ -106,7 +115,7 @@ class JobDb(private val database: Database) {
             }
         }
 
-        observers.forEach { it(job) }
+        observers.forEach { it(JobDbOp.Update, job) }
     }
 
     fun count(): Int = transaction(database) {
@@ -136,6 +145,6 @@ class JobDb(private val database: Database) {
             Jobs.deleteWhere { Jobs.id eq job.id }
         }
 
-        observers.forEach { it(job) }
+        observers.forEach { it(JobDbOp.Remove, job) }
     }
 }

ui-vaadin/src/main/kotlin/edu/wpi/axon/ui/service/JobProvider.kt

@@ -16,9 +16,9 @@ class JobProvider : AbstractBackEndDataProvider<Job, Void>(), KoinComponent, Has
 
     init {
         val ui = UI.getCurrent()
-        jobs.subscribe {
+        jobs.subscribe { _, jobFromDb ->
             ui.access {
-                refreshItem(it)
+                refreshItem(jobFromDb)
             }
         }
     }

ui-vaadin/src/main/kotlin/edu/wpi/axon/ui/view/jobs/JobEditorForm.kt

@@ -45,10 +45,8 @@ class JobEditorForm : KComposite(), KoinComponent {
         set(value) {
             field = value
             isVisible = value is Some
-            value.map {
-                binder.readBean(it)
-            }
             form.isEnabled = value.fold({ false }, { it.status == TrainingScriptProgress.NotStarted })
+            value.map { binder.readBean(it) }
         }
 
     private val root = ui {
@@ -73,7 +71,7 @@ class JobEditorForm : KComposite(), KoinComponent {
                     formItem("Name") {
                         textField {
                             setWidthFull()
-                            bind(binder).asRequired().bind(Job::name)
+                            bind(binder).asRequired()
                         }
                     }
                     formItem("Dataset") {

ui-vaadin/src/main/kotlin/edu/wpi/axon/ui/view/jobs/JobsView.kt

@@ -1,5 +1,6 @@
 package edu.wpi.axon.ui.view.jobs
 
+import arrow.core.None
 import arrow.core.Option
 import arrow.core.Some
 import com.github.mvysny.karibudsl.v10.KComposite
@@ -25,6 +26,7 @@ import com.vaadin.flow.router.OptionalParameter
 import com.vaadin.flow.router.Route
 import com.vaadin.flow.router.RouteAlias
 import edu.wpi.axon.db.JobDb
+import edu.wpi.axon.db.JobDbOp
 import edu.wpi.axon.dbdata.Job
 import edu.wpi.axon.ui.MainLayout
 import edu.wpi.axon.ui.service.JobProvider
@@ -77,10 +79,12 @@ class JobsView : KComposite(), HasUrlParameter<Int>, AfterNavigationObserver, En
 
     init {
         val ui = UI.getCurrent()
-        jobDb.subscribe { jobFromDb ->
+        jobDb.subscribe { op, jobFromDb ->
             form.job.map { currentJob ->
                 if (currentJob.id == jobFromDb.id) {
-                    ui.access { form.job = Some(jobFromDb) }
+                    ui.access {
+                        form.job = if (op == JobDbOp.Remove) None else Some(jobFromDb)
+                    }
                 }
             }
         }