From d2f5fa5ca7025750d4d5d0e30de8acf08747be36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Wed, 11 May 2022 15:00:05 +0200
Subject: [PATCH] Web: simplify handling of job updates

---
 web/app/src/views/JobsView.vue | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/web/app/src/views/JobsView.vue b/web/app/src/views/JobsView.vue
index abe6089a..f9f0a1bd 100644
--- a/web/app/src/views/JobsView.vue
+++ b/web/app/src/views/JobsView.vue
@@ -76,30 +76,16 @@ export default {
 
     // SocketIO data event handlers:
     onSioJobUpdate(jobUpdate) {
-      if (!jobUpdate.previous_status)
-        return this.onJobNew(jobUpdate);
-      return this.onJobUpdate(jobUpdate);
-    },
-    onJobUpdate(jobUpdate) {
-      // this.messages.push(`Job update: ${jobUpdate.id} (${jobUpdate.previous_status} → ${jobUpdate.status})`);
       if (this.$refs.jobsTable) {
-        this.$refs.jobsTable.processJobUpdate(jobUpdate);
-      } else {
-        console.warn("App: this.$refs.jobsTable is", this.$refs.jobsTable);
-      }
-
-      if (this.jobID == jobUpdate.id) {
-        this._fetchJob(jobUpdate.id);
+        if (jobUpdate.previous_status)
+          this.$refs.jobsTable.processJobUpdate(jobUpdate);
+        else
+          this.$refs.jobsTable.processNewJob(jobUpdate);
       }
+      if (this.jobID == jobUpdate.id)
+        this._fetchJob(this.jobID);
     },
-    onJobNew(jobUpdate) {
-      if (!this.$refs.jobsTable) {
-        console.warn("App: this.$refs.jobsTable is", this.$refs.jobsTable);
-        return;
-      }
 
-      // this.messages.push(`New job: ${jobUpdate.id} (${jobUpdate.status})`);
-      this.$refs.jobsTable.processNewJob(jobUpdate);
     },
 
     /**