-
Notifications
You must be signed in to change notification settings - Fork 274
Condition Matcher for displaying notifications #5093
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.
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
Changes from 2 commits
c3cc2bf
09729c7
e909a0e
5a84e39
56c1888
a981227
dbfcefc
823ea7f
218c8ed
5743e94
899da9d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| // Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package software.aws.toolkits.jetbrains.core.notifications | ||
|
|
||
| fun checkSeverity(notificationSeverity: String): NotificationSeverity = when (notificationSeverity) { | ||
| "Critical" -> NotificationSeverity.CRITICAL | ||
| "Warning" -> NotificationSeverity.WARNING | ||
| "Info" -> NotificationSeverity.INFO | ||
| else -> NotificationSeverity.INFO | ||
| } | ||
|
Check warning on line 11 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/CustomizeNotificationsUi.kt
|
||
|
|
||
| // TODO: Add actions that can be performed from the notifications here | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // 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.notification.NotificationType | ||
| import com.intellij.openapi.actionSystem.AnAction | ||
| import com.intellij.openapi.project.Project | ||
|
||
| import software.aws.toolkits.jetbrains.utils.notifySticky | ||
|
|
||
| object DisplayToastNotifications { | ||
|
||
| fun show(title: String, message: String, action: List<AnAction>, notificationType: NotificationSeverity) { | ||
| val notifyType = when (notificationType) { | ||
| NotificationSeverity.CRITICAL -> NotificationType.ERROR | ||
| NotificationSeverity.WARNING -> NotificationType.WARNING | ||
| NotificationSeverity.INFO -> NotificationType.INFORMATION | ||
|
Check warning on line 16 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/DisplayToastNotifications.kt
|
||
| } | ||
| notifySticky(notifyType, title, message, null, action) | ||
| } | ||
|
Check warning on line 19 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/DisplayToastNotifications.kt
|
||
|
|
||
| fun shouldShow(project: Project, notificationData: NotificationData) { | ||
|
||
| if (RulesEngine.displayNotification(notificationData, project)) { | ||
| val notificationContent = notificationData.content.locale | ||
| val severity = notificationData.severity | ||
| show(notificationContent.title, notificationContent.description, emptyList(), checkSeverity(severity)) | ||
|
Check warning on line 25 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/DisplayToastNotifications.kt
|
||
| } | ||
| } | ||
|
Check warning on line 27 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/DisplayToastNotifications.kt
|
||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,181 @@ | ||
| // 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.fasterxml.jackson.annotation.JsonProperty | ||
|
|
||
| data class NotificationsList( | ||
| @JsonProperty("schema") | ||
| val schema: Schema, | ||
|
Check warning on line 10 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("notifications") | ||
| val notifications: List<NotificationData>, | ||
|
Check warning on line 12 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| data class Schema( | ||
| @JsonProperty("version") | ||
| val version: String, | ||
|
Check warning on line 17 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| data class NotificationData( | ||
| @JsonProperty("id") | ||
manodnyab marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| val id: String, | ||
|
Check warning on line 22 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("schedule") | ||
| val schedule: NotificationSchedule, | ||
|
Check warning on line 24 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("severity") | ||
| val severity: String, | ||
|
Check warning on line 26 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("condition") | ||
| val condition: NotificationDisplayCondition?, | ||
|
Check warning on line 28 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("content") | ||
| val content: NotificationContentDescriptionLocale, | ||
|
Check warning on line 30 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("actions") | ||
| val actions: List<NotificationFollowupActions>? = emptyList(), | ||
| ) | ||
|
Check warning on line 33 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class NotificationSchedule( | ||
| @JsonProperty("type") | ||
| val type: String, | ||
|
Check warning on line 37 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| enum class NotificationSeverity { | ||
| INFO, | ||
| WARNING, | ||
| CRITICAL, | ||
| } | ||
|
Check warning on line 44 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class NotificationContentDescriptionLocale( | ||
| @JsonProperty("en-US") | ||
| val locale: NotificationContentDescription, | ||
|
Check warning on line 48 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| data class NotificationContentDescription( | ||
| @JsonProperty("title") | ||
| val title: String, | ||
|
Check warning on line 53 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("description") | ||
| val description: String, | ||
|
Check warning on line 55 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| data class NotificationFollowupActions( | ||
| @JsonProperty("type") | ||
| val type: String, | ||
|
Check warning on line 60 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("content") | ||
| val content: NotificationFollowupActionsContent, | ||
|
Check warning on line 62 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| data class NotificationFollowupActionsContent( | ||
| @JsonProperty("en-US") | ||
| val locale: NotificationActionDescription, | ||
|
Check warning on line 67 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| data class NotificationActionDescription( | ||
| @JsonProperty("title") | ||
| val title: String, | ||
|
Check warning on line 72 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("url") | ||
| val url: String?, | ||
|
Check warning on line 74 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| data class NotificationDisplayCondition( | ||
| @JsonProperty("compute") | ||
| val compute: ComputeType?, | ||
|
Check warning on line 79 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("os") | ||
| val os: SystemType?, | ||
|
Check warning on line 81 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("ide") | ||
| val ide: SystemType?, | ||
|
Check warning on line 83 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("extension") | ||
| val extension: List<ExtensionType>?, | ||
|
Check warning on line 85 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("authx") | ||
| val authx: List<AuthxType>, | ||
|
Check warning on line 87 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| data class ComputeType( | ||
| @JsonProperty("type") | ||
| val type: NotificationExpression?, | ||
|
Check warning on line 92 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("architecture") | ||
| val architecture: NotificationExpression?, | ||
|
Check warning on line 94 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| data class SystemType( | ||
| @JsonProperty("type") | ||
| val type: NotificationExpression?, | ||
|
Check warning on line 99 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("version") | ||
| val version: NotificationExpression?, | ||
|
Check warning on line 101 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| data class ExtensionType( | ||
| @JsonProperty("id") | ||
| val id: String?, | ||
| @JsonProperty("version") | ||
| val version: NotificationExpression?, | ||
|
Check warning on line 108 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| open class NotificationExpression | ||
|
|
||
| open class NotificationOperation : NotificationExpression() | ||
|
Check warning on line 113 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class NotCondition( | ||
| @JsonProperty("not") | ||
| val expectedValue: NotificationExpression, | ||
| ) : NotificationExpression() | ||
|
Check warning on line 118 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class OrCondition( | ||
| @JsonProperty("or") | ||
| val expectedValueList: List<NotificationExpression>, | ||
| ) : NotificationExpression() | ||
|
Check warning on line 123 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class AndCondition( | ||
| @JsonProperty("and") | ||
| val expectedValueList: List<NotificationExpression>, | ||
| ) : NotificationExpression() | ||
|
Check warning on line 128 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class AuthxType( | ||
| @JsonProperty("feature") | ||
| val feature: String, | ||
|
Check warning on line 132 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("type") | ||
| val type: NotificationExpression?, | ||
|
Check warning on line 134 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("region") | ||
| val region: NotificationExpression?, | ||
|
Check warning on line 136 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("connectionState") | ||
| val connectionState: NotificationExpression?, | ||
|
Check warning on line 138 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| @JsonProperty("ssoscopes") | ||
| val ssoScopes: NotificationExpression?, | ||
|
Check warning on line 140 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
| ) | ||
|
|
||
| data class ComparisonCondition( | ||
| @JsonProperty("==") | ||
| val expectedValue: String, | ||
| ) : NotificationOperation() | ||
|
Check warning on line 146 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class NotEqualsCondition( | ||
| @JsonProperty("!=") | ||
| val expectedValue: String, | ||
| ) : NotificationOperation() | ||
|
Check warning on line 151 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class GreaterThanCondition( | ||
| @JsonProperty(">") | ||
| val expectedValue: String, | ||
| ) : NotificationOperation() | ||
|
Check warning on line 156 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class GreaterThanOrEqualsCondition( | ||
| @JsonProperty(">=") | ||
| val expectedValue: String, | ||
| ) : NotificationOperation() | ||
|
Check warning on line 161 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class LessThanCondition( | ||
| @JsonProperty("<") | ||
| val expectedValue: String, | ||
| ) : NotificationOperation() | ||
|
Check warning on line 166 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class LessThanOrEqualsCondition( | ||
| @JsonProperty("<=") | ||
| val expectedValue: String, | ||
| ) : NotificationOperation() | ||
|
Check warning on line 171 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class InCondition( | ||
| @JsonProperty("anyOf") | ||
| val expectedValueList: List<String>, | ||
| ) : NotificationOperation() | ||
|
Check warning on line 176 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
|
|
||
| data class NotInCondition( | ||
| @JsonProperty("noneOf") | ||
| val expectedValueList: List<String>, | ||
| ) : NotificationOperation() | ||
|
Check warning on line 181 in plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationFormatUtils.kt
|
||
Check warning
Code scanning / QDJVMC
Unused symbol Warning