Make jobs and uploads page the same

This makes these pages call the same code.

We can resolve the multiple URLs once we’ve removed the feature flag.

app/main/views/uploads.py

@@ -19,6 +19,7 @@ from app import current_service, notification_api_client, service_api_client
 from app.extensions import antivirus_client
 from app.main import main
 from app.main.forms import PDFUploadForm
+from app.main.views.jobs import view_jobs
 from app.s3_client.s3_letter_upload_client import (
     get_letter_metadata,
     get_letter_pdf_and_metadata,
@@ -38,7 +39,7 @@ MAX_FILE_UPLOAD_SIZE = 2 * 1024 * 1024  # 2MB
 @main.route("/services/<service_id>/uploads")
 @user_has_permissions('send_messages')
 def uploads(service_id):
-    return render_template('views/uploads/index.html')
+    return view_jobs(service_id)
 
 
 @main.route("/services/<service_id>/upload-letter", methods=['GET', 'POST'])

app/templates/views/uploads/index.html

@@ -1,18 +0,0 @@
-{% extends "withnav_template.html" %}
-{% from "components/page-header.html" import page_header %}
-
-{% block service_page_title %}
-  Uploads
-{% endblock %}
-
-{% block maincolumn_content %}
-<div class="grid-row">
-  <div class="column-five-sixths">
-    {{ page_header('Uploads') }}
-
-    <p>Upload a letter and Notify will print, pack and post it for you.</p>
-
-    <a href="{{ url_for('.upload_letter', service_id=current_service.id) }}" class="button-secondary">Upload a letter</a>
-  </div>
-</div>
-{% endblock %}

tests/app/main/views/test_uploads.py

@@ -8,6 +8,26 @@ from app.utils import normalize_spaces
 from tests.conftest import SERVICE_ONE_ID
 
 
+@pytest.mark.parametrize('extra_permissions', (
+    [],
+    ['letter'],
+    ['upload_letters'],
+    pytest.param(
+        ['letter', 'upload_letters'],
+        marks=pytest.mark.xfail(raises=AssertionError),
+    ),
+))
+def test_no_upload_letters_button_without_permission(
+    client_request,
+    service_one,
+    mock_get_jobs,
+    extra_permissions,
+):
+    service_one['permissions'] += extra_permissions
+    page = client_request.get('main.uploads', service_id=SERVICE_ONE_ID)
+    assert not page.find('a', text='Upload a letter')
+
+
 def test_get_upload_hub_page(
     client_request,
     service_one,