From 0a619c4d5d16af38c158dcf6245a2c9b9fa14384 Mon Sep 17 00:00:00 2001
From: James Gilbert <james.gilbert@diamond.ac.uk>
Date: Tue, 21 Jul 2026 14:01:12 +0100
Subject: [PATCH 1/2] fix(graph-proxy): make Trigger templateRef optional

---
 backend/graph-proxy/src/graphql/triggers.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/graph-proxy/src/graphql/triggers.rs b/backend/graph-proxy/src/graphql/triggers.rs
index 8dd06bfa0..3838dedc5 100644
--- a/backend/graph-proxy/src/graphql/triggers.rs
+++ b/backend/graph-proxy/src/graphql/triggers.rs
@@ -46,7 +46,7 @@ enum TriggerError {
 struct TriggerSpec {
     /// The name of a ClusterTriggerTemplate that the Trigger is created from
     #[serde(rename = "templateRef")]
-    template_ref: String,
+    template_ref: Option<String>,
 }
 
 /// A Trigger for creating automated workflows
@@ -56,7 +56,7 @@ struct TriggerGQL {
     /// The name of the Trigger
     name: Option<String>,
     /// The name of a ClusterTriggerTemplate that the Trigger is created from
-    template_ref: String,
+    template_ref: Option<String>,
     /// The beamline that the Trigger monitors
     beamline: Option<String>,
 }
@@ -211,7 +211,9 @@ impl TriggerMutation {
                 )])),
                 ..Default::default()
             },
-            spec: TriggerSpec { template_ref },
+            spec: TriggerSpec {
+                template_ref: Some(template_ref),
+            },
         };
 
         match api.create(&PostParams::default(), &trigger).await {

From a8aff6f091fbec71a980027d257b4ba54ed82c68 Mon Sep 17 00:00:00 2001
From: James Gilbert <james.gilbert@diamond.ac.uk>
Date: Tue, 21 Jul 2026 14:01:38 +0100
Subject: [PATCH 2/2] fix(events): allow Triggers without templateRef

---
 charts/events/Chart.yaml                                    | 2 +-
 charts/events/crds/trigger-crds.yaml                        | 1 -
 charts/events/templates/populate-trigger-clusterpolicy.yaml | 6 ++++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/charts/events/Chart.yaml b/charts/events/Chart.yaml
index c928b1b7d..6d2ad150a 100644
--- a/charts/events/Chart.yaml
+++ b/charts/events/Chart.yaml
@@ -3,7 +3,7 @@ name: events
 description: Data Analysis event triggering
 type: application
 
-version: 0.3.1
+version: 0.3.2
 
 dependencies:
   - name: argo-events
diff --git a/charts/events/crds/trigger-crds.yaml b/charts/events/crds/trigger-crds.yaml
index 4289153f1..d8c8ed29d 100644
--- a/charts/events/crds/trigger-crds.yaml
+++ b/charts/events/crds/trigger-crds.yaml
@@ -113,7 +113,6 @@ spec:
                           - required: [name, path]
                           - required: [name, default]
               required:
-                - templateRef
                 - workflow
                 - eventName
           required:
diff --git a/charts/events/templates/populate-trigger-clusterpolicy.yaml b/charts/events/templates/populate-trigger-clusterpolicy.yaml
index a4b759d00..fec331121 100644
--- a/charts/events/templates/populate-trigger-clusterpolicy.yaml
+++ b/charts/events/templates/populate-trigger-clusterpolicy.yaml
@@ -26,6 +26,12 @@ spec:
             urlPath: "/apis/workflows.diamond.ac.uk/v1alpha1/clustertriggertemplates/{{`{{templateRef}}`}}"
             method: GET
 
+      preconditions:
+        all:
+          - key: "{{`{{ templateRef }}`}}"
+            operator: NotEquals
+            value: ""
+
       mutate:
         patchStrategicMerge:
           metadata: