Skip to content

Commit d4df3b6

Browse files
authored
👻 please be the very last branding related change (konveyor#797)
Signed-off-by: David Zager <david.j.zager@gmail.com>
1 parent b95a64e commit d4df3b6

File tree

8 files changed

+23
-16
lines changed

8 files changed

+23
-16
lines changed

tests/e2e/enums/views.enum.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { getAnalysisViewTitle } from '../utilities/utils';
1+
import { extensionShortName, getAnalysisViewTitle } from '../utilities/utils';
22

33
export const KAIViews = {
4-
manageProfiles: 'Manage Profiles',
5-
resolutionDetails: 'Resolution Details',
4+
manageProfiles: `${extensionShortName} Manage Profiles`,
5+
resolutionDetails: `${extensionShortName} Resolution Details`,
66
analysisView: getAnalysisViewTitle(),
77
} as const;

tests/e2e/utilities/utils.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ import process from 'process';
99
export const extensionName = process.env.EXTENSION_NAME || 'konveyor';
1010
export const extensionPublisher = process.env.EXTENSION_PUBLISHER || 'konveyor';
1111
export const extensionId = `${extensionPublisher}.${extensionName}`;
12+
export const extensionShortName = process.env.TEST_CATEGORY || 'Konveyor';
1213

13-
// Function to get the analysis view title based on extension name
14+
// Function to get the analysis view title based on extension short name
1415
export function getAnalysisViewTitle(): string {
15-
return `${extensionName.charAt(0).toUpperCase() + extensionName.slice(1)} Analysis View`;
16+
return `${extensionShortName} Analysis View`;
1617
}
1718

1819
// Function to get OS information

vscode/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
"konveyor": [
293293
{
294294
"id": "konveyor.issueView",
295-
"name": "Konveyor Issues"
295+
"name": "Issues"
296296
}
297297
]
298298
},

vscode/src/KonveyorGUIWebviewViewProvider.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { getNonce } from "./utilities/getNonce";
1717
import { ExtensionData, WebviewType } from "@editor-extensions/shared";
1818
import { Immutable } from "immer";
1919
import jsesc from "jsesc";
20-
import { EXTENSION_NAME } from "./utilities/constants";
20+
import { EXTENSION_NAME, EXTENSION_SHORT_NAME } from "./utilities/constants";
2121

2222
const DEV_SERVER_ROOT = "http://localhost:5173/out/webview";
2323

