Merge pull request #4258 from alphagov/speed-up-templates-page-179736794

Optimise load time for service "Templates" page

Author: benthorner

app/main/views/templates.py

@@ -104,8 +104,12 @@ def choose_template(service_id, template_type='all', template_folder_id=None):
 
     template_list = TemplateList(current_service, template_type, template_folder_id, current_user)
 
+    all_template_folders = [
+        item.folder for item in TemplateList(service=current_service, user=current_user) if item.is_folder
+    ]
+
     templates_and_folders_form = TemplateAndFoldersSelectionForm(
-        all_template_folders=current_service.get_user_template_folders(current_user),
+        all_template_folders=all_template_folders,
         template_list=template_list,
         template_type=template_type,
         available_template_types=current_service.available_template_types,
@@ -470,10 +474,9 @@ def manage_template_folder(service_id, template_folder_id):
 @user_has_permissions('manage_templates')
 def delete_template_folder(service_id, template_folder_id):
     template_folder = current_service.get_template_folder_with_user_permission_or_403(template_folder_id, current_user)
+    template_list = TemplateList(service=current_service, template_folder_id=template_folder_id)
 
-    if len(current_service.get_template_folders_and_templates(
-        template_type="all", template_folder_id=template_folder_id
-    )) > 0:
+    if not template_list.folder_is_empty:
         flash("You must empty this folder before you can delete it", 'info')
         return redirect(
             url_for(

app/models/service.py

@@ -223,22 +223,6 @@ def all_templates(self):
     def all_template_ids(self):
         return {template['id'] for template in self.all_templates}
 
-    def get_templates(self, template_type='all', template_folder_id=None, user=None):
-        if user and template_folder_id:
-            folder = self.get_template_folder(template_folder_id)
-            if not user.has_template_folder_permission(folder):
-                return []
-
-        if isinstance(template_type, str):
-            template_type = [template_type]
-        if template_folder_id:
-            template_folder_id = str(template_folder_id)
-        return [
-            template for template in self.all_templates
-            if (set(template_type) & {'all', template['template_type']})
-            and template.get('folder') == template_folder_id
-        ]
-
     def get_template(self, template_id, version=None):
         return service_api_client.get_service_template(self.id, template_id, version)['data']
 
@@ -552,63 +536,6 @@ def all_template_folders(self):
     def all_template_folder_ids(self):
         return {folder['id'] for folder in self.all_template_folders}
 
-    def get_user_template_folders(self, user):
-        """Returns a modified list of folders a user has permission to view
-
-        For each folder, we do the following:
-        - if user has no permission to view the folder, skip it
-        - if folder is visible and its parent is visible, we add it to the list of folders
-        we later return without modifying anything
-        - if folder is visible, but the parent is not, we iterate through the parent until we
-        either find a visible parent or reach root folder. On each iteration we concatenate
-        invisible parent folder name to the front of our folder name, modifying the name, and we
-        change parent_folder_id attribute to a higher level parent. This flattens the path to the
-        folder making sure it displays in the closest visible parent.
-
-        """
-        user_folders = []
-        for folder in self.all_template_folders:
-            if not user.has_template_folder_permission(folder, service=self):
-                continue
-            parent = self.get_template_folder(folder["parent_id"])
-            if user.has_template_folder_permission(parent, service=self):
-                user_folders.append(folder)
-            else:
-                folder_attrs = {
-                    "id": folder["id"], "name": folder["name"], "parent_id": folder["parent_id"],
-                    "users_with_permission": folder["users_with_permission"]
-                }
-                while folder_attrs["parent_id"] is not None:
-                    folder_attrs["name"] = [
-                        parent["name"],
-                        folder_attrs["name"],
-                    ]
-                    if parent["parent_id"] is None:
-                        folder_attrs["parent_id"] = None
-                    else:
-                        parent = self.get_template_folder(parent["parent_id"])
-                        folder_attrs["parent_id"] = parent.get("id", None)
-                        if user.has_template_folder_permission(parent, service=self):
-                            break
-                user_folders.append(folder_attrs)
-        return user_folders
-
-    def get_template_folders(self, template_type='all', parent_folder_id=None, user=None):
-        if user:
-            folders = self.get_user_template_folders(user)
-        else:
-            folders = self.all_template_folders
-        if parent_folder_id:
-            parent_folder_id = str(parent_folder_id)
-
-        return [
-            folder for folder in folders
-            if (
-                folder['parent_id'] == parent_folder_id
-                and self.is_folder_visible(folder['id'], template_type, user)
-            )
-        ]
-
     def get_template_folder(self, folder_id):
         if folder_id is None:
             return {
@@ -618,22 +545,6 @@ def get_template_folder(self, folder_id):
             }
         return self._get_by_id(self.all_template_folders, folder_id)
 
-    def is_folder_visible(self, template_folder_id, template_type='all', user=None):
-
-        if template_type == 'all':
-            return True
-
-        if self.get_templates(template_type, template_folder_id):
-            return True
-
-        if any(
-            self.is_folder_visible(child_folder['id'], template_type, user)
-            for child_folder in self.get_template_folders(template_type, template_folder_id, user)
-        ):
-            return True
-
-        return False
-
     def get_template_folder_path(self, template_folder_id):
 
         folder = self.get_template_folder(template_folder_id)
@@ -650,12 +561,6 @@ def get_template_path(self, template):
             template,
         ]
 
-    def get_template_folders_and_templates(self, template_type, template_folder_id):
-        return (
-            self.get_templates(template_type, template_folder_id)
-            + self.get_template_folders(template_type, template_folder_id)
-        )
-
     @property
     def count_of_templates_and_folders(self):
         return len(self.all_templates + self.all_template_folders)