Merge lp:~rvb/maas/nel-ui into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Improve the node event log UI: display the event time as "time since", use proper dash sign in display, add support for debug-level events.

This is how it looks like: http://people.canonical.com/~rvb/nel-display.png.

[Jeroen T. Vermeulen (jtv)]

Wow. The GTF didn't have any entries for NEL yet. Thanks for filling that gap.

I was wondering what you meant by “proper dash sign” — this kind of dash is called an emdash. The shorter one is an endash. They're both proper, just for different situations. I love them both. :)

Two very minor notes:

1. Could you break that long line in the template?

2. Would it be worth displaying a timezone?

review: Approve

[Raphaël Badin (rvb)]

> I was wondering what you meant by “proper dash sign” — this kind of dash is
> called an emdash. The shorter one is an endash. They're both proper, just
> for different situations. I love them both. :)

The template was using '--' before this change. Hence me using the word 'proper'.

> Two very minor notes:
>
> 1. Could you break that long line in the template?

Done.

> 2. Would it be worth displaying a timezone?

I've added it (in the full date you get when hovering over a "1 day ago" display).

Thanks for the review!

=== modified file 'src/maasserver/static/css/components/table_list.css'
--- src/maasserver/static/css/components/table_list.css	2014-08-13 21:49:35 +0000
+++ src/maasserver/static/css/components/table_list.css	2014-09-23 09:46:17 +0000
@@ -42,6 +42,10 @@
     text-align: right;
     }
 
+table.list tr.debug {
+    color: #AAA;
+    }
+
 table.list tr.warning {
     background-color: #FEEFB3;
     }

=== modified file 'src/maasserver/templates/maasserver/node_event_list_snippet.html'
--- src/maasserver/templates/maasserver/node_event_list_snippet.html	2014-09-18 03:15:07 +0000
+++ src/maasserver/templates/maasserver/node_event_list_snippet.html	2014-09-23 09:46:17 +0000
@@ -4,23 +4,20 @@
     <thead>
       <tr>
         <th>Level</th>
-        <th>Timestamp</th>
+        <th>Emitted</th>
         <th>Event</th>
         </tr>
     </thead>
     <tbody>
       {% for event_item in event_list %}
-      <tr {% if event_item.type.level_str == 'WARNING' %} class="warning"
-          {% elif event_item.type.level_str == 'ERROR' %} class="error"
-          {% elif event_item.type.level_str == 'CRITICAL' %} class="critical"
-          {% endif %} id="{{ event_item.id }}">
+      <tr class="{{ event_item.type.level_str|lower }}" id="{{ event_item.id }}">
         <td width="10%">{{ event_item.type.level_str }}</td>
-        <td width="30%">{{ event_item.created|date:'Y-m-d H:i:s' }}</td>
+        <td width="30%" title="{{ event_item.created|date:'r' }}">
+          {{ event_item.created|timesince }} ago
+        </td>
         <td class="event_description">
-        {{ event_item.type.description }} 
-        {% if event_item.description %}
-        -- {{ event_item.description }}
-        {% endif %}
+        {{ event_item.type.description }}
+        {% if event_item.description %} &mdash; {{ event_item.description }}{% endif %}
         </td>
         <td></td>
       </tr>

=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2014-09-19 12:48:48 +0000
+++ src/maasserver/testing/factory.py	2014-09-23 09:46:17 +0000
@@ -989,16 +989,19 @@
             description = factory.make_name('description')
         if level is None:
             level = random.choice([
-                logging.ERROR, logging.WARNING, logging.INFO])
+                logging.ERROR, logging.WARNING, logging.INFO, logging.DEBUG])
         return EventType.objects.create(
             name=name, description=description, level=level)
 
-    def make_Event(self, node=None, type=None):
+    def make_Event(self, node=None, type=None, description=None):
         if node is None:
             node = self.make_Node()
         if type is None:
             type = self.make_EventType()
-        return Event.objects.create(node=node, type=type)
+        if description is None:
+            description = self.make_name('desc')
+        return Event.objects.create(
+            node=node, type=type, description=description)
 
     def make_LargeFile(self, content=None, size=512):
         """Create `LargeFile`.

=== modified file 'src/maasserver/views/tests/test_nodes.py'
--- src/maasserver/views/tests/test_nodes.py	2014-09-19 09:40:37 +0000
+++ src/maasserver/views/tests/test_nodes.py	2014-09-23 09:46:17 +0000
@@ -97,6 +97,10 @@
     )
 
 
+def normalize_text(text):
+    return ' '.join(text.split())
+
+
 class TestGenerateJSPowerTypes(MAASServerTestCase):
     def patch_power_types(self, enum):
         """Make `get_power_types` return the given `enum` dict."""
@@ -1245,13 +1249,19 @@
             for _ in range(NodeView.number_of_events_shown)
         ]
         response = self.client.get(reverse('node-view', args=[node.system_id]))
-        self.assertIn("Latest node events", response.content)
+        self.assertIn("Latest node events", response.content.decode('utf8'))
         document = fromstring(response.content)
         events_displayed = document.xpath(
             "//div[@id='node_event_list']//td[@class='event_description']")
         self.assertItemsEqual(
-            [event.type.description for event in events],
-            [display.text_content().strip() for display in events_displayed]
+            [
+                event.type.description + ' \u2014 ' + event.description
+                for event in events
+            ],
+            [
+                normalize_text(display.text_content())
+                for display in events_displayed
+            ]
         )
 
     def test_node_view_doesnt_show_events_from_other_nodes(self):
@@ -1275,7 +1285,7 @@
         factory.make_Event(node=node)
         response = self.client.get(
             reverse('node-view', args=[node.system_id]))
-        self.assertIn("Latest node events", response.content)
+        self.assertIn("Latest node events", response.content.decode('utf8'))
         document = fromstring(response.content)
         [events_section] = document.xpath("//li[@id='node-events']")
         self.assertIn(
@@ -1290,7 +1300,7 @@
             factory.make_Event(node=node)
         response = self.client.get(
             reverse('node-view', args=[node.system_id]))
-        self.assertIn("Latest node events", response.content)
+        self.assertIn("Latest node events", response.content.decode('utf8'))
         document = fromstring(response.content)
         [events_section] = document.xpath("//li[@id='node-events']")
         self.assertIn(
@@ -1370,8 +1380,14 @@
         events_displayed = document.xpath(
             "//div[@id='node_event_list']//td[@class='event_description']")
         self.assertItemsEqual(
-            [event.type.description for event in events],
-            [display.text_content().strip() for display in events_displayed]
+            [
+                event.type.description + ' \u2014 ' + event.description
+                for event in events
+            ],
+            [
+                normalize_text(display.text_content())
+                for display in events_displayed
+            ]
         )
 
     def test_event_log_is_paginated(self):