Merge pull request #2720 from digma-ai/recent-activity-indicator

recent activity indicator Closes #2716

Author: shalom938

analytics-provider/src/test/java/org/digma/intellij/plugin/analytics/EnvironmentTests.java

@@ -17,8 +17,8 @@ class EnvironmentTests extends AbstractAnalyticsProviderTest {
     void getEnvironmentsTest() throws JsonProcessingException {
 
         List<Env> expectedEnvs = new ArrayList<>();
-        expectedEnvs.add(new Env("myid1", "myname1", EnvType.Public));
-        expectedEnvs.add(new Env("myid2", "myname2", EnvType.Private));
+        expectedEnvs.add(new Env("myid1", "myname1", EnvType.Public,new Date()));
+        expectedEnvs.add(new Env("myid2", "myname2", EnvType.Private,new Date()));
         mockBackEnd.enqueue(new MockResponse()
                 .setBody(objectMapper.writeValueAsString(expectedEnvs))
                 .addHeader("Content-Type", "application/json"));

model/src/main/kotlin/org/digma/intellij/plugin/model/rest/environment/Env.kt

@@ -1,15 +1,19 @@
 package org.digma.intellij.plugin.model.rest.environment
 
 import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import java.beans.ConstructorProperties
+import java.util.Date
 
 enum class EnvType { Private, Public }
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 data class Env
 @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-@ConstructorProperties("id", "name", "type")
+@ConstructorProperties("id", "name", "type", "lastActive")
 constructor(
     val id: String,
     val name: String,
     val type: EnvType,
+    val lastActive: Date?
 )

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

@@ -10,7 +10,9 @@ const val CommandQueryName = "pluginCommand"
 abstract class Command {
 
     enum class Commands(val commandName: String) {
-        RECENT_ACTIVITY_BADGE("RecentActivityBadge");
+        DUMMY_COMMAND("DummyCommand"); //just a dummy enum to satisfy the compiler
+        //RecentActivityBadge is not in use; we do it from the plugin code, here just as an example
+        //RECENT_ACTIVITY_BADGE("RecentActivityBadge");
 
 
         fun createInstance():Command{

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

@@ -9,6 +9,7 @@ import org.digma.intellij.plugin.ui.jcef.jsonToObject
 import org.digma.intellij.plugin.ui.recentactivity.RecentActivityToolWindowIconChanger
 import java.beans.ConstructorProperties
 
+//Not in use, we do it in the plugin, keep as an example
 class RecentActivityBadgeCommand : Command() {
 
     private val logger = Logger.getInstance(this::class.java)

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

@@ -1,8 +1,17 @@
 package org.digma.intellij.plugin.ui.recentactivity
 
+import com.intellij.openapi.project.Project
 import org.digma.intellij.plugin.ui.jcef.BaseEnvJsTemplateBuilder
 
 
+private const val RECENT_EXPIRATION_LIMIT_MILLIS_PARAM_NAME = "RecentActivityExpirationLimit";
+
 class RecentActivityEnvJsTemplateBuilder(templatePath: String) : BaseEnvJsTemplateBuilder(templatePath) {
 
+    override fun addAppSpecificEnvVariable(
+        project: Project,
+        data: MutableMap<String, Any>
+    ) {
+        data[RECENT_EXPIRATION_LIMIT_MILLIS_PARAM_NAME] = RECENT_EXPIRATION_LIMIT_MILLIS
+    }
 }

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

@@ -3,17 +3,28 @@ package org.digma.intellij.plugin.ui.recentactivity
 import com.intellij.execution.runners.ExecutionUtil
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
+import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowManager
 import org.digma.intellij.plugin.PluginId
+import org.digma.intellij.plugin.analytics.ApiClientChangedEvent
+import org.digma.intellij.plugin.analytics.getAllEnvironments
+import org.digma.intellij.plugin.common.DisposableAdaptor
 import org.digma.intellij.plugin.common.EDT
+import org.digma.intellij.plugin.errorreporting.ErrorReporter
 import org.digma.intellij.plugin.icons.AppIcons
+import org.digma.intellij.plugin.log.Log
+import org.digma.intellij.plugin.scheduling.disposingPeriodicTask
+import java.util.Date
 import javax.swing.Icon
+import kotlin.time.Duration.Companion.seconds
 
 //must be a singleton because it relies on null and non-null properties
 @Service(Service.Level.PROJECT)
-class RecentActivityToolWindowIconChanger(val project: Project) {
+class RecentActivityToolWindowIconChanger(val project: Project): DisposableAdaptor {
+
+    private val logger = Logger.getInstance(this::class.java)
 
     private val defaultIcon = AppIcons.TOOL_WINDOW_OBSERVABILITY
     private var actualIcon: Icon? = null
@@ -26,15 +37,49 @@ class RecentActivityToolWindowIconChanger(val project: Project) {
         }
     }
 
+    init {
+        val registered = disposingPeriodicTask("RecentActivityIconChanger",10.seconds.inWholeMilliseconds,10.seconds.inWholeMilliseconds,true){
+            val environments = getAllEnvironments(project)
+            val lastActiveTime: Date? = environments
+                .filter { it.lastActive != null }
+                .maxByOrNull { it.lastActive!! }
+                ?.lastActive
+
+            val isRecent = lastActiveTime?.let {
+                val now = System.currentTimeMillis()
+                now - it.time < RECENT_EXPIRATION_LIMIT_MILLIS
+            } ?: false
+
+            if (isRecent){
+                showBadge()
+            }else{
+                hideBadge()
+            }
+        }
+        if (!registered){
+            Log.log(logger::warn,"could not register recent activity icon changer scheduler")
+            ErrorReporter.getInstance().reportError(project,"RecentActivityToolWindowIconChanger.scheduler","could not register recent activity icon changer scheduler",mapOf())
+        }
+
+
+        project.messageBus.connect(this)
+            .subscribe(ApiClientChangedEvent.API_CLIENT_CHANGED_TOPIC, ApiClientChangedEvent {
+                hideBadge()
+            })
+    }
+
+
     fun showBadge() {
 
         val toolWindow = getToolWindow() ?: return
 
         createBadgeIcon()
 
         EDT.ensureEDT {
-            badgeIcon?.let {
-                toolWindow.setIcon(it)
+            if (toolWindow.icon != badgeIcon) {
+                badgeIcon?.let {
+                    toolWindow.setIcon(it)
+                }
             }
         }
     }
@@ -58,7 +103,10 @@ class RecentActivityToolWindowIconChanger(val project: Project) {
         val toolWindow = getToolWindow() ?: return
 
         EDT.ensureEDT {
-            toolWindow.setIcon(actualIcon ?: defaultIcon)
+            val icon = actualIcon ?: defaultIcon
+            if (toolWindow.icon != icon) {
+                toolWindow.setIcon(icon)
+            }
         }
     }
 

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

@@ -0,0 +1,11 @@
+package org.digma.intellij.plugin.ui.recentactivity
+
+import com.intellij.openapi.project.Project
+import org.digma.intellij.plugin.startup.DigmaProjectActivity
+
+class RecentActivityToolWindowIconChangerStarter: DigmaProjectActivity() {
+
+    override fun executeProjectStartup(project: Project) {
+        RecentActivityToolWindowIconChanger.getInstance(project)
+    }
+}

src/main/resources/META-INF/plugin.xml

@@ -134,6 +134,8 @@
                 implementation="org.digma.intellij.plugin.updates.ui.UIUpdateStarter"/>
         <postStartupActivity
                 implementation="org.digma.intellij.plugin.analytics.BackendInfoHolderStarter"/>
+        <postStartupActivity
+                implementation="org.digma.intellij.plugin.ui.recentactivity.RecentActivityToolWindowIconChangerStarter"/>
 
 
         <errorHandler implementation="org.digma.intellij.plugin.ui.reports.DigmaErrorReportSubmitter"/>

src/main/resources/webview/recent-activity/env.js

@@ -1 +1,2 @@
-@GLOBAL_ENV_VARS@
+@GLOBAL_ENV_VARS@
+window.recentActivityExpirationLimit = ${RecentActivityExpirationLimit};

ui-version

@@ -1 +1 @@
-12.0.0
+13.0.0