Merge pull request #568 from alphagov/template_history_view

Template history view

app/main/views/jobs.py

@@ -57,7 +57,9 @@ def view_jobs(service_id):
 @user_has_permissions('view_activity', admin_override=True)
 def view_job(service_id, job_id):
     job = job_api_client.get_job(service_id, job_id)['data']
-    template = service_api_client.get_service_template(service_id, job['template'])['data']
+    template = service_api_client.get_service_template(service_id=service_id,
+                                                       template_id=job['template'],
+                                                       version=job['template_version'])['data']
     notifications = notification_api_client.get_notifications_for_service(service_id, job_id)
     finished = job['status'] == 'finished'
     return render_template(

app/main/views/templates.py

@@ -21,7 +21,7 @@ page_headings = {
 }
 
 
-@main.route("/services/<service_id>/templates/<template_id>", methods=['GET'])
+@main.route("/services/<service_id>/templates/<template_id>")
 @login_required
 @user_has_permissions(
     'view_activity',
@@ -41,6 +41,27 @@ def view_template(service_id, template_id):
     )
 
 
+@main.route("/services/<service_id>/templates/<template_id>/version/<int:version>")
+@login_required
+@user_has_permissions(
+    'view_activity',
+    'send_texts',
+    'send_emails',
+    'manage_templates',
+    'manage_api_keys',
+    admin_override=True,
+    any_=True
+)
+def view_template_version(service_id, template_id, version):
+    return render_template(
+        'views/templates/template_history.html',
+        template=Template(
+            service_api_client.get_service_template(service_id, template_id, version)['data'],
+            prefix=current_service['name']
+        )
+    )
+
+
 @main.route("/services/<service_id>/templates/add-<template_type>", methods=['GET', 'POST'])
 @login_required
 @user_has_permissions('manage_templates', admin_override=True)
@@ -142,3 +163,30 @@ def delete_service_template(service_id, template_id):
         h1='Edit template',
         form=form,
         template_id=template_id)
+
+
+@main.route('/services/<service_id>/templates/<template_id>/versions')
+@login_required
+@user_has_permissions(
+    'view_activity',
+    'send_texts',
+    'send_emails',
+    'manage_templates',
+    'manage_api_keys',
+    admin_override=True,
+    any_=True
+)
+def view_template_versions(service_id, template_id):
+    return render_template(
+        'views/templates/choose_history.html',
+        template=Template(
+            service_api_client.get_service_template(service_id, template_id)['data'],
+            prefix=current_service['name']
+        ),
+        versions=[
+            Template(
+                template,
+                prefix=current_service['name']
+            ) for template in service_api_client.get_service_template_versions(service_id, template_id)['data']
+        ]
+    )

app/notify_client/api_client.py

@@ -128,13 +128,25 @@ class ServiceAPIClient(NotificationsAPIClient):
         endpoint = "/service/{0}/template/{1}".format(service_id, id_)
         return self.post(endpoint, data)
 
-    def get_service_template(self, service_id, template_id, *params):
+    def get_service_template(self, service_id, template_id, version=None, *params):
         """
         Retrieve a service template.
         """
         endpoint = '/service/{service_id}/template/{template_id}'.format(
             service_id=service_id,
             template_id=template_id)
+        if version:
+            endpoint = '{base}/version/{version}'.format(base=endpoint, version=version)
+        return self.get(endpoint, *params)
+
+    def get_service_template_versions(self, service_id, template_id, *params):
+        """
+        Retrieve a list of versions for a template
+        """
+        endpoint = '/service/{service_id}/template/{template_id}/versions'.format(
+            service_id=service_id,
+            template_id=template_id
+        )
         return self.get(endpoint, *params)
 
     def get_service_templates(self, service_id, *params):

app/templates/components/email-message.html

@@ -15,6 +15,7 @@
       {% else %}
         {{ name }}
       {% endif %}
+      {% if created_at %}{{ created_at }}{% endif %}
     </h3>
   {% endif %}
   <div class="email-message">

app/templates/components/sms-message.html

@@ -14,6 +14,7 @@
       {% else %}
         {{ name }}
       {% endif %}
