From e6733d7e24e93dd29859b0c980596826c561de22 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Thu, 20 Jun 2019 10:59:54 +0100
Subject: [PATCH] Link to usage, not dashboard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Organisation team members only have access to the dashboard if they’re
also a member of that service.

They always have access to the usage page, so let’s link there instead.
---
 app/templates/org_nav.html                                | 2 +-
 app/templates/views/organisations/organisation/index.html | 6 +++---
 tests/app/main/views/organisations/test_organisation.py   | 6 +++---
 tests/app/test_navigation.py                              | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/templates/org_nav.html b/app/templates/org_nav.html
index fd3cc0c2d..a9f518e11 100644
--- a/app/templates/org_nav.html
+++ b/app/templates/org_nav.html
@@ -1,6 +1,6 @@
 <nav class="navigation">
   <ul>
-  	<li><a href="{{ url_for('.organisation_dashboard', org_id=current_org.id) }}" {{ org_navigation.is_selected('dashboard') }}>Services</a></li>
+  	<li><a href="{{ url_for('.organisation_dashboard', org_id=current_org.id) }}" {{ org_navigation.is_selected('dashboard') }}>Usage</a></li>
     <li><a href="{{ url_for('.manage_org_users', org_id=current_org.id) }}" {{ org_navigation.is_selected('team-members') }}>Team members</a></li>
     {% if current_user.platform_admin %}
     <li><a href="{{ url_for('.organisation_settings', org_id=current_org.id) }}" {{ org_navigation.is_selected('settings') }}>Settings</a></li>
diff --git a/app/templates/views/organisations/organisation/index.html b/app/templates/views/organisations/organisation/index.html
index c0ae8a5cd..49b7cf452 100644
--- a/app/templates/views/organisations/organisation/index.html
+++ b/app/templates/views/organisations/organisation/index.html
@@ -1,18 +1,18 @@
 {% extends "org_template.html" %}
 
 {% block org_page_title %}
-  Services
+  Usage
 {% endblock %}
 
 {% block maincolumn_content %}
 
   <h1 class="heading-medium">
-    Services
+    Usage
   </h1>
   <ul>
   {% for service in current_org.live_services %}
     <li class="browse-list-item">
-      <a href="{{ url_for('main.service_dashboard', service_id=service.id) }}" class="browse-list-link">{{ service['name'] }}</a>
+      <a href="{{ url_for('main.usage', service_id=service.id) }}" class="browse-list-link">{{ service['name'] }}</a>
     </li>
   {% endfor %}
   </ul>
diff --git a/tests/app/main/views/organisations/test_organisation.py b/tests/app/main/views/organisations/test_organisation.py
index 634182ec8..bfe84636d 100644
--- a/tests/app/main/views/organisations/test_organisation.py
+++ b/tests/app/main/views/organisations/test_organisation.py
@@ -72,7 +72,7 @@ def test_view_organisation_shows_the_correct_organisation(
         org_id=ORGANISATION_ID,
     )
 
-    assert normalize_spaces(page.select_one('h1').text) == 'Services'
+    assert normalize_spaces(page.select_one('h1').text) == 'Usage'
 
 
 def test_create_new_organisation(
@@ -121,8 +121,8 @@ def test_organisation_services_shows_live_services_only(
 
     assert normalize_spaces(services[0].text) == '1'
     assert normalize_spaces(services[1].text) == '5'
-    assert services[0].find('a')['href'] == url_for('main.service_dashboard', service_id=SERVICE_ONE_ID)
-    assert services[1].find('a')['href'] == url_for('main.service_dashboard', service_id=SERVICE_TWO_ID)
+    assert services[0].find('a')['href'] == url_for('main.usage', service_id=SERVICE_ONE_ID)
+    assert services[1].find('a')['href'] == url_for('main.usage', service_id=SERVICE_TWO_ID)
 
 
 def test_organisation_trial_mode_services_shows_all_non_live_services(
diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py
index 167ef9fac..8cfb8c2ba 100644
--- a/tests/app/test_navigation.py
+++ b/tests/app/test_navigation.py
@@ -130,7 +130,7 @@ def test_a_page_should_nave_selected_header_navigation_item(
 
 
 @pytest.mark.parametrize('endpoint, selected_nav_item', [
-    ('main.organisation_dashboard', 'Services'),
+    ('main.organisation_dashboard', 'Usage'),
     ('main.manage_org_users', 'Team members'),
 ])
 def test_a_page_should_nave_selected_org_navigation_item(