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(plan): stop polling done rollouts and refine plan statuses (#19906)
boojack10f49c5e52dc
diff --git a/frontend/src/components/Plan/components/PlanDetailPage/PlanMetadataSidebar.vue b/frontend/src/components/Plan/components/PlanDetailPage/PlanMetadataSidebar.vueindex a0e654e3c3..b605096c4d 100644--- a/frontend/src/components/Plan/components/PlanDetailPage/PlanMetadataSidebar.vue+++ b/frontend/src/components/Plan/components/PlanDetailPage/PlanMetadataSidebar.vue@@ -135,6 +135,13 @@ const getRolloutStatusInfo = (): StatusInfo => {return getReviewStatusInfo();}+ const hasCompletedTasks = rollout.value.stages+ .flatMap((stage) => stage.tasks)+ .some(+ (task) =>+ task.status === Task_Status.DONE || task.status === Task_Status.SKIPPED+ );+switch (getRolloutStatus(rollout.value)) {case Task_Status.DONE:case Task_Status.SKIPPED:@@ -150,6 +157,13 @@ const getRolloutStatusInfo = (): StatusInfo => {dotClass: "bg-control-placeholder",};case Task_Status.NOT_STARTED:+ if (hasCompletedTasks) {+ return { label: t("common.deploying"), dotClass: "bg-accent" };+ }+ return {+ label: t("common.not-started"),+ dotClass: "bg-control-placeholder",+ };default:return {label: t("common.not-started"),diff --git a/frontend/src/components/Plan/components/PlanDetailPage/usePhaseState.ts b/frontend/src/components/Plan/components/PlanDetailPage/usePhaseState.tsindex cd7db37cbf..bbd716aaad 100644--- a/frontend/src/components/Plan/components/PlanDetailPage/usePhaseState.ts+++ b/frontend/src/components/Plan/components/PlanDetailPage/usePhaseState.ts@@ -110,9 +110,20 @@ export const usePhaseState = (const deployBadge = computed<PhaseBadge | undefined>(() => {if (statusMap.value.deploy !== "active" || !rollout.value) return undefined;const allTasks = rollout.value.stages.flatMap((s) => s.tasks);+ const hasCompletedTasks = allTasks.some(+ (task) =>+ task.status === Task_Status.DONE || task.status === Task_Status.SKIPPED+ );if (allTasks.some((task) => task.status === Task_Status.FAILED))return { label: t("common.failed"), type: "error" };- if (allTasks.some((task) => task.status === Task_Status.RUNNING))+ if (+ allTasks.some(+ (task) =>+ task.status === Task_Status.RUNNING ||+ task.status === Task_Status.PENDING+ ) ||+ hasCompletedTasks+ )return { label: t("common.in-progress"), type: "info" };return { label: t("common.not-started"), type: "default" };});diff --git a/frontend/src/components/Plan/logic/poller/poller.ts b/frontend/src/components/Plan/logic/poller/poller.tsindex a2f00e302d..94c622f175 100644--- a/frontend/src/components/Plan/logic/poller/poller.ts+++ b/frontend/src/components/Plan/logic/poller/poller.ts@@ -22,7 +22,10 @@ import { getRouteQueryString } from "@/router/dashboard/projectV1RouteHelpers";import { useCurrentProjectV1 } from "@/store";import { isValidRolloutName } from "@/types";import { IssueSchema } from "@/types/proto-es/v1/issue_service_pb";-import { RolloutSchema } from "@/types/proto-es/v1/rollout_service_pb";+import {+ RolloutSchema,+ Task_Status,+} from "@/types/proto-es/v1/rollout_service_pb";import {getRolloutFromPlan,isValidIssueName,@@ -195,6 +198,19 @@ export const provideResourcePoller = () => {const resourcesToPolled = computed(() => uniq([...resourcesFromRoute.value]));+ const isPlanDone = computed(() => {+ if (!rollout.value) return false;+ const allTasks = rollout.value.stages.flatMap((stage) => stage.tasks);+ return (+ allTasks.length > 0 &&+ allTasks.every(+ (task) =>+ task.status === Task_Status.DONE ||+ task.status === Task_Status.SKIPPED+ )+ );+ });+// Initialize existing resources that are already on the planconst initializeExistingResources = async () => {if (@@ -313,7 +329,10 @@ export const provideResourcePoller = () => {// Restart poller with clean stateconst restartPoller = () => {- const shouldPoll = !isCreating.value && resourcesToPolled.value.length > 0;+ const shouldPoll =+ !isCreating.value &&+ !isPlanDone.value &&+ resourcesToPolled.value.length > 0;if (!shouldPoll) return;resourcePoller.stop();@@ -431,14 +450,18 @@ export const provideResourcePoller = () => {// Main poller lifecycle managementwatchEffect(async () => {const activeResources = resourcesToPolled.value;- const shouldPoll = !isCreating.value && activeResources.length > 0;+ const shouldLoadResources = !isCreating.value && activeResources.length > 0;+ const shouldPoll = shouldLoadResources && !isPlanDone.value;- if (shouldPoll) {+ if (shouldLoadResources) {await initializeExistingResources();- if (!pollerState.value.isPollerRunning) {+ if (shouldPoll && !pollerState.value.isPollerRunning) {resourcePoller.start();pollerState.value.isPollerRunning = true;+ } else if (!shouldPoll && pollerState.value.isPollerRunning) {+ resourcePoller.stop();+ pollerState.value.isPollerRunning = false;}if (!pollerState.value.hasInitialRefresh) {diff --git a/frontend/src/components/Plan/logic/useRolloutReadyLink.ts b/frontend/src/components/Plan/logic/useRolloutReadyLink.tsindex b7494746ab..85b68194be 100644--- a/frontend/src/components/Plan/logic/useRolloutReadyLink.ts+++ b/frontend/src/components/Plan/logic/useRolloutReadyLink.ts@@ -2,13 +2,12 @@ import { computed } from "vue";import { useRoute } from "vue-router";import { PROJECT_V1_ROUTE_ISSUE_DETAIL } from "@/router/dashboard/projectV1";import { usePlanContext } from "./context";-import { isDatabaseChangeSpec } from "./plan";/*** Composable that determines whether the "Plan" link should be shown.* This link appears on the Issue page when:* - The plan has an existing rollout- * - All specs are database-change related+ * - All specs are database change specs*/export const useRolloutReadyLink = () => {const route = useRoute();@@ -22,7 +21,9 @@ export const useRolloutReadyLink = () => {return (plan.value.specs.length > 0 &&- plan.value.specs.every(isDatabaseChangeSpec)+ plan.value.specs.every(+ (spec) => spec.config.case === "changeDatabaseConfig"+ ));});