From 172f93e8411c8d6324274edfac95fbbfd421e614 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 3 Feb 2020 11:35:17 +0000
Subject: [PATCH] Refactor navigation logic

Will be easier to change if the navigation shown to org users is
separated from the navigation shown to regular users of a service.
---
 app/templates/main_nav.html | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html
index 884a78441..242394636 100644
--- a/app/templates/main_nav.html
+++ b/app/templates/main_nav.html
@@ -3,10 +3,10 @@
 {% else %}
 <nav class="navigation">
   <ul>
-  {% if current_user.has_permissions('view_activity') %}
-    <li><a href="{{ url_for('.service_dashboard', service_id=current_service.id) }}" {{ main_navigation.is_selected('dashboard') }}>Dashboard</a></li>
-  {% endif %}
   {% if current_user.has_permissions() %}
+    {% if current_user.has_permissions('view_activity') %}
+      <li><a href="{{ url_for('.service_dashboard', service_id=current_service.id) }}" {{ main_navigation.is_selected('dashboard') }}>Dashboard</a></li>
+    {% endif %}
     <li><a href="{{ url_for('.choose_template', service_id=current_service.id) }}" {{ main_navigation.is_selected('templates') }}>Templates</a></li>
     {% if current_user.has_permissions('view_activity') %}
       {% if current_service.can_upload_letters %}
@@ -18,17 +18,20 @@
         <li><a href="{{ url_for('main.uploads', service_id=current_service.id) }}" {{ casework_navigation.is_selected('uploads') }}>Uploads</a></li>
       {% endif %}
     {% endif %}
-  {% endif %}
     <li><a href="{{ url_for('.manage_users', service_id=current_service.id) }}" {{ main_navigation.is_selected('team-members') }}>Team members</a></li>
-  {% if current_user.has_permissions('manage_service', allow_org_user=True) %}
+    {% if current_user.has_permissions('manage_service', allow_org_user=True) %}
+      <li><a href="{{ url_for('.usage', service_id=current_service.id) }}" {{ main_navigation.is_selected('usage') }}>Usage</a></li>
+    {% endif %}
+    {% if current_user.has_permissions('manage_api_keys', 'manage_service') %}
+      <li><a href="{{ url_for('.service_settings', service_id=current_service.id) }}" {{ main_navigation.is_selected('settings') }}>Settings</a></li>
+    {% endif %}
+    {% if current_user.has_permissions('manage_api_keys') %}
+      <li><a href="{{ url_for('.api_integration', service_id=current_service.id) }}" {{ main_navigation.is_selected('api-integration') }}>API integration</a></li>
+    {% endif %}
+  {% elif current_user.has_permissions(allow_org_user=True) %}
+    <li><a href="{{ url_for('.manage_users', service_id=current_service.id) }}" {{ main_navigation.is_selected('team-members') }}>Team members</a></li>
     <li><a href="{{ url_for('.usage', service_id=current_service.id) }}" {{ main_navigation.is_selected('usage') }}>Usage</a></li>
   {% endif %}
-  {% if current_user.has_permissions('manage_api_keys', 'manage_service') %}
-    <li><a href="{{ url_for('.service_settings', service_id=current_service.id) }}" {{ main_navigation.is_selected('settings') }}>Settings</a></li>
-  {% endif %}
-  {% if current_user.has_permissions('manage_api_keys') %}
-    <li><a href="{{ url_for('.api_integration', service_id=current_service.id) }}" {{ main_navigation.is_selected('api-integration') }}>API integration</a></li>
-  {% endif %}
   </ul>
 </nav>
 {% endif %}