From 7a311409751a5722e1a0c82dd048bf2d0afa2e42 Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Wed, 14 Apr 2021 18:10:31 -0700
Subject: [PATCH 01/20] Added banner placeholder in tabs component, and added
 banner feature in config.json

---
 nav-app/src/app/tabs/tabs.component.html |  7 +++++++
 nav-app/src/app/tabs/tabs.component.scss | 11 +++++++++++
 nav-app/src/app/tabs/tabs.component.ts   |  2 ++
 nav-app/src/assets/config.json           |  1 +
 4 files changed, 21 insertions(+)

diff --git a/nav-app/src/app/tabs/tabs.component.html b/nav-app/src/app/tabs/tabs.component.html
index 42e9763c7..70a54cfd1 100755
--- a/nav-app/src/app/tabs/tabs.component.html
+++ b/nav-app/src/app/tabs/tabs.component.html
@@ -1,5 +1,12 @@
 <link href="https://fonts.googleapis.com/css?family=Roboto+Mono:500" rel="stylesheet">
 
+<!-- Banner -->
+<div *ngIf="hasFeature('banner') && bannerContent" class="header">
+    <div class="banner">
+        <span role="alert">{{ bannerContent }}</span>
+    </div>
+</div>
+
 <!-- Header/Help -->
 <div *ngIf="hasFeature('header')" [style.margin-bottom]="hasFeature('tabs') ? '0px' : '15px'" class="header" >
     <div class="logo">
diff --git a/nav-app/src/app/tabs/tabs.component.scss b/nav-app/src/app/tabs/tabs.component.scss
index eb302c393..d0853fdae 100755
--- a/nav-app/src/app/tabs/tabs.component.scss
+++ b/nav-app/src/app/tabs/tabs.component.scss
@@ -188,6 +188,17 @@ input[type=file]{
         height: 2ex;
         padding: 5px;
     }
+
+    .banner {
+        background-color: color(primary);
+        margin: 7px;
+        padding: 5px;
+        border-radius: 5px;
+        text-align: center;
+        color: on-color(primary);
+        display: flex;
+        justify-content: space-between;
+    }
 }
 
 .btn-group {
diff --git a/nav-app/src/app/tabs/tabs.component.ts b/nav-app/src/app/tabs/tabs.component.ts
index e4ac4d7ed..a9c4aca28 100755
--- a/nav-app/src/app/tabs/tabs.component.ts
+++ b/nav-app/src/app/tabs/tabs.component.ts
@@ -60,6 +60,7 @@ export class TabsComponent implements AfterContentInit, AfterViewInit {
                     if(!this.activeTab) { this.selectTab(this.layerTabs[0]); }
                 });
                 this.customizedConfig = this.configService.getFeatureList()
+                this.bannerContent = this.customizedConfig.find((obj) => obj.name === "banner")?.content;
             },
             complete: () => { if (subscription) subscription.unsubscribe(); } //prevent memory leaks
         });
