Skip to content

Commit e0b4876

Browse files
cdavernascdavernas
authored
Merge pull request #428 from serverlessworkflow/fix-datetime-format
Fixed the format of all date times by properly converting them to local time
2 parents 2730c0e + 775d534 commit e0b4876

File tree

9 files changed

+30
-35
lines changed

9 files changed

+30
-35
lines changed

‎src/dashboard/Synapse.Dashboard/Components/TaskInstanceDetails/TaskInstanceDetails.razor

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
<div class="row mb-3">
4242
<div class="col-md-12 col-lg-4">
4343
<div class="label">Start Time</div>
44-
@(TaskInstance.StartedAt?.DateTime.RelativeFormat() ?? "-")
44+
@(TaskInstance.StartedAt?.RelativeFormat() ?? "-")
4545
</div>
4646
<div class="col-md-12 col-lg-4">
4747
<div class="label">End Time</div>
48-
@(TaskInstance.EndedAt?.DateTime.RelativeFormat() ?? "-")
48+
@(TaskInstance.EndedAt?.RelativeFormat() ?? "-")
4949
</div>
5050
<div class="col-md-12 col-lg-4">
5151
<div class="label">Duration</div>
@@ -117,8 +117,8 @@
117117
@foreach (var run in TaskInstance.Runs)
118118
{
119119
<tr>
120-
<td>@run.StartedAt.DateTime.RelativeFormat()</td>
121-
<td class="text-center">@(run.EndedAt?.DateTime.RelativeFormat() ?? "-")</td>
120+
<td>@run.StartedAt.RelativeFormat()</td>
121+
<td class="text-center">@(run.EndedAt?.RelativeFormat() ?? "-")</td>
122122
<td class="text-center">@(run.EndedAt.HasValue ? run.EndedAt.Value.Subtract(run.StartedAt).ToString("hh\\:mm\\:ss\\.fff") : "-")</td>
123123
<td class="text-center"><span class="badge rounded-pill badge rounded-pill border [email protected]() [email protected]()">@(run.Outcome ?? TaskInstanceStatus.Pending)</span></td>
124124
</tr>
@@ -145,7 +145,7 @@
145145
@foreach (var retry in TaskInstance.Retries)
146146
{
147147
<tr>
148-
<td>@retry.Time.DateTime.RelativeFormat()</td>
148+
<td>@retry.Time.RelativeFormat()</td>
149149
<td class="text-center">@retry.Number</td>
150150
<td class="text-center">
151151
<DocumentDetails Label="Cause" Document="@retry.Cause" />

‎src/dashboard/Synapse.Dashboard/Components/WorkflowInstanceDetails/TaskInstanceRow.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<tr @onclick="async _ => await OnToggleRow()" class="cursor-pointer">
2121
<td>@TaskInstance.Reference</td>
2222
<td class="text-center"><span class="badge rounded-pill badge rounded-pill border [email protected]() [email protected]()">@(TaskInstance.Status ?? TaskInstanceStatus.Pending)</span></td>
23-
<td class="text-center">@(TaskInstance.StartedAt?.DateTime.RelativeFormat() ?? "-")</td>
24-
<td class="text-center">@(TaskInstance.EndedAt?.DateTime.RelativeFormat() ?? "-")</td>
23+
<td class="text-center">@(TaskInstance.StartedAt?.RelativeFormat() ?? "-")</td>
24+
<td class="text-center">@(TaskInstance.EndedAt?.RelativeFormat() ?? "-")</td>
2525
<td class="text-center">
2626
@if (TaskInstance.StartedAt.HasValue == true && TaskInstance.EndedAt.HasValue == true)
2727
{

‎src/dashboard/Synapse.Dashboard/Components/WorkflowInstanceDetails/WorkflowInstanceDetails.razor

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
<div class="row mb-3">
3838
<div class="col-md-12 col-lg-4">
3939
<div class="label">Start Time</div>
40-
@(workflowInstance.Status?.StartedAt?.DateTime.RelativeFormat() ?? "-")
40+
@(workflowInstance.Status?.StartedAt?.RelativeFormat() ?? "-")
4141
</div>
4242
<div class="col-md-12 col-lg-4">
4343
<div class="label">End Time</div>
44-
@(workflowInstance.Status?.EndedAt?.DateTime.RelativeFormat() ?? "-")
44+
@(workflowInstance.Status?.EndedAt?.RelativeFormat() ?? "-")
4545
</div>
4646
<div class="col-md-12 col-lg-4">
4747
<div class="label">Duration</div>
@@ -112,8 +112,8 @@
112112
@foreach (var run in workflowInstance.Status.Runs)
113113
{
114114
<tr>
115-
<td>@run.StartedAt.DateTime.RelativeFormat()</td>
116-
<td class="text-center">@(run.EndedAt?.DateTime.RelativeFormat() ?? "-")</td>
115+
<td>@run.StartedAt.RelativeFormat()</td>
116+
<td class="text-center">@(run.EndedAt?.RelativeFormat() ?? "-")</td>
117117
<td class="text-center">@(run.EndedAt.HasValue ? run.EndedAt.Value.Subtract(run.StartedAt).ToString("hh\\:mm\\:ss\\.fff") : "-")</td>
118118
</tr>
119119
}

‎src/dashboard/Synapse.Dashboard/Components/WorkflowInstancesList/WorkflowInstancesList.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@
113113
<span class="badge rounded-pill badge rounded-pill border [email protected]?.Phase.GetColorClass() [email protected]?.Phase.GetColorClass()">@(instance.Status?.Phase ?? WorkflowInstanceStatusPhase.Pending)</span>
114114
break;
115115
case "Creation Time":
116-
@instance.Metadata.CreationTimestamp?.DateTime.RelativeFormat()
116+
@instance.Metadata.CreationTimestamp?.RelativeFormat()
117117
break;
118118
case "Start Time":
119-
@(instance.Status?.StartedAt?.DateTime.RelativeFormat() ?? "-")
119+
@(instance.Status?.StartedAt?.RelativeFormat() ?? "-")
120120
break;
121121
case "End Time":
122-
@(instance.Status?.EndedAt?.DateTime.RelativeFormat() ?? "-")
122+
@(instance.Status?.EndedAt?.RelativeFormat() ?? "-")
123123
break;
124124
case "Duration":
125125
@(instance.Status?.StartedAt.HasValue == true && instance.Status?.EndedAt.HasValue == true ? instance.Status.EndedAt.Value.Subtract(instance.Status.StartedAt.Value).ToString("hh\\:mm\\:ss\\.fff") : "-")

‎src/dashboard/Synapse.Dashboard/Extensions/DateTimeExtensions.cs

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ namespace Synapse.Dashboard.Extensions;
2222
/// </summary>
2323
public static class DateTimeExtensions
2424
{
25+
2526
/// <summary>
26-
/// Formats the provided <see cref="DateTime"/> in a relative fashion (e.g.: 3 minutes ago, Yesterday at 1:00pm...)
27+
/// Formats the provided <see cref="DateTimeOffset"/> in a relative fashion (e.g.: 3 minutes ago, Yesterday at 1:00pm...)
2728
/// </summary>
28-
/// <param name="dateTime"></param>
29-
/// <returns></returns>
30-
public static string RelativeFormat(this DateTime dateTime)
29+
/// <param name="dateTime">The extended <see cref="DateTimeOffset"/></param>
30+
/// <returns>The <see cref="DateTimeOffset"/>, formatted in a relative fashion</returns>
31+
public static string RelativeFormat(this DateTimeOffset dateTime)
3132
{
32-
var now = DateTime.Now;
33+
var now = DateTimeOffset.Now;
3334
var delta = now.Subtract(dateTime);
3435
if (Math.Abs(delta.Days) >= 1)
3536
{
@@ -43,15 +44,9 @@ public static string RelativeFormat(this DateTime dateTime)
4344
defaults.LastWeek,
4445
$"{cultureFormats.ShortDatePattern} {cultureFormats.ShortTimePattern}"
4546
);
46-
return now.CalendarTime(dateTime, formats);
47-
}
48-
else if (delta < TimeSpan.Zero)
49-
{
50-
return dateTime.ToNow();
51-
}
52-
else
53-
{
54-
return dateTime.FromNow();
47+
return now.DateTime.CalendarTime(dateTime.DateTime, formats);
5548
}
49+
else if (delta < TimeSpan.Zero) return dateTime.DateTime.ToNow();
50+
else return dateTime.DateTime.FromNow();
5651
}
5752
}

‎src/dashboard/Synapse.Dashboard/Pages/Correlations/List/View.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<tr @onclick="async _ => await OnShowResourceDetailsAsync(correlation)" class="cursor-pointer">
6262
<td class="text-start" title="The namespace the correlation belongs to">@correlation.Metadata.Namespace</td>
6363
<td class="text-start" title="The correlation's name">@correlation.Metadata.Name</td>
64-
<td class="text-center" title="The date and time at which the correlation has been created">@correlation.Metadata.CreationTimestamp?.DateTime.RelativeFormat()</td>
65-
<td class="text-center" title="The date and time at which the correlation was last modified">@correlation.Status?.LastModified?.DateTime.RelativeFormat()</td>
64+
<td class="text-center" title="The date and time at which the correlation has been created">@correlation.Metadata.CreationTimestamp?.RelativeFormat()</td>
65+
<td class="text-center" title="The date and time at which the correlation was last modified">@correlation.Status?.LastModified?.RelativeFormat()</td>
6666
<td class="text-center" title="@GetStatusPhaseTitle(correlation.Status?.Phase)"><span class="badge rounded-pill border border-@GetStatusPhaseClass(correlation) text-@GetStatusPhaseClass(correlation)">@correlation.Status?.Phase</span></td>
6767
<td class="text-center" title="@GetLifetimeTitle(correlation.Spec.Lifetime)"><span class="badge rounded-pill border border-secondary text-secondary">@correlation.Spec.Lifetime</span></td>
6868
<td class="text-center" title="@GetEventConsumptionStrategyTitle(correlation)"><span class="badge rounded-pill border border-secondary text-secondary">@GetEventConsumptionStrategy(correlation)</span></td>

‎src/dashboard/Synapse.Dashboard/Pages/Correlators/List/View.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<tr @onclick="async _ => await OnShowResourceDetailsAsync(resource)" class="cursor-pointer">
7171
<td class="text-start">@resource.Metadata.Namespace</td>
7272
<td class="text-start">@resource.Metadata.Name</td>
73-
<td class="text-center">@resource.Metadata.CreationTimestamp?.DateTime.RelativeFormat()</td>
73+
<td class="text-center">@resource.Metadata.CreationTimestamp?.RelativeFormat()</td>
7474
<td class="text-center"><span class="badge rounded-pill border [email protected]?.Phase.GetColorClass() [email protected]?.Phase.GetColorClass()">@resource.Status?.Phase</span></td>
7575
<td class="text-end">
7676
<button class="btn btn-sm btn-dark" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false" title="" @onclick:stopPropagation="true"><i class="bi bi-three-dots-vertical"></i></button>

‎src/dashboard/Synapse.Dashboard/Pages/Operators/List/View.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<tr @onclick="async _ => await OnShowResourceDetailsAsync(resource)" class="cursor-pointer">
7171
<td class="text-start">@resource.Metadata.Namespace</td>
7272
<td class="text-start">@resource.Metadata.Name</td>
73-
<td class="text-center">@resource.Metadata.CreationTimestamp?.DateTime.RelativeFormat()</td>
73+
<td class="text-center">@resource.Metadata.CreationTimestamp?.RelativeFormat()</td>
7474
<td class="text-center"><span class="badge rounded-pill border [email protected]?.Phase.GetColorClass() [email protected]?.Phase.GetColorClass()">@resource.Status?.Phase</span></td>
7575
<td class="text-end">
7676
<button class="btn btn-sm btn-dark" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false" title="" @onclick:stopPropagation="true"><i class="bi bi-three-dots-vertical"></i></button>

‎src/dashboard/Synapse.Dashboard/Pages/Workflows/List/View.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@
9393
<a href="#" @onclick="_ => Store.SetNamespace(resource.Metadata.Namespace)" @onclick:preventDefault="true" @onclick:stopPropagation="true">@resource.Metadata.Namespace</a>
9494
<a href="/namespaces/@resource.Metadata.Namespace" @onclick:stopPropagation="true"><Icon Name="IconName.BoxArrowUpRight" Class="small" /></a>
9595
</td>
96-
<td class="text-center">@resource.Metadata.CreationTimestamp?.DateTime.RelativeFormat()</td>
97-
<td class="text-center">@(resource.Status?.Versions.Where(v => v.Value.LastStartedAt.HasValue).Select(v => v.Value.LastStartedAt).Order().LastOrDefault()?.DateTime.RelativeFormat() ?? "-")</td>
98-
<td class="text-center">@(resource.Status?.Versions.Where(v => v.Value.LastEndedAt.HasValue).Select(v => v.Value.LastEndedAt).Order().LastOrDefault()?.DateTime.RelativeFormat() ?? "-")</td>
96+
<td class="text-center">@resource.Metadata.CreationTimestamp?.RelativeFormat()</td>
97+
<td class="text-center">@(resource.Status?.Versions.Where(v => v.Value.LastStartedAt.HasValue).Select(v => v.Value.LastStartedAt).Order().LastOrDefault()?.RelativeFormat() ?? "-")</td>
98+
<td class="text-center">@(resource.Status?.Versions.Where(v => v.Value.LastEndedAt.HasValue).Select(v => v.Value.LastEndedAt).Order().LastOrDefault()?.RelativeFormat() ?? "-")</td>
9999
<td class="text-center">@resource.Spec.Versions.Count</td>
100100
<td class="text-center">@resource.Spec.Versions.GetLatest().Document.Version</td>
101101
<td class="text-center">@resource.Status?.Versions.Values.Sum(s => s.TotalInstances)</td>

0 commit comments

Comments
 (0)