Merge pull request #2227 from digma-ai/feature/promotion

Added promotion
digma-ai · Jun 18, 2024 · b2cee9d · b2cee9d
2 parents 6cfdff1 + 7d32296
commit b2cee9d
Show file tree

Hide file tree

Showing 13 changed files with 1,555 additions and 243 deletions.
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/posthog/ActivityMonitor.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/posthog/ActivityMonitor.kt
@@ -166,14 +166,15 @@ class ActivityMonitor(private val project: Project) : Disposable {
         )
     }
 
-    fun registerEmail(email: String) {
-        postHog?.alias(userId, email)
+    fun registerEmail(email: String, courseRequested: Boolean) {
         postHog?.identify(
             userId, mapOf(
                 "email" to getEmailForEvent(),
-                INSTALL_STATUS_PROPERTY_NAME to getCurrentInstallStatus()
+                INSTALL_STATUS_PROPERTY_NAME to getCurrentInstallStatus(),
+                "user_requested_course" to courseRequested.toString()
             )
         )
+        postHog?.alias(userId, email)
     }
 
     fun registerCustomEvent(eventName: String, tags: Map<String, Any> = mapOf()) {
@@ -670,7 +671,8 @@ class ActivityMonitor(private val project: Project) : Disposable {
                     INSTALL_STATUS_PROPERTY_NAME to getCurrentInstallStatus(),
                     ENVIRONMENT_ADDED_PROPERTY_NAME to PersistenceService.getInstance().isEnvironmentAdded(),
                     LOAD_WARNING_APPEARED_PROPERTY_NAME to PersistenceService.getInstance().isLoadWarningAppeared(),
-                    JIRA_FIELD_COPIED_PROPERTY_NAME to PersistenceService.getInstance().isJiraFieldCopied()
+                    JIRA_FIELD_COPIED_PROPERTY_NAME to PersistenceService.getInstance().isJiraFieldCopied(),
+                    "user_requested_course" to "false"
                 )
             )
         }
@@ -695,7 +697,8 @@ class ActivityMonitor(private val project: Project) : Disposable {
                     INSTALL_STATUS_PROPERTY_NAME to getCurrentInstallStatus(),
                     ENVIRONMENT_ADDED_PROPERTY_NAME to PersistenceService.getInstance().isEnvironmentAdded(),
                     LOAD_WARNING_APPEARED_PROPERTY_NAME to PersistenceService.getInstance().isLoadWarningAppeared(),
-                    JIRA_FIELD_COPIED_PROPERTY_NAME to PersistenceService.getInstance().isJiraFieldCopied()
+                    JIRA_FIELD_COPIED_PROPERTY_NAME to PersistenceService.getInstance().isJiraFieldCopied(),
+                    "user_requested_course" to "false"
                 )
             )
         }
@@ -881,11 +884,12 @@ class ActivityMonitor(private val project: Project) : Disposable {
         postHog?.identify(
             userId,
             mapOf(
-                LOAD_WARNING_APPEARED_PROPERTY_NAME + "_timestamp" to PersistenceService.getInstance().getLoadWarningAppearedTimestamp()
+                LOAD_WARNING_APPEARED_PROPERTY_NAME + "_timestamp" to PersistenceService.getInstance().getLoadWarningAppearedTimestamp(),
+                "user_requested_course" to "false"
             ),
             mapOf(
-                LOAD_WARNING_APPEARED_PROPERTY_NAME to PersistenceService.getInstance().isLoadWarningAppeared()
-            )
+                LOAD_WARNING_APPEARED_PROPERTY_NAME to PersistenceService.getInstance().isLoadWarningAppeared(),
+            ),
         )
 
     }
