From 813d2df3b98f08a8cd0b3b5e61c25dc2d597740e Mon Sep 17 00:00:00 2001 From: csuraparaju Date: Sat, 20 Apr 2024 22:34:24 -0400 Subject: [PATCH 01/11] dataSources shows up on UI --- nav-app/angular.json | 3 + nav-app/src/app/classes/filter.ts | 63 ++++++++++++++++++- nav-app/src/app/classes/view-model.ts | 16 +++++ .../app/datatable/data-table.component.html | 24 ++++--- package-lock.json | 6 ++ 5 files changed, 101 insertions(+), 11 deletions(-) create mode 100644 package-lock.json diff --git a/nav-app/angular.json b/nav-app/angular.json index dd5a16ba8..f504fac5c 100644 --- a/nav-app/angular.json +++ b/nav-app/angular.json @@ -142,5 +142,8 @@ "@schematics/angular:directive": { "prefix": "app" } + }, + "cli": { + "analytics": false } } diff --git a/nav-app/src/app/classes/filter.ts b/nav-app/src/app/classes/filter.ts index 7a665ec9f..1eae3079c 100644 --- a/nav-app/src/app/classes/filter.ts +++ b/nav-app/src/app/classes/filter.ts @@ -8,11 +8,21 @@ export class Filter { selection: string[]; }; + public dataSources : { + options: string[]; + selection: string[]; + } + constructor() { this.platforms = { selection: [], options: [], }; + + this.dataSources = { + selection: [], + options: [], + }; } /** @@ -27,6 +37,24 @@ export class Filter { } } + /** + * Initialize the data source options according to the data in the domain + * @param {Domain} domain the domain to parse for data source options + */ + + public initDataSourcesOptions(domain: Domain): void { + // dataSourcesMap is a Map + // We want to store the name field in the options array as well as the selection array + + // Iterate over the entries of the Map + for (const [key, value] of domain.dataSources.entries()) { + // Store the name field in the options array + this.dataSources.options.push(value.name); + this.dataSources.selection.push(value.name); + } + + } + /** * toggle the given value in the given filter * @param {*} filterName the name of the filter @@ -60,7 +88,7 @@ export class Filter { * @return stringified filter */ public serialize(): string { - return JSON.stringify({ platforms: this.platforms.selection }); + return JSON.stringify({ platforms: this.platforms.selection, dataSources: this.dataSources.selection }); } /** @@ -78,6 +106,25 @@ export class Filter { return true; }; + let isDataSourcesMap = function (obj: any): boolean { + // Check if obj is an instance of Map + if (!(obj instanceof Map)) { + return false; + } + + // Iterate over the entries of the Map + for (const [key, value] of obj.entries()) { + // Check if key is a string and value is an object with 'name' and 'external_references' properties + if (typeof key !== 'string' || typeof value !== 'object' || value === null || !('name' in value) || !('external_references' in value)) { + return false; + } + } + + return true; + } + + + // Deserialize platforms if (rep.platforms) { if (isStringArray(rep.platforms)) { let backwards_compatibility_mappings = { @@ -101,5 +148,19 @@ export class Filter { this.platforms.selection = Array.from(selection); } else console.error('TypeError: filter platforms field is not a string[]'); } + + // Deserialize data sources + + if(rep.dataSources) { + if (isDataSourcesMap(rep.dataSources)) { + this.dataSources.selection = Array.from(rep.dataSources.keys()); + // show debug message + console.log('Data Sources:', this.dataSources.selection); + // assert that selections is an array + if (!Array.isArray(this.dataSources.selection)) { + console.error('TypeError: filter dataSources selection field is not a string[]'); + } + } else console.error('TypeError: filter dataSources field is not a Map'); + } } } diff --git a/nav-app/src/app/classes/view-model.ts b/nav-app/src/app/classes/view-model.ts index b42f3bf32..9be8b64da 100644 --- a/nav-app/src/app/classes/view-model.ts +++ b/nav-app/src/app/classes/view-model.ts @@ -146,10 +146,12 @@ export class ViewModel { this.dataService.onDataLoad(this.domainVersionID, function () { self.initTechniqueVMs(); self.filters.initPlatformOptions(self.dataService.getDomain(self.domainVersionID)); + self.filters.initDataSourcesOptions(self.dataService.getDomain(self.domainVersionID)); }); } else { this.initTechniqueVMs(); this.filters.initPlatformOptions(domain); + this.filters.initDataSourcesOptions(domain); } this.loaded = true; } @@ -845,6 +847,20 @@ export class ViewModel { return true; //platform match } } + + // filter by data sources + let dataSources = new Set(technique.datasources); + for (let dataSource of this.filters.dataSources.selection) { + if (dataSources.has(dataSource)) { + techniqueVM.setIsVisible(true); + technique.subtechniques.forEach((subtechnique) => { + let subtechniqueVM = this.getTechniqueVM(subtechnique, tactic); + subtechniqueVM.setIsVisible(true); + }); + return true; // data source match + } + } + techniqueVM.setIsVisible(false); technique.subtechniques.forEach((subtechnique) => { let subtechniqueVM = this.getTechniqueVM(subtechnique, tactic); diff --git a/nav-app/src/app/datatable/data-table.component.html b/nav-app/src/app/datatable/data-table.component.html index e264caab8..c8de7f98f 100755 --- a/nav-app/src/app/datatable/data-table.component.html +++ b/nav-app/src/app/datatable/data-table.component.html @@ -1,3 +1,4 @@ + + +
+ -->
@@ -817,11 +821,11 @@ + -->
keyboard_arrow_up @@ -850,4 +854,4 @@
-
+
\ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000..a9cb9e746 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,6 @@ +{ + "name": "attack-navigator", + "lockfileVersion": 3, + "requires": true, + "packages": {} +} From 55e654fe44f82f4952a77a714aa0f747ea1dc7d2 Mon Sep 17 00:00:00 2001 From: csuraparaju Date: Sat, 20 Apr 2024 23:20:49 -0400 Subject: [PATCH 02/11] datasource technique filter attempt --- nav-app/src/app/classes/filter.ts | 1 + nav-app/src/app/classes/view-model.ts | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/nav-app/src/app/classes/filter.ts b/nav-app/src/app/classes/filter.ts index 1eae3079c..4494dc7f4 100644 --- a/nav-app/src/app/classes/filter.ts +++ b/nav-app/src/app/classes/filter.ts @@ -31,6 +31,7 @@ export class Filter { */ public initPlatformOptions(domain: Domain): void { this.platforms.options = JSON.parse(JSON.stringify(domain.platforms)); + if (!this.platforms.selection.length) { // prevent overwriting current selection this.platforms.selection = JSON.parse(JSON.stringify(domain.platforms)); diff --git a/nav-app/src/app/classes/view-model.ts b/nav-app/src/app/classes/view-model.ts index 9be8b64da..8e245cda7 100644 --- a/nav-app/src/app/classes/view-model.ts +++ b/nav-app/src/app/classes/view-model.ts @@ -848,19 +848,24 @@ export class ViewModel { } } - // filter by data sources - let dataSources = new Set(technique.datasources); - for (let dataSource of this.filters.dataSources.selection) { - if (dataSources.has(dataSource)) { + // technique.datasources is a string of the datasource for + // the current technique. The string is of the form: + // 'Sensor Health: Host Status,File: File Metadata' + + let datasource = technique.datasources.split(':')[0]; + + for (let ds of this.filters.dataSources.selection) { + if (ds === datasource) { techniqueVM.setIsVisible(true); technique.subtechniques.forEach((subtechnique) => { let subtechniqueVM = this.getTechniqueVM(subtechnique, tactic); subtechniqueVM.setIsVisible(true); }); - return true; // data source match + return true; //datasource match } } + techniqueVM.setIsVisible(false); technique.subtechniques.forEach((subtechnique) => { let subtechniqueVM = this.getTechniqueVM(subtechnique, tactic); From f37ace8d7e5fd5ac708e3566ac3c2432f39bdaea Mon Sep 17 00:00:00 2001 From: csuraparaju Date: Mon, 22 Apr 2024 19:38:24 -0400 Subject: [PATCH 03/11] datasources filtering done --- nav-app/src/app/classes/filter.ts | 9 +++-- nav-app/src/app/classes/view-model.ts | 21 ++++++------ .../app/datatable/data-table.component.html | 34 ++++++++++++++----- 3 files changed, 42 insertions(+), 22 deletions(-) diff --git a/nav-app/src/app/classes/filter.ts b/nav-app/src/app/classes/filter.ts index 4494dc7f4..d69c100a6 100644 --- a/nav-app/src/app/classes/filter.ts +++ b/nav-app/src/app/classes/filter.ts @@ -71,8 +71,7 @@ export class Filter { this[filterName].selection.splice(index, 1); } else { this[filterName].selection.push(value); - } - } + } } /** * determine if the given value is active in the filter @@ -116,7 +115,11 @@ export class Filter { // Iterate over the entries of the Map for (const [key, value] of obj.entries()) { // Check if key is a string and value is an object with 'name' and 'external_references' properties - if (typeof key !== 'string' || typeof value !== 'object' || value === null || !('name' in value) || !('external_references' in value)) { + if (typeof key !== 'string' || + typeof value !== 'object' || + value === null || + !('name' in value) || + !('external_references' in value)) { return false; } } diff --git a/nav-app/src/app/classes/view-model.ts b/nav-app/src/app/classes/view-model.ts index 8e245cda7..22d0c5dbb 100644 --- a/nav-app/src/app/classes/view-model.ts +++ b/nav-app/src/app/classes/view-model.ts @@ -819,6 +819,9 @@ export class ViewModel { return techniques.filter((technique: Technique) => { let techniqueVM = this.getTechniqueVM(technique, tactic); // filter by enabled + let in_platform = false; + let in_ds = false; + if (this.hideDisabled && !this.isSubtechniqueEnabled(technique, techniqueVM, tactic)) { techniqueVM.setIsVisible(false); technique.subtechniques.forEach((subtechnique) => { @@ -844,34 +847,32 @@ export class ViewModel { let subtechniqueVM = this.getTechniqueVM(subtechnique, tactic); subtechniqueVM.setIsVisible(true); }); - return true; //platform match + in_platform = true; } } - // technique.datasources is a string of the datasource for - // the current technique. The string is of the form: - // 'Sensor Health: Host Status,File: File Metadata' - - let datasource = technique.datasources.split(':')[0]; + let ds_mid = technique.datasources.split(',').map((ds) => ds.split(':')[0]); + let datasources = new Set(ds_mid); for (let ds of this.filters.dataSources.selection) { - if (ds === datasource) { + if (datasources.has(ds)) { techniqueVM.setIsVisible(true); technique.subtechniques.forEach((subtechnique) => { let subtechniqueVM = this.getTechniqueVM(subtechnique, tactic); subtechniqueVM.setIsVisible(true); }); - return true; //datasource match + in_ds = true; } } - techniqueVM.setIsVisible(false); technique.subtechniques.forEach((subtechnique) => { let subtechniqueVM = this.getTechniqueVM(subtechnique, tactic); subtechniqueVM.setIsVisible(false); }); - return false; // no platform match + + return in_platform && in_ds; + }); } diff --git a/nav-app/src/app/datatable/data-table.component.html b/nav-app/src/app/datatable/data-table.component.html index c8de7f98f..55ad4ce01 100755 --- a/nav-app/src/app/datatable/data-table.component.html +++ b/nav-app/src/app/datatable/data-table.component.html @@ -269,23 +269,39 @@ filter_list
-
- {{ filter }} -
-
+ +
+ Platforms +
+
+ (click)="viewModel.filters.toggleInFilter('platforms', filterOption)" + [checked]="viewModel.filters.inFilter('platforms', filterOption)" />
-
Data does not include {{ filter }}
+
Data does not include Platforms
+
+ + +
+ Data Sources +
+
+ + +
+
+
Data does not include Data Sources
- -
From b357b22db291344ae072e57eea95c88958152226 Mon Sep 17 00:00:00 2001 From: csuraparaju Date: Mon, 22 Apr 2024 19:56:40 -0400 Subject: [PATCH 04/11] front end stuff --- .../app/datatable/data-table.component.scss | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/nav-app/src/app/datatable/data-table.component.scss b/nav-app/src/app/datatable/data-table.component.scss index 9c6b56db2..d2ac63f05 100755 --- a/nav-app/src/app/datatable/data-table.component.scss +++ b/nav-app/src/app/datatable/data-table.component.scss @@ -296,11 +296,30 @@ $cellSize: 15px; } } +// .filters { +// padding: 4px; + +// .filter { +// text-align: left; + +// &:not(:first-child) { +// margin-top: 4px; +// } + +// .filter-option { +// &:hover { +// @include adaptive-color('background', color(cell-highlight-color), color(cell-highlight-dark-color)); +// } +// } +// } +// } .filters { padding: 4px; .filter { text-align: left; + max-height: 20em; /* Set a fixed height */ + overflow-y: auto; /* Add scrollbar for vertical overflow */ &:not(:first-child) { margin-top: 4px; @@ -314,6 +333,7 @@ $cellSize: 15px; } } + .warning { @include adaptive-color('color', #b30000, #ffab0f); } From b3c8fbdb8776873c92a59aecb15aa89708c2e3ec Mon Sep 17 00:00:00 2001 From: ytw-wyt Date: Mon, 22 Apr 2024 20:21:55 -0400 Subject: [PATCH 05/11] updated view for data-table --- nav-app/src/app/datatable/data-table.component.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nav-app/src/app/datatable/data-table.component.scss b/nav-app/src/app/datatable/data-table.component.scss index d2ac63f05..e4335878e 100755 --- a/nav-app/src/app/datatable/data-table.component.scss +++ b/nav-app/src/app/datatable/data-table.component.scss @@ -314,7 +314,8 @@ $cellSize: 15px; // } // } .filters { - padding: 4px; + display: flex; + overflow-y: hidden; // Prevents additional space when content is too large .filter { text-align: left; From c62dcb664819c94afedc83b80124ad90dabf8d9f Mon Sep 17 00:00:00 2001 From: ytw-wyt Date: Tue, 23 Apr 2024 13:37:10 -0400 Subject: [PATCH 06/11] solved the bug in UI --- nav-app/src/app/datatable/data-table.component.scss | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nav-app/src/app/datatable/data-table.component.scss b/nav-app/src/app/datatable/data-table.component.scss index e4335878e..1a4746c92 100755 --- a/nav-app/src/app/datatable/data-table.component.scss +++ b/nav-app/src/app/datatable/data-table.component.scss @@ -315,12 +315,17 @@ $cellSize: 15px; // } .filters { display: flex; - overflow-y: hidden; // Prevents additional space when content is too large + overflow-y: scroll; // Prevents additional space when content is too large + max-height: 30vh; + border: 1px solid color(panel-dark); .filter { text-align: left; - max-height: 20em; /* Set a fixed height */ - overflow-y: auto; /* Add scrollbar for vertical overflow */ + flex-direction: column; /* Ensures elements are stacked vertically */ + // max-height: 20em; /* Set a fixed height */ + // overflow-y: scroll; /* Add scrollbar for vertical overflow */ + // max-height: 30vh; + // border: 1px solid color(panel-dark); &:not(:first-child) { margin-top: 4px; From f3e600f60f5b12ccffac29f64a87663998c2a321 Mon Sep 17 00:00:00 2001 From: ytw-wyt Date: Tue, 23 Apr 2024 14:14:12 -0400 Subject: [PATCH 07/11] changed the UI of filter to a column --- .../app/datatable/data-table.component.html | 4 +- .../app/datatable/data-table.component.scss | 37 ++++++++++++++++--- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/nav-app/src/app/datatable/data-table.component.html b/nav-app/src/app/datatable/data-table.component.html index 55ad4ce01..f0bac4d11 100755 --- a/nav-app/src/app/datatable/data-table.component.html +++ b/nav-app/src/app/datatable/data-table.component.html @@ -270,7 +270,7 @@
-
+
Platforms
@@ -287,7 +287,7 @@
-
+
Data Sources
diff --git a/nav-app/src/app/datatable/data-table.component.scss b/nav-app/src/app/datatable/data-table.component.scss index 1a4746c92..8dc77b961 100755 --- a/nav-app/src/app/datatable/data-table.component.scss +++ b/nav-app/src/app/datatable/data-table.component.scss @@ -314,12 +314,12 @@ $cellSize: 15px; // } // } .filters { - display: flex; - overflow-y: scroll; // Prevents additional space when content is too large - max-height: 30vh; - border: 1px solid color(panel-dark); + display: block; + overflow-y: auto; // Prevents additional space when content is too large + max-height: 60vh; + //border: 1px solid color(panel-dark); - .filter { + .filter-platform { text-align: left; flex-direction: column; /* Ensures elements are stacked vertically */ // max-height: 20em; /* Set a fixed height */ @@ -327,6 +327,33 @@ $cellSize: 15px; // max-height: 30vh; // border: 1px solid color(panel-dark); + overflow-y: scroll; // Prevents additional space when content is too large + // max-height: 30vh; + border: 1px solid color(panel-dark); + + &:not(:first-child) { + margin-top: 4px; + } + + .filter-option { + &:hover { + @include adaptive-color('background', color(cell-highlight-color), color(cell-highlight-dark-color)); + } + } + } + + .filter-datasource { + text-align: left; + flex-direction: column; /* Ensures elements are stacked vertically */ + // max-height: 20em; /* Set a fixed height */ + //overflow-y: scroll; /* Add scrollbar for vertical overflow */ + // max-height: 30vh; + // border: 1px solid color(panel-dark); + + overflow-y: scroll; // Prevents additional space when content is too large + //max-height: 30vh; + border: 1px solid color(panel-dark); + &:not(:first-child) { margin-top: 4px; } From 7aadb7a646f1f257a1622f4eb5e9c77a1c782581 Mon Sep 17 00:00:00 2001 From: ytw-wyt Date: Wed, 24 Apr 2024 11:19:59 -0400 Subject: [PATCH 08/11] dealed with empty datasources --- nav-app/src/app/classes/view-model.ts | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/nav-app/src/app/classes/view-model.ts b/nav-app/src/app/classes/view-model.ts index 22d0c5dbb..6ebcebf18 100644 --- a/nav-app/src/app/classes/view-model.ts +++ b/nav-app/src/app/classes/view-model.ts @@ -818,9 +818,6 @@ export class ViewModel { public filterTechniques(techniques: Technique[], tactic: Tactic, matrix: Matrix): Technique[] { return techniques.filter((technique: Technique) => { let techniqueVM = this.getTechniqueVM(technique, tactic); - // filter by enabled - let in_platform = false; - let in_ds = false; if (this.hideDisabled && !this.isSubtechniqueEnabled(technique, techniqueVM, tactic)) { techniqueVM.setIsVisible(false); @@ -838,6 +835,10 @@ export class ViewModel { }); return true; // don't filter by platform if it's pre-attack } + + // filter by enabled + let in_platform = false; + let in_ds = false; // filter by platform let platforms = new Set(technique.platforms); for (let platform of this.filters.platforms.selection) { @@ -847,13 +848,17 @@ export class ViewModel { let subtechniqueVM = this.getTechniqueVM(subtechnique, tactic); subtechniqueVM.setIsVisible(true); }); + //return true; in_platform = true; } } - + let ds_mid = technique.datasources.split(',').map((ds) => ds.split(':')[0]); let datasources = new Set(ds_mid); - + console.log(ds_mid); + + //if (this.filters.dataSources.selection.length==0) return true; + if (ds_mid.length==1 && ds_mid[0]=='') return true; for (let ds of this.filters.dataSources.selection) { if (datasources.has(ds)) { techniqueVM.setIsVisible(true); @@ -865,14 +870,14 @@ export class ViewModel { } } + if (in_ds&&in_platform) return true; + techniqueVM.setIsVisible(false); technique.subtechniques.forEach((subtechnique) => { let subtechniqueVM = this.getTechniqueVM(subtechnique, tactic); subtechniqueVM.setIsVisible(false); }); - return in_platform && in_ds; - }); } From e75e95779d3b8bfb792ff02236cbd24bdc121e53 Mon Sep 17 00:00:00 2001 From: Tarun Bandi Date: Thu, 25 Apr 2024 20:18:12 -0400 Subject: [PATCH 09/11] Revert "front end stuff" This reverts commit b357b22db291344ae072e57eea95c88958152226. --- .../app/datatable/data-table.component.scss | 50 ------------------- 1 file changed, 50 deletions(-) diff --git a/nav-app/src/app/datatable/data-table.component.scss b/nav-app/src/app/datatable/data-table.component.scss index 8dc77b961..96364f4fc 100755 --- a/nav-app/src/app/datatable/data-table.component.scss +++ b/nav-app/src/app/datatable/data-table.component.scss @@ -296,23 +296,6 @@ $cellSize: 15px; } } -// .filters { -// padding: 4px; - -// .filter { -// text-align: left; - -// &:not(:first-child) { -// margin-top: 4px; -// } - -// .filter-option { -// &:hover { -// @include adaptive-color('background', color(cell-highlight-color), color(cell-highlight-dark-color)); -// } -// } -// } -// } .filters { display: block; overflow-y: auto; // Prevents additional space when content is too large @@ -321,38 +304,6 @@ $cellSize: 15px; .filter-platform { text-align: left; - flex-direction: column; /* Ensures elements are stacked vertically */ - // max-height: 20em; /* Set a fixed height */ - // overflow-y: scroll; /* Add scrollbar for vertical overflow */ - // max-height: 30vh; - // border: 1px solid color(panel-dark); - - overflow-y: scroll; // Prevents additional space when content is too large - // max-height: 30vh; - border: 1px solid color(panel-dark); - - &:not(:first-child) { - margin-top: 4px; - } - - .filter-option { - &:hover { - @include adaptive-color('background', color(cell-highlight-color), color(cell-highlight-dark-color)); - } - } - } - - .filter-datasource { - text-align: left; - flex-direction: column; /* Ensures elements are stacked vertically */ - // max-height: 20em; /* Set a fixed height */ - //overflow-y: scroll; /* Add scrollbar for vertical overflow */ - // max-height: 30vh; - // border: 1px solid color(panel-dark); - - overflow-y: scroll; // Prevents additional space when content is too large - //max-height: 30vh; - border: 1px solid color(panel-dark); &:not(:first-child) { margin-top: 4px; @@ -366,7 +317,6 @@ $cellSize: 15px; } } - .warning { @include adaptive-color('color', #b30000, #ffab0f); } From 718c7ad13c75f60b770d371171a966c783076e9b Mon Sep 17 00:00:00 2001 From: Tarun Bandi Date: Sun, 28 Apr 2024 21:29:44 -0400 Subject: [PATCH 10/11] rm print --- nav-app/src/app/classes/view-model.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nav-app/src/app/classes/view-model.ts b/nav-app/src/app/classes/view-model.ts index 6ebcebf18..8228320ca 100644 --- a/nav-app/src/app/classes/view-model.ts +++ b/nav-app/src/app/classes/view-model.ts @@ -855,10 +855,9 @@ export class ViewModel { let ds_mid = technique.datasources.split(',').map((ds) => ds.split(':')[0]); let datasources = new Set(ds_mid); - console.log(ds_mid); //if (this.filters.dataSources.selection.length==0) return true; - if (ds_mid.length==1 && ds_mid[0]=='') return true; + if (ds_mid.length==1 && ds_mid[0]=='') return in_platform; for (let ds of this.filters.dataSources.selection) { if (datasources.has(ds)) { techniqueVM.setIsVisible(true); From 7be7fcbc9079040ab191a4cbff22855594a7de6e Mon Sep 17 00:00:00 2001 From: Tarun Bandi Date: Sun, 28 Apr 2024 21:54:39 -0400 Subject: [PATCH 11/11] fixing the CSS(revert) --- nav-app/src/app/classes/view-model.ts | 15 +++--- .../app/datatable/data-table.component.scss | 52 ++++++++++++++++++- 2 files changed, 57 insertions(+), 10 deletions(-) diff --git a/nav-app/src/app/classes/view-model.ts b/nav-app/src/app/classes/view-model.ts index 8228320ca..91f6e3770 100644 --- a/nav-app/src/app/classes/view-model.ts +++ b/nav-app/src/app/classes/view-model.ts @@ -818,6 +818,9 @@ export class ViewModel { public filterTechniques(techniques: Technique[], tactic: Tactic, matrix: Matrix): Technique[] { return techniques.filter((technique: Technique) => { let techniqueVM = this.getTechniqueVM(technique, tactic); + // filter by enabled + let in_platform = false; + let in_ds = false; if (this.hideDisabled && !this.isSubtechniqueEnabled(technique, techniqueVM, tactic)) { techniqueVM.setIsVisible(false); @@ -835,10 +838,6 @@ export class ViewModel { }); return true; // don't filter by platform if it's pre-attack } - - // filter by enabled - let in_platform = false; - let in_ds = false; // filter by platform let platforms = new Set(technique.platforms); for (let platform of this.filters.platforms.selection) { @@ -848,15 +847,13 @@ export class ViewModel { let subtechniqueVM = this.getTechniqueVM(subtechnique, tactic); subtechniqueVM.setIsVisible(true); }); - //return true; in_platform = true; } } - + let ds_mid = technique.datasources.split(',').map((ds) => ds.split(':')[0]); let datasources = new Set(ds_mid); - //if (this.filters.dataSources.selection.length==0) return true; if (ds_mid.length==1 && ds_mid[0]=='') return in_platform; for (let ds of this.filters.dataSources.selection) { if (datasources.has(ds)) { @@ -869,14 +866,14 @@ export class ViewModel { } } - if (in_ds&&in_platform) return true; - techniqueVM.setIsVisible(false); technique.subtechniques.forEach((subtechnique) => { let subtechniqueVM = this.getTechniqueVM(subtechnique, tactic); subtechniqueVM.setIsVisible(false); }); + return in_platform && in_ds; + }); } diff --git a/nav-app/src/app/datatable/data-table.component.scss b/nav-app/src/app/datatable/data-table.component.scss index 96364f4fc..96c1207bc 100755 --- a/nav-app/src/app/datatable/data-table.component.scss +++ b/nav-app/src/app/datatable/data-table.component.scss @@ -296,6 +296,23 @@ $cellSize: 15px; } } +// .filters { +// padding: 4px; + +// .filter { +// text-align: left; + +// &:not(:first-child) { +// margin-top: 4px; +// } + +// .filter-option { +// &:hover { +// @include adaptive-color('background', color(cell-highlight-color), color(cell-highlight-dark-color)); +// } +// } +// } +// } .filters { display: block; overflow-y: auto; // Prevents additional space when content is too large @@ -304,6 +321,38 @@ $cellSize: 15px; .filter-platform { text-align: left; + flex-direction: column; /* Ensures elements are stacked vertically */ + // max-height: 20em; /* Set a fixed height */ + // overflow-y: scroll; /* Add scrollbar for vertical overflow */ + // max-height: 30vh; + // border: 1px solid color(panel-dark); + + overflow-y: scroll; // Prevents additional space when content is too large + // max-height: 30vh; + border: 1px solid color(panel-dark); + + &:not(:first-child) { + margin-top: 4px; + } + + .filter-option { + &:hover { + @include adaptive-color('background', color(cell-highlight-color), color(cell-highlight-dark-color)); + } + } + } + + .filter-datasource { + text-align: left; + flex-direction: column; /* Ensures elements are stacked vertically */ + // max-height: 20em; /* Set a fixed height */ + //overflow-y: scroll; /* Add scrollbar for vertical overflow */ + // max-height: 30vh; + // border: 1px solid color(panel-dark); + + overflow-y: scroll; // Prevents additional space when content is too large + //max-height: 30vh; + border: 1px solid color(panel-dark); &:not(:first-child) { margin-top: 4px; @@ -317,6 +366,7 @@ $cellSize: 15px; } } + .warning { @include adaptive-color('color', #b30000, #ffab0f); } @@ -560,4 +610,4 @@ $cellSize: 15px; width: 250px !important; overflow-y: auto; max-height: 50vh; -} +} \ No newline at end of file