From 340439cbe8f585652cb9b00cc8ea1b1989abd09c Mon Sep 17 00:00:00 2001
From: Paul Pepper <paul.pepper@digital.trade.gov.uk>
Date: Thu, 29 Aug 2024 18:16:03 +0100
Subject: [PATCH 01/57] App initial commit.

---
 settings/common.py              | 1 +
 workflow/__init__.py            | 0
 workflow/admin.py               | 1 +
 workflow/apps.py                | 6 ++++++
 workflow/migrations/__init__.py | 0
 workflow/models.py              | 1 +
 workflow/tests.py               | 1 +
 workflow/views.py               | 1 +
 8 files changed, 11 insertions(+)
 create mode 100644 workflow/__init__.py
 create mode 100644 workflow/admin.py
 create mode 100644 workflow/apps.py
 create mode 100644 workflow/migrations/__init__.py
 create mode 100644 workflow/models.py
 create mode 100644 workflow/tests.py
 create mode 100644 workflow/views.py

diff --git a/settings/common.py b/settings/common.py
index bbf3cdb60..6bdf41f7c 100644
--- a/settings/common.py
+++ b/settings/common.py
@@ -141,6 +141,7 @@
     "exporter.apps.ExporterConfig",
     "crispy_forms",
     "crispy_forms_gds",
+    "workflow",
 ]
 
 APPS_THAT_MUST_COME_LAST = ["django.forms"]
diff --git a/workflow/__init__.py b/workflow/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/workflow/admin.py b/workflow/admin.py
new file mode 100644
index 000000000..846f6b406
--- /dev/null
+++ b/workflow/admin.py
@@ -0,0 +1 @@
+# Register your models here.
diff --git a/workflow/apps.py b/workflow/apps.py
new file mode 100644
index 000000000..bd2134053
--- /dev/null
+++ b/workflow/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class WorkflowConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "workflow"
diff --git a/workflow/migrations/__init__.py b/workflow/migrations/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/workflow/models.py b/workflow/models.py
new file mode 100644
index 000000000..6b2021999
--- /dev/null
+++ b/workflow/models.py
@@ -0,0 +1 @@
+# Create your models here.
diff --git a/workflow/tests.py b/workflow/tests.py
new file mode 100644
index 000000000..a39b155ac
--- /dev/null
+++ b/workflow/tests.py
@@ -0,0 +1 @@
+# Create your tests here.
diff --git a/workflow/views.py b/workflow/views.py
new file mode 100644
index 000000000..60f00ef0e
--- /dev/null
+++ b/workflow/views.py
@@ -0,0 +1 @@
+# Create your views here.

From 301644a7d6c516417756174e128dd4ed1b41f9af Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Thu, 19 Sep 2024 17:15:04 +0100
Subject: [PATCH 02/57] TP2000-1472  Revise task-related models (#1288)

* Rename UserAssignment model to TaskAssignee

* Add TaskCategory and TaskProgressState models

* Add parent_task field to Task model

* Add creator field to Task model

* Add TaskLog model

* Don't require that tasks have a workbasket

* Make progress_state a required field on Task model

* Order task category by name and display progress state by value

* Remove Task prefix from Category and ProgressState models

* Remove workflow app
---
 .../UnassignUserForm.js                       |   6 +-
 .../UnassignUserForm.test.js.snap             |   8 +-
 common/tests/factories.py                     |  42 +++--
 common/tests/test_views.py                    |   6 +-
 common/views/pages.py                         |   6 +-
 conftest.py                                   |  14 +-
 package-lock.json                             |  39 ++---
 package.json                                  |   2 +-
 settings/common.py                            |   1 -
 ...0003_rename_userassignment_taskassignee.py |  60 +++++++
 ...askprogressstate_task_category_and_more.py | 134 ++++++++++++++
 tasks/migrations/0005_task_parent_task.py     |  26 +++
 tasks/migrations/0006_task_creator.py         |  27 +++
 tasks/migrations/0007_create_tasklog.py       |  69 ++++++++
 .../migrations/0008_alter_task_workbasket.py  |  27 +++
 tasks/models.py                               | 165 ++++++++++++++++--
 tasks/tests/conftest.py                       |  38 ++--
 tasks/tests/test_models.py                    | 158 +++++++++++++----
 workbaskets/forms.py                          |  36 ++--
 workbaskets/models.py                         |  15 +-
 workbaskets/tests/test_forms.py               |  20 +--
 workbaskets/tests/test_models.py              |  32 ++--
 workbaskets/tests/test_views.py               |  38 ++--
 workbaskets/views/ui.py                       |  15 +-
 workflow/__init__.py                          |   0
 workflow/admin.py                             |   1 -
 workflow/apps.py                              |   6 -
 workflow/migrations/__init__.py               |   0
 workflow/models.py                            |   1 -
 workflow/tests.py                             |   1 -
 workflow/views.py                             |   1 -
 31 files changed, 803 insertions(+), 191 deletions(-)
 create mode 100644 tasks/migrations/0003_rename_userassignment_taskassignee.py
 create mode 100644 tasks/migrations/0004_taskcategory_taskprogressstate_task_category_and_more.py
 create mode 100644 tasks/migrations/0005_task_parent_task.py
 create mode 100644 tasks/migrations/0006_task_creator.py
 create mode 100644 tasks/migrations/0007_create_tasklog.py
 create mode 100644 tasks/migrations/0008_alter_task_workbasket.py
 delete mode 100644 workflow/__init__.py
 delete mode 100644 workflow/admin.py
 delete mode 100644 workflow/apps.py
 delete mode 100644 workflow/migrations/__init__.py
 delete mode 100644 workflow/models.py
 delete mode 100644 workflow/tests.py
 delete mode 100644 workflow/views.py

diff --git a/common/static/common/js/components/WorkbasketUserAssignment/UnassignUserForm.js b/common/static/common/js/components/WorkbasketUserAssignment/UnassignUserForm.js
index 7a9fae768..e2d5c2779 100644
--- a/common/static/common/js/components/WorkbasketUserAssignment/UnassignUserForm.js
+++ b/common/static/common/js/components/WorkbasketUserAssignment/UnassignUserForm.js
@@ -5,8 +5,8 @@ import accessibleAutocomplete from "accessible-autocomplete";
 import PropTypes from "prop-types";
 
 function UnassignUserForm({ users }) {
-  const elementId = "assignments-select";
-  const elementName = "assignments";
+  const elementId = "assignees-select";
+  const elementName = "assignees";
   const label = "Unassign user";
   const hint = "Select a user to unassign";
 
@@ -66,7 +66,7 @@ UnassignUserForm.propTypes = {
     PropTypes.shape({
       pk: PropTypes.number.isRequired,
       name: PropTypes.string.isRequired,
-    })
+    }),
   ),
 };
 
diff --git a/common/static/common/js/components/WorkbasketUserAssignment/tests/__snapshots__/UnassignUserForm.test.js.snap b/common/static/common/js/components/WorkbasketUserAssignment/tests/__snapshots__/UnassignUserForm.test.js.snap
index 9427e9111..c25959a29 100644
--- a/common/static/common/js/components/WorkbasketUserAssignment/tests/__snapshots__/UnassignUserForm.test.js.snap
+++ b/common/static/common/js/components/WorkbasketUserAssignment/tests/__snapshots__/UnassignUserForm.test.js.snap
@@ -16,20 +16,20 @@ exports[`UnassignUserForm renders form 1`] = `
   >
     <label
       className="govuk-label"
-      htmlFor="assignments-select"
+      htmlFor="assignees-select"
     >
       Unassign user
     </label>
     <div
       className="govuk-hint"
-      id="assignments-hint"
+      id="assignees-hint"
     >
       Select a user to unassign
     </div>
     <select
       data-testid="unassign-user-select"
-      id="assignments-select"
-      name="assignments"
+      id="assignees-select"
+      name="assignees"
       required={true}
     >
       <option
diff --git a/common/tests/factories.py b/common/tests/factories.py
index dff7f3505..f3335c637 100644
--- a/common/tests/factories.py
+++ b/common/tests/factories.py
@@ -30,7 +30,8 @@
 from measures.validators import OrderNumberCaptureCode
 from publishing.models import ProcessingState
 from quotas.validators import QuotaEventType
-from tasks.models import UserAssignment
+from tasks.models import ProgressState
+from tasks.models import TaskAssignee
 from workbaskets.validators import WorkflowStatus
 
 User = get_user_model()
@@ -1533,40 +1534,61 @@ class Meta:
         model = "notifications.CrownDependenciesEnvelopeFailedNotification"
 
 
+class CategoryFactory(factory.django.DjangoModelFactory):
+    name = factory.Faker("word")
+
+    class Meta:
+        model = "tasks.Category"
+
+
+class ProgressStateFactory(factory.django.DjangoModelFactory):
+    name = FuzzyChoice(ProgressState.State.values)
+
+    class Meta:
+        model = "tasks.ProgressState"
+        django_get_or_create = ("name",)
+
+
 class TaskFactory(factory.django.DjangoModelFactory):
     title = factory.Faker("sentence")
     description = factory.Faker("sentence")
+    category = factory.SubFactory(CategoryFactory)
+    progress_state = factory.SubFactory(ProgressStateFactory)
     workbasket = factory.SubFactory(WorkBasketFactory)
+    creator = factory.SubFactory(UserFactory)
 
     class Meta:
         model = "tasks.Task"
 
 
-class UserAssignmentFactory(factory.django.DjangoModelFactory):
+class SubTaskFactory(TaskFactory):
+    parent_task = factory.SubFactory(TaskFactory)
+
+
+class TaskAssigneeFactory(factory.django.DjangoModelFactory):
     user = factory.SubFactory(UserFactory)
-    assigned_by = factory.SubFactory(UserFactory)
-    assignment_type = FuzzyChoice(UserAssignment.AssignmentType.values)
+    assignment_type = FuzzyChoice(TaskAssignee.AssignmentType.values)
     task = factory.SubFactory(TaskFactory)
 
     class Meta:
-        model = "tasks.UserAssignment"
+        model = "tasks.TaskAssignee"
 
 
 class AssignedWorkBasketFactory(WorkBasketFactory):
     """Creates a workbasket which has an assigned worker and reviewer."""
 
     @factory.post_generation
-    def user_assignments(self, create, extracted, **kwargs):
+    def create_workbasket_assignments(self, create, extracted, **kwargs):
         if not create:
             return
 
         task = TaskFactory.create(workbasket=self)
-        UserAssignmentFactory.create(
-            assignment_type=UserAssignment.AssignmentType.WORKBASKET_WORKER,
+        TaskAssigneeFactory.create(
+            assignment_type=TaskAssignee.AssignmentType.WORKBASKET_WORKER,
             task=task,
         )
-        UserAssignmentFactory.create(
-            assignment_type=UserAssignment.AssignmentType.WORKBASKET_REVIEWER,
+        TaskAssigneeFactory.create(
+            assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
             task=task,
         )
 
diff --git a/common/tests/test_views.py b/common/tests/test_views.py
index 86316da3e..8fe1fb0a4 100644
--- a/common/tests/test_views.py
+++ b/common/tests/test_views.py
@@ -16,7 +16,7 @@
 from common.views import HealthCheckView
 from common.views import handler403
 from common.views import handler500
-from tasks.models import UserAssignment
+from tasks.models import TaskAssignee
 from workbaskets.validators import WorkflowStatus
 
 pytestmark = pytest.mark.django_db
@@ -281,9 +281,9 @@ def test_homepage_cards_contain_expected_links(superuser_client):
 def test_homepage_card_currently_working_on(status, valid_user, valid_user_client):
     test_reason = "test reason"
     workbasket = factories.WorkBasketFactory.create(status=status, reason=test_reason)
-    factories.UserAssignmentFactory.create(
+    factories.TaskAssigneeFactory.create(
         user=valid_user,
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_REVIEWER,
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
         task__workbasket=workbasket,
     )
     TrackedModelCheckFactory.create(
diff --git a/common/views/pages.py b/common/views/pages.py
index 875d45e85..87f061334 100644
--- a/common/views/pages.py
+++ b/common/views/pages.py
@@ -43,7 +43,7 @@
 from publishing.models import PackagedWorkBasket
 from quotas.models import QuotaOrderNumber
 from regulations.models import Regulation
-from tasks.models import UserAssignment
+from tasks.models import TaskAssignee
 from workbaskets.models import WorkBasket
 from workbaskets.models import WorkflowStatus
 
@@ -56,7 +56,7 @@ def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
         assignments = (
-            UserAssignment.objects.filter(user=self.request.user)
+            TaskAssignee.objects.filter(user=self.request.user)
             .assigned()
             .select_related("task__workbasket")
             .filter(
@@ -70,7 +70,7 @@ def get_context_data(self, **kwargs):
             assignment_type = (
                 "Assigned"
                 if assignment.assignment_type
-                == UserAssignment.AssignmentType.WORKBASKET_WORKER
+                == TaskAssignee.AssignmentType.WORKBASKET_WORKER
                 else "Reviewing"
             )
             rule_violations_count = workbasket.tracked_model_check_errors.count()
diff --git a/conftest.py b/conftest.py
index 4c7883647..54ff9db39 100644
--- a/conftest.py
+++ b/conftest.py
@@ -70,7 +70,7 @@
 from measures.models import MonetaryUnit
 from measures.parsers import DutySentenceParser
 from publishing.models import PackagedWorkBasket
-from tasks.models import UserAssignment
+from tasks.models import TaskAssignee
 from workbaskets.models import WorkBasket
 from workbaskets.models import get_partition_scheme
 from workbaskets.validators import WorkflowStatus
@@ -301,8 +301,8 @@ def policy_group(db) -> Group:
         ("publishing", "consume_from_packaging_queue"),
         ("publishing", "manage_packaging_queue"),
         ("publishing", "view_envelope"),
-        ("tasks", "add_userassignment"),
-        ("tasks", "change_userassignment"),
+        ("tasks", "add_taskassignee"),
+        ("tasks", "change_taskassignee"),
         ("tasks", "add_comment"),
         ("tasks", "view_comment"),
         ("tasks", "change_comment"),
@@ -540,12 +540,12 @@ def workbasket():
         workbasket = factories.WorkBasketFactory.create()
 
     task = factories.TaskFactory.create(workbasket=workbasket)
-    factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_WORKER,
+    factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_WORKER,
         task=task,
     )
-    factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_REVIEWER,
+    factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
         task=task,
     )
     return workbasket
diff --git a/package-lock.json b/package-lock.json
index 945fe7e88..709cfc548 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
         "sass-loader": "^12.1.0",
         "style-loader": "^3.0.0",
         "styled-components": "^6.1.0",
-        "webpack": "^5.76.0",
+        "webpack": "^5.94.0",
         "webpack-bundle-tracker": "^3.0.1",
         "webpack-cli": "^4.7.2"
       },
@@ -3992,20 +3992,14 @@
       "version": "8.56.6",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.6.tgz",
       "integrity": "sha512-ymwc+qb1XkjT/gfoQwxIeHZ6ixH23A+tCT2ADSA/DPVKzAjwYkTXBMCQ/f6fe4wEa85Lhp26VPeUxI7wMhAi7A==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
       }
     },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.7",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-      "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
     "node_modules/@types/estree": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
@@ -4590,10 +4584,10 @@
         "acorn-walk": "^8.0.2"
       }
     },
-    "node_modules/acorn-import-assertions": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+    "node_modules/acorn-import-attributes": {
+      "version": "1.9.5",
+      "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+      "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
       "peerDependencies": {
         "acorn": "^8"
       }
@@ -6348,9 +6342,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.16.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz",
-      "integrity": "sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==",
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
+      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -14287,20 +14281,19 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.91.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz",
-      "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==",
+      "version": "5.94.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+      "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
       "dependencies": {
-        "@types/eslint-scope": "^3.7.3",
         "@types/estree": "^1.0.5",
         "@webassemblyjs/ast": "^1.12.1",
         "@webassemblyjs/wasm-edit": "^1.12.1",
         "@webassemblyjs/wasm-parser": "^1.12.1",
         "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.9.0",
+        "acorn-import-attributes": "^1.9.5",
         "browserslist": "^4.21.10",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.16.0",
+        "enhanced-resolve": "^5.17.1",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
diff --git a/package.json b/package.json
index 68fab2432..ae163f067 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
     "sass-loader": "^12.1.0",
     "style-loader": "^3.0.0",
     "styled-components": "^6.1.0",
-    "webpack": "^5.76.0",
+    "webpack": "^5.94.0",
     "webpack-bundle-tracker": "^3.0.1",
     "webpack-cli": "^4.7.2"
   },
diff --git a/settings/common.py b/settings/common.py
index 6bdf41f7c..bbf3cdb60 100644
--- a/settings/common.py
+++ b/settings/common.py
@@ -141,7 +141,6 @@
     "exporter.apps.ExporterConfig",
     "crispy_forms",
     "crispy_forms_gds",
-    "workflow",
 ]
 
 APPS_THAT_MUST_COME_LAST = ["django.forms"]
diff --git a/tasks/migrations/0003_rename_userassignment_taskassignee.py b/tasks/migrations/0003_rename_userassignment_taskassignee.py
new file mode 100644
index 000000000..45e8c73c1
--- /dev/null
+++ b/tasks/migrations/0003_rename_userassignment_taskassignee.py
@@ -0,0 +1,60 @@
+# Generated by Django 4.2.14 on 2024-09-05 14:06
+
+from django.conf import settings
+from django.db import migrations
+from django.db import models
+
+
+def forwards_delete_outdated_permissions(apps, schema_editor):
+    """Deletes old set of permissions belonging to `UserAssignment` following
+    the renaming to `TaskAssignee` as Django creates a new set of permissions
+    for the renamed table."""
+    Permission = apps.get_model("auth.Permission")
+    Permission.objects.filter(
+        models.Q(codename="add_userassignment")
+        | models.Q(codename="change_userassignment")
+        | models.Q(codename="delete_userassignment")
+        | models.Q(codename="view_userassignment"),
+    ).delete()
+
+
+def backwards_delete_outdated_permissions(apps, schema_editor):
+    """Deletes old set of permissions belonging to `TaskAssignee` following the
+    renaming back to `UserAssignment` as Django creates a new set of permissions
+    for the renamed table."""
+    Permission = apps.get_model("auth.Permission")
+    Permission.objects.filter(
+        models.Q(codename="add_taskassignee")
+        | models.Q(codename="change_taskassignee")
+        | models.Q(codename="delete_taskassignee")
+        | models.Q(codename="view_taskassignee"),
+    ).delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("tasks", "0002_comment"),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name="UserAssignment",
+            new_name="TaskAssignee",
+        ),
+        migrations.AlterField(
+            model_name="taskassignee",
+            name="task",
+            field=models.ForeignKey(
+                editable=False,
+                on_delete=models.deletion.CASCADE,
+                related_name="assignees",
+                to="tasks.task",
+            ),
+        ),
+        migrations.RunPython(
+            forwards_delete_outdated_permissions,
+            backwards_delete_outdated_permissions,
+        ),
+    ]
diff --git a/tasks/migrations/0004_taskcategory_taskprogressstate_task_category_and_more.py b/tasks/migrations/0004_taskcategory_taskprogressstate_task_category_and_more.py
new file mode 100644
index 000000000..f76c7f31b
--- /dev/null
+++ b/tasks/migrations/0004_taskcategory_taskprogressstate_task_category_and_more.py
@@ -0,0 +1,134 @@
+# Generated by Django 4.2.14 on 2024-09-06 14:33
+
+import django.db.models.deletion
+from django.db import migrations
+from django.db import models
+
+from tasks.models import ProgressState as TaskProgressState
+from workbaskets.validators import WorkflowStatus
+
+
+def forwards_create_default_task_progress_state_instances(apps, schema_editor):
+    """Creates default `ProgressState` instances for `TO_DO`, `IN_PROGRESS` and
+    `DONE`."""
+    ProgressState = apps.get_model("tasks", "ProgressState")
+    progress_states = [ProgressState(name=state) for state in TaskProgressState.State]
+    ProgressState.objects.bulk_create(progress_states)
+
+
+def forwards_update_existing_tasks_progress_state(apps, schema_editor):
+    """
+    Updates `progress_state` on existing `Task` instances that have an
+    associated workbasket.
+
+    Tasks with an unpublished workbasket are set to `ProgressState.State.IN_PROGRESS`
+    and tasks with a published workbasket are set to `ProgressState.State.DONE`.
+    """
+    ProgressState = apps.get_model("tasks", "ProgressState")
+    inprogress_state = ProgressState.objects.get(
+        name=TaskProgressState.State.IN_PROGRESS,
+    )
+    done_state = ProgressState.objects.get(name=TaskProgressState.State.DONE)
+    Task = apps.get_model("tasks", "Task")
+
+    Task.objects.filter(
+        models.Q(workbasket__status=WorkflowStatus.EDITING)
+        | models.Q(workbasket__status=WorkflowStatus.QUEUED)
+        | models.Q(workbasket__status=WorkflowStatus.ERRORED),
+    ).update(progress_state=inprogress_state)
+
+    Task.objects.filter(
+        models.Q(workbasket__status=WorkflowStatus.PUBLISHED)
+        | models.Q(workbasket__status=WorkflowStatus.ARCHIVED),
+    ).update(progress_state=done_state)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0003_rename_userassignment_taskassignee"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Category",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=255, unique=True)),
+            ],
+            options={
+                "ordering": ["name"],
+                "verbose_name_plural": "categories",
+            },
+        ),
+        migrations.CreateModel(
+            name="ProgressState",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "name",
+                    models.CharField(
+                        choices=[
+                            ("TO_DO", "To do"),
+                            ("IN_PROGRESS", "In progress"),
+                            ("DONE", "Done"),
+                        ],
+                        max_length=255,
+                        unique=True,
+                    ),
+                ),
+            ],
+        ),
+        migrations.RunPython(
+            forwards_create_default_task_progress_state_instances,
+            migrations.RunPython.noop,
+        ),
+        migrations.AddField(
+            model_name="task",
+            name="category",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="tasks.category",
+            ),
+        ),
+        migrations.AddField(
+            model_name="task",
+            name="progress_state",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="tasks.progressstate",
+            ),
+        ),
+        migrations.RunPython(
+            forwards_update_existing_tasks_progress_state,
+            migrations.RunPython.noop,
+        ),
+        migrations.AlterField(
+            model_name="task",
+            name="progress_state",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                to="tasks.progressstate",
+            ),
+        ),
+    ]
diff --git a/tasks/migrations/0005_task_parent_task.py b/tasks/migrations/0005_task_parent_task.py
new file mode 100644
index 000000000..fa287684c
--- /dev/null
+++ b/tasks/migrations/0005_task_parent_task.py
@@ -0,0 +1,26 @@
+# Generated by Django 4.2.14 on 2024-09-09 08:14
+
+import django.db.models.deletion
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0004_taskcategory_taskprogressstate_task_category_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="task",
+            name="parent_task",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="subtasks",
+                to="tasks.task",
+            ),
+        ),
+    ]
diff --git a/tasks/migrations/0006_task_creator.py b/tasks/migrations/0006_task_creator.py
new file mode 100644
index 000000000..14a36da18
--- /dev/null
+++ b/tasks/migrations/0006_task_creator.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.14 on 2024-09-09 08:46
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("tasks", "0005_task_parent_task"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="task",
+            name="creator",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="created_tasks",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]
diff --git a/tasks/migrations/0007_create_tasklog.py b/tasks/migrations/0007_create_tasklog.py
new file mode 100644
index 000000000..15a81debf
--- /dev/null
+++ b/tasks/migrations/0007_create_tasklog.py
@@ -0,0 +1,69 @@
+# Generated by Django 4.2.14 on 2024-09-09 11:03
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("tasks", "0006_task_creator"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="taskassignee",
+            name="assigned_by",
+        ),
+        migrations.CreateModel(
+            name="TaskLog",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                (
+                    "action",
+                    models.CharField(
+                        choices=[
+                            ("TASK_ASSIGNED", "Task Assigned"),
+                            ("TASK_UNASSIGNED", "Task Unassigned"),
+                            ("PROGRESS_STATE_UPDATED", "Progress State Updated"),
+                        ],
+                        max_length=100,
+                    ),
+                ),
+                ("description", models.TextField(editable=False)),
+                (
+                    "instigator",
+                    models.ForeignKey(
+                        editable=False,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "task",
+                    models.ForeignKey(
+                        editable=False,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="logs",
+                        to="tasks.task",
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+    ]
diff --git a/tasks/migrations/0008_alter_task_workbasket.py b/tasks/migrations/0008_alter_task_workbasket.py
new file mode 100644
index 000000000..391ef9983
--- /dev/null
+++ b/tasks/migrations/0008_alter_task_workbasket.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.14 on 2024-09-10 18:06
+
+import django.db.models.deletion
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("workbaskets", "0008_datarow_dataupload"),
+        ("tasks", "0007_create_tasklog"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="task",
+            name="workbasket",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="tasks",
+                to="workbaskets.workbasket",
+            ),
+        ),
+    ]
diff --git a/tasks/models.py b/tasks/models.py
index 18ca59ccb..424b026b3 100644
--- a/tasks/models.py
+++ b/tasks/models.py
@@ -1,26 +1,84 @@
 from datetime import datetime
 
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.db import models
 
 from common.models.mixins import TimestampedMixin
 from workbaskets.models import WorkBasket
 
+User = get_user_model()
+
 
 class Task(TimestampedMixin):
     title = models.CharField(max_length=255)
     description = models.TextField()
+    category = models.ForeignKey(
+        "Category",
+        blank=True,
+        null=True,
+        on_delete=models.PROTECT,
+    )
+    progress_state = models.ForeignKey(
+        "ProgressState",
+        on_delete=models.PROTECT,
+    )
+    parent_task = models.ForeignKey(
+        "self",
+        blank=True,
+        null=True,
+        on_delete=models.CASCADE,
+        related_name="subtasks",
+    )
     workbasket = models.ForeignKey(
         WorkBasket,
+        blank=True,
+        null=True,
         on_delete=models.PROTECT,
         related_name="tasks",
     )
+    creator = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        null=True,
+        on_delete=models.PROTECT,
+        related_name="created_tasks",
+    )
 
     def __str__(self):
         return self.title
 
 
-class UserAssignmentQueryset(models.QuerySet):
+class Category(models.Model):
+    name = models.CharField(
+        max_length=255,
+        unique=True,
+    )
+
+    class Meta:
+        ordering = ["name"]
+        verbose_name_plural = "categories"
+
+    def __str__(self):
+        return self.name
+
+
+class ProgressState(models.Model):
+    class State(models.TextChoices):
+        TO_DO = "TO_DO", "To do"
+        IN_PROGRESS = "IN_PROGRESS", "In progress"
+        DONE = "DONE", "Done"
+
+    name = models.CharField(
+        max_length=255,
+        choices=State.choices,
+        unique=True,
+    )
+
+    def __str__(self):
+        return self.get_name_display()
+
+
+class TaskAssigneeQueryset(models.QuerySet):
     def assigned(self):
         return self.exclude(unassigned_at__isnull=False)
 
@@ -29,16 +87,16 @@ def unassigned(self):
 
     def workbasket_workers(self):
         return self.filter(
-            assignment_type=UserAssignment.AssignmentType.WORKBASKET_WORKER,
+            assignment_type=TaskAssignee.AssignmentType.WORKBASKET_WORKER,
         )
 
     def workbasket_reviewers(self):
         return self.filter(
-            assignment_type=UserAssignment.AssignmentType.WORKBASKET_REVIEWER,
+            assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
         )
 
 
-class UserAssignment(TimestampedMixin):
+class TaskAssignee(TimestampedMixin):
     class AssignmentType(models.TextChoices):
         WORKBASKET_WORKER = "WORKBASKET_WORKER", "Workbasket worker"
         WORKBASKET_REVIEWER = "WORKBASKET_REVIEWER", "Workbasket reviewer"
@@ -48,12 +106,6 @@ class AssignmentType(models.TextChoices):
         on_delete=models.PROTECT,
         related_name="assigned_to",
     )
-    assigned_by = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.PROTECT,
-        editable=False,
-        related_name="assigned_by",
-    )
     assignment_type = models.CharField(
         choices=AssignmentType.choices,
         max_length=50,
@@ -62,7 +114,7 @@ class AssignmentType(models.TextChoices):
         Task,
         on_delete=models.CASCADE,
         editable=False,
-        related_name="user_assignments",
+        related_name="assignees",
     )
     unassigned_at = models.DateTimeField(
         auto_now=False,
@@ -70,7 +122,7 @@ class AssignmentType(models.TextChoices):
         null=True,
     )
 
-    objects = UserAssignmentQueryset.as_manager()
+    objects = TaskAssigneeQueryset.as_manager()
 
     def __str__(self):
         return (
@@ -94,6 +146,95 @@ def unassign_user(cls, user, task):
             return False
 
 
+class TaskLogManager(models.Manager):
+    def create(
+        self,
+        task: Task,
+        action: "TaskLog.AuditActionType",
+        instigator: User,
+        **kwargs,
+    ) -> "TaskLog":
+        """
+        Creates a new `TaskLog` instance with a generated description based on
+        `action`, saving it to the database and returning the created instance.
+
+        A TaskLog's `description` is generated using a template retrieved from `TaskLog.AUDIT_ACTION_MAP` that maps an `action` to its corresponding description.
+        Additional `kwargs` are required to format the description template depending on the provided action.
+        """
+
+        if action not in self.model.AuditActionType:
+            raise ValueError(
+                f"The action '{action}' is an invalid TaskLog.AuditActionType value.",
+            )
+
+        description_template = self.model.AUDIT_ACTION_MAP.get(action)
+        if not description_template:
+            raise ValueError(
+                f"No description template found for action '{action}' in TaskLog.AUDIT_ACTION_MAP.",
+            )
+
+        context = {"instigator": instigator}
+
+        if action in {
+            self.model.AuditActionType.TASK_ASSIGNED,
+            self.model.AuditActionType.TASK_UNASSIGNED,
+        }:
+            assignee = kwargs.pop("assignee", None)
+            if not assignee:
+                raise ValueError(f"Missing 'assignee' in kwargs for action '{action}'.")
+            context["assignee"] = assignee
+
+        elif action == self.model.AuditActionType.PROGRESS_STATE_UPDATED:
+            progress_state = kwargs.pop("progress_state", None)
+            if not progress_state:
+                raise ValueError(
+                    f"Missing 'progress_state' in kwargs for action '{action}'.",
+                )
+            context["progress_state"] = progress_state
+
+        description = description_template.format(**context)
+
+        return super().create(
+            task=task,
+            action=action,
+            instigator=instigator,
+            description=description,
+            **kwargs,
+        )
+
+
+class TaskLog(TimestampedMixin):
+    class AuditActionType(models.TextChoices):
+        TASK_ASSIGNED = ("TASK_ASSIGNED",)
+        TASK_UNASSIGNED = ("TASK_UNASSIGNED",)
+        PROGRESS_STATE_UPDATED = ("PROGRESS_STATE_UPDATED",)
+
+    AUDIT_ACTION_MAP = {
+        AuditActionType.TASK_ASSIGNED: "{instigator} assigned {assignee}",
+        AuditActionType.TASK_UNASSIGNED: "{instigator} unassigned {assignee}",
+        AuditActionType.PROGRESS_STATE_UPDATED: "{instigator} changed the status to {progress_state}",
+    }
+
+    action = models.CharField(
+        max_length=100,
+        choices=AuditActionType.choices,
+    )
+    description = models.TextField(editable=False)
+    task = models.ForeignKey(
+        Task,
+        on_delete=models.PROTECT,
+        editable=False,
+        related_name="logs",
+    )
+    instigator = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.PROTECT,
+        editable=False,
+    )
+
+    objects = TaskLogManager()
+
+
 class Comment(TimestampedMixin):
     author = models.ForeignKey(
         settings.AUTH_USER_MODEL,
diff --git a/tasks/tests/conftest.py b/tasks/tests/conftest.py
index 47808d0c2..3ce8cffad 100644
--- a/tasks/tests/conftest.py
+++ b/tasks/tests/conftest.py
@@ -1,8 +1,11 @@
 import pytest
 
+from common.tests.factories import CategoryFactory
+from common.tests.factories import ProgressStateFactory
+from common.tests.factories import SubTaskFactory
+from common.tests.factories import TaskAssigneeFactory
 from common.tests.factories import TaskFactory
-from common.tests.factories import UserAssignmentFactory
-from tasks.models import UserAssignment
+from tasks.models import TaskAssignee
 
 
 @pytest.fixture()
@@ -11,19 +14,34 @@ def task():
 
 
 @pytest.fixture()
-def user_assignment():
-    return UserAssignmentFactory.create()
+def subtask():
+    return SubTaskFactory.create()
 
 
 @pytest.fixture()
-def workbasket_worker_assignment():
-    return UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_WORKER,
+def category():
+    return CategoryFactory.create()
+
+
+@pytest.fixture()
+def progress_state():
+    return ProgressStateFactory.create()
+
+
+@pytest.fixture()
+def task_assignee():
+    return TaskAssigneeFactory.create()
+
+
+@pytest.fixture()
+def workbasket_worker_assignee():
+    return TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_WORKER,
     )
 
 
 @pytest.fixture()
-def workbasket_reviewer_assignment():
-    return UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_REVIEWER,
+def workbasket_reviewer_assignee():
+    return TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
     )
diff --git a/tasks/tests/test_models.py b/tasks/tests/test_models.py
index cb7259218..2201e0c2d 100644
--- a/tasks/tests/test_models.py
+++ b/tasks/tests/test_models.py
@@ -1,58 +1,156 @@
 import pytest
+from django.db.utils import IntegrityError
 
-from tasks.models import UserAssignment
+from common.tests.factories import CategoryFactory
+from common.tests.factories import ProgressStateFactory
+from common.tests.factories import TaskFactory
+from tasks.models import ProgressState
+from tasks.models import TaskAssignee
+from tasks.models import TaskLog
 
 pytestmark = pytest.mark.django_db
 
 
-def test_user_assignment_unassign_user_classmethod(user_assignment):
-    user = user_assignment.user
-    task = user_assignment.task
+def test_task_category_uniqueness():
+    name = "Most favoured nation"
+    CategoryFactory.create(name=name)
+    with pytest.raises(IntegrityError):
+        CategoryFactory.create(name=name)
 
-    assert UserAssignment.unassign_user(user=user, task=task)
+
+def test_task_progress_state_uniqueness():
+    name = "Blocked"
+    ProgressState.objects.create(name=name)
+    with pytest.raises(IntegrityError):
+        ProgressState.objects.create(name=name)
+
+
+def test_task_assignee_unassign_user_classmethod(task_assignee):
+    user = task_assignee.user
+    task = task_assignee.task
+
+    assert TaskAssignee.unassign_user(user=user, task=task)
     # User has already been unassigned
-    assert not UserAssignment.unassign_user(user=user, task=task)
+    assert not TaskAssignee.unassign_user(user=user, task=task)
 
 
-def test_user_assignment_assigned_queryset(
-    user_assignment,
+def test_task_assignee_assigned_queryset(
+    task_assignee,
 ):
-    assert UserAssignment.objects.assigned().count() == 1
+    assert TaskAssignee.objects.assigned().count() == 1
 
-    user = user_assignment.user
-    task = user_assignment.task
-    UserAssignment.unassign_user(user=user, task=task)
+    user = task_assignee.user
+    task = task_assignee.task
+    TaskAssignee.unassign_user(user=user, task=task)
 
-    assert not UserAssignment.objects.assigned()
+    assert not TaskAssignee.objects.assigned()
 
 
-def test_user_assignment_unassigned_queryset(
-    user_assignment,
+def test_task_assignee_unassigned_queryset(
+    task_assignee,
 ):
-    assert not UserAssignment.objects.unassigned()
+    assert not TaskAssignee.objects.unassigned()
 
-    user = user_assignment.user
-    task = user_assignment.task
-    UserAssignment.unassign_user(user=user, task=task)
+    user = task_assignee.user
+    task = task_assignee.task
+    TaskAssignee.unassign_user(user=user, task=task)
 
-    assert UserAssignment.objects.unassigned().count() == 1
+    assert TaskAssignee.objects.unassigned().count() == 1
 
 
-def test_user_assignment_workbasket_workers_queryset(
-    workbasket_worker_assignment,
-    workbasket_reviewer_assignment,
+def test_task_assignee_workbasket_workers_queryset(
+    workbasket_worker_assignee,
+    workbasket_reviewer_assignee,
 ):
-    workbasket_workers = UserAssignment.objects.workbasket_workers()
+    workbasket_workers = TaskAssignee.objects.workbasket_workers()
 
     assert workbasket_workers.count() == 1
-    assert workbasket_worker_assignment in workbasket_workers
+    assert workbasket_worker_assignee in workbasket_workers
 
 
-def test_user_assignment_workbasket_reviewers_queryset(
-    workbasket_worker_assignment,
-    workbasket_reviewer_assignment,
+def test_task_assignee_workbasket_reviewers_queryset(
+    workbasket_worker_assignee,
+    workbasket_reviewer_assignee,
 ):
-    workbasket_reviewers = UserAssignment.objects.workbasket_reviewers()
+    workbasket_reviewers = TaskAssignee.objects.workbasket_reviewers()
 
     assert workbasket_reviewers.count() == 1
-    assert workbasket_reviewer_assignment in workbasket_reviewers
+    assert workbasket_reviewer_assignee in workbasket_reviewers
+
+
+def test_create_task_log_task_assigned():
+    task = TaskFactory.create()
+    instigator = task.creator
+    action = TaskLog.AuditActionType.TASK_ASSIGNED
+    task_log = TaskLog.objects.create(
+        task=task,
+        action=action,
+        instigator=instigator,
+        assignee=instigator,
+    )
+
+    assert task_log.task == task
+    assert task_log.instigator == instigator
+    assert task_log.action == action
+    assert task_log.description == f"{instigator} assigned {instigator}"
+
+
+def test_create_task_log_task_unassigned():
+    task = TaskFactory.create()
+    instigator = task.creator
+    action = TaskLog.AuditActionType.TASK_UNASSIGNED
+    task_log = TaskLog.objects.create(
+        task=task,
+        action=action,
+        instigator=instigator,
+        assignee=instigator,
+    )
+
+    assert task_log.task == task
+    assert task_log.instigator == instigator
+    assert task_log.action == action
+    assert task_log.description == f"{instigator} unassigned {instigator}"
+
+
+def test_create_task_log_progress_state_updated():
+    task = TaskFactory.create()
+    instigator = task.creator
+    action = TaskLog.AuditActionType.PROGRESS_STATE_UPDATED
+    progress_state = ProgressStateFactory.create()
+    task_log = TaskLog.objects.create(
+        task=task,
+        action=action,
+        instigator=instigator,
+        progress_state=progress_state,
+    )
+
+    assert task_log.task == task
+    assert task_log.instigator == instigator
+    assert task_log.action == action
+    assert (
+        task_log.description == f"{instigator} changed the status to {progress_state}"
+    )
+
+
+def test_create_task_log_invalid_audit_action():
+    task = TaskFactory.create()
+    instigator = task.creator
+    action = "INVALID_AUDIT_ACTION"
+
+    with pytest.raises(ValueError) as error:
+        TaskLog.objects.create(task=task, action=action, instigator=instigator)
+    assert f"The action '{action}' is an invalid TaskLog.AuditActionType value." in str(
+        error,
+    )
+
+
+def test_create_task_log_missing_kwargs():
+    task = TaskFactory.create()
+    instigator = task.creator
+    action = TaskLog.AuditActionType.TASK_ASSIGNED
+
+    with pytest.raises(ValueError) as error:
+        TaskLog.objects.create(task=task, action=action, instigator=instigator)
+    assert f"Missing 'assignee' in kwargs for action '{action}'." in str(
+        error,
+    )
diff --git a/workbaskets/forms.py b/workbaskets/forms.py
index bd332d2a2..7d6c0827d 100644
--- a/workbaskets/forms.py
+++ b/workbaskets/forms.py
@@ -19,7 +19,7 @@
 from common.validators import markdown_tags_allowlist
 from tasks.models import Comment
 from tasks.models import Task
-from tasks.models import UserAssignment
+from tasks.models import TaskAssignee
 from workbaskets import models
 from workbaskets import validators
 from workbaskets.util import serialize_uploaded_data
@@ -208,7 +208,7 @@ class WorkBasketAssignUsersForm(forms.Form):
         error_messages={"required": "Select one or more users to assign"},
     )
     assignment_type = forms.ChoiceField(
-        choices=UserAssignment.AssignmentType.choices,
+        choices=TaskAssignee.AssignmentType.choices,
         widget=forms.RadioSelect,
         error_messages={"required": "Select an assignment type"},
     )
@@ -251,15 +251,14 @@ def init_layout(self):
     def assign_users(self, task):
         assignment_type = self.cleaned_data["assignment_type"]
 
-        objs = [
-            UserAssignment(
+        assignees = [
+            TaskAssignee(
                 user=user,
-                assigned_by=self.request.user,
                 assignment_type=assignment_type,
                 task=task,
             )
             for user in self.cleaned_data["users"]
-            if not UserAssignment.objects.filter(
+            if not TaskAssignee.objects.filter(
                 user=user,
                 assignment_type=assignment_type,
                 task__workbasket=self.workbasket,
@@ -267,17 +266,15 @@ def assign_users(self, task):
             .assigned()
             .exists()
         ]
-        user_assignments = UserAssignment.objects.bulk_create(objs)
-
-        return user_assignments
+        return TaskAssignee.objects.bulk_create(assignees)
 
 
 class WorkBasketUnassignUsersForm(forms.Form):
-    assignments = forms.ModelMultipleChoiceField(
+    assignees = forms.ModelMultipleChoiceField(
         label="Users",
         help_text="Select users to unassign",
         widget=forms.CheckboxSelectMultiple,
-        queryset=UserAssignment.objects.all(),
+        queryset=TaskAssignee.objects.all(),
         error_messages={"required": "Select one or more users to unassign"},
     )
 
@@ -289,12 +286,12 @@ def __init__(self, *args, **kwargs):
         self.init_layout()
 
     def init_fields(self):
-        self.fields["assignments"].queryset = self.workbasket.user_assignments.order_by(
+        self.fields["assignees"].queryset = self.workbasket.user_assignments.order_by(
             "user__first_name",
             "user__last_name",
         )
 
-        self.fields["assignments"].label_from_instance = (
+        self.fields["assignees"].label_from_instance = (
             lambda obj: f"{obj.user.get_full_name()} ({obj.get_assignment_type_display().lower()})"
         )
 
@@ -303,7 +300,7 @@ def init_layout(self):
         self.helper.label_size = Size.SMALL
         self.helper.legend_size = Size.SMALL
         self.helper.layout = Layout(
-            "assignments",
+            "assignees",
             Submit(
                 "submit",
                 "Save",
@@ -313,15 +310,14 @@ def init_layout(self):
         )
 
     def unassign_users(self):
-        assignments = self.cleaned_data["assignments"]
-        for assignment in assignments:
-            assignment.unassigned_at = datetime.now()
+        assignees = self.cleaned_data["assignees"]
+        for assignee in assignees:
+            assignee.unassigned_at = datetime.now()
 
-        user_assignments = UserAssignment.objects.bulk_update(
-            assignments,
+        return TaskAssignee.objects.bulk_update(
+            assignees,
             fields=["unassigned_at"],
         )
-        return user_assignments
 
 
 class WorkBasketCommentForm(forms.ModelForm):
diff --git a/workbaskets/models.py b/workbaskets/models.py
index b7424e348..427131e01 100644
--- a/workbaskets/models.py
+++ b/workbaskets/models.py
@@ -646,36 +646,43 @@ def unchecked_or_errored_transactions(self):
 
     @property
     def worker_assignments(self):
-        from tasks.models import UserAssignment
+        """Returns a queryset of associated `TaskAssignee` instances filtered to
+        match `AssignmentType.WORKBASKET_WORKER`."""
+        from tasks.models import TaskAssignee
 
         return (
-            UserAssignment.objects.filter(task__workbasket=self)
+            TaskAssignee.objects.filter(task__workbasket=self)
             .workbasket_workers()
             .assigned()
         )
 
     @property
     def reviewer_assignments(self):
-        from tasks.models import UserAssignment
+        """Returns a queryset of associated `TaskAssignee` instances filtered to
+        match `AssignmentType.WORKBASKET_REVIEWER`."""
+        from tasks.models import TaskAssignee
 
         return (
-            UserAssignment.objects.filter(task__workbasket=self)
+            TaskAssignee.objects.filter(task__workbasket=self)
             .workbasket_reviewers()
             .assigned()
         )
 
     @property
     def user_assignments(self):
+        """Returns a queryset of associated `TaskAssignee` instances."""
         assignments = self.worker_assignments | self.reviewer_assignments
         return assignments
 
     @property
     def assigned_workers(self):
+        """Returns a queryset of `User` instances assigned as workers."""
         user_ids = self.worker_assignments.values_list("user_id", flat=True)
         return User.objects.filter(id__in=user_ids)
 
     @property
     def assigned_reviewers(self):
+        """Returns a queryset of `User` instances assigned as reviewers."""
         user_ids = self.reviewer_assignments.values_list("user_id", flat=True)
         return User.objects.filter(id__in=user_ids)
 
diff --git a/workbaskets/tests/test_forms.py b/workbaskets/tests/test_forms.py
index 4fb80a28a..4fca07d67 100644
--- a/workbaskets/tests/test_forms.py
+++ b/workbaskets/tests/test_forms.py
@@ -1,7 +1,7 @@
 import pytest
 
 from common.tests import factories
-from tasks.models import UserAssignment
+from tasks.models import TaskAssignee
 from workbaskets import forms
 from workbaskets.validators import tops_jira_number_validator
 
@@ -129,7 +129,7 @@ def test_workbasket_assign_users_form_assigns_users(rf, valid_user, user_workbas
     users = factories.UserFactory.create_batch(2, is_superuser=True)
     data = {
         "users": users,
-        "assignment_type": UserAssignment.AssignmentType.WORKBASKET_WORKER,
+        "assignment_type": TaskAssignee.AssignmentType.WORKBASKET_WORKER,
     }
 
     form = forms.WorkBasketAssignUsersForm(
@@ -142,7 +142,7 @@ def test_workbasket_assign_users_form_assigns_users(rf, valid_user, user_workbas
     task = factories.TaskFactory.create(workbasket=user_workbasket)
     form.assign_users(task=task)
     for user in users:
-        assert UserAssignment.objects.get(user=user, task=task, assigned_by=valid_user)
+        assert TaskAssignee.objects.get(user=user, task=task)
 
 
 def test_workbasket_assign_users_form_required_fields(rf, valid_user, user_workbasket):
@@ -166,13 +166,13 @@ def test_workbasket_unassign_users_form_unassigns_users(
 ):
     request = rf.request()
     request.user = valid_user
-    assignments = factories.UserAssignmentFactory.create_batch(
+    assignees = factories.TaskAssigneeFactory.create_batch(
         2,
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_REVIEWER,
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
         task__workbasket=user_workbasket,
     )
     data = {
-        "assignments": assignments,
+        "assignees": assignees,
     }
 
     form = forms.WorkBasketUnassignUsersForm(
@@ -183,9 +183,9 @@ def test_workbasket_unassign_users_form_unassigns_users(
     assert form.is_valid()
 
     form.unassign_users()
-    for assignment in assignments:
-        assignment.refresh_from_db()
-        assert not assignment.is_assigned
+    for assignee in assignees:
+        assignee.refresh_from_db()
+        assert not assignee.is_assigned
 
 
 def test_workbasket_unassign_users_form_required_fields(
@@ -202,7 +202,7 @@ def test_workbasket_unassign_users_form_required_fields(
         data={},
     )
     assert not form.is_valid()
-    assert f"Select one or more users to unassign" in form.errors["assignments"]
+    assert f"Select one or more users to unassign" in form.errors["assignees"]
 
 
 def test_workbasket_comment_create_form(assigned_workbasket):
diff --git a/workbaskets/tests/test_models.py b/workbaskets/tests/test_models.py
index 2ccf09a16..a9e23c086 100644
--- a/workbaskets/tests/test_models.py
+++ b/workbaskets/tests/test_models.py
@@ -17,7 +17,7 @@
 from common.tests.factories import WorkBasketFactory
 from common.tests.util import assert_transaction_order
 from common.validators import UpdateType
-from tasks.models import UserAssignment
+from tasks.models import TaskAssignee
 from workbaskets import tasks
 from workbaskets.models import REVISION_ONLY
 from workbaskets.models import SEED_FIRST
@@ -365,12 +365,12 @@ def test_queue(valid_user, unapproved_checked_transaction):
     approver and shifting transaction from DRAFT to REVISION partition."""
     wb = unapproved_checked_transaction.workbasket
     task = factories.TaskFactory.create(workbasket=wb)
-    factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_WORKER,
+    factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_WORKER,
         task=task,
     )
-    factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_REVIEWER,
+    factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
         task=task,
     )
     wb.queue(valid_user.pk, settings.TRANSACTION_SCHEMA)
@@ -451,38 +451,38 @@ def test_unassigned_workbasket_cannot_be_queued():
     with pytest.raises(TransitionNotAllowed):
         workbasket.queue(user=worker.id, scheme_name=settings.TRANSACTION_SCHEMA)
 
-    factories.UserAssignmentFactory.create(
+    factories.TaskAssigneeFactory.create(
         user=worker,
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_WORKER,
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_WORKER,
         task=task,
     )
-    factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_REVIEWER,
+    factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
         task=task,
     )
     assert workbasket.is_fully_assigned()
 
-    UserAssignment.unassign_user(user=worker, task=task)
+    TaskAssignee.unassign_user(user=worker, task=task)
     assert not workbasket.is_fully_assigned()
 
 
 def test_workbasket_user_assignments_queryset():
     workbasket = factories.WorkBasketFactory.create()
-    worker_assignment = factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_WORKER,
+    worker_assignment = factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_WORKER,
         task__workbasket=workbasket,
     )
-    reviewer_assignment = factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_REVIEWER,
+    reviewer_assignment = factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
         task__workbasket=workbasket,
     )
     # Inactive assignment
-    factories.UserAssignmentFactory.create(
+    factories.TaskAssigneeFactory.create(
         unassigned_at=datetime.now(),
         task__workbasket=workbasket,
     )
     # Unrelated assignment
-    factories.UserAssignmentFactory.create()
+    factories.TaskAssigneeFactory.create()
 
     workbasket.refresh_from_db()
     queryset = workbasket.user_assignments
diff --git a/workbaskets/tests/test_views.py b/workbaskets/tests/test_views.py
index 8c8213f46..8baa0f142 100644
--- a/workbaskets/tests/test_views.py
+++ b/workbaskets/tests/test_views.py
@@ -26,7 +26,7 @@
 from importer.models import ImportBatchStatus
 from measures.models import Measure
 from tasks.models import Comment
-from tasks.models import UserAssignment
+from tasks.models import TaskAssignee
 from workbaskets import models
 from workbaskets.tasks import check_workbasket_sync
 from workbaskets.validators import WorkflowStatus
@@ -286,13 +286,13 @@ def test_workbasket_assignments_appear(valid_user_client):
     # Fully assign the workbasket
     task = factories.TaskFactory.create(workbasket=workbasket)
 
-    worker_assignment = factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_WORKER,
+    worker_assignment = factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_WORKER,
         task=task,
         user=worker,
     )
-    reviewer_assignment = factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_REVIEWER,
+    reviewer_assignment = factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
         task=task,
         user=reviewer,
     )
@@ -329,12 +329,12 @@ def test_select_workbasket_filtering(
 
     task = factories.TaskFactory.create(workbasket=fully_assigned_workbasket)
 
-    factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_WORKER,
+    factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_WORKER,
         task=task,
     )
-    factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_REVIEWER,
+    factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
         task=task,
     )
     # Create an unassigned workbasket
@@ -344,15 +344,15 @@ def test_select_workbasket_filtering(
     reviewer_task = factories.TaskFactory.create(
         workbasket=reviewer_assigned_workbasket,
     )
-    factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_REVIEWER,
+    factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
         task=reviewer_task,
     )
     # Create a workbasket with only a worker assigned
     worker_assigned_workbasket = factories.WorkBasketFactory.create(id=4)
     worker_task = factories.TaskFactory.create(workbasket=worker_assigned_workbasket)
-    factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_WORKER,
+    factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_WORKER,
         task=worker_task,
     )
 
@@ -2260,12 +2260,12 @@ def test_disabled_packaging_for_unassigned_workbasket(
 
     # Assign the workbasket so it can now be packaged
     task = factories.TaskFactory.create(workbasket=user_empty_workbasket)
-    factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_WORKER,
+    factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_WORKER,
         task=task,
     )
-    factories.UserAssignmentFactory.create(
-        assignment_type=UserAssignment.AssignmentType.WORKBASKET_REVIEWER,
+    factories.TaskAssigneeFactory.create(
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
         task=task,
     )
 
@@ -2277,7 +2277,7 @@ def test_disabled_packaging_for_unassigned_workbasket(
 
 def test_workbasket_assign_users_view(valid_user, valid_user_client, user_workbasket):
     valid_user.user_permissions.add(
-        Permission.objects.get(codename="add_userassignment"),
+        Permission.objects.get(codename="add_taskassignee"),
     )
     response = valid_user_client.get(
         reverse(
@@ -2303,7 +2303,7 @@ def test_workbasket_assign_users_view_without_permission(client, user_workbasket
 
 def test_workbasket_unassign_users_view(valid_user, valid_user_client, user_workbasket):
     valid_user.user_permissions.add(
-        Permission.objects.get(codename="change_userassignment"),
+        Permission.objects.get(codename="change_taskassignee"),
     )
     response = valid_user_client.get(
         reverse(
diff --git a/workbaskets/views/ui.py b/workbaskets/views/ui.py
index f62fb86d1..3b7f682a8 100644
--- a/workbaskets/views/ui.py
+++ b/workbaskets/views/ui.py
@@ -64,8 +64,9 @@
 from quotas.models import QuotaSuspension
 from regulations.models import Regulation
 from tasks.models import Comment
+from tasks.models import ProgressState
 from tasks.models import Task
-from tasks.models import UserAssignment
+from tasks.models import TaskAssignee
 from workbaskets import forms
 from workbaskets.models import DataRow
 from workbaskets.models import DataUpload
@@ -101,12 +102,12 @@ class WorkBasketAssignmentFilter(FilterSet):
 
     def assignment_filter(self, queryset, name, value):
         active_workers = (
-            UserAssignment.objects.workbasket_workers()
+            TaskAssignee.objects.workbasket_workers()
             .assigned()
             .values_list("task__workbasket_id")
         )
         active_reviewers = (
-            UserAssignment.objects.workbasket_reviewers()
+            TaskAssignee.objects.workbasket_reviewers()
             .assigned()
             .values_list("task__workbasket_id")
         )
@@ -1593,7 +1594,7 @@ class NoActiveWorkBasket(TemplateView):
 
 
 class WorkBasketAssignUsersView(PermissionRequiredMixin, FormView):
-    permission_required = "tasks.add_userassignment"
+    permission_required = "tasks.add_taskassignee"
     template_name = "workbaskets/assign_users.jinja"
     form_class = forms.WorkBasketAssignUsersForm
 
@@ -1623,6 +1624,10 @@ def form_valid(self, form):
             defaults={
                 "title": self.workbasket.title,
                 "description": self.workbasket.reason,
+                "progress_state": ProgressState.objects.get(
+                    name=ProgressState.State.TO_DO,
+                ),
+                "creator": self.request.user,
             },
         )
         form.assign_users(task=task)
@@ -1633,7 +1638,7 @@ def get_success_url(self):
 
 
 class WorkBasketUnassignUsersView(PermissionRequiredMixin, FormView):
-    permission_required = "tasks.change_userassignment"
+    permission_required = "tasks.change_taskassignee"
     template_name = "workbaskets/assign_users.jinja"
     form_class = forms.WorkBasketUnassignUsersForm
 
diff --git a/workflow/__init__.py b/workflow/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/workflow/admin.py b/workflow/admin.py
deleted file mode 100644
index 846f6b406..000000000
--- a/workflow/admin.py
+++ /dev/null
@@ -1 +0,0 @@
-# Register your models here.
diff --git a/workflow/apps.py b/workflow/apps.py
deleted file mode 100644
index bd2134053..000000000
--- a/workflow/apps.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.apps import AppConfig
-
-
-class WorkflowConfig(AppConfig):
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "workflow"
diff --git a/workflow/migrations/__init__.py b/workflow/migrations/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/workflow/models.py b/workflow/models.py
deleted file mode 100644
index 6b2021999..000000000
--- a/workflow/models.py
+++ /dev/null
@@ -1 +0,0 @@
-# Create your models here.
diff --git a/workflow/tests.py b/workflow/tests.py
deleted file mode 100644
index a39b155ac..000000000
--- a/workflow/tests.py
+++ /dev/null
@@ -1 +0,0 @@
-# Create your tests here.
diff --git a/workflow/views.py b/workflow/views.py
deleted file mode 100644
index 60f00ef0e..000000000
--- a/workflow/views.py
+++ /dev/null
@@ -1 +0,0 @@
-# Create your views here.

From ee4871d3464e1bf1f0df1e66790b7de4e45acdf4 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Fri, 20 Sep 2024 09:50:38 +0100
Subject: [PATCH 03/57] TP2000-1473  Register task-related models in admin site
 (#1289)

* Register Category model in admin site

* Register ProgressState in admin site

* Register TaskAssignee in admin site

* Register Task model in admin site
---
 tasks/admin.py | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 tasks/admin.py

diff --git a/tasks/admin.py b/tasks/admin.py
new file mode 100644
index 000000000..593611372
--- /dev/null
+++ b/tasks/admin.py
@@ -0,0 +1,86 @@
+from django.contrib import admin
+from django.urls import reverse
+from django.utils.safestring import mark_safe
+
+from tasks.models import Category
+from tasks.models import ProgressState
+from tasks.models import Task
+from tasks.models import TaskAssignee
+
+
+class TaskAdminMixin:
+    def link_to_task(self, task: Task):
+        task_url = reverse(
+            "admin:tasks_task_change",
+            args=(task.pk,),
+        )
+        return mark_safe(
+            f'<a href="{task_url}">{task.pk}</a>',
+        )
+
+    def link_to_workbasket(self, workbasket):
+        workbasket_url = reverse(
+            "admin:workbaskets_workbasket_change",
+            args=(workbasket.pk,),
+        )
+        return mark_safe(
+            f'<a href="{workbasket_url}">{workbasket.pk}</a>',
+        )
+
+
+class TaskAdmin(TaskAdminMixin, admin.ModelAdmin):
+    list_display = [
+        "id",
+        "title",
+        "description",
+        "category",
+        "progress_state",
+        "parent_task_id",
+        "workbasket_id",
+        "creator",
+    ]
+    search_fields = ["id", "title", "description"]
+    list_filter = ["category", "progress_state"]
+
+    def parent_task_id(self, obj):
+        if not obj.parent_task:
+            return None
+        return self.link_to_task(obj.parent_task)
+
+    def workbasket_id(self, obj):
+        if not obj.workbasket:
+            return "-"
+        return self.link_to_workbasket(obj.workbasket)
+
+
+class CategoryAdmin(admin.ModelAdmin):
+    search_fields = ["name"]
+
+
+class ProgressStateAdmin(admin.ModelAdmin):
+    search_fields = ["name"]
+
+
+class TaskAssigneeAdmin(TaskAdminMixin, admin.ModelAdmin):
+    list_display = ["id", "assignee", "assignment_type", "task_id", "unassigned_at"]
+    search_fields = ["user__username", "assignment_type", "task__id"]
+
+    @admin.display(description="User")
+    def assignee(self, obj):
+        if not obj.user:
+            return "Missing user!"
+        return obj.user.get_displayname()
+
+    def task_id(self, obj):
+        if not obj.task:
+            return "Missing task!"
+        return self.link_to_task(obj.task)
+
+
+admin.site.register(Task, TaskAdmin)
+
+admin.site.register(Category, CategoryAdmin)
+
+admin.site.register(ProgressState, ProgressStateAdmin)
+
+admin.site.register(TaskAssignee, TaskAssigneeAdmin)

From de2733ca99bc21841e8121310ffa9e74abc8cf51 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Thu, 31 Oct 2024 13:54:16 +0000
Subject: [PATCH 04/57] Implement prototype UI for tasks (#1308)

* Add initial TaskCreate view & form

* Add initial Task detail view

* Add initial Task edit form & view

* Add initial Task delete view & form

* Add initial Task list view

* Try pre_save signals for TaskLog creation

* Tidy templates

* Allow Task deletion

* Register TaskLog model in admin

* Add test for TaskLog creation

* Rename user group in conftest

* Set up pre_save signal for TaskAssignee to create TaskLog entries

* Persist TaskLog entries after Task deletion

* Add mixins to override Manager and QuerySet methods for pre_save signal handling

* Fix Task delete view

* Move WithSignalManagerMixin and WithSignalQuerysetMixin to common/models/mixins

* Set initial pagination limit for TaskListView
---
 common/models/mixins/__init__.py        |  35 ++++++++
 common/tests/factories.py               |   2 +
 conftest.py                             |   5 +-
 tasks/admin.py                          |  16 ++++
 tasks/filters.py                        |  28 ++++++
 tasks/forms.py                          |  70 +++++++++++++++
 tasks/jinja2/tasks/confirm_create.jinja |  42 +++++++++
 tasks/jinja2/tasks/confirm_delete.jinja |  41 +++++++++
 tasks/jinja2/tasks/confirm_update.jinja |  41 +++++++++
 tasks/jinja2/tasks/delete.jinja         |  26 ++++++
 tasks/jinja2/tasks/detail.jinja         | 115 ++++++++++++++++++++++++
 tasks/jinja2/tasks/edit.jinja           |  19 ++++
 tasks/jinja2/tasks/list.jinja           |  78 ++++++++++++++++
 tasks/migrations/0007_create_tasklog.py |   4 +-
 tasks/models.py                         |  39 ++++++--
 tasks/signals.py                        |  67 ++++++++++++++
 tasks/tests/test_models.py              |   8 +-
 tasks/tests/test_views.py               |  35 ++++++++
 tasks/urls.py                           |  33 +++++++
 tasks/views.py                          | 114 +++++++++++++++++++++++
 urls.py                                 |   1 +
 workbaskets/forms.py                    |   8 ++
 workbaskets/tests/test_models.py        |   2 +-
 workbaskets/tests/test_views.py         |  76 +++++++++++-----
 workbaskets/views/ui.py                 |   1 -
 25 files changed, 872 insertions(+), 34 deletions(-)
 create mode 100644 tasks/filters.py
 create mode 100644 tasks/forms.py
 create mode 100644 tasks/jinja2/tasks/confirm_create.jinja
 create mode 100644 tasks/jinja2/tasks/confirm_delete.jinja
 create mode 100644 tasks/jinja2/tasks/confirm_update.jinja
 create mode 100644 tasks/jinja2/tasks/delete.jinja
 create mode 100644 tasks/jinja2/tasks/detail.jinja
 create mode 100644 tasks/jinja2/tasks/edit.jinja
 create mode 100644 tasks/jinja2/tasks/list.jinja
 create mode 100644 tasks/signals.py
 create mode 100644 tasks/tests/test_views.py
 create mode 100644 tasks/urls.py
 create mode 100644 tasks/views.py

diff --git a/common/models/mixins/__init__.py b/common/models/mixins/__init__.py
index d2e203dd5..0592410b9 100644
--- a/common/models/mixins/__init__.py
+++ b/common/models/mixins/__init__.py
@@ -1,6 +1,7 @@
 """Mixins for models."""
 
 from django.db import models
+from django.db.models import signals
 
 
 class TimestampedMixin(models.Model):
@@ -11,3 +12,37 @@ class TimestampedMixin(models.Model):
 
     class Meta:
         abstract = True
+
+
+class WithSignalManagerMixin:
+    """A mixin that overrides default Manager methods to send pre_save signals
+    for model instances."""
+
+    def bulk_create(self, objs, **kwargs) -> list:
+        for obj in objs:
+            signals.pre_save.send(sender=self.model, instance=obj)
+        return super().bulk_create(objs, **kwargs)
+
+
+class WithSignalQuerysetMixin:
+    """A mixin that overrides default QuerySet methods to send pre_save signals
+    for model instances."""
+
+    def update(self, **kwargs) -> int:
+        old_instances_map = {}
+        pk_list = []
+        for old_instance in self.iterator():
+            old_instances_map[old_instance.pk] = old_instance
+            pk_list.append(old_instance.pk)
+
+        rows_updated = super().update(**kwargs)
+
+        for new_instance in self.model.objects.filter(pk__in=pk_list):
+            old_instance = old_instances_map.get(new_instance.pk)
+            signals.pre_save.send(
+                sender=self.model,
+                instance=new_instance,
+                old_instance=old_instance,
+            )
+
+        return rows_updated
diff --git a/common/tests/factories.py b/common/tests/factories.py
index f3335c637..34f0bdbf2 100644
--- a/common/tests/factories.py
+++ b/common/tests/factories.py
@@ -7,6 +7,7 @@
 
 import factory
 from django.contrib.auth import get_user_model
+from django.db.models import signals
 from factory.fuzzy import FuzzyChoice
 from factory.fuzzy import FuzzyText
 from faker import Faker
@@ -1565,6 +1566,7 @@ class SubTaskFactory(TaskFactory):
     parent_task = factory.SubFactory(TaskFactory)
 
 
+@factory.django.mute_signals(signals.pre_save)
 class TaskAssigneeFactory(factory.django.DjangoModelFactory):
     user = factory.SubFactory(UserFactory)
     assignment_type = FuzzyChoice(TaskAssignee.AssignmentType.values)
diff --git a/conftest.py b/conftest.py
index 54ff9db39..8c9ed10c0 100644
--- a/conftest.py
+++ b/conftest.py
@@ -290,7 +290,7 @@ def api_client() -> APIClient:
 
 @pytest.fixture
 def policy_group(db) -> Group:
-    group = factories.UserGroupFactory.create(name="Policy")
+    group = factories.UserGroupFactory.create(name="Tariff Managers")
 
     for app_label, codename in [
         ("common", "add_trackedmodel"),
@@ -301,6 +301,9 @@ def policy_group(db) -> Group:
         ("publishing", "consume_from_packaging_queue"),
         ("publishing", "manage_packaging_queue"),
         ("publishing", "view_envelope"),
+        ("tasks", "add_task"),
+        ("tasks", "change_task"),
+        ("tasks", "delete_task"),
         ("tasks", "add_taskassignee"),
         ("tasks", "change_taskassignee"),
         ("tasks", "add_comment"),
diff --git a/tasks/admin.py b/tasks/admin.py
index 593611372..01086b346 100644
--- a/tasks/admin.py
+++ b/tasks/admin.py
@@ -6,6 +6,7 @@
 from tasks.models import ProgressState
 from tasks.models import Task
 from tasks.models import TaskAssignee
+from tasks.models import TaskLog
 
 
 class TaskAdminMixin:
@@ -77,6 +78,19 @@ def task_id(self, obj):
         return self.link_to_task(obj.task)
 
 
+class TaskLogAdmin(admin.ModelAdmin):
+    list_display = ["task", "action", "created_at"]
+    list_filter = ["action"]
+    readonly_fields = [
+        "id",
+        "action",
+        "description",
+        "task",
+        "instigator",
+        "created_at",
+    ]
+
+
 admin.site.register(Task, TaskAdmin)
 
 admin.site.register(Category, CategoryAdmin)
@@ -84,3 +98,5 @@ def task_id(self, obj):
 admin.site.register(ProgressState, ProgressStateAdmin)
 
 admin.site.register(TaskAssignee, TaskAssigneeAdmin)
+
+admin.site.register(TaskLog, TaskLogAdmin)
diff --git a/tasks/filters.py b/tasks/filters.py
new file mode 100644
index 000000000..b65c79793
--- /dev/null
+++ b/tasks/filters.py
@@ -0,0 +1,28 @@
+from django.forms import CheckboxSelectMultiple
+from django.urls import reverse_lazy
+from django_filters import ModelMultipleChoiceFilter
+
+from common.filters import TamatoFilter
+from tasks.models import ProgressState
+from tasks.models import Task
+
+
+class TaskFilter(TamatoFilter):
+
+    search_fields = (
+        "id",
+        "title",
+        "description",
+    )
+    clear_url = reverse_lazy("workflow:task-ui-list")
+
+    progress_state = ModelMultipleChoiceFilter(
+        label="Status",
+        help_text="Select all that apply",
+        queryset=ProgressState.objects.all(),
+        widget=CheckboxSelectMultiple,
+    )
+
+    class Meta:
+        model = Task
+        fields = ["search", "category", "progress_state"]
diff --git a/tasks/forms.py b/tasks/forms.py
new file mode 100644
index 000000000..9334f1ef6
--- /dev/null
+++ b/tasks/forms.py
@@ -0,0 +1,70 @@
+from crispy_forms_gds.helper import FormHelper
+from crispy_forms_gds.layout import Layout
+from crispy_forms_gds.layout import Size
+from crispy_forms_gds.layout import Submit
+from django.forms import ModelForm
+
+from common.forms import delete_form_for
+from tasks.models import Task
+from workbaskets.models import WorkBasket
+
+
+class TaskBaseForm(ModelForm):
+    class Meta:
+        model = Task
+        exclude = ["parent_task", "creator"]
+
+        error_messages = {
+            "title": {
+                "required": "Enter a title",
+            },
+            "description": {
+                "required": "Enter a description",
+            },
+            "progress_state": {
+                "required": "Select a status",
+            },
+        }
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.init_fields()
+        self.init_layout()
+
+    def init_fields(self):
+        self.fields["progress_state"].label = "Status"
+        self.fields["workbasket"].queryset = WorkBasket.objects.editable()
+
+    def init_layout(self):
+        self.helper = FormHelper(self)
+        self.helper.label_size = Size.SMALL
+        self.helper.legend_size = Size.SMALL
+        self.helper.layout = Layout(
+            "title",
+            "description",
+            "category",
+            "progress_state",
+            "workbasket",
+            Submit(
+                "submit",
+                "Save",
+                data_module="govuk-button",
+                data_prevent_double_click="true",
+            ),
+        )
+
+
+class TaskCreateForm(TaskBaseForm):
+    def save(self, user, commit=True):
+        instance = super().save(commit=False)
+        instance.creator = user
+        if commit:
+            instance.save()
+        return instance
+
+
+class TaskUpdateForm(TaskBaseForm):
+    pass
+
+
+TaskDeleteForm = delete_form_for(Task)
diff --git a/tasks/jinja2/tasks/confirm_create.jinja b/tasks/jinja2/tasks/confirm_create.jinja
new file mode 100644
index 000000000..f4feb04b4
--- /dev/null
+++ b/tasks/jinja2/tasks/confirm_create.jinja
@@ -0,0 +1,42 @@
+{% extends "common/confirm_create.jinja" %}
+
+{% from "components/breadcrumbs/macro.njk" import govukBreadcrumbs %}
+{% from "components/panel/macro.njk" import govukPanel %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Task created" %}
+
+{% block breadcrumb %}
+  {{ govukBreadcrumbs({
+    "items": [
+      {"text": "Home", "href": url("home")},
+      {"text": "Create a new task", "href": url("workflow:task-ui-create") },
+      {"text": "Task created"}
+    ]
+  }) }}
+{% endblock %}
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": "Task: " ~ object.title,
+    "text": "You have created a new task",
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
+
+{% block button_group %}
+  {{ govukButton({
+    "text": "View task",
+    "href": url('workflow:task-ui-detail', kwargs={"pk": object.pk}),
+    "classes": "govuk-button"
+  }) }}
+  {{ govukButton({
+    "text": "Return to homepage",
+    "href": url("home"),
+    "classes": "govuk-button--secondary"
+  }) }}
+{% endblock %}
+
+{% block actions %}
+  <li><a href="{{ url("workflow:task-ui-list") }}">Find and view tasks</a></li>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/confirm_delete.jinja b/tasks/jinja2/tasks/confirm_delete.jinja
new file mode 100644
index 000000000..65b53069a
--- /dev/null
+++ b/tasks/jinja2/tasks/confirm_delete.jinja
@@ -0,0 +1,41 @@
+{% extends "layouts/confirm.jinja" %}
+
+{% from "components/breadcrumbs/macro.njk" import govukBreadcrumbs %}
+{% from "components/panel/macro.njk" import govukPanel %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Task deleted" %}
+
+{% block breadcrumb %}
+  {{ govukBreadcrumbs({
+    "items": [
+      {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
+      {"text": page_title}
+    ]
+  }) }}
+{% endblock %}
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": "Task ID: " ~ deleted_pk,
+    "text": "Task has been deleted",
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
+
+{% block button_group %}
+  {{ govukButton({
+    "text": "Find and view tasks",
+    "href": url("workflow:task-ui-list"),
+    "classes": "govuk-button"
+  }) }}
+  {{ govukButton({
+    "text": "Return to homepage",
+    "href": url("home"),
+    "classes": "govuk-button--secondary"
+  }) }}
+{% endblock %}
+
+{% block actions %}
+  <li><a href="{{ url("workflow:task-ui-create") }}">Create a task</a></li>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/confirm_update.jinja b/tasks/jinja2/tasks/confirm_update.jinja
new file mode 100644
index 000000000..7e6b712ff
--- /dev/null
+++ b/tasks/jinja2/tasks/confirm_update.jinja
@@ -0,0 +1,41 @@
+{% extends "common/confirm_update.jinja" %}
+
+{% from "components/breadcrumbs/macro.njk" import govukBreadcrumbs %}
+{% from "components/panel/macro.njk" import govukPanel %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Task updated" %}
+
+{% block breadcrumb %}
+  {{ govukBreadcrumbs({
+    "items": [
+      {"text": "Task: " ~ object.title, "href": url("workflow:task-ui-detail", kwargs={"pk": object.pk})},
+      {"text": page_title}
+    ]
+  }) }}
+{% endblock %}
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": "Task: " ~ object.title,
+    "text": "Task has been updated",
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
+
+{% block button_group %}
+  {{ govukButton({
+    "text": "View task",
+    "href": url('workflow:task-ui-detail', kwargs={"pk": object.pk}),
+    "classes": "govuk-button"
+  }) }}
+  {{ govukButton({
+    "text": "Return to homepage",
+    "href": url("home"),
+    "classes": "govuk-button--secondary"
+  }) }}
+{% endblock %}
+
+{% block actions %}
+  <li><a href="{{ url("workflow:task-ui-list") }}">Find and view tasks</a></li>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/delete.jinja b/tasks/jinja2/tasks/delete.jinja
new file mode 100644
index 000000000..9cc761efc
--- /dev/null
+++ b/tasks/jinja2/tasks/delete.jinja
@@ -0,0 +1,26 @@
+{% extends "common/delete.jinja" %}
+
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+{% from "components/warning-text/macro.njk" import govukWarningText %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Delete Task:" ~ object.title %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
+      {"text": "Task: " ~ object.title, "href": url("workflow:task-ui-detail", kwargs={"pk": object.pk})},
+      {"text": page_title}
+    ])
+  }}
+{% endblock %}
+
+{% block form %}
+  {{ govukWarningText({
+    "text": "Are you sure you want to delete this task?"
+  }) }}
+
+  {% call django_form(action=url("workflow:task-ui-delete", kwargs={"pk": object.pk})) %}
+    {{ crispy(form) }}
+  {% endcall %}
+{% endblock %}
diff --git a/tasks/jinja2/tasks/detail.jinja b/tasks/jinja2/tasks/detail.jinja
new file mode 100644
index 000000000..665b4564b
--- /dev/null
+++ b/tasks/jinja2/tasks/detail.jinja
@@ -0,0 +1,115 @@
+{% extends "layouts/layout.jinja" %}
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Task: " ~ object.title %}
+
+{% set edit_url = url("workflow:task-ui-update", kwargs={"pk": object.pk}) %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
+      {"text": page_title}
+    ]
+  ) }}
+{% endblock %}
+
+{% block content %}
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+      <h1 class="govuk-heading-xl">{{ page_title }}</h1>
+    </div>
+  </div>
+
+  <h2 class="govuk-heading-m">Details</h2>
+  
+  <dl class="govuk-summary-list">
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">
+      ID
+    </dt>
+    <dd class="govuk-summary-list__value">
+      {{ object.pk }}
+    </dd>
+  </div>
+
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">
+      Title
+    </dt>
+    <dd class="govuk-summary-list__value">
+      {{ object.title }}
+    </dd>
+    <dd class="govuk-summary-list__actions">
+      <a class="govuk-link" href="{{ edit_url }}">Change<span class="govuk-visually-hidden"> title</span></a>
+    </dd>
+  </div>
+
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">
+      Description
+    </dt>
+    <dd class="govuk-summary-list__value">
+      {{ object.description }}
+    </dd>
+    <dd class="govuk-summary-list__actions">
+      <a class="govuk-link" href="{{ edit_url }}">Change<span class="govuk-visually-hidden"> description</span></a>
+    </dd>
+  </div>
+
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">
+      Category
+    </dt>
+    <dd class="govuk-summary-list__value">
+      {{ object.category }}
+    </dd>
+    <dd class="govuk-summary-list__actions">
+      <a class="govuk-link" href="{{ edit_url }}">Change<span class="govuk-visually-hidden"> category</span></a>
+    </dd>
+  </div>
+
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">
+      Status
+    </dt>
+    <dd class="govuk-summary-list__value">
+      {{ object.progress_state }}
+    </dd>
+    <dd class="govuk-summary-list__actions">
+      <a class="govuk-link" href="{{ edit_url }}">Change<span class="govuk-visually-hidden"> status</span></a>
+    </dd>
+  </div>
+
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">
+      Created
+    </dt>
+    <dd class="govuk-summary-list__value">
+      {{ "{:%d %b %Y %H:%M}".format(object.created_at) }}
+    </dd>
+  </div>
+
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">
+      Created by
+    </dt>
+    <dd class="govuk-summary-list__value">
+      {{ object.creator.get_displayname() }}
+    </dd>
+  </div>
+</dl>
+
+<div class="govuk-button-group">
+  {{ govukButton({
+    "text": "Delete task",
+    "href": url("workflow:task-ui-delete", kwargs={"pk": object.pk}),
+    "classes": "govuk-button--warning"
+  }) }}
+  {{ govukButton({
+    "text": "Find and view tasks",
+    "href": url("workflow:task-ui-list"),
+    "classes": "govuk-button--secondary"
+  }) }}
+</div>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/edit.jinja b/tasks/jinja2/tasks/edit.jinja
new file mode 100644
index 000000000..9ce73f211
--- /dev/null
+++ b/tasks/jinja2/tasks/edit.jinja
@@ -0,0 +1,19 @@
+{% extends "layouts/form.jinja" %}
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+
+{% set page_title = "Edit task details" %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
+      {"text": "Task: " ~ object.title, "href": url("workflow:task-ui-detail", kwargs={"pk": object.pk})},
+      {"text": page_title}
+    ])
+  }}
+{% endblock %}
+
+{% block form %}
+  {% call django_form() %}
+    {{ crispy(form) }}
+  {% endcall %}
+{% endblock %}
diff --git a/tasks/jinja2/tasks/list.jinja b/tasks/jinja2/tasks/list.jinja
new file mode 100644
index 000000000..fa120a392
--- /dev/null
+++ b/tasks/jinja2/tasks/list.jinja
@@ -0,0 +1,78 @@
+{% extends "layouts/layout.jinja" %}
+
+{% from "components/table/macro.njk" import govukTable %}
+{% from "components/create_sortable_anchor.jinja" import create_sortable_anchor %}
+
+{% set page_title = "Find and view tasks" %}
+
+{% set base_url = url("workflow:task-ui-list") %}
+
+{% block content %}
+  <h1 class="govuk-heading-xl">{{ page_title }}</h1>
+  <p class="govuk-body">
+    Search for tasks.
+    Alternatively, <a class="govuk-link" href="{{ url("workflow:task-ui-create") }}">create a new task</a>.
+  </p>
+
+  <div class="filter-layout">
+    <div class="filter-layout__filters">
+      <h2 class="govuk-heading-m govuk-!-margin-top-3">Search and filter</h2>
+      <form method="get" action="{{ url("workflow:task-ui-list") }}">
+          {{ crispy(filter.form) }}
+      </form>
+    </div>
+
+  <div class="filter-layout__content">
+    {% if paginator.count > 0 %}
+      {% include "includes/common/pagination-list-summary.jinja" %}
+    {% endif %}
+    {% if object_list %}
+      {% set table_rows = [] %}
+      {% for object in object_list %}
+        {%- set task_linked_id -%}
+          <a
+            class="govuk-link"
+            href="{{ url("workflow:task-ui-detail", kwargs={"pk": object.pk}) }}"
+          >{{ object.pk }}</a>
+        {%- endset -%}
+
+        {%- set workbasket_linked_id -%}
+          <a
+            class="govuk-link"
+            href="{{ url("workbaskets:workbasket-ui-detail", kwargs={"pk": object.workbasket.pk}) }}"
+          >{{ object.workbasket.pk }}</a>
+        {%- endset -%}
+
+        {{ table_rows.append([
+          {"text": task_linked_id},
+          {"text": object.title},
+          {"text": object.category},
+          {"text": object.progress_state},
+          {"text": workbasket_linked_id if object.workbasket else "-"},
+          {"text": "{:%d %b %Y}".format(object.created_at)},
+        ]) or "" }}
+      {% endfor %}
+
+      {{ govukTable({
+        "head": [
+          {"text": "ID"},
+          {"text": "Title"},
+          {"text": "Category"},
+          {"text": "Status"},
+          {"text": "Workbasket"},
+          {"text": create_sortable_anchor(request, "created_at", "Created", base_url)},
+        ],
+          "rows": table_rows
+        }) }}
+    {% else %}
+      <p class="govuk-body">There are no results for your search, please:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>check the spelling of your keywords</li>
+        <li>use more general keywords</li>
+        <li>select or deselect different filters</li>
+      </ul>
+    {% endif %}
+    {% include "includes/common/pagination.jinja" %}
+  </div>
+</div>
+{% endblock %}
diff --git a/tasks/migrations/0007_create_tasklog.py b/tasks/migrations/0007_create_tasklog.py
index 15a81debf..05659f3fa 100644
--- a/tasks/migrations/0007_create_tasklog.py
+++ b/tasks/migrations/0007_create_tasklog.py
@@ -40,6 +40,7 @@ class Migration(migrations.Migration):
                             ("TASK_UNASSIGNED", "Task Unassigned"),
                             ("PROGRESS_STATE_UPDATED", "Progress State Updated"),
                         ],
+                        editable=False,
                         max_length=100,
                     ),
                 ),
@@ -56,7 +57,8 @@ class Migration(migrations.Migration):
                     "task",
                     models.ForeignKey(
                         editable=False,
-                        on_delete=django.db.models.deletion.PROTECT,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
                         related_name="logs",
                         to="tasks.task",
                     ),
diff --git a/tasks/models.py b/tasks/models.py
index 424b026b3..28cad75a1 100644
--- a/tasks/models.py
+++ b/tasks/models.py
@@ -3,13 +3,25 @@
 from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.db import models
+from django.db import transaction
+from django.urls import reverse
 
 from common.models.mixins import TimestampedMixin
+from common.models.mixins import WithSignalManagerMixin
+from common.models.mixins import WithSignalQuerysetMixin
 from workbaskets.models import WorkBasket
 
 User = get_user_model()
 
 
+class TaskManager(WithSignalManagerMixin, models.Manager):
+    pass
+
+
+class TaskQueryset(WithSignalQuerysetMixin, models.QuerySet):
+    pass
+
+
 class Task(TimestampedMixin):
     title = models.CharField(max_length=255)
     description = models.TextField()
@@ -44,9 +56,14 @@ class Task(TimestampedMixin):
         related_name="created_tasks",
     )
 
+    objects = TaskManager.from_queryset(TaskQueryset)()
+
     def __str__(self):
         return self.title
 
+    def get_url(self):
+        return reverse("workflow:task-ui-detail", kwargs={"pk": self.pk})
+
 
 class Category(models.Model):
     name = models.CharField(
@@ -78,7 +95,11 @@ def __str__(self):
         return self.get_name_display()
 
 
-class TaskAssigneeQueryset(models.QuerySet):
+class TaskAssigneeManager(WithSignalManagerMixin, models.Manager):
+    pass
+
+
+class TaskAssigneeQueryset(WithSignalQuerysetMixin, models.QuerySet):
     def assigned(self):
         return self.exclude(unassigned_at__isnull=False)
 
@@ -122,7 +143,7 @@ class AssignmentType(models.TextChoices):
         null=True,
     )
 
-    objects = TaskAssigneeQueryset.as_manager()
+    objects = TaskAssigneeManager.from_queryset(TaskAssigneeQueryset)()
 
     def __str__(self):
         return (
@@ -134,13 +155,17 @@ def is_assigned(self):
         return True if not self.unassigned_at else False
 
     @classmethod
-    def unassign_user(cls, user, task):
+    def unassign_user(cls, user, task, instigator):
+        from tasks.signals import set_current_instigator
+
         try:
             assignment = cls.objects.get(user=user, task=task)
             if assignment.unassigned_at:
                 return False
-            assignment.unassigned_at = datetime.now()
-            assignment.save(update_fields=["unassigned_at"])
+            set_current_instigator(instigator)
+            with transaction.atomic():
+                assignment.unassigned_at = datetime.now()
+                assignment.save(update_fields=["unassigned_at"])
             return True
         except cls.DoesNotExist:
             return False
@@ -218,11 +243,13 @@ class AuditActionType(models.TextChoices):
     action = models.CharField(
         max_length=100,
         choices=AuditActionType.choices,
+        editable=False,
     )
     description = models.TextField(editable=False)
     task = models.ForeignKey(
         Task,
-        on_delete=models.PROTECT,
+        null=True,
+        on_delete=models.SET_NULL,
         editable=False,
         related_name="logs",
     )
diff --git a/tasks/signals.py b/tasks/signals.py
new file mode 100644
index 000000000..af6392408
--- /dev/null
+++ b/tasks/signals.py
@@ -0,0 +1,67 @@
+import threading
+
+from django.db.models.signals import pre_save
+from django.dispatch import receiver
+
+from tasks.models import Task
+from tasks.models import TaskAssignee
+from tasks.models import TaskLog
+
+_thread_locals = threading.local()
+
+
+def get_current_instigator():
+    return getattr(_thread_locals, "instigator", None)
+
+
+def set_current_instigator(instigator):
+    _thread_locals.instigator = instigator
+
+
+@receiver(pre_save, sender=Task)
+def create_tasklog_for_task_update(sender, instance, old_instance=None, **kwargs):
+    """
+    Creates a `TaskLog` entry when a `Task` is being updated and the update
+    action is a `TaskLog.AuditActionType`.
+
+    Note that this signal is triggered before the `Task` instance is saved.
+    """
+    if instance._state.adding:
+        return
+
+    old_instance = old_instance or Task.objects.get(pk=instance.pk)
+
+    if instance.progress_state != old_instance.progress_state:
+        TaskLog.objects.create(
+            task=instance,
+            action=TaskLog.AuditActionType.PROGRESS_STATE_UPDATED,
+            instigator=get_current_instigator(),
+            progress_state=instance.progress_state,
+        )
+
+
+@receiver(pre_save, sender=TaskAssignee)
+def create_tasklog_for_task_assignee(sender, instance, old_instance=None, **kwargs):
+    """
+    Creates a `TaskLog` entry when a user is assigned to or unassigned from a
+    `Task`.
+
+    Note that this signal is triggered before the `TaskAssignee` instance is saved.
+    """
+    if instance._state.adding:
+        return TaskLog.objects.create(
+            task=instance.task,
+            action=TaskLog.AuditActionType.TASK_ASSIGNED,
+            instigator=get_current_instigator(),
+            assignee=instance.user,
+        )
+
+    old_instance = old_instance or TaskAssignee.objects.get(pk=instance.pk)
+
+    if instance.unassigned_at and instance.unassigned_at != old_instance.unassigned_at:
+        return TaskLog.objects.create(
+            task=instance.task,
+            action=TaskLog.AuditActionType.TASK_UNASSIGNED,
+            instigator=get_current_instigator(),
+            assignee=old_instance.user,
+        )
diff --git a/tasks/tests/test_models.py b/tasks/tests/test_models.py
index 2201e0c2d..ec8f6fb81 100644
--- a/tasks/tests/test_models.py
+++ b/tasks/tests/test_models.py
@@ -29,9 +29,9 @@ def test_task_assignee_unassign_user_classmethod(task_assignee):
     user = task_assignee.user
     task = task_assignee.task
 
-    assert TaskAssignee.unassign_user(user=user, task=task)
+    assert TaskAssignee.unassign_user(user=user, task=task, instigator=user)
     # User has already been unassigned
-    assert not TaskAssignee.unassign_user(user=user, task=task)
+    assert not TaskAssignee.unassign_user(user=user, task=task, instigator=user)
 
 
 def test_task_assignee_assigned_queryset(
@@ -41,7 +41,7 @@ def test_task_assignee_assigned_queryset(
 
     user = task_assignee.user
     task = task_assignee.task
-    TaskAssignee.unassign_user(user=user, task=task)
+    TaskAssignee.unassign_user(user=user, task=task, instigator=user)
 
     assert not TaskAssignee.objects.assigned()
 
@@ -53,7 +53,7 @@ def test_task_assignee_unassigned_queryset(
 
     user = task_assignee.user
     task = task_assignee.task
-    TaskAssignee.unassign_user(user=user, task=task)
+    TaskAssignee.unassign_user(user=user, task=task, instigator=user)
 
     assert TaskAssignee.objects.unassigned().count() == 1
 
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
new file mode 100644
index 000000000..b7ecd58c8
--- /dev/null
+++ b/tasks/tests/test_views.py
@@ -0,0 +1,35 @@
+from django.urls import reverse
+
+from common.tests.factories import ProgressStateFactory
+from common.tests.factories import TaskFactory
+from tasks.models import ProgressState
+from tasks.models import TaskLog
+
+
+def test_task_update_view_update_progress_state(valid_user_client):
+    """Tests that `TaskUpdateView` updates `Task.progress_state` and that a
+    related `TaskLog` entry is also created."""
+    instance = TaskFactory.create(progress_state__name=ProgressState.State.TO_DO)
+    new_progress_state = ProgressStateFactory.create(
+        name=ProgressState.State.IN_PROGRESS,
+    )
+    form_data = {
+        "progress_state": new_progress_state.pk,
+        "title": instance.title,
+        "description": instance.description,
+    }
+    url = reverse(
+        "workflow:task-ui-update",
+        kwargs={"pk": instance.pk},
+    )
+    response = valid_user_client.post(url, form_data)
+    assert response.status_code == 302
+
+    instance.refresh_from_db()
+
+    assert instance.progress_state == new_progress_state
+    assert TaskLog.objects.get(
+        task=instance,
+        action=TaskLog.AuditActionType.PROGRESS_STATE_UPDATED,
+        instigator=response.wsgi_request.user,
+    )
diff --git a/tasks/urls.py b/tasks/urls.py
new file mode 100644
index 000000000..176b76bff
--- /dev/null
+++ b/tasks/urls.py
@@ -0,0 +1,33 @@
+from django.urls import include
+from django.urls import path
+
+from tasks import views
+
+app_name = "workflow"
+
+ui_patterns = [
+    path("", views.TaskListView.as_view(), name="task-ui-list"),
+    path("<int:pk>/", views.TaskDetailView.as_view(), name="task-ui-detail"),
+    path("create/", views.TaskCreateView.as_view(), name="task-ui-create"),
+    path(
+        "<int:pk>/confirm-create",
+        views.TaskConfirmCreateView.as_view(),
+        name="task-ui-confirm-create",
+    ),
+    path("<int:pk>/update/", views.TaskUpdateView.as_view(), name="task-ui-update"),
+    path(
+        "<int:pk>/confirm-update",
+        views.TaskConfirmUpdateView.as_view(),
+        name="task-ui-confirm-update",
+    ),
+    path("<int:pk>/delete/", views.TaskDeleteView.as_view(), name="task-ui-delete"),
+    path(
+        "<int:pk>/confirm-delete",
+        views.TaskConfirmDeleteView.as_view(),
+        name="task-ui-confirm-delete",
+    ),
+]
+
+urlpatterns = [
+    path("tasks/", include(ui_patterns)),
+]
diff --git a/tasks/views.py b/tasks/views.py
new file mode 100644
index 000000000..c2394b226
--- /dev/null
+++ b/tasks/views.py
@@ -0,0 +1,114 @@
+from django.contrib.auth.mixins import PermissionRequiredMixin
+from django.db import transaction
+from django.http import HttpResponseRedirect
+from django.urls import reverse
+from django.views.generic.base import TemplateView
+from django.views.generic.detail import DetailView
+from django.views.generic.edit import CreateView
+from django.views.generic.edit import DeleteView
+from django.views.generic.edit import UpdateView
+
+from common.views import SortingMixin
+from common.views import WithPaginationListView
+from tasks.filters import TaskFilter
+from tasks.forms import TaskCreateForm
+from tasks.forms import TaskDeleteForm
+from tasks.forms import TaskUpdateForm
+from tasks.models import Task
+from tasks.signals import set_current_instigator
+
+
+class TaskListView(PermissionRequiredMixin, SortingMixin, WithPaginationListView):
+    model = Task
+    template_name = "tasks/list.jinja"
+    permission_required = "tasks.view_task"
+    paginate_by = 20
+    filterset_class = TaskFilter
+    sort_by_fields = ["created_at"]
+
+    def get_queryset(self):
+        queryset = Task.objects.all()
+        ordering = self.get_ordering()
+        if ordering:
+            ordering = (ordering,)
+            queryset = queryset.order_by(*ordering)
+        return queryset
+
+
+class TaskDetailView(PermissionRequiredMixin, DetailView):
+    model = Task
+    template_name = "tasks/detail.jinja"
+    permission_required = "tasks.view_task"
+
+
+class TaskCreateView(PermissionRequiredMixin, CreateView):
+    model = Task
+    template_name = "layouts/create.jinja"
+    permission_required = "tasks.add_task"
+    form_class = TaskCreateForm
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["page_title"] = "Create a task"
+        return context
+
+    def form_valid(self, form):
+        self.object = form.save(user=self.request.user)
+        return HttpResponseRedirect(self.get_success_url())
+
+    def get_success_url(self):
+        return reverse("workflow:task-ui-confirm-create", kwargs={"pk": self.object.pk})
+
+
+class TaskConfirmCreateView(PermissionRequiredMixin, DetailView):
+    model = Task
+    template_name = "tasks/confirm_create.jinja"
+    permission_required = "tasks.add_task"
+
+
+class TaskUpdateView(PermissionRequiredMixin, UpdateView):
+    model = Task
+    template_name = "tasks/edit.jinja"
+    permission_required = "tasks.change_task"
+    form_class = TaskUpdateForm
+
+    def form_valid(self, form):
+        set_current_instigator(self.request.user)
+        with transaction.atomic():
+            self.object = form.save()
+        return HttpResponseRedirect(self.get_success_url())
+
+    def get_success_url(self):
+        return reverse("workflow:task-ui-confirm-update", kwargs={"pk": self.object.pk})
+
+
+class TaskConfirmUpdateView(PermissionRequiredMixin, DetailView):
+    model = Task
+    template_name = "tasks/confirm_update.jinja"
+    permission_required = "tasks.change_task"
+
+
+class TaskDeleteView(PermissionRequiredMixin, DeleteView):
+    model = Task
+    template_name = "tasks/delete.jinja"
+    permission_required = "tasks.delete_task"
+    form_class = TaskDeleteForm
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["instance"] = self.object
+        return kwargs
+
+    def get_success_url(self):
+        return reverse("workflow:task-ui-confirm-delete", kwargs={"pk": self.object.pk})
+
+
+class TaskConfirmDeleteView(PermissionRequiredMixin, TemplateView):
+    model = Task
+    template_name = "tasks/confirm_delete.jinja"
+    permission_required = "tasks.delete_task"
+
+    def get_context_data(self, **kwargs):
+        context_data = super().get_context_data(**kwargs)
+        context_data["deleted_pk"] = self.kwargs["pk"]
+        return context_data
diff --git a/urls.py b/urls.py
index 61e6aca58..d82888efc 100644
--- a/urls.py
+++ b/urls.py
@@ -37,6 +37,7 @@
     path("", include("regulations.urls")),
     path("", include("reports.urls")),
     path("", include("taric_parsers.urls")),
+    path("", include("tasks.urls", namespace="workflow")),
     path("", include("workbaskets.urls", namespace="workbaskets")),
     path("", include("reference_documents.urls", namespace="reference_documents")),
 ]
diff --git a/workbaskets/forms.py b/workbaskets/forms.py
index 7d6c0827d..b2fb5002a 100644
--- a/workbaskets/forms.py
+++ b/workbaskets/forms.py
@@ -11,6 +11,7 @@
 from crispy_forms_gds.layout import Submit
 from django import forms
 from django.contrib.auth import get_user_model
+from django.db import transaction
 from django.db.models import Q
 from django.urls import reverse
 
@@ -20,6 +21,7 @@
 from tasks.models import Comment
 from tasks.models import Task
 from tasks.models import TaskAssignee
+from tasks.signals import set_current_instigator
 from workbaskets import models
 from workbaskets import validators
 from workbaskets.util import serialize_uploaded_data
@@ -248,7 +250,10 @@ def init_layout(self):
             ),
         )
 
+    @transaction.atomic
     def assign_users(self, task):
+        set_current_instigator(self.request.user)
+
         assignment_type = self.cleaned_data["assignment_type"]
 
         assignees = [
@@ -309,7 +314,10 @@ def init_layout(self):
             ),
         )
 
+    @transaction.atomic
     def unassign_users(self):
+        set_current_instigator(self.request.user)
+
         assignees = self.cleaned_data["assignees"]
         for assignee in assignees:
             assignee.unassigned_at = datetime.now()
diff --git a/workbaskets/tests/test_models.py b/workbaskets/tests/test_models.py
index a9e23c086..c837459e6 100644
--- a/workbaskets/tests/test_models.py
+++ b/workbaskets/tests/test_models.py
@@ -462,7 +462,7 @@ def test_unassigned_workbasket_cannot_be_queued():
     )
     assert workbasket.is_fully_assigned()
 
-    TaskAssignee.unassign_user(user=worker, task=task)
+    TaskAssignee.unassign_user(user=worker, task=task, instigator=worker)
     assert not workbasket.is_fully_assigned()
 
 
diff --git a/workbaskets/tests/test_views.py b/workbaskets/tests/test_views.py
index 8baa0f142..9abc1721c 100644
--- a/workbaskets/tests/test_views.py
+++ b/workbaskets/tests/test_views.py
@@ -27,6 +27,7 @@
 from measures.models import Measure
 from tasks.models import Comment
 from tasks.models import TaskAssignee
+from tasks.models import TaskLog
 from workbaskets import models
 from workbaskets.tasks import check_workbasket_sync
 from workbaskets.validators import WorkflowStatus
@@ -2275,18 +2276,36 @@ def test_disabled_packaging_for_unassigned_workbasket(
     assert not packaging_button.has_attr("disabled")
 
 
-def test_workbasket_assign_users_view(valid_user, valid_user_client, user_workbasket):
-    valid_user.user_permissions.add(
-        Permission.objects.get(codename="add_taskassignee"),
-    )
-    response = valid_user_client.get(
-        reverse(
-            "workbaskets:workbasket-ui-assign-users",
-            kwargs={"pk": user_workbasket.pk},
-        ),
+def test_workbasket_assign_users_view(valid_user, valid_user_client, new_workbasket):
+    """Tests that a user can be assigned to a workbasket and that a `TaskLog`
+    entry is created together with the `TaskAssignee` instance."""
+    url = reverse(
+        "workbaskets:workbasket-ui-assign-users",
+        kwargs={"pk": new_workbasket.pk},
     )
+
+    form_data = {
+        "users": [valid_user.pk],
+        "assignment_type": TaskAssignee.AssignmentType.WORKBASKET_WORKER,
+    }
+
+    response = valid_user_client.get(url)
     assert response.status_code == 200
-    assert "Assign users to workbasket" in str(response.content)
+
+    response = valid_user_client.post(url, form_data)
+    assert response.status_code == 302
+
+    assert TaskAssignee.objects.get(
+        user=valid_user,
+        assignment_type=TaskAssignee.AssignmentType.WORKBASKET_WORKER,
+        task__workbasket=new_workbasket,
+    )
+
+    assert TaskLog.objects.get(
+        task__workbasket=new_workbasket,
+        action=TaskLog.AuditActionType.TASK_ASSIGNED,
+        instigator=response.wsgi_request.user,
+    )
 
 
 def test_workbasket_assign_users_view_without_permission(client, user_workbasket):
@@ -2301,18 +2320,35 @@ def test_workbasket_assign_users_view_without_permission(client, user_workbasket
     assert response.status_code == 403
 
 
-def test_workbasket_unassign_users_view(valid_user, valid_user_client, user_workbasket):
-    valid_user.user_permissions.add(
-        Permission.objects.get(codename="change_taskassignee"),
-    )
-    response = valid_user_client.get(
-        reverse(
-            "workbaskets:workbasket-ui-unassign-users",
-            kwargs={"pk": user_workbasket.pk},
-        ),
+def test_workbasket_unassign_users_view(valid_user, valid_user_client):
+    """Tests that a user can be unassigned from a workbasket and that a
+    `TaskLog` entry is created together with the updated `TaskAssignee`
+    instance."""
+    assignee = factories.TaskAssigneeFactory.create(user=valid_user)
+    workbasket = assignee.task.workbasket
+
+    url = reverse(
+        "workbaskets:workbasket-ui-unassign-users",
+        kwargs={"pk": workbasket.pk},
     )
+    form_data = {
+        "assignees": [assignee.pk],
+    }
+
+    response = valid_user_client.get(url)
     assert response.status_code == 200
-    assert "Unassign users from workbasket" in str(response.content)
+
+    response = valid_user_client.post(url, form_data)
+    assert response.status_code == 302
+
+    assignee.refresh_from_db()
+
+    assert not assignee.is_assigned
+    assert TaskLog.objects.get(
+        task__workbasket=workbasket,
+        action=TaskLog.AuditActionType.TASK_UNASSIGNED,
+        instigator=response.wsgi_request.user,
+    )
 
 
 def test_workbasket_unassign_users_view_without_permission(client, user_workbasket):
diff --git a/workbaskets/views/ui.py b/workbaskets/views/ui.py
index 3b7f682a8..62705411a 100644
--- a/workbaskets/views/ui.py
+++ b/workbaskets/views/ui.py
@@ -1661,7 +1661,6 @@ def get_form_kwargs(self):
         )
         return kwargs
 
-    @atomic
     def form_valid(self, form):
         form.unassign_users()
         return redirect(self.get_success_url())

From ddfea35343385d3b0444aecf03388d7b28dd4b49 Mon Sep 17 00:00:00 2001
From: Marya Shariq <marya.shariq@digital.trade.gov.uk>
Date: Mon, 11 Nov 2024 14:46:09 +0000
Subject: [PATCH 05/57] TP2000-1487: Create Subtask Form (#1319)

* create 'subtask create form' with predetermined parent

* add test to check that SubtaskCreateForm.save adds correct parent task when creating subtask
---
 tasks/forms.py            | 10 ++++++++++
 tasks/tests/test_forms.py | 22 ++++++++++++++++++++++
 tasks/urls.py             |  5 +++++
 tasks/views.py            | 21 +++++++++++++++++++++
 4 files changed, 58 insertions(+)
 create mode 100644 tasks/tests/test_forms.py

diff --git a/tasks/forms.py b/tasks/forms.py
index 9334f1ef6..c15f3be06 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -67,4 +67,14 @@ class TaskUpdateForm(TaskBaseForm):
     pass
 
 
+class SubTaskCreateForm(TaskBaseForm):
+    def save(self, parent_task, user, commit=True):
+        instance = super().save(commit=False)
+        instance.creator = user
+        instance.parent_task = parent_task
+        if commit:
+            instance.save()
+        return instance
+
+
 TaskDeleteForm = delete_form_for(Task)
diff --git a/tasks/tests/test_forms.py b/tasks/tests/test_forms.py
new file mode 100644
index 000000000..d04806c63
--- /dev/null
+++ b/tasks/tests/test_forms.py
@@ -0,0 +1,22 @@
+from common.tests.factories import ProgressStateFactory
+from common.tests.factories import TaskFactory
+from tasks import forms
+from tasks.models import ProgressState
+
+
+def test_create_subtask_assigns_correct_parent_task(valid_user):
+    """Tests that SubtaskCreateForm assigns the correct parent on form.save."""
+    parent_task_instance = TaskFactory.create()
+    progress_state = ProgressStateFactory.create(
+        name=ProgressState.State.IN_PROGRESS,
+    )
+
+    subtask_form_data = {
+        "progress_state": progress_state.pk,
+        "title": "subtask test title",
+        "description": "subtask test description",
+    }
+    form = forms.SubTaskCreateForm(data=subtask_form_data)
+    new_subtask = form.save(parent_task_instance, user=valid_user)
+
+    assert new_subtask.parent_task.pk == parent_task_instance.pk
diff --git a/tasks/urls.py b/tasks/urls.py
index 176b76bff..0f5aff2c5 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -26,6 +26,11 @@
         views.TaskConfirmDeleteView.as_view(),
         name="task-ui-confirm-delete",
     ),
+    path(
+        "<int:pk>/sub-tasks/create",
+        views.SubTaskCreateView.as_view(),
+        name="subtask-ui-create",
+    ),
 ]
 
 urlpatterns = [
diff --git a/tasks/views.py b/tasks/views.py
index c2394b226..5f9b2bfad 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -11,6 +11,7 @@
 from common.views import SortingMixin
 from common.views import WithPaginationListView
 from tasks.filters import TaskFilter
+from tasks.forms import SubTaskCreateForm
 from tasks.forms import TaskCreateForm
 from tasks.forms import TaskDeleteForm
 from tasks.forms import TaskUpdateForm
@@ -112,3 +113,23 @@ def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)
         context_data["deleted_pk"] = self.kwargs["pk"]
         return context_data
+
+
+class SubTaskCreateView(PermissionRequiredMixin, CreateView):
+    model = Task
+    template_name = "layouts/create.jinja"
+    permission_required = "tasks.add_task"
+    form_class = SubTaskCreateForm
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["page_title"] = "Create a subtask"
+        return context
+
+    def form_valid(self, form):
+        parent_task = Task.objects.filter(pk=self.kwargs["pk"]).first()
+        self.object = form.save(parent_task, user=self.request.user)
+        return HttpResponseRedirect(self.get_success_url())
+
+    def get_success_url(self):
+        return reverse("workflow:task-ui-confirm-create", kwargs={"pk": self.object.pk})

From ead85bceccbcf5af6a8ecabf2f824ecde9bfc340 Mon Sep 17 00:00:00 2001
From: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:05:07 +0000
Subject: [PATCH 06/57] TP2000-1540, TP2000-1541, TP2000-1546 & TP2000-1553
 queues, workflows and workflow task items (#1321)

* Split models file and add stubbed queue support.

* Removed queue from base class; Create TaskItem using TaskItemTemplate position

* Amend TaskItem.position exception error message

* Override QueueItem metaclass to enforce queue field on conrete subclasses

* Export queue-related models from tasks

* Implement Queue instance methods using new get_related_objects util method

* Implement QueueItem instance methods

* Add Queue.get_items() and add return type annotations

* Add concrete test-only models for Queue and QueueItem

* Add queue tests

* Add queue and item tests

* Refactor TableLock into a decorator and context manager

* Override QueueItem's model manager create method to set queue positions on behalf of subclasses

* Amend Queue and QueueItem tests

* Docstring updates.

* Support only a single reverse FK relationship to QueueItem for queue instances

* Support default State instance on ProgressState and Task.progress_state

* Remove redundant model manager. Add task and task template util methods.

* Add workflow unit tests.

* Rely on Task.progress_state default in WB assign users view

---------

Co-authored-by: Dale Cannon <dale.cannon@digital.trade.gov.uk>
---
 common/tests/test_util.py                     |  41 +++-
 common/util.py                                |  59 +++--
 settings/test.py                              |   7 +-
 ...late_taskworkflow_tasktemplate_and_more.py | 165 +++++++++++++
 tasks/models/__init__.py                      |  41 ++++
 tasks/models/logs.py                          |  99 ++++++++
 tasks/models/queue.py                         | 230 ++++++++++++++++++
 tasks/{models.py => models/task.py}           | 147 +++--------
 tasks/models/workflow.py                      | 124 ++++++++++
 tasks/tests/test_queue/__init__.py            |   0
 tasks/tests/test_queue/models.py              |  24 ++
 tasks/tests/test_queue_models.py              | 151 ++++++++++++
 tasks/tests/test_workflow_models.py           | 162 ++++++++++++
 workbaskets/views/ui.py                       |   4 -
 14 files changed, 1122 insertions(+), 132 deletions(-)
 create mode 100644 tasks/migrations/0009_taskworkflowtemplate_taskworkflow_tasktemplate_and_more.py
 create mode 100644 tasks/models/__init__.py
 create mode 100644 tasks/models/logs.py
 create mode 100644 tasks/models/queue.py
 rename tasks/{models.py => models/task.py} (60%)
 create mode 100644 tasks/models/workflow.py
 create mode 100644 tasks/tests/test_queue/__init__.py
 create mode 100644 tasks/tests/test_queue/models.py
 create mode 100644 tasks/tests/test_queue_models.py
 create mode 100644 tasks/tests/test_workflow_models.py

diff --git a/common/tests/test_util.py b/common/tests/test_util.py
index ba956d454..b7d5be1b9 100644
--- a/common/tests/test_util.py
+++ b/common/tests/test_util.py
@@ -27,7 +27,7 @@
                 "port": 1234,
                 "dbname": "dbname",
             },
-            "engine://username:password@host:1234/dbname",
+            "engine://username:password@host:1234/dbname",  # /PS-IGNORE
         ),
         (
             {
@@ -379,3 +379,42 @@ def test_xml_fromstring_vulnerabilities(file_name):
     string = open(file).read()
     with pytest.raises((XMLSyntaxError, DTDForbidden)):
         util.xml_fromstring(string)
+
+
+@mock.patch("django.db.transaction.get_connection")
+def test_tablelock_as_context_manager(mock_get_connection):
+    mock_cursor = mock.MagicMock()
+    mock_get_connection.return_value.cursor.return_value.__enter__.return_value = (
+        mock_cursor
+    )
+
+    instance = factories.TestModel1Factory.create()
+    model = instance._meta.model
+    lock = util.TableLock.EXCLUSIVE
+
+    with util.TableLock(model, lock=lock):
+        assert model.objects.select_for_update().get(pk=instance.pk)
+        mock_cursor.execute.assert_called_once_with(
+            f"LOCK TABLE {model._meta.db_table} IN {lock} MODE",
+        )
+
+
+@mock.patch("django.db.transaction.get_connection")
+def test_tablelock_as_decorator(mock_get_connection):
+    mock_cursor = mock.MagicMock()
+    mock_get_connection.return_value.cursor.return_value.__enter__.return_value = (
+        mock_cursor
+    )
+
+    instance = factories.TestModel1Factory.create()
+    model = instance._meta.model
+    lock = util.TableLock.EXCLUSIVE
+
+    @util.TableLock.acquire_lock(model, lock=lock)
+    def decorated_function():
+        return True
+
+    assert decorated_function()
+    mock_cursor.execute.assert_called_once_with(
+        f"LOCK TABLE {model._meta.db_table} IN {lock} MODE",
+    )
diff --git a/common/util.py b/common/util.py
index 667f96b79..e8e0de4f0 100644
--- a/common/util.py
+++ b/common/util.py
@@ -432,8 +432,8 @@ def get_field_tuple(model: Model, field_name: str) -> Tuple[str, Any]:
 
 
 class TableLock:
-    """Provides a decorator for locking database tables for the duration of a
-    decorated function."""
+    """Provides a decorator and context manager for locking database tables for
+    the duration of a decorated function or context block."""
 
     ACCESS_SHARE = "ACCESS SHARE"
     ROW_SHARE = "ROW SHARE"
@@ -455,6 +455,29 @@ class TableLock:
         ACCESS_EXCLUSIVE,
     )
 
+    def __init__(self, *models, lock=None):
+        if lock is None:
+            lock = self.ACCESS_EXCLUSIVE
+
+        if lock not in self.LOCK_TYPES:
+            raise ValueError("%s is not a PostgreSQL supported lock mode.")
+
+        self.lock = lock
+        self.models = models
+
+    def __enter__(self):
+        with atomic():
+            with transaction.get_connection().cursor() as cursor:
+                for model in self.models:
+                    if isinstance(model, str):
+                        model = apps.get_model(model)
+                    cursor.execute(
+                        f"LOCK TABLE {model._meta.db_table} IN {self.lock} MODE",
+                    )
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        pass
+
     @classmethod
     def acquire_lock(cls, *models, lock=None):
         """
@@ -469,24 +492,11 @@ def myview(request)
         PostgreSQL's LOCK Documentation:
         http://www.postgresql.org/docs/8.3/interactive/sql-lock.html
         """
-        if lock is None:
-            lock = cls.ACCESS_EXCLUSIVE
-
-        if lock not in cls.LOCK_TYPES:
-            raise ValueError("%s is not a PostgreSQL supported lock mode.")
 
         @wrapt.decorator
         def wrapper(wrapped, instance, args, kwargs):
-            with atomic():
-                with transaction.get_connection().cursor() as cursor:
-                    for model in models:
-                        if isinstance(model, str):
-                            model = apps.get_model(model)
-                        cursor.execute(
-                            f"LOCK TABLE {model._meta.db_table} IN {lock} MODE",
-                        )
-
-                    return wrapped(*args, **kwargs)
+            with cls(*models, lock=lock):
+                return wrapped(*args, **kwargs)
 
         return wrapper
 
@@ -694,3 +704,18 @@ def wrapper(wrapped, instance, args, kwargs):
         return result
 
     return wrapper
+
+
+def get_related_names(instance, related_model) -> list[str]:
+    """
+    Return a list of related names of reverse foreign-key relationships to
+    (subclasses of) the specified `related_model` for the given `instance`.
+
+    If a reverse foreign-key relationship exists but no related name has been defined, a default name in the format `relatedmodel_set` will be returned.
+    If no such relationships exist, an empty list if returned.
+    """
+    related_names = []
+    for field in instance._meta.get_fields():
+        if field.one_to_many and issubclass(field.related_model, related_model):
+            related_names.append(field.get_accessor_name())
+    return related_names
diff --git a/settings/test.py b/settings/test.py
index 03b732549..5973d5380 100644
--- a/settings/test.py
+++ b/settings/test.py
@@ -8,7 +8,12 @@
 CSRF_COOKIE_SECURE = False
 SESSION_COOKIE_SECURE = False
 
-INSTALLED_APPS.append("common.tests")
+INSTALLED_APPS.extend(
+    [
+        "common.tests",
+        "tasks.tests.test_queue",
+    ],
+)
 
 # Bucket settings are belt-and-braces to guard against running in a real bucket
 HMRC_BUCKET_STORAGE_NAME = os.environ.get("TEST_HMRC_BUCKET_STORAGE_NAME", "test-hmrc")
diff --git a/tasks/migrations/0009_taskworkflowtemplate_taskworkflow_tasktemplate_and_more.py b/tasks/migrations/0009_taskworkflowtemplate_taskworkflow_tasktemplate_and_more.py
new file mode 100644
index 000000000..7eaf5611d
--- /dev/null
+++ b/tasks/migrations/0009_taskworkflowtemplate_taskworkflow_tasktemplate_and_more.py
@@ -0,0 +1,165 @@
+# Generated by Django 4.2.15 on 2024-11-04 12:23
+
+import django.db.models.deletion
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0008_alter_task_workbasket"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="TaskWorkflowTemplate",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("title", models.CharField(max_length=255)),
+                ("description", models.TextField(blank=True)),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+        migrations.CreateModel(
+            name="TaskWorkflow",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("title", models.CharField(max_length=255)),
+                ("description", models.TextField(blank=True)),
+                (
+                    "creator_template",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to="tasks.taskworkflowtemplate",
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+        migrations.CreateModel(
+            name="TaskTemplate",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("updated_at", models.DateTimeField(auto_now=True)),
+                ("title", models.CharField(max_length=255)),
+                ("description", models.TextField()),
+                (
+                    "category",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="tasks.category",
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+        migrations.CreateModel(
+            name="TaskItemTemplate",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "position",
+                    models.PositiveSmallIntegerField(db_index=True, editable=False),
+                ),
+                (
+                    "queue",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="queue_items",
+                        to="tasks.taskworkflowtemplate",
+                    ),
+                ),
+                (
+                    "task_template",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="tasks.tasktemplate",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["queue", "position"],
+                "abstract": False,
+            },
+        ),
+        migrations.CreateModel(
+            name="TaskItem",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "position",
+                    models.PositiveSmallIntegerField(db_index=True, editable=False),
+                ),
+                (
+                    "queue",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="queue_items",
+                        to="tasks.taskworkflow",
+                    ),
+                ),
+                (
+                    "task",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="tasks.task",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["queue", "position"],
+                "abstract": False,
+            },
+        ),
+    ]
diff --git a/tasks/models/__init__.py b/tasks/models/__init__.py
new file mode 100644
index 000000000..af60eda88
--- /dev/null
+++ b/tasks/models/__init__.py
@@ -0,0 +1,41 @@
+"""Models used by all apps in the project."""
+
+from tasks.models.logs import TaskLog
+from tasks.models.queue import Queue
+from tasks.models.queue import QueueItem
+from tasks.models.queue import RequiredFieldError
+from tasks.models.task import Category
+from tasks.models.task import Comment
+from tasks.models.task import ProgressState
+from tasks.models.task import Task
+from tasks.models.task import TaskAssignee
+from tasks.models.workflow import TaskWorkflow
+from tasks.models.workflow import TaskItem
+from tasks.models.workflow import TaskWorkflowTemplate
+from tasks.models.workflow import TaskItemTemplate
+from tasks.models.workflow import TaskTemplate
+
+
+__all__ = [
+    # tasks.models.logs
+    "TaskLog",
+
+    # tasks.models.queue
+    "Queue",
+    "QueueItem",
+    "RequiredFieldError",
+
+    # tasks.models.task
+    "Category",
+    "Comment",
+    "ProgressState",
+    "Task",
+    "TaskAssignee",
+
+    # tasks.models.workflow
+    "TaskWorkflow",
+    "TaskItem",
+    "TaskWorkflowTemplate",
+    "TaskItemTemplate",
+    "TaskTemplate",
+]
diff --git a/tasks/models/logs.py b/tasks/models/logs.py
new file mode 100644
index 000000000..30c4bc046
--- /dev/null
+++ b/tasks/models/logs.py
@@ -0,0 +1,99 @@
+from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.db import models
+
+from common.models.mixins import TimestampedMixin
+from tasks.models.task import Task
+
+User = get_user_model()
+
+
+class TaskLogManager(models.Manager):
+    def create(
+        self,
+        task: Task,
+        action: "TaskLog.AuditActionType",
+        instigator: User,
+        **kwargs,
+    ) -> "TaskLog":
+        """
+        Creates a new `TaskLog` instance with a generated description based on
+        `action`, saving it to the database and returning the created instance.
+
+        A TaskLog's `description` is generated using a template retrieved from `TaskLog.AUDIT_ACTION_MAP` that maps an `action` to its corresponding description.
+        Additional `kwargs` are required to format the description template depending on the provided action.
+        """
+
+        if action not in self.model.AuditActionType:
+            raise ValueError(
+                f"The action '{action}' is an invalid TaskLog.AuditActionType value.",
+            )
+
+        description_template = self.model.AUDIT_ACTION_MAP.get(action)
+        if not description_template:
+            raise ValueError(
+                f"No description template found for action '{action}' in TaskLog.AUDIT_ACTION_MAP.",
+            )
+
+        context = {"instigator": instigator}
+
+        if action in {
+            self.model.AuditActionType.TASK_ASSIGNED,
+            self.model.AuditActionType.TASK_UNASSIGNED,
+        }:
+            assignee = kwargs.pop("assignee", None)
+            if not assignee:
+                raise ValueError(f"Missing 'assignee' in kwargs for action '{action}'.")
+            context["assignee"] = assignee
+
+        elif action == self.model.AuditActionType.PROGRESS_STATE_UPDATED:
+            progress_state = kwargs.pop("progress_state", None)
+            if not progress_state:
+                raise ValueError(
+                    f"Missing 'progress_state' in kwargs for action '{action}'.",
+                )
+            context["progress_state"] = progress_state
+
+        description = description_template.format(**context)
+
+        return super().create(
+            task=task,
+            action=action,
+            instigator=instigator,
+            description=description,
+            **kwargs,
+        )
+
+
+class TaskLog(TimestampedMixin):
+    class AuditActionType(models.TextChoices):
+        TASK_ASSIGNED = ("TASK_ASSIGNED",)
+        TASK_UNASSIGNED = ("TASK_UNASSIGNED",)
+        PROGRESS_STATE_UPDATED = ("PROGRESS_STATE_UPDATED",)
+
+    AUDIT_ACTION_MAP = {
+        AuditActionType.TASK_ASSIGNED: "{instigator} assigned {assignee}",
+        AuditActionType.TASK_UNASSIGNED: "{instigator} unassigned {assignee}",
+        AuditActionType.PROGRESS_STATE_UPDATED: "{instigator} changed the status to {progress_state}",
+    }
+
+    action = models.CharField(
+        max_length=100,
+        choices=AuditActionType.choices,
+        editable=False,
+    )
+    description = models.TextField(editable=False)
+    task = models.ForeignKey(
+        Task,
+        null=True,
+        on_delete=models.SET_NULL,
+        editable=False,
+        related_name="logs",
+    )
+    instigator = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.PROTECT,
+        editable=False,
+    )
+
+    objects = TaskLogManager()
diff --git a/tasks/models/queue.py b/tasks/models/queue.py
new file mode 100644
index 000000000..0fc517f26
--- /dev/null
+++ b/tasks/models/queue.py
@@ -0,0 +1,230 @@
+from __future__ import annotations
+
+from typing import Self
+
+from django.core.exceptions import ObjectDoesNotExist
+from django.db import models
+from django.db.transaction import atomic
+
+from common.util import TableLock
+from common.util import get_related_names
+
+
+class RequiredFieldError(Exception):
+    pass
+
+
+class Queue(models.Model):
+    """
+    A (FIFO) queue.
+
+    Note: This abstract class only supports a single reverse foreign-key relationship
+    to `QueueItem` for each instance. As such, all instance methods in this class use
+    the first-returned related name to access related `QueueItem` objects. This means that
+    if there are multiple relationships, only the first one will be considered when
+    retrieving items from the queue,
+    """
+
+    class Meta:
+        abstract = True
+
+    def get_items(self) -> models.QuerySet:
+        """Get all queue items as a queryset."""
+        related_name = get_related_names(self, QueueItem)[0]
+        return getattr(self, related_name).all()
+
+    def get_first(self) -> QueueItem | None:
+        """Get the first item in the queue."""
+        return self.get_items().first()
+
+    def get_last(self) -> QueueItem | None:
+        """Get the last item in the queue."""
+        return self.get_items().last()
+
+    def get_item(self, position: int) -> QueueItem | None:
+        """Get the item at `position` position in the queue."""
+        try:
+            return self.get_items().get(position=position)
+        except ObjectDoesNotExist:
+            return None
+
+    @property
+    def max_position(self) -> int:
+        """
+        Returns the highest item position in the queue.
+
+        If the queue is empty it returns zero.
+        """
+        max = self.get_items().aggregate(
+            max_position=models.Max("position"),
+        )["max_position"]
+        return max if max is not None else 0
+
+
+class QueueItemMetaClass(models.base.ModelBase):
+    def __new__(cls, name, bases, attrs):
+        new_class = super().__new__(cls, name, bases, attrs)
+
+        if (
+            "QueueItem" in [base.__name__ for base in bases]
+            and not new_class._meta.abstract
+        ):
+            queue_field = attrs.get("queue", None)
+            if not queue_field or not isinstance(queue_field, models.ForeignKey):
+                raise RequiredFieldError(
+                    f"{name} must have a 'queue' ForeignKey field.",
+                )
+
+        return new_class
+
+
+class QueueItemManager(models.Manager):
+    @atomic
+    def create(self, **kwargs) -> QueueItem:
+        """Create a new item instance in a queue, given by the `queue` named
+        param, and place it in last position."""
+
+        with TableLock(self.model, lock=TableLock.EXCLUSIVE):
+            queue = kwargs.pop("queue")
+            position = kwargs.pop("position", (queue.get_items().count() + 1))
+
+            if position <= 0:
+                raise ValueError(
+                    "QueueItem.position must be a positive integer greater than zero.",
+                )
+
+            return super().create(
+                queue=queue,
+                position=position,
+                **kwargs,
+            )
+
+
+class QueueItem(models.Model, metaclass=QueueItemMetaClass):
+    """Item that is a member of a Queue."""
+
+    class Meta:
+        abstract = True
+        ordering = ["queue", "position"]
+
+    position = models.PositiveSmallIntegerField(
+        db_index=True,
+        editable=False,
+    )
+    """
+    1-based positioning - 1 is the first position.
+    """
+
+    objects = QueueItemManager()
+
+    @atomic
+    def delete(self):
+        """Remove and delete instance from its queue, shuffling all successive
+        queued instances up one position."""
+        instance = self.__class__.objects.select_for_update(nowait=True).get(pk=self.pk)
+
+        self.__class__.objects.select_for_update(nowait=True).filter(
+            position__gt=instance.position,
+        ).update(position=models.F("position") - 1)
+
+        return super().delete()
+
+    @atomic
+    def promote(self) -> Self:
+        """
+        Promote the instance by one place up the queue.
+
+        No change is made if the instance is already in its queue's first place.
+
+        Returns the promoted instance with any database updates applied.
+        """
+        instance = self.__class__.objects.select_for_update(nowait=True).get(pk=self.pk)
+
+        if instance.position == 1:
+            return instance
+
+        item_to_demote = self.__class__.objects.select_for_update(nowait=True).get(
+            position=instance.position - 1,
+        )
+        item_to_demote.position += 1
+        instance.position -= 1
+        self.__class__.objects.bulk_update([instance, item_to_demote], ["position"])
+        instance.refresh_from_db()
+
+        return instance
+
+    @atomic
+    def demote(self) -> Self:
+        """
+        Demote the instance by one place down the queue.
+
+        No change is made if the instance is already in its queue's last place.
+
+        Returns the demoted instance with any database updates applied.
+        """
+        instance = self.__class__.objects.select_for_update(nowait=True).get(pk=self.pk)
+
+        if instance.position == self.queue.max_position:
+            return instance
+
+        item_to_promote = self.__class__.objects.select_for_update(nowait=True).get(
+            position=instance.position + 1,
+        )
+        item_to_promote.position -= 1
+        instance.position += 1
+        self.__class__.objects.bulk_update([instance, item_to_promote], ["position"])
+        instance.refresh_from_db()
+
+        return instance
+
+    @atomic
+    def promote_to_first(self) -> Self:
+        """
+        Promote the instance to the first place in the queue so that it occupies
+        position 1.
+
+        No change is made if the instance is already in its queue's first place.
+
+        Returns the promoted instance with any database updates applied.
+        """
+
+        instance = self.__class__.objects.select_for_update(nowait=True).get(pk=self.pk)
+
+        if instance.position == 1:
+            return instance
+
+        self.__class__.objects.select_for_update(nowait=True).filter(
+            models.Q(position__lt=instance.position),
+        ).update(position=models.F("position") + 1)
+
+        instance.position = 1
+        instance.save(update_fields=["position"])
+        instance.refresh_from_db()
+
+        return instance
+
+    @atomic
+    def demote_to_last(self) -> Self:
+        """
+        Demote the instance to the last place in the queue so that it occupies
+        position of queue length.
+
+        No change is made if the instance is already in its queue's last place.
+
+        Returns the demoted instance with any database updates applied.
+        """
+        instance = self.__class__.objects.select_for_update(nowait=True).get(pk=self.pk)
+
+        last_place = self.queue.max_position
+        if instance.position == last_place:
+            return instance
+
+        self.__class__.objects.select_for_update(nowait=True).filter(
+            position__gt=instance.position,
+        ).update(position=models.F("position") - 1)
+
+        instance.position = last_place
+        instance.save(update_fields=["position"])
+        instance.refresh_from_db()
+
+        return instance
diff --git a/tasks/models.py b/tasks/models/task.py
similarity index 60%
rename from tasks/models.py
rename to tasks/models/task.py
index 28cad75a1..14c8d3201 100644
--- a/tasks/models.py
+++ b/tasks/models/task.py
@@ -14,6 +14,32 @@
 User = get_user_model()
 
 
+class ProgressState(models.Model):
+    class State(models.TextChoices):
+        TO_DO = "TO_DO", "To do"
+        IN_PROGRESS = "IN_PROGRESS", "In progress"
+        DONE = "DONE", "Done"
+
+    DEFAULT_STATE_NAME = State.TO_DO
+    """The name of the default `State` object for `ProgressState`."""
+
+    name = models.CharField(
+        max_length=255,
+        choices=State.choices,
+        unique=True,
+    )
+
+    def __str__(self):
+        return self.get_name_display()
+
+    @classmethod
+    def get_default_state_id(cls):
+        """Get the id / pk of the default `State` object for `ProgressState`."""
+        # Failsafe get_or_create() avoids attempt to get non-existant instance.
+        default, _ = cls.objects.get_or_create(name=cls.DEFAULT_STATE_NAME)
+        return default.id
+
+
 class TaskManager(WithSignalManagerMixin, models.Manager):
     pass
 
@@ -22,7 +48,13 @@ class TaskQueryset(WithSignalQuerysetMixin, models.QuerySet):
     pass
 
 
-class Task(TimestampedMixin):
+class TaskBase(TimestampedMixin):
+    """Abstract model mixin containing model fields common to TaskTemplate and
+    Task models."""
+
+    class Meta:
+        abstract = True
+
     title = models.CharField(max_length=255)
     description = models.TextField()
     category = models.ForeignKey(
@@ -31,8 +63,12 @@ class Task(TimestampedMixin):
         null=True,
         on_delete=models.PROTECT,
     )
+
+
+class Task(TaskBase):
     progress_state = models.ForeignKey(
-        "ProgressState",
+        ProgressState,
+        default=ProgressState.get_default_state_id,
         on_delete=models.PROTECT,
     )
     parent_task = models.ForeignKey(
@@ -79,22 +115,6 @@ def __str__(self):
         return self.name
 
 
-class ProgressState(models.Model):
-    class State(models.TextChoices):
-        TO_DO = "TO_DO", "To do"
-        IN_PROGRESS = "IN_PROGRESS", "In progress"
-        DONE = "DONE", "Done"
-
-    name = models.CharField(
-        max_length=255,
-        choices=State.choices,
-        unique=True,
-    )
-
-    def __str__(self):
-        return self.get_name_display()
-
-
 class TaskAssigneeManager(WithSignalManagerMixin, models.Manager):
     pass
 
@@ -171,97 +191,6 @@ def unassign_user(cls, user, task, instigator):
             return False
 
 
-class TaskLogManager(models.Manager):
-    def create(
-        self,
-        task: Task,
-        action: "TaskLog.AuditActionType",
-        instigator: User,
-        **kwargs,
-    ) -> "TaskLog":
-        """
-        Creates a new `TaskLog` instance with a generated description based on
-        `action`, saving it to the database and returning the created instance.
-
-        A TaskLog's `description` is generated using a template retrieved from `TaskLog.AUDIT_ACTION_MAP` that maps an `action` to its corresponding description.
-        Additional `kwargs` are required to format the description template depending on the provided action.
-        """
-
-        if action not in self.model.AuditActionType:
-            raise ValueError(
-                f"The action '{action}' is an invalid TaskLog.AuditActionType value.",
-            )
-
-        description_template = self.model.AUDIT_ACTION_MAP.get(action)
-        if not description_template:
-            raise ValueError(
-                f"No description template found for action '{action}' in TaskLog.AUDIT_ACTION_MAP.",
-            )
-
-        context = {"instigator": instigator}
-
-        if action in {
-            self.model.AuditActionType.TASK_ASSIGNED,
-            self.model.AuditActionType.TASK_UNASSIGNED,
-        }:
-            assignee = kwargs.pop("assignee", None)
-            if not assignee:
-                raise ValueError(f"Missing 'assignee' in kwargs for action '{action}'.")
-            context["assignee"] = assignee
-
-        elif action == self.model.AuditActionType.PROGRESS_STATE_UPDATED:
-            progress_state = kwargs.pop("progress_state", None)
-            if not progress_state:
-                raise ValueError(
-                    f"Missing 'progress_state' in kwargs for action '{action}'.",
-                )
-            context["progress_state"] = progress_state
-
-        description = description_template.format(**context)
-
-        return super().create(
-            task=task,
-            action=action,
-            instigator=instigator,
-            description=description,
-            **kwargs,
-        )
-
-
-class TaskLog(TimestampedMixin):
-    class AuditActionType(models.TextChoices):
-        TASK_ASSIGNED = ("TASK_ASSIGNED",)
-        TASK_UNASSIGNED = ("TASK_UNASSIGNED",)
-        PROGRESS_STATE_UPDATED = ("PROGRESS_STATE_UPDATED",)
-
-    AUDIT_ACTION_MAP = {
-        AuditActionType.TASK_ASSIGNED: "{instigator} assigned {assignee}",
-        AuditActionType.TASK_UNASSIGNED: "{instigator} unassigned {assignee}",
-        AuditActionType.PROGRESS_STATE_UPDATED: "{instigator} changed the status to {progress_state}",
-    }
-
-    action = models.CharField(
-        max_length=100,
-        choices=AuditActionType.choices,
-        editable=False,
-    )
-    description = models.TextField(editable=False)
-    task = models.ForeignKey(
-        Task,
-        null=True,
-        on_delete=models.SET_NULL,
-        editable=False,
-        related_name="logs",
-    )
-    instigator = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        on_delete=models.PROTECT,
-        editable=False,
-    )
-
-    objects = TaskLogManager()
-
-
 class Comment(TimestampedMixin):
     author = models.ForeignKey(
         settings.AUTH_USER_MODEL,
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
new file mode 100644
index 000000000..4087a2540
--- /dev/null
+++ b/tasks/models/workflow.py
@@ -0,0 +1,124 @@
+from django.db import models
+from django.db.transaction import atomic
+
+from tasks.models.queue import Queue
+from tasks.models.queue import QueueItem
+from tasks.models.task import Task
+from tasks.models.task import TaskBase
+
+# ---------------
+# - Base classes.
+# ---------------
+
+
+class TaskWorkflowBase(Queue):
+    """Abstract model base class containing model fields common to TaskWorkflow
+    and TaskWorkflowTemplate."""
+
+    class Meta:
+        abstract = True
+
+    title = models.CharField(
+        max_length=255,
+    )
+    description = models.TextField(
+        blank=True,
+    )
+
+
+# ----------------------
+# - Workflows and tasks.
+# ----------------------
+
+
+class TaskWorkflow(TaskWorkflowBase):
+    """Workflow of ordered Tasks."""
+
+    creator_template = models.ForeignKey(
+        "tasks.TaskWorkflowTemplate",
+        null=True,
+        on_delete=models.SET_NULL,
+    )
+
+    def get_tasks(self) -> models.QuerySet:
+        """Get a QuerySet of the Tasks associated through their TaskItem
+        instances to this TaskWorkflow."""
+        return Task.objects.filter(taskitem__queue=self)
+
+
+class TaskItem(QueueItem):
+    """Task item queue management for Task instances (these should always be
+    subtasks)."""
+
+    queue = models.ForeignKey(
+        TaskWorkflow,
+        related_name="queue_items",
+        on_delete=models.CASCADE,
+    )
+    task = models.OneToOneField(
+        "tasks.Task",
+        on_delete=models.CASCADE,
+    )
+    """The Task instance managed by this TaskItem."""
+
+
+# ----------------------------------------
+# - Template workflows and template tasks.
+# ----------------------------------------
+
+
+class TaskWorkflowTemplate(TaskWorkflowBase):
+    """Template used to create TaskWorkflow instance."""
+
+    def get_task_templates(self) -> models.QuerySet:
+        """Get a QuerySet of the TaskTemplates associated through their
+        TaskItemTemplate instances to this TaskWorkflowTemplate."""
+        return TaskTemplate.objects.filter(taskitemtemplate__queue=self)
+
+    @atomic
+    def create_task_workflow(self) -> "TaskWorkflow":
+        """Create a workflow and it subtasks, using values from this template
+        workflow and its task templates."""
+
+        task_workflow = TaskWorkflow.objects.create(
+            title=self.title,
+            description=self.description,
+            creator_template=self,
+        )
+
+        task_item_templates = TaskItemTemplate.objects.select_related(
+            "task_template",
+        ).filter(queue=self)
+        for task_item_template in task_item_templates:
+            task_template = task_item_template.task_template
+            task = Task.objects.create(
+                title=task_template.title,
+                description=task_template.description,
+                category=task_template.category,
+            )
+            TaskItem.objects.create(
+                position=task_item_template.position,
+                queue=task_workflow,
+                task=task,
+            )
+
+        return task_workflow
+
+
+class TaskItemTemplate(QueueItem):
+    """Queue item management for TaskTemplate instances."""
+
+    queue = models.ForeignKey(
+        TaskWorkflowTemplate,
+        related_name="queue_items",
+        on_delete=models.CASCADE,
+    )
+    task_template = models.OneToOneField(
+        "tasks.TaskTemplate",
+        on_delete=models.CASCADE,
+    )
+
+
+class TaskTemplate(TaskBase):
+    """Template used to create Task instances from within a template
+    workflow."""
diff --git a/tasks/tests/test_queue/__init__.py b/tasks/tests/test_queue/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tasks/tests/test_queue/models.py b/tasks/tests/test_queue/models.py
new file mode 100644
index 000000000..1e53ca973
--- /dev/null
+++ b/tasks/tests/test_queue/models.py
@@ -0,0 +1,24 @@
+from django.db import models
+
+from tasks.models import Queue
+from tasks.models import QueueItem
+
+
+class TestQueue(Queue):
+    """Concrete subclass of Queue."""
+
+    class Meta:
+        abstract = False
+
+
+class TestQueueItem(QueueItem):
+    """Concrete subclass of QueueItem."""
+
+    class Meta:
+        abstract = False
+
+    queue = models.ForeignKey(
+        TestQueue,
+        related_name="queue_items",
+        on_delete=models.CASCADE,
+    )
diff --git a/tasks/tests/test_queue_models.py b/tasks/tests/test_queue_models.py
new file mode 100644
index 000000000..3a878695d
--- /dev/null
+++ b/tasks/tests/test_queue_models.py
@@ -0,0 +1,151 @@
+import pytest
+from factory import SubFactory
+from factory.django import DjangoModelFactory
+
+from tasks.tests.test_queue.models import TestQueue
+from tasks.tests.test_queue.models import TestQueueItem
+
+pytestmark = pytest.mark.django_db
+
+
+class TestQueueFactory(DjangoModelFactory):
+    """Factory for TestQueue."""
+
+    class Meta:
+        abstract = False
+        model = TestQueue
+
+
+class TestQueueItemFactory(DjangoModelFactory):
+    """Factory for TestQueueItem."""
+
+    class Meta:
+        model = TestQueueItem
+        abstract = False
+
+    queue = SubFactory(TestQueueFactory)
+
+
+@pytest.fixture()
+def queue() -> TestQueue:
+    """Return an instance of TestQueue that contains no TestQueueItems."""
+    queue = TestQueueFactory.create()
+
+    assert not queue.get_items().exists()
+
+    return queue
+
+
+@pytest.fixture()
+def single_item_queue(queue) -> TestQueue:
+    """Return an instance of TestQueue containing a single TestQueueItem."""
+    TestQueueItemFactory.create(queue=queue)
+
+    assert queue.get_items().count() == 1
+
+    return queue
+
+
+@pytest.fixture()
+def three_item_queue(queue) -> TestQueue:
+    """Return an instance of TestQueue containing three TestQueueItem
+    instances."""
+    TestQueueItemFactory.create(queue=queue)
+    TestQueueItemFactory.create(queue=queue)
+    TestQueueItemFactory.create(queue=queue)
+
+    assert queue.get_items().count() == 3
+
+    return queue
+
+
+def test_empty_queue(queue):
+    assert queue.max_position == 0
+    assert queue.get_first() == None
+    assert queue.get_item(1) == None
+    assert queue.get_last() == None
+
+
+def test_non_empty_queue(queue):
+    first_item = TestQueueItemFactory.create(queue=queue)
+    second_item = TestQueueItemFactory.create(queue=queue)
+    third_item = TestQueueItemFactory.create(queue=queue)
+
+    assert first_item.position == 1
+    assert second_item.position == 2
+    assert third_item.position == 3
+    assert {first_item, second_item, third_item} == set(queue.get_items())
+    assert queue.max_position == 3
+    assert queue.get_items().count() == 3
+    assert queue.get_first() == first_item
+    assert queue.get_last() == third_item
+    assert queue.get_item(2) == second_item
+
+
+def test_item_delete(three_item_queue):
+    three_item_queue.get_first().delete()
+
+    assert three_item_queue.get_items().count() == 2
+
+    three_item_queue.get_item(1).delete()
+    three_item_queue.get_last().delete()
+
+    assert three_item_queue.get_items().count() == 0
+
+
+def test_item_promote(three_item_queue):
+    item = three_item_queue.get_last()
+
+    assert item.position == 3
+
+    item = item.promote()
+    item = item.promote()
+
+    assert item.position == 1
+
+    item = item.promote()
+
+    assert item.position == 1
+
+
+def test_item_demote(three_item_queue):
+    item = three_item_queue.get_first()
+
+    assert item.position == 1
+
+    item = item.demote()
+    item = item.demote()
+
+    assert item.position == 3
+
+    item = item.demote()
+
+    assert item.position == 3
+
+
+def test_item_demote_to_last(three_item_queue):
+    item = three_item_queue.get_first()
+
+    assert item.position == 1
+
+    item = item.demote_to_last()
+
+    assert item.position == 3
+
+    item = item.demote_to_last()
+
+    assert item.position == 3
+
+
+def test_item_promote_to_first(three_item_queue):
+    item = three_item_queue.get_last()
+
+    assert item.position == 3
+
+    item = item.promote_to_first()
+
+    assert item.position == 1
+
+    item = item.promote_to_first()
+
+    assert item.position == 1
diff --git a/tasks/tests/test_workflow_models.py b/tasks/tests/test_workflow_models.py
new file mode 100644
index 000000000..eb6716b02
--- /dev/null
+++ b/tasks/tests/test_workflow_models.py
@@ -0,0 +1,162 @@
+import factory
+import pytest
+from django.core.exceptions import ObjectDoesNotExist
+from factory import SubFactory
+from factory.django import DjangoModelFactory
+
+from common.tests.factories import CategoryFactory
+from tasks.models import TaskItemTemplate
+from tasks.models import TaskTemplate
+from tasks.models import TaskWorkflowTemplate
+
+pytestmark = pytest.mark.django_db
+
+
+class TaskWorkflowTemplateFactory(DjangoModelFactory):
+    """Factory to create TaskWorkflowTemplate instances."""
+
+    class Meta:
+        model = TaskWorkflowTemplate
+
+
+class TaskTemplateFactory(DjangoModelFactory):
+    """Factory to create TaskTemplate instances."""
+
+    title = factory.Faker("sentence")
+    description = factory.Faker("sentence")
+    category = factory.SubFactory(CategoryFactory)
+
+    class Meta:
+        model = TaskTemplate
+
+
+class TaskItemTemplateFactory(DjangoModelFactory):
+    """Factory to create TaskItemTemplate instances."""
+
+    class Meta:
+        model = TaskItemTemplate
+
+    queue = SubFactory(TaskWorkflowTemplateFactory)
+    task_template = SubFactory(TaskTemplateFactory)
+
+
+@pytest.fixture()
+def task_workflow_template() -> TaskWorkflowTemplate:
+    """Return an empty TaskWorkflowTemplate instance (containing no items)."""
+    return TaskWorkflowTemplateFactory.create()
+
+
+@pytest.fixture()
+def task_workflow_template_three_task_items(
+    task_workflow_template,
+) -> TaskWorkflowTemplate:
+    """Return a TaskWorkflowTemplate instance containing three TaskItemTemplate
+    and related TaskTemplates."""
+
+    task_item_templates = []
+    for _ in range(3):
+        task_template = TaskTemplateFactory.create()
+        task_item_template = TaskItemTemplateFactory.create(
+            queue=task_workflow_template,
+            task_template=task_template,
+        )
+        task_item_templates.append(task_item_template)
+
+    assert task_workflow_template.get_items().count() == 3
+    assert (
+        TaskItemTemplate.objects.filter(
+            queue=task_workflow_template,
+        ).count()
+        == 3
+    )
+    assert (
+        TaskTemplate.objects.filter(
+            taskitemtemplate__in=task_item_templates,
+        ).count()
+        == 3
+    )
+
+    return task_workflow_template
+
+
+def test_create_task_workflow_from_task_workflow_template(
+    task_workflow_template_three_task_items,
+):
+    """Test creation of TaskWorkflow instances from TaskWorkflowTemplates using
+    its `create_task_workflow()` method."""
+    task_workflow = task_workflow_template_three_task_items.create_task_workflow()
+
+    # Test that workflow values are valid.
+    assert task_workflow.creator_template == task_workflow_template_three_task_items
+    assert task_workflow.title == task_workflow_template_three_task_items.title
+    assert (
+        task_workflow.description == task_workflow_template_three_task_items.description
+    )
+    assert task_workflow.get_items().count() == 3
+
+    # Validate that item positions are equivalent.
+    zipped_items = zip(
+        task_workflow_template_three_task_items.get_items(),
+        task_workflow.get_items(),
+    )
+    for item_template, item in zipped_items:
+        assert item_template.position == item.position
+
+    # Validate that object values are equivalent.
+    zipped_objs = zip(
+        task_workflow_template_three_task_items.get_task_templates(),
+        task_workflow.get_tasks(),
+    )
+    for task_template, task in zipped_objs:
+        assert task_template.title == task.title
+        assert task_template.description == task.description
+        assert task_template.category == task.category
+
+
+def test_delete_task_item_template():
+    task_item_template = TaskItemTemplateFactory.create()
+    task_item_template_id = task_item_template.id
+    task_template_id = task_item_template.task_template.id
+
+    assert TaskItemTemplate.objects.get(id=task_item_template_id)
+    assert TaskTemplate.objects.get(id=task_template_id)
+
+    task_item_template.delete()
+
+    with pytest.raises(ObjectDoesNotExist):
+        TaskItemTemplate.objects.get(id=task_item_template_id)
+    assert TaskTemplate.objects.get(id=task_template_id)
+
+
+def test_delete_task_template():
+    task_item_template = TaskItemTemplateFactory.create()
+    task_item_template_id = task_item_template.id
+    task_template = task_item_template.task_template
+    task_template_id = task_item_template.task_template.id
+
+    assert TaskItemTemplate.objects.get(id=task_item_template_id)
+    assert TaskTemplate.objects.get(id=task_template_id)
+
+    task_template.delete()
+
+    with pytest.raises(ObjectDoesNotExist):
+        TaskItemTemplate.objects.get(id=task_item_template_id)
+    with pytest.raises(ObjectDoesNotExist):
+        assert TaskTemplate.objects.get(id=task_template_id)
+
+
+def test_delete_task_workflow_template(task_workflow_template_three_task_items):
+    task_item_template_ids = [
+        item.id for item in task_workflow_template_three_task_items.get_items()
+    ]
+    task_template_ids = [
+        task.id for task in task_workflow_template_three_task_items.get_task_templates()
+    ]
+
+    assert len(task_item_template_ids) == 3
+    assert len(task_template_ids) == 3
+
+    task_workflow_template_three_task_items.delete()
+
+    assert not TaskItemTemplate.objects.filter(id__in=task_item_template_ids).exists()
+    assert TaskTemplate.objects.filter(id__in=task_template_ids).count() == 3
diff --git a/workbaskets/views/ui.py b/workbaskets/views/ui.py
index 62705411a..6281bbb15 100644
--- a/workbaskets/views/ui.py
+++ b/workbaskets/views/ui.py
@@ -64,7 +64,6 @@
 from quotas.models import QuotaSuspension
 from regulations.models import Regulation
 from tasks.models import Comment
-from tasks.models import ProgressState
 from tasks.models import Task
 from tasks.models import TaskAssignee
 from workbaskets import forms
@@ -1624,9 +1623,6 @@ def form_valid(self, form):
             defaults={
                 "title": self.workbasket.title,
                 "description": self.workbasket.reason,
-                "progress_state": ProgressState.objects.get(
-                    name=ProgressState.State.TO_DO,
-                ),
                 "creator": self.request.user,
             },
         )

From 4d7dda9c6cb1e5c0e7fb1659b5bab07ac17c683d Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Tue, 12 Nov 2024 14:31:13 +0000
Subject: [PATCH 07/57] TP2000-1543 Prototype workflow template detail view
 (#1322)

* Implement prototype TaskWorkflowTemplate detail view

* Rename workflow template jinja template

* Add TaskWorkflowTemplateDetailView test
---
 common/static/common/scss/application.scss    |  1 +
 conftest.py                                   |  1 +
 .../tasks/workflows/template_detail.jinja     | 97 +++++++++++++++++++
 tasks/static/tasks/scss/_tasks.scss           | 49 ++++++++++
 tasks/tests/test_views.py                     | 19 ++++
 tasks/urls.py                                 | 15 ++-
 tasks/views.py                                | 14 +++
 webpack.config.js                             |  1 +
 8 files changed, 195 insertions(+), 2 deletions(-)
 create mode 100644 tasks/jinja2/tasks/workflows/template_detail.jinja
 create mode 100644 tasks/static/tasks/scss/_tasks.scss

diff --git a/common/static/common/scss/application.scss b/common/static/common/scss/application.scss
index dbe60d797..c93689c49 100644
--- a/common/static/common/scss/application.scss
+++ b/common/static/common/scss/application.scss
@@ -28,6 +28,7 @@ $govuk-image-url-function: frontend-image-url;
 @import "regulations";
 @import "workbaskets";
 @import "reference_documents";
+@import "tasks";
 @import "versions";
 @import "fake-link";
 @import "violations";
diff --git a/conftest.py b/conftest.py
index 8c9ed10c0..eefff698c 100644
--- a/conftest.py
+++ b/conftest.py
@@ -310,6 +310,7 @@ def policy_group(db) -> Group:
         ("tasks", "view_comment"),
         ("tasks", "change_comment"),
         ("tasks", "delete_comment"),
+        ("tasks", "view_taskworkflowtemplate"),
     ]:
         group.permissions.add(
             Permission.objects.get(
diff --git a/tasks/jinja2/tasks/workflows/template_detail.jinja b/tasks/jinja2/tasks/workflows/template_detail.jinja
new file mode 100644
index 000000000..9e9073fd5
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/template_detail.jinja
@@ -0,0 +1,97 @@
+{% extends "layouts/layout.jinja" %}
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Workflow template: " ~ object.title %}
+
+{% set edit_url = "#TODO" %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {"text": page_title}
+    ],
+    with_workbasket=False,
+  ) }}
+{% endblock %}
+
+{% block content %}
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+      <h1 class="govuk-heading-xl">{{ page_title }}</h1>
+    </div>
+  </div>
+
+  <h2 class="govuk-heading-m">Details</h2>
+  
+  <dl class="govuk-summary-list">
+    <div class="govuk-summary-list__row">
+      <dt class="govuk-summary-list__key">
+        ID
+      </dt>
+      <dd class="govuk-summary-list__value">
+        {{ object.pk }}
+      </dd>
+    </div>
+
+    <div class="govuk-summary-list__row">
+      <dt class="govuk-summary-list__key">
+        Title
+      </dt>
+      <dd class="govuk-summary-list__value">
+        {{ object.title }}
+      </dd>
+      <dd class="govuk-summary-list__actions">
+        <a class="govuk-link" href="{{ edit_url }}">Change<span class="govuk-visually-hidden"> title</span></a>
+      </dd>
+    </div>
+
+    <div class="govuk-summary-list__row">
+      <dt class="govuk-summary-list__key">
+        Description
+      </dt>
+      <dd class="govuk-summary-list__value">
+        {{ object.description }}
+      </dd>
+      <dd class="govuk-summary-list__actions">
+        <a class="govuk-link" href="{{ edit_url }}">Change<span class="govuk-visually-hidden"> description</span></a>
+      </dd>
+    </div>
+  </dl>
+
+  <h2 class="govuk-heading-m">Task templates</h2>
+
+  {% if not task_template_items %}
+    <p class="govuk-body">There are currently no task templates for this workflow template.</p>
+  {% else %}
+    <ol class="govuk-task-list">
+      {% for task_template_item in task_template_items -%}
+        <li class="govuk-task-list__item govuk-task-list__item--with-link">
+          <div class="govuk-task-list__name-and-hint">
+            <a class="govuk-link govuk-task-list__link" href="#TODO">
+              {{- task_template_item.task_template.title -}}
+            </a>
+            {% if task_template_item.task_template.description -%}
+              <div class="govuk-task-list__hint">
+                {{ task_template_item.task_template.description|truncate(50) }}
+              </div>
+            {% endif %}
+          </div>
+        </li>
+      {% endfor %}
+    </ol>
+  {% endif %}
+
+<div class="govuk-button-group govuk-!-margin-top-6">
+  {{ govukButton({
+    "text": "Delete workflow template",
+    "href": "#TODO",
+    "classes": "govuk-button--warning"
+  }) }}
+  {{ govukButton({
+    "text": "Find and view workflow templates",
+    "href": "#TODO",
+    "classes": "govuk-button--secondary"
+  }) }}
+</div>
+{% endblock %}
diff --git a/tasks/static/tasks/scss/_tasks.scss b/tasks/static/tasks/scss/_tasks.scss
new file mode 100644
index 000000000..563247648
--- /dev/null
+++ b/tasks/static/tasks/scss/_tasks.scss
@@ -0,0 +1,49 @@
+// Source: https://design-system.service.gov.uk/components/task-list/
+
+.govuk-task-list {
+  @include govuk-font($size: 19);
+  margin-top: 0;
+  @include govuk-responsive-margin(6, "bottom");
+  padding: 0;
+  list-style-type: none;
+}
+
+.govuk-task-list__item {
+  display: table;
+  position: relative;
+  width: 100%;
+  margin-bottom: 0;
+  padding-top: govuk-spacing(2);
+  padding-bottom: govuk-spacing(2);
+  border-bottom: 1px solid $govuk-border-colour;
+}
+
+.govuk-task-list__item:first-child {
+  border-top: 1px solid $govuk-border-colour;
+}
+
+.govuk-task-list__item--with-link:hover {
+  background: govuk-colour("light-grey");
+}
+
+.govuk-task-list__name-and-hint {
+  display: table-cell;
+  vertical-align: top;
+  @include govuk-text-colour;
+}
+
+.govuk-task-list__link::after {
+  content: "";
+  display: block;
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
+
+.govuk-task-list__hint {
+  margin-top: govuk-spacing(1);
+  color: $govuk-secondary-text-colour;
+}
+
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index b7ecd58c8..252f256c8 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -1,9 +1,11 @@
+from bs4 import BeautifulSoup
 from django.urls import reverse
 
 from common.tests.factories import ProgressStateFactory
 from common.tests.factories import TaskFactory
 from tasks.models import ProgressState
 from tasks.models import TaskLog
+from tasks.tests.test_workflow_models import TaskItemTemplateFactory
 
 
 def test_task_update_view_update_progress_state(valid_user_client):
@@ -33,3 +35,20 @@ def test_task_update_view_update_progress_state(valid_user_client):
         action=TaskLog.AuditActionType.PROGRESS_STATE_UPDATED,
         instigator=response.wsgi_request.user,
     )
+
+
+def test_workflow_template_detail_view_displays_task_templates(valid_user_client):
+    task_item_template = TaskItemTemplateFactory.create()
+    task_template = task_item_template.task_template
+    workflow_template = task_item_template.queue
+
+    url = reverse(
+        "workflow:task-workflow-template-ui-detail",
+        kwargs={"pk": workflow_template.pk},
+    )
+    response = valid_user_client.get(url)
+    assert response.status_code == 200
+
+    page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
+    assert page.find("h1", text=workflow_template.title)
+    assert page.find("a", text=task_template.title)
diff --git a/tasks/urls.py b/tasks/urls.py
index 0f5aff2c5..74d2e10ef 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -5,7 +5,7 @@
 
 app_name = "workflow"
 
-ui_patterns = [
+task_ui_patterns = [
     path("", views.TaskListView.as_view(), name="task-ui-list"),
     path("<int:pk>/", views.TaskDetailView.as_view(), name="task-ui-detail"),
     path("create/", views.TaskCreateView.as_view(), name="task-ui-create"),
@@ -33,6 +33,17 @@
     ),
 ]
 
+workflow_template_ui_patterns = [
+    path(
+        "templates/<int:pk>/",
+        views.TaskWorkflowTemplateDetailView.as_view(),
+        name="task-workflow-template-ui-detail",
+    ),
+]
+
+workflow_ui_patterns = workflow_template_ui_patterns
+
 urlpatterns = [
-    path("tasks/", include(ui_patterns)),
+    path("tasks/", include(task_ui_patterns)),
+    path("workflows/", include(workflow_ui_patterns)),
 ]
diff --git a/tasks/views.py b/tasks/views.py
index 5f9b2bfad..01d06fd61 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -16,6 +16,7 @@
 from tasks.forms import TaskDeleteForm
 from tasks.forms import TaskUpdateForm
 from tasks.models import Task
+from tasks.models import TaskWorkflowTemplate
 from tasks.signals import set_current_instigator
 
 
@@ -133,3 +134,16 @@ def form_valid(self, form):
 
     def get_success_url(self):
         return reverse("workflow:task-ui-confirm-create", kwargs={"pk": self.object.pk})
+
+
+class TaskWorkflowTemplateDetailView(PermissionRequiredMixin, DetailView):
+    model = TaskWorkflowTemplate
+    template_name = "tasks/workflows/template_detail.jinja"
+    permission_required = "tasks.view_taskworkflowtemplate"
+
+    def get_context_data(self, **kwargs):
+        context_data = super().get_context_data(**kwargs)
+        context_data["task_template_items"] = (
+            self.get_object().get_items().select_related("task_template")
+        )
+        return context_data
diff --git a/webpack.config.js b/webpack.config.js
index 5c98a53be..8dbf2b028 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -81,6 +81,7 @@ module.exports = {
                   "regulations/static/regulations/scss",
                   "workbaskets/static/workbaskets/scss",
                   "reference_documents/static/reference_documents/scss",
+                  "tasks/static/tasks/scss",
                 ],
               },
             },

From 77760e5b917a5c1c285ecc0b86524945d1dbfd53 Mon Sep 17 00:00:00 2001
From: Paul Pepper <paul.pepper@digital.trade.gov.uk>
Date: Tue, 12 Nov 2024 14:52:37 +0000
Subject: [PATCH 08/57] PR template tweaks

---
 .github/pull_request_template.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index a4620a412..1bb09902a 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,5 +1,6 @@
-# TP-??? Your PR title here
+# TP2000-??? Your PR title here
 <!---
+                                                  <--- 50 characters
  * Include the JIRA ticket number, eg TP-123, to automatically link.
  * Use 50 characters maximum.
  * Do not end with a full-stop.
@@ -22,12 +23,12 @@ What is this PR doing, e.g. implementations, algorithms, etc.?
 --->
 
 <!---
-Optionally let reviewers know they need to run migrations or update dependencies before
+Let reviewers know they need to run migrations or update dependencies before
 testing by adding the following section:
-## Checklist
-- Requires migrations?
-- Requires dependency updates?
 --->
+## Checklist
+- Requires migrations? Yes / No
+- Requires dependency updates? Yes / No
 
 <!---
 Links to relevant material

From 5ec8f3835f3b0676a57f52af174048bfa09e57ab Mon Sep 17 00:00:00 2001
From: Paul Pepper <paul.pepper@digital.trade.gov.uk>
Date: Tue, 12 Nov 2024 15:53:12 +0000
Subject: [PATCH 09/57] Black formatting

---
 tasks/models/__init__.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tasks/models/__init__.py b/tasks/models/__init__.py
index af60eda88..95be31658 100644
--- a/tasks/models/__init__.py
+++ b/tasks/models/__init__.py
@@ -9,29 +9,25 @@
 from tasks.models.task import ProgressState
 from tasks.models.task import Task
 from tasks.models.task import TaskAssignee
-from tasks.models.workflow import TaskWorkflow
 from tasks.models.workflow import TaskItem
-from tasks.models.workflow import TaskWorkflowTemplate
 from tasks.models.workflow import TaskItemTemplate
 from tasks.models.workflow import TaskTemplate
-
+from tasks.models.workflow import TaskWorkflow
+from tasks.models.workflow import TaskWorkflowTemplate
 
 __all__ = [
     # tasks.models.logs
     "TaskLog",
-
     # tasks.models.queue
     "Queue",
     "QueueItem",
     "RequiredFieldError",
-
     # tasks.models.task
     "Category",
     "Comment",
     "ProgressState",
     "Task",
     "TaskAssignee",
-
     # tasks.models.workflow
     "TaskWorkflow",
     "TaskItem",

From d1d18ed7bd07eae92bdc6d166d598b86bc5f25b9 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Thu, 14 Nov 2024 14:07:44 +0000
Subject: [PATCH 10/57] TP2000-1545  Add task template reordering capability to
 workflow template detail view (#1323)

* Add task template reordering capability to workflow template detail view

* Catch race condition exception

* Add workflow template reorder items view test

* Ensure item being moved belongs to workflow template

* Add task queue template resembling packaging queue design

* Order get_task_templates() and get_tasks() querysets by item position

* Add promote_to_first/last form action handling
---
 tasks/jinja2/tasks/includes/task_queue.jinja  | 74 ++++++++++++++++++
 tasks/jinja2/tasks/macros/item_actions.jinja  | 29 +++++++
 .../tasks/workflows/template_detail.jinja     | 55 ++++++--------
 tasks/models/workflow.py                      | 12 ++-
 tasks/static/tasks/scss/_tasks.scss           | 11 ---
 tasks/tests/test_views.py                     | 52 +++++++++++++
 tasks/views.py                                | 75 ++++++++++++++++++-
 7 files changed, 258 insertions(+), 50 deletions(-)
 create mode 100644 tasks/jinja2/tasks/includes/task_queue.jinja
 create mode 100644 tasks/jinja2/tasks/macros/item_actions.jinja

diff --git a/tasks/jinja2/tasks/includes/task_queue.jinja b/tasks/jinja2/tasks/includes/task_queue.jinja
new file mode 100644
index 000000000..2b1ab3e05
--- /dev/null
+++ b/tasks/jinja2/tasks/includes/task_queue.jinja
@@ -0,0 +1,74 @@
+{% from "components/table/macro.njk" import govukTable %}
+{% from "tasks/macros/item_actions.jinja" import render_item_button %}
+
+{%- set table_rows = [] -%}
+
+{%- for obj in object_list %}
+  {%- set up_down_cell_content %}
+    {% if loop.index == 1 %}
+      {{ render_item_button(obj, "demote", use_icon=True) }}
+    {% elif loop.index == 2 %}
+      {{ render_item_button(obj, "promote", use_icon=True) }}
+      <br>
+      {% if 2 < object_list | length %}
+        {{ render_item_button(obj, "demote", use_icon=True) }}
+      {% endif %}
+    {% elif loop.index == object_list | length %}
+      {{ render_item_button(obj, "promote", use_icon=True) }}
+    {% else %}
+      {{ render_item_button(obj, "promote", use_icon=True) }}
+      <br>
+      {{ render_item_button(obj, "demote", use_icon=True) }}
+    {% endif %}
+  {% endset -%}
+
+  {%- set title_cell_content %}
+    <a href="#TODO" class="govuk-link">{{ obj.title }}</a>
+  {% endset -%}
+
+  {%- set description_cell_content %}
+    <span>{{ obj.description|truncate(50) }}</span>
+  {% endset -%}
+
+  {%- set order_cell_content %}
+    {% if loop.index == 1%}
+      {{ render_item_button(obj, "demote_to_last") }}
+    {% elif loop.index == object_list | length %}
+      {{ render_item_button(obj, "promote_to_first") }}
+    {% else %}
+      {{ render_item_button(obj, "promote_to_first") }}
+      <br>
+      {{ render_item_button(obj, "demote_to_last") }}
+    {% endif %}
+  {% endset -%}
+
+  {%- set remove_cell_content %}
+    TODO
+  {% endset -%}
+
+  {{ table_rows.append([
+    {"html": up_down_cell_content},
+    {"text": loop.index},
+    {"html": title_cell_content},
+    {"html": description_cell_content},
+    {"html": order_cell_content},
+    {"html": remove_cell_content},
+  ]) or "" }}
+
+{% endfor -%}
+
+<form method="post">
+    <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}">
+
+  {{ govukTable({
+    "head": [
+      {"text": ""},
+      {"text": "Position"},
+      {"text": "Title"},
+      {"text": "Description"},
+      {"text": "Order"},
+      {"text": "Remove"},
+    ],
+    "rows": table_rows,
+  }) }}
+</form>
diff --git a/tasks/jinja2/tasks/macros/item_actions.jinja b/tasks/jinja2/tasks/macros/item_actions.jinja
new file mode 100644
index 000000000..89e209b0b
--- /dev/null
+++ b/tasks/jinja2/tasks/macros/item_actions.jinja
@@ -0,0 +1,29 @@
+{% macro render_item_button(obj, action, use_icon=False) %}
+  {% set action_text = {
+    "promote": "Move up",
+    "demote": "Move down",
+    "promote_to_first": "Move to first",
+    "demote_to_last": "Move to last",
+  }[action] %}
+
+  {% set icon_src = {
+    "promote": "/common/images/chevron-up.svg",
+    "demote": "/common/images/chevron-down.svg",
+  }[action] %}
+
+  <button name="{{ action }}"
+    value="{{ obj.pk }}"
+    class="govuk-link fake-link govuk-!-padding-right-2"
+    data-module="govuk-button"
+    data-prevent-double-click="true"
+  >
+    {% if use_icon and icon_src %}
+      <img class="icon"
+        src="{{ static(icon_src) }}"
+        alt="{{ action_text}} icon"
+      >
+    {% else %}
+      {{ action_text }}
+    {% endif%}
+  </button>
+{% endmacro %}
diff --git a/tasks/jinja2/tasks/workflows/template_detail.jinja b/tasks/jinja2/tasks/workflows/template_detail.jinja
index 9e9073fd5..b4bf3868e 100644
--- a/tasks/jinja2/tasks/workflows/template_detail.jinja
+++ b/tasks/jinja2/tasks/workflows/template_detail.jinja
@@ -3,6 +3,7 @@
 {% from "components/button/macro.njk" import govukButton %}
 
 {% set page_title = "Workflow template: " ~ object.title %}
+{% set list_include = "tasks/includes/task_queue.jinja" %}
 
 {% set edit_url = "#TODO" %}
 
@@ -32,6 +33,7 @@
       <dd class="govuk-summary-list__value">
         {{ object.pk }}
       </dd>
+      <dd class="govuk-summary-list__actions"></dd>
     </div>
 
     <div class="govuk-summary-list__row">
@@ -61,37 +63,26 @@
 
   <h2 class="govuk-heading-m">Task templates</h2>
 
-  {% if not task_template_items %}
-    <p class="govuk-body">There are currently no task templates for this workflow template.</p>
-  {% else %}
-    <ol class="govuk-task-list">
-      {% for task_template_item in task_template_items -%}
-        <li class="govuk-task-list__item govuk-task-list__item--with-link">
-          <div class="govuk-task-list__name-and-hint">
-            <a class="govuk-link govuk-task-list__link" href="#TODO">
-              {{- task_template_item.task_template.title -}}
-            </a>
-            {% if task_template_item.task_template.description -%}
-              <div class="govuk-task-list__hint">
-                {{ task_template_item.task_template.description|truncate(50) }}
-              </div>
-            {% endif %}
-          </div>
-        </li>
-      {% endfor %}
-    </ol>
-  {% endif %}
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-full">
+      {% if object_list %}
+        {% include list_include %}
+      {% else %}
+        <p class="govuk-body">There are no task templates for this workflow template.</p>
+      {% endif %}
+    </div>
+  </div>
 
-<div class="govuk-button-group govuk-!-margin-top-6">
-  {{ govukButton({
-    "text": "Delete workflow template",
-    "href": "#TODO",
-    "classes": "govuk-button--warning"
-  }) }}
-  {{ govukButton({
-    "text": "Find and view workflow templates",
-    "href": "#TODO",
-    "classes": "govuk-button--secondary"
-  }) }}
-</div>
+  <div class="govuk-button-group govuk-!-margin-top-6">
+    {{ govukButton({
+      "text": "Delete workflow template",
+      "href": "#TODO",
+      "classes": "govuk-button--warning"
+    }) }}
+    {{ govukButton({
+      "text": "Find and view workflow templates",
+      "href": "#TODO",
+      "classes": "govuk-button--secondary"
+    }) }}
+  </div>
 {% endblock %}
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index 4087a2540..c58ab4db3 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -42,8 +42,9 @@ class TaskWorkflow(TaskWorkflowBase):
 
     def get_tasks(self) -> models.QuerySet:
         """Get a QuerySet of the Tasks associated through their TaskItem
-        instances to this TaskWorkflow."""
-        return Task.objects.filter(taskitem__queue=self)
+        instances to this TaskWorkflow, ordered by the position of the
+        TaskItem."""
+        return Task.objects.filter(taskitem__queue=self).order_by("taskitem__position")
 
 
 class TaskItem(QueueItem):
@@ -72,8 +73,11 @@ class TaskWorkflowTemplate(TaskWorkflowBase):
 
     def get_task_templates(self) -> models.QuerySet:
         """Get a QuerySet of the TaskTemplates associated through their
-        TaskItemTemplate instances to this TaskWorkflowTemplate."""
-        return TaskTemplate.objects.filter(taskitemtemplate__queue=self)
+        TaskItemTemplate instances to this TaskWorkflowTemplate, ordered by the
+        position of the TaskItemTemplate."""
+        return TaskTemplate.objects.filter(taskitemtemplate__queue=self).order_by(
+            "taskitemtemplate__position",
+        )
 
     @atomic
     def create_task_workflow(self) -> "TaskWorkflow":
diff --git a/tasks/static/tasks/scss/_tasks.scss b/tasks/static/tasks/scss/_tasks.scss
index 563247648..c86541eec 100644
--- a/tasks/static/tasks/scss/_tasks.scss
+++ b/tasks/static/tasks/scss/_tasks.scss
@@ -32,18 +32,7 @@
   @include govuk-text-colour;
 }
 
-.govuk-task-list__link::after {
-  content: "";
-  display: block;
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-}
-
 .govuk-task-list__hint {
   margin-top: govuk-spacing(1);
   color: $govuk-secondary-text-colour;
 }
-
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 252f256c8..1ca529ddd 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -1,3 +1,4 @@
+import pytest
 from bs4 import BeautifulSoup
 from django.urls import reverse
 
@@ -6,6 +7,10 @@
 from tasks.models import ProgressState
 from tasks.models import TaskLog
 from tasks.tests.test_workflow_models import TaskItemTemplateFactory
+from tasks.tests.test_workflow_models import task_workflow_template  # noqa
+from tasks.tests.test_workflow_models import (  # noqa
+    task_workflow_template_three_task_items,
+)
 
 
 def test_task_update_view_update_progress_state(valid_user_client):
@@ -52,3 +57,50 @@ def test_workflow_template_detail_view_displays_task_templates(valid_user_client
     page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
     assert page.find("h1", text=workflow_template.title)
     assert page.find("a", text=task_template.title)
+
+
+@pytest.mark.parametrize(
+    ("action", "item_position", "expected_item_order"),
+    [
+        ("promote", 1, [1, 2, 3]),
+        ("promote", 2, [2, 1, 3]),
+        ("demote", 2, [1, 3, 2]),
+        ("demote", 3, [1, 2, 3]),
+        ("promote_to_first", 3, [3, 1, 2]),
+        ("demote_to_last", 1, [2, 3, 1]),
+    ],
+)
+def test_workflow_template_detail_view_reorder_items(
+    action,
+    item_position,
+    expected_item_order,
+    valid_user_client,
+    task_workflow_template_three_task_items,
+):
+    """Tests that `TaskWorkflowTemplateDetailView` handles POST requests to
+    promote or demote task templates."""
+
+    def convert_to_index(position: int) -> int:
+        """Converts a 1-based item position to a 0-based index for items array
+        access."""
+        return position - 1
+
+    items = list(task_workflow_template_three_task_items.get_items())
+    item_to_move = items[convert_to_index(item_position)]
+
+    url = reverse(
+        "workflow:task-workflow-template-ui-detail",
+        kwargs={"pk": task_workflow_template_three_task_items.pk},
+    )
+    form_data = {
+        action: item_to_move.id,
+    }
+
+    response = valid_user_client.post(url, form_data)
+    assert response.status_code == 302
+
+    reordered_items = task_workflow_template_three_task_items.get_items()
+    for i, reordered_item in enumerate(reordered_items):
+        expected_position = convert_to_index(expected_item_order[i])
+        expected_item = items[expected_position]
+        assert reordered_item.id == expected_item.id
diff --git a/tasks/views.py b/tasks/views.py
index 01d06fd61..fbc8998e1 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -1,7 +1,10 @@
 from django.contrib.auth.mixins import PermissionRequiredMixin
+from django.db import OperationalError
 from django.db import transaction
 from django.http import HttpResponseRedirect
+from django.shortcuts import get_object_or_404
 from django.urls import reverse
+from django.utils.functional import cached_property
 from django.views.generic.base import TemplateView
 from django.views.generic.detail import DetailView
 from django.views.generic.edit import CreateView
@@ -16,6 +19,7 @@
 from tasks.forms import TaskDeleteForm
 from tasks.forms import TaskUpdateForm
 from tasks.models import Task
+from tasks.models import TaskItemTemplate
 from tasks.models import TaskWorkflowTemplate
 from tasks.signals import set_current_instigator
 
@@ -141,9 +145,74 @@ class TaskWorkflowTemplateDetailView(PermissionRequiredMixin, DetailView):
     template_name = "tasks/workflows/template_detail.jinja"
     permission_required = "tasks.view_taskworkflowtemplate"
 
+    @cached_property
+    def task_workflow_template(self) -> TaskWorkflowTemplate:
+        return self.get_object()
+
+    @property
+    def view_url(self) -> str:
+        return reverse(
+            "workflow:task-workflow-template-ui-detail",
+            kwargs={"pk": self.task_workflow_template.pk},
+        )
+
     def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)
-        context_data["task_template_items"] = (
-            self.get_object().get_items().select_related("task_template")
-        )
+        context_data["object_list"] = self.task_workflow_template.get_task_templates()
         return context_data
+
+    def post(self, request, *args, **kwargs):
+        if "promote" in request.POST:
+            self.promote(request.POST.get("promote"))
+        elif "demote" in request.POST:
+            self.demote(request.POST.get("demote"))
+        elif "promote_to_first" in request.POST:
+            self.promote_to_first(request.POST.get("promote_to_first"))
+        elif "demote_to_last" in request.POST:
+            self.demote_to_last(request.POST.get("demote_to_last"))
+
+        return HttpResponseRedirect(self.view_url)
+
+    def promote(self, task_template_id: int) -> None:
+        task_item_template = get_object_or_404(
+            TaskItemTemplate,
+            task_template_id=task_template_id,
+            queue=self.task_workflow_template,
+        )
+        try:
+            task_item_template.promote()
+        except OperationalError:
+            pass
+
+    def demote(self, task_template_id: int) -> None:
+        task_item_template = get_object_or_404(
+            TaskItemTemplate,
+            task_template_id=task_template_id,
+            queue=self.task_workflow_template,
+        )
+        try:
+            task_item_template.demote()
+        except OperationalError:
+            pass
+
+    def promote_to_first(self, task_template_id: int) -> None:
+        task_item_template = get_object_or_404(
+            TaskItemTemplate,
+            task_template_id=task_template_id,
+            queue=self.task_workflow_template,
+        )
+        try:
+            task_item_template.promote_to_first()
+        except OperationalError:
+            pass
+
+    def demote_to_last(self, task_template_id: int) -> None:
+        task_item_template = get_object_or_404(
+            TaskItemTemplate,
+            task_template_id=task_template_id,
+            queue=self.task_workflow_template,
+        )
+        try:
+            task_item_template.demote_to_last()
+        except OperationalError:
+            pass

From 84e3c161debaa3269a5221e54e74db2e5bcdd2d8 Mon Sep 17 00:00:00 2001
From: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>
Date: Fri, 15 Nov 2024 10:14:42 +0000
Subject: [PATCH 11/57] TP2000-48 & TP2000-1549 Task template create and detail
 views (#1326)

* Fix misaligned actions. Add links.

* Add __str__() method

* Task template creation UI support

* Add missing trailing slash

* Add tasktemplate perms to conftest

* Move factories and fixtures to their own modules

* Fixture for single item workflow template

* Unit tests for create and detail views for task templates

* Correct fixture name

* Add link to task template detail view
---
 common/jinja2/layouts/detail.jinja            |   2 +
 conftest.py                                   |   4 +
 tasks/forms.py                                |  24 ++++
 .../task_template_confirm_create.jinja        |  50 ++++++++
 .../workflows/task_template_create.jinja      |  20 ++++
 .../workflows/task_template_detail.jinja      |  63 ++++++++++
 .../tasks/workflows/template_detail.jinja     |  20 +++-
 tasks/models/workflow.py                      |   6 +
 tasks/tests/conftest.py                       |  61 ++++++++++
 tasks/tests/factories.py                      |  36 ++++++
 tasks/tests/test_views.py                     |  69 +++++++++--
 tasks/tests/test_workflow_models.py           | 108 ++++--------------
 tasks/urls.py                                 |  24 +++-
 tasks/views.py                                |  63 ++++++++++
 14 files changed, 447 insertions(+), 103 deletions(-)
 create mode 100644 tasks/jinja2/tasks/workflows/task_template_confirm_create.jinja
 create mode 100644 tasks/jinja2/tasks/workflows/task_template_create.jinja
 create mode 100644 tasks/jinja2/tasks/workflows/task_template_detail.jinja
 create mode 100644 tasks/tests/factories.py

diff --git a/common/jinja2/layouts/detail.jinja b/common/jinja2/layouts/detail.jinja
index d0a607a09..23565d1b3 100644
--- a/common/jinja2/layouts/detail.jinja
+++ b/common/jinja2/layouts/detail.jinja
@@ -1,4 +1,6 @@
 {% extends "layouts/layout.jinja" %}
+
+{% from "components/tabs/macros.njk" import govukTabs %}
 {% from "components/breadcrumbs.jinja" import breadcrumbs %}
 
 {% block breadcrumb %}
diff --git a/conftest.py b/conftest.py
index eefff698c..5670aa32c 100644
--- a/conftest.py
+++ b/conftest.py
@@ -311,6 +311,10 @@ def policy_group(db) -> Group:
         ("tasks", "change_comment"),
         ("tasks", "delete_comment"),
         ("tasks", "view_taskworkflowtemplate"),
+        ("tasks", "add_tasktemplate"),
+        ("tasks", "change_tasktemplate"),
+        ("tasks", "delete_tasktemplate"),
+        ("tasks", "view_tasktemplate"),
     ]:
         group.permissions.add(
             Permission.objects.get(
diff --git a/tasks/forms.py b/tasks/forms.py
index c15f3be06..391dbed54 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -6,6 +6,7 @@
 
 from common.forms import delete_form_for
 from tasks.models import Task
+from tasks.models import TaskTemplate
 from workbaskets.models import WorkBasket
 
 
@@ -78,3 +79,26 @@ def save(self, parent_task, user, commit=True):
 
 
 TaskDeleteForm = delete_form_for(Task)
+
+
+class TaskTemplateCreateForm(ModelForm):
+    class Meta:
+        model = TaskTemplate
+        fields = ("title", "description")
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.helper = FormHelper(self)
+        self.helper.label_size = Size.SMALL
+        self.helper.legend_size = Size.SMALL
+        self.helper.layout = Layout(
+            "title",
+            "description",
+            Submit(
+                "submit",
+                "Create",
+                data_module="govuk-button",
+                data_prevent_double_click="true",
+            ),
+        )
diff --git a/tasks/jinja2/tasks/workflows/task_template_confirm_create.jinja b/tasks/jinja2/tasks/workflows/task_template_confirm_create.jinja
new file mode 100644
index 000000000..1cf1e406e
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/task_template_confirm_create.jinja
@@ -0,0 +1,50 @@
+{% extends "common/confirm_create.jinja" %}
+
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+{% from "components/panel/macro.njk" import govukPanel %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Task template created" %}
+
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+    request,
+    [
+      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Workflow template: " ~ task_workflow_template.title,
+        "href": url(
+          "workflow:task-workflow-template-ui-detail",
+          kwargs={"pk": task_workflow_template.pk}),
+      },
+      {"text": page_title}
+    ],
+    False,
+  ) }}
+{% endblock %}
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": "Task template: " ~ object.title,
+    "text": "You have created a new task template",
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
+
+{% block button_group %}
+  {{ govukButton({
+    "text": "View task template",
+    "href": url("workflow:task-template-ui-detail", kwargs={"pk": object.pk}),
+    "classes": "govuk-button"
+  }) }}
+  {{ govukButton({
+    "text": "Return to homepage",
+    "href": url("home"),
+    "classes": "govuk-button--secondary"
+  }) }}
+{% endblock %}
+
+{% block actions %}
+  <li><a href="TODO" class="govuk-link">Find and edit workflow templates</a></li>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/task_template_create.jinja b/tasks/jinja2/tasks/workflows/task_template_create.jinja
new file mode 100644
index 000000000..f5cac6482
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/task_template_create.jinja
@@ -0,0 +1,20 @@
+{% extends 'layouts/create.jinja' %}
+
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+
+{% set page_title = "Create a task template" %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+    request,
+    [
+      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Workflow template: " ~ task_workflow_template.title,
+        "href": url("workflow:task-workflow-template-ui-detail", kwargs={"pk": task_workflow_template.pk}),
+      },
+      {"text": page_title}
+    ],
+    False,
+  ) }}
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/task_template_detail.jinja b/tasks/jinja2/tasks/workflows/task_template_detail.jinja
new file mode 100644
index 000000000..3910c8c51
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/task_template_detail.jinja
@@ -0,0 +1,63 @@
+{% extends "layouts/layout.jinja" %}
+
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Task template: " ~ object.title %}
+{% set edit_url = "#TODO" %}
+
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+    request,
+    [
+      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Workflow template: " ~ task_workflow_template.title,
+        "href": url(
+          "workflow:task-workflow-template-ui-detail",
+          kwargs={"pk": task_workflow_template.pk}),
+      },
+      {"text": page_title}
+    ],
+    False,
+  ) }}
+{% endblock %}
+
+{% block content %}
+  <h1 class="govuk-heading-xl">{{ page_title }}</h1>
+
+  <h2 class="govuk-heading-m">Details</h2>
+
+  <dl class="govuk-summary-list">
+    <div class="govuk-summary-list__row">
+      <dt class="govuk-summary-list__key">ID</dt>
+      <dd class="govuk-summary-list__value">{{ object.pk }}</dd>
+      <dd class="govuk-summary-list__actions"></dd>
+    </div>
+
+    <div class="govuk-summary-list__row">
+      <dt class="govuk-summary-list__key">Title</dt>
+      <dd class="govuk-summary-list__value">{{ object.title }}</dd>
+      <dd class="govuk-summary-list__actions">
+        <a class="govuk-link" href="#TODO">Change<span class="govuk-visually-hidden"> title</span></a>
+      </dd>
+    </div>
+
+    <div class="govuk-summary-list__row">
+      <dt class="govuk-summary-list__key">Description</dt>
+      <dd class="govuk-summary-list__value">{{ object.description }}</dd>
+      <dd class="govuk-summary-list__actions">
+        <a class="govuk-link" href="#TODO">Change<span class="govuk-visually-hidden"> description</span></a>
+      </dd>
+    </div>
+  </dl>
+
+  <div class="govuk-button-group govuk-!-margin-top-6">
+  {{ govukButton({
+      "text": "Delete task template",
+      "href": "#TODO",
+      "classes": "govuk-button--warning"
+  }) }}
+  </div>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/template_detail.jinja b/tasks/jinja2/tasks/workflows/template_detail.jinja
index b4bf3868e..86c76750c 100644
--- a/tasks/jinja2/tasks/workflows/template_detail.jinja
+++ b/tasks/jinja2/tasks/workflows/template_detail.jinja
@@ -17,11 +17,7 @@
 {% endblock %}
 
 {% block content %}
-  <div class="govuk-grid-row">
-    <div class="govuk-grid-column-two-thirds">
-      <h1 class="govuk-heading-xl">{{ page_title }}</h1>
-    </div>
-  </div>
+  <h1 class="govuk-heading-xl">{{ page_title }}</h1>
 
   <h2 class="govuk-heading-m">Details</h2>
   
@@ -61,7 +57,19 @@
     </div>
   </dl>
 
-  <h2 class="govuk-heading-m">Task templates</h2>
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-three-quarters">
+      <h2 class="govuk-heading-m">Task templates</h2>
+    </div>
+
+    <div class="govuk-grid-column-one-quarter">
+      {{ govukButton({
+        "text": "Create task template",
+        "href": url("workflow:task-template-ui-create", kwargs={"workflow_template_pk": object.pk}),
+        "classes": "govuk-button align-right"
+      }) }}
+    </div>
+  </div>
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index c58ab4db3..9f7332f9d 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -46,6 +46,9 @@ def get_tasks(self) -> models.QuerySet:
         TaskItem."""
         return Task.objects.filter(taskitem__queue=self).order_by("taskitem__position")
 
+    def __str__(self):
+        return self.title
+
 
 class TaskItem(QueueItem):
     """Task item queue management for Task instances (these should always be
@@ -126,3 +129,6 @@ class TaskItemTemplate(QueueItem):
 class TaskTemplate(TaskBase):
     """Template used to create Task instances from within a template
     workflow."""
+
+    def __str__(self):
+        return self.title
diff --git a/tasks/tests/conftest.py b/tasks/tests/conftest.py
index 3ce8cffad..4b582a4a6 100644
--- a/tasks/tests/conftest.py
+++ b/tasks/tests/conftest.py
@@ -6,6 +6,10 @@
 from common.tests.factories import TaskAssigneeFactory
 from common.tests.factories import TaskFactory
 from tasks.models import TaskAssignee
+from tasks.models import TaskItemTemplate
+from tasks.models import TaskTemplate
+from tasks.models import TaskWorkflowTemplate
+from tasks.tests import factories
 
 
 @pytest.fixture()
@@ -45,3 +49,60 @@ def workbasket_reviewer_assignee():
     return TaskAssigneeFactory.create(
         assignment_type=TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
     )
+
+
+@pytest.fixture()
+def task_workflow_template() -> TaskWorkflowTemplate:
+    """Return an empty TaskWorkflowTemplate instance (containing no items)."""
+    return factories.TaskWorkflowTemplateFactory.create()
+
+
+@pytest.fixture()
+def task_workflow_template_single_task_template_item(
+    task_workflow_template,
+) -> TaskWorkflowTemplate:
+    """Return a TaskWorkflowTemplate instance containing a single
+    TaskTemplateItem instance."""
+
+    task_template = factories.TaskTemplateFactory.create()
+    factories.TaskItemTemplateFactory.create(
+        queue=task_workflow_template,
+        task_template=task_template,
+    )
+
+    assert task_workflow_template.get_items().count() == 1
+
+    return task_workflow_template
+
+
+@pytest.fixture()
+def task_workflow_template_three_task_template_items(
+    task_workflow_template,
+) -> TaskWorkflowTemplate:
+    """Return a TaskWorkflowTemplate instance containing three TaskItemTemplate
+    and related TaskTemplates."""
+
+    task_item_templates = []
+    for _ in range(3):
+        task_template = factories.TaskTemplateFactory.create()
+        task_item_template = factories.TaskItemTemplateFactory.create(
+            queue=task_workflow_template,
+            task_template=task_template,
+        )
+        task_item_templates.append(task_item_template)
+
+    assert task_workflow_template.get_items().count() == 3
+    assert (
+        TaskItemTemplate.objects.filter(
+            queue=task_workflow_template,
+        ).count()
+        == 3
+    )
+    assert (
+        TaskTemplate.objects.filter(
+            taskitemtemplate__in=task_item_templates,
+        ).count()
+        == 3
+    )
+
+    return task_workflow_template
diff --git a/tasks/tests/factories.py b/tasks/tests/factories.py
new file mode 100644
index 000000000..c771d7c95
--- /dev/null
+++ b/tasks/tests/factories.py
@@ -0,0 +1,36 @@
+import factory
+from factory import SubFactory
+from factory.django import DjangoModelFactory
+
+from common.tests.factories import CategoryFactory
+from tasks.models import TaskItemTemplate
+from tasks.models import TaskTemplate
+from tasks.models import TaskWorkflowTemplate
+
+
+class TaskWorkflowTemplateFactory(DjangoModelFactory):
+    """Factory to create TaskWorkflowTemplate instances."""
+
+    class Meta:
+        model = TaskWorkflowTemplate
+
+
+class TaskTemplateFactory(DjangoModelFactory):
+    """Factory to create TaskTemplate instances."""
+
+    title = factory.Faker("sentence")
+    description = factory.Faker("sentence")
+    category = factory.SubFactory(CategoryFactory)
+
+    class Meta:
+        model = TaskTemplate
+
+
+class TaskItemTemplateFactory(DjangoModelFactory):
+    """Factory to create TaskItemTemplate instances."""
+
+    class Meta:
+        model = TaskItemTemplate
+
+    queue = SubFactory(TaskWorkflowTemplateFactory)
+    task_template = SubFactory(TaskTemplateFactory)
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 1ca529ddd..f630c9a8e 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -1,3 +1,4 @@
+import factory
 import pytest
 from bs4 import BeautifulSoup
 from django.urls import reverse
@@ -6,11 +7,7 @@
 from common.tests.factories import TaskFactory
 from tasks.models import ProgressState
 from tasks.models import TaskLog
-from tasks.tests.test_workflow_models import TaskItemTemplateFactory
-from tasks.tests.test_workflow_models import task_workflow_template  # noqa
-from tasks.tests.test_workflow_models import (  # noqa
-    task_workflow_template_three_task_items,
-)
+from tasks.tests.factories import TaskItemTemplateFactory
 
 
 def test_task_update_view_update_progress_state(valid_user_client):
@@ -75,7 +72,7 @@ def test_workflow_template_detail_view_reorder_items(
     item_position,
     expected_item_order,
     valid_user_client,
-    task_workflow_template_three_task_items,
+    task_workflow_template_three_task_template_items,
 ):
     """Tests that `TaskWorkflowTemplateDetailView` handles POST requests to
     promote or demote task templates."""
@@ -85,12 +82,12 @@ def convert_to_index(position: int) -> int:
         access."""
         return position - 1
 
-    items = list(task_workflow_template_three_task_items.get_items())
+    items = list(task_workflow_template_three_task_template_items.get_items())
     item_to_move = items[convert_to_index(item_position)]
 
     url = reverse(
         "workflow:task-workflow-template-ui-detail",
-        kwargs={"pk": task_workflow_template_three_task_items.pk},
+        kwargs={"pk": task_workflow_template_three_task_template_items.pk},
     )
     form_data = {
         action: item_to_move.id,
@@ -99,8 +96,62 @@ def convert_to_index(position: int) -> int:
     response = valid_user_client.post(url, form_data)
     assert response.status_code == 302
 
-    reordered_items = task_workflow_template_three_task_items.get_items()
+    reordered_items = task_workflow_template_three_task_template_items.get_items()
     for i, reordered_item in enumerate(reordered_items):
         expected_position = convert_to_index(expected_item_order[i])
         expected_item = items[expected_position]
         assert reordered_item.id == expected_item.id
+
+
+def test_create_task_template_view(valid_user_client, task_workflow_template):
+    """Test the view for creating new TaskTemplates and the confirmation view
+    that a successful creation redirects to."""
+
+    assert task_workflow_template.get_task_templates().count() == 0
+
+    create_url = reverse(
+        "workflow:task-template-ui-create",
+        kwargs={"workflow_template_pk": task_workflow_template.pk},
+    )
+    form_data = {
+        "title": factory.Faker("sentence"),
+        "description": factory.Faker("sentence"),
+    }
+    create_response = valid_user_client.post(create_url, form_data)
+    created_task_template = task_workflow_template.get_task_templates().get()
+    confirmation_url = reverse(
+        "workflow:task-template-ui-confirm-create",
+        kwargs={"pk": created_task_template.pk},
+    )
+
+    assert create_response.status_code == 302
+    assert task_workflow_template.get_task_templates().count() == 1
+    assert create_response.url == confirmation_url
+
+    confirmation_response = valid_user_client.get(confirmation_url)
+
+    soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
+
+    assert confirmation_response.status_code == 200
+    assert created_task_template.title in soup.select("h1.govuk-panel__title")[0].text
+
+
+def test_task_template_detail_view(
+    valid_user_client,
+    task_workflow_template_single_task_template_item,
+):
+    task_template = (
+        task_workflow_template_single_task_template_item.get_task_templates().get()
+    )
+    url = reverse("workflow:task-template-ui-detail", kwargs={"pk": task_template.pk})
+    response = valid_user_client.get(url)
+
+    soup = BeautifulSoup(str(response.content), "html.parser")
+
+    assert response.status_code == 200
+    assert (
+        task_template.title
+        in soup.select("div.govuk-summary-list__row:nth-child(2) > dd:nth-child(2)")[
+            0
+        ].text
+    )
diff --git a/tasks/tests/test_workflow_models.py b/tasks/tests/test_workflow_models.py
index eb6716b02..270e7b055 100644
--- a/tasks/tests/test_workflow_models.py
+++ b/tasks/tests/test_workflow_models.py
@@ -1,102 +1,37 @@
-import factory
 import pytest
 from django.core.exceptions import ObjectDoesNotExist
-from factory import SubFactory
-from factory.django import DjangoModelFactory
 
-from common.tests.factories import CategoryFactory
 from tasks.models import TaskItemTemplate
 from tasks.models import TaskTemplate
-from tasks.models import TaskWorkflowTemplate
+from tasks.tests import factories
 
 pytestmark = pytest.mark.django_db
 
 
-class TaskWorkflowTemplateFactory(DjangoModelFactory):
-    """Factory to create TaskWorkflowTemplate instances."""
-
-    class Meta:
-        model = TaskWorkflowTemplate
-
-
-class TaskTemplateFactory(DjangoModelFactory):
-    """Factory to create TaskTemplate instances."""
-
-    title = factory.Faker("sentence")
-    description = factory.Faker("sentence")
-    category = factory.SubFactory(CategoryFactory)
-
-    class Meta:
-        model = TaskTemplate
-
-
-class TaskItemTemplateFactory(DjangoModelFactory):
-    """Factory to create TaskItemTemplate instances."""
-
-    class Meta:
-        model = TaskItemTemplate
-
-    queue = SubFactory(TaskWorkflowTemplateFactory)
-    task_template = SubFactory(TaskTemplateFactory)
-
-
-@pytest.fixture()
-def task_workflow_template() -> TaskWorkflowTemplate:
-    """Return an empty TaskWorkflowTemplate instance (containing no items)."""
-    return TaskWorkflowTemplateFactory.create()
-
-
-@pytest.fixture()
-def task_workflow_template_three_task_items(
-    task_workflow_template,
-) -> TaskWorkflowTemplate:
-    """Return a TaskWorkflowTemplate instance containing three TaskItemTemplate
-    and related TaskTemplates."""
-
-    task_item_templates = []
-    for _ in range(3):
-        task_template = TaskTemplateFactory.create()
-        task_item_template = TaskItemTemplateFactory.create(
-            queue=task_workflow_template,
-            task_template=task_template,
-        )
-        task_item_templates.append(task_item_template)
-
-    assert task_workflow_template.get_items().count() == 3
-    assert (
-        TaskItemTemplate.objects.filter(
-            queue=task_workflow_template,
-        ).count()
-        == 3
-    )
-    assert (
-        TaskTemplate.objects.filter(
-            taskitemtemplate__in=task_item_templates,
-        ).count()
-        == 3
-    )
-
-    return task_workflow_template
-
-
 def test_create_task_workflow_from_task_workflow_template(
-    task_workflow_template_three_task_items,
+    task_workflow_template_three_task_template_items,
 ):
     """Test creation of TaskWorkflow instances from TaskWorkflowTemplates using
     its `create_task_workflow()` method."""
-    task_workflow = task_workflow_template_three_task_items.create_task_workflow()
+    task_workflow = (
+        task_workflow_template_three_task_template_items.create_task_workflow()
+    )
 
     # Test that workflow values are valid.
-    assert task_workflow.creator_template == task_workflow_template_three_task_items
-    assert task_workflow.title == task_workflow_template_three_task_items.title
     assert (
-        task_workflow.description == task_workflow_template_three_task_items.description
+        task_workflow.creator_template
+        == task_workflow_template_three_task_template_items
+    )
+    assert task_workflow.title == task_workflow_template_three_task_template_items.title
+    assert (
+        task_workflow.description
+        == task_workflow_template_three_task_template_items.description
     )
     assert task_workflow.get_items().count() == 3
 
     # Validate that item positions are equivalent.
     zipped_items = zip(
-        task_workflow_template_three_task_items.get_items(),
+        task_workflow_template_three_task_template_items.get_items(),
         task_workflow.get_items(),
     )
     for item_template, item in zipped_items:
@@ -104,7 +39,7 @@ def test_create_task_workflow_from_task_workflow_template(
 
     # Validate that object values are equivalent.
     zipped_objs = zip(
-        task_workflow_template_three_task_items.get_task_templates(),
+        task_workflow_template_three_task_template_items.get_task_templates(),
         task_workflow.get_tasks(),
     )
     for task_template, task in zipped_objs:
@@ -114,7 +49,7 @@ def test_create_task_workflow_from_task_workflow_template(
 
 
 def test_delete_task_item_template():
-    task_item_template = TaskItemTemplateFactory.create()
+    task_item_template = factories.TaskItemTemplateFactory.create()
     task_item_template_id = task_item_template.id
     task_template_id = task_item_template.task_template.id
 
@@ -129,7 +64,7 @@ def test_delete_task_item_template():
 
 
 def test_delete_task_template():
-    task_item_template = TaskItemTemplateFactory.create()
+    task_item_template = factories.TaskItemTemplateFactory.create()
     task_item_template_id = task_item_template.id
     task_template = task_item_template.task_template
     task_template_id = task_item_template.task_template.id
@@ -145,18 +80,21 @@ def test_delete_task_template():
         assert TaskTemplate.objects.get(id=task_template_id)
 
 
-def test_delete_task_workflow_template(task_workflow_template_three_task_items):
+def test_delete_task_workflow_template(
+    task_workflow_template_three_task_template_items,
+):
     task_item_template_ids = [
-        item.id for item in task_workflow_template_three_task_items.get_items()
+        item.id for item in task_workflow_template_three_task_template_items.get_items()
     ]
     task_template_ids = [
-        task.id for task in task_workflow_template_three_task_items.get_task_templates()
+        task.id
+        for task in task_workflow_template_three_task_template_items.get_task_templates()
     ]
 
     assert len(task_item_template_ids) == 3
     assert len(task_template_ids) == 3
 
-    task_workflow_template_three_task_items.delete()
+    task_workflow_template_three_task_template_items.delete()
 
     assert not TaskItemTemplate.objects.filter(id__in=task_item_template_ids).exists()
     assert TaskTemplate.objects.filter(id__in=task_template_ids).count() == 3
diff --git a/tasks/urls.py b/tasks/urls.py
index 74d2e10ef..79b34cb6b 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -33,17 +33,35 @@
     ),
 ]
 
+workflow_ui_patterns = [
+    # TODO
+]
+
 workflow_template_ui_patterns = [
     path(
-        "templates/<int:pk>/",
+        "<int:pk>/",
         views.TaskWorkflowTemplateDetailView.as_view(),
         name="task-workflow-template-ui-detail",
     ),
+    path(
+        "task-templates/<int:pk>/",
+        views.TaskTemplateDetailView.as_view(),
+        name="task-template-ui-detail",
+    ),
+    path(
+        "<int:workflow_template_pk>/task-templates/create/",
+        views.TaskTemplateCreateView.as_view(),
+        name="task-template-ui-create",
+    ),
+    path(
+        "task-templates/confirm-create/<int:pk>/",
+        views.TaskTemplateConfirmCreateView.as_view(),
+        name="task-template-ui-confirm-create",
+    ),
 ]
 
-workflow_ui_patterns = workflow_template_ui_patterns
-
 urlpatterns = [
     path("tasks/", include(task_ui_patterns)),
     path("workflows/", include(workflow_ui_patterns)),
+    path("workflow-templates/", include(workflow_template_ui_patterns)),
 ]
diff --git a/tasks/views.py b/tasks/views.py
index fbc8998e1..029ac8d61 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -17,9 +17,11 @@
 from tasks.forms import SubTaskCreateForm
 from tasks.forms import TaskCreateForm
 from tasks.forms import TaskDeleteForm
+from tasks.forms import TaskTemplateCreateForm
 from tasks.forms import TaskUpdateForm
 from tasks.models import Task
 from tasks.models import TaskItemTemplate
+from tasks.models import TaskTemplate
 from tasks.models import TaskWorkflowTemplate
 from tasks.signals import set_current_instigator
 
@@ -216,3 +218,64 @@ def demote_to_last(self, task_template_id: int) -> None:
             task_item_template.demote_to_last()
         except OperationalError:
             pass
+
+
+class TaskTemplateDetailView(PermissionRequiredMixin, DetailView):
+    model = TaskTemplate
+    template_name = "tasks/workflows/task_template_detail.jinja"
+    permission_required = "tasks.view_tasktemplate"
+
+    def get_context_data(self, **kwargs) -> dict:
+        context = super().get_context_data(**kwargs)
+
+        context["task_workflow_template"] = self.get_object().taskitemtemplate.queue
+
+        return context
+
+
+class TaskTemplateCreateView(PermissionRequiredMixin, CreateView):
+    template_name = "tasks/workflows/task_template_create.jinja"
+    form_class = TaskTemplateCreateForm
+    permission_required = "tasks.add_tasktemplate"
+
+    def get_task_workflow_template(self) -> TaskWorkflowTemplate:
+        """Get the TaskWorkflowTemplate identified by the pk in the URL."""
+        return TaskWorkflowTemplate.objects.get(
+            pk=self.kwargs["workflow_template_pk"],
+        )
+
+    def get_context_data(self, **kwargs) -> dict:
+        context = super().get_context_data(**kwargs)
+
+        context["task_workflow_template"] = self.get_task_workflow_template()
+
+        return context
+
+    def form_valid(self, form) -> HttpResponseRedirect:
+        with transaction.atomic():
+            self.object = form.save()
+            TaskItemTemplate.objects.create(
+                queue=self.get_task_workflow_template(),
+                task_template=self.object,
+            )
+
+        return HttpResponseRedirect(self.get_success_url(), self.object.pk)
+
+    def get_success_url(self) -> str:
+        return reverse(
+            "workflow:task-template-ui-confirm-create",
+            kwargs={"pk": self.object.pk},
+        )
+
+
+class TaskTemplateConfirmCreateView(PermissionRequiredMixin, DetailView):
+    model = TaskTemplate
+    template_name = "tasks/workflows/task_template_confirm_create.jinja"
+    permission_required = "tasks.add_tasktemplate"
+
+    def get_context_data(self, **kwargs) -> dict:
+        context = super().get_context_data(**kwargs)
+
+        context["task_workflow_template"] = self.get_object().taskitemtemplate.queue
+
+        return context

From f2bead06b555aac25bc84e1d5025ff68db5d8b69 Mon Sep 17 00:00:00 2001
From: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>
Date: Fri, 15 Nov 2024 10:45:43 +0000
Subject: [PATCH 12/57] TP2000-1551 Task template update views and forms
 (#1327)

* Fix misaligned actions. Add links.

* Add __str__() method

* Task template creation UI support

* Add missing trailing slash

* Add tasktemplate perms to conftest

* Move factories and fixtures to their own modules

* Fixture for single item workflow template

* Unit tests for create and detail views for task templates

* Correct fixture name

* Add link to task template detail view

* Add get_url() method support

* Implement forms and views for task template udpate

* Add unit test for update view
---
 tasks/forms.py                                | 16 ++++--
 tasks/jinja2/tasks/includes/task_queue.jinja  |  2 +-
 .../task_template_confirm_update.jinja        | 49 ++++++++++++++++++
 .../workflows/task_template_detail.jinja      |  4 +-
 ..._create.jinja => task_template_save.jinja} |  1 -
 tasks/models/task.py                          |  7 ++-
 tasks/models/workflow.py                      |  9 ++++
 tasks/tests/test_views.py                     | 50 +++++++++++++++++++
 tasks/urls.py                                 | 10 ++++
 tasks/views.py                                | 38 +++++++++++++-
 10 files changed, 176 insertions(+), 10 deletions(-)
 create mode 100644 tasks/jinja2/tasks/workflows/task_template_confirm_update.jinja
 rename tasks/jinja2/tasks/workflows/{task_template_create.jinja => task_template_save.jinja} (91%)

diff --git a/tasks/forms.py b/tasks/forms.py
index 391dbed54..2dc71dceb 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -81,12 +81,12 @@ def save(self, parent_task, user, commit=True):
 TaskDeleteForm = delete_form_for(Task)
 
 
-class TaskTemplateCreateForm(ModelForm):
+class TaskTemplateFormBase(ModelForm):
     class Meta:
         model = TaskTemplate
         fields = ("title", "description")
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, submit_title, **kwargs):
         super().__init__(*args, **kwargs)
 
         self.helper = FormHelper(self)
@@ -97,8 +97,18 @@ def __init__(self, *args, **kwargs):
             "description",
             Submit(
                 "submit",
-                "Create",
+                submit_title,
                 data_module="govuk-button",
                 data_prevent_double_click="true",
             ),
         )
+
+
+class TaskTemplateCreateForm(TaskTemplateFormBase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, submit_title="Create", **kwargs)
+
+
+class TaskTemplateUpdateForm(TaskTemplateFormBase):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, submit_title="Update", **kwargs)
diff --git a/tasks/jinja2/tasks/includes/task_queue.jinja b/tasks/jinja2/tasks/includes/task_queue.jinja
index 2b1ab3e05..79e45dd16 100644
--- a/tasks/jinja2/tasks/includes/task_queue.jinja
+++ b/tasks/jinja2/tasks/includes/task_queue.jinja
@@ -23,7 +23,7 @@
   {% endset -%}
 
   {%- set title_cell_content %}
-    <a href="#TODO" class="govuk-link">{{ obj.title }}</a>
+    <a href="{{ obj.get_url(action='detail') }}" class="govuk-link">{{ obj.title }}</a>
   {% endset -%}
 
   {%- set description_cell_content %}
diff --git a/tasks/jinja2/tasks/workflows/task_template_confirm_update.jinja b/tasks/jinja2/tasks/workflows/task_template_confirm_update.jinja
new file mode 100644
index 000000000..6970c1149
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/task_template_confirm_update.jinja
@@ -0,0 +1,49 @@
+{% extends "common/confirm_update.jinja" %}
+
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+{% from "components/panel/macro.njk" import govukPanel %}
+{% from "components/button/macro.njk" import govukButton %}
+
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+    request,
+    [
+      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Workflow template: " ~ task_workflow_template.title,
+        "href": url(
+          "workflow:task-workflow-template-ui-detail",
+          kwargs={"pk": task_workflow_template.pk},
+        ),
+      },
+      {"text": page_title}
+    ],
+    False,
+  ) }}
+{% endblock %}
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": "Task template: " ~ object.title,
+    "text": "Task template has been updated",
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
+
+{% block button_group %}
+  {{ govukButton({
+    "text": "View task template",
+    "href": url("workflow:task-template-ui-detail", kwargs={"pk": object.pk}),
+    "classes": "govuk-button"
+  }) }}
+  {{ govukButton({
+    "text": "Return to homepage",
+    "href": url("home"),
+    "classes": "govuk-button--secondary"
+  }) }}
+{% endblock %}
+
+{% block actions %}
+  <li><a href="TODO" class="govuk-link">Find and edit workflow templates</a></li>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/task_template_detail.jinja b/tasks/jinja2/tasks/workflows/task_template_detail.jinja
index 3910c8c51..d8c672761 100644
--- a/tasks/jinja2/tasks/workflows/task_template_detail.jinja
+++ b/tasks/jinja2/tasks/workflows/task_template_detail.jinja
@@ -40,7 +40,7 @@
       <dt class="govuk-summary-list__key">Title</dt>
       <dd class="govuk-summary-list__value">{{ object.title }}</dd>
       <dd class="govuk-summary-list__actions">
-        <a class="govuk-link" href="#TODO">Change<span class="govuk-visually-hidden"> title</span></a>
+        <a class="govuk-link" href="{{ object.get_url(action='edit') }}">Change<span class="govuk-visually-hidden"> title</span></a>
       </dd>
     </div>
 
@@ -48,7 +48,7 @@
       <dt class="govuk-summary-list__key">Description</dt>
       <dd class="govuk-summary-list__value">{{ object.description }}</dd>
       <dd class="govuk-summary-list__actions">
-        <a class="govuk-link" href="#TODO">Change<span class="govuk-visually-hidden"> description</span></a>
+        <a class="govuk-link" href="{{ object.get_url(action='edit') }}">Change<span class="govuk-visually-hidden"> description</span></a>
       </dd>
     </div>
   </dl>
diff --git a/tasks/jinja2/tasks/workflows/task_template_create.jinja b/tasks/jinja2/tasks/workflows/task_template_save.jinja
similarity index 91%
rename from tasks/jinja2/tasks/workflows/task_template_create.jinja
rename to tasks/jinja2/tasks/workflows/task_template_save.jinja
index f5cac6482..c2fe106f5 100644
--- a/tasks/jinja2/tasks/workflows/task_template_create.jinja
+++ b/tasks/jinja2/tasks/workflows/task_template_save.jinja
@@ -2,7 +2,6 @@
 
 {% from "components/breadcrumbs.jinja" import breadcrumbs %}
 
-{% set page_title = "Create a task template" %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(
diff --git a/tasks/models/task.py b/tasks/models/task.py
index 14c8d3201..ee36ac07f 100644
--- a/tasks/models/task.py
+++ b/tasks/models/task.py
@@ -97,8 +97,11 @@ class Task(TaskBase):
     def __str__(self):
         return self.title
 
-    def get_url(self):
-        return reverse("workflow:task-ui-detail", kwargs={"pk": self.pk})
+    def get_url(self, action: str = "detail"):
+        if action == "detail":
+            return reverse("workflow:task-ui-detail", kwargs={"pk": self.pk})
+
+        return "#NOT-IMPLEMENTED"
 
 
 class Category(models.Model):
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index 9f7332f9d..57cb27804 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -1,5 +1,6 @@
 from django.db import models
 from django.db.transaction import atomic
+from django.urls import reverse
 
 from tasks.models.queue import Queue
 from tasks.models.queue import QueueItem
@@ -130,5 +131,13 @@ class TaskTemplate(TaskBase):
     """Template used to create Task instances from within a template
     workflow."""
 
+    def get_url(self, action: str = "detail"):
+        if action == "detail":
+            return reverse("workflow:task-template-ui-detail", kwargs={"pk": self.pk})
+        elif action == "edit":
+            return reverse("workflow:task-template-ui-update", kwargs={"pk": self.pk})
+
+        return "#NOT-IMPLEMENTED"
+
     def __str__(self):
         return self.title
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index f630c9a8e..6c6b430b2 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -155,3 +155,53 @@ def test_task_template_detail_view(
             0
         ].text
     )
+
+
+def test_update_task_template_view(
+    valid_user_client,
+    task_workflow_template_single_task_template_item,
+):
+    """Test the view for updating TaskTemplates and the confirmation view that a
+    successful update redirects to."""
+
+    assert (
+        task_workflow_template_single_task_template_item.get_task_templates().count()
+        == 1
+    )
+
+    task_template = (
+        task_workflow_template_single_task_template_item.get_task_templates().get()
+    )
+    update_url = reverse(
+        "workflow:task-template-ui-update",
+        kwargs={"pk": task_template.pk},
+    )
+    appended_text = "updated"
+    form_data = {
+        "title": f"{task_template.title} {appended_text}",
+        "description": f"{task_template.description} {appended_text}",
+    }
+    update_response = valid_user_client.post(update_url, form_data)
+    updated_task_template = (
+        task_workflow_template_single_task_template_item.get_task_templates().get()
+    )
+    confirmation_url = reverse(
+        "workflow:task-template-ui-confirm-update",
+        kwargs={"pk": updated_task_template.pk},
+    )
+
+    assert update_response.status_code == 302
+    assert update_response.url == confirmation_url
+    assert (
+        task_workflow_template_single_task_template_item.get_task_templates().count()
+        == 1
+    )
+    assert updated_task_template.title.endswith(appended_text)
+    assert updated_task_template.description.endswith(appended_text)
+
+    confirmation_response = valid_user_client.get(confirmation_url)
+
+    soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
+
+    assert confirmation_response.status_code == 200
+    assert updated_task_template.title in soup.select("h1.govuk-panel__title")[0].text
diff --git a/tasks/urls.py b/tasks/urls.py
index 79b34cb6b..9c76edbdd 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -58,6 +58,16 @@
         views.TaskTemplateConfirmCreateView.as_view(),
         name="task-template-ui-confirm-create",
     ),
+    path(
+        "task-templates/<int:pk>/update/",
+        views.TaskTemplateUpdateView.as_view(),
+        name="task-template-ui-update",
+    ),
+    path(
+        "task-templates/confirm-update/<int:pk>/",
+        views.TaskTemplateConfirmUpdateView.as_view(),
+        name="task-template-ui-confirm-update",
+    ),
 ]
 
 urlpatterns = [
diff --git a/tasks/views.py b/tasks/views.py
index 029ac8d61..650225159 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -18,6 +18,7 @@
 from tasks.forms import TaskCreateForm
 from tasks.forms import TaskDeleteForm
 from tasks.forms import TaskTemplateCreateForm
+from tasks.forms import TaskTemplateUpdateForm
 from tasks.forms import TaskUpdateForm
 from tasks.models import Task
 from tasks.models import TaskItemTemplate
@@ -234,7 +235,7 @@ def get_context_data(self, **kwargs) -> dict:
 
 
 class TaskTemplateCreateView(PermissionRequiredMixin, CreateView):
-    template_name = "tasks/workflows/task_template_create.jinja"
+    template_name = "tasks/workflows/task_template_save.jinja"
     form_class = TaskTemplateCreateForm
     permission_required = "tasks.add_tasktemplate"
 
@@ -247,6 +248,7 @@ def get_task_workflow_template(self) -> TaskWorkflowTemplate:
     def get_context_data(self, **kwargs) -> dict:
         context = super().get_context_data(**kwargs)
 
+        context["page_title"] = "Create a task template"
         context["task_workflow_template"] = self.get_task_workflow_template()
 
         return context
@@ -279,3 +281,37 @@ def get_context_data(self, **kwargs) -> dict:
         context["task_workflow_template"] = self.get_object().taskitemtemplate.queue
 
         return context
+
+
+class TaskTemplateUpdateView(PermissionRequiredMixin, UpdateView):
+    model = TaskTemplate
+    template_name = "tasks/workflows/task_template_save.jinja"
+    permission_required = "tasks.change_tasktemplate"
+    form_class = TaskTemplateUpdateForm
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context["page_title"] = f"Update task template: {self.get_object().title}"
+        context["task_workflow_template"] = self.get_object().taskitemtemplate.queue
+
+        return context
+
+    def get_success_url(self):
+        return reverse(
+            "workflow:task-template-ui-confirm-update",
+            kwargs={"pk": self.object.pk},
+        )
+
+
+class TaskTemplateConfirmUpdateView(PermissionRequiredMixin, DetailView):
+    model = TaskTemplate
+    template_name = "tasks/workflows/task_template_confirm_update.jinja"
+    permission_required = "tasks.add_tasktemplate"
+
+    def get_context_data(self, **kwargs) -> dict:
+        context = super().get_context_data(**kwargs)
+
+        context["task_workflow_template"] = self.get_object().taskitemtemplate.queue
+
+        return context

From d103846e47ce52b994dcb472be87645ddcf5709f Mon Sep 17 00:00:00 2001
From: Paul Pepper <paul.pepper@digital.trade.gov.uk>
Date: Fri, 15 Nov 2024 12:26:05 +0000
Subject: [PATCH 13/57] Fix typo in macro import

---
 common/jinja2/layouts/detail.jinja | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/jinja2/layouts/detail.jinja b/common/jinja2/layouts/detail.jinja
index 23565d1b3..af8ab5375 100644
--- a/common/jinja2/layouts/detail.jinja
+++ b/common/jinja2/layouts/detail.jinja
@@ -1,6 +1,6 @@
 {% extends "layouts/layout.jinja" %}
 
-{% from "components/tabs/macros.njk" import govukTabs %}
+{% from "components/tabs/macro.njk" import govukTabs %}
 {% from "components/breadcrumbs.jinja" import breadcrumbs %}
 
 {% block breadcrumb %}

From 01db6721147a7993e9ec553cf32e8477ed1744c0 Mon Sep 17 00:00:00 2001
From: Lauren Mullally <46787754+LaurenMullally@users.noreply.github.com>
Date: Mon, 18 Nov 2024 11:36:54 +0000
Subject: [PATCH 14/57] TP2000-1569 Embellish create subtask journey (#1325)

* shared success template for tasks and subtasks

* modified subtask confirmcreate success url to include ID of newly created subtask

* added 'create subtask' button to task details page

* conditional rendering of 'create subtask' button only for tasks without parent

* Remove redirect from get context function, and fix task details button test

* Add validation to prevent subtasks being created from subtasks

* Add parent name to subtask title

* Add test to check for form error

---------

Co-authored-by: marya <marya.shariq@digital.trade.gov.uk>
---
 tasks/jinja2/tasks/confirm_create.jinja |  12 +--
 tasks/jinja2/tasks/detail.jinja         |   7 ++
 tasks/tests/test_views.py               | 102 ++++++++++++++++++++++++
 tasks/urls.py                           |   7 +-
 tasks/views.py                          |  33 +++++++-
 5 files changed, 150 insertions(+), 11 deletions(-)

diff --git a/tasks/jinja2/tasks/confirm_create.jinja b/tasks/jinja2/tasks/confirm_create.jinja
index f4feb04b4..badec2989 100644
--- a/tasks/jinja2/tasks/confirm_create.jinja
+++ b/tasks/jinja2/tasks/confirm_create.jinja
@@ -4,29 +4,29 @@
 {% from "components/panel/macro.njk" import govukPanel %}
 {% from "components/button/macro.njk" import govukButton %}
 
-{% set page_title = "Task created" %}
+{% set page_title = verbose_name|capitalize ~ " created" %}
 
 {% block breadcrumb %}
   {{ govukBreadcrumbs({
     "items": [
       {"text": "Home", "href": url("home")},
-      {"text": "Create a new task", "href": url("workflow:task-ui-create") },
-      {"text": "Task created"}
+      {"text": "Create a new " ~ verbose_name, "href": url("workflow:task-ui-create") },
+      {"text": verbose_name|capitalize ~ " created"}
     ]
   }) }}
 {% endblock %}
 
 {% block panel %}
   {{ govukPanel({
-    "titleText": "Task: " ~ object.title,
-    "text": "You have created a new task",
+    "titleText": verbose_name|capitalize ~ ": " ~ object.title,
+    "text": "You have created a new " ~ verbose_name,
     "classes": "govuk-!-margin-bottom-7"
   }) }}
 {% endblock %}
 
 {% block button_group %}
   {{ govukButton({
-    "text": "View task",
+    "text": "View " ~ verbose_name,
     "href": url('workflow:task-ui-detail', kwargs={"pk": object.pk}),
     "classes": "govuk-button"
   }) }}
diff --git a/tasks/jinja2/tasks/detail.jinja b/tasks/jinja2/tasks/detail.jinja
index 665b4564b..43451a261 100644
--- a/tasks/jinja2/tasks/detail.jinja
+++ b/tasks/jinja2/tasks/detail.jinja
@@ -111,5 +111,12 @@
     "href": url("workflow:task-ui-list"),
     "classes": "govuk-button--secondary"
   }) }}
+  {% if not object.parent_task %}
+    {{ govukButton({
+      "text": "Create subtask",
+      "href": url("workflow:subtask-ui-create", kwargs={"pk": object.pk}),
+      "classes": "govuk-button--secondary"
+    }) }}
+  {% endif %}
 </div>
 {% endblock %}
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 6c6b430b2..f2815fb21 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -4,11 +4,14 @@
 from django.urls import reverse
 
 from common.tests.factories import ProgressStateFactory
+from common.tests.factories import SubTaskFactory
 from common.tests.factories import TaskFactory
 from tasks.models import ProgressState
 from tasks.models import TaskLog
 from tasks.tests.factories import TaskItemTemplateFactory
 
+pytestmark = pytest.mark.django_db
+
 
 def test_task_update_view_update_progress_state(valid_user_client):
     """Tests that `TaskUpdateView` updates `Task.progress_state` and that a
@@ -39,6 +42,105 @@ def test_task_update_view_update_progress_state(valid_user_client):
     )
 
 
+@pytest.mark.parametrize(
+    ("object_type", "success_url"),
+    [
+        ("Task", "workflow:task-ui-confirm-create"),
+        ("Subtask", "workflow:subtask-ui-confirm-create"),
+    ],
+    ids=("task test", "subtask test"),
+)
+def test_confirm_create_template_shows_task_or_subtask(
+    valid_user_client,
+    object_type,
+    success_url,
+):
+    """Test the confirm create template distinguishes between subtask or task's
+    creation."""
+
+    parent_task_instance = TaskFactory.create(
+        progress_state__name=ProgressState.State.TO_DO,
+    )
+
+    url = reverse(
+        success_url,
+        kwargs={
+            "pk": parent_task_instance.pk,
+        },
+    )
+    response = valid_user_client.get(url)
+
+    assert response.status_code == 200
+
+    page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
+    expected_h1_text = f"{object_type}: {parent_task_instance.title}"
+
+    assert expected_h1_text in page.find("h1").text
+
+
+@pytest.mark.parametrize(
+    ("task_factory", "expected_result"),
+    [
+        (TaskFactory, True),
+        (SubTaskFactory, False),
+    ],
+    ids=("task test", "subtask test"),
+)
+def test_create_subtask_button_shows_only_for_non_parent_tasks(
+    superuser_client,
+    task_factory,
+    expected_result,
+):
+    task = task_factory.create()
+
+    url = reverse(
+        "workflow:task-ui-detail",
+        kwargs={
+            "pk": task.pk,
+        },
+    )
+    response = superuser_client.get(url)
+    assert response.status_code == 200
+
+    page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
+
+    if expected_result:
+        assert page.find("a", href=f"/tasks/{task.pk}/subtasks/create")
+    else:
+        assert not page.find("a", href=f"/tasks/{task.pk}/subtasks/create")
+
+
+def test_create_subtask_form_errors_when_parent_is_subtask(valid_user_client):
+    """Tests that the SubtaskCreateForm errors when a form is submitted that has
+    a subtask as a parent."""
+
+    subtask_parent = SubTaskFactory.create()
+    progress_state = ProgressStateFactory.create()
+
+    subtask_form_data = {
+        "progress_state": progress_state.pk,
+        "title": "subtask test title",
+        "description": "subtask test description",
+    }
+
+    url = reverse(
+        "workflow:subtask-ui-create",
+        kwargs={
+            "pk": subtask_parent.pk,
+        },
+    )
+
+    response = valid_user_client.post(url, subtask_form_data)
+
+    assert response.status_code == 200
+    assert not response.context_data["form"].is_valid()
+    soup = BeautifulSoup(str(response.content), "html.parser")
+    assert (
+        "You cannot make a subtask from a subtask."
+        in soup.find("div", class_="govuk-error-summary").text
+    )
+
+
 def test_workflow_template_detail_view_displays_task_templates(valid_user_client):
     task_item_template = TaskItemTemplateFactory.create()
     task_template = task_item_template.task_template
diff --git a/tasks/urls.py b/tasks/urls.py
index 9c76edbdd..c9b8f45a7 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -27,10 +27,15 @@
         name="task-ui-confirm-delete",
     ),
     path(
-        "<int:pk>/sub-tasks/create",
+        "<int:pk>/subtasks/create",
         views.SubTaskCreateView.as_view(),
         name="subtask-ui-create",
     ),
+    path(
+        "subtasks/<int:pk>/confirm-create/",
+        views.SubTaskConfirmCreateView.as_view(),
+        name="subtask-ui-confirm-create",
+    ),
 ]
 
 workflow_ui_patterns = [
diff --git a/tasks/views.py b/tasks/views.py
index 650225159..2df5b8c74 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -74,6 +74,11 @@ class TaskConfirmCreateView(PermissionRequiredMixin, DetailView):
     template_name = "tasks/confirm_create.jinja"
     permission_required = "tasks.add_task"
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["verbose_name"] = "task"
+        return context
+
 
 class TaskUpdateView(PermissionRequiredMixin, UpdateView):
     model = Task
@@ -131,16 +136,36 @@ class SubTaskCreateView(PermissionRequiredMixin, CreateView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["page_title"] = "Create a subtask"
+        context["page_title"] = f"Create a subtask for task {self.kwargs["pk"]}"
         return context
 
     def form_valid(self, form):
         parent_task = Task.objects.filter(pk=self.kwargs["pk"]).first()
-        self.object = form.save(parent_task, user=self.request.user)
-        return HttpResponseRedirect(self.get_success_url())
+        if parent_task.parent_task:
+            form.add_error(
+                None,
+                "You cannot make a subtask from a subtask.",
+            )
+            return self.form_invalid(form)
+        else:
+            self.object = form.save(parent_task, user=self.request.user)
+            return HttpResponseRedirect(self.get_success_url())
 
     def get_success_url(self):
-        return reverse("workflow:task-ui-confirm-create", kwargs={"pk": self.object.pk})
+        return reverse(
+            "workflow:subtask-ui-confirm-create",
+            kwargs={"pk": self.object.pk},
+        )
+
+
+class SubTaskConfirmCreateView(DetailView):
+    model = Task
+    template_name = "tasks/confirm_create.jinja"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["verbose_name"] = "subtask"
+        return context
 
 
 class TaskWorkflowTemplateDetailView(PermissionRequiredMixin, DetailView):

From baf7f61d8821b585dd1f314091b7b74f2df1795a Mon Sep 17 00:00:00 2001
From: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>
Date: Mon, 18 Nov 2024 13:36:47 +0000
Subject: [PATCH 15/57] Add support view support for task workflow deletion
 (#1329)

---
 tasks/forms.py                                |  3 +
 .../task_template_confirm_delete.jinja        | 58 ++++++++++++++++++
 .../workflows/task_template_delete.jinja      | 40 +++++++++++++
 .../workflows/task_template_detail.jinja      |  9 ++-
 tasks/tests/test_views.py                     | 60 +++++++++++++++++++
 tasks/urls.py                                 | 10 ++++
 tasks/views.py                                | 44 ++++++++++++++
 7 files changed, 223 insertions(+), 1 deletion(-)
 create mode 100644 tasks/jinja2/tasks/workflows/task_template_confirm_delete.jinja
 create mode 100644 tasks/jinja2/tasks/workflows/task_template_delete.jinja

diff --git a/tasks/forms.py b/tasks/forms.py
index 2dc71dceb..7c60325b8 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -112,3 +112,6 @@ def __init__(self, *args, **kwargs):
 class TaskTemplateUpdateForm(TaskTemplateFormBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, submit_title="Update", **kwargs)
+
+
+TaskTemplateDeleteForm = delete_form_for(TaskTemplate)
diff --git a/tasks/jinja2/tasks/workflows/task_template_confirm_delete.jinja b/tasks/jinja2/tasks/workflows/task_template_confirm_delete.jinja
new file mode 100644
index 000000000..d185378af
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/task_template_confirm_delete.jinja
@@ -0,0 +1,58 @@
+{% extends "layouts/confirm.jinja" %}
+
+{% from "components/breadcrumbs/macro.njk" import govukBreadcrumbs %}
+{% from "components/panel/macro.njk" import govukPanel %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Task template deleted" %}
+
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+    request,
+    [
+      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Workflow template: " ~ task_workflow_template.title,
+        "href": url(
+          "workflow:task-workflow-template-ui-detail",
+          kwargs={"pk": task_workflow_template.pk},
+        ),
+      },
+      {"text": page_title}
+    ],
+    False,
+  ) }}
+{% endblock %}
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": "Task template ID: " ~ deleted_pk,
+    "text": "Task template has been deleted",
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
+
+{% block button_group %}
+  {{ govukButton({
+    "text": "View workflow template",
+    "href": url(
+      "workflow:task-workflow-template-ui-detail",
+      kwargs={"pk": task_workflow_template.pk},
+    ),
+    "classes": "govuk-button"
+  }) }}
+  {{ govukButton({
+    "text": "Return to homepage",
+    "href": url("home"),
+    "classes": "govuk-button--secondary"
+  }) }}
+{% endblock %}
+
+{% block actions %}
+  <li>
+    <a class="govuk-link"
+      href="{{ url('workflow:task-template-ui-create', kwargs={'workflow_template_pk': task_workflow_template.pk}) }}"
+    >Create a task template</a>
+  </li>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/task_template_delete.jinja b/tasks/jinja2/tasks/workflows/task_template_delete.jinja
new file mode 100644
index 000000000..206700b56
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/task_template_delete.jinja
@@ -0,0 +1,40 @@
+{% extends "common/delete.jinja" %}
+
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+{% from "components/warning-text/macro.njk" import govukWarningText %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Delete task template:" ~ object.title %}
+
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+    request,
+    [
+      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Workflow template: " ~ task_workflow_template.title,
+        "href": url("workflow:task-workflow-template-ui-detail", kwargs={"pk": task_workflow_template.pk}),
+      },
+      {"text": page_title}
+    ],
+    False,
+  ) }}
+{% endblock %}
+
+{% block form %}
+  {{ govukWarningText({
+    "text": "Are you sure you want to delete this task template?"
+  }) }}
+
+  {% call django_form(
+      action=url(
+        "workflow:task-template-ui-delete",
+        kwargs={
+          "workflow_template_pk": task_workflow_template.pk,
+          "pk": object.pk,
+        }),
+  ) %}
+    {{ crispy(form) }}
+  {% endcall %}
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/task_template_detail.jinja b/tasks/jinja2/tasks/workflows/task_template_detail.jinja
index d8c672761..c2ce54206 100644
--- a/tasks/jinja2/tasks/workflows/task_template_detail.jinja
+++ b/tasks/jinja2/tasks/workflows/task_template_detail.jinja
@@ -56,7 +56,14 @@
   <div class="govuk-button-group govuk-!-margin-top-6">
   {{ govukButton({
       "text": "Delete task template",
-      "href": "#TODO",
+      "href": url(
+        "workflow:task-template-ui-delete",
+        kwargs={
+          "workflow_template_pk": task_workflow_template.pk,
+          "pk": object.pk,
+        },
+      ),
+
       "classes": "govuk-button--warning"
   }) }}
   </div>
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index f2815fb21..67a541f2d 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -7,7 +7,10 @@
 from common.tests.factories import SubTaskFactory
 from common.tests.factories import TaskFactory
 from tasks.models import ProgressState
+from tasks.models import TaskItemTemplate
 from tasks.models import TaskLog
+from tasks.models import TaskTemplate
+from tasks.models import TaskWorkflowTemplate
 from tasks.tests.factories import TaskItemTemplateFactory
 
 pytestmark = pytest.mark.django_db
@@ -307,3 +310,60 @@ def test_update_task_template_view(
 
     assert confirmation_response.status_code == 200
     assert updated_task_template.title in soup.select("h1.govuk-panel__title")[0].text
+
+
+def test_delete_task_template_view(
+    valid_user_client,
+    task_workflow_template_single_task_template_item,
+):
+    """Test the view for deleting TaskTemplates and the confirmation view that a
+    successful deletion redirects to."""
+
+    assert (
+        task_workflow_template_single_task_template_item.get_task_templates().count()
+        == 1
+    )
+    assert task_workflow_template_single_task_template_item.get_items().count() == 1
+
+    task_template_pk = (
+        task_workflow_template_single_task_template_item.get_task_templates().get().pk
+    )
+    task_item_template_pk = (
+        task_workflow_template_single_task_template_item.get_items().get().pk
+    )
+    delete_url = reverse(
+        "workflow:task-template-ui-delete",
+        kwargs={
+            "workflow_template_pk": task_workflow_template_single_task_template_item.pk,
+            "pk": task_template_pk,
+        },
+    )
+
+    delete_response = valid_user_client.post(delete_url)
+    task_workflow_template_after = TaskWorkflowTemplate.objects.get(
+        pk=task_workflow_template_single_task_template_item.pk,
+    )
+
+    confirmation_url = reverse(
+        "workflow:task-template-ui-confirm-delete",
+        kwargs={
+            "workflow_template_pk": task_workflow_template_single_task_template_item.pk,
+            "pk": task_template_pk,
+        },
+    )
+
+    assert delete_response.status_code == 302
+    assert delete_response.url == confirmation_url
+    assert task_workflow_template_after.get_task_templates().count() == 0
+    assert not TaskTemplate.objects.filter(pk=task_template_pk)
+    assert not TaskItemTemplate.objects.filter(pk=task_item_template_pk)
+
+    confirmation_response = valid_user_client.get(confirmation_url)
+
+    soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
+
+    assert confirmation_response.status_code == 200
+    assert (
+        f"Task template ID: {task_template_pk}"
+        in soup.select(".govuk-panel__title")[0].text
+    )
diff --git a/tasks/urls.py b/tasks/urls.py
index c9b8f45a7..6620250ef 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -73,6 +73,16 @@
         views.TaskTemplateConfirmUpdateView.as_view(),
         name="task-template-ui-confirm-update",
     ),
+    path(
+        "<int:workflow_template_pk>/task-templates/<int:pk>/delete/",
+        views.TaskTemplateDeleteView.as_view(),
+        name="task-template-ui-delete",
+    ),
+    path(
+        "<int:workflow_template_pk>/task-templates/<int:pk>/confirm-delete/",
+        views.TaskTemplateConfirmDeleteView.as_view(),
+        name="task-template-ui-confirm-delete",
+    ),
 ]
 
 urlpatterns = [
diff --git a/tasks/views.py b/tasks/views.py
index 2df5b8c74..4d92f157f 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -18,6 +18,7 @@
 from tasks.forms import TaskCreateForm
 from tasks.forms import TaskDeleteForm
 from tasks.forms import TaskTemplateCreateForm
+from tasks.forms import TaskTemplateDeleteForm
 from tasks.forms import TaskTemplateUpdateForm
 from tasks.forms import TaskUpdateForm
 from tasks.models import Task
@@ -340,3 +341,46 @@ def get_context_data(self, **kwargs) -> dict:
         context["task_workflow_template"] = self.get_object().taskitemtemplate.queue
 
         return context
+
+
+class TaskTemplateDeleteView(PermissionRequiredMixin, DeleteView):
+    model = TaskTemplate
+    template_name = "tasks/workflows/task_template_delete.jinja"
+    permission_required = "tasks.delete_tasktemplate"
+    form_class = TaskTemplateDeleteForm
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["instance"] = self.object
+        return kwargs
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context["task_workflow_template"] = self.get_object().taskitemtemplate.queue
+
+        return context
+
+    def get_success_url(self):
+        return reverse(
+            "workflow:task-template-ui-confirm-delete",
+            kwargs={
+                "workflow_template_pk": self.kwargs["workflow_template_pk"],
+                "pk": self.object.pk,
+            },
+        )
+
+
+class TaskTemplateConfirmDeleteView(PermissionRequiredMixin, TemplateView):
+    template_name = "tasks/workflows/task_template_confirm_delete.jinja"
+    permission_required = "tasks.delete_tasktemplate"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context["deleted_pk"] = self.kwargs["pk"]
+        context["task_workflow_template"] = TaskWorkflowTemplate.objects.get(
+            pk=self.kwargs["workflow_template_pk"],
+        )
+
+        return context

From f4f351c4af2c03ab19ad156233fdacabdc59bd6e Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Mon, 18 Nov 2024 13:59:26 +0000
Subject: [PATCH 16/57] TP2000-1544 Prototype workflow template create & update
 views (#1328)

* Don't show actions for a single item in queue list

* Filter queue items by their own queue when reordering

* Support task workflow template creation

* Support workflow template editing
---
 conftest.py                                   |  3 +
 tasks/forms.py                                | 43 ++++++++++++
 tasks/jinja2/tasks/includes/task_queue.jinja  |  8 ++-
 .../workflows/template_confirm_create.jinja   | 47 +++++++++++++
 .../workflows/template_confirm_update.jinja   | 49 +++++++++++++
 .../tasks/workflows/template_create.jinja     | 16 +++++
 .../tasks/workflows/template_detail.jinja     |  2 +-
 .../tasks/workflows/template_edit.jinja       | 19 +++++
 tasks/models/queue.py                         |  7 +-
 tasks/models/workflow.py                      | 14 ++++
 tasks/tests/test_views.py                     | 70 +++++++++++++++++++
 tasks/urls.py                                 | 20 ++++++
 tasks/views.py                                | 40 +++++++++++
 13 files changed, 334 insertions(+), 4 deletions(-)
 create mode 100644 tasks/jinja2/tasks/workflows/template_confirm_create.jinja
 create mode 100644 tasks/jinja2/tasks/workflows/template_confirm_update.jinja
 create mode 100644 tasks/jinja2/tasks/workflows/template_create.jinja
 create mode 100644 tasks/jinja2/tasks/workflows/template_edit.jinja

diff --git a/conftest.py b/conftest.py
index 5670aa32c..56049cabb 100644
--- a/conftest.py
+++ b/conftest.py
@@ -310,6 +310,9 @@ def policy_group(db) -> Group:
         ("tasks", "view_comment"),
         ("tasks", "change_comment"),
         ("tasks", "delete_comment"),
+        ("tasks", "add_taskworkflowtemplate"),
+        ("tasks", "change_taskworkflowtemplate"),
+        ("tasks", "delete_taskworkflowtemplate"),
         ("tasks", "view_taskworkflowtemplate"),
         ("tasks", "add_tasktemplate"),
         ("tasks", "change_tasktemplate"),
diff --git a/tasks/forms.py b/tasks/forms.py
index 7c60325b8..8eb40723d 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -7,6 +7,7 @@
 from common.forms import delete_form_for
 from tasks.models import Task
 from tasks.models import TaskTemplate
+from tasks.models import TaskWorkflowTemplate
 from workbaskets.models import WorkBasket
 
 
@@ -81,6 +82,48 @@ def save(self, parent_task, user, commit=True):
 TaskDeleteForm = delete_form_for(Task)
 
 
+class TaskWorkflowTemplateBaseForm(ModelForm):
+    class Meta:
+        model = TaskWorkflowTemplate
+        fields = ("title", "description")
+
+        error_messages = {
+            "title": {
+                "required": "Enter a title",
+            },
+            "description": {
+                "required": "Enter a description",
+            },
+        }
+
+    def __init__(self, *args, submit_title, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.helper = FormHelper(self)
+        self.helper.label_size = Size.SMALL
+        self.helper.legend_size = Size.SMALL
+        self.helper.layout = Layout(
+            "title",
+            "description",
+            Submit(
+                "submit",
+                submit_title,
+                data_module="govuk-button",
+                data_prevent_double_click="true",
+            ),
+        )
+
+
+class TaskWorkflowTemplateCreateForm(TaskWorkflowTemplateBaseForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, submit_title="Create", **kwargs)
+
+
+class TaskWorkflowTemplateUpdateForm(TaskWorkflowTemplateBaseForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, submit_title="Update", **kwargs)
+
+
 class TaskTemplateFormBase(ModelForm):
     class Meta:
         model = TaskTemplate
diff --git a/tasks/jinja2/tasks/includes/task_queue.jinja b/tasks/jinja2/tasks/includes/task_queue.jinja
index 79e45dd16..904a3fdfc 100644
--- a/tasks/jinja2/tasks/includes/task_queue.jinja
+++ b/tasks/jinja2/tasks/includes/task_queue.jinja
@@ -5,7 +5,9 @@
 
 {%- for obj in object_list %}
   {%- set up_down_cell_content %}
-    {% if loop.index == 1 %}
+    {% if object_list|length == 1 %}
+      {# No buttons needed for a single item #}
+    {% elif loop.index == 1 %}
       {{ render_item_button(obj, "demote", use_icon=True) }}
     {% elif loop.index == 2 %}
       {{ render_item_button(obj, "promote", use_icon=True) }}
@@ -31,7 +33,9 @@
   {% endset -%}
 
   {%- set order_cell_content %}
-    {% if loop.index == 1%}
+    {% if object_list|length == 1 %}
+      {# No buttons needed for a single item #}
+    {% elif loop.index == 1 %}
       {{ render_item_button(obj, "demote_to_last") }}
     {% elif loop.index == object_list | length %}
       {{ render_item_button(obj, "promote_to_first") }}
diff --git a/tasks/jinja2/tasks/workflows/template_confirm_create.jinja b/tasks/jinja2/tasks/workflows/template_confirm_create.jinja
new file mode 100644
index 000000000..62f9ee5fe
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/template_confirm_create.jinja
@@ -0,0 +1,47 @@
+{% extends "common/confirm_create.jinja" %}
+
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+{% from "components/panel/macro.njk" import govukPanel %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Workflow template created" %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+    request,
+    [
+      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Create a workflow template",
+        "href": url("workflow:task-workflow-template-ui-create"),
+      },
+      {"text": page_title}
+    ],
+    False,
+  ) }}
+{% endblock %}
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": "Workflow template: " ~ object.title,
+    "text": "You have created a new workflow template",
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
+
+{% block button_group %}
+  {{ govukButton({
+    "text": "View workflow template",
+    "href": url("workflow:task-workflow-template-ui-detail", kwargs={"pk": object.pk}),
+    "classes": "govuk-button"
+  }) }}
+  {{ govukButton({
+    "text": "Create a task template",
+    "href": url("workflow:task-template-ui-create", kwargs={"workflow_template_pk": object.pk}),
+    "classes": "govuk-button--secondary"
+  }) }}
+{% endblock %}
+
+{% block actions %}
+  <li><a href="TODO" class="govuk-link">Find and view workflow templates</a></li>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/template_confirm_update.jinja b/tasks/jinja2/tasks/workflows/template_confirm_update.jinja
new file mode 100644
index 000000000..fde9d4b53
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/template_confirm_update.jinja
@@ -0,0 +1,49 @@
+{% extends "common/confirm_create.jinja" %}
+
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+{% from "components/panel/macro.njk" import govukPanel %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Workflow template updated" %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+    request,
+    [
+      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Workflow template: " ~ object.title,
+        "href": url(
+          "workflow:task-workflow-template-ui-detail",
+          kwargs={"pk": object.pk}),
+      },
+      {"text": page_title}
+    ],
+    False,
+  ) }}
+{% endblock %}
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": "Workflow template: " ~ object.title,
+    "text": "You have updated the workflow template",
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
+
+{% block button_group %}
+  {{ govukButton({
+    "text": "View workflow template",
+    "href": url("workflow:task-workflow-template-ui-detail", kwargs={"pk": object.pk}),
+    "classes": "govuk-button"
+  }) }}
+  {{ govukButton({
+    "text": "Create a task template",
+    "href": url("workflow:task-template-ui-create", kwargs={"workflow_template_pk": object.pk}),
+    "classes": "govuk-button--secondary"
+  }) }}
+{% endblock %}
+
+{% block actions %}
+  <li><a href="TODO" class="govuk-link">Find and view workflow templates</a></li>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/template_create.jinja b/tasks/jinja2/tasks/workflows/template_create.jinja
new file mode 100644
index 000000000..f2ec118c6
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/template_create.jinja
@@ -0,0 +1,16 @@
+{% extends "layouts/create.jinja" %}
+
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+
+{% set page_title = "Create a workflow template" %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+    request,
+    [
+      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {"text": page_title}
+    ],
+    False,
+  ) }}
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/template_detail.jinja b/tasks/jinja2/tasks/workflows/template_detail.jinja
index 86c76750c..afa1e3f9e 100644
--- a/tasks/jinja2/tasks/workflows/template_detail.jinja
+++ b/tasks/jinja2/tasks/workflows/template_detail.jinja
@@ -5,7 +5,7 @@
 {% set page_title = "Workflow template: " ~ object.title %}
 {% set list_include = "tasks/includes/task_queue.jinja" %}
 
-{% set edit_url = "#TODO" %}
+{% set edit_url = object.get_url("edit") %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(request, [
diff --git a/tasks/jinja2/tasks/workflows/template_edit.jinja b/tasks/jinja2/tasks/workflows/template_edit.jinja
new file mode 100644
index 000000000..0bcfad36c
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/template_edit.jinja
@@ -0,0 +1,19 @@
+{% extends "layouts/form.jinja" %}
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+
+{% set page_title = "Edit workflow template details" %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
+      {"text": "Workflow template: " ~ object.title, "href": object.get_url("detail")},
+      {"text": page_title}
+    ])
+  }}
+{% endblock %}
+
+{% block form %}
+  {% call django_form() %}
+    {{ crispy(form) }}
+  {% endcall %}
+{% endblock %}
diff --git a/tasks/models/queue.py b/tasks/models/queue.py
index 0fc517f26..79aabb103 100644
--- a/tasks/models/queue.py
+++ b/tasks/models/queue.py
@@ -125,6 +125,7 @@ def delete(self):
 
         self.__class__.objects.select_for_update(nowait=True).filter(
             position__gt=instance.position,
+            queue=instance.queue,
         ).update(position=models.F("position") - 1)
 
         return super().delete()
@@ -145,6 +146,7 @@ def promote(self) -> Self:
 
         item_to_demote = self.__class__.objects.select_for_update(nowait=True).get(
             position=instance.position - 1,
+            queue=instance.queue,
         )
         item_to_demote.position += 1
         instance.position -= 1
@@ -169,6 +171,7 @@ def demote(self) -> Self:
 
         item_to_promote = self.__class__.objects.select_for_update(nowait=True).get(
             position=instance.position + 1,
+            queue=instance.queue,
         )
         item_to_promote.position -= 1
         instance.position += 1
@@ -194,7 +197,8 @@ def promote_to_first(self) -> Self:
             return instance
 
         self.__class__.objects.select_for_update(nowait=True).filter(
-            models.Q(position__lt=instance.position),
+            position__lt=instance.position,
+            queue=instance.queue,
         ).update(position=models.F("position") + 1)
 
         instance.position = 1
@@ -221,6 +225,7 @@ def demote_to_last(self) -> Self:
 
         self.__class__.objects.select_for_update(nowait=True).filter(
             position__gt=instance.position,
+            queue=instance.queue,
         ).update(position=models.F("position") - 1)
 
         instance.position = last_place
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index 57cb27804..650130675 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -112,6 +112,20 @@ def create_task_workflow(self) -> "TaskWorkflow":
 
         return task_workflow
 
+    def get_url(self, action: str = "detail"):
+        if action == "detail":
+            return reverse(
+                "workflow:task-workflow-template-ui-detail",
+                kwargs={"pk": self.pk},
+            )
+        elif action == "edit":
+            return reverse(
+                "workflow:task-workflow-template-ui-update",
+                kwargs={"pk": self.pk},
+            )
+
+        return "#NOT-IMPLEMENTED"
+
 
 class TaskItemTemplate(QueueItem):
     """Queue item management for TaskTemplate instances."""
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 67a541f2d..5ac49e991 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -208,6 +208,76 @@ def convert_to_index(position: int) -> int:
         assert reordered_item.id == expected_item.id
 
 
+def test_workflow_template_create_view(valid_user_client):
+    """Tests that a new workflow template can be created and that the
+    corresponding confirmation view returns a HTTP 200 response."""
+
+    assert not TaskWorkflowTemplate.objects.exists()
+
+    create_url = reverse("workflow:task-workflow-template-ui-create")
+    form_data = {
+        "title": "Test workflow template",
+        "description": "Test description",
+    }
+    create_response = valid_user_client.post(create_url, form_data)
+
+    created_workflow_template = TaskWorkflowTemplate.objects.get(
+        title=form_data["title"],
+        description=form_data["description"],
+    )
+    confirmation_url = reverse(
+        "workflow:task-workflow-template-ui-confirm-create",
+        kwargs={"pk": created_workflow_template.pk},
+    )
+    assert create_response.status_code == 302
+    assert create_response.url == confirmation_url
+
+    confirmation_response = valid_user_client.get(confirmation_url)
+
+    soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
+
+    assert confirmation_response.status_code == 200
+    assert (
+        created_workflow_template.title in soup.select("h1.govuk-panel__title")[0].text
+    )
+
+
+def test_workflow_template_update_view(
+    valid_user_client,
+    task_workflow_template,
+):
+    """Tests that a workflow template can be updated and that the corresponding
+    confirmation view returns a HTTP 200 response."""
+
+    update_url = reverse(
+        "workflow:task-workflow-template-ui-update",
+        kwargs={"pk": task_workflow_template.pk},
+    )
+    form_data = {
+        "title": "Updated test title",
+        "description": "Updated test title",
+    }
+
+    update_response = valid_user_client.post(update_url, form_data)
+    assert update_response.status_code == 302
+
+    task_workflow_template.refresh_from_db()
+    assert task_workflow_template.title == form_data["title"]
+    assert task_workflow_template.description == form_data["description"]
+
+    confirmation_url = reverse(
+        "workflow:task-workflow-template-ui-confirm-update",
+        kwargs={"pk": task_workflow_template.pk},
+    )
+    assert update_response.url == confirmation_url
+
+    confirmation_response = valid_user_client.get(confirmation_url)
+    assert confirmation_response.status_code == 200
+
+    soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
+    assert task_workflow_template.title in soup.select("h1.govuk-panel__title")[0].text
+
+
 def test_create_task_template_view(valid_user_client, task_workflow_template):
     """Test the view for creating new TaskTemplates and the confirmation view
     that a successful creation redirects to."""
diff --git a/tasks/urls.py b/tasks/urls.py
index 6620250ef..8c4967225 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -48,6 +48,26 @@
         views.TaskWorkflowTemplateDetailView.as_view(),
         name="task-workflow-template-ui-detail",
     ),
+    path(
+        "create/",
+        views.TaskWorkflowTemplateCreateView.as_view(),
+        name="task-workflow-template-ui-create",
+    ),
+    path(
+        "<int:pk>/confirm-create/",
+        views.TaskWorkflowTemplateConfirmCreateView.as_view(),
+        name="task-workflow-template-ui-confirm-create",
+    ),
+    path(
+        "<int:pk>/update/",
+        views.TaskWorkflowTemplateUpdateView.as_view(),
+        name="task-workflow-template-ui-update",
+    ),
+    path(
+        "<int:pk>/confirm-update/",
+        views.TaskWorkflowTemplateConfirmUpdateView.as_view(),
+        name="task-workflow-template-ui-confirm-update",
+    ),
     path(
         "task-templates/<int:pk>/",
         views.TaskTemplateDetailView.as_view(),
diff --git a/tasks/views.py b/tasks/views.py
index 4d92f157f..bcc02e61b 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -21,6 +21,8 @@
 from tasks.forms import TaskTemplateDeleteForm
 from tasks.forms import TaskTemplateUpdateForm
 from tasks.forms import TaskUpdateForm
+from tasks.forms import TaskWorkflowTemplateCreateForm
+from tasks.forms import TaskWorkflowTemplateUpdateForm
 from tasks.models import Task
 from tasks.models import TaskItemTemplate
 from tasks.models import TaskTemplate
@@ -247,6 +249,44 @@ def demote_to_last(self, task_template_id: int) -> None:
             pass
 
 
+class TaskWorkflowTemplateCreateView(PermissionRequiredMixin, CreateView):
+    model = TaskWorkflowTemplate
+    permission_required = "tasks.add_taskworkflowtemplate"
+    template_name = "tasks/workflows/template_create.jinja"
+    form_class = TaskWorkflowTemplateCreateForm
+
+    def get_success_url(self):
+        return reverse(
+            "workflow:task-workflow-template-ui-confirm-create",
+            kwargs={"pk": self.object.pk},
+        )
+
+
+class TaskWorkflowTemplateConfirmCreateView(PermissionRequiredMixin, DetailView):
+    model = TaskWorkflowTemplate
+    template_name = "tasks/workflows/template_confirm_create.jinja"
+    permission_required = "tasks.add_taskworkflowtemplate"
+
+
+class TaskWorkflowTemplateUpdateView(PermissionRequiredMixin, UpdateView):
+    model = TaskWorkflowTemplate
+    template_name = "tasks/workflows/template_edit.jinja"
+    permission_required = "tasks.change_taskworkflowtemplate"
+    form_class = TaskWorkflowTemplateUpdateForm
+
+    def get_success_url(self):
+        return reverse(
+            "workflow:task-workflow-template-ui-confirm-update",
+            kwargs={"pk": self.object.pk},
+        )
+
+
+class TaskWorkflowTemplateConfirmUpdateView(PermissionRequiredMixin, DetailView):
+    model = TaskWorkflowTemplate
+    template_name = "tasks/workflows/template_confirm_update.jinja"
+    permission_required = "tasks.change_taskworkflowtemplate"
+
+
 class TaskTemplateDetailView(PermissionRequiredMixin, DetailView):
     model = TaskTemplate
     template_name = "tasks/workflows/task_template_detail.jinja"

From bc787f85156f3c263a68f41c4b4210ea24a5bc68 Mon Sep 17 00:00:00 2001
From: Lauren Qurashi <lauren.qurashi@digital.trade.gov.uk>
Date: Mon, 18 Nov 2024 14:58:29 +0000
Subject: [PATCH 17/57] Fix double quotes lint error from create subtask form
 pr

---
 tasks/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tasks/views.py b/tasks/views.py
index bcc02e61b..b237449b2 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -139,7 +139,7 @@ class SubTaskCreateView(PermissionRequiredMixin, CreateView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["page_title"] = f"Create a subtask for task {self.kwargs["pk"]}"
+        context["page_title"] = f"Create a subtask for task {self.kwargs['pk']}"
         return context
 
     def form_valid(self, form):

From a28e7bd6be6ecbcb5688cd09fa9d455d4bdc1613 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Tue, 19 Nov 2024 14:03:04 +0000
Subject: [PATCH 18/57] TP2000-1573  Implement workflow template delete view
 (#1330)

* Support workflow template deletion

* Add TaskWorkflowTemplateDeleteView unit test

* Delete task templates together with workflow templates
---
 tasks/forms.py                                |  3 ++
 .../workflows/template_confirm_delete.jinja   | 42 +++++++++++++++++++
 .../tasks/workflows/template_delete.jinja     | 32 ++++++++++++++
 .../tasks/workflows/template_detail.jinja     |  2 +-
 tasks/models/workflow.py                      |  5 +++
 tasks/tests/test_views.py                     | 41 ++++++++++++++++++
 tasks/urls.py                                 | 10 +++++
 tasks/views.py                                | 35 ++++++++++++++++
 8 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 tasks/jinja2/tasks/workflows/template_confirm_delete.jinja
 create mode 100644 tasks/jinja2/tasks/workflows/template_delete.jinja

diff --git a/tasks/forms.py b/tasks/forms.py
index 8eb40723d..894868276 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -124,6 +124,9 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, submit_title="Update", **kwargs)
 
 
+TaskWorkflowTemplateDeleteForm = delete_form_for(TaskWorkflowTemplate)
+
+
 class TaskTemplateFormBase(ModelForm):
     class Meta:
         model = TaskTemplate
diff --git a/tasks/jinja2/tasks/workflows/template_confirm_delete.jinja b/tasks/jinja2/tasks/workflows/template_confirm_delete.jinja
new file mode 100644
index 000000000..c46e0628c
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/template_confirm_delete.jinja
@@ -0,0 +1,42 @@
+{% extends "layouts/confirm.jinja" %}
+
+{% from "components/breadcrumbs/macro.njk" import govukBreadcrumbs %}
+{% from "components/panel/macro.njk" import govukPanel %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Workflow template deleted" %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+    request,
+    [
+      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {"text": page_title}
+    ],
+    False,
+  ) }}
+{% endblock %}
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": "Workflow template ID: " ~ deleted_pk,
+    "text": "Workflow template has been deleted",
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
+
+{% block button_group %}
+  {{ govukButton({
+    "text": "Find and view workflow templates",
+    "href": "#TODO",
+    "classes": "govuk-button"
+  }) }}
+  {{ govukButton({
+    "text": "Create a workflow template",
+    "href": url("workflow:task-workflow-template-ui-create"),
+    "classes": "govuk-button--secondary"
+  }) }}
+{% endblock %}
+
+{% block actions %}
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/template_delete.jinja b/tasks/jinja2/tasks/workflows/template_delete.jinja
new file mode 100644
index 000000000..5632034af
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/template_delete.jinja
@@ -0,0 +1,32 @@
+{% extends "layouts/form.jinja" %}
+
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+{% from "components/warning-text/macro.njk" import govukWarningText %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set page_title = "Delete workflow template: " ~ object.title %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+    request,
+    [
+      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Workflow template: " ~ object.title,
+        "href": object.get_url("detail"),
+      },
+      {"text": page_title}
+    ],
+    False,
+  ) }}
+{% endblock %}
+
+{% block form %}
+  {{ govukWarningText({
+    "text": "Are you sure you want to delete this workflow template?"
+  }) }}
+
+  {% call django_form(action=object.get_url("delete")) %}
+    {{ crispy(form) }}
+  {% endcall %}
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/template_detail.jinja b/tasks/jinja2/tasks/workflows/template_detail.jinja
index afa1e3f9e..00e04093d 100644
--- a/tasks/jinja2/tasks/workflows/template_detail.jinja
+++ b/tasks/jinja2/tasks/workflows/template_detail.jinja
@@ -84,7 +84,7 @@
   <div class="govuk-button-group govuk-!-margin-top-6">
     {{ govukButton({
       "text": "Delete workflow template",
-      "href": "#TODO",
+      "href": object.get_url("delete"),
       "classes": "govuk-button--warning"
     }) }}
     {{ govukButton({
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index 650130675..e6cf7ef02 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -123,6 +123,11 @@ def get_url(self, action: str = "detail"):
                 "workflow:task-workflow-template-ui-update",
                 kwargs={"pk": self.pk},
             )
+        elif action == "delete":
+            return reverse(
+                "workflow:task-workflow-template-ui-delete",
+                kwargs={"pk": self.pk},
+            )
 
         return "#NOT-IMPLEMENTED"
 
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 5ac49e991..2b01be341 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -278,6 +278,47 @@ def test_workflow_template_update_view(
     assert task_workflow_template.title in soup.select("h1.govuk-panel__title")[0].text
 
 
+def test_workflow_template_delete_view(
+    valid_user_client,
+    task_workflow_template_single_task_template_item,
+):
+    """Tests that a workflow template can be deleted (along with related
+    TaskItemPosition and TaskTemplate objects) and that the corresponding
+    confirmation view returns a HTTP 200 response."""
+
+    task_workflow_template_pk = task_workflow_template_single_task_template_item.pk
+    task_template_pk = (
+        task_workflow_template_single_task_template_item.get_task_templates().get().pk
+    )
+
+    delete_url = task_workflow_template_single_task_template_item.get_url("delete")
+    delete_response = valid_user_client.post(delete_url)
+    assert delete_response.status_code == 302
+
+    assert not TaskWorkflowTemplate.objects.filter(
+        pk=task_workflow_template_pk,
+    ).exists()
+    assert not TaskItemTemplate.objects.filter(
+        queue_id=task_workflow_template_pk,
+    ).exists()
+    assert not TaskTemplate.objects.filter(pk=task_template_pk).exists()
+
+    confirmation_url = reverse(
+        "workflow:task-workflow-template-ui-confirm-delete",
+        kwargs={"pk": task_workflow_template_pk},
+    )
+    assert delete_response.url == confirmation_url
+
+    confirmation_response = valid_user_client.get(confirmation_url)
+    assert confirmation_response.status_code == 200
+
+    soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
+    assert (
+        f"Workflow template ID: {task_workflow_template_pk}"
+        in soup.select(".govuk-panel__title")[0].text
+    )
+
+
 def test_create_task_template_view(valid_user_client, task_workflow_template):
     """Test the view for creating new TaskTemplates and the confirmation view
     that a successful creation redirects to."""
diff --git a/tasks/urls.py b/tasks/urls.py
index 8c4967225..e28b7d445 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -68,6 +68,16 @@
         views.TaskWorkflowTemplateConfirmUpdateView.as_view(),
         name="task-workflow-template-ui-confirm-update",
     ),
+    path(
+        "<int:pk>/delete/",
+        views.TaskWorkflowTemplateDeleteView.as_view(),
+        name="task-workflow-template-ui-delete",
+    ),
+    path(
+        "<int:pk>/confirm-delete/",
+        views.TaskWorkflowTemplateConfirmDeleteView.as_view(),
+        name="task-workflow-template-ui-confirm-delete",
+    ),
     path(
         "task-templates/<int:pk>/",
         views.TaskTemplateDetailView.as_view(),
diff --git a/tasks/views.py b/tasks/views.py
index b237449b2..1cefcf10e 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -22,6 +22,7 @@
 from tasks.forms import TaskTemplateUpdateForm
 from tasks.forms import TaskUpdateForm
 from tasks.forms import TaskWorkflowTemplateCreateForm
+from tasks.forms import TaskWorkflowTemplateDeleteForm
 from tasks.forms import TaskWorkflowTemplateUpdateForm
 from tasks.models import Task
 from tasks.models import TaskItemTemplate
@@ -287,6 +288,40 @@ class TaskWorkflowTemplateConfirmUpdateView(PermissionRequiredMixin, DetailView)
     permission_required = "tasks.change_taskworkflowtemplate"
 
 
+class TaskWorkflowTemplateDeleteView(PermissionRequiredMixin, DeleteView):
+    model = TaskWorkflowTemplate
+    template_name = "tasks/workflows/template_delete.jinja"
+    permission_required = "tasks.delete_taskworkflowtemplate"
+    form_class = TaskWorkflowTemplateDeleteForm
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["instance"] = self.object
+        return kwargs
+
+    @transaction.atomic
+    def form_valid(self, form):
+        self.object.get_task_templates().delete()
+        return super().form_valid(form)
+
+    def get_success_url(self):
+        return reverse(
+            "workflow:task-workflow-template-ui-confirm-delete",
+            kwargs={"pk": self.object.pk},
+        )
+
+
+class TaskWorkflowTemplateConfirmDeleteView(PermissionRequiredMixin, TemplateView):
+    model = TaskWorkflowTemplate
+    template_name = "tasks/workflows/template_confirm_delete.jinja"
+    permission_required = "tasks.change_taskworkflowtemplate"
+
+    def get_context_data(self, **kwargs):
+        context_data = super().get_context_data(**kwargs)
+        context_data["deleted_pk"] = self.kwargs["pk"]
+        return context_data
+
+
 class TaskTemplateDetailView(PermissionRequiredMixin, DetailView):
     model = TaskTemplate
     template_name = "tasks/workflows/task_template_detail.jinja"

From 2ff785807bf149683aa5122489e9dd04389ca23a Mon Sep 17 00:00:00 2001
From: Marya Shariq <marya.shariq@digital.trade.gov.uk>
Date: Thu, 21 Nov 2024 10:38:04 +0000
Subject: [PATCH 19/57] Tp 2000 1489  delete subtask (#1332)

* wip

* add subtask delete and deleteconfirm view

* fixed deletesubtask view by adding in get_form_kwargs

* Update tasks/jinja2/tasks/delete.jinja

Co-authored-by: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>

---------

Co-authored-by: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>
---
 tasks/jinja2/tasks/confirm_delete.jinja |  2 +-
 tasks/jinja2/tasks/delete.jinja         | 39 +++++++++++++++--------
 tasks/jinja2/tasks/detail.jinja         |  8 +++++
 tasks/tests/test_views.py               | 39 +++++++++++++++++++++++
 tasks/urls.py                           | 10 ++++++
 tasks/views.py                          | 41 +++++++++++++++++++++++++
 6 files changed, 126 insertions(+), 13 deletions(-)

diff --git a/tasks/jinja2/tasks/confirm_delete.jinja b/tasks/jinja2/tasks/confirm_delete.jinja
index 65b53069a..6beb6198f 100644
--- a/tasks/jinja2/tasks/confirm_delete.jinja
+++ b/tasks/jinja2/tasks/confirm_delete.jinja
@@ -18,7 +18,7 @@
 {% block panel %}
   {{ govukPanel({
     "titleText": "Task ID: " ~ deleted_pk,
-    "text": "Task has been deleted",
+    "text": verbose_name|capitalize ~ " has been deleted",
     "classes": "govuk-!-margin-bottom-7"
   }) }}
 {% endblock %}
diff --git a/tasks/jinja2/tasks/delete.jinja b/tasks/jinja2/tasks/delete.jinja
index 9cc761efc..574aa28a5 100644
--- a/tasks/jinja2/tasks/delete.jinja
+++ b/tasks/jinja2/tasks/delete.jinja
@@ -4,23 +4,38 @@
 {% from "components/warning-text/macro.njk" import govukWarningText %}
 {% from "components/button/macro.njk" import govukButton %}
 
-{% set page_title = "Delete Task:" ~ object.title %}
+{% set page_title = "Delete my Task:" ~ object.title %}
+
+{% block content %}
+<div class="govuk-!-width-two-thirds">
+  <h1 class="govuk-heading-xl">Delete {{ verbose_name }}: {{ object.title }}</h1>
+  {% if page_label %}
+    <div class="govuk-hint"> {{ page_label }}</div>
+  {% endif %}
+  {% block form %}
+    {{ govukWarningText({
+    "text": "Are you sure you want to delete this " ~ verbose_name ~ "?"
+  }) }}
+
+  {% if not object.parent_task %}
+    {% set url_name = "workflow:task-ui-delete" %}
+  {% else %}
+    {% set url_name = "workflow:subtask-ui-delete" %}
+  {% endif %}
+  
+  {% call django_form(action=url(url_name, kwargs={"pk": object.pk})) %}
+    {{ crispy(form) }}
+  {% endcall %}
+
+  {% endblock %}
+</div>
+{% endblock %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(request, [
       {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
-      {"text": "Task: " ~ object.title, "href": url("workflow:task-ui-detail", kwargs={"pk": object.pk})},
+      {"text": verbose_name ~ " :" ~ object.title, "href": url("workflow:task-ui-detail", kwargs={"pk": object.pk})},
       {"text": page_title}
     ])
   }}
 {% endblock %}
-
-{% block form %}
-  {{ govukWarningText({
-    "text": "Are you sure you want to delete this task?"
-  }) }}
-
-  {% call django_form(action=url("workflow:task-ui-delete", kwargs={"pk": object.pk})) %}
-    {{ crispy(form) }}
-  {% endcall %}
-{% endblock %}
diff --git a/tasks/jinja2/tasks/detail.jinja b/tasks/jinja2/tasks/detail.jinja
index 43451a261..5515adeb7 100644
--- a/tasks/jinja2/tasks/detail.jinja
+++ b/tasks/jinja2/tasks/detail.jinja
@@ -101,11 +101,19 @@
 </dl>
 
 <div class="govuk-button-group">
+{% if not object.parent_task %}
   {{ govukButton({
     "text": "Delete task",
     "href": url("workflow:task-ui-delete", kwargs={"pk": object.pk}),
     "classes": "govuk-button--warning"
   }) }}
+  {% else %}
+    {{ govukButton({
+    "text": "Delete subtask",
+    "href": url("workflow:subtask-ui-delete", kwargs={"pk": object.pk}),
+    "classes": "govuk-button--warning"
+  }) }}
+  {% endif %}
   {{ govukButton({
     "text": "Find and view tasks",
     "href": url("workflow:task-ui-list"),
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 2b01be341..2b1feaef1 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -15,6 +15,8 @@
 
 pytestmark = pytest.mark.django_db
 
+pytestmark = pytest.mark.django_db
+
 
 def test_task_update_view_update_progress_state(valid_user_client):
     """Tests that `TaskUpdateView` updates `Task.progress_state` and that a
@@ -144,6 +146,43 @@ def test_create_subtask_form_errors_when_parent_is_subtask(valid_user_client):
     )
 
 
+@pytest.mark.parametrize(
+    ("client_type", "expected_status_code_get", "expected_status_code_post"),
+    [
+        ("valid_user_client", 200, 302),
+        ("client_with_current_workbasket_no_permissions", 403, 403),
+    ],
+)
+def test_delete_subtask_missing_user_permissions(
+    client_type,
+    expected_status_code_get,
+    expected_status_code_post,
+    request,
+):
+    """Tests that attempting to delete a subtask fails for users without the
+    necessary permissions."""
+    client_type = request.getfixturevalue(client_type)
+
+    # Creating an instance of a subtask that will be deleted
+    subtask_instance = SubTaskFactory.create(
+        progress_state__name=ProgressState.State.TO_DO,
+    )
+
+    # The DeleteSubTask view and URL
+    url = reverse(
+        "workflow:subtask-ui-delete",
+        kwargs={"pk": subtask_instance.pk},
+    )
+
+    # Test DeleteSubtask form view
+    get_response = client_type.get(url)
+    assert get_response.status_code == expected_status_code_get
+
+    # POST the delete subtask form
+    response = client_type.post(url)
+    assert response.status_code == expected_status_code_post
+
+
 def test_workflow_template_detail_view_displays_task_templates(valid_user_client):
     task_item_template = TaskItemTemplateFactory.create()
     task_template = task_item_template.task_template
diff --git a/tasks/urls.py b/tasks/urls.py
index e28b7d445..22309eaa8 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -31,6 +31,16 @@
         views.SubTaskCreateView.as_view(),
         name="subtask-ui-create",
     ),
+    path(
+        "subtasks/<int:pk>/delete",
+        views.SubTaskDeleteView.as_view(),
+        name="subtask-ui-delete",
+    ),
+    path(
+        "subtasks/<int:pk>/confirm-delete",
+        views.SubTaskConfirmDeleteView.as_view(),
+        name="subtask-ui-confirm-delete",
+    ),
     path(
         "subtasks/<int:pk>/confirm-create/",
         views.SubTaskConfirmCreateView.as_view(),
diff --git a/tasks/views.py b/tasks/views.py
index 1cefcf10e..dedf448eb 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -117,6 +117,11 @@ def get_form_kwargs(self):
         kwargs["instance"] = self.object
         return kwargs
 
+    def get_context_data(self, **kwargs):
+        context_data = super().get_context_data(**kwargs)
+        context_data["verbose_name"] = "task"
+        return context_data
+
     def get_success_url(self):
         return reverse("workflow:task-ui-confirm-delete", kwargs={"pk": self.object.pk})
 
@@ -129,6 +134,7 @@ class TaskConfirmDeleteView(PermissionRequiredMixin, TemplateView):
     def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)
         context_data["deleted_pk"] = self.kwargs["pk"]
+        context_data["verbose_name"] = "task"
         return context_data
 
 
@@ -172,6 +178,41 @@ def get_context_data(self, **kwargs):
         return context
 
 
+class SubTaskDeleteView(PermissionRequiredMixin, DeleteView):
+    model = Task
+    template_name = "tasks/delete.jinja"
+    permission_required = "tasks.delete_task"
+    form_class = TaskDeleteForm
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["instance"] = self.object
+        return kwargs
+
+    def get_context_data(self, **kwargs):
+        context_data = super().get_context_data(**kwargs)
+        context_data["verbose_name"] = "subtask"
+        return context_data
+
+    def get_success_url(self):
+        return reverse(
+            "workflow:subtask-ui-confirm-delete",
+            kwargs={"pk": self.object.pk},
+        )
+
+
+class SubTaskConfirmDeleteView(PermissionRequiredMixin, TemplateView):
+    model = Task
+    template_name = "tasks/confirm_delete.jinja"
+    permission_required = "tasks.delete_task"
+
+    def get_context_data(self, **kwargs):
+        context_data = super().get_context_data(**kwargs)
+        context_data["verbose_name"] = "subtask"
+        context_data["deleted_pk"] = self.kwargs["pk"]
+        return context_data
+
+
 class TaskWorkflowTemplateDetailView(PermissionRequiredMixin, DetailView):
     model = TaskWorkflowTemplate
     template_name = "tasks/workflows/template_detail.jinja"

From e9a4546a0e02d76b0112d648d34026d5817ea0cf Mon Sep 17 00:00:00 2001
From: marya <marya.shariq@digital.trade.gov.uk>
Date: Thu, 21 Nov 2024 12:24:52 +0000
Subject: [PATCH 20/57] deleted comments

---
 tasks/tests/test_views.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 2b1feaef1..2d0fca227 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -162,23 +162,18 @@ def test_delete_subtask_missing_user_permissions(
     """Tests that attempting to delete a subtask fails for users without the
     necessary permissions."""
     client_type = request.getfixturevalue(client_type)
-
-    # Creating an instance of a subtask that will be deleted
     subtask_instance = SubTaskFactory.create(
         progress_state__name=ProgressState.State.TO_DO,
     )
 
-    # The DeleteSubTask view and URL
     url = reverse(
         "workflow:subtask-ui-delete",
         kwargs={"pk": subtask_instance.pk},
     )
 
-    # Test DeleteSubtask form view
     get_response = client_type.get(url)
     assert get_response.status_code == expected_status_code_get
 
-    # POST the delete subtask form
     response = client_type.post(url)
     assert response.status_code == expected_status_code_post
 

From 993ec6402027e2d80fee1235ae8599149e7b0d2b Mon Sep 17 00:00:00 2001
From: Lauren Mullally <46787754+LaurenMullally@users.noreply.github.com>
Date: Mon, 25 Nov 2024 11:04:02 +0000
Subject: [PATCH 21/57] TP2000-1488 Edit Subtasks  (#1334)

* Clean up urls and add update and confirm update urls

* Add Update views and templates

* amend update link in template to accomodate subtasks

* Refactor update link test

* Add is_subtask property and amend tests

* Merge in megabranch - might be wonky

---------

Co-authored-by: Paul Pepper <paul.pepper@digital.trade.gov.uk>
---
 tasks/jinja2/tasks/confirm_update.jinja | 10 ++---
 tasks/jinja2/tasks/detail.jinja         |  8 +++-
 tasks/jinja2/tasks/edit.jinja           |  2 +-
 tasks/models/task.py                    |  4 ++
 tasks/tests/test_models.py              | 12 ++++++
 tasks/tests/test_views.py               | 51 ++++++++++++++++++++-----
 tasks/urls.py                           | 31 +++++++++++++--
 tasks/views.py                          | 48 ++++++++++++++++++++++-
 8 files changed, 143 insertions(+), 23 deletions(-)

diff --git a/tasks/jinja2/tasks/confirm_update.jinja b/tasks/jinja2/tasks/confirm_update.jinja
index 7e6b712ff..b4b075802 100644
--- a/tasks/jinja2/tasks/confirm_update.jinja
+++ b/tasks/jinja2/tasks/confirm_update.jinja
@@ -4,12 +4,12 @@
 {% from "components/panel/macro.njk" import govukPanel %}
 {% from "components/button/macro.njk" import govukButton %}
 
-{% set page_title = "Task updated" %}
+{% set page_title = page_title %}
 
 {% block breadcrumb %}
   {{ govukBreadcrumbs({
     "items": [
-      {"text": "Task: " ~ object.title, "href": url("workflow:task-ui-detail", kwargs={"pk": object.pk})},
+      {"text": object_type ~ ": " ~ object.title, "href": url("workflow:task-ui-detail", kwargs={"pk": object.pk})},
       {"text": page_title}
     ]
   }) }}
@@ -17,15 +17,15 @@
 
 {% block panel %}
   {{ govukPanel({
-    "titleText": "Task: " ~ object.title,
-    "text": "Task has been updated",
+    "titleText": object_type ~ ": " ~ object.title,
+    "text": object_type ~ " has been updated",
     "classes": "govuk-!-margin-bottom-7"
   }) }}
 {% endblock %}
 
 {% block button_group %}
   {{ govukButton({
-    "text": "View task",
+    "text": "View " ~ object_type,
     "href": url('workflow:task-ui-detail', kwargs={"pk": object.pk}),
     "classes": "govuk-button"
   }) }}
diff --git a/tasks/jinja2/tasks/detail.jinja b/tasks/jinja2/tasks/detail.jinja
index 5515adeb7..5a28e3363 100644
--- a/tasks/jinja2/tasks/detail.jinja
+++ b/tasks/jinja2/tasks/detail.jinja
@@ -4,7 +4,11 @@
 
 {% set page_title = "Task: " ~ object.title %}
 
-{% set edit_url = url("workflow:task-ui-update", kwargs={"pk": object.pk}) %}
+{%if object.parent_task%}
+  {% set edit_url = url("workflow:subtask-ui-update", kwargs={"pk": object.pk}) %}
+{% else %}
+  {% set edit_url = url("workflow:task-ui-update", kwargs={"pk": object.pk}) %}
+{% endif%}
 
 {% block breadcrumb %}
   {{ breadcrumbs(request, [
@@ -122,7 +126,7 @@
   {% if not object.parent_task %}
     {{ govukButton({
       "text": "Create subtask",
-      "href": url("workflow:subtask-ui-create", kwargs={"pk": object.pk}),
+      "href": url("workflow:subtask-ui-create", kwargs={"parent_task_pk": object.pk}),
       "classes": "govuk-button--secondary"
     }) }}
   {% endif %}
diff --git a/tasks/jinja2/tasks/edit.jinja b/tasks/jinja2/tasks/edit.jinja
index 9ce73f211..d56b9d0d8 100644
--- a/tasks/jinja2/tasks/edit.jinja
+++ b/tasks/jinja2/tasks/edit.jinja
@@ -1,7 +1,7 @@
 {% extends "layouts/form.jinja" %}
 {% from "components/breadcrumbs.jinja" import breadcrumbs %}
 
-{% set page_title = "Edit task details" %}
+{% set page_title = page_title %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(request, [
diff --git a/tasks/models/task.py b/tasks/models/task.py
index ee36ac07f..48633e64e 100644
--- a/tasks/models/task.py
+++ b/tasks/models/task.py
@@ -94,6 +94,10 @@ class Task(TaskBase):
 
     objects = TaskManager.from_queryset(TaskQueryset)()
 
+    @property
+    def is_subtask(self) -> bool:
+        return bool(self.parent_task)
+
     def __str__(self):
         return self.title
 
diff --git a/tasks/tests/test_models.py b/tasks/tests/test_models.py
index ec8f6fb81..00562a52c 100644
--- a/tasks/tests/test_models.py
+++ b/tasks/tests/test_models.py
@@ -3,6 +3,7 @@
 
 from common.tests.factories import CategoryFactory
 from common.tests.factories import ProgressStateFactory
+from common.tests.factories import SubTaskFactory
 from common.tests.factories import TaskFactory
 from tasks.models import ProgressState
 from tasks.models import TaskAssignee
@@ -154,3 +155,14 @@ def test_create_task_log_missing_kwargs():
     assert f"Missing 'assignee' in kwargs for action '{action}'." in str(
         error,
     )
+
+
+@pytest.mark.parametrize(
+    ("task_factory"),
+    [TaskFactory, SubTaskFactory],
+    ids=("task test", "subtask test"),
+)
+def test_task_is_subtask_property(task_factory):
+    task = task_factory.create()
+
+    assert bool(task.parent_task) == task.is_subtask
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 2d0fca227..5bf1131ea 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -84,17 +84,48 @@ def test_confirm_create_template_shows_task_or_subtask(
 
 
 @pytest.mark.parametrize(
-    ("task_factory", "expected_result"),
+    ("task_factory", "update_url"),
     [
-        (TaskFactory, True),
-        (SubTaskFactory, False),
+        (TaskFactory, "workflow:task-ui-update"),
+        (SubTaskFactory, "workflow:subtask-ui-update"),
     ],
     ids=("task test", "subtask test"),
 )
+def test_update_link_changes_for_task_and_subtask(
+    superuser_client,
+    task_factory,
+    update_url,
+):
+    task = task_factory.create()
+
+    url = reverse(
+        "workflow:task-ui-detail",
+        kwargs={
+            "pk": task.pk,
+        },
+    )
+    response = superuser_client.get(url)
+    assert response.status_code == 200
+
+    page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
+
+    update_link = reverse(
+        update_url,
+        kwargs={
+            "pk": task.pk,
+        },
+    )
+    assert page.find("a", href=update_link)
+
+
+@pytest.mark.parametrize(
+    ("task_factory"),
+    [TaskFactory, SubTaskFactory],
+    ids=("task test", "subtask test"),
+)
 def test_create_subtask_button_shows_only_for_non_parent_tasks(
     superuser_client,
     task_factory,
-    expected_result,
 ):
     task = task_factory.create()
 
@@ -109,10 +140,12 @@ def test_create_subtask_button_shows_only_for_non_parent_tasks(
 
     page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
 
-    if expected_result:
-        assert page.find("a", href=f"/tasks/{task.pk}/subtasks/create")
-    else:
-        assert not page.find("a", href=f"/tasks/{task.pk}/subtasks/create")
+    create_subtask_url = reverse(
+        "workflow:subtask-ui-create",
+        kwargs={"parent_task_pk": task.pk},
+    )
+
+    assert bool(page.find("a", href=create_subtask_url)) != task.is_subtask
 
 
 def test_create_subtask_form_errors_when_parent_is_subtask(valid_user_client):
@@ -131,7 +164,7 @@ def test_create_subtask_form_errors_when_parent_is_subtask(valid_user_client):
     url = reverse(
         "workflow:subtask-ui-create",
         kwargs={
-            "pk": subtask_parent.pk,
+            "parent_task_pk": subtask_parent.pk,
         },
     )
 
diff --git a/tasks/urls.py b/tasks/urls.py
index 22309eaa8..89589ebd7 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -6,28 +6,30 @@
 app_name = "workflow"
 
 task_ui_patterns = [
+    # Task urls
     path("", views.TaskListView.as_view(), name="task-ui-list"),
     path("<int:pk>/", views.TaskDetailView.as_view(), name="task-ui-detail"),
     path("create/", views.TaskCreateView.as_view(), name="task-ui-create"),
     path(
-        "<int:pk>/confirm-create",
+        "<int:pk>/confirm-create/",
         views.TaskConfirmCreateView.as_view(),
         name="task-ui-confirm-create",
     ),
     path("<int:pk>/update/", views.TaskUpdateView.as_view(), name="task-ui-update"),
     path(
-        "<int:pk>/confirm-update",
+        "<int:pk>/confirm-update/",
         views.TaskConfirmUpdateView.as_view(),
         name="task-ui-confirm-update",
     ),
     path("<int:pk>/delete/", views.TaskDeleteView.as_view(), name="task-ui-delete"),
     path(
-        "<int:pk>/confirm-delete",
+        "<int:pk>/confirm-delete/",
         views.TaskConfirmDeleteView.as_view(),
         name="task-ui-confirm-delete",
     ),
+    # Subtask urls
     path(
-        "<int:pk>/subtasks/create",
+        "<int:parent_task_pk>/subtasks/create/",
         views.SubTaskCreateView.as_view(),
         name="subtask-ui-create",
     ),
@@ -46,8 +48,29 @@
         views.SubTaskConfirmCreateView.as_view(),
         name="subtask-ui-confirm-create",
     ),
+    path(
+        "subtasks/<int:pk>/delete",
+        views.SubTaskDeleteView.as_view(),
+        name="subtask-ui-delete",
+    ),
+    path(
+        "subtasks/<int:pk>/confirm-delete",
+        views.SubTaskConfirmDeleteView.as_view(),
+        name="subtask-ui-confirm-delete",
+    ),
+    path(
+        "subtasks/<int:pk>/update/",
+        views.SubTaskUpdateView.as_view(),
+        name="subtask-ui-update",
+    ),
+    path(
+        "subtasks/confirm-update/<int:pk>/",
+        views.SubTaskConfirmUpdateView.as_view(),
+        name="subtask-ui-confirm-update",
+    ),
 ]
 
+
 workflow_ui_patterns = [
     # TODO
 ]
diff --git a/tasks/views.py b/tasks/views.py
index dedf448eb..67e3e8e48 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -105,6 +105,12 @@ class TaskConfirmUpdateView(PermissionRequiredMixin, DetailView):
     template_name = "tasks/confirm_update.jinja"
     permission_required = "tasks.change_task"
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["page_title"] = "Task updated"
+        context["object_type"] = "Task"
+        return context
+
 
 class TaskDeleteView(PermissionRequiredMixin, DeleteView):
     model = Task
@@ -146,11 +152,13 @@ class SubTaskCreateView(PermissionRequiredMixin, CreateView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["page_title"] = f"Create a subtask for task {self.kwargs['pk']}"
+        context["page_title"] = (
+            f"Create a subtask for task {self.kwargs['parent_task_pk']}"
+        )
         return context
 
     def form_valid(self, form):
-        parent_task = Task.objects.filter(pk=self.kwargs["pk"]).first()
+        parent_task = Task.objects.filter(pk=self.kwargs["parent_task_pk"]).first()
         if parent_task.parent_task:
             form.add_error(
                 None,
@@ -178,6 +186,42 @@ def get_context_data(self, **kwargs):
         return context
 
 
+class SubTaskUpdateView(PermissionRequiredMixin, UpdateView):
+    model = Task
+    template_name = "tasks/edit.jinja"
+    permission_required = "tasks.change_task"
+    form_class = TaskUpdateForm
+
+    def form_valid(self, form):
+        set_current_instigator(self.request.user)
+        with transaction.atomic():
+            self.object = form.save()
+        return HttpResponseRedirect(self.get_success_url())
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["page_title"] = f"Edit subtask {self.object.pk}"
+        return context
+
+    def get_success_url(self):
+        return reverse(
+            "workflow:subtask-ui-confirm-update",
+            kwargs={"pk": self.object.pk},
+        )
+
+
+class SubTaskConfirmUpdateView(PermissionRequiredMixin, DetailView):
+    model = Task
+    template_name = "tasks/confirm_update.jinja"
+    permission_required = "tasks.change_task"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["page_title"] = "Subtask updated"
+        context["object_type"] = "Subtask"
+        return context
+
+
 class SubTaskDeleteView(PermissionRequiredMixin, DeleteView):
     model = Task
     template_name = "tasks/delete.jinja"

From f55394a82871e3af737433b5e9b7466bd6291a24 Mon Sep 17 00:00:00 2001
From: Marya Shariq <marya.shariq@digital.trade.gov.uk>
Date: Mon, 25 Nov 2024 15:14:11 +0000
Subject: [PATCH 22/57] Tp2000 1589  - temporary list views tile (#1338)

* added navigation tile to homepage to link to workflow list views

* fixed indentation on lines 153 and 154
---
 common/jinja2/common/homepage.jinja | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/common/jinja2/common/homepage.jinja b/common/jinja2/common/homepage.jinja
index f78ab9917..4cf76ea38 100644
--- a/common/jinja2/common/homepage.jinja
+++ b/common/jinja2/common/homepage.jinja
@@ -144,6 +144,25 @@
       </article>
     {% endif %}
 
+      <article class="masonry-card">
+        <h3 class="govuk-heading-m">Tasks and Workflows - TEST ONLY</h3>
+        <p class="govuk-body">
+          <a href="{{ url('workflow:task-ui-list') }}"
+            class="govuk-link"
+          >Tasks</a>
+        </p>
+        <p class="govuk-body"></p>
+          <a href=#TODO
+            class="govuk-link"
+          >Workflows</a>
+        </p>
+        <p class="govuk-body"></p>
+          <a href=#TODO
+            class="govuk-link"
+          >Workflow templates</a>
+        </p>
+      </article>
+
     <article class="masonry-card">
       <h3 class="govuk-heading-m">Resources</h3>
       <p class="govuk-body">

From 7dfe0592b22a3d01d9459a915f00a1eeff76705f Mon Sep 17 00:00:00 2001
From: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>
Date: Mon, 25 Nov 2024 17:21:40 +0000
Subject: [PATCH 23/57] TP2000-1590 TaskWorkflow summary info support (#1337)

* Add TaskWorkflow.summary_task ForeignKey

* Refactor, remoging base class

* Add factories and fixtures for TaskWorkflow and TaskItem

* Add queryset function filter_top_level() with unit test

* Add non_workflow() and workflow_summary() queryset filter functions and tests

* Remove leftover comment.

* Correct variable name
---
 .../0011_taskworkflow_summary_task.py         | 24 +++++++++
 .../0012_taskworkflow_assign_summary_task.py  | 25 +++++++++
 .../0013_alter_taskworkflow_summary_task.py   | 23 +++++++++
 ...emove_taskworkflow_description_and_more.py | 30 +++++++++++
 tasks/models/task.py                          | 28 +++++++++-
 tasks/models/workflow.py                      | 51 +++++++++++--------
 tasks/tests/conftest.py                       | 22 ++++++++
 tasks/tests/factories.py                      | 22 ++++++++
 tasks/tests/test_models.py                    | 34 +++++++++++++
 9 files changed, 236 insertions(+), 23 deletions(-)
 create mode 100644 tasks/migrations/0011_taskworkflow_summary_task.py
 create mode 100644 tasks/migrations/0012_taskworkflow_assign_summary_task.py
 create mode 100644 tasks/migrations/0013_alter_taskworkflow_summary_task.py
 create mode 100644 tasks/migrations/0014_remove_taskworkflow_description_and_more.py

diff --git a/tasks/migrations/0011_taskworkflow_summary_task.py b/tasks/migrations/0011_taskworkflow_summary_task.py
new file mode 100644
index 000000000..3c9e9c435
--- /dev/null
+++ b/tasks/migrations/0011_taskworkflow_summary_task.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.2.16 on 2024-11-20 17:22
+
+import django.db.models.deletion
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0010_alter_task_progress_state"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="taskworkflow",
+            name="summary_task",
+            field=models.OneToOneField(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="tasks.task",
+            ),
+        ),
+    ]
diff --git a/tasks/migrations/0012_taskworkflow_assign_summary_task.py b/tasks/migrations/0012_taskworkflow_assign_summary_task.py
new file mode 100644
index 000000000..38f0dda86
--- /dev/null
+++ b/tasks/migrations/0012_taskworkflow_assign_summary_task.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.2.16 on 2024-11-20 17:27
+
+from django.db import migrations
+
+
+def assign_new_summary_task_on_workflow(apps, schema_editor):
+    Task = apps.get_model("tasks", "Task")
+    TaskWorkflow = apps.get_model("tasks", "TaskWorkflow")
+
+    for task_workflow in TaskWorkflow.objects.all():
+        task_workflow.summary_task = Task.objects.create(
+            title="Workflow summarising task",
+            description="Workflow summarising task.",
+        )
+        TaskWorkflow.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0011_taskworkflow_summary_task"),
+    ]
+
+    operations = []
+    operations = [migrations.RunPython(assign_new_summary_task_on_workflow)]
diff --git a/tasks/migrations/0013_alter_taskworkflow_summary_task.py b/tasks/migrations/0013_alter_taskworkflow_summary_task.py
new file mode 100644
index 000000000..8e257e1a0
--- /dev/null
+++ b/tasks/migrations/0013_alter_taskworkflow_summary_task.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.16 on 2024-11-20 17:31
+
+import django.db.models.deletion
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0012_taskworkflow_assign_summary_task"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="taskworkflow",
+            name="summary_task",
+            field=models.OneToOneField(
+                on_delete=django.db.models.deletion.PROTECT,
+                to="tasks.task",
+            ),
+        ),
+    ]
diff --git a/tasks/migrations/0014_remove_taskworkflow_description_and_more.py b/tasks/migrations/0014_remove_taskworkflow_description_and_more.py
new file mode 100644
index 000000000..91757eed9
--- /dev/null
+++ b/tasks/migrations/0014_remove_taskworkflow_description_and_more.py
@@ -0,0 +1,30 @@
+# Generated by Django 4.2.16 on 2024-11-20 17:46
+
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0013_alter_taskworkflow_summary_task"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="taskworkflow",
+            name="description",
+        ),
+        migrations.RemoveField(
+            model_name="taskworkflow",
+            name="title",
+        ),
+        migrations.AlterField(
+            model_name="taskworkflowtemplate",
+            name="description",
+            field=models.TextField(
+                blank=True,
+                help_text="Description of what this workflow template is used for. ",
+            ),
+        ),
+    ]
diff --git a/tasks/models/task.py b/tasks/models/task.py
index 54139b80d..1423d2f31 100644
--- a/tasks/models/task.py
+++ b/tasks/models/task.py
@@ -46,7 +46,33 @@ class TaskManager(WithSignalManagerMixin, models.Manager):
 
 
 class TaskQueryset(WithSignalQuerysetMixin, models.QuerySet):
-    pass
+    def non_workflow(self):
+        """Return a queryset of standalone Task instances, i.e. instances that
+        are not related via TaskItem instnaces to any TaskWorkflow and are not
+        referenced by TaskWorkflow.summary_task (related_name=taskworkflow)."""
+        return self.filter(
+            models.Q(taskitem__isnull=True) & models.Q(taskworkflow__isnull=True),
+        )
+
+    def workflow_summary(self):
+        """Return a queryset of TaskWorkflow summary Task instances, i.e. those
+        with a non-null related_name=taskworkflow."""
+        return self.filter(
+            models.Q(taskworkflow__isnull=False),
+        )
+
+    def top_level(self):
+        """
+        Return a queryset of Task instances that are either:
+        1. Stand-alone Task instances that are not part of a Workflow tasks
+        2. Workflow.summary_task instances.
+
+        The intent is to provide a top-level filtering of Task instances,
+        permitting a combined at-a-glance view of Tasks and Workflow instances.
+        """
+        return self.filter(
+            models.Q(taskitem__isnull=True) | models.Q(taskworkflow__isnull=False),
+        )
 
 
 class TaskBase(TimestampedMixin):
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index e6cf7ef02..35f149252 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -7,39 +7,26 @@
 from tasks.models.task import Task
 from tasks.models.task import TaskBase
 
-# ---------------
-# - Base classes.
-# ---------------
-
-
-class TaskWorkflowBase(Queue):
-    """Abstract model base class containing model fields common to TaskWorkflow
-    and TaskWorkflowTemplate."""
-
-    class Meta:
-        abstract = True
-
-    title = models.CharField(
-        max_length=255,
-    )
-    description = models.TextField(
-        blank=True,
-    )
-
-
 # ----------------------
 # - Workflows and tasks.
 # ----------------------
 
 
-class TaskWorkflow(TaskWorkflowBase):
+class TaskWorkflow(Queue):
     """Workflow of ordered Tasks."""
 
+    summary_task = models.OneToOneField(
+        Task,
+        on_delete=models.PROTECT,
+    )
+    """Provides task-like filtering and display capabilities for this
+    workflow."""
     creator_template = models.ForeignKey(
         "tasks.TaskWorkflowTemplate",
         null=True,
         on_delete=models.SET_NULL,
     )
+    """The template from which this workflow was created, if any."""
 
     def get_tasks(self) -> models.QuerySet:
         """Get a QuerySet of the Tasks associated through their TaskItem
@@ -72,9 +59,29 @@ class TaskItem(QueueItem):
 # ----------------------------------------
 
 
-class TaskWorkflowTemplate(TaskWorkflowBase):
+class TaskWorkflowTemplate(Queue):
     """Template used to create TaskWorkflow instance."""
 
+    title = models.CharField(
+        max_length=255,
+    )
+    """
+    A title name for the instance.
+
+    This isn't the same as the title assigned to a TaskWorkflow instance
+    generated from a template.
+    """
+    description = models.TextField(
+        blank=True,
+        help_text="Description of what this workflow template is used for. ",
+    )
+    """
+    Description of what the instance is used for.
+
+    This isn't the same as the description that may be applied to a TaskWorkflow
+    instance generated from a template.
+    """
+
     def get_task_templates(self) -> models.QuerySet:
         """Get a QuerySet of the TaskTemplates associated through their
         TaskItemTemplate instances to this TaskWorkflowTemplate, ordered by the
diff --git a/tasks/tests/conftest.py b/tasks/tests/conftest.py
index 4b582a4a6..6c324f913 100644
--- a/tasks/tests/conftest.py
+++ b/tasks/tests/conftest.py
@@ -8,6 +8,7 @@
 from tasks.models import TaskAssignee
 from tasks.models import TaskItemTemplate
 from tasks.models import TaskTemplate
+from tasks.models import TaskWorkflow
 from tasks.models import TaskWorkflowTemplate
 from tasks.tests import factories
 
@@ -106,3 +107,24 @@ def task_workflow_template_three_task_template_items(
     )
 
     return task_workflow_template
+
+
+@pytest.fixture()
+def task_workflow() -> TaskWorkflow:
+    """Return an empty TaskWorkflow instance (containing no items)."""
+    return factories.TaskWorkflowFactory.create()
+
+
+@pytest.fixture()
+def task_workflow_single_task_item(task_workflow) -> TaskWorkflow:
+    """Return a TaskWorkflow instance containing a single TaskItem instance with
+    associated Task instance."""
+
+    task_item = factories.TaskItemFactory.create(
+        queue=task_workflow,
+    )
+
+    assert task_workflow.get_items().count() == 1
+    assert task_workflow.get_items().get() == task_item
+
+    return task_workflow
diff --git a/tasks/tests/factories.py b/tasks/tests/factories.py
index c771d7c95..030cde8f1 100644
--- a/tasks/tests/factories.py
+++ b/tasks/tests/factories.py
@@ -3,8 +3,11 @@
 from factory.django import DjangoModelFactory
 
 from common.tests.factories import CategoryFactory
+from common.tests.factories import TaskFactory
+from tasks.models import TaskItem
 from tasks.models import TaskItemTemplate
 from tasks.models import TaskTemplate
+from tasks.models import TaskWorkflow
 from tasks.models import TaskWorkflowTemplate
 
 
@@ -34,3 +37,22 @@ class Meta:
 
     queue = SubFactory(TaskWorkflowTemplateFactory)
     task_template = SubFactory(TaskTemplateFactory)
+
+
+class TaskWorkflowFactory(DjangoModelFactory):
+    """Factory to create TaskWorkflow instances."""
+
+    class Meta:
+        model = TaskWorkflow
+
+    summary_task = SubFactory(TaskFactory)
+
+
+class TaskItemFactory(DjangoModelFactory):
+    """Factory to create TaskItem instances."""
+
+    class Meta:
+        model = TaskItem
+
+    queue = SubFactory(TaskWorkflowFactory)
+    task = SubFactory(TaskFactory)
diff --git a/tasks/tests/test_models.py b/tasks/tests/test_models.py
index 00562a52c..136231eeb 100644
--- a/tasks/tests/test_models.py
+++ b/tasks/tests/test_models.py
@@ -6,6 +6,7 @@
 from common.tests.factories import SubTaskFactory
 from common.tests.factories import TaskFactory
 from tasks.models import ProgressState
+from tasks.models import Task
 from tasks.models import TaskAssignee
 from tasks.models import TaskLog
 
@@ -79,6 +80,39 @@ def test_task_assignee_workbasket_reviewers_queryset(
     assert workbasket_reviewer_assignee in workbasket_reviewers
 
 
+def test_non_workflow_task_queryset(task, task_workflow_single_task_item):
+    """Test correct behaviour of TaskQueryset.non_workflow()."""
+
+    non_workflow_tasks = Task.objects.non_workflow()
+
+    assert Task.objects.count() == 3
+    assert task == non_workflow_tasks.get()
+
+
+def test_workflow_summary_task_queryset(task, task_workflow_single_task_item):
+    """Test correct behaviour of TaskQueryset.workflow_summary()."""
+
+    """Return a queryset of TaskWorkflow summary Task instances, i.e. those
+    with a non-null related_name=taskworkflow."""
+
+    workflow_tasks = Task.objects.workflow_summary()
+
+    assert Task.objects.count() == 3
+    assert task_workflow_single_task_item.summary_task == workflow_tasks.get()
+
+
+def test_top_level_task_queryset(task, task_workflow_single_task_item):
+    """Test correct behaviour of TaskQueryset.top_level()."""
+
+    top_level_tasks = Task.objects.top_level()
+
+    assert Task.objects.count() == 3
+    assert top_level_tasks.count() == 2
+    assert task_workflow_single_task_item.summary_task in top_level_tasks
+    assert task in top_level_tasks
+    assert task_workflow_single_task_item.get_tasks().get() not in top_level_tasks
+
+
 def test_create_task_log_task_assigned():
     task = TaskFactory.create()
     instigator = task.creator

From 997d36a390326df0cad672f17a5aa3e0aa6393b0 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Thu, 28 Nov 2024 12:40:56 +0000
Subject: [PATCH 24/57] Update TaskWorkflowTemplate.create_task_workflow()
 method and unit test (#1339)

* Save Workflow instance in forward op to fix migration application

* Have TaskWorkflowTemplate.create_task_workflow() create summary task from data param

* Make explicit create_task_workflow() params
---
 .../0012_taskworkflow_assign_summary_task.py       |  2 +-
 tasks/models/workflow.py                           |  6 +++---
 tasks/tests/test_workflow_models.py                | 14 ++++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/tasks/migrations/0012_taskworkflow_assign_summary_task.py b/tasks/migrations/0012_taskworkflow_assign_summary_task.py
index 38f0dda86..26e22ed3b 100644
--- a/tasks/migrations/0012_taskworkflow_assign_summary_task.py
+++ b/tasks/migrations/0012_taskworkflow_assign_summary_task.py
@@ -12,7 +12,7 @@ def assign_new_summary_task_on_workflow(apps, schema_editor):
             title="Workflow summarising task",
             description="Workflow summarising task.",
         )
-        TaskWorkflow.save()
+        task_workflow.save()
 
 
 class Migration(migrations.Migration):
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index 35f149252..26a00c931 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -91,13 +91,13 @@ def get_task_templates(self) -> models.QuerySet:
         )
 
     @atomic
-    def create_task_workflow(self) -> "TaskWorkflow":
+    def create_task_workflow(self, title: str, description: str) -> "TaskWorkflow":
         """Create a workflow and it subtasks, using values from this template
         workflow and its task templates."""
 
+        summary_task = Task.objects.create(title=title, description=description)
         task_workflow = TaskWorkflow.objects.create(
-            title=self.title,
-            description=self.description,
+            summary_task=summary_task,
             creator_template=self,
         )
 
diff --git a/tasks/tests/test_workflow_models.py b/tasks/tests/test_workflow_models.py
index 270e7b055..93cda5eed 100644
--- a/tasks/tests/test_workflow_models.py
+++ b/tasks/tests/test_workflow_models.py
@@ -13,8 +13,13 @@ def test_create_task_workflow_from_task_workflow_template(
 ):
     """Test creation of TaskWorkflow instances from TaskWorkflowTemplates using
     its `create_task_workflow()` method."""
+    title = "Workflow title"
+    description = "Workflow description"
     task_workflow = (
-        task_workflow_template_three_task_template_items.create_task_workflow()
+        task_workflow_template_three_task_template_items.create_task_workflow(
+            title=title,
+            description=description,
+        )
     )
 
     # Test that workflow values are valid.
@@ -22,11 +27,8 @@ def test_create_task_workflow_from_task_workflow_template(
         task_workflow.creator_template
         == task_workflow_template_three_task_template_items
     )
-    assert task_workflow.title == task_workflow_template_three_task_template_items.title
-    assert (
-        task_workflow.description
-        == task_workflow_template_three_task_template_items.description
-    )
+    assert task_workflow.summary_task.title == title
+    assert task_workflow.summary_task.description == description
     assert task_workflow.get_items().count() == 3
 
     # Validate that item positions are equivalent.

From 4540d83bc531b1b22683c343b82855fdfe0f6d85 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Thu, 28 Nov 2024 16:22:16 +0000
Subject: [PATCH 25/57] TP2000-1556 Implement workflow create view (#1340)

* Save Workflow instance in forward op to fix migration application

* Have TaskWorkflowTemplate.create_task_workflow() create summary task from data param

* Override TaskWorkflowTemplate.__str__ to display instance title

* Add UI capability to create workflows with or without workflow templates

* Make confirm_create template usable for workflow and worklow template models

* Add workflow creation confirmation view

* Add workflow create view & form unit tests

* Simplify TaskWorkflowCreateView.form_valid()

* Change factory faker provider of CategoryFactory.name to avoid recurrent duplicate key errors

* Simplify workflow_create_form_valid_data test assertion

* Make explicit create_task_workflow() params

* Remove commented out get_url() conditionals
---
 common/tests/factories.py                     |  2 +-
 conftest.py                                   |  4 +
 tasks/forms.py                                | 76 ++++++++++++++++++
 .../tasks/workflows/confirm_create.jinja      | 61 ++++++++++++++
 .../{template_create.jinja => create.jinja}   |  2 +-
 .../workflows/template_confirm_create.jinja   | 47 -----------
 ...015_alter_taskworkflow_options_and_more.py | 21 +++++
 tasks/models/workflow.py                      | 39 ++++++++-
 tasks/tests/test_forms.py                     | 80 +++++++++++++++++++
 tasks/tests/test_views.py                     | 73 +++++++++++++++++
 tasks/tests/test_workflow_models.py           |  5 ++
 tasks/urls.py                                 | 11 ++-
 tasks/views.py                                | 55 ++++++++++++-
 13 files changed, 420 insertions(+), 56 deletions(-)
 create mode 100644 tasks/jinja2/tasks/workflows/confirm_create.jinja
 rename tasks/jinja2/tasks/workflows/{template_create.jinja => create.jinja} (85%)
 delete mode 100644 tasks/jinja2/tasks/workflows/template_confirm_create.jinja
 create mode 100644 tasks/migrations/0015_alter_taskworkflow_options_and_more.py

diff --git a/common/tests/factories.py b/common/tests/factories.py
index 34f0bdbf2..d1c487b1b 100644
--- a/common/tests/factories.py
+++ b/common/tests/factories.py
@@ -1536,7 +1536,7 @@ class Meta:
 
 
 class CategoryFactory(factory.django.DjangoModelFactory):
-    name = factory.Faker("word")
+    name = factory.Faker("bs")
 
     class Meta:
         model = "tasks.Category"
diff --git a/conftest.py b/conftest.py
index 56049cabb..0afdd2286 100644
--- a/conftest.py
+++ b/conftest.py
@@ -310,6 +310,10 @@ def policy_group(db) -> Group:
         ("tasks", "view_comment"),
         ("tasks", "change_comment"),
         ("tasks", "delete_comment"),
+        ("tasks", "add_taskworkflow"),
+        ("tasks", "change_taskworkflow"),
+        ("tasks", "delete_taskworkflow"),
+        ("tasks", "view_taskworkflow"),
         ("tasks", "add_taskworkflowtemplate"),
         ("tasks", "change_taskworkflowtemplate"),
         ("tasks", "delete_taskworkflowtemplate"),
diff --git a/tasks/forms.py b/tasks/forms.py
index 894868276..39bcf2ea6 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -1,10 +1,19 @@
 from crispy_forms_gds.helper import FormHelper
+from crispy_forms_gds.layout import Fieldset
 from crispy_forms_gds.layout import Layout
 from crispy_forms_gds.layout import Size
 from crispy_forms_gds.layout import Submit
+from django.db.models import TextChoices
+from django.forms import CharField
+from django.forms import Form
+from django.forms import ModelChoiceField
 from django.forms import ModelForm
+from django.forms import Textarea
 
+from common.forms import BindNestedFormMixin
+from common.forms import RadioNested
 from common.forms import delete_form_for
+from common.validators import SymbolValidator
 from tasks.models import Task
 from tasks.models import TaskTemplate
 from tasks.models import TaskWorkflowTemplate
@@ -82,6 +91,73 @@ def save(self, parent_task, user, commit=True):
 TaskDeleteForm = delete_form_for(Task)
 
 
+class TaskWorkflowTemplateForm(Form):
+    workflow_template = ModelChoiceField(
+        label="",
+        queryset=TaskWorkflowTemplate.objects.all(),
+        help_text="Select a workflow template.",
+        error_messages={
+            "required": "Select a workflow template",
+        },
+    )
+
+
+class TaskWorkflowCreateForm(BindNestedFormMixin, Form):
+    class CreateType(TextChoices):
+        WITH_TEMPLATE = "WITH_TEMPLATE", "Yes"
+        WITHOUT_TEMPLATE = "WITHOUT_TEMPLATE", "No"
+
+    title = CharField(
+        max_length=255,
+        validators=[SymbolValidator],
+        error_messages={
+            "required": "Enter a title for the workflow",
+        },
+    )
+
+    description = CharField(
+        validators=[SymbolValidator],
+        widget=Textarea(),
+        error_messages={
+            "required": "Enter a description for the workflow",
+        },
+    )
+
+    create_type = RadioNested(
+        label="Do you want to use a workflow template?",
+        choices=CreateType.choices,
+        nested_forms={
+            CreateType.WITH_TEMPLATE.value: [TaskWorkflowTemplateForm],
+            CreateType.WITHOUT_TEMPLATE.value: [],
+        },
+        error_messages={
+            "required": "Select if you want to use a workflow template",
+        },
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.bind_nested_forms(*args, **kwargs)
+
+        self.helper = FormHelper(self)
+        self.helper.label_size = Size.SMALL
+        self.helper.legend_size = Size.SMALL
+        self.helper.layout = Layout(
+            Fieldset(
+                "title",
+                "description",
+            ),
+            "create_type",
+            Submit(
+                "submit",
+                "Create",
+                data_module="govuk-button",
+                data_prevent_double_click="true",
+            ),
+        )
+
+
 class TaskWorkflowTemplateBaseForm(ModelForm):
     class Meta:
         model = TaskWorkflowTemplate
diff --git a/tasks/jinja2/tasks/workflows/confirm_create.jinja b/tasks/jinja2/tasks/workflows/confirm_create.jinja
new file mode 100644
index 000000000..a84c0b9d6
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/confirm_create.jinja
@@ -0,0 +1,61 @@
+{% extends "common/confirm_create.jinja" %}
+
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+{% from "components/panel/macro.njk" import govukPanel %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set object_name = object._meta.verbose_name %}
+{% set page_title = object_name ~ " created" %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+    request,
+    [
+      {
+        "text": "Find and view workflow templates",
+        "href": object.get_url("list")},
+      {
+        "text": "Create a " ~ object_name,
+        "href": object.get_url("create"),
+      },
+      {"text": page_title}
+    ],
+    False,
+  ) }}
+{% endblock %}
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": object_name|capitalize ~ ": " ~ object,
+    "text": "You have created a new " ~ object_name,
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
+
+{% block button_group %}
+  {{ govukButton({
+    "text": "View " ~ object_name,
+    "href": object.get_url("detail"),
+    "classes": "govuk-button"
+  }) }}
+
+  {% if object_name == "workflow" %}
+    {{ govukButton({
+      "text": "Create a task",
+      "href": "#TODO",
+      "classes": "govuk-button--secondary"
+    }) }}
+  {% elif object_name == "workflow template" %}
+    {{ govukButton({
+      "text": "Create a task template",
+      "href": url("workflow:task-template-ui-create", kwargs={"workflow_template_pk": object.pk}),
+      "classes": "govuk-button--secondary"
+    }) }}
+  {% endif %}
+{% endblock %}
+
+{% block actions %}
+  <li>
+    <a href={{ object.get_url("list") }} class="govuk-link">Find and view {{object_name}}s</a>
+  </li>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/template_create.jinja b/tasks/jinja2/tasks/workflows/create.jinja
similarity index 85%
rename from tasks/jinja2/tasks/workflows/template_create.jinja
rename to tasks/jinja2/tasks/workflows/create.jinja
index f2ec118c6..423b43452 100644
--- a/tasks/jinja2/tasks/workflows/template_create.jinja
+++ b/tasks/jinja2/tasks/workflows/create.jinja
@@ -2,7 +2,7 @@
 
 {% from "components/breadcrumbs.jinja" import breadcrumbs %}
 
-{% set page_title = "Create a workflow template" %}
+{% set page_title = "Create a " ~ verbose_name  %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(
diff --git a/tasks/jinja2/tasks/workflows/template_confirm_create.jinja b/tasks/jinja2/tasks/workflows/template_confirm_create.jinja
deleted file mode 100644
index 62f9ee5fe..000000000
--- a/tasks/jinja2/tasks/workflows/template_confirm_create.jinja
+++ /dev/null
@@ -1,47 +0,0 @@
-{% extends "common/confirm_create.jinja" %}
-
-{% from "components/breadcrumbs.jinja" import breadcrumbs %}
-{% from "components/panel/macro.njk" import govukPanel %}
-{% from "components/button/macro.njk" import govukButton %}
-
-{% set page_title = "Workflow template created" %}
-
-{% block breadcrumb %}
-  {{ breadcrumbs(
-    request,
-    [
-      {"text": "Find and view workflow templates", "href": "#TODO"},
-      {
-        "text": "Create a workflow template",
-        "href": url("workflow:task-workflow-template-ui-create"),
-      },
-      {"text": page_title}
-    ],
-    False,
-  ) }}
-{% endblock %}
-
-{% block panel %}
-  {{ govukPanel({
-    "titleText": "Workflow template: " ~ object.title,
-    "text": "You have created a new workflow template",
-    "classes": "govuk-!-margin-bottom-7"
-  }) }}
-{% endblock %}
-
-{% block button_group %}
-  {{ govukButton({
-    "text": "View workflow template",
-    "href": url("workflow:task-workflow-template-ui-detail", kwargs={"pk": object.pk}),
-    "classes": "govuk-button"
-  }) }}
-  {{ govukButton({
-    "text": "Create a task template",
-    "href": url("workflow:task-template-ui-create", kwargs={"workflow_template_pk": object.pk}),
-    "classes": "govuk-button--secondary"
-  }) }}
-{% endblock %}
-
-{% block actions %}
-  <li><a href="TODO" class="govuk-link">Find and view workflow templates</a></li>
-{% endblock %}
diff --git a/tasks/migrations/0015_alter_taskworkflow_options_and_more.py b/tasks/migrations/0015_alter_taskworkflow_options_and_more.py
new file mode 100644
index 000000000..41e835e11
--- /dev/null
+++ b/tasks/migrations/0015_alter_taskworkflow_options_and_more.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.2.15 on 2024-11-26 13:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0014_remove_taskworkflow_description_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="taskworkflow",
+            options={"verbose_name": "workflow"},
+        ),
+        migrations.AlterModelOptions(
+            name="taskworkflowtemplate",
+            options={"verbose_name": "workflow template"},
+        ),
+    ]
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index 26a00c931..fb8d97145 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -2,6 +2,7 @@
 from django.db.transaction import atomic
 from django.urls import reverse
 
+from common.models import User
 from tasks.models.queue import Queue
 from tasks.models.queue import QueueItem
 from tasks.models.task import Task
@@ -28,14 +29,25 @@ class TaskWorkflow(Queue):
     )
     """The template from which this workflow was created, if any."""
 
+    class Meta:
+        verbose_name = "workflow"
+
+    def __str__(self):
+        return self.summary_task.title
+
     def get_tasks(self) -> models.QuerySet:
         """Get a QuerySet of the Tasks associated through their TaskItem
         instances to this TaskWorkflow, ordered by the position of the
         TaskItem."""
         return Task.objects.filter(taskitem__queue=self).order_by("taskitem__position")
 
-    def __str__(self):
-        return self.title
+    def get_url(self, action: str = "detail"):
+        if action == "create":
+            return reverse(
+                "workflow:task-workflow-ui-create",
+            )
+
+        return "#NOT-IMPLEMENTED"
 
 
 class TaskItem(QueueItem):
@@ -82,6 +94,12 @@ class TaskWorkflowTemplate(Queue):
     instance generated from a template.
     """
 
+    class Meta:
+        verbose_name = "workflow template"
+
+    def __str__(self):
+        return self.title
+
     def get_task_templates(self) -> models.QuerySet:
         """Get a QuerySet of the TaskTemplates associated through their
         TaskItemTemplate instances to this TaskWorkflowTemplate, ordered by the
@@ -91,11 +109,20 @@ def get_task_templates(self) -> models.QuerySet:
         )
 
     @atomic
-    def create_task_workflow(self, title: str, description: str) -> "TaskWorkflow":
+    def create_task_workflow(
+        self,
+        title: str,
+        description: str,
+        creator: User,
+    ) -> "TaskWorkflow":
         """Create a workflow and it subtasks, using values from this template
         workflow and its task templates."""
 
-        summary_task = Task.objects.create(title=title, description=description)
+        summary_task = Task.objects.create(
+            title=title,
+            description=description,
+            creator=creator,
+        )
         task_workflow = TaskWorkflow.objects.create(
             summary_task=summary_task,
             creator_template=self,
@@ -135,6 +162,10 @@ def get_url(self, action: str = "detail"):
                 "workflow:task-workflow-template-ui-delete",
                 kwargs={"pk": self.pk},
             )
+        elif action == "create":
+            return reverse(
+                "workflow:task-workflow-template-ui-create",
+            )
 
         return "#NOT-IMPLEMENTED"
 
diff --git a/tasks/tests/test_forms.py b/tasks/tests/test_forms.py
index d04806c63..1dfd706fa 100644
--- a/tasks/tests/test_forms.py
+++ b/tasks/tests/test_forms.py
@@ -1,8 +1,12 @@
+import pytest
+
 from common.tests.factories import ProgressStateFactory
 from common.tests.factories import TaskFactory
 from tasks import forms
 from tasks.models import ProgressState
 
+pytestmark = pytest.mark.django_db
+
 
 def test_create_subtask_assigns_correct_parent_task(valid_user):
     """Tests that SubtaskCreateForm assigns the correct parent on form.save."""
@@ -20,3 +24,79 @@ def test_create_subtask_assigns_correct_parent_task(valid_user):
     new_subtask = form.save(parent_task_instance, user=valid_user)
 
     assert new_subtask.parent_task.pk == parent_task_instance.pk
+
+
+@pytest.mark.parametrize(
+    "form_data",
+    [
+        {
+            "title": "Test workflow 1",
+            "description": "Workflow created without using template",
+            "create_type": forms.TaskWorkflowCreateForm.CreateType.WITHOUT_TEMPLATE,
+        },
+        {
+            "title": "Test workflow 2",
+            "description": "Workflow created using template",
+            "create_type": forms.TaskWorkflowCreateForm.CreateType.WITH_TEMPLATE,
+            "workflow_template": "",
+        },
+    ],
+    ids=(
+        "without_template",
+        "with_template",
+    ),
+)
+def test_workflow_create_form_valid_data(form_data, task_workflow_template):
+    """Tests that `TaskWorkflowCreateForm` returns expected cleaned_data given
+    valid form data."""
+
+    if "workflow_template" in form_data:
+        form_data["workflow_template"] = task_workflow_template
+
+    form = forms.TaskWorkflowCreateForm(form_data)
+    assert form.is_valid()
+    assert form.cleaned_data == form_data
+
+
+@pytest.mark.parametrize(
+    ("form_data", "field", "error_message"),
+    [
+        ({"title": ""}, "title", "Enter a title for the workflow"),
+        ({"description": ""}, "description", "Enter a description for the workflow"),
+        (
+            {"create_type": ""},
+            "create_type",
+            "Select if you want to use a workflow template",
+        ),
+        (
+            {
+                "create_type": forms.TaskWorkflowCreateForm.CreateType.WITH_TEMPLATE,
+                "workflow_template": "",
+            },
+            "create_type",
+            "Select a workflow template",
+        ),
+        (
+            {
+                "create_type": forms.TaskWorkflowCreateForm.CreateType.WITH_TEMPLATE,
+                "workflow_template": "invalidchoice",
+            },
+            "create_type",
+            "Select a valid choice. That choice is not one of the available choices.",
+        ),
+    ],
+    ids=(
+        "missing_title",
+        "missing_description",
+        "missing_create_type",
+        "missing_workflow_template",
+        "invalid_workflow_template",
+    ),
+)
+def test_workflow_create_form_invalid_data(form_data, field, error_message):
+    """Tests that `TaskWorkflowCreateForm` raises expected form errors given
+    invalid form data."""
+
+    form = forms.TaskWorkflowCreateForm(form_data)
+    assert not form.is_valid()
+    assert error_message in form.errors[field]
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 5bf1131ea..412d5ab35 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -6,10 +6,12 @@
 from common.tests.factories import ProgressStateFactory
 from common.tests.factories import SubTaskFactory
 from common.tests.factories import TaskFactory
+from tasks.forms import TaskWorkflowCreateForm
 from tasks.models import ProgressState
 from tasks.models import TaskItemTemplate
 from tasks.models import TaskLog
 from tasks.models import TaskTemplate
+from tasks.models import TaskWorkflow
 from tasks.models import TaskWorkflowTemplate
 from tasks.tests.factories import TaskItemTemplateFactory
 
@@ -545,3 +547,74 @@ def test_delete_task_template_view(
         f"Task template ID: {task_template_pk}"
         in soup.select(".govuk-panel__title")[0].text
     )
+
+
+@pytest.mark.parametrize(
+    "form_data",
+    [
+        {
+            "title": "Test workflow 1",
+            "description": "Workflow created without using template",
+            "create_type": TaskWorkflowCreateForm.CreateType.WITHOUT_TEMPLATE,
+        },
+        {
+            "title": "Test workflow 2",
+            "description": "Workflow created using template",
+            "create_type": TaskWorkflowCreateForm.CreateType.WITH_TEMPLATE,
+        },
+    ],
+    ids=(
+        "without_template",
+        "with_template",
+    ),
+)
+def test_workflow_create_view(
+    form_data,
+    valid_user,
+    valid_user_client,
+    task_workflow_template_single_task_template_item,
+):
+    """Tests that a new workflow can be created (with or without workflow
+    template) and that the corresponding confirmation view returns a HTTP 200
+    response."""
+
+    with_template = (
+        form_data["create_type"] == TaskWorkflowCreateForm.CreateType.WITH_TEMPLATE
+    )
+
+    if with_template:
+        form_data["workflow_template"] = (
+            task_workflow_template_single_task_template_item.pk
+        )
+
+    assert not TaskWorkflow.objects.exists()
+
+    create_url = reverse("workflow:task-workflow-ui-create")
+    create_response = valid_user_client.post(create_url, form_data)
+    assert create_response.status_code == 302
+
+    created_workflow = TaskWorkflow.objects.get(
+        summary_task__title=form_data["title"],
+        summary_task__description=form_data["description"],
+        summary_task__creator=valid_user,
+    )
+
+    if with_template:
+        assert (
+            created_workflow.get_tasks().count()
+            == task_workflow_template_single_task_template_item.get_task_templates().count()
+        )
+    else:
+        assert created_workflow.get_tasks().count() == 0
+
+    confirmation_url = reverse(
+        "workflow:task-workflow-ui-confirm-create",
+        kwargs={"pk": created_workflow.pk},
+    )
+    assert create_response.url == confirmation_url
+
+    confirmation_response = valid_user_client.get(confirmation_url)
+    assert confirmation_response.status_code == 200
+
+    soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
+    assert str(created_workflow) in soup.select("h1.govuk-panel__title")[0].text
diff --git a/tasks/tests/test_workflow_models.py b/tasks/tests/test_workflow_models.py
index 93cda5eed..26d81cb93 100644
--- a/tasks/tests/test_workflow_models.py
+++ b/tasks/tests/test_workflow_models.py
@@ -9,16 +9,20 @@
 
 
 def test_create_task_workflow_from_task_workflow_template(
+    valid_user,
     task_workflow_template_three_task_template_items,
 ):
     """Test creation of TaskWorkflow instances from TaskWorkflowTemplates using
     its `create_task_workflow()` method."""
+
     title = "Workflow title"
     description = "Workflow description"
+    creator = valid_user
     task_workflow = (
         task_workflow_template_three_task_template_items.create_task_workflow(
             title=title,
             description=description,
+            creator=creator,
         )
     )
 
@@ -29,6 +33,7 @@ def test_create_task_workflow_from_task_workflow_template(
     )
     assert task_workflow.summary_task.title == title
     assert task_workflow.summary_task.description == description
+    assert task_workflow.summary_task.creator == creator
     assert task_workflow.get_items().count() == 3
 
     # Validate that item positions are equivalent.
diff --git a/tasks/urls.py b/tasks/urls.py
index 89589ebd7..6aaf5aee0 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -72,7 +72,16 @@
 
 
 workflow_ui_patterns = [
-    # TODO
+    path(
+        "create/",
+        views.TaskWorkflowCreateView.as_view(),
+        name="task-workflow-ui-create",
+    ),
+    path(
+        "<int:pk>/confirm-create/",
+        views.TaskWorkflowConfirmCreateView.as_view(),
+        name="task-workflow-ui-confirm-create",
+    ),
 ]
 
 workflow_template_ui_patterns = [
diff --git a/tasks/views.py b/tasks/views.py
index 67e3e8e48..3f7e4cf17 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -9,6 +9,7 @@
 from django.views.generic.detail import DetailView
 from django.views.generic.edit import CreateView
 from django.views.generic.edit import DeleteView
+from django.views.generic.edit import FormView
 from django.views.generic.edit import UpdateView
 
 from common.views import SortingMixin
@@ -21,12 +22,14 @@
 from tasks.forms import TaskTemplateDeleteForm
 from tasks.forms import TaskTemplateUpdateForm
 from tasks.forms import TaskUpdateForm
+from tasks.forms import TaskWorkflowCreateForm
 from tasks.forms import TaskWorkflowTemplateCreateForm
 from tasks.forms import TaskWorkflowTemplateDeleteForm
 from tasks.forms import TaskWorkflowTemplateUpdateForm
 from tasks.models import Task
 from tasks.models import TaskItemTemplate
 from tasks.models import TaskTemplate
+from tasks.models import TaskWorkflow
 from tasks.models import TaskWorkflowTemplate
 from tasks.signals import set_current_instigator
 
@@ -257,6 +260,49 @@ def get_context_data(self, **kwargs):
         return context_data
 
 
+class TaskWorkflowCreateView(PermissionRequiredMixin, FormView):
+    permission_required = "tasks.add_taskworkflow"
+    template_name = "tasks/workflows/create.jinja"
+    form_class = TaskWorkflowCreateForm
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["verbose_name"] = "workflow"
+        return context
+
+    def form_valid(self, form):
+        summary_data = {
+            "title": form.cleaned_data["title"],
+            "description": form.cleaned_data["description"],
+            "creator": self.request.user,
+        }
+        create_type = form.cleaned_data["create_type"]
+
+        if create_type == TaskWorkflowCreateForm.CreateType.WITH_TEMPLATE:
+            template = form.cleaned_data["workflow_template"]
+            self.object = template.create_task_workflow(**summary_data)
+        elif create_type == TaskWorkflowCreateForm.CreateType.WITHOUT_TEMPLATE:
+            with transaction.atomic():
+                summary_task = Task.objects.create(**summary_data)
+                self.object = TaskWorkflow.objects.create(
+                    summary_task=summary_task,
+                )
+
+        return super().form_valid(form)
+
+    def get_success_url(self):
+        return reverse(
+            "workflow:task-workflow-ui-confirm-create",
+            kwargs={"pk": self.object.pk},
+        )
+
+
+class TaskWorkflowConfirmCreateView(PermissionRequiredMixin, DetailView):
+    model = TaskWorkflow
+    template_name = "tasks/workflows/confirm_create.jinja"
+    permission_required = "tasks.add_taskworkflow"
+
+
 class TaskWorkflowTemplateDetailView(PermissionRequiredMixin, DetailView):
     model = TaskWorkflowTemplate
     template_name = "tasks/workflows/template_detail.jinja"
@@ -338,9 +384,14 @@ def demote_to_last(self, task_template_id: int) -> None:
 class TaskWorkflowTemplateCreateView(PermissionRequiredMixin, CreateView):
     model = TaskWorkflowTemplate
     permission_required = "tasks.add_taskworkflowtemplate"
-    template_name = "tasks/workflows/template_create.jinja"
+    template_name = "tasks/workflows/create.jinja"
     form_class = TaskWorkflowTemplateCreateForm
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["verbose_name"] = "workflow template"
+        return context
+
     def get_success_url(self):
         return reverse(
             "workflow:task-workflow-template-ui-confirm-create",
@@ -350,7 +401,7 @@ def get_success_url(self):
 
 class TaskWorkflowTemplateConfirmCreateView(PermissionRequiredMixin, DetailView):
     model = TaskWorkflowTemplate
-    template_name = "tasks/workflows/template_confirm_create.jinja"
+    template_name = "tasks/workflows/confirm_create.jinja"
     permission_required = "tasks.add_taskworkflowtemplate"
 
 

From 2ea9f5c90f76fde52afeb0852ad99761f28e179c Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Thu, 28 Nov 2024 16:43:43 +0000
Subject: [PATCH 26/57] TP2000-1555 Implement workflow detail view (#1341)

* Add workflow detail view

* Add workflow detail view unit tests

* Add detail get_url action to Workflow model
---
 tasks/jinja2/tasks/includes/task_queue.jinja  |  2 +-
 .../{template_detail.jinja => detail.jinja}   | 35 +++++---
 tasks/models/workflow.py                      | 23 +++++-
 tasks/tests/conftest.py                       | 26 ++++++
 tasks/tests/factories.py                      |  3 +
 tasks/tests/test_views.py                     | 74 ++++++++++++++++-
 tasks/urls.py                                 |  5 ++
 tasks/views.py                                | 81 ++++++++++++++++++-
 8 files changed, 230 insertions(+), 19 deletions(-)
 rename tasks/jinja2/tasks/workflows/{template_detail.jinja => detail.jinja} (62%)

diff --git a/tasks/jinja2/tasks/includes/task_queue.jinja b/tasks/jinja2/tasks/includes/task_queue.jinja
index 904a3fdfc..1f55b66d3 100644
--- a/tasks/jinja2/tasks/includes/task_queue.jinja
+++ b/tasks/jinja2/tasks/includes/task_queue.jinja
@@ -47,7 +47,7 @@
   {% endset -%}
 
   {%- set remove_cell_content %}
-    TODO
+    <a href="{{ obj.get_url("delete") }}" class="govuk-link">Remove</a>
   {% endset -%}
 
   {{ table_rows.append([
diff --git a/tasks/jinja2/tasks/workflows/template_detail.jinja b/tasks/jinja2/tasks/workflows/detail.jinja
similarity index 62%
rename from tasks/jinja2/tasks/workflows/template_detail.jinja
rename to tasks/jinja2/tasks/workflows/detail.jinja
index 00e04093d..db9be5e80 100644
--- a/tasks/jinja2/tasks/workflows/template_detail.jinja
+++ b/tasks/jinja2/tasks/workflows/detail.jinja
@@ -2,14 +2,23 @@
 {% from "components/breadcrumbs.jinja" import breadcrumbs %}
 {% from "components/button/macro.njk" import govukButton %}
 
-{% set page_title = "Workflow template: " ~ object.title %}
-{% set list_include = "tasks/includes/task_queue.jinja" %}
+{% set object_name = object._meta.verbose_name %}
+
+{% set page_title = object_name|capitalize ~ ": " ~ object.title %}
 
-{% set edit_url = object.get_url("edit") %}
+{% if object_name == "workflow" %}
+  {% set task_object_name = "task" %}
+  {% set task_object_create_url = "#TODO" %}
+{% elif object_name == "workflow template" %}
+  {% set task_object_name = "task template" %}
+  {% set task_object_create_url = url("workflow:task-template-ui-create", kwargs={"workflow_template_pk": object.pk}) %}
+{% endif %}
+
+{% set list_include = "tasks/includes/task_queue.jinja" %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(request, [
-      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {"text": "Find and view "~ object_name ~ "s", "href": object.get_url("list")},
       {"text": page_title}
     ],
     with_workbasket=False,
@@ -40,7 +49,7 @@
         {{ object.title }}
       </dd>
       <dd class="govuk-summary-list__actions">
-        <a class="govuk-link" href="{{ edit_url }}">Change<span class="govuk-visually-hidden"> title</span></a>
+        <a class="govuk-link" href="{{ object.get_url("edit") }}">Change<span class="govuk-visually-hidden"> title</span></a>
       </dd>
     </div>
 
@@ -52,20 +61,20 @@
         {{ object.description }}
       </dd>
       <dd class="govuk-summary-list__actions">
-        <a class="govuk-link" href="{{ edit_url }}">Change<span class="govuk-visually-hidden"> description</span></a>
+        <a class="govuk-link" href="{{ object.get_url("edit") }}">Change<span class="govuk-visually-hidden"> description</span></a>
       </dd>
     </div>
   </dl>
 
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">
-      <h2 class="govuk-heading-m">Task templates</h2>
+      <h2 class="govuk-heading-m">{{ task_object_name|capitalize }}s</h2>
     </div>
 
     <div class="govuk-grid-column-one-quarter">
       {{ govukButton({
-        "text": "Create task template",
-        "href": url("workflow:task-template-ui-create", kwargs={"workflow_template_pk": object.pk}),
+        "text": "Create a " ~ task_object_name,
+        "href": task_object_create_url,
         "classes": "govuk-button align-right"
       }) }}
     </div>
@@ -76,20 +85,20 @@
       {% if object_list %}
         {% include list_include %}
       {% else %}
-        <p class="govuk-body">There are no task templates for this workflow template.</p>
+        <p class="govuk-body">There are no {{ task_object_name }}s for this {{ object_name }}.</p>
       {% endif %}
     </div>
   </div>
 
   <div class="govuk-button-group govuk-!-margin-top-6">
     {{ govukButton({
-      "text": "Delete workflow template",
+      "text": "Delete " ~ object_name,
       "href": object.get_url("delete"),
       "classes": "govuk-button--warning"
     }) }}
     {{ govukButton({
-      "text": "Find and view workflow templates",
-      "href": "#TODO",
+      "text": "Find and view " ~ object_name ~ "s",
+      "href": object.get_url("list"),
       "classes": "govuk-button--secondary"
     }) }}
   </div>
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index fb8d97145..1d37e2cbf 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -33,8 +33,16 @@ class Meta:
         verbose_name = "workflow"
 
     def __str__(self):
+        return self.title
+
+    @property
+    def title(self) -> str:
         return self.summary_task.title
 
+    @property
+    def description(self) -> str:
+        return self.summary_task.description
+
     def get_tasks(self) -> models.QuerySet:
         """Get a QuerySet of the Tasks associated through their TaskItem
         instances to this TaskWorkflow, ordered by the position of the
@@ -42,7 +50,12 @@ def get_tasks(self) -> models.QuerySet:
         return Task.objects.filter(taskitem__queue=self).order_by("taskitem__position")
 
     def get_url(self, action: str = "detail"):
-        if action == "create":
+        if action == "detail":
+            return reverse(
+                "workflow:task-workflow-ui-detail",
+                kwargs={"pk": self.pk},
+            )
+        elif action == "create":
             return reverse(
                 "workflow:task-workflow-ui-create",
             )
@@ -193,6 +206,14 @@ def get_url(self, action: str = "detail"):
             return reverse("workflow:task-template-ui-detail", kwargs={"pk": self.pk})
         elif action == "edit":
             return reverse("workflow:task-template-ui-update", kwargs={"pk": self.pk})
+        elif action == "delete":
+            return reverse(
+                "workflow:task-template-ui-delete",
+                kwargs={
+                    "workflow_template_pk": self.taskitemtemplate.queue.pk,
+                    "pk": self.pk,
+                },
+            )
 
         return "#NOT-IMPLEMENTED"
 
diff --git a/tasks/tests/conftest.py b/tasks/tests/conftest.py
index 6c324f913..f3b877727 100644
--- a/tasks/tests/conftest.py
+++ b/tasks/tests/conftest.py
@@ -5,7 +5,9 @@
 from common.tests.factories import SubTaskFactory
 from common.tests.factories import TaskAssigneeFactory
 from common.tests.factories import TaskFactory
+from tasks.models import Task
 from tasks.models import TaskAssignee
+from tasks.models import TaskItem
 from tasks.models import TaskItemTemplate
 from tasks.models import TaskTemplate
 from tasks.models import TaskWorkflow
@@ -128,3 +130,27 @@ def task_workflow_single_task_item(task_workflow) -> TaskWorkflow:
     assert task_workflow.get_items().get() == task_item
 
     return task_workflow
+
+
+@pytest.fixture()
+def task_workflow_three_task_items(
+    task_workflow,
+) -> TaskWorkflow:
+    """Return a TaskWorkflow instance containing three TaskItems and related
+    Tasks."""
+
+    expected_count = 3
+
+    task_items = factories.TaskItemFactory.create_batch(
+        expected_count,
+        queue=task_workflow,
+    )
+
+    assert task_workflow.get_items().count() == expected_count
+    assert TaskItem.objects.filter(queue=task_workflow).count() == expected_count
+    assert (
+        Task.objects.filter(taskitem__in=[item.pk for item in task_items]).count()
+        == expected_count
+    )
+
+    return task_workflow
diff --git a/tasks/tests/factories.py b/tasks/tests/factories.py
index 030cde8f1..7c703c8b4 100644
--- a/tasks/tests/factories.py
+++ b/tasks/tests/factories.py
@@ -14,6 +14,9 @@
 class TaskWorkflowTemplateFactory(DjangoModelFactory):
     """Factory to create TaskWorkflowTemplate instances."""
 
+    title = factory.Faker("sentence")
+    description = factory.Faker("sentence")
+
     class Meta:
         model = TaskWorkflowTemplate
 
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 412d5ab35..264c6d046 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -226,7 +226,7 @@ def test_workflow_template_detail_view_displays_task_templates(valid_user_client
     assert response.status_code == 200
 
     page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
-    assert page.find("h1", text=workflow_template.title)
+    assert page.find("h1", text=f"Workflow template: {workflow_template.title}")
     assert page.find("a", text=task_template.title)
 
 
@@ -256,7 +256,7 @@ def convert_to_index(position: int) -> int:
         access."""
         return position - 1
 
-    items = list(task_workflow_template_three_task_template_items.get_items())
+    items = list(task_workflow_template_three_task_template_items.get_task_templates())
     item_to_move = items[convert_to_index(item_position)]
 
     url = reverse(
@@ -270,7 +270,9 @@ def convert_to_index(position: int) -> int:
     response = valid_user_client.post(url, form_data)
     assert response.status_code == 302
 
-    reordered_items = task_workflow_template_three_task_template_items.get_items()
+    reordered_items = (
+        task_workflow_template_three_task_template_items.get_task_templates()
+    )
     for i, reordered_item in enumerate(reordered_items):
         expected_position = convert_to_index(expected_item_order[i])
         expected_item = items[expected_position]
@@ -549,6 +551,72 @@ def test_delete_task_template_view(
     )
 
 
+def test_workflow_detail_view_displays_tasks(
+    valid_user_client,
+    task_workflow_single_task_item,
+):
+    workflow = task_workflow_single_task_item
+    task = task_workflow_single_task_item.get_tasks().get()
+
+    url = reverse(
+        "workflow:task-workflow-ui-detail",
+        kwargs={"pk": workflow.pk},
+    )
+    response = valid_user_client.get(url)
+    assert response.status_code == 200
+
+    page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
+    assert page.find("h1", text=f"Workflow: {workflow.title}")
+    assert page.find("a", text=task.title)
+
+
+@pytest.mark.parametrize(
+    ("action", "item_position", "expected_item_order"),
+    [
+        ("promote", 1, [1, 2, 3]),
+        ("promote", 2, [2, 1, 3]),
+        ("demote", 2, [1, 3, 2]),
+        ("demote", 3, [1, 2, 3]),
+        ("promote_to_first", 3, [3, 1, 2]),
+        ("demote_to_last", 1, [2, 3, 1]),
+    ],
+)
+def test_workflow_detail_view_reorder_items(
+    action,
+    item_position,
+    expected_item_order,
+    valid_user_client,
+    task_workflow_three_task_items,
+):
+    """Tests that `TaskWorkflowDetailView` handles POST requests to promote or
+    demote tasks."""
+
+    def convert_to_index(position: int) -> int:
+        """Converts a 1-based item position to a 0-based index for items array
+        access."""
+        return position - 1
+
+    items = list(task_workflow_three_task_items.get_tasks())
+    item_to_move = items[convert_to_index(item_position)]
+
+    url = reverse(
+        "workflow:task-workflow-ui-detail",
+        kwargs={"pk": task_workflow_three_task_items.pk},
+    )
+    form_data = {
+        action: item_to_move.id,
+    }
+
+    response = valid_user_client.post(url, form_data)
+    assert response.status_code == 302
+
+    reordered_items = task_workflow_three_task_items.get_tasks()
+    for i, reordered_item in enumerate(reordered_items):
+        expected_position = convert_to_index(expected_item_order[i])
+        expected_item = items[expected_position]
+        assert reordered_item.id == expected_item.id
+
+
 @pytest.mark.parametrize(
     "form_data",
     [
diff --git a/tasks/urls.py b/tasks/urls.py
index 6aaf5aee0..4ad833c41 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -72,6 +72,11 @@
 
 
 workflow_ui_patterns = [
+    path(
+        "<int:pk>/",
+        views.TaskWorkflowDetailView.as_view(),
+        name="task-workflow-ui-detail",
+    ),
     path(
         "create/",
         views.TaskWorkflowCreateView.as_view(),
diff --git a/tasks/views.py b/tasks/views.py
index 3f7e4cf17..eb91e14b7 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -27,6 +27,7 @@
 from tasks.forms import TaskWorkflowTemplateDeleteForm
 from tasks.forms import TaskWorkflowTemplateUpdateForm
 from tasks.models import Task
+from tasks.models import TaskItem
 from tasks.models import TaskItemTemplate
 from tasks.models import TaskTemplate
 from tasks.models import TaskWorkflow
@@ -260,6 +261,84 @@ def get_context_data(self, **kwargs):
         return context_data
 
 
+class TaskWorkflowDetailView(PermissionRequiredMixin, DetailView):
+    model = TaskWorkflow
+    template_name = "tasks/workflows/detail.jinja"
+    permission_required = "tasks.view_taskworkflow"
+
+    @cached_property
+    def task_workflow(self) -> TaskWorkflow:
+        return self.get_object()
+
+    @property
+    def view_url(self) -> str:
+        return reverse(
+            "workflow:task-workflow-ui-detail",
+            kwargs={"pk": self.task_workflow.pk},
+        )
+
+    def get_context_data(self, **kwargs):
+        context_data = super().get_context_data(**kwargs)
+        context_data["object_list"] = self.task_workflow.get_tasks()
+        return context_data
+
+    def post(self, request, *args, **kwargs):
+        if "promote" in request.POST:
+            self.promote(request.POST.get("promote"))
+        elif "demote" in request.POST:
+            self.demote(request.POST.get("demote"))
+        elif "promote_to_first" in request.POST:
+            self.promote_to_first(request.POST.get("promote_to_first"))
+        elif "demote_to_last" in request.POST:
+            self.demote_to_last(request.POST.get("demote_to_last"))
+
+        return HttpResponseRedirect(self.view_url)
+
+    def promote(self, task_id: int) -> None:
+        task_item = get_object_or_404(
+            TaskItem,
+            task_id=task_id,
+            queue=self.task_workflow,
+        )
+        try:
+            task_item.promote()
+        except OperationalError:
+            pass
+
+    def demote(self, task_id: int) -> None:
+        task_item = get_object_or_404(
+            TaskItem,
+            task_id=task_id,
+            queue=self.task_workflow,
+        )
+        try:
+            task_item.demote()
+        except OperationalError:
+            pass
+
+    def promote_to_first(self, task_id: int) -> None:
+        task_item = get_object_or_404(
+            TaskItem,
+            task_id=task_id,
+            queue=self.task_workflow,
+        )
+        try:
+            task_item.promote_to_first()
+        except OperationalError:
+            pass
+
+    def demote_to_last(self, task_id: int) -> None:
+        task_item = get_object_or_404(
+            TaskItem,
+            task_id=task_id,
+            queue=self.task_workflow,
+        )
+        try:
+            task_item.demote_to_last()
+        except OperationalError:
+            pass
+
+
 class TaskWorkflowCreateView(PermissionRequiredMixin, FormView):
     permission_required = "tasks.add_taskworkflow"
     template_name = "tasks/workflows/create.jinja"
@@ -305,7 +384,7 @@ class TaskWorkflowConfirmCreateView(PermissionRequiredMixin, DetailView):
 
 class TaskWorkflowTemplateDetailView(PermissionRequiredMixin, DetailView):
     model = TaskWorkflowTemplate
-    template_name = "tasks/workflows/template_detail.jinja"
+    template_name = "tasks/workflows/detail.jinja"
     permission_required = "tasks.view_taskworkflowtemplate"
 
     @cached_property

From 708944c5d9b8c3d6a736db0a6c194376813aeddf Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Thu, 28 Nov 2024 16:58:43 +0000
Subject: [PATCH 27/57] TP2000-1602 Implement workflow delete view (#1342)

* Add workflow delete view

* Add workflow delete view unit test

* Set workflows/confirm_delete context variables in view
---
 tasks/forms.py                                |  4 ++
 ...firm_delete.jinja => confirm_delete.jinja} | 19 +++---
 .../{template_delete.jinja => delete.jinja}   |  9 +--
 tasks/models/workflow.py                      |  5 ++
 tasks/tests/test_views.py                     | 41 ++++++++++++-
 tasks/urls.py                                 | 10 ++++
 tasks/views.py                                | 58 ++++++++++++++++++-
 7 files changed, 128 insertions(+), 18 deletions(-)
 rename tasks/jinja2/tasks/workflows/{template_confirm_delete.jinja => confirm_delete.jinja} (58%)
 rename tasks/jinja2/tasks/workflows/{template_delete.jinja => delete.jinja} (63%)

diff --git a/tasks/forms.py b/tasks/forms.py
index 39bcf2ea6..eb2a53fbe 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -16,6 +16,7 @@
 from common.validators import SymbolValidator
 from tasks.models import Task
 from tasks.models import TaskTemplate
+from tasks.models import TaskWorkflow
 from tasks.models import TaskWorkflowTemplate
 from workbaskets.models import WorkBasket
 
@@ -158,6 +159,9 @@ def __init__(self, *args, **kwargs):
         )
 
 
+TaskWorkflowDeleteForm = delete_form_for(TaskWorkflow)
+
+
 class TaskWorkflowTemplateBaseForm(ModelForm):
     class Meta:
         model = TaskWorkflowTemplate
diff --git a/tasks/jinja2/tasks/workflows/template_confirm_delete.jinja b/tasks/jinja2/tasks/workflows/confirm_delete.jinja
similarity index 58%
rename from tasks/jinja2/tasks/workflows/template_confirm_delete.jinja
rename to tasks/jinja2/tasks/workflows/confirm_delete.jinja
index c46e0628c..5c333a081 100644
--- a/tasks/jinja2/tasks/workflows/template_confirm_delete.jinja
+++ b/tasks/jinja2/tasks/workflows/confirm_delete.jinja
@@ -4,13 +4,13 @@
 {% from "components/panel/macro.njk" import govukPanel %}
 {% from "components/button/macro.njk" import govukButton %}
 
-{% set page_title = "Workflow template deleted" %}
+{% set page_title = verbose_name|capitalize ~ " deleted" %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(
     request,
     [
-      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {"text": "Find and view "~ verbose_name ~ "s", "href": list_url},
       {"text": page_title}
     ],
     False,
@@ -19,24 +19,23 @@
 
 {% block panel %}
   {{ govukPanel({
-    "titleText": "Workflow template ID: " ~ deleted_pk,
-    "text": "Workflow template has been deleted",
+    "titleText": verbose_name|capitalize ~ " ID: " ~ deleted_pk,
+    "text": verbose_name|capitalize ~ " has been deleted",
     "classes": "govuk-!-margin-bottom-7"
   }) }}
 {% endblock %}
 
 {% block button_group %}
   {{ govukButton({
-    "text": "Find and view workflow templates",
-    "href": "#TODO",
+    "text": "Find and view " ~ verbose_name ~ "s",
+    "href": list_url,
     "classes": "govuk-button"
   }) }}
   {{ govukButton({
-    "text": "Create a workflow template",
-    "href": url("workflow:task-workflow-template-ui-create"),
+    "text": "Create a " ~ verbose_name,
+    "href": create_url,
     "classes": "govuk-button--secondary"
   }) }}
 {% endblock %}
 
-{% block actions %}
-{% endblock %}
+{% block actions %}{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/template_delete.jinja b/tasks/jinja2/tasks/workflows/delete.jinja
similarity index 63%
rename from tasks/jinja2/tasks/workflows/template_delete.jinja
rename to tasks/jinja2/tasks/workflows/delete.jinja
index 5632034af..aff449a61 100644
--- a/tasks/jinja2/tasks/workflows/template_delete.jinja
+++ b/tasks/jinja2/tasks/workflows/delete.jinja
@@ -4,15 +4,16 @@
 {% from "components/warning-text/macro.njk" import govukWarningText %}
 {% from "components/button/macro.njk" import govukButton %}
 
-{% set page_title = "Delete workflow template: " ~ object.title %}
+{% set object_name = object._meta.verbose_name %}
+{% set page_title = "Delete " ~ object_name ~ ": " ~ object.title %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(
     request,
     [
-      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {"text": "Find and view "~ object_name ~ "s", "href": object.get_url("list")},
       {
-        "text": "Workflow template: " ~ object.title,
+        "text": object_name|capitalize ~ ": " ~ object.title,
         "href": object.get_url("detail"),
       },
       {"text": page_title}
@@ -23,7 +24,7 @@
 
 {% block form %}
   {{ govukWarningText({
-    "text": "Are you sure you want to delete this workflow template?"
+    "text": "Are you sure you want to delete this " ~ object_name ~ "?",
   }) }}
 
   {% call django_form(action=object.get_url("delete")) %}
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index 1d37e2cbf..5850935fe 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -55,6 +55,11 @@ def get_url(self, action: str = "detail"):
                 "workflow:task-workflow-ui-detail",
                 kwargs={"pk": self.pk},
             )
+        elif action == "delete":
+            return reverse(
+                "workflow:task-workflow-ui-delete",
+                kwargs={"pk": self.pk},
+            )
         elif action == "create":
             return reverse(
                 "workflow:task-workflow-ui-create",
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 264c6d046..4fc6647c7 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -8,6 +8,8 @@
 from common.tests.factories import TaskFactory
 from tasks.forms import TaskWorkflowCreateForm
 from tasks.models import ProgressState
+from tasks.models import Task
+from tasks.models import TaskItem
 from tasks.models import TaskItemTemplate
 from tasks.models import TaskLog
 from tasks.models import TaskTemplate
@@ -354,7 +356,7 @@ def test_workflow_template_delete_view(
     task_workflow_template_single_task_template_item,
 ):
     """Tests that a workflow template can be deleted (along with related
-    TaskItemPosition and TaskTemplate objects) and that the corresponding
+    TaskItemTemplate and TaskTemplate objects) and that the corresponding
     confirmation view returns a HTTP 200 response."""
 
     task_workflow_template_pk = task_workflow_template_single_task_template_item.pk
@@ -686,3 +688,40 @@ def test_workflow_create_view(
 
     soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
     assert str(created_workflow) in soup.select("h1.govuk-panel__title")[0].text
+
+
+def test_workflow_delete_view(
+    valid_user_client,
+    task_workflow_single_task_item,
+):
+    """Tests that a workflow can be deleted (along with related TaskItem and
+    Task objects) and that the corresponding confirmation view returns a HTTP
+    200 response."""
+
+    workflow_pk = task_workflow_single_task_item.pk
+    summary_task_pk = task_workflow_single_task_item.summary_task.pk
+    task_pk = task_workflow_single_task_item.get_tasks().get().pk
+
+    delete_url = task_workflow_single_task_item.get_url("delete")
+    delete_response = valid_user_client.post(delete_url)
+    assert delete_response.status_code == 302
+
+    assert not TaskWorkflow.objects.filter(
+        pk=workflow_pk,
+    ).exists()
+    assert not TaskItem.objects.filter(
+        queue_id=workflow_pk,
+    ).exists()
+    assert not Task.objects.filter(pk__in=[summary_task_pk, task_pk]).exists()
+
+    confirmation_url = reverse(
+        "workflow:task-workflow-ui-confirm-delete",
+        kwargs={"pk": workflow_pk},
+    )
+    assert delete_response.url == confirmation_url
+
+    confirmation_response = valid_user_client.get(confirmation_url)
+    assert confirmation_response.status_code == 200
+
+    soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
+    assert f"Workflow ID: {workflow_pk}" in soup.select(".govuk-panel__title")[0].text
diff --git a/tasks/urls.py b/tasks/urls.py
index 4ad833c41..cfcb80ecc 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -87,6 +87,16 @@
         views.TaskWorkflowConfirmCreateView.as_view(),
         name="task-workflow-ui-confirm-create",
     ),
+    path(
+        "<int:pk>/delete/",
+        views.TaskWorkflowDeleteView.as_view(),
+        name="task-workflow-ui-delete",
+    ),
+    path(
+        "<int:pk>/confirm-delete/",
+        views.TaskWorkflowConfirmDeleteView.as_view(),
+        name="task-workflow-ui-confirm-delete",
+    ),
 ]
 
 workflow_template_ui_patterns = [
diff --git a/tasks/views.py b/tasks/views.py
index eb91e14b7..a37047147 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -23,6 +23,7 @@
 from tasks.forms import TaskTemplateUpdateForm
 from tasks.forms import TaskUpdateForm
 from tasks.forms import TaskWorkflowCreateForm
+from tasks.forms import TaskWorkflowDeleteForm
 from tasks.forms import TaskWorkflowTemplateCreateForm
 from tasks.forms import TaskWorkflowTemplateDeleteForm
 from tasks.forms import TaskWorkflowTemplateUpdateForm
@@ -382,6 +383,50 @@ class TaskWorkflowConfirmCreateView(PermissionRequiredMixin, DetailView):
     permission_required = "tasks.add_taskworkflow"
 
 
+class TaskWorkflowDeleteView(PermissionRequiredMixin, DeleteView):
+    model = TaskWorkflow
+    template_name = "tasks/workflows/delete.jinja"
+    permission_required = "tasks.delete_taskworkflow"
+    form_class = TaskWorkflowDeleteForm
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["instance"] = self.object
+        return kwargs
+
+    @transaction.atomic
+    def form_valid(self, form):
+        summary_task = self.object.summary_task
+        self.object.get_tasks().delete()
+        result = super().form_valid(form)
+        summary_task.delete()
+        return result
+
+    def get_success_url(self):
+        return reverse(
+            "workflow:task-workflow-ui-confirm-delete",
+            kwargs={"pk": self.object.pk},
+        )
+
+
+class TaskWorkflowConfirmDeleteView(PermissionRequiredMixin, TemplateView):
+    model = TaskWorkflow
+    template_name = "tasks/workflows/confirm_delete.jinja"
+    permission_required = "tasks.change_taskworkflow"
+
+    def get_context_data(self, **kwargs):
+        context_data = super().get_context_data(**kwargs)
+        context_data.update(
+            {
+                "verbose_name": "workflow",
+                "deleted_pk": self.kwargs["pk"],
+                "create_url": reverse("workflow:task-workflow-ui-create"),
+                "list_url": "#NOT-IMPLEMENTED",
+            },
+        )
+        return context_data
+
+
 class TaskWorkflowTemplateDetailView(PermissionRequiredMixin, DetailView):
     model = TaskWorkflowTemplate
     template_name = "tasks/workflows/detail.jinja"
@@ -505,7 +550,7 @@ class TaskWorkflowTemplateConfirmUpdateView(PermissionRequiredMixin, DetailView)
 
 class TaskWorkflowTemplateDeleteView(PermissionRequiredMixin, DeleteView):
     model = TaskWorkflowTemplate
-    template_name = "tasks/workflows/template_delete.jinja"
+    template_name = "tasks/workflows/delete.jinja"
     permission_required = "tasks.delete_taskworkflowtemplate"
     form_class = TaskWorkflowTemplateDeleteForm
 
@@ -528,12 +573,19 @@ def get_success_url(self):
 
 class TaskWorkflowTemplateConfirmDeleteView(PermissionRequiredMixin, TemplateView):
     model = TaskWorkflowTemplate
-    template_name = "tasks/workflows/template_confirm_delete.jinja"
+    template_name = "tasks/workflows/confirm_delete.jinja"
     permission_required = "tasks.change_taskworkflowtemplate"
 
     def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)
-        context_data["deleted_pk"] = self.kwargs["pk"]
+        context_data.update(
+            {
+                "verbose_name": "workflow template",
+                "deleted_pk": self.kwargs["pk"],
+                "create_url": reverse("workflow:task-workflow-template-ui-create"),
+                "list_url": "#NOT-IMPLEMENTED",
+            },
+        )
         return context_data
 
 

From 02044bac4207b4906b6f86bb1d92369baf6ba64c Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:34:11 +0000
Subject: [PATCH 28/57] Factor out workflow item management helper functions
 into view mixin (#1346)

---
 tasks/views.py | 196 +++++++++++++++++++++++--------------------------
 1 file changed, 93 insertions(+), 103 deletions(-)

diff --git a/tasks/views.py b/tasks/views.py
index a37047147..4da592aba 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -27,6 +27,8 @@
 from tasks.forms import TaskWorkflowTemplateCreateForm
 from tasks.forms import TaskWorkflowTemplateDeleteForm
 from tasks.forms import TaskWorkflowTemplateUpdateForm
+from tasks.models import Queue
+from tasks.models import QueueItem
 from tasks.models import Task
 from tasks.models import TaskItem
 from tasks.models import TaskItemTemplate
@@ -262,25 +264,98 @@ def get_context_data(self, **kwargs):
         return context_data
 
 
-class TaskWorkflowDetailView(PermissionRequiredMixin, DetailView):
-    model = TaskWorkflow
-    template_name = "tasks/workflows/detail.jinja"
-    permission_required = "tasks.view_taskworkflow"
+class QueuedItemManagementMixin:
+    """A view mixin providing helper functions to manage queued items."""
+
+    queued_item_model: type[QueueItem] = None
+    """The model responsible for managing members of a queue."""
+
+    item_lookup_field: str = ""
+    """The lookup field of the instance managed by a queued item."""
+
+    queue_field: str = ""
+    """The name of the ForeignKey field relating a queued item to a queue."""
 
     @cached_property
-    def task_workflow(self) -> TaskWorkflow:
+    def queue(self) -> type[Queue]:
+        """The queue instance that is the object of the view."""
         return self.get_object()
 
+    def promote(self, lookup_id: int) -> None:
+        queued_item = get_object_or_404(
+            self.queued_item_model,
+            **{
+                self.item_lookup_field: lookup_id,
+                self.queue_field: self.queue,
+            },
+        )
+        try:
+            queued_item.promote()
+        except OperationalError:
+            pass
+
+    def demote(self, lookup_id: int) -> None:
+        queued_item = get_object_or_404(
+            self.queued_item_model,
+            **{
+                self.item_lookup_field: lookup_id,
+                self.queue_field: self.queue,
+            },
+        )
+        try:
+            queued_item.demote()
+        except OperationalError:
+            pass
+
+    def promote_to_first(self, lookup_id: int) -> None:
+        queued_item = get_object_or_404(
+            self.queued_item_model,
+            **{
+                self.item_lookup_field: lookup_id,
+                self.queue_field: self.queue,
+            },
+        )
+        try:
+            queued_item.promote_to_first()
+        except OperationalError:
+            pass
+
+    def demote_to_last(self, lookup_id: int) -> None:
+        queued_item = get_object_or_404(
+            self.queued_item_model,
+            **{
+                self.item_lookup_field: lookup_id,
+                self.queue_field: self.queue,
+            },
+        )
+        try:
+            queued_item.demote_to_last()
+        except OperationalError:
+            pass
+
+
+class TaskWorkflowDetailView(
+    PermissionRequiredMixin,
+    QueuedItemManagementMixin,
+    DetailView,
+):
+    template_name = "tasks/workflows/detail.jinja"
+    permission_required = "tasks.view_taskworkflow"
+    model = TaskWorkflow
+    queued_item_model = TaskItem
+    item_lookup_field = "task_id"
+    queue_field = "queue"
+
     @property
     def view_url(self) -> str:
         return reverse(
             "workflow:task-workflow-ui-detail",
-            kwargs={"pk": self.task_workflow.pk},
+            kwargs={"pk": self.queue.pk},
         )
 
     def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)
-        context_data["object_list"] = self.task_workflow.get_tasks()
+        context_data["object_list"] = self.queue.get_tasks()
         return context_data
 
     def post(self, request, *args, **kwargs):
@@ -295,50 +370,6 @@ def post(self, request, *args, **kwargs):
 
         return HttpResponseRedirect(self.view_url)
 
-    def promote(self, task_id: int) -> None:
-        task_item = get_object_or_404(
-            TaskItem,
-            task_id=task_id,
-            queue=self.task_workflow,
-        )
-        try:
-            task_item.promote()
-        except OperationalError:
-            pass
-
-    def demote(self, task_id: int) -> None:
-        task_item = get_object_or_404(
-            TaskItem,
-            task_id=task_id,
-            queue=self.task_workflow,
-        )
-        try:
-            task_item.demote()
-        except OperationalError:
-            pass
-
-    def promote_to_first(self, task_id: int) -> None:
-        task_item = get_object_or_404(
-            TaskItem,
-            task_id=task_id,
-            queue=self.task_workflow,
-        )
-        try:
-            task_item.promote_to_first()
-        except OperationalError:
-            pass
-
-    def demote_to_last(self, task_id: int) -> None:
-        task_item = get_object_or_404(
-            TaskItem,
-            task_id=task_id,
-            queue=self.task_workflow,
-        )
-        try:
-            task_item.demote_to_last()
-        except OperationalError:
-            pass
-
 
 class TaskWorkflowCreateView(PermissionRequiredMixin, FormView):
     permission_required = "tasks.add_taskworkflow"
@@ -427,25 +458,28 @@ def get_context_data(self, **kwargs):
         return context_data
 
 
-class TaskWorkflowTemplateDetailView(PermissionRequiredMixin, DetailView):
-    model = TaskWorkflowTemplate
+class TaskWorkflowTemplateDetailView(
+    PermissionRequiredMixin,
+    QueuedItemManagementMixin,
+    DetailView,
+):
     template_name = "tasks/workflows/detail.jinja"
     permission_required = "tasks.view_taskworkflowtemplate"
-
-    @cached_property
-    def task_workflow_template(self) -> TaskWorkflowTemplate:
-        return self.get_object()
+    model = TaskWorkflowTemplate
+    queued_item_model = TaskItemTemplate
+    item_lookup_field = "task_template_id"
+    queue_field = "queue"
 
     @property
     def view_url(self) -> str:
         return reverse(
             "workflow:task-workflow-template-ui-detail",
-            kwargs={"pk": self.task_workflow_template.pk},
+            kwargs={"pk": self.queue.pk},
         )
 
     def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)
-        context_data["object_list"] = self.task_workflow_template.get_task_templates()
+        context_data["object_list"] = self.queue.get_task_templates()
         return context_data
 
     def post(self, request, *args, **kwargs):
@@ -460,50 +494,6 @@ def post(self, request, *args, **kwargs):
 
         return HttpResponseRedirect(self.view_url)
 
-    def promote(self, task_template_id: int) -> None:
-        task_item_template = get_object_or_404(
-            TaskItemTemplate,
-            task_template_id=task_template_id,
-            queue=self.task_workflow_template,
-        )
-        try:
-            task_item_template.promote()
-        except OperationalError:
-            pass
-
-    def demote(self, task_template_id: int) -> None:
-        task_item_template = get_object_or_404(
-            TaskItemTemplate,
-            task_template_id=task_template_id,
-            queue=self.task_workflow_template,
-        )
-        try:
-            task_item_template.demote()
-        except OperationalError:
-            pass
-
-    def promote_to_first(self, task_template_id: int) -> None:
-        task_item_template = get_object_or_404(
-            TaskItemTemplate,
-            task_template_id=task_template_id,
-            queue=self.task_workflow_template,
-        )
-        try:
-            task_item_template.promote_to_first()
-        except OperationalError:
-            pass
-
-    def demote_to_last(self, task_template_id: int) -> None:
-        task_item_template = get_object_or_404(
-            TaskItemTemplate,
-            task_template_id=task_template_id,
-            queue=self.task_workflow_template,
-        )
-        try:
-            task_item_template.demote_to_last()
-        except OperationalError:
-            pass
-
 
 class TaskWorkflowTemplateCreateView(PermissionRequiredMixin, CreateView):
     model = TaskWorkflowTemplate

From 442fd3eeada32251b27f123c70460966ae86801e Mon Sep 17 00:00:00 2001
From: Marya Shariq <marya.shariq@digital.trade.gov.uk>
Date: Thu, 5 Dec 2024 15:40:55 +0000
Subject: [PATCH 29/57] Tp2000 1592 workflow template list view (#1348)

* added workflow templates list view with basic search functionality

* added unit test to check that fields are being correctly displayed as columns on an html table and fixed link in homepage tile to list views

* added workflow template list view with search functionality across title, description, and template creator

* resolved PR comments and created new migration file to prevent files clashing

* added 'list_url' context data for TaskWorkflowTemplateCreate View

* fixed typo
---
 common/jinja2/common/homepage.jinja           |  2 +-
 tasks/filters.py                              | 15 +++++
 tasks/forms.py                                |  7 ++
 tasks/jinja2/tasks/workflows/create.jinja     |  2 +-
 .../workflows/template_confirm_update.jinja   |  2 +-
 .../tasks/workflows/template_list.jinja       | 67 +++++++++++++++++++
 .../0016_taskworkflowtemplate_creator.py      | 27 ++++++++
 tasks/models/workflow.py                      | 11 +++
 tasks/tests/test_views.py                     | 22 ++++++
 tasks/urls.py                                 |  5 ++
 tasks/views.py                                | 17 ++++-
 11 files changed, 173 insertions(+), 4 deletions(-)
 create mode 100644 tasks/jinja2/tasks/workflows/template_list.jinja
 create mode 100644 tasks/migrations/0016_taskworkflowtemplate_creator.py

diff --git a/common/jinja2/common/homepage.jinja b/common/jinja2/common/homepage.jinja
index 9b55c6b6d..074063cc4 100644
--- a/common/jinja2/common/homepage.jinja
+++ b/common/jinja2/common/homepage.jinja
@@ -157,7 +157,7 @@
           >Workflows</a>
         </p>
         <p class="govuk-body"></p>
-          <a href=#TODO
+          <a href="{{ url('workflow:task-workflow-template-ui-list') }}"
             class="govuk-link"
           >Workflow templates</a>
         </p>
diff --git a/tasks/filters.py b/tasks/filters.py
index b65c79793..43784378d 100644
--- a/tasks/filters.py
+++ b/tasks/filters.py
@@ -5,6 +5,7 @@
 from common.filters import TamatoFilter
 from tasks.models import ProgressState
 from tasks.models import Task
+from tasks.models import TaskWorkflowTemplate
 
 
 class TaskFilter(TamatoFilter):
@@ -26,3 +27,17 @@ class TaskFilter(TamatoFilter):
     class Meta:
         model = Task
         fields = ["search", "category", "progress_state"]
+
+
+class WorkflowTemplateFilter(TamatoFilter):
+    search_fields = (
+        "id",
+        "title",
+        "description",
+        "creator__username",
+    )
+    clear_url = reverse_lazy("workflow:task-workflow-template-ui-list")
+
+    class Meta:
+        model = TaskWorkflowTemplate
+        fields = ["search"]
diff --git a/tasks/forms.py b/tasks/forms.py
index eb2a53fbe..1fa40f209 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -198,6 +198,13 @@ class TaskWorkflowTemplateCreateForm(TaskWorkflowTemplateBaseForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, submit_title="Create", **kwargs)
 
+    def save(self, user, commit=True):
+        instance = super().save(commit=False)
+        instance.creator = user
+        if commit:
+            instance.save()
+        return instance
+
 
 class TaskWorkflowTemplateUpdateForm(TaskWorkflowTemplateBaseForm):
     def __init__(self, *args, **kwargs):
diff --git a/tasks/jinja2/tasks/workflows/create.jinja b/tasks/jinja2/tasks/workflows/create.jinja
index 423b43452..a2affcceb 100644
--- a/tasks/jinja2/tasks/workflows/create.jinja
+++ b/tasks/jinja2/tasks/workflows/create.jinja
@@ -8,7 +8,7 @@
   {{ breadcrumbs(
     request,
     [
-      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {"text": "Find and view "~ verbose_name ~ "s", "href": list_url},
       {"text": page_title}
     ],
     False,
diff --git a/tasks/jinja2/tasks/workflows/template_confirm_update.jinja b/tasks/jinja2/tasks/workflows/template_confirm_update.jinja
index fde9d4b53..ceeea3c9a 100644
--- a/tasks/jinja2/tasks/workflows/template_confirm_update.jinja
+++ b/tasks/jinja2/tasks/workflows/template_confirm_update.jinja
@@ -10,7 +10,7 @@
   {{ breadcrumbs(
     request,
     [
-      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {"text": "Find and view workflow templates", "href": url("workflow:task-workflow-template-ui-list")},
       {
         "text": "Workflow template: " ~ object.title,
         "href": url(
diff --git a/tasks/jinja2/tasks/workflows/template_list.jinja b/tasks/jinja2/tasks/workflows/template_list.jinja
new file mode 100644
index 000000000..501c5d171
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/template_list.jinja
@@ -0,0 +1,67 @@
+{% extends "layouts/layout.jinja" %}
+
+{% from "components/table/macro.njk" import govukTable %}
+{% from "components/create_sortable_anchor.jinja" import create_sortable_anchor %}
+
+{% set page_title = "Find and view task workflow templates" %}
+
+{% set base_url = url("workflow:task-workflow-template-ui-list") %}
+
+{% block content %}
+  <h1 class="govuk-heading-xl">{{ page_title }}</h1>
+  <p class="govuk-body">
+    Search for task workflow templates.
+    Alternatively, <a class="govuk-link" href="{{ url("workflow:task-workflow-template-ui-create") }}">create a new task workflow template</a>.
+  </p>
+
+  <div class="filter-layout">
+    <div class="filter-layout__filters">
+      <h2 class="govuk-heading-m govuk-!-margin-top-3">Search and filter</h2>
+      <form method="get" action="{{ url("workflow:task-workflow-template-ui-list") }}">
+          {{ crispy(filter.form) }}
+      </form>
+    </div>
+
+  <div class="filter-layout__content">
+    {% if paginator.count > 0 %}
+      {% include "includes/common/pagination-list-summary.jinja" %}
+    {% endif %}
+    {% if object_list %}
+      {% set table_rows = [] %}
+      {% for object in object_list %}
+        {%- set workflow_template_linked_id -%}
+          <a
+            class="govuk-link"
+            href="{{ url("workflow:task-workflow-template-ui-detail", kwargs={"pk": object.pk}) }}"
+          >{{ object.pk }}</a>
+        {%- endset -%}
+
+        {{ table_rows.append([
+          {"text": workflow_template_linked_id},
+          {"text": object.title},
+          {"text": object.description},
+          {"text": object.creator.get_displayname() if object.creator else "Unknown"}
+        ]) or "" }}
+      {% endfor %}
+
+      {{ govukTable({
+        "head": [
+          {"text": "ID"},
+          {"text": "Title"},
+          {"text": "Description"},
+          {"text":"Created by"}
+        ],
+          "rows": table_rows
+        }) }}
+    {% else %}
+      <p class="govuk-body">There are no results for your search, please:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>check the spelling of your keywords</li>
+        <li>use more general keywords</li>
+        <li>select or deselect different filters</li>
+      </ul>
+    {% endif %}
+    {% include "includes/common/pagination.jinja" %}
+  </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/tasks/migrations/0016_taskworkflowtemplate_creator.py b/tasks/migrations/0016_taskworkflowtemplate_creator.py
new file mode 100644
index 000000000..68ad3ffa1
--- /dev/null
+++ b/tasks/migrations/0016_taskworkflowtemplate_creator.py
@@ -0,0 +1,27 @@
+# Generated by Django 4.2.15 on 2024-12-05 15:15
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("tasks", "0015_alter_taskworkflow_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="taskworkflowtemplate",
+            name="creator",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="created_taskworkflowtemplates",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index 5850935fe..79a42609e 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.db import models
 from django.db.transaction import atomic
 from django.urls import reverse
@@ -111,6 +112,12 @@ class TaskWorkflowTemplate(Queue):
     This isn't the same as the description that may be applied to a TaskWorkflow
     instance generated from a template.
     """
+    creator = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        null=True,
+        on_delete=models.PROTECT,
+        related_name="created_taskworkflowtemplates",
+    )
 
     class Meta:
         verbose_name = "workflow template"
@@ -184,6 +191,10 @@ def get_url(self, action: str = "detail"):
             return reverse(
                 "workflow:task-workflow-template-ui-create",
             )
+        elif action == "list":
+            return reverse(
+                "workflow:task-workflow-template-ui-list",
+            )
 
         return "#NOT-IMPLEMENTED"
 
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 4fc6647c7..d125a0a45 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -16,6 +16,7 @@
 from tasks.models import TaskWorkflow
 from tasks.models import TaskWorkflowTemplate
 from tasks.tests.factories import TaskItemTemplateFactory
+from tasks.tests.factories import TaskWorkflowTemplateFactory
 
 pytestmark = pytest.mark.django_db
 
@@ -553,6 +554,27 @@ def test_delete_task_template_view(
     )
 
 
+def test_workflow_template_list_view(valid_user, client):
+    """Test that valid user receives a 200 on GET for TaskWorkflowList view and
+    values display in table."""
+    template_instance = TaskWorkflowTemplateFactory.create(creator=valid_user)
+
+    url = reverse("workflow:task-workflow-template-ui-list")
+    client.force_login(valid_user)
+    response = client.get(url)
+
+    assert response.status_code == 200
+
+    soup = BeautifulSoup(str(response.content), "html.parser")
+    table = soup.select("table")[0]
+    row_text = [row.text for row in table.findChildren("td")]
+
+    assert template_instance.title in row_text
+    assert str(template_instance.id) in row_text
+    assert template_instance.description in row_text
+    assert template_instance.creator.get_displayname() in row_text
+
+
 def test_workflow_detail_view_displays_tasks(
     valid_user_client,
     task_workflow_single_task_item,
diff --git a/tasks/urls.py b/tasks/urls.py
index cfcb80ecc..0601ba6d4 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -100,6 +100,11 @@
 ]
 
 workflow_template_ui_patterns = [
+    path(
+        "",
+        views.TaskWorkflowTemplateListView.as_view(),
+        name="task-workflow-template-ui-list",
+    ),
     path(
         "<int:pk>/",
         views.TaskWorkflowTemplateDetailView.as_view(),
diff --git a/tasks/views.py b/tasks/views.py
index 4da592aba..ee27a5ee8 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -15,6 +15,7 @@
 from common.views import SortingMixin
 from common.views import WithPaginationListView
 from tasks.filters import TaskFilter
+from tasks.filters import WorkflowTemplateFilter
 from tasks.forms import SubTaskCreateForm
 from tasks.forms import TaskCreateForm
 from tasks.forms import TaskDeleteForm
@@ -264,6 +265,18 @@ def get_context_data(self, **kwargs):
         return context_data
 
 
+class TaskWorkflowTemplateListView(PermissionRequiredMixin, WithPaginationListView):
+    model = TaskWorkflowTemplate
+    template_name = "tasks/workflows/template_list.jinja"
+    permission_required = "tasks.view_taskworkflowtemplate"
+    paginate_by = 20
+    filterset_class = WorkflowTemplateFilter
+
+    def get_queryset(self):
+        queryset = TaskWorkflowTemplate.objects.all()
+        return queryset
+
+
 class QueuedItemManagementMixin:
     """A view mixin providing helper functions to manage queued items."""
 
@@ -379,6 +392,7 @@ class TaskWorkflowCreateView(PermissionRequiredMixin, FormView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["verbose_name"] = "workflow"
+        context["list_url"] = "#NOT-IMPLEMENTED"
         return context
 
     def form_valid(self, form):
@@ -504,6 +518,7 @@ class TaskWorkflowTemplateCreateView(PermissionRequiredMixin, CreateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["verbose_name"] = "workflow template"
+        context["list_url"] = reverse("workflow:task-workflow-template-ui-list")
         return context
 
     def get_success_url(self):
@@ -573,7 +588,7 @@ def get_context_data(self, **kwargs):
                 "verbose_name": "workflow template",
                 "deleted_pk": self.kwargs["pk"],
                 "create_url": reverse("workflow:task-workflow-template-ui-create"),
-                "list_url": "#NOT-IMPLEMENTED",
+                "list_url": reverse("workflow:task-workflow-template-ui-list"),
             },
         )
         return context_data

From 363bced4e0a5bcde5fbe7904d631c95a7c7610a4 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Fri, 6 Dec 2024 11:22:01 +0000
Subject: [PATCH 30/57] TP2000-1582  Enable customisable queue field name on
 QueueItem subclasses (#1343)

* Amend Queue model docstring

* Enable customisable queue field name of QueueItem concrete subclasses

* Add QueueItem metaclass validation tests

* Add type hint to QueueItem.queue_field and update its docstring

* Get field_name post-init to include inherited attributes from parent class

* Rename queue field on TaskItem and TaskItemTemplate models

* Update references to named queue

* Recommend QueueItem subclasses redefine model Meta class following queue field renaming
---
 common/util.py                                |  2 +-
 ...rename_queue_taskitem_workflow_and_more.py | 51 +++++++++++
 tasks/models/queue.py                         | 90 ++++++++++++++-----
 tasks/models/workflow.py                      | 32 +++++--
 tasks/tests/conftest.py                       | 12 +--
 tasks/tests/factories.py                      |  4 +-
 tasks/tests/test_queue_models.py              | 60 +++++++++++++
 tasks/tests/test_views.py                     |  6 +-
 tasks/views.py                                | 26 ++++--
 9 files changed, 231 insertions(+), 52 deletions(-)
 create mode 100644 tasks/migrations/0017_rename_queue_taskitem_workflow_and_more.py

diff --git a/common/util.py b/common/util.py
index 74a71a21f..116aff2aa 100644
--- a/common/util.py
+++ b/common/util.py
@@ -796,7 +796,7 @@ def get_related_names(instance, related_model) -> list[str]:
 
     If a reverse foreign-key relationship exists but no related name has been
     defined, a default name in the format `relatedmodel_set` will be returned.
-    If no such relationships exist, an empty list if returned.
+    If no such relationships exist, an empty list is returned.
     """
     related_names = []
     for field in instance._meta.get_fields():
diff --git a/tasks/migrations/0017_rename_queue_taskitem_workflow_and_more.py b/tasks/migrations/0017_rename_queue_taskitem_workflow_and_more.py
new file mode 100644
index 000000000..1c2c8b37d
--- /dev/null
+++ b/tasks/migrations/0017_rename_queue_taskitem_workflow_and_more.py
@@ -0,0 +1,51 @@
+# Generated by Django 4.2.15 on 2024-12-05 15:46
+
+import django.db.models.deletion
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0016_taskworkflowtemplate_creator"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="taskitem",
+            old_name="queue",
+            new_name="workflow",
+        ),
+        migrations.AlterField(
+            model_name="taskitem",
+            name="workflow",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="workflow_items",
+                to="tasks.taskworkflow",
+            ),
+        ),
+        migrations.AlterModelOptions(
+            name="taskitem",
+            options={"ordering": ["workflow", "position"]},
+        ),
+        migrations.RenameField(
+            model_name="taskitemtemplate",
+            old_name="queue",
+            new_name="workflow_template",
+        ),
+        migrations.AlterField(
+            model_name="taskitemtemplate",
+            name="workflow_template",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="workflow_template_items",
+                to="tasks.taskworkflowtemplate",
+            ),
+        ),
+        migrations.AlterModelOptions(
+            name="taskitemtemplate",
+            options={"ordering": ["workflow_template", "position"]},
+        ),
+    ]
diff --git a/tasks/models/queue.py b/tasks/models/queue.py
index 79aabb103..780f54d2d 100644
--- a/tasks/models/queue.py
+++ b/tasks/models/queue.py
@@ -2,6 +2,7 @@
 
 from typing import Self
 
+from django.core.exceptions import FieldDoesNotExist
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 from django.db.transaction import atomic
@@ -18,11 +19,8 @@ class Queue(models.Model):
     """
     A (FIFO) queue.
 
-    Note: This abstract class only supports a single reverse foreign-key relationship
-    to `QueueItem` for each instance. As such, all instance methods in this class use
-    the first-returned related name to access related `QueueItem` objects. This means that
-    if there are multiple relationships, only the first one will be considered when
-    retrieving items from the queue,
+    Note: This abstract class only supports a single, reverse foreign-key relationship
+    to `QueueItem` for each instance (i.e `QueueItem` instances are assumed to belong only to a single `Queue` instance).
     """
 
     class Meta:
@@ -65,18 +63,31 @@ class QueueItemMetaClass(models.base.ModelBase):
     def __new__(cls, name, bases, attrs):
         new_class = super().__new__(cls, name, bases, attrs)
 
-        if (
-            "QueueItem" in [base.__name__ for base in bases]
-            and not new_class._meta.abstract
-        ):
-            queue_field = attrs.get("queue", None)
-            if not queue_field or not isinstance(queue_field, models.ForeignKey):
-                raise RequiredFieldError(
-                    f"{name} must have a 'queue' ForeignKey field.",
-                )
+        if not new_class._meta.abstract:
+            queue_field_name = getattr(new_class, "queue_field", None)
+            cls.validate_queue_field(new_class, queue_field_name)
 
         return new_class
 
+    @staticmethod
+    def validate_queue_field(new_class: type[Self], queue_field_name: str) -> None:
+        """Validate that concrete subclasses of `QueueItem` have a ForeignKey
+        field to a subclass of `Queue` model."""
+        try:
+            queue_field = new_class._meta.get_field(queue_field_name)
+        except FieldDoesNotExist:
+            queue_field = None
+
+        if not queue_field or not isinstance(queue_field, models.ForeignKey):
+            raise RequiredFieldError(
+                f"{new_class.__name__} must have a 'queue' ForeignKey field. The name of the field must match the value given to the 'queue_field' attribute on the model.",
+            )
+
+        if not issubclass(queue_field.remote_field.model, Queue):
+            raise RequiredFieldError(
+                f"{queue_field} must be a ForeignKey field to a subclass of 'Queue' model.",
+            )
+
 
 class QueueItemManager(models.Manager):
     @atomic
@@ -85,7 +96,8 @@ def create(self, **kwargs) -> QueueItem:
         param, and place it in last position."""
 
         with TableLock(self.model, lock=TableLock.EXCLUSIVE):
-            queue = kwargs.pop("queue")
+            queue_field = self.model.queue_field
+            queue = kwargs.pop(queue_field)
             position = kwargs.pop("position", (queue.get_items().count() + 1))
 
             if position <= 0:
@@ -94,8 +106,8 @@ def create(self, **kwargs) -> QueueItem:
                 )
 
             return super().create(
-                queue=queue,
                 position=position,
+                **{queue_field: queue},
                 **kwargs,
             )
 
@@ -107,6 +119,18 @@ class Meta:
         abstract = True
         ordering = ["queue", "position"]
 
+    queue_field: str = "queue"
+    """
+    The name of the required ForeignKey field relating this instance to a Queue
+    instance.
+
+    The value of this attribute can be inherited as is or overridden in
+    subclasses to reflect the specific purpose or role of the queue.
+
+    If this value is overridden, the subclass must redefine the `Meta` class
+    to maintain ordering based on the queue field.
+    """
+
     position = models.PositiveSmallIntegerField(
         db_index=True,
         editable=False,
@@ -117,6 +141,14 @@ class Meta:
 
     objects = QueueItemManager()
 
+    def get_queue_field(self) -> str:
+        """Return the queue field name on this instance."""
+        return self.__class__.queue_field
+
+    def get_queue(self) -> type[Queue]:
+        """Return the queue instance related to this instance."""
+        return getattr(self, self.get_queue_field())
+
     @atomic
     def delete(self):
         """Remove and delete instance from its queue, shuffling all successive
@@ -125,7 +157,7 @@ def delete(self):
 
         self.__class__.objects.select_for_update(nowait=True).filter(
             position__gt=instance.position,
-            queue=instance.queue,
+            **{self.get_queue_field(): self.get_queue()},
         ).update(position=models.F("position") - 1)
 
         return super().delete()
@@ -146,7 +178,7 @@ def promote(self) -> Self:
 
         item_to_demote = self.__class__.objects.select_for_update(nowait=True).get(
             position=instance.position - 1,
-            queue=instance.queue,
+            **{self.get_queue_field(): self.get_queue()},
         )
         item_to_demote.position += 1
         instance.position -= 1
@@ -166,12 +198,18 @@ def demote(self) -> Self:
         """
         instance = self.__class__.objects.select_for_update(nowait=True).get(pk=self.pk)
 
-        if instance.position == self.queue.max_position:
+        queue_field = self.get_queue_field()
+        queue = self.get_queue()
+        queue_kwarg = {
+            queue_field: queue,
+        }
+
+        if instance.position == queue.max_position:
             return instance
 
         item_to_promote = self.__class__.objects.select_for_update(nowait=True).get(
             position=instance.position + 1,
-            queue=instance.queue,
+            **queue_kwarg,
         )
         item_to_promote.position -= 1
         instance.position += 1
@@ -198,7 +236,7 @@ def promote_to_first(self) -> Self:
 
         self.__class__.objects.select_for_update(nowait=True).filter(
             position__lt=instance.position,
-            queue=instance.queue,
+            **{self.get_queue_field(): self.get_queue()},
         ).update(position=models.F("position") + 1)
 
         instance.position = 1
@@ -219,13 +257,19 @@ def demote_to_last(self) -> Self:
         """
         instance = self.__class__.objects.select_for_update(nowait=True).get(pk=self.pk)
 
-        last_place = self.queue.max_position
+        queue_field = self.get_queue_field()
+        queue = self.get_queue()
+        queue_kwarg = {
+            queue_field: queue,
+        }
+
+        last_place = queue.max_position
         if instance.position == last_place:
             return instance
 
         self.__class__.objects.select_for_update(nowait=True).filter(
             position__gt=instance.position,
-            queue=instance.queue,
+            **queue_kwarg,
         ).update(position=models.F("position") - 1)
 
         instance.position = last_place
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index 79a42609e..15be3e5ba 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -48,7 +48,9 @@ def get_tasks(self) -> models.QuerySet:
         """Get a QuerySet of the Tasks associated through their TaskItem
         instances to this TaskWorkflow, ordered by the position of the
         TaskItem."""
-        return Task.objects.filter(taskitem__queue=self).order_by("taskitem__position")
+        return Task.objects.filter(taskitem__workflow=self).order_by(
+            "taskitem__position",
+        )
 
     def get_url(self, action: str = "detail"):
         if action == "detail":
@@ -73,9 +75,11 @@ class TaskItem(QueueItem):
     """Task item queue management for Task instances (these should always be
     subtasks)."""
 
-    queue = models.ForeignKey(
+    queue_field = "workflow"
+
+    workflow = models.ForeignKey(
         TaskWorkflow,
-        related_name="queue_items",
+        related_name="workflow_items",
         on_delete=models.CASCADE,
     )
     task = models.OneToOneField(
@@ -84,6 +88,9 @@ class TaskItem(QueueItem):
     )
     """The Task instance managed by this TaskItem."""
 
+    class Meta:
+        ordering = ["workflow", "position"]
+
 
 # ----------------------------------------
 # - Template workflows and template tasks.
@@ -129,7 +136,9 @@ def get_task_templates(self) -> models.QuerySet:
         """Get a QuerySet of the TaskTemplates associated through their
         TaskItemTemplate instances to this TaskWorkflowTemplate, ordered by the
         position of the TaskItemTemplate."""
-        return TaskTemplate.objects.filter(taskitemtemplate__queue=self).order_by(
+        return TaskTemplate.objects.filter(
+            taskitemtemplate__workflow_template=self,
+        ).order_by(
             "taskitemtemplate__position",
         )
 
@@ -155,7 +164,7 @@ def create_task_workflow(
 
         task_item_templates = TaskItemTemplate.objects.select_related(
             "task_template",
-        ).filter(queue=self)
+        ).filter(workflow_template=self)
         for task_item_template in task_item_templates:
             task_template = task_item_template.task_template
             task = Task.objects.create(
@@ -165,7 +174,7 @@ def create_task_workflow(
             )
             TaskItem.objects.create(
                 position=task_item_template.position,
-                queue=task_workflow,
+                workflow=task_workflow,
                 task=task,
             )
 
@@ -202,9 +211,11 @@ def get_url(self, action: str = "detail"):
 class TaskItemTemplate(QueueItem):
     """Queue item management for TaskTemplate instances."""
 
-    queue = models.ForeignKey(
+    queue_field = "workflow_template"
+
+    workflow_template = models.ForeignKey(
         TaskWorkflowTemplate,
-        related_name="queue_items",
+        related_name="workflow_template_items",
         on_delete=models.CASCADE,
     )
     task_template = models.OneToOneField(
@@ -212,6 +223,9 @@ class TaskItemTemplate(QueueItem):
         on_delete=models.CASCADE,
     )
 
+    class Meta:
+        ordering = ["workflow_template", "position"]
+
 
 class TaskTemplate(TaskBase):
     """Template used to create Task instances from within a template
@@ -226,7 +240,7 @@ def get_url(self, action: str = "detail"):
             return reverse(
                 "workflow:task-template-ui-delete",
                 kwargs={
-                    "workflow_template_pk": self.taskitemtemplate.queue.pk,
+                    "workflow_template_pk": self.taskitemtemplate.workflow_template.pk,
                     "pk": self.pk,
                 },
             )
diff --git a/tasks/tests/conftest.py b/tasks/tests/conftest.py
index f3b877727..c56a17eff 100644
--- a/tasks/tests/conftest.py
+++ b/tasks/tests/conftest.py
@@ -69,7 +69,7 @@ def task_workflow_template_single_task_template_item(
 
     task_template = factories.TaskTemplateFactory.create()
     factories.TaskItemTemplateFactory.create(
-        queue=task_workflow_template,
+        workflow_template=task_workflow_template,
         task_template=task_template,
     )
 
@@ -89,7 +89,7 @@ def task_workflow_template_three_task_template_items(
     for _ in range(3):
         task_template = factories.TaskTemplateFactory.create()
         task_item_template = factories.TaskItemTemplateFactory.create(
-            queue=task_workflow_template,
+            workflow_template=task_workflow_template,
             task_template=task_template,
         )
         task_item_templates.append(task_item_template)
@@ -97,7 +97,7 @@ def task_workflow_template_three_task_template_items(
     assert task_workflow_template.get_items().count() == 3
     assert (
         TaskItemTemplate.objects.filter(
-            queue=task_workflow_template,
+            workflow_template=task_workflow_template,
         ).count()
         == 3
     )
@@ -123,7 +123,7 @@ def task_workflow_single_task_item(task_workflow) -> TaskWorkflow:
     associated Task instance."""
 
     task_item = factories.TaskItemFactory.create(
-        queue=task_workflow,
+        workflow=task_workflow,
     )
 
     assert task_workflow.get_items().count() == 1
@@ -143,11 +143,11 @@ def task_workflow_three_task_items(
 
     task_items = factories.TaskItemFactory.create_batch(
         expected_count,
-        queue=task_workflow,
+        workflow=task_workflow,
     )
 
     assert task_workflow.get_items().count() == expected_count
-    assert TaskItem.objects.filter(queue=task_workflow).count() == expected_count
+    assert TaskItem.objects.filter(workflow=task_workflow).count() == expected_count
     assert (
         Task.objects.filter(taskitem__in=[item.pk for item in task_items]).count()
         == expected_count
diff --git a/tasks/tests/factories.py b/tasks/tests/factories.py
index 7c703c8b4..95d66f29a 100644
--- a/tasks/tests/factories.py
+++ b/tasks/tests/factories.py
@@ -38,7 +38,7 @@ class TaskItemTemplateFactory(DjangoModelFactory):
     class Meta:
         model = TaskItemTemplate
 
-    queue = SubFactory(TaskWorkflowTemplateFactory)
+    workflow_template = SubFactory(TaskWorkflowTemplateFactory)
     task_template = SubFactory(TaskTemplateFactory)
 
 
@@ -57,5 +57,5 @@ class TaskItemFactory(DjangoModelFactory):
     class Meta:
         model = TaskItem
 
-    queue = SubFactory(TaskWorkflowFactory)
+    workflow = SubFactory(TaskWorkflowFactory)
     task = SubFactory(TaskFactory)
diff --git a/tasks/tests/test_queue_models.py b/tasks/tests/test_queue_models.py
index 3a878695d..d56f00f1d 100644
--- a/tasks/tests/test_queue_models.py
+++ b/tasks/tests/test_queue_models.py
@@ -1,7 +1,11 @@
 import pytest
+from django.db.models import CASCADE
+from django.db.models import ForeignKey
 from factory import SubFactory
 from factory.django import DjangoModelFactory
 
+from tasks.models import QueueItem
+from tasks.models import RequiredFieldError
 from tasks.tests.test_queue.models import TestQueue
 from tasks.tests.test_queue.models import TestQueueItem
 
@@ -59,6 +63,62 @@ def three_item_queue(queue) -> TestQueue:
     return queue
 
 
+def test_queueitem_metaclass_validation_missing_queue_field():
+    """Tests that a concrete sublass of `QueueItem` must provide a queue field
+    on the model."""
+    with pytest.raises(RequiredFieldError) as error:
+
+        class TestQueueItemSubclass(QueueItem):
+            class Meta:
+                abstract = False
+
+        TestQueueItemSubclass()
+
+    assert (
+        "must have a 'queue' ForeignKey field. The name of the field must match the value given to the 'queue_field' attribute on the model."
+        in str(error.value)
+    )
+
+
+def test_queueitem_metaclass_validation_mismatched_queue_field():
+    """Tests that the `QueueItem.queue_field` attribute on a concrete subclass
+    must match its queue ForeignKey field."""
+    with pytest.raises(RequiredFieldError) as error:
+
+        class TestQueueItemSubclass(QueueItem):
+            class Meta:
+                abstract = False
+
+            queue_field = "test_queue"
+            queue = ForeignKey(TestQueue, on_delete=CASCADE)
+
+        TestQueueItemSubclass()
+
+    assert (
+        "The name of the field must match the value given to the 'queue_field' attribute on the model."
+        in str(error.value)
+    )
+
+
+def test_queueitem_metaclass_validation_invalid_model():
+    """Tests that a concrete subclass of `QueueItem` must have a ForeignKey
+    field to a subclass of `Queue`."""
+    with pytest.raises(RequiredFieldError) as error:
+
+        class TestQueueItemSubclass(QueueItem):
+            class Meta:
+                abstract = False
+
+            queue_field = "test_queue"
+            test_queue = ForeignKey(QueueItem, on_delete=CASCADE)
+
+        TestQueueItemSubclass()
+
+    assert "must be a ForeignKey field to a subclass of 'Queue' model" in str(
+        error.value,
+    )
+
+
 def test_empty_queue(queue):
     assert queue.max_position == 0
     assert queue.get_first() == None
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index d125a0a45..902ed0c57 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -219,7 +219,7 @@ def test_delete_subtask_missing_user_permissions(
 def test_workflow_template_detail_view_displays_task_templates(valid_user_client):
     task_item_template = TaskItemTemplateFactory.create()
     task_template = task_item_template.task_template
-    workflow_template = task_item_template.queue
+    workflow_template = task_item_template.workflow_template
 
     url = reverse(
         "workflow:task-workflow-template-ui-detail",
@@ -373,7 +373,7 @@ def test_workflow_template_delete_view(
         pk=task_workflow_template_pk,
     ).exists()
     assert not TaskItemTemplate.objects.filter(
-        queue_id=task_workflow_template_pk,
+        workflow_template_id=task_workflow_template_pk,
     ).exists()
     assert not TaskTemplate.objects.filter(pk=task_template_pk).exists()
 
@@ -732,7 +732,7 @@ def test_workflow_delete_view(
         pk=workflow_pk,
     ).exists()
     assert not TaskItem.objects.filter(
-        queue_id=workflow_pk,
+        workflow_id=workflow_pk,
     ).exists()
     assert not Task.objects.filter(pk__in=[summary_task_pk, task_pk]).exists()
 
diff --git a/tasks/views.py b/tasks/views.py
index ee27a5ee8..48331bfa0 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -357,7 +357,7 @@ class TaskWorkflowDetailView(
     model = TaskWorkflow
     queued_item_model = TaskItem
     item_lookup_field = "task_id"
-    queue_field = "queue"
+    queue_field = queued_item_model.queue_field
 
     @property
     def view_url(self) -> str:
@@ -482,7 +482,7 @@ class TaskWorkflowTemplateDetailView(
     model = TaskWorkflowTemplate
     queued_item_model = TaskItemTemplate
     item_lookup_field = "task_template_id"
-    queue_field = "queue"
+    queue_field = queued_item_model.queue_field
 
     @property
     def view_url(self) -> str:
@@ -602,7 +602,9 @@ class TaskTemplateDetailView(PermissionRequiredMixin, DetailView):
     def get_context_data(self, **kwargs) -> dict:
         context = super().get_context_data(**kwargs)
 
-        context["task_workflow_template"] = self.get_object().taskitemtemplate.queue
+        context["task_workflow_template"] = (
+            self.get_object().taskitemtemplate.workflow_template
+        )
 
         return context
 
@@ -630,7 +632,7 @@ def form_valid(self, form) -> HttpResponseRedirect:
         with transaction.atomic():
             self.object = form.save()
             TaskItemTemplate.objects.create(
-                queue=self.get_task_workflow_template(),
+                workflow_template=self.get_task_workflow_template(),
                 task_template=self.object,
             )
 
@@ -651,7 +653,9 @@ class TaskTemplateConfirmCreateView(PermissionRequiredMixin, DetailView):
     def get_context_data(self, **kwargs) -> dict:
         context = super().get_context_data(**kwargs)
 
-        context["task_workflow_template"] = self.get_object().taskitemtemplate.queue
+        context["task_workflow_template"] = (
+            self.get_object().taskitemtemplate.workflow_template
+        )
 
         return context
 
@@ -666,7 +670,9 @@ def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
         context["page_title"] = f"Update task template: {self.get_object().title}"
-        context["task_workflow_template"] = self.get_object().taskitemtemplate.queue
+        context["task_workflow_template"] = (
+            self.get_object().taskitemtemplate.workflow_template
+        )
 
         return context
 
@@ -685,7 +691,9 @@ class TaskTemplateConfirmUpdateView(PermissionRequiredMixin, DetailView):
     def get_context_data(self, **kwargs) -> dict:
         context = super().get_context_data(**kwargs)
 
-        context["task_workflow_template"] = self.get_object().taskitemtemplate.queue
+        context["task_workflow_template"] = (
+            self.get_object().taskitemtemplate.workflow_template
+        )
 
         return context
 
@@ -704,7 +712,9 @@ def get_form_kwargs(self):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        context["task_workflow_template"] = self.get_object().taskitemtemplate.queue
+        context["task_workflow_template"] = (
+            self.get_object().taskitemtemplate.workflow_template
+        )
 
         return context
 

From ec10b14f8464c18c3cec2d817fd98aff4f558cbb Mon Sep 17 00:00:00 2001
From: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>
Date: Fri, 6 Dec 2024 11:46:53 +0000
Subject: [PATCH 31/57] Include user param in form.save() call (#1350)

---
 tasks/views.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tasks/views.py b/tasks/views.py
index 48331bfa0..1e98840ab 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -521,6 +521,10 @@ def get_context_data(self, **kwargs):
         context["list_url"] = reverse("workflow:task-workflow-template-ui-list")
         return context
 
+    def form_valid(self, form):
+        self.object = form.save(user=self.request.user)
+        return HttpResponseRedirect(self.get_success_url())
+
     def get_success_url(self):
         return reverse(
             "workflow:task-workflow-template-ui-confirm-create",

From 821d5e84d716c3c84f6f16c80a60f57b44f856b0 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Tue, 10 Dec 2024 11:05:52 +0000
Subject: [PATCH 32/57] TP2000-1557  Implement workflow edit view (#1347)

* Add TaskWorkflowUpdateForm

* Refactor confirm_update and edit templates for Workflow and WorkflowTemplate reuse

* Add TaskWorkflow update view

* Add edit action to TaskWorkflow.get_url()

* Add workflow update view & form tests
---
 tasks/forms.py                                | 55 +++++++++++++++++++
 .../tasks/workflows/confirm_update.jinja      | 53 ++++++++++++++++++
 tasks/jinja2/tasks/workflows/edit.jinja       | 22 ++++++++
 .../workflows/template_confirm_update.jinja   | 49 -----------------
 .../tasks/workflows/template_edit.jinja       | 19 -------
 tasks/models/workflow.py                      |  5 ++
 tasks/tests/test_forms.py                     | 16 ++++++
 tasks/tests/test_views.py                     | 33 +++++++++++
 tasks/urls.py                                 | 10 ++++
 tasks/views.py                                | 24 +++++++-
 10 files changed, 216 insertions(+), 70 deletions(-)
 create mode 100644 tasks/jinja2/tasks/workflows/confirm_update.jinja
 create mode 100644 tasks/jinja2/tasks/workflows/edit.jinja
 delete mode 100644 tasks/jinja2/tasks/workflows/template_confirm_update.jinja
 delete mode 100644 tasks/jinja2/tasks/workflows/template_edit.jinja

diff --git a/tasks/forms.py b/tasks/forms.py
index 1fa40f209..5fab477ca 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -3,6 +3,7 @@
 from crispy_forms_gds.layout import Layout
 from crispy_forms_gds.layout import Size
 from crispy_forms_gds.layout import Submit
+from django.db import transaction
 from django.db.models import TextChoices
 from django.forms import CharField
 from django.forms import Form
@@ -162,6 +163,60 @@ def __init__(self, *args, **kwargs):
 TaskWorkflowDeleteForm = delete_form_for(TaskWorkflow)
 
 
+class TaskWorkflowUpdateForm(ModelForm):
+    title = CharField(
+        max_length=255,
+        validators=[SymbolValidator],
+        error_messages={
+            "required": "Enter a title",
+        },
+    )
+    description = CharField(
+        validators=[SymbolValidator],
+        widget=Textarea(),
+        error_messages={
+            "required": "Enter a description",
+        },
+    )
+
+    class Meta:
+        model = TaskWorkflow
+        fields = []
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.init_fields()
+        self.init_layout()
+
+    def init_fields(self):
+        self.fields["title"].initial = self.instance.summary_task.title
+        self.fields["description"].initial = self.instance.summary_task.description
+
+    def init_layout(self):
+        self.helper = FormHelper(self)
+        self.helper.label_size = Size.SMALL
+        self.helper.legend_size = Size.SMALL
+        self.helper.layout = Layout(
+            "title",
+            "description",
+            Submit(
+                "submit",
+                "Update",
+                data_module="govuk-button",
+                data_prevent_double_click="true",
+            ),
+        )
+
+    @transaction.atomic
+    def save(self, commit=True):
+        summary_task = self.instance.summary_task
+        summary_task.title = self.cleaned_data["title"]
+        summary_task.description = self.cleaned_data["description"]
+        if commit:
+            summary_task.save()
+        return self.instance
+
+
 class TaskWorkflowTemplateBaseForm(ModelForm):
     class Meta:
         model = TaskWorkflowTemplate
diff --git a/tasks/jinja2/tasks/workflows/confirm_update.jinja b/tasks/jinja2/tasks/workflows/confirm_update.jinja
new file mode 100644
index 000000000..9c4efc761
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/confirm_update.jinja
@@ -0,0 +1,53 @@
+{% extends "layouts/confirm.jinja" %}
+
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+{% from "components/panel/macro.njk" import govukPanel %}
+{% from "components/button/macro.njk" import govukButton %}
+
+{% set object_name = object._meta.verbose_name %}
+{% set page_title = object_name|capitalize ~ " updated" %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(
+    request,
+    [
+      {"text": "Find and view " ~ object_name ~ "s", "href": object.get_url("list")},
+      {"text": object_name|capitalize ~ ": " ~ object.title, "href": object.get_url("detail")},
+      {"text": page_title}
+    ],
+    with_workbasket=False,
+  ) }}
+{% endblock %}
+
+{% block panel %}
+  {{ govukPanel({
+    "titleText": object_name|capitalize ~ ": " ~ object,
+    "text": "You have updated the " ~ object_name,
+    "classes": "govuk-!-margin-bottom-7"
+  }) }}
+{% endblock %}
+
+{% block button_group %}
+  {{ govukButton({
+    "text": "View " ~ object_name,
+    "href": object.get_url("detail"),
+    "classes": "govuk-button"
+  }) }}
+  {% if object_name == "workflow" %}
+    {{ govukButton({
+      "text": "Create a task",
+      "href": "#TODO",
+      "classes": "govuk-button--secondary"
+    }) }}
+  {% elif object_name == "workflow template" %}
+    {{ govukButton({
+      "text": "Create a task template",
+      "href": url("workflow:task-template-ui-create", kwargs={"workflow_template_pk": object.pk}),
+      "classes": "govuk-button--secondary"
+    }) }}
+  {% endif %}
+{% endblock %}
+
+{% block actions %}
+  <a href={{ object.get_url("list") }} class="govuk-link">Find and view {{object_name}}s</a>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/edit.jinja b/tasks/jinja2/tasks/workflows/edit.jinja
new file mode 100644
index 000000000..f4789b63d
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/edit.jinja
@@ -0,0 +1,22 @@
+{% extends "layouts/form.jinja" %}
+{% from "components/breadcrumbs.jinja" import breadcrumbs %}
+
+{% set object_name = object._meta.verbose_name %}
+
+{% set page_title = "Edit " ~ object_name ~ " details" %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and view " ~ object_name ~ "s", "href": object.get_url("list")},
+      {"text": object_name|capitalize ~ ": " ~ object.title, "href": object.get_url("detail")},
+      {"text": page_title}
+    ],
+    with_workbasket=False,
+  )}}
+{% endblock %}
+
+{% block form %}
+  {% call django_form() %}
+    {{ crispy(form) }}
+  {% endcall %}
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/template_confirm_update.jinja b/tasks/jinja2/tasks/workflows/template_confirm_update.jinja
deleted file mode 100644
index ceeea3c9a..000000000
--- a/tasks/jinja2/tasks/workflows/template_confirm_update.jinja
+++ /dev/null
@@ -1,49 +0,0 @@
-{% extends "common/confirm_create.jinja" %}
-
-{% from "components/breadcrumbs.jinja" import breadcrumbs %}
-{% from "components/panel/macro.njk" import govukPanel %}
-{% from "components/button/macro.njk" import govukButton %}
-
-{% set page_title = "Workflow template updated" %}
-
-{% block breadcrumb %}
-  {{ breadcrumbs(
-    request,
-    [
-      {"text": "Find and view workflow templates", "href": url("workflow:task-workflow-template-ui-list")},
-      {
-        "text": "Workflow template: " ~ object.title,
-        "href": url(
-          "workflow:task-workflow-template-ui-detail",
-          kwargs={"pk": object.pk}),
-      },
-      {"text": page_title}
-    ],
-    False,
-  ) }}
-{% endblock %}
-
-{% block panel %}
-  {{ govukPanel({
-    "titleText": "Workflow template: " ~ object.title,
-    "text": "You have updated the workflow template",
-    "classes": "govuk-!-margin-bottom-7"
-  }) }}
-{% endblock %}
-
-{% block button_group %}
-  {{ govukButton({
-    "text": "View workflow template",
-    "href": url("workflow:task-workflow-template-ui-detail", kwargs={"pk": object.pk}),
-    "classes": "govuk-button"
-  }) }}
-  {{ govukButton({
-    "text": "Create a task template",
-    "href": url("workflow:task-template-ui-create", kwargs={"workflow_template_pk": object.pk}),
-    "classes": "govuk-button--secondary"
-  }) }}
-{% endblock %}
-
-{% block actions %}
-  <li><a href="TODO" class="govuk-link">Find and view workflow templates</a></li>
-{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/template_edit.jinja b/tasks/jinja2/tasks/workflows/template_edit.jinja
deleted file mode 100644
index 0bcfad36c..000000000
--- a/tasks/jinja2/tasks/workflows/template_edit.jinja
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "layouts/form.jinja" %}
-{% from "components/breadcrumbs.jinja" import breadcrumbs %}
-
-{% set page_title = "Edit workflow template details" %}
-
-{% block breadcrumb %}
-  {{ breadcrumbs(request, [
-      {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
-      {"text": "Workflow template: " ~ object.title, "href": object.get_url("detail")},
-      {"text": page_title}
-    ])
-  }}
-{% endblock %}
-
-{% block form %}
-  {% call django_form() %}
-    {{ crispy(form) }}
-  {% endcall %}
-{% endblock %}
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index 15be3e5ba..afec94229 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -58,6 +58,11 @@ def get_url(self, action: str = "detail"):
                 "workflow:task-workflow-ui-detail",
                 kwargs={"pk": self.pk},
             )
+        elif action == "edit":
+            return reverse(
+                "workflow:task-workflow-ui-update",
+                kwargs={"pk": self.pk},
+            )
         elif action == "delete":
             return reverse(
                 "workflow:task-workflow-ui-delete",
diff --git a/tasks/tests/test_forms.py b/tasks/tests/test_forms.py
index 1dfd706fa..b4e7972f8 100644
--- a/tasks/tests/test_forms.py
+++ b/tasks/tests/test_forms.py
@@ -100,3 +100,19 @@ def test_workflow_create_form_invalid_data(form_data, field, error_message):
     form = forms.TaskWorkflowCreateForm(form_data)
     assert not form.is_valid()
     assert error_message in form.errors[field]
+
+
+def test_workflow_update_form_save(task_workflow):
+    """Tests that the details of `TaskWorkflow.summary_task` are updated when
+    calling form.save()."""
+    form_data = {
+        "title": "Updated workflow title",
+        "description": "Updated workflow description",
+    }
+
+    form = forms.TaskWorkflowUpdateForm(data=form_data, instance=task_workflow)
+    assert form.is_valid()
+
+    workflow = form.save()
+    assert workflow.summary_task.title == form_data["title"]
+    assert workflow.summary_task.description == form_data["description"]
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 902ed0c57..de53dc9bc 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -712,6 +712,39 @@ def test_workflow_create_view(
     assert str(created_workflow) in soup.select("h1.govuk-panel__title")[0].text
 
 
+def test_workflow_update_view(
+    valid_user_client,
+    task_workflow,
+):
+    """Tests that a workflow can be updated and that the corresponding
+    confirmation view returns a HTTP 200 response."""
+
+    form_data = {
+        "title": "Updated workflow title",
+        "description": "Updated workflow description",
+    }
+    update_url = task_workflow.get_url("edit")
+
+    update_response = valid_user_client.post(update_url, form_data)
+    assert update_response.status_code == 302
+
+    task_workflow.refresh_from_db()
+    assert task_workflow.summary_task.title == form_data["title"]
+    assert task_workflow.summary_task.description == form_data["description"]
+
+    confirmation_url = reverse(
+        "workflow:task-workflow-ui-confirm-update",
+        kwargs={"pk": task_workflow.pk},
+    )
+    assert update_response.url == confirmation_url
+
+    confirmation_response = valid_user_client.get(confirmation_url)
+    assert confirmation_response.status_code == 200
+
+    soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
+    assert str(task_workflow) in soup.select("h1.govuk-panel__title")[0].text
+
+
 def test_workflow_delete_view(
     valid_user_client,
     task_workflow_single_task_item,
diff --git a/tasks/urls.py b/tasks/urls.py
index 0601ba6d4..5b2694fd4 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -87,6 +87,16 @@
         views.TaskWorkflowConfirmCreateView.as_view(),
         name="task-workflow-ui-confirm-create",
     ),
+    path(
+        "<int:pk>/update/",
+        views.TaskWorkflowUpdateView.as_view(),
+        name="task-workflow-ui-update",
+    ),
+    path(
+        "<int:pk>/confirm-update/",
+        views.TaskWorkflowConfirmUpdateView.as_view(),
+        name="task-workflow-ui-confirm-update",
+    ),
     path(
         "<int:pk>/delete/",
         views.TaskWorkflowDeleteView.as_view(),
diff --git a/tasks/views.py b/tasks/views.py
index 1e98840ab..5a6d38392 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -28,6 +28,7 @@
 from tasks.forms import TaskWorkflowTemplateCreateForm
 from tasks.forms import TaskWorkflowTemplateDeleteForm
 from tasks.forms import TaskWorkflowTemplateUpdateForm
+from tasks.forms import TaskWorkflowUpdateForm
 from tasks.models import Queue
 from tasks.models import QueueItem
 from tasks.models import Task
@@ -428,6 +429,25 @@ class TaskWorkflowConfirmCreateView(PermissionRequiredMixin, DetailView):
     permission_required = "tasks.add_taskworkflow"
 
 
+class TaskWorkflowUpdateView(PermissionRequiredMixin, UpdateView):
+    model = TaskWorkflow
+    template_name = "tasks/workflows/edit.jinja"
+    permission_required = "tasks.change_taskworkflow"
+    form_class = TaskWorkflowUpdateForm
+
+    def get_success_url(self):
+        return reverse(
+            "workflow:task-workflow-ui-confirm-update",
+            kwargs={"pk": self.object.pk},
+        )
+
+
+class TaskWorkflowConfirmUpdateView(PermissionRequiredMixin, DetailView):
+    model = TaskWorkflow
+    template_name = "tasks/workflows/confirm_update.jinja"
+    permission_required = "tasks.change_taskworkflow"
+
+
 class TaskWorkflowDeleteView(PermissionRequiredMixin, DeleteView):
     model = TaskWorkflow
     template_name = "tasks/workflows/delete.jinja"
@@ -540,7 +560,7 @@ class TaskWorkflowTemplateConfirmCreateView(PermissionRequiredMixin, DetailView)
 
 class TaskWorkflowTemplateUpdateView(PermissionRequiredMixin, UpdateView):
     model = TaskWorkflowTemplate
-    template_name = "tasks/workflows/template_edit.jinja"
+    template_name = "tasks/workflows/edit.jinja"
     permission_required = "tasks.change_taskworkflowtemplate"
     form_class = TaskWorkflowTemplateUpdateForm
 
@@ -553,7 +573,7 @@ def get_success_url(self):
 
 class TaskWorkflowTemplateConfirmUpdateView(PermissionRequiredMixin, DetailView):
     model = TaskWorkflowTemplate
-    template_name = "tasks/workflows/template_confirm_update.jinja"
+    template_name = "tasks/workflows/confirm_update.jinja"
     permission_required = "tasks.change_taskworkflowtemplate"
 
 

From d9937d1cc8fa9e710c56fd0680794117634fd615 Mon Sep 17 00:00:00 2001
From: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>
Date: Tue, 10 Dec 2024 12:04:49 +0000
Subject: [PATCH 33/57] TP2000-1580 Task workflow combined list view pt2
 (#1353)

* Support for task workflow list view

* Incorrect code delete fix.

* Queryset filters, tests and views for tasks and workflows

* Add link to create new workflow

* Add is_summary_task property and test

* Filter support for tasks and workflows list view

* Add type column

* Correct content

* Add valid href values

* Add view_task perm

* Unit test list views

* Add list support to get_url()

* Add missing return

* Correct indentation

* Correct indent

* Remove unnecessary queryset filter

* Add return type annotation

* Completed writing test
---
 common/jinja2/common/homepage.jinja           |   7 +-
 conftest.py                                   |   1 +
 settings/common.py                            |   3 +
 tasks/filters.py                              |  78 ++++++++++++++
 tasks/jinja2/tasks/workflows/list.jinja       |  82 ++++++++++++++
 .../workflows/task-and-workflow-list.jinja    | 101 ++++++++++++++++++
 tasks/models/task.py                          |  33 ++++--
 tasks/models/workflow.py                      |   4 +
 tasks/tests/test_models.py                    |  42 ++++++--
 tasks/tests/test_views.py                     |  31 ++++++
 tasks/urls.py                                 |  15 ++-
 tasks/views.py                                |  45 ++++++++
 12 files changed, 421 insertions(+), 21 deletions(-)
 create mode 100644 tasks/jinja2/tasks/workflows/list.jinja
 create mode 100644 tasks/jinja2/tasks/workflows/task-and-workflow-list.jinja

diff --git a/common/jinja2/common/homepage.jinja b/common/jinja2/common/homepage.jinja
index 074063cc4..35e0fd117 100644
--- a/common/jinja2/common/homepage.jinja
+++ b/common/jinja2/common/homepage.jinja
@@ -152,10 +152,15 @@
           >Tasks</a>
         </p>
         <p class="govuk-body"></p>
-          <a href=#TODO
+          <a href="{{ url('workflow:task-workflow-ui-list') }}"
             class="govuk-link"
           >Workflows</a>
         </p>
+        <p class="govuk-body"></p>
+          <a href="{{ url('workflow:task-and-workflow-ui-list') }}"
+            class="govuk-link"
+          >Tasks and Workflows</a>
+        </p>
         <p class="govuk-body"></p>
           <a href="{{ url('workflow:task-workflow-template-ui-list') }}"
             class="govuk-link"
diff --git a/conftest.py b/conftest.py
index 0afdd2286..329aa7f37 100644
--- a/conftest.py
+++ b/conftest.py
@@ -304,6 +304,7 @@ def policy_group(db) -> Group:
         ("tasks", "add_task"),
         ("tasks", "change_task"),
         ("tasks", "delete_task"),
+        ("tasks", "view_task"),
         ("tasks", "add_taskassignee"),
         ("tasks", "change_taskassignee"),
         ("tasks", "add_comment"),
diff --git a/settings/common.py b/settings/common.py
index 51ef14097..731cbc63e 100644
--- a/settings/common.py
+++ b/settings/common.py
@@ -881,6 +881,9 @@
 
 TRANSACTION_SCHEMA = os.getenv("TRANSACTION_SCHEMA", "workbaskets.models.SEED_FIRST")
 
+# TAP's default maximum number of items to display in a paginated list view.
+DEFAULT_PAGINATOR_PER_PAGE_MAX = 20
+
 # Default max number of objects that will be accurately counted by LimitedPaginator.
 LIMITED_PAGINATOR_MAX_COUNT = 200
 # Default max number of objects that will be accurately counted by MeasurePaginator.
diff --git a/tasks/filters.py b/tasks/filters.py
index 43784378d..f91a34540 100644
--- a/tasks/filters.py
+++ b/tasks/filters.py
@@ -1,8 +1,11 @@
+from django.db.models import TextChoices
 from django.forms import CheckboxSelectMultiple
 from django.urls import reverse_lazy
+from django_filters import ChoiceFilter
 from django_filters import ModelMultipleChoiceFilter
 
 from common.filters import TamatoFilter
+from common.widgets import RadioSelect
 from tasks.models import ProgressState
 from tasks.models import Task
 from tasks.models import TaskWorkflowTemplate
@@ -28,6 +31,81 @@ class Meta:
         model = Task
         fields = ["search", "category", "progress_state"]
 
+    @property
+    def qs(self):
+        return super().qs.non_workflow()
+
+
+class TaskWorkflowFilter(TamatoFilter):
+    search_fields = (
+        "id",
+        "title",
+        "description",
+    )
+    clear_url = reverse_lazy("workflow:task-workflow-ui-list")
+
+    progress_state = ModelMultipleChoiceFilter(
+        label="Status",
+        help_text="Select all that apply",
+        queryset=ProgressState.objects.all(),
+        widget=CheckboxSelectMultiple,
+    )
+
+    class Meta:
+        model = Task
+        fields = ["search", "category", "progress_state"]
+
+    @property
+    def qs(self):
+        qs = super().qs
+        return qs.workflow_summary()
+
+
+class TasksAndWorkflowsChoices(TextChoices):
+    TASKS_ONLY = "TASKS_ONLY", "Tasks only"
+    WORKFLOWS_ONLY = "WORKFLOWS_ONLY", "Workflows only"
+
+
+class TaskAndWorkflowFilter(TamatoFilter):
+    search_fields = (
+        "id",
+        "title",
+        "description",
+    )
+    clear_url = reverse_lazy("workflow:task-and-workflow-ui-list")
+
+    tasks_and_workflows = ChoiceFilter(
+        choices=TasksAndWorkflowsChoices.choices,
+        method="filter_by_tasks_and_workflows",
+        widget=RadioSelect,
+        label="Tasks and workflows",
+        empty_label="Tasks and workflows",
+        help_text="Select the choice that applies",
+    )
+
+    progress_state = ModelMultipleChoiceFilter(
+        label="Status",
+        help_text="Select all that apply",
+        queryset=ProgressState.objects.all(),
+        widget=CheckboxSelectMultiple,
+    )
+
+    class Meta:
+        model = Task
+        fields = ["search", "tasks_and_workflows", "category", "progress_state"]
+
+    def filter_by_tasks_and_workflows(self, queryset, name, value):
+        if TasksAndWorkflowsChoices.TASKS_ONLY == value:
+            queryset = queryset.non_workflow()
+        elif TasksAndWorkflowsChoices.WORKFLOWS_ONLY == value:
+            queryset = queryset.workflow_summary()
+
+        return queryset
+
+    @property
+    def qs(self):
+        return super().qs.top_level()
+
 
 class WorkflowTemplateFilter(TamatoFilter):
     search_fields = (
diff --git a/tasks/jinja2/tasks/workflows/list.jinja b/tasks/jinja2/tasks/workflows/list.jinja
new file mode 100644
index 000000000..868ed0d73
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/list.jinja
@@ -0,0 +1,82 @@
+{% extends "layouts/layout.jinja" %}
+
+{% from "components/table/macro.njk" import govukTable %}
+{% from "components/create_sortable_anchor.jinja" import create_sortable_anchor %}
+
+{% set page_title = "Find and view tasks workflows" %}
+
+{% set base_url = url("workflow:task-workflow-ui-list") %}
+
+{% block content %}
+  <h1 class="govuk-heading-xl">{{ page_title }}</h1>
+  <p class="govuk-body">
+    Search for workflows. Alternatively,
+    <a class="govuk-link" href="{{ url('workflow:task-workflow-ui-create') }}">create a new workflow</a>
+  </p>
+
+  <div class="filter-layout">
+    <div class="filter-layout__filters">
+      <h2 class="govuk-heading-m govuk-!-margin-top-3">Search and filter</h2>
+
+      <form method="get" action="{{ url("workflow:task-workflow-ui-list") }}">
+          {{ crispy(filter.form) }}
+      </form>
+    </div>
+
+    <div class="filter-layout__content">
+      {% if paginator.count > 0 %}
+        {% include "includes/common/pagination-list-summary.jinja" %}
+      {% endif %}
+
+      {% if object_list %}
+        {% set table_rows = [] %}
+
+        {% for object in object_list %}
+          {%- set task_linked_id -%}
+            <a
+              class="govuk-link"
+              href="{{ url('workflow:task-workflow-ui-detail', kwargs={'pk':  object.taskworkflow.pk}) }}"
+            >{{ object.taskworkflow.pk }}</a>
+          {%- endset -%}
+
+          {%- set workbasket_linked_id -%}
+            <a
+              class="govuk-link"
+              href="{{ url("workbaskets:workbasket-ui-detail", kwargs={"pk": object.workbasket.pk}) }}"
+            >{{ object.workbasket.pk }}</a>
+          {%- endset -%}
+
+          {{ table_rows.append([
+            {"text": task_linked_id},
+            {"text": object.title},
+            {"text": object.category},
+            {"text": object.progress_state},
+            {"text": workbasket_linked_id if object.workbasket else "-"},
+            {"text": "{:%d %b %Y}".format(object.created_at)},
+          ]) or "" }}
+        {% endfor %}
+
+        {{ govukTable({
+          "head": [
+            {"text": "ID"},
+            {"text": "Title"},
+            {"text": "Category"},
+            {"text": "Status"},
+            {"text": "Workbasket"},
+            {"text": create_sortable_anchor(request, "created_at", "Created", base_url)},
+          ],
+            "rows": table_rows
+          }) }}
+      {% else %}
+        <p class="govuk-body">There are no results for your search, please:</p>
+        <ul class="govuk-list govuk-list--bullet">
+          <li>check the spelling of your keywords</li>
+          <li>use more general keywords</li>
+          <li>select or deselect different filters</li>
+        </ul>
+      {% endif %}
+
+      {% include "includes/common/pagination.jinja" %}
+    </div>
+  </div>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/task-and-workflow-list.jinja b/tasks/jinja2/tasks/workflows/task-and-workflow-list.jinja
new file mode 100644
index 000000000..c2a9258f5
--- /dev/null
+++ b/tasks/jinja2/tasks/workflows/task-and-workflow-list.jinja
@@ -0,0 +1,101 @@
+{% extends "layouts/layout.jinja" %}
+
+{% from "components/table/macro.njk" import govukTable %}
+{% from "components/create_sortable_anchor.jinja" import create_sortable_anchor %}
+
+{% set page_title = "Find and view tasks and workflows" %}
+
+{% set base_url = url("workflow:task-and-workflow-ui-list") %}
+
+{% block content %}
+  <h1 class="govuk-heading-xl">{{ page_title }}</h1>
+  <p class="govuk-body">
+    Search for tasks and workflows. Alternatively
+    <a class="govuk-link" href="{{ url('workflow:task-ui-create') }}">create a new task</a>
+    or
+    <a class="govuk-link" href="{{ url('workflow:task-workflow-ui-create') }}">create a new workflow</a>.
+  </p>
+
+  <div class="filter-layout">
+    <div class="filter-layout__filters">
+      <h2 class="govuk-heading-m govuk-!-margin-top-3">Search and filter</h2>
+
+      <form method="get" action="{{ base_url }}">
+          {{ crispy(filter.form) }}
+      </form>
+    </div>
+
+    <div class="filter-layout__content">
+      {% if paginator.count > 0 %}
+        {% include "includes/common/pagination-list-summary.jinja" %}
+      {% endif %}
+
+      {% if object_list %}
+        {% set table_rows = [] %}
+
+        {% for object in object_list %}
+          {%- set task_linked_id -%}
+            {% if object.taskworkflow %}
+              <a
+                class="govuk-link"
+                href="{{ url('workflow:task-workflow-ui-detail', kwargs={'pk': object.taskworkflow.pk}) }}"
+              >{{ object.pk }}</a>
+            {% else %}
+              <a
+                class="govuk-link"
+                href="{{ url('workflow:task-ui-detail', kwargs={'pk': object.pk}) }}"
+              >{{ object.pk }}</a>
+            {% endif %}
+          {%- endset -%}
+
+          {%- set workbasket_linked_id -%}
+            <a
+              class="govuk-link"
+              href="{{ url('workbaskets:workbasket-ui-detail', kwargs={'pk': object.workbasket.pk}) }}"
+            >{{ object.workbasket.pk }}</a>
+          {%- endset -%}
+
+          {%- set object_type -%}
+            {% if object.is_summary_task %}
+              Workflow
+            {% else %}
+              Task
+            {% endif %}
+          {%- endset -%}
+
+          {{ table_rows.append([
+            {"text": task_linked_id},
+            {"text": object.title},
+            {"text": object_type},
+            {"text": object.category},
+            {"text": object.progress_state},
+            {"text": workbasket_linked_id if object.workbasket else "-"},
+            {"text": "{:%d %b %Y}".format(object.created_at)},
+          ]) or "" }}
+        {% endfor %}
+
+        {{ govukTable({
+          "head": [
+            {"text": "ID"},
+            {"text": "Title"},
+            {"text": "Type"},
+            {"text": "Category"},
+            {"text": "Status"},
+            {"text": "Workbasket"},
+            {"text": create_sortable_anchor(request, "created_at", "Created", base_url)},
+          ],
+            "rows": table_rows
+          }) }}
+      {% else %}
+        <p class="govuk-body">There are no results for your search, please:</p>
+        <ul class="govuk-list govuk-list--bullet">
+          <li>check the spelling of your keywords</li>
+          <li>use more general keywords</li>
+          <li>select or deselect different filters</li>
+        </ul>
+      {% endif %}
+
+      {% include "includes/common/pagination.jinja" %}
+    </div>
+  </div>
+{% endblock %}
diff --git a/tasks/models/task.py b/tasks/models/task.py
index 1423d2f31..bb06bd6ab 100644
--- a/tasks/models/task.py
+++ b/tasks/models/task.py
@@ -46,24 +46,30 @@ class TaskManager(WithSignalManagerMixin, models.Manager):
 
 
 class TaskQueryset(WithSignalQuerysetMixin, models.QuerySet):
-    def non_workflow(self):
-        """Return a queryset of standalone Task instances, i.e. instances that
-        are not related via TaskItem instnaces to any TaskWorkflow and are not
-        referenced by TaskWorkflow.summary_task (related_name=taskworkflow)."""
+    def non_workflow(self) -> "TaskQueryset":
+        """Return a queryset of standalone Task instances that are not part of a
+        workflow and are not subtasks."""
         return self.filter(
-            models.Q(taskitem__isnull=True) & models.Q(taskworkflow__isnull=True),
+            models.Q(parent_task__isnull=True)
+            & models.Q(taskitem__isnull=True)
+            & models.Q(taskworkflow__isnull=True),
         )
 
-    def workflow_summary(self):
-        """Return a queryset of TaskWorkflow summary Task instances, i.e. those
-        with a non-null related_name=taskworkflow."""
+    def workflow_summary(self) -> "TaskQueryset":
+        """
+        Return a queryset of summary Task instances of TaskWorkflows, i.e. those
+        with a non-null related_name=taskworkflow.
+
+        Summary Task instances are never subtasks.
+        """
         return self.filter(
             models.Q(taskworkflow__isnull=False),
         )
 
-    def top_level(self):
+    def top_level(self) -> "TaskQueryset":
         """
-        Return a queryset of Task instances that are either:
+        Return a queryset of Task instances that are not subtasks and are
+        either:
         1. Stand-alone Task instances that are not part of a Workflow tasks
         2. Workflow.summary_task instances.
 
@@ -71,7 +77,8 @@ def top_level(self):
         permitting a combined at-a-glance view of Tasks and Workflow instances.
         """
         return self.filter(
-            models.Q(taskitem__isnull=True) | models.Q(taskworkflow__isnull=False),
+            (models.Q(taskitem__isnull=True) | models.Q(taskworkflow__isnull=False))
+            & models.Q(parent_task__isnull=True),
         )
 
 
@@ -125,6 +132,10 @@ class Task(TaskBase):
     def is_subtask(self) -> bool:
         return bool(self.parent_task)
 
+    @property
+    def is_summary_task(self) -> bool:
+        return hasattr(self, "taskworkflow")
+
     def __str__(self):
         return self.title
 
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index afec94229..bbb6622f9 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -72,6 +72,10 @@ def get_url(self, action: str = "detail"):
             return reverse(
                 "workflow:task-workflow-ui-create",
             )
+        elif action == "list":
+            return reverse(
+                "workflow:task-workflow-ui-list",
+            )
 
         return "#NOT-IMPLEMENTED"
 
diff --git a/tasks/tests/test_models.py b/tasks/tests/test_models.py
index 136231eeb..ecf4c0fb9 100644
--- a/tasks/tests/test_models.py
+++ b/tasks/tests/test_models.py
@@ -9,6 +9,7 @@
 from tasks.models import Task
 from tasks.models import TaskAssignee
 from tasks.models import TaskLog
+from tasks.tests.factories import TaskWorkflowFactory
 
 pytestmark = pytest.mark.django_db
 
@@ -80,33 +81,45 @@ def test_task_assignee_workbasket_reviewers_queryset(
     assert workbasket_reviewer_assignee in workbasket_reviewers
 
 
-def test_non_workflow_task_queryset(task, task_workflow_single_task_item):
+def test_non_workflow_queryset(task, task_workflow_single_task_item):
     """Test correct behaviour of TaskQueryset.non_workflow()."""
 
+    SubTaskFactory(parent_task=task)
+    SubTaskFactory(parent_task=task_workflow_single_task_item.get_tasks().get())
+
     non_workflow_tasks = Task.objects.non_workflow()
 
-    assert Task.objects.count() == 3
-    assert task == non_workflow_tasks.get()
+    # 1 x standalone task + 1 summary task + 1 x workflow task + 2 x subtasks
+    assert Task.objects.count() == 5
+    assert non_workflow_tasks.get() == task
 
 
-def test_workflow_summary_task_queryset(task, task_workflow_single_task_item):
+def test_workflow_summary_queryset(task, task_workflow_single_task_item):
     """Test correct behaviour of TaskQueryset.workflow_summary()."""
 
     """Return a queryset of TaskWorkflow summary Task instances, i.e. those
     with a non-null related_name=taskworkflow."""
 
-    workflow_tasks = Task.objects.workflow_summary()
+    SubTaskFactory(parent_task=task)
+    SubTaskFactory(parent_task=task_workflow_single_task_item.get_tasks().get())
+
+    workflow_summary_tasks = Task.objects.workflow_summary()
 
-    assert Task.objects.count() == 3
-    assert task_workflow_single_task_item.summary_task == workflow_tasks.get()
+    # 1 x standalone task + 1 summary task + 1 x workflow task + 2 x subtasks
+    assert Task.objects.count() == 5
+    assert workflow_summary_tasks.get() == task_workflow_single_task_item.summary_task
 
 
 def test_top_level_task_queryset(task, task_workflow_single_task_item):
     """Test correct behaviour of TaskQueryset.top_level()."""
 
+    SubTaskFactory(parent_task=task)
+    SubTaskFactory(parent_task=task_workflow_single_task_item.get_tasks().get())
+
     top_level_tasks = Task.objects.top_level()
 
-    assert Task.objects.count() == 3
+    # 1 x standalone task + 1 summary task + 1 x workflow task + 2 x subtasks
+    assert Task.objects.count() == 5
     assert top_level_tasks.count() == 2
     assert task_workflow_single_task_item.summary_task in top_level_tasks
     assert task in top_level_tasks
@@ -200,3 +213,16 @@ def test_task_is_subtask_property(task_factory):
     task = task_factory.create()
 
     assert bool(task.parent_task) == task.is_subtask
+
+
+@pytest.mark.parametrize(
+    ("create_task_fn"),
+    (
+        lambda: TaskFactory.create(),
+        lambda: TaskWorkflowFactory.create().summary_task,
+    ),
+    ids=("standalone task test", "summary task test"),
+)
+def test_task_is_summary_task_property(create_task_fn):
+    task = create_task_fn()
+    assert bool(hasattr(task, "taskworkflow")) == task.is_summary_task
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index de53dc9bc..ac179e65e 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -780,3 +780,34 @@ def test_workflow_delete_view(
 
     soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
     assert f"Workflow ID: {workflow_pk}" in soup.select(".govuk-panel__title")[0].text
+
+
+def test_workflow_list_view(valid_user_client, task_workflow):
+    response = valid_user_client.get(reverse("workflow:task-workflow-ui-list"))
+
+    assert response.status_code == 200
+
+    page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
+    table = page.select("table")[0]
+
+    assert len(table.select("tbody tr")) == 1
+    assert table.select("tr:nth-child(1) > td:nth-child(1) > a:nth-child(1)")[
+        0
+    ].text == str(task_workflow.pk)
+
+
+def test_task_and_workflow_list_view(valid_user_client, task, task_workflow):
+    response = valid_user_client.get(reverse("workflow:task-and-workflow-ui-list"))
+
+    assert response.status_code == 200
+
+    page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
+    table = page.select("table")[0]
+
+    assert len(table.select("tbody tr")) == 2
+    assert table.select("tr:nth-child(1) > td:nth-child(1) > a:nth-child(1)")[
+        0
+    ].text == str(task.pk)
+    assert table.select("tr:nth-child(2) > td:nth-child(1) > a:nth-child(1)")[
+        0
+    ].text == str(task_workflow.summary_task.pk)
diff --git a/tasks/urls.py b/tasks/urls.py
index 5b2694fd4..ad00db22f 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -70,8 +70,12 @@
     ),
 ]
 
-
 workflow_ui_patterns = [
+    path(
+        "",
+        views.TaskWorkflowListView.as_view(),
+        name="task-workflow-ui-list",
+    ),
     path(
         "<int:pk>/",
         views.TaskWorkflowDetailView.as_view(),
@@ -109,6 +113,14 @@
     ),
 ]
 
+task_and_workflow_ui_patterns = [
+    path(
+        "",
+        views.TaskAndWorkflowListView.as_view(),
+        name="task-and-workflow-ui-list",
+    ),
+]
+
 workflow_template_ui_patterns = [
     path(
         "",
@@ -190,5 +202,6 @@
 urlpatterns = [
     path("tasks/", include(task_ui_patterns)),
     path("workflows/", include(workflow_ui_patterns)),
+    path("tasks-and-workflows/", include(task_and_workflow_ui_patterns)),
     path("workflow-templates/", include(workflow_template_ui_patterns)),
 ]
diff --git a/tasks/views.py b/tasks/views.py
index 5a6d38392..261491b6b 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db import OperationalError
 from django.db import transaction
@@ -14,7 +15,9 @@
 
 from common.views import SortingMixin
 from common.views import WithPaginationListView
+from tasks.filters import TaskAndWorkflowFilter
 from tasks.filters import TaskFilter
+from tasks.filters import TaskWorkflowFilter
 from tasks.filters import WorkflowTemplateFilter
 from tasks.forms import SubTaskCreateForm
 from tasks.forms import TaskCreateForm
@@ -266,6 +269,48 @@ def get_context_data(self, **kwargs):
         return context_data
 
 
+class TaskWorkflowListView(
+    PermissionRequiredMixin,
+    SortingMixin,
+    WithPaginationListView,
+):
+    model = Task
+    template_name = "tasks/workflows/list.jinja"
+    permission_required = "tasks.view_task"
+    paginate_by = settings.DEFAULT_PAGINATOR_PER_PAGE_MAX
+    filterset_class = TaskWorkflowFilter
+    sort_by_fields = ["created_at"]
+
+    def get_queryset(self):
+        queryset = Task.objects.all()
+        ordering = self.get_ordering()
+        if ordering:
+            ordering = (ordering,)
+            queryset = queryset.order_by(*ordering)
+        return queryset
+
+
+class TaskAndWorkflowListView(
+    PermissionRequiredMixin,
+    SortingMixin,
+    WithPaginationListView,
+):
+    model = Task
+    template_name = "tasks/workflows/task-and-workflow-list.jinja"
+    permission_required = "tasks.view_task"
+    paginate_by = settings.DEFAULT_PAGINATOR_PER_PAGE_MAX
+    filterset_class = TaskAndWorkflowFilter
+    sort_by_fields = ["created_at"]
+
+    def get_queryset(self):
+        queryset = Task.objects.all()
+        ordering = self.get_ordering()
+        if ordering:
+            ordering = (ordering,)
+            queryset = queryset.order_by(*ordering)
+        return queryset
+
+
 class TaskWorkflowTemplateListView(PermissionRequiredMixin, WithPaginationListView):
     model = TaskWorkflowTemplate
     template_name = "tasks/workflows/template_list.jinja"

From 206cc7df229b04eaf531a36d619bbd9ff7c0933e Mon Sep 17 00:00:00 2001
From: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>
Date: Tue, 17 Dec 2024 12:20:50 +0000
Subject: [PATCH 34/57] TP2000-1615 Various errors (#1357)

* Avoid dereferencing null

* Avoid dereferencing null

* Remove spurious operations attribute

* Avoid dereferencing null

* Avoid dereferencing null

* Add default ordering

* Inherit model Meta and apply ordering where needed

* Do the TODOs in hrefs
---
 tasks/jinja2/tasks/detail.jinja                |  2 +-
 tasks/jinja2/tasks/list.jinja                  | 14 +++++++++-----
 tasks/jinja2/tasks/workflows/list.jinja        | 14 +++++++++-----
 .../workflows/task-and-workflow-list.jinja     | 14 +++++++++-----
 .../task_template_confirm_create.jinja         |  7 +++++--
 .../task_template_confirm_delete.jinja         |  5 ++++-
 .../task_template_confirm_update.jinja         |  7 +++++--
 .../tasks/workflows/task_template_delete.jinja |  5 ++++-
 .../tasks/workflows/task_template_detail.jinja |  6 ++++--
 .../tasks/workflows/task_template_save.jinja   |  5 ++++-
 .../0012_taskworkflow_assign_summary_task.py   |  1 -
 tasks/models/task.py                           |  4 ++++
 tasks/models/workflow.py                       | 18 ++++++++++++++----
 13 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/tasks/jinja2/tasks/detail.jinja b/tasks/jinja2/tasks/detail.jinja
index 5a28e3363..d19cd9dca 100644
--- a/tasks/jinja2/tasks/detail.jinja
+++ b/tasks/jinja2/tasks/detail.jinja
@@ -99,7 +99,7 @@
       Created by
     </dt>
     <dd class="govuk-summary-list__value">
-      {{ object.creator.get_displayname() }}
+      {{ object.creator.get_displayname() if object.creator else "-" }}
     </dd>
   </div>
 </dl>
diff --git a/tasks/jinja2/tasks/list.jinja b/tasks/jinja2/tasks/list.jinja
index fa120a392..f516e5ca1 100644
--- a/tasks/jinja2/tasks/list.jinja
+++ b/tasks/jinja2/tasks/list.jinja
@@ -37,10 +37,14 @@
         {%- endset -%}
 
         {%- set workbasket_linked_id -%}
-          <a
-            class="govuk-link"
-            href="{{ url("workbaskets:workbasket-ui-detail", kwargs={"pk": object.workbasket.pk}) }}"
-          >{{ object.workbasket.pk }}</a>
+          {% if object.workbasket %}
+            <a
+              class="govuk-link"
+              href="{{ url("workbaskets:workbasket-ui-detail", kwargs={"pk": object.workbasket.pk}) }}"
+            >{{ object.workbasket.pk }}</a>
+          {% else %}
+            -
+          {%- endif -%}
         {%- endset -%}
 
         {{ table_rows.append([
@@ -48,7 +52,7 @@
           {"text": object.title},
           {"text": object.category},
           {"text": object.progress_state},
-          {"text": workbasket_linked_id if object.workbasket else "-"},
+          {"text": workbasket_linked_id},
           {"text": "{:%d %b %Y}".format(object.created_at)},
         ]) or "" }}
       {% endfor %}
diff --git a/tasks/jinja2/tasks/workflows/list.jinja b/tasks/jinja2/tasks/workflows/list.jinja
index 868ed0d73..fd76656f0 100644
--- a/tasks/jinja2/tasks/workflows/list.jinja
+++ b/tasks/jinja2/tasks/workflows/list.jinja
@@ -40,10 +40,14 @@
           {%- endset -%}
 
           {%- set workbasket_linked_id -%}
-            <a
-              class="govuk-link"
-              href="{{ url("workbaskets:workbasket-ui-detail", kwargs={"pk": object.workbasket.pk}) }}"
-            >{{ object.workbasket.pk }}</a>
+            {% if object.workbasket %}
+              <a
+                class="govuk-link"
+                href="{{ url("workbaskets:workbasket-ui-detail", kwargs={"pk": object.workbasket.pk}) }}"
+              >{{ object.workbasket.pk }}</a>
+            {%- else -%}
+              -
+            {%- endif -%}
           {%- endset -%}
 
           {{ table_rows.append([
@@ -51,7 +55,7 @@
             {"text": object.title},
             {"text": object.category},
             {"text": object.progress_state},
-            {"text": workbasket_linked_id if object.workbasket else "-"},
+            {"text": workbasket_linked_id},
             {"text": "{:%d %b %Y}".format(object.created_at)},
           ]) or "" }}
         {% endfor %}
diff --git a/tasks/jinja2/tasks/workflows/task-and-workflow-list.jinja b/tasks/jinja2/tasks/workflows/task-and-workflow-list.jinja
index c2a9258f5..e0e5339ae 100644
--- a/tasks/jinja2/tasks/workflows/task-and-workflow-list.jinja
+++ b/tasks/jinja2/tasks/workflows/task-and-workflow-list.jinja
@@ -49,10 +49,14 @@
           {%- endset -%}
 
           {%- set workbasket_linked_id -%}
-            <a
-              class="govuk-link"
-              href="{{ url('workbaskets:workbasket-ui-detail', kwargs={'pk': object.workbasket.pk}) }}"
-            >{{ object.workbasket.pk }}</a>
+            {% if object.workbasket %}
+              <a
+                class="govuk-link"
+                href="{{ url('workbaskets:workbasket-ui-detail', kwargs={'pk': object.workbasket.pk}) }}"
+              >{{ object.workbasket.pk }}</a>
+            {%- else -%}
+              -
+            {%- endif -%}
           {%- endset -%}
 
           {%- set object_type -%}
@@ -69,7 +73,7 @@
             {"text": object_type},
             {"text": object.category},
             {"text": object.progress_state},
-            {"text": workbasket_linked_id if object.workbasket else "-"},
+            {"text": workbasket_linked_id},
             {"text": "{:%d %b %Y}".format(object.created_at)},
           ]) or "" }}
         {% endfor %}
diff --git a/tasks/jinja2/tasks/workflows/task_template_confirm_create.jinja b/tasks/jinja2/tasks/workflows/task_template_confirm_create.jinja
index 1cf1e406e..0c532419c 100644
--- a/tasks/jinja2/tasks/workflows/task_template_confirm_create.jinja
+++ b/tasks/jinja2/tasks/workflows/task_template_confirm_create.jinja
@@ -11,7 +11,10 @@
   {{ breadcrumbs(
     request,
     [
-      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Find and view workflow templates",
+        "href": url("workflow:task-workflow-template-ui-list"),
+      },
       {
         "text": "Workflow template: " ~ task_workflow_template.title,
         "href": url(
@@ -46,5 +49,5 @@
 {% endblock %}
 
 {% block actions %}
-  <li><a href="TODO" class="govuk-link">Find and edit workflow templates</a></li>
+  <li><a href="{{ url('workflow:task-workflow-template-ui-list') }}" class="govuk-link">Find and edit workflow templates</a></li>
 {% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/task_template_confirm_delete.jinja b/tasks/jinja2/tasks/workflows/task_template_confirm_delete.jinja
index d185378af..66d11df2e 100644
--- a/tasks/jinja2/tasks/workflows/task_template_confirm_delete.jinja
+++ b/tasks/jinja2/tasks/workflows/task_template_confirm_delete.jinja
@@ -11,7 +11,10 @@
   {{ breadcrumbs(
     request,
     [
-      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Find and view workflow templates",
+        "href": url("workflow:task-workflow-template-ui-list"),
+      },
       {
         "text": "Workflow template: " ~ task_workflow_template.title,
         "href": url(
diff --git a/tasks/jinja2/tasks/workflows/task_template_confirm_update.jinja b/tasks/jinja2/tasks/workflows/task_template_confirm_update.jinja
index 6970c1149..37c745db3 100644
--- a/tasks/jinja2/tasks/workflows/task_template_confirm_update.jinja
+++ b/tasks/jinja2/tasks/workflows/task_template_confirm_update.jinja
@@ -9,7 +9,10 @@
   {{ breadcrumbs(
     request,
     [
-      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Find and view workflow templates",
+        "href": url("workflow:task-workflow-template-ui-list"),
+      },
       {
         "text": "Workflow template: " ~ task_workflow_template.title,
         "href": url(
@@ -45,5 +48,5 @@
 {% endblock %}
 
 {% block actions %}
-  <li><a href="TODO" class="govuk-link">Find and edit workflow templates</a></li>
+  <li><a href="{{ url('workflow:task-workflow-template-ui-list') }}" class="govuk-link">Find and edit workflow templates</a></li>
 {% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/task_template_delete.jinja b/tasks/jinja2/tasks/workflows/task_template_delete.jinja
index 206700b56..0bb6a8066 100644
--- a/tasks/jinja2/tasks/workflows/task_template_delete.jinja
+++ b/tasks/jinja2/tasks/workflows/task_template_delete.jinja
@@ -11,7 +11,10 @@
   {{ breadcrumbs(
     request,
     [
-      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Find and view workflow templates",
+        "href": url("workflow:task-workflow-template-ui-list"),
+      },
       {
         "text": "Workflow template: " ~ task_workflow_template.title,
         "href": url("workflow:task-workflow-template-ui-detail", kwargs={"pk": task_workflow_template.pk}),
diff --git a/tasks/jinja2/tasks/workflows/task_template_detail.jinja b/tasks/jinja2/tasks/workflows/task_template_detail.jinja
index c2ce54206..f42ff3f41 100644
--- a/tasks/jinja2/tasks/workflows/task_template_detail.jinja
+++ b/tasks/jinja2/tasks/workflows/task_template_detail.jinja
@@ -4,14 +4,16 @@
 {% from "components/button/macro.njk" import govukButton %}
 
 {% set page_title = "Task template: " ~ object.title %}
-{% set edit_url = "#TODO" %}
 
 
 {% block breadcrumb %}
   {{ breadcrumbs(
     request,
     [
-      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Find and view workflow templates",
+        "href": url("workflow:task-workflow-template-ui-list"),
+      },
       {
         "text": "Workflow template: " ~ task_workflow_template.title,
         "href": url(
diff --git a/tasks/jinja2/tasks/workflows/task_template_save.jinja b/tasks/jinja2/tasks/workflows/task_template_save.jinja
index c2fe106f5..5ac41d48d 100644
--- a/tasks/jinja2/tasks/workflows/task_template_save.jinja
+++ b/tasks/jinja2/tasks/workflows/task_template_save.jinja
@@ -7,7 +7,10 @@
   {{ breadcrumbs(
     request,
     [
-      {"text": "Find and view workflow templates", "href": "#TODO"},
+      {
+        "text": "Find and view workflow templates",
+        "href": url("workflow:task-workflow-template-ui-list"),
+      },
       {
         "text": "Workflow template: " ~ task_workflow_template.title,
         "href": url("workflow:task-workflow-template-ui-detail", kwargs={"pk": task_workflow_template.pk}),
diff --git a/tasks/migrations/0012_taskworkflow_assign_summary_task.py b/tasks/migrations/0012_taskworkflow_assign_summary_task.py
index 26e22ed3b..ac8848ab8 100644
--- a/tasks/migrations/0012_taskworkflow_assign_summary_task.py
+++ b/tasks/migrations/0012_taskworkflow_assign_summary_task.py
@@ -21,5 +21,4 @@ class Migration(migrations.Migration):
         ("tasks", "0011_taskworkflow_summary_task"),
     ]
 
-    operations = []
     operations = [migrations.RunPython(assign_new_summary_task_on_workflow)]
diff --git a/tasks/models/task.py b/tasks/models/task.py
index bb06bd6ab..24b4edae0 100644
--- a/tasks/models/task.py
+++ b/tasks/models/task.py
@@ -128,6 +128,10 @@ class Task(TaskBase):
 
     objects = TaskManager.from_queryset(TaskQueryset)()
 
+    class Meta(TaskBase.Meta):
+        abstract = False
+        ordering = ["id"]
+
     @property
     def is_subtask(self) -> bool:
         return bool(self.parent_task)
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index bbb6622f9..c97324f15 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -30,7 +30,9 @@ class TaskWorkflow(Queue):
     )
     """The template from which this workflow was created, if any."""
 
-    class Meta:
+    class Meta(Queue.Meta):
+        abstract = False
+        ordering = ["id"]
         verbose_name = "workflow"
 
     def __str__(self):
@@ -97,7 +99,8 @@ class TaskItem(QueueItem):
     )
     """The Task instance managed by this TaskItem."""
 
-    class Meta:
+    class Meta(QueueItem.Meta):
+        abstract = False
         ordering = ["workflow", "position"]
 
 
@@ -135,7 +138,9 @@ class TaskWorkflowTemplate(Queue):
         related_name="created_taskworkflowtemplates",
     )
 
-    class Meta:
+    class Meta(Queue.Meta):
+        abstract = False
+        ordering = ["id"]
         verbose_name = "workflow template"
 
     def __str__(self):
@@ -232,7 +237,8 @@ class TaskItemTemplate(QueueItem):
         on_delete=models.CASCADE,
     )
 
-    class Meta:
+    class Meta(QueueItem.Meta):
+        abstract = False
         ordering = ["workflow_template", "position"]
 
 
@@ -256,5 +262,9 @@ def get_url(self, action: str = "detail"):
 
         return "#NOT-IMPLEMENTED"
 
+    class Meta(TaskBase.Meta):
+        abstract = False
+        ordering = ["id"]
+
     def __str__(self):
         return self.title

From ab3854fdda7a46a2eb6e83f9faf417c58fdf81aa Mon Sep 17 00:00:00 2001
From: Marya Shariq <marya.shariq@digital.trade.gov.uk>
Date: Tue, 17 Dec 2024 14:32:26 +0000
Subject: [PATCH 35/57] Tp2000 1594 ordering of workflow templates list view
 (#1356)

* added 'created_at' and 'updated_at' fields to TaskWorkflowTemplateModel and sorting by date functionality for list view

* fixed mixin inheritance order for TaskWorkflowTemplateListView, ordering by dates works correctly now

* fixed inconsistency in datetime string formatting

* fixed datetime format inconsistencies by passing in settings.DATETIME_FORMAT as context variable
---
 .../tasks/workflows/template_list.jinja       |  8 +++--
 ...askworkflowtemplate_created_at_and_more.py | 29 +++++++++++++++++++
 tasks/models/workflow.py                      |  3 +-
 tasks/tests/test_views.py                     |  3 ++
 tasks/views.py                                | 15 +++++++++-
 5 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 tasks/migrations/0018_taskworkflowtemplate_created_at_and_more.py

diff --git a/tasks/jinja2/tasks/workflows/template_list.jinja b/tasks/jinja2/tasks/workflows/template_list.jinja
index 501c5d171..3be85f30e 100644
--- a/tasks/jinja2/tasks/workflows/template_list.jinja
+++ b/tasks/jinja2/tasks/workflows/template_list.jinja
@@ -40,7 +40,9 @@
           {"text": workflow_template_linked_id},
           {"text": object.title},
           {"text": object.description},
-          {"text": object.creator.get_displayname() if object.creator else "Unknown"}
+          {"text": object.creator.get_displayname() if object.creator else "Unknown"},
+          {"text": object.created_at.strftime(datetime_format)},
+          {"text": object.updated_at.strftime(datetime_format)},
         ]) or "" }}
       {% endfor %}
 
@@ -49,7 +51,9 @@
           {"text": "ID"},
           {"text": "Title"},
           {"text": "Description"},
-          {"text":"Created by"}
+          {"text": "Created by"},
+          {"text": create_sortable_anchor(request, "created_at", "Created", base_url)},
+          {"text": create_sortable_anchor(request, "updated_at", "Last Updated", base_url)},
         ],
           "rows": table_rows
         }) }}
diff --git a/tasks/migrations/0018_taskworkflowtemplate_created_at_and_more.py b/tasks/migrations/0018_taskworkflowtemplate_created_at_and_more.py
new file mode 100644
index 000000000..ab4565535
--- /dev/null
+++ b/tasks/migrations/0018_taskworkflowtemplate_created_at_and_more.py
@@ -0,0 +1,29 @@
+# Generated by Django 4.2.15 on 2024-12-09 14:53
+
+import django.utils.timezone
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0017_rename_queue_taskitem_workflow_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="taskworkflowtemplate",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True,
+                default=django.utils.timezone.now,
+            ),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="taskworkflowtemplate",
+            name="updated_at",
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index c97324f15..b0bb33c54 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -4,6 +4,7 @@
 from django.urls import reverse
 
 from common.models import User
+from common.models.mixins import TimestampedMixin
 from tasks.models.queue import Queue
 from tasks.models.queue import QueueItem
 from tasks.models.task import Task
@@ -109,7 +110,7 @@ class Meta(QueueItem.Meta):
 # ----------------------------------------
 
 
-class TaskWorkflowTemplate(Queue):
+class TaskWorkflowTemplate(Queue, TimestampedMixin):
     """Template used to create TaskWorkflow instance."""
 
     title = models.CharField(
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index ac179e65e..562050197 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -3,6 +3,7 @@
 from bs4 import BeautifulSoup
 from django.urls import reverse
 
+import settings
 from common.tests.factories import ProgressStateFactory
 from common.tests.factories import SubTaskFactory
 from common.tests.factories import TaskFactory
@@ -573,6 +574,8 @@ def test_workflow_template_list_view(valid_user, client):
     assert str(template_instance.id) in row_text
     assert template_instance.description in row_text
     assert template_instance.creator.get_displayname() in row_text
+    assert f"{template_instance.strftime(settings.DATETIME_FORMAT)}" in row_text
+    assert f"{template_instance.strftime(settings.DATETIME_FORMAT)}" in row_text
 
 
 def test_workflow_detail_view_displays_tasks(
diff --git a/tasks/views.py b/tasks/views.py
index 261491b6b..7dd1a111d 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -311,15 +311,28 @@ def get_queryset(self):
         return queryset
 
 
-class TaskWorkflowTemplateListView(PermissionRequiredMixin, WithPaginationListView):
+class TaskWorkflowTemplateListView(
+    PermissionRequiredMixin,
+    SortingMixin,
+    WithPaginationListView,
+):
     model = TaskWorkflowTemplate
     template_name = "tasks/workflows/template_list.jinja"
     permission_required = "tasks.view_taskworkflowtemplate"
     paginate_by = 20
     filterset_class = WorkflowTemplateFilter
+    sort_by_fields = ["created_at", "updated_at"]
+
+    def get_context_data(self, **kwargs):
+        context_data = super().get_context_data(**kwargs)
+        context_data["datetime_format"] = settings.DATETIME_FORMAT
 
     def get_queryset(self):
         queryset = TaskWorkflowTemplate.objects.all()
+        ordering = self.get_ordering()
+        if ordering:
+            ordering = (ordering,)
+            queryset = queryset.order_by(*ordering)
         return queryset
 
 

From dd663acc8e100dd2720eeb45627c3ff13799bd41 Mon Sep 17 00:00:00 2001
From: Paul Pepper <paul.pepper@digital.trade.gov.uk>
Date: Tue, 17 Dec 2024 16:06:23 +0000
Subject: [PATCH 36/57] Add migrations.

---
 ...ons_alter_tasktemplate_options_and_more.py | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 tasks/migrations/0019_alter_task_options_alter_tasktemplate_options_and_more.py

diff --git a/tasks/migrations/0019_alter_task_options_alter_tasktemplate_options_and_more.py b/tasks/migrations/0019_alter_task_options_alter_tasktemplate_options_and_more.py
new file mode 100644
index 000000000..9219fcb7f
--- /dev/null
+++ b/tasks/migrations/0019_alter_task_options_alter_tasktemplate_options_and_more.py
@@ -0,0 +1,29 @@
+# Generated by Django 4.2.17 on 2024-12-17 16:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0018_taskworkflowtemplate_created_at_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="task",
+            options={"ordering": ["id"]},
+        ),
+        migrations.AlterModelOptions(
+            name="tasktemplate",
+            options={"ordering": ["id"]},
+        ),
+        migrations.AlterModelOptions(
+            name="taskworkflow",
+            options={"ordering": ["id"], "verbose_name": "workflow"},
+        ),
+        migrations.AlterModelOptions(
+            name="taskworkflowtemplate",
+            options={"ordering": ["id"], "verbose_name": "workflow template"},
+        ),
+    ]

From 58241968c742818f067fcdaa66171afe7ce99bb4 Mon Sep 17 00:00:00 2001
From: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>
Date: Tue, 17 Dec 2024 21:44:53 +0000
Subject: [PATCH 37/57] Fix failing test (#1362)

* Correctly return context

* Fix and simplify test
---
 tasks/tests/test_views.py | 21 +++++++++++----------
 tasks/views.py            |  5 ++++-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 562050197..6a1a77155 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -555,27 +555,28 @@ def test_delete_task_template_view(
     )
 
 
-def test_workflow_template_list_view(valid_user, client):
+def test_workflow_template_list_view(valid_user_client, valid_user):
     """Test that valid user receives a 200 on GET for TaskWorkflowList view and
     values display in table."""
-    template_instance = TaskWorkflowTemplateFactory.create(creator=valid_user)
 
-    url = reverse("workflow:task-workflow-template-ui-list")
-    client.force_login(valid_user)
-    response = client.get(url)
+    template_instance = TaskWorkflowTemplateFactory.create(creator=valid_user)
+    response = valid_user_client.get(reverse("workflow:task-workflow-template-ui-list"))
 
     assert response.status_code == 200
 
     soup = BeautifulSoup(str(response.content), "html.parser")
-    table = soup.select("table")[0]
-    row_text = [row.text for row in table.findChildren("td")]
+    row_text = [td.text for td in soup.select("table tr:nth-child(1) > td")]
 
-    assert template_instance.title in row_text
     assert str(template_instance.id) in row_text
+    assert template_instance.title in row_text
     assert template_instance.description in row_text
     assert template_instance.creator.get_displayname() in row_text
-    assert f"{template_instance.strftime(settings.DATETIME_FORMAT)}" in row_text
-    assert f"{template_instance.strftime(settings.DATETIME_FORMAT)}" in row_text
+    assert (
+        f"{template_instance.updated_at.strftime(settings.DATETIME_FORMAT)}" in row_text
+    )
+    assert (
+        f"{template_instance.created_at.strftime(settings.DATETIME_FORMAT)}" in row_text
+    )
 
 
 def test_workflow_detail_view_displays_tasks(
diff --git a/tasks/views.py b/tasks/views.py
index 7dd1a111d..5eddb8d4e 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -323,10 +323,13 @@ class TaskWorkflowTemplateListView(
     filterset_class = WorkflowTemplateFilter
     sort_by_fields = ["created_at", "updated_at"]
 
-    def get_context_data(self, **kwargs):
+    def get_context_data(self, **kwargs) -> dict:
         context_data = super().get_context_data(**kwargs)
+
         context_data["datetime_format"] = settings.DATETIME_FORMAT
 
+        return context_data
+
     def get_queryset(self):
         queryset = TaskWorkflowTemplate.objects.all()
         ordering = self.get_ordering()

From 4f054b684a53eababa43221744197cf9fa14b285 Mon Sep 17 00:00:00 2001
From: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>
Date: Wed, 18 Dec 2024 11:26:47 +0000
Subject: [PATCH 38/57] Fix UI bug (#1364)

* Remove redundant assignment

* Set missing context variable.
---
 tasks/jinja2/tasks/edit.jinja | 1 -
 tasks/views.py                | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tasks/jinja2/tasks/edit.jinja b/tasks/jinja2/tasks/edit.jinja
index d56b9d0d8..d2d0bde91 100644
--- a/tasks/jinja2/tasks/edit.jinja
+++ b/tasks/jinja2/tasks/edit.jinja
@@ -1,7 +1,6 @@
 {% extends "layouts/form.jinja" %}
 {% from "components/breadcrumbs.jinja" import breadcrumbs %}
 
-{% set page_title = page_title %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(request, [
diff --git a/tasks/views.py b/tasks/views.py
index 5eddb8d4e..4df9a8517 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -102,6 +102,11 @@ class TaskUpdateView(PermissionRequiredMixin, UpdateView):
     permission_required = "tasks.change_task"
     form_class = TaskUpdateForm
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["page_title"] = "Edit task details"
+        return context
+
     def form_valid(self, form):
         set_current_instigator(self.request.user)
         with transaction.atomic():

From d1c35059bf94433282c0011241aea17a4b82604d Mon Sep 17 00:00:00 2001
From: Lauren Mullally <46787754+LaurenMullally@users.noreply.github.com>
Date: Thu, 19 Dec 2024 14:34:21 +0000
Subject: [PATCH 39/57] TP2000-1600 Add Subtask filter to Task admin view
 (#1344)

* Add is subtask to Task admin list display

* Add filter for subtasks

* Refactor filtering to extend from TaskQueryset
---
 tasks/admin.py       | 25 ++++++++++++++++++++++++-
 tasks/models/task.py | 13 +++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/tasks/admin.py b/tasks/admin.py
index 01086b346..18924664b 100644
--- a/tasks/admin.py
+++ b/tasks/admin.py
@@ -29,10 +29,29 @@ def link_to_workbasket(self, workbasket):
         )
 
 
+class SubtaskFilter(admin.SimpleListFilter):
+    title = "Subtasks"
+    parameter_name = "is_subtask"
+
+    def lookups(self, request, model_admin):
+        return (
+            ("TRUE", "Subtasks"),
+            ("FALSE", "Tasks"),
+        )
+
+    def queryset(self, request, queryset):
+        value = self.value()
+        if value == "TRUE":
+            return queryset.subtasks()
+        elif value == "FALSE":
+            return queryset.parents()
+
+
 class TaskAdmin(TaskAdminMixin, admin.ModelAdmin):
     list_display = [
         "id",
         "title",
+        "is_subtask",
         "description",
         "category",
         "progress_state",
@@ -41,7 +60,11 @@ class TaskAdmin(TaskAdminMixin, admin.ModelAdmin):
         "creator",
     ]
     search_fields = ["id", "title", "description"]
-    list_filter = ["category", "progress_state"]
+    list_filter = (
+        SubtaskFilter,
+        "category",
+        "progress_state",
+    )
 
     def parent_task_id(self, obj):
         if not obj.parent_task:
diff --git a/tasks/models/task.py b/tasks/models/task.py
index 24b4edae0..a93970dd7 100644
--- a/tasks/models/task.py
+++ b/tasks/models/task.py
@@ -1,6 +1,7 @@
 from datetime import datetime
 
 from django.conf import settings
+from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.db import models
 from django.db import transaction
@@ -81,6 +82,17 @@ def top_level(self) -> "TaskQueryset":
             & models.Q(parent_task__isnull=True),
         )
 
+    def parents(self):
+        """Returns a queryset of tasks who do not have subtasks linked to
+        them."""
+        return self.filter(
+            models.Q(parent_task=None),
+        )
+
+    def subtasks(self):
+        """Returns a queryset of tasks who have parent tasks linked to them."""
+        return self.exclude(models.Q(parent_task=None))
+
 
 class TaskBase(TimestampedMixin):
     """Abstract model mixin containing model fields common to TaskTemplate and
@@ -133,6 +145,7 @@ class Meta(TaskBase.Meta):
         ordering = ["id"]
 
     @property
+    @admin.display(boolean=True)
     def is_subtask(self) -> bool:
         return bool(self.parent_task)
 

From 9b994759b9d3b40634966c3772b7fd7e6c778621 Mon Sep 17 00:00:00 2001
From: Lauren Mullally <46787754+LaurenMullally@users.noreply.github.com>
Date: Fri, 3 Jan 2025 16:13:35 +0000
Subject: [PATCH 40/57] Add simple TaskWorkflowAdmin view (#1373)

---
 tasks/admin.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tasks/admin.py b/tasks/admin.py
index 18924664b..790685feb 100644
--- a/tasks/admin.py
+++ b/tasks/admin.py
@@ -7,6 +7,7 @@
 from tasks.models import Task
 from tasks.models import TaskAssignee
 from tasks.models import TaskLog
+from tasks.models import TaskWorkflow
 
 
 class TaskAdminMixin:
@@ -114,6 +115,16 @@ class TaskLogAdmin(admin.ModelAdmin):
     ]
 
 
+class TaskWorflowAdmin(admin.ModelAdmin):
+    search_fields = ["summary_task__title"]
+    list_display = [
+        "id",
+        "title",
+        "description",
+        "creator_template",
+    ]
+
+
 admin.site.register(Task, TaskAdmin)
 
 admin.site.register(Category, CategoryAdmin)
@@ -123,3 +134,5 @@ class TaskLogAdmin(admin.ModelAdmin):
 admin.site.register(TaskAssignee, TaskAssigneeAdmin)
 
 admin.site.register(TaskLog, TaskLogAdmin)
+
+admin.site.register(TaskWorkflow, TaskWorflowAdmin)

From 755fac69c5b5003dba2dad826edd63afa2fc8c08 Mon Sep 17 00:00:00 2001
From: Marya Shariq <marya.shariq@digital.trade.gov.uk>
Date: Thu, 9 Jan 2025 11:17:15 +0000
Subject: [PATCH 41/57] Tp2000 1542  workflow template admin support (#1374)

* added admin support for task workflow templates and task templates

* admin support for task workflow templates and task templates

* created ReadOnlyAdminMixIn for use with both taskworkflowtemplate admin and tasktemplate admin
---
 tasks/admin.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/tasks/admin.py b/tasks/admin.py
index 790685feb..04e2cfb9d 100644
--- a/tasks/admin.py
+++ b/tasks/admin.py
@@ -7,7 +7,9 @@
 from tasks.models import Task
 from tasks.models import TaskAssignee
 from tasks.models import TaskLog
+from tasks.models import TaskTemplate
 from tasks.models import TaskWorkflow
+from tasks.models import TaskWorkflowTemplate
 
 
 class TaskAdminMixin:
@@ -115,6 +117,51 @@ class TaskLogAdmin(admin.ModelAdmin):
     ]
 
 
+class ReadOnlyAdminMixin:
+    def has_add_permission(self, request):
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+
+class TaskWorkflowTemplateAdmin(ReadOnlyAdminMixin, admin.ModelAdmin):
+    list_display = (
+        "id",
+        "title",
+        "description",
+        "creator",
+    )
+
+
+class TaskTemplateAdmin(ReadOnlyAdminMixin, admin.ModelAdmin):
+    list_display = (
+        "id",
+        "title",
+        "description",
+        "taskworkflowtemplate_id",
+    )
+
+    @admin.display(description="Task Workflow Template")
+    def taskworkflowtemplate_id(self, obj):
+        if not obj.taskitemtemplate:
+            return "-"
+        return self.link_to_task_workflow_template(obj.taskitemtemplate)
+
+    def link_to_task_workflow_template(self, task_item_template):
+        workflow_template_pk = task_item_template.workflow_template.pk
+        task_workflow_template_url = reverse(
+            "admin:tasks_taskworkflowtemplate_change",
+            args=(workflow_template_pk,),
+        )
+        return mark_safe(
+            f'<a href="{task_workflow_template_url}">{workflow_template_pk}</a>',
+        )
+
+
 class TaskWorflowAdmin(admin.ModelAdmin):
     search_fields = ["summary_task__title"]
     list_display = [
@@ -135,4 +182,7 @@ class TaskWorflowAdmin(admin.ModelAdmin):
 
 admin.site.register(TaskLog, TaskLogAdmin)
 
+admin.site.register(TaskWorkflowTemplate, TaskWorkflowTemplateAdmin)
+
+admin.site.register(TaskTemplate, TaskTemplateAdmin)
 admin.site.register(TaskWorkflow, TaskWorflowAdmin)

From c6c0a436fd58e56a946d901cbae25ae2f4f41a07 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Wed, 15 Jan 2025 10:03:48 +0000
Subject: [PATCH 42/57] TP2000-1652  Enhance workflow, workflow template admin
 views (#1381)

* Add search fields to TaskTemplateAdmin

* Display related items on workflow & workflow template admin views
---
 tasks/admin.py | 61 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 12 deletions(-)

diff --git a/tasks/admin.py b/tasks/admin.py
index 04e2cfb9d..2d8e9c53d 100644
--- a/tasks/admin.py
+++ b/tasks/admin.py
@@ -6,12 +6,25 @@
 from tasks.models import ProgressState
 from tasks.models import Task
 from tasks.models import TaskAssignee
+from tasks.models import TaskItem
+from tasks.models import TaskItemTemplate
 from tasks.models import TaskLog
 from tasks.models import TaskTemplate
 from tasks.models import TaskWorkflow
 from tasks.models import TaskWorkflowTemplate
 
 
+class ReadOnlyAdminMixin:
+    def has_add_permission(self, request, obj=None):
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+
 class TaskAdminMixin:
     def link_to_task(self, task: Task):
         task_url = reverse(
@@ -50,7 +63,7 @@ def queryset(self, request, queryset):
             return queryset.parents()
 
 
-class TaskAdmin(TaskAdminMixin, admin.ModelAdmin):
+class TaskAdmin(ReadOnlyAdminMixin, TaskAdminMixin, admin.ModelAdmin):
     list_display = [
         "id",
         "title",
@@ -88,7 +101,7 @@ class ProgressStateAdmin(admin.ModelAdmin):
     search_fields = ["name"]
 
 
-class TaskAssigneeAdmin(TaskAdminMixin, admin.ModelAdmin):
+class TaskAssigneeAdmin(ReadOnlyAdminMixin, TaskAdminMixin, admin.ModelAdmin):
     list_display = ["id", "assignee", "assignment_type", "task_id", "unassigned_at"]
     search_fields = ["user__username", "assignment_type", "task__id"]
 
@@ -104,7 +117,7 @@ def task_id(self, obj):
         return self.link_to_task(obj.task)
 
 
-class TaskLogAdmin(admin.ModelAdmin):
+class TaskLogAdmin(ReadOnlyAdminMixin, admin.ModelAdmin):
     list_display = ["task", "action", "created_at"]
     list_filter = ["action"]
     readonly_fields = [
@@ -117,15 +130,13 @@ class TaskLogAdmin(admin.ModelAdmin):
     ]
 
 
-class ReadOnlyAdminMixin:
-    def has_add_permission(self, request):
-        return False
+class TaskItemTemplateInline(admin.TabularInline):
+    model = TaskItemTemplate
+    readonly_fields = ("task_template_description", "position")
 
-    def has_change_permission(self, request, obj=None):
-        return False
-
-    def has_delete_permission(self, request, obj=None):
-        return False
+    @admin.display(description="Description")
+    def task_template_description(self, obj):
+        return obj.task_template.description
 
 
 class TaskWorkflowTemplateAdmin(ReadOnlyAdminMixin, admin.ModelAdmin):
@@ -133,8 +144,15 @@ class TaskWorkflowTemplateAdmin(ReadOnlyAdminMixin, admin.ModelAdmin):
         "id",
         "title",
         "description",
+        "task_templates_count",
         "creator",
     )
+    search_fields = ("title", "description")
+    inlines = [TaskItemTemplateInline]
+
+    @admin.display(description="Task templates")
+    def task_templates_count(self, obj):
+        return obj.get_task_templates().count()
 
 
 class TaskTemplateAdmin(ReadOnlyAdminMixin, admin.ModelAdmin):
@@ -143,7 +161,10 @@ class TaskTemplateAdmin(ReadOnlyAdminMixin, admin.ModelAdmin):
         "title",
         "description",
         "taskworkflowtemplate_id",
+        "created_at",
     )
+    search_fields = ["id", "title", "description"]
+    list_filter = ["category"]
 
     @admin.display(description="Task Workflow Template")
     def taskworkflowtemplate_id(self, obj):
@@ -162,14 +183,29 @@ def link_to_task_workflow_template(self, task_item_template):
         )
 
 
-class TaskWorflowAdmin(admin.ModelAdmin):
+class TaskItemInline(admin.TabularInline):
+    model = TaskItem
+    readonly_fields = ("task_description", "position")
+
+    @admin.display(description="Description")
+    def task_description(self, obj):
+        return obj.task.description
+
+
+class TaskWorflowAdmin(ReadOnlyAdminMixin, admin.ModelAdmin):
     search_fields = ["summary_task__title"]
     list_display = [
         "id",
         "title",
         "description",
+        "task_count",
         "creator_template",
     ]
+    inlines = [TaskItemInline]
+
+    @admin.display(description="Tasks")
+    def task_count(self, obj):
+        return obj.get_tasks().count()
 
 
 admin.site.register(Task, TaskAdmin)
@@ -185,4 +221,5 @@ class TaskWorflowAdmin(admin.ModelAdmin):
 admin.site.register(TaskWorkflowTemplate, TaskWorkflowTemplateAdmin)
 
 admin.site.register(TaskTemplate, TaskTemplateAdmin)
+
 admin.site.register(TaskWorkflow, TaskWorflowAdmin)

From 6d9e3680352e764879c13ed8fed070252791cd10 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Thu, 16 Jan 2025 12:25:34 +0000
Subject: [PATCH 43/57] TP2000-1658  Correct usage of select_for_update() in
 QueueItem instance methods (#1385)

* Evaluate querysets that rely on select_for_update()

* Add race condition unit tests for QueueItem instance methods
---
 tasks/models/queue.py            |  48 ++++++--
 tasks/tests/test_queue_models.py | 184 +++++++++++++++++++++++++++++++
 2 files changed, 220 insertions(+), 12 deletions(-)

diff --git a/tasks/models/queue.py b/tasks/models/queue.py
index 780f54d2d..1dc679076 100644
--- a/tasks/models/queue.py
+++ b/tasks/models/queue.py
@@ -155,10 +155,18 @@ def delete(self):
         queued instances up one position."""
         instance = self.__class__.objects.select_for_update(nowait=True).get(pk=self.pk)
 
-        self.__class__.objects.select_for_update(nowait=True).filter(
-            position__gt=instance.position,
-            **{self.get_queue_field(): self.get_queue()},
-        ).update(position=models.F("position") - 1)
+        to_update = list(
+            self.__class__.objects.select_for_update(nowait=True)
+            .filter(
+                position__gt=instance.position,
+                **{self.get_queue_field(): self.get_queue()},
+            )
+            .values_list("pk", flat=True),
+        )
+
+        self.__class__.objects.filter(pk__in=to_update).update(
+            position=models.F("position") - 1,
+        )
 
         return super().delete()
 
@@ -234,10 +242,18 @@ def promote_to_first(self) -> Self:
         if instance.position == 1:
             return instance
 
-        self.__class__.objects.select_for_update(nowait=True).filter(
-            position__lt=instance.position,
-            **{self.get_queue_field(): self.get_queue()},
-        ).update(position=models.F("position") + 1)
+        to_update = list(
+            self.__class__.objects.select_for_update(nowait=True)
+            .filter(
+                position__lt=instance.position,
+                **{self.get_queue_field(): self.get_queue()},
+            )
+            .values_list("pk", flat=True),
+        )
+
+        self.__class__.objects.filter(pk__in=to_update).update(
+            position=models.F("position") + 1,
+        )
 
         instance.position = 1
         instance.save(update_fields=["position"])
@@ -267,10 +283,18 @@ def demote_to_last(self) -> Self:
         if instance.position == last_place:
             return instance
 
-        self.__class__.objects.select_for_update(nowait=True).filter(
-            position__gt=instance.position,
-            **queue_kwarg,
-        ).update(position=models.F("position") - 1)
+        to_update = list(
+            self.__class__.objects.select_for_update(nowait=True)
+            .filter(
+                position__gt=instance.position,
+                **queue_kwarg,
+            )
+            .values_list("pk", flat=True),
+        )
+
+        self.__class__.objects.filter(pk__in=to_update).update(
+            position=models.F("position") - 1,
+        )
 
         instance.position = last_place
         instance.save(update_fields=["position"])
diff --git a/tasks/tests/test_queue_models.py b/tasks/tests/test_queue_models.py
index d56f00f1d..0021fe2d3 100644
--- a/tasks/tests/test_queue_models.py
+++ b/tasks/tests/test_queue_models.py
@@ -1,6 +1,11 @@
+import threading
+from functools import wraps
+
 import pytest
+from django.db import OperationalError
 from django.db.models import CASCADE
 from django.db.models import ForeignKey
+from django.db.models import QuerySet
 from factory import SubFactory
 from factory.django import DjangoModelFactory
 
@@ -209,3 +214,182 @@ def test_item_promote_to_first(three_item_queue):
     item = item.promote_to_first()
 
     assert item.position == 1
+
+
+@pytest.mark.django_db(transaction=True)
+class TestQueueRaceConditions:
+    """Tests that concurrent requests to reorder queue items don't result in
+    duplicate or non-consecutive positions."""
+
+    NUM_THREADS: int = 2
+    """The number of threads each test uses."""
+
+    THREAD_TIMEOUT: int = 5
+    """The duration in seconds to wait for a thread to complete before timing
+    out."""
+
+    NUM_QUEUE_ITEMS: int = 5
+    """The number of queue items to create for each test."""
+
+    @pytest.fixture(autouse=True)
+    def setup(self, queue):
+        """Initialises a barrier to synchronise threads and creates queue items
+        anew for each test."""
+
+        self.unexpected_exceptions: list[Exception] = []
+
+        self.barrier: threading.Barrier = threading.Barrier(
+            parties=self.NUM_THREADS,
+            timeout=self.THREAD_TIMEOUT,
+        )
+
+        self.queue: TestQueue = queue
+        self.queue_items: QuerySet[TestQueueItem] = TestQueueItemFactory.create_batch(
+            self.NUM_QUEUE_ITEMS,
+            queue=queue,
+        )
+
+    def assert_no_unexpected_exceptions(self):
+        """Asserts that no threads raised an unexpected exception."""
+        assert (
+            not self.unexpected_exceptions
+        ), f"Unexpected exception(s) raised: {self.unexpected_exceptions}"
+
+    def assert_expected_positions(self):
+        """Asserts that queue item positions remain both unique and in
+        consecutive sequence."""
+        positions = list(
+            TestQueueItem.objects.filter(
+                queue=self.queue,
+            )
+            .order_by("position")
+            .values_list("position", flat=True),
+        )
+
+        assert len(set(positions)) == len(positions), "Duplicate positions found!"
+
+        assert positions == list(
+            range(min(positions), max(positions) + 1),
+        ), "Non-consecutive positions found!"
+
+    def synchronised(func):
+        """
+        Decorator that ensures all threads wait until they can call their target
+        function in a synchronised fashion.
+
+        Any unexpected exceptions raised during the execution of the decorated
+        function are stored for the individual test to re-raise.
+        """
+
+        @wraps(func)
+        def wrapper(self, *args, **kwargs):
+            try:
+                self.barrier.wait()
+                func(self, *args, **kwargs)
+            except OperationalError:
+                # A conflicting lock is already acquired
+                pass
+            except Exception as error:
+                self.unexpected_exceptions.append(error)
+
+        return wrapper
+
+    @synchronised
+    def synchronised_call(
+        self,
+        method_name: str,
+        queue_item: TestQueueItem,
+    ):
+        """
+        Thread-synchronised wrapper for the following `QueueItem` instance
+        methods:
+
+        - delete
+        - promote
+        - demote
+        - promote_to_first
+        - demote_to_last
+        """
+        getattr(queue_item, method_name)()
+
+    @synchronised
+    def synchronised_create_queue_item(self):
+        """Thread-synchronised wrapper to create a new queue item instance."""
+        TestQueueItemFactory.create(queue=self.queue)
+
+    def execute_threads(self, threads: list[threading.Thread]):
+        """Starts a list of threads and waits for them to complete or
+        timeout."""
+        for thread in threads:
+            thread.start()
+
+        for thread in threads:
+            thread.join(timeout=self.THREAD_TIMEOUT)
+            if thread.is_alive():
+                raise RuntimeError(f"Thread {thread.name} timed out.")
+
+    def test_demote_and_promote_queue_items(self):
+        """Demotes and promotes the same queue item."""
+        thread1 = threading.Thread(
+            target=self.synchronised_call,
+            kwargs={
+                "method_name": "demote",
+                "queue_item": self.queue_items[2],
+            },
+            name="DemoteItemThread1",
+        )
+        thread2 = threading.Thread(
+            target=self.synchronised_call,
+            kwargs={
+                "method_name": "promote",
+                "queue_item": self.queue_items[2],
+            },
+            name="PromoteItemThread2",
+        )
+
+        self.execute_threads([thread1, thread2])
+        self.assert_no_unexpected_exceptions()
+        self.assert_expected_positions()
+
+    def test_delete_and_create_queue_items(self):
+        """Deletes the first item while creating a new one."""
+        thread1 = threading.Thread(
+            target=self.synchronised_call,
+            kwargs={
+                "method_name": "delete",
+                "queue_item": self.queue_items[0],
+            },
+            name="DeleteItemThread1",
+        )
+        thread2 = threading.Thread(
+            target=self.synchronised_create_queue_item,
+            name="CreateItemThread2",
+        )
+
+        self.execute_threads([thread1, thread2])
+        self.assert_no_unexpected_exceptions()
+        self.assert_expected_positions()
+
+    def test_promote_and_promote_to_first_queue_items(self):
+        """Promotes to first the last-placed item while promoting the one before
+        it."""
+        thread1 = threading.Thread(
+            target=self.synchronised_call,
+            kwargs={
+                "method_name": "promote_to_first",
+                "queue_item": self.queue_items[4],
+            },
+            name="PromoteItemToFirstThread1",
+        )
+        thread2 = threading.Thread(
+            target=self.synchronised_call,
+            kwargs={
+                "method_name": "promote",
+                "queue_item": self.queue_items[3],
+            },
+            name="PromoteItemThread2",
+        )
+
+        self.execute_threads([thread1, thread2])
+        self.assert_no_unexpected_exceptions()
+        self.assert_expected_positions()

From 2064d09aa5e98dffc219df73a15c08ca04fc6c1a Mon Sep 17 00:00:00 2001
From: Paul Pepper <85895113+paulpepper-trade@users.noreply.github.com>
Date: Tue, 11 Feb 2025 15:28:56 +0000
Subject: [PATCH 44/57] TP2000-1583 Add task assignee update support (#1407)

* Show workbasket assignment on details view

* Order attributes the same as on edit view

* Pass creator into Task when creating from template

* Add assignees row

* Update docstring

* Add assignees to context data

* Add view context elements

* Add React components

* View and Form support to add TaskAssignees to a Task

* Support for unassigning task assignees

* Rename refactor

* Remove TODO comments

* Implement UserQuerySet

* Updated model docstring

* Add type annotation and docstrings

* Remove unused view and URL route

* Avoid duplicates in queryset due to multi-group membership.

* Link to view from anchors and exclude unassigned

* Create User.objects via UserManager.from_queryset()

* Define custom manager
---
 common/migrations/0013_alter_user_managers.py |  21 +++
 common/models/user.py                         |  22 +++
 common/static/common/js/application.js        |   2 +
 .../TaskUserAssignment/AssignUserForm.js      |  75 ++++++++++
 .../TaskUserAssignment/UnassignUserForm.js    |  73 ++++++++++
 .../js/components/TaskUserAssignment/index.js | 133 ++++++++++++++++++
 tasks/forms.py                                | 119 ++++++++++++++++
 tasks/jinja2/tasks/assign_users.jinja         |  23 +++
 tasks/jinja2/tasks/detail.jinja               | 126 ++++++++++++++---
 ...0020_alter_taskassignee_assignment_type.py |  26 ++++
 tasks/models/task.py                          |  73 ++++++++++
 tasks/models/workflow.py                      |   1 +
 tasks/signals.py                              |   3 +
 tasks/urls.py                                 |  10 ++
 tasks/views.py                                |  91 ++++++++++++
 15 files changed, 781 insertions(+), 17 deletions(-)
 create mode 100644 common/migrations/0013_alter_user_managers.py
 create mode 100644 common/static/common/js/components/TaskUserAssignment/AssignUserForm.js
 create mode 100644 common/static/common/js/components/TaskUserAssignment/UnassignUserForm.js
 create mode 100644 common/static/common/js/components/TaskUserAssignment/index.js
 create mode 100644 tasks/jinja2/tasks/assign_users.jinja
 create mode 100644 tasks/migrations/0020_alter_taskassignee_assignment_type.py

diff --git a/common/migrations/0013_alter_user_managers.py b/common/migrations/0013_alter_user_managers.py
new file mode 100644
index 000000000..38149a5cd
--- /dev/null
+++ b/common/migrations/0013_alter_user_managers.py
@@ -0,0 +1,21 @@
+# Generated by Django 4.2.18 on 2025-02-11 14:47
+
+from django.db import migrations
+
+import common.models.user
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("common", "0012_user_sso_uuid"),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name="user",
+            managers=[
+                ("objects", common.models.user.TamatoUserManager()),
+            ],
+        ),
+    ]
diff --git a/common/models/user.py b/common/models/user.py
index 61dfd092b..7ec0bd6ca 100644
--- a/common/models/user.py
+++ b/common/models/user.py
@@ -1,10 +1,32 @@
 from django.contrib.auth.models import AbstractUser
+from django.contrib.auth.models import UserManager
 from django.db import models
 
 
+class UserQuerySet(models.QuerySet):
+    def active_tms(self) -> models.QuerySet | list["User"]:
+        """Return a QuerySet of active users that may take the tariff manager
+        role."""
+        return (
+            self.filter(
+                models.Q(groups__name__in=["Tariff Managers", "Tariff Lead Profile"])
+                | models.Q(is_superuser=True),
+            )
+            .filter(is_active=True)
+            .distinct()
+            .order_by("first_name", "last_name")
+        )
+
+
+class TamatoUserManager(UserManager.from_queryset(UserQuerySet)):
+    use_in_migrations = True
+
+
 class User(AbstractUser):
     """Custom user model."""
 
+    objects = TamatoUserManager()
+
     current_workbasket = models.ForeignKey(
         "workbaskets.WorkBasket",
         on_delete=models.SET_NULL,
diff --git a/common/static/common/js/application.js b/common/static/common/js/application.js
index 91bc1f7d1..6c1ec0c29 100644
--- a/common/static/common/js/application.js
+++ b/common/static/common/js/application.js
@@ -26,6 +26,7 @@ import initTapDebounce from "./buttonDebounce";
 import { setupQuotaOriginFormset } from "./components/QuotaOriginFormset/index";
 import { setupGeoAreaForm } from "./components/GeoAreaForm/index";
 import { setupWorkbasketUserAssignment } from "./components/WorkbasketUserAssignment/index";
+import { setupTaskUserAssignment } from "./components/TaskUserAssignment/index";
 import { initMasonry } from "./masonry";
 
 showHideCheckboxes();
@@ -46,4 +47,5 @@ initTapDebounce();
 setupQuotaOriginFormset();
 setupGeoAreaForm();
 setupWorkbasketUserAssignment();
+setupTaskUserAssignment();
 initMasonry();
diff --git a/common/static/common/js/components/TaskUserAssignment/AssignUserForm.js b/common/static/common/js/components/TaskUserAssignment/AssignUserForm.js
new file mode 100644
index 000000000..ab8de68f5
--- /dev/null
+++ b/common/static/common/js/components/TaskUserAssignment/AssignUserForm.js
@@ -0,0 +1,75 @@
+/* global CSRF_TOKEN:readonly, assignUsersUrl:readonly */
+
+import React, { useEffect } from "react";
+import accessibleAutocomplete from "accessible-autocomplete";
+import PropTypes from "prop-types";
+
+function AssignUserForm({ users }) {
+  const elementId = "users-select";
+  const elementName = "users";
+  const label = "Assign user";
+  const hint = "Select a user to assign";
+
+  useEffect(() => {
+    const selectElement = document.getElementById(elementId);
+    if (selectElement)
+      accessibleAutocomplete.enhanceSelectElement({
+        autoselect: false,
+        defaultValue: "",
+        minLength: 2,
+        showAllValues: true,
+        selectElement: selectElement,
+      });
+  }, []);
+
+  return (
+    <>
+      <form
+        action={assignUsersUrl}
+        method="POST"
+        data-testid={"assign-user-form"}
+      >
+        <input type="hidden" value={CSRF_TOKEN} name="csrfmiddlewaretoken" />
+        <div className="govuk-form-group">
+          <label className="govuk-label" htmlFor={elementId}>
+            {label}
+          </label>
+          <div id={`${elementName}-hint`} className="govuk-hint">
+            {hint}
+          </div>
+          <select
+            required={true}
+            id={elementId}
+            name={elementName}
+            data-testid="assign-user-select"
+          >
+            <option value="">Select a user</option>
+            {users.map((user) => (
+              <option key={user.pk} value={user.pk}>
+                {user.name}
+              </option>
+            ))}
+          </select>
+        </div>
+        <button
+          type="submit"
+          className="govuk-button"
+          data-prevent-double-click="true"
+        >
+          Save
+        </button>
+      </form>
+    </>
+  );
+}
+
+AssignUserForm.propTypes = {
+  users: PropTypes.arrayOf(
+    PropTypes.shape({
+      pk: PropTypes.number.isRequired,
+      name: PropTypes.string.isRequired,
+    }),
+  ),
+};
+
+export { AssignUserForm };
diff --git a/common/static/common/js/components/TaskUserAssignment/UnassignUserForm.js b/common/static/common/js/components/TaskUserAssignment/UnassignUserForm.js
new file mode 100644
index 000000000..e2d5c2779
--- /dev/null
+++ b/common/static/common/js/components/TaskUserAssignment/UnassignUserForm.js
@@ -0,0 +1,73 @@
+/* global CSRF_TOKEN:readonly, unassignUsersUrl:readonly */
+
+import React, { useEffect } from "react";
+import accessibleAutocomplete from "accessible-autocomplete";
+import PropTypes from "prop-types";
+
+function UnassignUserForm({ users }) {
+  const elementId = "assignees-select";
+  const elementName = "assignees";
+  const label = "Unassign user";
+  const hint = "Select a user to unassign";
+
+  useEffect(() => {
+    const selectElement = document.getElementById(elementId);
+    if (selectElement)
+      accessibleAutocomplete.enhanceSelectElement({
+        autoselect: false,
+        defaultValue: "",
+        minLength: 2,
+        showAllValues: true,
+        selectElement: selectElement,
+      });
+  }, []);
+
+  return (
+    <form
+      action={unassignUsersUrl}
+      method="POST"
+      data-testid={"unassign-user-form"}
+    >
+      <input type="hidden" value={CSRF_TOKEN} name="csrfmiddlewaretoken" />
+      <div className="govuk-form-group">
+        <label className="govuk-label" htmlFor={elementId}>
+          {label}
+        </label>
+        <div id={`${elementName}-hint`} className="govuk-hint">
+          {hint}
+        </div>
+        <select
+          required={true}
+          id={elementId}
+          name={elementName}
+          data-testid="unassign-user-select"
+        >
+          <option value="">Select a user</option>
+          {users.map((user) => (
+            <option key={user.pk} value={user.pk}>
+              {user.name}
+            </option>
+          ))}
+        </select>
+      </div>
+      <button
+        type="submit"
+        className="govuk-button"
+        data-prevent-double-click="true"
+      >
+        Save
+      </button>
+    </form>
+  );
+}
+
+UnassignUserForm.propTypes = {
+  users: PropTypes.arrayOf(
+    PropTypes.shape({
+      pk: PropTypes.number.isRequired,
+      name: PropTypes.string.isRequired,
+    }),
+  ),
+};
+
+export { UnassignUserForm };
diff --git a/common/static/common/js/components/TaskUserAssignment/index.js b/common/static/common/js/components/TaskUserAssignment/index.js
new file mode 100644
index 000000000..c2e494ec1
--- /dev/null
+++ b/common/static/common/js/components/TaskUserAssignment/index.js
@@ -0,0 +1,133 @@
+/* global assignableUsers:readonly, currentAssignees:readonly */
+
+import React, { useState } from "react";
+import { createPortal } from "react-dom";
+import { createRoot } from "react-dom/client";
+import PropTypes from "prop-types";
+
+import { AssignUserForm } from "./AssignUserForm";
+import { UnassignUserForm } from "./UnassignUserForm";
+
+/**
+ * Renders a button that opens/closes a form to assign/unassign users.
+ * @param action The form's action (Assign or Unassign)
+ * @param users The form's selectable users
+ * @param buttonId The button's element ID
+ * @param formId The form's element ID
+ */
+function TaskUserAssignment({ action, users, buttonId, formId }) {
+  const [showForm, setShowForm] = useState(null);
+
+  const removeFormDiv = () => {
+    const possibleFormDivs = [
+      document.getElementById("assign-users-form"),
+      document.getElementById("unassign-users-form"),
+    ];
+    possibleFormDivs.forEach((form) => {
+      if (form) {
+        const assignmentRow = form.previousSibling;
+        assignmentRow.classList.remove("govuk-summary-list__row--no-border");
+        form.remove();
+      }
+    });
+  };
+
+  const createFormDiv = () => {
+    const formDiv = document.createElement("div");
+    formDiv.id = formId;
+    formDiv.className = "govuk-!-margin-top-4";
+
+    const assignedUsersContent = document.getElementById(
+      "assigned-users-content",
+    );
+    assignedUsersContent.classList.add("govuk-summary-list__row--no-border");
+    assignedUsersContent.after(formDiv);
+
+    setShowForm(formDiv);
+  };
+
+  const handleClick = (e) => {
+    e.preventDefault();
+    const isShown = document.getElementById(formId);
+    removeFormDiv();
+    if (showForm && isShown) {
+      setShowForm(null);
+      return;
+    }
+    createFormDiv();
+  };
+
+  function UserForm({ action }) {
+    if (action === "Assign") {
+      return <AssignUserForm users={users} />;
+    } else {
+      return <UnassignUserForm users={users} />;
+    }
+  }
+
+  return (
+    <>
+      <button
+        type="button"
+        onClick={handleClick}
+        id={buttonId}
+        data-testid={buttonId}
+        className="govuk-link fake-link"
+      >
+        {action}
+      </button>
+
+      {showForm !== null &&
+        createPortal(<UserForm action={action} />, showForm)}
+    </>
+  );
+}
+TaskUserAssignment.propTypes = {
+  action: PropTypes.string.isRequired,
+  users: PropTypes.arrayOf(
+    PropTypes.shape({
+      pk: PropTypes.number.isRequired,
+      name: PropTypes.string.isRequired,
+    }),
+  ),
+  buttonId: PropTypes.string.isRequired,
+  formId: PropTypes.string.isRequired,
+};
+
+/**
+ * Creates React roots in which to render TaskUserAssignment components
+ * for each assign/unassign link on the Task detail view.
+ */
+function init() {
+  const assignUsersLink = document.getElementById("assign-users");
+  if (assignUsersLink) {
+    const assignUsers = createRoot(assignUsersLink);
+    assignUsers.render(
+      <TaskUserAssignment
+        action="Assign"
+        users={assignableUsers}
+        buttonId="assign-users"
+        formId="assign-users-form"
+      />,
+    );
+  }
+
+  const unassignUsersLink = document.getElementById("unassign-users");
+  if (unassignUsersLink) {
+    const unassignUsers = createRoot(unassignUsersLink);
+    unassignUsers.render(
+      <TaskUserAssignment
+        action="Unassign"
+        users={currentAssignees}
+        buttonId="unassign-users"
+        formId="unassign-users-form"
+      />,
+    );
+  }
+}
+
+function setupTaskUserAssignment() {
+  document.addEventListener("DOMContentLoaded", init());
+}
+
+export { setupTaskUserAssignment, TaskUserAssignment };
diff --git a/tasks/forms.py b/tasks/forms.py
index 5fab477ca..1332679e6 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -1,26 +1,36 @@
+from datetime import datetime
+
 from crispy_forms_gds.helper import FormHelper
 from crispy_forms_gds.layout import Fieldset
 from crispy_forms_gds.layout import Layout
 from crispy_forms_gds.layout import Size
 from crispy_forms_gds.layout import Submit
+from django.contrib.auth import get_user_model
 from django.db import transaction
 from django.db.models import TextChoices
 from django.forms import CharField
+from django.forms import CheckboxSelectMultiple
 from django.forms import Form
 from django.forms import ModelChoiceField
 from django.forms import ModelForm
+from django.forms import ModelMultipleChoiceField
 from django.forms import Textarea
+from django.utils.timezone import make_aware
 
 from common.forms import BindNestedFormMixin
 from common.forms import RadioNested
 from common.forms import delete_form_for
 from common.validators import SymbolValidator
 from tasks.models import Task
+from tasks.models import TaskAssignee
 from tasks.models import TaskTemplate
 from tasks.models import TaskWorkflow
 from tasks.models import TaskWorkflowTemplate
+from tasks.signals import set_current_instigator
 from workbaskets.models import WorkBasket
 
+User = get_user_model()
+
 
 class TaskBaseForm(ModelForm):
     class Meta:
@@ -80,6 +90,115 @@ class TaskUpdateForm(TaskBaseForm):
     pass
 
 
+class AssignUsersForm(Form):
+    users = ModelMultipleChoiceField(
+        help_text="Select users to assign",
+        widget=CheckboxSelectMultiple,
+        queryset=User.objects.active_tms(),
+        error_messages={"required": "Select one or more users to assign"},
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.init_fields()
+        self.init_layout()
+
+    def init_fields(self):
+        self.fields["users"].label_from_instance = lambda obj: obj.get_full_name()
+
+    def init_layout(self):
+        self.helper = FormHelper(self)
+        self.helper.label_size = Size.SMALL
+        self.helper.legend_size = Size.SMALL
+        self.helper.layout = Layout(
+            "users",
+            Submit(
+                "submit",
+                "Save",
+                data_module="govuk-button",
+                data_prevent_double_click="true",
+            ),
+        )
+
+    @transaction.atomic
+    def assign_users(self, task: Task, user_instigator) -> list[TaskAssignee]:
+        """Create TaskAssignee instances for the selected Users and return the
+        TaskAssignees as a list."""
+        set_current_instigator(user_instigator)
+
+        assignees = [
+            TaskAssignee(
+                user=user,
+                assignment_type=TaskAssignee.AssignmentType.GENERAL,
+                task=task,
+            )
+            for user in self.cleaned_data["users"]
+            if not TaskAssignee.objects.filter(
+                user=user,
+                assignment_type=TaskAssignee.AssignmentType.GENERAL,
+                task=task,
+            )
+            .assigned()
+            .exists()
+        ]
+        return TaskAssignee.objects.bulk_create(assignees)
+
+
+class UnassignUsersForm(Form):
+    assignees = ModelMultipleChoiceField(
+        label="Users",
+        help_text="Select users to unassign",
+        widget=CheckboxSelectMultiple,
+        queryset=TaskAssignee.objects.all(),
+        error_messages={"required": "Select one or more users to unassign"},
+    )
+
+    def __init__(self, *args, **kwargs):
+        self.task = kwargs.pop("task", None)
+        super().__init__(*args, **kwargs)
+        self.init_fields()
+        self.init_layout()
+
+    def init_fields(self):
+        self.fields["assignees"].queryset = self.task.assignees.order_by(
+            "user__first_name",
+            "user__last_name",
+        ).exclude(unassigned_at__isnull=False)
+
+        self.fields["assignees"].label_from_instance = (
+            lambda obj: f"{obj.user.get_full_name()}"
+        )
+
+    def init_layout(self):
+        self.helper = FormHelper(self)
+        self.helper.label_size = Size.SMALL
+        self.helper.legend_size = Size.SMALL
+        self.helper.layout = Layout(
+            "assignees",
+            Submit(
+                "submit",
+                "Save",
+                data_module="govuk-button",
+                data_prevent_double_click="true",
+            ),
+        )
+
+    @transaction.atomic
+    def unassign_users(self, user_instigator) -> int:
+        """Set assignees as unassigned from their associated task and return the
+        number of assignees that have been updated in this way."""
+        set_current_instigator(user_instigator)
+
+        assignees = self.cleaned_data["assignees"]
+        for assignee in assignees:
+            assignee.unassigned_at = make_aware(datetime.now())
+
+        return TaskAssignee.objects.bulk_update(
+            assignees,
+            fields=["unassigned_at"],
+        )
+
+
 class SubTaskCreateForm(TaskBaseForm):
     def save(self, parent_task, user, commit=True):
         instance = super().save(commit=False)
diff --git a/tasks/jinja2/tasks/assign_users.jinja b/tasks/jinja2/tasks/assign_users.jinja
new file mode 100644
index 000000000..2b8b9c108
--- /dev/null
+++ b/tasks/jinja2/tasks/assign_users.jinja
@@ -0,0 +1,23 @@
+{% extends "layouts/form.jinja" %}
+
+{% from "components/breadcrumbs/macro.njk" import govukBreadcrumbs %}
+
+{% set page_title = page_title %}
+
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
+      {"text": page_title}
+    ]
+  ) }}
+{% endblock %}
+
+{% block form %}
+  <div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+      {% call django_form() %}
+        {{ crispy(form) }}
+      {% endcall %}
+    </div>
+  </div>
+{% endblock %}
diff --git a/tasks/jinja2/tasks/detail.jinja b/tasks/jinja2/tasks/detail.jinja
index d19cd9dca..a3f94a83c 100644
--- a/tasks/jinja2/tasks/detail.jinja
+++ b/tasks/jinja2/tasks/detail.jinja
@@ -10,6 +10,20 @@
   {% set edit_url = url("workflow:task-ui-update", kwargs={"pk": object.pk}) %}
 {% endif%}
 
+{% macro display_assignees(assignees) %}
+  {% if not assignees %}
+    <div class="govuk-!-margin-bottom-3">
+      None
+    </div>
+  {% else %}
+    {% for assignee in assignees %}
+      <div class="govuk-!-margin-bottom-3">
+      {{ assignee.name }}{% if not loop.last %}, {% endif %}
+      </div>
+    {% endfor %}
+  {% endif %}
+{% endmacro %}
+
 {% block breadcrumb %}
   {{ breadcrumbs(request, [
       {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
@@ -18,16 +32,27 @@
   ) }}
 {% endblock %}
 
+{% set workbasket_summary_link %}
+  {% if object.workbasket %}
+    <a
+      class="govuk-link"
+      href="{{ url('workbaskets:workbasket-ui-detail', kwargs={'pk': object.workbasket.pk}) }}"
+    >{{ object.workbasket.pk }} ({{ object.workbasket.status }})</a>
+  {% else %}
+    None
+  {% endif %}
+{% endset %}
+
 {% block content %}
-  <div class="govuk-grid-row">
-    <div class="govuk-grid-column-two-thirds">
-      <h1 class="govuk-heading-xl">{{ page_title }}</h1>
-    </div>
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <h1 class="govuk-heading-xl">{{ page_title }}</h1>
   </div>
+</div>
 
-  <h2 class="govuk-heading-m">Details</h2>
-  
-  <dl class="govuk-summary-list">
+<h2 class="govuk-heading-m">Details</h2>
+
+<dl class="govuk-summary-list">
   <div class="govuk-summary-list__row">
     <dt class="govuk-summary-list__key">
       ID
@@ -35,6 +60,9 @@
     <dd class="govuk-summary-list__value">
       {{ object.pk }}
     </dd>
+    <dd class="govuk-summary-list__actions">
+      <!-- Empty for column alignment -->
+    </dd>
   </div>
 
   <div class="govuk-summary-list__row">
@@ -85,6 +113,18 @@
     </dd>
   </div>
 
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">
+      Workbasket
+    </dt>
+    <dd class="govuk-summary-list__value">
+      {{ workbasket_summary_link }}
+    </dd>
+    <dd class="govuk-summary-list__actions">
+      <a class="govuk-link" href="{{ edit_url }}">Change<span class="govuk-visually-hidden"> workbasket</span></a>
+    </dd>
+  </div>
+
   <div class="govuk-summary-list__row">
     <dt class="govuk-summary-list__key">
       Created
@@ -92,6 +132,9 @@
     <dd class="govuk-summary-list__value">
       {{ "{:%d %b %Y %H:%M}".format(object.created_at) }}
     </dd>
+    <dd class="govuk-summary-list__actions">
+      <!-- Empty for column alignment -->
+    </dd>
   </div>
 
   <div class="govuk-summary-list__row">
@@ -101,28 +144,64 @@
     <dd class="govuk-summary-list__value">
       {{ object.creator.get_displayname() if object.creator else "-" }}
     </dd>
+    <dd class="govuk-summary-list__actions">
+      <!-- Empty for column alignment -->
+    </dd>
+  </div>
+
+  <div class="govuk-summary-list__row">
+    <dt class="govuk-summary-list__key">
+      Assignees
+    </dt>
+    <dd class="govuk-summary-list__value">
+      <div id="assigned-users-content">
+        {{ display_assignees(current_assignees) }}
+      </div>
+    </dd>
+    <dd class="govuk-summary-list__actions">
+      <ul class="govuk-summary-list__actions-list">
+        <li class="govuk-summary-list__actions-list-item">
+          <a
+            id="assign-users"
+            class="govuk-link"
+            href="{{ url('workflow:task-ui-assign-users', kwargs={'pk': object.pk}) }}"
+          >Assign<span class="govuk-visually-hidden"> users</span></a>
+        </li>
+        {% if current_assignees %}
+        <li class="govuk-summary-list__actions-list-item">
+          <a
+            id="unassign-users"
+            class="govuk-link"
+            href="{{ url('workflow:task-ui-unassign-users', kwargs={'pk': object.pk}) }}"
+          >Unassign<span class="govuk-visually-hidden"> users</span></a>
+        </li>
+        {% endif %}
+      </ul>
+    </dd>
   </div>
 </dl>
 
 <div class="govuk-button-group">
-{% if not object.parent_task %}
-  {{ govukButton({
-    "text": "Delete task",
-    "href": url("workflow:task-ui-delete", kwargs={"pk": object.pk}),
-    "classes": "govuk-button--warning"
-  }) }}
+  {% if not object.parent_task %}
+    {{ govukButton({
+      "text": "Delete task",
+      "href": url("workflow:task-ui-delete", kwargs={"pk": object.pk}),
+      "classes": "govuk-button--warning"
+    }) }}
   {% else %}
     {{ govukButton({
-    "text": "Delete subtask",
-    "href": url("workflow:subtask-ui-delete", kwargs={"pk": object.pk}),
-    "classes": "govuk-button--warning"
-  }) }}
+      "text": "Delete subtask",
+      "href": url("workflow:subtask-ui-delete", kwargs={"pk": object.pk}),
+      "classes": "govuk-button--warning"
+    }) }}
   {% endif %}
+
   {{ govukButton({
     "text": "Find and view tasks",
     "href": url("workflow:task-ui-list"),
     "classes": "govuk-button--secondary"
   }) }}
+
   {% if not object.parent_task %}
     {{ govukButton({
       "text": "Create subtask",
@@ -131,4 +210,17 @@
     }) }}
   {% endif %}
 </div>
+
+{% set assign_users_link = url("workflow:task-ui-assign-users", kwargs={"pk": object.pk}) %}
+{% set unassign_users_link = url("workflow:task-ui-unassign-users", kwargs={"pk": object.pk}) %}
+
+<script nonce="{{ request.csp_nonce }}">
+  const CSRF_TOKEN = "{{ csrf_token }}";
+
+  const currentAssignees = {{ current_assignees|safe }};
+  const assignableUsers = {{ assignable_users|safe }};
+
+  const assignUsersUrl = "{{ assign_users_link }}";
+  const unassignUsersUrl = "{{ unassign_users_link }}";
+</script>
 {% endblock %}
diff --git a/tasks/migrations/0020_alter_taskassignee_assignment_type.py b/tasks/migrations/0020_alter_taskassignee_assignment_type.py
new file mode 100644
index 000000000..46b091033
--- /dev/null
+++ b/tasks/migrations/0020_alter_taskassignee_assignment_type.py
@@ -0,0 +1,26 @@
+# Generated by Django 4.2.17 on 2024-12-23 14:55
+
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0019_alter_task_options_alter_tasktemplate_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="taskassignee",
+            name="assignment_type",
+            field=models.CharField(
+                choices=[
+                    ("WORKBASKET_WORKER", "Workbasket worker"),
+                    ("WORKBASKET_REVIEWER", "Workbasket reviewer"),
+                    ("GENERAL", "General"),
+                ],
+                max_length=50,
+            ),
+        ),
+    ]
diff --git a/tasks/models/task.py b/tasks/models/task.py
index a93970dd7..294ed5150 100644
--- a/tasks/models/task.py
+++ b/tasks/models/task.py
@@ -200,9 +200,82 @@ def workbasket_reviewers(self):
 
 
 class TaskAssignee(TimestampedMixin):
+    """
+    Model used to assocate Task instances with one or more Users.
+
+    The original intent was to associate two mandatory user roles to a workbasket:
+    - Worker who creates data in the workbasket - instances have
+      `assignment_type = AssignmentType.WORKBASKET_WORKER`
+    - Reviewer of workbasket data - instances have
+      `assignment_type = AssignmentType.WORKBASKET_REVIEWER`
+
+    In retrospect, these users should be assigned directly to the workbasket,
+    not via a Task, which includes an unnecessary level of indirection.
+
+    Current Task management introduces AssignmentType.GENERAL. TaskAssignee
+    instances with
+      `assignment_type = AssignmentType.GENERAL`
+    are actual task assignments, rather than the legacy approach to assigning
+    users to worker or reviewer roles.
+
+    Workbasket and new task assignment should be separated by introducing a new
+    Django Model, say, WorkBasketAssignee, and old assignments should be
+    migrated to instances of the new, replacement model.
+
+        class WorkBasketAssignee(TimestampedMixin):
+            class AssignmentType(models.TextChoices):
+                WORKBASKET_WORKER = "WORKBASKET_WORKER", "Workbasket worker"
+                WORKBASKET_REVIEWER = "WORKBASKET_REVIEWER", "Workbasket reviewer"
+
+            workbasket = models.ForeignKey(
+                WorkBasket,
+                blank=True,
+                null=True,
+                on_delete=models.CASCADE,
+                related_name="workbasketassignees",
+            )
+            user = models.ForeignKey(
+                settings.AUTH_USER_MODEL,
+                on_delete=models.PROTECT,
+                related_name="assigned_to",
+            )
+            assignment_type = models.CharField(
+                choices=AssignmentType.choices,
+                max_length=50,
+            )
+            unassigned_at = models.DateTimeField(
+                auto_now=False,
+                blank=True,
+                null=True,
+            )
+
+            @property
+            def is_assigned(self) -> bool:
+                return True if not self.unassigned_at else False
+
+            @classmethod
+            def unassign_user(cls, user, workbasket) -> bool:
+                try:
+                    assignment = cls.objects.get(user=user, workbasket=workbasket)
+                except cls.DoesNotExist:
+                    return False
+
+                if assignment.unassigned_at:
+                    return False
+
+                with transaction.atomic():
+                    assignment.unassigned_at = make_aware(datetime.now())
+                    assignment.save(update_fields=["unassigned_at"])
+                    return True
+
+    AssignmentType can then be stripped from TaskAssignee, since there'll only
+    be one type of assignee against tasks.
+    """
+
     class AssignmentType(models.TextChoices):
         WORKBASKET_WORKER = "WORKBASKET_WORKER", "Workbasket worker"
         WORKBASKET_REVIEWER = "WORKBASKET_REVIEWER", "Workbasket reviewer"
+        GENERAL = "GENERAL", "General"
 
     user = models.ForeignKey(
         settings.AUTH_USER_MODEL,
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index b0bb33c54..0df851a6d 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -186,6 +186,7 @@ def create_task_workflow(
                 title=task_template.title,
                 description=task_template.description,
                 category=task_template.category,
+                creator=creator,
             )
             TaskItem.objects.create(
                 position=task_item_template.position,
diff --git a/tasks/signals.py b/tasks/signals.py
index af6392408..1f13fa0a4 100644
--- a/tasks/signals.py
+++ b/tasks/signals.py
@@ -15,6 +15,9 @@ def get_current_instigator():
 
 
 def set_current_instigator(instigator):
+    """Sets the current user (`instigator`) who is instigating a task
+    action / change. This is normally done from the view that handles the
+    change. When the change is saved, instigator details are logged."""
     _thread_locals.instigator = instigator
 
 
diff --git a/tasks/urls.py b/tasks/urls.py
index ad00db22f..22817acdb 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -27,6 +27,16 @@
         views.TaskConfirmDeleteView.as_view(),
         name="task-ui-confirm-delete",
     ),
+    path(
+        "<int:pk>/assign-users/",
+        views.TaskAssignUsersView.as_view(),
+        name="task-ui-assign-users",
+    ),
+    path(
+        f"<int:pk>/unassign-users/",
+        views.TaskUnassignUsersView.as_view(),
+        name="task-ui-unassign-users",
+    ),
     # Subtask urls
     path(
         "<int:parent_task_pk>/subtasks/create/",
diff --git a/tasks/views.py b/tasks/views.py
index 4df9a8517..6ef88084b 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -1,4 +1,5 @@
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db import OperationalError
 from django.db import transaction
@@ -19,6 +20,7 @@
 from tasks.filters import TaskFilter
 from tasks.filters import TaskWorkflowFilter
 from tasks.filters import WorkflowTemplateFilter
+from tasks.forms import AssignUsersForm
 from tasks.forms import SubTaskCreateForm
 from tasks.forms import TaskCreateForm
 from tasks.forms import TaskDeleteForm
@@ -32,9 +34,11 @@
 from tasks.forms import TaskWorkflowTemplateDeleteForm
 from tasks.forms import TaskWorkflowTemplateUpdateForm
 from tasks.forms import TaskWorkflowUpdateForm
+from tasks.forms import UnassignUsersForm
 from tasks.models import Queue
 from tasks.models import QueueItem
 from tasks.models import Task
+from tasks.models import TaskAssignee
 from tasks.models import TaskItem
 from tasks.models import TaskItemTemplate
 from tasks.models import TaskTemplate
@@ -42,6 +46,8 @@
 from tasks.models import TaskWorkflowTemplate
 from tasks.signals import set_current_instigator
 
+User = get_user_model()
+
 
 class TaskListView(PermissionRequiredMixin, SortingMixin, WithPaginationListView):
     model = Task
@@ -65,6 +71,36 @@ class TaskDetailView(PermissionRequiredMixin, DetailView):
     template_name = "tasks/detail.jinja"
     permission_required = "tasks.view_task"
 
+    def get_context_data(self, **kwargs) -> dict:
+        context = super().get_context_data(**kwargs)
+
+        # TODO: Factor out queries and place in TaskAssigeeQuerySet.
+        current_assignees = TaskAssignee.objects.filter(
+            task=self.get_object(),
+            # TODO:
+            # Using all task assignees is temporary for illustration as it
+            # doesn't align with the new approach of assigning users to tasks
+            # rather than assigning users to workbaskets (the old approach,
+            # uses tasks as an intermediary joining object).
+            # assignment_type=TaskAssignee.AssignmentType.GENERAL,
+        ).assigned()
+
+        context["current_assignees"] = [
+            {"pk": assignee.pk, "name": assignee.user.get_full_name()}
+            for assignee in current_assignees.order_by(
+                "user__first_name",
+                "user__last_name",
+            )
+        ]
+        context["assignable_users"] = [
+            {"pk": user.pk, "name": user.get_full_name()}
+            for user in User.objects.active_tms().exclude(
+                pk__in=current_assignees.values_list("user__pk", flat=True),
+            )
+        ]
+
+        return context
+
 
 class TaskCreateView(PermissionRequiredMixin, CreateView):
     model = Task
@@ -161,6 +197,61 @@ def get_context_data(self, **kwargs):
         return context_data
 
 
+class TaskAssignUsersView(PermissionRequiredMixin, FormView):
+    permission_required = "tasks.add_taskassignee"
+    template_name = "tasks/assign_users.jinja"
+    form_class = AssignUsersForm
+
+    @property
+    def task(self):
+        return Task.objects.get(pk=self.kwargs["pk"])
+
+    def get_context_data(self, *args, **kwargs):
+        context = super().get_context_data(*args, **kwargs)
+        context["page_title"] = "Assign users to task"
+        return context
+
+    def form_valid(self, form):
+        form.assign_users(task=self.task, user_instigator=self.request.user)
+        return HttpResponseRedirect(self.get_success_url())
+
+    def get_success_url(self):
+        return reverse(
+            "workflow:task-ui-detail",
+            kwargs={"pk": self.kwargs["pk"]},
+        )
+
+
+class TaskUnassignUsersView(PermissionRequiredMixin, FormView):
+    permission_required = "tasks.change_taskassignee"
+    template_name = "tasks/assign_users.jinja"
+    form_class = UnassignUsersForm
+
+    @property
+    def task(self):
+        return Task.objects.get(pk=self.kwargs["pk"])
+
+    def get_context_data(self, *args, **kwargs):
+        context = super().get_context_data(*args, **kwargs)
+        context["page_title"] = "Unassign users from task"
+        return context
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs["task"] = self.task
+        return kwargs
+
+    def form_valid(self, form):
+        form.unassign_users(self.request.user)
+        return HttpResponseRedirect(self.get_success_url())
+
+    def get_success_url(self):
+        return reverse(
+            "workflow:task-ui-detail",
+            kwargs={"pk": self.kwargs["pk"]},
+        )
+
+
 class SubTaskCreateView(PermissionRequiredMixin, CreateView):
     model = Task
     template_name = "layouts/create.jinja"

From 6590627c229af185650639d7a741b57a815677d0 Mon Sep 17 00:00:00 2001
From: Paul Pepper <paul.pepper@digital.trade.gov.uk>
Date: Tue, 11 Feb 2025 15:49:21 +0000
Subject: [PATCH 45/57] Renumber clashing migration

---
 ...013_alter_user_managers.py => 0014_alter_user_managers.py} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename common/migrations/{0013_alter_user_managers.py => 0014_alter_user_managers.py} (73%)

diff --git a/common/migrations/0013_alter_user_managers.py b/common/migrations/0014_alter_user_managers.py
similarity index 73%
rename from common/migrations/0013_alter_user_managers.py
rename to common/migrations/0014_alter_user_managers.py
index 38149a5cd..1ff782ad2 100644
--- a/common/migrations/0013_alter_user_managers.py
+++ b/common/migrations/0014_alter_user_managers.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.18 on 2025-02-11 14:47
+# Generated by Django 4.2.18 on 2025-02-11 15:48
 
 from django.db import migrations
 
@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("common", "0012_user_sso_uuid"),
+        ("common", "0013_versiongroup_common_vers_current_04c358_idx"),
     ]
 
     operations = [

From 16ba584c6e0bd4d3488d0b38ad9f104c43702676 Mon Sep 17 00:00:00 2001
From: Marya Shariq <marya.shariq@digital.trade.gov.uk>
Date: Wed, 12 Feb 2025 08:31:59 +0000
Subject: [PATCH 46/57] Tp2000 1616  workflow task create view (#1363)

* added new urls for task workflow task create

* added 2 views for task workflow task create and confirm create

* added URL and views for workflow task create and confirm create

* failing unit test

* fixed failing test for workflow task create and confirm create view

* modified TaskBaseForm to explicitly add 'fields' attribute as per Django documentation guidelines

* removed redundant comment

* Rename migration file after naming conflict

* Remove last committed migration

* addressing PR comments including reordering assert statements in tests and changing URL to match convention

---------

Co-authored-by: Lauren Mullally <lauren.mullally@digita.ltrade.gov.uk>
Co-authored-by: Paul Pepper <paul.pepper@digital.trade.gov.uk>
---
 tasks/forms.py                            |  8 ++-
 tasks/jinja2/tasks/workflows/detail.jinja |  2 +-
 tasks/tests/test_views.py                 | 78 +++++++++++++++++++++++
 tasks/urls.py                             | 10 +++
 tasks/views.py                            | 45 +++++++++++++
 5 files changed, 141 insertions(+), 2 deletions(-)

diff --git a/tasks/forms.py b/tasks/forms.py
index 1332679e6..5b6b4c71b 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -35,7 +35,13 @@
 class TaskBaseForm(ModelForm):
     class Meta:
         model = Task
-        exclude = ["parent_task", "creator"]
+        fields = [
+            "title",
+            "description",
+            "progress_state",
+            "category",
+            "workbasket",
+        ]
 
         error_messages = {
             "title": {
diff --git a/tasks/jinja2/tasks/workflows/detail.jinja b/tasks/jinja2/tasks/workflows/detail.jinja
index db9be5e80..b9f395a0a 100644
--- a/tasks/jinja2/tasks/workflows/detail.jinja
+++ b/tasks/jinja2/tasks/workflows/detail.jinja
@@ -8,7 +8,7 @@
 
 {% if object_name == "workflow" %}
   {% set task_object_name = "task" %}
-  {% set task_object_create_url = "#TODO" %}
+  {% set task_object_create_url = url("workflow:task-workflow-task-ui-create", kwargs={"task_workflow_pk": object.pk}) %}
 {% elif object_name == "workflow template" %}
   {% set task_object_name = "task template" %}
   {% set task_object_create_url = url("workflow:task-template-ui-create", kwargs={"workflow_template_pk": object.pk}) %}
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 6a1a77155..8a5a4af6a 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -815,3 +815,81 @@ def test_task_and_workflow_list_view(valid_user_client, task, task_workflow):
     assert table.select("tr:nth-child(2) > td:nth-child(1) > a:nth-child(1)")[
         0
     ].text == str(task_workflow.summary_task.pk)
+
+
+def test_create_workflow_task_view(valid_user_client, task_workflow):
+    """Test the view for creating new Tasks for an existing workflow and the
+    confirmation view that a successful creation redirects to."""
+
+    assert task_workflow.get_tasks().count() == 0
+
+    progress_state = ProgressStateFactory.create()
+
+    create_url = reverse(
+        "workflow:task-workflow-task-ui-create",
+        kwargs={"task_workflow_pk": task_workflow.pk},
+    )
+
+    form_data = {
+        "title": factory.Faker("sentence"),
+        "description": factory.Faker("sentence"),
+        "progress_state": progress_state.pk,
+    }
+    create_response = valid_user_client.post(create_url, form_data)
+
+    assert task_workflow.get_tasks().count() == 1
+    assert create_response.status_code == 302
+
+    created_workflow_task = task_workflow.get_tasks().get()
+    confirmation_url = reverse(
+        "workflow:task-workflow-task-ui-confirm-create",
+        kwargs={"pk": created_workflow_task.pk},
+    )
+    assert create_response.url == confirmation_url
+
+    confirmation_response = valid_user_client.get(confirmation_url)
+    assert confirmation_response.status_code == 200
+
+    soup = BeautifulSoup(
+        confirmation_response.content.decode(confirmation_response.charset),
+        "html.parser",
+    )
+    assert created_workflow_task.title in soup.select("h1.govuk-panel__title")[0].text
+
+
+def test_workflow_delete_view_deletes_related_tasks(
+    valid_user_client,
+    task_workflow_single_task_item,
+):
+    """Tests that a workflow can be deleted (along with related Task and
+    TaskItem objects) and that the corresponding confirmation view returns a
+    HTTP 200 response."""
+
+    task_workflow_pk = task_workflow_single_task_item.pk
+    task_pk = task_workflow_single_task_item.get_tasks().get().pk
+
+    delete_url = task_workflow_single_task_item.get_url("delete")
+    delete_response = valid_user_client.post(delete_url)
+    assert delete_response.status_code == 302
+
+    assert not TaskWorkflow.objects.filter(
+        pk=task_workflow_pk,
+    ).exists()
+    assert not TaskItem.objects.filter(
+        workflow_id=task_workflow_pk,
+    ).exists()
+    assert not Task.objects.filter(pk=task_pk).exists()
+
+    confirmation_url = reverse(
+        "workflow:task-workflow-ui-confirm-delete",
+        kwargs={"pk": task_workflow_pk},
+    )
+    assert delete_response.url == confirmation_url
+
+    confirmation_response = valid_user_client.get(confirmation_url)
+    assert confirmation_response.status_code == 200
+
+    soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
+    assert (
+        f"Workflow ID: {task_workflow_pk}" in soup.select(".govuk-panel__title")[0].text
+    )
diff --git a/tasks/urls.py b/tasks/urls.py
index 22817acdb..9acadb182 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -121,6 +121,16 @@
         views.TaskWorkflowConfirmDeleteView.as_view(),
         name="task-workflow-ui-confirm-delete",
     ),
+    path(
+        "<int:task_workflow_pk>/task/create/",
+        views.TaskWorkflowTaskCreateView.as_view(),
+        name="task-workflow-task-ui-create",
+    ),
+    path(
+        "task/<int:pk>/confirm-create/",
+        views.TaskWorkflowTaskConfirmCreateView.as_view(),
+        name="task-workflow-task-ui-confirm-create",
+    ),
 ]
 
 task_and_workflow_ui_patterns = [
diff --git a/tasks/views.py b/tasks/views.py
index 6ef88084b..f660413d5 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -649,6 +649,51 @@ def get_context_data(self, **kwargs):
         return context_data
 
 
+class TaskWorkflowTaskCreateView(PermissionRequiredMixin, CreateView):
+    model = Task
+    template_name = "layouts/create.jinja"
+    permission_required = "tasks.add_task"
+    form_class = TaskCreateForm
+
+    def get_task_workflow(self):
+        """Get the associated TaskWorkflow via its pk in the URL."""
+        return TaskWorkflow.objects.get(
+            pk=self.kwargs["task_workflow_pk"],
+        )
+
+    def get_context_data(self, **kwargs) -> dict:
+        context = super().get_context_data(**kwargs)
+
+        context["page_title"] = "Create a task"
+        return context
+
+    def form_valid(self, form) -> HttpResponseRedirect:
+        with transaction.atomic():
+            self.object = form.save(user=self.request.user)
+            TaskItem.objects.create(
+                workflow=self.get_task_workflow(),
+                task=self.object,
+            )
+        return HttpResponseRedirect(self.get_success_url())
+
+    def get_success_url(self):
+        return reverse(
+            "workflow:task-workflow-task-ui-confirm-create",
+            kwargs={"pk": self.object.pk},
+        )
+
+
+class TaskWorkflowTaskConfirmCreateView(PermissionRequiredMixin, DetailView):
+    model = Task
+    template_name = "tasks/confirm_create.jinja"
+    permission_required = "tasks.add_task"
+
+    def get_context_data(self, **kwargs) -> dict:
+        context = super().get_context_data(**kwargs)
+        context["verbose_name"] = "task"
+        return context
+
+
 class TaskWorkflowTemplateDetailView(
     PermissionRequiredMixin,
     QueuedItemManagementMixin,

From b1401a8b3822bf96b42dce8d325522adaaffe381 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Wed, 12 Feb 2025 13:41:21 +0000
Subject: [PATCH 47/57] TP2000-1653  Enhance AutoCompleteField to support a
 broader range of models (#1382)

* Ensure only authenticated and authorised users can access WorkBasketViewSet API endpoints

* Add a search filter for workbaskets

* Add autocomplete_label property to workbasket model

* Add new workbasket API endpoint optimised for use with AutoCompleteField in forms

* Support other types of model other than TrackedModels in AutoCompleteWidget

* Enable specifying a custom API source URL when using an AutoCompleteField

* Make workbasket an AutoCompleteField on Task forms

* Delegate validation to to_python so that any validation errors will be displayed as form errors

* Add note about search rank normalisation

* Add comment to caught exception for clarity
---
 common/fields.py                  | 48 +++++++++++++++++----
 common/tests/test_fields.py       | 55 ++++++++++++++++++++++++
 common/widgets.py                 |  8 +++-
 tasks/forms.py                    | 17 +++++++-
 workbaskets/filters.py            | 69 +++++++++++++++++++++++++++++++
 workbaskets/models.py             |  4 ++
 workbaskets/tests/test_filters.py | 32 ++++++++++++++
 workbaskets/tests/test_views.py   | 18 ++++++++
 workbaskets/views/api.py          | 39 +++++++++++++++++
 9 files changed, 280 insertions(+), 10 deletions(-)
 create mode 100644 common/tests/test_fields.py
 create mode 100644 workbaskets/filters.py
 create mode 100644 workbaskets/tests/test_filters.py

diff --git a/common/fields.py b/common/fields.py
index 88cd07cf7..d8fa44863 100644
--- a/common/fields.py
+++ b/common/fields.py
@@ -5,6 +5,7 @@
 from dateutil.relativedelta import relativedelta
 from django.contrib.postgres.fields import DateRangeField
 from django.contrib.postgres.fields import DateTimeRangeField
+from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models.expressions import RawSQL
 from django.forms import ModelChoiceField
@@ -146,20 +147,51 @@ class TaricDateTimeRangeField(DateTimeRangeField):
 
 
 class AutoCompleteField(ModelChoiceField):
-    def __init__(self, *args, **kwargs):
-        qs = kwargs["queryset"]
-        prefix = getattr(qs.model, "url_pattern_name_prefix", None)
-        if not prefix:
-            prefix = qs.model._meta.model_name
+    """
+    A form field that provides an AutoComplete widget for selecting a model
+    instance.
+
+    Args:
+    - queryset (QuerySet): A queryset of model instances that will populate the valid choices for the field.
+    - label (str): (Optional) A label for the field.
+    - help_text (str): (Optional) Help text for the field.
+    - url_pattern_name (str): (Optional) A custom pattern name to use for resolving the API source URL of AutoCompleteWidget.
+    - attrs (dict): (Optional) Additional attributes to pass to AutoCompleteWidget, e.g  {"min-length": 2}.
+    """
+
+    def __init__(self, queryset, url_pattern_name=None, *args, **kwargs):
         self.widget = AutocompleteWidget(
             attrs={
                 "label": kwargs.get("label", ""),
                 "help_text": kwargs.get("help_text", ""),
-                "source_url": reverse_lazy(f"{prefix}-list"),
+                "source_url": reverse_lazy(
+                    self.get_url_pattern_name(queryset, url_pattern_name),
+                ),
                 **kwargs.pop("attrs", {}),
             },
         )
-        super().__init__(*args, **kwargs)
+        super().__init__(queryset=queryset, *args, **kwargs)
+
+    def get_url_pattern_name(self, queryset, url_pattern_name: str | None) -> str:
+        """
+        Determines the URL pattern name to use for resolving the API source URL
+        of AutocompleteWidget.
+
+        If a custom name isn't provided, the name will be based on the
+        attributes of the model derived from the queryset.
+        """
+
+        if url_pattern_name is not None:
+            return url_pattern_name
+
+        prefix = getattr(queryset.model, "url_pattern_name_prefix", None)
+        if not prefix:
+            prefix = queryset.model._meta.model_name
+
+        return f"{prefix}-list"
 
     def prepare_value(self, value):
-        return self.to_python(value)
+        try:
+            return self.to_python(value)
+        except ValidationError:
+            return None
diff --git a/common/tests/test_fields.py b/common/tests/test_fields.py
new file mode 100644
index 000000000..f30ca312d
--- /dev/null
+++ b/common/tests/test_fields.py
@@ -0,0 +1,55 @@
+import pytest
+from django.urls import reverse_lazy
+
+from common.fields import AutoCompleteField
+from footnotes.models import Footnote
+from workbaskets.models import WorkBasket
+
+pytestmark = pytest.mark.django_db
+
+
+@pytest.mark.parametrize(
+    ("queryset, url_pattern_name, label, help_text, attrs, expected_url"),
+    [
+        (
+            Footnote.objects.all(),
+            None,
+            "Footnotes",
+            "Search for footnotes",
+            {"min-length": 2},
+            reverse_lazy("footnote-list"),
+        ),
+        (
+            WorkBasket.objects.all(),
+            "workbaskets:workbasket-autocomplete-list",
+            "Workbaskets",
+            "Search for workbaskets",
+            {},
+            reverse_lazy("workbaskets:workbasket-autocomplete-list"),
+        ),
+    ],
+)
+def test_autocompletefield_url_pattern_name(
+    queryset,
+    url_pattern_name,
+    label,
+    help_text,
+    attrs,
+    expected_url,
+):
+    """Tests that a custom URL pattern name can be provided for resolving the
+    API source URL of the field's autocomplete widget."""
+    field = AutoCompleteField(
+        queryset=queryset,
+        url_pattern_name=url_pattern_name,
+        label=label,
+        help_text=help_text,
+        attrs=attrs,
+    )
+
+    assert not field.queryset.difference(queryset)
+    assert field.label == label
+    assert field.help_text == help_text
+    for key, value in attrs.items():
+        assert field.widget.attrs.get(key) == value
+    assert field.widget.attrs.get("source_url") == expected_url
diff --git a/common/widgets.py b/common/widgets.py
index 05be8f890..a2b5e1629 100644
--- a/common/widgets.py
+++ b/common/widgets.py
@@ -44,13 +44,19 @@ class AutocompleteWidget(widgets.Widget):
     template_name = "components/autocomplete.jinja"
 
     def get_context(self, name, value, attrs=None):
+        from common.models import TrackedModel
+
         if attrs is None:
             attrs = {}
+
         display_string = ""
-        if value:
+
+        if isinstance(value, TrackedModel):
             display_string = value.structure_code
             if value.structure_description:
                 display_string = f"{display_string} - {value.structure_description}"
+        else:
+            display_string = value.autocomplete_label if value else ""
 
         return {
             "widget": {
diff --git a/tasks/forms.py b/tasks/forms.py
index 5b6b4c71b..d9e94bb97 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -17,6 +17,7 @@
 from django.forms import Textarea
 from django.utils.timezone import make_aware
 
+from common.fields import AutoCompleteField
 from common.forms import BindNestedFormMixin
 from common.forms import RadioNested
 from common.forms import delete_form_for
@@ -55,6 +56,21 @@ class Meta:
             },
         }
 
+    workbasket = AutoCompleteField(
+        label="Workbasket",
+        help_text=(
+            "Search for a workbasket by typing in the workbasket's ID, TOPS/Jira number or description. "
+            "A dropdown list will appear after a few seconds. You can then select the correct workbasket from the dropdown list."
+        ),
+        queryset=WorkBasket.objects.editable(),
+        url_pattern_name="workbaskets:workbasket-autocomplete-list",
+        attrs={"min_length": 2},
+        error_messages={
+            "invalid_choice": "Select a workbasket that is in the editing state",
+        },
+        required=False,
+    )
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.init_fields()
@@ -62,7 +78,6 @@ def __init__(self, *args, **kwargs):
 
     def init_fields(self):
         self.fields["progress_state"].label = "Status"
-        self.fields["workbasket"].queryset = WorkBasket.objects.editable()
 
     def init_layout(self):
         self.helper = FormHelper(self)
diff --git a/workbaskets/filters.py b/workbaskets/filters.py
new file mode 100644
index 000000000..0d3b08061
--- /dev/null
+++ b/workbaskets/filters.py
@@ -0,0 +1,69 @@
+from django.contrib.postgres.search import SearchRank
+from django.contrib.postgres.search import SearchVector
+from django.db.models import Case
+from django.db.models import FloatField
+from django.db.models import Q
+from django.db.models import Value
+from django.db.models import When
+
+from common.filters import TamatoFilterBackend
+from common.filters import TamatoFilterMixin
+
+
+class WorkBasketFilterMixin(TamatoFilterMixin):
+    search_fields = ("title", "reason")
+
+    def search_queryset(self, queryset, search_term):
+        """
+        Filters the queryset to results with `search_fields` (including PK)
+        containing or matching the `search_term`.
+
+        Results are ordered first by relevancy then by PK to favour newer
+        objects in the event of a tied rank value. Exact search term matches are
+        therefore prioritised over partial substring matches.
+
+        The search rank is normalised to penalise longer documents and those
+        with a high unique word count, improving relevance scoring.
+        """
+        NORMALISATION_LOG_LENGTH = 1
+        NORMALISATION_UNIQUE_WORDS = 8
+
+        search_term = self.get_search_term(search_term)
+        search_vector = SearchVector(*self.search_fields)
+        search_rank = SearchRank(
+            search_vector,
+            search_term,
+            normalization=Value(NORMALISATION_LOG_LENGTH).bitor(
+                Value(NORMALISATION_UNIQUE_WORDS),
+            ),
+        )
+
+        vector_queryset = queryset.annotate(search=search_vector)
+
+        exact_match_query = Q(search=search_term)
+        partial_match_query = Q(search__icontains=search_term)
+        query = exact_match_query | partial_match_query
+
+        try:
+            pk_query = Q(pk=int(search_term))
+            query |= pk_query
+            search_rank = Case(
+                When(pk=search_term, then=1),
+                default=search_rank,
+                output_field=FloatField(),
+            )
+        except ValueError:
+            # search_term cannot be converted to an integer
+            pass
+
+        return (
+            vector_queryset.annotate(
+                rank=search_rank,
+            )
+            .filter(query)
+            .order_by("-rank", "-pk")
+        )
+
+
+class WorkBasketAutoCompleteFilterBackEnd(TamatoFilterBackend, WorkBasketFilterMixin):
+    pass
diff --git a/workbaskets/models.py b/workbaskets/models.py
index aab2b464b..8ba2c7e32 100644
--- a/workbaskets/models.py
+++ b/workbaskets/models.py
@@ -491,6 +491,10 @@ def commodity_measure_changes_hash(self):
         hash.update(value)
         return hash.hexdigest()
 
+    @property
+    def autocomplete_label(self):
+        return f"({self.pk})  {self.title} - {self.reason}"
+
     def __str__(self):
         return f"({self.pk}) [{self.status}]"
 
diff --git a/workbaskets/tests/test_filters.py b/workbaskets/tests/test_filters.py
new file mode 100644
index 000000000..78913e832
--- /dev/null
+++ b/workbaskets/tests/test_filters.py
@@ -0,0 +1,32 @@
+import pytest
+
+from common.tests.factories import WorkBasketFactory
+from workbaskets.filters import WorkBasketAutoCompleteFilterBackEnd
+from workbaskets.models import WorkBasket
+
+pytestmark = pytest.mark.django_db
+
+
+def test_workbasket_autocomplete_filter_backend():
+    """Tests that WorkBasketAutoCompleteFilterBackEnd filters workbaskets by
+    exact and partial match of search term."""
+    workbasket1 = WorkBasketFactory.create(
+        pk=1111,
+        title="wb1",
+        reason="samedescription",
+    )
+    workbasket2 = WorkBasketFactory.create(
+        pk=2222,
+        title="wb2",
+        reason="samedescription",
+    )
+    queryset = WorkBasket.objects.all()
+
+    filter = WorkBasketAutoCompleteFilterBackEnd()
+    results = filter.search_queryset(queryset=queryset, search_term=str(workbasket1.pk))
+    assert workbasket1 in results
+    assert workbasket2 not in results
+
+    results = filter.search_queryset(queryset=queryset, search_term="same")
+    assert workbasket1 in results
+    assert workbasket2 in results
diff --git a/workbaskets/tests/test_views.py b/workbaskets/tests/test_views.py
index 124b75781..6971de859 100644
--- a/workbaskets/tests/test_views.py
+++ b/workbaskets/tests/test_views.py
@@ -43,6 +43,24 @@
 pytestmark = pytest.mark.django_db
 
 
+def test_workbasket_autocomplete_api_endpoint(valid_user_api_client):
+    """Tests that workbasket autocomplete API endpoint allows searching for
+    workbaskets."""
+    factories.WorkBasketFactory.create(reason="irrelevant_workbasket")
+    workbasket = factories.WorkBasketFactory.create(reason="test")
+
+    autocomplete_api_url = reverse("workbaskets:workbasket-autocomplete-list")
+    response = valid_user_api_client.get(
+        path=autocomplete_api_url,
+        data={"search": "test"},
+    )
+
+    assert response.status_code == 200
+    assert response.data["count"] == 1
+    assert response.data["results"][0]["value"] == workbasket.pk
+    assert response.data["results"][0]["label"] == workbasket.autocomplete_label
+
+
 def test_workbasket_create_form_creates_workbasket_object(
     valid_user_api_client,
 ):
diff --git a/workbaskets/views/api.py b/workbaskets/views/api.py
index 4af575a24..9ce8cc81f 100644
--- a/workbaskets/views/api.py
+++ b/workbaskets/views/api.py
@@ -1,7 +1,13 @@
+from rest_framework import permissions
 from rest_framework import renderers
+from rest_framework import status
 from rest_framework import viewsets
+from rest_framework.decorators import action
+from rest_framework.response import Response
 
 from common.renderers import TaricXMLRenderer
+from common.serializers import AutoCompleteSerializer
+from workbaskets.filters import WorkBasketAutoCompleteFilterBackEnd
 from workbaskets.models import WorkBasket
 from workbaskets.serializers import WorkBasketSerializer
 
@@ -17,9 +23,42 @@ class WorkBasketViewSet(viewsets.ModelViewSet):
         renderers.BrowsableAPIRenderer,
         TaricXMLRenderer,
     ]
+    permission_classes = [
+        permissions.IsAuthenticated,
+        permissions.DjangoModelPermissions,
+    ]
     search_fields = ["title"]
 
     def get_template_names(self, *args, **kwargs):
         if self.detail:
             return ["workbaskets/taric/workbasket_detail.xml"]
         return ["workbaskets/taric/workbasket_list.xml"]
+
+    @action(
+        detail=False,
+        methods=["GET"],
+        url_path="autocomplete",
+        url_name="autocomplete-list",
+    )
+    def autocomplete(self, request):
+        """
+        Read-only API endpoint that allows users to search for workbaskets by
+        ID, title or reason (i.e description) using an autocomplete form field.
+
+        It returns a paginated JSON array of workbaskets that match the search
+        query.
+        """
+        filter_backend = WorkBasketAutoCompleteFilterBackEnd()
+        queryset = filter_backend.filter_queryset(
+            request,
+            WorkBasket.objects.all(),
+            self,
+        )
+
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = AutoCompleteSerializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+
+        serializer = AutoCompleteSerializer(queryset, many=True)
+        return Response(serializer.data, status=status.HTTP_200_OK)

From 56f1d4bd2632ead4056255c07967de1ff8ba0b23 Mon Sep 17 00:00:00 2001
From: Paul Pepper <paul.pepper@digital.trade.gov.uk>
Date: Wed, 12 Feb 2025 17:28:01 +0000
Subject: [PATCH 48/57] Restrict factory to workbasket assignees

---
 common/tests/factories.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/tests/factories.py b/common/tests/factories.py
index d1c487b1b..5dfb18593 100644
--- a/common/tests/factories.py
+++ b/common/tests/factories.py
@@ -1569,7 +1569,12 @@ class SubTaskFactory(TaskFactory):
 @factory.django.mute_signals(signals.pre_save)
 class TaskAssigneeFactory(factory.django.DjangoModelFactory):
     user = factory.SubFactory(UserFactory)
-    assignment_type = FuzzyChoice(TaskAssignee.AssignmentType.values)
+    assignment_type = FuzzyChoice(
+        [
+            TaskAssignee.AssignmentType.WORKBASKET_WORKER,
+            TaskAssignee.AssignmentType.WORKBASKET_REVIEWER,
+        ],
+    )
     task = factory.SubFactory(TaskFactory)
 
     class Meta:

From 280ee8158ded5052b48d5807bcc32b3528a53e41 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Thu, 13 Feb 2025 10:23:05 +0000
Subject: [PATCH 49/57] TP2000-1651  Fix sorting on list views (#1380)

* Amend breadcrumb formatting on Task delete view

* Avoid dereferencing null category on task and workflow list views

* Add parent task breadcrumb on subtask create view

* Amend workflow and worklfow template name references on their respective list views

* Add a return to workflow template button on task template confirm create view

* Truncate long descriptions on workflow template list view

* Use sentence case for table column headers on workflow template list view

* Show associated workbasket on Task detail view

* Preserve filtering when sorting on all Task & Workflow list views

* Add page caption and link to parent task for Subtask detail views

* Add a return to workflow template button on task template detail view

* Remove workbasket breadcrumb from task and workflow views

* Rename SortingMixin.clean_query_params() to build_sorting_urls()

* Add util function to get resolved URL of current view

* Add capability to SortingMixin to build sorting URLs

* Update usage of create_sortable_anchor

* Fix tests related to sorting changes

* Reposition Auto end-date measures summary row above comments
---
 .../includes/certificates/tabs/measures.jinja |  8 ++-
 certificates/tests/test_views.py              |  1 +
 certificates/views.py                         |  1 +
 .../tabs/measures-declarable.jinja            | 10 ++--
 .../commodities/tabs/measures-defined.jinja   |  8 ++-
 .../components/create_sortable_anchor.jinja   | 22 +++------
 common/util.py                                | 10 ++++
 common/views/mixins.py                        | 40 +++++++++++++++
 .../includes/footnotes/tabs/measures.jinja    |  8 ++-
 footnotes/views.py                            |  1 +
 .../includes/geo_areas/tabs/measures.jinja    |  6 +--
 geo_areas/views.py                            |  1 +
 measures/jinja2/includes/measures/list.jinja  | 10 ++--
 measures/views/search.py                      | 15 +-----
 .../includes/quotas/tabs/measures.jinja       |  4 +-
 quotas/jinja2/quotas/definitions.jinja        |  1 -
 quotas/jinja2/quotas/tables/definitions.jinja |  4 +-
 quotas/views/base.py                          |  2 +-
 .../includes/regulations/tabs/measures.jinja  |  8 ++-
 regulations/views.py                          |  1 +
 tasks/jinja2/tasks/create.jinja               | 26 ++++++++++
 tasks/jinja2/tasks/delete.jinja               | 18 +++----
 tasks/jinja2/tasks/detail.jinja               | 49 ++++++++++++++++---
 tasks/jinja2/tasks/edit.jinja                 |  5 +-
 tasks/jinja2/tasks/list.jinja                 | 12 +++--
 tasks/jinja2/tasks/workflows/list.jinja       | 14 ++++--
 .../workflows/task-and-workflow-list.jinja    | 12 +++--
 .../task_template_confirm_create.jinja        |  4 +-
 .../workflows/task_template_detail.jinja      |  5 ++
 .../tasks/workflows/template_list.jinja       | 20 +++++---
 tasks/views.py                                | 28 ++++++++---
 .../workbaskets/auto_end_date_measures.jinja  |  8 ++-
 workbaskets/jinja2/workbaskets/changes.jinja  |  8 ++-
 .../workbaskets/checks/missing_measures.jinja |  4 +-
 .../workbaskets/summary-workbasket.jinja      | 25 +++++-----
 .../jinja2/workbaskets/violations.jinja       |  8 ++-
 workbaskets/views/ui.py                       | 32 ++++++------
 37 files changed, 277 insertions(+), 162 deletions(-)
 create mode 100644 tasks/jinja2/tasks/create.jinja

diff --git a/certificates/jinja2/includes/certificates/tabs/measures.jinja b/certificates/jinja2/includes/certificates/tabs/measures.jinja
index ddca45753..f8e2f7ea2 100644
--- a/certificates/jinja2/includes/certificates/tabs/measures.jinja
+++ b/certificates/jinja2/includes/certificates/tabs/measures.jinja
@@ -44,18 +44,16 @@
     ]) or "" }}
   {% endfor %}
 
-  {% set base_url = url('certificate-ui-detail-measures', kwargs={"certificate_type__sid":object.certificate_type.sid, "sid":object.sid}) %}
-
   {% set commodity_code %}
-    {{ create_sortable_anchor(request, "goods_nomenclature", "Commodity code", base_url) }}
+    {{ create_sortable_anchor(request, "Commodity code", sorting_urls["goods_nomenclature"]) }}
   {% endset %}
 
   {% set geo_area %}
-    {{ create_sortable_anchor(request, "geo_area", "Geographical area", base_url) }}
+    {{ create_sortable_anchor(request, "Geographical area", sorting_urls["geo_area"]) }}
   {% endset %}
 
   {% set start_date %}
-    {{ create_sortable_anchor(request, "start_date", "Start date", base_url) }}
+    {{ create_sortable_anchor(request, "Start date", sorting_urls["start_date"]) }}
   {% endset %}
 
   {% if paginator.count > 0 %}
diff --git a/certificates/tests/test_views.py b/certificates/tests/test_views.py
index 8c2fe80cf..d89d8ed76 100644
--- a/certificates/tests/test_views.py
+++ b/certificates/tests/test_views.py
@@ -373,6 +373,7 @@ def test_certificate_detail_measures_view_sorting_commodity(valid_user_client):
         )
         measures.append(measure)
     commodity_codes = [measure.goods_nomenclature.item_id for measure in measures]
+    commodity_codes.sort()
 
     url = reverse(
         "certificate-ui-detail-measures",
diff --git a/certificates/views.py b/certificates/views.py
index a2caf6c4b..fb5b96409 100644
--- a/certificates/views.py
+++ b/certificates/views.py
@@ -168,6 +168,7 @@ class CertificateDetailMeasures(SortingMixin, WithPaginationListMixin, ListView)
     paginate_by = 20
     sort_by_fields = ["goods_nomenclature", "geo_area", "start_date"]
     custom_sorting = {
+        "goods_nomenclature": "goods_nomenclature__item_id",
         "geo_area": "geographical_area__area_id",
         "start_date": "valid_between",
     }
diff --git a/commodities/jinja2/includes/commodities/tabs/measures-declarable.jinja b/commodities/jinja2/includes/commodities/tabs/measures-declarable.jinja
index 62a54928a..95eeda96e 100644
--- a/commodities/jinja2/includes/commodities/tabs/measures-declarable.jinja
+++ b/commodities/jinja2/includes/commodities/tabs/measures-declarable.jinja
@@ -62,22 +62,20 @@
   ]) or "" }}
 {% endfor %}
 
-{% set base_url = url('commodity-ui-detail-measures-declarable', args=[commodity.sid]) %}
-
 {% set comm_code %}
-  {{ create_sortable_anchor(request, "commodity", "Commodity code", base_url) }}
+  {{ create_sortable_anchor(request, "Commodity code", sorting_urls["commodity"]) }}
 {% endset %}
 
 {% set measure_type %}
-  {{ create_sortable_anchor(request, "measure_type", "Measure type", base_url) }}
+  {{ create_sortable_anchor(request, "Measure type", sorting_urls["measure_type"]) }}
 {% endset %}
 
 {% set geo_area %}
-  {{ create_sortable_anchor(request, "geo_area", "Geographical area", base_url) }}
+  {{ create_sortable_anchor(request, "Geographical area", sorting_urls["geo_area"]) }}
 {% endset %}
 
 {% set start_date %}
-  {{ create_sortable_anchor(request, "start_date", "Start date", base_url) }}
+  {{ create_sortable_anchor(request, "Start date", sorting_urls["start_date"]) }}
 {% endset %}
 
 {% if paginator.count > 0 %}
diff --git a/commodities/jinja2/includes/commodities/tabs/measures-defined.jinja b/commodities/jinja2/includes/commodities/tabs/measures-defined.jinja
index 1b0b19ac6..41d379a62 100644
--- a/commodities/jinja2/includes/commodities/tabs/measures-defined.jinja
+++ b/commodities/jinja2/includes/commodities/tabs/measures-defined.jinja
@@ -56,18 +56,16 @@
   ]) or "" }}
 {% endfor %}
 
-{% set base_url = url('commodity-ui-detail-measures-as-defined', args=[commodity.sid]) %}
-
 {% set measure_type %}
-  {{ create_sortable_anchor(request, "measure_type", "Measure type", base_url) }}
+  {{ create_sortable_anchor(request, "Measure type", sorting_urls["measure_type"]) }}
 {% endset %}
 
 {% set geo_area %}
-  {{ create_sortable_anchor(request, "geo_area", "Geographical area", base_url) }}
+  {{ create_sortable_anchor(request, "Geographical area", sorting_urls["geo_area"]) }}
 {% endset %}
 
 {% set start_date %}
-  {{ create_sortable_anchor(request, "start_date", "Start date", base_url) }}
+  {{ create_sortable_anchor(request, "Start date", sorting_urls["start_date"]) }}
 {% endset %}
 
 {% if paginator.count > 0 %}
diff --git a/common/jinja2/components/create_sortable_anchor.jinja b/common/jinja2/components/create_sortable_anchor.jinja
index b83f591dc..3db8ae818 100644
--- a/common/jinja2/components/create_sortable_anchor.jinja
+++ b/common/jinja2/components/create_sortable_anchor.jinja
@@ -1,21 +1,11 @@
-
-{% macro create_sortable_anchor(request, sort_by, title, base_url, query_params=False, fragment="") %}
-
-  {% if query_params %}
-    {% set query_string_prefix = "&"%}
-  {% else %}
-    {% set query_string_prefix = "?"%}
-  {% endif %}
-
-  {% if request.GET.sort_by == sort_by and request.GET.ordered == "desc" %}
-
-      <a class="govuk-link govuk-link--no-visited-state sort-icon--down" href="{{ base_url }}{{query_string_prefix}}sort_by={{ sort_by }}&ordered=asc{{ fragment }}">
-        {{ title }} <img src="{{ static('common/images/sort_icon.svg') }}" alt="">
-      </a>
+{% macro create_sortable_anchor(request, title, url, fragment="") %}
+  {% if request.GET.ordered == "desc" %}
+    <a class="govuk-link govuk-link--no-visited-state sort-icon--down" href="{{ url }}{{ fragment }}">
+      {{ title }} <img src="{{ static('common/images/sort_icon.svg') }}" alt="">
+    </a>
   {% else %}
-      <a class="govuk-link govuk-link--no-visited-state sort-icon--up" href="{{ base_url }}{{query_string_prefix}}sort_by={{ sort_by }}&ordered=desc{{ fragment }}">
+    <a class="govuk-link govuk-link--no-visited-state sort-icon--up" href="{{ url }}{{ fragment }}">
       {{ title }} <img src="{{ static('common/images/sort_icon.svg') }}" alt="">
     </a>
   {% endif %}
-
 {% endmacro %}
diff --git a/common/util.py b/common/util.py
index aef0adf8f..2f3539872 100644
--- a/common/util.py
+++ b/common/util.py
@@ -47,7 +47,9 @@
 from django.db.models.functions.text import Lower
 from django.db.models.functions.text import Upper
 from django.db.transaction import atomic
+from django.http import HttpRequest
 from django.template import loader
+from django.urls import reverse
 from django.utils import timezone
 from lxml import etree
 from psycopg.types.range import DateRange
@@ -809,3 +811,11 @@ def get_related_names(instance, related_model) -> list[str]:
         if field.one_to_many and issubclass(field.related_model, related_model):
             related_names.append(field.get_accessor_name())
     return related_names
+
+
+def get_current_view_url(request: HttpRequest) -> str:
+    """Returns the resolved URL of the current view."""
+    view_name = request.resolver_match.view_name
+    args = request.resolver_match.args
+    kwargs = request.resolver_match.kwargs
+    return reverse(view_name, args=args, kwargs=kwargs)
diff --git a/common/views/mixins.py b/common/views/mixins.py
index 6cfff811e..11581c534 100644
--- a/common/views/mixins.py
+++ b/common/views/mixins.py
@@ -8,11 +8,13 @@
 from django.db.models import Model
 from django.db.models import QuerySet
 from django.http import Http404
+from django.http import QueryDict
 
 from common.business_rules import BusinessRule
 from common.business_rules import BusinessRuleViolation
 from common.models import TrackedModel
 from common.pagination import build_pagination_list
+from common.util import get_current_view_url
 
 
 class WithPaginationListMixin:
@@ -162,3 +164,41 @@ def get_ordering(self):
 
         else:
             return None
+
+    def remove_sorting_params(self) -> QueryDict:
+        """Returns a cleaned copy of GET params having removed 'sort_by' and
+        'ordered'."""
+        query_params = self.request.GET.copy()
+        query_params.pop("sort_by", None)
+        query_params.pop("ordered", None)
+        return query_params
+
+    def build_sorting_urls(self) -> dict[str, str]:
+        """
+        Returns a dictionary mapping a sort_by_field to its sorting URL.
+
+        Appends `sort_by` and `ordered` query params to the current view URL for each field in `sort_by_fields`,
+        while keeping other query params (such as those used for filtering) in place.
+        """
+        urls = {}
+        view_url = get_current_view_url(self.request)
+        query_params = self.remove_sorting_params().urlencode()
+        ordering = self.get_ordering()
+
+        for sort_by in self.sort_by_fields:
+            if ordering and ordering.startswith("-"):
+                sorting_params = f"sort_by={sort_by}&ordered=asc"
+            else:
+                sorting_params = f"sort_by={sort_by}&ordered=desc"
+            urls[sort_by] = (
+                f"{view_url}?{query_params}&{sorting_params}"
+                if query_params
+                else f"{view_url}?{sorting_params}"
+            )
+
+        return urls
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["sorting_urls"] = self.build_sorting_urls()
+        return context
diff --git a/footnotes/jinja2/includes/footnotes/tabs/measures.jinja b/footnotes/jinja2/includes/footnotes/tabs/measures.jinja
index 40d0d9e21..36b2fef14 100644
--- a/footnotes/jinja2/includes/footnotes/tabs/measures.jinja
+++ b/footnotes/jinja2/includes/footnotes/tabs/measures.jinja
@@ -44,18 +44,16 @@
     ]) or "" }}
   {% endfor %}
 
-  {% set base_url = url('footnote-ui-detail-measures', kwargs={"footnote_type__footnote_type_id":object.footnote_type.footnote_type_id, "footnote_id":object.footnote_id}) %}
-
   {% set commodity_code %}
-    {{ create_sortable_anchor(request, "goods_nomenclature", "Commodity code", base_url) }}
+    {{ create_sortable_anchor(request, "Commodity code", sorting_urls["goods_nomenclature"]) }}
   {% endset %}
 
  {% set geo_area %}
-    {{ create_sortable_anchor(request, "geo_area", "Geographical area", base_url) }}
+    {{ create_sortable_anchor(request, "Geographical area", sorting_urls["geo_area"]) }}
   {% endset %}
 
   {% set start_date %}
-    {{ create_sortable_anchor(request, "start_date", "Start date", base_url) }}
+    {{ create_sortable_anchor(request, "Start date", sorting_urls["start_date"]) }}
   {% endset %}
 
   {% if paginator.count > 0 %}
diff --git a/footnotes/views.py b/footnotes/views.py
index 5e701d8f4..add4f964a 100644
--- a/footnotes/views.py
+++ b/footnotes/views.py
@@ -203,6 +203,7 @@ class FootnoteDetailMeasures(SortingMixin, WithPaginationListMixin, ListView):
     paginate_by = 20
     sort_by_fields = ["goods_nomenclature", "geo_area", "start_date"]
     custom_sorting = {
+        "goods_nomenclature": "goods_nomenclature__item_id",
         "geo_area": "geographical_area__area_id",
         "start_date": "valid_between",
     }
diff --git a/geo_areas/jinja2/includes/geo_areas/tabs/measures.jinja b/geo_areas/jinja2/includes/geo_areas/tabs/measures.jinja
index 4edd73849..c491c78c9 100644
--- a/geo_areas/jinja2/includes/geo_areas/tabs/measures.jinja
+++ b/geo_areas/jinja2/includes/geo_areas/tabs/measures.jinja
@@ -40,14 +40,12 @@
     ]) or "" }}
   {% endfor %}
 
-  {% set base_url = url('geo_area-ui-detail-measures', kwargs={"sid": object.sid}) %}
-
   {% set commodity_code %}
-    {{ create_sortable_anchor(request, "goods_nomenclature", "Commodity code", base_url) }}
+    {{ create_sortable_anchor(request, "Commodity code", sorting_urls["goods_nomenclature"]) }}
   {% endset %}
 
   {% set start_date %}
-    {{ create_sortable_anchor(request, "start_date", "Start date", base_url) }}
+    {{ create_sortable_anchor(request, "Start date", sorting_urls["start_date"]) }}
   {% endset %}
 
   {% if paginator.count > 0 %}
diff --git a/geo_areas/views.py b/geo_areas/views.py
index cd17b212e..546caaf78 100644
--- a/geo_areas/views.py
+++ b/geo_areas/views.py
@@ -148,6 +148,7 @@ class GeoAreaDetailMeasures(SortingMixin, WithPaginationListMixin, ListView):
     paginate_by = 20
     sort_by_fields = ["goods_nomenclature", "start_date"]
     custom_sorting = {
+        "goods_nomenclature": "goods_nomenclature__item_id",
         "start_date": "valid_between",
     }
 
diff --git a/measures/jinja2/includes/measures/list.jinja b/measures/jinja2/includes/measures/list.jinja
index bbb3a31e4..37886c290 100644
--- a/measures/jinja2/includes/measures/list.jinja
+++ b/measures/jinja2/includes/measures/list.jinja
@@ -13,23 +13,23 @@
 {%- endset %}
 
 {% set sid %}
-  {{ create_sortable_anchor(request, "sid", "SID", base_url, query_params) }}
+  {{ create_sortable_anchor(request, "SID", sorting_urls["sid"]) }}
 {% endset %}
 
 {% set measure_type %}
-  {{ create_sortable_anchor(request, "measure_type", "Type", base_url, query_params) }}
+  {{ create_sortable_anchor(request, "Type", sorting_urls["measure_type"]) }}
 {% endset %}
 
 {% set geo_area %}
-  {{ create_sortable_anchor(request, "geo_area", "Geographical area", base_url, query_params) }}
+  {{ create_sortable_anchor(request, "Geographical area", sorting_urls["geo_area"]) }}
 {% endset %}
 
 {% set start_date %}
-  {{ create_sortable_anchor(request, "start_date", "Start date", base_url, query_params) }}
+  {{ create_sortable_anchor(request, "Start date", sorting_urls["start_date"]) }}
 {% endset %}
 
 {% set end_date %}
-  {{ create_sortable_anchor(request, "end_date", "End date", base_url, query_params) }}
+  {{ create_sortable_anchor(request, "End date", sorting_urls["end_date"]) }}
 {% endset %}
 
 {# sets out form #}
diff --git a/measures/views/search.py b/measures/views/search.py
index dec0f6ba2..eeee5bb7b 100644
--- a/measures/views/search.py
+++ b/measures/views/search.py
@@ -84,16 +84,6 @@ def get_form_kwargs(self):
         kwargs["objects"] = page.object_list
         return kwargs
 
-    def cleaned_query_params(self):
-        # Remove the sort_by and ordered params in order to stop them being duplicated in the base url
-        if "sort_by" and "ordered" in self.filterset.data:
-            cleaned_filterset = self.filterset.data.copy()
-            cleaned_filterset.pop("sort_by")
-            cleaned_filterset.pop("ordered")
-            return cleaned_filterset
-        else:
-            return self.filterset.data
-
     def selected_filter_formatter(self) -> List[List[str]]:
         """
         A function that formats the selected filter choices into nicely written
@@ -242,6 +232,7 @@ def get_context_data(self, **kwargs):
                 ),
                 "selected_filter_lists": self.selected_filter_formatter(),
                 "workbasket": self.workbasket,
+                "sorting_urls": self.build_sorting_urls(),
             },
         )
         if context["has_previous_page"]:
@@ -253,10 +244,6 @@ def get_context_data(self, **kwargs):
             pk__in=self.measure_selections,
         ).values_list("sid", flat=True)
 
-        context["query_params"] = True
-        context["base_url"] = (
-            f'{reverse("measure-ui-list")}?{urlencode(self.cleaned_query_params())}'
-        )
         return context
 
     def get_initial(self):
diff --git a/quotas/jinja2/includes/quotas/tabs/measures.jinja b/quotas/jinja2/includes/quotas/tabs/measures.jinja
index 761e6a562..33fabd967 100644
--- a/quotas/jinja2/includes/quotas/tabs/measures.jinja
+++ b/quotas/jinja2/includes/quotas/tabs/measures.jinja
@@ -16,10 +16,8 @@
   ]) or "" }}
 {% endfor %}
 
-{% set base_url = url('quota-ui-detail', args=[object.sid]) %}
-
 {% set commodity_code %}
-  {{ create_sortable_anchor(request, "goods_nomenclature", "Commodity code", base_url, "#measures") }}
+  {{ create_sortable_anchor(request, "Commodity code", sorting_urls["goods_nomenclature"], "#measures") }}
 {% endset %}
 
 <div class="quota__measures govuk-grid-row">
diff --git a/quotas/jinja2/quotas/definitions.jinja b/quotas/jinja2/quotas/definitions.jinja
index 614da2ec4..80974d22e 100644
--- a/quotas/jinja2/quotas/definitions.jinja
+++ b/quotas/jinja2/quotas/definitions.jinja
@@ -61,7 +61,6 @@
 
 {{ fake_tabs(links) }}
 <div class="quota-definitions">
-  {% set base_url = url('quota_definition-ui-list', args=[quota.sid] ) %}
   <div class="govuk-tabs__panel">
   {% if quota_type == "blocking_periods" %}
     {% include "quotas/tables/blocking_periods.jinja" %}
diff --git a/quotas/jinja2/quotas/tables/definitions.jinja b/quotas/jinja2/quotas/tables/definitions.jinja
index 494a25dca..3f6f48aed 100644
--- a/quotas/jinja2/quotas/tables/definitions.jinja
+++ b/quotas/jinja2/quotas/tables/definitions.jinja
@@ -65,11 +65,11 @@
 {% endfor %}
 
 {% set sid %}
-  {{ create_sortable_anchor(request, "sid", "Quota definition SID", base_url) }}
+  {{ create_sortable_anchor(request, "Quota definition SID", sorting_urls["sid"]) }}
 {% endset %}
 
 {% set start_date %}
-  {{ create_sortable_anchor(request, "valid_between", "Start date", base_url) }}
+  {{ create_sortable_anchor(request, "Start date", sorting_urls["valid_between"]) }}
 {% endset %}
 
 {{ govukTable({
diff --git a/quotas/views/base.py b/quotas/views/base.py
index 49519047b..0b7891f1a 100644
--- a/quotas/views/base.py
+++ b/quotas/views/base.py
@@ -190,7 +190,7 @@ class QuotaList(QuotaOrderNumberMixin, TamatoListView):
     filterset_class = QuotaFilter
 
 
-class QuotaDetail(QuotaOrderNumberMixin, TrackedModelDetailView, SortingMixin):
+class QuotaDetail(QuotaOrderNumberMixin, SortingMixin, TrackedModelDetailView):
     template_name = "quotas/detail.jinja"
     sort_by_fields = ["goods_nomenclature"]
 
diff --git a/regulations/jinja2/includes/regulations/tabs/measures.jinja b/regulations/jinja2/includes/regulations/tabs/measures.jinja
index 00f24c85a..ffcd52ed9 100644
--- a/regulations/jinja2/includes/regulations/tabs/measures.jinja
+++ b/regulations/jinja2/includes/regulations/tabs/measures.jinja
@@ -45,18 +45,16 @@
     ]) or "" }}
   {% endfor %}
 
-  {% set base_url = url('regulation-ui-detail-measures', kwargs={"role_type": object.role_type, "regulation_id": object.regulation_id}) %}
-
   {% set commodity_code %}
-    {{ create_sortable_anchor(request, "goods_nomenclature", "Commodity code", base_url) }}
+    {{ create_sortable_anchor(request, "Commodity code", sorting_urls["goods_nomenclature"]) }}
   {% endset %}
 
   {% set geo_area %}
-    {{ create_sortable_anchor(request, "geo_area", "Geographical area", base_url) }}
+    {{ create_sortable_anchor(request, "Geographical area", sorting_urls["geo_area"]) }}
   {% endset %}
 
   {% set start_date %}
-    {{ create_sortable_anchor(request, "start_date", "Start date", base_url) }}
+    {{ create_sortable_anchor(request, "Start date", sorting_urls["start_date"]) }}
   {% endset %}
 
   {% if paginator.count > 0 %}
diff --git a/regulations/views.py b/regulations/views.py
index 0634d0d8d..0270cf8da 100644
--- a/regulations/views.py
+++ b/regulations/views.py
@@ -79,6 +79,7 @@ class RegulationDetailMeasures(SortingMixin, WithPaginationListMixin, ListView):
     paginate_by = 20
     sort_by_fields = ["goods_nomenclature", "geo_area", "start_date"]
     custom_sorting = {
+        "goods_nomenclature": "goods_nomenclature__item_id",
         "geo_area": "geographical_area__area_id",
         "start_date": "valid_between",
     }
diff --git a/tasks/jinja2/tasks/create.jinja b/tasks/jinja2/tasks/create.jinja
new file mode 100644
index 000000000..2e25bdbaf
--- /dev/null
+++ b/tasks/jinja2/tasks/create.jinja
@@ -0,0 +1,26 @@
+{% extends 'layouts/form.jinja' %}
+
+{% block breadcrumb %}
+  {% if parent_task %}
+    {{ breadcrumbs(request, [
+        {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
+        {"text": "Task: " ~ parent_task.title, "href": parent_task.get_url("detail")},
+        {"text": page_title}
+      ],
+      with_workbasket=False,
+    ) }}
+  {% else %}
+    {{ breadcrumbs(request, [
+        {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
+        {"text": page_title}
+      ],
+      with_workbasket=False,
+    ) }}
+  {% endif %}
+{% endblock %}
+
+{% block form %}
+  {% call django_form() %}
+    {{ crispy(form) }}
+  {% endcall %}
+{% endblock %}
diff --git a/tasks/jinja2/tasks/delete.jinja b/tasks/jinja2/tasks/delete.jinja
index 574aa28a5..0de6bacb0 100644
--- a/tasks/jinja2/tasks/delete.jinja
+++ b/tasks/jinja2/tasks/delete.jinja
@@ -4,7 +4,14 @@
 {% from "components/warning-text/macro.njk" import govukWarningText %}
 {% from "components/button/macro.njk" import govukButton %}
 
-{% set page_title = "Delete my Task:" ~ object.title %}
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
+      {"text": verbose_name|capitalize ~ ": " ~ object.title, "href": url("workflow:task-ui-detail", kwargs={"pk": object.pk})},
+      {"text": page_title}
+    ])
+  }}
+{% endblock %}
 
 {% block content %}
 <div class="govuk-!-width-two-thirds">
@@ -30,12 +37,3 @@
   {% endblock %}
 </div>
 {% endblock %}
-
-{% block breadcrumb %}
-  {{ breadcrumbs(request, [
-      {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
-      {"text": verbose_name ~ " :" ~ object.title, "href": url("workflow:task-ui-detail", kwargs={"pk": object.pk})},
-      {"text": page_title}
-    ])
-  }}
-{% endblock %}
diff --git a/tasks/jinja2/tasks/detail.jinja b/tasks/jinja2/tasks/detail.jinja
index a3f94a83c..0750d487e 100644
--- a/tasks/jinja2/tasks/detail.jinja
+++ b/tasks/jinja2/tasks/detail.jinja
@@ -4,11 +4,36 @@
 
 {% set page_title = "Task: " ~ object.title %}
 
-{%if object.parent_task%}
+{% if object.parent_task %}
   {% set edit_url = url("workflow:subtask-ui-update", kwargs={"pk": object.pk}) %}
+  {% set title_caption = "Subtask" %}
+  {% set parent_summary_list_row %}
+    <div class="govuk-summary-list__row">
+      <dt class="govuk-summary-list__key">
+        Parent task
+      </dt>
+      <dd class="govuk-summary-list__value">
+        <a
+          class="govuk-link"
+          href="{{ object.parent_task.get_url("detail") }}"
+        >{{ object.parent_task.pk }}</a>
+      </dd>
+    </div>
+  {% endset %}
 {% else %}
   {% set edit_url = url("workflow:task-ui-update", kwargs={"pk": object.pk}) %}
-{% endif%}
+{% endif %}
+
+{% set workbasket_linked_id %}
+  {% if object.workbasket -%}
+    <a
+      class="govuk-link"
+      href="{{ url("workbaskets:workbasket-ui-detail", kwargs={"pk": object.workbasket.pk}) }}"
+    >{{ object.workbasket.pk }}</a>
+  {% else %}
+    -
+  {% endif -%}
+{% endset %}
 
 {% macro display_assignees(assignees) %}
   {% if not assignees %}
@@ -28,7 +53,8 @@
   {{ breadcrumbs(request, [
       {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
       {"text": page_title}
-    ]
+    ],
+    with_workbasket=False,
   ) }}
 {% endblock %}
 
@@ -46,6 +72,13 @@
 {% block content %}
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
+    {% if title_caption %}
+      {% block page_subtitle %}
+        <span class="govuk-caption-xl">
+          {{ title_caption }}
+        </span>
+      {% endblock %}
+    {% endif %}
     <h1 class="govuk-heading-xl">{{ page_title }}</h1>
   </div>
 </div>
@@ -94,7 +127,7 @@
       Category
     </dt>
     <dd class="govuk-summary-list__value">
-      {{ object.category }}
+      {{ object.category or "-" }}
     </dd>
     <dd class="govuk-summary-list__actions">
       <a class="govuk-link" href="{{ edit_url }}">Change<span class="govuk-visually-hidden"> category</span></a>
@@ -118,13 +151,17 @@
       Workbasket
     </dt>
     <dd class="govuk-summary-list__value">
-      {{ workbasket_summary_link }}
+      {{ workbasket_linked_id }}
     </dd>
     <dd class="govuk-summary-list__actions">
-      <a class="govuk-link" href="{{ edit_url }}">Change<span class="govuk-visually-hidden"> workbasket</span></a>
+      <a class="govuk-link" href="{{ edit_url }}">Change<span class="govuk-visually-hidden"> status</span></a>
     </dd>
   </div>
 
+  {% if object.parent_task %}
+    {{ parent_summary_list_row }}
+  {% endif %}
+
   <div class="govuk-summary-list__row">
     <dt class="govuk-summary-list__key">
       Created
diff --git a/tasks/jinja2/tasks/edit.jinja b/tasks/jinja2/tasks/edit.jinja
index d2d0bde91..0f8ebe1ee 100644
--- a/tasks/jinja2/tasks/edit.jinja
+++ b/tasks/jinja2/tasks/edit.jinja
@@ -7,8 +7,9 @@
       {"text": "Find and view tasks", "href": url("workflow:task-ui-list")},
       {"text": "Task: " ~ object.title, "href": url("workflow:task-ui-detail", kwargs={"pk": object.pk})},
       {"text": page_title}
-    ])
-  }}
+    ],
+    with_workbasket=False,
+  ) }}
 {% endblock %}
 
 {% block form %}
diff --git a/tasks/jinja2/tasks/list.jinja b/tasks/jinja2/tasks/list.jinja
index f516e5ca1..b85fe2a7a 100644
--- a/tasks/jinja2/tasks/list.jinja
+++ b/tasks/jinja2/tasks/list.jinja
@@ -5,7 +5,13 @@
 
 {% set page_title = "Find and view tasks" %}
 
-{% set base_url = url("workflow:task-ui-list") %}
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": page_title}
+    ],
+    with_workbasket=False,
+  ) }}
+{% endblock %}
 
 {% block content %}
   <h1 class="govuk-heading-xl">{{ page_title }}</h1>
@@ -50,7 +56,7 @@
         {{ table_rows.append([
           {"text": task_linked_id},
           {"text": object.title},
-          {"text": object.category},
+          {"text": object.category or "-"},
           {"text": object.progress_state},
           {"text": workbasket_linked_id},
           {"text": "{:%d %b %Y}".format(object.created_at)},
@@ -64,7 +70,7 @@
           {"text": "Category"},
           {"text": "Status"},
           {"text": "Workbasket"},
-          {"text": create_sortable_anchor(request, "created_at", "Created", base_url)},
+          {"text": create_sortable_anchor(request, "Created", sorting_urls["created_at"])},
         ],
           "rows": table_rows
         }) }}
diff --git a/tasks/jinja2/tasks/workflows/list.jinja b/tasks/jinja2/tasks/workflows/list.jinja
index fd76656f0..18b7a72a9 100644
--- a/tasks/jinja2/tasks/workflows/list.jinja
+++ b/tasks/jinja2/tasks/workflows/list.jinja
@@ -3,9 +3,15 @@
 {% from "components/table/macro.njk" import govukTable %}
 {% from "components/create_sortable_anchor.jinja" import create_sortable_anchor %}
 
-{% set page_title = "Find and view tasks workflows" %}
+{% set page_title = "Find and view workflows" %}
 
-{% set base_url = url("workflow:task-workflow-ui-list") %}
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": page_title}
+    ],
+    with_workbasket=False,
+  ) }}
+{% endblock %}
 
 {% block content %}
   <h1 class="govuk-heading-xl">{{ page_title }}</h1>
@@ -53,7 +59,7 @@
           {{ table_rows.append([
             {"text": task_linked_id},
             {"text": object.title},
-            {"text": object.category},
+            {"text": object.category or "-"},
             {"text": object.progress_state},
             {"text": workbasket_linked_id},
             {"text": "{:%d %b %Y}".format(object.created_at)},
@@ -67,7 +73,7 @@
             {"text": "Category"},
             {"text": "Status"},
             {"text": "Workbasket"},
-            {"text": create_sortable_anchor(request, "created_at", "Created", base_url)},
+            {"text": create_sortable_anchor(request, "Created", sorting_urls["created_at"])},
           ],
             "rows": table_rows
           }) }}
diff --git a/tasks/jinja2/tasks/workflows/task-and-workflow-list.jinja b/tasks/jinja2/tasks/workflows/task-and-workflow-list.jinja
index e0e5339ae..b9f7f8d1d 100644
--- a/tasks/jinja2/tasks/workflows/task-and-workflow-list.jinja
+++ b/tasks/jinja2/tasks/workflows/task-and-workflow-list.jinja
@@ -5,7 +5,13 @@
 
 {% set page_title = "Find and view tasks and workflows" %}
 
-{% set base_url = url("workflow:task-and-workflow-ui-list") %}
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": page_title}
+    ],
+    with_workbasket=False,
+  ) }}
+{% endblock %}
 
 {% block content %}
   <h1 class="govuk-heading-xl">{{ page_title }}</h1>
@@ -20,7 +26,7 @@
     <div class="filter-layout__filters">
       <h2 class="govuk-heading-m govuk-!-margin-top-3">Search and filter</h2>
 
-      <form method="get" action="{{ base_url }}">
+      <form method="get" action="{{ url("workflow:task-and-workflow-ui-list") }}">
           {{ crispy(filter.form) }}
       </form>
     </div>
@@ -86,7 +92,7 @@
             {"text": "Category"},
             {"text": "Status"},
             {"text": "Workbasket"},
-            {"text": create_sortable_anchor(request, "created_at", "Created", base_url)},
+            {"text": create_sortable_anchor(request, "Created", sorting_urls["created_at"])},
           ],
             "rows": table_rows
           }) }}
diff --git a/tasks/jinja2/tasks/workflows/task_template_confirm_create.jinja b/tasks/jinja2/tasks/workflows/task_template_confirm_create.jinja
index 0c532419c..e3dcac8b0 100644
--- a/tasks/jinja2/tasks/workflows/task_template_confirm_create.jinja
+++ b/tasks/jinja2/tasks/workflows/task_template_confirm_create.jinja
@@ -42,8 +42,8 @@
     "classes": "govuk-button"
   }) }}
   {{ govukButton({
-    "text": "Return to homepage",
-    "href": url("home"),
+    "text": "Return to workflow template",
+    "href": url("workflow:task-workflow-template-ui-detail", kwargs={"pk": task_workflow_template.pk}),
     "classes": "govuk-button--secondary"
   }) }}
 {% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/task_template_detail.jinja b/tasks/jinja2/tasks/workflows/task_template_detail.jinja
index f42ff3f41..286cd9ad5 100644
--- a/tasks/jinja2/tasks/workflows/task_template_detail.jinja
+++ b/tasks/jinja2/tasks/workflows/task_template_detail.jinja
@@ -68,5 +68,10 @@
 
       "classes": "govuk-button--warning"
   }) }}
+  {{ govukButton({
+    "text": "Return to workflow template",
+    "href": url("workflow:task-workflow-template-ui-detail", kwargs={"pk": task_workflow_template.pk}),
+    "classes": "govuk-button--secondary"
+  }) }}
   </div>
 {% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/template_list.jinja b/tasks/jinja2/tasks/workflows/template_list.jinja
index 3be85f30e..3900678c5 100644
--- a/tasks/jinja2/tasks/workflows/template_list.jinja
+++ b/tasks/jinja2/tasks/workflows/template_list.jinja
@@ -3,15 +3,21 @@
 {% from "components/table/macro.njk" import govukTable %}
 {% from "components/create_sortable_anchor.jinja" import create_sortable_anchor %}
 
-{% set page_title = "Find and view task workflow templates" %}
+{% set page_title = "Find and view workflow templates" %}
 
-{% set base_url = url("workflow:task-workflow-template-ui-list") %}
+{% block breadcrumb %}
+  {{ breadcrumbs(request, [
+      {"text": page_title}
+    ],
+    with_workbasket=False,
+  ) }}
+{% endblock %}
 
 {% block content %}
   <h1 class="govuk-heading-xl">{{ page_title }}</h1>
   <p class="govuk-body">
-    Search for task workflow templates.
-    Alternatively, <a class="govuk-link" href="{{ url("workflow:task-workflow-template-ui-create") }}">create a new task workflow template</a>.
+    Search for workflow templates.
+    Alternatively, <a class="govuk-link" href="{{ url("workflow:task-workflow-template-ui-create") }}">create a new workflow template</a>.
   </p>
 
   <div class="filter-layout">
@@ -39,7 +45,7 @@
         {{ table_rows.append([
           {"text": workflow_template_linked_id},
           {"text": object.title},
-          {"text": object.description},
+          {"text": object.description|truncate(75)},
           {"text": object.creator.get_displayname() if object.creator else "Unknown"},
           {"text": object.created_at.strftime(datetime_format)},
           {"text": object.updated_at.strftime(datetime_format)},
@@ -52,8 +58,8 @@
           {"text": "Title"},
           {"text": "Description"},
           {"text": "Created by"},
-          {"text": create_sortable_anchor(request, "created_at", "Created", base_url)},
-          {"text": create_sortable_anchor(request, "updated_at", "Last Updated", base_url)},
+          {"text": create_sortable_anchor(request, "Created", sorting_urls["created_at"])},
+          {"text": create_sortable_anchor(request, "Last updated", sorting_urls["updated_at"])},
         ],
           "rows": table_rows
         }) }}
diff --git a/tasks/views.py b/tasks/views.py
index f660413d5..f7027a915 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -65,6 +65,10 @@ def get_queryset(self):
             queryset = queryset.order_by(*ordering)
         return queryset
 
+    def get_context_data(self, *, object_list=None, **kwargs):
+        context = super().get_context_data(object_list=object_list, **kwargs)
+        return context
+
 
 class TaskDetailView(PermissionRequiredMixin, DetailView):
     model = Task
@@ -104,7 +108,7 @@ def get_context_data(self, **kwargs) -> dict:
 
 class TaskCreateView(PermissionRequiredMixin, CreateView):
     model = Task
-    template_name = "layouts/create.jinja"
+    template_name = "tasks/create.jinja"
     permission_required = "tasks.add_task"
     form_class = TaskCreateForm
 
@@ -254,27 +258,31 @@ def get_success_url(self):
 
 class SubTaskCreateView(PermissionRequiredMixin, CreateView):
     model = Task
-    template_name = "layouts/create.jinja"
+    template_name = "tasks/create.jinja"
     permission_required = "tasks.add_task"
     form_class = SubTaskCreateForm
 
+    @property
+    def parent_task(self) -> Task:
+        return Task.objects.get(pk=self.kwargs["parent_task_pk"])
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["page_title"] = (
             f"Create a subtask for task {self.kwargs['parent_task_pk']}"
         )
+        context["parent_task"] = self.parent_task
         return context
 
     def form_valid(self, form):
-        parent_task = Task.objects.filter(pk=self.kwargs["parent_task_pk"]).first()
-        if parent_task.parent_task:
+        if self.parent_task.parent_task:
             form.add_error(
                 None,
                 "You cannot make a subtask from a subtask.",
             )
             return self.form_invalid(form)
         else:
-            self.object = form.save(parent_task, user=self.request.user)
+            self.object = form.save(self.parent_task, user=self.request.user)
             return HttpResponseRedirect(self.get_success_url())
 
     def get_success_url(self):
@@ -385,6 +393,10 @@ def get_queryset(self):
             queryset = queryset.order_by(*ordering)
         return queryset
 
+    def get_context_data(self, *, object_list=None, **kwargs):
+        context = super().get_context_data(object_list=object_list, **kwargs)
+        return context
+
 
 class TaskAndWorkflowListView(
     PermissionRequiredMixin,
@@ -406,6 +418,10 @@ def get_queryset(self):
             queryset = queryset.order_by(*ordering)
         return queryset
 
+    def get_context_data(self, *, object_list=None, **kwargs):
+        context = super().get_context_data(object_list=object_list, **kwargs)
+        return context
+
 
 class TaskWorkflowTemplateListView(
     PermissionRequiredMixin,
@@ -421,9 +437,7 @@ class TaskWorkflowTemplateListView(
 
     def get_context_data(self, **kwargs) -> dict:
         context_data = super().get_context_data(**kwargs)
-
         context_data["datetime_format"] = settings.DATETIME_FORMAT
-
         return context_data
 
     def get_queryset(self):
diff --git a/workbaskets/jinja2/includes/workbaskets/auto_end_date_measures.jinja b/workbaskets/jinja2/includes/workbaskets/auto_end_date_measures.jinja
index d9e81311b..bcf27a4db 100644
--- a/workbaskets/jinja2/includes/workbaskets/auto_end_date_measures.jinja
+++ b/workbaskets/jinja2/includes/workbaskets/auto_end_date_measures.jinja
@@ -29,18 +29,16 @@
     ]) or "" }}
   {% endfor %}
 
-  {% set base_url = url('workbaskets:workbasket-ui-auto-end-date-measures') %}
-
   {% set commodity_code %}
-    {{ create_sortable_anchor(request, "goods_nomenclature", "Commodity code", base_url) }}
+    {{ create_sortable_anchor(request, "Commodity code", sorting_urls["goods_nomenclature"], "#measures") }}
   {% endset %}
 
   {% set start_date %}
-    {{ create_sortable_anchor(request, "start_date", "Measure start date", base_url) }}
+    {{ create_sortable_anchor(request, "Measure start date", sorting_urls["start_date"], "#measures") }}
   {% endset %}
 
   {% set measure_sid %}
-    {{ create_sortable_anchor(request, "sid", "Measure SID", base_url) }}
+    {{ create_sortable_anchor(request, "Measure SID", sorting_urls["sid"], "#measures") }}
   {% endset %}
 
   {% if object_list %}
diff --git a/workbaskets/jinja2/workbaskets/changes.jinja b/workbaskets/jinja2/workbaskets/changes.jinja
index 96cbca35c..4fd4c401e 100644
--- a/workbaskets/jinja2/workbaskets/changes.jinja
+++ b/workbaskets/jinja2/workbaskets/changes.jinja
@@ -6,18 +6,16 @@
 {% from "includes/workbaskets/navigation.jinja" import create_workbasket_detail_navigation with context %}
 {% from "macros/checkbox_item.jinja" import checkbox_item %}
 
-{% set base_url = url("workbaskets:workbasket-ui-changes", args=[workbasket.pk]) ~ "?page=" ~ page_obj.number %}
-
 {% set component %}
-  {{ create_sortable_anchor(request, "component", "Item", base_url, True) }}
+  {{ create_sortable_anchor(request, "Item", sorting_urls["component"]) }}
 {% endset %}
 
 {% set action %}
-  {{ create_sortable_anchor(request, "action", "Action", base_url, True) }}
+  {{ create_sortable_anchor(request, "Action", sorting_urls["action"]) }}
 {% endset %}
 
 {% set activity_date %}
-  {{ create_sortable_anchor(request, "activity_date", "Activity date", base_url, True) }}
+  {{ create_sortable_anchor(request, "Activity date", sorting_urls["activity_date"]) }}
 {% endset %}
 
 {% set page_title %} Workbasket {{ workbasket.id }} - {{ workbasket.status }} {% endset %}
diff --git a/workbaskets/jinja2/workbaskets/checks/missing_measures.jinja b/workbaskets/jinja2/workbaskets/checks/missing_measures.jinja
index 6a9068614..8279f3939 100644
--- a/workbaskets/jinja2/workbaskets/checks/missing_measures.jinja
+++ b/workbaskets/jinja2/workbaskets/checks/missing_measures.jinja
@@ -121,10 +121,8 @@
               </div>
             </div>
 
-            {% set base_url = url("workbaskets:workbasket-ui-missing-measures-check") %}
-
             {% set commodity_code %}
-              {{ create_sortable_anchor(request, "commodity", "Commodity code", base_url) }}
+              {{ create_sortable_anchor(request, "Commodity code", sorting_urls["commodity"]) }}
             {% endset %}
 
             {% set table_rows = [] %}
diff --git a/workbaskets/jinja2/workbaskets/summary-workbasket.jinja b/workbaskets/jinja2/workbaskets/summary-workbasket.jinja
index 8d54bf4f9..ddc37e738 100644
--- a/workbaskets/jinja2/workbaskets/summary-workbasket.jinja
+++ b/workbaskets/jinja2/workbaskets/summary-workbasket.jinja
@@ -15,8 +15,6 @@
 {% set assign_users_link = url("workbaskets:workbasket-ui-assign-users", kwargs={"pk": workbasket.pk}) %}
 {% set unassign_users_link = url("workbaskets:workbasket-ui-unassign-users", kwargs={"pk": workbasket.pk}) %}
 
-{% set base_url = url("workbaskets:current-workbasket") ~ "?page=" ~ page_obj.number %}
-
 {% macro display_assigned_users(assigned_users, assignment_type) %}
   {% if not assigned_users and assignment_type == "workers" %}
     No users have been assigned to this workbasket yet.
@@ -156,6 +154,17 @@
       </dd>
     </div>
 
+    <div class="govuk-summary-list__row">
+      <dt class="govuk-summary-list__key">Auto end-date measures</dt>
+      <dd class="govuk-summary-list__value">Automatically end-date or delete measures and footnote associations on commodities which have been ended in this workbasket.</dd>
+      <dd class="govuk-summary-list__actions">
+        <a
+          class="govuk-link"
+          href="{{ url('workbaskets:workbasket-ui-auto-end-date-measures') }}"
+        >Auto end-date measures</a>
+      </dd>
+    </div>
+
     {% if workbasket.tasks.exists() and can_add_comment %}
       <div class="govuk-summary-list__row govuk-summary-list__row--no-border">
         <dt class="govuk-summary-list__key">Activity</dt>
@@ -164,21 +173,11 @@
         </dd>
         {% if comments %}
           <dd class="govuk-summary-list__actions">
-            <span class="govuk-visually-hidden">Sort by </span>{{ create_sortable_anchor(request, "comments", sort_by_title, base_url, query_params="True") }}
+            <span class="govuk-visually-hidden">Sort by </span>{{ create_sortable_anchor(request, sort_by_label, sorting_urls["comments"]) }}
           </dd>
         {% endif %}
       </div>
     {% endif %}
-    <div class="govuk-summary-list__row">
-      <dt class="govuk-summary-list__key">Auto end-date measures</dt>
-      <dd class="govuk-summary-list__value">Automatically end-date or delete measures and footnote associations on commodities which have been ended in this workbasket.</dd>
-      <dd class="govuk-summary-list__actions">
-        <a
-          class="govuk-link"
-          href="{{ url('workbaskets:workbasket-ui-auto-end-date-measures') }}"
-        >Auto end-date measures</a>
-      </dd>
-    </div>
   </dl>
 
   {% if comments and can_view_comment %}
diff --git a/workbaskets/jinja2/workbaskets/violations.jinja b/workbaskets/jinja2/workbaskets/violations.jinja
index b85e2a923..37c63cb85 100644
--- a/workbaskets/jinja2/workbaskets/violations.jinja
+++ b/workbaskets/jinja2/workbaskets/violations.jinja
@@ -33,18 +33,16 @@
     ]) or "" }}
 {% endfor %}
 
-{% set base_url = url('workbaskets:workbasket-ui-violations' ) %}
-
 {% set item %}
-  {{ create_sortable_anchor(request, "model", "Item", base_url) }}
+  {{ create_sortable_anchor(request, "Item", sorting_urls["model"]) }}
 {% endset %}
 
 {% set violation %}
-  {{ create_sortable_anchor(request, "check_name", "Violation", base_url) }}
+  {{ create_sortable_anchor(request, "Violation", sorting_urls["check_name"]) }}
 {% endset %}
 
 {% set activity_date %}
-  {{ create_sortable_anchor(request, "date", "Activity date", base_url) }}
+  {{ create_sortable_anchor(request, "Activity date", sorting_urls["date"]) }}
 {% endset %}
 
 {{ govukTable({
diff --git a/workbaskets/views/ui.py b/workbaskets/views/ui.py
index b7a45f40e..ba239c0d3 100644
--- a/workbaskets/views/ui.py
+++ b/workbaskets/views/ui.py
@@ -2,7 +2,6 @@
 import re
 from datetime import date
 from functools import cached_property
-from typing import Tuple
 
 import boto3
 import django_filters
@@ -388,9 +387,11 @@ class EditWorkbasketView(PermissionRequiredMixin, TemplateView):
 
 
 @method_decorator(require_current_workbasket, name="dispatch")
-class CurrentWorkBasket(FormView):
+class CurrentWorkBasket(SortingMixin, FormView):
     template_name = "workbaskets/summary-workbasket.jinja"
     form_class = forms.WorkBasketCommentCreateForm
+    sort_by_fields = ["comments"]
+    custom_sorting = {"comments": "created_at"}
 
     @property
     def workbasket(self) -> WorkBasket:
@@ -398,27 +399,28 @@ def workbasket(self) -> WorkBasket:
 
     @cached_property
     def comments(self):
+        comments = Comment.objects.filter(task__workbasket=self.workbasket)
         ordering = self.get_comments_ordering()[0]
-        return Comment.objects.filter(task__workbasket=self.workbasket).order_by(
-            ordering,
-        )
+        if ordering:
+            comments = comments.order_by(ordering)
+        return comments
 
     @cached_property
     def paginator(self):
         return Paginator(self.comments, per_page=20)
 
-    def get_comments_ordering(self) -> Tuple[str, str]:
-        """Returns the ordering for `self.comments` based on `ordered` GET param
-        together with the title to use for the sort by filter (which will be the
-        opposite of the applied ordering)."""
-        ordered = self.request.GET.get("ordered")
-        if ordered == "desc":
+    def get_comments_ordering(self) -> tuple[str, str]:
+        """Reverses the ordering value returned by `super().get_ordering()` to
+        list newest comments first by default and includes a custom label to use
+        as the sorting anchor's title."""
+        ordering = super().get_ordering()
+        if ordering and ordering.startswith("-"):
             ordering = "created_at"
-            new_sort_by_title = "Newest first"
+            sort_by_label = "Newest first"
         else:
             ordering = "-created_at"
-            new_sort_by_title = "Oldest first"
-        return ordering, new_sort_by_title
+            sort_by_label = "Oldest first"
+        return ordering, sort_by_label
 
     def form_valid(self, form):
         form.save(user=self.request.user, workbasket=self.workbasket)
@@ -477,7 +479,7 @@ def get_context_data(self, **kwargs):
                 "can_add_comment": can_add_comment,
                 "can_view_comment": can_view_comment,
                 "comments": page.object_list,
-                "sort_by_title": self.get_comments_ordering()[1],
+                "sort_by_label": self.get_comments_ordering()[1],
                 "paginator": self.paginator,
                 "page_obj": page,
                 "page_links": page_links,

From 562a3c1cc42b6b63c59264da54c2dc3150e58f51 Mon Sep 17 00:00:00 2001
From: Dale Cannon <dale.cannon@digital.trade.gov.uk>
Date: Thu, 13 Feb 2025 17:05:21 +0000
Subject: [PATCH 50/57] Pre-sort objects in view sorting tests to guarantee
 consistent ordering

---
 footnotes/tests/test_views.py   | 4 +++-
 geo_areas/tests/test_views.py   | 4 +++-
 regulations/tests/test_views.py | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/footnotes/tests/test_views.py b/footnotes/tests/test_views.py
index a432a0edf..ee4627cd7 100644
--- a/footnotes/tests/test_views.py
+++ b/footnotes/tests/test_views.py
@@ -347,7 +347,9 @@ def test_footnote_detail_measures_view_sorting_commodity(valid_user_client):
             associated_footnote=footnote,
         )
         measures.append(measure)
-    commodity_codes = [measure.goods_nomenclature.item_id for measure in measures]
+    commodity_codes = sorted(
+        [measure.goods_nomenclature.item_id for measure in measures],
+    )
     url = reverse(
         "footnote-ui-detail-measures",
         kwargs={
diff --git a/geo_areas/tests/test_views.py b/geo_areas/tests/test_views.py
index 58f5acf17..bdfe199e5 100644
--- a/geo_areas/tests/test_views.py
+++ b/geo_areas/tests/test_views.py
@@ -579,7 +579,9 @@ def test_geo_area_detail_measures_view_sorting_commodity(valid_user_client):
         3,
         geographical_area=geo_area,
     )
-    commodity_codes = [measure.goods_nomenclature.item_id for measure in measures]
+    commodity_codes = sorted(
+        [measure.goods_nomenclature.item_id for measure in measures],
+    )
 
     url = reverse(
         "geo_area-ui-detail-measures",
diff --git a/regulations/tests/test_views.py b/regulations/tests/test_views.py
index f6f55405d..889aa51cd 100644
--- a/regulations/tests/test_views.py
+++ b/regulations/tests/test_views.py
@@ -149,7 +149,9 @@ def test_regulation_detail_measures_view_sorting_commodity(valid_user_client):
         3,
         generating_regulation=regulation,
     )
-    commodity_codes = [measure.goods_nomenclature.item_id for measure in measures]
+    commodity_codes = sorted(
+        [measure.goods_nomenclature.item_id for measure in measures],
+    )
 
     url = reverse(
         "regulation-ui-detail-measures",

From 380d87b326bfeb3dfa02bb4e263badbd19f6c96f Mon Sep 17 00:00:00 2001
From: Marya Shariq <marya.shariq@digital.trade.gov.uk>
Date: Thu, 20 Feb 2025 11:16:34 +0000
Subject: [PATCH 51/57] UI text changes for new 'tickets' tile on homepage
 (#1414)

* UI text changes for new 'tickets' tile on homepage

* two unit tests added to check visibility of 'tickets' tile for users with specific permissions
---
 common/jinja2/common/homepage.jinja | 29 +++++++----------
 common/tests/test_views.py          | 50 +++++++++++++++++++++++++++--
 2 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/common/jinja2/common/homepage.jinja b/common/jinja2/common/homepage.jinja
index 7cc40fa84..236d807aa 100644
--- a/common/jinja2/common/homepage.jinja
+++ b/common/jinja2/common/homepage.jinja
@@ -144,29 +144,24 @@
       </article>
     {% endif %}
 
+
+    {% if request.user.groups.filter(name='Tariff Managers').exists() or request.user.is_superuser %}
       <article class="masonry-card">
-        <h3 class="govuk-heading-m">Tasks and Workflows - TEST ONLY</h3>
-        <p class="govuk-body">
-          <a href="{{ url('workflow:task-ui-list') }}"
-            class="govuk-link"
-          >Tasks</a>
-        </p>
-        <p class="govuk-body"></p>
+        <h3 class="govuk-heading-m">Tickets</h3>
+          <p class="govuk-body"></p>
           <a href="{{ url('workflow:task-workflow-ui-list') }}"
             class="govuk-link"
-          >Workflows</a>
-        </p>
-        <p class="govuk-body"></p>
-          <a href="{{ url('workflow:task-and-workflow-ui-list') }}"
-            class="govuk-link"
-          >Tasks and Workflows</a>
-        </p>
-        <p class="govuk-body"></p>
+          >Tickets</a>
+          </p>
+        {% if request.user.is_superuser %}
+          <p class="govuk-body"></p>
           <a href="{{ url('workflow:task-workflow-template-ui-list') }}"
             class="govuk-link"
-          >Workflow templates</a>
-        </p>
+          >Ticket templates</a>
+          </p>
+        {% endif %}
       </article>
+    {% endif %}
 
     <article class="masonry-card">
       <h3 class="govuk-heading-m">Resources</h3>
diff --git a/common/tests/test_views.py b/common/tests/test_views.py
index 5b65d32ea..8bd62e88f 100644
--- a/common/tests/test_views.py
+++ b/common/tests/test_views.py
@@ -378,8 +378,7 @@ def test_resources_view_displays_resources(heading, expected_url, valid_user_cli
 @override_settings(SSO_ENABLED=True)
 def test_admin_login_shows_404_when_sso_enabled(superuser_client):
     """Test to check that when staff SSO is enabled, the login page shows a 404
-    but the rest of the admin site is still available.
-    """
+    but the rest of the admin site is still available."""
     response = superuser_client.get(reverse("admin:login"))
     assert response.status_code == 404
 
@@ -387,3 +386,50 @@ def test_admin_login_shows_404_when_sso_enabled(superuser_client):
     assert response.status_code == 200
     page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
     assert page.find("h1", string="Site administration")
+
+
+@pytest.mark.parametrize(
+    "client_name",
+    [
+        "client",
+        "superuser_client",
+        "valid_user_client",
+    ],
+)
+def test_tickets_tile_visibility_based_on_user_permissions(client_name, request):
+    """This test checks if 'Tickets' tile is only visible to either Tariff
+    Managers (valid_user_client used as proxy) or superusers."""
+    client = request.getfixturevalue(client_name)
+    response = client.get(reverse("home"))
+
+    page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
+    card = page.find("h3", string="Tickets")
+
+    if client_name == "client":
+        assert not card
+    else:
+        assert card
+
+
+@pytest.mark.parametrize(
+    "client_name",
+    [
+        "valid_user_client",
+        "superuser_client",
+    ],
+)
+def test_ticket_templates_link_only_visible_to_superuser(client_name, request):
+    """This test checks if the 'Ticket Templates' link is only visible to
+    superusers."""
+    print(f"Using the following client: {client_name}")
+    client = request.getfixturevalue(client_name)
+    response = client.get(reverse("home"))
+
+    page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
+    link_url = reverse("workflow:task-workflow-template-ui-list")
+    ticket_templates_link = page.find("a", href=link_url)
+
+    if client_name == "valid_user_client":
+        assert not ticket_templates_link
+    else:
+        assert ticket_templates_link

From 48ef119f5e5d6c8152b92cd83e249b9530ca3e16 Mon Sep 17 00:00:00 2001
From: marya <marya.shariq@digital.trade.gov.uk>
Date: Thu, 20 Feb 2025 14:08:15 +0000
Subject: [PATCH 52/57] references to subtasks removed from UI

---
 tasks/jinja2/tasks/detail.jinja | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tasks/jinja2/tasks/detail.jinja b/tasks/jinja2/tasks/detail.jinja
index 0750d487e..4034cf800 100644
--- a/tasks/jinja2/tasks/detail.jinja
+++ b/tasks/jinja2/tasks/detail.jinja
@@ -238,14 +238,6 @@
     "href": url("workflow:task-ui-list"),
     "classes": "govuk-button--secondary"
   }) }}
-
-  {% if not object.parent_task %}
-    {{ govukButton({
-      "text": "Create subtask",
-      "href": url("workflow:subtask-ui-create", kwargs={"parent_task_pk": object.pk}),
-      "classes": "govuk-button--secondary"
-    }) }}
-  {% endif %}
 </div>
 
 {% set assign_users_link = url("workflow:task-ui-assign-users", kwargs={"pk": object.pk}) %}

From b64597d3eaff326548cdcdfdcab596de97be9d2a Mon Sep 17 00:00:00 2001
From: marya <marya.shariq@digital.trade.gov.uk>
Date: Thu, 20 Feb 2025 14:12:09 +0000
Subject: [PATCH 53/57] Revert "references to subtasks removed from UI"

This reverts commit 48ef119f5e5d6c8152b92cd83e249b9530ca3e16.
---
 tasks/jinja2/tasks/detail.jinja | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tasks/jinja2/tasks/detail.jinja b/tasks/jinja2/tasks/detail.jinja
index 4034cf800..0750d487e 100644
--- a/tasks/jinja2/tasks/detail.jinja
+++ b/tasks/jinja2/tasks/detail.jinja
@@ -238,6 +238,14 @@
     "href": url("workflow:task-ui-list"),
     "classes": "govuk-button--secondary"
   }) }}
+
+  {% if not object.parent_task %}
+    {{ govukButton({
+      "text": "Create subtask",
+      "href": url("workflow:subtask-ui-create", kwargs={"parent_task_pk": object.pk}),
+      "classes": "govuk-button--secondary"
+    }) }}
+  {% endif %}
 </div>
 
 {% set assign_users_link = url("workflow:task-ui-assign-users", kwargs={"pk": object.pk}) %}

From fe6675af93be7ca1fe47a8a8ff172cab90c3dd61 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Fri, 28 Feb 2025 16:41:51 +0000
Subject: [PATCH 54/57] TP2000-1725  Redesign ticket detail view (#1417)

* Remove queued item management from ticket detail view

* Reconcile detail.jinja for ticket and ticket template detail views

* Display step assignees on ticket detail view

* Add heading caption to ticket detail view

* Remove details summary list

* Add description detail

* Add datetime formatting jinja filters

* Add display_details macros

* Add css classes for stacked summary list

* Add details column

* Add edit button

* Update ticket detail view unit tests

* Use coloured tags for status

* Align ticket template step list table with ticket step list table

* Amend content
---
 common/jinja2.py                              |   8 ++
 common/static/common/scss/_components.scss    |  26 ++++
 common/util.py                                |  28 ++++
 tasks/jinja2/tasks/includes/task_list.jinja   |  26 ++++
 tasks/jinja2/tasks/includes/task_queue.jinja  |   8 +-
 .../jinja2/tasks/macros/display_details.jinja |  42 ++++++
 tasks/jinja2/tasks/workflows/detail.jinja     | 131 ++++++++----------
 tasks/tests/factories.py                      |   2 +
 tasks/tests/test_views.py                     |  67 +++------
 tasks/views.py                                |  32 ++---
 10 files changed, 221 insertions(+), 149 deletions(-)
 create mode 100644 tasks/jinja2/tasks/includes/task_list.jinja
 create mode 100644 tasks/jinja2/tasks/macros/display_details.jinja

diff --git a/common/jinja2.py b/common/jinja2.py
index 6d9909e47..b794b0382 100644
--- a/common/jinja2.py
+++ b/common/jinja2.py
@@ -16,6 +16,10 @@
 from webpack_loader.contrib.jinja2ext import _render_bundle
 from webpack_loader.templatetags.webpack_loader import webpack_static
 
+from common.util import format_date
+from common.util import format_datetime
+from common.util import format_short_date
+from common.util import format_short_datetime
 from govuk_frontend_jinja.templates import Environment
 from govuk_frontend_jinja.templates import NunjucksExtension
 from workbaskets.models import WorkBasket
@@ -127,6 +131,10 @@ def environment(**kwargs):
         {
             "localtime": template_localtime,
             "pluralize": pluralize,
+            "format_date": format_date,
+            "format_short_date": format_short_date,
+            "format_datetime": format_datetime,
+            "format_short_datetime": format_short_datetime,
         },
     )
 
diff --git a/common/static/common/scss/_components.scss b/common/static/common/scss/_components.scss
index a0b8ed9d9..a3024cd52 100644
--- a/common/static/common/scss/_components.scss
+++ b/common/static/common/scss/_components.scss
@@ -165,3 +165,29 @@
 .govuk-checkboxes__label:before {
   background-color: white
 }
+
+.govuk-summary-list__row__stacked {
+  @extend .govuk-summary-list__row;
+  display: block;
+}
+
+.govuk-summary-list__key__stacked {
+  @extend .govuk-summary-list__key;
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin: 0;
+}
+
+.govuk-summary-list__value__stacked {
+  @extend .govuk-summary-list__value;
+  display: block;
+  padding: 0;
+  margin: 0;
+}
+
+.govuk-summary-list__value__stacked:last-child {
+  width: 100%;
+  padding-bottom: govuk-spacing(2);
+  margin: 0;
+}
diff --git a/common/util.py b/common/util.py
index 2f3539872..69d431bdf 100644
--- a/common/util.py
+++ b/common/util.py
@@ -690,6 +690,34 @@ def format_date_string(date_string: str, short_format=False) -> str:
         return ""
 
 
+def format_date(value: datetime) -> str:
+    """Formats a datetime object using `settings.DATE_FORMAT`."""
+    if isinstance(value, datetime):
+        return value.strftime(settings.DATE_FORMAT)
+    return value
+
+
+def format_short_date(value: datetime) -> str:
+    """Formats a datetime object using `settings.SHORT_DATE_FORMAT`."""
+    if isinstance(value, datetime):
+        return value.strftime(settings.SHORT_DATE_FORMAT)
+    return value
+
+
+def format_datetime(value: datetime) -> str:
+    """Formats a datetime object using `settings.DATETIME_FORMAT`."""
+    if isinstance(value, datetime):
+        return value.strftime(settings.DATETIME_FORMAT)
+    return value
+
+
+def format_short_datetime(value: datetime) -> str:
+    """Formats a datetime object using `settings.SHORT_DATETIME_FORMAT`."""
+    if isinstance(value, datetime):
+        return value.strftime(settings.SHORT_DATETIME_FORMAT)
+    return value
+
+
 def log_timing(logger_function: typing.Callable):
     """
     Decorator function to log start and end times of a decorated function.
diff --git a/tasks/jinja2/tasks/includes/task_list.jinja b/tasks/jinja2/tasks/includes/task_list.jinja
new file mode 100644
index 000000000..3e1a48c37
--- /dev/null
+++ b/tasks/jinja2/tasks/includes/task_list.jinja
@@ -0,0 +1,26 @@
+{% from "components/table/macro.njk" import govukTable %}
+{% from "tasks/macros/display_details.jinja" import display_assignees %}
+{% from "tasks/macros/display_details.jinja" import display_status %}
+
+{% set table_rows = [] %}
+
+{% for object in object_list %}
+  {% set object_link -%}
+    <a class="govuk-link" href="{{ object.get_url(action='detail') }}">{{ object.title }}</a>
+  {%- endset %}
+
+  {{ table_rows.append([
+    {"html": object_link},
+    {"text": display_assignees(object.assignees.assigned())},
+    {"text": display_status(object.progress_state.__str__())},
+  ]) or "" }}
+{% endfor %}
+
+{{ govukTable({
+  "head": [
+    {"text": "Name"},
+    {"text": "Assignee"},
+    {"text": "Status"},
+  ],
+  "rows": table_rows
+}) }}
diff --git a/tasks/jinja2/tasks/includes/task_queue.jinja b/tasks/jinja2/tasks/includes/task_queue.jinja
index 1f55b66d3..b8dcc46e9 100644
--- a/tasks/jinja2/tasks/includes/task_queue.jinja
+++ b/tasks/jinja2/tasks/includes/task_queue.jinja
@@ -28,10 +28,6 @@
     <a href="{{ obj.get_url(action='detail') }}" class="govuk-link">{{ obj.title }}</a>
   {% endset -%}
 
-  {%- set description_cell_content %}
-    <span>{{ obj.description|truncate(50) }}</span>
-  {% endset -%}
-
   {%- set order_cell_content %}
     {% if object_list|length == 1 %}
       {# No buttons needed for a single item #}
@@ -54,7 +50,6 @@
     {"html": up_down_cell_content},
     {"text": loop.index},
     {"html": title_cell_content},
-    {"html": description_cell_content},
     {"html": order_cell_content},
     {"html": remove_cell_content},
   ]) or "" }}
@@ -68,8 +63,7 @@
     "head": [
       {"text": ""},
       {"text": "Position"},
-      {"text": "Title"},
-      {"text": "Description"},
+      {"text": "Name"},
       {"text": "Order"},
       {"text": "Remove"},
     ],
diff --git a/tasks/jinja2/tasks/macros/display_details.jinja b/tasks/jinja2/tasks/macros/display_details.jinja
new file mode 100644
index 000000000..841324fbe
--- /dev/null
+++ b/tasks/jinja2/tasks/macros/display_details.jinja
@@ -0,0 +1,42 @@
+{% from "components/tag/macro.njk" import govukTag %}
+
+{% macro display_assignees(assignees) -%}
+  {% if not assignees %}
+    None
+  {% else %}
+    {% for assignee in assignees %}
+      {{ assignee.user.get_displayname() }}{% if not loop.last %}, {% endif %}
+    {% endfor %}
+  {% endif %}
+{%- endmacro %}
+
+{% macro display_workbasket(workbasket) -%}
+  {% if not workbasket %}
+    None
+  {% else %}
+    <a
+      class="govuk-link"
+      href="{{ url("workbaskets:workbasket-ui-detail", kwargs={"pk": workbasket.pk}) }}"
+    >{{ workbasket.pk }} - {{ workbasket.status }}</a>
+  {% endif %}
+{%- endmacro %}
+
+{% macro display_summary_row_stacked(key, value) -%}
+  <div class="govuk-summary-list__row__stacked">
+    <dt class="govuk-summary-list__key__stacked">{{ key }}</dt>
+    <dd class="govuk-summary-list__value__stacked">{{ value }}</dd>
+  </div>
+{%- endmacro %}
+
+{% macro display_status(status) %}
+  {% set status_to_class_map = ({
+    "In progress": "govuk-tag--blue",
+    "Done": "govuk-tag--green",
+    "To do": "govuk-tag--purple",
+  }) %}
+
+  {{ govukTag({
+    "text": status,
+    "classes": status_to_class_map[status],
+  }) }}
+{% endmacro %}
diff --git a/tasks/jinja2/tasks/workflows/detail.jinja b/tasks/jinja2/tasks/workflows/detail.jinja
index b9f395a0a..1835e9856 100644
--- a/tasks/jinja2/tasks/workflows/detail.jinja
+++ b/tasks/jinja2/tasks/workflows/detail.jinja
@@ -1,24 +1,16 @@
 {% extends "layouts/layout.jinja" %}
 {% from "components/breadcrumbs.jinja" import breadcrumbs %}
 {% from "components/button/macro.njk" import govukButton %}
+{% from "tasks/macros/display_details.jinja" import display_assignees %}
+{% from "tasks/macros/display_details.jinja" import display_workbasket %}
+{% from "tasks/macros/display_details.jinja" import display_summary_row_stacked %}
+{% from "tasks/macros/display_details.jinja" import display_status %}
 
-{% set object_name = object._meta.verbose_name %}
-
-{% set page_title = object_name|capitalize ~ ": " ~ object.title %}
-
-{% if object_name == "workflow" %}
-  {% set task_object_name = "task" %}
-  {% set task_object_create_url = url("workflow:task-workflow-task-ui-create", kwargs={"task_workflow_pk": object.pk}) %}
-{% elif object_name == "workflow template" %}
-  {% set task_object_name = "task template" %}
-  {% set task_object_create_url = url("workflow:task-template-ui-create", kwargs={"workflow_template_pk": object.pk}) %}
-{% endif %}
-
-{% set list_include = "tasks/includes/task_queue.jinja" %}
+{% set page_title = verbose_name|capitalize ~ " " ~ object.id %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(request, [
-      {"text": "Find and view "~ object_name ~ "s", "href": object.get_url("list")},
+      {"text": "Find and view " ~ verbose_name ~ "s", "href": object.get_url("list")},
       {"text": page_title}
     ],
     with_workbasket=False,
@@ -26,80 +18,73 @@
 {% endblock %}
 
 {% block content %}
-  <h1 class="govuk-heading-xl">{{ page_title }}</h1>
-
-  <h2 class="govuk-heading-m">Details</h2>
-  
-  <dl class="govuk-summary-list">
-    <div class="govuk-summary-list__row">
-      <dt class="govuk-summary-list__key">
-        ID
-      </dt>
-      <dd class="govuk-summary-list__value">
-        {{ object.pk }}
-      </dd>
-      <dd class="govuk-summary-list__actions"></dd>
-    </div>
-
-    <div class="govuk-summary-list__row">
-      <dt class="govuk-summary-list__key">
-        Title
-      </dt>
-      <dd class="govuk-summary-list__value">
-        {{ object.title }}
-      </dd>
-      <dd class="govuk-summary-list__actions">
-        <a class="govuk-link" href="{{ object.get_url("edit") }}">Change<span class="govuk-visually-hidden"> title</span></a>
-      </dd>
-    </div>
-
-    <div class="govuk-summary-list__row">
-      <dt class="govuk-summary-list__key">
-        Description
-      </dt>
-      <dd class="govuk-summary-list__value">
-        {{ object.description }}
-      </dd>
-      <dd class="govuk-summary-list__actions">
-        <a class="govuk-link" href="{{ object.get_url("edit") }}">Change<span class="govuk-visually-hidden"> description</span></a>
-      </dd>
-    </div>
-  </dl>
-
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-three-quarters">
-      <h2 class="govuk-heading-m">{{ task_object_name|capitalize }}s</h2>
+      <h1 class="govuk-heading-xl govuk-!-margin-bottom-0">
+        <span class="govuk-caption-xl">{{ object.title }}</span>
+        {{ page_title }}
+      </h1>
     </div>
 
-    <div class="govuk-grid-column-one-quarter">
+    <div class="govuk-grid-column-one-quarter govuk-!-margin-top-7">
       {{ govukButton({
-        "text": "Create a " ~ task_object_name,
-        "href": task_object_create_url,
-        "classes": "govuk-button align-right"
+        "text": "Edit " ~ verbose_name,
+        "href": object.get_url("edit"),
+        "classes": "align-right",
       }) }}
     </div>
   </div>
 
+  <hr class="govuk-section-break govuk-section-break--visible">
+
   <div class="govuk-grid-row">
-    <div class="govuk-grid-column-full">
+    <div class="govuk-grid-column-three-quarters">
+      <h2 class="govuk-heading-m">Description</h2>
+      <p class="govuk-body">{{ object.description }}</p>
+
+      <h2 class="govuk-heading-m">Steps</h2>
       {% if object_list %}
         {% include list_include %}
       {% else %}
-        <p class="govuk-body">There are no {{ task_object_name }}s for this {{ object_name }}.</p>
+        <p class="govuk-body">There are no steps for this {{ verbose_name }}.</p>
       {% endif %}
     </div>
-  </div>
 
-  <div class="govuk-button-group govuk-!-margin-top-6">
-    {{ govukButton({
-      "text": "Delete " ~ object_name,
-      "href": object.get_url("delete"),
-      "classes": "govuk-button--warning"
-    }) }}
-    {{ govukButton({
-      "text": "Find and view " ~ object_name ~ "s",
-      "href": object.get_url("list"),
-      "classes": "govuk-button--secondary"
-    }) }}
+    <div class="govuk-grid-column-one-quarter">
+      <h2 class="govuk-heading-m">Details</h2>
+      <dl class="govuk-summary-list govuk-summary-list--no-border">
+        {% if verbose_name == "ticket" %}
+          {{ display_summary_row_stacked("Workbasket", display_workbasket(object.summary_task.workbasket)) }}
+          {{ display_summary_row_stacked("Status", display_status(object.summary_task.progress_state.__str__())) }}
+          {{ display_summary_row_stacked("Assignee", display_assignees(object.summary_task.assignees.assigned())) }}
+          {{ display_summary_row_stacked("Work type", object.creator_template.title) }}
+          {{ display_summary_row_stacked("Created date", object.summary_task.created_at|format_date) }}
+          {{ display_summary_row_stacked("Entry into force date", "None") }}
+          {{ display_summary_row_stacked("Policy contact", "None") }}
+        {% elif verbose_name == "ticket template" %}
+          {{ display_summary_row_stacked("Created by", object.creator.get_displayname()) }}
+          {{ display_summary_row_stacked("Created date", object.created_at|format_date) }}
+        {% endif %}
+      </dl>
+    </div>
   </div>
+
+  {% if verbose_name == "ticket template" %}
+    <div class="govuk-grid-row">
+      <div class="govuk-grid-column-two-thirds">
+        <div class="govuk-button-group">
+          {{ govukButton({
+            "text": "Add a step",
+            "href": url("workflow:task-template-ui-create", kwargs={"workflow_template_pk": object.pk}),
+          }) }}
+          {{ govukButton({
+            "text": "Delete " ~ verbose_name,
+            "href": object.get_url("delete"),
+            "classes": "govuk-button--warning"
+          }) }}
+        </div>
+      </div>
+    </div>
+  {% endif %}
+
 {% endblock %}
diff --git a/tasks/tests/factories.py b/tasks/tests/factories.py
index 95d66f29a..9d97e84d0 100644
--- a/tasks/tests/factories.py
+++ b/tasks/tests/factories.py
@@ -4,6 +4,7 @@
 
 from common.tests.factories import CategoryFactory
 from common.tests.factories import TaskFactory
+from common.tests.factories import UserFactory
 from tasks.models import TaskItem
 from tasks.models import TaskItemTemplate
 from tasks.models import TaskTemplate
@@ -16,6 +17,7 @@ class TaskWorkflowTemplateFactory(DjangoModelFactory):
 
     title = factory.Faker("sentence")
     description = factory.Faker("sentence")
+    creator = factory.SubFactory(UserFactory)
 
     class Meta:
         model = TaskWorkflowTemplate
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 8a5a4af6a..e0e4d6570 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -7,6 +7,7 @@
 from common.tests.factories import ProgressStateFactory
 from common.tests.factories import SubTaskFactory
 from common.tests.factories import TaskFactory
+from common.util import format_date
 from tasks.forms import TaskWorkflowCreateForm
 from tasks.models import ProgressState
 from tasks.models import Task
@@ -219,7 +220,6 @@ def test_delete_subtask_missing_user_permissions(
 
 def test_workflow_template_detail_view_displays_task_templates(valid_user_client):
     task_item_template = TaskItemTemplateFactory.create()
-    task_template = task_item_template.task_template
     workflow_template = task_item_template.workflow_template
 
     url = reverse(
@@ -230,8 +230,14 @@ def test_workflow_template_detail_view_displays_task_templates(valid_user_client
     assert response.status_code == 200
 
     page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
-    assert page.find("h1", text=f"Workflow template: {workflow_template.title}")
-    assert page.find("a", text=task_template.title)
+
+    assert f"Ticket template {workflow_template.id}" in page.find("h1").text
+    assert page.find("p", text=workflow_template.description)
+    assert page.find("dd", text=workflow_template.creator.get_displayname())
+    assert page.find("dd", text=format_date(workflow_template.created_at))
+
+    template_rows = page.select(".govuk-table__body > .govuk-table__row")
+    assert len(template_rows) == workflow_template.get_task_templates().count()
 
 
 @pytest.mark.parametrize(
@@ -584,7 +590,7 @@ def test_workflow_detail_view_displays_tasks(
     task_workflow_single_task_item,
 ):
     workflow = task_workflow_single_task_item
-    task = task_workflow_single_task_item.get_tasks().get()
+    workbasket = workflow.summary_task.workbasket
 
     url = reverse(
         "workflow:task-workflow-ui-detail",
@@ -594,55 +600,14 @@ def test_workflow_detail_view_displays_tasks(
     assert response.status_code == 200
 
     page = BeautifulSoup(response.content.decode(response.charset), "html.parser")
-    assert page.find("h1", text=f"Workflow: {workflow.title}")
-    assert page.find("a", text=task.title)
-
-
-@pytest.mark.parametrize(
-    ("action", "item_position", "expected_item_order"),
-    [
-        ("promote", 1, [1, 2, 3]),
-        ("promote", 2, [2, 1, 3]),
-        ("demote", 2, [1, 3, 2]),
-        ("demote", 3, [1, 2, 3]),
-        ("promote_to_first", 3, [3, 1, 2]),
-        ("demote_to_last", 1, [2, 3, 1]),
-    ],
-)
-def test_workflow_detail_view_reorder_items(
-    action,
-    item_position,
-    expected_item_order,
-    valid_user_client,
-    task_workflow_three_task_items,
-):
-    """Tests that `TaskWorkflowDetailView` handles POST requests to promote or
-    demote tasks."""
 
-    def convert_to_index(position: int) -> int:
-        """Converts a 1-based item position to a 0-based index for items array
-        access."""
-        return position - 1
-
-    items = list(task_workflow_three_task_items.get_tasks())
-    item_to_move = items[convert_to_index(item_position)]
-
-    url = reverse(
-        "workflow:task-workflow-ui-detail",
-        kwargs={"pk": task_workflow_three_task_items.pk},
-    )
-    form_data = {
-        action: item_to_move.id,
-    }
-
-    response = valid_user_client.post(url, form_data)
-    assert response.status_code == 302
+    assert f"Ticket {workflow.id}" in page.find("h1").text
+    assert page.find("p", text=workflow.description)
+    assert page.find("a", text=f"{workbasket.pk} - {workbasket.status}")
+    assert page.find("dd", text=format_date(workflow.summary_task.created_at))
 
-    reordered_items = task_workflow_three_task_items.get_tasks()
-    for i, reordered_item in enumerate(reordered_items):
-        expected_position = convert_to_index(expected_item_order[i])
-        expected_item = items[expected_position]
-        assert reordered_item.id == expected_item.id
+    step_rows = page.select(".govuk-table__body > .govuk-table__row")
+    assert len(step_rows) == workflow.get_tasks().count()
 
 
 @pytest.mark.parametrize(
diff --git a/tasks/views.py b/tasks/views.py
index f7027a915..77a16440d 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -521,15 +521,11 @@ def demote_to_last(self, lookup_id: int) -> None:
 
 class TaskWorkflowDetailView(
     PermissionRequiredMixin,
-    QueuedItemManagementMixin,
     DetailView,
 ):
     template_name = "tasks/workflows/detail.jinja"
     permission_required = "tasks.view_taskworkflow"
     model = TaskWorkflow
-    queued_item_model = TaskItem
-    item_lookup_field = "task_id"
-    queue_field = queued_item_model.queue_field
 
     @property
     def view_url(self) -> str:
@@ -540,21 +536,15 @@ def view_url(self) -> str:
 
     def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)
-        context_data["object_list"] = self.queue.get_tasks()
+        context_data.update(
+            {
+                "object_list": self.get_object().get_tasks(),
+                "verbose_name": "ticket",
+                "list_include": "tasks/includes/task_list.jinja",
+            },
+        )
         return context_data
 
-    def post(self, request, *args, **kwargs):
-        if "promote" in request.POST:
-            self.promote(request.POST.get("promote"))
-        elif "demote" in request.POST:
-            self.demote(request.POST.get("demote"))
-        elif "promote_to_first" in request.POST:
-            self.promote_to_first(request.POST.get("promote_to_first"))
-        elif "demote_to_last" in request.POST:
-            self.demote_to_last(request.POST.get("demote_to_last"))
-
-        return HttpResponseRedirect(self.view_url)
-
 
 class TaskWorkflowCreateView(PermissionRequiredMixin, FormView):
     permission_required = "tasks.add_taskworkflow"
@@ -729,7 +719,13 @@ def view_url(self) -> str:
 
     def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)
-        context_data["object_list"] = self.queue.get_task_templates()
+        context_data.update(
+            {
+                "object_list": self.queue.get_task_templates(),
+                "verbose_name": "ticket template",
+                "list_include": "tasks/includes/task_queue.jinja",
+            },
+        )
         return context_data
 
     def post(self, request, *args, **kwargs):

From 7ca53f0caf1d22e90386f1fade25b6c88b9255de Mon Sep 17 00:00:00 2001
From: Marya Shariq <marya.shariq@digital.trade.gov.uk>
Date: Fri, 28 Feb 2025 16:43:17 +0000
Subject: [PATCH 55/57] Tp2000 1726  delete ticket view (#1420)

* wip

* added list url

* removed redundant comments

* modified breadcrumbs

* modified unit tests
---
 tasks/jinja2/tasks/workflows/delete.jinja | 9 ++++-----
 tasks/tests/test_views.py                 | 4 ++--
 tasks/views.py                            | 9 +++++++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/tasks/jinja2/tasks/workflows/delete.jinja b/tasks/jinja2/tasks/workflows/delete.jinja
index aff449a61..fb49ee889 100644
--- a/tasks/jinja2/tasks/workflows/delete.jinja
+++ b/tasks/jinja2/tasks/workflows/delete.jinja
@@ -4,16 +4,15 @@
 {% from "components/warning-text/macro.njk" import govukWarningText %}
 {% from "components/button/macro.njk" import govukButton %}
 
-{% set object_name = object._meta.verbose_name %}
-{% set page_title = "Delete " ~ object_name ~ ": " ~ object.title %}
+{% set page_title = "Delete " ~ verbose_name ~ ": " ~ object.title %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(
     request,
     [
-      {"text": "Find and view "~ object_name ~ "s", "href": object.get_url("list")},
+      {"text": "Find and view "~ verbose_name ~ "s", "href": object.get_url("list")},
       {
-        "text": object_name|capitalize ~ ": " ~ object.title,
+        "text": verbose_name|capitalize ~ ": " ~ object.title,
         "href": object.get_url("detail"),
       },
       {"text": page_title}
@@ -24,7 +23,7 @@
 
 {% block form %}
   {{ govukWarningText({
-    "text": "Are you sure you want to delete this " ~ object_name ~ "?",
+    "text": "Are you sure you want to delete this " ~ verbose_name ~ "?",
   }) }}
 
   {% call django_form(action=object.get_url("delete")) %}
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index e0e4d6570..af76bbbe4 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -748,7 +748,7 @@ def test_workflow_delete_view(
     assert confirmation_response.status_code == 200
 
     soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
-    assert f"Workflow ID: {workflow_pk}" in soup.select(".govuk-panel__title")[0].text
+    assert f"Ticket ID: {workflow_pk}" in soup.select(".govuk-panel__title")[0].text
 
 
 def test_workflow_list_view(valid_user_client, task_workflow):
@@ -856,5 +856,5 @@ def test_workflow_delete_view_deletes_related_tasks(
 
     soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
     assert (
-        f"Workflow ID: {task_workflow_pk}" in soup.select(".govuk-panel__title")[0].text
+        f"Ticket ID: {task_workflow_pk}" in soup.select(".govuk-panel__title")[0].text
     )
diff --git a/tasks/views.py b/tasks/views.py
index 77a16440d..8a72ab26b 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -620,6 +620,11 @@ def get_form_kwargs(self):
         kwargs["instance"] = self.object
         return kwargs
 
+    def get_context_data(self, **kwargs):
+        context_data = super().get_context_data(**kwargs)
+        context_data["verbose_name"] = "ticket"
+        return context_data
+
     @transaction.atomic
     def form_valid(self, form):
         summary_task = self.object.summary_task
@@ -644,10 +649,10 @@ def get_context_data(self, **kwargs):
         context_data = super().get_context_data(**kwargs)
         context_data.update(
             {
-                "verbose_name": "workflow",
+                "verbose_name": "ticket",
                 "deleted_pk": self.kwargs["pk"],
                 "create_url": reverse("workflow:task-workflow-ui-create"),
-                "list_url": "#NOT-IMPLEMENTED",
+                "list_url": reverse("workflow:task-workflow-ui-list"),
             },
         )
         return context_data

From 7ebc168eb31a9039c3c567840db346b5e22d433f Mon Sep 17 00:00:00 2001
From: Lauren Mullally <46787754+LaurenMullally@users.noreply.github.com>
Date: Mon, 3 Mar 2025 14:35:50 +0000
Subject: [PATCH 56/57] TP200-1722 Create New Ticket (#1419)

* Amend template, form and include additional fields

* Amend model to take in eif date and policy contact

* amend form's mandatory fields and error messages

* Amend mandatory fields

* Fix form tests

* Amend view tests

* Amend workflow model tests

* Squish the migrations

* Amend ticket name error message

* Amend policy contact character limit and squash migrations

* Re route create form's success url and amend tests
---
 tasks/forms.py                                | 51 ++++++++-------
 tasks/jinja2/tasks/workflows/create.jinja     |  2 +-
 ...ow_eif_date_taskworkflow_policy_contact.py | 24 +++++++
 tasks/models/workflow.py                      | 14 +++++
 tasks/tests/test_forms.py                     | 62 ++++++-------------
 tasks/tests/test_views.py                     | 58 +++++------------
 tasks/tests/test_workflow_models.py           | 15 ++++-
 tasks/views.py                                | 24 +++----
 8 files changed, 122 insertions(+), 128 deletions(-)
 create mode 100644 tasks/migrations/0021_taskworkflow_eif_date_taskworkflow_policy_contact.py

diff --git a/tasks/forms.py b/tasks/forms.py
index d9e94bb97..e026872cd 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -7,7 +7,6 @@
 from crispy_forms_gds.layout import Submit
 from django.contrib.auth import get_user_model
 from django.db import transaction
-from django.db.models import TextChoices
 from django.forms import CharField
 from django.forms import CheckboxSelectMultiple
 from django.forms import Form
@@ -19,7 +18,7 @@
 
 from common.fields import AutoCompleteField
 from common.forms import BindNestedFormMixin
-from common.forms import RadioNested
+from common.forms import DateInputFieldFixed
 from common.forms import delete_form_for
 from common.validators import SymbolValidator
 from tasks.models import Task
@@ -245,36 +244,42 @@ class TaskWorkflowTemplateForm(Form):
 
 
 class TaskWorkflowCreateForm(BindNestedFormMixin, Form):
-    class CreateType(TextChoices):
-        WITH_TEMPLATE = "WITH_TEMPLATE", "Yes"
-        WITHOUT_TEMPLATE = "WITHOUT_TEMPLATE", "No"
 
-    title = CharField(
+    ticket_name = CharField(
+        required=True,
         max_length=255,
         validators=[SymbolValidator],
         error_messages={
-            "required": "Enter a title for the workflow",
+            "required": "Enter a title for the ticket",
+        },
+    )
+
+    work_type = ModelChoiceField(
+        required=True,
+        help_text="Choose the most appropriate category, this will generate a pre-defined set of steps to complete the work",
+        queryset=TaskWorkflowTemplate.objects.all(),
+        error_messages={
+            "required": "Choose a work type",
         },
     )
 
     description = CharField(
+        required=False,
         validators=[SymbolValidator],
         widget=Textarea(),
-        error_messages={
-            "required": "Enter a description for the workflow",
-        },
+        help_text="This field is optional",
     )
 
-    create_type = RadioNested(
-        label="Do you want to use a workflow template?",
-        choices=CreateType.choices,
-        nested_forms={
-            CreateType.WITH_TEMPLATE.value: [TaskWorkflowTemplateForm],
-            CreateType.WITHOUT_TEMPLATE.value: [],
-        },
-        error_messages={
-            "required": "Select if you want to use a workflow template",
-        },
+    entry_into_force_date = DateInputFieldFixed(
+        required=False,
+        help_text="This field is optional",
+    )
+
+    policy_contact = CharField(
+        required=False,
+        max_length=255,
+        validators=[SymbolValidator],
+        help_text="This field is optional",
     )
 
     def __init__(self, *args, **kwargs):
@@ -287,10 +292,12 @@ def __init__(self, *args, **kwargs):
         self.helper.legend_size = Size.SMALL
         self.helper.layout = Layout(
             Fieldset(
-                "title",
+                "ticket_name",
+                "work_type",
                 "description",
+                "entry_into_force_date",
+                "policy_contact",
             ),
-            "create_type",
             Submit(
                 "submit",
                 "Create",
diff --git a/tasks/jinja2/tasks/workflows/create.jinja b/tasks/jinja2/tasks/workflows/create.jinja
index a2affcceb..f2f0e13d8 100644
--- a/tasks/jinja2/tasks/workflows/create.jinja
+++ b/tasks/jinja2/tasks/workflows/create.jinja
@@ -2,7 +2,7 @@
 
 {% from "components/breadcrumbs.jinja" import breadcrumbs %}
 
-{% set page_title = "Create a " ~ verbose_name  %}
+{% set page_title = "Create a new " ~ verbose_name  %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(
diff --git a/tasks/migrations/0021_taskworkflow_eif_date_taskworkflow_policy_contact.py b/tasks/migrations/0021_taskworkflow_eif_date_taskworkflow_policy_contact.py
new file mode 100644
index 000000000..ed635ddd8
--- /dev/null
+++ b/tasks/migrations/0021_taskworkflow_eif_date_taskworkflow_policy_contact.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.2.18 on 2025-03-03 10:36
+
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0020_alter_taskassignee_assignment_type"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="taskworkflow",
+            name="eif_date",
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="taskworkflow",
+            name="policy_contact",
+            field=models.CharField(blank=True, max_length=40, null=True),
+        ),
+    ]
diff --git a/tasks/models/workflow.py b/tasks/models/workflow.py
index 0df851a6d..f089d5106 100644
--- a/tasks/models/workflow.py
+++ b/tasks/models/workflow.py
@@ -1,3 +1,5 @@
+from datetime import date
+
 from django.conf import settings
 from django.db import models
 from django.db.transaction import atomic
@@ -26,10 +28,16 @@ class TaskWorkflow(Queue):
     workflow."""
     creator_template = models.ForeignKey(
         "tasks.TaskWorkflowTemplate",
+        blank=False,
         null=True,
         on_delete=models.SET_NULL,
     )
     """The template from which this workflow was created, if any."""
+    eif_date = models.DateField(
+        blank=True,
+        null=True,
+    )
+    policy_contact = models.CharField(max_length=40, blank=True, null=True)
 
     class Meta(Queue.Meta):
         abstract = False
@@ -163,6 +171,9 @@ def create_task_workflow(
         title: str,
         description: str,
         creator: User,
+        # Take in additional data
+        eif_date: date,
+        policy_contact: str,
     ) -> "TaskWorkflow":
         """Create a workflow and it subtasks, using values from this template
         workflow and its task templates."""
@@ -175,6 +186,9 @@ def create_task_workflow(
         task_workflow = TaskWorkflow.objects.create(
             summary_task=summary_task,
             creator_template=self,
+            # Pass new data to the workflow instance that will be made
+            eif_date=eif_date,
+            policy_contact=policy_contact,
         )
 
         task_item_templates = TaskItemTemplate.objects.select_related(
diff --git a/tasks/tests/test_forms.py b/tasks/tests/test_forms.py
index b4e7972f8..db30ff822 100644
--- a/tasks/tests/test_forms.py
+++ b/tasks/tests/test_forms.py
@@ -26,71 +26,45 @@ def test_create_subtask_assigns_correct_parent_task(valid_user):
     assert new_subtask.parent_task.pk == parent_task_instance.pk
 
 
-@pytest.mark.parametrize(
-    "form_data",
-    [
-        {
-            "title": "Test workflow 1",
-            "description": "Workflow created without using template",
-            "create_type": forms.TaskWorkflowCreateForm.CreateType.WITHOUT_TEMPLATE,
-        },
-        {
-            "title": "Test workflow 2",
-            "description": "Workflow created using template",
-            "create_type": forms.TaskWorkflowCreateForm.CreateType.WITH_TEMPLATE,
-            "workflow_template": "",
-        },
-    ],
-    ids=(
-        "without_template",
-        "with_template",
-    ),
-)
-def test_workflow_create_form_valid_data(form_data, task_workflow_template):
+def test_workflow_create_form_valid_data(task_workflow_template):
     """Tests that `TaskWorkflowCreateForm` returns expected cleaned_data given
     valid form data."""
 
-    if "workflow_template" in form_data:
-        form_data["workflow_template"] = task_workflow_template
+    form_data = {
+        "ticket_name": "Test ticket 1",
+        "description": "Ticket created with all fields",
+        "work_type": task_workflow_template,
+        "entry_into_force_date_0": 12,
+        "entry_into_force_date_1": 12,
+        "entry_into_force_date_2": 2026,
+        "policy_contact": "Fake Contact Name",
+    }
 
     form = forms.TaskWorkflowCreateForm(form_data)
     assert form.is_valid()
-    assert form.cleaned_data == form_data
 
 
 @pytest.mark.parametrize(
     ("form_data", "field", "error_message"),
     [
-        ({"title": ""}, "title", "Enter a title for the workflow"),
-        ({"description": ""}, "description", "Enter a description for the workflow"),
-        (
-            {"create_type": ""},
-            "create_type",
-            "Select if you want to use a workflow template",
-        ),
+        ({"ticket_name": ""}, "ticket_name", "Enter a title for the ticket"),
         (
-            {
-                "create_type": forms.TaskWorkflowCreateForm.CreateType.WITH_TEMPLATE,
-                "workflow_template": "",
-            },
-            "create_type",
-            "Select a workflow template",
+            {"work_type": ""},
+            "work_type",
+            "Choose a work type",
         ),
         (
             {
-                "create_type": forms.TaskWorkflowCreateForm.CreateType.WITH_TEMPLATE,
                 "workflow_template": "invalidchoice",
             },
-            "create_type",
-            "Select a valid choice. That choice is not one of the available choices.",
+            "work_type",
+            "Choose a work type",
         ),
     ],
     ids=(
         "missing_title",
-        "missing_description",
-        "missing_create_type",
-        "missing_workflow_template",
-        "invalid_workflow_template",
+        "missing_work_type",
+        "invalid_work_type",
     ),
 )
 def test_workflow_create_form_invalid_data(form_data, field, error_message):
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index af76bbbe4..27123ca24 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -8,7 +8,6 @@
 from common.tests.factories import SubTaskFactory
 from common.tests.factories import TaskFactory
 from common.util import format_date
-from tasks.forms import TaskWorkflowCreateForm
 from tasks.models import ProgressState
 from tasks.models import Task
 from tasks.models import TaskItem
@@ -610,66 +609,39 @@ def test_workflow_detail_view_displays_tasks(
     assert len(step_rows) == workflow.get_tasks().count()
 
 
-@pytest.mark.parametrize(
-    "form_data",
-    [
-        {
-            "title": "Test workflow 1",
-            "description": "Workflow created without using template",
-            "create_type": TaskWorkflowCreateForm.CreateType.WITHOUT_TEMPLATE,
-        },
-        {
-            "title": "Test workflow 2",
-            "description": "Workflow created using template",
-            "create_type": TaskWorkflowCreateForm.CreateType.WITH_TEMPLATE,
-        },
-    ],
-    ids=(
-        "without_template",
-        "with_template",
-    ),
-)
 def test_workflow_create_view(
-    form_data,
     valid_user,
     valid_user_client,
     task_workflow_template_single_task_template_item,
 ):
-    """Tests that a new workflow can be created (with or without workflow
-    template) and that the corresponding confirmation view returns a HTTP 200
-    response."""
-
-    with_template = (
-        form_data["create_type"] == TaskWorkflowCreateForm.CreateType.WITH_TEMPLATE
-    )
-
-    if with_template:
-        form_data["workflow_template"] = (
-            task_workflow_template_single_task_template_item.pk
-        )
+    """Tests that a new workflow can be created and that the corresponding
+    confirmation view returns a HTTP 200 response."""
 
     assert not TaskWorkflow.objects.exists()
 
+    form_data = {
+        "ticket_name": "Test workflow 1",
+        "description": "Workflow created",
+        "work_type": task_workflow_template_single_task_template_item.pk,
+    }
+
     create_url = reverse("workflow:task-workflow-ui-create")
     create_response = valid_user_client.post(create_url, form_data)
     assert create_response.status_code == 302
 
     created_workflow = TaskWorkflow.objects.get(
-        summary_task__title=form_data["title"],
+        summary_task__title=form_data["ticket_name"],
         summary_task__description=form_data["description"],
         summary_task__creator=valid_user,
     )
 
-    if with_template:
-        assert (
-            created_workflow.get_tasks().count()
-            == task_workflow_template_single_task_template_item.get_task_templates().count()
-        )
-    else:
-        assert created_workflow.get_tasks().count() == 0
+    assert (
+        created_workflow.get_tasks().count()
+        == task_workflow_template_single_task_template_item.get_task_templates().count()
+    )
 
     confirmation_url = reverse(
-        "workflow:task-workflow-ui-confirm-create",
+        "workflow:task-workflow-ui-detail",
         kwargs={"pk": created_workflow.pk},
     )
     assert create_response.url == confirmation_url
@@ -678,7 +650,7 @@ def test_workflow_create_view(
     assert confirmation_response.status_code == 200
 
     soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
-    assert str(created_workflow) in soup.select("h1.govuk-panel__title")[0].text
+    assert str(created_workflow) in soup.select("h1")[0].text
 
 
 def test_workflow_update_view(
diff --git a/tasks/tests/test_workflow_models.py b/tasks/tests/test_workflow_models.py
index 26d81cb93..dab1dfec9 100644
--- a/tasks/tests/test_workflow_models.py
+++ b/tasks/tests/test_workflow_models.py
@@ -1,3 +1,5 @@
+import datetime
+
 import pytest
 from django.core.exceptions import ObjectDoesNotExist
 
@@ -15,14 +17,19 @@ def test_create_task_workflow_from_task_workflow_template(
     """Test creation of TaskWorkflow instances from TaskWorkflowTemplates using
     its `create_task_workflow()` method."""
 
-    title = "Workflow title"
+    ticket_name = "Workflow title"
     description = "Workflow description"
     creator = valid_user
+    eif_date = datetime.date(2026, 12, 12)
+    policy_contact = "Policy Contact"
+
     task_workflow = (
         task_workflow_template_three_task_template_items.create_task_workflow(
-            title=title,
+            title=ticket_name,
             description=description,
             creator=creator,
+            eif_date=eif_date,
+            policy_contact=policy_contact,
         )
     )
 
@@ -31,10 +38,12 @@ def test_create_task_workflow_from_task_workflow_template(
         task_workflow.creator_template
         == task_workflow_template_three_task_template_items
     )
-    assert task_workflow.summary_task.title == title
+    assert task_workflow.summary_task.title == ticket_name
     assert task_workflow.summary_task.description == description
     assert task_workflow.summary_task.creator == creator
     assert task_workflow.get_items().count() == 3
+    assert task_workflow.eif_date == eif_date
+    assert task_workflow.policy_contact == policy_contact
 
     # Validate that item positions are equivalent.
     zipped_items = zip(
diff --git a/tasks/views.py b/tasks/views.py
index 8a72ab26b..f47ff1234 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -547,39 +547,33 @@ def get_context_data(self, **kwargs):
 
 
 class TaskWorkflowCreateView(PermissionRequiredMixin, FormView):
+    # Feb 2025 - Workflows will now be called Tickets in the UI only.
     permission_required = "tasks.add_taskworkflow"
     template_name = "tasks/workflows/create.jinja"
     form_class = TaskWorkflowCreateForm
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["verbose_name"] = "workflow"
+        context["verbose_name"] = "ticket"
         context["list_url"] = "#NOT-IMPLEMENTED"
         return context
 
     def form_valid(self, form):
-        summary_data = {
-            "title": form.cleaned_data["title"],
+        data = {
+            "title": form.cleaned_data["ticket_name"],
             "description": form.cleaned_data["description"],
             "creator": self.request.user,
+            "eif_date": form.cleaned_data["entry_into_force_date"],
+            "policy_contact": form.cleaned_data["policy_contact"],
         }
-        create_type = form.cleaned_data["create_type"]
-
-        if create_type == TaskWorkflowCreateForm.CreateType.WITH_TEMPLATE:
-            template = form.cleaned_data["workflow_template"]
-            self.object = template.create_task_workflow(**summary_data)
-        elif create_type == TaskWorkflowCreateForm.CreateType.WITHOUT_TEMPLATE:
-            with transaction.atomic():
-                summary_task = Task.objects.create(**summary_data)
-                self.object = TaskWorkflow.objects.create(
-                    summary_task=summary_task,
-                )
+        template = form.cleaned_data["work_type"]
+        self.object = template.create_task_workflow(**data)
 
         return super().form_valid(form)
 
     def get_success_url(self):
         return reverse(
-            "workflow:task-workflow-ui-confirm-create",
+            "workflow:task-workflow-ui-detail",
             kwargs={"pk": self.object.pk},
         )
 

From 57bbf8e6b00bebbd8bfebe1af3524fe7b297b3f0 Mon Sep 17 00:00:00 2001
From: Dale Cannon <118175145+dalecannon@users.noreply.github.com>
Date: Wed, 5 Mar 2025 13:32:01 +0000
Subject: [PATCH 57/57] TP2000-1724  Redesign ticket edit view (#1421)

* Rename workflow as ticket

* Add EIF date and policy contact fields to ticket edit form

* Add back link to ticket edit form

* Update confirmation view

* Display EIF date and policy contact values on ticket detail view

* Update form and view tests

* Remove step assignees column on ticket detail view

* Add margin to stacked summary list value

* Hide step column headers on ticket detail view
---
 common/static/common/scss/_components.scss    |  6 ++--
 common/util.py                                | 12 +++----
 tasks/forms.py                                | 35 ++++++++++++++-----
 tasks/jinja2/tasks/includes/task_list.jinja   |  7 ++--
 .../tasks/workflows/confirm_update.jinja      | 25 +++++--------
 tasks/jinja2/tasks/workflows/detail.jinja     |  4 +--
 tasks/jinja2/tasks/workflows/edit.jinja       |  8 ++---
 tasks/tests/test_forms.py                     | 12 +++++--
 tasks/tests/test_views.py                     | 19 ++++++----
 tasks/views.py                                | 20 +++++++++++
 10 files changed, 95 insertions(+), 53 deletions(-)

diff --git a/common/static/common/scss/_components.scss b/common/static/common/scss/_components.scss
index a3024cd52..db21c71dc 100644
--- a/common/static/common/scss/_components.scss
+++ b/common/static/common/scss/_components.scss
@@ -175,15 +175,15 @@
   @extend .govuk-summary-list__key;
   display: block;
   width: 100%;
-  padding: 0;
-  margin: 0;
+  padding: 0 !important;
+  margin: 0 !important;
 }
 
 .govuk-summary-list__value__stacked {
   @extend .govuk-summary-list__value;
   display: block;
   padding: 0;
-  margin: 0;
+  margin-bottom: govuk-spacing(2) !important;
 }
 
 .govuk-summary-list__value__stacked:last-child {
diff --git a/common/util.py b/common/util.py
index 69d431bdf..d011a19f3 100644
--- a/common/util.py
+++ b/common/util.py
@@ -690,16 +690,16 @@ def format_date_string(date_string: str, short_format=False) -> str:
         return ""
 
 
-def format_date(value: datetime) -> str:
-    """Formats a datetime object using `settings.DATE_FORMAT`."""
-    if isinstance(value, datetime):
+def format_date(value: datetime | date) -> str:
+    """Formats a datetime or date object using `settings.DATE_FORMAT`."""
+    if isinstance(value, (datetime, date)):
         return value.strftime(settings.DATE_FORMAT)
     return value
 
 
-def format_short_date(value: datetime) -> str:
-    """Formats a datetime object using `settings.SHORT_DATE_FORMAT`."""
-    if isinstance(value, datetime):
+def format_short_date(value: datetime | date) -> str:
+    """Formats a datetime or date object using `settings.SHORT_DATE_FORMAT`."""
+    if isinstance(value, (datetime, date)):
         return value.strftime(settings.SHORT_DATE_FORMAT)
     return value
 
diff --git a/tasks/forms.py b/tasks/forms.py
index e026872cd..9b259bd42 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -1,6 +1,7 @@
 from datetime import datetime
 
 from crispy_forms_gds.helper import FormHelper
+from crispy_forms_gds.layout import HTML
 from crispy_forms_gds.layout import Fieldset
 from crispy_forms_gds.layout import Layout
 from crispy_forms_gds.layout import Size
@@ -312,23 +313,31 @@ def __init__(self, *args, **kwargs):
 
 class TaskWorkflowUpdateForm(ModelForm):
     title = CharField(
+        label="Ticket name",
         max_length=255,
         validators=[SymbolValidator],
         error_messages={
-            "required": "Enter a title",
+            "required": "Enter a ticket name",
         },
     )
     description = CharField(
         validators=[SymbolValidator],
         widget=Textarea(),
-        error_messages={
-            "required": "Enter a description",
-        },
+        required=False,
+    )
+    eif_date = DateInputFieldFixed(
+        label="Entry into force date",
+        required=False,
+    )
+    policy_contact = CharField(
+        required=False,
+        max_length=40,
+        validators=[SymbolValidator],
     )
 
     class Meta:
         model = TaskWorkflow
-        fields = []
+        fields = ["eif_date", "policy_contact"]
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -346,22 +355,32 @@ def init_layout(self):
         self.helper.layout = Layout(
             "title",
             "description",
+            "eif_date",
+            "policy_contact",
             Submit(
                 "submit",
-                "Update",
+                "Save",
                 data_module="govuk-button",
                 data_prevent_double_click="true",
+                css_class="govuk-!-margin-right-2",
+            ),
+            HTML(
+                f'<a class="govuk-link govuk-!-display-inline-block govuk-!-margin-top-2" href="{self.instance.get_url("detail")}">Back</a>',
             ),
         )
 
     @transaction.atomic
     def save(self, commit=True):
-        summary_task = self.instance.summary_task
+        instance = super().save(commit)
+
+        summary_task = instance.summary_task
         summary_task.title = self.cleaned_data["title"]
         summary_task.description = self.cleaned_data["description"]
+
         if commit:
             summary_task.save()
-        return self.instance
+
+        return instance
 
 
 class TaskWorkflowTemplateBaseForm(ModelForm):
diff --git a/tasks/jinja2/tasks/includes/task_list.jinja b/tasks/jinja2/tasks/includes/task_list.jinja
index 3e1a48c37..6aaff7228 100644
--- a/tasks/jinja2/tasks/includes/task_list.jinja
+++ b/tasks/jinja2/tasks/includes/task_list.jinja
@@ -1,5 +1,4 @@
 {% from "components/table/macro.njk" import govukTable %}
-{% from "tasks/macros/display_details.jinja" import display_assignees %}
 {% from "tasks/macros/display_details.jinja" import display_status %}
 
 {% set table_rows = [] %}
@@ -11,16 +10,14 @@
 
   {{ table_rows.append([
     {"html": object_link},
-    {"text": display_assignees(object.assignees.assigned())},
     {"text": display_status(object.progress_state.__str__())},
   ]) or "" }}
 {% endfor %}
 
 {{ govukTable({
   "head": [
-    {"text": "Name"},
-    {"text": "Assignee"},
-    {"text": "Status"},
+    {"text": "Name", "classes": "govuk-visually-hidden"},
+    {"text": "Status", "classes": "govuk-visually-hidden"},
   ],
   "rows": table_rows
 }) }}
diff --git a/tasks/jinja2/tasks/workflows/confirm_update.jinja b/tasks/jinja2/tasks/workflows/confirm_update.jinja
index 9c4efc761..1aeaed0e9 100644
--- a/tasks/jinja2/tasks/workflows/confirm_update.jinja
+++ b/tasks/jinja2/tasks/workflows/confirm_update.jinja
@@ -4,15 +4,14 @@
 {% from "components/panel/macro.njk" import govukPanel %}
 {% from "components/button/macro.njk" import govukButton %}
 
-{% set object_name = object._meta.verbose_name %}
-{% set page_title = object_name|capitalize ~ " updated" %}
+{% set page_title = verbose_name|capitalize ~ " updated" %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(
     request,
     [
-      {"text": "Find and view " ~ object_name ~ "s", "href": object.get_url("list")},
-      {"text": object_name|capitalize ~ ": " ~ object.title, "href": object.get_url("detail")},
+      {"text": "Find and view " ~ verbose_name ~ "s", "href": object.get_url("list")},
+      {"text": verbose_name|capitalize ~ " " ~ object.id, "href": object.get_url("detail")},
       {"text": page_title}
     ],
     with_workbasket=False,
@@ -21,27 +20,21 @@
 
 {% block panel %}
   {{ govukPanel({
-    "titleText": object_name|capitalize ~ ": " ~ object,
-    "text": "You have updated the " ~ object_name,
+    "titleText": verbose_name|capitalize ~ " " ~ object.id,
+    "text": "You have updated the " ~ verbose_name,
     "classes": "govuk-!-margin-bottom-7"
   }) }}
 {% endblock %}
 
 {% block button_group %}
   {{ govukButton({
-    "text": "View " ~ object_name,
+    "text": "View " ~ verbose_name,
     "href": object.get_url("detail"),
     "classes": "govuk-button"
   }) }}
-  {% if object_name == "workflow" %}
+  {% if verbose_name == "ticket template" %}
     {{ govukButton({
-      "text": "Create a task",
-      "href": "#TODO",
-      "classes": "govuk-button--secondary"
-    }) }}
-  {% elif object_name == "workflow template" %}
-    {{ govukButton({
-      "text": "Create a task template",
+      "text": "Add a step",
       "href": url("workflow:task-template-ui-create", kwargs={"workflow_template_pk": object.pk}),
       "classes": "govuk-button--secondary"
     }) }}
@@ -49,5 +42,5 @@
 {% endblock %}
 
 {% block actions %}
-  <a href={{ object.get_url("list") }} class="govuk-link">Find and view {{object_name}}s</a>
+  <a href={{ object.get_url("list") }} class="govuk-link">Find and view {{verbose_name}}s</a>
 {% endblock %}
diff --git a/tasks/jinja2/tasks/workflows/detail.jinja b/tasks/jinja2/tasks/workflows/detail.jinja
index 1835e9856..16c1b852a 100644
--- a/tasks/jinja2/tasks/workflows/detail.jinja
+++ b/tasks/jinja2/tasks/workflows/detail.jinja
@@ -59,8 +59,8 @@
           {{ display_summary_row_stacked("Assignee", display_assignees(object.summary_task.assignees.assigned())) }}
           {{ display_summary_row_stacked("Work type", object.creator_template.title) }}
           {{ display_summary_row_stacked("Created date", object.summary_task.created_at|format_date) }}
-          {{ display_summary_row_stacked("Entry into force date", "None") }}
-          {{ display_summary_row_stacked("Policy contact", "None") }}
+          {{ display_summary_row_stacked("Entry into force date", object.eif_date|format_date) }}
+          {{ display_summary_row_stacked("Policy contact", object.policy_contact or "None") }}
         {% elif verbose_name == "ticket template" %}
           {{ display_summary_row_stacked("Created by", object.creator.get_displayname()) }}
           {{ display_summary_row_stacked("Created date", object.created_at|format_date) }}
diff --git a/tasks/jinja2/tasks/workflows/edit.jinja b/tasks/jinja2/tasks/workflows/edit.jinja
index f4789b63d..25feda85b 100644
--- a/tasks/jinja2/tasks/workflows/edit.jinja
+++ b/tasks/jinja2/tasks/workflows/edit.jinja
@@ -1,14 +1,12 @@
 {% extends "layouts/form.jinja" %}
 {% from "components/breadcrumbs.jinja" import breadcrumbs %}
 
-{% set object_name = object._meta.verbose_name %}
-
-{% set page_title = "Edit " ~ object_name ~ " details" %}
+{% set page_title = "Edit " ~ verbose_name ~ " " ~ object.id %}
 
 {% block breadcrumb %}
   {{ breadcrumbs(request, [
-      {"text": "Find and view " ~ object_name ~ "s", "href": object.get_url("list")},
-      {"text": object_name|capitalize ~ ": " ~ object.title, "href": object.get_url("detail")},
+      {"text": "Find and view " ~ verbose_name ~ "s", "href": object.get_url("list")},
+      {"text": verbose_name|capitalize ~ " " ~ object.id, "href": object.get_url("detail")},
       {"text": page_title}
     ],
     with_workbasket=False,
diff --git a/tasks/tests/test_forms.py b/tasks/tests/test_forms.py
index db30ff822..eb717e9ac 100644
--- a/tasks/tests/test_forms.py
+++ b/tasks/tests/test_forms.py
@@ -1,3 +1,5 @@
+from datetime import date
+
 import pytest
 
 from common.tests.factories import ProgressStateFactory
@@ -80,13 +82,19 @@ def test_workflow_update_form_save(task_workflow):
     """Tests that the details of `TaskWorkflow.summary_task` are updated when
     calling form.save()."""
     form_data = {
-        "title": "Updated workflow title",
-        "description": "Updated workflow description",
+        "title": "Updated title",
+        "description": "Updated description",
+        "eif_date_0": date.today().day,
+        "eif_date_1": date.today().month,
+        "eif_date_2": date.today().year,
+        "policy_contact": "Policy contact",
     }
 
     form = forms.TaskWorkflowUpdateForm(data=form_data, instance=task_workflow)
     assert form.is_valid()
 
     workflow = form.save()
+    assert workflow.eif_date == date.today()
+    assert workflow.policy_contact == form_data["policy_contact"]
     assert workflow.summary_task.title == form_data["title"]
     assert workflow.summary_task.description == form_data["description"]
diff --git a/tasks/tests/test_views.py b/tasks/tests/test_views.py
index 27123ca24..5adde8201 100644
--- a/tasks/tests/test_views.py
+++ b/tasks/tests/test_views.py
@@ -1,3 +1,5 @@
+from datetime import date
+
 import factory
 import pytest
 from bs4 import BeautifulSoup
@@ -21,8 +23,6 @@
 
 pytestmark = pytest.mark.django_db
 
-pytestmark = pytest.mark.django_db
-
 
 def test_task_update_view_update_progress_state(valid_user_client):
     """Tests that `TaskUpdateView` updates `Task.progress_state` and that a
@@ -355,7 +355,9 @@ def test_workflow_template_update_view(
     assert confirmation_response.status_code == 200
 
     soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
-    assert task_workflow_template.title in soup.select("h1.govuk-panel__title")[0].text
+    assert (
+        str(task_workflow_template.id) in soup.select("h1.govuk-panel__title")[0].text
+    )
 
 
 def test_workflow_template_delete_view(
@@ -589,6 +591,9 @@ def test_workflow_detail_view_displays_tasks(
     task_workflow_single_task_item,
 ):
     workflow = task_workflow_single_task_item
+    workflow.policy_contact = "Policy contact"
+    workflow.eif_date = date.today()
+    workflow.save()
     workbasket = workflow.summary_task.workbasket
 
     url = reverse(
@@ -604,6 +609,8 @@ def test_workflow_detail_view_displays_tasks(
     assert page.find("p", text=workflow.description)
     assert page.find("a", text=f"{workbasket.pk} - {workbasket.status}")
     assert page.find("dd", text=format_date(workflow.summary_task.created_at))
+    assert page.find("dd", text=format_date(workflow.eif_date))
+    assert page.find("dd", text=workflow.policy_contact)
 
     step_rows = page.select(".govuk-table__body > .govuk-table__row")
     assert len(step_rows) == workflow.get_tasks().count()
@@ -661,8 +668,8 @@ def test_workflow_update_view(
     confirmation view returns a HTTP 200 response."""
 
     form_data = {
-        "title": "Updated workflow title",
-        "description": "Updated workflow description",
+        "title": "Updated title",
+        "description": "Updated description",
     }
     update_url = task_workflow.get_url("edit")
 
@@ -683,7 +690,7 @@ def test_workflow_update_view(
     assert confirmation_response.status_code == 200
 
     soup = BeautifulSoup(str(confirmation_response.content), "html.parser")
-    assert str(task_workflow) in soup.select("h1.govuk-panel__title")[0].text
+    assert str(task_workflow.id) in soup.select("h1.govuk-panel__title")[0].text
 
 
 def test_workflow_delete_view(
diff --git a/tasks/views.py b/tasks/views.py
index f47ff1234..71dd09e25 100644
--- a/tasks/views.py
+++ b/tasks/views.py
@@ -590,6 +590,11 @@ class TaskWorkflowUpdateView(PermissionRequiredMixin, UpdateView):
     permission_required = "tasks.change_taskworkflow"
     form_class = TaskWorkflowUpdateForm
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["verbose_name"] = "ticket"
+        return context
+
     def get_success_url(self):
         return reverse(
             "workflow:task-workflow-ui-confirm-update",
@@ -602,6 +607,11 @@ class TaskWorkflowConfirmUpdateView(PermissionRequiredMixin, DetailView):
     template_name = "tasks/workflows/confirm_update.jinja"
     permission_required = "tasks.change_taskworkflow"
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["verbose_name"] = "ticket"
+        return context
+
 
 class TaskWorkflowDeleteView(PermissionRequiredMixin, DeleteView):
     model = TaskWorkflow
@@ -775,6 +785,11 @@ class TaskWorkflowTemplateUpdateView(PermissionRequiredMixin, UpdateView):
     permission_required = "tasks.change_taskworkflowtemplate"
     form_class = TaskWorkflowTemplateUpdateForm
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["verbose_name"] = "ticket template"
+        return context
+
     def get_success_url(self):
         return reverse(
             "workflow:task-workflow-template-ui-confirm-update",
@@ -787,6 +802,11 @@ class TaskWorkflowTemplateConfirmUpdateView(PermissionRequiredMixin, DetailView)
     template_name = "tasks/workflows/confirm_update.jinja"
     permission_required = "tasks.change_taskworkflowtemplate"
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["verbose_name"] = "ticket template"
+        return context
+
 
 class TaskWorkflowTemplateDeleteView(PermissionRequiredMixin, DeleteView):
     model = TaskWorkflowTemplate