diff --git a/src/renderer/components/dock/logs/__test__/download-logs.test.tsx b/src/renderer/components/dock/logs/__test__/download-logs.test.tsx index 1d3c4becbf..b4078957f4 100644 --- a/src/renderer/components/dock/logs/__test__/download-logs.test.tsx +++ b/src/renderer/components/dock/logs/__test__/download-logs.test.tsx @@ -15,7 +15,7 @@ import type { ApplicationBuilder } from "../../../test-utils/get-application-bui import { getApplicationBuilder } from "../../../test-utils/get-application-builder"; import dockStoreInjectable from "../../dock/store.injectable"; import areLogsPresentInjectable from "../are-logs-present.injectable"; -import callForAllLogsInjectable from "../call-for-all-logs.injectable"; +import callForLogsInjectable from "../call-for-logs.injectable"; import createPodLogsTabInjectable from "../create-pod-logs-tab.injectable"; import getLogTabDataInjectable from "../get-log-tab-data.injectable"; import getLogsWithoutTimestampsInjectable from "../get-logs-without-timestamps.injectable"; @@ -41,7 +41,7 @@ describe("download logs options in pod logs dock tab", () => { builder.setEnvironmentToClusterFrame(); builder.beforeApplicationStart(({ rendererDi }) => { - rendererDi.override(callForAllLogsInjectable, () => () => Promise.resolve("all-logs")); + rendererDi.override(callForLogsInjectable, () => () => Promise.resolve("all-logs")); // Overriding internals of logsViewModelInjectable rendererDi.override(getLogsInjectable, () => () => ["some-logs"]); diff --git a/src/renderer/components/dock/logs/call-for-all-logs.injectable.ts b/src/renderer/components/dock/logs/call-for-all-logs.injectable.ts deleted file mode 100644 index dba9f2d463..0000000000 --- a/src/renderer/components/dock/logs/call-for-all-logs.injectable.ts +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; -import type { Pod, PodLogsQuery } from "../../../../common/k8s-api/endpoints"; -import callForLogsInjectable from "./call-for-logs.injectable"; - -const callForAllLogsInjectable = getInjectable({ - id: "call-for-all-logs", - - instantiate: (di) => { - const callForLogs = di.inject(callForLogsInjectable); - - return async (pod: Pod, query?: PodLogsQuery) => { - const namespace = pod.getNs(); - const name = pod.getName(); - const logs = await callForLogs({ name, namespace }, query); - - return logs; - }; - }, -}); - -export default callForAllLogsInjectable; diff --git a/src/renderer/components/dock/logs/controls.tsx b/src/renderer/components/dock/logs/controls.tsx index 5d5e65c359..c78162f950 100644 --- a/src/renderer/components/dock/logs/controls.tsx +++ b/src/renderer/components/dock/logs/controls.tsx @@ -13,9 +13,8 @@ import { Checkbox } from "../../checkbox"; import type { LogTabViewModel } from "./logs-view-model"; import { withInjectables } from "@ogre-tools/injectable-react"; import openSaveFileDialogInjectable from "../../../utils/save-file.injectable"; -import callForAllLogsInjectable from "./call-for-all-logs.injectable"; import { DownloadLogsDropdown } from "./download-logs-dropdown"; -import type { Pod, PodLogsQuery } from "../../../../common/k8s-api/endpoints"; +import callForLogsInjectable, { CallForLogs } from "./call-for-logs.injectable"; export interface LogControlsProps { model: LogTabViewModel; @@ -23,10 +22,10 @@ export interface LogControlsProps { interface Dependencies { openSaveFileDialog: (filename: string, contents: BlobPart | BlobPart[], type: string) => void; - callForAllLogs: (pod: Pod, query?: PodLogsQuery) => Promise; + callForLogs: CallForLogs; } -const NonInjectedLogControls = observer(({ openSaveFileDialog, model, callForAllLogs }: Dependencies & LogControlsProps) => { +const NonInjectedLogControls = observer(({ openSaveFileDialog, model, callForLogs }: Dependencies & LogControlsProps) => { const tabData = model.logTabData.get(); const pod = model.pod.get(); @@ -51,7 +50,10 @@ const NonInjectedLogControls = observer(({ openSaveFileDialog, model, callForAll const pod = model.pod.get(); if (pod) { - const logs = await callForAllLogs(pod, { timestamps: showTimestamps, previous }); + const logs = await callForLogs( + { name: pod.getName(), namespace: pod.getNs() }, + { timestamps: showTimestamps, previous } + ) openSaveFileDialog(`${pod.getName()}.log`, logs, "text/plain"); } @@ -106,7 +108,7 @@ const NonInjectedLogControls = observer(({ openSaveFileDialog, model, callForAll export const LogControls = withInjectables(NonInjectedLogControls, { getProps: (di, props) => ({ openSaveFileDialog: di.inject(openSaveFileDialogInjectable), - callForAllLogs: di.inject(callForAllLogsInjectable), + callForLogs: di.inject(callForLogsInjectable), ...props, }), });