@@ -61,17 +61,17 @@ export class KonveyorGUIWebviewViewProvider implements WebviewViewProvider {
6161
case "sidebar":
6262
return {
6363
viewType: KonveyorGUIWebviewViewProvider.SIDEBAR_VIEW_TYPE,
64-
title: `${EXTENSION_NAME.charAt(0).toUpperCase() + EXTENSION_NAME.slice(1)} Analysis View`,
64+
title: `${EXTENSION_SHORT_NAME} Analysis View`,
6565
};
6666
case "resolution":
6767
return {
6868
viewType: KonveyorGUIWebviewViewProvider.RESOLUTION_VIEW_TYPE,
69-
title: "Resolution Details",
69+
title: `${EXTENSION_SHORT_NAME} Resolution Details`,
7070
};
7171
case "profiles":
7272
return {
7373
viewType: KonveyorGUIWebviewViewProvider.PROFILES_VIEW_TYPE,
74-
title: "Manage Profiles",
74+
title: `${EXTENSION_SHORT_NAME} Manage Profiles`,
7575
};
7676
default:
7777
throw new Error(`Unsupported view type: ${this._viewType}`);

vscode/src/ViolationCodeActionProvider.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ExtensionState } from "./extensionState";
33
import { EnhancedIncident } from "@editor-extensions/shared";
44
import { Immutable } from "immer";
55
import { DiagnosticSource } from "@editor-extensions/shared";
6-
import { EXTENSION_NAME } from "./utilities/constants";
6+
import { EXTENSION_NAME, EXTENSION_SHORT_NAME } from "./utilities/constants";
77
export class ViolationCodeActionProvider implements vscode.CodeActionProvider {
88
static readonly providedCodeActionKinds = [vscode.CodeActionKind.QuickFix];
99

@@ -61,24 +61,27 @@ export class ViolationCodeActionProvider implements vscode.CodeActionProvider {
6161
return actions;
6262
}
6363

64-
const askKaiAction = new vscode.CodeAction("Ask Kai", vscode.CodeActionKind.QuickFix);
64+
const askKaiAction = new vscode.CodeAction(
65+
`Ask ${EXTENSION_SHORT_NAME}`,
66+
vscode.CodeActionKind.QuickFix,
67+
);
6568
askKaiAction.command = {
6669
command: `${EXTENSION_NAME}.getSolution`,
67-
title: "Ask Kai",
70+
title: `Ask ${EXTENSION_SHORT_NAME}`,
6871
arguments: [[incident]],
6972
};
7073
askKaiAction.diagnostics = [diagnostic];
7174
actions.push(askKaiAction);
7275

7376
if (continueExt) {
7477
const askContinueAction = new vscode.CodeAction(
75-
"Ask Continue with Konveyor Context",
78+
`Ask Continue with ${EXTENSION_SHORT_NAME} Context`,
7679
vscode.CodeActionKind.QuickFix,
7780
);
7881

7982
askContinueAction.command = {
8083
command: `${EXTENSION_NAME}.askContinue`,
81-
title: "Ask Continue with Konveyor Context",
84+
title: `Ask Continue with ${EXTENSION_SHORT_NAME} Context`,
8285
arguments: [incident],
8386
};
8487
askContinueAction.diagnostics = [diagnostic];

vscode/src/utilities/constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ declare const __BUILD_GIT_SHA_SHORT__: string;
77
declare const __BUILD_TIMESTAMP__: string;
88
declare const __EXTENSION_AUTHOR__: string;
99
declare const __EXTENSION_DISPLAY_NAME__: string;
10+
declare const __EXTENSION_SHORT_NAME__: string;
1011

1112
export const KONVEYOR_SCHEME = "konveyorMemFs";
1213
export const KONVEYOR_READ_ONLY_SCHEME = "konveyorReadOnly";
@@ -21,6 +22,7 @@ export const EXTENSION_AUTHOR = __EXTENSION_AUTHOR__;
2122
export const EXTENSION_PUBLISHER = __EXTENSION_PUBLISHER__;
2223
export const EXTENSION_VERSION = __EXTENSION_VERSION__;
2324
export const EXTENSION_DISPLAY_NAME = __EXTENSION_DISPLAY_NAME__;
25+
export const EXTENSION_SHORT_NAME = __EXTENSION_SHORT_NAME__;
2426
export const BUILD_GIT_SHA = __BUILD_GIT_SHA__;
2527
export const BUILD_GIT_SHA_SHORT = __BUILD_GIT_SHA_SHORT__;
2628
export const BUILD_TIMESTAMP = __BUILD_TIMESTAMP__;

vscode/webpack.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ module.exports = (env, argv) => {
8787
__EXTENSION_PUBLISHER__: JSON.stringify(packageJson.publisher),
8888
__EXTENSION_VERSION__: JSON.stringify(packageJson.version),
8989
__EXTENSION_DISPLAY_NAME__: JSON.stringify(packageJson.displayName),
90+
__EXTENSION_SHORT_NAME__: JSON.stringify(packageJson.contributes.commands[0].category),
9091
__BUILD_GIT_SHA__: JSON.stringify(getGitSha()),
9192
__BUILD_GIT_SHA_SHORT__: JSON.stringify(getGitShaShort()),
9293
__BUILD_TIMESTAMP__: JSON.stringify(new Date().toISOString()),

webview-ui/src/components/ResolutionsPage/ResolutionsPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ const ResolutionPage: React.FC = () => {
210210
>
211211
<PageSection>
212212
<Title headingLevel="h1" size="2xl" style={{ display: "flex", alignItems: "center" }}>
213-
Kai Results
213+
Generative AI Results
214214
{isFetchingSolution && <LoadingIndicator />}
215215
{!isFetchingSolution && (
216216
<CheckCircleIcon style={{ marginLeft: "10px", color: "green" }} />

0 commit comments

Comments
 (0)