Merge pull request #322 from mitre-attack/fix/#204-technique-hover

Fix/#204 technique hover
mitre-attack · Jul 20, 2021 · 1985779 · 1985779
2 parents e401945 + 2420182
commit 1985779
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/nav-app/src/app/matrix/technique-cell/technique-cell.component.ts b/nav-app/src/app/matrix/technique-cell/technique-cell.component.ts
@@ -24,25 +24,25 @@ export class TechniqueCellComponent implements OnInit {
         if (this.showContextmenu) return false;
         if (this.viewModel.highlightedTechniques.size === 0) return false;
 
-        return (this.viewModel.highlightedTechniques.has(this.technique.id) && this.viewModel.highlightedTactic && this.viewModel.highlightedTactic.id == this.tactic.id);
+        return (this.viewModel.highlightedTechnique === this.technique && this.viewModel.highlightedTactic && this.viewModel.highlightedTactic.id === this.tactic.id);
     }
 
+
     public get isHighlighted(): boolean {
-        if (this.viewModel.selectTechniquesAcrossTactics) {
-            if (this.viewModel.selectSubtechniquesWithParent) {
-                return this.technique.isSubtechnique && this.viewModel.highlightedTechniques.has(this.technique.parent.id);
-            }
-        }
-        else if (this.viewModel.highlightedTactic && this.viewModel.highlightedTactic.id == this.tactic.id) {
-            if (this.viewModel.selectSubtechniquesWithParent) {
-                return this.technique.isSubtechnique && this.viewModel.highlightedTechniques.has(this.technique.parent.id);
+        let isHighlighted = this.showContextmenu;
+        let idToMatch = this.technique.id;
+        if (this.viewModel.selectSubtechniquesWithParent && this.technique.isSubtechnique) idToMatch = this.technique.parent.id;
+
+        if (this.viewModel.highlightedTechniques.has(idToMatch)) {
+            if (!this.viewModel.highlightedTactic) { // highlight is called from search component
+                return true;
+            } else {
+                const isTacticMatching = this.viewModel.highlightedTactic === this.tactic;
+                return (this.viewModel.selectTechniquesAcrossTactics || isTacticMatching);
             }
         }
-        if (this.viewModel.highlightedTechniques.has(this.technique.id)) { // for highlighting techniques from the techniques search component, where highlightedTactic is null
-            return true;
-        }
 
-        return this.showContextmenu;
+        return isHighlighted;
     }
 
     constructor(public configService: ConfigService, public dataService: DataService) { }

diff --git a/nav-app/src/app/viewmodels.service.ts b/nav-app/src/app/viewmodels.service.ts
@@ -498,6 +498,7 @@ export class ViewModel {
 
     public highlightedTactic: Tactic = null;
     public highlightedTechniques: Set<string> = new Set<string>();
+    public highlightedTechnique: Technique = null; // the Technique that was actually moused over
 
     /**
      * Highlight the given technique under the given tactic
@@ -506,6 +507,7 @@ export class ViewModel {
      */
     public highlightTechnique(technique: Technique, tactic?: Tactic | null) {
         if (this.selectSubtechniquesWithParent && technique.isSubtechnique) this.highlightedTechniques.add(technique.parent.id);
+        this.highlightedTechnique = technique;
         this.highlightedTechniques.add(technique.id);
         this.highlightedTactic = tactic;
     }
@@ -514,6 +516,7 @@ export class ViewModel {
      */
     public clearHighlight() {
         this.highlightedTactic = null;
+        this.highlightedTechnique = null;
         this.highlightedTechniques = new Set<string>();
     }