Skip to content

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

refactor: get rid of the frontend issue filter (#18150)

ecmadaob77a5745b880
diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.go
index 7390331433..01727216a7 100644
--- a/backend/api/v1/issue_service.go
+++ b/backend/api/v1/issue_service.go
@@ -43,6 +43,12 @@ type IssueService struct {
metricReporter *metricreport.Reporter
}
+type filterIssueMessage struct {
+ ApprovalStatus *v1pb.Issue_ApprovalStatus
+ // ApproverID is the principal uid.
+ ApproverID *int
+}
+
// NewIssueService creates a new IssueService.
func NewIssueService(
store *store.Store,
@@ -77,7 +83,13 @@ func (s *IssueService) GetIssue(ctx context.Context, req *connect.Request[v1pb.G
return connect.NewResponse(issueV1), nil
}
-func (s *IssueService) getIssueFind(ctx context.Context, filter string, query string, limit, offset *int) (*store.FindIssueMessage, error) {
+func (s *IssueService) getIssueFind(
+ ctx context.Context,
+ filter string,
+ query string,
+ limit,
+ offset *int,
+) (*store.FindIssueMessage, *filterIssueMessage, error) {
issueFind := &store.FindIssueMessage{
Limit: limit,
Offset: offset,
@@ -86,18 +98,20 @@ func (s *IssueService) getIssueFind(ctx context.Context, filter string, query st
issueFind.Query = &query
}
if filter == "" {
- return issueFind, nil
+ return issueFind, nil, nil
}
e, err := cel.NewEnv()
if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create cel env"))
+ return nil, nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to create cel env"))
}
ast, iss := e.Parse(filter)
if iss != nil {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to parse filter %v, error: %v", filter, iss.String()))
+ return nil, nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to parse filter %v, error: %v", filter, iss.String()))
}
+ filterIssue := &filterIssueMessage{}
+
var parseFilter func(expr celast.Expr) (string, error)
parseFilter = func(expr celast.Expr) (string, error) {
switch expr.Kind() {
@@ -109,12 +123,6 @@ func (s *IssueService) getIssueFind(ctx context.Context, filter string, query st
case celoperators.Equals:
variable, value := getVariableAndValueFromExpr(expr)
switch variable {
- case "creator":
- user, err := s.getUserByIdentifier(ctx, value.(string))
- if err != nil {
- return "", connect.NewError(connect.CodeInternal, errors.Errorf("failed to get user %v with error %v", value, err.Error()))
- }
- issueFind.CreatorID = &user.ID
case "instance":
instanceResourceID, err := common.GetInstanceID(value.(string))
if err != nil {
@@ -180,6 +188,23 @@ func (s *IssueService) getIssueFind(ctx context.Context, filter string, query st
}
case "labels":
issueFind.LabelList = append(issueFind.LabelList, value.(string))
+ case "approval_status":
+ approvalStatusValue, ok := v1pb.Issue_ApprovalStatus_value[value.(string)]
+ if !ok {
+ return "", connect.NewError(connect.CodeInvalidArgument, errors.Errorf(`invalid approval_status %q`, value))
+ }
+ approvalStatus := v1pb.Issue_ApprovalStatus(approvalStatusValue)
+ filterIssue.ApprovalStatus = &approvalStatus
+ case "current_approver", "creator":
+ user, err := s.getUserByIdentifier(ctx, value.(string))
+ if err != nil {
+ return "", connect.NewError(connect.CodeInternal, errors.Errorf("failed to get user %v with error %v", value, err.Error()))
+ }
+ if variable == "current_approver" {
+ filterIssue.ApproverID = &user.ID
+ } else {
+ issueFind.CreatorID = &user.ID
+ }
default:
return "", connect.NewError(connect.CodeInvalidArgument, errors.Errorf("unsupport variable %q with %v operator", variable, celoperators.Equals))
}
@@ -251,9 +276,9 @@ func (s *IssueService) getIssueFind(ctx context.Context, filter string, query st
}
if _, err := parseFilter(ast.NativeRep().Expr()); err != nil {
- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to parse filter, error: %v", err))
+ return nil, nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to parse filter, error: %v", err))
}
- return issueFind, nil
+ return issueFind, filterIssue, nil
}
func (s *IssueService) ListIssues(ctx context.Context, req *connect.Request[v1pb.ListIssuesRequest]) (*connect.Response[v1pb.ListIssuesResponse], error) {
@@ -276,7 +301,7 @@ func (s *IssueService) ListIssues(ctx context.Context, req *connect.Request[v1pb
}
limitPlusOne := offset.limit + 1
- issueFind, err := s.getIssueFind(ctx, req.Msg.Filter, req.Msg.Query, &limitPlusOne, &offset.offset)
+ issueFind, issueFilter, err := s.getIssueFind(ctx, req.Msg.Filter, req.Msg.Query, &limitPlusOne, &offset.offset)
if err != nil {
return nil, err
}
@@ -295,7 +320,7 @@ func (s *IssueService) ListIssues(ctx context.Context, req *connect.Request[v1pb
issues = issues[:offset.limit]
}
- converted, err := s.convertToIssues(ctx, issues)
+ converted, err := s.convertToIssues(ctx, issues, issueFilter)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to convert to issue, error: %v", err))
}
@@ -325,22 +350,24 @@ func (s *IssueService) SearchIssues(ctx context.Context, req *connect.Request[v1
}
limitPlusOne := offset.limit + 1
- issueFind, err := s.getIssueFind(ctx, req.Msg.Filter, req.Msg.Query, &limitPlusOne, &offset.offset)
+ issueFind, issueFilter, err := s.getIssueFind(ctx, req.Msg.Filter, req.Msg.Query, &limitPlusOne, &offset.offset)
if err != nil {
return nil, err
}
if projectID != "-" {
issueFind.ProjectID = &projectID
}
- user, ok := GetUserFromContext(ctx)
- if !ok {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
- }
- projectIDsFilter, err := getProjectIDsSearchFilter(ctx, user, iam.PermissionIssuesGet, s.iamManager, s.store)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get projectIDs, error: %v", err))
+ if issueFind.ProjectID == nil {
+ user, ok := GetUserFromContext(ctx)
+ if !ok {
+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
+ }
+ projectIDsFilter, err := getProjectIDsSearchFilter(ctx, user, iam.PermissionIssuesGet, s.iamManager, s.store)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get projectIDs, error: %v", err))
+ }
+ issueFind.ProjectIDs = projectIDsFilter
}
- issueFind.ProjectIDs = projectIDsFilter
issues, err := s.store.ListIssueV2(ctx, issueFind)
if err != nil {
@@ -355,7 +382,7 @@ func (s *IssueService) SearchIssues(ctx context.Context, req *connect.Request[v1
issues = issues[:offset.limit]
}
- converted, err := s.convertToIssues(ctx, issues)
+ converted, err := s.convertToIssues(ctx, issues, issueFilter)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to convert to issue, error: %v", err))
}
@@ -722,20 +749,7 @@ func (s *IssueService) ApproveIssue(ctx context.Context, req *connect.Request[v1
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- policy, err := s.store.GetProjectIamPolicy(ctx, issue.Project.ResourceID)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get project policy, error: %v", err))
- }
-
- workspacePolicy, err := s.store.GetWorkspaceIamPolicy(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get workspace policy, error: %v", err))
- }
-
- canApprove, err := isUserReviewer(ctx, s.store, issue, role, user, policy.Policy, workspacePolicy.Policy)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check if principal can approve step, error: %v", err))
- }
+ canApprove := s.isUserReviewer(ctx, issue, role, user)
if !canApprove {
return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("cannot approve because the user does not have the required permission"))
}
@@ -925,20 +939,7 @@ func (s *IssueService) RejectIssue(ctx context.Context, req *connect.Request[v1p
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("user not found"))
}
- policy, err := s.store.GetProjectIamPolicy(ctx, issue.Project.ResourceID)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get project policy, error: %v", err))
- }
-
- workspacePolicy, err := s.store.GetWorkspaceIamPolicy(ctx)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to get workspace policy, error: %v", err))
- }
-
- canApprove, err := isUserReviewer(ctx, s.store, issue, role, user, policy.Policy, workspacePolicy.Policy)
- if err != nil {
- return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to check if principal can reject step, error: %v", err))
- }
+ canApprove := s.isUserReviewer(ctx, issue, role, user)
if !canApprove {
return nil, connect.NewError(connect.CodePermissionDenied, errors.Errorf("cannot reject because the user does not have the required permission"))
}
@@ -1544,16 +1545,11 @@ func (s *IssueService) getIssueMessage(ctx context.Context, name string) (*store
return issue, nil
}
-func canRequestIssue(issueCreator *store.UserMessage, user *store.UserMessage) bool {
- return issueCreator.ID == user.ID
+func (s *IssueService) isUserReviewer(ctx context.Context, issue *store.IssueMessage, role string, user *store.UserMessage) bool {
+ roles := s.getUserRoleMap(ctx, issue.Project.ResourceID, user.ID)
+ return roles[role]
}
-func isUserReviewer(ctx context.Context, stores *store.Store, issue *store.IssueMessage, role string, user *store.UserMessage, policies ...*storepb.IamPolicy) (bool, error) {
- // Check project policy about self approval.
- if !issue.Project.Setting.AllowSelfApproval && issue.Creator.ID == user.ID {
- return false, errors.Errorf("creator cannot self approve")
- }
-
- roles := utils.GetUserFormattedRolesMap(ctx, stores, user, policies...)
- return roles[role], nil
+func canRequestIssue(issueCreator *store.UserMessage, user *store.UserMessage) bool {
+ return issueCreator.ID == user.ID
}
diff --git a/backend/api/v1/issue_service_converter.go b/backend/api/v1/issue_service_converter.go
index 8c608a6f82..fc60b6cdd2 100644
--- a/backend/api/v1/issue_service_converter.go
+++ b/backend/api/v1/issue_service_converter.go
@@ -3,28 +3,75 @@ package v1
import (
"context"
"fmt"
+ "log/slog"
"github.com/pkg/errors"
"google.golang.org/protobuf/types/known/timestamppb"
"github.com/bytebase/bytebase/backend/common"
+ "github.com/bytebase/bytebase/backend/common/log"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
"github.com/bytebase/bytebase/backend/store"
+ "github.com/bytebase/bytebase/backend/utils"
)
-func (s *IssueService) convertToIssues(ctx context.Context, issues []*store.IssueMessage) ([]*v1pb.Issue, error) {
+func (s *IssueService) convertToIssues(ctx context.Context, issues []*store.IssueMessage, issueFilter *filterIssueMessage) ([]*v1pb.Issue, error) {
var converted []*v1pb.Issue
for _, issue := range issues {
v1Issue, err := s.convertToIssue(ctx, issue)
if err != nil {
return nil, errors.Wrapf(err, "failed to convert to issue")
}
+ if v1Issue == nil {
+ continue
+ }
+ if issueFilter != nil {
+ if v := issueFilter.ApprovalStatus; v != nil && v1Issue.ApprovalStatus != *v {
+ continue
+ }
+ projectID, _, err := common.GetProjectIDIssueUID(v1Issue.Name)
+ if err != nil {
+ slog.Error("failed to parse the issue name", log.BBError(err), slog.String("issue", v1Issue.Name))
+ continue
+ }
+ if v := issueFilter.ApproverID; v != nil && !s.isIssueNextApprover(ctx, v1Issue, projectID, *v) {
+ continue
+ }
+ }
converted = append(converted, v1Issue)
}
return converted, nil
}
+func (s *IssueService) getUserRoleMap(ctx context.Context, projectResourceID string, principalUID int) map[string]bool {
+ policy, err := s.store.GetProjectIamPolicy(ctx, projectResourceID)
+ slog.Error("failed to get project iam policy", log.BBError(err), slog.String("project", projectResourceID))
+ if err != nil {
+ return map[string]bool{}
+ }
+ workspacePolicy, err := s.store.GetWorkspaceIamPolicy(ctx)
+ if err != nil {
+ slog.Error("failed to get workspace iam policy", log.BBError(err))
+ return map[string]bool{}
+ }
+
+ return utils.GetUserFormattedRolesMap(ctx, s.store, &store.UserMessage{
+ ID: principalUID,
+ }, policy.Policy, workspacePolicy.Policy)
+}
+
+func (s *IssueService) isIssueNextApprover(ctx context.Context, issue *v1pb.Issue, projectResourceID string, principalUID int) bool {
+ roles := s.getUserRoleMap(ctx, projectResourceID, principalUID)
+ approvalRoles := issue.GetApprovalTemplate().GetFlow().GetRoles()
+ index := len(issue.Approvers)
+ if index >= len(approvalRoles) {
+ return false
+ }
+
+ return roles[approvalRoles[index]]
+}
+
func (s *IssueService) convertToIssue(ctx context.Context, issue *store.IssueMessage) (*v1pb.Issue, error) {
issuePayload := issue.Payload
diff --git a/backend/generated-go/v1/issue_service.pb.go b/backend/generated-go/v1/issue_service.pb.go
index 96abed90c4..0468e27976 100644
--- a/backend/generated-go/v1/issue_service.pb.go
+++ b/backend/generated-go/v1/issue_service.pb.go
@@ -532,6 +532,8 @@ type ListIssuesRequest struct {
// - database: the database full name in the "instances/{id}/databases/{name}" format, support "==" operator.
// - environment: the database full name in the "environments/{name}" format, support "==" operator.
// - labels: the issue labels, support "==" and "in" operator.
+ // - approval_status: issue approval status, support "==" operator.
+ // - current_approver: the issue approver, should in "users/{email} format", support "==" operator.
//
// For example:
// creator == "users/[email protected]" && status in ["OPEN", "DONE"]
@@ -1192,7 +1194,6 @@ type Issue struct {
// - roles/workspaceDBA
// - roles/projectOwner
// - roles/projectReleaser
- // - users/{email}
Releasers []string `protobuf:"bytes,20,rep,name=releasers,proto3" json:"releasers,omitempty"`
// The risk level of the issue.
RiskLevel RiskLevel `protobuf:"varint,21,opt,name=risk_level,json=riskLevel,proto3,enum=bytebase.v1.RiskLevel" json:"risk_level,omitempty"`
diff --git a/frontend/src/components/AdvancedSearch/AdvancedSearch.vue b/frontend/src/components/AdvancedSearch/AdvancedSearch.vue
index 6357f92bb8..24c43de706 100644
--- a/frontend/src/components/AdvancedSearch/AdvancedSearch.vue
+++ b/frontend/src/components/AdvancedSearch/AdvancedSearch.vue
@@ -55,7 +55,7 @@
<div
v-show="showMenu"
v-zindexable="{ enabled: true }"
- class="absolute top-[36px] w-full bg-gray-100 shadow-xl origin-top-left rounded-[3px] overflow-clip"
+ class="absolute top-9 w-full bg-gray-100 shadow-xl origin-top-left rounded-[3px] overflow-clip"
>
<ScopeMenu
:show="state.menuView === 'scope'"
@@ -99,6 +99,7 @@ import {
buildSearchTextBySearchParams,
emptySearchParams,
getValueFromSearchParams,
+ getValuesFromSearchParams,
mergeSearchParams,
minmax,
upsertScope,
@@ -317,33 +318,26 @@ const visibleScopeOptions = computed(() => {
const visibleValueOptions = computed(() => {
if (!state.currentScope) return [];
+ const selectedValues = new Set(
+ getValuesFromSearchParams(props.params, state.currentScope)
+ );
+ const options = valueOptions.value.filter(
+ (option) => !selectedValues.has(option.value)
+ );
+
const keyword = currentValueForScope.value
.trim()
.replace(/:.*$/, "")
.toLowerCase();
if (!keyword || currentScopeOption.value?.search) {
- return valueOptions.value;
+ return options;
}
- const filtered = valueOptions.value.filter(
+ return options.filter(
(option) =>
option.value.toLowerCase().includes(keyword) ||
option.keywords.some((key) => key.includes(keyword))
);
-
- const currentValue = getValueFromSearchParams(
- props.params,
- state.currentScope
- );
- const option = valueOptions.value.find((opt) => opt.value === currentValue);
- if (currentValue && option) {
- // If we have current value, put it to the first if it doesn't match the keyword
- const index = filtered.findIndex((opt) => opt.value === currentValue);
- if (index < 0) {
- filtered.unshift(option);
- }
- }
- return filtered;
});
const visibleOptions = computed(() => {
diff --git a/frontend/src/components/AdvancedSearch/ScopeTags.vue b/frontend/src/components/AdvancedSearch/ScopeTags.vue
index 1e086db1e2..ec6bfbe9da 100644
--- a/frontend/src/components/AdvancedSearch/ScopeTags.vue
+++ b/frontend/src/components/AdvancedSearch/ScopeTags.vue
@@ -1,7 +1,7 @@
<template>
<NTag
v-for="(scope, i) in params.scopes"
- :key="scope.id"
+ :key="`${i}-${scope.id}`"
:closable="!scope.readonly"
:disabled="scope.readonly"
:data-search-scope-id="scope.id"
diff --git a/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue b/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue
index 361b51975d..42e8845511 100644
--- a/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue
+++ b/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue
@@ -45,7 +45,7 @@ import { computed, ref } from "vue";
import AdvancedSearch from "@/components/AdvancedSearch";
import TimeRange from "@/components/AdvancedSearch/TimeRange.vue";
import type { SearchParams, SearchScopeId } from "@/utils";
-import { UIIssueFilterScopeIdList } from "@/utils";
+
import PresetButtons from "./PresetButtons.vue";
import Status from "./Status.vue";
import { useIssueSearchScopeOptions } from "./useIssueSearchScopeOptions";
@@ -78,8 +78,9 @@ const allowedScopes = computed((): SearchScopeId[] => {
return props.overrideScopeIdList;
}
return [
- ...UIIssueFilterScopeIdList,
"creator",
+ "current-approver",
+ "approval",
"instance",
"database",
"status",
diff --git a/frontend/src/components/IssueV1/components/IssueSearch/PresetButtons.vue b/frontend/src/components/IssueV1/components/IssueSearch/PresetButtons.vue
index 6065094b63..a824e9cd8f 100644
--- a/frontend/src/components/IssueV1/components/IssueSearch/PresetButtons.vue
+++ b/frontend/src/components/IssueV1/components/IssueSearch/PresetButtons.vue
@@ -18,12 +18,12 @@ import { NTab, NTabs } from "naive-ui";
import { computed } from "vue";
import { useI18n } from "vue-i18n";
import { useCurrentUserV1 } from "@/store";
-import type { SearchParams } from "@/utils";
import {
- getSemanticIssueStatusFromSearchParams,
- getValueFromSearchParams,
- upsertScope,
-} from "@/utils";
+ Issue_ApprovalStatus,
+ IssueStatus,
+} from "@/types/proto-es/v1/issue_service_pb";
+import type { SearchParams } from "@/utils";
+import { getValueFromSearchParams, upsertScope } from "@/utils";
type PresetValue = "WAITING_APPROVAL" | "CREATED" | "ALL";
@@ -60,7 +60,7 @@ const presets = computed((): Preset[] => [
const activePreset = computed((): PresetValue | "" => {
const preset = presets.value.find((p) => isActive(p.value));
- return preset ? preset.value : "";
+ return preset?.value ?? "";
});
const isActive = (preset: PresetValue): boolean => {
@@ -68,19 +68,13 @@ const isActive = (preset: PresetValue): boolean => {
if (preset === "WAITING_APPROVAL") {
return (
- getSemanticIssueStatusFromSearchParams(props.params) === "OPEN" &&
- getValueFromSearchParams(props.params, "approval") === "pending" &&
- getValueFromSearchParams(props.params, "approver") === myEmail &&
- props.params.scopes.filter((s) => !s.readonly).length === 3
+ getValueFromSearchParams(props.params, "approval") ===
+ Issue_ApprovalStatus[Issue_ApprovalStatus.PENDING]
);
}
if (preset === "CREATED") {
- return (
- getSemanticIssueStatusFromSearchParams(props.params) === "OPEN" &&
- getValueFromSearchParams(props.params, "creator") === myEmail &&
- props.params.scopes.filter((s) => !s.readonly).length === 2
- );
+ return getValueFromSearchParams(props.params, "creator") === myEmail;
}
if (preset === "ALL") {
@@ -90,9 +84,7 @@ const isActive = (preset: PresetValue): boolean => {
return false;
};
-const selectPreset = (preset: PresetValue | string) => {
- if (!["WAITING_APPROVAL", "CREATED", "ALL"].includes(preset)) return;
-
+const selectPreset = (preset: PresetValue) => {
const myEmail = me.value.email;
const readonlyScopes = props.params.scopes.filter((s) => s.readonly);
@@ -105,16 +97,19 @@ const selectPreset = (preset: PresetValue | string) => {
newParams = upsertScope({
params: newParams,
scopes: [
- { id: "status", value: "OPEN" },
- { id: "approval", value: "pending" },
- { id: "approver", value: myEmail },
+ { id: "status", value: IssueStatus[IssueStatus.OPEN] },
+ {
+ id: "approval",
+ value: Issue_ApprovalStatus[Issue_ApprovalStatus.PENDING],
+ },
+ { id: "current-approver", value: myEmail },
],
});
} else if (preset === "CREATED") {
newParams = upsertScope({
params: newParams,
scopes: [
- { id: "status", value: "OPEN" },
+ { id: "status", value: IssueStatus[IssueStatus.OPEN] },
{ id: "creator", value: myEmail },
],
});
diff --git a/frontend/src/components/IssueV1/components/IssueSearch/Status.vue b/frontend/src/components/IssueV1/components/IssueSearch/Status.vue
index d1ed83e1d7..4f174bda23 100644
--- a/frontend/src/components/IssueV1/components/IssueSearch/Status.vue
+++ b/frontend/src/components/IssueV1/components/IssueSearch/Status.vue
@@ -17,8 +17,9 @@
import { NTab, NTabs } from "naive-ui";
import { computed } from "vue";
import { useI18n } from "vue-i18n";
-import type { SearchParams, SemanticIssueStatus } from "@/utils";
-import { getSemanticIssueStatusFromSearchParams, upsertScope } from "@/utils";
+import { IssueStatus } from "@/types/proto-es/v1/issue_service_pb";
+import type { SearchParams, SearchScope } from "@/utils";
+import { getValuesFromSearchParams, upsertScope } from "@/utils";
const props = defineProps<{
params: SearchParams;
@@ -33,32 +34,69 @@ const { t } = useI18n();
const tabItemList = computed(() => {
return [
{
- value: "OPEN",
+ value: IssueStatus.OPEN,
label: t("issue.table.open"),
},
{
- value: "CLOSED",
+ value: IssueStatus.DONE,
label: t("issue.table.closed"),
},
] as {
- value: SemanticIssueStatus;
+ value: IssueStatus;
label: string;
}[];
});
-const tab = computed(() => {
- return getSemanticIssueStatusFromSearchParams(props.params) ?? "";
+const tab = computed((): IssueStatus => {
+ const statusList = getValuesFromSearchParams(props.params, "status").map(
+ (status) => IssueStatus[status as keyof typeof IssueStatus]
+ );
+
+ switch (statusList.length) {
+ case 0:
+ return IssueStatus.ISSUE_STATUS_UNSPECIFIED;
+ case 1:
+ if (statusList[0] === IssueStatus.OPEN) {
+ return IssueStatus.OPEN;
+ }
+ return IssueStatus.DONE;
+ default:
+ if (!statusList.includes(IssueStatus.OPEN)) {
+ return IssueStatus.DONE;
+ }
+ return IssueStatus.ISSUE_STATUS_UNSPECIFIED;
+ }
});
-const updateStatus = (value: SemanticIssueStatus) => {
- if (!["", "OPEN", "CLOSED"].includes(value)) return;
+const updateStatus = (value: IssueStatus) => {
+ const scopes: SearchScope[] = [];
+ let allowMultiple = false;
+ if (value === IssueStatus.OPEN) {
+ scopes.push({
+ id: "status",
+ value: IssueStatus[IssueStatus.OPEN],
+ });
+ } else {
+ scopes.push(
+ {
+ id: "status",
+ value: IssueStatus[IssueStatus.DONE],
+ },
+ {
+ id: "status",
+ value: IssueStatus[IssueStatus.CANCELED],
+ }
+ );
+ allowMultiple = true;
+ }
const updated = upsertScope({
- params: props.params,
- scopes: {
- id: "status",
- value: value,
+ params: {
+ ...props.params,
+ scopes: props.params.scopes.filter((scope) => scope.id !== "status"),
},
+ scopes,
+ allowMultiple,
});
emit("update:params", updated);
};
diff --git a/frontend/src/components/IssueV1/components/IssueSearch/useIssueSearchScopeOptions.ts b/frontend/src/components/IssueV1/components/IssueSearch/useIssueSearchScopeOptions.ts
index aebfb944c9..9e6aec8708 100644
--- a/frontend/src/components/IssueV1/components/IssueSearch/useIssueSearchScopeOptions.ts
+++ b/frontend/src/components/IssueV1/components/IssueSearch/useIssueSearchScopeOptions.ts
@@ -18,6 +18,11 @@ import {
useUserStore,
} from "@/store";
import { isValidProjectName, SYSTEM_BOT_USER_NAME, UNKNOWN_ID } from "@/types";
+import { MigrationType } from "@/types/proto-es/v1/common_pb";
+import {
+ Issue_ApprovalStatus,
+ IssueStatus,
+} from "@/types/proto-es/v1/issue_service_pb";
import { type Label } from "@/types/proto-es/v1/project_service_pb";
import { UserType } from "@/types/proto-es/v1/user_service_pb";
import type { SearchParams, SearchScopeId } from "@/utils";
@@ -175,18 +180,24 @@ export const useIssueSearchScopeOptions = (
},
{
id: "status",
+ allowMultiple: true,
title: t("common.status"),
description: t("issue.advanced-search.scope.approval.description"),
options: [
{
- value: "OPEN",
+ value: IssueStatus[IssueStatus.OPEN],
keywords: ["open"],
render: () => renderSpan(t("issue.table.open")),
},
{
- value: "CLOSED",
- keywords: ["closed", "canceled", "done"],
- render: () => renderSpan(t("issue.table.closed")),
+ value: IssueStatus[IssueStatus.DONE],
+ keywords: ["closed", "done"],
+ render: () => renderSpan(t("common.done")),
+ },
+ {
+ value: IssueStatus[IssueStatus.CANCELED],
+ keywords: ["closed", "canceled"],
+ render: () => renderSpan(t("common.canceled")),
},
],
},
@@ -196,7 +207,7 @@ export const useIssueSearchScopeOptions = (
description: t("issue.advanced-search.scope.approval.description"),
options: [
{
- value: "pending",
+ value: Issue_ApprovalStatus[Issue_ApprovalStatus.PENDING],
keywords: ["pending"],
render: () =>
renderSpan(
@@ -204,7 +215,7 @@ export const useIssueSearchScopeOptions = (
),
},
{
- value: "approved",
+ value: Issue_ApprovalStatus[Issue_ApprovalStatus.APPROVED],
keywords: ["approved", "done"],
render: () =>
renderSpan(
@@ -224,9 +235,11 @@ export const useIssueSearchScopeOptions = (
]),
},
{
- id: "approver",
- title: t("issue.advanced-search.scope.approver.title"),
- description: t("issue.advanced-search.scope.approver.description"),
+ id: "current-approver",
+ title: t("issue.advanced-search.scope.current-approver.title"),
+ description: t(
+ "issue.advanced-search.scope.current-approver.description"
+ ),
search: searchPrincipalSearchValueOptions([
UserType.USER,
UserType.SERVICE_ACCOUNT,
@@ -238,12 +251,12 @@ export const useIssueSearchScopeOptions = (
description: t("issue.advanced-search.scope.type.description"),
options: [
{
- value: "DDL",
+ value: MigrationType[MigrationType.DDL],
keywords: ["ddl", "data definition language"],
render: () => renderSpan("Data Definition Language"),
},
{
- value: "DML",
+ value: MigrationType[MigrationType.DML],
keywords: ["dml", "data manipulation language"],
render: () => renderSpan("Data Manipulation Language"),
},
diff --git a/frontend/src/components/Project/ProjectIssuesPanel.vue b/frontend/src/components/Project/ProjectIssuesPanel.vue
index 73dff119b9..823f3161d0 100644
--- a/frontend/src/components/Project/ProjectIssuesPanel.vue
+++ b/frontend/src/components/Project/ProjectIssuesPanel.vue
@@ -15,7 +15,7 @@
<IssueTableV1
:bordered="true"
:loading="loading"
- :issue-list="applyUIIssueFilter(list, mergedUIIssueFilter)"
+ :issue-list="list"
:highlight-text="state.params.query"
/>
</template>
@@ -25,7 +25,6 @@
</template>
<script lang="ts" setup>
-import { type UseStorageOptions } from "@vueuse/core";
import { computed, onMounted, reactive, ref, watch } from "vue";
import type { ComponentExposed } from "vue-component-type-helpers";
import { useRoute, useRouter } from "vue-router";
@@ -37,18 +36,18 @@ import {
useRefreshIssueList,
} from "@/store";
import type { ComposedIssue } from "@/types";
+import {
+ Issue_ApprovalStatus,
+ IssueStatus,
+} from "@/types/proto-es/v1/issue_service_pb";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
-import type { SearchParams, SearchScope, SemanticIssueStatus } from "@/utils";
+import type { SearchParams, SearchScope } from "@/utils";
import {
- applyUIIssueFilter,
buildIssueFilterBySearchParams,
buildSearchParamsBySearchText,
buildSearchTextBySearchParams,
- buildUIIssueFilterBySearchParams,
extractProjectResourceName,
- getSemanticIssueStatusFromSearchParams,
mergeSearchParams,
- useDynamicLocalStorage,
} from "@/utils";
import { IssueSearch } from "../IssueV1/components";
@@ -77,32 +76,18 @@ const readonlyScopes = computed((): SearchScope[] => {
];
});
-const storedStatus = useDynamicLocalStorage<SemanticIssueStatus>(
- computed(() => `bb.project.issue-list-status.${me.value.name}`),
- "OPEN",
- window.localStorage,
- {
- serializer: {
- read(raw: SemanticIssueStatus) {
- if (!["OPEN", "CLOSED"].includes(raw)) return "OPEN";
- return raw;
- },
- write(value) {
- return value;
- },
- },
- } as UseStorageOptions<SemanticIssueStatus>
-);
-
const defaultSearchParams = (): SearchParams => {
const myEmail = me.value.email;
return {
query: "",
scopes: [
...readonlyScopes.value,
- { id: "status", value: "OPEN" },
- { id: "approval", value: "pending" },
- { id: "approver", value: myEmail },
+ { id: "status", value: IssueStatus[IssueStatus.OPEN] },
+ {
+ id: "approval",
+ value: Issue_ApprovalStatus[Issue_ApprovalStatus.PENDING],
+ },
+ { id: "current-approver", value: myEmail },
],
};
};
@@ -114,9 +99,6 @@ const state = reactive<LocalState>({
const mergedIssueFilter = computed(() => {
return buildIssueFilterBySearchParams(state.params);
});
-const mergedUIIssueFilter = computed(() => {
- return buildUIIssueFilterBySearchParams(state.params);
-});
const fetchIssueList = async ({
pageToken,
@@ -149,13 +131,6 @@ watch(
}
);
-watch(
- () => getSemanticIssueStatusFromSearchParams(state.params),
- (status) => {
- storedStatus.value = status;
- }
-);
-
// Helper to check if params match the default preset
const isDefaultPreset = (params: SearchParams): boolean => {
const defaultParams = defaultSearchParams();
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index cb31b94fd0..eb388f244f 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -922,9 +922,9 @@
"title": "Creator",
"description": "Search by the creator"
},
- "approver": {
- "title": "Approver",
- "description": "Search by the issue approver"
+ "current-approver": {
+ "title": "Current approver",
+ "description": "Search by the issue current approver"
},
"approval": {
"value": {
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index 4e515f71b6..fac07c4f6c 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -922,9 +922,9 @@
"title": "Creador",
"description": "Búsqueda por creador"
},
- "approver": {
- "title": "Aprobador",
- "description": "Búsqueda por aprobador del problema"
+ "current-approver": {
+ "title": "aprobador actual",
+ "description": "Buscar por el aprobador actual del problema"
},
"approval": {
"value": {
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index f32839f839..f7105cac65 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -922,9 +922,9 @@
"title": "作成者",
"description": "作成者で検索"
},
- "approver": {
- "title": "承認者",
- "description": "イシューの承認者で検索"
+ "current-approver": {
+ "title": "現在の承認者",
+ "description": "問題の現在の承認者による検索"
},
"approval": {
"value": {
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index e871fcb8ee..016f8c926c 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -922,9 +922,9 @@
"title": "Người tạo",
"description": "Tìm kiếm theo người sáng tạo"
},
- "approver": {
- "title": "Người phê duyệt",
- "description": "Tìm kiếm theo người phê duyệt vấn đề"
+ "current-approver": {
+ "title": "Người phê duyệt hiện tại",
+ "description": "Tìm kiếm theo người phê duyệt hiện tại"
},
"approval": {
"value": {
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index 6e4fff8fec..d365567d09 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -922,9 +922,9 @@
"title": "创建人",
"description": "根据创建人搜索"
},
- "approver": {
- "title": "审批人",
- "description": "根据工单审批人搜索"
+ "current-approver": {
+ "title": "当前审批人",
+ "description": "按工单的当前审批人搜索"
},
"approval": {
"value": {
diff --git a/frontend/src/store/modules/v1/issue.ts b/frontend/src/store/modules/v1/issue.ts
index 4fc5c6198d..24b388c37b 100644
--- a/frontend/src/store/modules/v1/issue.ts
+++ b/frontend/src/store/modules/v1/issue.ts
@@ -42,6 +42,14 @@ export const buildIssueFilter = (find: IssueFilter): string => {
if (find.creator) {
filter.push(`creator == "${find.creator}"`);
}
+ if (find.currentApprover) {
+ filter.push(`current_approver == "${find.currentApprover}"`);
+ }
+ if (find.approvalStatus) {
+ filter.push(
+ `approval_status == "${Issue_ApprovalStatus[find.approvalStatus]}"`
+ );
+ }
if (find.statusList && find.statusList.length > 0) {
filter.push(
`status in [${find.statusList.map((s) => `"${IssueStatus[s]}"`).join(",")}]`
diff --git a/frontend/src/types/proto-es/v1/issue_service_pb.d.ts b/frontend/src/types/proto-es/v1/issue_service_pb.d.ts
index 464910e295..b09465c332 100644
--- a/frontend/src/types/proto-es/v1/issue_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/issue_service_pb.d.ts
@@ -112,6 +112,8 @@ export declare type ListIssuesRequest = Message<"bytebase.v1.ListIssuesRequest">
* - database: the database full name in the "instances/{id}/databases/{name}" format, support "==" operator.
* - environment: the database full name in the "environments/{name}" format, support "==" operator.
* - labels: the issue labels, support "==" and "in" operator.
+ * - approval_status: issue approval status, support "==" operator.
+ * - current_approver: the issue approver, should in "users/{email} format", support "==" operator.
*
* For example:
* creator == "users/[email protected]" && status in ["OPEN", "DONE"]
@@ -515,7 +517,6 @@ export declare type Issue = Message<"bytebase.v1.Issue"> & {
* - roles/workspaceDBA
* - roles/projectOwner
* - roles/projectReleaser
- * - users/{email}
*
* @generated from field: repeated string releasers = 20;
*/
diff --git a/frontend/src/types/v1/issue/issue.ts b/frontend/src/types/v1/issue/issue.ts
index 6592e955ab..6c515d16ac 100644
--- a/frontend/src/types/v1/issue/issue.ts
+++ b/frontend/src/types/v1/issue/issue.ts
@@ -5,7 +5,11 @@ import {
UNKNOWN_PROJECT_NAME,
UNKNOWN_ROLLOUT_NAME,
} from "@/types";
-import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
+import { MigrationType } from "@/types/proto-es/v1/common_pb";
+import type {
+ Issue,
+ Issue_ApprovalStatus,
+} from "@/types/proto-es/v1/issue_service_pb";
import {
Issue_Type,
IssueSchema,
@@ -65,13 +69,15 @@ export interface IssueFilter {
environment?: string;
query: string;
creator?: string;
+ currentApprover?: string;
+ approvalStatus?: Issue_ApprovalStatus;
statusList?: IssueStatus[];
createdTsAfter?: number;
createdTsBefore?: number;
// type is the issue type, for example: GRANT_REQUEST, DATABASE_EXPORT
type?: Issue_Type;
// taskType is the task type, for example: DDL, DML
- taskType?: string;
+ taskType?: MigrationType;
// filter by labels, for example: labels = "feature & bug"
labels?: string[];
}
diff --git a/frontend/src/utils/v1/advanced-search/common.ts b/frontend/src/utils/v1/advanced-search/common.ts
index 5a5aadf8da..38c48b6aa5 100644
--- a/frontend/src/utils/v1/advanced-search/common.ts
+++ b/frontend/src/utils/v1/advanced-search/common.ts
@@ -1,14 +1,5 @@
import { cloneDeep, pullAt } from "lodash-es";
-export type SemanticIssueStatus = "OPEN" | "CLOSED";
-
-export const UIIssueFilterScopeIdList = [
- "approver",
- "approval",
- "releaser",
-] as const;
-type UIIssueFilterScopeId = (typeof UIIssueFilterScopeIdList)[number];
-
export const CommonFilterScopeIdList = ["environment", "instance"] as const;
type CommonFilterScopeId = (typeof CommonFilterScopeIdList)[number];
@@ -32,6 +23,8 @@ export const AllSearchScopeIdList = [
// issue related search scopes.
"issue-label",
"taskType",
+ "current-approver",
+ "approval",
// auditLog related search scopes.
"method",
"level",
@@ -45,7 +38,6 @@ export const AllSearchScopeIdList = [
export type SearchScopeId =
| (typeof AllSearchScopeIdList)[number]
- | UIIssueFilterScopeId
| CommonFilterScopeId;
export type SearchScope = {
@@ -60,11 +52,7 @@ export interface SearchParams {
}
export const isValidSearchScopeId = (id: string): id is SearchScopeId => {
- return (
- AllSearchScopeIdList.includes(id as any) ||
- UIIssueFilterScopeIdList.includes(id as any) ||
- CommonFilterScopeIdList.includes(id as any)
- );
+ return AllSearchScopeIdList.includes(id as any);
};
export const buildSearchTextBySearchParams = (
@@ -83,7 +71,8 @@ export const buildSearchTextBySearchParams = (
export const mergeSearchParams = (base: SearchParams, patch: SearchParams) => {
for (const scope of patch.scopes) {
- if (!base.scopes.find((s) => s.id === scope.id)) {
+ const existed = base.scopes.find((s) => s.id === scope.id);
+ if (!existed || existed.value !== scope.value) {
base.scopes.push(scope);
}
}
@@ -116,6 +105,13 @@ export const buildSearchParamsBySearchText = (text: string): SearchParams => {
return params;
};
+export const getValuesFromSearchParams = (
+ params: SearchParams,
+ scopeId: SearchScopeId
+) => {
+ return params.scopes.filter((s) => s.id === scopeId).map((s) => s.value);
+};
+
export const getValueFromSearchParams = (
params: SearchParams,
scopeId: SearchScopeId,
@@ -167,9 +163,12 @@ export const upsertScope = ({
if (!Array.isArray(scopes)) {
scopes = [scopes];
}
- scopes.forEach((scope) => {
+ for (const scope of scopes) {
const index = target.scopes.findIndex((s) => s.id === scope.id);
if (index >= 0) {
+ if (target.scopes[index].value === scope.value) {
+ continue;
+ }
if (!scope.value) {
pullAt(target.scopes, index);
} else {
@@ -184,7 +183,8 @@ export const upsertScope = ({
target.scopes.push(scope);
}
}
- });
+ }
+
return target;
};
diff --git a/frontend/src/utils/v1/advanced-search/issue/index.ts b/frontend/src/utils/v1/advanced-search/issue/index.ts
index c646c8b43c..178cd64f81 100644
--- a/frontend/src/utils/v1/advanced-search/issue/index.ts
+++ b/frontend/src/utils/v1/advanced-search/issue/index.ts
@@ -1,2 +1 @@
export * from "./utils";
-export * from "./ui-filter";
diff --git a/frontend/src/utils/v1/advanced-search/issue/ui-filter.ts b/frontend/src/utils/v1/advanced-search/issue/ui-filter.ts
deleted file mode 100644
index 4371b2b27e..0000000000
--- a/frontend/src/utils/v1/advanced-search/issue/ui-filter.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import { releaserCandidatesForIssue } from "@/components/IssueV1/logic";
-import { candidatesOfApprovalStepV1, userNamePrefix } from "@/store";
-import type { ComposedIssue } from "@/types";
-import { Issue_ApprovalStatus } from "@/types/proto-es/v1/issue_service_pb";
-import { isUserIncludedInList } from "@/utils";
-import type { SearchParams } from "../common";
-import { getValueFromSearchParams } from "../common";
-
-export const IssueApprovalStatusList = ["pending", "approved"] as const;
-export type IssueApprovalStatus = (typeof IssueApprovalStatusList)[number];
-export const isValidIssueApprovalStatus = (
- s: string
-): s is IssueApprovalStatus => {
- return IssueApprovalStatusList.includes(s as IssueApprovalStatus);
-};
-
-// Use snake_case to keep consistent with the advanced search query string
-export interface UIIssueFilter {
- approver?: string;
- approval?: IssueApprovalStatus | "";
- releaser?: string;
-}
-
-export const filterIssueByApprover = (
- issue: ComposedIssue,
- approver: string | undefined
-) => {
- if (!approver) return true;
-
- // Only show issues that are pending approval
- if (issue.approvalStatus !== Issue_ApprovalStatus.PENDING) {
- return false;
- }
-
- const { approvalTemplate, approvers } = issue;
- if (!approvalTemplate) return false;
-
- const currentRoleIndex = approvers.length;
- const roles = approvalTemplate.flow?.roles || [];
- const role = roles[currentRoleIndex];
- if (!role) return false;
-
- const candidates = candidatesOfApprovalStepV1(issue, role);
-
- // We support "approver:{email}" by now
- // Planning to support "approver:[{email_1}, {email_2}, ...]" and
- // "approver:roles/{role}" in the future
- if (approver.startsWith(userNamePrefix)) {
- return candidates.includes(approver);
- }
-
- console.error(
- "[filterIssueByApprover] should never reach this line",
- approver
- );
- return false;
-};
-
-export const filterIssueByReleaser = (
- issue: ComposedIssue,
- releaser: string | undefined
-) => {
- if (!releaser) return true;
-
- // We support "release:{email}" by now
- // Planning to support "release:[{email_1}, {email_2}, ...]" and
- // "release:roles/{role}" in the future
- if (releaser.startsWith(userNamePrefix)) {
- const candidates = releaserCandidatesForIssue(issue);
- return isUserIncludedInList(releaser, candidates);
- }
-
- console.error(
- "[filterIssueByReleaser] should never reach this line",
- releaser
- );
- return false;
-};
-
-export const filterIssueByApprovalStatus = (
- issue: ComposedIssue,
- status: IssueApprovalStatus | "" | undefined
-) => {
- if (!status) return true;
-
- const approvalStatus = issue.approvalStatus;
- if (status === "pending") {
- return approvalStatus === Issue_ApprovalStatus.PENDING;
- }
- if (status === "approved") {
- return (
- approvalStatus === Issue_ApprovalStatus.APPROVED ||
- approvalStatus === Issue_ApprovalStatus.SKIPPED
- );
- }
-
- console.error(
- "[filterIssueByApprovalStatus] should never reach this line",
- status
- );
- return false;
-};
-
-export const applyUIIssueFilter = (
- list: ComposedIssue[],
- filter: UIIssueFilter | undefined
-) => {
- if (!filter) return list;
- return list
- .filter((issue) => filterIssueByApprover(issue, filter.approver))
- .filter((issue) => filterIssueByApprovalStatus(issue, filter.approval))
- .filter((issue) => filterIssueByReleaser(issue, filter.releaser));
-};
-
-export const getIssueApprovalStatusFromSearchParams = (
- params: SearchParams
-) => {
- return getValueFromSearchParams(
- params,
- "approval",
- "" /* prefix='' */,
- IssueApprovalStatusList
- ) as IssueApprovalStatus | "";
-};
-
-export const buildUIIssueFilterBySearchParams = (params: SearchParams) => {
- const uiIssueFilter: UIIssueFilter = {
- approval: getIssueApprovalStatusFromSearchParams(params),
- approver: getValueFromSearchParams(params, "approver", userNamePrefix),
- releaser: getValueFromSearchParams(params, "releaser", userNamePrefix),
- };
-
- return uiIssueFilter;
-};
diff --git a/frontend/src/utils/v1/advanced-search/issue/utils.ts b/frontend/src/utils/v1/advanced-search/issue/utils.ts
index 29da0d7f09..a2b2268d13 100644
--- a/frontend/src/utils/v1/advanced-search/issue/utils.ts
+++ b/frontend/src/utils/v1/advanced-search/issue/utils.ts
@@ -7,58 +7,62 @@ import {
} from "@/store";
import type { IssueFilter } from "@/types";
import { unknownDatabase } from "@/types";
-import { IssueStatus } from "@/types/proto-es/v1/issue_service_pb";
-import type { SearchParams, SemanticIssueStatus } from "../common";
+import { MigrationType } from "@/types/proto-es/v1/common_pb";
+import {
+ Issue_ApprovalStatus,
+ IssueStatus,
+} from "@/types/proto-es/v1/issue_service_pb";
+import type { SearchParams } from "../common";
import {
getTsRangeFromSearchParams,
getValueFromSearchParams,
- type SearchScopeId,
+ getValuesFromSearchParams,
} from "../common";
-const getValuesFromSearchParams = (
- params: SearchParams,
- scopeId: SearchScopeId
-) => {
- return params.scopes.filter((s) => s.id === scopeId).map((s) => s.value);
-};
-
export const buildIssueFilterBySearchParams = (
params: SearchParams,
defaultFilter?: Partial<IssueFilter>
) => {
- const { query, scopes } = params;
- const projectScope = scopes.find((s) => s.id === "project");
- const taskTypeScope = scopes.find((s) => s.id === "taskType");
- const databaseScope = scopes.find((s) => s.id === "database");
+ const { query } = params;
+ const projectScope = getValueFromSearchParams(params, "project");
+ const taskTypeScope = getValueFromSearchParams(params, "taskType");
+ const databaseScope = getValueFromSearchParams(params, "database");
let database = "";
if (databaseScope) {
- const db = useDatabaseV1Store().getDatabaseByName(databaseScope.value);
+ const db = useDatabaseV1Store().getDatabaseByName(databaseScope);
if (db.name !== unknownDatabase().name) {
database = db.name;
}
}
const createdTsRange = getTsRangeFromSearchParams(params, "created");
- const status = getSemanticIssueStatusFromSearchParams(params);
const labels = getValuesFromSearchParams(params, "issue-label");
+ const approvalStatus = getValueFromSearchParams(params, "approval");
const filter: IssueFilter = {
...defaultFilter,
query,
instance: getValueFromSearchParams(params, "instance", instanceNamePrefix),
database,
- project: `${projectNamePrefix}${projectScope?.value ?? "-"}`,
+ project: `${projectNamePrefix}${projectScope || "-"}`,
createdTsAfter: createdTsRange?.[0],
createdTsBefore: createdTsRange?.[1],
- taskType: taskTypeScope?.value,
+ taskType: MigrationType[taskTypeScope as keyof typeof MigrationType],
creator: getValueFromSearchParams(params, "creator", userNamePrefix),
- statusList:
- status === "OPEN"
- ? [IssueStatus.OPEN]
- : status === "CLOSED"
- ? [IssueStatus.DONE, IssueStatus.CANCELED]
- : undefined,
+ currentApprover: getValueFromSearchParams(
+ params,
+ "current-approver",
+ userNamePrefix
+ ),
+ approvalStatus: approvalStatus
+ ? Issue_ApprovalStatus[
+ approvalStatus as keyof typeof Issue_ApprovalStatus
+ ]
+ : undefined,
+ statusList: getValuesFromSearchParams(params, "status").map(
+ (status) => IssueStatus[status as keyof typeof IssueStatus]
+ ),
labels,
environment: getValueFromSearchParams(
params,
@@ -68,16 +72,3 @@ export const buildIssueFilterBySearchParams = (
};
return filter;
};
-
-export const getSemanticIssueStatusFromSearchParams = (
- params: SearchParams
-) => {
- const status = getValueFromSearchParams(
- params,
- "status",
- "" /* prefix='' */,
- ["OPEN", "CLOSED"]
- ) as SemanticIssueStatus | "";
- if (!status) return undefined;
- return status;
-};
diff --git a/frontend/src/views/ExportCenter/index.vue b/frontend/src/views/ExportCenter/index.vue
index b3516b727a..793a168be5 100644
--- a/frontend/src/views/ExportCenter/index.vue
+++ b/frontend/src/views/ExportCenter/index.vue
@@ -76,7 +76,7 @@ import {
} from "@/store";
import { projectNamePrefix } from "@/store/modules/v1/common";
import type { ComposedIssue } from "@/types";
-import { Issue_Type } from "@/types/proto-es/v1/issue_service_pb";
+import { Issue_Type, IssueStatus } from "@/types/proto-es/v1/issue_service_pb";
import {
buildIssueFilterBySearchParams,
extractProjectResourceName,
@@ -112,7 +112,10 @@ const readonlyScopes = computed((): SearchScope[] => {
const defaultSearchParams = () => {
const params: SearchParams = {
query: "",
- scopes: [...readonlyScopes.value, { id: "status", value: "OPEN" }],
+ scopes: [
+ ...readonlyScopes.value,
+ { id: "status", value: IssueStatus[IssueStatus.OPEN] },
+ ],
};
return params;
};
diff --git a/frontend/src/views/MyIssues.vue b/frontend/src/views/MyIssues.vue
index 24795aec5f..b149ae1bed 100644
--- a/frontend/src/views/MyIssues.vue
+++ b/frontend/src/views/MyIssues.vue
@@ -16,7 +16,7 @@
<IssueTableV1
class="border-x-0"
:loading="loading"
- :issue-list="applyUIIssueFilter(list, mergedUIIssueFilter)"
+ :issue-list="list"
:highlight-text="state.params.query"
:show-project="true"
/>
@@ -27,7 +27,7 @@
</template>
<script lang="ts" setup>
-import { type UseStorageOptions, useLocalStorage } from "@vueuse/core";
+import { useLocalStorage } from "@vueuse/core";
import { computed, onMounted, reactive, ref, watch } from "vue";
import type { ComponentExposed } from "vue-component-type-helpers";
import { useRoute, useRouter } from "vue-router";
@@ -41,15 +41,15 @@ import {
useRefreshIssueList,
} from "@/store";
import { type ComposedIssue } from "@/types";
-import type { SearchParams, SemanticIssueStatus } from "@/utils";
import {
- applyUIIssueFilter,
+ Issue_ApprovalStatus,
+ IssueStatus,
+} from "@/types/proto-es/v1/issue_service_pb";
+import type { SearchParams } from "@/utils";
+import {
buildIssueFilterBySearchParams,
buildSearchParamsBySearchText,
buildSearchTextBySearchParams,
- buildUIIssueFilterBySearchParams,
- getSemanticIssueStatusFromSearchParams,
- useDynamicLocalStorage,
} from "@/utils";
import { getComponentIdLocalStorageKey } from "@/utils/localStorage";
@@ -69,31 +69,17 @@ const viewId = useLocalStorage<string>(
""
);
-const storedStatus = useDynamicLocalStorage<SemanticIssueStatus>(
- computed(() => `bb.home.issue-list-status.${me.value.name}`),
- "OPEN",
- window.localStorage,
- {
- serializer: {
- read(raw: SemanticIssueStatus) {
- if (!["OPEN", "CLOSED"].includes(raw)) return "OPEN";
- return raw;
- },
- write(value) {
- return value;
- },
- },
- } as UseStorageOptions<SemanticIssueStatus>
-);
-
const defaultSearchParams = (): SearchParams => {
const myEmail = me.value.email;
return {
query: "",
scopes: [
- { id: "status", value: "OPEN" },
- { id: "approval", value: "pending" },
- { id: "approver", value: myEmail },
+ { id: "status", value: IssueStatus[IssueStatus.OPEN] },
+ {
+ id: "approval",
+ value: Issue_ApprovalStatus[Issue_ApprovalStatus.PENDING],
+ },
+ { id: "current-approver", value: myEmail },
],
};
};
@@ -105,9 +91,6 @@ const state = reactive<LocalState>({
const mergedIssueFilter = computed(() => {
return buildIssueFilterBySearchParams(state.params);
});
-const mergedUIIssueFilter = computed(() => {
- return buildUIIssueFilterBySearchParams(state.params);
-});
const fetchIssueList = async ({
pageToken,
@@ -133,13 +116,6 @@ watch(
);
useRefreshIssueList(() => issuePagedTable.value?.refresh());
-watch(
- () => getSemanticIssueStatusFromSearchParams(state.params),
- (status) => {
- storedStatus.value = status;
- }
-);
-
// Helper to check if params match the default preset
const isDefaultPreset = (params: SearchParams): boolean => {
const defaultParams = defaultSearchParams();
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index a2a97154da..2f2e1d3a70 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -4016,6 +4016,8 @@ paths:
- database: the database full name in the "instances/{id}/databases/{name}" format, support "==" operator.
- environment: the database full name in the "environments/{name}" format, support "==" operator.
- labels: the issue labels, support "==" and "in" operator.
+ - approval_status: issue approval status, support "==" operator.
+ - current_approver: the issue approver, should in "users/{email} format", support "==" operator.
For example:
creator == "users/[email protected]" && status in ["OPEN", "DONE"]
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index ef5ed2a17f..13d1ef9694 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -3612,7 +3612,7 @@ DatabaseService manages databases and their schemas.
| plan | [string](#string) | | The plan associated with the issue. Can be empty. Format: projects/{project}/plans/{plan} |
| rollout | [string](#string) | | The rollout associated with the issue. Can be empty. Format: projects/{project}/rollouts/{rollout} |
| grant_request | [GrantRequest](#bytebase-v1-GrantRequest) | | Used if the issue type is GRANT_REQUEST. |
-| releasers | [string](#string) | repeated | The releasers of the pending stage of the issue rollout, judging from the rollout policy. Format: - roles/workspaceOwner - roles/workspaceDBA - roles/projectOwner - roles/projectReleaser - users/{email} |
+| releasers | [string](#string) | repeated | The releasers of the pending stage of the issue rollout, judging from the rollout policy. Format: - roles/workspaceOwner - roles/workspaceDBA - roles/projectOwner - roles/projectReleaser |
| risk_level | [RiskLevel](#bytebase-v1-RiskLevel) | | The risk level of the issue. |
| task_status_count | [Issue.TaskStatusCountEntry](#bytebase-v1-Issue-TaskStatusCountEntry) | repeated | The status count of the issue. Keys are the following: - NOT_STARTED - SKIPPED - PENDING - RUNNING - DONE - FAILED - CANCELED |
| labels | [string](#string) | repeated | Labels attached to the issue for categorization and filtering. |
@@ -3836,7 +3836,7 @@ When paginating, all other parameters provided to `ListIssueComments` must match
When paginating, all other parameters provided to `ListIssues` must match the call that provided the page token. |
| filter | [string](#string) | | Filter is used to filter issues returned in the list. The syntax and semantics of CEL are documented at https://github.com/google/cel-spec
-Supported filters: - creator: issue creator full name in &#34;users/{email or id}&#34; format, support &#34;==&#34; operator. - status: the issue status, support &#34;==&#34; and &#34;in&#34; operator, check the IssueStatus enum for the values. - create_time: issue create time in &#34;2006-01-02T15:04:05Z07:00&#34; format, support &#34;&gt;=&#34; or &#34;&lt;=&#34; operator. - type: the issue type, support &#34;==&#34; and &#34;in&#34; operator, check the Type enum in the Issue message for the values. - task_type: support &#34;==&#34; operator, the value can be &#34;DDL&#34;, &#34;DML&#34; or &#34;DATA_EXPORT&#34; - instance: the instance full name in the &#34;instances/{id}&#34; format, support &#34;==&#34; operator. - database: the database full name in the &#34;instances/{id}/databases/{name}&#34; format, support &#34;==&#34; operator. - environment: the database full name in the &#34;environments/{name}&#34; format, support &#34;==&#34; operator. - labels: the issue labels, support &#34;==&#34; and &#34;in&#34; operator.
+Supported filters: - creator: issue creator full name in &#34;users/{email or id}&#34; format, support &#34;==&#34; operator. - status: the issue status, support &#34;==&#34; and &#34;in&#34; operator, check the IssueStatus enum for the values. - create_time: issue create time in &#34;2006-01-02T15:04:05Z07:00&#34; format, support &#34;&gt;=&#34; or &#34;&lt;=&#34; operator. - type: the issue type, support &#34;==&#34; and &#34;in&#34; operator, check the Type enum in the Issue message for the values. - task_type: support &#34;==&#34; operator, the value can be &#34;DDL&#34;, &#34;DML&#34; or &#34;DATA_EXPORT&#34; - instance: the instance full name in the &#34;instances/{id}&#34; format, support &#34;==&#34; operator. - database: the database full name in the &#34;instances/{id}/databases/{name}&#34; format, support &#34;==&#34; operator. - environment: the database full name in the &#34;environments/{name}&#34; format, support &#34;==&#34; operator. - labels: the issue labels, support &#34;==&#34; and &#34;in&#34; operator. - approval_status: issue approval status, support &#34;==&#34; operator. - current_approver: the issue approver, should in &#34;users/{email} format&#34;, support &#34;==&#34; operator.
For example: creator == &#34;users/[email protected]&#34; &amp;&amp; status in [&#34;OPEN&#34;, &#34;DONE&#34;] status == &#34;CANCELED&#34; &amp;&amp; type == &#34;DATABASE_CHANGE&#34; instance == &#34;instances/sample&#34; &amp;&amp; labels in [&#34;label1&#34;, &#34;label2&#34;] create_time &gt;= &#34;2025-01-02T15:04:05Z07:00&#34; environment == &#34;environments/test&#34; |
| query | [string](#string) | | Query is the query statement. |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index 730277469b..a66451d98d 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -11003,8 +11003,7 @@ Format:
- roles/workspaceOwner
- roles/workspaceDBA
- roles/projectOwner
-- roles/projectReleaser
-- users/{email} </p></td>
+- roles/projectReleaser </p></td>
</tr>
<tr>
@@ -11595,6 +11594,8 @@ Supported filters:
- database: the database full name in the &#34;instances/{id}/databases/{name}&#34; format, support &#34;==&#34; operator.
- environment: the database full name in the &#34;environments/{name}&#34; format, support &#34;==&#34; operator.
- labels: the issue labels, support &#34;==&#34; and &#34;in&#34; operator.
+- approval_status: issue approval status, support &#34;==&#34; operator.
+- current_approver: the issue approver, should in &#34;users/{email} format&#34;, support &#34;==&#34; operator.
For example:
creator == &#34;users/[email protected]&#34; &amp;&amp; status in [&#34;OPEN&#34;, &#34;DONE&#34;]
diff --git a/proto/v1/v1/issue_service.proto b/proto/v1/v1/issue_service.proto
index 5ccb5d21ac..8026cb8ce4 100644
--- a/proto/v1/v1/issue_service.proto
+++ b/proto/v1/v1/issue_service.proto
@@ -213,6 +213,8 @@ message ListIssuesRequest {
// - database: the database full name in the "instances/{id}/databases/{name}" format, support "==" operator.
// - environment: the database full name in the "environments/{name}" format, support "==" operator.
// - labels: the issue labels, support "==" and "in" operator.
+ // - approval_status: issue approval status, support "==" operator.
+ // - current_approver: the issue approver, should in "users/{email} format", support "==" operator.
//
// For example:
// creator == "users/[email protected]" && status in ["OPEN", "DONE"]
@@ -432,7 +434,6 @@ message Issue {
// - roles/workspaceDBA
// - roles/projectOwner
// - roles/projectReleaser
- // - users/{email}
repeated string releasers = 20;
// The risk level of the issue.