Patch CodeWhisperer preview actions

Author: rli

.changes/next-release/bugfix-8ffde2b8-8cf1-4282-9573-da6e5687b079.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Clarify next steps when attempting to use CodeWhisperer"
+}

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -49,7 +49,7 @@ object IdeVersions {
                     "rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
                 ),
                 netFrameworkTarget = "net472",
-                rdGenVersion = "0.213.394",
+                rdGenVersion = "2021.3.5",
                 nugetVersion = "2021.3.0"
             )
         ),

jetbrains-core/resources/telemetryOverride.json

@@ -1,5 +1,10 @@
 {
     "types": [
+        {
+            "name": "elementId",
+            "type": "string",
+            "description": "An identifier associated with a UI element"
+        }
     ],
     "metrics": [
         {
@@ -10,6 +15,11 @@
                     "type": "result"
                 }
             ]
+        },
+        {
+            "name": "ui_click",
+            "description": "User clicked/activated a UI element. This does not necessarily have to be an explicit mouse click. Any user action that has the same behavior as a mouse click can use this event.",
+            "metadata": [{ "type": "elementId" }]
         }
     ]
 }

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererLearnMoreAction.kt

@@ -19,6 +19,6 @@ class CodeWhispererLearnMoreAction :
     DumbAware {
 
     override fun actionPerformed(e: AnActionEvent) {
-        CodeWhispererExplorerActionManager.getInstance().showWhatIsCodeWhisperer()
+        CodeWhispererExplorerActionManager.getInstance().showWhatIsCodeWhisperer(e.project)
     }
 }

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/actions/CodeWhispererWhatIsAction.kt

@@ -22,6 +22,6 @@ class CodeWhispererWhatIsAction :
     }
 
     override fun actionPerformed(e: AnActionEvent) {
-        CodeWhispererExplorerActionManager.getInstance().showWhatIsCodeWhisperer()
+        CodeWhispererExplorerActionManager.getInstance().showWhatIsCodeWhisperer(e.project)
     }
 }

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/CodeWhispererExplorerActionManager.kt

@@ -23,6 +23,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.TokenD
 import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.telemetry.AwsTelemetry
+import software.aws.toolkits.telemetry.UiTelemetry
 import java.net.URI
 
 @State(name = "codewhispererStates", storages = [Storage("aws.xml")])
