Skip to content

Commit 6081228

Browse files
committed
fix: removing the migration of /agents ux and unused code
1 parent 085a3da commit 6081228

File tree

18 files changed

+45
-684
lines changed

18 files changed

+45
-684
lines changed

plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323

2424
<extensions defaultExtensionNs="amazon.q">
2525
<appFactory implementation="software.aws.toolkits.jetbrains.services.cwc.AppFactory" />
26-
<appFactory implementation="software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevAppFactory" />
27-
<appFactory implementation="software.aws.toolkits.jetbrains.services.amazonqDoc.DocAppFactory" />
28-
<appFactory implementation="software.aws.toolkits.jetbrains.services.amazonqCodeScan.CodeScanChatAppFactory" />
29-
<appFactory implementation="software.aws.toolkits.jetbrains.services.amazonqCodeTest.CodeTestChatAppFactory" />
26+
<!-- <appFactory implementation="software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevAppFactory" />-->
27+
<!-- <appFactory implementation="software.aws.toolkits.jetbrains.services.amazonqDoc.DocAppFactory" />-->
28+
<!-- <appFactory implementation="software.aws.toolkits.jetbrains.services.amazonqCodeScan.CodeScanChatAppFactory" />-->
29+
<!-- <appFactory implementation="software.aws.toolkits.jetbrains.services.amazonqCodeTest.CodeTestChatAppFactory" />-->
3030
</extensions>
3131

