Moving CW actions to status bar (#4186)

* Moving CW actions to status bar

* Make the migration action button clickable to display the status bar; some other fixes

* fix test

* Add Transform action into the panel

* Reapply changes suggested in this PR

* Remove QServiceNode files since it got migrated, and the not supported usecases

* Add change note, other minor fixes

* Update plugins/toolkit/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

Co-authored-by: manodnyab <[email protected]>

---------

Co-authored-by: manodnyab <[email protected]>

Author: andrewyuq

.changes/next-release/feature-a2f44e45-8883-48a6-bb3e-f6413e22e41c.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q + CodeWhisperer: Most Amazon Q + CodeWhisperer actions are now migrated from the AWS Toolkit panel to the Amazon Q status bar menu."
+}

plugins/toolkit/jetbrains-core/resources/META-INF/plugin.xml

@@ -230,7 +230,6 @@
         <extensionPoint name="tool" interface="software.aws.toolkits.jetbrains.core.tools.ToolType" dynamic="true"/>
         <extensionPoint name="devTools.serviceNode" interface="software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes.DevToolsServiceNode" dynamic="true"/>
         <extensionPoint name="devTools.treeStructure" interface="software.aws.toolkits.jetbrains.core.explorer.devToolsTab.DevToolsTreeStructureProvider" dynamic="true"/>
-        <extensionPoint name="cwq.serviceNode" interface="software.aws.toolkits.jetbrains.core.explorer.cwqTab.nodes.CwQServiceNode" dynamic="true"/>
         <extensionPoint name="cwq.treeStructure" interface="software.aws.toolkits.jetbrains.core.explorer.cwqTab.CwQTreeStructureProvider" dynamic="true"/>
         <extensionPoint name="codewhisperer.programmingLanguage" interface="software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage" dynamic="true"/>
         <extensionPoint name="codewhisperer.classResolver" interface="software.aws.toolkits.jetbrains.services.codewhisperer.language.classresolver.CodeWhispererClassResolver" dynamic="true"/>
@@ -363,7 +362,6 @@
         <projectService serviceInterface="software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor"
                         serviceImplementation="software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptorImpl"
                         testServiceImplementation="software.aws.toolkits.jetbrains.services.codewhisperer.credentials.MockCodeWhispererClientAdaptor"/>
-        <projectService serviceImplementation="software.aws.toolkits.jetbrains.services.codewhisperer.status.CodeWhispererStatusBarManager"/>
         <projectService serviceInterface="software.aws.toolkits.jetbrains.services.codewhisperer.util.FileContextProvider"
                         serviceImplementation="software.aws.toolkits.jetbrains.services.codewhisperer.util.DefaultCodeWhispererFileContextProvider"/>
         <projectService serviceImplementation="software.aws.toolkits.jetbrains.services.codewhisperer.learn.LearnCodeWhispererManager"/>
@@ -521,7 +519,6 @@
 
         <!-- Explorer nodes -->
         <explorer.treeStructure implementation="software.aws.toolkits.jetbrains.services.dynamic.explorer.DynamicResourceTreeStructureProvider"/>
-        <devTools.treeStructure implementation="software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerTreeStructureProvider"/>
         <explorer.serviceNode implementation="software.aws.toolkits.jetbrains.core.explorer.nodes.AppRunnerExplorerRootNode"/>
         <explorer.serviceNode implementation="software.aws.toolkits.jetbrains.core.explorer.nodes.CloudFormationExplorerRootNode"/>
         <explorer.serviceNode implementation="software.aws.toolkits.jetbrains.core.explorer.nodes.CloudWatchRootNode"/>
@@ -537,9 +534,6 @@
         <!-- DevTools nodes-->
         <devTools.serviceNode implementation="software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes.CawsServiceNode"/>
 
-        <!-- CodeWhisperer +Q nodes-->
-        <cwq.serviceNode implementation="software.aws.toolkits.jetbrains.core.explorer.cwqTab.nodes.QServiceNode"/>
-        <cwq.serviceNode implementation="software.aws.toolkits.jetbrains.core.explorer.cwqTab.nodes.CodeWhispererExplorerRootNode"/>
         <!-- Experiments -->
         <experiment implementation="software.aws.toolkits.jetbrains.services.ecs.EcsExecExperiment"/>
         <experiment implementation="software.aws.toolkits.jetbrains.services.dynamic.JsonResourceModificationExperiment"/>
