Skip to content

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

chore: support change issue order (#19451)

ecmadaof17c181ed460
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index a2471da3bd..bbf6dd49e9 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -12463,6 +12463,7 @@ components:
- create_time: issue create time in "2006-01-02T15:04:05Z07:00" format, support ">=" or "<=" operator.
- type: the issue type, support "==" and "in" operator, check the Type enum in the Issue message for the values.
- labels: the issue labels, support "==" and "in" operator.
+ - risk_level: the issue risk level, support "in" operator, check the RiskLevel enum for the values.
- approval_status: issue approval status, support "==" operator.
- current_approver: the issue approver, should in "users/{email} format", support "==" operator.
@@ -12470,11 +12471,24 @@ components:
creator == "users/[email protected]" && status in ["OPEN", "DONE"]
status == "CANCELED" && type == "DATABASE_CHANGE"
labels in ["label1", "label2"]
+ risk_level in ["HIGH", "MODERATE"]
create_time >= "2025-01-02T15:04:05Z07:00"
query:
type: string
title: query
description: Query is the query statement.
+ orderBy:
+ type: string
+ title: order_by
+ description: |-
+ The order by of issues.
+ Support:
+ - create_time
+ - update_time
+ The default sorting order is ascending.
+ For example:
+ - order_by = "create_time desc"
+ - order_by = "update_time asc"
title: ListIssuesRequest
additionalProperties: false
bytebase.v1.ListIssuesResponse:
@@ -15851,6 +15865,18 @@ components:
type: string
title: query
description: Query is the query statement.
+ orderBy:
+ type: string
+ title: order_by
+ description: |-
+ The order by of issues.
+ Support:
+ - create_time
+ - update_time
+ The default sorting order is ascending.
+ For example:
+ - order_by = "create_time desc"
+ - order_by = "update_time asc"
title: SearchIssuesRequest
additionalProperties: false
bytebase.v1.SearchIssuesResponse:
diff --git a/backend/api/v1/issue_service.go b/backend/api/v1/issue_service.go
index 0a66c31881..5d00436350 100644
--- a/backend/api/v1/issue_service.go
+++ b/backend/api/v1/issue_service.go
@@ -203,6 +203,14 @@ func (s *IssueService) getIssueFind(
}
issueFind.LabelList = append(issueFind.LabelList, issueLabel)
}
+ case "risk_level":
+ for _, raw := range rawList {
+ riskLevel, err := convertToAPIRiskLevel(v1pb.RiskLevel(v1pb.RiskLevel_value[raw.(string)]))
+ if err != nil {
+ return "", connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to convert to risk level, err: %v", err))
+ }
+ issueFind.RiskLevelList = append(issueFind.RiskLevelList, riskLevel)
+ }
default:
return "", connect.NewError(connect.CodeInvalidArgument, errors.Errorf("unsupport variable %q with %v operator", variable, celoperators.In))
}
@@ -247,6 +255,12 @@ func (s *IssueService) ListIssues(ctx context.Context, req *connect.Request[v1pb
}
issueFind.ProjectID = &projectID
+ orderByKeys, err := store.GetIssueOrders(req.Msg.OrderBy)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, err)
+ }
+ issueFind.OrderByKeys = orderByKeys
+
issues, err := s.store.ListIssues(ctx, issueFind)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to search issue"))
@@ -294,6 +308,13 @@ func (s *IssueService) SearchIssues(ctx context.Context, req *connect.Request[v1
if err != nil {
return nil, err
}
+
+ orderByKeys, err := store.GetIssueOrders(req.Msg.OrderBy)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, err)
+ }
+ issueFind.OrderByKeys = orderByKeys
+
if projectID != "-" {
issueFind.ProjectID = &projectID
}
diff --git a/backend/api/v1/issue_service_converter.go b/backend/api/v1/issue_service_converter.go
index bad76dbc81..465ca5c5ea 100644
--- a/backend/api/v1/issue_service_converter.go
+++ b/backend/api/v1/issue_service_converter.go
@@ -229,6 +229,19 @@ func convertToIssueStatus(status storepb.Issue_Status) v1pb.IssueStatus {
}
}
+func convertToAPIRiskLevel(riskLevel v1pb.RiskLevel) (storepb.RiskLevel, error) {
+ switch riskLevel {
+ case v1pb.RiskLevel_LOW:
+ return storepb.RiskLevel_LOW, nil
+ case v1pb.RiskLevel_MODERATE:
+ return storepb.RiskLevel_MODERATE, nil
+ case v1pb.RiskLevel_HIGH:
+ return storepb.RiskLevel_HIGH, nil
+ default:
+ return storepb.RiskLevel_RISK_LEVEL_UNSPECIFIED, errors.Errorf("invalid risk level %v", riskLevel)
+ }
+}
+
func convertToIssueRiskLevel(riskLevel storepb.RiskLevel) v1pb.RiskLevel {
switch riskLevel {
case storepb.RiskLevel_RISK_LEVEL_UNSPECIFIED:
diff --git a/backend/generated-go/v1/issue_service.pb.go b/backend/generated-go/v1/issue_service.pb.go
index a03247762f..fed6ec4f47 100644
--- a/backend/generated-go/v1/issue_service.pb.go
+++ b/backend/generated-go/v1/issue_service.pb.go
@@ -459,6 +459,7 @@ type ListIssuesRequest struct {
// - create_time: issue create time in "2006-01-02T15:04:05Z07:00" format, support ">=" or "<=" operator.
// - type: the issue type, support "==" and "in" operator, check the Type enum in the Issue message for the values.
// - labels: the issue labels, support "==" and "in" operator.
+ // - risk_level: the issue risk level, support "in" operator, check the RiskLevel enum for the values.
// - approval_status: issue approval status, support "==" operator.
// - current_approver: the issue approver, should in "users/{email} format", support "==" operator.
//
@@ -466,10 +467,20 @@ type ListIssuesRequest struct {
// creator == "users/[email protected]" && status in ["OPEN", "DONE"]
// status == "CANCELED" && type == "DATABASE_CHANGE"
// labels in ["label1", "label2"]
+ // risk_level in ["HIGH", "MODERATE"]
// create_time >= "2025-01-02T15:04:05Z07:00"
Filter string `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
// Query is the query statement.
- Query string `protobuf:"bytes,5,opt,name=query,proto3" json:"query,omitempty"`
+ Query string `protobuf:"bytes,5,opt,name=query,proto3" json:"query,omitempty"`
+ // The order by of issues.
+ // Support:
+ // - create_time
+ // - update_time
+ // The default sorting order is ascending.
+ // For example:
+ // - order_by = "create_time desc"
+ // - order_by = "update_time asc"
+ OrderBy string `protobuf:"bytes,6,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -539,6 +550,13 @@ func (x *ListIssuesRequest) GetQuery() string {
return ""
}
+func (x *ListIssuesRequest) GetOrderBy() string {
+ if x != nil {
+ return x.OrderBy
+ }
+ return ""
+}
+
type ListIssuesResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The issues from the specified request.
@@ -615,7 +633,16 @@ type SearchIssuesRequest struct {
// Check the filter field in the ListIssuesRequest message.
Filter string `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
// Query is the query statement.
- Query string `protobuf:"bytes,5,opt,name=query,proto3" json:"query,omitempty"`
+ Query string `protobuf:"bytes,5,opt,name=query,proto3" json:"query,omitempty"`
+ // The order by of issues.
+ // Support:
+ // - create_time
+ // - update_time
+ // The default sorting order is ascending.
+ // For example:
+ // - order_by = "create_time desc"
+ // - order_by = "update_time asc"
+ OrderBy string `protobuf:"bytes,6,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -685,6 +712,13 @@ func (x *SearchIssuesRequest) GetQuery() string {
return ""
}
+func (x *SearchIssuesRequest) GetOrderBy() string {
+ if x != nil {
+ return x.OrderBy
+ }
+ return ""
+}
+
type SearchIssuesResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The issues from the specified request.
@@ -2136,7 +2170,7 @@ const file_v1_issue_service_proto_rawDesc = "" +
"\x12CreateIssueRequest\x124\n" +
"\x06parent\x18\x01 \x01(\tB\x1c\xe0A\x02\xfaA\x16\n" +
"\x14bytebase.com/ProjectR\x06parent\x12-\n" +
- "\x05issue\x18\x02 \x01(\v2\x12.bytebase.v1.IssueB\x03\xe0A\x02R\x05issue\"\xb3\x01\n" +
+ "\x05issue\x18\x02 \x01(\v2\x12.bytebase.v1.IssueB\x03\xe0A\x02R\x05issue\"\xce\x01\n" +
"\x11ListIssuesRequest\x124\n" +
"\x06parent\x18\x01 \x01(\tB\x1c\xe0A\x02\xfaA\x16\n" +
"\x14bytebase.com/ProjectR\x06parent\x12\x1b\n" +
@@ -2144,17 +2178,19 @@ const file_v1_issue_service_proto_rawDesc = "" +
"\n" +
"page_token\x18\x03 \x01(\tR\tpageToken\x12\x16\n" +
"\x06filter\x18\x04 \x01(\tR\x06filter\x12\x14\n" +
- "\x05query\x18\x05 \x01(\tR\x05query\"h\n" +
+ "\x05query\x18\x05 \x01(\tR\x05query\x12\x19\n" +
+ "\border_by\x18\x06 \x01(\tR\aorderBy\"h\n" +
"\x12ListIssuesResponse\x12*\n" +
"\x06issues\x18\x01 \x03(\v2\x12.bytebase.v1.IssueR\x06issues\x12&\n" +
- "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\x9c\x01\n" +
+ "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\xb7\x01\n" +
"\x13SearchIssuesRequest\x12\x1b\n" +
"\x06parent\x18\x01 \x01(\tB\x03\xe0A\x02R\x06parent\x12\x1b\n" +
"\tpage_size\x18\x02 \x01(\x05R\bpageSize\x12\x1d\n" +
"\n" +
"page_token\x18\x03 \x01(\tR\tpageToken\x12\x16\n" +
"\x06filter\x18\x04 \x01(\tR\x06filter\x12\x14\n" +
- "\x05query\x18\x05 \x01(\tR\x05query\"j\n" +
+ "\x05query\x18\x05 \x01(\tR\x05query\x12\x19\n" +
+ "\border_by\x18\x06 \x01(\tR\aorderBy\"j\n" +
"\x14SearchIssuesResponse\x12*\n" +
"\x06issues\x18\x01 \x03(\v2\x12.bytebase.v1.IssueR\x06issues\x12&\n" +
"\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\xc1\x01\n" +
diff --git a/backend/generated-go/v1/issue_service_equal.pb.go b/backend/generated-go/v1/issue_service_equal.pb.go
index d623a327eb..b469f5ae0e 100644
--- a/backend/generated-go/v1/issue_service_equal.pb.go
+++ b/backend/generated-go/v1/issue_service_equal.pb.go
@@ -63,6 +63,9 @@ func (x *ListIssuesRequest) Equal(y *ListIssuesRequest) bool {
if x.Query != y.Query {
return false
}
+ if x.OrderBy != y.OrderBy {
+ return false
+ }
return true
}
@@ -109,6 +112,9 @@ func (x *SearchIssuesRequest) Equal(y *SearchIssuesRequest) bool {
if x.Query != y.Query {
return false
}
+ if x.OrderBy != y.OrderBy {
+ return false
+ }
return true
}
diff --git a/backend/store/issue.go b/backend/store/issue.go
index dff8d0e5a8..7debda7b0c 100644
--- a/backend/store/issue.go
+++ b/backend/store/issue.go
@@ -74,7 +74,36 @@ type FindIssueMessage struct {
Query *string
- LabelList []string
+ LabelList []string
+ RiskLevelList []storepb.RiskLevel
+ OrderByKeys []*OrderByKey
+}
+
+// GetIssueOrders parses the order_by string and returns the corresponding OrderByKeys.
+func GetIssueOrders(orderBy string) ([]*OrderByKey, error) {
+ keys, err := parseOrderBy(orderBy)
+ if err != nil {
+ return nil, err
+ }
+
+ orderByKeys := []*OrderByKey{}
+ for _, key := range keys {
+ switch key.Key {
+ case "create_time":
+ orderByKeys = append(orderByKeys, &OrderByKey{
+ Key: "issue.created_at",
+ SortOrder: key.SortOrder,
+ })
+ case "update_time":
+ orderByKeys = append(orderByKeys, &OrderByKey{
+ Key: "issue.updated_at",
+ SortOrder: key.SortOrder,
+ })
+ default:
+ return nil, errors.Errorf(`invalid order key "%v"`, key.Key)
+ }
+ }
+ return orderByKeys, nil
}
// GetIssue gets issue by issue UID.
@@ -249,6 +278,22 @@ func (s *Store) ListIssues(ctx context.Context, find *FindIssueMessage) ([]*Issu
if len(find.LabelList) != 0 {
where.And("payload->'labels' ??& ?::TEXT[]", find.LabelList)
}
+ if len(find.RiskLevelList) != 0 {
+ riskLevelStrings := make([]string, 0, len(find.RiskLevelList))
+ for _, rl := range find.RiskLevelList {
+ riskLevelStrings = append(riskLevelStrings, rl.String())
+ }
+ where.And("payload->>'riskLevel' = ANY(?)", riskLevelStrings)
+ }
+
+ if len(find.OrderByKeys) > 0 && orderByClause == "ORDER BY issue.id DESC" {
+ parts := make([]string, 0, len(find.OrderByKeys)+1)
+ for _, v := range find.OrderByKeys {
+ parts = append(parts, fmt.Sprintf("%s %s", v.Key, v.SortOrder.String()))
+ }
+ parts = append(parts, "issue.id DESC")
+ orderByClause = fmt.Sprintf("ORDER BY %s", strings.Join(parts, ", "))
+ }
q := qb.Q().Space(`
SELECT
diff --git a/frontend/src/components/IssueV1/components/IssueListItem.vue b/frontend/src/components/IssueV1/components/IssueListItem.vue
index 35191d4086..5689aab907 100644
--- a/frontend/src/components/IssueV1/components/IssueListItem.vue
+++ b/frontend/src/components/IssueV1/components/IssueListItem.vue
@@ -40,6 +40,7 @@
></span>
{{ label.value }}
</span>
+ <RiskLevelIcon :risk-level="issue.riskLevel" class="shrink-0" />
</div>
<!-- Line 2: metadata -->
<div
@@ -49,6 +50,7 @@
#{{ extractIssueUID(issue.name) }}
</span>
<span>&middot;</span>
+ {{ $t("common.created") }}
<HumanizeTs :ts="createTimeTs" />
<span>&middot;</span>
<router-link
@@ -95,6 +97,7 @@
import { NCheckbox } from "naive-ui";
import { computed } from "vue";
import { useRouter } from "vue-router";
+import RiskLevelIcon from "@/components/Plan/components/IssueReviewView/Sidebar/ApprovalFlowSection/RiskLevelIcon.vue";
import { PROJECT_V1_ROUTE_DETAIL } from "@/router/dashboard/projectV1";
import { WORKSPACE_ROUTE_USER_PROFILE } from "@/router/dashboard/workspaceRoutes";
import { useUserStore } from "@/store";
diff --git a/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue b/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue
index 7fbfe6ce03..af15857ebf 100644
--- a/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue
+++ b/frontend/src/components/IssueV1/components/IssueSearch/IssueSearch.vue
@@ -16,6 +16,11 @@
v-bind="componentProps?.['time-range']"
@update:params="$emit('update:params', $event)"
/>
+ <IssueSortDropdown
+ v-if="components.includes('sort')"
+ :order-by="orderBy"
+ @update:order-by="$emit('update:orderBy', $event)"
+ />
<slot name="searchbox-suffix" />
</div>
@@ -38,10 +43,11 @@ import AdvancedSearch from "@/components/AdvancedSearch";
import TimeRange from "@/components/AdvancedSearch/TimeRange.vue";
import type { SearchParams, SearchScopeId } from "@/utils";
+import IssueSortDropdown from "./IssueSortDropdown.vue";
import PresetButtons from "./PresetButtons.vue";
import { useIssueSearchScopeOptions } from "./useIssueSearchScopeOptions";
-export type SearchComponent = "searchbox" | "presets" | "time-range";
+export type SearchComponent = "searchbox" | "presets" | "time-range" | "sort";
const props = withDefaults(
defineProps<{
@@ -51,17 +57,20 @@ const props = withDefaults(
components?: SearchComponent[];
componentProps?: Partial<Record<SearchComponent, Record<string, unknown>>>;
defaultParams?: SearchParams;
+ orderBy?: string;
}>(),
{
overrideScopeIdList: () => [],
components: () => ["searchbox", "time-range", "presets"],
componentProps: undefined,
defaultParams: undefined,
+ orderBy: "create_time desc",
}
);
defineEmits<{
(event: "update:params", params: SearchParams): void;
+ (event: "update:orderBy", value: string): void;
}>();
const showTimeRange = ref(false);
@@ -77,6 +86,7 @@ const allowedScopes = computed((): SearchScopeId[] => {
"status",
"issue-label",
"project",
+ "risk-level",
];
});
diff --git a/frontend/src/components/IssueV1/components/IssueSearch/IssueSortDropdown.vue b/frontend/src/components/IssueV1/components/IssueSearch/IssueSortDropdown.vue
new file mode 100644
index 0000000000..c1c6cb9f56
--- /dev/null
+++ b/frontend/src/components/IssueV1/components/IssueSearch/IssueSortDropdown.vue
@@ -0,0 +1,96 @@
+<template>
+ <NDropdown
+ :show="showDropdown"
+ :options="options"
+ placement="bottom-end"
+ @clickoutside="showDropdown = false"
+ @select="handleSelect"
+ >
+ <NButton
+ quaternary
+ :class="
+ orderBy
+ ? 'text-accent! hover:text-accent'
+ : 'text-control-placeholder hover:text-control'
+ "
+ @click="showDropdown = !showDropdown"
+ >
+ <template #icon>
+ <ArrowUpDownIcon class="w-4 h-4" />
+ </template>
+ {{ $t("issue.sort.sort") }}
+ </NButton>
+ </NDropdown>
+</template>
+
+<script lang="tsx" setup>
+import { ArrowUpDownIcon, CheckIcon } from "lucide-vue-next";
+import type { DropdownOption } from "naive-ui";
+import { NButton, NDropdown } from "naive-ui";
+import { computed, ref } from "vue";
+import { useI18n } from "vue-i18n";
+
+const props = defineProps<{
+ orderBy: string;
+}>();
+
+const emit = defineEmits<{
+ (event: "update:orderBy", value: string): void;
+}>();
+
+const { t } = useI18n();
+const showDropdown = ref(false);
+
+const checkIcon = (value: string) => {
+ return () => (
+ <CheckIcon
+ class={`w-3 h-3 ${props.orderBy === value ? "text-accent" : "text-transparent"}`}
+ />
+ );
+};
+
+const options = computed((): DropdownOption[] => [
+ {
+ key: "create_time",
+ label: t("issue.sort.created"),
+ children: [
+ {
+ key: "create_time desc",
+ label: t("issue.sort.descending"),
+ icon: checkIcon("create_time desc"),
+ },
+ {
+ key: "create_time asc",
+ label: t("issue.sort.ascending"),
+ icon: checkIcon("create_time asc"),
+ },
+ ],
+ },
+ {
+ key: "update_time",
+ label: t("issue.sort.updated"),
+ children: [
+ {
+ key: "update_time desc",
+ label: t("issue.sort.descending"),
+ icon: checkIcon("update_time desc"),
+ },
+ {
+ key: "update_time asc",
+ label: t("issue.sort.ascending"),
+ icon: checkIcon("update_time asc"),
+ },
+ ],
+ },
+]);
+
+const handleSelect = (key: string) => {
+ // Clicking the already-selected option clears back to default
+ if (key === props.orderBy) {
+ emit("update:orderBy", "");
+ } else {
+ emit("update:orderBy", key);
+ }
+ showDropdown.value = false;
+};
+</script>
diff --git a/frontend/src/components/IssueV1/components/IssueSearch/PresetButtons.vue b/frontend/src/components/IssueV1/components/IssueSearch/PresetButtons.vue
index cbedce09f3..18a3bf9a76 100644
--- a/frontend/src/components/IssueV1/components/IssueSearch/PresetButtons.vue
+++ b/frontend/src/components/IssueV1/components/IssueSearch/PresetButtons.vue
@@ -85,8 +85,9 @@ const isActive = (preset: PresetValue): boolean => {
return status === IssueStatus[IssueStatus.OPEN] && !approval;
}
+ const statuses = getValuesFromSearchParams(props.params, "status");
+
if (preset === "CLOSED") {
- const statuses = getValuesFromSearchParams(props.params, "status");
return (
statuses.includes(IssueStatus[IssueStatus.DONE]) &&
!statuses.includes(IssueStatus[IssueStatus.OPEN])
@@ -94,7 +95,7 @@ const isActive = (preset: PresetValue): boolean => {
}
if (preset === "ALL") {
- return props.params.scopes.filter((s) => !s.readonly).length === 0;
+ return statuses.length === 0;
}
return false;
diff --git a/frontend/src/components/IssueV1/components/IssueSearch/index.ts b/frontend/src/components/IssueV1/components/IssueSearch/index.ts
index 58fc4b1473..63c13b52fc 100644
--- a/frontend/src/components/IssueV1/components/IssueSearch/index.ts
+++ b/frontend/src/components/IssueV1/components/IssueSearch/index.ts
@@ -1,2 +1,3 @@
export { default as IssueSearch } from "./IssueSearch.vue";
+export { default as IssueSortDropdown } from "./IssueSortDropdown.vue";
export { default as PresetButtons } from "./PresetButtons.vue";
diff --git a/frontend/src/components/IssueV1/components/IssueSearch/useIssueSearchScopeOptions.ts b/frontend/src/components/IssueV1/components/IssueSearch/useIssueSearchScopeOptions.ts
index 7cf44bf1c7..5719b42787 100644
--- a/frontend/src/components/IssueV1/components/IssueSearch/useIssueSearchScopeOptions.ts
+++ b/frontend/src/components/IssueV1/components/IssueSearch/useIssueSearchScopeOptions.ts
@@ -11,6 +11,7 @@ import { useCommonSearchScopeOptions } from "@/components/AdvancedSearch/useComm
import YouTag from "@/components/misc/YouTag.vue";
import { useCurrentUserV1, useProjectV1Store, useUserStore } from "@/store";
import { isValidProjectName } from "@/types";
+import { RiskLevel } from "@/types/proto-es/v1/common_pb";
import {
Issue_ApprovalStatus,
IssueStatus,
@@ -188,6 +189,29 @@ export const useIssueSearchScopeOptions = (
}),
allowMultiple: true,
},
+ {
+ id: "risk-level",
+ title: t("issue.risk-level.self"),
+ description: t("issue.risk-level.filter"),
+ allowMultiple: true,
+ options: [
+ {
+ value: RiskLevel[RiskLevel.HIGH],
+ keywords: ["high"],
+ render: () => renderSpan(t("issue.risk-level.high")),
+ },
+ {
+ value: RiskLevel[RiskLevel.MODERATE],
+ keywords: ["moderate"],
+ render: () => renderSpan(t("issue.risk-level.moderate")),
+ },
+ {
+ value: RiskLevel[RiskLevel.LOW],
+ keywords: ["low"],
+ render: () => renderSpan(t("issue.risk-level.low")),
+ },
+ ],
+ },
];
const supportOptionIdSet = new Set(supportOptionIdList.value);
return scopes.filter((scope) => supportOptionIdSet.has(scope.id));
diff --git a/frontend/src/components/Project/ProjectIssuesPanel.vue b/frontend/src/components/Project/ProjectIssuesPanel.vue
index b88d1737b8..eb05228287 100644
--- a/frontend/src/components/Project/ProjectIssuesPanel.vue
+++ b/frontend/src/components/Project/ProjectIssuesPanel.vue
@@ -11,7 +11,8 @@
</NAlert>
<IssueSearch
v-model:params="state.params"
- :components="['searchbox', 'time-range', 'presets']"
+ v-model:order-by="orderBy"
+ :components="['searchbox', 'time-range', 'sort', 'presets']"
/>
</div>
<PagedTable
@@ -73,6 +74,7 @@ const route = useRoute();
const router = useRouter();
const me = useCurrentUserV1();
const issueStore = useIssueV1Store();
+const orderBy = ref("");
const issuePagedTable = ref<ComponentExposed<typeof PagedTable<Issue>>>();
const uiStateStore = useUIStateStore();
@@ -130,7 +132,9 @@ const state = reactive<LocalState>({
});
const mergedIssueFilter = computed(() => {
- return buildIssueFilterBySearchParams(state.params);
+ const filter = buildIssueFilterBySearchParams(state.params);
+ filter.orderBy = orderBy.value;
+ return filter;
});
const fetchIssueList = async ({
diff --git a/frontend/src/locales/en-US.json b/frontend/src/locales/en-US.json
index 6f182a7152..9911f2625e 100644
--- a/frontend/src/locales/en-US.json
+++ b/frontend/src/locales/en-US.json
@@ -1035,6 +1035,13 @@
}
}
},
+ "sort": {
+ "sort": "Sort",
+ "created": "Create time",
+ "updated": "Update time",
+ "ascending": "Ascending",
+ "descending": "Descending"
+ },
"table": {
"open": "Open",
"closed": "Closed",
@@ -1078,7 +1085,8 @@
"self": "Risk level",
"low": "Low",
"moderate": "Moderate",
- "high": "High"
+ "high": "High",
+ "filter": "Filter issues by risk level"
},
"issue-name": "Issue name",
"access-grant": {
diff --git a/frontend/src/locales/es-ES.json b/frontend/src/locales/es-ES.json
index edef9521f2..e002ea6430 100644
--- a/frontend/src/locales/es-ES.json
+++ b/frontend/src/locales/es-ES.json
@@ -1035,6 +1035,13 @@
}
}
},
+ "sort": {
+ "sort": "Ordenar",
+ "created": "Fecha de creación",
+ "updated": "Fecha de actualización",
+ "ascending": "Ascendente",
+ "descending": "Descendente"
+ },
"table": {
"open": "Abierto",
"closed": "Cerrado",
@@ -1078,7 +1085,8 @@
"self": "Nivel de riesgo",
"low": "Bajo",
"moderate": "Moderado",
- "high": "Alto"
+ "high": "Alto",
+ "filter": "Filtrar por nivel de riesgo"
},
"issue-name": "Nombre de la incidencia",
"access-grant": {
diff --git a/frontend/src/locales/ja-JP.json b/frontend/src/locales/ja-JP.json
index 187baa7245..c2ab341d0b 100644
--- a/frontend/src/locales/ja-JP.json
+++ b/frontend/src/locales/ja-JP.json
@@ -1035,6 +1035,13 @@
}
}
},
+ "sort": {
+ "sort": "並べ替え",
+ "created": "作成日時",
+ "updated": "更新日時",
+ "ascending": "昇順",
+ "descending": "降順"
+ },
"table": {
"open": "オープン",
"closed": "クローズ ",
@@ -1078,7 +1085,8 @@
"self": "リスクレベル",
"low": "低い",
"moderate": "適度",
- "high": "高い"
+ "high": "高い",
+ "filter": "リスクレベルでフィルタリング"
},
"issue-name": "イシュー名",
"access-grant": {
diff --git a/frontend/src/locales/vi-VN.json b/frontend/src/locales/vi-VN.json
index 97cab63da6..b0fdfc4b1c 100644
--- a/frontend/src/locales/vi-VN.json
+++ b/frontend/src/locales/vi-VN.json
@@ -1035,6 +1035,13 @@
}
}
},
+ "sort": {
+ "sort": "Sắp xếp",
+ "created": "Thời gian tạo",
+ "updated": "Thời gian cập nhật",
+ "ascending": "Tăng dần",
+ "descending": "Giảm dần"
+ },
"table": {
"open": "Mở",
"closed": "Đã đóng",
@@ -1078,7 +1085,8 @@
"self": "Mức độ rủi ro",
"low": "Thấp",
"moderate": "Trung bình",
- "high": "Cao"
+ "high": "Cao",
+ "filter": "Lọc theo mức độ rủi ro"
},
"issue-name": "Tên vấn đề",
"access-grant": {
diff --git a/frontend/src/locales/zh-CN.json b/frontend/src/locales/zh-CN.json
index 5a77afff3f..18929dab56 100644
--- a/frontend/src/locales/zh-CN.json
+++ b/frontend/src/locales/zh-CN.json
@@ -1035,6 +1035,13 @@
}
}
},
+ "sort": {
+ "sort": "排序",
+ "created": "创建时间",
+ "updated": "更新时间",
+ "ascending": "正序",
+ "descending": "倒序"
+ },
"table": {
"open": "开启中",
"closed": "已关闭",
@@ -1078,7 +1085,8 @@
"self": "风险等级",
"low": "低风险",
"moderate": "中风险",
- "high": "高风险"
+ "high": "高风险",
+ "filter": "按风险等级筛选"
},
"issue-name": "工单名称",
"access-grant": {
diff --git a/frontend/src/store/modules/v1/issue.ts b/frontend/src/store/modules/v1/issue.ts
index 35cb2d71d3..3db8dad49a 100644
--- a/frontend/src/store/modules/v1/issue.ts
+++ b/frontend/src/store/modules/v1/issue.ts
@@ -8,6 +8,7 @@ import { ref, watch } from "vue";
import { issueServiceClientConnect } from "@/connect";
import { silentContextKey } from "@/connect/context-key";
import { type IssueFilter } from "@/types";
+import { RiskLevel } from "@/types/proto-es/v1/common_pb";
import type { Issue } from "@/types/proto-es/v1/issue_service_pb";
import {
GetIssueRequestSchema,
@@ -49,6 +50,11 @@ export const buildIssueFilter = (find: IssueFilter): string => {
`status in [${find.statusList.map((s) => `"${IssueStatus[s]}"`).join(",")}]`
);
}
+ if (find.riskLevelList && find.riskLevelList.length > 0) {
+ filter.push(
+ `risk_level in [${find.riskLevelList.map((r) => `"${RiskLevel[r]}"`).join(",")}]`
+ );
+ }
if (find.createdTsAfter) {
filter.push(
`create_time >= "${dayjs(find.createdTsAfter).utc().format()}"`
@@ -82,6 +88,7 @@ export const useIssueV1Store = defineStore("issue_v1", () => {
query: find.query,
pageSize,
pageToken,
+ orderBy: find.orderBy,
});
const resp = await issueServiceClientConnect.searchIssues(request);
const issues = resp.issues;
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 d90fe519ba..f8858e54eb 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
@@ -108,6 +108,7 @@ export declare type ListIssuesRequest = Message<"bytebase.v1.ListIssuesRequest">
* - create_time: issue create time in "2006-01-02T15:04:05Z07:00" format, support ">=" or "<=" operator.
* - type: the issue type, support "==" and "in" operator, check the Type enum in the Issue message for the values.
* - labels: the issue labels, support "==" and "in" operator.
+ * - risk_level: the issue risk level, support "in" operator, check the RiskLevel enum for the values.
* - approval_status: issue approval status, support "==" operator.
* - current_approver: the issue approver, should in "users/{email} format", support "==" operator.
*
@@ -115,6 +116,7 @@ export declare type ListIssuesRequest = Message<"bytebase.v1.ListIssuesRequest">
* creator == "users/[email protected]" && status in ["OPEN", "DONE"]
* status == "CANCELED" && type == "DATABASE_CHANGE"
* labels in ["label1", "label2"]
+ * risk_level in ["HIGH", "MODERATE"]
* create_time >= "2025-01-02T15:04:05Z07:00"
*
* @generated from field: string filter = 4;
@@ -127,6 +129,20 @@ export declare type ListIssuesRequest = Message<"bytebase.v1.ListIssuesRequest">
* @generated from field: string query = 5;
*/
query: string;
+
+ /**
+ * The order by of issues.
+ * Support:
+ * - create_time
+ * - update_time
+ * The default sorting order is ascending.
+ * For example:
+ * - order_by = "create_time desc"
+ * - order_by = "update_time asc"
+ *
+ * @generated from field: string order_by = 6;
+ */
+ orderBy: string;
};
/**
@@ -209,6 +225,20 @@ export declare type SearchIssuesRequest = Message<"bytebase.v1.SearchIssuesReque
* @generated from field: string query = 5;
*/
query: string;
+
+ /**
+ * The order by of issues.
+ * Support:
+ * - create_time
+ * - update_time
+ * The default sorting order is ascending.
+ * For example:
+ * - order_by = "create_time desc"
+ * - order_by = "update_time asc"
+ *
+ * @generated from field: string order_by = 6;
+ */
+ orderBy: string;
};
/**
diff --git a/frontend/src/types/proto-es/v1/issue_service_pb.js b/frontend/src/types/proto-es/v1/issue_service_pb.js
index 7cd29b8bf3..8e8d81801a 100644
--- a/frontend/src/types/proto-es/v1/issue_service_pb.js
+++ b/frontend/src/types/proto-es/v1/issue_service_pb.js
@@ -17,7 +17,7 @@ import { file_v1_common } from "./common_pb";
* Describes the file v1/issue_service.proto.
*/
export const file_v1_issue_service = /*@__PURE__*/
- fileDesc("ChZ2MS9pc3N1ZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJKCg9HZXRJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDQoFZm9yY2UYAiABKAgiagoSQ3JlYXRlSXNzdWVSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBImCgVpc3N1ZRgCIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQgPgQQIihwEKEUxpc3RJc3N1ZXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkiUQoSTGlzdElzc3Vlc1Jlc3BvbnNlEiIKBmlzc3VlcxgBIAMoCzISLmJ5dGViYXNlLnYxLklzc3VlEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJwChNTZWFyY2hJc3N1ZXNSZXF1ZXN0EhMKBnBhcmVudBgBIAEoCUID4EECEhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJEg4KBmZpbHRlchgEIAEoCRINCgVxdWVyeRgFIAEoCSJTChRTZWFyY2hJc3N1ZXNSZXNwb25zZRIiCgZpc3N1ZXMYASADKAsyEi5ieXRlYmFzZS52MS5Jc3N1ZRIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkioAEKElVwZGF0ZUlzc3VlUmVxdWVzdBI9CgVpc3N1ZRgBIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRI0Cgt1cGRhdGVfbWFzaxgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAhIVCg1hbGxvd19taXNzaW5nGAMgASgIIpgBCh5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1JlcXVlc3QSLAoGcGFyZW50GAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg4KBmlzc3VlcxgCIAMoCRIoCgZzdGF0dXMYAyABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1cxIOCgZyZWFzb24YBCABKAkiIQofQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXNwb25zZSJQChNBcHByb3ZlSXNzdWVSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEg8KB2NvbW1lbnQYAiABKAkiTwoSUmVqZWN0SXNzdWVSZXF1ZXN0EigKBG5hbWUYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEg8KB2NvbW1lbnQYAiABKAkiUAoTUmVxdWVzdElzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIr4ICgVJc3N1ZRIMCgRuYW1lGAEgASgJEhcKBXRpdGxlGAIgASgJQgi6SAVyAxjIARIdCgtkZXNjcmlwdGlvbhgDIAEoCUIIukgFcgMYkE4SJQoEdHlwZRgEIAEoDjIXLmJ5dGViYXNlLnYxLklzc3VlLlR5cGUSKAoGc3RhdHVzGAUgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXMSLgoJYXBwcm92ZXJzGAYgAygLMhsuYnl0ZWJhc2UudjEuSXNzdWUuQXBwcm92ZXISOAoRYXBwcm92YWxfdGVtcGxhdGUYByABKAsyHS5ieXRlYmFzZS52MS5BcHByb3ZhbFRlbXBsYXRlEhQKB2NyZWF0b3IYCCABKAlCA+BBAxI0CgtjcmVhdGVfdGltZRgJIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgKIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIMCgRwbGFuGAsgASgJEjAKDWdyYW50X3JlcXVlc3QYDSABKAsyGS5ieXRlYmFzZS52MS5HcmFudFJlcXVlc3QSKgoKcmlza19sZXZlbBgPIAEoDjIWLmJ5dGViYXNlLnYxLlJpc2tMZXZlbBIOCgZsYWJlbHMYESADKAkSPwoPYXBwcm92YWxfc3RhdHVzGBIgASgOMiEuYnl0ZWJhc2UudjEuSXNzdWUuQXBwcm92YWxTdGF0dXNCA+BBAxI2CgxhY2Nlc3NfZ3JhbnQYEyABKAlCIOBBA/pBGgoYYnl0ZWJhc2UuY29tL0FjY2Vzc0dyYW50GpwBCghBcHByb3ZlchIyCgZzdGF0dXMYASABKA4yIi5ieXRlYmFzZS52MS5Jc3N1ZS5BcHByb3Zlci5TdGF0dXMSEQoJcHJpbmNpcGFsGAIgASgJIkkKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABILCgdQRU5ESU5HEAESDAoIQVBQUk9WRUQQAhIMCghSRUpFQ1RFRBADImsKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEhMKD0RBVEFCQVNFX0NIQU5HRRABEhEKDUdSQU5UX1JFUVVFU1QQAhITCg9EQVRBQkFTRV9FWFBPUlQQAxIQCgxBQ0NFU1NfR1JBTlQQBCJ1Cg5BcHByb3ZhbFN0YXR1cxIfChtBUFBST1ZBTF9TVEFUVVNfVU5TUEVDSUZJRUQQABIMCghDSEVDS0lORxABEgsKB1BFTkRJTkcQAhIMCghBUFBST1ZFRBADEgwKCFJFSkVDVEVEEAQSCwoHU0tJUFBFRBAFOjrqQTcKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIhcHJvamVjdHMve3Byb2plY3R9L2lzc3Vlcy97aXNzdWV9In8KDEdyYW50UmVxdWVzdBIMCgRyb2xlGAEgASgJEgwKBHVzZXIYAiABKAkSJAoJY29uZGl0aW9uGAMgASgLMhEuZ29vZ2xlLnR5cGUuRXhwchItCgpleHBpcmF0aW9uGAQgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uIl8KEEFwcHJvdmFsVGVtcGxhdGUSJwoEZmxvdxgBIAEoCzIZLmJ5dGViYXNlLnYxLkFwcHJvdmFsRmxvdxINCgV0aXRsZRgCIAEoCRITCgtkZXNjcmlwdGlvbhgDIAEoCSIdCgxBcHByb3ZhbEZsb3cSDQoFcm9sZXMYASADKAkibQoYTGlzdElzc3VlQ29tbWVudHNSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkiZwoZTGlzdElzc3VlQ29tbWVudHNSZXNwb25zZRIxCg5pc3N1ZV9jb21tZW50cxgBIAMoCzIZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkieQoZQ3JlYXRlSXNzdWVDb21tZW50UmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEjAKDWlzc3VlX2NvbW1lbnQYAiABKAsyGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQixgEKGVVwZGF0ZUlzc3VlQ29tbWVudFJlcXVlc3QSKgoGcGFyZW50GAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIwCg1pc3N1ZV9jb21tZW50GAIgASgLMhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50EjQKC3VwZGF0ZV9tYXNrGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFza0ID4EECEhUKDWFsbG93X21pc3NpbmcYBCABKAgi/AcKDElzc3VlQ29tbWVudBIMCgRuYW1lGAEgASgJEhoKB2NvbW1lbnQYAiABKAlCCbpIBnIEGICABBIPCgdwYXlsb2FkGAMgASgJEjQKC2NyZWF0ZV90aW1lGAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEjQKC3VwZGF0ZV90aW1lGAUgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhQKB2NyZWF0b3IYBiABKAlCA+BBAxI2CghhcHByb3ZhbBgHIAEoCzIiLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5BcHByb3ZhbEgAEj0KDGlzc3VlX3VwZGF0ZRgIIAEoCzIlLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5Jc3N1ZVVwZGF0ZUgAEkQKEHBsYW5fc3BlY191cGRhdGUYDCABKAsyKC5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuUGxhblNwZWNVcGRhdGVIABqQAQoIQXBwcm92YWwSOQoGc3RhdHVzGAEgASgOMikuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50LkFwcHJvdmFsLlN0YXR1cyJJCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgwKCEFQUFJPVkVEEAISDAoIUkVKRUNURUQQAxrpAgoLSXNzdWVVcGRhdGUSFwoKZnJvbV90aXRsZRgBIAEoCUgAiAEBEhUKCHRvX3RpdGxlGAIgASgJSAGIAQESHQoQZnJvbV9kZXNjcmlwdGlvbhgDIAEoCUgCiAEBEhsKDnRvX2Rlc2NyaXB0aW9uGAQgASgJSAOIAQESMgoLZnJvbV9zdGF0dXMYBSABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1c0gEiAEBEjAKCXRvX3N0YXR1cxgGIAEoDjIYLmJ5dGViYXNlLnYxLklzc3VlU3RhdHVzSAWIAQESEwoLZnJvbV9sYWJlbHMYByADKAkSEQoJdG9fbGFiZWxzGAggAygJQg0KC19mcm9tX3RpdGxlQgsKCV90b190aXRsZUITChFfZnJvbV9kZXNjcmlwdGlvbkIRCg9fdG9fZGVzY3JpcHRpb25CDgoMX2Zyb21fc3RhdHVzQgwKCl90b19zdGF0dXMaagoOUGxhblNwZWNVcGRhdGUSDAoEc3BlYxgBIAEoCRIXCgpmcm9tX3NoZWV0GAIgASgJSACIAQESFQoIdG9fc2hlZXQYAyABKAlIAYgBAUINCgtfZnJvbV9zaGVldEILCglfdG9fc2hlZXRCBwoFZXZlbnQqTQoLSXNzdWVTdGF0dXMSHAoYSVNTVUVfU1RBVFVTX1VOU1BFQ0lGSUVEEAASCAoET1BFThABEggKBERPTkUQAhIMCghDQU5DRUxFRBADMtgPCgxJc3N1ZVNlcnZpY2USgAEKCEdldElzc3VlEhwuYnl0ZWJhc2UudjEuR2V0SXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiQtpBBG5hbWWK6jANYmIuaXNzdWVzLmdldJDqMAGC0+STAiASHi92MS97bmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfRKcAQoLQ3JlYXRlSXNzdWUSHy5ieXRlYmFzZS52MS5DcmVhdGVJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSJY2kEMcGFyZW50LGlzc3VliuowEGJiLmlzc3Vlcy5jcmVhdGWQ6jABmOowAYLT5JMCJzoFaXNzdWUiHi92MS97cGFyZW50PXByb2plY3RzLyp9L2lzc3VlcxKUAQoKTGlzdElzc3VlcxIeLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZXNSZXF1ZXN0Gh8uYnl0ZWJhc2UudjEuTGlzdElzc3Vlc1Jlc3BvbnNlIkXaQQZwYXJlbnSK6jAOYmIuaXNzdWVzLmxpc3SQ6jABgtPkkwIgEh4vdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXMSmgEKDFNlYXJjaElzc3VlcxIgLmJ5dGViYXNlLnYxLlNlYXJjaElzc3Vlc1JlcXVlc3QaIS5ieXRlYmFzZS52MS5TZWFyY2hJc3N1ZXNSZXNwb25zZSJFiuowDWJiLmlzc3Vlcy5nZXSQ6jACgtPkkwIqOgEqIiUvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXM6c2VhcmNoEqcBCgtVcGRhdGVJc3N1ZRIfLmJ5dGViYXNlLnYxLlVwZGF0ZUlzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlImPaQRFpc3N1ZSx1cGRhdGVfbWFza4rqMBBiYi5pc3N1ZXMudXBkYXRlkOowAZjqMAGC0+STAi06BWlzc3VlMiQvdjEve2lzc3VlLm5hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn0SwAEKEUxpc3RJc3N1ZUNvbW1lbnRzEiUuYnl0ZWJhc2UudjEuTGlzdElzc3VlQ29tbWVudHNSZXF1ZXN0GiYuYnl0ZWJhc2UudjEuTGlzdElzc3VlQ29tbWVudHNSZXNwb25zZSJc2kEGcGFyZW50iuowFWJiLmlzc3VlQ29tbWVudHMubGlzdJDqMAGC0+STAjASLi92MS97cGFyZW50PXByb2plY3RzLyovaXNzdWVzLyp9L2lzc3VlQ29tbWVudHMS0gEKEkNyZWF0ZUlzc3VlQ29tbWVudBImLmJ5dGViYXNlLnYxLkNyZWF0ZUlzc3VlQ29tbWVudFJlcXVlc3QaGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQiedpBFHBhcmVudCxpc3N1ZV9jb21tZW50iuowF2JiLmlzc3VlQ29tbWVudHMuY3JlYXRlkOowAZjqMAGC0+STAjk6DWlzc3VlX2NvbW1lbnQiKC92MS97cGFyZW50PXByb2plY3RzLyovaXNzdWVzLyp9OmNvbW1lbnQS3wEKElVwZGF0ZUlzc3VlQ29tbWVudBImLmJ5dGViYXNlLnYxLlVwZGF0ZUlzc3VlQ29tbWVudFJlcXVlc3QaGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQihQHaQSBwYXJlbnQsaXNzdWVfY29tbWVudCx1cGRhdGVfbWFza4rqMBdiYi5pc3N1ZUNvbW1lbnRzLnVwZGF0ZZDqMAGY6jABgtPkkwI5Og1pc3N1ZV9jb21tZW50MigvdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpjb21tZW50Es0BChdCYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1cxIrLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlSXNzdWVzU3RhdHVzUmVxdWVzdBosLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlSXNzdWVzU3RhdHVzUmVzcG9uc2UiV4rqMBBiYi5pc3N1ZXMudXBkYXRlkOowAZjqMAGC0+STAjU6ASoiMC92MS97cGFyZW50PXByb2plY3RzLyp9L2lzc3VlczpiYXRjaFVwZGF0ZVN0YXR1cxJ/CgxBcHByb3ZlSXNzdWUSIC5ieXRlYmFzZS52MS5BcHByb3ZlSXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiOZDqMAKY6jABgtPkkwIrOgEqIiYvdjEve25hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn06YXBwcm92ZRJ8CgtSZWplY3RJc3N1ZRIfLmJ5dGViYXNlLnYxLlJlamVjdElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjiQ6jACmOowAYLT5JMCKjoBKiIlL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OnJlamVjdBJ/CgxSZXF1ZXN0SXNzdWUSIC5ieXRlYmFzZS52MS5SZXF1ZXN0SXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiOZDqMAKY6jABgtPkkwIrOgEqIiYvdjEve25hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn06cmVxdWVzdEKnAQoPY29tLmJ5dGViYXNlLnYxQhFJc3N1ZVNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_google_type_expr, file_v1_annotation, file_v1_common]);
+ fileDesc("ChZ2MS9pc3N1ZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJKCg9HZXRJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDQoFZm9yY2UYAiABKAgiagoSQ3JlYXRlSXNzdWVSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBImCgVpc3N1ZRgCIAEoCzISLmJ5dGViYXNlLnYxLklzc3VlQgPgQQIimQEKEUxpc3RJc3N1ZXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkSEAoIb3JkZXJfYnkYBiABKAkiUQoSTGlzdElzc3Vlc1Jlc3BvbnNlEiIKBmlzc3VlcxgBIAMoCzISLmJ5dGViYXNlLnYxLklzc3VlEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSKCAQoTU2VhcmNoSXNzdWVzUmVxdWVzdBITCgZwYXJlbnQYASABKAlCA+BBAhIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIOCgZmaWx0ZXIYBCABKAkSDQoFcXVlcnkYBSABKAkSEAoIb3JkZXJfYnkYBiABKAkiUwoUU2VhcmNoSXNzdWVzUmVzcG9uc2USIgoGaXNzdWVzGAEgAygLMhIuYnl0ZWJhc2UudjEuSXNzdWUSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIqABChJVcGRhdGVJc3N1ZVJlcXVlc3QSPQoFaXNzdWUYASABKAsyEi5ieXRlYmFzZS52MS5Jc3N1ZUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSNAoLdXBkYXRlX21hc2sYAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRNYXNrQgPgQQISFQoNYWxsb3dfbWlzc2luZxgDIAEoCCKYAQoeQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXNSZXF1ZXN0EiwKBnBhcmVudBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIOCgZpc3N1ZXMYAiADKAkSKAoGc3RhdHVzGAMgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXMSDgoGcmVhc29uGAQgASgJIiEKH0JhdGNoVXBkYXRlSXNzdWVzU3RhdHVzUmVzcG9uc2UiUAoTQXBwcm92ZUlzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIk8KElJlamVjdElzc3VlUmVxdWVzdBIoCgRuYW1lGAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIPCgdjb21tZW50GAIgASgJIlAKE1JlcXVlc3RJc3N1ZVJlcXVlc3QSKAoEbmFtZRgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSDwoHY29tbWVudBgCIAEoCSK+CAoFSXNzdWUSDAoEbmFtZRgBIAEoCRIXCgV0aXRsZRgCIAEoCUIIukgFcgMYyAESHQoLZGVzY3JpcHRpb24YAyABKAlCCLpIBXIDGJBOEiUKBHR5cGUYBCABKA4yFy5ieXRlYmFzZS52MS5Jc3N1ZS5UeXBlEigKBnN0YXR1cxgFIAEoDjIYLmJ5dGViYXNlLnYxLklzc3VlU3RhdHVzEi4KCWFwcHJvdmVycxgGIAMoCzIbLmJ5dGViYXNlLnYxLklzc3VlLkFwcHJvdmVyEjgKEWFwcHJvdmFsX3RlbXBsYXRlGAcgASgLMh0uYnl0ZWJhc2UudjEuQXBwcm92YWxUZW1wbGF0ZRIUCgdjcmVhdG9yGAggASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYCSABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSNAoLdXBkYXRlX3RpbWUYCiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSDAoEcGxhbhgLIAEoCRIwCg1ncmFudF9yZXF1ZXN0GA0gASgLMhkuYnl0ZWJhc2UudjEuR3JhbnRSZXF1ZXN0EioKCnJpc2tfbGV2ZWwYDyABKA4yFi5ieXRlYmFzZS52MS5SaXNrTGV2ZWwSDgoGbGFiZWxzGBEgAygJEj8KD2FwcHJvdmFsX3N0YXR1cxgSIAEoDjIhLmJ5dGViYXNlLnYxLklzc3VlLkFwcHJvdmFsU3RhdHVzQgPgQQMSNgoMYWNjZXNzX2dyYW50GBMgASgJQiDgQQP6QRoKGGJ5dGViYXNlLmNvbS9BY2Nlc3NHcmFudBqcAQoIQXBwcm92ZXISMgoGc3RhdHVzGAEgASgOMiIuYnl0ZWJhc2UudjEuSXNzdWUuQXBwcm92ZXIuU3RhdHVzEhEKCXByaW5jaXBhbBgCIAEoCSJJCgZTdGF0dXMSFgoSU1RBVFVTX1VOU1BFQ0lGSUVEEAASCwoHUEVORElORxABEgwKCEFQUFJPVkVEEAISDAoIUkVKRUNURUQQAyJrCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABITCg9EQVRBQkFTRV9DSEFOR0UQARIRCg1HUkFOVF9SRVFVRVNUEAISEwoPREFUQUJBU0VfRVhQT1JUEAMSEAoMQUNDRVNTX0dSQU5UEAQidQoOQXBwcm92YWxTdGF0dXMSHwobQVBQUk9WQUxfU1RBVFVTX1VOU1BFQ0lGSUVEEAASDAoIQ0hFQ0tJTkcQARILCgdQRU5ESU5HEAISDAoIQVBQUk9WRUQQAxIMCghSRUpFQ1RFRBAEEgsKB1NLSVBQRUQQBTo66kE3ChJieXRlYmFzZS5jb20vSXNzdWUSIXByb2plY3RzL3twcm9qZWN0fS9pc3N1ZXMve2lzc3VlfSJ/CgxHcmFudFJlcXVlc3QSDAoEcm9sZRgBIAEoCRIMCgR1c2VyGAIgASgJEiQKCWNvbmRpdGlvbhgDIAEoCzIRLmdvb2dsZS50eXBlLkV4cHISLQoKZXhwaXJhdGlvbhgEIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbiJfChBBcHByb3ZhbFRlbXBsYXRlEicKBGZsb3cYASABKAsyGS5ieXRlYmFzZS52MS5BcHByb3ZhbEZsb3cSDQoFdGl0bGUYAiABKAkSEwoLZGVzY3JpcHRpb24YAyABKAkiHQoMQXBwcm92YWxGbG93Eg0KBXJvbGVzGAEgAygJIm0KGExpc3RJc3N1ZUNvbW1lbnRzUmVxdWVzdBIqCgZwYXJlbnQYASABKAlCGuBBAvpBFAoSYnl0ZWJhc2UuY29tL0lzc3VlEhEKCXBhZ2Vfc2l6ZRgCIAEoBRISCgpwYWdlX3Rva2VuGAMgASgJImcKGUxpc3RJc3N1ZUNvbW1lbnRzUmVzcG9uc2USMQoOaXNzdWVfY29tbWVudHMYASADKAsyGS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJInkKGUNyZWF0ZUlzc3VlQ29tbWVudFJlcXVlc3QSKgoGcGFyZW50GAEgASgJQhrgQQL6QRQKEmJ5dGViYXNlLmNvbS9Jc3N1ZRIwCg1pc3N1ZV9jb21tZW50GAIgASgLMhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50IsYBChlVcGRhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0EioKBnBhcmVudBgBIAEoCUIa4EEC+kEUChJieXRlYmFzZS5jb20vSXNzdWUSMAoNaXNzdWVfY29tbWVudBgCIAEoCzIZLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudBI0Cgt1cGRhdGVfbWFzaxgDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE1hc2tCA+BBAhIVCg1hbGxvd19taXNzaW5nGAQgASgIIvwHCgxJc3N1ZUNvbW1lbnQSDAoEbmFtZRgBIAEoCRIaCgdjb21tZW50GAIgASgJQgm6SAZyBBiAgAQSDwoHcGF5bG9hZBgDIAEoCRI0CgtjcmVhdGVfdGltZRgEIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxI0Cgt1cGRhdGVfdGltZRgFIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBCA+BBAxIUCgdjcmVhdG9yGAYgASgJQgPgQQMSNgoIYXBwcm92YWwYByABKAsyIi5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuQXBwcm92YWxIABI9Cgxpc3N1ZV91cGRhdGUYCCABKAsyJS5ieXRlYmFzZS52MS5Jc3N1ZUNvbW1lbnQuSXNzdWVVcGRhdGVIABJEChBwbGFuX3NwZWNfdXBkYXRlGAwgASgLMiguYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50LlBsYW5TcGVjVXBkYXRlSAAakAEKCEFwcHJvdmFsEjkKBnN0YXR1cxgBIAEoDjIpLmJ5dGViYXNlLnYxLklzc3VlQ29tbWVudC5BcHByb3ZhbC5TdGF0dXMiSQoGU3RhdHVzEhYKElNUQVRVU19VTlNQRUNJRklFRBAAEgsKB1BFTkRJTkcQARIMCghBUFBST1ZFRBACEgwKCFJFSkVDVEVEEAMa6QIKC0lzc3VlVXBkYXRlEhcKCmZyb21fdGl0bGUYASABKAlIAIgBARIVCgh0b190aXRsZRgCIAEoCUgBiAEBEh0KEGZyb21fZGVzY3JpcHRpb24YAyABKAlIAogBARIbCg50b19kZXNjcmlwdGlvbhgEIAEoCUgDiAEBEjIKC2Zyb21fc3RhdHVzGAUgASgOMhguYnl0ZWJhc2UudjEuSXNzdWVTdGF0dXNIBIgBARIwCgl0b19zdGF0dXMYBiABKA4yGC5ieXRlYmFzZS52MS5Jc3N1ZVN0YXR1c0gFiAEBEhMKC2Zyb21fbGFiZWxzGAcgAygJEhEKCXRvX2xhYmVscxgIIAMoCUINCgtfZnJvbV90aXRsZUILCglfdG9fdGl0bGVCEwoRX2Zyb21fZGVzY3JpcHRpb25CEQoPX3RvX2Rlc2NyaXB0aW9uQg4KDF9mcm9tX3N0YXR1c0IMCgpfdG9fc3RhdHVzGmoKDlBsYW5TcGVjVXBkYXRlEgwKBHNwZWMYASABKAkSFwoKZnJvbV9zaGVldBgCIAEoCUgAiAEBEhUKCHRvX3NoZWV0GAMgASgJSAGIAQFCDQoLX2Zyb21fc2hlZXRCCwoJX3RvX3NoZWV0QgcKBWV2ZW50Kk0KC0lzc3VlU3RhdHVzEhwKGElTU1VFX1NUQVRVU19VTlNQRUNJRklFRBAAEggKBE9QRU4QARIICgRET05FEAISDAoIQ0FOQ0VMRUQQAzLYDwoMSXNzdWVTZXJ2aWNlEoABCghHZXRJc3N1ZRIcLmJ5dGViYXNlLnYxLkdldElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIkLaQQRuYW1liuowDWJiLmlzc3Vlcy5nZXSQ6jABgtPkkwIgEh4vdjEve25hbWU9cHJvamVjdHMvKi9pc3N1ZXMvKn0SnAEKC0NyZWF0ZUlzc3VlEh8uYnl0ZWJhc2UudjEuQ3JlYXRlSXNzdWVSZXF1ZXN0GhIuYnl0ZWJhc2UudjEuSXNzdWUiWNpBDHBhcmVudCxpc3N1ZYrqMBBiYi5pc3N1ZXMuY3JlYXRlkOowAZjqMAGC0+STAic6BWlzc3VlIh4vdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXMSlAEKCkxpc3RJc3N1ZXMSHi5ieXRlYmFzZS52MS5MaXN0SXNzdWVzUmVxdWVzdBofLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZXNSZXNwb25zZSJF2kEGcGFyZW50iuowDmJiLmlzc3Vlcy5saXN0kOowAYLT5JMCIBIeL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzEpoBCgxTZWFyY2hJc3N1ZXMSIC5ieXRlYmFzZS52MS5TZWFyY2hJc3N1ZXNSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuU2VhcmNoSXNzdWVzUmVzcG9uc2UiRYrqMA1iYi5pc3N1ZXMuZ2V0kOowAoLT5JMCKjoBKiIlL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vaXNzdWVzOnNlYXJjaBKnAQoLVXBkYXRlSXNzdWUSHy5ieXRlYmFzZS52MS5VcGRhdGVJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSJj2kERaXNzdWUsdXBkYXRlX21hc2uK6jAQYmIuaXNzdWVzLnVwZGF0ZZDqMAGY6jABgtPkkwItOgVpc3N1ZTIkL3YxL3tpc3N1ZS5uYW1lPXByb2plY3RzLyovaXNzdWVzLyp9EsABChFMaXN0SXNzdWVDb21tZW50cxIlLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZUNvbW1lbnRzUmVxdWVzdBomLmJ5dGViYXNlLnYxLkxpc3RJc3N1ZUNvbW1lbnRzUmVzcG9uc2UiXNpBBnBhcmVudIrqMBViYi5pc3N1ZUNvbW1lbnRzLmxpc3SQ6jABgtPkkwIwEi4vdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfS9pc3N1ZUNvbW1lbnRzEtIBChJDcmVhdGVJc3N1ZUNvbW1lbnQSJi5ieXRlYmFzZS52MS5DcmVhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0GhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50InnaQRRwYXJlbnQsaXNzdWVfY29tbWVudIrqMBdiYi5pc3N1ZUNvbW1lbnRzLmNyZWF0ZZDqMAGY6jABgtPkkwI5Og1pc3N1ZV9jb21tZW50IigvdjEve3BhcmVudD1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpjb21tZW50Et8BChJVcGRhdGVJc3N1ZUNvbW1lbnQSJi5ieXRlYmFzZS52MS5VcGRhdGVJc3N1ZUNvbW1lbnRSZXF1ZXN0GhkuYnl0ZWJhc2UudjEuSXNzdWVDb21tZW50IoUB2kEgcGFyZW50LGlzc3VlX2NvbW1lbnQsdXBkYXRlX21hc2uK6jAXYmIuaXNzdWVDb21tZW50cy51cGRhdGWQ6jABmOowAYLT5JMCOToNaXNzdWVfY29tbWVudDIoL3YxL3twYXJlbnQ9cHJvamVjdHMvKi9pc3N1ZXMvKn06Y29tbWVudBLNAQoXQmF0Y2hVcGRhdGVJc3N1ZXNTdGF0dXMSKy5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1JlcXVlc3QaLC5ieXRlYmFzZS52MS5CYXRjaFVwZGF0ZUlzc3Vlc1N0YXR1c1Jlc3BvbnNlIleK6jAQYmIuaXNzdWVzLnVwZGF0ZZDqMAGY6jABgtPkkwI1OgEqIjAvdjEve3BhcmVudD1wcm9qZWN0cy8qfS9pc3N1ZXM6YmF0Y2hVcGRhdGVTdGF0dXMSfwoMQXBwcm92ZUlzc3VlEiAuYnl0ZWJhc2UudjEuQXBwcm92ZUlzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjmQ6jACmOowAYLT5JMCKzoBKiImL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OmFwcHJvdmUSfAoLUmVqZWN0SXNzdWUSHy5ieXRlYmFzZS52MS5SZWplY3RJc3N1ZVJlcXVlc3QaEi5ieXRlYmFzZS52MS5Jc3N1ZSI4kOowApjqMAGC0+STAio6ASoiJS92MS97bmFtZT1wcm9qZWN0cy8qL2lzc3Vlcy8qfTpyZWplY3QSfwoMUmVxdWVzdElzc3VlEiAuYnl0ZWJhc2UudjEuUmVxdWVzdElzc3VlUmVxdWVzdBoSLmJ5dGViYXNlLnYxLklzc3VlIjmQ6jACmOowAYLT5JMCKzoBKiImL3YxL3tuYW1lPXByb2plY3RzLyovaXNzdWVzLyp9OnJlcXVlc3RCpwEKD2NvbS5ieXRlYmFzZS52MUIRSXNzdWVTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_google_type_expr, file_v1_annotation, file_v1_common]);
/**
* Describes the message bytebase.v1.GetIssueRequest.
diff --git a/frontend/src/types/v1/issue/issue.ts b/frontend/src/types/v1/issue/issue.ts
index 55d9b4a83a..16cc6d0465 100644
--- a/frontend/src/types/v1/issue/issue.ts
+++ b/frontend/src/types/v1/issue/issue.ts
@@ -1,3 +1,4 @@
+import { RiskLevel } from "@/types/proto-es/v1/common_pb";
import type { Issue_ApprovalStatus } from "@/types/proto-es/v1/issue_service_pb";
import { Issue_Type, IssueStatus } from "@/types/proto-es/v1/issue_service_pb";
@@ -8,10 +9,13 @@ export interface IssueFilter {
currentApprover?: string;
approvalStatus?: Issue_ApprovalStatus;
statusList?: IssueStatus[];
+ riskLevelList?: RiskLevel[];
createdTsAfter?: number;
createdTsBefore?: number;
// type is the issue type, for example: GRANT_REQUEST, DATABASE_EXPORT
type?: Issue_Type;
// filter by labels, for example: labels = "feature & bug"
labels?: string[];
+ // order by, for example: "create_time desc", "update_time asc"
+ orderBy?: string;
}
diff --git a/frontend/src/utils/v1/advanced-search/issue/utils.ts b/frontend/src/utils/v1/advanced-search/issue/utils.ts
index a8f530a48c..c4910db106 100644
--- a/frontend/src/utils/v1/advanced-search/issue/utils.ts
+++ b/frontend/src/utils/v1/advanced-search/issue/utils.ts
@@ -1,5 +1,6 @@
import { projectNamePrefix, userNamePrefix } from "@/store";
import type { IssueFilter } from "@/types";
+import { RiskLevel } from "@/types/proto-es/v1/common_pb";
import {
Issue_ApprovalStatus,
IssueStatus,
@@ -42,6 +43,9 @@ export const buildIssueFilterBySearchParams = (
statusList: getValuesFromSearchParams(params, "status").map(
(status) => IssueStatus[status as keyof typeof IssueStatus]
),
+ riskLevelList: getValuesFromSearchParams(params, "risk-level").map(
+ (risk) => RiskLevel[risk as keyof typeof RiskLevel]
+ ),
labels,
};
return filter;
diff --git a/frontend/src/views/MyIssues.vue b/frontend/src/views/MyIssues.vue
index 0217d0ff8f..9373c690aa 100644
--- a/frontend/src/views/MyIssues.vue
+++ b/frontend/src/views/MyIssues.vue
@@ -2,7 +2,8 @@
<div :key="viewId" class="py-4 flex flex-col">
<IssueSearch
v-model:params="state.params"
- :components="['searchbox', 'time-range', 'presets']"
+ v-model:order-by="orderBy"
+ :components="['searchbox', 'time-range', 'sort', 'presets']"
:default-params="computedDefaultParams"
class="px-4"
/>
@@ -60,6 +61,7 @@ const route = useRoute();
const router = useRouter();
const me = useCurrentUserV1();
const issueStore = useIssueV1Store();
+const orderBy = ref("");
const issuePagedTable = ref<ComponentExposed<typeof PagedTable<Issue>>>();
const viewId = useLocalStorage<string>(STORAGE_KEY_MY_ISSUES_TAB, "");
@@ -96,7 +98,9 @@ const state = reactive<LocalState>({
const computedDefaultParams = computed(() => defaultSearchParams());
const mergedIssueFilter = computed(() => {
- return buildIssueFilterBySearchParams(state.params);
+ const filter = buildIssueFilterBySearchParams(state.params);
+ filter.orderBy = orderBy.value;
+ return filter;
});
const fetchIssueList = async ({
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index d7cb06b00b..7e0cf2df13 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -8223,6 +8223,7 @@ paths:
- create_time: issue create time in "2006-01-02T15:04:05Z07:00" format, support ">=" or "<=" operator.
- type: the issue type, support "==" and "in" operator, check the Type enum in the Issue message for the values.
- labels: the issue labels, support "==" and "in" operator.
+ - risk_level: the issue risk level, support "in" operator, check the RiskLevel enum for the values.
- approval_status: issue approval status, support "==" operator.
- current_approver: the issue approver, should in "users/{email} format", support "==" operator.
@@ -8230,6 +8231,7 @@ paths:
creator == "users/[email protected]" && status in ["OPEN", "DONE"]
status == "CANCELED" && type == "DATABASE_CHANGE"
labels in ["label1", "label2"]
+ risk_level in ["HIGH", "MODERATE"]
create_time >= "2025-01-02T15:04:05Z07:00"
schema:
type: string
@@ -8244,6 +8246,7 @@ paths:
- create_time: issue create time in "2006-01-02T15:04:05Z07:00" format, support ">=" or "<=" operator.
- type: the issue type, support "==" and "in" operator, check the Type enum in the Issue message for the values.
- labels: the issue labels, support "==" and "in" operator.
+ - risk_level: the issue risk level, support "in" operator, check the RiskLevel enum for the values.
- approval_status: issue approval status, support "==" operator.
- current_approver: the issue approver, should in "users/{email} format", support "==" operator.
@@ -8251,6 +8254,7 @@ paths:
creator == "users/[email protected]" && status in ["OPEN", "DONE"]
status == "CANCELED" && type == "DATABASE_CHANGE"
labels in ["label1", "label2"]
+ risk_level in ["HIGH", "MODERATE"]
create_time >= "2025-01-02T15:04:05Z07:00"
- name: query
in: query
@@ -8259,6 +8263,29 @@ paths:
type: string
title: query
description: Query is the query statement.
+ - name: orderBy
+ in: query
+ description: |-
+ The order by of issues.
+ Support:
+ - create_time
+ - update_time
+ The default sorting order is ascending.
+ For example:
+ - order_by = "create_time desc"
+ - order_by = "update_time asc"
+ schema:
+ type: string
+ title: order_by
+ description: |-
+ The order by of issues.
+ Support:
+ - create_time
+ - update_time
+ The default sorting order is ascending.
+ For example:
+ - order_by = "create_time desc"
+ - order_by = "update_time asc"
responses:
"200":
description: Success
@@ -9169,6 +9196,18 @@ paths:
type: string
title: query
description: Query is the query statement.
+ orderBy:
+ type: string
+ title: order_by
+ description: |-
+ The order by of issues.
+ Support:
+ - create_time
+ - update_time
+ The default sorting order is ascending.
+ For example:
+ - order_by = "create_time desc"
+ - order_by = "update_time asc"
title: SearchIssuesRequest
additionalProperties: false
required: true
@@ -21712,6 +21751,7 @@ components:
- create_time: issue create time in "2006-01-02T15:04:05Z07:00" format, support ">=" or "<=" operator.
- type: the issue type, support "==" and "in" operator, check the Type enum in the Issue message for the values.
- labels: the issue labels, support "==" and "in" operator.
+ - risk_level: the issue risk level, support "in" operator, check the RiskLevel enum for the values.
- approval_status: issue approval status, support "==" operator.
- current_approver: the issue approver, should in "users/{email} format", support "==" operator.
@@ -21719,11 +21759,24 @@ components:
creator == "users/[email protected]" && status in ["OPEN", "DONE"]
status == "CANCELED" && type == "DATABASE_CHANGE"
labels in ["label1", "label2"]
+ risk_level in ["HIGH", "MODERATE"]
create_time >= "2025-01-02T15:04:05Z07:00"
query:
type: string
title: query
description: Query is the query statement.
+ orderBy:
+ type: string
+ title: order_by
+ description: |-
+ The order by of issues.
+ Support:
+ - create_time
+ - update_time
+ The default sorting order is ascending.
+ For example:
+ - order_by = "create_time desc"
+ - order_by = "update_time asc"
title: ListIssuesRequest
required:
- parent
@@ -25173,6 +25226,18 @@ components:
type: string
title: query
description: Query is the query statement.
+ orderBy:
+ type: string
+ title: order_by
+ description: |-
+ The order by of issues.
+ Support:
+ - create_time
+ - update_time
+ The default sorting order is ascending.
+ For example:
+ - order_by = "create_time desc"
+ - order_by = "update_time asc"
title: SearchIssuesRequest
required:
- parent
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index b66e850d75..9dd482f955 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -1517,10 +1517,11 @@ 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. - 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.
+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. - labels: the issue labels, support &#34;==&#34; and &#34;in&#34; operator. - risk_level: the issue risk level, support &#34;in&#34; operator, check the RiskLevel enum for the values. - 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; labels in [&#34;label1&#34;, &#34;label2&#34;] create_time &gt;= &#34;2025-01-02T15:04:05Z07:00&#34; |
+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; labels in [&#34;label1&#34;, &#34;label2&#34;] risk_level in [&#34;HIGH&#34;, &#34;MODERATE&#34;] create_time &gt;= &#34;2025-01-02T15:04:05Z07:00&#34; |
| query | [string](#string) | | Query is the query statement. |
+| order_by | [string](#string) | | The order by of issues. Support: - create_time - update_time The default sorting order is ascending. For example: - order_by = &#34;create_time desc&#34; - order_by = &#34;update_time asc&#34; |
@@ -1590,6 +1591,7 @@ For example: creator == &#34;users/[email protected]&#34; &amp;&amp; status in [&#
When paginating, all other parameters provided to `SearchIssues` must match the call that provided the page token. |
| filter | [string](#string) | | Filter is used to filter issues returned in the list. Check the filter field in the ListIssuesRequest message. |
| query | [string](#string) | | Query is the query statement. |
+| order_by | [string](#string) | | The order by of issues. Support: - create_time - update_time The default sorting order is ascending. For example: - order_by = &#34;create_time desc&#34; - order_by = &#34;update_time asc&#34; |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index f80a9b856d..4df4b9ecbc 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -5103,6 +5103,7 @@ Supported filters:
- 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.
- labels: the issue labels, support &#34;==&#34; and &#34;in&#34; operator.
+- risk_level: the issue risk level, support &#34;in&#34; operator, check the RiskLevel enum for the values.
- 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.
@@ -5110,6 +5111,7 @@ 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;
labels in [&#34;label1&#34;, &#34;label2&#34;]
+risk_level in [&#34;HIGH&#34;, &#34;MODERATE&#34;]
create_time &gt;= &#34;2025-01-02T15:04:05Z07:00&#34; </p></td>
</tr>
@@ -5120,6 +5122,20 @@ create_time &gt;= &#34;2025-01-02T15:04:05Z07:00&#34; </p></td>
<td><p>Query is the query statement. </p></td>
</tr>
+ <tr>
+ <td>order_by</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The order by of issues.
+Support:
+- create_time
+- update_time
+The default sorting order is ascending.
+For example:
+- order_by = &#34;create_time desc&#34;
+- order_by = &#34;update_time asc&#34; </p></td>
+ </tr>
+
</tbody>
</table>
@@ -5278,6 +5294,20 @@ Check the filter field in the ListIssuesRequest message. </p></td>
<td><p>Query is the query statement. </p></td>
</tr>
+ <tr>
+ <td>order_by</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The order by of issues.
+Support:
+- create_time
+- update_time
+The default sorting order is ascending.
+For example:
+- order_by = &#34;create_time desc&#34;
+- order_by = &#34;update_time asc&#34; </p></td>
+ </tr>
+
</tbody>
</table>
diff --git a/proto/v1/v1/issue_service.proto b/proto/v1/v1/issue_service.proto
index 98067dab18..44bcc82a5d 100644
--- a/proto/v1/v1/issue_service.proto
+++ b/proto/v1/v1/issue_service.proto
@@ -209,6 +209,7 @@ message ListIssuesRequest {
// - create_time: issue create time in "2006-01-02T15:04:05Z07:00" format, support ">=" or "<=" operator.
// - type: the issue type, support "==" and "in" operator, check the Type enum in the Issue message for the values.
// - labels: the issue labels, support "==" and "in" operator.
+ // - risk_level: the issue risk level, support "in" operator, check the RiskLevel enum for the values.
// - approval_status: issue approval status, support "==" operator.
// - current_approver: the issue approver, should in "users/{email} format", support "==" operator.
//
@@ -216,11 +217,22 @@ message ListIssuesRequest {
// creator == "users/[email protected]" && status in ["OPEN", "DONE"]
// status == "CANCELED" && type == "DATABASE_CHANGE"
// labels in ["label1", "label2"]
+ // risk_level in ["HIGH", "MODERATE"]
// create_time >= "2025-01-02T15:04:05Z07:00"
string filter = 4;
// Query is the query statement.
string query = 5;
+
+ // The order by of issues.
+ // Support:
+ // - create_time
+ // - update_time
+ // The default sorting order is ascending.
+ // For example:
+ // - order_by = "create_time desc"
+ // - order_by = "update_time asc"
+ string order_by = 6;
}
message ListIssuesResponse {
@@ -257,6 +269,16 @@ message SearchIssuesRequest {
// Query is the query statement.
string query = 5;
+
+ // The order by of issues.
+ // Support:
+ // - create_time
+ // - update_time
+ // The default sorting order is ascending.
+ // For example:
+ // - order_by = "create_time desc"
+ // - order_by = "update_time asc"
+ string order_by = 6;
}
message SearchIssuesResponse {