Skip to content

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

refactor: simplify review code by co-locating functions with consumers (#17651)

Danny Xudb42f4ab7c05
diff --git a/frontend/src/components/IssueV1/components/BannerSection.vue b/frontend/src/components/IssueV1/components/BannerSection.vue
index d8fbb9c6ac..5b5fa42255 100644
--- a/frontend/src/components/IssueV1/components/BannerSection.vue
+++ b/frontend/src/components/IssueV1/components/BannerSection.vue
@@ -1,54 +1,41 @@
<template>
- <template v-if="showPendingReview">
- <div
- class="h-8 w-full text-base font-medium bg-accent text-white flex justify-center items-center"
- >
- {{ $t("issue.waiting-for-review") }}
- </div>
- </template>
- <template v-else-if="showRejectedReview">
- <div
- class="h-8 w-full text-base font-medium bg-warning text-white flex justify-center items-center"
- >
- {{ $t("issue.review-sent-back") }}
- </div>
- </template>
- <template v-else>
- <div
- v-if="showClosedBanner"
- class="h-8 w-full text-base font-medium bg-gray-400 text-white flex justify-center items-center"
- >
- {{ $t("common.closed") }}
- </div>
- <div
- v-else-if="showSuccessBanner"
- class="h-8 w-full text-base font-medium text-white flex justify-center items-center"
- :class="isUnfinishedResolvedIssue ? 'bg-warning' : 'bg-success'"
- >
- {{ $t("common.done") }}
- <span v-if="isUnfinishedResolvedIssue" class="text-sm ml-2">
- {{ $t("issue.some-tasks-are-not-executed-successfully") }}
- </span>
- </div>
- <div
- v-else-if="showPendingRollout"
- class="h-8 w-full text-base font-medium bg-accent text-white flex justify-center items-center"
- >
- {{ $t("issue.awaiting-rollout") }}
- </div>
- <div
- v-else-if="showEarliestAllowedTimeBanner"
- class="h-8 w-full text-base font-medium bg-accent text-white flex justify-center items-center"
- >
- {{
- $t("issue.waiting-earliest-allowed-time", { time: earliestAllowedTime })
- }}
- </div>
- </template>
+ <div
+ v-if="showPendingReview"
+ class="h-8 w-full text-base font-medium bg-accent text-white flex justify-center items-center"
+ >
+ {{ $t("issue.waiting-for-review") }}
+ </div>
+ <div
+ v-else-if="showRejectedReview"
+ class="h-8 w-full text-base font-medium bg-warning text-white flex justify-center items-center"
+ >
+ {{ $t("issue.review-sent-back") }}
+ </div>
+ <div
+ v-else-if="showClosedBanner"
+ class="h-8 w-full text-base font-medium bg-gray-400 text-white flex justify-center items-center"
+ >
+ {{ $t("common.closed") }}
+ </div>
+ <div
+ v-else-if="showSuccessBanner"
+ class="h-8 w-full text-base font-medium text-white flex justify-center items-center"
+ :class="isUnfinishedResolvedIssue ? 'bg-warning' : 'bg-success'"
+ >
+ {{ $t("common.done") }}
+ <span v-if="isUnfinishedResolvedIssue" class="text-sm ml-2">
+ {{ $t("issue.some-tasks-are-not-executed-successfully") }}
+ </span>
+ </div>
+ <div
+ v-else-if="showPendingRollout"
+ class="h-8 w-full text-base font-medium bg-accent text-white flex justify-center items-center"
+ >
+ {{ $t("issue.awaiting-rollout") }}
+ </div>
</template>
<script lang="ts" setup>
-import dayjs from "dayjs";
import { computed } from "vue";
import {
IssueStatus,
@@ -61,18 +48,20 @@ import {
isUnfinishedResolvedTask as checkUnfinishedResolvedTask,
} from "../logic";
-const { isCreating, issue } = useIssueContext();
+const { issue } = useIssueContext();
const showPendingReview = computed(() => {
- if (isCreating.value) return false;
- if (issue.value.status !== IssueStatus.OPEN) return false;
- return issue.value.approvalStatus === Issue_ApprovalStatus.PENDING;
+ return (
+ issue.value.status === IssueStatus.OPEN &&
+ issue.value.approvalStatus === Issue_ApprovalStatus.PENDING
+ );
});
const showRejectedReview = computed(() => {
- if (isCreating.value) return false;
- if (issue.value.status !== IssueStatus.OPEN) return false;
- return issue.value.approvalStatus === Issue_ApprovalStatus.REJECTED;
+ return (
+ issue.value.status === IssueStatus.OPEN &&
+ issue.value.approvalStatus === Issue_ApprovalStatus.REJECTED
+ );
});
const showClosedBanner = computed(() => {
@@ -85,40 +74,12 @@ const showSuccessBanner = computed(() => {
const showPendingRollout = computed(() => {
if (issue.value.status !== IssueStatus.OPEN) return false;
- if (!isDatabaseChangeRelatedIssue(issue.value)) {
- return false;
- }
+ if (!isDatabaseChangeRelatedIssue(issue.value)) return false;
const task = activeTaskInRollout(issue.value.rolloutEntity);
return task.status === Task_Status.NOT_STARTED;
});
-const showEarliestAllowedTimeBanner = computed(() => {
- if (issue.value.status !== IssueStatus.OPEN) return false;
- if (!isDatabaseChangeRelatedIssue(issue.value)) {
- return false;
- }
-
- const task = activeTaskInRollout(issue.value.rolloutEntity);
-
- if (task.status !== Task_Status.PENDING) {
- return false;
- }
-
- // const now = Math.floor(Date.now() / 1000);
- // return task.earliestAllowedTs > now;
- return false; // todo
-});
-
-const earliestAllowedTime = computed(() => {
- // const task = activeTaskInRollout(issue.value.rolloutEntity);
- const tz = "UTC" + dayjs().format("ZZ");
- return dayjs().format(`YYYY-MM-DD HH:mm:ss ${tz}`);
- // return dayjs(task.earliestAllowedTs * 1000).format(
- // `YYYY-MM-DD HH:mm:ss ${tz}`
- // );
-});
-
const isUnfinishedResolvedIssue = computed(() => {
return checkUnfinishedResolvedTask(issue.value);
});
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 abfd07315e..d09a258afb 100644
--- a/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/IssueReviewButtonGroup.vue
+++ b/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/IssueReviewButtonGroup.vue
@@ -47,23 +47,12 @@ const currentUser = useCurrentUserV1();
const { issue, phase, events, selectedTask, selectedStage } = useIssueContext();
const { project } = useCurrentProjectV1();
-const approvalFlowReady = computed(() => {
- const approvalStatus = issue.value.approvalStatus;
- return approvalStatus !== Issue_ApprovalStatus.CHECKING;
-});
-
-const rolloutReady = computed(() => {
- const approvalStatus = issue.value.approvalStatus;
- return (
- approvalStatus === Issue_ApprovalStatus.APPROVED ||
- approvalStatus === Issue_ApprovalStatus.SKIPPED
- );
-});
-
const shouldShowApproveOrReject = computed(() => {
if (
issue.value.status === IssueStatus.CANCELED ||
- issue.value.status === IssueStatus.DONE
+ issue.value.status === IssueStatus.DONE ||
+ phase.value !== "REVIEW" ||
+ issue.value.approvalStatus !== Issue_ApprovalStatus.PENDING
) {
return false;
}
@@ -76,41 +65,24 @@ const shouldShowApproveOrReject = computed(() => {
return false;
}
- if (phase.value !== "REVIEW") {
- return false;
- }
-
- if (!approvalFlowReady.value) return false;
- if (rolloutReady.value) return false;
-
return true;
});
-const shouldShowApprove = computed(() => {
- if (!shouldShowApproveOrReject.value) return false;
- return issue.value.approvalStatus === Issue_ApprovalStatus.PENDING;
-});
-const shouldShowReject = computed(() => {
- if (!shouldShowApproveOrReject.value) return false;
- return issue.value.approvalStatus === Issue_ApprovalStatus.PENDING;
-});
+
const shouldShowReRequestReview = computed(() => {
return (
extractUserId(issue.value.creator) === currentUser.value.email &&
issue.value.approvalStatus === Issue_ApprovalStatus.REJECTED
);
});
+
const issueReviewActionList = computed(() => {
const actionList: IssueReviewAction[] = [];
- if (shouldShowReject.value) {
- actionList.push("SEND_BACK");
- }
- if (shouldShowApprove.value) {
- actionList.push("APPROVE");
+ if (shouldShowApproveOrReject.value) {
+ actionList.push("SEND_BACK", "APPROVE");
}
if (shouldShowReRequestReview.value) {
actionList.push("RE_REQUEST");
}
-
return actionList;
});
diff --git a/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/ReviewActionButton.vue b/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/ReviewActionButton.vue
index 8cb334781a..f51351c494 100644
--- a/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/ReviewActionButton.vue
+++ b/frontend/src/components/IssueV1/components/HeaderSection/Actions/review/ReviewActionButton.vue
@@ -5,7 +5,7 @@
size="medium"
tag="div"
:disabled="errors.length > 0"
- v-bind="issueReviewActionButtonProps(action)"
+ :type="action === 'SEND_BACK' ? 'default' : 'primary'"
@click="$emit('perform-action', action)"
>
{{ issueReviewActionDisplayName(action) }}
@@ -24,14 +24,23 @@ import { useI18n } from "vue-i18n";
import type { IssueReviewAction } from "@/components/IssueV1/logic";
import {
issueReviewActionDisplayName,
- issueReviewActionButtonProps,
- allowUserToApplyReviewAction,
useIssueContext,
- displayReviewRoleTitle,
} from "@/components/IssueV1/logic";
import type { ErrorItem } from "@/components/misc/ErrorList.vue";
import ErrorList from "@/components/misc/ErrorList.vue";
-import { Issue_Approver_Status } from "@/types/proto-es/v1/issue_service_pb";
+import {
+ candidatesOfApprovalStepV1,
+ extractUserId,
+ useCurrentUserV1,
+} from "@/store";
+import type { ComposedIssue } from "@/types";
+import {
+ ApprovalNode_Type,
+ Issue_ApprovalStatus,
+ Issue_Approver_Status,
+ IssueStatus,
+} from "@/types/proto-es/v1/issue_service_pb";
+import { displayRoleTitle, isUserIncludedInList } from "@/utils";
const props = defineProps<{
action: IssueReviewAction;
@@ -67,15 +76,54 @@ const errors = computed(() => {
if (!step) return errors;
for (const node of step.nodes) {
- const roleTitle = displayReviewRoleTitle(node);
- if (roleTitle) {
- errors.push({
- error: roleTitle,
- indent: 1,
- });
+ if (node.type === ApprovalNode_Type.ANY_IN_GROUP && node.role) {
+ const roleTitle = displayRoleTitle(node.role);
+ if (roleTitle) {
+ errors.push({
+ error: roleTitle,
+ indent: 1,
+ });
+ }
}
}
return errors;
});
+
+const allowUserToApplyReviewAction = (
+ issue: ComposedIssue,
+ action: IssueReviewAction
+) => {
+ if (
+ issue.status === IssueStatus.CANCELED ||
+ issue.status === IssueStatus.DONE ||
+ issue.approvalStatus === Issue_ApprovalStatus.CHECKING ||
+ issue.approvalStatus === Issue_ApprovalStatus.APPROVED ||
+ issue.approvalStatus === Issue_ApprovalStatus.SKIPPED
+ ) {
+ return false;
+ }
+
+ const me = useCurrentUserV1();
+
+ if (action === "RE_REQUEST") {
+ return me.value.email === extractUserId(issue.creator);
+ }
+
+ const { approvalTemplates, approvers } = issue;
+ if (approvalTemplates.length === 0) return false;
+
+ const rejectedIndex = approvers.findIndex(
+ (ap) => ap.status === Issue_Approver_Status.REJECTED
+ );
+ const currentStepIndex =
+ rejectedIndex >= 0 ? rejectedIndex : approvers.length;
+
+ const steps = approvalTemplates[0].flow?.steps ?? [];
+ const step = steps[currentStepIndex];
+ if (!step) return false;
+
+ const candidates = candidatesOfApprovalStepV1(issue, step);
+ return isUserIncludedInList(me.value.email, candidates);
+};
</script>
diff --git a/frontend/src/components/IssueV1/components/Panel/IssueReviewActionPanel.vue b/frontend/src/components/IssueV1/components/Panel/IssueReviewActionPanel.vue
index 3d7cbeec6b..178d926189 100644
--- a/frontend/src/components/IssueV1/components/Panel/IssueReviewActionPanel.vue
+++ b/frontend/src/components/IssueV1/components/Panel/IssueReviewActionPanel.vue
@@ -79,8 +79,8 @@
<NTooltip :disabled="confirmErrors.length === 0" placement="top">
<template #trigger>
<NButton
+ type="primary"
:disabled="confirmErrors.length > 0"
- v-bind="confirmButtonProps"
@click="handleConfirm"
>
{{ $t("common.confirm") }}
@@ -104,8 +104,6 @@ import { useI18n } from "vue-i18n";
import type { IssueReviewAction } from "@/components/IssueV1/logic";
import {
useIssueContext,
- targetReviewStatusForReviewAction,
- issueReviewActionButtonProps,
issueReviewActionDisplayName,
planCheckRunSummaryForIssue,
} from "@/components/IssueV1/logic";
@@ -118,7 +116,6 @@ import {
RejectIssueRequestSchema,
RequestIssueRequestSchema,
} from "@/types/proto-es/v1/issue_service_pb";
-import { Issue_Approver_Status } from "@/types/proto-es/v1/issue_service_pb";
import { databaseForTask } from "@/utils";
import { ErrorList } from "../common";
import CommonDrawer from "./CommonDrawer.vue";
@@ -204,34 +201,24 @@ const confirmErrors = computed(() => {
return errors;
});
-const confirmButtonProps = computed(() => {
- if (!props.action) return {};
- const p = issueReviewActionButtonProps(props.action);
- if (p.type === "default") {
- p.type = "primary";
- }
- return p;
-});
-
const handleConfirm = async () => {
const { action } = props;
if (!action) return;
state.loading = true;
try {
- const status = targetReviewStatusForReviewAction(action);
- if (status === Issue_Approver_Status.APPROVED) {
+ if (action === "APPROVE") {
const request = create(ApproveIssueRequestSchema, {
name: issue.value.name,
comment: comment.value,
});
await issueServiceClientConnect.approveIssue(request);
- } else if (status === Issue_Approver_Status.PENDING) {
+ } else if (action === "RE_REQUEST") {
const request = create(RequestIssueRequestSchema, {
name: issue.value.name,
comment: comment.value,
});
await issueServiceClientConnect.requestIssue(request);
- } else if (status === Issue_Approver_Status.REJECTED) {
+ } else if (action === "SEND_BACK") {
const request = create(RejectIssueRequestSchema, {
name: issue.value.name,
comment: comment.value,
diff --git a/frontend/src/components/IssueV1/logic/action/review.ts b/frontend/src/components/IssueV1/logic/action/review.ts
index fba71fe281..cef1825d04 100644
--- a/frontend/src/components/IssueV1/logic/action/review.ts
+++ b/frontend/src/components/IssueV1/logic/action/review.ts
@@ -1,33 +1,7 @@
-import type { ButtonProps } from "naive-ui";
import { t } from "@/plugins/i18n";
-import {
- candidatesOfApprovalStepV1,
- useCurrentUserV1,
- extractUserId,
-} from "@/store";
-import type { ComposedIssue } from "@/types";
-import {
- IssueStatus,
- Issue_Approver_Status,
- Issue_ApprovalStatus,
-} from "@/types/proto-es/v1/issue_service_pb";
-import { isUserIncludedInList } from "@/utils";
export type IssueReviewAction = "APPROVE" | "SEND_BACK" | "RE_REQUEST";
-export const targetReviewStatusForReviewAction = (
- action: IssueReviewAction
-) => {
- switch (action) {
- case "APPROVE":
- return Issue_Approver_Status.APPROVED;
- case "SEND_BACK":
- return Issue_Approver_Status.REJECTED;
- case "RE_REQUEST":
- return Issue_Approver_Status.PENDING;
- }
-};
-
export const issueReviewActionDisplayName = (action: IssueReviewAction) => {
switch (action) {
case "APPROVE":
@@ -38,65 +12,3 @@ export const issueReviewActionDisplayName = (action: IssueReviewAction) => {
return t("custom-approval.issue-review.re-request-review");
}
};
-
-export const issueReviewActionButtonProps = (
- action: IssueReviewAction
-): ButtonProps => {
- switch (action) {
- case "APPROVE":
- return {
- type: "primary",
- };
- case "SEND_BACK":
- return {
- type: "default",
- };
- case "RE_REQUEST":
- return {
- type: "primary",
- };
- }
-};
-
-export const allowUserToApplyReviewAction = (
- issue: ComposedIssue,
- action: IssueReviewAction
-) => {
- const approvalFlowReady =
- issue.approvalStatus !== Issue_ApprovalStatus.CHECKING;
- const rolloutReady =
- issue.approvalStatus === Issue_ApprovalStatus.APPROVED ||
- issue.approvalStatus === Issue_ApprovalStatus.SKIPPED;
-
- if (
- issue.status === IssueStatus.CANCELED ||
- issue.status === IssueStatus.DONE
- ) {
- return false;
- }
-
- if (!approvalFlowReady) return false;
- if (rolloutReady) return false;
-
- const me = useCurrentUserV1();
-
- if (action === "APPROVE" || action === "SEND_BACK") {
- const { approvalTemplates, approvers } = issue;
- if (approvalTemplates.length === 0) return false;
-
- const rejectedIndex = approvers.findIndex(
- (ap) => ap.status === Issue_Approver_Status.REJECTED
- );
- const currentStepIndex =
- rejectedIndex >= 0 ? rejectedIndex : approvers.length;
-
- const steps = approvalTemplates[0].flow?.steps ?? [];
- const step = steps[currentStepIndex];
- if (!step) return false;
- const candidates = candidatesOfApprovalStepV1(issue, step);
- return isUserIncludedInList(me.value.email, candidates);
- }
-
- // action === 'RE_REQUEST'
- return me.value.email === extractUserId(issue.creator);
-};
diff --git a/frontend/src/components/IssueV1/logic/index.ts b/frontend/src/components/IssueV1/logic/index.ts
index 5967666607..80b60ac65e 100644
--- a/frontend/src/components/IssueV1/logic/index.ts
+++ b/frontend/src/components/IssueV1/logic/index.ts
@@ -1,7 +1,6 @@
export * from "./context";
export * from "./base";
export * from "./releaser";
-export * from "./review";
export * from "./rollout";
export * from "./utils";
export * from "./initialize";
diff --git a/frontend/src/components/IssueV1/logic/review.ts b/frontend/src/components/IssueV1/logic/review.ts
deleted file mode 100644
index 2d513f31fc..0000000000
--- a/frontend/src/components/IssueV1/logic/review.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import type { ApprovalNode } from "@/types/proto-es/v1/issue_service_pb";
-import { ApprovalNode_Type } from "@/types/proto-es/v1/issue_service_pb";
-import { displayRoleTitle } from "@/utils";
-
-export const displayReviewRoleTitle = (node: ApprovalNode) => {
- const { type, role } = node;
- if (type !== ApprovalNode_Type.ANY_IN_GROUP) {
- return "";
- }
-
- if (role) {
- return displayRoleTitle(role);
- }
- return "";
-};
diff --git a/frontend/src/components/Plan/logic/index.ts b/frontend/src/components/Plan/logic/index.ts
index a16bd0992a..e308ca1607 100644
--- a/frontend/src/components/Plan/logic/index.ts
+++ b/frontend/src/components/Plan/logic/index.ts
@@ -6,5 +6,4 @@ export * from "./sheet";
export * from "./plan-check";
export * from "./utils";
export * from "./sidebar";
-export * from "./issue-review";
export * from "./usePlanCheckStatus";
diff --git a/frontend/src/components/Plan/logic/issue-review.ts b/frontend/src/components/Plan/logic/issue-review.ts
deleted file mode 100644
index ad8b1c8af3..0000000000
--- a/frontend/src/components/Plan/logic/issue-review.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import type { ComputedRef, InjectionKey } from "vue";
-import { computed, inject, provide, unref } from "vue";
-import {
- Issue_ApprovalStatus,
- type Issue,
-} from "@/types/proto-es/v1/issue_service_pb";
-
-export const KEY = Symbol(
- "bb.plan.issue.review.context"
-) as InjectionKey<IssueReviewContext>;
-
-export const useIssueReviewContext = () => {
- return inject(KEY)!;
-};
-
-export const provideIssueReviewContext = (
- issue: ComputedRef<Issue | undefined>
-) => {
- const status = computed(() => {
- const tempIssue = issue.value;
- if (!tempIssue) {
- return Issue_ApprovalStatus.PENDING;
- }
- return tempIssue.approvalStatus;
- });
-
- const rolloutReady = computed(() => {
- return (
- status.value === Issue_ApprovalStatus.APPROVED ||
- status.value === Issue_ApprovalStatus.SKIPPED
- );
- });
-
- const error = computed(() => {
- return unref(issue)?.approvalStatusError;
- });
-
- const context = {
- rolloutReady,
- error,
- };
-
- provide(KEY, context);
-
- return context;
-};
-
-type IssueReviewContext = ReturnType<typeof provideIssueReviewContext>;
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index d0dfd74e55..a518fa479d 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -959,7 +959,6 @@
"off-tooltip": "Executes statements individually in auto-commit mode. Statements are committed immediately and cannot be rolled back if a later statement fails.",
"execution-order-note": "Non-transactional statements will be executed last."
},
- "waiting-earliest-allowed-time": "Will run after {time}",
"batch-transition": {
"not-allowed-tips": "Some of selected issues cannot be {operation}",
"resolve": "Resolve",
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 7efb594e10..f045bff8b3 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -959,7 +959,6 @@
"off-tooltip": "Ejecuta declaraciones individualmente en modo de confirmación automática. Las declaraciones se confirman inmediatamente y no se pueden revertir si una declaración posterior falla.",
"execution-order-note": "Las declaraciones no transaccionales se ejecutarán en último lugar."
},
- "waiting-earliest-allowed-time": "Se ejecutará después de {time}",
"batch-transition": {
"not-allowed-tips": "Algunos de las incidencias seleccionadas no se pueden {operation}",
"resolve": "Resolver",
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index a04e2fc347..38785aea54 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -959,7 +959,6 @@
"off-tooltip": "自動コミットモードで個別にステートメントを実行します。ステートメントは即座にコミットされ、後続のステートメントが失敗してもロールバックできません。",
"execution-order-note": "非トランザクション ステートメントは最後に実行されます。"
},
- "waiting-earliest-allowed-time": "{time}の後に実行されます",
"batch-transition": {
"not-allowed-tips": "選択したイシューの一部を {operation} にすることはできません",
"resolve": "仕上げる",
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index d8a063044c..6a1a4f6ca9 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -959,7 +959,6 @@
"off-tooltip": "Thực thi các câu lệnh riêng lẻ trong chế độ tự động commit. Các câu lệnh được commit ngay lập tức và không thể khôi phục nếu câu lệnh sau đó thất bại.",
"execution-order-note": "Các câu lệnh không liên quan đến giao dịch sẽ được thực hiện cuối cùng."
},
- "waiting-earliest-allowed-time": "Sẽ chạy sau {time}",
"batch-transition": {
"not-allowed-tips": "Một số vấn đề đã chọn không thể {operation}",
"resolve": "Giải quyết",
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index fffc1fa3b6..0d645b6f8b 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -959,7 +959,6 @@
"off-tooltip": "以自动提交模式单独执行语句。语句立即提交,如果后续语句失败则无法回滚。",
"execution-order-note": "非事务性语句将最后执行。"
},
- "waiting-earliest-allowed-time": "将于 {time} 之后执行",
"batch-transition": {
"not-allowed-tips": "部分选中的工单无法被{operation}",
"resolve": "完成",
diff --git a/frontend/src/types/index.ts b/frontend/src/types/index.ts
index 24b6178207..3b6be0794a 100644
--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -17,7 +17,6 @@ export * from "./notification";
export * from "./oauth";
export * from "./plan";
export * from "./release";
-export * from "./review";
export * from "./risk";
export * from "./rollout";
export * from "./semanticTypes";
diff --git a/frontend/src/types/review.ts b/frontend/src/types/review.ts
deleted file mode 100644
index f797bbc2b5..0000000000
--- a/frontend/src/types/review.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { create as createProto } from "@bufbuild/protobuf";
-import type {
- Issue_Approver,
- ApprovalTemplate,
-} from "./proto-es/v1/issue_service_pb";
-import { ApprovalTemplateSchema } from "./proto-es/v1/issue_service_pb";
-
-export type ReviewFlow = {
- template: ApprovalTemplate;
- approvers: Issue_Approver[];
- currentStepIndex: number; // -1 if finished
-};
-
-export const emptyFlow = (): ReviewFlow => {
- return {
- template: createProto(ApprovalTemplateSchema, {}),
- approvers: [],
- currentStepIndex: -1,
- };
-};
diff --git a/frontend/src/views/project/CICDLayout.vue b/frontend/src/views/project/CICDLayout.vue
index c8437fcbb8..912b393390 100644
--- a/frontend/src/views/project/CICDLayout.vue
+++ b/frontend/src/views/project/CICDLayout.vue
@@ -77,7 +77,6 @@ import {
import PollerProvider from "@/components/Plan/PollerProvider.vue";
import { HeaderSection } from "@/components/Plan/components";
import RefreshIndicator from "@/components/Plan/components/RefreshIndicator.vue";
-import { provideIssueReviewContext } from "@/components/Plan/logic/issue-review";
import { provideSidebarContext } from "@/components/Plan/logic/sidebar";
import { useNavigationGuard } from "@/components/Plan/logic/useNavigationGuard";
import { useIssueLayoutVersion } from "@/composables/useIssueLayoutVersion";
@@ -167,8 +166,6 @@ providePlanContext({
...planBaseContext,
});
-provideIssueReviewContext(computed(() => issue.value));
-
provideSidebarContext(containerRef);
watch(