v2

Author: Will-ShaoHua

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

@@ -183,16 +183,16 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
                     ToolkitConnectionManager.getInstance(project)
                         .activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
                     )?.let { connection ->
-                        runInEdt {
-                            SsoLogoutAction(connection).actionPerformed(
-                                AnActionEvent.createFromDataContext(
-                                    "qBrowser",
-                                    null,
-                                    DataContext.EMPTY_CONTEXT
-                                )
+                    runInEdt {
+                        SsoLogoutAction(connection).actionPerformed(
+                            AnActionEvent.createFromDataContext(
+                                "qBrowser",
+                                null,
+                                DataContext.EMPTY_CONTEXT
                             )
-                        }
+                        )
                     }
+                }
             }
 
             is BrowserMessage.Reauth -> {
@@ -220,6 +220,10 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
                 )
             }
 
+            is BrowserMessage.ListProfiles -> {
+                handleListProfilesMessage()
+            }
+
             is BrowserMessage.PublishWebviewTelemetry -> {
                 publishTelemetry(message)
             }
@@ -272,48 +276,6 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
 
         when (stage) {
             "PROFILE_SELECT" -> {
-                ApplicationManager.getApplication().executeOnPooledThread {
-                    var errorMessage: String = ""
-                    val profiles = try {
-                        QRegionProfileManager.getInstance().listRegionProfiles(project)
-                    } catch (e: Exception) {
-                        e.message?.let {
-                            errorMessage = it
-                        }
-                        LOG.warn { "Failed to call listRegionProfiles API: $errorMessage" }
-                        val qConn = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())
-                        Telemetry.amazonq.didSelectProfile.use { span ->
-                            span.source(QProfileSwitchIntent.Auth.value)
-                                .amazonQProfileRegion(QRegionProfileManager.getInstance().activeProfile(project)?.region ?: "not-set")
-                                .ssoRegion((qConn as? AwsBearerTokenConnection)?.region)
-                                .credentialStartUrl((qConn as? AwsBearerTokenConnection)?.startUrl)
-                                .result(MetricResult.Failed)
-                                .reason(e.message)
-                        }
-
-                        null
-                    }
-
-                    if (profiles?.size == 1) {
-                        LOG.debug { "User only have access to 1 Q profile, auto-selecting profile ${profiles.first().profileName} for ${project.name}" }
-                        QRegionProfileManager.getInstance().switchProfile(project, profiles.first(), QProfileSwitchIntent.Update)
-                    }
-
-                    // required EDT as this entire block is executed on thread pool
-                    runInEdt {
-                        val jsonData = """
-                        {
-                            stage: '$stage',
-                            status: '${if (profiles != null) "succeeded" else "failed"}',
-                            profiles: ${writeValueAsString(profiles ?: "")},
-                            errorMessage: '$errorMessage'
-                        }
-                        """.trimIndent()
-
-                        executeJS("window.ideClient.prepareUi($jsonData)")
-                    }
-                }
-
                 val jsonData = """
                     {
                         stage: '$stage',
@@ -353,6 +315,51 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
         jcefBrowser.loadHTML(getWebviewHTML(webScriptUri, query))
     }
 
+    private fun handleListProfilesMessage() {
+        ApplicationManager.getApplication().executeOnPooledThread {
+            var errorMessage: String = ""
+            val profiles = try {
+                QRegionProfileManager.getInstance().listRegionProfiles(project)
+            } catch (e: Exception) {
+                e.message?.let {
+                    errorMessage = it
+                }
+                LOG.warn { "Failed to call listRegionProfiles API: $errorMessage" }
+                val qConn = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())
+                Telemetry.amazonq.didSelectProfile.use { span ->
+                    span.source(QProfileSwitchIntent.Auth.value)
+                        .amazonQProfileRegion(QRegionProfileManager.getInstance().activeProfile(project)?.region ?: "not-set")
+                        .ssoRegion((qConn as? AwsBearerTokenConnection)?.region)
+                        .credentialStartUrl((qConn as? AwsBearerTokenConnection)?.startUrl)
+                        .result(MetricResult.Failed)
+                        .reason(e.message)
+                }
+
+                null
+            }
+
+            if (profiles?.size == 1) {
+                LOG.debug { "User only have access to 1 Q profile, auto-selecting profile ${profiles.first().profileName} for ${project.name}" }
+                QRegionProfileManager.getInstance().switchProfile(project, profiles.first(), QProfileSwitchIntent.Update)
+                return@executeOnPooledThread
+            }
+
+            // required EDT as this entire block is executed on thread pool
+            runInEdt {
+                val jsonData = """
+                        {
+                            stage: 'PROFILE_SELECT',
+                            status: '${if (profiles != null) "succeeded" else "failed"}',
+                            profiles: ${writeValueAsString(profiles ?: "")},
+                            errorMessage: '$errorMessage'
+                        }
+                """.trimIndent()
+
+                executeJS("window.ideClient.prepareUi($jsonData)")
+            }
+        }
+    }
+
     companion object {
         private val LOG = getLogger<QWebviewBrowser>()
         private const val WEB_SCRIPT_URI = "http://webview/js/getStart.js"

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/BrowserMessage.kt

@@ -27,7 +27,8 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo
     JsonSubTypes.Type(value = BrowserMessage.Reauth::class, name = "reauth"),
     JsonSubTypes.Type(value = BrowserMessage.SendUiClickTelemetry::class, name = "sendUiClickTelemetry"),
     JsonSubTypes.Type(value = BrowserMessage.SwitchProfile::class, name = "switchProfile"),
-    JsonSubTypes.Type(value = BrowserMessage.PublishWebviewTelemetry::class, name = "webviewTelemetry")
+    JsonSubTypes.Type(value = BrowserMessage.PublishWebviewTelemetry::class, name = "webviewTelemetry"),
+    JsonSubTypes.Type(value = BrowserMessage.ListProfiles::class, name = "listProfiles")
 )
 sealed interface BrowserMessage {
 
@@ -66,6 +67,8 @@ sealed interface BrowserMessage {
         val arn: String,
     ) : BrowserMessage
 
+    object ListProfiles : BrowserMessage
+
     data class SendUiClickTelemetry(val signInOptionClicked: String?) : BrowserMessage
 
     data class PublishWebviewTelemetry(val event: String) : BrowserMessage

plugins/core/webview/src/q-ui/components/profileSelection.vue

@@ -85,7 +85,7 @@ export default defineComponent({
         }
     },
     computed: {
-        isWaitingResponse(): boolean {
+        isWaitingResponse() {
             const profileResult = this.$store.state.listProfilesResult
             if (profileResult instanceof ListProfilePendingResult) {
                 return true
@@ -97,12 +97,14 @@ export default defineComponent({
                 this.errorMessage = GENERIC_PROFILE_LOAD_ERROR
             } else {
                 // should not be this path
-                this.errorMessage = 'Unexpected error happened while loading Q webview page'
+                this.errorMessage = "Unexpected error happenede while loading Q Webview page"
             }
-
-            return false
         }
     },
+    mounted() {
+        window.ideApi.postMessage({command: 'listProfiles'})
+    },
+
     methods: {
         toggleItemSelection(profile: Profile) {
             this.selectedProfile = profile;

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/webview/ToolkitLoginWebview.kt

@@ -246,6 +246,8 @@ class ToolkitWebviewBrowser(val project: Project, private val parentDisposable:
 
             is BrowserMessage.SwitchProfile -> {}
 
+            is BrowserMessage.ListProfiles -> {}
+
             is BrowserMessage.PublishWebviewTelemetry -> {
                 publishTelemetry(message)
             }