Skip to content

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

refactor(frontend): remove ComposedIssue and use base Issue type (#19039)

boojack0a717fb3c69e
diff --git a/frontend/src/components/IssueV1/components/BatchIssueActionsV1.vue b/frontend/src/components/IssueV1/components/BatchIssueActionsV1.vue
index 3110ab5f20..554eed5a09 100644
--- a/frontend/src/components/IssueV1/components/BatchIssueActionsV1.vue
+++ b/frontend/src/components/IssueV1/components/BatchIssueActionsV1.vue
@@ -49,7 +49,7 @@ import type { PropType } from "vue";
import { computed, reactive, ref } from "vue";
import { TooltipButton } from "@/components/v2";
import { refreshIssueList } from "@/store";
-import type { ComposedIssue } from "@/types";
+import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
import { BatchIssueStatusActionPanel } from "./Panel";
import type { IssueStatusAction } from "./Panel/issueStatusAction";
import {
@@ -63,7 +63,7 @@ type LocalState = {
const props = defineProps({
issueList: {
- type: Array as PropType<ComposedIssue[]>,
+ type: Array as PropType<Issue[]>,
default: () => [],
},
});
diff --git a/frontend/src/components/IssueV1/components/CurrentApproverV1.vue b/frontend/src/components/IssueV1/components/CurrentApproverV1.vue
index da045d5cd1..393c6769a9 100644
--- a/frontend/src/components/IssueV1/components/CurrentApproverV1.vue
+++ b/frontend/src/components/IssueV1/components/CurrentApproverV1.vue
@@ -58,7 +58,7 @@ import {
userNamePrefix,
useUserStore,
} from "@/store";
-import { type ComposedIssue } from "@/types";
+import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
import {
Issue_ApprovalStatus,
Issue_Approver_Status,
@@ -66,7 +66,7 @@ import {
} from "@/types/proto-es/v1/issue_service_pb";
const props = defineProps<{
- issue: ComposedIssue;
+ issue: Issue;
}>();
const me = useCurrentUserV1();
diff --git a/frontend/src/components/IssueV1/components/IssueStatusIcon.vue b/frontend/src/components/IssueV1/components/IssueStatusIcon.vue
index 3f67642814..1a858ed970 100644
--- a/frontend/src/components/IssueV1/components/IssueStatusIcon.vue
+++ b/frontend/src/components/IssueV1/components/IssueStatusIcon.vue
@@ -6,29 +6,7 @@
:class="issueIconClass()"
>
<template v-if="issueStatus === IssueStatus.OPEN">
- <template v-if="taskStatus === Task_Status.RUNNING">
- <div class="flex h-2 w-2 relative overflow-visible">
- <span
- class="w-full h-full rounded-full z-0 absolute animate-ping-slow"
- style="
- background-color: rgba(37, 99, 235, 0.5); /* bg-info/50 */
- "
- aria-hidden="true"
- ></span>
- <span
- class="w-full h-full rounded-full z-1 bg-info"
- aria-hidden="true"
- ></span>
- </div>
- </template>
<span
- v-else-if="taskStatus === Task_Status.FAILED"
- class="h-2 w-2 rounded-full text-center pb-6 font-normal text-base"
- aria-hidden="true"
- >!</span
- >
- <span
- v-else
class="h-1.5 w-1.5 bg-info rounded-full"
aria-hidden="true"
></span>
@@ -59,9 +37,8 @@ import { NTooltip } from "naive-ui";
import type { PropType } from "vue";
import { computed } from "vue";
import { useI18n } from "vue-i18n";
-import type { ComposedIssue } from "@/types";
+import type { Issue } 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 { isUnfinishedResolvedTask as checkUnfinishedResolvedTask } from "@/utils";
export type SizeType = "small" | "normal";
@@ -71,17 +48,12 @@ const props = defineProps({
required: true,
type: Number as PropType<IssueStatus>,
},
- // Specify taskStatus if we want to show the task specific status when issueStatus is OPEN.
- taskStatus: {
- type: Number as PropType<Task_Status>,
- default: undefined,
- },
size: {
type: String as PropType<SizeType>,
default: "normal",
},
issue: {
- type: Object as PropType<ComposedIssue>,
+ type: Object as PropType<Issue>,
default: undefined,
},
});
@@ -92,9 +64,6 @@ const issueIconClass = () => {
const iconClass = props.size === "normal" ? "w-5 h-5" : "w-4 h-4";
switch (props.issueStatus) {
case IssueStatus.OPEN:
- if (props.taskStatus && props.taskStatus === Task_Status.FAILED) {
- return iconClass + " bg-error text-white";
- }
return iconClass + " bg-white border-2 border-info text-info";
case IssueStatus.CANCELED:
return iconClass + " bg-white border-2 text-gray-400 border-gray-400";
@@ -108,7 +77,8 @@ const issueIconClass = () => {
};
const isUnfinishedResolvedIssue = computed(() => {
- return checkUnfinishedResolvedTask(props.issue);
+ // In list contexts, we don't have rollout data, so pass undefined
+ return checkUnfinishedResolvedTask(props.issue, undefined);
});
const stringifyIssueStatus = (issueStatus: IssueStatus): string => {
diff --git a/frontend/src/components/IssueV1/components/IssueTableV1.vue b/frontend/src/components/IssueV1/components/IssueTableV1.vue
index cb93cd26f4..11a9abdf08 100644
--- a/frontend/src/components/IssueV1/components/IssueTableV1.vue
+++ b/frontend/src/components/IssueV1/components/IssueTableV1.vue
@@ -13,7 +13,7 @@
:striped="true"
:bordered="bordered"
:loading="loading"
- :row-key="(issue: ComposedIssue) => issue.name"
+ :row-key="(issue: Issue) => issue.name"
:default-expand-all="true"
:expanded-row-keys="
issueList.filter(isIssueExpanded).map((issue) => issue.name)
@@ -50,11 +50,8 @@ import CurrentApproverV1 from "@/components/IssueV1/components/CurrentApproverV1
import { UserNameCell } from "@/components/v2/Model/cells";
import { useElementVisibilityInScrollParent } from "@/composables/useElementVisibilityInScrollParent";
import { useUserStore } from "@/store";
-import {
- type ComposedIssue,
- getTimeForPbTimestampProtoEs,
- unknownUser,
-} from "@/types";
+import { getTimeForPbTimestampProtoEs, unknownUser } from "@/types";
+import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
import {
extractIssueUID,
getHighlightHTMLByRegExp,
@@ -73,7 +70,7 @@ interface LocalState {
const props = withDefaults(
defineProps<{
- issueList: ComposedIssue[];
+ issueList: Issue[];
bordered?: boolean;
title?: string;
highlightText?: string;
@@ -128,8 +125,8 @@ const selectedIssueList = computed(() => {
);
});
-const columnList = computed((): DataTableColumn<ComposedIssue>[] => {
- const columns: (DataTableColumn<ComposedIssue> & { hide?: boolean })[] = [
+const columnList = computed((): DataTableColumn<Issue>[] => {
+ const columns: (DataTableColumn<Issue> & { hide?: boolean })[] = [
{
type: "selection",
width: 40,
@@ -251,7 +248,7 @@ const columnList = computed((): DataTableColumn<ComposedIssue>[] => {
return columns.filter((column) => !column.hide);
});
-const issueUrl = (issue: ComposedIssue) => {
+const issueUrl = (issue: Issue) => {
const issueRoute = getIssueRoute(issue);
const route = router.resolve({
name: issueRoute.name,
@@ -260,7 +257,7 @@ const issueUrl = (issue: ComposedIssue) => {
return route.fullPath;
};
-const rowProps = (issue: ComposedIssue) => {
+const rowProps = (issue: Issue) => {
return {
style: "cursor: pointer;",
onClick: (e: MouseEvent) => {
@@ -371,7 +368,7 @@ const issueHighlightSections = (
];
};
-const isIssueExpanded = (issue: ComposedIssue): boolean => {
+const isIssueExpanded = (issue: Issue): boolean => {
if (!props.highlightText || !issue.description) {
return false;
}
diff --git a/frontend/src/components/IssueV1/components/Panel/BatchIssueStatusActionPanel.vue b/frontend/src/components/IssueV1/components/Panel/BatchIssueStatusActionPanel.vue
index 50f507a672..a1c2fa059c 100644
--- a/frontend/src/components/IssueV1/components/Panel/BatchIssueStatusActionPanel.vue
+++ b/frontend/src/components/IssueV1/components/Panel/BatchIssueStatusActionPanel.vue
@@ -65,7 +65,7 @@ import { computed, reactive, ref } from "vue";
import { useI18n } from "vue-i18n";
import { issueServiceClientConnect } from "@/connect";
import { pushNotification } from "@/store";
-import type { ComposedIssue } from "@/types";
+import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
import { BatchUpdateIssuesStatusRequestSchema } from "@/types/proto-es/v1/issue_service_pb";
import CommonDrawer from "./CommonDrawer.vue";
import type { IssueStatusAction } from "./issueStatusAction";
@@ -80,7 +80,7 @@ type LocalState = {
};
const props = defineProps<{
- issueList: ComposedIssue[];
+ issueList: Issue[];
action?: IssueStatusAction;
}>();
diff --git a/frontend/src/components/IssueV1/components/Panel/issueStatusAction.ts b/frontend/src/components/IssueV1/components/Panel/issueStatusAction.ts
index 91eff23fd4..7701f268d0 100644
--- a/frontend/src/components/IssueV1/components/Panel/issueStatusAction.ts
+++ b/frontend/src/components/IssueV1/components/Panel/issueStatusAction.ts
@@ -1,6 +1,6 @@
import type { ButtonProps } from "naive-ui";
import { t } from "@/plugins/i18n";
-import type { ComposedIssue } from "@/types";
+import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
import { IssueStatus } from "@/types/proto-es/v1/issue_service_pb";
import { isDatabaseDataExportIssue, isGrantRequestIssue } from "@/utils";
@@ -25,7 +25,7 @@ const PossibleIssueStatusActionMap: Record<IssueStatus, IssueStatusAction[]> = {
};
export const getApplicableIssueStatusActionList = (
- issue: ComposedIssue
+ issue: Issue
): IssueStatusAction[] => {
const list = PossibleIssueStatusActionMap[issue.status];
return list.filter((action) => {
diff --git a/frontend/src/components/MarkdownEditor/MarkdownEditor.vue b/frontend/src/components/MarkdownEditor/MarkdownEditor.vue
index d4c0c5417d..560d89660b 100644
--- a/frontend/src/components/MarkdownEditor/MarkdownEditor.vue
+++ b/frontend/src/components/MarkdownEditor/MarkdownEditor.vue
@@ -67,10 +67,7 @@
@click="onIssueSelect(issue)"
@mouseenter="() => (state.activeIssueIndex = index)"
>
- <IssueStatusIcon
- :issue-status="issue.status"
- :task-status="issueTaskStatus(issue)"
- />
+ <IssueStatusIcon :issue-status="issue.status" />
<span class="opacity-60">#{{ extractIssueUID(issue.name) }}</span>
<div class="whitespace-nowrap">
<HighlightLabelText
@@ -101,15 +98,10 @@ import { nextTick, onMounted, reactive, ref, toRef, watch } from "vue";
import { useI18n } from "vue-i18n";
import { HighlightLabelText } from "@/components/v2";
import { useIssueV1Store } from "@/store";
-import { type ComposedIssue, DEBOUNCE_SEARCH_DELAY } from "@/types";
+import { DEBOUNCE_SEARCH_DELAY } from "@/types";
+import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
-import { Task_Status } from "@/types/proto-es/v1/rollout_service_pb";
-import {
- activeTaskInRollout,
- extractIssueUID,
- isDatabaseChangeRelatedIssue,
- sizeToFit,
-} from "@/utils";
+import { extractIssueUID, sizeToFit } from "@/utils";
import IssueStatusIcon from "../IssueV1/components/IssueStatusIcon.vue";
import { useRenderMarkdown } from "./useRenderMarkdown";
@@ -169,7 +161,7 @@ watch(
const contentTextArea = ref<HTMLTextAreaElement>();
const contentPreviewArea = ref<HTMLIFrameElement>();
const issuePanel = ref<HTMLDivElement>();
-const filterIssueList = ref<ComposedIssue[]>([]);
+const filterIssueList = ref<Issue[]>([]);
watch(
() => filterIssueList.value.length,
@@ -484,7 +476,7 @@ const clearIssuePanel = () => {
// onIssueSelect will replace the input issue id with the selected issue id.
// For example, if the text is "#12|" (| is the cursor position), and select the issue with id 1234,
// we will replace the "#12|" with "#1234 |"
-const onIssueSelect = (issue: ComposedIssue) => {
+const onIssueSelect = (issue: Issue) => {
if (!contentTextArea.value) {
return false;
}
@@ -525,15 +517,6 @@ const onIssueSelect = (issue: ComposedIssue) => {
return;
};
-const issueTaskStatus = (issue: ComposedIssue) => {
- // For grant request issue, we always show the status as "NOT_STARTED" as task status.
- if (!isDatabaseChangeRelatedIssue(issue)) {
- return Task_Status.NOT_STARTED;
- }
-
- return activeTaskInRollout(issue.rolloutEntity)?.status;
-};
-
const adjustIssuePanelWithPosition = useDebounceFn((e?: KeyboardEvent) => {
if (
e &&
diff --git a/frontend/src/components/Project/ProjectIssuesPanel.vue b/frontend/src/components/Project/ProjectIssuesPanel.vue
index 19300466bb..38b1f3fa08 100644
--- a/frontend/src/components/Project/ProjectIssuesPanel.vue
+++ b/frontend/src/components/Project/ProjectIssuesPanel.vue
@@ -45,7 +45,7 @@ import {
useRefreshIssueList,
useUIStateStore,
} from "@/store";
-import type { ComposedIssue } from "@/types";
+import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
import {
Issue_ApprovalStatus,
IssueStatus,
@@ -73,8 +73,7 @@ const route = useRoute();
const router = useRouter();
const me = useCurrentUserV1();
const issueStore = useIssueV1Store();
-const issuePagedTable =
- ref<ComponentExposed<typeof PagedTable<ComposedIssue>>>();
+const issuePagedTable = ref<ComponentExposed<typeof PagedTable<Issue>>>();
const uiStateStore = useUIStateStore();
const HINT_KEY = "issue.hint-dismissed";
diff --git a/frontend/src/components/Quickstart.vue b/frontend/src/components/Quickstart.vue
index 67966e672e..a204a9ace6 100644
--- a/frontend/src/components/Quickstart.vue
+++ b/frontend/src/components/Quickstart.vue
@@ -158,11 +158,6 @@ const sampleIssue = computedAsync(async () => {
}
const issue = await issueStore.fetchIssueByName(
`${sampleProject.value.name}/issues/${SAMPLE_ISSUE_ID}`,
- {
- // Don't need to fetch the plan and rollout.
- withPlan: false,
- withRollout: false,
- },
true /* silent */
);
return issue;
diff --git a/frontend/src/store/modules/v1/experimental-issue.ts b/frontend/src/store/modules/v1/experimental-issue.ts
index 23e73a0ee9..693c1e2330 100644
--- a/frontend/src/store/modules/v1/experimental-issue.ts
+++ b/frontend/src/store/modules/v1/experimental-issue.ts
@@ -4,146 +4,12 @@ import {
planServiceClientConnect,
rolloutServiceClientConnect,
} from "@/connect";
-import { useProjectV1Store } from "@/store";
-import {
- type ComposedIssue,
- EMPTY_ID,
- emptyIssue,
- emptyRollout,
- UNKNOWN_ID,
- unknownIssue,
-} from "@/types";
import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
-import {
- CreateIssueRequestSchema,
- GetIssueRequestSchema,
-} from "@/types/proto-es/v1/issue_service_pb";
+import { CreateIssueRequestSchema } from "@/types/proto-es/v1/issue_service_pb";
import type { Plan } from "@/types/proto-es/v1/plan_service_pb";
-import {
- CreatePlanRequestSchema,
- GetPlanCheckRunRequestSchema,
- GetPlanRequestSchema,
-} from "@/types/proto-es/v1/plan_service_pb";
+import { CreatePlanRequestSchema } from "@/types/proto-es/v1/plan_service_pb";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
-import {
- CreateRolloutRequestSchema,
- GetRolloutRequestSchema,
- ListTaskRunsRequestSchema,
-} from "@/types/proto-es/v1/rollout_service_pb";
-import {
- extractProjectResourceName,
- getRolloutFromPlan,
- hasProjectPermissionV2,
-} from "@/utils";
-
-export interface ComposeIssueConfig {
- withPlan?: boolean;
- withRollout?: boolean;
-}
-
-const composeIssue = async (
- rawIssue: Issue,
- config: ComposeIssueConfig = { withPlan: true, withRollout: true }
-): Promise<ComposedIssue> => {
- const project = `projects/${extractProjectResourceName(rawIssue.name)}`;
- const projectEntity = useProjectV1Store().getProjectByName(project);
-
- const issue: ComposedIssue = {
- ...rawIssue,
- planEntity: undefined,
- planCheckRunList: [],
- rolloutEntity: emptyRollout(),
- rolloutTaskRunList: [],
- project,
- };
-
- if (config.withPlan && issue.plan) {
- if (hasProjectPermissionV2(projectEntity, "bb.plans.get")) {
- const request = create(GetPlanRequestSchema, {
- name: issue.plan,
- });
- const response = await planServiceClientConnect.getPlan(request);
- issue.planEntity = response;
- }
-
- if (hasProjectPermissionV2(projectEntity, "bb.planCheckRuns.get")) {
- const request = create(GetPlanCheckRunRequestSchema, {
- name: `${issue.plan}/planCheckRun`,
- });
- try {
- const response =
- await planServiceClientConnect.getPlanCheckRun(request);
- issue.planCheckRunList = [response];
- } catch {
- // Plan check run might not exist yet
- issue.planCheckRunList = [];
- }
- }
- }
- if (config.withRollout && issue.plan) {
- const rolloutName = getRolloutFromPlan(issue.plan);
- if (hasProjectPermissionV2(projectEntity, "bb.rollouts.get")) {
- const request = create(GetRolloutRequestSchema, {
- name: rolloutName,
- });
- try {
- const response = await rolloutServiceClientConnect.getRollout(request);
- issue.rolloutEntity = response;
- } catch (e) {
- // Rollout might not exist yet
- console.error(e);
- }
- }
-
- if (hasProjectPermissionV2(projectEntity, "bb.taskRuns.list")) {
- const request = create(ListTaskRunsRequestSchema, {
- parent: `${rolloutName}/stages/-/tasks/-`,
- });
- try {
- const response =
- await rolloutServiceClientConnect.listTaskRuns(request);
- const taskRuns = response.taskRuns;
- issue.rolloutTaskRunList = taskRuns;
- } catch (e) {
- // Rollout might not exist yet
- console.error(e);
- }
- }
- }
-
- return issue;
-};
-
-export const shallowComposeIssue = async (
- rawIssue: Issue,
- config?: ComposeIssueConfig
-): Promise<ComposedIssue> => {
- return composeIssue(
- rawIssue,
- config || { withPlan: false, withRollout: false }
- );
-};
-
-export const experimentalFetchIssueByUID = async (
- uid: string,
- project: string
-) => {
- if (uid === "undefined") {
- console.warn("undefined issue uid");
- return unknownIssue();
- }
-
- if (uid === String(EMPTY_ID)) return emptyIssue();
- if (uid === String(UNKNOWN_ID)) return unknownIssue();
-
- const request = create(GetIssueRequestSchema, {
- name: `${project}/issues/${uid}`,
- });
- const newIssue = await issueServiceClientConnect.getIssue(request);
- const rawIssue = newIssue;
-
- return composeIssue(rawIssue);
-};
+import { CreateRolloutRequestSchema } from "@/types/proto-es/v1/rollout_service_pb";
export interface CreateIssueByPlanOptions {
skipRollout?: boolean;
diff --git a/frontend/src/store/modules/v1/issue.ts b/frontend/src/store/modules/v1/issue.ts
index 334ccf8197..5960c56c7f 100644
--- a/frontend/src/store/modules/v1/issue.ts
+++ b/frontend/src/store/modules/v1/issue.ts
@@ -22,10 +22,6 @@ import {
} from "@/utils";
import { useUserStore } from "../user";
import { projectNamePrefix, userNamePrefix } from "./common";
-import {
- type ComposeIssueConfig,
- shallowComposeIssue,
-} from "./experimental-issue";
import { useProjectV1Store } from "./project";
import { useProjectIamPolicyStore } from "./projectIamPolicy";
@@ -75,10 +71,11 @@ export const buildIssueFilter = (find: IssueFilter): string => {
export const useIssueV1Store = defineStore("issue_v1", () => {
const projectStore = useProjectV1Store();
- const listIssues = async (
- { find, pageSize, pageToken }: ListIssueParams,
- composeIssueConfig?: ComposeIssueConfig
- ) => {
+ const listIssues = async ({
+ find,
+ pageSize,
+ pageToken,
+ }: ListIssueParams): Promise<{ nextPageToken: string; issues: Issue[] }> => {
const request = create(SearchIssuesRequestSchema, {
parent: find.project,
filter: buildIssueFilter(find),
@@ -93,23 +90,19 @@ export const useIssueV1Store = defineStore("issue_v1", () => {
return `projects/${extractProjectResourceName(issue.name)}`;
});
await projectStore.batchGetOrFetchProjects(projects);
- const composedIssues = await Promise.all(
- issues.map((issue) => shallowComposeIssue(issue, composeIssueConfig))
- );
- // Preprare creator for the issues.
- const users = uniq(composedIssues.map((issue) => issue.creator));
+ // Prepare creator for the issues.
+ const users = uniq(issues.map((issue) => issue.creator));
await useUserStore().batchGetOrFetchUsers(users);
return {
nextPageToken: resp.nextPageToken,
- issues: composedIssues,
+ issues,
};
};
const fetchIssueByName = async (
name: string,
- composeIssueConfig?: ComposeIssueConfig,
silent: boolean = false
- ) => {
+ ): Promise<Issue> => {
const request = create(GetIssueRequestSchema, { name });
const issue = await issueServiceClientConnect.getIssue(request, {
contextValues: createContextValues().set(silentContextKey, silent),
@@ -117,7 +110,7 @@ export const useIssueV1Store = defineStore("issue_v1", () => {
await projectStore.getOrFetchProjectByName(
`projects/${extractProjectResourceName(issue.name)}`
);
- return shallowComposeIssue(issue, composeIssueConfig);
+ return issue;
};
return {
diff --git a/frontend/src/types/v1/issue/issue.ts b/frontend/src/types/v1/issue/issue.ts
index 960a9de26d..55d9b4a83a 100644
--- a/frontend/src/types/v1/issue/issue.ts
+++ b/frontend/src/types/v1/issue/issue.ts
@@ -1,58 +1,5 @@
-import { create as createProto } from "@bufbuild/protobuf";
-import { EMPTY_PROJECT_NAME, UNKNOWN_PROJECT_NAME } from "@/types";
-import type {
- Issue,
- Issue_ApprovalStatus,
-} from "@/types/proto-es/v1/issue_service_pb";
-import {
- Issue_Type,
- IssueSchema,
- IssueStatus,
-} from "@/types/proto-es/v1/issue_service_pb";
-import type { Plan, PlanCheckRun } from "@/types/proto-es/v1/plan_service_pb";
-import type { Rollout, TaskRun } from "@/types/proto-es/v1/rollout_service_pb";
-import { EMPTY_ID, UNKNOWN_ID } from "../../const";
-
-// For grant request issue, it has no plan and rollout.
-// For sql review issue, it has no rollout.
-export interface ComposedIssue extends Issue {
- planEntity: Plan | undefined;
- planCheckRunList: PlanCheckRun[];
- rolloutEntity: Rollout | undefined;
- rolloutTaskRunList: TaskRun[];
- project: string;
-}
-
-export const EMPTY_ISSUE_NAME = `projects/${EMPTY_ID}/issues/${EMPTY_ID}`;
-export const UNKNOWN_ISSUE_NAME = `projects/${UNKNOWN_ID}/issues/${UNKNOWN_ID}`;
-
-export const emptyIssue = (): ComposedIssue => {
- return {
- ...createProto(IssueSchema, {
- name: EMPTY_ISSUE_NAME,
- type: Issue_Type.DATABASE_CHANGE,
- }),
- planEntity: undefined,
- planCheckRunList: [],
- rolloutEntity: undefined,
- rolloutTaskRunList: [],
- project: EMPTY_PROJECT_NAME,
- };
-};
-
-export const unknownIssue = (): ComposedIssue => {
- return {
- ...createProto(IssueSchema, {
- name: UNKNOWN_ISSUE_NAME,
- type: Issue_Type.DATABASE_CHANGE,
- }),
- planEntity: undefined,
- planCheckRunList: [],
- rolloutEntity: undefined,
- rolloutTaskRunList: [],
- project: UNKNOWN_PROJECT_NAME,
- };
-};
+import type { Issue_ApprovalStatus } from "@/types/proto-es/v1/issue_service_pb";
+import { Issue_Type, IssueStatus } from "@/types/proto-es/v1/issue_service_pb";
export interface IssueFilter {
project: string;
diff --git a/frontend/src/utils/v1/issue/issue.ts b/frontend/src/utils/v1/issue/issue.ts
index e6324945d1..2857845560 100644
--- a/frontend/src/utils/v1/issue/issue.ts
+++ b/frontend/src/utils/v1/issue/issue.ts
@@ -11,7 +11,6 @@ import {
} from "@/store";
import {
type ComposedDatabase,
- type ComposedIssue,
EMPTY_ID,
isValidDatabaseName,
UNKNOWN_ID,
@@ -57,20 +56,23 @@ const DATABASE_RELATED_TASK_TYPE_LIST = [
Task_Type.DATABASE_MIGRATE,
];
-export const isDatabaseChangeRelatedIssue = (issue: ComposedIssue): boolean => {
+export const isDatabaseChangeRelatedIssue = (
+ issue: Issue,
+ rollout: Rollout | undefined
+): boolean => {
return (
Boolean(issue.plan) &&
- flattenTaskV1List(issue.rolloutEntity).some((task) => {
+ flattenTaskV1List(rollout).some((task) => {
return DATABASE_RELATED_TASK_TYPE_LIST.includes(task.type);
})
);
};
-export const isGrantRequestIssue = (issue: ComposedIssue): boolean => {
+export const isGrantRequestIssue = (issue: Issue): boolean => {
return issue.type === Issue_Type.GRANT_REQUEST;
};
-export const isDatabaseDataExportIssue = (issue: ComposedIssue): boolean => {
+export const isDatabaseDataExportIssue = (issue: Issue): boolean => {
return issue.type === Issue_Type.DATABASE_EXPORT;
};
@@ -144,7 +146,10 @@ export const projectOfIssue = (issue: Issue): Project => {
);
};
-export const isUnfinishedResolvedTask = (issue: ComposedIssue | undefined) => {
+export const isUnfinishedResolvedTask = (
+ issue: Issue | undefined,
+ rollout: Rollout | undefined
+) => {
if (!issue) {
return false;
}
@@ -154,7 +159,7 @@ export const isUnfinishedResolvedTask = (issue: ComposedIssue | undefined) => {
if (issue.status !== IssueStatus.DONE) {
return false;
}
- return flattenTaskV1List(issue.rolloutEntity).some((task) => {
+ return flattenTaskV1List(rollout).some((task) => {
return ![Task_Status.DONE, Task_Status.SKIPPED].includes(task.status);
});
};
diff --git a/frontend/src/views/ExportCenter/index.vue b/frontend/src/views/ExportCenter/index.vue
index 0d3eb8a126..4b597934c6 100644
--- a/frontend/src/views/ExportCenter/index.vue
+++ b/frontend/src/views/ExportCenter/index.vue
@@ -79,7 +79,7 @@ import {
useRefreshIssueList,
} from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
-import type { ComposedIssue } from "@/types";
+import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
import { Issue_Type, IssueStatus } from "@/types/proto-es/v1/issue_service_pb";
import {
buildIssueFilterBySearchParams,
@@ -137,8 +137,7 @@ watch(
);
const issueStore = useIssueV1Store();
-const issuePagedTable =
- ref<ComponentExposed<typeof PagedTable<ComposedIssue>>>();
+const issuePagedTable = ref<ComponentExposed<typeof PagedTable<Issue>>>();
const dataExportIssueSearchParams = computed(() => {
// Default scopes with type.
diff --git a/frontend/src/views/MyIssues.vue b/frontend/src/views/MyIssues.vue
index 6ef91a7c22..540c6e3ec8 100644
--- a/frontend/src/views/MyIssues.vue
+++ b/frontend/src/views/MyIssues.vue
@@ -41,7 +41,7 @@ import {
useIssueV1Store,
useRefreshIssueList,
} from "@/store";
-import { type ComposedIssue } from "@/types";
+import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
import {
Issue_ApprovalStatus,
IssueStatus,
@@ -61,8 +61,7 @@ const route = useRoute();
const router = useRouter();
const me = useCurrentUserV1();
const issueStore = useIssueV1Store();
-const issuePagedTable =
- ref<ComponentExposed<typeof PagedTable<ComposedIssue>>>();
+const issuePagedTable = ref<ComponentExposed<typeof PagedTable<Issue>>>();
const viewId = useLocalStorage<string>(
`bb.components.${WORKSPACE_ROUTE_MY_ISSUES}.id`,