From bd4cf98239fb9f6075d191009434ae58d067c7c9 Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Fri, 18 Dec 2020 09:35:27 +0200
Subject: [PATCH] fix watches

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 src/renderer/api/api-manager.ts    | 4 ++++
 src/renderer/api/kube-watch-api.ts | 4 ++--
 src/renderer/kube-object.store.ts  | 5 ++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/renderer/api/api-manager.ts b/src/renderer/api/api-manager.ts
index 68d4773540..01e5ceb228 100644
--- a/src/renderer/api/api-manager.ts
+++ b/src/renderer/api/api-manager.ts
@@ -17,6 +17,10 @@ export class ApiManager {
     return Array.from(this.apis.values()).find(pathOrCallback ?? (() => true));
   }
 
+  getApiByKind(kind: string, apiVersion: string) {
+    return Array.from(this.apis.values()).find((api) => api.kind === kind && api.apiVersion === apiVersion);
+  }
+
   registerApi(apiBase: string, api: KubeApi) {
     if (!this.apis.has(apiBase)) {
       this.apis.set(apiBase, api);
diff --git a/src/renderer/api/kube-watch-api.ts b/src/renderer/api/kube-watch-api.ts
index 58665a11a1..6ff4ff5b92 100644
--- a/src/renderer/api/kube-watch-api.ts
+++ b/src/renderer/api/kube-watch-api.ts
@@ -158,8 +158,8 @@ export class KubeWatchApi {
 
   addListener(store: KubeObjectStore, callback: (evt: IKubeWatchEvent) => void) {
     const listener = (evt: IKubeWatchEvent<KubeJsonApiData>) => {
-      const { selfLink, namespace, resourceVersion } = evt.object.metadata;
-      const api = apiManager.getApi(selfLink);
+      const { namespace, resourceVersion } = evt.object.metadata;
+      const api = apiManager.getApiByKind(evt.object.kind, evt.object.apiVersion);
 
       api.setResourceVersion(namespace, resourceVersion);
       api.setResourceVersion("", resourceVersion);
diff --git a/src/renderer/kube-object.store.ts b/src/renderer/kube-object.store.ts
index e23adf3566..bb2fffd819 100644
--- a/src/renderer/kube-object.store.ts
+++ b/src/renderer/kube-object.store.ts
@@ -195,10 +195,9 @@ export abstract class KubeObjectStore<T extends KubeObject = any> extends ItemSt
     const items = this.items.toJS();
 
     for (const {type, object} of this.eventsBuffer.clear()) {
-      const { uid, selfLink } = object.metadata;
-      const index = items.findIndex(item => item.getId() === uid);
+      const index = items.findIndex(item => item.getId() === object.metadata?.uid);
       const item = items[index];
-      const api = apiManager.getApi(selfLink);
+      const api = apiManager.getApiByKind(object.kind, object.apiVersion);
 
       switch (type) {
         case "ADDED":