Refresh all insights and errors button

MykolaYaremchuk · MykolaYaremchuk · commit 7c3436898a20 · 2022-12-07T10:03:20.000+02:00
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/ui/service/ErrorsViewService.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/ui/service/ErrorsViewService.kt
@@ -2,6 +2,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.document.DocumentInfoContainer
 import org.digma.intellij.plugin.errors.ErrorsProvider
 import org.digma.intellij.plugin.log.Log
@@ -15,10 +16,13 @@ import org.digma.intellij.plugin.ui.model.errors.ErrorDetailsModel
 import org.digma.intellij.plugin.ui.model.errors.ErrorsModel
 import org.digma.intellij.plugin.ui.model.errors.ErrorsTabCard
 import java.util.Collections
+import java.util.concurrent.locks.Lock
+import java.util.concurrent.locks.ReentrantLock
 
 class ErrorsViewService(project: Project) : AbstractViewService(project) {
 
     private val logger: Logger = Logger.getInstance(ErrorsViewService::class.java)
+    private val lock: Lock = ReentrantLock()
 
     //the model is single per the life of an open project in intellij. it shouldn't be created
     //elsewhere in the program. it can not be singleton.
@@ -40,17 +44,24 @@ class ErrorsViewService(project: Project) : AbstractViewService(project) {
     fun contextChanged(
         methodInfo: MethodInfo
     ) {
-
-        Log.log(logger::debug, "contextChanged to {}. ", methodInfo)
-
-        val errorsListContainer = errorsProvider.getErrors(methodInfo)
-        model.listViewItems = errorsListContainer.listViewItems
-        model.usageStatusResult = errorsListContainer.usageStatus
-        model.scope = MethodScope(methodInfo)
-        model.card = ErrorsTabCard.ERRORS_LIST
-        model.errorsCount = errorsListContainer.count
-
-        updateUi()
+        try {
+            Log.log(logger::debug, "contextChanged to {}. ", methodInfo)
+
+            lock.tryLock()
+            Log.log(logger::debug, "TryLock acquired for contextChanged to {}. ", methodInfo)
+
+            val errorsListContainer = errorsProvider.getErrors(methodInfo)
+            model.listViewItems = errorsListContainer.listViewItems
+            model.usageStatusResult = errorsListContainer.usageStatus
+            model.scope = MethodScope(methodInfo)
+            model.card = ErrorsTabCard.ERRORS_LIST
+            model.errorsCount = errorsListContainer.count
+
+            updateUi()
+        } finally {
+            lock.unlock()
+            Log.log(logger::debug, "TryLock released for contextChanged to {}. ", methodInfo)
+        }
     }
 
 
@@ -158,5 +169,13 @@ class ErrorsViewService(project: Project) : AbstractViewService(project) {
         return emptyErrorDetails
     }
 
+    fun refreshErrors() {
+        val scope = model.scope
+        if (scope is MethodScope) {
+            Backgroundable.ensureBackground(project, "Refresh errors list") {
+                contextChanged(scope.getMethodInfo())
+            }
+        }
+    }
 
 }
diff --git a/ide-common/src/main/kotlin/org/digma/intellij/plugin/ui/service/InsightsViewService.kt b/ide-common/src/main/kotlin/org/digma/intellij/plugin/ui/service/InsightsViewService.kt
@@ -51,7 +51,7 @@ class InsightsViewService(project: Project) : AbstractViewService(project) {
             Log.log(logger::debug, "contextChanged to {}. ", methodInfo)
 
             lock.tryLock()
-            Log.log(logger::debug, "Try lock acquired for contextChanged to {}. ", methodInfo)
+            Log.log(logger::debug, "TryLock acquired for contextChanged to {}. ", methodInfo)
 
             val insightsListContainer: InsightsListContainer = insightsProvider.getInsights(methodInfo)
 
@@ -65,7 +65,7 @@ class InsightsViewService(project: Project) : AbstractViewService(project) {
             updateUi()
         } finally {
             lock.unlock()
-            Log.log(logger::debug, "Try lock released for contextChanged to {}. ", methodInfo)
+            Log.log(logger::debug, "TryLock released for contextChanged to {}. ", methodInfo)
         }
     }
 
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/common/ErrorsCommon.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/common/ErrorsCommon.kt
@@ -11,7 +11,7 @@ import javax.swing.border.LineBorder
 
 fun createScorePanelNoArrows(model: CodeObjectError): JPanel {
 
-    val scorePanelSize = Laf.scalePanels(Laf.Sizes.ERROR_SCORE_PANEL_SIZE)
+    val scorePanelSize = Laf.scalePanels(Laf.Sizes.PANEL_SIZE_32)
     val scoreLabel = JLabel("${model.scoreInfo.score}", JLabel.CENTER)
     scoreLabel.toolTipText = genToolTipAsHtml(model.scoreInfo)
     scoreLabel.preferredSize = Dimension(scorePanelSize,scorePanelSize)
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/common/Laf.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/common/Laf.kt
@@ -4,7 +4,7 @@ import com.intellij.icons.AllIcons
 import com.intellij.ui.JBColor
 import com.intellij.util.ui.JBUI
 import org.digma.intellij.plugin.icons.IconsUtil
-import org.digma.intellij.plugin.ui.common.Laf.Sizes.Companion.INSIGHT_ICON_SIZE
+import org.digma.intellij.plugin.ui.common.Laf.Sizes.Companion.INSIGHT_ICON_SIZE_32
 import org.digma.intellij.plugin.ui.list.insights.ThreeDotsIcon
 import java.awt.Color
 import java.awt.Font
@@ -98,6 +98,7 @@ object Laf  {
                 @JvmStatic val WAITING_DATA = SvgIcon.asIs("/icons/sand-watch.svg")
                 @JvmStatic val SLOW = SvgIcon.asIs("/icons/snail.svg")
                 @JvmStatic val THREE_DOTS = ThreeDotsIcon.asIs("/icons/three-dots.svg")
+                @JvmStatic val REFRESH = ThreeDotsIcon.asIs("/icons/repeat.svg")
 
                 @JvmStatic val QUESTION_MARK = AllIcons.General.QuestionDialog
                 @JvmStatic val SPAN_DURATION_DROPPED = loadAndScaleIconByWidth("/icons/dropped.png", 8)
@@ -110,7 +111,7 @@ object Laf  {
             }
 
             private fun loadAndScaleInsightIconByWidth(path: String): Icon {
-                val size = scaleIcons(INSIGHT_ICON_SIZE)
+                val size = scaleIcons(INSIGHT_ICON_SIZE_32)
                 return IconsUtil.loadAndScaleIconObjectByWidth(path, size)
             }
 
@@ -123,10 +124,11 @@ object Laf  {
     class Sizes{
         companion object {
             @JvmStatic
-            val INSIGHT_ICON_SIZE: Int = 32
-            const val ERROR_SCORE_PANEL_SIZE = 32
-            const val ERROR_DETAILS_BACK_BUTTON_SIZE = 32
-            const val ERROR_DETAILS_NAVIGATION_BUTTON_SIZE = 24
+            val INSIGHT_ICON_SIZE_32: Int = 32
+            const val PANEL_SIZE_32 = 32
+            const val BUTTON_SIZE_32 = 32
+            const val BUTTON_SIZE_24 = 24
+            const val BUTTON_SIZE_26 = 26
         }
     }
 
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/common/Panels.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/common/Panels.kt
@@ -10,15 +10,23 @@ import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.dsl.gridLayout.HorizontalAlign
 import com.intellij.util.ui.JBUI
 import org.digma.intellij.plugin.analytics.AnalyticsService
+import org.digma.intellij.plugin.ui.errors.IconButton
 import org.digma.intellij.plugin.ui.model.NOT_SUPPORTED_OBJECT_MSG
 import org.digma.intellij.plugin.ui.model.PanelModel
 import org.digma.intellij.plugin.ui.model.insights.InsightsModel
 import org.digma.intellij.plugin.ui.panels.DigmaResettablePanel
 import org.digma.intellij.plugin.ui.panels.DigmaTabPanel
+import org.digma.intellij.plugin.ui.service.ErrorsViewService
+import org.digma.intellij.plugin.ui.service.InsightsViewService
 import java.awt.BorderLayout
-import javax.swing.JLabel
+import java.awt.Dimension
+import java.awt.event.MouseAdapter
+import java.awt.event.MouseEvent
+import javax.swing.*
 
 
+private const val REFRESH_ALL_INSIGHTS_AND_ERRORS = "Refresh"
+
 fun noCodeObjectWarningPanel(model: PanelModel): DialogPanel {
 
     return panel {
@@ -77,9 +85,9 @@ fun createTopPanel(project: Project, model: PanelModel): DigmaResettablePanel {
     }
 
     result.isOpaque = false
-    result.border = JBUI.Borders.empty(0, 10, 0, 10)
+    result.border = JBUI.Borders.empty(0, 10)
     result.layout = BorderLayout()
-    result.add(scopeLine, BorderLayout.NORTH)
+    result.add(getScopeLineResultPanel(scopeLine, project), BorderLayout.NORTH)
     result.add(envsPanel, BorderLayout.CENTER)
     return result
 }
@@ -88,3 +96,32 @@ fun createTopPanel(project: Project, model: PanelModel): DigmaResettablePanel {
 fun wrapWithNoConnectionWrapper(project: Project, panel: DigmaTabPanel): DigmaTabPanel {
     return NoConnectionWrapper(project, panel)
 }
+
+private fun getGeneralRefreshButton(project: Project): JButton {
+    val insightsActionListener: InsightsViewService = project.getService(InsightsViewService::class.java)
+    val errorsActionListener: ErrorsViewService = project.getService(ErrorsViewService::class.java)
+
+    val size = Laf.scalePanels(Laf.Sizes.BUTTON_SIZE_26)
+    val buttonsSize = Dimension(size, size)
+    val generalRefreshIconButton = IconButton(Laf.Icons.Insight.REFRESH)
+    generalRefreshIconButton.preferredSize = buttonsSize
+    generalRefreshIconButton.maximumSize = buttonsSize
+    generalRefreshIconButton.toolTipText = asHtml(REFRESH_ALL_INSIGHTS_AND_ERRORS)
+
+    generalRefreshIconButton.addMouseListener(object : MouseAdapter() {
+        override fun mouseClicked(e: MouseEvent?) {
+            insightsActionListener.refreshInsights()
+            errorsActionListener.refreshErrors()
+        }
+    })
+    return generalRefreshIconButton
+}
+
+private fun getScopeLineResultPanel(scopeLine: DialogPanel, project: Project): JPanel {
+    val scopeLineResultPanel = JPanel()
+    scopeLineResultPanel.layout = BoxLayout(scopeLineResultPanel, BoxLayout.LINE_AXIS)
+    scopeLineResultPanel.add(scopeLine)
+    scopeLineResultPanel.add(Box.createHorizontalGlue())
+    scopeLineResultPanel.add(getGeneralRefreshButton(project))
+    return scopeLineResultPanel
+}
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/common/ScopeLine.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/common/ScopeLine.kt
@@ -17,7 +17,7 @@ fun scopeLine(scopeNameProducer: Producer<String>,
               scopeIconProducer: Producer<Icon>): DialogPanel {
 
     return panel {
-        row(asHtml(spanGrayed("Scope: "))) {
+        row {
             icon(scopeIconProducer.produce()).bind(
                 JLabel::getIcon, JLabel::setIcon, MutableProperty(
                     getter = { scopeIconProducer.produce() },
diff --git a/src/main/kotlin/org/digma/intellij/plugin/ui/errors/ErrorDetailsPanel.kt b/src/main/kotlin/org/digma/intellij/plugin/ui/errors/ErrorDetailsPanel.kt
@@ -258,7 +258,7 @@ fun flowStackNavigation(errorsModel: ErrorsModel, framesList: ScrollablePanelLis
 
     val currentLabel = JLabel("0/00 Flow Stacks")
 
-    val size = Laf.scalePanels(Laf.Sizes.ERROR_DETAILS_NAVIGATION_BUTTON_SIZE)
+    val size = Laf.scalePanels(Laf.Sizes.BUTTON_SIZE_24)
     val buttonsSize = Dimension(size + 2, size + 2)
 
     val backButton = IconButton(Laf.Icons.ErrorDetails.BACK)
@@ -394,7 +394,7 @@ fun getAffectedServicesTooltip(errorsModel: ErrorsModel): String {
 
 private fun backButton(project: Project): JPanel {
 
-    val size = Laf.scalePanels(Laf.Sizes.ERROR_DETAILS_BACK_BUTTON_SIZE)
+    val size = Laf.scalePanels(Laf.Sizes.BUTTON_SIZE_32)
     val buttonsSize = Dimension(size + 2, size + 3)
 
     val backButton = IconButton(Laf.Icons.ErrorDetails.BACK)
diff --git a/src/main/resources/icons/repeat.svg b/src/main/resources/icons/repeat.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_456_17932)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.90506 0.280021C7.47833 -0.147156 9.14455 -0.0834895 10.6806 0.462495C12.2167 1.00848 13.5493 2.01072 14.5001 3.33502V1C15.5 1 15.5 1 16.0001 1V6.00002H11C11 5.5 11 5 11 4.50002H13.4771C12.6937 3.27451 11.522 2.34713 10.1493 1.86625C8.77665 1.38537 7.28235 1.37877 5.90548 1.84752C4.52861 2.31626 3.34874 3.23325 2.55461 4.4518C1.76049 5.67035 1.39801 7.12003 1.52516 8.56893C1.65231 10.0178 2.26174 11.3822 3.25595 12.4438C4.25017 13.5055 5.57172 14.2029 7.00918 14.4247C8.44665 14.6465 9.91696 14.3797 11.1849 13.6671C12.4528 12.9545 13.4451 11.8372 14.0031 10.494C15.3881 11.069 14 10.5 15.3881 11.069C14.8669 12.3236 14.0348 13.4247 12.9703 14.2687C11.9057 15.1126 10.6438 15.6716 9.30348 15.8929C7.96313 16.1142 6.58851 15.9906 5.30919 15.5336C4.02986 15.0766 2.88797 14.3014 1.99117 13.281C1.09436 12.2606 0.472175 11.0286 0.183259 9.70118C-0.105657 8.37377 -0.0517856 6.99464 0.339795 5.69381C0.731375 4.39298 1.44777 3.21329 2.42144 2.26595C3.39511 1.3186 4.59398 0.635808 5.90506 0.280021Z" fill="#DEDEDE"/>
+</g>
+<defs>
+<clipPath id="clip0_456_17932">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class InsightsViewService(project: Project) : AbstractViewService(project) {`
`51`	`51`	`Log.log(logger::debug, "contextChanged to {}. ", methodInfo)`
`52`	`52`
`53`	`53`	`lock.tryLock()`
`54`		`- Log.log(logger::debug, "Try lock acquired for contextChanged to {}. ", methodInfo)`
	`54`	`+ Log.log(logger::debug, "TryLock acquired for contextChanged to {}. ", methodInfo)`
`55`	`55`
`56`	`56`	`val insightsListContainer: InsightsListContainer = insightsProvider.getInsights(methodInfo)`
`57`	`57`
`@@ -65,7 +65,7 @@ class InsightsViewService(project: Project) : AbstractViewService(project) {`
`65`	`65`	`updateUi()`
`66`	`66`	`} finally {`
`67`	`67`	`lock.unlock()`
`68`		`- Log.log(logger::debug, "Try lock released for contextChanged to {}. ", methodInfo)`
	`68`	`+ Log.log(logger::debug, "TryLock released for contextChanged to {}. ", methodInfo)`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`