diff --git a/src/main/lens-proxy.ts b/src/main/lens-proxy.ts index 72646f1717..ef56fdf58d 100644 --- a/src/main/lens-proxy.ts +++ b/src/main/lens-proxy.ts @@ -31,6 +31,7 @@ import { Singleton } from "../common/utils"; import type { Cluster } from "./cluster"; import type { ProxyApiRequestArgs } from "./proxy-functions"; import { appEventBus } from "../common/event-bus"; +import { getBoolean } from "./utils/parse-query"; type GetClusterForRequest = (req: http.IncomingMessage) => Cluster | null; @@ -40,21 +41,20 @@ export interface LensProxyFunctions { kubeApiRequest: (args: ProxyApiRequestArgs) => void | Promise; } -const truthyParams = ["1", "true", ""]; const watchParam = "watch"; const followParam = "follow"; export function isLongRunningRequest(reqUrl: string) { const url = new URL(reqUrl, "http://localhost"); - if (url.searchParams.has(watchParam) && truthyParams.includes(url.searchParams.get(watchParam)) ) { + if (url.searchParams.has(watchParam) && getBoolean(url.searchParams, watchParam)) { return true; } - if (url.searchParams.has(followParam) && truthyParams.includes(url.searchParams.get(followParam)) ) { + if (url.searchParams.has(followParam) && getBoolean(url.searchParams, followParam)) { return true; } - + return false; } diff --git a/src/main/routes/helm-route.ts b/src/main/routes/helm-route.ts index 5e104f6a11..2f217a3193 100644 --- a/src/main/routes/helm-route.ts +++ b/src/main/routes/helm-route.ts @@ -23,7 +23,7 @@ import type { LensApiRequest } from "../router"; import { helmService } from "../helm/helm-service"; import logger from "../logger"; import { respondJson, respondText } from "../utils/http-responses"; -import { getBoolean } from "./utils/parse-query"; +import { getBoolean } from "../utils/parse-query"; export class HelmApiRoute { static async listCharts(request: LensApiRequest) { diff --git a/src/main/routes/utils/index.ts b/src/main/routes/utils/index.ts deleted file mode 100644 index 4a7de80225..0000000000 --- a/src/main/routes/utils/index.ts +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copyright (c) 2021 OpenLens Authors - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -export * from "./parse-query"; diff --git a/src/main/routes/utils/parse-query.ts b/src/main/utils/parse-query.ts similarity index 100% rename from src/main/routes/utils/parse-query.ts rename to src/main/utils/parse-query.ts