From 91ab97e923675867923964520d164dc4636658ec Mon Sep 17 00:00:00 2001 From: Nora Date: Tue, 2 Jan 2024 13:23:00 +0000 Subject: [PATCH 1/2] Adjust extension log messages --- .../src/common/logging/vscode/output-channel-logger.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/ql-vscode/src/common/logging/vscode/output-channel-logger.ts b/extensions/ql-vscode/src/common/logging/vscode/output-channel-logger.ts index b960384eac9..1c865200485 100644 --- a/extensions/ql-vscode/src/common/logging/vscode/output-channel-logger.ts +++ b/extensions/ql-vscode/src/common/logging/vscode/output-channel-logger.ts @@ -63,7 +63,7 @@ export class OutputChannelLogger message: string, show: (message: string, ...items: string[]) => Thenable, ): Promise { - const label = "Show Log"; + const label = "View extension logs"; const result = await show(message, label); if (result === label) { From cfbc44311b45c06cd26ad3e62f359c5a793565dc Mon Sep 17 00:00:00 2001 From: Nora Date: Tue, 2 Jan 2024 13:52:08 +0000 Subject: [PATCH 2/2] Adjust actions log messages --- extensions/ql-vscode/src/stories/common/Alert.stories.tsx | 6 +++--- .../src/view/variant-analysis/FailureReasonAlert.tsx | 4 ++-- .../view/variant-analysis/VariantAnalysisStatusStats.tsx | 2 +- .../__tests__/VariantAnalysisStats.spec.tsx | 2 +- .../__tests__/VariantAnalysisStatusStats.spec.tsx | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/extensions/ql-vscode/src/stories/common/Alert.stories.tsx b/extensions/ql-vscode/src/stories/common/Alert.stories.tsx index 4f9214c0110..4e555013899 100644 --- a/extensions/ql-vscode/src/stories/common/Alert.stories.tsx +++ b/extensions/ql-vscode/src/stories/common/Alert.stories.tsx @@ -72,8 +72,8 @@ ErrorExample.args = { <> Request to https://api.github.com/repos/octodemo/Hello-World/code-scanning/codeql/queries - failed. Check logs and try running this query - again. + failed. View actions logs and try running this + query again. ), }; @@ -86,7 +86,7 @@ ErrorWithButtons.args = { "Request to https://api.github.com/repos/octodemo/Hello-World/code-scanning/codeql/queries failed. Try running this query again.", actions: ( <> - View logs + View actions logs Retry ), diff --git a/extensions/ql-vscode/src/view/variant-analysis/FailureReasonAlert.tsx b/extensions/ql-vscode/src/view/variant-analysis/FailureReasonAlert.tsx index 2c5f947be1a..50a8d7f148d 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/FailureReasonAlert.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/FailureReasonAlert.tsx @@ -34,8 +34,8 @@ const getMessage = (failureReason: VariantAnalysisFailureReason): ReactNode => { return ( <> The GitHub Actions workflow run has failed.{" "} - Check logs and try running - this query again. + View actions logs and try + running this query again. ); case VariantAnalysisFailureReason.InternalError: diff --git a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStatusStats.tsx b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStatusStats.tsx index 6c2d0fbc94b..53b76a52267 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStatusStats.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisStatusStats.tsx @@ -37,7 +37,7 @@ export const VariantAnalysisStatusStats = ({ {completedAt !== undefined ? formatDate(completedAt) : "-"} )} {onViewLogsClick && ( - View logs + View actions logs )} ); diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStats.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStats.spec.tsx index 1996e88e72b..de51096cc2e 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStats.spec.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStats.spec.tsx @@ -147,7 +147,7 @@ describe(VariantAnalysisStats.name, () => { completedAt: new Date(), }); - await userEvent.click(screen.getByText("View logs")); + await userEvent.click(screen.getByText("View actions logs")); expect(onViewLogsClick).toHaveBeenCalledTimes(1); }); diff --git a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStatusStats.spec.tsx b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStatusStats.spec.tsx index 8cdc0cd56ef..609ec2089b6 100644 --- a/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStatusStats.spec.tsx +++ b/extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisStatusStats.spec.tsx @@ -54,7 +54,7 @@ describe(VariantAnalysisStatusStats.name, () => { onViewLogsClick: () => undefined, }); - expect(screen.getByText("View logs")).toBeInTheDocument(); + expect(screen.getByText("View actions logs")).toBeInTheDocument(); }); it("renders when there isn't a viewLogs links", () => { @@ -63,6 +63,6 @@ describe(VariantAnalysisStatusStats.name, () => { onViewLogsClick: undefined, }); - expect(screen.queryByText("View logs")).not.toBeInTheDocument(); + expect(screen.queryByText("View actions logs")).not.toBeInTheDocument(); }); });