Skip to content

Feat(UI): Mark deletions in colorized text #3633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 9 commits into
base: develop
Choose a base branch
from
Draft

Feat(UI): Mark deletions in colorized text #3633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c10ca15
Update task title display in RequestFwChangePopup
SolidProgramming Aug 28, 2025
2723318
[~] Update title display logic for task types
SolidProgramming Aug 29, 2025
8d46ed9
Merge branch 'develop' into feature_3464
SolidProgramming Sep 9, 2025
f29ddb1
Merge branch 'develop' into feature_3464
SolidProgramming Sep 14, 2025
cf0b973
Merge branch 'CactuseSecurity:main' into feature_3464
SolidProgramming Sep 15, 2025
3bd0854
Merge branch 'develop' into feature_3464
SolidProgramming Oct 8, 2025
ca3873b
Merge branch 'develop' into feature_3464
SolidProgramming Oct 10, 2025
1a623a8
Merge branch 'develop' into feature_3464
SolidProgramming Oct 20, 2025
6c87389
Merge branch 'develop' into feature_3464
SolidProgramming Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions roles/lib/files/FWO.Api.Client/GraphQlApiSubscription.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using FWO.Logging;
using FWO.Logging;
using GraphQL;
using GraphQL.Client.Http;
using Newtonsoft.Json.Linq;
Expand Down Expand Up @@ -69,7 +69,7 @@ protected virtual void CreateSubscription()
if (response.Data == null)
{
// Terminate subscription
subscription.Dispose();
subscription?.Dispose();
}
else
{
Expand Down
17 changes: 16 additions & 1 deletion roles/ui/files/FWO.UI/Pages/NetworkModelling/RequestFwChangePopup.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,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] : "")
Expand Down Expand Up @@ -319,6 +323,17 @@
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;
Expand Down