Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor: use backend Issue_ApprovalStatus directly in frontend (#17646)

Danny Xu4ae515d33f8c
diff --git a/frontend/src/components/IssueV1/components/BannerSection.vue b/frontend/src/components/IssueV1/components/BannerSection.vue
index dc92569a2e..d3bec2e5c0 100644
--- a/frontend/src/components/IssueV1/components/BannerSection.vue
+++ b/frontend/src/components/IssueV1/components/BannerSection.vue
@@ -52,7 +52,7 @@ import dayjs from "dayjs";
import { computed } from "vue";
import {
IssueStatus,
- Issue_Approver_Status,
+ Issue_ApprovalStatus,
} from "@/types/proto-es/v1/issue_service_pb";
import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";
import { activeTaskInRollout, isDatabaseChangeRelatedIssue } from "@/utils";
@@ -67,13 +67,13 @@ const { status: reviewStatus } = reviewContext;
const showPendingReview = computed(() => {
if (isCreating.value) return false;
if (issue.value.status !== IssueStatus.OPEN) return false;
- return reviewStatus.value === Issue_Approver_Status.PENDING;
+ return reviewStatus.value === Issue_ApprovalStatus.PENDING;
});
const showRejectedReview = computed(() => {
if (isCreating.value) return false;
if (issue.value.status !== IssueStatus.OPEN) return false;
- return reviewStatus.value === Issue_Approver_Status.REJECTED;
+ return reviewStatus.value === Issue_ApprovalStatus.REJECTED;
});
const showClosedBanner = computed(() => {
diff --git a/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/IssueReviewButtonGroup.vue b/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/IssueReviewButtonGroup.vue
index 51161d48d1..a5e5e9b8f7 100644
--- a/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/IssueReviewButtonGroup.vue
+++ b/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/IssueReviewButtonGroup.vue
@@ -31,7 +31,7 @@ import {
import { useCurrentUserV1, extractUserId, useCurrentProjectV1 } from "@/store";
import {
IssueStatus,
- Issue_Approver_Status,
+ Issue_ApprovalStatus,
} from "@/types/proto-es/v1/issue_service_pb";
import {
isDatabaseChangeRelatedIssue,
@@ -76,16 +76,16 @@ const shouldShowApproveOrReject = computed(() => {
});
const shouldShowApprove = computed(() => {
if (!shouldShowApproveOrReject.value) return false;
- return status.value === Issue_Approver_Status.PENDING;
+ return status.value === Issue_ApprovalStatus.PENDING;
});
const shouldShowReject = computed(() => {
if (!shouldShowApproveOrReject.value) return false;
- return status.value === Issue_Approver_Status.PENDING;
+ return status.value === Issue_ApprovalStatus.PENDING;
});
const shouldShowReRequestReview = computed(() => {
return (
extractUserId(issue.value.creator) === currentUser.value.email &&
- status.value === Issue_Approver_Status.REJECTED
+ status.value === Issue_ApprovalStatus.REJECTED
);
});
const issueReviewActionList = computed(() => {
@@ -104,10 +104,7 @@ const issueReviewActionList = computed(() => {
});
const issueStatusActionList = computed(() => {
- return getApplicableIssueStatusActionList(
- issue.value,
- reviewContext.status.value
- );
+ return getApplicableIssueStatusActionList(issue.value);
});
const forceRolloutActionList = computed((): ExtraActionOption[] => {
// If it's not a database change related issue, no force rollout actions.
diff --git a/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/CombinedRolloutButtonGroup.vue b/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/CombinedRolloutButtonGroup.vue
index 39276550e8..e7b734a790 100644
--- a/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/CombinedRolloutButtonGroup.vue
+++ b/frontend/src/components/IssueV1/components/HeaderSection/Actions/rollout/CombinedRolloutButtonGroup.vue
@@ -37,20 +37,11 @@ import RolloutActionButtonGroup from "./RolloutActionButtonGroup.vue";
import type { RolloutAction } from "./common";
const { t } = useI18n();
-const {
- issue,
- selectedStage,
- selectedTask,
- events,
- releaserCandidates,
- reviewContext,
-} = useIssueContext();
+const { issue, selectedStage, selectedTask, events, releaserCandidates } =
+ useIssueContext();
const issueStatusActionList = computed(() => {
- return getApplicableIssueStatusActionList(
- issue.value,
- reviewContext.status.value
- );
+ return getApplicableIssueStatusActionList(issue.value);
});
const taskRolloutActionList = computed(() => {
diff --git a/frontend/src/components/IssueV1/logic/action/issue.ts b/frontend/src/components/IssueV1/logic/action/issue.ts
index b6bdf4a4fa..25dc5ee35f 100644
--- a/frontend/src/components/IssueV1/logic/action/issue.ts
+++ b/frontend/src/components/IssueV1/logic/action/issue.ts
@@ -2,10 +2,7 @@ import type { ButtonProps } from "naive-ui";
import { t } from "@/plugins/i18n";
import { useCurrentUserV1, extractUserId } from "@/store";
import type { ComposedIssue } from "@/types";
-import {
- IssueStatus,
- Issue_Approver_Status,
-} from "@/types/proto-es/v1/issue_service_pb";
+import { IssueStatus } from "@/types/proto-es/v1/issue_service_pb";
import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";
import {
flattenTaskV1List,
@@ -40,8 +37,7 @@ export const PossibleIssueStatusActionMap: Record<
};
export const getApplicableIssueStatusActionList = (
- issue: ComposedIssue,
- _reviewStatus?: Issue_Approver_Status
+ issue: ComposedIssue
): IssueStatusAction[] => {
const list = PossibleIssueStatusActionMap[issue.status];
return list.filter((action) => {
diff --git a/frontend/src/components/IssueV1/logic/context.ts b/frontend/src/components/IssueV1/logic/context.ts
index f9488ee707..5a0e8a6cd8 100644
--- a/frontend/src/components/IssueV1/logic/context.ts
+++ b/frontend/src/components/IssueV1/logic/context.ts
@@ -4,7 +4,7 @@ import { v4 as uuidv4 } from "uuid";
import type { InjectionKey, Ref, ComputedRef } from "vue";
import { inject, provide } from "vue";
import type { ComposedIssue, ReviewFlow } from "@/types";
-import type { Issue_Approver_Status } from "@/types/proto-es/v1/issue_service_pb";
+import type { Issue_ApprovalStatus } from "@/types/proto-es/v1/issue_service_pb";
import type { PlanCheckRun } from "@/types/proto-es/v1/plan_service_pb";
import type { Stage, Task } from "@/types/proto-es/v1/rollout_service_pb";
import type {
@@ -30,9 +30,9 @@ export type ReviewContext = {
// Now we have only one flow in an issue
flow: Ref<ReviewFlow>;
// The overall status of the entire review flow
- status: Ref<Issue_Approver_Status>;
+ status: Ref<Issue_ApprovalStatus>;
// Whether the review flow is finished successfully.
- // A shortcut to `status === Review_Approver_Status.APPROVED`
+ // A shortcut to `status === Issue_ApprovalStatus.APPROVED`
done: Ref<boolean>;
// Whether the review finding has error.
error: Ref<string | undefined>;
diff --git a/frontend/src/components/IssueV1/logic/review.ts b/frontend/src/components/IssueV1/logic/review.ts
index 5494bbcde5..f3230549ad 100644
--- a/frontend/src/components/IssueV1/logic/review.ts
+++ b/frontend/src/components/IssueV1/logic/review.ts
@@ -52,40 +52,13 @@ export const extractReviewContext = (issue: MaybeRef<Issue>): ReviewContext => {
};
});
const status = computed(() => {
- if (!ready.value) {
- return Issue_Approver_Status.PENDING;
- }
- if (unref(issue).approvalStatusError) {
- return Issue_Approver_Status.PENDING;
- }
-
- const { template, approvers } = flow.value;
- const steps = template.flow?.steps ?? [];
-
- if (steps.length === 0) {
- // No review flow steps. That means need not manual review.
- return Issue_Approver_Status.APPROVED;
- }
-
- if (
- approvers.some((app) => app.status === Issue_Approver_Status.REJECTED)
- ) {
- // If any of the approvers down voted, the overall status should be 'REJECTED'
- return Issue_Approver_Status.REJECTED;
- }
-
- // For an N-steps approval flow, we need exactly N upvote approvals to
- // pass the entire flow.
- const upVotes = approvers.filter(
- (app) => app.status === Issue_Approver_Status.APPROVED
- );
- if (upVotes.length === steps.length) {
- return Issue_Approver_Status.APPROVED;
- }
- return Issue_Approver_Status.PENDING;
+ return unref(issue).approvalStatus;
});
const done = computed(() => {
- return status.value === Issue_Approver_Status.APPROVED;
+ return (
+ status.value === Issue_ApprovalStatus.APPROVED ||
+ status.value === Issue_ApprovalStatus.SKIPPED
+ );
});
const error = computed(() => {
return unref(issue).approvalStatusError;
diff --git a/frontend/src/components/Plan/logic/issue-review.ts b/frontend/src/components/Plan/logic/issue-review.ts
index b6070b5865..5a4c2f8111 100644
--- a/frontend/src/components/Plan/logic/issue-review.ts
+++ b/frontend/src/components/Plan/logic/issue-review.ts
@@ -1,8 +1,6 @@
-import { head } from "lodash-es";
import type { ComputedRef, InjectionKey } from "vue";
import { computed, inject, provide, unref } from "vue";
import {
- Issue_Approver_Status,
Issue_ApprovalStatus,
type Issue,
} from "@/types/proto-es/v1/issue_service_pb";
@@ -21,39 +19,16 @@ export const provideIssueReviewContext = (
const status = computed(() => {
const tempIssue = issue.value;
if (!tempIssue) {
- return Issue_Approver_Status.PENDING;
+ return Issue_ApprovalStatus.PENDING;
}
- if (tempIssue?.approvalStatus === Issue_ApprovalStatus.CHECKING) {
- return Issue_Approver_Status.PENDING;
- }
- if (tempIssue?.approvalStatus === Issue_ApprovalStatus.ERROR) {
- return Issue_Approver_Status.PENDING;
- }
-
- const { approvalTemplates, approvers } = tempIssue;
- const steps = head(approvalTemplates)?.flow?.steps ?? [];
- // No review flow steps. That means need not manual review.
- if (steps.length === 0) {
- return Issue_Approver_Status.APPROVED;
- }
- // If any of the approvers rejected, the overall status should be 'REJECTED'
- if (
- approvers.some((app) => app.status === Issue_Approver_Status.REJECTED)
- ) {
- return Issue_Approver_Status.REJECTED;
- }
-
- if (
- approvers.length === steps.length &&
- approvers.every((app) => app.status === Issue_Approver_Status.APPROVED)
- ) {
- return Issue_Approver_Status.APPROVED;
- }
- return Issue_Approver_Status.PENDING;
+ return tempIssue.approvalStatus;
});
const done = computed(() => {
- return status.value === Issue_Approver_Status.APPROVED;
+ return (
+ status.value === Issue_ApprovalStatus.APPROVED ||
+ status.value === Issue_ApprovalStatus.SKIPPED
+ );
});
const error = computed(() => {
diff --git a/frontend/src/utils/v1/advanced-search/issue/ui-filter.ts b/frontend/src/utils/v1/advanced-search/issue/ui-filter.ts
index b363b59248..bcf0cc0389 100644
--- a/frontend/src/utils/v1/advanced-search/issue/ui-filter.ts
+++ b/frontend/src/utils/v1/advanced-search/issue/ui-filter.ts
@@ -5,7 +5,7 @@ import {
} from "@/components/IssueV1/logic";
import { userNamePrefix } from "@/store";
import type { ComposedIssue } from "@/types";
-import { Issue_Approver_Status } from "@/types/proto-es/v1/issue_service_pb";
+import { Issue_ApprovalStatus } from "@/types/proto-es/v1/issue_service_pb";
import { isUserIncludedInList } from "@/utils";
import type { SearchParams } from "../common";
import { getValueFromSearchParams } from "../common";
@@ -79,10 +79,13 @@ export const filterIssueByApprovalStatus = (
const reviewContext = extractReviewContext(issue);
if (status === "pending") {
- return reviewContext.status.value === Issue_Approver_Status.PENDING;
+ return reviewContext.status.value === Issue_ApprovalStatus.PENDING;
}
if (status === "approved") {
- return reviewContext.status.value === Issue_Approver_Status.APPROVED;
+ return (
+ reviewContext.status.value === Issue_ApprovalStatus.APPROVED ||
+ reviewContext.status.value === Issue_ApprovalStatus.SKIPPED
+ );
}
console.error(