Merge pull request #2493 from alphagov/delete_folder

Add delete folder flow

app/main/views/templates.py

@@ -349,6 +349,8 @@ def action_blocked(service_id, notification_type, return_to, template_id):
 
 @main.route("/services/<service_id>/templates/add-folder", methods=['GET', 'POST'])
 @main.route("/services/<service_id>/templates/folders/<template_folder_id>/add-folder", methods=['GET', 'POST'])
+@login_required
+@user_has_permissions('manage_templates')
 def add_template_folder(service_id, template_folder_id=None):
     if not current_service.has_permission('edit_folders'):
         abort(403)
@@ -370,6 +372,8 @@ def add_template_folder(service_id, template_folder_id=None):
 
 
 @main.route("/services/<service_id>/templates/folders/<template_folder_id>/manage", methods=['GET', 'POST'])
+@login_required
+@user_has_permissions('manage_templates')
 def manage_template_folder(service_id, template_folder_id):
     if not current_service.has_permission('edit_folders'):
         abort(403)
@@ -390,6 +394,60 @@ def manage_template_folder(service_id, template_folder_id):
         'views/templates/manage-template-folder.html',
         form=form,
         template_folder_path=current_service.get_template_folder_path(template_folder_id),
+        current_service_id=current_service.id,
+        template_folder_id=template_folder_id
+    )
+
+
+@main.route("/services/<service_id>/templates/folders/<template_folder_id>/delete", methods=['GET', 'POST'])
+@login_required
+@user_has_permissions('manage_templates')
+def delete_template_folder(service_id, template_folder_id):
+    if not current_service.has_permission('edit_folders'):
+        abort(403)
+    form = TemplateFolderForm()
+    template_folder_path = current_service.get_template_folder_path(template_folder_id)
+    template_folder_name = template_folder_path[-1]["name"]
+
+    if len(current_service.get_template_folders_and_templates(
+        template_type="all", template_folder_id=template_folder_id
+    )) > 0:
+        flash("You must empty this folder before you can delete it".format(template_folder_name), 'info')
+        return redirect(
+            url_for(
+                '.choose_template', service_id=service_id, template_type="all", template_folder_id=template_folder_id
+            )
+        )
+
+    if request.method == 'POST':
+        try:
+            template_folder_api_client.delete_template_folder(current_service.id, template_folder_id)
+
+            return redirect(
+                url_for('.choose_template', service_id=service_id)
+            )
+        except HTTPError as e:
+            msg = "Folder is not empty"
+            if e.status_code == 400 and msg in e.message:
+                flash("You must empty this folder before you can delete it".format(template_folder_name), 'info')
+                return redirect(
+                    url_for(
+                        '.choose_template',
+                        service_id=service_id,
+                        template_type="all",
+                        template_folder_id=template_folder_id
+                    )
+                )
+            else:
+                abort(500, e)
+
+    flash("Are you sure you want to delete the '{}' folder?".format(template_folder_name), 'delete')
+    return render_template(
+        'views/templates/manage-template-folder.html',
+        form=form,
+        template_folder_path=template_folder_path,
+        current_service_id=current_service.id,
+        template_folder_id=template_folder_id
     )
 
 

app/navigation.py

@@ -142,6 +142,7 @@ class HeaderNavigation(Navigation):
         'create_api_key',
         'data_retention',
         'delete_service_template',
+        'delete_template_folder',
         'delivery_and_failure',
         'delivery_status_callback',
         'design_content',
@@ -409,6 +410,7 @@ class MainNavigation(Navigation):
         'cookies',
         'create_email_branding',
         'data_retention',
+        'delete_template_folder',
         'delivery_and_failure',
         'design_content',
         'documentation',
@@ -590,6 +592,7 @@ class CaseworkNavigation(Navigation):
         'create_email_branding',
         'data_retention',
         'delete_service_template',
+        'delete_template_folder',
         'delivery_and_failure',
         'delivery_status_callback',
         'design_content',
@@ -827,6 +830,7 @@ class OrgNavigation(Navigation):
         'create_email_branding',
         'data_retention',
         'delete_service_template',
