From b7f64c26386d1dc060c83d1237b583a3a8514042 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Mon, 27 Mar 2023 11:15:27 +0300 Subject: [PATCH 1/3] Use container name as downloaded file name Signed-off-by: Alex Andreev --- .../components/dock/logs/download-all-logs.injectable.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/renderer/components/dock/logs/download-all-logs.injectable.ts b/packages/core/src/renderer/components/dock/logs/download-all-logs.injectable.ts index 089652af0e12..45e970056488 100644 --- a/packages/core/src/renderer/components/dock/logs/download-all-logs.injectable.ts +++ b/packages/core/src/renderer/components/dock/logs/download-all-logs.injectable.ts @@ -25,7 +25,7 @@ const downloadAllLogsInjectable = getInjectable({ }); if (logs) { - openSaveFileDialog(`${params.name}.log`, logs, "text/plain"); + openSaveFileDialog(`${query.container}.log`, logs, "text/plain"); } else { showErrorNotification("No logs to download"); } From 8a407401c0d6cc64f24d6f859c776f57fb9331dc Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Mon, 27 Mar 2023 11:15:57 +0300 Subject: [PATCH 2/3] Specify container to call for logs query Signed-off-by: Alex Andreev --- .../core/src/renderer/components/dock/logs/logs-view-model.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/renderer/components/dock/logs/logs-view-model.ts b/packages/core/src/renderer/components/dock/logs/logs-view-model.ts index a54c0f64f60a..fbf79a401056 100644 --- a/packages/core/src/renderer/components/dock/logs/logs-view-model.ts +++ b/packages/core/src/renderer/components/dock/logs/logs-view-model.ts @@ -101,7 +101,7 @@ export class LogTabViewModel { if (pod && tabData) { const params = { name: pod.getName(), namespace: pod.getNs() }; - const query = { timestamps: tabData.showTimestamps, previous: tabData.showPrevious }; + const query = { timestamps: tabData.showTimestamps, previous: tabData.showPrevious, container: tabData.selectedContainer }; return this.dependencies.downloadAllLogs(params, query); } From d8e1dadd4a8d5f7ba51ad1715235568644ccad91 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Mon, 27 Mar 2023 11:16:05 +0300 Subject: [PATCH 3/3] Fixing tests Signed-off-by: Alex Andreev --- packages/core/src/features/pod-logs/download-logs.test.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/src/features/pod-logs/download-logs.test.tsx b/packages/core/src/features/pod-logs/download-logs.test.tsx index 9cd378a6d4f1..87bcf740d3f2 100644 --- a/packages/core/src/features/pod-logs/download-logs.test.tsx +++ b/packages/core/src/features/pod-logs/download-logs.test.tsx @@ -190,12 +190,12 @@ describe("download logs options in logs dock tab", () => { it("logs have been called with query", () => { expect(callForLogsMock).toHaveBeenCalledWith( { name: "dockerExporter", namespace: "default" }, - { "previous": true, "timestamps": false }, + { "previous": true, "timestamps": false, container: "docker-exporter" }, ); }); it("shows save dialog with proper attributes", async () => { - expect(openSaveFileDialogMock).toHaveBeenCalledWith("dockerExporter.log", "all-logs", "text/plain"); + expect(openSaveFileDialogMock).toHaveBeenCalledWith("docker-exporter.log", "all-logs", "text/plain"); }); it("doesn't block download dropdown for interaction after click", async () => { @@ -265,7 +265,7 @@ describe("download logs options in logs dock tab", () => { it("logs have been called", () => { expect(callForLogsMock).toHaveBeenCalledWith( { name: "dockerExporter", namespace: "default" }, - { "previous": true, "timestamps": false }, + { "previous": true, "timestamps": false, container: "docker-exporter" }, ); });