Navigation schema change - environment selection #324

Author: MykolaYaremchuk

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [2.0.39] - 2023-03-17
+### Changed
+- Added Pycharm support
+- bugfix/link on span modifies the active env (#387)
+- Navigation schema change - environment selection #324
+
 ## [2.0.38] - 2023-03-08
 ### Changed
 - Repaint UI only when insights list was changed
@@ -45,4 +51,5 @@ All notable changes to this project will be documented in this file.
 [2.0.36]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.35...v2.0.36
 [2.0.37]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.36...v2.0.37
 [2.0.38]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.37...v2.0.38
-[Unreleased]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.38...HEAD
+[2.0.39]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.38...v2.0.39
+[Unreleased]: https://github.com/digma-ai/digma-intellij-plugin/compare/v2.0.39...HEAD

build.gradle.kts

@@ -50,7 +50,6 @@ changelog {
     version.set(project.semanticVersion.version.get().toString())
     path.set("${project.projectDir}/CHANGELOG.md")
     groups.set(listOf("Added", "Changed", "Deprecated", "Removed", "Fixed", "Security"))
-//    groups.set(emptyList())
     header.set(provider { "[${version.get()}] - ${date()}" })
     keepUnreleasedSection.set(false)
 }

ide-common/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsService.java

@@ -8,6 +8,7 @@
 import org.apache.commons.lang3.time.StopWatch;
 import org.digma.intellij.plugin.common.Backgroundable;
 import org.digma.intellij.plugin.common.CommonUtils;
+import org.digma.intellij.plugin.common.usageStatusChange.UsageStatusChangeListener;
 import org.digma.intellij.plugin.log.Log;
 import org.digma.intellij.plugin.model.InsightType;
 import org.digma.intellij.plugin.model.rest.debugger.DebuggerEventRequest;
@@ -199,7 +200,18 @@ public CodeObjectErrorDetails getErrorDetails(String errorUid) throws AnalyticsS
     }
 
     public UsageStatusResult getUsageStatus(List<String> objectIds) throws AnalyticsServiceException {
-        return executeCatching(() -> analyticsProviderProxy.getUsageStatus(new UsageStatusRequest(objectIds)));
+        UsageStatusResult usageStatusResult = executeCatching(() -> analyticsProviderProxy.getUsageStatus(new UsageStatusRequest(objectIds)));
+        notifyUsageStatusChanged(usageStatusResult);
+        return usageStatusResult;
+    }
+
+    private void notifyUsageStatusChanged(UsageStatusResult newUsageStatusResult) {
+        Log.log(LOGGER::debug, "Firing UsageStatusChange event for {}", newUsageStatusResult);
+        if (project.isDisposed()) {
+            return;
+        }
+        UsageStatusChangeListener publisher = project.getMessageBus().syncPublisher(UsageStatusChangeListener.USAGE_STATUS_CHANGED_TOPIC);
+        publisher.usageStatusChanged(newUsageStatusResult);
     }
 
     public RecentActivityResult getRecentActivity(List<String> environments) throws AnalyticsServiceException {

ide-common/src/main/java/org/digma/intellij/plugin/common/modelChangeListener/ModelChangeHandler.java

@@ -0,0 +1,11 @@
+package org.digma.intellij.plugin.common.modelChangeListener;
+
+import org.digma.intellij.plugin.ui.model.PanelModel;
+
+public class ModelChangeHandler implements ModelChangeListener {
+
+    @Override
+    public void modelChanged(PanelModel newModel) {
+        //nothing to do here
+    }
+}

ide-common/src/main/java/org/digma/intellij/plugin/common/modelChangeListener/ModelChangeListener.java

@@ -0,0 +1,13 @@
+package org.digma.intellij.plugin.common.modelChangeListener;
+
+import com.intellij.util.messages.Topic;
+import org.digma.intellij.plugin.ui.model.PanelModel;
+
+public interface ModelChangeListener {
+
+    @Topic.ProjectLevel
+    Topic<ModelChangeListener> MODEL_CHANGED_TOPIC = Topic.create("MODEL_CHANGED_TOPIC", ModelChangeListener.class);
+
+    void modelChanged(PanelModel newModel);
+
+}

ide-common/src/main/java/org/digma/intellij/plugin/common/usageStatusChange/UsageStatusChangeHandler.java

@@ -0,0 +1,10 @@
+package org.digma.intellij.plugin.common.usageStatusChange;
+
+import org.digma.intellij.plugin.model.rest.usage.UsageStatusResult;
+
+public class UsageStatusChangeHandler implements UsageStatusChangeListener {
+    @Override
+    public void usageStatusChanged(UsageStatusResult newUsageStatusResult) {
+        //nothing to do here
+    }
+}

ide-common/src/main/java/org/digma/intellij/plugin/common/usageStatusChange/UsageStatusChangeListener.java

@@ -0,0 +1,13 @@
+package org.digma.intellij.plugin.common.usageStatusChange;
+
+import com.intellij.util.messages.Topic;
+import org.digma.intellij.plugin.model.rest.usage.UsageStatusResult;
+
+public interface UsageStatusChangeListener {
+
+    @Topic.ProjectLevel
+    Topic<UsageStatusChangeListener> USAGE_STATUS_CHANGED_TOPIC = Topic.create("USAGE_STATUS_CHANGED_TOPIC", UsageStatusChangeListener.class);
+
+    void usageStatusChanged(UsageStatusResult newUsageStatusResult);
+
+}

ide-common/src/main/kotlin/org/digma/intellij/plugin/ui/service/InsightsViewService.kt

@@ -3,6 +3,7 @@ package org.digma.intellij.plugin.ui.service
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.Project
 import org.digma.intellij.plugin.common.Backgroundable
+import org.digma.intellij.plugin.common.modelChangeListener.ModelChangeListener
 import org.digma.intellij.plugin.document.DocumentInfoContainer
 import org.digma.intellij.plugin.insights.InsightsProvider
 import org.digma.intellij.plugin.log.Log
@@ -59,7 +60,7 @@ class InsightsViewService(project: Project) : AbstractViewService(project) {
             model.insightsCount = insightsListContainer.count
             model.card = InsightsTabCard.INSIGHTS
 
-            updateUi()
+            notifyModelChangedAndUpdateUi()
         } finally {
             if (lock.isHeldByCurrentThread) {
                 lock.unlock()
@@ -80,7 +81,7 @@ class InsightsViewService(project: Project) : AbstractViewService(project) {
         model.insightsCount = 0
         model.card = InsightsTabCard.INSIGHTS
 
-        updateUi()
+        notifyModelChangedAndUpdateUi()
     }
 
 
@@ -95,7 +96,7 @@ class InsightsViewService(project: Project) : AbstractViewService(project) {
         model.insightsCount = 0
         model.card = InsightsTabCard.INSIGHTS
 
-        updateUi()
+        notifyModelChangedAndUpdateUi()
     }
 
     fun emptyNonSupportedFile(fileUri: String) {
@@ -109,7 +110,7 @@ class InsightsViewService(project: Project) : AbstractViewService(project) {
         model.insightsCount = 0
         model.card = InsightsTabCard.INSIGHTS
 
-        updateUi()
+        notifyModelChangedAndUpdateUi()
     }
 
     fun showDocumentPreviewList(
@@ -133,7 +134,8 @@ class InsightsViewService(project: Project) : AbstractViewService(project) {
 
         model.listViewItems = ArrayList()
         model.card = InsightsTabCard.PREVIEW
-        updateUi()
+
+        notifyModelChangedAndUpdateUi()
     }
 
 
@@ -172,4 +174,18 @@ class InsightsViewService(project: Project) : AbstractViewService(project) {
         }
     }
 
+    private fun notifyModelChanged() {
+        Log.log(logger::debug, "Firing ModelChange event for {}", model)
+        if (project.isDisposed) {
+            return
+        }
+        val publisher = project.messageBus.syncPublisher(ModelChangeListener.MODEL_CHANGED_TOPIC)
+        publisher.modelChanged(model)
+    }
+
+    private fun notifyModelChangedAndUpdateUi() {
+        notifyModelChanged()
+        updateUi()
+    }
+
 }

ide-common/src/main/kotlin/org/digma/intellij/plugin/ui/service/ToolWindowTabsHelper.kt

@@ -15,9 +15,9 @@ class ToolWindowTabsHelper(val project: Project) {
     private var errorDetailsOn = false
 
     companion object {
-        const val INSIGHTS_TAB_NAME = "insights"
-        const val ERRORS_TAB_NAME = "errors"
-        const val SUMMARY_TAB_NAME = "summary"
+        const val INSIGHTS_TAB_NAME = "Insights"
+        const val ERRORS_TAB_NAME = "Errors"
+        const val SUMMARY_TAB_NAME = "Summary"
 
         @JvmStatic
         fun getInstance(project: Project):ToolWindowTabsHelper{

…ugin/toolwindow/CustomResourceHandler.kt …/recentactivity/CustomResourceHandler.ktsrc/main/java/org/digma/intellij/plugin/toolwindow/CustomResourceHandler.kt renamed to src/main/java/org/digma/intellij/plugin/toolwindow/recentactivity/CustomResourceHandler.kt src/main/java/org/digma/intellij/plugin/toolwindow/CustomResourceHandler.kt renamed to src/main/java/org/digma/intellij/plugin/toolwindow/recentactivity/CustomResourceHandler.kt

@@ -1,4 +1,4 @@
-package org.digma.intellij.plugin.toolwindow
+package org.digma.intellij.plugin.toolwindow.recentactivity
 
 import freemarker.template.Configuration
 import org.cef.callback.CefCallback