Skip to content

Commit 785b3f8

Browse files
Merge pull request #2094 from digma-ai/unify-actions-names
unify action names
2 parents a5184cf + e5eaec2 commit 785b3f8

File tree

11 files changed

+341
-221
lines changed

11 files changed

+341
-221
lines changed

CHANGELOG.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@
44

55
- Fix env refresh by @opoliarush in https://github.com/digma-ai/digma-intellij-plugin/pull/2022
66
- Support digma auth header by @opoliarush in https://github.com/digma-ai/digma-intellij-plugin/pull/2028
7-
- Feature/new environment api user id in account by @shalom938 in https://github.com/digma-ai/digma-intellij-plugin/pull/2030
7+
- Feature/new environment api user id in account by @shalom938
8+
in https://github.com/digma-ai/digma-intellij-plugin/pull/2030
89
- Send user info to UI by @opoliarush in https://github.com/digma-ai/digma-intellij-plugin/pull/2039
910
- Contracts refactoring 1 by @shaykeren in https://github.com/digma-ai/digma-intellij-plugin/pull/2061
1011
- Feature/sign in suggestion by @opoliarush in https://github.com/digma-ai/digma-intellij-plugin/pull/2071
1112
- Feature/sign in by @opoliarush in https://github.com/digma-ai/digma-intellij-plugin/pull/2065
12-
- refactor documentation app for common jcef infrastructure by @shalom938 in https://github.com/digma-ai/digma-intellij-plugin/pull/2082
13-
- ensue no read access in Backgroundable Closes #2084 by @shalom938 in https://github.com/digma-ai/digma-intellij-plugin/pull/2086
13+
- refactor documentation app for common jcef infrastructure by @shalom938
14+
in https://github.com/digma-ai/digma-intellij-plugin/pull/2082
15+
- ensue no read access in Backgroundable Closes #2084 by @shalom938
16+
in https://github.com/digma-ai/digma-intellij-plugin/pull/2086
1417
- Feature/new environment api by @opoliarush in https://github.com/digma-ai/digma-intellij-plugin/pull/2032
1518
- Rollback tmp changes by @shaykeren in https://github.com/digma-ai/digma-intellij-plugin/pull/2089
1619
- Update UI by @kshmidt-digma in https://github.com/digma-ai/digma-intellij-plugin/pull/2090

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/BaseMessageRouterHandler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
8181

8282
//do common messages for all apps, or call doOnQuery
8383
when (action) {
84-
JCEFGlobalConstants.GLOBAL_REGISTER -> {
84+
JCEFGlobalConstants.GLOBAL_PERSONALIZE_REGISTER -> {
8585
val payload = getPayloadFromRequestNonNull(requestJsonNode)
8686
val registrationMap: Map<String, String> =
8787
payload.fields().asSequence()
@@ -204,7 +204,7 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
204204
changeScope(requestJsonNode)
205205
}
206206

207-
JCEFGlobalConstants.GLOBAL_REGISTRATION -> {
207+
JCEFGlobalConstants.GLOBAL_REGISTER -> {
208208
val payload = getPayloadFromRequest(requestJsonNode)
209209
payload?.let {
210210
val userDetails = mapOf("email" to payload.get("email").asText());

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/JCEFGlobalConstants.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ object JCEFGlobalConstants {
3030
const val GLOBAL_SET_IS_DOCKER_INSTALLED: String = "GLOBAL/SET_IS_DOCKER_INSTALLED"
3131
const val GLOBAL_SET_IS_DOCKER_COMPOSE_INSTALLED: String = "GLOBAL/SET_IS_DOCKER_COMPOSE_INSTALLED"
3232
const val GLOBAL_SET_OBSERVABILITY: String = "GLOBAL/SET_OBSERVABILITY"
33-
const val GLOBAL_REGISTER: String = "GLOBAL/REGISTER"
33+
const val GLOBAL_PERSONALIZE_REGISTER: String = "GLOBAL/PERSONALIZE_REGISTER"
3434
const val GLOBAL_SET_IS_OBSERVABILITY_ENABLED: String = "GLOBAL/SET_IS_OBSERVABILITY_ENABLED"
3535
const val GLOBAL_SET_BACKEND_INFO: String = "GLOBAL/SET_BACKEND_INFO"
3636
const val GLOBAL_SET_IS_MICROMETER_PROJECT: String = "GLOBAL/SET_IS_MICROMETER_PROJECT"
@@ -43,7 +43,7 @@ object JCEFGlobalConstants {
4343
const val GLOBAL_CHANGE_SCOPE: String = "GLOBAL/CHANGE_SCOPE"
4444
const val GLOBAL_LOGIN: String = "GLOBAL/LOGIN"
4545
const val GLOBAL_LOGOUT: String = "GLOBAL/LOGOUT"
46-
const val GLOBAL_REGISTRATION: String = "GLOBAL/REGISTRATION"
46+
const val GLOBAL_REGISTER: String = "GLOBAL/REGISTER"
4747
const val GLOBAL_CHANGE_VIEW: String = "GLOBAL/CHANGE_VIEW"
4848
const val GLOBAL_SET_STATE: String = "GLOBAL/SET_STATE"
4949
const val GLOBAL_UPDATE_STATE: String = "GLOBAL/UPDATE_STATE"

src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivityMessageRouterHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class RecentActivityMessageRouterHandler(project: Project) : BaseMessageRouterHa
8383
project.service<RecentActivityUpdater>().updateLatestActivities()
8484
}
8585

86-
"RECENT_ACTIVITY/DELETE_ENVIRONMENT_V2" -> {
86+
"RECENT_ACTIVITY/DELETE_ENVIRONMENT" -> {
8787
val environmentId = getEnvironmentIdFromPayload(requestJsonNode)
8888
environmentId?.let {
8989
project.service<RecentActivityService>().deleteEnvironmentV2(environmentId)

src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/model/SetEnvironmentCreatedMessage.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ import org.digma.intellij.plugin.ui.jcef.JCEFGlobalConstants
55

66
data class SetEnvironmentCreatedMessage(@JsonRawValue val payload: String) {
77
val type = JCEFGlobalConstants.REQUEST_MESSAGE_TYPE
8-
val action = "RECENT_ACTIVITY/ENVIRONMENT_CREATED"
8+
val action = "RECENT_ACTIVITY/SET_CREATE_ENVIRONMENT_RESULT"
99
}

src/main/resources/webview/common/images/environmentId_dark.svg

Lines changed: 16 additions & 16 deletions
Loading

src/main/resources/webview/common/images/howToSetupEnvironmentMenuItem_dark.svg

Lines changed: 18 additions & 18 deletions
Loading

src/main/resources/webview/documentation/index.js

Lines changed: 57 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/resources/webview/main/index.js

Lines changed: 56 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/resources/webview/navigation/index.js

Lines changed: 66 additions & 60 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)