@@ -32,7 +33,7 @@ internal class CodeWhispererExplorerActionManager : PersistentStateComponent<Cod
     fun performAction(project: Project, actionId: String) {
         when (actionId) {
             ACTION_WHAT_IS_CODEWHISPERER -> {
-                showWhatIsCodeWhisperer()
+                showWhatIsCodeWhisperer(project)
             }
             ACTION_ENABLE_CODEWHISPERER -> {
                 enableCodeWhisperer(project)
@@ -91,9 +92,10 @@ internal class CodeWhispererExplorerActionManager : PersistentStateComponent<Cod
         actionState.token = token
     }
 
-    fun showWhatIsCodeWhisperer() {
+    fun showWhatIsCodeWhisperer(project: Project?) {
         val uri = URI(CodeWhispererConstants.CODEWHISPERER_LEARN_MORE_URI)
         BrowserUtil.browse(uri)
+        UiTelemetry.click(project, "cw_learnMore_Cta")
     }
 
     fun showTokenRegistrationPage() {

jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/CodeWhispererServiceNode.kt

@@ -4,21 +4,16 @@
 package software.aws.toolkits.jetbrains.services.codewhisperer.explorer
 
 import com.intellij.icons.AllIcons
+import com.intellij.ide.BrowserUtil
 import com.intellij.ide.util.treeView.AbstractTreeNode
 import com.intellij.openapi.project.Project
 import software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes.AbstractActionTreeNode
 import software.aws.toolkits.jetbrains.core.explorer.devToolsTab.nodes.ActionGroupOnRightClick
 import software.aws.toolkits.jetbrains.core.explorer.nodes.AwsExplorerNode
-import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeWhispererCodeScanManager
-import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager.Companion.ACTION_ENABLE_CODEWHISPERER
-import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager.Companion.ACTION_ENTER_ACCESSTOKEN
-import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager.Companion.ACTION_OPEN_CODE_REFERENCE_PANEL
-import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager.Companion.ACTION_PAUSE_CODEWHISPERER
-import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager.Companion.ACTION_REQUEST_ACCESSTOKEN
-import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager.Companion.ACTION_RESUME_CODEWHISPERER
-import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager.Companion.ACTION_RUN_SECURITY_SCAN
+import software.aws.toolkits.jetbrains.core.utils.buildList
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager.Companion.ACTION_WHAT_IS_CODEWHISPERER
 import software.aws.toolkits.resources.message
+import software.aws.toolkits.telemetry.UiTelemetry
 import javax.swing.Icon
 
 class CodeWhispererServiceNode(
@@ -27,24 +22,7 @@ class CodeWhispererServiceNode(
 ) : AbstractActionTreeNode(project, value, null), ActionGroupOnRightClick {
     private val nodeProject
         get() = myProject
-    private val pauseCodeWhispererNode by lazy {
-        CodeWhispererActionNode(
-            nodeProject,
-            message("codewhisperer.explorer.pause_auto"),
-            ACTION_PAUSE_CODEWHISPERER,
-            1,
-            AllIcons.Actions.Pause
-        )
-    }
-    private val resumeCodeWhispererNode by lazy {
-        CodeWhispererActionNode(
-            nodeProject,
-            message("codewhisperer.explorer.resume_auto"),
-            ACTION_RESUME_CODEWHISPERER,
-            1,
-            AllIcons.Actions.Resume
-        )
-    }
+
     private val whatIsCodeWhispererNode by lazy {
         CodeWhispererActionNode(
             nodeProject,
@@ -54,75 +32,23 @@ class CodeWhispererServiceNode(
             AllIcons.Actions.Help
         )
     }
-    private val enableCodeWhispererNode by lazy {
-        CodeWhispererActionNode(
-            nodeProject,
-            message("codewhisperer.explorer.enable"),
-            ACTION_ENABLE_CODEWHISPERER,
-            1,
-            AllIcons.Actions.Execute
-        )
-    }
-    private val openCodeReferenceNode by lazy {
-        CodeWhispererActionNode(
-            nodeProject,
-            message("codewhisperer.explorer.code_reference.open"),
-            ACTION_OPEN_CODE_REFERENCE_PANEL,
-            3,
-            AllIcons.Actions.Preview
-        )
-    }
-    private val runCodeScanNode by lazy {
-        CodeWhispererActionNode(
-            nodeProject, message("codewhisperer.codescan.run_scan"),
-            ACTION_RUN_SECURITY_SCAN,
-            2,
-            CodeWhispererCodeScanManager.getInstance(nodeProject).getActionButtonIcon()
-        )
-    }
-    private val requestAccessTokenNode by lazy {
-        CodeWhispererActionNode(
-            nodeProject,
-            message("codewhisperer.explorer.token.request"),
-            ACTION_REQUEST_ACCESSTOKEN,
-            4,
-            AllIcons.General.User
-        )
-    }
-    private val enterAccessTokenNode by lazy {
-        CodeWhispererActionNode(
-            nodeProject,
-            message("codewhisperer.explorer.token.dialog_title"),
-            ACTION_ENTER_ACCESSTOKEN,
-            5,
-            AllIcons.Actions.Edit
-        )
-    }
 
     override fun onDoubleClick() {}
 
-    override fun getChildren(): Collection<AbstractTreeNode<*>> {
-        val codewhispererActions = mutableListOf<CodeWhispererActionNode>()
-        val manager = CodeWhispererExplorerActionManager.getInstance()
-        if (!manager.isAuthorized()) {
-            codewhispererActions.add(whatIsCodeWhispererNode)
-            codewhispererActions.add(requestAccessTokenNode)
-            codewhispererActions.add(enterAccessTokenNode)
-        } else {
-            if (!manager.hasAcceptedTermsOfService()) {
-                codewhispererActions.add(whatIsCodeWhispererNode)
-                codewhispererActions.add(enableCodeWhispererNode)
-            } else {
-                if (manager.isAutoEnabled()) {
-                    codewhispererActions.add(pauseCodeWhispererNode)
-                } else {
-                    codewhispererActions.add(resumeCodeWhispererNode)
+    override fun getChildren(): Collection<AbstractTreeNode<*>> = buildList {
+        add(whatIsCodeWhispererNode)
+        add(
+            object : AbstractActionTreeNode(
+                nodeProject,
+                message("codewhisperer.upgrade_ide"),
+                AllIcons.General.User
+            ) {
+                override fun onDoubleClick() {
+                    BrowserUtil.browse("https://github.com/aws/aws-toolkit-jetbrains/issues/3684")
+                    UiTelemetry.click(project, "cw_upgradeIde_Cta")
                 }
-                codewhispererActions.add(runCodeScanNode)
-                codewhispererActions.add(openCodeReferenceNode)
             }
-        }
-        return codewhispererActions
+        )
     }
 
     override fun actionGroupName(): String = "aws.toolkit.explorer.codewhisperer"

jetbrains-rider/build.gradle.kts

@@ -16,7 +16,6 @@ buildscript {
     println("Using rd-gen: $rdversion")
 
     repositories {
-        maven("https://www.myget.org/F/rd-snapshots/maven/")
         mavenCentral()
     }
 

resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -319,6 +319,7 @@ codewhisperer.trigger.document.unsupported=CodeWhisperer is not supported for th
 codewhisperer.trigger.error.client_side=Unable to show recommendations, please try again later
 codewhisperer.trigger.error.server_side=Unable to get recommendations, please try again later
 codewhisperer.trigger.service=Invoke CodeWhisperer
+codewhisperer.upgrade_ide=To use CodeWhisperer, update your JetBrains IDE to version 2023.1 or later.
 common.none=None
 configure.toolkit=Configure AWS Connection
 configure.toolkit.upsert_credentials.action=Edit AWS Credential file(s)