From 34bccd927724e9a3c5cc5904ecc1a76e8381f4e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Fri, 20 May 2022 11:26:06 +0200
Subject: [PATCH] Cleanup, web: rename `subscribedJob` to `subscribedJobID`

The prop contains the job ID, not the job itself, which is now reflected
in the name.

No functional changes.
---
 web/app/src/components/UpdateListener.vue | 14 +++++++-------
 web/app/src/views/JobsView.vue            |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/app/src/components/UpdateListener.vue b/web/app/src/components/UpdateListener.vue
index a9e3ad8e..f06e7d54 100644
--- a/web/app/src/components/UpdateListener.vue
+++ b/web/app/src/components/UpdateListener.vue
@@ -15,7 +15,7 @@ export default {
     // SocketIO events:
     "sioReconnected", "sioDisconnected"
   ],
-  props: ["websocketURL", "subscribedJob"],
+  props: ["websocketURL", "subscribedJobID", "subscribedTaskID"],
   data() {
     return {
       socket: null,
@@ -36,12 +36,12 @@ export default {
     this.disconnectWebsocket();
   },
   watch: {
-    subscribedJob(newJob, oldJob) {
-      if (oldJob) {
-        this._updateJobSubscription("unsubscribe", oldJob);
+    subscribedJobID(newJobID, oldJobID) {
+      if (oldJobID) {
+        this._updateJobSubscription("unsubscribe", oldJobID);
       }
-      if (newJob) {
-        this._updateJobSubscription("subscribe", newJob);
+      if (newJobID) {
+        this._updateJobSubscription("subscribe", newJobID);
       }
     },
   },
@@ -148,7 +148,7 @@ export default {
 
     // Resubscribe to whatever we want to be subscribed to:
     _resubscribe() {
-      if (this.subscribedJob) this._updateJobSubscription("subscribe", this.subscribedJob);
+      if (this.subscribedJobID) this._updateJobSubscription("subscribe", this.subscribedJobID);
     },
   },
 };
diff --git a/web/app/src/views/JobsView.vue b/web/app/src/views/JobsView.vue
index e989c5bd..63f9bf45 100644
--- a/web/app/src/views/JobsView.vue
+++ b/web/app/src/views/JobsView.vue
@@ -13,7 +13,7 @@
   <footer class="window-footer" v-if="!showFooterPopup" @click="showFooterPopup = true"><notification-bar /></footer>
   <footer-popup v-if="showFooterPopup" ref="footerPopup" @clickClose="showFooterPopup = false" />
 
-  <update-listener ref="updateListener" :websocketURL="websocketURL" :subscribedJob="jobID"
+  <update-listener ref="updateListener" :websocketURL="websocketURL" :subscribedJobID="jobID"
     @jobUpdate="onSioJobUpdate" @taskUpdate="onSioTaskUpdate" @message="onChatMessage"
     @sioReconnected="onSIOReconnected" @sioDisconnected="onSIODisconnected" />
 </template>