+      {% if created_at %}{{ created_at }}{% endif %}
     </h3>
   {% endif %}
   {% if recipient is not none %}

app/templates/views/notifications.html

@@ -81,7 +81,7 @@
         {{ item.to }}
       </p>
       <p class="hint">
-        <a href="{{ url_for('.view_template', service_id=current_service.id, template_id=item.template.id) }}">{{ item.template.name }}</a>
+        <a href="{{ url_for('.view_template_version', service_id=current_service.id, template_id=item.template.id, version=item.template_version) }}">{{ item.template.name }}</a>
         sent from
         {% if item.job %}
           <a href="{{ url_for(".view_job", service_id=current_service.id, job_id=item.job.id) }}">{{ item.job.original_file_name }}</a>

app/templates/views/templates/_template.html

@@ -25,6 +25,7 @@
     {% if current_user.has_permissions(permissions=['manage_templates'], admin_override=True) %}
        <a href="{{ url_for(".edit_service_template", service_id=current_service.id, template_id=template.id) }}">Edit template</a>
     {% endif %}
+    <a href="{{ url_for('.view_template_versions', service_id=current_service.id, template_id=template.id) }}">Template versions</a>
     <a href="{{ url_for(".send_from_api", service_id=current_service.id, template_id=template.id) }}">API info</a>
   </div>
 </div>

app/templates/views/templates/_template_history.html

@@ -0,0 +1,40 @@
+{% from "components/email-message.html" import email_message %}
+{% from "components/sms-message.html" import sms_message %}
+
+<div class="column-two-thirds">
+  {% if 'email' == template.template_type %}
+    {{ email_message(
+      template.formatted_subject_as_markup,
+      template.formatted_as_markup,
+      name=template.name if show_title else None,
+      edit_link=url_for(
+        '.view_template_version',
+        service_id=current_service.id,
+        template_id=template.id,
+        version=template.get_raw('version')
+      )
+    ) }}
+  {% elif 'sms' == template.template_type %}
+    {{ sms_message(
+      template.formatted_as_markup,
+      name=template.name if show_title else None,
+      edit_link=url_for(
+        '.view_template_version',
+        service_id=current_service.id,
+        template_id=template.id,
+        version=template.get_raw('version')
+      )
+    ) }}
+  {% endif %}
+</div>
+
+<div class="column-one-third">
+  <div class="sms-message-use-links{% if show_title %}-with-title{% endif %}">
+    <p>Edited by {{ template.get_raw('created_by').name }}</p>
+    <p>Created on {{ template.get_raw('created_at')|format_datetime }}</p>
+    <p>Edited on
+      {% if template.get_raw('updated_at') %}
+        {{ template.get_raw('updated_at')|format_datetime }}</p>
+      {% endif %}
+  </div>
+</div>

app/templates/views/templates/choose_history.html

@@ -0,0 +1,16 @@
+{% extends "withnav_template.html" %}
+
+{% block page_title %}
+  {{ template.name }} – GOV.UK Notify
+{% endblock %}
+
+{% block maincolumn_content %}
+    <h1 class="heading-large">{{ template.name }} version history</h1>
+    <div class="grid-row">
+      {% for template in versions %}
+        {% with show_title=True %}
+          {% include 'views/templates/_template_history.html' %}
+        {% endwith %}
+      {% endfor %}
+    </div>
+{% endblock %}

app/templates/views/templates/template_history.html

@@ -0,0 +1,22 @@
+{% extends "withnav_template.html" %}
+{% from "components/email-message.html" import email_message %}
+{% from "components/sms-message.html" import sms_message %}
+{% from "components/page-footer.html" import page_footer %}
+{% from "components/textbox.html" import textbox %}
+
+{% block page_title %}
+  {{ template.name }} – GOV.UK Notify
+{% endblock %}
+
+{% block maincolumn_content %}
+
+
+  <h1 class="heading-large">{{ template.name }}</h1>
+
+  <div class="grid-row">
+    {% with show_title=False %}
+      {% include 'views/templates/_template_history.html' %}
+    {% endwith %}
+  </div>
+
+{% endblock %}