Skip to content

Commit 3fad124

Browse files
laileni-awslaileni-aws
committed
Code Cleanup1
1 parent 69a662a commit 3fad124

File tree

7 files changed

+33
-97
lines changed

7 files changed

+33
-97
lines changed

‎packages/core/src/amazonq/webview/ui/apps/scanChatConnector.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import { ChatItem, ChatItemType } from '@aws/mynah-ui'
1111
import { ExtensionMessage } from '../commands'
1212
import { TabOpenType, TabsStorage } from '../storages/tabsStorage'
13-
import { GumbyMessageType } from '../../../../amazonqGumby/chat/views/connector/connector' //TODO
13+
import { ScanMessageType } from '../../../../amazonqScans/chat/views/connector/connector'
1414
import { ChatPayload } from '../connector'
1515

1616
export interface ConnectorProps {
@@ -30,7 +30,7 @@ export interface ConnectorProps {
3030

3131
export interface MessageData {
3232
tabID: string
33-
type: GumbyMessageType
33+
type: ScanMessageType
3434
}
3535

3636
export class Connector {
@@ -123,7 +123,7 @@ export class Connector {
123123
tabID: tabID,
124124
command: 'scan',
125125
chatMessage: 'transform',
126-
tabType: 'scan', //TODO
126+
tabType: 'scan',
127127
})
128128
}
129129

@@ -185,7 +185,7 @@ export class Connector {
185185
}
186186

187187
// This handles messages received from the extension, to be forwarded to the webview
188-
handleMessageReceive = async (messageData: { type: GumbyMessageType } & Record<string, any>) => {
188+
handleMessageReceive = async (messageData: { type: ScanMessageType } & Record<string, any>) => {
189189
switch (messageData.type) {
190190
case 'asyncEventProgressMessage':
191191
this.onAsyncEventProgress(

‎packages/core/src/amazonq/webview/ui/connector.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ export class Connector {
100100
break
101101
case 'gumby':
102102
this.gumbyChatConnector.onResponseBodyLinkClick(tabID, messageId, link)
103+
break
103104
case 'scan':
104105
this.scanChatConnector.onResponseBodyLinkClick(tabID, messageId, link)
105106
}

‎packages/core/src/amazonq/webview/ui/main.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export const createMynahUI = (ideApi: any, amazonQEnabled: boolean) => {
5656
let isFeatureDevEnabled = amazonQEnabled
5757

5858
let isGumbyEnabled = amazonQEnabled
59-
59+
//TODO: Do we need similar for Scans?
6060
let tabDataGenerator = new TabDataGenerator({
6161
isFeatureDevEnabled,
6262
isGumbyEnabled,

‎packages/core/src/amazonq/webview/ui/quickActions/handler.ts‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class QuickActionHandler {
5050
this.handleGumbyCommand(tabID, eventId)
5151
break
5252
case '/scan':
53-
this.handleScanCommand(tabID, eventId)
53+
this.handleScanCommand(tabID, eventId) //TODO: Need to add Prompt which populates once user hit /scan
5454
break
5555
case '/clear':
5656
this.handleClearCommand(tabID)
@@ -113,26 +113,27 @@ export class QuickActionHandler {
113113
}
114114

115115
private handleScanCommand(tabID: string, eventId: string | undefined) {
116-
// if (!this.isGumbyEnabled) {
117-
// return
118-
// }
116+
//TODO: Need to replace with isScanEnabled
117+
if (!this.isGumbyEnabled) {
118+
return
119+
}
119120

120-
let gumbyTabId: string | undefined = undefined
121+
let scanTabId: string | undefined = undefined
121122

122123
this.tabsStorage.getTabs().forEach((tab) => {
123124
if (tab.type === 'scan') {
124-
gumbyTabId = tab.id
125+
scanTabId = tab.id
125126
}
126127
})
127128

128-
if (gumbyTabId !== undefined) {
129-
this.mynahUI.selectTab(gumbyTabId, eventId || '')
130-
this.connector.onTabChange(gumbyTabId)
129+
if (scanTabId !== undefined) {
130+
this.mynahUI.selectTab(scanTabId, eventId || '')
131+
this.connector.onTabChange(scanTabId)
131132
return
132133
}
133134

134135
let affectedTabId: string | undefined = tabID
135-
// if there is no gumby tab, open a new one
136+
// if there is no scan tab, open a new one
136137
if (this.tabsStorage.getTab(affectedTabId)?.type !== 'unknown') {
137138
affectedTabId = this.mynahUI.updateStore('', {
138139
loadingChat: true,

‎packages/core/src/amazonqScans/app.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import * as vscode from 'vscode'
77
import { AmazonQAppInitContext } from '../amazonq/apps/initContext'
88
import { MessagePublisher } from '../amazonq/messages/messagePublisher'
99
import { MessageListener } from '../amazonq/messages/messageListener'
10-
import { ScanChatControllerEventEmitters, GumbyController } from './chat/controller/controller'
10+
import { ScanChatControllerEventEmitters, ScanController } from './chat/controller/controller'
1111
import { AppToWebViewMessageDispatcher } from './chat/views/connector/connector'
1212
import { Messenger } from './chat/controller/messenger/messenger'
1313
import { UIMessageListener } from './chat/views/actions/uiMessageListener'
1414
import { debounce } from 'lodash'
1515
import { AuthUtil } from '../codewhisperer/util/authUtil'
1616
import { showTransformationHub } from './commands'
17-
import { codeScanState, transformByQState } from '../codewhisperer/models/model'
17+
import { codeScanState } from '../codewhisperer/models/model'
1818
import { ChatSessionManager } from './chat/storages/chatSession'
1919

2020
export function init(appContext: AmazonQAppInitContext) {
@@ -37,7 +37,7 @@ export function init(appContext: AmazonQAppInitContext) {
3737
const dispatcher = new AppToWebViewMessageDispatcher(appContext.getAppsToWebViewMessagePublisher())
3838
const messenger = new Messenger(dispatcher)
3939

40-
new GumbyController(gumbyChatControllerEventEmitters, messenger, appContext.onDidChangeAmazonQVisibility.event)
40+
new ScanController(gumbyChatControllerEventEmitters, messenger, appContext.onDidChangeAmazonQVisibility.event)
4141

4242
const scanChatUIInputEventEmitter = new vscode.EventEmitter<any>()
4343

‎packages/core/src/amazonqScans/chat/controller/controller.ts‎

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export interface ScanChatControllerEventEmitters {
8888
readonly showSecurityScan: vscode.EventEmitter<any>
8989
}
9090

91-
export class GumbyController {
91+
export class ScanController {
9292
private readonly messenger: Messenger
9393
private readonly sessionStorage: ChatSessionManager
9494
private authController: AuthController
@@ -122,7 +122,6 @@ export class GumbyController {
122122
})
123123

124124
this.chatControllerMessageListeners.formActionClicked.event((data) => {
125-
void vscode.window.setStatusBarMessage('Running Project scan SCAN')
126125
return this.formActionClicked(data)
127126
})
128127

@@ -250,79 +249,14 @@ export class GumbyController {
250249
this.messenger.sendCompilationInProgress(message.tabID)
251250
return
252251
}
253-
void vscode.window.setStatusBarMessage('This is Scan Side only')
254-
255252
// this.messenger.sendSecurityScans(message.tabID) //TODO
256-
this.messenger.sendScans(message.tabID, 'Choose Scan Type')
253+
this.messenger.sendScans(message.tabID, 'Choose the type of Scan')
257254
// this.messenger.sendTransformationIntroduction(message.tabID)
258255
})
259256
} catch (e: any) {
260257
// if there was an issue getting the list of valid projects, the error message will be shown here
261258
this.messenger.sendErrorMessage(e.message, message.tabID)
262259
}
263-
/*
264-
//TODO Here
265-
try {
266-
const validProjects = await this.validateProjectsWithReplyOnError(message)
267-
if (validProjects.length > 0) {
268-
this.sessionStorage.getSession().updateCandidateProjects(validProjects)
269-
await this.messenger.sendProjectPrompt(validProjects, message.tabID)
270-
}
271-
} catch (err: any) {
272-
// if there was an issue getting the list of valid projects, the error message will be shown here
273-
this.messenger.sendErrorMessage(err.message, message.tabID)
274-
}
275-
*/
276-
}
277-
278-
private async validateProjectsWithReplyOnError(message: any): Promise<TransformationCandidateProject[]> {
279-
let telemetryJavaVersion = JDKToTelemetryValue(JDKVersion.UNSUPPORTED) as CodeTransformJavaSourceVersionsAllowed
280-
281-
let err
282-
try {
283-
const validProjects = await telemetry.codeTransform_validateProject.run(async () => {
284-
telemetry.record({
285-
codeTransformBuildSystem: 'Maven', // default for Maven until we add undefined field to CodeTransformBuildSystem
286-
codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
287-
})
288-
289-
const validProjects = await getValidCandidateProjects()
290-
if (validProjects.length > 0) {
291-
// validProjects[0].JDKVersion will be undefined if javap errors out or no .class files found, so call it UNSUPPORTED
292-
const javaVersion = validProjects[0].JDKVersion ?? JDKVersion.UNSUPPORTED
293-
telemetryJavaVersion = JDKToTelemetryValue(javaVersion) as CodeTransformJavaSourceVersionsAllowed
294-
}
295-
telemetry.record({ codeTransformLocalJavaVersion: telemetryJavaVersion })
296-
297-
await setMaven()
298-
const versionInfo = await getVersionData()
299-
const mavenVersionInfoMessage = `${versionInfo[0]} (${transformByQState.getMavenName()})`
300-
telemetry.record({ buildSystemVersion: mavenVersionInfoMessage })
301-
302-
return validProjects
303-
})
304-
return validProjects
305-
} catch (e: any) {
306-
if (e instanceof NoJavaProjectsFoundError) {
307-
this.messenger.sendUnrecoverableErrorResponse('no-java-project-found', message.tabID)
308-
} else if (e instanceof NoMavenJavaProjectsFoundError) {
309-
this.messenger.sendUnrecoverableErrorResponse('no-maven-java-project-found', message.tabID)
310-
} else {
311-
this.messenger.sendUnrecoverableErrorResponse('no-project-found', message.tabID)
312-
}
313-
err = e
314-
} finally {
315-
// TODO: remove deprecated metric once BI started using new metrics
316-
// telemetry.codeTransform_projectDetails.emit({
317-
// passive: true,
318-
// codeTransformSessionId: CodeTransformTelemetryState.instance.getSessionId(),
319-
// codeTransformLocalJavaVersion: telemetryJavaVersion,
320-
// result: err?.code ? MetadataResult.Fail : MetadataResult.Pass,
321-
// reason: err?.code,
322-
// reasonDesc: getTelemetryReasonDesc(err),
323-
// })
324-
}
325-
return []
326260
}
327261

328262
private async formActionClicked(message: any) {

‎packages/core/src/amazonqScans/chat/views/connector/connector.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { ChatItemButton, ChatItemFormItem } from '@aws/mynah-ui/dist/static'
1010
import { GumbyCommands } from '../../controller/messenger/messengerUtils'
1111
import { ChatItemType } from '../../../../amazonq/commons/model'
1212

13-
export type GumbyMessageType =
13+
export type ScanMessageType =
1414
| 'errorMessage'
1515
| 'asyncEventProgressMessage'
1616
| 'authenticationUpdateMessage'
@@ -24,14 +24,14 @@ export type GumbyMessageType =
2424
class UiMessage {
2525
readonly time: number = Date.now()
2626
readonly sender: string = gumbyChat
27-
readonly type: GumbyMessageType = 'chatMessage'
27+
readonly type: ScanMessageType = 'chatMessage'
2828
readonly status: string = 'info'
2929

3030
public constructor(protected tabID: string) {}
3131
}
3232

3333
export class ErrorMessage extends UiMessage {
34-
override type: GumbyMessageType = 'errorMessage'
34+
override type: ScanMessageType = 'errorMessage'
3535

3636
constructor(
3737
readonly title: string,
@@ -55,7 +55,7 @@ export class AsyncEventProgressMessage extends UiMessage {
5555
readonly messageId?: string | undefined
5656
readonly buttons?: ChatItemButton[]
5757
readonly messageType = 'answer-part'
58-
override type: GumbyMessageType = 'asyncEventProgressMessage'
58+
override type: ScanMessageType = 'asyncEventProgressMessage'
5959

6060
constructor(tabID: string, props: AsyncEventProgressMessageProps) {
6161
super(tabID)
@@ -69,7 +69,7 @@ export class AsyncEventProgressMessage extends UiMessage {
6969
export class AuthenticationUpdateMessage {
7070
readonly time: number = Date.now()
7171
readonly sender: string = gumbyChat
72-
readonly type: GumbyMessageType = 'authenticationUpdateMessage'
72+
readonly type: ScanMessageType = 'authenticationUpdateMessage'
7373

7474
constructor(
7575
readonly gumbyEnabled: boolean,
@@ -78,7 +78,7 @@ export class AuthenticationUpdateMessage {
7878
}
7979

8080
export class AuthNeededException extends UiMessage {
81-
override type: GumbyMessageType = 'authNeededException'
81+
override type: ScanMessageType = 'authNeededException'
8282

8383
constructor(
8484
readonly message: string,
@@ -99,7 +99,7 @@ export class ChatPrompt extends UiMessage {
9999
readonly messageType = 'system-prompt'
100100
readonly formItems: ChatItemFormItem[]
101101
formButtons: ChatItemButton[]
102-
override type: GumbyMessageType = 'chatPrompt'
102+
override type: ScanMessageType = 'chatPrompt'
103103

104104
constructor(props: ChatPromptProps, promptIDPrefix: string, tabID: string, keepCardAfterClick: boolean = true) {
105105
super(tabID)
@@ -134,7 +134,7 @@ export class ChatMessage extends UiMessage {
134134
readonly messageId?: string | undefined
135135
readonly messageType: ChatItemType
136136
readonly buttons: ChatItemButton[]
137-
override type: GumbyMessageType = 'chatMessage'
137+
override type: ScanMessageType = 'chatMessage'
138138

139139
constructor(props: ChatMessageProps, tabID: string) {
140140
super(tabID)
@@ -146,7 +146,7 @@ export class ChatMessage extends UiMessage {
146146
}
147147

148148
export class ChatInputEnabledMessage extends UiMessage {
149-
override type: GumbyMessageType = 'chatInputEnabledMessage'
149+
override type: ScanMessageType = 'chatInputEnabledMessage'
150150

151151
constructor(
152152
tabID: string,
@@ -157,7 +157,7 @@ export class ChatInputEnabledMessage extends UiMessage {
157157
}
158158

159159
export class SendCommandMessage extends UiMessage {
160-
override type: GumbyMessageType = 'sendCommandMessage'
160+
override type: ScanMessageType = 'sendCommandMessage'
161161

162162
constructor(
163163
readonly command: GumbyCommands,
@@ -170,7 +170,7 @@ export class SendCommandMessage extends UiMessage {
170170

171171
export class UpdatePlaceholderMessage extends UiMessage {
172172
readonly newPlaceholder: string
173-
override type: GumbyMessageType = 'updatePlaceholderMessage'
173+
override type: ScanMessageType = 'updatePlaceholderMessage'
174174

175175
constructor(tabID: string, newPlaceholder: string) {
176176
super(tabID)

0 commit comments

Comments
 (0)