3232
<actions>

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -145,24 +145,8 @@ class CodeWhispererCodeScanManager(val project: Project, private val defaultScop
145145
*/
146146
fun isOnDemandScanInProgress(): Boolean = isOnDemandScanInProgress.get()
147147

148-
/**
149-
* Code scan job is active when the [Job] is started and is in active state.
150-
*/
151-
fun isCodeScanJobActive(): Boolean = this::codeScanJob.isInitialized && codeScanJob.isActive && isOnDemandScanInProgress()
152-
153-
fun getRunActionButtonIcon(): Icon = if (isOnDemandScanInProgress()) AllIcons.Process.Step_1 else AllIcons.Actions.Execute
154-
155148
fun getActionButtonIconForExplorerNode(): Icon = if (isOnDemandScanInProgress()) AllIcons.Actions.Suspend else AllIcons.Actions.Execute
156149

157-
fun getActionButtonText(): String = if (!isOnDemandScanInProgress()) {
158-
message(
159-
"codewhisperer.codescan.run_scan",
160-
INACTIVE_TEXT_COLOR
161-
)
162-
} else {
163-
message("codewhisperer.codescan.stop_scan")
164-
}
165-
166150
private fun isIgnoredIssueTitle(title: String) = getIgnoredIssueTitles().contains(title)
167151

168152
fun isIgnoredIssue(title: String, document: Document, file: VirtualFile, startLine: Int) = isIgnoredIssueTitle(title) ||

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/actions/CodeWhispererCodeScanRunAction.kt

Lines changed: 0 additions & 40 deletions
This file was deleted.

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/QStatusBarLoggedInActionGroup.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileMa
1818
import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererConnectOnGithubAction
1919
import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererLearnMoreAction
2020
import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererProvideFeedbackAction
21-
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.actions.CodeWhispererCodeScanRunAction
2221
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.actions.ActionProvider
2322
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.actions.Customize
2423
import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.actions.Learn
@@ -41,7 +40,6 @@ class QStatusBarLoggedInActionGroup : DefaultActionGroup() {
4140
override val customize = Customize()
4241
override val learn = Learn()
4342
override val openChatPanel = ActionManager.getInstance().getAction("q.openchat")
44-
override val runScan = CodeWhispererCodeScanRunAction()
4543
override val pauseAutoScans = PauseCodeScans()
4644
override val resumeAutoScans = ResumeCodeScans()
4745
override val sendFeedback = CodeWhispererProvideFeedbackAction()

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/actions/ActionFactory.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ interface ActionProvider<T> {
2020
val openChatPanel: T
2121
val pauseAutoScans: T
2222
val resumeAutoScans: T
23-
val runScan: T
2423
val sendFeedback: T
2524
val connectOnGithub: T
2625
val documentation: T
@@ -53,7 +52,6 @@ fun <T> buildActionListForCodeScan(project: Project, actionProvider: ActionProvi
5352
add(actionProvider.resumeAutoScans)
5453
}
5554
}
56-
add(actionProvider.runScan)
5755
}
5856

5957
fun <T> buildActionListForOtherFeatures(project: Project, actionProvider: ActionProvider<T>): List<T> =

plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/amazonqCommonsConnector.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,21 +86,9 @@ export class Connector {
8686
private processUserGuideLink(tabType: TabType, actionId: string) {
8787
let userGuideLink = ''
8888
switch (tabType) {
89-
case 'codescan':
90-
userGuideLink = codeScanUserGuide
91-
break
92-
case 'codetest':
93-
userGuideLink = codeTestUserGuide
94-
break
9589
case 'codetransform':
9690
userGuideLink = codeTransformUserGuide
9791
break
98-
case 'doc':
99-
userGuideLink = docUserGuide
100-
break
101-
case 'featuredev':
102-
userGuideLink = featureDevUserGuide
103-
break
10492
}
10593

10694
// e.g. amazonq-explore-user-guide-featuredev

plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTestChatConnector.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2-
// SPDX-License-Identifier: Apache-2.0
1+
/*!
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
35

46
import {ExtensionMessage} from "../commands";
57
import {ChatPayload, ConnectorProps} from "../connector";
68
import {FormButtonIds} from "../forms/constants";
79
import {ChatItem, ChatItemAction, ChatItemType, FeedbackPayload, MynahIcons, MynahUIDataModel} from '@aws/mynah-ui-chat'
810
import {CodeReference} from "./amazonqCommonsConnector";
9-
import {Status} from "@aws/mynah-ui-chat/dist/static";
10-
import {EmptyMynahUIDataModel} from "@aws/mynah-ui-chat/dist/helper/store";
11-
import {doesNotMatch} from "node:assert";
1211

1312
export interface ICodeTestChatConnectorProps {
1413
sendMessageToExtension: (message: ExtensionMessage) => void

plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/docChatConnector.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -243,12 +243,12 @@ export class Connector {
243243
canBeVoted: false,
244244
})
245245

246-
this.onChatAnswerReceived(messageData.tabID, {
247-
type: ChatItemType.SYSTEM_PROMPT,
248-
body: undefined,
249-
followUp: this.followUpGenerator.generateAuthFollowUps('doc', messageData.authType),
250-
canBeVoted: false,
251-
})
246+
// this.onChatAnswerReceived(messageData.tabID, {
247+
// type: ChatItemType.SYSTEM_PROMPT,
248+
// body: undefined,
249+
// followUp: this.followUpGenerator.generateAuthFollowUps('doc', messageData.authType),
250+
// canBeVoted: false,
251+
// })
252252

253253
return
254254
}
@@ -321,12 +321,12 @@ export class Connector {
321321
}
322322

323323
if (messageData.type === 'authNeededException') {
324-
this.processAuthNeededException(messageData)
324+
// this.processAuthNeededException(messageData)
325325
return
326326
}
327327

328328
if (messageData.type === 'openNewTabMessage') {
329-
this.onNewTab('doc')
329+
// this.onNewTab('doc')
330330
return
331331
}
332332

plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/featureDevChatConnector.ts

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class Connector {
5050
private readonly chatInputEnabled
5151
private readonly onUpdateAuthentication
5252
private readonly followUpGenerator: FollowUpGenerator
53-
private readonly onNewTab
53+
// private readonly onNewTab
5454
private readonly onFileComponentUpdate
5555

5656
constructor(props: ConnectorProps) {
@@ -64,7 +64,7 @@ export class Connector {
6464
this.chatInputEnabled = props.onChatInputEnabled
6565
this.onUpdateAuthentication = props.onUpdateAuthentication
6666
this.followUpGenerator = new FollowUpGenerator()
67-
this.onNewTab = props.onNewTab
67+
// this.onNewTab = props.onNewTab
6868
this.onFileComponentUpdate = props.onFileComponentUpdate
6969
}
7070

@@ -173,27 +173,6 @@ export class Connector {
173173
}
174174
}
175175

176-
private processAuthNeededException = async (messageData: any): Promise<void> => {
177-
if (this.onChatAnswerReceived === undefined) {
178-
return
179-
}
180-
181-
this.onChatAnswerReceived(messageData.tabID, {
182-
type: ChatItemType.ANSWER,
183-
body: messageData.message,
184-
followUp: undefined,
185-
canBeVoted: false,
186-
})
187-
188-
this.onChatAnswerReceived(messageData.tabID, {
189-
type: ChatItemType.SYSTEM_PROMPT,
190-
body: undefined,
191-
followUp: this.followUpGenerator.generateAuthFollowUps('featuredev', messageData.authType),
192-
canBeVoted: false,
193-
})
194-
195-
return
196-
}
197176

198177
private createAnswer = (messageData: any): ChatItem => {
199178
return {
@@ -274,16 +253,6 @@ export class Connector {
274253
)
275254
return
276255
}
277-
278-
if (messageData.type === 'authNeededException') {
279-
this.processAuthNeededException(messageData)
280-
return
281-
}
282-
283-
if (messageData.type === 'openNewTabMessage') {
284-
this.onNewTab('featuredev')
285-
return
286-
}
287256
}
288257

289258
onStopChatResponse = (tabID: string): void => {

0 commit comments

Comments
 (0)