From 4671a874bfa233d72e8c974b2fec80648fb1fddb Mon Sep 17 00:00:00 2001
From: Pavel Zavora <pavel.zavora@bonitoo.io>
Date: Wed, 2 Feb 2022 14:53:32 +0100
Subject: [PATCH] fix(fluxWizard): clone cached values to avoid cache polution

---
 .../apis/queryBuilderFetcher.ts                | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/ui/src/shared/components/TimeMachine/fluxQueryBuilder/apis/queryBuilderFetcher.ts b/ui/src/shared/components/TimeMachine/fluxQueryBuilder/apis/queryBuilderFetcher.ts
index 1d007a3c8..3ce9f2273 100644
--- a/ui/src/shared/components/TimeMachine/fluxQueryBuilder/apis/queryBuilderFetcher.ts
+++ b/ui/src/shared/components/TimeMachine/fluxQueryBuilder/apis/queryBuilderFetcher.ts
@@ -79,11 +79,10 @@ class QueryBuilderFetcher {
 
     this.findKeysQueries[tagIndex] = pendingResult
 
-    pendingResult.promise
-      .then(result => {
-        this.findKeysCache[cacheKey] = result
-      })
-      .catch(() => {})
+    pendingResult.promise = pendingResult.promise.then(result => {
+      this.findKeysCache[cacheKey] = [...result]
+      return result
+    })
 
     return pendingResult.promise
   }
@@ -121,11 +120,10 @@ class QueryBuilderFetcher {
 
     this.findValuesQueries[tagIndex] = pendingResult
 
-    pendingResult.promise
-      .then(result => {
-        this.findValuesCache[cacheKey] = result
-      })
-      .catch(() => {})
+    pendingResult.promise = pendingResult.promise.then(result => {
+      this.findValuesCache[cacheKey] = [...result]
+      return result
+    })
 
     return pendingResult.promise
   }