Skip to content

fix(amazonq): fix Q toolwindow potentially shows the wrong content #5598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 28, 2025
Merged

fix(amazonq): fix Q toolwindow potentially shows the wrong content #5598

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae27002
fix Q toolwindow possibly shows the wrong content
Will-ShaoHua Apr 17, 2025
b873c0d
cl
Will-ShaoHua Apr 17, 2025
33a953d
patch
Will-ShaoHua Apr 17, 2025
9c48c01
changelog str
Will-ShaoHua Apr 25, 2025
6f47238
Merge remote-tracking branch 'upstream/main' into toolwindow
Will-ShaoHua Apr 25, 2025
c270360
test
Will-ShaoHua Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/bugfix-a7fedb6e-13ab-4d6a-a9ea-293b3f533bad.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Q toolwindow potentially render chat UI when it's supposed to show auth UI and it makes users not able to complete setup"
}
2 changes: 1 addition & 1 deletion ...c/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
override fun onProfileSelected(myProject: Project, profile: QRegionProfile?) {
if (project.isDisposed) return
AmazonQToolWindow.getInstance(project).disposeAndRecreate()
qPanel.setContent(AmazonQToolWindow.getInstance(project).component)
prepareChatContent(project, qPanel)
}
}
)
Expand Down
3 changes: 2 additions & 1 deletion ...ity/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ class QRegionProfileManager : PersistentStateComponent<QProfileState>, Disposabl
}

if (profiles == null || profiles.none { it.arn == selected.arn }) {
invalidateProfile(selected.arn)
// Note that order matters, should switch to null first then invalidateProfile
switchProfile(project, null, intent = QProfileSwitchIntent.Reload)
invalidateProfile(selected.arn)
Comment on lines +85 to +87
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not ideal, will revisit later

Telemetry.amazonq.profileState.use { span ->
span.source(QProfileSwitchIntent.Reload.value)
.amazonQProfileRegion(selected.region)
Expand Down
Loading