Display startup and emergency notifications #5143
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package software.aws.toolkits.jetbrains.services.amazonq.toolwindow | ||
|
|
||
| import com.intellij.openapi.project.Project | ||
| import com.intellij.ui.components.panels.Wrapper | ||
| import com.intellij.util.ui.components.BorderLayoutPanel | ||
| import software.aws.toolkits.core.utils.error | ||
| import software.aws.toolkits.core.utils.getLogger | ||
| import software.aws.toolkits.jetbrains.core.webview.BrowserState | ||
| import software.aws.toolkits.jetbrains.services.amazonq.QWebviewPanel | ||
| import software.aws.toolkits.jetbrains.utils.isQConnected | ||
| import software.aws.toolkits.jetbrains.utils.isQExpired | ||
| import software.aws.toolkits.telemetry.FeatureId | ||
| import javax.swing.JComponent | ||
|
|
||
| class OuterAmazonQPanel(val project: Project) : BorderLayoutPanel() { | ||
| private val wrapper = Wrapper() | ||
| init { | ||
| isOpaque = false | ||
| addToCenter(wrapper) | ||
| val component = if (isQConnected(project) && !isQExpired(project)) { | ||
| AmazonQToolWindow.getInstance(project).component | ||
| } else { | ||
| QWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.AmazonQ)) | ||
| QWebviewPanel.getInstance(project).component | ||
| } | ||
| updateQPanel(component) | ||
| } | ||
|
|
||
| fun updateQPanel(content: JComponent) { | ||
Check noticeCode scanning / QDJVMC Class member can have 'private' visibility Note |
||
| try { | ||
| wrapper.setContent(content) | ||
| } catch (e: Exception) { | ||
| getLogger<OuterAmazonQPanel>().error { "Error while creating window" } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package software.aws.toolkits.jetbrains.core.notifications | ||
|
|
||
| import com.intellij.icons.AllIcons | ||
| import com.intellij.ide.BrowserUtil | ||
| import com.intellij.openapi.actionSystem.AnAction | ||
| import com.intellij.openapi.actionSystem.AnActionEvent | ||
| import com.intellij.openapi.application.runInEdt | ||
| import com.intellij.openapi.progress.ProgressIndicator | ||
| import com.intellij.openapi.progress.ProgressManager | ||
| import com.intellij.openapi.progress.Task | ||
| import com.intellij.openapi.project.Project | ||
| import com.intellij.openapi.ui.Messages | ||
| import com.intellij.ui.EditorNotificationPanel | ||
| import software.aws.toolkits.jetbrains.AwsPlugin | ||
| import software.aws.toolkits.jetbrains.AwsToolkit | ||
| import software.aws.toolkits.jetbrains.core.plugin.PluginUpdateManager | ||
| import software.aws.toolkits.resources.AwsCoreBundle | ||
|
|
||
| fun checkSeverity(notificationSeverity: String): NotificationSeverity = when (notificationSeverity) { | ||
| "Critical" -> NotificationSeverity.CRITICAL | ||
| "Warning" -> NotificationSeverity.WARNING | ||
| "Info" -> NotificationSeverity.INFO | ||
| else -> NotificationSeverity.INFO | ||
| } | ||
|
|
||
| object NotificationManager { | ||
| fun createActions( | ||
| project: Project, | ||
| followupActions: List<NotificationFollowupActions>?, | ||
| message: String, | ||
| title: String, | ||
|
|
||
| ): List<NotificationActionList> = buildList { | ||
| var url: String? = null | ||
| followupActions?.forEach { action -> | ||
| if (action.type == "ShowUrl") { | ||
| url = action.content.locale.url | ||
| } | ||
|
|
||
| if (action.type == "UpdateExtension") { | ||
| add( | ||
| NotificationActionList(AwsCoreBundle.message("notification.update")) { | ||
| updatePlugins() | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| if (action.type == "OpenChangelog") { | ||
| add( | ||
| NotificationActionList(AwsCoreBundle.message("notification.changelog")) { | ||
| BrowserUtil.browse(AwsToolkit.GITHUB_CHANGELOG) | ||
| } | ||
| ) | ||
| } | ||
| } | ||
| add( | ||
| NotificationActionList(AwsCoreBundle.message("general.more_dialog")) { | ||
| if (url == null) { | ||
| Messages.showYesNoDialog( | ||
| project, | ||
| message, | ||
| title, | ||
| AwsCoreBundle.message("general.acknowledge"), | ||
| AwsCoreBundle.message("general.cancel"), | ||
| AllIcons.General.Error | ||
| ) | ||
| } else { | ||
| val link = url ?: AwsToolkit.GITHUB_URL | ||
| val openLink = Messages.showYesNoDialog( | ||
| project, | ||
| message, | ||
| title, | ||
| AwsCoreBundle.message(AwsCoreBundle.message("notification.learn_more")), | ||
| AwsCoreBundle.message("general.cancel"), | ||
| AllIcons.General.Error | ||
| ) | ||
| if (openLink == 0) { | ||
| BrowserUtil.browse(link) | ||
| } | ||
| } | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| fun buildNotificationActions(actions: List<NotificationActionList>): List<AnAction> = actions.map { (title, block) -> | ||
| object : AnAction(title) { | ||
| override fun actionPerformed(e: AnActionEvent) { | ||
| block() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun buildBannerPanel(panel: EditorNotificationPanel, actions: List<NotificationActionList>): EditorNotificationPanel { | ||
| actions.forEach { (actionTitle, block) -> | ||
| panel.createActionLabel(actionTitle) { | ||
| block() | ||
| } | ||
| } | ||
|
|
||
| return panel | ||
| } | ||
| private fun updatePlugins() { | ||
| val pluginUpdateManager = PluginUpdateManager() | ||
| runInEdt { | ||
| ProgressManager.getInstance().run(object : Task.Backgroundable( | ||
| null, | ||
| AwsCoreBundle.message("aws.settings.auto_update.progress.message") | ||
| ) { | ||
| override fun run(indicator: ProgressIndicator) { | ||
| pluginUpdateManager.checkForUpdates(indicator, AwsPlugin.CORE) | ||
| pluginUpdateManager.checkForUpdates(indicator, AwsPlugin.TOOLKIT) | ||
| pluginUpdateManager.checkForUpdates(indicator, AwsPlugin.Q) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| data class NotificationActionList( | ||
| val title: String, | ||
| val blockToExecute: () -> Unit, | ||
| ) | ||
|
|
||
| data class BannerContent( | ||
| val title: String, | ||
| val message: String, | ||
| val actions: List<NotificationActionList>, | ||
| val id: String, | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package software.aws.toolkits.jetbrains.core.notifications | ||
|
|
||
| object DisplayToastNotifications | ||
Check warningCode scanning / QDJVMC Unused symbol Warning |
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check warning
Code scanning / QDJVMC
Unused symbol Warning