From 96da55f5aaebca591bbcb03faff8faebd6026e93 Mon Sep 17 00:00:00 2001
From: minkyngkm <min.kim@canonical.com>
Date: Thu, 1 Aug 2024 12:53:49 +0100
Subject: [PATCH 1/2] Update navigation

---
 navigation.yaml                      | 14 ++++++++++++++
 templates/templates/_navigation.html | 11 ++++++++++-
 webapp/app.py                        |  3 +++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/navigation.yaml b/navigation.yaml
index bc24c673fb2..3fcf19ac44a 100644
--- a/navigation.yaml
+++ b/navigation.yaml
@@ -333,6 +333,20 @@ pro:
     - title: Discourse
       path: https://discourse.ubuntu.com/c/ubuntu-pro
 
+Distributor:
+  title: Ubuntu Pro Distributor
+  path: /pro/distributor
+
+  children:
+    - title: Overview
+      path: /pro/distributor
+    - title: Account users
+      path: /pro/distributor/users
+    - title: Docs
+      path: https://documentation.ubuntu.com/pro
+    - title: Discourse
+      path: https://discourse.ubuntu.com/c/ubuntu-pro
+
 account:
   title: Account
   path: /account
diff --git a/templates/templates/_navigation.html b/templates/templates/_navigation.html
index 990bb8808e3..d9e7a8dc449 100644
--- a/templates/templates/_navigation.html
+++ b/templates/templates/_navigation.html
@@ -148,7 +148,7 @@
             {% endif %}
           {% endif %}
         </div>
-
+        
         <nav class="p-navigation__nav"
              aria-label="{{ breadcrumbs.section.title | replace(' ', '&nbsp;') | safe }} navigation">
           {% if breadcrumbs.children %}
@@ -179,12 +179,21 @@
                   {% elif child.path != '/blog/archives' and child.path != '/blog/upcoming' %}
                     {% set has_access = not child.login_required or child.login_required and user_info %}
                     {% if has_access %}
+                      {% if breadcrumbs.section.title == "Ubuntu Pro Distributor" and child.title == "Docs" or child.title == "Discourse" %}
+                        <li class="p-navigation__item {% if child.active %}is-selected{% endif %}">
+                          <a class="p-navigation__link"
+                            href="{{ child.path }}" target="_blank"
+                            {% if child.active %}aria-current="page"{% endif %}>{{
+                          child.title }}</a>
+                        </li>
+                      {% else %}
                       <li class="p-navigation__item {% if child.active %}is-selected{% endif %}">
                         <a class="p-navigation__link"
                            href="{{ child.path }}"
                            {% if child.active %}aria-current="page"{% endif %}>{{
                         child.title }}</a>
                       </li>
+                      {% endif %}
                     {% endif %}
                   {% endif %}
                 {% endif %}
diff --git a/webapp/app.py b/webapp/app.py
index ef1fe6f54ef..5165b6aedb5 100644
--- a/webapp/app.py
+++ b/webapp/app.py
@@ -220,6 +220,9 @@
     "/pro/contracts/<contract_id>/token", view_func=get_contract_token
 )
 app.add_url_rule("/pro/users", view_func=advantage_account_users_view)
+app.add_url_rule(
+    "/pro/distributor/users", view_func=advantage_account_users_view
+)
 app.add_url_rule("/pro/account-users", view_func=get_account_users)
 app.add_url_rule(
     "/pro/accounts/<account_id>/user",

From 32262821642779cc17172cf29cc7ec5a25c1034c Mon Sep 17 00:00:00 2001
From: minkyngkm <min.kim@canonical.com>
Date: Thu, 1 Aug 2024 12:54:11 +0100
Subject: [PATCH 2/2] Display page in a new tab

---
 static/js/src/advantage/distributor/Distributor.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/js/src/advantage/distributor/Distributor.tsx b/static/js/src/advantage/distributor/Distributor.tsx
index e95c2c4fca0..4500ad6c10f 100644
--- a/static/js/src/advantage/distributor/Distributor.tsx
+++ b/static/js/src/advantage/distributor/Distributor.tsx
@@ -28,6 +28,8 @@ const Distributor = () => {
               <a
                 className="p-button--positive"
                 href="https://www.partner.canonical.com/#/deals/new"
+                target="_blank"
+                rel="noopener noreferrer"
               >
                 <Icon
                   name={ICONS.externalLink}