Added meet q page when users sign in through Codewhisperer (#4092)

* Added meet q page even when users sign in through cw

* added util

* switched q sign in

Author: manodnyab

jetbrains-core/src/software/aws/toolkits/jetbrains/services/amazonq/explorerActions/SignInToQAction.kt

@@ -6,16 +6,13 @@ package software.aws.toolkits.jetbrains.services.amazonq.explorerActions
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.application.runInEdt
-import com.intellij.openapi.fileEditor.FileEditorManager
-import com.intellij.openapi.fileEditor.OpenFileDescriptor
 import com.intellij.openapi.project.DumbAwareAction
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
 import software.aws.toolkits.jetbrains.core.credentials.reauthConnectionIfNeeded
 import software.aws.toolkits.jetbrains.core.explorer.refreshCwQTree
 import software.aws.toolkits.jetbrains.core.gettingstarted.requestCredentialsForQ
-import software.aws.toolkits.jetbrains.services.amazonq.gettingstarted.QGettingStartedVirtualFile
-import software.aws.toolkits.jetbrains.settings.MeetQSettings
+import software.aws.toolkits.jetbrains.services.amazonq.gettingstarted.openMeetQPage
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.UiTelemetry
 
@@ -35,21 +32,8 @@ abstract class SignInToQActionBase(actionName: String) : DumbAwareAction(actionN
             runInEdt {
                 if (requestCredentialsForQ(project)) {
                     project.refreshCwQTree()
-                    val meetQSettings = MeetQSettings.getInstance()
-                    if (!meetQSettings.shouldDisplayPage) {
+                    if (!openMeetQPage(project)) {
                         return@runInEdt
-                    } else {
-                        FileEditorManager.getInstance(
-                            project
-                        ).openTextEditor(
-                            OpenFileDescriptor(
-                                project,
-                                QGettingStartedVirtualFile()
-                            ),
-                            true
-                        )
-                        meetQSettings.shouldDisplayPage = false
-                        UiTelemetry.click(project, "toolkit_openedWelcomeToAmazonQPage")
                     }
                 }
             }

jetbrains-core/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedUtils.kt

@@ -0,0 +1,30 @@
+// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.gettingstarted
+
+import com.intellij.openapi.fileEditor.FileEditorManager
+import com.intellij.openapi.fileEditor.OpenFileDescriptor
+import com.intellij.openapi.project.Project
+import software.aws.toolkits.jetbrains.settings.MeetQSettings
+import software.aws.toolkits.telemetry.UiTelemetry
+
+fun openMeetQPage(project: Project): Boolean {
+    val meetQSettings = MeetQSettings.getInstance()
+    if (!meetQSettings.shouldDisplayPage) {
+        return false
+    } else {
+        FileEditorManager.getInstance(
+            project
+        ).openTextEditor(
+            OpenFileDescriptor(
+                project,
+                QGettingStartedVirtualFile()
+            ),
+            true
+        )
+        meetQSettings.shouldDisplayPage = false
+        UiTelemetry.click(project, "toolkit_openedWelcomeToAmazonQPage")
+    }
+    return true
+}

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

@@ -7,6 +7,7 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.project.Project
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.reconnectCodeWhisperer
 import software.aws.toolkits.resources.message
+import software.aws.toolkits.telemetry.UiTelemetry
 import java.awt.event.MouseEvent
 
 class CodeWhispererReconnectNode(nodeProject: Project) : CodeWhispererActionNode(
@@ -16,6 +17,7 @@ class CodeWhispererReconnectNode(nodeProject: Project) : CodeWhispererActionNode
     AllIcons.Actions.Execute
 ) {
     override fun onDoubleClick(event: MouseEvent) {
+        UiTelemetry.click(project, "ReconnectNode")
         reconnectCodeWhisperer(project)
     }
 }

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

@@ -12,6 +12,7 @@ import software.aws.toolkits.jetbrains.core.credentials.pinning.CodeWhispererCon
 import software.aws.toolkits.jetbrains.core.credentials.reauthConnectionIfNeeded
 import software.aws.toolkits.jetbrains.core.explorer.refreshCwQTree
 import software.aws.toolkits.jetbrains.core.gettingstarted.requestCredentialsForCodeWhisperer
+import software.aws.toolkits.jetbrains.services.amazonq.gettingstarted.openMeetQPage
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.isCodeWhispererEnabled
 import software.aws.toolkits.jetbrains.services.codewhisperer.startup.CodeWhispererProjectStartupActivity
 import software.aws.toolkits.resources.message
@@ -45,6 +46,9 @@ class GetStartedNode(nodeProject: Project) : CodeWhispererActionNode(
                 // Start from scratch if no active connection
                 if (requestCredentialsForCodeWhisperer(project)) {
                     project.refreshCwQTree()
+                    if (!openMeetQPage(project)) {
+                        return@runInEdt
+                    }
                 }
             }
         }