@@ -870,17 +864,17 @@
                 class="software.aws.toolkits.jetbrains.services.codewhisperer.codescan.actions.CodeWhispererStopCodeScanAction"/>
         </group>
 
-        <group id="q.not.supported">
-            <action class="software.aws.toolkits.jetbrains.core.explorer.cwqTab.nodes.QNotSupportedNode"/>
-        </group>
         <group id="aws.toolkit.q.idc.signed.in">
             <action
                 id="q.openchat"
-                class="software.aws.toolkits.jetbrains.services.amazonq.CwQChatAction"/>
+                class="software.aws.toolkits.jetbrains.services.amazonq.QOpenPanelAction"/>
+            <action
+                id="q.migrate"
+                class="software.aws.toolkits.jetbrains.services.amazonq.QMigrationNotificationAction"/>
         </group>
 
         <group id="aws.toolkit.q.sign.in">
-            <action class="software.aws.toolkits.jetbrains.services.amazonq.explorerActions.SignInToQAction"/>
+            <action id="q.sign.in" class="software.aws.toolkits.jetbrains.services.amazonq.explorerActions.SignInToQAction"/>
             <action id="q.learn.more" class="software.aws.toolkits.jetbrains.services.amazonq.explorerActions.QLearnMoreAction"/>
         </group>
 
@@ -935,7 +929,7 @@
         </group>
 
         <group id="aws.toolkit.jetbrains.core.services.codewhisperer.suggestions"
-               class="software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererNodeActionGroup" />
+               class="software.aws.toolkits.jetbrains.services.codewhisperer.explorer.QStatusBarLoggedInActionGroup" />
 
     </actions>
 

plugins/toolkit/jetbrains-core/resources/icons/misc/new.svg

@@ -52,6 +52,8 @@ object AwsIcons {
         @JvmField val TYPESCRIPT = load("/icons/misc/typeScript.svg") // 16x16
 
         @JvmField val CSHARP = load("/icons/misc/csharp.svg") // 16x16
+
+        @JvmField val NEW = load("/icons/misc/new.svg") // 16x16
     }
 
     object Resources {

plugins/toolkit/jetbrains-core/src/icons/AwsIcons.kt

@@ -4,10 +4,12 @@
 package software.aws.toolkits.jetbrains.core.credentials.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.ui.MessageDialogBuilder
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ProfileSsoManagedBearerSsoConnection
+import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManagerListener
 import software.aws.toolkits.jetbrains.core.credentials.logoutFromSsoConnection
 import software.aws.toolkits.jetbrains.core.explorer.refreshDevToolTree
 import software.aws.toolkits.jetbrains.core.gettingstarted.deleteSsoConnectionCW
@@ -25,6 +27,9 @@ class SsoLogoutAction(private val value: AwsBearerTokenConnection) : DumbAwareAc
             }
         }
         logoutFromSsoConnection(e.project, value)
+        ApplicationManager.getApplication().messageBus.syncPublisher(
+            ToolkitConnectionManagerListener.TOPIC
+        ).activeConnectionChanged(null)
         e.project?.refreshDevToolTree()
     }
 }

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/actions/SsoLogoutAction.kt

@@ -10,7 +10,7 @@ import com.intellij.openapi.project.Project
 import software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes.AbstractActionTreeNode
 import java.awt.event.MouseEvent
 
