Merge pull request #2371 from digma-ai/feature/report-fix

Feature/report fix

Author: opoliarush

ide-common/src/main/kotlin/org/digma/intellij/plugin/ui/settings/ApplicationUISettingsChangeNotifier.kt

@@ -9,6 +9,7 @@ import com.intellij.openapi.editor.colors.EditorColorsListener
 import com.intellij.openapi.editor.colors.EditorColorsManager
 import com.intellij.openapi.editor.colors.impl.AppEditorFontOptions
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.Disposer
 import com.intellij.ui.JBColor
 import com.intellij.util.Alarm
 import com.intellij.util.ui.UIUtil
@@ -65,15 +66,17 @@ class ApplicationUISettingsChangeNotifier : Disposable{
         }
     }
 
-
-    fun addSettingsChangeListener(listener: SettingsChangeListener){
-        listeners.add(listener)
-    }
-
     fun removeSettingsChangeListener(listener: SettingsChangeListener){
         listeners.remove(listener)
     }
 
+    fun addSettingsChangeListener(listener: SettingsChangeListener, parentDisposable: Disposable) {
+        listeners.add(listener)
+        Disposer.register(parentDisposable) {
+            removeSettingsChangeListener(listener)
+        }
+    }
+
     override fun dispose() {
         listeners.clear()
     }

src/main/java/org/digma/intellij/plugin/dashboard/DashboardFileEditor.java

@@ -9,11 +9,14 @@
 import org.cef.browser.*;
 import org.cef.handler.CefLifeSpanHandlerAdapter;
 import org.digma.intellij.plugin.ui.jcef.JBCefBrowserBuilderCreator;
+import org.digma.intellij.plugin.ui.settings.*;
 import org.jetbrains.annotations.*;
 
 import javax.swing.*;
 import java.beans.PropertyChangeListener;
 
+import static org.digma.intellij.plugin.ui.jcef.JCefMessagesUtilsKt.*;
+
 public class DashboardFileEditor extends UserDataHolderBase implements FileEditor {
 
     static final String RESOURCE_FOLDER_NAME = "/webview/dashboard";
@@ -35,6 +38,24 @@ public DashboardFileEditor(Project project, VirtualFile file) {
         cefMessageRouter.addHandler(new DashboardMessageRouterHandler(project), true);
         jbCefClient.getCefClient().addMessageRouter(cefMessageRouter);
 
+
+        ApplicationUISettingsChangeNotifier.getInstance(project).addSettingsChangeListener(new SettingsChangeListener() {
+            @Override
+            public void systemFontChange(@NotNull String fontName) {
+                sendRequestToChangeFont(fontName, jbCefBrowser);
+            }
+
+            @Override
+            public void systemThemeChange(@NotNull Theme theme) {
+                sendRequestToChangeUiTheme(theme, jbCefBrowser);
+            }
+
+            @Override
+            public void editorFontChange(@NotNull String fontName) {
+                sendRequestToChangeCodeFont(fontName, jbCefBrowser);
+            }
+        }, this);
+
         var lifeSpanHandler = new CefLifeSpanHandlerAdapter() {
             @Override
             public void onAfterCreated(CefBrowser browser) {

src/main/java/org/digma/intellij/plugin/troubleshooting/TroubleshootingService.java

@@ -76,7 +76,7 @@ public void systemThemeChange(@NotNull Theme theme) {
                 public void editorFontChange(@NotNull String fontName) {
                     messageHandler.sendRequestToChangeCodeFont(fontName);
                 }
-            });
+            }, this);
 
             return jbCefBrowser.getComponent();
 

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

@@ -221,6 +221,10 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
                         changeScope(requestJsonNode)
                     }
 
