Skip to content

Commit f70ac01

Browse files
tpurschketpurschke
authored
Merge pull request CactuseSecurity#4109 from SolidProgramming/fix/ui/issue_3884
fix(UI/Monitoring): Import success MarkupString
2 parents 336c499 + 27bf81e commit f70ac01

1 file changed

Lines changed: 50 additions & 34 deletions

File tree

‎roles/ui/files/FWO.UI/Shared/ImportDetails.razor‎

Lines changed: 50 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@inject ApiConnection apiConnection
1+
@inject ApiConnection apiConnection
22
@inject UserConfig userConfig
33

44
<PopUp Title="@(userConfig.GetText("import_status_details") + ImportStatus.MgmName)" Show="@DetailsMode" Size=PopupSize.Large OnClose="async () => await CloseDetails()">
@@ -26,70 +26,86 @@
2626

2727
<h6>@(userConfig.GetText("first_import"))</h6>
2828
<div class="row">
29-
<div class="col-sm-1"/>
29+
<div class="col-sm-1" />
3030
<div class="col-sm-2">@(userConfig.GetText("import_id")):</div>
3131
<div class="col-sm-2">@(ImportStatus.FirstImport != null && ImportStatus.FirstImport.Length > 0 ? ImportStatus.FirstImport[0].ControlId : "")</div>
3232
</div>
3333
<div class="row">
34-
<div class="col-sm-1"/>
34+
<div class="col-sm-1" />
3535
<div class="col-sm-1">@(userConfig.GetText("start")):</div>
3636
<div class="col-sm-3">@(ImportStatus.FirstImport != null && ImportStatus.FirstImport.Length > 0 ? ImportStatus.FirstImport[0].StartTime : "")</div>
3737
<div class="col-sm-1">@(userConfig.GetText("stop")):</div>
3838
<div class="col-sm-3">@(ImportStatus.FirstImport != null && ImportStatus.FirstImport.Length > 0 ? ImportStatus.FirstImport[0].StopTime : "")</div>
3939
<div class="col-sm-2">@(userConfig.GetText("duration")):</div>
40-
<div class="col-sm-1">@(ImportStatus.FirstImport != null && ImportStatus.FirstImport.Length > 0 && ImportStatus.FirstImport[0].StartTime != null
41-
&& ImportStatus.FirstImport[0].StopTime != null ? ((TimeSpan)(ImportStatus.FirstImport[0].StopTime! - ImportStatus.FirstImport[0].StartTime!)).TotalSeconds.ToString("f2") : "")</div>
40+
<div class="col-sm-1">
41+
@(ImportStatus.FirstImport != null && ImportStatus.FirstImport.Length > 0 && ImportStatus.FirstImport[0].StartTime != null
42+
&& ImportStatus.FirstImport[0].StopTime != null ? ((TimeSpan)(ImportStatus.FirstImport[0].StopTime! - ImportStatus.FirstImport[0].StartTime!)).TotalSeconds.ToString("f2") : "")
43+
</div>
4244
</div>
4345
<div class="row">
44-
<div class="col-sm-1"/>
46+
<div class="col-sm-1" />
4547
<div class="col-sm-1">@(userConfig.GetText("success")):</div>
46-
<div class="col-sm-1">@(ImportStatus.FirstImport != null && ImportStatus.FirstImport.Length > 0 ? ImportStatus.FirstImport[0].SuccessfulImport.ShowAsHtml() : "")</div>
47-
<div class="col-sm-1">@(userConfig.GetText("errors")):</div>
48-
<div class="col-sm-8">@(ImportStatus.FirstImport != null && ImportStatus.FirstImport.Length > 0 ? ImportStatus.FirstImport[0].ImportErrors : "")</div>
48+
<div class="col-sm-1">
49+
@if (ImportStatus.FirstImport != null && ImportStatus.FirstImport.Length > 0)
50+
{
51+
@(ImportStatus.FirstImport[0].SuccessfulImport.ShowAsHtml())
52+
}
4953
</div>
50-
<br>
51-
<h6>@(userConfig.GetText("last_successful_import"))</h6>
52-
<div class="row">
53-
<div class="col-sm-1"/>
54-
<div class="col-sm-2">@(userConfig.GetText("import_id")):</div>
55-
<div class="col-sm-2">@(ImportStatus.LastSuccessfulImport != null && ImportStatus.LastSuccessfulImport.Length > 0 ? ImportStatus.LastSuccessfulImport[0].ControlId : "")</div>
54+
<div class="col-sm-1">@(userConfig.GetText("errors")):</div>
55+
<div class="col-sm-8">@(ImportStatus.FirstImport != null && ImportStatus.FirstImport.Length > 0 ? ImportStatus.FirstImport[0].ImportErrors : "")</div>
56+
</div>
57+
<br>
58+
<h6>@(userConfig.GetText("last_successful_import"))</h6>
59+
<div class="row">
60+
<div class="col-sm-1" />
61+
<div class="col-sm-2">@(userConfig.GetText("import_id")):</div>
62+
<div class="col-sm-2">@(ImportStatus.LastSuccessfulImport != null && ImportStatus.LastSuccessfulImport.Length > 0 ? ImportStatus.LastSuccessfulImport[0].ControlId : "")</div>
63+
</div>
64+
<div class="row">
65+
<div class="col-sm-1" />
66+
<div class="col-sm-1">@(userConfig.GetText("start")):</div>
67+
<div class="col-sm-3">@(ImportStatus.LastSuccessfulImport != null && ImportStatus.LastSuccessfulImport.Length > 0 ? ImportStatus.LastSuccessfulImport[0].StartTime : "")</div>
68+
<div class="col-sm-1">@(userConfig.GetText("stop")):</div>
69+
<div class="col-sm-3">@(ImportStatus.LastSuccessfulImport != null && ImportStatus.LastSuccessfulImport.Length > 0 ? ImportStatus.LastSuccessfulImport[0].StopTime : "")</div>
70+
<div class="col-sm-2">@(userConfig.GetText("duration")):</div>
71+
<div class="col-sm-1">
72+
@(ImportStatus.LastSuccessfulImport != null && ImportStatus.LastSuccessfulImport.Length > 0 && ImportStatus.LastSuccessfulImport[0].StartTime != null
73+
&& ImportStatus.LastSuccessfulImport[0].StopTime != null ? ((TimeSpan)(ImportStatus.LastSuccessfulImport[0].StopTime! - ImportStatus.LastSuccessfulImport[0].StartTime!)).TotalSeconds.ToString("f2") : "")
74+
</div>
5675
</div>
5776
<div class="row">
58-
<div class="col-sm-1"/>
59-
<div class="col-sm-1">@(userConfig.GetText("start")):</div>
60-
<div class="col-sm-3">@(ImportStatus.LastSuccessfulImport != null && ImportStatus.LastSuccessfulImport.Length > 0 ? ImportStatus.LastSuccessfulImport[0].StartTime : "")</div>
61-
<div class="col-sm-1">@(userConfig.GetText("stop")):</div>
62-
<div class="col-sm-3">@(ImportStatus.LastSuccessfulImport != null && ImportStatus.LastSuccessfulImport.Length > 0 ? ImportStatus.LastSuccessfulImport[0].StopTime : "")</div>
63-
<div class="col-sm-2">@(userConfig.GetText("duration")):</div>
64-
<div class="col-sm-1">@(ImportStatus.LastSuccessfulImport != null && ImportStatus.LastSuccessfulImport.Length > 0 && ImportStatus.LastSuccessfulImport[0].StartTime != null
65-
&& ImportStatus.LastSuccessfulImport[0].StopTime != null ? ((TimeSpan)(ImportStatus.LastSuccessfulImport[0].StopTime! - ImportStatus.LastSuccessfulImport[0].StartTime!)).TotalSeconds.ToString("f2") : "")</div>
66-
</div>
67-
<div class="row">
68-
<div class="col-sm-1"/>
77+
<div class="col-sm-1" />
6978
<div class="col-sm-5">@(userConfig.GetText("err_since_last_succ")):</div>
7079
<div class="col-sm-2">@(ImportStatus.ErrorCount)</div>
7180
</div>
7281
<br>
7382
<h6>@(userConfig.GetText("last_import"))</h6>
7483
<div class="row">
75-
<div class="col-sm-1"/>
84+
<div class="col-sm-1" />
7685
<div class="col-sm-2">@(userConfig.GetText("import_id")):</div>
7786
<div class="col-sm-2">@(ImportStatus.LastImport != null && ImportStatus.LastImport.Length > 0 ? ImportStatus.LastImport[0].ControlId : "")</div>
7887
</div>
7988
<div class="row">
80-
<div class="col-sm-1"/>
89+
<div class="col-sm-1" />
8190
<div class="col-sm-1">@(userConfig.GetText("start")):</div>
8291
<div class="col-sm-3">@(ImportStatus.LastImport != null && ImportStatus.LastImport.Length > 0 ? ImportStatus.LastImport[0].StartTime : "")</div>
8392
<div class="col-sm-1">@(userConfig.GetText("stop")):</div>
8493
<div class="col-sm-3">@(ImportStatus.LastImport != null && ImportStatus.LastImport.Length > 0 ? ImportStatus.LastImport[0].StopTime : "")</div>
8594
<div class="col-sm-2">@(userConfig.GetText("duration")):</div>
86-
<div class="col-sm-1">@(ImportStatus.LastImport != null && ImportStatus.LastImport.Length > 0 && ImportStatus.LastImport[0].StartTime != null
87-
&& ImportStatus.LastImport[0].StopTime != null ? ((TimeSpan)(ImportStatus.LastImport[0].StopTime! - ImportStatus.LastImport[0].StartTime!)).TotalSeconds.ToString("f2") : "")</div>
95+
<div class="col-sm-1">
96+
@(ImportStatus.LastImport != null && ImportStatus.LastImport.Length > 0 && ImportStatus.LastImport[0].StartTime != null
97+
&& ImportStatus.LastImport[0].StopTime != null ? ((TimeSpan)(ImportStatus.LastImport[0].StopTime! - ImportStatus.LastImport[0].StartTime!)).TotalSeconds.ToString("f2") : "")
98+
</div>
8899
</div>
89100
<div class="row">
90-
<div class="col-sm-1"/>
101+
<div class="col-sm-1" />
91102
<div class="col-sm-1">@(userConfig.GetText("success")):</div>
92-
<div class="col-sm-1">@(ImportStatus.LastImport != null && ImportStatus.LastImport.Length > 0 ? ImportStatus.LastImport[0].SuccessfulImport.ShowAsHtml() : "")</div>
103+
<div class="col-sm-1">
104+
@if (ImportStatus.LastImport != null && ImportStatus.LastImport.Length > 0)
105+
{
106+
@(ImportStatus.LastImport[0].SuccessfulImport.ShowAsHtml())
107+
}
108+
</div>
93109
<div class="col-sm-1">@(userConfig.GetText("errors")):</div>
94110
<div class="col-sm-8">@(ImportStatus.LastImport != null && ImportStatus.LastImport.Length > 0 ? ImportStatus.LastImport[0].ImportErrors : "")</div>
95111
</div>
@@ -113,10 +129,10 @@
113129

114130
[Parameter]
115131
public bool DetailsMode { get; set; }
116-
132+
117133
[Parameter]
118134
public EventCallback<bool> DetailsModeChanged { get; set; }
119-
135+
120136
[Parameter]
121137
public EventCallback<bool> Closing { get; set; }
122138

0 commit comments

Comments
 (0)