From 6cb4359d139621817157a3a970673ef6f3c8012c Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Fri, 15 Feb 2019 12:52:09 -0500
Subject: [PATCH] Fix issue where entity issues UI could show stale issues

---
 css/80_app.css              |  6 ++++--
 modules/ui/entity_issues.js | 10 ++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/css/80_app.css b/css/80_app.css
index 40fd881ef..71291baa4 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -3041,7 +3041,8 @@ div.full-screen > button:hover {
     color: #ff9205;
     fill: #ff9205;
 }
-.issue.severity-warning .issue-fix-item.actionable:hover {
+.issue.severity-warning .issue-fix-item.actionable:hover,
+.issue.severity-warning .issue-fix-item.actionable button:focus {
     color: #f07504;
     fill: #f07504;
 }
@@ -3060,7 +3061,8 @@ div.full-screen > button:hover {
     color: #DD1400;
     fill: #DD1400;
 }
-.issue.severity-error .issue-fix-item.actionable:hover {
+.issue.severity-error .issue-fix-item.actionable:hover,
+.issue.severity-error .issue-fix-item.actionable button:focus {
     color: #ab0f00;
     fill: #ab0f00;
 }
diff --git a/modules/ui/entity_issues.js b/modules/ui/entity_issues.js
index 06534c0a5..83e5c5fa5 100644
--- a/modules/ui/entity_issues.js
+++ b/modules/ui/entity_issues.js
@@ -13,13 +13,15 @@ export function uiEntityIssues(context) {
     var _expanded = 0;
     var _entityID;
 
-
+    // Listen for validation reload even though the entity editor is reloaded on
+    // every graph change since the graph change event may happen before the issue
+    // cache is refreshed
     context.validator().on('reload.entity_issues', function() {
 
-        update();
-
-         _selection.selectAll('.entity-issues')
+         _selection.selectAll('.disclosure-wrap-entity_issues')
              .call(render);
+
+        update();
     });