+                    JCEFGlobalConstants.GLOBAL_GET_ENVIRONMENTS -> {
+                        sendEnvironmentsList(browser, getAllEnvironments(project))
+                    }
+
                     JCEFGlobalConstants.GLOBAL_REGISTER -> {
                         val payload = getPayloadFromRequest(requestJsonNode)
                         payload?.let {

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

@@ -25,6 +25,7 @@ object JCEFGlobalConstants {
     const val INSTALLATION_WIZARD_SET_STOP_DIGMA_ENGINE_RESULT: String = "INSTALLATION_WIZARD/SET_STOP_DIGMA_ENGINE_RESULT"
     const val GLOBAL_SET_ENVIRONMENT: String = "GLOBAL/SET_ENVIRONMENT"
     const val GLOBAL_SET_ENVIRONMENTS: String = "GLOBAL/SET_ENVIRONMENTS"
+    const val GLOBAL_GET_ENVIRONMENTS: String = "GLOBAL/GET_ENVIRONMENTS"
     const val GLOBAL_SET_IS_DIGMA_ENGINE_INSTALLED: String = "GLOBAL/SET_IS_DIGMA_ENGINE_INSTALLED"
     const val GLOBAL_SET_IS_DIGMA_ENGINE_RUNNING: String = "GLOBAL/SET_IS_DIGMA_ENGINE_RUNNING"
     const val GLOBAL_SET_IS_DOCKER_INSTALLED: String = "GLOBAL/SET_IS_DOCKER_INSTALLED"

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

@@ -65,9 +65,6 @@ private constructor(
 
     private val logger: Logger = Logger.getInstance(JCefComponent::class.java)
 
-    private val settingsChangeListener: SettingsChangeListener
-
-
     init {
         val connectionEventAlarm = Alarm(Alarm.ThreadToUse.POOLED_THREAD, parentDisposable)
 
@@ -130,8 +127,7 @@ private constructor(
             .subscribe(DigmathonActivationEvent.DIGMATHON_ACTIVATION_TOPIC,
                 DigmathonActivationEvent { isActive -> sendDigmathonState(isActive, jbCefBrowser.cefBrowser) })
 
-
-        settingsChangeListener = object : SettingsChangeListener {
+        ApplicationUISettingsChangeNotifier.getInstance(project).addSettingsChangeListener(object : SettingsChangeListener {
             override fun systemFontChange(fontName: String) {
                 sendRequestToChangeFont(fontName, jbCefBrowser)
             }
@@ -143,9 +139,7 @@ private constructor(
             override fun editorFontChange(fontName: String) {
                 sendRequestToChangeCodeFont(fontName, jbCefBrowser)
             }
-        }
-
-        ApplicationUISettingsChangeNotifier.getInstance(project).addSettingsChangeListener(settingsChangeListener)
+        }, this)
 
         AuthManager.getInstance().addAuthInfoChangeListener({ authInfo ->
             try {
@@ -358,7 +352,6 @@ private constructor(
         try {
             jbCefBrowser.jbCefClient.dispose()
             jbCefBrowser.dispose()
-            ApplicationUISettingsChangeNotifier.getInstance(project).removeSettingsChangeListener(settingsChangeListener)
         } catch (e: Exception) {
             ErrorReporter.getInstance().reportError(project, "JCefComponent.dispose", e)
         }

src/main/kotlin/org/digma/intellij/plugin/ui/wizard/InstallationWizardSidePanelWindowPanel.kt

@@ -521,7 +521,7 @@ fun createInstallationWizardSidePanelWindowPanel(project: Project, wizardSkipIns
     jcefDigmaPanel.add(browserPanel, BorderLayout.CENTER)
 
 
-    val settingsChangeListener = object : SettingsChangeListener {
+    ApplicationUISettingsChangeNotifier.getInstance(project).addSettingsChangeListener(object : SettingsChangeListener {
         override fun systemFontChange(fontName: String) {
             sendRequestToChangeFont(fontName, jbCefBrowser)
         }
@@ -533,14 +533,7 @@ fun createInstallationWizardSidePanelWindowPanel(project: Project, wizardSkipIns
         override fun editorFontChange(fontName: String) {
             sendRequestToChangeCodeFont(fontName, jbCefBrowser)
         }
-    }
-    ApplicationUISettingsChangeNotifier.getInstance(project).addSettingsChangeListener(settingsChangeListener)
-    Disposer.register(jbCefBrowser) {
-        ApplicationUISettingsChangeNotifier.getInstance(project).removeSettingsChangeListener(settingsChangeListener)
-    }
-
-
-
+    }, jbCefBrowser)
 
     project.messageBus.connect(jbCefBrowser)
         .subscribe(AnalyticsServiceConnectionEvent.ANALYTICS_SERVICE_CONNECTION_EVENT_TOPIC, object : AnalyticsServiceConnectionEvent {