Skip to content

Commit 9093555

Browse files
committed
Fixed get envs
Fixed dynamic them change
1 parent 7b07f43 commit 9093555

File tree

4 files changed

+36
-5
lines changed

4 files changed

+36
-5
lines changed

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@
99
import org.cef.browser.*;
1010
import org.cef.handler.CefLifeSpanHandlerAdapter;
1111
import org.digma.intellij.plugin.ui.jcef.JBCefBrowserBuilderCreator;
12+
import org.digma.intellij.plugin.ui.settings.*;
1213
import org.jetbrains.annotations.*;
1314

1415
import javax.swing.*;
1516
import java.beans.PropertyChangeListener;
1617

18+
import static org.digma.intellij.plugin.ui.jcef.JCefMessagesUtilsKt.*;
19+
1720
public class DashboardFileEditor extends UserDataHolderBase implements FileEditor {
1821

1922
static final String RESOURCE_FOLDER_NAME = "/webview/dashboard";
@@ -23,6 +26,8 @@ public class DashboardFileEditor extends UserDataHolderBase implements FileEdito
2326
private final VirtualFile file;
2427
private final JBCefBrowser jbCefBrowser;
2528
private final CefMessageRouter cefMessageRouter;
29+
private final SettingsChangeListener listener;
30+
private final ApplicationUISettingsChangeNotifier uiSettingsChangeNotifier;
2631

2732
public DashboardFileEditor(Project project, VirtualFile file) {
2833
this.file = file;
@@ -35,6 +40,26 @@ public DashboardFileEditor(Project project, VirtualFile file) {
3540
cefMessageRouter.addHandler(new DashboardMessageRouterHandler(project), true);
3641
jbCefClient.getCefClient().addMessageRouter(cefMessageRouter);
3742

43+
listener = new SettingsChangeListener() {
44+
@Override
45+
public void systemFontChange(@NotNull String fontName) {
46+
sendRequestToChangeFont(fontName, jbCefBrowser);
47+
}
48+
49+
@Override
50+
public void systemThemeChange(@NotNull Theme theme) {
51+
sendRequestToChangeUiTheme(theme, jbCefBrowser);
52+
}
53+
54+
@Override
55+
public void editorFontChange(@NotNull String fontName) {
56+
sendRequestToChangeCodeFont(fontName, jbCefBrowser);
57+
}
58+
};
59+
60+
uiSettingsChangeNotifier = ApplicationUISettingsChangeNotifier.getInstance(project);
61+
uiSettingsChangeNotifier.addSettingsChangeListener(listener);
62+
3863
var lifeSpanHandler = new CefLifeSpanHandlerAdapter() {
3964
@Override
4065
public void onAfterCreated(CefBrowser browser) {
@@ -101,6 +126,7 @@ public void removePropertyChangeListener(@NotNull PropertyChangeListener listene
101126
public void dispose() {
102127
jbCefBrowser.dispose();
103128
cefMessageRouter.dispose();
129+
uiSettingsChangeNotifier.removeSettingsChangeListener(listener);
104130
}
105131

106132
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,10 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
221221
changeScope(requestJsonNode)
222222
}
223223

224+
JCEFGlobalConstants.GLOBAL_GET_ENVIRONMENTS -> {
225+
sendEnvironmentsList(browser, getAllEnvironments(project))
226+
}
227+
224228
JCEFGlobalConstants.GLOBAL_REGISTER -> {
225229
val payload = getPayloadFromRequest(requestJsonNode)
226230
payload?.let {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ object JCEFGlobalConstants {
2525
const val INSTALLATION_WIZARD_SET_STOP_DIGMA_ENGINE_RESULT: String = "INSTALLATION_WIZARD/SET_STOP_DIGMA_ENGINE_RESULT"
2626
const val GLOBAL_SET_ENVIRONMENT: String = "GLOBAL/SET_ENVIRONMENT"
2727
const val GLOBAL_SET_ENVIRONMENTS: String = "GLOBAL/SET_ENVIRONMENTS"
28+
const val GLOBAL_GET_ENVIRONMENTS: String = "GLOBAL/GET_ENVIRONMENTS"
2829
const val GLOBAL_SET_IS_DIGMA_ENGINE_INSTALLED: String = "GLOBAL/SET_IS_DIGMA_ENGINE_INSTALLED"
2930
const val GLOBAL_SET_IS_DIGMA_ENGINE_RUNNING: String = "GLOBAL/SET_IS_DIGMA_ENGINE_RUNNING"
3031
const val GLOBAL_SET_IS_DOCKER_INSTALLED: String = "GLOBAL/SET_IS_DOCKER_INSTALLED"

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

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

0 commit comments

Comments
 (0)