Merge pull request #2461 from digma-ai/reload-jcef

reload UI

Author: shalom938

ide-common/src/main/kotlin/org/digma/intellij/plugin/reload/ReloadAction.kt

@@ -0,0 +1,18 @@
+package org.digma.intellij.plugin.reload
+
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.components.service
+import org.digma.intellij.plugin.errorreporting.ErrorReporter
+
+//devkit doesn't know that the action is registered because it looks for plugin.xml in the current project
+@Suppress("ComponentNotRegistered")
+class ReloadAction : AnAction() {
+    override fun actionPerformed(p0: AnActionEvent) {
+        try {
+            service<ReloadService>().reload()
+        } catch (e: Throwable) {
+            ErrorReporter.getInstance().reportError("ReloadAction.actionPerformed", e)
+        }
+    }
+}

ide-common/src/main/kotlin/org/digma/intellij/plugin/reload/ReloadService.kt

@@ -0,0 +1,54 @@
+package org.digma.intellij.plugin.reload
+
+import com.intellij.openapi.Disposable
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.project.ProjectManager
+import com.intellij.openapi.util.Disposer
+import org.digma.intellij.plugin.common.EDT
+import org.digma.intellij.plugin.common.isProjectValid
+import org.digma.intellij.plugin.errorreporting.ErrorReporter
+import org.digma.intellij.plugin.ui.MainToolWindowCardsController
+import org.digma.intellij.plugin.ui.panels.ReloadablePanel
+
+@Service(Service.Level.APP)
+class ReloadService {
+
+    private val reloadables = mutableListOf<ReloadablePanel>()
+
+
+    fun register(reloadablePanel: ReloadablePanel, parentDisposable: Disposable) {
+        reloadables.add(reloadablePanel)
+        Disposer.register(parentDisposable) {
+            remove(reloadablePanel)
+        }
+    }
+
+    fun remove(reloadablePanel: ReloadablePanel) {
+        reloadables.remove(reloadablePanel)
+    }
+
+
+    fun reload() {
+        ProjectManager.getInstance().openProjects.forEach {
+            try {
+                if (isProjectValid(it)) {
+                    MainToolWindowCardsController.getInstance(it).wizardFinished()
+                }
+            } catch (e: Throwable) {
+                ErrorReporter.getInstance().reportError("ReloadService.reload", e)
+            }
+        }
+
+        reloadables.forEach {
+            EDT.ensureEDT {
+                try {
+                    it.reload()
+                } catch (e: Throwable) {
+                    ErrorReporter.getInstance().reportError("ReloadService.reload", e)
+                }
+            }
+        }
+    }
+
+
+}

ide-common/src/main/kotlin/org/digma/intellij/plugin/ui/panels/ReloadablePanel.kt

@@ -0,0 +1,5 @@
+package org.digma.intellij.plugin.ui.panels
+
+interface ReloadablePanel {
+    fun reload()
+}

src/main/kotlin/org/digma/intellij/plugin/ui/mainapp/MainAppPanel.kt

@@ -1,25 +1,41 @@
 package org.digma.intellij.plugin.ui.mainapp
 
+import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.jcef.JBCefApp
 import com.intellij.util.ui.JBUI
+import org.digma.intellij.plugin.reload.ReloadService
 import org.digma.intellij.plugin.ui.insights.InsightsService
 import org.digma.intellij.plugin.ui.jcef.DownloadHandlerAdapter
 import org.digma.intellij.plugin.ui.jcef.JCefComponent
 import org.digma.intellij.plugin.ui.list.listBackground
 import org.digma.intellij.plugin.ui.navigation.CodeButtonCaretContextService
 import org.digma.intellij.plugin.ui.navigation.NavigationService
 import org.digma.intellij.plugin.ui.panels.DisposablePanel
+import org.digma.intellij.plugin.ui.panels.ReloadablePanel
 import org.digma.intellij.plugin.ui.tests.TestsUpdater
 import java.awt.BorderLayout
 import java.awt.Insets
 import javax.swing.JComponent
 import javax.swing.JLabel
 
