Skip to content

Commit ab7288d

Browse files
authored
refactor: removing the auth utils code of /agents (#6080)
1 parent 5753b4d commit ab7288d

File tree

11 files changed

+6
-95
lines changed

11 files changed

+6
-95
lines changed

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.webview.BrowserConnector
4141
import software.aws.toolkits.jetbrains.services.amazonq.webview.FqnWebviewAdapter
4242
import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.EditorThemeAdapter
4343
import software.aws.toolkits.jetbrains.services.amazonqCodeScan.auth.isCodeScanAvailable
44-
import software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth.isCodeTestAvailable
45-
import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable
46-
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable
4744
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
4845
import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
4946
import software.aws.toolkits.resources.message
@@ -265,10 +262,7 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
265262
private fun connectUi(browser: Browser) {
266263
browser.init(
267264
isCodeTransformAvailable = isCodeTransformAvailable(project),
268-
isFeatureDevAvailable = isFeatureDevAvailable(project),
269265
isCodeScanAvailable = isCodeScanAvailable(project),
270-
isCodeTestAvailable = isCodeTestAvailable(project),
271-
isDocAvailable = isDocAvailable(project),
272266
highlightCommand = highlightCommand(),
273267
activeProfile = QRegionProfileManager.getInstance().takeIf { it.shouldDisplayProfileInfo(project) }?.activeProfile(project)
274268
)

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,13 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro
4444

4545
fun init(
4646
isCodeTransformAvailable: Boolean,
47-
isFeatureDevAvailable: Boolean,
48-
isDocAvailable: Boolean,
4947
isCodeScanAvailable: Boolean,
50-
isCodeTestAvailable: Boolean,
5148
highlightCommand: HighlightCommand?,
5249
activeProfile: QRegionProfile?,
5350
) {
5451
loadWebView(
5552
isCodeTransformAvailable,
56-
isFeatureDevAvailable,
57-
isDocAvailable,
5853
isCodeScanAvailable,
59-
isCodeTestAvailable,
6054
highlightCommand,
6155
activeProfile
6256
)
@@ -80,10 +74,7 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro
8074
// Load the chat web app into the jcefBrowser
8175
private fun loadWebView(
8276
isCodeTransformAvailable: Boolean,
83-
isFeatureDevAvailable: Boolean,
84-
isDocAvailable: Boolean,
8577
isCodeScanAvailable: Boolean,
86-
isCodeTestAvailable: Boolean,
8778
highlightCommand: HighlightCommand?,
8879
activeProfile: QRegionProfile?,
8980
) {
@@ -99,10 +90,7 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro
9990
"webview/chat.html",
10091
getWebviewHTML(
10192
isCodeTransformAvailable,
102-
isFeatureDevAvailable,
103-
isDocAvailable,
10493
isCodeScanAvailable,
105-
isCodeTestAvailable,
10694
highlightCommand,
10795
activeProfile,
10896
)
@@ -116,10 +104,7 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro
116104
*/
117105
private fun getWebviewHTML(
118106
isCodeTransformAvailable: Boolean,
119-
isFeatureDevAvailable: Boolean,
120-
isDocAvailable: Boolean,
121107
isCodeScanAvailable: Boolean,
122-
isCodeTestAvailable: Boolean,
123108
highlightCommand: HighlightCommand?,
124109
activeProfile: QRegionProfile?,
125110
): String {
@@ -138,11 +123,11 @@ class Browser(parent: Disposable, private val mynahAsset: Path, val project: Pro
138123
const hybridChatConnector = connectorAdapter.initiateAdapter(
139124
${MeetQSettings.getInstance().reinvent2024OnboardingCount < MAX_ONBOARDING_PAGE_COUNT},
140125
${MeetQSettings.getInstance().disclaimerAcknowledged},
141-
$isFeatureDevAvailable,
126+
true,
142127
$isCodeTransformAvailable,
143-
$isDocAvailable,
128+
true,
144129
$isCodeScanAvailable,
145-
$isCodeTestAvailable,
130+
true,
146131
{
147132
postMessage: message => { $postMessageToJavaJsCode }
148133
},

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.util.tabType
109109
import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.AmazonQTheme
110110
import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.ThemeBrowserAdapter
111111
import software.aws.toolkits.jetbrains.services.amazonqCodeScan.auth.isCodeScanAvailable
112-
import software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth.isCodeTestAvailable
113-
import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable
114-
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable
115112
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
116113
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanIssue
117114
import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanManager
@@ -694,11 +691,8 @@ class BrowserConnector(
694691
}
695692

696693
private suspend fun updateQuickActionsInBrowser(browser: Browser) {
697-
val isFeatureDevAvailable = isFeatureDevAvailable(project)
698694
val isCodeTransformAvailable = isCodeTransformAvailable(project)
699-
val isDocAvailable = isDocAvailable(project)
700695
val isCodeScanAvailable = isCodeScanAvailable(project)
701-
val isCodeTestAvailable = isCodeTestAvailable(project)
702696

703697
val serverCapabilities = AmazonQLspService.getInstance(project).instanceFlow.first().initializeResult.await().awsServerCapabilities
704698

@@ -709,11 +703,11 @@ class BrowserConnector(
709703
const tempConnector = connectorAdapter.initiateAdapter(
710704
false,
711705
true, // the two values are not used here, needed for constructor
712-
$isFeatureDevAvailable,
706+
true,
713707
$isCodeTransformAvailable,
714-
$isDocAvailable,
708+
true,
715709
$isCodeScanAvailable,
716-
$isCodeTestAvailable,
710+
true,
717711
{ postMessage: () => {} },
718712
);
719713

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/CodeScanChatApp.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeScan.messages.Authent
3232
import software.aws.toolkits.jetbrains.services.amazonqCodeScan.messages.CODE_SCAN_TAB_NAME
3333
import software.aws.toolkits.jetbrains.services.amazonqCodeScan.messages.IncomingCodeScanMessage
3434
import software.aws.toolkits.jetbrains.services.amazonqCodeScan.storage.ChatSessionStorage
35-
import software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth.isCodeTestAvailable
36-
import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable
37-
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable
3835
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable
3936
import java.util.concurrent.atomic.AtomicBoolean
4037

@@ -90,11 +87,8 @@ class CodeScanChatApp(private val scope: CoroutineScope) : AmazonQApp {
9087
// Notify tabs about restoring authentication
9188
context.messagesFromAppToUi.publish(
9289
AuthenticationUpdateMessage(
93-
featureDevEnabled = isFeatureDevAvailable(context.project),
9490
codeTransformEnabled = isCodeTransformAvailable(context.project),
9591
codeScanEnabled = isCodeScanAvailable(context.project),
96-
codeTestEnabled = isCodeTestAvailable(context.project),
97-
docEnabled = isDocAvailable(context.project),
9892
authenticatingTabIDs = chatSessionStorage.getAuthenticatingSessions().map { it.tabId }
9993
)
10094
)

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/messages/CodeScanMessage.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,8 @@ data class ChatInputEnabledMessage(
129129

130130
data class AuthenticationUpdateMessage(
131131
val authenticatingTabIDs: List<String>,
132-
val featureDevEnabled: Boolean,
133132
val codeTransformEnabled: Boolean,
134133
val codeScanEnabled: Boolean,
135-
val codeTestEnabled: Boolean,
136-
val docEnabled: Boolean,
137134
val message: String? = null,
138135
) : CodeScanUiMessage(
139136
null,

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/auth/CodeTestAuthUtils.kt

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

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/auth/DocAuthUtils.kt

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

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/auth/FeatureDevAuthUtils.kt

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

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ReferenceLogController.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import software.aws.toolkits.jetbrains.services.cwc.messages.CodeReference
1414

1515
object ReferenceLogController {
1616
fun addReferenceLog(originalCode: String, codeReferences: List<CodeReference>?, editor: Editor, project: Project, inlineChatStartPosition: CaretPosition?) {
17-
// TODO flare: hook /dev references with flare correctly, this is only a compile error fix which is not tested
1817
codeReferences?.let { references ->
1918
val cwReferences = references.map { reference ->
2019
InlineCompletionReference(

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformChatApp.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
1919
import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
2020
import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileSelectedListener
2121
import software.aws.toolkits.jetbrains.services.amazonqCodeScan.auth.isCodeScanAvailable
22-
import software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth.isCodeTestAvailable
23-
import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable
24-
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable
2522
import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformActionMessage
2623
import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformMessageListener
2724
import software.aws.toolkits.jetbrains.services.codemodernizer.controller.CodeTransformChatController
@@ -113,11 +110,8 @@ class CodeTransformChatApp : AmazonQApp {
113110
// Notify tabs about restoring authentication
114111
context.messagesFromAppToUi.publish(
115112
AuthenticationUpdateMessage(
116-
featureDevEnabled = isFeatureDevAvailable(context.project),
117113
codeTransformEnabled = isCodeTransformAvailable(context.project),
118114
codeScanEnabled = isCodeScanAvailable(context.project),
119-
codeTestEnabled = isCodeTestAvailable(context.project),
120-
docEnabled = isDocAvailable(context.project),
121115
authenticatingTabIDs = chatSessionStorage.getAuthenticatingSessions().map { it.tabId },
122116
)
123117
)

0 commit comments

Comments
 (0)