Merge pull request #32 from center-for-threat-informed-defense/TAT-15…

…1-fix-filter-algorithm feat(TAT-152): update filter algorithm to ensure a technique matches all criteria
center-for-threat-informed-defense · Jul 23, 2024 · 1c5667a · 1c5667a
2 parents 1787343 + d53760e
commit 1c5667a
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/src/views/TopTenResults.vue b/src/views/TopTenResults.vue
@@ -53,29 +53,41 @@ export default defineComponent({
                 return filteredList;
             }
             for (const technique of filteredList) {
-                if (this.addTechniqueToList(technique)) {
+                if (this.checkForNist(technique) && this.checkForCis(technique) && this.checkForDetection(technique) && this.checkForOs(technique)) {
                     newFilterList.push(technique)
                 }
             }
             return newFilterList
         },
-        addTechniqueToList(technique: Technique): boolean {
+        checkForCis(technique: Technique): boolean {
+            if (this.filters.cis.size === 0) { return true }
             for (const property of this.filters.cis) {
-                if (technique.cis_controls && technique.cis_controls.find(c => c === property)) {
+                if (technique.cis_controls && technique.cis_controls.find(n => n === property)) {
                     return true;
                 }
             }
-
+            return false;
+        },
+        checkForNist(technique: Technique): boolean {
+            if (this.filters.nist.size === 0) { return true }
             for (const property of this.filters.nist) {
                 if (technique.nist_controls && technique.nist_controls.find(n => n === property)) {
                     return true;
                 }
             }
+            return false;
+        },
+        checkForOs(technique: Technique): boolean {
+            if (this.filters.os.size === 0) { return true }
             for (const property of this.filters.os) {
                 if (technique.platforms && technique.platforms.find(n => n === property)) {
                     return true;
                 }
             }
+            return false;
+        },
+        checkForDetection(technique: Technique): boolean {
+            if (this.filters.detection.size === 0) { return true }
             for (const filterProp of this.filters.detection) {
                 const key = this.calculatorStore.filterProperties.detection.options.find(i => i.name === filterProp)
                 if (technique[key.id]) {