-class MainAppPanel(private val project: Project) : DisposablePanel() {
+class MainAppPanel(private val project: Project) : DisposablePanel(), ReloadablePanel {
+
+    private var jCefComponent: JCefComponent? = null
+
+    private var parentDisposable = Disposer.newDisposable()
 
     init {
+        jCefComponent = build()
+        service<ReloadService>().register(this, MainAppService.getInstance(project))
+        Disposer.register(MainAppService.getInstance(project)) {
+            dispose()
+        }
+    }
+
+
+    private fun build(): JCefComponent? {
 
         val jCefComponent = createJcefComponent()
 
@@ -30,12 +46,6 @@ class MainAppPanel(private val project: Project) : DisposablePanel() {
         add(jcefUiComponent, BorderLayout.CENTER)
         background = listBackground()
 
-        Disposer.register(MainAppService.getInstance(project)) {
-            jCefComponent?.dispose()
-            remove(jcefUiComponent)
-            dispose()
-        }
-
         jCefComponent?.let {
             MainAppService.getInstance(project).setJCefComponent(it)
             TestsUpdater.getInstance(project).setJCefComponent(it)
@@ -44,12 +54,22 @@ class MainAppPanel(private val project: Project) : DisposablePanel() {
             CodeButtonCaretContextService.getInstance(project).setJCefComponent(it)
         }
 
+        return jCefComponent
     }
 
+
+    override fun reload() {
+        dispose()
+        removeAll()
+        parentDisposable = Disposer.newDisposable()
+        jCefComponent = build()
+    }
+
+
     private fun createJcefComponent(): JCefComponent? {
         return if (JBCefApp.isSupported()) {
             JCefComponent.JCefComponentBuilder(
-                project, "Main", MainAppService.getInstance(project),
+                project, "Main", parentDisposable,
                 MAIN_APP_URL,
                 MainAppMessageRouterHandler(project)
             )
@@ -66,6 +86,9 @@ class MainAppPanel(private val project: Project) : DisposablePanel() {
     }
 
     override fun dispose() {
-        //nothing to do
+        Disposer.dispose(parentDisposable)
+        jCefComponent?.let {
+            Disposer.dispose(it)
+        }
     }
 }

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

@@ -5,45 +5,66 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import com.intellij.ui.jcef.JBCefApp
 import com.intellij.util.ui.JBUI
+import org.digma.intellij.plugin.reload.ReloadService
 import org.digma.intellij.plugin.ui.jcef.JCefComponent
 import org.digma.intellij.plugin.ui.jcef.JCefComponent.JCefComponentBuilder
 import org.digma.intellij.plugin.ui.list.listBackground
 import org.digma.intellij.plugin.ui.panels.DisposablePanel
+import org.digma.intellij.plugin.ui.panels.ReloadablePanel
 import java.awt.BorderLayout
+import java.awt.Insets
 import javax.swing.JComponent
 import javax.swing.JLabel
 
-class RecentActivityPanel(private val project: Project) : DisposablePanel() {
+class RecentActivityPanel(private val project: Project) : DisposablePanel(), ReloadablePanel {
+
+    private var jCefComponent: JCefComponent? = null
+
+    private var parentDisposable = Disposer.newDisposable()
 
     init {
+        jCefComponent = build()
+        service<ReloadService>().register(this, project.service<RecentActivityService>())
+        Disposer.register(project.service<RecentActivityService>()) {
+            dispose()
+        }
+    }
+
+
+    private fun build(): JCefComponent? {
 
         val jCefComponent = createJcefComponent()
 
         val jcefUiComponent: JComponent = jCefComponent?.getComponent() ?: JLabel("JCEF not supported")
 
         layout = BorderLayout()
         border = JBUI.Borders.empty()
-        background = listBackground()
         add(jcefUiComponent, BorderLayout.CENTER)
-
-        Disposer.register(project.service<RecentActivityService>()) {
-            jCefComponent?.dispose()
-            remove(jcefUiComponent)
-            dispose()
-        }
+        background = listBackground()
 
         jCefComponent?.let {
             project.service<RecentActivityService>().setJcefComponent(it)
             project.service<RecentActivityUpdater>().setJcefComponent(it)
             project.service<LiveViewUpdater>().setJcefComponent(it)
         }
+
+        return jCefComponent
+    }
+
+
+    override fun reload() {
+        project.service<LiveViewUpdater>().stopLiveView()
+        dispose()
+        removeAll()
+        parentDisposable = Disposer.newDisposable()
+        jCefComponent = build()
     }
 
 
     private fun createJcefComponent(): JCefComponent? {
         return if (JBCefApp.isSupported()) {
             JCefComponentBuilder(
-                project, "RecentActivity", project.service<RecentActivityService>(),
+                project, "RecentActivity", parentDisposable,
                 RECENT_ACTIVITY_URL,
                 RecentActivityMessageRouterHandler(project)
             )
@@ -54,7 +75,14 @@ class RecentActivityPanel(private val project: Project) : DisposablePanel() {
     }
 
 
+    override fun getInsets(): Insets {
+        return JBUI.emptyInsets()
+    }
+
     override fun dispose() {
-        //nothing to do
+        Disposer.dispose(parentDisposable)
+        jCefComponent?.let {
+            Disposer.dispose(it)
+        }
     }
 }

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

@@ -166,4 +166,14 @@
                   topic="com.intellij.openapi.project.ProjectCloseListener"/>
     </applicationListeners>
 
+
+    <actions>
+        <action id="org.digma.intellij.plugin.reload.ReloadAction" class="org.digma.intellij.plugin.reload.ReloadAction"
+                text="Reload Digma UI" description="Reload Digma jcef browsers"
+                icon="org.digma.intellij.plugin.icons.AppIcons.TOOL_WINDOW">
+            <add-to-group group-id="HelpMenu" anchor="last"/>
+        </action>
+    </actions>
+
+
 </idea-plugin>