@@ -623,6 +624,7 @@ export class TabsComponent implements AfterContentInit, AfterViewInit {
     // layerLinkURL = ""; //the user inputted layer link which will get parsed into a param
     layerLinkURLs: string[] = [];
     customizedConfig = [];
+    bannerContent = '';
 
     /**
      * Helper function to track which layerLinkURLs have been added or removed
diff --git a/nav-app/src/assets/config.json b/nav-app/src/assets/config.json
index dd4c13b06..a772468a2 100755
--- a/nav-app/src/assets/config.json
+++ b/nav-app/src/assets/config.json
@@ -86,6 +86,7 @@
         {"name": "tabs", "enabled": true, "description": "Disable to remove the ability to open new tabs."},
         {"name": "selecting_techniques", "enabled": true, "description": "Disable to remove the ability to select techniques."},
         {"name": "header", "enabled": true, "description": "Disable to remove the header containing 'MITRE ATT&CK Navigator' and the link to the help page. The help page can still be accessed from the new tab menu."},
+        {"name": "banner", "enabled": true, "description": "Disable to remove the banner announcing ATT&CK Navigator updates.", "content":  "New updates"},
         {"name": "subtechniques", "enabled": true, "description": "Disable to remove all sub-technique features from the interface."},
         {"name": "selection_controls", "enabled": true, "description": "Disable to to disable all subfeatures", "subfeatures": [
             {"name": "search", "enabled": true, "description": "Disable to remove the technique search panel from the interface."},

From 5ddf7266c978e514d022732f7627bc4c2418af4b Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Wed, 14 Apr 2021 18:13:11 -0700
Subject: [PATCH 02/20] Updated CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6aa37fe1..8d7aa30ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Added support for displaying notes in tooltips. Notes on a technique are indicated in the same style as a comment.
 - Fixed a bug in exporting matrix to Excel sheet, where the style of all sub-techniques with the same name in a column were incorrectly over-ridden by the style of the first sub-technique in its name. See issue [#270](https://github.com/mitre-attack/attack-navigator/issues/270).
 - Consolidated AWS, GCP, and Azure platforms into IaaS platform to integrate upcoming release of ATT&CK. See issue [#252](https://github.com/mitre-attack/attack-navigator/issues/252). 
+- Added configurable banner to announce new updates. See issue [#205](https://github.com/mitre-attack/attack-navigator/issues/205). 
 
 # v4.2 - 3 February 2021
 

From e475beee6c7a6deb81f685572704934ef4a96829 Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Thu, 15 Apr 2021 10:05:59 -0700
Subject: [PATCH 03/20] Moved banner setting placement in config.json, and
 updated template to not show banner if header is disabled

---
 nav-app/src/app/config.service.ts        | 2 ++
 nav-app/src/app/tabs/tabs.component.html | 2 +-
 nav-app/src/app/tabs/tabs.component.ts   | 4 ++--
 nav-app/src/assets/config.json           | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nav-app/src/app/config.service.ts b/nav-app/src/app/config.service.ts
index 58b779a84..3e2e3022d 100644
--- a/nav-app/src/app/config.service.ts
+++ b/nav-app/src/app/config.service.ts
@@ -6,6 +6,7 @@ import { DataService, Technique, Tactic } from './data.service'; //import the Da
 })
 export class ConfigService {
     public comment_color = "yellow";
+    public banner = "";
     private features = new Map<string, boolean>();
     private featureGroups = new Map<string, string[]>();
     private featureStructure: object[];
@@ -34,6 +35,7 @@ export class ConfigService {
                 dataService.subtechniquesEnabled = self.getFeature("subtechniques");
                 self.featureStructure = config["features"];
                 self.comment_color = config["comment_color"];
+                self.banner = config["banner"];
                 for (let obj of config["custom_context_menu_items"]) {
                     self.contextMenuItems.push(new ContextMenuItem(obj.label, obj.url, obj.subtechnique_url))
                 }
diff --git a/nav-app/src/app/tabs/tabs.component.html b/nav-app/src/app/tabs/tabs.component.html
index 70a54cfd1..5ab21b7a1 100755
--- a/nav-app/src/app/tabs/tabs.component.html
+++ b/nav-app/src/app/tabs/tabs.component.html
@@ -1,7 +1,7 @@
 <link href="https://fonts.googleapis.com/css?family=Roboto+Mono:500" rel="stylesheet">
 
 <!-- Banner -->
-<div *ngIf="hasFeature('banner') && bannerContent" class="header">
+<div *ngIf="hasFeature('header') && bannerContent" class="header">
     <div class="banner">
         <span role="alert">{{ bannerContent }}</span>
     </div>
diff --git a/nav-app/src/app/tabs/tabs.component.ts b/nav-app/src/app/tabs/tabs.component.ts
index a9c4aca28..d79329a6f 100755
--- a/nav-app/src/app/tabs/tabs.component.ts
+++ b/nav-app/src/app/tabs/tabs.component.ts
@@ -60,7 +60,7 @@ export class TabsComponent implements AfterContentInit, AfterViewInit {
                     if(!this.activeTab) { this.selectTab(this.layerTabs[0]); }
                 });
                 this.customizedConfig = this.configService.getFeatureList()
-                this.bannerContent = this.customizedConfig.find((obj) => obj.name === "banner")?.content;
+                this.bannerContent = this.configService.banner;
             },
             complete: () => { if (subscription) subscription.unsubscribe(); } //prevent memory leaks
         });
@@ -624,7 +624,7 @@ export class TabsComponent implements AfterContentInit, AfterViewInit {
     // layerLinkURL = ""; //the user inputted layer link which will get parsed into a param
     layerLinkURLs: string[] = [];
     customizedConfig = [];
-    bannerContent = '';
+    bannerContent = "";
 
     /**
      * Helper function to track which layerLinkURLs have been added or removed
diff --git a/nav-app/src/assets/config.json b/nav-app/src/assets/config.json
index a772468a2..ef21b7457 100755
--- a/nav-app/src/assets/config.json
+++ b/nav-app/src/assets/config.json
@@ -82,11 +82,12 @@
 
     "comment_color": "yellow",
 
+    "banner": "",
+
     "features": [
         {"name": "tabs", "enabled": true, "description": "Disable to remove the ability to open new tabs."},
         {"name": "selecting_techniques", "enabled": true, "description": "Disable to remove the ability to select techniques."},
         {"name": "header", "enabled": true, "description": "Disable to remove the header containing 'MITRE ATT&CK Navigator' and the link to the help page. The help page can still be accessed from the new tab menu."},
-        {"name": "banner", "enabled": true, "description": "Disable to remove the banner announcing ATT&CK Navigator updates.", "content":  "New updates"},
         {"name": "subtechniques", "enabled": true, "description": "Disable to remove all sub-technique features from the interface."},
         {"name": "selection_controls", "enabled": true, "description": "Disable to to disable all subfeatures", "subfeatures": [
             {"name": "search", "enabled": true, "description": "Disable to remove the technique search panel from the interface."},

From ced7fa3d219558229eccfbf90724baa5fbb8203d Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Thu, 15 Apr 2021 10:28:27 -0700
Subject: [PATCH 04/20] Updated style of banner, changed font to Roboto, and
 changed padding

---
 nav-app/src/app/tabs/tabs.component.scss | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nav-app/src/app/tabs/tabs.component.scss b/nav-app/src/app/tabs/tabs.component.scss
index d0853fdae..d14d4b159 100755
--- a/nav-app/src/app/tabs/tabs.component.scss
+++ b/nav-app/src/app/tabs/tabs.component.scss
@@ -192,12 +192,14 @@ input[type=file]{
     .banner {
         background-color: color(primary);
         margin: 7px;
-        padding: 5px;
+        padding: 5px 7px 5px 7px;
         border-radius: 5px;
-        text-align: center;
+        text-align: left;
         color: on-color(primary);
         display: flex;
-        justify-content: space-between;
+        justify-content: center;
+        font-size: 14px;
+        font-family: Roboto, "Helvetica Neue", sans-serif;
     }
 }
 

From 769c043d6db6b4168c0f43dd43c230f40b65983c Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Fri, 16 Apr 2021 14:18:39 -0700
Subject: [PATCH 05/20] Updated CHANGELOG for expand subtechniques

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6aa37fe1..04c32aae8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Added support for displaying notes in tooltips. Notes on a technique are indicated in the same style as a comment.
 - Fixed a bug in exporting matrix to Excel sheet, where the style of all sub-techniques with the same name in a column were incorrectly over-ridden by the style of the first sub-technique in its name. See issue [#270](https://github.com/mitre-attack/attack-navigator/issues/270).
 - Consolidated AWS, GCP, and Azure platforms into IaaS platform to integrate upcoming release of ATT&CK. See issue [#252](https://github.com/mitre-attack/attack-navigator/issues/252). 
+- Added feature to only expand all sub-techniques that are annotated. See issue [#256](https://github.com/mitre-attack/attack-navigator/issues/256). 
 
 # v4.2 - 3 February 2021
 

From d39b2fb9fe0189d669a16a49c0c70c0306b5b86b Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Fri, 16 Apr 2021 17:39:04 -0700
Subject: [PATCH 06/20] Added showAnnotatedOnly as an optional boolean
 parameter to expandSubtechniques(), which will only expand techniques with
 annotated subtechniques

---
 .../src/app/datatable/data-table.component.ts   | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/nav-app/src/app/datatable/data-table.component.ts b/nav-app/src/app/datatable/data-table.component.ts
index 34ad0edb3..3330b6b5b 100755
--- a/nav-app/src/app/datatable/data-table.component.ts
+++ b/nav-app/src/app/datatable/data-table.component.ts
@@ -285,13 +285,26 @@ export class DataTableComponent implements AfterViewInit {
     /**
      * Show all sub-techniques in layout view
      */
-    expandSubtechniques(): void {
+    expandSubtechniques(showAnnotatedOnly?: boolean): void {
         if (this.viewModel.layout.layout == "mini") return; //control disabled in mini layout
         for (let technique of this.dataService.getDomain(this.viewModel.domainID).techniques) {
             if (technique.subtechniques.length > 0) {
                 for (let id of technique.get_all_technique_tactic_ids()) {
                     let tvm = this.viewModel.getTechniqueVM_id(id);
-                    tvm.showSubtechniques = true;
+                    if (!showAnnotatedOnly) {
+                        tvm.showSubtechniques = true;
+                    } else {
+                        let foundAnnotated = false;
+                        for (let subtechnique of technique.subtechniques) {
+                            for (let sid of subtechnique.get_all_technique_tactic_ids()) {
+                                let svm = this.viewModel.getTechniqueVM_id(sid);
+                                if (svm.annotated() && !foundAnnotated) {
+                                    foundAnnotated = true; // set boolean after it finds the first annotated subtechnique
+                                }
+                                tvm.showSubtechniques = foundAnnotated;  // otherwise, keep going and collapse if no annotations found
+                            }
+                        }
+                    }
                 }
             }
         }

From 5fc7c001eb8bff3413b8a9fa6ca1fdd119ecf0e1 Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Wed, 21 Apr 2021 16:54:14 -0700
Subject: [PATCH 07/20] Updated with merged changes

---
 README.md                                           |  2 ++
 nav-app/src/app/datatable/data-table.component.html | 10 ++++++++++
 nav-app/src/app/datatable/data-table.component.ts   |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a3ee8d15d..df86b2e16 100755
--- a/README.md
+++ b/README.md
@@ -192,6 +192,8 @@ The following is an example iframe which embeds our [*Bear APTs](layers/data/sam
 <iframe src="https://mitre-attack.github.io/attack-navigator/enterprise/#layerURL=https%3A%2F%2Fraw.githubusercontent.com%2Fmitre%2Fattack-navigator%2Fmaster%2Flayers%2Fdata%2Fsamples%2FBear_APT.json&tabs=false&selecting_techniques=false" width="1000" height="500"></iframe>
 ```
 
+
+
 ## Related MITRE Work
 #### CTI
 [Cyber Threat Intelligence repository](https://github.com/mitre/cti) of the ATT&CK catalog expressed in STIX 2.0 JSON.
diff --git a/nav-app/src/app/datatable/data-table.component.html b/nav-app/src/app/datatable/data-table.component.html
index 2d5d6423b..06a85e7ef 100755
--- a/nav-app/src/app/datatable/data-table.component.html
+++ b/nav-app/src/app/datatable/data-table.component.html
@@ -337,6 +337,16 @@
                  </div>
              </div>
 
+            <!-- expand only annotated sub-techniques -->
+            <div *ngIf="configService.getFeature('subtechniques')" class="control-row-item">
+                <div class="control-row-button noselect"
+                     (click)="expandSubtechniques(true)"
+                     matTooltipPosition="below"
+                     matTooltip="expand annotated sub-techniques">
+                     <img [src]="viewModel.layout.layout == 'mini' ? 'assets/icons/unfold_more_gray_24px.svg' : 'assets/icons/unfold_more_alt_black_24px.svg'" alt="expand annotated sub-techniques"/>
+                 </div>
+             </div>
+
             <!-- collapse all sub-techniques -->
             <div *ngIf="configService.getFeature('subtechniques')" class="control-row-item">
                 <div class="control-row-button noselect"
diff --git a/nav-app/src/app/datatable/data-table.component.ts b/nav-app/src/app/datatable/data-table.component.ts
index 3330b6b5b..c97c400f6 100755
--- a/nav-app/src/app/datatable/data-table.component.ts
+++ b/nav-app/src/app/datatable/data-table.component.ts
@@ -368,4 +368,4 @@ export class DataTableComponent implements AfterViewInit {
     exportRender(): void {
         this.tabs.openSVGDialog(this.viewModel);
     }
-}
\ No newline at end of file
+}

From be3c59cf670e1d8efb63eb9298965d81d6b4ea91 Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Tue, 27 Apr 2021 08:27:40 -0700
Subject: [PATCH 08/20] Added new unfold more alt icon for expanding select
 subtechniques

---
 nav-app/src/app/datatable/data-table.component.html    |  2 +-
 .../src/assets/icons/unfold_more_alt_black_24px.svg    |  2 ++
 nav-app/src/assets/icons/unfold_more_alt_gray_24px.svg | 10 ++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 nav-app/src/assets/icons/unfold_more_alt_black_24px.svg
 create mode 100644 nav-app/src/assets/icons/unfold_more_alt_gray_24px.svg

diff --git a/nav-app/src/app/datatable/data-table.component.html b/nav-app/src/app/datatable/data-table.component.html
index 06a85e7ef..445e6304b 100755
--- a/nav-app/src/app/datatable/data-table.component.html
+++ b/nav-app/src/app/datatable/data-table.component.html
@@ -343,7 +343,7 @@
                      (click)="expandSubtechniques(true)"
                      matTooltipPosition="below"
                      matTooltip="expand annotated sub-techniques">
-                     <img [src]="viewModel.layout.layout == 'mini' ? 'assets/icons/unfold_more_gray_24px.svg' : 'assets/icons/unfold_more_alt_black_24px.svg'" alt="expand annotated sub-techniques"/>
+                     <img [src]="viewModel.layout.layout == 'mini' ? 'assets/icons/unfold_more_alt_gray_24px.svg' : 'assets/icons/unfold_more_alt_black_24px.svg'" alt="expand annotated sub-techniques"/>
                  </div>
              </div>
 
diff --git a/nav-app/src/assets/icons/unfold_more_alt_black_24px.svg b/nav-app/src/assets/icons/unfold_more_alt_black_24px.svg
new file mode 100644
index 000000000..67210956e
--- /dev/null
+++ b/nav-app/src/assets/icons/unfold_more_alt_black_24px.svg
@@ -0,0 +1,2 @@
+<svg fill="#000000" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><g><path d="M0,0h24v24H0V0z" fill="none"/><path d="M12,5.8L15.2,9l1.4-1.4L12,3L7.4,7.6L8.8,9L12,5.8z M12,18.2L8.8,15l-1.4,1.4L12,21l4.6-4.6L15.2,15L12,18.2z"/><rect x="8.9" y="11.3" style="display:none;" width="6.1" height="1.4"/>
+</g><g><g><rect x="9" y="11.3" width="6" height="1.5"/><rect x="9" y="11.3" transform="matrix(0.5 -0.866 0.866 0.5 -4.4181 16.4014)" width="6" height="1.5"/><rect x="9" y="11.3" transform="matrix(0.5 0.866 -0.866 0.5 16.4131 -4.3745)" width="6" height="1.5"/></g></g></svg>
diff --git a/nav-app/src/assets/icons/unfold_more_alt_gray_24px.svg b/nav-app/src/assets/icons/unfold_more_alt_gray_24px.svg
new file mode 100644
index 000000000..b49733d5a
--- /dev/null
+++ b/nav-app/src/assets/icons/unfold_more_alt_gray_24px.svg
@@ -0,0 +1,10 @@
+<svg fill="#aaaaaa" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+<g>
+<path d="M0,0h24v24H0V0z" fill="none"/>
+<path style="fill:#AAAAAA;" d="M12,5.8L15.2,9l1.4-1.4L12,3L7.4,7.6L8.8,9L12,5.8z M12,18.2L8.8,15l-1.4,1.4L12,21l4.6-4.6L15.2,15
+	L12,18.2z"/>
+</g><g>
+	<rect x="9" y="11.3" style="fill:#AAAAAA;" width="6" height="1.5"/>
+	<rect x="9" y="11.3" transform="matrix(0.5 -0.866 0.866 0.5 -4.4181 16.4014)" width="6" height="1.5"/>
+	<rect x="9" y="11.3" transform="matrix(0.5 0.866 -0.866 0.5 16.4131 -4.3745)" width="6" height="1.5"/>
+</g></svg>

From 9f00c783fa35a398ef4ef16a262dd6b981234f7b Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Tue, 27 Apr 2021 08:34:07 -0700
Subject: [PATCH 09/20] Cleaning up svg

---
 nav-app/src/assets/icons/unfold_more_alt_gray_24px.svg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nav-app/src/assets/icons/unfold_more_alt_gray_24px.svg b/nav-app/src/assets/icons/unfold_more_alt_gray_24px.svg
index b49733d5a..c22f07aa0 100644
--- a/nav-app/src/assets/icons/unfold_more_alt_gray_24px.svg
+++ b/nav-app/src/assets/icons/unfold_more_alt_gray_24px.svg
@@ -1,10 +1,10 @@
 <svg fill="#aaaaaa" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
 <g>
 <path d="M0,0h24v24H0V0z" fill="none"/>
-<path style="fill:#AAAAAA;" d="M12,5.8L15.2,9l1.4-1.4L12,3L7.4,7.6L8.8,9L12,5.8z M12,18.2L8.8,15l-1.4,1.4L12,21l4.6-4.6L15.2,15
+<path d="M12,5.8L15.2,9l1.4-1.4L12,3L7.4,7.6L8.8,9L12,5.8z M12,18.2L8.8,15l-1.4,1.4L12,21l4.6-4.6L15.2,15
 	L12,18.2z"/>
 </g><g>
-	<rect x="9" y="11.3" style="fill:#AAAAAA;" width="6" height="1.5"/>
+	<rect x="9" y="11.3" width="6" height="1.5"/>
 	<rect x="9" y="11.3" transform="matrix(0.5 -0.866 0.866 0.5 -4.4181 16.4014)" width="6" height="1.5"/>
 	<rect x="9" y="11.3" transform="matrix(0.5 0.866 -0.866 0.5 16.4131 -4.3745)" width="6" height="1.5"/>
 </g></svg>

From 9b28bce8fa22fb00af248ca6378a0ca3d2ac6626 Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Tue, 27 Apr 2021 08:48:46 -0700
Subject: [PATCH 10/20] Moved bannerContent to innerHTML to support html
 formatting and hyperlinks

---
 nav-app/src/app/tabs/tabs.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nav-app/src/app/tabs/tabs.component.html b/nav-app/src/app/tabs/tabs.component.html
index 5ab21b7a1..b0fbee230 100755
--- a/nav-app/src/app/tabs/tabs.component.html
+++ b/nav-app/src/app/tabs/tabs.component.html
@@ -3,7 +3,7 @@
 <!-- Banner -->
 <div *ngIf="hasFeature('header') && bannerContent" class="header">
     <div class="banner">
-        <span role="alert">{{ bannerContent }}</span>
+        <span role="alert" [innerHTML]="bannerContent"></span>
     </div>
 </div>
 

From 3f416f365f24570a6e7e1ba9b344e0a7bc3a8b17 Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Tue, 27 Apr 2021 09:55:36 -0700
Subject: [PATCH 11/20] Moved logo and help icon to inside banner, if banner
 content is available

---
 nav-app/src/app/tabs/tabs.component.html | 12 +++++++--
 nav-app/src/app/tabs/tabs.component.scss | 32 +++++++++++++++++++++---
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/nav-app/src/app/tabs/tabs.component.html b/nav-app/src/app/tabs/tabs.component.html
index b0fbee230..b84e0da69 100755
--- a/nav-app/src/app/tabs/tabs.component.html
+++ b/nav-app/src/app/tabs/tabs.component.html
@@ -3,12 +3,20 @@
 <!-- Banner -->
 <div *ngIf="hasFeature('header') && bannerContent" class="header">
     <div class="banner">
-        <span role="alert" [innerHTML]="bannerContent"></span>
+        <span class="bannerContent" role="alert" [innerHTML]="bannerContent"></span>
+        <div [style.margin-bottom]="hasFeature('tabs') ? '0px' : '15px'" class="bannerLinks">
+            <div>
+                <a href="http://attack.mitre.org">MITRE ATT&CK&reg; Navigator</a>
+            </div>
+            <div *ngIf="hasFeature('tabs')" class="helpIcon" matTooltip="help" (click)="openHelpDialog()">
+                <svg xmlns="http://www.w3.org/2000/svg" height="18px" viewBox="0 0 24 24" width="18px" fill="#FFFFFF"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M11 18h2v-2h-2v2zm1-16C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm0-14c-2.21 0-4 1.79-4 4h2c0-1.1.9-2 2-2s2 .9 2 2c0 2-3 1.75-3 5h2c0-2.25 3-2.5 3-5 0-2.21-1.79-4-4-4z"/></svg>
+            </div>
+        </div>
     </div>
 </div>
 
 <!-- Header/Help -->
-<div *ngIf="hasFeature('header')" [style.margin-bottom]="hasFeature('tabs') ? '0px' : '15px'" class="header" >
+<div *ngIf="hasFeature('header') && !bannerContent" [style.margin-bottom]="hasFeature('tabs') ? '0px' : '15px'" class="header" >
     <div class="logo">
         <a href="http://attack.mitre.org">MITRE ATT&CK&reg; Navigator</a>
     </div>
diff --git a/nav-app/src/app/tabs/tabs.component.scss b/nav-app/src/app/tabs/tabs.component.scss
index d14d4b159..4ad715a1b 100755
--- a/nav-app/src/app/tabs/tabs.component.scss
+++ b/nav-app/src/app/tabs/tabs.component.scss
@@ -191,15 +191,39 @@ input[type=file]{
 
     .banner {
         background-color: color(primary);
-        margin: 7px;
-        padding: 5px 7px 5px 7px;
+        margin: 7px 0;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 5px 15px;
         border-radius: 5px;
         text-align: left;
         color: on-color(primary);
-        display: flex;
-        justify-content: center;
         font-size: 14px;
         font-family: Roboto, "Helvetica Neue", sans-serif;
+        .bannerContent {
+            padding-right: 15px;
+        }
+        .bannerLinks {
+            display: flex;
+            align-items: center;
+            border-left: 2px solid #ffffffad;
+            padding-left: 15px;
+        }
+        .helpIcon {
+            height: 18px;
+            padding-left: 15px;
+        }
+        ::ng-deep a, a, ::ng-deep * {
+            display: inline;
+            color: on-color(primary);
+            text-decoration-line: none;
+            text-decoration-color: on-color(primary);
+        }
+        ::ng-deep a:hover, a:hover, .helpIcon:hover {
+            color: $panel-dark;
+            opacity: 0.8;
+        }
     }
 }
 

From a0e6d0896494ea10cd4f14bd689ab9ec86182bd2 Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Tue, 27 Apr 2021 10:04:19 -0700
Subject: [PATCH 12/20] Updated README with banner info

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 3e4c5269f..90b442a63 100755
--- a/README.md
+++ b/README.md
@@ -169,6 +169,9 @@ Local files to load should be placed in the `nav-app/src/assets/` directory.
 
 Default layers from the web can also be set using a query string in the Navigator URL. Refer to the in-application help page section "Customizing the Navigator" for more details.
 
+## Enabling Banner in Navigator
+The `banner` setting in `nav-app/src/assets/config.json` by default is an empty string `"""` (and not visible), and can be set to whatever content you wish to display inside a banner at the top of the Navigator webpage. The banner supports HTML and hyperlinks in the content.
+
 ## Disabling Navigator Features
 The `features` array in `nav-app/src/assets/config.json` lists Navigator features you may want to disable. Setting the `enabled` field on a feature in the configuration file will hide all control
 elements related to that feature.

From fdf88c6ba416a69be47acfd79c2e571a02fd4573 Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Tue, 27 Apr 2021 10:17:10 -0700
Subject: [PATCH 13/20] Replaced for loop with the some() method for simplicity

---
 nav-app/src/app/datatable/data-table.component.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/nav-app/src/app/datatable/data-table.component.ts b/nav-app/src/app/datatable/data-table.component.ts
index c97c400f6..988115fc2 100755
--- a/nav-app/src/app/datatable/data-table.component.ts
+++ b/nav-app/src/app/datatable/data-table.component.ts
@@ -294,15 +294,11 @@ export class DataTableComponent implements AfterViewInit {
                     if (!showAnnotatedOnly) {
                         tvm.showSubtechniques = true;
                     } else {
-                        let foundAnnotated = false;
                         for (let subtechnique of technique.subtechniques) {
-                            for (let sid of subtechnique.get_all_technique_tactic_ids()) {
+                            tvm.showSubtechniques = tvm.showSubtechniques || subtechnique.get_all_technique_tactic_ids().some((sid) => {
                                 let svm = this.viewModel.getTechniqueVM_id(sid);
-                                if (svm.annotated() && !foundAnnotated) {
-                                    foundAnnotated = true; // set boolean after it finds the first annotated subtechnique
-                                }
-                                tvm.showSubtechniques = foundAnnotated;  // otherwise, keep going and collapse if no annotations found
-                            }
+                                return svm.annotated();
+                            })
                         }
                     }
                 }

From bc6767531b37877aa51005cae1368b3d90c2f76d Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Tue, 27 Apr 2021 12:31:04 -0700
Subject: [PATCH 14/20] Switched ::ng-deep for ViewEncapsulation, and removed
 cursor pointer behavior on hover over banner

---
 nav-app/src/app/tabs/tabs.component.scss | 1 +
 nav-app/src/app/tabs/tabs.component.ts   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nav-app/src/app/tabs/tabs.component.scss b/nav-app/src/app/tabs/tabs.component.scss
index 4ad715a1b..21b569c0a 100755
--- a/nav-app/src/app/tabs/tabs.component.scss
+++ b/nav-app/src/app/tabs/tabs.component.scss
@@ -201,6 +201,7 @@ input[type=file]{
         color: on-color(primary);
         font-size: 14px;
         font-family: Roboto, "Helvetica Neue", sans-serif;
+        cursor: initial;
         .bannerContent {
             padding-right: 15px;
         }
diff --git a/nav-app/src/app/tabs/tabs.component.ts b/nav-app/src/app/tabs/tabs.component.ts
index d79329a6f..1080d858b 100755
--- a/nav-app/src/app/tabs/tabs.component.ts
+++ b/nav-app/src/app/tabs/tabs.component.ts
@@ -1,5 +1,5 @@
 // https://embed.plnkr.co/wWKnXzpm8V31wlvu64od/
-import { Component, AfterContentInit, ViewChild, TemplateRef, AfterViewInit } from '@angular/core';
+import { Component, AfterContentInit, ViewChild, TemplateRef, AfterViewInit, ViewEncapsulation } from '@angular/core';
 import { DataService, Technique } from '../data.service'; //import the DataService component so we can use it
 import { ConfigService } from '../config.service';
 import * as is from 'is_js';
@@ -18,8 +18,8 @@ declare var math: any; //use mathjs
     selector: 'tabs',
     templateUrl: './tabs.component.html',
     styleUrls: ['./tabs.component.scss'],
-    providers: [ViewModelsService]
-
+    providers: [ViewModelsService],
+    encapsulation: ViewEncapsulation.None
 })
 export class TabsComponent implements AfterContentInit, AfterViewInit {
 

From 33a5d69146023736101978e2a4cc061423f5a52f Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Tue, 27 Apr 2021 13:51:51 -0700
Subject: [PATCH 15/20] Switched ::ng-deep for ViewEncapsulation, and removed
 cursor pointer behavior on hover over banner

---
 nav-app/src/app/tabs/tabs.component.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nav-app/src/app/tabs/tabs.component.scss b/nav-app/src/app/tabs/tabs.component.scss
index 21b569c0a..a884d1da4 100755
--- a/nav-app/src/app/tabs/tabs.component.scss
+++ b/nav-app/src/app/tabs/tabs.component.scss
@@ -210,18 +210,19 @@ input[type=file]{
             align-items: center;
             border-left: 2px solid #ffffffad;
             padding-left: 15px;
+            cursor: initial;
         }
         .helpIcon {
             height: 18px;
             padding-left: 15px;
         }
-        ::ng-deep a, a, ::ng-deep * {
+        a {
             display: inline;
             color: on-color(primary);
             text-decoration-line: none;
             text-decoration-color: on-color(primary);
         }
-        ::ng-deep a:hover, a:hover, .helpIcon:hover {
+        a:hover, .helpIcon:hover {
             color: $panel-dark;
             opacity: 0.8;
         }

From 0da865af3e4df95f5d5d77508ed05a5ca224d1fb Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Wed, 28 Apr 2021 08:19:49 -0700
Subject: [PATCH 16/20] Adding back text underline to links in banner

---
 nav-app/src/app/tabs/tabs.component.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nav-app/src/app/tabs/tabs.component.scss b/nav-app/src/app/tabs/tabs.component.scss
index a884d1da4..2ae275562 100755
--- a/nav-app/src/app/tabs/tabs.component.scss
+++ b/nav-app/src/app/tabs/tabs.component.scss
@@ -219,7 +219,6 @@ input[type=file]{
         a {
             display: inline;
             color: on-color(primary);
-            text-decoration-line: none;
             text-decoration-color: on-color(primary);
         }
         a:hover, .helpIcon:hover {

From ebc400f7f0c7fdc8c4efc98d3f6895e0e3088a44 Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Wed, 28 Apr 2021 08:27:02 -0700
Subject: [PATCH 17/20] Updated help component with new expand annotated
 sub-techniques feature

---
 nav-app/src/app/help/help.component.html | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nav-app/src/app/help/help.component.html b/nav-app/src/app/help/help.component.html
index 6c27cbed8..875dae987 100755
--- a/nav-app/src/app/help/help.component.html
+++ b/nav-app/src/app/help/help.component.html
@@ -410,11 +410,15 @@ <h2 id="help_Show_Hide_Subtechniques">
             </p>
             <ul>
                 <li>
-                    <img src="assets/icons/unfold_more_black_24px.svg">
+                    <img alt="expand icon" src="assets/icons/unfold_more_black_24px.svg">
                     All sub-techniques can be shown by clicking the "expand sub-techniques" button.
                 </li>
                 <li>
-                    <img src="assets/icons/unfold_less_black_24px.svg">
+                    <img alt="expand annotated icon" src="assets/icons/unfold_more_alt_black_24px.svg">
+                    All annotated sub-techniques can be shown by clicking the "expand annotated sub-techniques" button.
+                </li>
+                <li>
+                    <img alt="collapse icon" src="assets/icons/unfold_less_black_24px.svg">
                     All sub-techniques can be hidden by clicking the "collapse sub-techniques" button.
                 </li>
             </ul>

From 74e44bb7d0faf234fa4aed031543941199d18463 Mon Sep 17 00:00:00 2001
From: Anna Lin <alin@mitre.org>
Date: Wed, 28 Apr 2021 08:44:31 -0700
Subject: [PATCH 18/20] Strongly-typed banner from features

---
 nav-app/src/app/config.service.ts      | 2 +-
 nav-app/src/app/tabs/tabs.component.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nav-app/src/app/config.service.ts b/nav-app/src/app/config.service.ts
index 3e2e3022d..be0936f01 100644
--- a/nav-app/src/app/config.service.ts
+++ b/nav-app/src/app/config.service.ts
@@ -6,7 +6,7 @@ import { DataService, Technique, Tactic } from './data.service'; //import the Da
 })
 export class ConfigService {
     public comment_color = "yellow";
-    public banner = "";
+    public banner: string;
     private features = new Map<string, boolean>();
     private featureGroups = new Map<string, string[]>();
     private featureStructure: object[];
diff --git a/nav-app/src/app/tabs/tabs.component.ts b/nav-app/src/app/tabs/tabs.component.ts
index 1080d858b..55191c23e 100755
--- a/nav-app/src/app/tabs/tabs.component.ts
+++ b/nav-app/src/app/tabs/tabs.component.ts
@@ -624,7 +624,7 @@ export class TabsComponent implements AfterContentInit, AfterViewInit {
     // layerLinkURL = ""; //the user inputted layer link which will get parsed into a param
     layerLinkURLs: string[] = [];
     customizedConfig = [];
-    bannerContent = "";
+    bannerContent: string;
 
     /**
      * Helper function to track which layerLinkURLs have been added or removed

From 1041c949b49604d19ca244f91bb549c187a9d196 Mon Sep 17 00:00:00 2001
From: Isabel Tuson <isabel@mitre.org>
Date: Wed, 28 Apr 2021 12:06:51 -0400
Subject: [PATCH 19/20] revised changelog for clarity

---
 CHANGELOG.md | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03f59f1bf..8be4fc367 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,23 @@
-# v4.3 - 26 February 2021
+# v4.3 - 29 April 2021
+## New Features
+- Added aggregate scores. Aggregate scores are computed using the score of the technique and all sub-techniques using an "aggregate function" -- min, max, average, or sum. The aggregate score is used to determine the color of the technique in place of the technique's score. Aggregate scores are an optional feature and can be enabled in the "matrix configuration" dropdown. See issue [#269](https://github.com/mitre-attack/attack-navigator/issues/269).
+- The user can now suppress the "leave site?" warning dialog in the config file or via the "create a customized navigator" interface. See issue [#267](https://github.com/mitre-attack/attack-navigator/issues/267).
+- Added an (optional) configurable banner. The new "banner" field of the config file can be used to customize the banner content with full HTML support. See issue [#205](https://github.com/mitre-attack/attack-navigator/issues/205). 
+- Added button to toolbar to only expand all sub-techniques that are annotated. See issue [#256](https://github.com/mitre-attack/attack-navigator/issues/256).
+- Added support for displaying STIX 2.1 notes in tooltips. Notes attached to techniques in the STIX data are indicated in the same style as a comment. As of version 4.3 the ATT&CK Navigator supports STIX 2.1, but cannot load data from a TAXII 2.1 server.
 
-- Added aggregate score that displays the combined score of the technique and all of its sub-techniques. See issue [#269](https://github.com/mitre-attack/attack-navigator/issues/269).
-- Added support for displaying notes in tooltips. Notes on a technique are indicated in the same style as a comment.
-- Fixed a bug in exporting matrix to Excel sheet, where the style of all sub-techniques with the same name in a column were incorrectly over-ridden by the style of the first sub-technique in its name. See issue [#270](https://github.com/mitre-attack/attack-navigator/issues/270).
+## Improvements
 - Consolidated AWS, GCP, and Azure platforms into IaaS platform to integrate upcoming release of ATT&CK. See issue [#252](https://github.com/mitre-attack/attack-navigator/issues/252).
-- Added feature to disable leave site dialog. See issue [#267](https://github.com/mitre-attack/attack-navigator/issues/267).
-- Added configurable banner to announce new updates. See issue [#205](https://github.com/mitre-attack/attack-navigator/issues/205). 
-- Added feature to only expand all sub-techniques that are annotated. See issue [#256](https://github.com/mitre-attack/attack-navigator/issues/256).
+
+## Fixes
+- Fixed a bug in exporting matrix to Excel sheet, where the style of all sub-techniques with the same name in a column were incorrectly over-ridden by the style of the first sub-technique in its name. See issue [#270](https://github.com/mitre-attack/attack-navigator/issues/270).
+## Layer File Format Changes
+Layer file format updated to version 4.2. This update is fully backwards compatible with the layer format v4.1 since the added fields are optional. See [layers/LAYERFORMATv4_2.md](layers/LAYERFORMATv4_2.md) for the full specification.
+
+This update adds settings for aggregate scores to the layout object of the layer:
+- `showAggregateScores`, which turns on the feature
+- `countUnscored` which counts unscored techniques as if their score was `0` when the aggregate function is "average".
+- `aggregateFunction`: the desired aggregation function: "average", "min", "max" or "sum".
 
 # v4.2 - 3 February 2021
 

From daf282b9816be421d3a171ac8ae0037f817139ee Mon Sep 17 00:00:00 2001
From: Isabel Tuson <isabel@mitre.org>
Date: Wed, 28 Apr 2021 12:08:56 -0400
Subject: [PATCH 20/20] revise layer format document

---
 layers/LAYERFORMATv4_2.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/layers/LAYERFORMATv4_2.md b/layers/LAYERFORMATv4_2.md
index 065cf455a..e2dc5d9d8 100644
--- a/layers/LAYERFORMATv4_2.md
+++ b/layers/LAYERFORMATv4_2.md
@@ -1,4 +1,4 @@
-# ATT&CK<sup>TM</sup> Navigator Layer File Format Definition
+# ATT&CK® Navigator Layer File Format Definition
 This document describes **Version 4.2** of the MITRE ATT&CK Navigator Layer file format. The ATT&CK Navigator stores layers as JSON, therefore this document defines the JSON properties in a layer file.
 
 ## Property Table
@@ -27,7 +27,7 @@ This document describes **Version 4.2** of the MITRE ATT&CK Navigator Layer file
 
 | Name     | Type     | Required? | Default Value (if not present) | Description |
 | :------------- | :------------- | :------------- | :------------- | :------------- |
-| platforms | Array of String | No | all platforms within domain | Specifies the platforms within the technology domain – only those techniques tagged with these platforms are to be displayed. Valid values are as follows: <br>**domain=enterprise-attack**: "PRE", "Windows", "Linux", "macOS", "Network", "AWS", "GCP", "Azure", "Azure AD", "Office 365", "SaaS" <br>**domain=mobile-attack**: "Android", "iOS". <br>**domain=ics-attack**: "Windows", "Control Server", "Data Historian", "Engineering Workstation", "Field Controller/RTU/PLC/IED", "Human-Machine Interface", "Input/Output Server", "Safety Instrumented System/Protection Relay" |
+| platforms | Array of String | No | all platforms within domain | Specifies the platforms within the technology domain - only those techniques tagged with these platforms are to be displayed. Valid values are as follows: <br>**domain=enterprise-attack**: "PRE", "Windows", "Linux", "macOS", "Network", "AWS", "GCP", "Azure", "Azure AD", "Office 365", "SaaS" <br>**domain=mobile-attack**: "Android", "iOS". <br>**domain=ics-attack**: "Windows", "Control Server", "Data Historian", "Engineering Workstation", "Field Controller/RTU/PLC/IED", "Human-Machine Interface", "Input/Output Server", "Safety Instrumented System/Protection Relay" |
 
 ## Version Object Properties
 
@@ -48,9 +48,9 @@ Technique objects are used to store both techniques and subtechniques. The only
 | comment | String | No | "" | Free-text field |
 | enabled | Boolean | No | true | Specifies if the technique is considered enabled or disabled in this layer |
 | score | Number | No | (unscored) | Optional numeric score assigned to this technique in the layer. If omitted, the technique is considered to be "unscored" meaning that it will not be assigned a color from the gradient by the Navigator |
-| color | String | No | "" | Explicit color value assigned to the technique in this layer. Note that explicitly defined color overrides any color implied by the score – the Navigator will display the technique using the explicitly defined color |
+| color | String | No | "" | Explicit color value assigned to the technique in this layer. Note that explicitly defined color overrides any color implied by the score - the Navigator will display the technique using the explicitly defined color |
 | metadata | Array of Metadata objects and Metadata Separator objects | No | | User defined metadata for this technique. See definition of Metadata object and Metadata Separator object below |
-| showSubtechniques | boolean | No | false | if true, the sub-techniques under this technique will be shown by default. This field is only valid under a technique with subtechniques. Note that subtechniques can still be shown/hidden using the UI controls — this field is simply the default state. |
+| showSubtechniques | boolean | No | false | if true, the sub-techniques under this technique will be shown by default. This field is only valid under a technique with subtechniques. Note that subtechniques can still be shown/hidden using the UI controls - this field is simply the default state. |
 
 ## Gradient Object properties
 | Name     | Type     | Required? | Default Value (if not present) | Description |