@@ -911,7 +915,8 @@ class ActivityMonitor(private val project: Project) : Disposable {
         postHog?.identify(
             userId,
             mapOf(
-                ENVIRONMENT_ADDED_PROPERTY_NAME + "_timestamp" to PersistenceService.getInstance().getEnvironmentAddedTimestamp()
+                ENVIRONMENT_ADDED_PROPERTY_NAME + "_timestamp" to PersistenceService.getInstance().getEnvironmentAddedTimestamp(),
+                "user_requested_course" to "false"
             ),
             mapOf(
                 ENVIRONMENT_ADDED_PROPERTY_NAME to PersistenceService.getInstance().isEnvironmentAdded()
@@ -943,7 +948,8 @@ class ActivityMonitor(private val project: Project) : Disposable {
         postHog?.identify(
             userId,
             mapOf(
-                JIRA_FIELD_COPIED_PROPERTY_NAME + "_timestamp" to PersistenceService.getInstance().getJiraFieldCopiedTimestamp()
+                JIRA_FIELD_COPIED_PROPERTY_NAME + "_timestamp" to PersistenceService.getInstance().getJiraFieldCopiedTimestamp(),
+                "user_requested_course" to "false"
             ),
             mapOf(
                 JIRA_FIELD_COPIED_PROPERTY_NAME to PersistenceService.getInstance().isJiraFieldCopied()

diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/jcef/UserRegistrationManager.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/jcef/UserRegistrationManager.kt
@@ -21,10 +21,12 @@ class UserRegistrationManager(private val project: Project) {
 
         ActivityMonitor.getInstance(project).registerCustomEvent("register local user", registrationMap)
         ActivityMonitor.getInstance(project).registerUserAction("local user registered", registrationMap)
+        val courseRequested = registrationMap["scope"] == "promotion"
+
 
         registrationMap["email"]?.let { userEmail ->
             PersistenceService.getInstance().setUserRegistrationEmail(userEmail)
-            ActivityMonitor.getInstance(project).registerEmail(userEmail)//override the onboarding email
+            ActivityMonitor.getInstance(project).registerEmail(userEmail, courseRequested)//override the onboarding email
             project.messageBus.syncPublisher(UserRegistrationEvent.USER_REGISTRATION_TOPIC).userRegistered(userEmail)
         } ?: ErrorReporter.getInstance().reportError(
             project, "UserRegistrationManager.register", "register user email", mapOf(

diff --git a/...main/kotlin/org/digma/intellij/plugin/ui/wizard/InstallationWizardSidePanelWindowPanel.kt b/...main/kotlin/org/digma/intellij/plugin/ui/wizard/InstallationWizardSidePanelWindowPanel.kt
@@ -42,6 +42,7 @@ import org.digma.intellij.plugin.log.Log
 import org.digma.intellij.plugin.persistence.PersistenceService
 import org.digma.intellij.plugin.persistence.updateInstallationWizardFlag
 import org.digma.intellij.plugin.posthog.ActivityMonitor
+import org.digma.intellij.plugin.recentactivity.RecentActivityToolWindowShower
 import org.digma.intellij.plugin.ui.MainToolWindowCardsController
 import org.digma.intellij.plugin.ui.ToolWindowShower
 import org.digma.intellij.plugin.ui.common.isJaegerButtonEnabled
@@ -67,7 +68,6 @@ import org.digma.intellij.plugin.ui.jcef.serializeAndExecuteWindowPostMessageJav
 import org.digma.intellij.plugin.ui.jcef.updateDigmaEngineStatus
 import org.digma.intellij.plugin.ui.notificationcenter.AppNotificationCenter
 import org.digma.intellij.plugin.ui.panels.DisposablePanel
-import org.digma.intellij.plugin.recentactivity.RecentActivityToolWindowShower
 import org.digma.intellij.plugin.ui.settings.ApplicationUISettingsChangeNotifier
 import org.digma.intellij.plugin.ui.settings.SettingsChangeListener
 import org.digma.intellij.plugin.ui.settings.Theme
@@ -215,7 +215,7 @@ fun createInstallationWizardSidePanelWindowPanel(project: Project, wizardSkipIns
                 val email = payload?.email
                 PersistenceService.getInstance().setUserEmail(email)
                 if (email != null) {
-                    ActivityMonitor.getInstance(project).registerEmail(email)
+                    ActivityMonitor.getInstance(project).registerEmail(email, false)
                 }
 
                 payload?.productKey?.let {

diff --git a/...main/resources/webview/common/images/promotion/collapsedContainerBackground.svg b/...main/resources/webview/common/images/promotion/collapsedContainerBackground.svg
diff --git a/...n/resources/webview/common/images/promotion/collapsedContainerEllipseShadow.svg b/...n/resources/webview/common/images/promotion/collapsedContainerEllipseShadow.svg