+        'delete_template_folder',
         'delivery_and_failure',
         'delivery_status_callback',
         'design_content',

app/notify_client/template_folder_api_client.py

@@ -50,5 +50,9 @@ class TemplateFolderAPIClient(NotifyAdminAPIClient):
             {"name": name}
         )
 
+    @cache.delete('service-{service_id}-template-folders')
+    def delete_template_folder(self, service_id, template_folder_id):
+        self.delete('/service/{}/template-folder/{}'.format(service_id, template_folder_id), {})
+
 
 template_folder_api_client = TemplateFolderAPIClient()

app/templates/views/templates/manage-template-folder.html

@@ -25,7 +25,15 @@ Templates
 
   {% call form_wrapper() %}
     {{ textbox(form.name) }}
-    {{ page_footer('Save') }}
+    {{ page_footer(
+      'Save',
+      delete_link=url_for(
+        '.delete_template_folder',
+        service_id=current_service_id,
+        template_folder_id=template_folder_id
+      ),
+      delete_link_text="Delete this folder") }}
+
   {% endcall %}
 
 {% endblock %}

tests/app/main/views/test_template_folders.py

@@ -324,7 +324,11 @@ def test_get_manage_folder_page(client_request, service_one, mock_get_template_f
         service_id=service_one['id'],
         template_folder_id=folder_id
     )
-    assert page.select_one('input[name=name]')['value'] == 'folder_two'
+    assert page.select_one('input[name=name]') is not None
+    delete_link = page.find('a', string="Delete this folder")
+    expected_delete_url = "/services/{}/templates/folders/{}/delete".format(service_one['id'], folder_id)
+
+    assert expected_delete_url in delete_link["href"]
 
 
 def test_manage_folder_page_404s(client_request, service_one, mock_get_template_folders):
@@ -372,3 +376,27 @@ def test_rename_folder(client_request, service_one, mock_get_template_folders, m
         folder_id,
         name="new beautiful name"
     )
+
+
+def test_delete_folder(client_request, service_one, mock_get_template_folders, mocker):
+    mock_delete = mocker.patch('app.template_folder_api_client.delete_template_folder')
+    folder_id = str(uuid.uuid4())
+    mock_get_template_folders.side_effect = [[
+        {'id': folder_id, 'name': 'sacrifice', 'parent_id': None},
+    ], []]
+    mocker.patch(
+        'app.models.service.Service.get_templates',
+        return_value=[],
+    )
+    service_one['permissions'] += ['edit_folders']
+
+    client_request.post(
+        'main.delete_template_folder',
+        service_id=service_one['id'],
+        template_folder_id=folder_id,
+        _expected_redirect=url_for("main.choose_template",
+                                   service_id=service_one['id'],
+                                   _external=True)
+    )
+
+    mock_delete.assert_called_once_with(service_one['id'], folder_id)

tests/app/notify_client/test_template_folder_client.py

@@ -121,3 +121,20 @@ def test_update_template_folder_calls_correct_api_endpoint(mocker, api_user_acti
 
     mock_post.assert_called_once_with(expected_url, data)
     mock_redis_delete.assert_called_once_with('service-{}-template-folders'.format(some_service_id))
+
+
+def test_delete_template_folder_calls_correct_api_endpoint(mocker, api_user_active):
+    mock_redis_delete = mocker.patch('app.notify_client.RedisClient.delete')
+
+    some_service_id = uuid.uuid4()
+    template_folder_id = uuid.uuid4()
+    expected_url = '/service/{}/template-folder/{}'.format(some_service_id, template_folder_id)
+
+    client = TemplateFolderAPIClient()
+
+    mock_delete = mocker.patch('app.notify_client.template_folder_api_client.TemplateFolderAPIClient.delete')
+
+    client.delete_template_folder(some_service_id, template_folder_id)
+
+    mock_delete.assert_called_once_with(expected_url, {})
+    mock_redis_delete.assert_called_once_with('service-{}-template-folders'.format(some_service_id))