Merge pull request #2133 from digma-ai/fix/dashboards

Fix dashboards

Author: opoliarush

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

@@ -15,7 +15,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 
-import static org.digma.intellij.plugin.analytics.EnvUtilsKt.getCurrentEnvironmentName;
+import static org.digma.intellij.plugin.analytics.EnvUtilsKt.getCurrentEnvironmentId;
 
 public class DashboardIndexTemplateBuilder {
     private final Logger logger = Logger.getInstance(DashboardIndexTemplateBuilder.class);
@@ -61,7 +61,7 @@ public InputStream build(Project project, DashboardVirtualFile dashboardVirtualF
             data.put(DIGMA_API_URL, SettingsState.getInstance().apiUrl);
 
             data.put(DASHBOARD_REFRESH_INTERVAL, 10*1000);
-            data.put(DASHBOARD_ENVIRONMENT, getCurrentEnvironmentName(project));
+            data.put(DASHBOARD_ENVIRONMENT, getCurrentEnvironmentId(project));
 
             Template template = freemarketConfiguration.getTemplate(INDEX_TEMPLATE_NAME);
             StringWriter stringWriter = new StringWriter();

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

@@ -63,7 +63,7 @@ private boolean showExisting(@NotNull String dashboardName) {
             var file = editor.getFile();
             if (file != null && DashboardVirtualFile.isDashboardVirtualFile(file)) {
                 DashboardVirtualFile openFile = (DashboardVirtualFile) file;
-                if (Objects.equals(openFile.getDashboardEnvId(), dashboardName)) {
+                if (Objects.equals(openFile.getDashboardName(), dashboardName)) {
                     EDT.ensureEDT(() -> FileEditorManager.getInstance(project).openFile(file, true, true));
                     return true;
                 }

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

@@ -10,7 +10,7 @@
 public class DashboardVirtualFile extends LightVirtualFile implements DigmaVirtualFileMarker {
 
     public static final Key<String> DASHBOARD_EDITOR_KEY = Key.create("Digma.DASHBOARD_EDITOR_KEY");
-    private String dashboardEnvId;
+    private String dashboardName;
     public DashboardVirtualFile(String myTitle) {
         super(myTitle);
         setFileType(DashboardFileType.INSTANCE);
@@ -25,16 +25,16 @@ public static boolean isDashboardVirtualFile(@NotNull VirtualFile file) {
     @NotNull
     public static VirtualFile createVirtualFile(@NotNull String dashboardName) {
         var file = new DashboardVirtualFile(dashboardName);
-        file.setDashboardEnvId(dashboardName);
+        file.setDashboardName(dashboardName);
         DASHBOARD_EDITOR_KEY.set(file, DashboardFileEditorProvider.DASHBOARD_EDITOR_TYPE);
         return file;
     }
 
-    public void setDashboardEnvId(String documentationPage) {
-        this.dashboardEnvId = documentationPage;
+    public void setDashboardName(String documentationPage) {
+        this.dashboardName = documentationPage;
     }
 
-    public String getDashboardEnvId() {
-        return dashboardEnvId;
+    public String getDashboardName() {
+        return dashboardName;
     }
 }

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

@@ -14,7 +14,7 @@ import org.cef.handler.CefMessageRouterHandlerAdapter
 import org.digma.intellij.plugin.analytics.AnalyticsService
 import org.digma.intellij.plugin.analytics.InsightStatsChangedEvent
 import org.digma.intellij.plugin.analytics.getAllEnvironments
-import org.digma.intellij.plugin.analytics.getEnvironmentNameById
+import org.digma.intellij.plugin.analytics.getEnvironmentById
 import org.digma.intellij.plugin.analytics.setCurrentEnvironmentById
 import org.digma.intellij.plugin.auth.AuthManager
 import org.digma.intellij.plugin.auth.LoginResult
@@ -166,8 +166,9 @@ abstract class BaseMessageRouterHandler(protected val project: Project) : Common
                     JCEFGlobalConstants.GLOBAL_OPEN_DASHBOARD -> {
                         val envId = getEnvironmentIdFromPayload(requestJsonNode)
                         envId?.let { env ->
-                            val envName = getEnvironmentNameById(project, env)
-                            DashboardService.getInstance(project).openDashboard("Dashboard Panel - $envName")
+                            getEnvironmentById(project, env)?.let {
+                                DashboardService.getInstance(project).openDashboard("Dashboard Panel - ${it.name} - ${it.type}")
+                            }
                         }
                     }