From 1808ea7384ba82d9c73933ed18499e99e0daa25b Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Mon, 22 Dec 2025 23:35:30 +0200
Subject: [PATCH] fix(jade): simplify rules headers and conditions; add helpers
 to expose ruleName safely

---
 client/components/rules/rulesActions.jade  | 12 +++++-------
 client/components/rules/rulesActions.js    |  9 +++++++++
 client/components/rules/rulesTriggers.jade |  4 +---
 client/components/rules/rulesTriggers.js   |  9 +++++++++
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/client/components/rules/rulesActions.jade b/client/components/rules/rulesActions.jade
index 7f11d9e9c..3deb7ba6d 100644
--- a/client/components/rules/rulesActions.jade
+++ b/client/components/rules/rulesActions.jade
@@ -1,9 +1,7 @@
 template(name="rulesActions")
   h2
     | ✨
-    | {{_ 'r-rule' }} "
-    = ruleName.get()
-    | " - {{_ 'r-add-action'}}
+    | {{_ 'r-rule' }} "{{ruleNameStr}}" - {{_ 'r-add-action'}}
   .triggers-content
     .triggers-body
       .triggers-side-menu
@@ -17,13 +15,13 @@ template(name="rulesActions")
           li.js-set-mail-actions
             | @
       .triggers-main-body
-        if ($eq currentActions.get 'board')
+        if $eq currentActions.get 'board'
           +boardActions(ruleName=data.ruleName triggerVar=data.triggerVar)
-        else if ($eq currentActions.get 'card')
+        else if $eq currentActions.get 'card'
           +cardActions(ruleName=data.ruleName triggerVar=data.triggerVar)
-        else if ($eq currentActions.get 'checklist')
+        else if $eq currentActions.get 'checklist'
           +checklistActions(ruleName=data.ruleName triggerVar=data.triggerVar)
-        else if ($eq currentActions.get 'mail')
+        else if $eq currentActions.get 'mail'
           +mailActions(ruleName=data.ruleName triggerVar=data.triggerVar)
   div.rules-back
         button.js-goback
diff --git a/client/components/rules/rulesActions.js b/client/components/rules/rulesActions.js
index 32b4c3897..9e60ad760 100644
--- a/client/components/rules/rulesActions.js
+++ b/client/components/rules/rulesActions.js
@@ -5,6 +5,15 @@ BlazeComponent.extendComponent({
     this.currentActions = new ReactiveVar('board');
   },
 
+  ruleNameStr() {
+    const rn = this.data() && this.data().ruleName;
+    try {
+      return rn && typeof rn.get === 'function' ? rn.get() : '';
+    } catch (_) {
+      return '';
+    }
+  },
+
   setBoardActions() {
     this.currentActions.set('board');
     $('.js-set-card-actions').removeClass('active');
diff --git a/client/components/rules/rulesTriggers.jade b/client/components/rules/rulesTriggers.jade
index dd3d431c1..e110198c5 100644
--- a/client/components/rules/rulesTriggers.jade
+++ b/client/components/rules/rulesTriggers.jade
@@ -1,9 +1,7 @@
 template(name="rulesTriggers")
   h2
     | ✨
-    | {{_ 'r-rule' }} "
-    = ruleName.get()
-    | " - {{_ 'r-add-trigger'}}
+    | {{_ 'r-rule' }} "{{ruleNameStr}}" - {{_ 'r-add-trigger'}}
   .triggers-content
     .triggers-body
       .triggers-side-menu
diff --git a/client/components/rules/rulesTriggers.js b/client/components/rules/rulesTriggers.js
index 960484267..240d7d2a8 100644
--- a/client/components/rules/rulesTriggers.js
+++ b/client/components/rules/rulesTriggers.js
@@ -7,6 +7,15 @@ BlazeComponent.extendComponent({
     this.showChecklistTrigger = new ReactiveVar(false);
   },
 
+  ruleNameStr() {
+    const rn = this.data() && this.data().ruleName;
+    try {
+      return rn && typeof rn.get === 'function' ? rn.get() : '';
+    } catch (_) {
+      return '';
+    }
+  },
+
   setBoardTriggers() {
     this.showBoardTrigger.set(true);
     this.showCardTrigger.set(false);