standardize time display

johnstcn · johnstcn · commit 234f0cb5d24e · 2023-11-09T13:09:50.000+01:00
diff --git a/cli/list.go b/cli/list.go
@@ -46,7 +46,7 @@ func workspaceListRowFromWorkspace(now time.Time, workspace codersdk.Workspace)
 	if !ptr.NilOrEmpty(workspace.AutostartSchedule) {
 		if sched, err := cron.Weekly(*workspace.AutostartSchedule); err == nil {
 			autostartDisplay = fmt.Sprintf("%s %s (%s)", sched.Time(), sched.DaysOfWeek(), sched.Location())
-			nextStartDisplay = relative(sched.Next(now).Sub(now))
+			nextStartDisplay = timeDisplay(sched.Next(now))
 		}
 	}
 
@@ -55,9 +55,8 @@ func workspaceListRowFromWorkspace(now time.Time, workspace codersdk.Workspace)
 	if !ptr.NilOrZero(workspace.TTLMillis) {
 		dur := time.Duration(*workspace.TTLMillis) * time.Millisecond
 		autostopDisplay = durationDisplay(dur)
-		if !workspace.LatestBuild.Deadline.IsZero() && workspace.LatestBuild.Deadline.Time.After(now) && status == "Running" {
-			remaining := time.Until(workspace.LatestBuild.Deadline.Time)
-			nextStopDisplay = fmt.Sprintf("%s (%s)", autostopDisplay, relative(remaining))
+		if !workspace.LatestBuild.Deadline.IsZero() && workspace.LatestBuild.Transition == codersdk.WorkspaceTransitionStart {
+			nextStopDisplay = timeDisplay(workspace.LatestBuild.Deadline.Time)
 		}
 	}
 
diff --git a/cli/util.go b/cli/util.go
@@ -62,6 +62,17 @@ func durationDisplay(d time.Duration) string {
 	return sign + durationDisplay
 }
 
+// timeDisplay formats a time in the local timezone
+// in RFC3339 format.
+func timeDisplay(t time.Time) string {
+	localTz, err := tz.TimezoneIANA()
+	if err != nil {
+		localTz = time.UTC
+	}
+
+	return t.In(localTz).Format(time.RFC3339)
+}
+
 // relative relativizes a duration with the prefix "ago" or "in"
 func relative(d time.Duration) string {
 	if d > 0 {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func workspaceListRowFromWorkspace(now time.Time, workspace codersdk.Workspace)`
`46`	`46`	`if !ptr.NilOrEmpty(workspace.AutostartSchedule) {`
`47`	`47`	`if sched, err := cron.Weekly(*workspace.AutostartSchedule); err == nil {`
`48`	`48`	`autostartDisplay = fmt.Sprintf("%s %s (%s)", sched.Time(), sched.DaysOfWeek(), sched.Location())`
`49`		`- nextStartDisplay = relative(sched.Next(now).Sub(now))`
	`49`	`+ nextStartDisplay = timeDisplay(sched.Next(now))`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`@@ -55,9 +55,8 @@ func workspaceListRowFromWorkspace(now time.Time, workspace codersdk.Workspace)`
`55`	`55`	`if !ptr.NilOrZero(workspace.TTLMillis) {`
`56`	`56`	`dur := time.Duration(workspace.TTLMillis) time.Millisecond`
`57`	`57`	`autostopDisplay = durationDisplay(dur)`
`58`		`- if !workspace.LatestBuild.Deadline.IsZero() && workspace.LatestBuild.Deadline.Time.After(now) && status == "Running" {`
`59`		`- remaining := time.Until(workspace.LatestBuild.Deadline.Time)`
`60`		`- nextStopDisplay = fmt.Sprintf("%s (%s)", autostopDisplay, relative(remaining))`
	`58`	`+ if !workspace.LatestBuild.Deadline.IsZero() && workspace.LatestBuild.Transition == codersdk.WorkspaceTransitionStart {`
	`59`	`+ nextStopDisplay = timeDisplay(workspace.LatestBuild.Deadline.Time)`
`61`	`60`	`}`
`62`	`61`	`}`
`63`	`62`