From c10ca15615dec0b371d0e6abd07f10fb514311d0 Mon Sep 17 00:00:00 2001
From: solidprogramming <luca.weidmann@gmx.de>
Date: Thu, 28 Aug 2025 12:16:51 +0200
Subject: [PATCH 1/2] Update task title display in RequestFwChangePopup

[~] Modify column definition for task titles.
[+] Add custom template using DisplayTitle method.
[+] Implement DisplayTitle method for conditional formatting. #3464
---
 .../NetworkModelling/RequestFwChangePopup.razor  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor
index 6de15ba99a..21d2b71cea 100644
--- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor
+++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor
@@ -39,7 +39,11 @@
                                 @(context.OnManagement?.Name)
                             </Template>
                         </Column>
-                        <Column TableItem="WfReqTask" Title="@(userConfig.GetText("title"))" Field="@(x => x.Title)" Sortable="true" Filterable="false" />
+                        <Column TableItem="WfReqTask" Title="@(userConfig.GetText("title"))" Field="@(x => x.Title)" Sortable="true" Filterable="false">
+                            <Template>
+                                @DisplayTitle(context)
+                            </Template>
+                        </Column>
                         <Column TableItem="WfReqTask" Title="@(userConfig.GetText("state"))" Field="@(x => x.StateId)" Sortable="true" Filterable="false">
                             <Template>
                                 @(RequestInProcess ? states.Name[context.StateId] : "")
@@ -309,6 +313,16 @@
         return "";
     }
 
+    private MarkupString DisplayTitle(WfReqTask task)
+    {
+        if((task.TaskType == WfTaskType.rule_delete.ToString() || task.TaskType == WfTaskType.group_delete.ToString()) ||
+           (task.TaskType == WfTaskType.rule_modify.ToString() || task.TaskType == WfTaskType.group_modify.ToString() && task.Elements.Any(_ => _.RequestAction == RequestAction.delete.ToString())))
+        {
+            return new MarkupString($"<span class=\"text-danger\">{task.Title}</span>");
+        }
+
+        return new MarkupString(task.Title);
+    }
     private async Task StartRequests()
     {
         WorkInProgress = true;

From 2723318f8c1fcbaa1d6dba0ea497ed923fa18cf4 Mon Sep 17 00:00:00 2001
From: solidprogramming <luca.weidmann@gmx.de>
Date: Fri, 29 Aug 2025 16:02:51 +0200
Subject: [PATCH 2/2] [~] Update title display logic for task types

---
 roles/lib/files/FWO.Api.Client/GraphQlApiSubscription.cs      | 4 ++--
 .../FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/lib/files/FWO.Api.Client/GraphQlApiSubscription.cs b/roles/lib/files/FWO.Api.Client/GraphQlApiSubscription.cs
index 9d00aa952a..c4ac652b41 100644
--- a/roles/lib/files/FWO.Api.Client/GraphQlApiSubscription.cs
+++ b/roles/lib/files/FWO.Api.Client/GraphQlApiSubscription.cs
@@ -1,4 +1,4 @@
-using FWO.Logging;
+using FWO.Logging;
 using GraphQL;
 using GraphQL.Client.Http;
 using Newtonsoft.Json.Linq;
@@ -70,7 +70,7 @@ protected virtual void CreateSubscription()
                         if (response.Data == null)
                         {
                             // Terminate subscription
-                            subscription.Dispose();
+                            subscription?.Dispose();
                         }
                         else
                         {
diff --git a/roles/ui/files/FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor b/roles/ui/files/FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor
index 21d2b71cea..e16433244f 100644
--- a/roles/ui/files/FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor
+++ b/roles/ui/files/FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor
@@ -316,13 +316,14 @@
     private MarkupString DisplayTitle(WfReqTask task)
     {
         if((task.TaskType == WfTaskType.rule_delete.ToString() || task.TaskType == WfTaskType.group_delete.ToString()) ||
-           (task.TaskType == WfTaskType.rule_modify.ToString() || task.TaskType == WfTaskType.group_modify.ToString() && task.Elements.Any(_ => _.RequestAction == RequestAction.delete.ToString())))
+           ((task.TaskType == WfTaskType.rule_modify.ToString() || task.TaskType == WfTaskType.group_modify.ToString()) && task.Elements.Any(_ => _.RequestAction == RequestAction.delete.ToString())))
         {
             return new MarkupString($"<span class=\"text-danger\">{task.Title}</span>");
         }
 
         return new MarkupString(task.Title);
     }
+
     private async Task StartRequests()
     {
         WorkInProgress = true;