Merge pull request #939 from alphagov/platform-admin-reorg

Reorganise list of services on platform admin page

app/assets/stylesheets/components/table.scss

@@ -139,6 +139,10 @@
     width: 52.5%;
   }
 
+}
+
+.table-field-heading {
+
   &:last-child {
     padding-right: 0;
   }

app/main/views/platform_admin.py

@@ -18,14 +18,23 @@ def platform_admin():
     services = service_api_client.get_services({'detailed': True})['data']
     return render_template(
         'views/platform-admin.html',
-        **get_statistics(services)
+        **get_statistics(sorted(
+            services,
+            key=lambda service: service['created_at'],
+            reverse=True
+        ))
     )
 
 
 def get_statistics(services):
     return {
         'global_stats': create_global_stats(services),
-        'service_stats': format_stats_by_service(services)
+        'live_services': format_stats_by_service([
+            service for service in services if not service['restricted']
+        ]),
+        'trial_mode_services': format_stats_by_service([
+            service for service in services if service['restricted']
+        ]),
     }
 
 
@@ -62,5 +71,6 @@ def format_stats_by_service(services):
             'delivered': sum(stat['delivered'] for stat in stats),
             'failed': sum(stat['failed'] for stat in stats),
             'restricted': service['restricted'],
-            'research_mode': service['research_mode']
+            'research_mode': service['research_mode'],
+            'created_at': service['created_at']
         }

app/templates/views/platform-admin.html

@@ -4,6 +4,51 @@
 {% from "components/browse-list.html" import browse_list %}
 {% from "components/table.html" import list_table, field, right_aligned_field_heading, hidden_field_heading, text_field %}
 
+{% macro services_table(services, caption) %}
+  {% call(item, row_number) list_table(
+    services,
+    caption=caption,
+    caption_visible=True,
+    field_headings=[
+      'Service',
+      hidden_field_heading('Status'),
+      right_aligned_field_heading('Sending'),
+      right_aligned_field_heading('Delivered'),
+      right_aligned_field_heading('Failed')
+    ],
+    field_headings_visible=True
+  ) %}
+    {% call field() %}
+      <div>
+        <a href="{{ url_for('main.service_dashboard', service_id=item['id']) }}" class="browse-list-link">{{ item['name'] }}</a>
+      </div>
+    {% endcall %}
+    {% if item['research_mode'] %}
+      {% call field() %}
+        <span class="research-mode">research mode</span>
+      {% endcall %}
+    {% elif not item['restricted'] %}
+      {% call field(status='error') %}
+        <span class="heading-medium">
+          Live
+        </span>
+      {% endcall %}
+    {% else %}
+      {{ text_field('') }}
+    {% endif %}
+    {% call field(align='right') %}
+      {{ big_number(item['sending'], smaller=True) }}
+    {% endcall %}
+    {% call field(align='right') %}
+      {{ big_number(item['delivered'], smaller=True) }}
+    {% endcall %}
+    {% call field(align='right', status='error' if 0 else '') %}
+      {{ big_number(item['failed'], smaller=True) }}
+    {% endcall %}
+  {% endcall %}
+{% endmacro %}
+
+
 {% block page_title %}
   Platform admin – GOV.UK Notify
 {% endblock %}
@@ -44,47 +89,8 @@
     </div>
   </div>
 
-  <h2 class='heading-medium visually-hidden'>Services</h2>
-  {% call(item, row_number) list_table(
-    service_stats,
-    caption="All services",
-    caption_visible=False,
-    field_headings=[
-      'Service',
-      hidden_field_heading('Status'),
-      right_aligned_field_heading('Sending'),
-      right_aligned_field_heading('Delivered'),
-      right_aligned_field_heading('Failed')
-    ],
-    field_headings_visible=True
-  ) %}
-    {% call field() %}
-      <div>
-        <a href="{{ url_for('main.service_dashboard', service_id=item['id']) }}" class="browse-list-link">{{ item['name'] }}</a>
-      </div>
-    {% endcall %}
-    {% if item['research_mode'] %}
-      {% call field() %}
-        <span class="research-mode">research mode</span>
-      {% endcall %}
-    {% elif not item['restricted'] %}
-      {% call field(status='error') %}
-        <span class="heading-medium">
-          Live
-        </span>
-      {% endcall %}
-    {% else %}
-      {{ text_field('') }}
-    {% endif %}
-    {% call field(align='right') %}
-      {{ big_number(item['sending'], smaller=True) }}
-    {% endcall %}
-    {% call field(align='right') %}
-      {{ big_number(item['delivered'], smaller=True) }}
-    {% endcall %}
-    {% call field(align='right', status='error' if 0 else '') %}
-      {{ big_number(item['failed'], smaller=True) }}
-    {% endcall %}
-  {% endcall %}
+  {{ services_table(live_services, 'Live services') }}
+
+  {{ services_table(trial_mode_services, 'Trial mode services') }}
 
 {% endblock %}

tests/__init__.py

@@ -65,7 +65,8 @@ def service_json(
         'sms_sender': sms_sender,
         'research_mode': research_mode,
         'organisation': organisation,
-        'branding': branding
+        'branding': branding,
+        'created_at': str(datetime.utcnow())
     }
 
 

tests/app/main/views/test_platform_admin.py

@@ -30,14 +30,15 @@ def test_should_403_if_not_platform_admin(app_, active_user_with_permissions, mo
             assert response.status_code == 403
 
 
-@pytest.mark.parametrize('restricted, research_mode, displayed', [
-    (True, False, ''),
-    (False, False, 'Live'),
-    (False, True, 'research mode'),
-    (True, True, 'research mode')
+@pytest.mark.parametrize('restricted, table_index, research_mode, displayed', [
+    (True, 1, False, ''),
+    (False, 0, False, 'Live'),
+    (False, 0, True, 'research mode'),
+    (True, 1, True, 'research mode')
 ])
 def test_should_show_research_and_restricted_mode(
     restricted,
+    table_index,
     research_mode,
     displayed,
     app_,
@@ -60,7 +61,7 @@ def test_should_show_research_and_restricted_mode(
     mock_get_detailed_services.assert_called_once_with({'detailed': True})
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
     # get second column, which contains flags as text.
-    assert page.tbody.select('td:nth-of-type(2)')[0].text.strip() == displayed
+    assert page.find_all('tbody')[table_index].find_all('td')[1].text.strip() == displayed
 
 
 def test_should_render_platform_admin_page(
@@ -79,7 +80,8 @@ def test_should_render_platform_admin_page(
     resp_data = response.get_data(as_text=True)
     assert 'Platform admin' in resp_data
     assert 'Today' in resp_data
-    assert 'Services' in resp_data
+    assert 'Live services' in resp_data
+    assert 'Trial mode services' in resp_data
     mock_get_detailed_services.assert_called_once_with({'detailed': True})
 
 

tests/conftest.py

@@ -84,7 +84,8 @@ def mock_get_detailed_service(mocker, api_user_active):
                 'statistics': {
                     'email': {'requested': 0, 'delivered': 0, 'failed': 0},
                     'sms': {'requested': 0, 'delivered': 0, 'failed': 0}
-                }
+                },
+                'created_at': str(datetime.utcnow())
             }
         }