From 98b2e051820d808be0a7846c94ca4873bd9d7d0d Mon Sep 17 00:00:00 2001 From: samgst-amazon Date: Wed, 4 Jun 2025 20:39:21 -0700 Subject: [PATCH 01/11] make chat unaccessible on 242.2.1 --- .../jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt | 5 +++++ .../services/amazonq/toolwindow/AmazonQToolWindowFactory.kt | 3 ++- .../aws/toolkits/jetbrains/services/amazonq/QUtils.kt | 5 +++++ .../aws/toolkits/resources/MessagesBundle.properties | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt index 2ff79e68005..00cd443f6ae 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt @@ -25,6 +25,7 @@ import software.aws.toolkits.jetbrains.isDeveloperMode import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext import software.aws.toolkits.jetbrains.services.amazonq.apps.AppConnection import software.aws.toolkits.jetbrains.services.amazonq.commands.MessageTypeRegistry +import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService import software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts.ArtifactManager import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AsyncChatUiListener @@ -44,6 +45,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeature import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable import java.util.concurrent.CompletableFuture import javax.swing.JButton +import software.aws.toolkits.resources.message class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Disposable { private val browser = CompletableFuture() @@ -102,6 +104,9 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di webviewContainer.add(JBTextArea("JCEF not supported")) } browser.complete(null) + } else if (!isQSupportedInThisVersion()){ + webviewContainer.add(JBTextArea("${message("q.unavailable")}\n ${message("q.unavailable.node")}")) + browser.complete(null) } else { val loadingPanel = JBLoadingPanel(null, this) val wrapper = Wrapper() diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt index 3ae16dd96c6..f6819935f1a 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt @@ -23,6 +23,7 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenPr import software.aws.toolkits.jetbrains.core.notifications.NotificationPanel import software.aws.toolkits.jetbrains.core.notifications.ProcessNotificationsBase import software.aws.toolkits.jetbrains.core.webview.BrowserState +import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion import software.aws.toolkits.jetbrains.services.amazonq.QWebviewPanel import software.aws.toolkits.jetbrains.services.amazonq.RefreshQChatPanelButtonPressedListener import software.aws.toolkits.jetbrains.services.amazonq.gettingstarted.openMeetQPage @@ -149,7 +150,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware { ) } - override fun shouldBeAvailable(project: Project): Boolean = isQWebviewsAvailable() + override fun shouldBeAvailable(project: Project): Boolean = isQWebviewsAvailable() && isQSupportedInThisVersion() companion object { private val LOG = getLogger() diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt index f6dea5c681e..fd33b65ca52 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt @@ -3,6 +3,7 @@ package software.aws.toolkits.jetbrains.services.amazonq +import com.intellij.openapi.application.ApplicationInfo import com.intellij.openapi.project.Project import com.intellij.openapi.util.SystemInfo import software.amazon.awssdk.services.codewhispererruntime.model.IdeCategory @@ -52,3 +53,7 @@ fun codeWhispererUserContext(): UserContext = ClientMetadata.getDefault().let { .ideVersion(it.awsVersion) .build() } + +fun isQSupportedInThisVersion(): Boolean = ApplicationInfo.getInstance().build.asStringWithoutProductCode() !in unSupportedIdeVersionInQ + +val unSupportedIdeVersionInQ = listOf("242.21829.142") diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties index 0871d6258f5..d995d8f8e07 100644 --- a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties +++ b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties @@ -1656,7 +1656,7 @@ q.session_configuration=Extend your IDE sessions q.session_configuration.description=Your maximum session length for Amazon Q can be extended to 90 days by your administrator. For more information, refer to How to extend the session duration for Amazon Q in the IDE in the IAM Identity Center User Guide. q.sign.in=Get Started q.ui.prompt.transform=/transform -q.unavailable=\ Not supported in v2023.2.0 +q.unavailable=\ Q Chat not supported in v2024.2.1 q.unavailable.node=Please update to the latest IDE version q.window.title=Amazon Q Chat rds.aurora=Aurora From 40ba27a8db57b26bb935aa0c237277dfcbf7f1cd Mon Sep 17 00:00:00 2001 From: samgst-amazon Date: Wed, 4 Jun 2025 20:45:53 -0700 Subject: [PATCH 02/11] detekt --- .../jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt | 4 ++-- .../services/amazonq/toolwindow/AmazonQToolWindowFactory.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt index 00cd443f6ae..94d681c3b7d 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt @@ -43,9 +43,9 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeTest.auth.isCodeTestA import software.aws.toolkits.jetbrains.services.amazonqDoc.auth.isDocAvailable import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.auth.isFeatureDevAvailable import software.aws.toolkits.jetbrains.services.codemodernizer.utils.isCodeTransformAvailable +import software.aws.toolkits.resources.message import java.util.concurrent.CompletableFuture import javax.swing.JButton -import software.aws.toolkits.resources.message class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Disposable { private val browser = CompletableFuture() @@ -104,7 +104,7 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di webviewContainer.add(JBTextArea("JCEF not supported")) } browser.complete(null) - } else if (!isQSupportedInThisVersion()){ + } else if (!isQSupportedInThisVersion()) { webviewContainer.add(JBTextArea("${message("q.unavailable")}\n ${message("q.unavailable.node")}")) browser.complete(null) } else { diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt index f6819935f1a..eb9111c95e5 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt @@ -23,10 +23,10 @@ import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenPr import software.aws.toolkits.jetbrains.core.notifications.NotificationPanel import software.aws.toolkits.jetbrains.core.notifications.ProcessNotificationsBase import software.aws.toolkits.jetbrains.core.webview.BrowserState -import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion import software.aws.toolkits.jetbrains.services.amazonq.QWebviewPanel import software.aws.toolkits.jetbrains.services.amazonq.RefreshQChatPanelButtonPressedListener import software.aws.toolkits.jetbrains.services.amazonq.gettingstarted.openMeetQPage +import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileSelectedListener From e136fcdf3b5a2fb95705304488392bdd26783104 Mon Sep 17 00:00:00 2001 From: samgst-amazon Date: Wed, 4 Jun 2025 21:39:41 -0700 Subject: [PATCH 03/11] feedback --- .../amazonq/toolwindow/AmazonQToolWindowFactory.kt | 3 +-- .../aws/toolkits/jetbrains/services/amazonq/QUtils.kt | 8 +++++++- .../aws/toolkits/resources/MessagesBundle.properties | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt index eb9111c95e5..3ae16dd96c6 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt @@ -26,7 +26,6 @@ import software.aws.toolkits.jetbrains.core.webview.BrowserState import software.aws.toolkits.jetbrains.services.amazonq.QWebviewPanel import software.aws.toolkits.jetbrains.services.amazonq.RefreshQChatPanelButtonPressedListener import software.aws.toolkits.jetbrains.services.amazonq.gettingstarted.openMeetQPage -import software.aws.toolkits.jetbrains.services.amazonq.isQSupportedInThisVersion import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileSelectedListener @@ -150,7 +149,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware { ) } - override fun shouldBeAvailable(project: Project): Boolean = isQWebviewsAvailable() && isQSupportedInThisVersion() + override fun shouldBeAvailable(project: Project): Boolean = isQWebviewsAvailable() companion object { private val LOG = getLogger() diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt index fd33b65ca52..5af2d1eec35 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt @@ -54,6 +54,12 @@ fun codeWhispererUserContext(): UserContext = ClientMetadata.getDefault().let { .build() } -fun isQSupportedInThisVersion(): Boolean = ApplicationInfo.getInstance().build.asStringWithoutProductCode() !in unSupportedIdeVersionInQ +fun isQSupportedInThisVersion(): Boolean { + val currentBuild = ApplicationInfo.getInstance().build + if (currentBuild.asStringWithoutProductCode() in unSupportedIdeVersionInQ) return false + + val version242Cutoff = com.intellij.openapi.util.BuildNumber.fromString("242.22855.74") + return !(currentBuild.baselineVersion == 242 && currentBuild.compareTo(version242Cutoff) < 0) +} val unSupportedIdeVersionInQ = listOf("242.21829.142") diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties index d995d8f8e07..9cf74f9571e 100644 --- a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties +++ b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties @@ -1656,7 +1656,7 @@ q.session_configuration=Extend your IDE sessions q.session_configuration.description=Your maximum session length for Amazon Q can be extended to 90 days by your administrator. For more information, refer to How to extend the session duration for Amazon Q in the IDE in the IAM Identity Center User Guide. q.sign.in=Get Started q.ui.prompt.transform=/transform -q.unavailable=\ Q Chat not supported in v2024.2.1 +q.unavailable=\ Amazon Q Chat is not supported in v2024.2.1 q.unavailable.node=Please update to the latest IDE version q.window.title=Amazon Q Chat rds.aurora=Aurora From 03140c0f94579c382d1dce07813cb819bc4d4265 Mon Sep 17 00:00:00 2001 From: samgst-amazon Date: Wed, 4 Jun 2025 22:07:28 -0700 Subject: [PATCH 04/11] detekt --- .../software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt index 5af2d1eec35..c90629b3e49 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt @@ -57,7 +57,7 @@ fun codeWhispererUserContext(): UserContext = ClientMetadata.getDefault().let { fun isQSupportedInThisVersion(): Boolean { val currentBuild = ApplicationInfo.getInstance().build if (currentBuild.asStringWithoutProductCode() in unSupportedIdeVersionInQ) return false - + val version242Cutoff = com.intellij.openapi.util.BuildNumber.fromString("242.22855.74") return !(currentBuild.baselineVersion == 242 && currentBuild.compareTo(version242Cutoff) < 0) } From c00de08f83e05735a9f5e8c908f2ecc09a726739 Mon Sep 17 00:00:00 2001 From: samgst-amazon Date: Wed, 4 Jun 2025 22:11:54 -0700 Subject: [PATCH 05/11] alias --- .../software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt index c90629b3e49..04308993cce 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt @@ -5,6 +5,7 @@ package software.aws.toolkits.jetbrains.services.amazonq import com.intellij.openapi.application.ApplicationInfo import com.intellij.openapi.project.Project +import com.intellij.openapi.util.BuildNumber import com.intellij.openapi.util.SystemInfo import software.amazon.awssdk.services.codewhispererruntime.model.IdeCategory import software.amazon.awssdk.services.codewhispererruntime.model.OperatingSystem @@ -58,7 +59,7 @@ fun isQSupportedInThisVersion(): Boolean { val currentBuild = ApplicationInfo.getInstance().build if (currentBuild.asStringWithoutProductCode() in unSupportedIdeVersionInQ) return false - val version242Cutoff = com.intellij.openapi.util.BuildNumber.fromString("242.22855.74") + val version242Cutoff = BuildNumber.fromString("242.22855.74") return !(currentBuild.baselineVersion == 242 && currentBuild.compareTo(version242Cutoff) < 0) } From 59626c611ae93c8bb314c614ed0aa61faa517f2b Mon Sep 17 00:00:00 2001 From: samgst-amazon Date: Wed, 4 Jun 2025 22:11:54 -0700 Subject: [PATCH 06/11] simplify --- .../aws/toolkits/jetbrains/services/amazonq/QUtils.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt index c90629b3e49..39ca137a220 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt @@ -5,6 +5,7 @@ package software.aws.toolkits.jetbrains.services.amazonq import com.intellij.openapi.application.ApplicationInfo import com.intellij.openapi.project.Project +import com.intellij.openapi.util.BuildNumber import com.intellij.openapi.util.SystemInfo import software.amazon.awssdk.services.codewhispererruntime.model.IdeCategory import software.amazon.awssdk.services.codewhispererruntime.model.OperatingSystem @@ -56,10 +57,6 @@ fun codeWhispererUserContext(): UserContext = ClientMetadata.getDefault().let { fun isQSupportedInThisVersion(): Boolean { val currentBuild = ApplicationInfo.getInstance().build - if (currentBuild.asStringWithoutProductCode() in unSupportedIdeVersionInQ) return false - - val version242Cutoff = com.intellij.openapi.util.BuildNumber.fromString("242.22855.74") + val version242Cutoff = BuildNumber.fromString("242.22855.74") return !(currentBuild.baselineVersion == 242 && currentBuild.compareTo(version242Cutoff) < 0) } - -val unSupportedIdeVersionInQ = listOf("242.21829.142") From 1d93c3f6fea8473867421300636cf8cd8c990c11 Mon Sep 17 00:00:00 2001 From: samgst-amazon Date: Wed, 4 Jun 2025 22:28:47 -0700 Subject: [PATCH 07/11] fix product code --- .../aws/toolkits/jetbrains/services/amazonq/QUtils.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt index 39ca137a220..64ac876f1cc 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt @@ -56,7 +56,10 @@ fun codeWhispererUserContext(): UserContext = ClientMetadata.getDefault().let { } fun isQSupportedInThisVersion(): Boolean { - val currentBuild = ApplicationInfo.getInstance().build - val version242Cutoff = BuildNumber.fromString("242.22855.74") - return !(currentBuild.baselineVersion == 242 && currentBuild.compareTo(version242Cutoff) < 0) + val currentBuild = ApplicationInfo.getInstance().build.withoutProductCode() + + return !( + currentBuild.baselineVersion == 242 && + BuildNumber.fromString("242.22855.74")?.let { currentBuild.compareTo(it) < 0 } == true + ) } From 9616d517d2f630bd3347f1c765bbcc5ee4cdbdb0 Mon Sep 17 00:00:00 2001 From: Sam Stewart Date: Wed, 4 Jun 2025 23:52:16 -0700 Subject: [PATCH 08/11] Update plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt Co-authored-by: Richard Li <742829+rli@users.noreply.github.com> --- .../software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt index 64ac876f1cc..55b6c46d7ef 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QUtils.kt @@ -60,6 +60,6 @@ fun isQSupportedInThisVersion(): Boolean { return !( currentBuild.baselineVersion == 242 && - BuildNumber.fromString("242.22855.74")?.let { currentBuild.compareTo(it) < 0 } == true + BuildNumber.fromString("242.22855.74")?.let { currentBuild < it } == true ) } From 1a292e04624e7e3f89828d198903a67c3757866b Mon Sep 17 00:00:00 2001 From: samgst-amazon Date: Wed, 4 Jun 2025 23:54:27 -0700 Subject: [PATCH 09/11] update message --- .../jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt index 94d681c3b7d..a88d369b8ff 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt @@ -105,7 +105,8 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di } browser.complete(null) } else if (!isQSupportedInThisVersion()) { - webviewContainer.add(JBTextArea("${message("q.unavailable")}\n ${message("q.unavailable.node")}")) + val currentBuild = com.intellij.openapi.application.ApplicationInfo.getInstance().build + webviewContainer.add(JBTextArea("Amazon Q is not supported in your version ${currentBuild}. Please update to the latest version of your IDE.")) browser.complete(null) } else { val loadingPanel = JBLoadingPanel(null, this) From b040be7252df293b79d96e401751fb7c92c234df Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Thu, 5 Jun 2025 00:05:24 -0700 Subject: [PATCH 10/11] Update plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties --- .../software/aws/toolkits/resources/MessagesBundle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties index 9cf74f9571e..9f769d120ab 100644 --- a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties +++ b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties @@ -1656,7 +1656,7 @@ q.session_configuration=Extend your IDE sessions q.session_configuration.description=Your maximum session length for Amazon Q can be extended to 90 days by your administrator. For more information, refer to How to extend the session duration for Amazon Q in the IDE in the IAM Identity Center User Guide. q.sign.in=Get Started q.ui.prompt.transform=/transform -q.unavailable=\ Amazon Q Chat is not supported in v2024.2.1 +q.unavailable=\ Amazon Q Chat is not supported in IDE versions <= v2024.2.1 q.unavailable.node=Please update to the latest IDE version q.window.title=Amazon Q Chat rds.aurora=Aurora From 0d7d479f862d68d27deb50d20925d28b4d292a22 Mon Sep 17 00:00:00 2001 From: samgst-amazon Date: Thu, 5 Jun 2025 00:07:24 -0700 Subject: [PATCH 11/11] revert --- .../jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt index a88d369b8ff..53323b638b2 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt @@ -105,8 +105,7 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di } browser.complete(null) } else if (!isQSupportedInThisVersion()) { - val currentBuild = com.intellij.openapi.application.ApplicationInfo.getInstance().build - webviewContainer.add(JBTextArea("Amazon Q is not supported in your version ${currentBuild}. Please update to the latest version of your IDE.")) + webviewContainer.add(JBTextArea("${message("q.unavailable")}\n ${message("q.unavailable.node")}")) browser.complete(null) } else { val loadingPanel = JBLoadingPanel(null, this)