From f49d3aeb6d2dcc60343b55bc4b220d7ebc5f0008 Mon Sep 17 00:00:00 2001
From: Jim Ehrismann <jehrismann@mirantis.com>
Date: Mon, 29 Nov 2021 11:00:38 -0500
Subject: [PATCH] pass clusterId query as param

Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>
---
 src/renderer/port-forward/port-forward.store.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/renderer/port-forward/port-forward.store.ts b/src/renderer/port-forward/port-forward.store.ts
index caf2d1001e..3d7f2c6153 100644
--- a/src/renderer/port-forward/port-forward.store.ts
+++ b/src/renderer/port-forward/port-forward.store.ts
@@ -112,7 +112,7 @@ export async function addPortForward(portForward: ForwardedPort): Promise<number
     }
   } catch (error) {
     logger.warn("[PORT-FORWARD-STORE] Error adding port-forward:", error, portForward);
-    throw(error);
+    throw (error);
   }
   portForwardStore.reset();
 
@@ -134,7 +134,7 @@ export async function getPortForward(portForward: ForwardedPort): Promise<number
     response = await apiBase.get<PortForwardResult>(`/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}?port=${portForward.port}&forwardPort=${portForward.forwardPort}${getProtocolQuery(portForward.protocol)}`);
   } catch (error) {
     logger.warn("[PORT-FORWARD-STORE] Error getting port-forward:", error, portForward);
-    throw(error);
+    throw (error);
   }
 
   return response?.port;
@@ -142,7 +142,7 @@ export async function getPortForward(portForward: ForwardedPort): Promise<number
 
 export async function modifyPortForward(portForward: ForwardedPort, desiredPort: number): Promise<number> {
   let port = 0;
-  
+
   await removePortForward(portForward);
   portForward.forwardPort = desiredPort;
   port = await addPortForward(portForward);
@@ -159,20 +159,19 @@ export async function removePortForward(portForward: ForwardedPort) {
     await waitUntilFree(+portForward.forwardPort, 200, 1000);
   } catch (error) {
     logger.warn("[PORT-FORWARD-STORE] Error removing port-forward:", error, portForward);
-    throw(error);
+    throw (error);
   }
   portForwardStore.reset();
 }
 
 export async function getPortForwards(clusterId?: string): Promise<ForwardedPort[]> {
   try {
-    const query = clusterId ? `?clusterId=${clusterId}` : "";
-    const response = await apiBase.get<PortForwardsResult>(`/pods/port-forwards${query}`);
+    const response = await apiBase.get<PortForwardsResult>("/pods/port-forwards", { query: { clusterId }});
 
     return response.portForwards;
   } catch (error) {
     logger.warn("[PORT-FORWARD-STORE] Error getting all port-forwards:", error);
-    
+
     return [];
   }
 }