Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
c3cc2bf
Display toast notifications with actions
manodnyab Nov 13, 2024
09729c7
Condition matcher for displaying notifications
manodnyab Nov 15, 2024
885f3f0
Show notification banner
manodnyab Nov 18, 2024
f0aca38
feedback 1
manodnyab Nov 19, 2024
e909a0e
Modified deserialization cases and added tests
manodnyab Nov 20, 2024
5a84e39
Merge branch 'feature/ideNotifs' into manodnyb/checkRulesForNotificat…
manodnyab Nov 20, 2024
56c1888
not required file change
manodnyab Nov 20, 2024
a981227
Merge remote-tracking branch 'origin/manodnyb/checkRulesForNotificati…
manodnyab Nov 20, 2024
682897f
feedback 1
manodnyab Nov 20, 2024
adb6ec7
resolved conflicts
manodnyab Nov 20, 2024
dbfcefc
feedback 1
manodnyab Nov 20, 2024
823ea7f
Merge remote-tracking branch 'origin/feature/ideNotifs' into manodnyb…
manodnyab Nov 20, 2024
218c8ed
modified the base class
manodnyab Nov 20, 2024
b684a01
merge conflicts resolved
manodnyab Nov 21, 2024
368fd25
merge conflicts resolved
manodnyab Nov 21, 2024
57fb2ef
rearranged call site
manodnyab Nov 21, 2024
a5126d1
show notifications when panel is opened
manodnyab Nov 21, 2024
22f9438
resolved merge conflicts
manodnyab Nov 21, 2024
87ec1d9
fixed tests
manodnyab Nov 21, 2024
24a2f65
Merge branch 'feature/ideNotifs' into manodnyb/addNotificationBanner
manodnyab Nov 21, 2024
78f8c6b
detekt
manodnyab Nov 21, 2024
bfc1077
Merge remote-tracking branch 'origin/manodnyb/addNotificationBanner' …
manodnyab Nov 21, 2024
8a1dee4
Update action displayed in notifications
manodnyab Nov 22, 2024
1a83a40
feedback
manodnyab Nov 22, 2024
9e8b0af
Merge branch 'feature/ideNotifs' into manodnyb/addNotificationBanner
manodnyab Nov 22, 2024
1b12854
convert panels into wrappers
manodnyab Nov 22, 2024
e7d8594
Merge remote-tracking branch 'origin/manodnyb/addNotificationBanner' …
manodnyab Nov 22, 2024
bbf6779
fixed test
manodnyab Nov 22, 2024
a8fa482
Merge branch 'feature/ideNotifs' into manodnyb/addNotificationBanner
manodnyab Nov 22, 2024
218f254
Merge remote-tracking branch 'origin/manodnyb/addNotificationBanner' …
manodnyab Nov 22, 2024
2b359fa
try inbuilt method
manodnyab Nov 22, 2024
4c32661
Merge branch 'feature/ideNotifs' into manodnyb/updateAndRestartAction
bryceitoc9 Nov 26, 2024
5c8f131
lint
rli Nov 27, 2024
ae35e39
Merge branch 'feature/ideNotifs' into manodnyb/updateAndRestartAction
rli Nov 27, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,16 @@
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) {
Expand All @@ -37,7 +43,7 @@
if (action.type == "UpdateExtension") {
add(
NotificationActionList(AwsCoreBundle.message("notification.update")) {
// TODO: Add update logic
updatePlugins()

Check warning on line 46 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/CustomizeNotificationsUi.kt

View check run for this annotation

Codecov / codecov/patch

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/CustomizeNotificationsUi.kt#L46

Added line #L46 was not covered by tests
}
)
}
Expand Down Expand Up @@ -96,6 +102,21 @@

return panel
}
private fun updatePlugins() {
val pluginUpdateManager = PluginUpdateManager()
runInEdt {
ProgressManager.getInstance().run(object : Task.Backgroundable(
null,
AwsCoreBundle.message("aws.settings.auto_update.progress.message")

Check warning on line 110 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/CustomizeNotificationsUi.kt

View check run for this annotation

Codecov / codecov/patch

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/CustomizeNotificationsUi.kt#L106-L110

Added lines #L106 - L110 were not covered by tests
) {
override fun run(indicator: ProgressIndicator) {
pluginUpdateManager.checkForUpdates(indicator, AwsPlugin.CORE)
pluginUpdateManager.checkForUpdates(indicator, AwsPlugin.TOOLKIT)
pluginUpdateManager.checkForUpdates(indicator, AwsPlugin.Q)
}

Check warning on line 116 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/CustomizeNotificationsUi.kt

View check run for this annotation

Codecov / codecov/patch

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/CustomizeNotificationsUi.kt#L113-L116

Added lines #L113 - L116 were not covered by tests
})
}
}

Check warning on line 119 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/CustomizeNotificationsUi.kt

View check run for this annotation

Codecov / codecov/patch

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/CustomizeNotificationsUi.kt#L118-L119

Added lines #L118 - L119 were not covered by tests
Comment on lines +105 to +119
Copy link
Contributor

Choose a reason for hiding this comment

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

i feel like this snippet exists in the auto updater

}

data class NotificationActionList(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ class PluginUpdateManager : Disposable {
// TODO: Optimize this to only search the result for AWS plugins
fun getUpdateInfo(): Collection<PluginDownloader> = UpdateChecker.getPluginUpdates() ?: emptyList()

internal fun updatePlugin(pluginDescriptor: IdeaPluginDescriptor, progressIndicator: ProgressIndicator): Boolean {
fun updatePlugin(pluginDescriptor: IdeaPluginDescriptor, progressIndicator: ProgressIndicator): Boolean {
val pluginName = pluginDescriptor.name

// wasUpdatedWithRestart means that, it was an update and it needs to restart to apply
Expand Down
Loading