Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor(frontend): update rollout routes to nest under plan (#18668)
boojack704270b57959
diff --git a/action/command/output/output_test.go b/action/command/output/output_test.goindex c10d5654c8..060ec5bc6e 100644--- a/action/command/output/output_test.go+++ b/action/command/output/output_test.go@@ -30,7 +30,7 @@ func TestWriteOutputJSON_StringFieldsOnly(t *testing.T) {w.Output = outputFilew.OutputMap.Release = "projects/test/releases/123"w.OutputMap.Plan = "projects/test/plans/456"- w.OutputMap.Rollout = "projects/test/rollouts/789"+ w.OutputMap.Rollout = "projects/test/plans/789/rollout"err := writeOutputJSON(w)require.NoError(t, err)@@ -46,7 +46,7 @@ func TestWriteOutputJSON_StringFieldsOnly(t *testing.T) {require.Equal(t, "projects/test/releases/123", result["release"])require.Equal(t, "projects/test/plans/456", result["plan"])- require.Equal(t, "projects/test/rollouts/789", result["rollout"])+ require.Equal(t, "projects/test/plans/789/rollout", result["rollout"])require.NotContains(t, result, "checkResults")}@@ -152,7 +152,7 @@ func TestWriteOutputJSON_AllFieldsPopulated(t *testing.T) {w.Output = outputFilew.OutputMap.Release = "projects/test/releases/123"w.OutputMap.Plan = "projects/test/plans/456"- w.OutputMap.Rollout = "projects/test/rollouts/789"+ w.OutputMap.Rollout = "projects/test/plans/789/rollout"w.OutputMap.CheckResults = &v1pb.CheckReleaseResponse{Results: []*v1pb.CheckReleaseResponse_CheckResult{{@@ -179,7 +179,7 @@ func TestWriteOutputJSON_AllFieldsPopulated(t *testing.T) {// Verify all fields are presentrequire.Equal(t, "projects/test/releases/123", result["release"])require.Equal(t, "projects/test/plans/456", result["plan"])- require.Equal(t, "projects/test/rollouts/789", result["rollout"])+ require.Equal(t, "projects/test/plans/789/rollout", result["rollout"])require.Contains(t, result, "checkResults")// Verify CheckResults structurediff --git a/backend/component/webhook/manager.go b/backend/component/webhook/manager.goindex dc59420e74..ec17ea82d8 100644--- a/backend/component/webhook/manager.go+++ b/backend/component/webhook/manager.go@@ -89,7 +89,7 @@ func (m *Manager) getWebhookContextFromEvent(ctx context.Context, e *Event, even// TODO(steven): Remove the slug dependency when the legacy issue page is removed.link = fmt.Sprintf("%s/projects/%s/issues/%s-%d", externalURL, e.Project.ResourceID, slug.Make(e.Issue.Title), e.Issue.UID)} else if e.Rollout != nil {- link = fmt.Sprintf("%s/projects/%s/rollouts/%d", externalURL, e.Project.ResourceID, e.Rollout.UID)+ link = fmt.Sprintf("%s/projects/%s/plans/%d/rollout", externalURL, e.Project.ResourceID, e.Rollout.UID)}switch e.Type {case storepb.Activity_ISSUE_CREATE:diff --git a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/TaskName.vue b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/TaskName.vueindex 64cb20e842..e5a0cf16e6 100644--- a/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/TaskName.vue+++ b/frontend/src/components/IssueV1/components/IssueCommentSection/IssueCommentView/TaskName.vue@@ -25,7 +25,7 @@ import { projectOfIssue } from "@/components/IssueV1/logic";import { useIssueLayoutVersion } from "@/composables/useIssueLayoutVersion";import {PROJECT_V1_ROUTE_ISSUE_DETAIL,- PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK,} from "@/router/dashboard/projectV1";import type { Issue } from "@/types/proto-es/v1/issue_service_pb";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";@@ -56,7 +56,7 @@ const link = computed(() => {if (enabledNewLayout.value) {return {- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK,params: {projectId: extractProjectResourceName(task.name),planId: extractPlanUIDFromRolloutName(task.name),diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vue b/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vueindex 7f183f92a7..05cd2c613d 100644--- a/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vue+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/Actions.vue@@ -76,7 +76,7 @@ import {issueServiceClientConnect,rolloutServiceClientConnect,} from "@/grpcweb";-import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL } from "@/router/dashboard/projectV1";+import { PROJECT_V1_ROUTE_PLAN_ROLLOUT } from "@/router/dashboard/projectV1";import { pushNotification, useCurrentProjectV1 } from "@/store";import { usePlanStore } from "@/store/modules/v1/plan";import { State } from "@/types/proto-es/v1/common_pb";@@ -283,7 +283,7 @@ const handleCreateRollout = async () => {});router.push({- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT,params: {projectId: extractProjectResourceName(project.value.name),planId: extractPlanUIDFromRolloutName(createdRollout.name),diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/RolloutReadyLink.vue b/frontend/src/components/Plan/components/HeaderSection/Actions/RolloutReadyLink.vueindex 7d3c16ef40..61ce5efc6d 100644--- a/frontend/src/components/Plan/components/HeaderSection/Actions/RolloutReadyLink.vue+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/RolloutReadyLink.vue@@ -17,7 +17,7 @@ import { NButton } from "naive-ui";import { computed } from "vue";import { usePlanContext } from "@/components/Plan/logic";import TaskStatus from "@/components/Rollout/kits/TaskStatus.vue";-import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL } from "@/router/dashboard/projectV1";+import { PROJECT_V1_ROUTE_PLAN_ROLLOUT } from "@/router/dashboard/projectV1";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";import {extractPlanUIDFromRolloutName,@@ -38,7 +38,7 @@ const planID = computed(() => {});const rolloutRoute = computed(() => ({- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT,params: {projectId: extractProjectResourceName(plan.value.name),planId: extractPlanUIDFromRolloutName(rollout.value?.name ?? ""),diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/create/RolloutCreatePanel.vue b/frontend/src/components/Plan/components/HeaderSection/Actions/create/RolloutCreatePanel.vueindex 7c75c74975..529bf0d4e8 100644--- a/frontend/src/components/Plan/components/HeaderSection/Actions/create/RolloutCreatePanel.vue+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/create/RolloutCreatePanel.vue@@ -77,7 +77,7 @@ import { ApprovalFlowSection } from "@/components/Plan/components/IssueReviewVieimport PlanCheckStatusCount from "@/components/Plan/components/PlanCheckStatusCount.vue";import { usePlanContext } from "@/components/Plan/logic";import { rolloutServiceClientConnect } from "@/grpcweb";-import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL } from "@/router/dashboard/projectV1";+import { PROJECT_V1_ROUTE_PLAN_ROLLOUT } from "@/router/dashboard/projectV1";import { pushNotification } from "@/store";import { CreateRolloutRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";import {@@ -163,7 +163,7 @@ const handleConfirm = async () => {emit("confirm");router.push({- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT,params: {projectId: extractProjectResourceName(project.value.name),planId: extractPlanUIDFromRolloutName(createdRollout.name),diff --git a/frontend/src/components/Plan/components/HeaderSection/Actions/unified/IssueReviewButton.vue b/frontend/src/components/Plan/components/HeaderSection/Actions/unified/IssueReviewButton.vueindex ad4adb0e46..aaac2f9b92 100644--- a/frontend/src/components/Plan/components/HeaderSection/Actions/unified/IssueReviewButton.vue+++ b/frontend/src/components/Plan/components/HeaderSection/Actions/unified/IssueReviewButton.vue@@ -167,7 +167,7 @@ import { usePlanContext } from "@/components/Plan/logic";import { issueServiceClientConnect } from "@/grpcweb";import {PROJECT_V1_ROUTE_ISSUE_DETAIL_V1,- PROJECT_V1_ROUTE_ROLLOUT_DETAIL,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT,} from "@/router/dashboard/projectV1";import {pushNotification,@@ -360,7 +360,7 @@ const handlePostActionNavigation = (nextTick(() => {router.push({- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT,params: {projectId: extractProjectResourceName(issueValue.name),planId: extractPlanUIDFromRolloutName(rolloutValue.name),diff --git a/frontend/src/components/Plan/components/IssueReviewView/ActivitySection/IssueCommentView/StageName.vue b/frontend/src/components/Plan/components/IssueReviewView/ActivitySection/IssueCommentView/StageName.vueindex 6bb6c117aa..70524cf495 100644--- a/frontend/src/components/Plan/components/IssueReviewView/ActivitySection/IssueCommentView/StageName.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/ActivitySection/IssueCommentView/StageName.vue@@ -14,7 +14,7 @@<script lang="ts" setup>import { computed } from "vue";import { EnvironmentV1Name } from "@/components/v2";-import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL } from "@/router/dashboard/projectV1";+import { PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE } from "@/router/dashboard/projectV1";import { useEnvironmentV1Store } from "@/store";import type { Stage } from "@/types/proto-es/v1/rollout_service_pb";import {@@ -33,7 +33,7 @@ const link = computed(() => {const { stage } = props;return {- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE,params: {projectId: extractProjectResourceName(stage.name),planId: extractPlanUIDFromRolloutName(stage.name),diff --git a/frontend/src/components/Plan/components/IssueReviewView/OverviewSection.vue b/frontend/src/components/Plan/components/IssueReviewView/OverviewSection.vueindex baf2c13e51..a8ad08520a 100644--- a/frontend/src/components/Plan/components/IssueReviewView/OverviewSection.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/OverviewSection.vue@@ -71,7 +71,7 @@ import { ref } from "vue";import { useRouter } from "vue-router";import TaskStatus from "@/components/Rollout/kits/TaskStatus.vue";import { EnvironmentV1Name } from "@/components/v2";-import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL } from "@/router/dashboard/projectV1";+import { PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE } from "@/router/dashboard/projectV1";import { useCurrentProjectV1, useEnvironmentV1Store } from "@/store";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";import {@@ -104,7 +104,7 @@ const navigateToStage = (stageName: string) => {if (!planId || !stageId) return;router.push({- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE,params: {projectId: extractProjectResourceName(project.value.name),planId,diff --git a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/DatabaseChangeSection.vue b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/DatabaseChangeSection.vueindex 19ba1e0a40..121f9d3566 100644--- a/frontend/src/components/Plan/components/IssueReviewView/Sidebar/DatabaseChangeSection.vue+++ b/frontend/src/components/Plan/components/IssueReviewView/Sidebar/DatabaseChangeSection.vue@@ -73,7 +73,7 @@ import { computed, ref } from "vue";import { useRouter } from "vue-router";import TaskStatus from "@/components/Rollout/kits/TaskStatus.vue";import { EnvironmentV1Name } from "@/components/v2";-import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL } from "@/router/dashboard/projectV1";+import { PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE } from "@/router/dashboard/projectV1";import { useCurrentProjectV1, useEnvironmentV1Store } from "@/store";import { Issue_Type } from "@/types/proto-es/v1/issue_service_pb";import { Advice_Level } from "@/types/proto-es/v1/sql_service_pb";@@ -111,7 +111,7 @@ const navigateToStage = (stageName: string) => {if (!planId || !stageId) return;router.push({- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE,params: {projectId: extractProjectResourceName(project.value.name),planId,diff --git a/frontend/src/components/Plan/components/SpecDetailView/FailedTaskRunsSection.vue b/frontend/src/components/Plan/components/SpecDetailView/FailedTaskRunsSection.vueindex ed7f7f2059..83119c3ad6 100644--- a/frontend/src/components/Plan/components/SpecDetailView/FailedTaskRunsSection.vue+++ b/frontend/src/components/Plan/components/SpecDetailView/FailedTaskRunsSection.vue@@ -60,7 +60,7 @@ import TaskRunStatusIcon from "@/components/IssueV1/components/TaskRunSection/Taimport HumanizeDate from "@/components/misc/HumanizeDate.vue";import TaskRunComment from "@/components/RolloutV1/components/TaskRunComment.vue";import { Drawer, DrawerContent } from "@/components/v2";-import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL } from "@/router/dashboard/projectV1";+import { PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK } from "@/router/dashboard/projectV1";import { useCurrentProjectV1, useDatabaseV1Store } from "@/store";import { useTaskRunLogStore } from "@/store/modules/v1/taskRunLog";import { getDateForPbTimestampProtoEs } from "@/types";@@ -298,7 +298,7 @@ const navigateToTaskDetail = (taskRun: TaskRun) => {const params = getTaskRouteParams(taskRun);if (params) {router.push({- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK,params: {projectId: extractProjectResourceName(project.value.name),planId: params.planId,diff --git a/frontend/src/components/Plan/logic/poller/poller.ts b/frontend/src/components/Plan/logic/poller/poller.tsindex 4b9d3b88ca..079224d829 100644--- a/frontend/src/components/Plan/logic/poller/poller.ts+++ b/frontend/src/components/Plan/logic/poller/poller.ts@@ -17,9 +17,9 @@ import {PROJECT_V1_ROUTE_PLAN_DETAIL,PROJECT_V1_ROUTE_PLAN_DETAIL_SPEC_DETAIL,PROJECT_V1_ROUTE_PLAN_DETAIL_SPECS,- PROJECT_V1_ROUTE_ROLLOUT_DETAIL,- PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL,- PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK,} from "@/router/dashboard/projectV1";import { useCurrentProjectV1 } from "@/store";import { isValidRolloutName } from "@/types";@@ -164,9 +164,9 @@ export const provideResourcePoller = () => {PROJECT_V1_ROUTE_PLAN_DETAIL_SPEC_DETAIL,];const rolloutRoutes = [- PROJECT_V1_ROUTE_ROLLOUT_DETAIL,- PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL,- PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK,];if (includes(planRoutes, routeName)) return ["plan"];diff --git a/frontend/src/components/Plan/logic/useRolloutReadyLink.ts b/frontend/src/components/Plan/logic/useRolloutReadyLink.tsindex 5f1baeb720..b8782854ed 100644--- a/frontend/src/components/Plan/logic/useRolloutReadyLink.ts+++ b/frontend/src/components/Plan/logic/useRolloutReadyLink.ts@@ -1,9 +1,9 @@import { computed } from "vue";import { useRoute } from "vue-router";import {- PROJECT_V1_ROUTE_ROLLOUT_DETAIL,- PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL,- PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK,} from "@/router/dashboard/projectV1";import {Issue_ApprovalStatus,@@ -14,9 +14,9 @@ import { Task_Status, Task_Type } from "@/types/proto-es/v1/rollout_service_pb";import { usePlanContext } from "./context";const ROLLOUT_ROUTES = new Set([- PROJECT_V1_ROUTE_ROLLOUT_DETAIL,- PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL,- PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK,]);const ACTIONABLE_TASK_STATUSES = new Set([diff --git a/frontend/src/components/Rollout/RolloutDataTable.vue b/frontend/src/components/Rollout/RolloutDataTable.vueindex 49ca26d36e..04c686bf05 100644--- a/frontend/src/components/Rollout/RolloutDataTable.vue+++ b/frontend/src/components/Rollout/RolloutDataTable.vue@@ -21,7 +21,7 @@ import Timestamp from "@/components/misc/Timestamp.vue";import { TASK_STATUS_FILTERS } from "@/components/Plan/constants/task";import TaskStatus from "@/components/Rollout/kits/TaskStatus.vue";import { EnvironmentV1Name } from "@/components/v2";-import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL } from "@/router/dashboard/projectV1";+import { PROJECT_V1_ROUTE_PLAN_ROLLOUT } from "@/router/dashboard/projectV1";import { useEnvironmentV1Store } from "@/store";import type {Rollout,@@ -190,7 +190,7 @@ const rowProps = (rollout: Rollout) => {style: "cursor: pointer;",onClick: (e: MouseEvent) => {const routeParams = {- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT,params: {projectId: extractProjectResourceName(rollout.name),planId: extractPlanUIDFromRolloutName(rollout.name),diff --git a/frontend/src/components/RolloutV1/components/RolloutBreadcrumb.vue b/frontend/src/components/RolloutV1/components/RolloutBreadcrumb.vueindex 3d21fb4796..91ed716f10 100644--- a/frontend/src/components/RolloutV1/components/RolloutBreadcrumb.vue+++ b/frontend/src/components/RolloutV1/components/RolloutBreadcrumb.vue@@ -24,8 +24,8 @@ import { usePlanContext } from "@/components/Plan/logic";import {PROJECT_V1_ROUTE_ISSUE_DETAIL_V1,PROJECT_V1_ROUTE_PLAN_DETAIL,- PROJECT_V1_ROUTE_ROLLOUT_DETAIL,- PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT,+ PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE,} from "@/router/dashboard/projectV1";import { useEnvironmentV1Store } from "@/store";import {@@ -116,7 +116,7 @@ const breadcrumbItems = computed<BreadcrumbItem[]>(() => {items.push({label: `${t("common.rollout")} #${planID.value}`,route: {- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT,params: { projectId: projectId.value, planId: planID.value },},clickable: hasTask,@@ -127,7 +127,7 @@ const breadcrumbItems = computed<BreadcrumbItem[]>(() => {items.push({label: stageTitle.value,route: {- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE,params: {projectId: projectId.value,planId: planID.value,diff --git a/frontend/src/components/RolloutV1/components/RolloutView.vue b/frontend/src/components/RolloutV1/components/RolloutView.vueindex c8b1d1c9f3..ad49ccd9ba 100644--- a/frontend/src/components/RolloutV1/components/RolloutView.vue+++ b/frontend/src/components/RolloutV1/components/RolloutView.vue@@ -40,7 +40,7 @@ import BBSpin from "@/bbkit/BBSpin.vue";import { usePlanContextWithRollout } from "@/components/Plan/logic";import { useRolloutViewContext } from "@/components/RolloutV1/logic/context";import { rolloutServiceClientConnect } from "@/grpcweb";-import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL } from "@/router/dashboard/projectV1";+import { PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE } from "@/router/dashboard/projectV1";import { useCurrentProjectV1 } from "@/store";import { pushNotification } from "@/store/modules/notification";import type { Stage } from "@/types/proto-es/v1/rollout_service_pb";@@ -92,7 +92,7 @@ watch(const planId = extractPlanUIDFromRolloutName(rollout.value.name);router.replace({- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE,params: {projectId: extractProjectResourceName(project.value.name),planId: planId || "_",@@ -111,7 +111,7 @@ const handleStageSelect = (stage: Stage) => {const planId = extractPlanUIDFromRolloutName(rollout.value.name);router.push({- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE,params: {projectId: extractProjectResourceName(project.value.name),planId: planId || "_",diff --git a/frontend/src/components/RolloutV1/components/TaskItem.vue b/frontend/src/components/RolloutV1/components/TaskItem.vueindex b873920a84..b1642dc197 100644--- a/frontend/src/components/RolloutV1/components/TaskItem.vue+++ b/frontend/src/components/RolloutV1/components/TaskItem.vue@@ -230,7 +230,7 @@ import Timestamp from "@/components/misc/Timestamp.vue";import { usePlanContextWithRollout } from "@/components/Plan";import DatabaseDisplay from "@/components/Plan/components/common/DatabaseDisplay.vue";import TaskStatus from "@/components/Rollout/kits/TaskStatus.vue";-import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL } from "@/router/dashboard/projectV1";+import { PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK } from "@/router/dashboard/projectV1";import { taskRunNamePrefix, useSheetV1Store } from "@/store";import type { Stage, Task } from "@/types/proto-es/v1/rollout_service_pb";import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";@@ -310,7 +310,7 @@ const taskDetailRoute = computed(() => {const taskId = extractTaskUID(props.task.name);return {- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK,params: {projectId: projectName,planId: planId || "-",diff --git a/frontend/src/components/RolloutV1/components/TaskTable.vue b/frontend/src/components/RolloutV1/components/TaskTable.vueindex 6a25527563..3849d549b8 100644--- a/frontend/src/components/RolloutV1/components/TaskTable.vue+++ b/frontend/src/components/RolloutV1/components/TaskTable.vue@@ -31,7 +31,7 @@ import DatabaseDisplay from "@/components/Plan/components/common/DatabaseDisplayimport { usePlanContextWithRollout } from "@/components/Plan/logic";import TaskStatus from "@/components/Rollout/kits/TaskStatus.vue";import { useRolloutViewContext } from "@/components/RolloutV1/logic/context";-import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL } from "@/router/dashboard/projectV1";+import { PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK } from "@/router/dashboard/projectV1";import { useDatabaseV1Store } from "@/store";import { getTimeForPbTimestampProtoEs } from "@/types";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";@@ -142,7 +142,7 @@ const handleRowClick = (task: Task) => {const params = getTaskRouteParams(task);if (params) {router.push({- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK,params: {projectId: extractProjectResourceName(task.name),planId: extractPlanUIDFromRolloutName(task.name),diff --git a/frontend/src/components/RolloutV1/components/composables/useTaskNavigation.ts b/frontend/src/components/RolloutV1/components/composables/useTaskNavigation.tsindex 9eb3a3fe53..f10ee103b1 100644--- a/frontend/src/components/RolloutV1/components/composables/useTaskNavigation.ts+++ b/frontend/src/components/RolloutV1/components/composables/useTaskNavigation.ts@@ -1,5 +1,5 @@import { useRouter } from "vue-router";-import { PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL } from "@/router/dashboard/projectV1";+import { PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK } from "@/router/dashboard/projectV1";import type { Task } from "@/types/proto-es/v1/rollout_service_pb";import {extractPlanUIDFromRolloutName,@@ -25,7 +25,7 @@ export const useTaskNavigation = () => {const taskId = extractTaskUID(task.name);router.push({- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK,params: {projectId: projectName,planId: planId || "-",diff --git a/frontend/src/router/dashboard/projectV1.ts b/frontend/src/router/dashboard/projectV1.tsindex b85bbdcd99..2c33aaf3aa 100644--- a/frontend/src/router/dashboard/projectV1.ts+++ b/frontend/src/router/dashboard/projectV1.ts@@ -30,9 +30,9 @@ export const PROJECT_V1_ROUTE_EXPORT_CENTER = `${PROJECT_V1_ROUTE_DASHBOARD}.expexport const PROJECT_V1_ROUTE_RELEASES = `${PROJECT_V1_ROUTE_DASHBOARD}.release`;export const PROJECT_V1_ROUTE_RELEASE_DETAIL = `${PROJECT_V1_ROUTE_DASHBOARD}.release.detail`;export const PROJECT_V1_ROUTE_ROLLOUTS = `${PROJECT_V1_ROUTE_DASHBOARD}.rollout`;-export const PROJECT_V1_ROUTE_ROLLOUT_DETAIL = `${PROJECT_V1_ROUTE_ROLLOUTS}.detail`;-export const PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL = `${PROJECT_V1_ROUTE_ROLLOUT_DETAIL}.stage.detail`;-export const PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL = `${PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL}.task.detail`;+export const PROJECT_V1_ROUTE_PLAN_ROLLOUT = `${PROJECT_V1_ROUTE_PLAN_DETAIL}.rollout`;+export const PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE = `${PROJECT_V1_ROUTE_PLAN_ROLLOUT}.stage`;+export const PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK = `${PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE}.task`;const issueRoutes: RouteRecordRaw[] = [{@@ -79,9 +79,10 @@ const issueRoutes: RouteRecordRaw[] = [},];+// Rollout routes - nested under plans/:planId/rolloutconst rolloutRoutes: RouteRecordRaw[] = [{- path: "rollouts/:planId",+ path: "plans/:planId/rollout",component: () => import("@/views/project/RolloutLayout.vue"),props: true,meta: {@@ -95,7 +96,7 @@ const rolloutRoutes: RouteRecordRaw[] = [children: [{path: "",- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT,component: () =>import("@/components/RolloutV1/components/RolloutView.vue"),props: true,@@ -105,7 +106,7 @@ const rolloutRoutes: RouteRecordRaw[] = [},{path: "stages/:stageId",- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL_STAGE_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT_STAGE,component: () =>import("@/components/RolloutV1/components/RolloutView.vue"),props: true,@@ -115,7 +116,7 @@ const rolloutRoutes: RouteRecordRaw[] = [},{path: "stages/:stageId/tasks/:taskId",- name: PROJECT_V1_ROUTE_ROLLOUT_DETAIL_TASK_DETAIL,+ name: PROJECT_V1_ROUTE_PLAN_ROLLOUT_TASK,component: () =>import("@/components/RolloutV1/components/TaskView.vue"),props: true,