Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
fix(frontend): show milliseconds for sub-second durations (#18199)
boojack1dec08d378a8
diff --git a/frontend/src/components/Plan/components/RolloutView/v2/StageContentView.vue b/frontend/src/components/Plan/components/RolloutView/v2/StageContentView.vueindex 04811ebaa2..34130b87ed 100644--- a/frontend/src/components/Plan/components/RolloutView/v2/StageContentView.vue+++ b/frontend/src/components/Plan/components/RolloutView/v2/StageContentView.vue@@ -23,22 +23,6 @@:selected-statuses="filterStatuses"@update:selected-statuses="handleFilterStatusesChange"/>- <!-- Rollback entry -->- <NButton- v-if="- isStageCreated(selectedStage) && rollbackableTaskRuns.length > 0- "- size="small"- quaternary- @click="showRollbackDrawer = true"- >- <template #icon>- <DatabaseBackupIcon :size="16" />- </template>- {{- $t("task-run.rollback.available", rollbackableTaskRuns.length)- }}- </NButton></div><!-- Right: Stage actions -->@@ -73,15 +57,16 @@<!-- Main content area: responsive layout --><div class="flex" :class="isWideScreen ? 'flex-row' : 'flex-col'"><!-- Timeline: inline above on narrow screen -->- <div v-if="!isWideScreen && isStageCreated(selectedStage)" class="mb-4">- <StageTimeline- :stage="selectedStage"- :task-runs="taskRuns"- :is-inline="true"- class="border-y"- />-- </div>+ <div v-if="!isWideScreen && isStageCreated(selectedStage)" class="mb-4">+ <StageTimeline+ :stage="selectedStage"+ :task-runs="taskRuns"+ :rollout="rollout"+ :rollbackable-task-runs="rollbackableTaskRuns"+ :is-inline="true"+ class="border-y"+ />+ </div><!-- Task list content --><div class="flex-1 min-w-0">@@ -102,19 +87,13 @@<StageTimeline:stage="selectedStage":task-runs="taskRuns"+ :rollout="rollout"+ :rollbackable-task-runs="rollbackableTaskRuns":is-inline="false"/></div></div></div>-- <!-- Rollback drawer -->- <TaskRunRollbackDrawer- v-model:show="showRollbackDrawer"- :rollout="rollout"- :rollbackable-task-runs="rollbackableTaskRuns"- @close="showRollbackDrawer = false"- /></div><div v-else class="flex items-center justify-center py-12">@@ -126,7 +105,7 @@<script lang="ts" setup>import { useMediaQuery } from "@vueuse/core";-import { DatabaseBackupIcon, PlayIcon, PlusIcon } from "lucide-vue-next";+import { PlayIcon, PlusIcon } from "lucide-vue-next";import { NButton, NTag } from "naive-ui";import { computed, ref, toRef } from "vue";import { EnvironmentV1Name } from "@/components/v2";@@ -134,7 +113,6 @@ import { useEnvironmentV1Store } from "@/store";import type { Rollout, Stage } from "@/types/proto-es/v1/rollout_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import { usePlanContextWithRollout } from "../../../logic";-import TaskRunRollbackDrawer from "../TaskRunRollbackDrawer.vue";import { useRollbackableTasks } from "./composables/useRollbackableTasks";import StageTimeline from "./StageTimeline.vue";import TaskFilter from "./TaskFilter.vue";@@ -164,7 +142,6 @@ const { rollbackableTaskRuns } = useRollbackableTasks(selectedStageRef,taskRuns);-const showRollbackDrawer = ref(false);const canRunStage = computed(() => {if (!props.selectedStage || !props.isStageCreated(props.selectedStage)) {diff --git a/frontend/src/components/Plan/components/RolloutView/v2/StageTimeline.vue b/frontend/src/components/Plan/components/RolloutView/v2/StageTimeline.vueindex 133d9e8cc0..ddc4cd3894 100644--- a/frontend/src/components/Plan/components/RolloutView/v2/StageTimeline.vue+++ b/frontend/src/components/Plan/components/RolloutView/v2/StageTimeline.vue@@ -3,7 +3,6 @@<!-- Header --><divclass="flex items-center justify-between px-3 py-2"- :class="[isExpanded && 'border-b']"@click="isInline && (isCollapsed = !isCollapsed)"><div class="flex items-center gap-2">@@ -22,10 +21,27 @@</div></div>+ <!-- Rollback entry -->+ <div+ v-if="rollbackableTaskRuns.length > 0"+ class="px-3 pb-3"+ >+ <NButton+ size="small"+ text+ @click="showRollbackDrawer = true"+ >+ <template #icon>+ <DatabaseBackupIcon :size="16" />+ </template>+ {{ $t("task-run.rollback.available", rollbackableTaskRuns.length) }}+ </NButton>+ </div>+<!-- Timeline entries: always show in sidebar mode, toggle in inline mode --><divv-if="isExpanded"- class="overflow-y-auto px-3 py-3"+ class="overflow-y-auto px-3 pt-1 pb-3":class="isInline ? 'max-h-48' : 'max-h-[calc(100vh-300px)]'"><div@@ -98,13 +114,13 @@</div><!-- Duration and Timestamp --><div class="text-xs text-gray-400 mt-0.5 flex items-center gap-1">- <NTooltip v-if="getDuration(taskRun)">+ <NTooltip v-if="getTaskRunDuration(taskRun)"><template #trigger>- <span class="">{{ getDuration(taskRun) }}</span>+ <span>{{ getTaskRunDuration(taskRun) }}</span></template>{{ $t("common.duration") }}</NTooltip>- <span v-if="getDuration(taskRun)">·</span>+ <span v-if="getTaskRunDuration(taskRun)">·</span><TimestampDisplay:timestamp="taskRun.updateTime"custom-class="!text-xs !text-gray-400"@@ -114,35 +130,55 @@</NTimelineItem></NTimeline></div>++ <!-- Rollback drawer -->+ <TaskRunRollbackDrawer+ v-model:show="showRollbackDrawer"+ :rollout="rollout"+ :rollbackable-task-runs="rollbackableTaskRuns"+ @close="showRollbackDrawer = false"+ /></div></template><script lang="ts" setup>-import { ChevronDownIcon, ChevronRightIcon } from "lucide-vue-next";-import { NTimeline, NTimelineItem, NTooltip } from "naive-ui";+import {+ ChevronDownIcon,+ ChevronRightIcon,+ DatabaseBackupIcon,+} from "lucide-vue-next";+import { NButton, NTimeline, NTimelineItem, NTooltip } from "naive-ui";import { computed, ref } from "vue";import TimestampDisplay from "@/components/misc/Timestamp.vue";import TaskStatus from "@/components/Rollout/kits/TaskStatus.vue";-import type { Stage, TaskRun } from "@/types/proto-es/v1/rollout_service_pb";+import type {+ Rollout,+ Stage,+ TaskRun,+} from "@/types/proto-es/v1/rollout_service_pb";import { TaskRun_Status } from "@/types/proto-es/v1/rollout_service_pb";import {extractDatabaseResourceName,extractInstanceResourceName,} from "@/utils";import { useResourcePoller } from "../../../logic/poller";+import TaskRunRollbackDrawer from "../TaskRunRollbackDrawer.vue";+import type { RollbackableTaskRun } from "./composables/useRollbackableTasks";import { useTaskNavigation } from "./composables/useTaskNavigation";import {getErrorPreview,getTaskNameFromTaskRun,+ getTaskRunDuration,getTimelineType,mapTaskRunStatusToTaskStatus,} from "./composables/useTaskRunUtils";-import { formatDuration } from "./composables/useTaskTiming";const props = withDefaults(defineProps<{stage: Stage | null | undefined;taskRuns: TaskRun[];+ rollout: Rollout;+ rollbackableTaskRuns: RollbackableTaskRun[];isInline?: boolean;}>(),{@@ -155,6 +191,7 @@ const emit = defineEmits<{}>();const isCollapsed = ref(false);+const showRollbackDrawer = ref(false);const { navigateToTaskDetail } = useTaskNavigation();const { lastRefreshTime } = useResourcePoller();@@ -209,32 +246,6 @@ const getTaskTargetDisplay = (};};-const getDuration = (taskRun: TaskRun): string => {- const startTime = taskRun.startTime;- const status = taskRun.status;-- // PENDING tasks are scheduled/queued, not running - no duration to show- if (status === TaskRun_Status.PENDING) {- return "";- }-- if (!startTime) return "";-- if (status === TaskRun_Status.RUNNING) {- // Show elapsed time for running tasks- const elapsedMs = Date.now() - Number(startTime.seconds) * 1000;- return elapsedMs > 0 ? formatDuration(elapsedMs) : "";- }-- // For completed tasks (DONE, FAILED, CANCELED), show total duration- const endTime = taskRun.updateTime;- if (!endTime) return "";-- const durationMs =- (Number(endTime.seconds) - Number(startTime.seconds)) * 1000;- return durationMs > 0 ? formatDuration(durationMs) : "";-};-const handleClickTarget = (taskRun: TaskRun) => {const task = getTaskFromTaskRun(taskRun);if (task) {diff --git a/frontend/src/components/Plan/components/RolloutView/v2/TaskItem.vue b/frontend/src/components/Plan/components/RolloutView/v2/TaskItem.vueindex 7a3ac5eeec..e2da144e70 100644--- a/frontend/src/components/Plan/components/RolloutView/v2/TaskItem.vue+++ b/frontend/src/components/Plan/components/RolloutView/v2/TaskItem.vue@@ -1,8 +1,7 @@<template><div- class="collapsible-task-item relative bg-white border rounded-lg transition-all group"+ class="collapsible-task-item relative bg-white border border-gray-300 rounded-lg transition-all group":class="[- borderClass,isExpanded ? 'shadow-sm' : 'hover:shadow-sm',]">@@ -195,7 +194,6 @@<!-- Error message for failed tasks --><div v-if="task.status === Task_Status.FAILED && latestTaskRun.detail" class="mb-2 p-2 bg-red-50 border border-red-200 rounded">- <div class="text-sm font-medium text-red-700 mb-1">{{ t("common.error") }}</div><div class="text-sm text-red-600 whitespace-pre-wrap">{{ latestTaskRun.detail }}</div>@@ -271,7 +269,6 @@ import { useTaskNavigation } from "./composables/useTaskNavigation";import { useTaskRunSummary } from "./composables/useTaskRunSummary";import { useTaskStatement } from "./composables/useTaskStatement";import { useTaskTiming } from "./composables/useTaskTiming";-import { getTaskBorderClass } from "./utils/taskStatus";const props = withDefaults(defineProps<{@@ -340,10 +337,6 @@ const { loading, statementPreview, displayedStatement } = useTaskStatement(() => props.isExpanded);-const borderClass = computed(() => {- return getTaskBorderClass(props.task.status);-});-const latestTaskRun = computed(() => {const taskRunsForTask = allTaskRuns.value.filter((run) =>run.name.startsWith(`${props.task.name}/${taskRunNamePrefix}`)diff --git a/frontend/src/components/Plan/components/RolloutView/v2/composables/useTaskRunUtils.ts b/frontend/src/components/Plan/components/RolloutView/v2/composables/useTaskRunUtils.tsindex 18fa0a656d..f729c95705 100644--- a/frontend/src/components/Plan/components/RolloutView/v2/composables/useTaskRunUtils.ts+++ b/frontend/src/components/Plan/components/RolloutView/v2/composables/useTaskRunUtils.ts@@ -1,4 +1,5 @@import { taskRunNamePrefix } from "@/store";+import type { TaskRun } from "@/types/proto-es/v1/rollout_service_pb";import {Task_Status,TaskRun_Status,@@ -68,3 +69,71 @@ export const getErrorPreview = (detail: string, maxLength = 50): string => {? `${firstLine.substring(0, maxLength)}...`: firstLine;};++/**+ * Format duration in milliseconds to human-readable string.+ * - >= 1h: "Xh Ym"+ * - >= 1m: "Xm Ys"+ * - >= 1s: "Xs"+ * - > 0ms: "Xms"+ * - <= 0: "< 1s"+ */+export const formatDuration = (durationMs: number): string => {+ const seconds = Math.floor(durationMs / 1000);+ const minutes = Math.floor(seconds / 60);+ const hours = Math.floor(minutes / 60);++ if (hours > 0) {+ const remainingMinutes = minutes % 60;+ return `${hours}h ${remainingMinutes}m`;+ }++ if (minutes > 0) {+ const remainingSeconds = seconds % 60;+ return `${minutes}m ${remainingSeconds}s`;+ }++ if (seconds > 0) {+ return `${seconds}s`;+ }++ if (durationMs > 0) {+ return `${Math.round(durationMs)}ms`;+ }++ return "< 1s";+};++/**+ * Get duration display string for a task run.+ * - PENDING: empty (not started yet)+ * - RUNNING: elapsed time from startTime to now+ * - Completed (DONE/FAILED/CANCELED): total duration from startTime to updateTime+ */+export const getTaskRunDuration = (taskRun: TaskRun): string => {+ const { startTime, status, updateTime } = taskRun;++ // PENDING tasks are scheduled/queued, not running - no duration to show+ if (status === TaskRun_Status.PENDING) {+ return "";+ }++ if (!startTime) {+ return "";+ }++ if (status === TaskRun_Status.RUNNING) {+ // Show elapsed time for running tasks+ const elapsedMs = Date.now() - Number(startTime.seconds) * 1000;+ return formatDuration(elapsedMs);+ }++ // For completed tasks (DONE, FAILED, CANCELED), show total duration+ if (!updateTime) {+ return "";+ }++ const durationMs =+ (Number(updateTime.seconds) - Number(startTime.seconds)) * 1000;+ return formatDuration(durationMs);+};diff --git a/frontend/src/components/Plan/components/RolloutView/v2/composables/useTaskTiming.ts b/frontend/src/components/Plan/components/RolloutView/v2/composables/useTaskTiming.tsindex bb8087f754..a79f3277f8 100644--- a/frontend/src/components/Plan/components/RolloutView/v2/composables/useTaskTiming.ts+++ b/frontend/src/components/Plan/components/RolloutView/v2/composables/useTaskTiming.ts@@ -2,6 +2,7 @@ import type { ComputedRef } from "vue";import { computed } from "vue";import type { Task, TaskRun } from "@/types/proto-es/v1/rollout_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";+import { formatDuration } from "./useTaskRunUtils";export type TimingType = "scheduled" | "running" | "completed" | "none";@@ -95,21 +96,3 @@ export const useTaskTiming = (scheduledTime,};};--export const formatDuration = (durationMs: number): string => {- const seconds = Math.floor(durationMs / 1000);- const minutes = Math.floor(seconds / 60);- const hours = Math.floor(minutes / 60);-- if (hours > 0) {- const remainingMinutes = minutes % 60;- return `${hours}h ${remainingMinutes}m`;- }-- if (minutes > 0) {- const remainingSeconds = seconds % 60;- return `${minutes}m ${remainingSeconds}s`;- }-- return `${seconds}s`;-};diff --git a/frontend/src/components/Plan/components/RolloutView/v2/utils/taskStatus.ts b/frontend/src/components/Plan/components/RolloutView/v2/utils/taskStatus.tsindex ad3ab08af8..bcb01b1bbe 100644--- a/frontend/src/components/Plan/components/RolloutView/v2/utils/taskStatus.ts+++ b/frontend/src/components/Plan/components/RolloutView/v2/utils/taskStatus.ts@@ -45,18 +45,6 @@ export const isTaskRunning = (task: Task): boolean => {return task.status === Task_Status.RUNNING;};-/**- * Get border and background CSS classes for a task based on its status- */-export const getTaskBorderClass = (status: Task_Status): string => {- switch (status) {- case Task_Status.FAILED:- return "border-red-300";- default:- return "border-gray-300";- }-};-/*** Create a Map of task status to sort priority based on TASK_STATUS_FILTERS order.* This ensures a single source of truth for task ordering.