-class AnActionTreeNode(
+open class AnActionTreeNode(
     project: Project,
     private val place: String,
     private val action: AnAction

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/actions/AnActionTreeNode.kt

@@ -5,22 +5,72 @@ package software.aws.toolkits.jetbrains.core.explorer.cwqTab
 
 import com.intellij.ide.projectView.PresentationData
 import com.intellij.ide.util.treeView.AbstractTreeNode
-import com.intellij.openapi.extensions.ExtensionPointName
+import com.intellij.openapi.actionSystem.ActionGroup
+import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.project.Project
-import software.aws.toolkits.jetbrains.core.explorer.cwqTab.nodes.CwQServiceNode
+import com.intellij.ui.SimpleTextAttributes
+import software.aws.toolkits.jetbrains.ToolkitPlaces
+import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
+import software.aws.toolkits.jetbrains.core.credentials.ToolkitAuthManager
+import software.aws.toolkits.jetbrains.core.explorer.actions.AnActionTreeNode
+import software.aws.toolkits.jetbrains.core.gettingstarted.editor.ActiveConnection
+import software.aws.toolkits.jetbrains.core.gettingstarted.editor.BearerTokenFeatureSet
+import software.aws.toolkits.jetbrains.core.gettingstarted.editor.checkBearerConnectionValidity
+import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion
+import software.aws.toolkits.jetbrains.services.codemodernizer.explorer.nodes.CodeModernizerRunModernizeNode
+import software.aws.toolkits.jetbrains.services.codemodernizer.isCodeModernizerAvailable
+import software.aws.toolkits.jetbrains.utils.isRunningOnRemoteBackend
+import software.aws.toolkits.resources.message
 
 class CwQTreeRootNode(private val nodeProject: Project) : AbstractTreeNode<Any>(nodeProject, Object()) {
+    private val runCodeModernizerNode by lazy { CodeModernizerRunModernizeNode(nodeProject) }
+
     override fun update(presentation: PresentationData) {}
 
-    override fun getChildren(): Collection<AbstractTreeNode<*>> = EP_NAME.extensionList
-        .filter { it.enabled() }
-        .map {
-            it.buildServiceRootNode(nodeProject).also { node ->
-                node.parent = this
+    override fun getChildren(): Collection<AbstractTreeNode<*>> {
+        val connection = checkBearerConnectionValidity(project, BearerTokenFeatureSet.Q)
+
+        val groupId = when (connection) {
+            is ActiveConnection.NotConnected -> if (otherActiveIdentityConnectionsAvailable()) ENABLE_Q_ACTION_GROUP else Q_SIGNED_OUT_ACTION_GROUP
+            is ActiveConnection.ValidBearer -> Q_SIGNED_IN_ACTION_GROUP
+            else -> Q_EXPIRED_TOKEN_ACTION_GROUP
+        }
+
+        val actions = ActionManager.getInstance().getAction(groupId) as ActionGroup
+        val childNodes = actions.getChildren(null).mapNotNull {
+            object : AnActionTreeNode(project, ToolkitPlaces.CWQ_TOOL_WINDOW, it) {
+                override fun update(presentation: PresentationData) {
+                    super.update(presentation)
+
+                    // We only want to display not supported info in the "Open Chat Panel" node not the migration node
+                    if (presentation.coloredText[0].text != message("action.q.openchat.text")) return
+
+                    if (groupId == Q_SIGNED_IN_ACTION_GROUP) {
+                        if (isRunningOnRemoteBackend()) {
+                            presentation.addText(message("codewhisperer.explorer.root_node.unavailable"), SimpleTextAttributes.GRAY_ATTRIBUTES)
+                        } else if (!isQSupportedInThisVersion()) {
+                            presentation.addText(message("q.unavailable"), SimpleTextAttributes.GRAY_ATTRIBUTES)
+                        }
+                    }
+                }
             }
         }
 
+        // Temporarily put the transform node in the panel(as the second node before the migration node), to be removed soon.
+        if (groupId == Q_SIGNED_IN_ACTION_GROUP && isCodeModernizerAvailable(project)) {
+            return listOf(childNodes[0], runCodeModernizerNode, childNodes[1])
+        }
+
+        return childNodes
+    }
+
+    private fun otherActiveIdentityConnectionsAvailable() =
+        ToolkitAuthManager.getInstance().listConnections().filterIsInstance<AwsBearerTokenConnection>().isNotEmpty()
+
     companion object {
-        val EP_NAME = ExtensionPointName<CwQServiceNode>("aws.toolkit.cwq.serviceNode")
+        const val Q_SIGNED_IN_ACTION_GROUP = "aws.toolkit.q.idc.signed.in"
+        const val Q_SIGNED_OUT_ACTION_GROUP = "aws.toolkit.q.sign.in"
+        const val Q_EXPIRED_TOKEN_ACTION_GROUP = "aws.toolkit.q.expired"
+        const val ENABLE_Q_ACTION_GROUP = "aws.toolkit.q.enable"
     }
 }