Merge branch 'main' into feature/human-in-the-loop

mk-fan · May 9, 2024 · 3fe6163 · 3fe6163
2 parents 4e4c60d + 449ecd9
commit 3fe6163
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/.../src/software/aws/toolkits/jetbrains/services/amazonq/explorerActions/QLearnMoreAction.kt b/.../src/software/aws/toolkits/jetbrains/services/amazonq/explorerActions/QLearnMoreAction.kt
@@ -5,14 +5,21 @@ package software.aws.toolkits.jetbrains.services.amazonq.explorerActions
 
 import com.intellij.icons.AllIcons
 import com.intellij.ide.BrowserUtil
+import com.intellij.ide.plugins.PluginManager
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.extensions.PluginId
+import software.aws.toolkits.jetbrains.AwsToolkit
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.UiTelemetry
 
 class QLearnMoreAction : AnAction(message("q.learn.more"), "", AllIcons.Actions.Help) {
     override fun actionPerformed(e: AnActionEvent) {
+        if (!PluginManager.isPluginInstalled(PluginId.getId(AwsToolkit.Q_PLUGIN_ID))) {
+            BrowserUtil.browse("https://plugins.jetbrains.com/plugin/24267-amazon-q")
+        } else {
+            BrowserUtil.browse("https://aws.amazon.com/q")
+        }
         UiTelemetry.click(e.project, "q_learnMore")
-        BrowserUtil.browse("https://aws.amazon.com/q")
     }
 }
diff --git a/...kit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/startup/QMigrationActivity.kt b/...kit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/startup/QMigrationActivity.kt
@@ -23,7 +23,6 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.CodeWhispererConnection
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.Q_MARKETPLACE_URI
 import software.aws.toolkits.jetbrains.settings.AwsSettings
 import software.aws.toolkits.jetbrains.utils.notifyError
 import software.aws.toolkits.jetbrains.utils.notifyInfo
@@ -63,7 +62,7 @@ class QMigrationActivity : StartupActivity.DumbAware {
                 project = project,
                 notificationActions = listOf(
                     NotificationAction.createSimple(message("aws.q.migration.action.read_more.text")) {
-                        BrowserUtil.browse(URI(Q_MARKETPLACE_URI))
+                        BrowserUtil.browse(Q_JB_MARKETPLACE_URI)
                         ToolkitTelemetry.showNotification(
                             id = Q_STANDALONE_CHANGE_ID,
                             component = Component.ReadMore,
@@ -184,5 +183,6 @@ class QMigrationActivity : StartupActivity.DumbAware {
 
         private const val Q_STANDALONE_INSTALLED_ID = "amazonQStandaloneInstalled"
         private const val Q_STANDALONE_CHANGE_ID = "amazonQStandaloneChange"
+        private const val Q_JB_MARKETPLACE_URI = "https://plugins.jetbrains.com/plugin/24267-amazon-q"
     }
 }
diff --git a/...ins/toolkit/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/...ins/toolkit/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -32,7 +32,7 @@ action.aws.toolkit.open.telemetry.viewer.text=View AWS Telemetry
 action.aws.toolkit.s3.open.bucket.viewer.prefixed.text=View Bucket with Prefix...
 action.aws.toolkit.s3.open.bucket.viewer.text=View Bucket
 action.aws.toolkit.toolwindow.explorer.newConnection.text=Setup authentication to begin
-action.aws.toolkit.toolwindow.newConnection.text=Setup authentication...
+action.aws.toolkit.toolwindow.newConnection.text=Add Another Connection...
 action.aws.toolkit.toolwindow.sso.signout.text=Sign out of SSO
 action.dynamic.open.text=Open Resource...
 action.q.openchat.text=Open Chat Panel
@@ -162,7 +162,7 @@ apprunner.view_service_log_streams.error=Unable to open log group {0}
 apprunner.view_service_log_streams.error_not_created=App Runner log group has not been created
 aws.codewhispererq.tab.title=Amazon Q
 aws.description=Amazon Web Services (AWS) is a secure cloud services platform, offering compute power, database storage, content delivery and other functionality to help businesses scale and grow.
-aws.developer.tools.tab.title=Developer Tools
+aws.developer.tools.tab.title=CodeCatalyst
 aws.getstarted.auth.panel.notSupport_text=Not supported for this feature
 aws.getstarted.auth.panel_bullet_iam=IAM Credentials
 aws.getstarted.auth.panel_bullets=IAM Identity Center\nAWS Builder ID