Skip to content

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

chore: list projects support order by title (#18683)

ecmadaocd1081f92a8b
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yaml
index 7edf0a3041..645541699b 100644
--- a/backend/api/mcp/gen/openapi.yaml
+++ b/backend/api/mcp/gen/openapi.yaml
@@ -9460,7 +9460,7 @@ components:
title: order_by
description: |-
The order by of the log.
- Only support order by create_time.
+ Only support order by create_time. The default sorting order is ascending.
For example:
- order_by = "create_time asc"
- order_by = "create_time desc"
@@ -11218,8 +11218,9 @@ components:
title: order_by
description: |-
The order by of databases.
- Support name, project, instance
+ Support name, project, instance. The default sorting order is ascending.
For example:
+ - order_by = "name" - order by name ascending
- order_by = "name desc"
- order_by = "name desc, project asc"
title: ListDatabasesRequest
@@ -11466,8 +11467,9 @@ components:
title: order_by
description: |-
The order by of instances.
- Support title, environment
+ Support title, environment. The default sorting order is ascending.
For example:
+ - order_by = "title"
- order_by = "title desc"
- order_by = "title desc, environment asc"
title: ListInstancesRequest
@@ -11742,6 +11744,16 @@ components:
Filter the project.
Check filter for SearchProjectsRequest for details.
Supports filtering by name, resource_id, state, and labels (e.g., labels.environment == "production").
+ orderBy:
+ type: string
+ title: order_by
+ description: |-
+ The order by of projects.
+ Support title. The default sorting order is ascending.
+ For example:
+ - order_by = "title"
+ - order_by = "title desc"
+ - order_by = "title asc"
title: ListProjectsRequest
additionalProperties: false
bytebase.v1.ListProjectsResponse:
@@ -12952,7 +12964,7 @@ components:
- FEATURE_DATA_CLASSIFICATION
- FEATURE_SCIM
- FEATURE_DIRECTORY_SYNC
- - FEATURE_TOKEN_DURATION_CONTROL
+ - FEATURE_SIGN_IN_FREQUENCY_CONTROL
- FEATURE_EXTERNAL_SECRET_MANAGER
- FEATURE_USER_EMAIL_DOMAIN_RESTRICTION
- FEATURE_PROJECT_MANAGEMENT
@@ -14079,6 +14091,12 @@ components:
description: |-
The resource name of the rollout.
Format: projects/{project}/plans/{plan}/rollout
+ plan:
+ type: string
+ title: plan
+ description: |-
+ The plan that this rollout is based on.
+ Format: projects/{project}/plans/{plan}
title:
type: string
title: title
@@ -14091,12 +14109,22 @@ components:
$ref: '#/components/schemas/bytebase.v1.Stage'
title: stages
description: Stages and thus tasks of the rollout.
+ creator:
+ type: string
+ title: creator
+ description: 'Format: users/[email protected]'
createTime:
title: create_time
$ref: '#/components/schemas/google.protobuf.Timestamp'
updateTime:
title: update_time
$ref: '#/components/schemas/google.protobuf.Timestamp'
+ issue:
+ type: string
+ title: issue
+ description: |-
+ The issue associated with the rollout. Could be empty.
+ Format: projects/{project}/issues/{issue}
title: Rollout
additionalProperties: false
bytebase.v1.RolloutPolicy:
@@ -14697,7 +14725,7 @@ components:
title: order_by
description: |-
The order by of the log.
- Only support order by create_time.
+ Only support order by create_time. The default sorting order is ascending.
For example:
- order_by = "create_time asc"
- order_by = "create_time desc"
@@ -14847,6 +14875,16 @@ components:
When paginating, all other parameters provided to `SearchProjects` must match
the call that provided the page token.
+ orderBy:
+ type: string
+ title: order_by
+ description: |-
+ The order by of projects.
+ Support title. The default sorting order is ascending.
+ For example:
+ - order_by = "title"
+ - order_by = "title desc"
+ - order_by = "title asc"
title: SearchProjectsRequest
additionalProperties: false
bytebase.v1.SearchProjectsResponse:
diff --git a/backend/api/v1/project_service.go b/backend/api/v1/project_service.go
index 9c7747eef2..04773a29c0 100644
--- a/backend/api/v1/project_service.go
+++ b/backend/api/v1/project_service.go
@@ -99,6 +99,13 @@ func (s *ProjectService) ListProjects(ctx context.Context, req *connect.Request[
return nil, connect.NewError(connect.CodeInvalidArgument, err)
}
find.FilterQ = filterQ
+
+ orderByKeys, err := store.GetProjectOrders(req.Msg.OrderBy)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, err)
+ }
+ find.OrderByKeys = orderByKeys
+
projects, err := s.store.ListProjects(ctx, find)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
@@ -149,6 +156,12 @@ func (s *ProjectService) SearchProjects(ctx context.Context, req *connect.Reques
}
find.FilterQ = filterQ
+ orderByKeys, err := store.GetProjectOrders(req.Msg.OrderBy)
+ if err != nil {
+ return nil, connect.NewError(connect.CodeInvalidArgument, err)
+ }
+ find.OrderByKeys = orderByKeys
+
projects, err := s.store.ListProjects(ctx, find)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
diff --git a/backend/generated-go/v1/audit_log_service.pb.go b/backend/generated-go/v1/audit_log_service.pb.go
index 618d8b693c..53c9e94ba7 100644
--- a/backend/generated-go/v1/audit_log_service.pb.go
+++ b/backend/generated-go/v1/audit_log_service.pb.go
@@ -123,7 +123,7 @@ type SearchAuditLogsRequest struct {
// - filter = "method == '/bytebase.v1.SQLService/Query' && severity == 'ERROR' && create_time <= '2021-01-01T00:00:00Z' && create_time >= '2020-01-01T00:00:00Z'"
Filter string `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"`
// The order by of the log.
- // Only support order by create_time.
+ // Only support order by create_time. The default sorting order is ascending.
// For example:
// - order_by = "create_time asc"
// - order_by = "create_time desc"
@@ -269,7 +269,7 @@ type ExportAuditLogsRequest struct {
// Check the filter field in the SearchAuditLogsRequest message.
Filter string `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"`
// The order by of the log.
- // Only support order by create_time.
+ // Only support order by create_time. The default sorting order is ascending.
// For example:
// - order_by = "create_time asc"
// - order_by = "create_time desc"
diff --git a/backend/generated-go/v1/database_service.pb.go b/backend/generated-go/v1/database_service.pb.go
index bb19062c2d..d76627493b 100644
--- a/backend/generated-go/v1/database_service.pb.go
+++ b/backend/generated-go/v1/database_service.pb.go
@@ -821,8 +821,9 @@ type ListDatabasesRequest struct {
// Show deleted database if specified.
ShowDeleted bool `protobuf:"varint,5,opt,name=show_deleted,json=showDeleted,proto3" json:"show_deleted,omitempty"`
// The order by of databases.
- // Support name, project, instance
+ // Support name, project, instance. The default sorting order is ascending.
// For example:
+ // - order_by = "name" - order by name ascending
// - order_by = "name desc"
// - order_by = "name desc, project asc"
OrderBy string `protobuf:"bytes,6,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
diff --git a/backend/generated-go/v1/instance_service.pb.go b/backend/generated-go/v1/instance_service.pb.go
index a3039289db..bfe19f95ab 100644
--- a/backend/generated-go/v1/instance_service.pb.go
+++ b/backend/generated-go/v1/instance_service.pb.go
@@ -448,8 +448,9 @@ type ListInstancesRequest struct {
// host == "127.0.0.1" && port == "54321"
Filter string `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
// The order by of instances.
- // Support title, environment
+ // Support title, environment. The default sorting order is ascending.
// For example:
+ // - order_by = "title"
// - order_by = "title desc"
// - order_by = "title desc, environment asc"
OrderBy string `protobuf:"bytes,5,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
diff --git a/backend/generated-go/v1/project_service.pb.go b/backend/generated-go/v1/project_service.pb.go
index f776e93255..367f549738 100644
--- a/backend/generated-go/v1/project_service.pb.go
+++ b/backend/generated-go/v1/project_service.pb.go
@@ -265,7 +265,14 @@ type ListProjectsRequest struct {
// Filter the project.
// Check filter for SearchProjectsRequest for details.
// Supports filtering by name, resource_id, state, and labels (e.g., labels.environment == "production").
- Filter string `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
+ Filter string `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`
+ // The order by of projects.
+ // Support title. The default sorting order is ascending.
+ // For example:
+ // - order_by = "title"
+ // - order_by = "title desc"
+ // - order_by = "title asc"
+ OrderBy string `protobuf:"bytes,5,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -328,6 +335,13 @@ func (x *ListProjectsRequest) GetFilter() string {
return ""
}
+func (x *ListProjectsRequest) GetOrderBy() string {
+ if x != nil {
+ return x.OrderBy
+ }
+ return ""
+}
+
type ListProjectsResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The projects from the specified request.
@@ -422,7 +436,14 @@ type SearchProjectsRequest struct {
//
// When paginating, all other parameters provided to `SearchProjects` must match
// the call that provided the page token.
- PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+ PageToken string `protobuf:"bytes,4,opt,name=page_token,json=pageToken,proto3" json:"page_token,omitempty"`
+ // The order by of projects.
+ // Support title. The default sorting order is ascending.
+ // For example:
+ // - order_by = "title"
+ // - order_by = "title desc"
+ // - order_by = "title asc"
+ OrderBy string `protobuf:"bytes,5,opt,name=order_by,json=orderBy,proto3" json:"order_by,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@@ -485,6 +506,13 @@ func (x *SearchProjectsRequest) GetPageToken() string {
return ""
}
+func (x *SearchProjectsRequest) GetOrderBy() string {
+ if x != nil {
+ return x.OrderBy
+ }
+ return ""
+}
+
type SearchProjectsResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
// The projects from the specified request.
@@ -1579,22 +1607,24 @@ const file_v1_project_service_proto_rawDesc = "" +
"\x05names\x18\x01 \x03(\tB\x1c\xe0A\x02\xfaA\x16\n" +
"\x14bytebase.com/ProjectR\x05names\"L\n" +
"\x18BatchGetProjectsResponse\x120\n" +
- "\bprojects\x18\x01 \x03(\v2\x14.bytebase.v1.ProjectR\bprojects\"\x8c\x01\n" +
+ "\bprojects\x18\x01 \x03(\v2\x14.bytebase.v1.ProjectR\bprojects\"\xa7\x01\n" +
"\x13ListProjectsRequest\x12\x1b\n" +
"\tpage_size\x18\x01 \x01(\x05R\bpageSize\x12\x1d\n" +
"\n" +
"page_token\x18\x02 \x01(\tR\tpageToken\x12!\n" +
"\fshow_deleted\x18\x03 \x01(\bR\vshowDeleted\x12\x16\n" +
- "\x06filter\x18\x04 \x01(\tR\x06filter\"p\n" +
+ "\x06filter\x18\x04 \x01(\tR\x06filter\x12\x19\n" +
+ "\border_by\x18\x05 \x01(\tR\aorderBy\"p\n" +
"\x14ListProjectsResponse\x120\n" +
"\bprojects\x18\x01 \x03(\v2\x14.bytebase.v1.ProjectR\bprojects\x12&\n" +
- "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\x8e\x01\n" +
+ "\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\xa9\x01\n" +
"\x15SearchProjectsRequest\x12!\n" +
"\fshow_deleted\x18\x01 \x01(\bR\vshowDeleted\x12\x16\n" +
"\x06filter\x18\x02 \x01(\tR\x06filter\x12\x1b\n" +
"\tpage_size\x18\x03 \x01(\x05R\bpageSize\x12\x1d\n" +
"\n" +
- "page_token\x18\x04 \x01(\tR\tpageToken\"r\n" +
+ "page_token\x18\x04 \x01(\tR\tpageToken\x12\x19\n" +
+ "\border_by\x18\x05 \x01(\tR\aorderBy\"r\n" +
"\x16SearchProjectsResponse\x120\n" +
"\bprojects\x18\x01 \x03(\v2\x14.bytebase.v1.ProjectR\bprojects\x12&\n" +
"\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"j\n" +
diff --git a/backend/generated-go/v1/project_service_equal.pb.go b/backend/generated-go/v1/project_service_equal.pb.go
index 5b48f9570f..d223b76440 100644
--- a/backend/generated-go/v1/project_service_equal.pb.go
+++ b/backend/generated-go/v1/project_service_equal.pb.go
@@ -76,6 +76,9 @@ func (x *ListProjectsRequest) Equal(y *ListProjectsRequest) bool {
if x.Filter != y.Filter {
return false
}
+ if x.OrderBy != y.OrderBy {
+ return false
+ }
return true
}
@@ -119,6 +122,9 @@ func (x *SearchProjectsRequest) Equal(y *SearchProjectsRequest) bool {
if x.PageToken != y.PageToken {
return false
}
+ if x.OrderBy != y.OrderBy {
+ return false
+ }
return true
}
diff --git a/backend/store/project.go b/backend/store/project.go
index 6c75b6adea..63f24913a9 100644
--- a/backend/store/project.go
+++ b/backend/store/project.go
@@ -41,6 +41,7 @@ type FindProjectMessage struct {
Limit *int
Offset *int
FilterQ *qb.Query
+ OrderByKeys []*OrderByKey
}
// UpdateProjectMessage is the message for updating a project.
@@ -108,7 +109,16 @@ func (s *Store) ListProjects(ctx context.Context, find *FindProjectMessage) ([]*
if !find.ShowDeleted {
q.And("deleted = ?", false)
}
- q.Space("ORDER BY project.resource_id")
+
+ if len(find.OrderByKeys) > 0 {
+ orderBy := []string{}
+ for _, v := range find.OrderByKeys {
+ orderBy = append(orderBy, fmt.Sprintf("%s %s", v.Key, v.SortOrder.String()))
+ }
+ q.Space(fmt.Sprintf("ORDER BY %s", strings.Join(orderBy, ", ")))
+ } else {
+ q.Space("ORDER BY project.resource_id")
+ }
if v := find.Limit; v != nil {
q.Space("LIMIT ?", *v)
}
@@ -676,3 +686,24 @@ func GetListProjectFilter(filter string) (*qb.Query, error) {
}
return qb.Q().Space("(?)", q), nil
}
+
+func GetProjectOrders(orderBy string) ([]*OrderByKey, error) {
+ keys, err := parseOrderBy(orderBy)
+ if err != nil {
+ return nil, err
+ }
+
+ if len(keys) == 0 {
+ return nil, nil
+ }
+ if len(keys) > 1 || keys[0].Key != "title" {
+ return nil, errors.Errorf(`only support order by "title"`)
+ }
+
+ return []*OrderByKey{
+ {
+ Key: "name",
+ SortOrder: keys[0].SortOrder,
+ },
+ }, nil
+}
diff --git a/frontend/src/components/AuditLog/AuditLogDataTable.vue b/frontend/src/components/AuditLog/AuditLogDataTable.vue
index f3f00a9f91..10ff0dff82 100644
--- a/frontend/src/components/AuditLog/AuditLogDataTable.vue
+++ b/frontend/src/components/AuditLog/AuditLogDataTable.vue
@@ -26,6 +26,7 @@ import { computed } from "vue";
import { useI18n } from "vue-i18n";
import { ProjectV1Name } from "@/components/v2";
import { UserLink } from "@/components/v2/Model/cells";
+import { mapSorterStatus } from "@/components/v2/Model/utils";
import {
extractUserId,
getProjectIdPlanUidStageUidFromRolloutName,
@@ -82,7 +83,7 @@ defineEmits<{
const { t } = useI18n();
const columnList = computed((): AuditDataTableColumn[] => {
- return (
+ const columns: AuditDataTableColumn[] = (
[
{
key: "create_time",
@@ -229,26 +230,8 @@ const columnList = computed((): AuditDataTableColumn[] => {
},
},
] as AuditDataTableColumn[]
- )
- .filter((column) => !column.hide)
- .map((column) => {
- if (props.sorters === undefined || column.type) {
- return column;
- }
- const sorterIndex = props.sorters.findIndex(
- (s) => s.columnKey === column.key.toString()
- );
- if (sorterIndex < 0) {
- return column;
- }
- return {
- ...column,
- sorter: {
- multiple: sorterIndex,
- },
- sortOrder: props.sorters[sorterIndex].order,
- };
- });
+ ).filter((column) => !column.hide);
+ return mapSorterStatus(columns, props.sorters);
});
const getViewLink = (auditLog: AuditLog): string | null => {
diff --git a/frontend/src/components/AuditLog/PagedAuditLogDataTable.vue b/frontend/src/components/AuditLog/PagedAuditLogDataTable.vue
index f1f3c18380..bc9d54123e 100644
--- a/frontend/src/components/AuditLog/PagedAuditLogDataTable.vue
+++ b/frontend/src/components/AuditLog/PagedAuditLogDataTable.vue
@@ -3,14 +3,16 @@
ref="auditPagedTable"
:session-key="`bb.page-audit-log-table.settings-audit-log-v1-table.${parent}`"
:fetch-list="fetchAuditLog"
+ :order-keys="['create_time']"
>
- <template #table="{ list, loading }">
+ <template #table="{ list, loading, sorters, onSortersUpdate }">
<AuditLogDataTable
:key="`audit-log-table.${parent}`"
:audit-log-list="list"
:show-project="false"
:loading="loading"
- v-model:sorters="sorters"
+ :sorters="sorters"
+ @update:sorters="onSortersUpdate"
/>
</template>
</PagedTable>
@@ -18,8 +20,7 @@
<script lang="tsx" setup>
import dayjs from "dayjs";
-import { type DataTableSortState } from "naive-ui";
-import { computed, ref, watch } from "vue";
+import { ref, watch } from "vue";
// https://github.com/vuejs/language-tools/issues/3206
import type { ComponentExposed } from "vue-component-type-helpers";
import AuditLogDataTable from "@/components/AuditLog/AuditLogDataTable.vue";
@@ -41,44 +42,27 @@ const props = defineProps<{
const auditLogStore = useAuditLogStore();
const auditPagedTable = ref<ComponentExposed<typeof PagedTable<AuditLog>>>();
-const sorters = ref<DataTableSortState[]>([
- {
- columnKey: "create_time",
- order: false,
- sorter: true,
- },
-]);
-
-const orderBy = computed(() => {
- return sorters.value
- .filter((sorter) => sorter.order)
- .map((sorter) => {
- const key = sorter.columnKey.toString();
- const order = sorter.order == "ascend" ? "asc" : "desc";
- return `${key} ${order}`;
- })
- .join(", ");
-});
-
const fetchAuditLog = async ({
pageToken,
pageSize,
+ orderBy,
}: {
pageToken: string;
pageSize: number;
+ orderBy?: string;
}) => {
const { nextPageToken, auditLogs } = await auditLogStore.fetchAuditLogs({
pageToken,
pageSize,
parent: props.parent,
filter: props.filter,
- orderBy: orderBy.value,
+ orderBy,
});
return { nextPageToken, list: auditLogs };
};
watch(
- () => [props.filter, props.parent, orderBy.value],
+ [() => props.filter, () => props.parent],
() => auditPagedTable.value?.refresh(),
{ deep: true }
);
@@ -103,7 +87,7 @@ const handleExport = async ({
search: {
parent: props.parent,
filter: props.filter,
- orderBy: orderBy.value,
+ // TODO(ed): how to support order by?
pageSize: 5000, // The maximum page size is 5000
pageToken,
},
diff --git a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue
index b758a4dfe0..a43e4f14f5 100644
--- a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue
+++ b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue
@@ -34,6 +34,7 @@ import {
} from "@/components/v2/Model/cells";
import type { ComposedDatabase } from "@/types";
import { hostPortOfInstanceV1 } from "@/utils";
+import { mapSorterStatus } from "../utils";
type DatabaseDataTableColumn = DataTableColumn<ComposedDatabase> & {
hide?: boolean;
@@ -195,31 +196,13 @@ const columnList = computed((): DatabaseDataTableColumn[] => {
["PROJECT_SHORT", [NAME, ENVIRONMENT, SCHEMA_VERSION, INSTANCE, ADDRESS]],
]);
- return (
+ const columns: DatabaseDataTableColumn[] = (
[
SELECTION,
...(columnsMap.get(props.mode) || []),
] as DatabaseDataTableColumn[]
- )
- .filter((column) => !column.hide)
- .map((column) => {
- if (props.sorters === undefined || column.type) {
- return column;
- }
- const sorterIndex = props.sorters.findIndex(
- (s) => s.columnKey === column.key.toString()
- );
- if (sorterIndex < 0) {
- return column;
- }
- return {
- ...column,
- sorter: {
- multiple: sorterIndex,
- },
- sortOrder: props.sorters[sorterIndex].order,
- };
- });
+ ).filter((column) => !column.hide);
+ return mapSorterStatus(columns, props.sorters);
});
const rowProps = (database: ComposedDatabase) => {
diff --git a/frontend/src/components/v2/Model/DatabaseV1Table/PagedDatabaseTable.vue b/frontend/src/components/v2/Model/DatabaseV1Table/PagedDatabaseTable.vue
index fd0fdf1c73..ecee445e73 100644
--- a/frontend/src/components/v2/Model/DatabaseV1Table/PagedDatabaseTable.vue
+++ b/frontend/src/components/v2/Model/DatabaseV1Table/PagedDatabaseTable.vue
@@ -5,8 +5,9 @@
:fetch-list="fetchDatabases"
:class="customClass"
:footer-class="footerClass"
+ :order-keys="['name', 'project', 'instance']"
>
- <template #table="{ list, loading }">
+ <template #table="{ list, loading, sorters, onSortersUpdate }">
<DatabaseV1Table
v-bind="$attrs"
:key="`database-table.${parent}`"
@@ -15,15 +16,14 @@
:keyword="filter.query"
:row-click="handleDatabaseClick"
:sorters="sorters"
- @update:sorters="onSorterUpdate"
+ @update:sorters="onSortersUpdate"
/>
</template>
</PagedTable>
</template>
<script setup lang="tsx">
-import { type DataTableSortState } from "naive-ui";
-import { computed, ref, watch } from "vue";
+import { ref, watch } from "vue";
import type { ComponentExposed } from "vue-component-type-helpers";
import { useRouter } from "vue-router";
import PagedTable from "@/components/v2/Model/PagedTable.vue";
@@ -58,61 +58,23 @@ const router = useRouter();
const databasePagedTable =
ref<ComponentExposed<typeof PagedTable<ComposedDatabase>>>();
-const sorters = ref<DataTableSortState[]>([
- {
- columnKey: "name",
- order: false,
- sorter: true,
- },
- {
- columnKey: "project",
- order: false,
- sorter: true,
- },
- {
- columnKey: "instance",
- order: false,
- sorter: true,
- },
-]);
-
-const onSorterUpdate = (sortStates: DataTableSortState[]) => {
- for (const sortState of sortStates) {
- const sorterIndex = sorters.value.findIndex(
- (s) => s.columnKey === sortState.columnKey
- );
- if (sorterIndex >= 0) {
- sorters.value[sorterIndex] = sortState;
- }
- }
-};
-
-const orderBy = computed(() => {
- return sorters.value
- .filter((sorter) => sorter.order)
- .map((sorter) => {
- const key = sorter.columnKey.toString();
- const order = sorter.order == "ascend" ? "asc" : "desc";
- return `${key} ${order}`;
- })
- .join(", ");
-});
-
const fetchDatabases = async ({
pageToken,
pageSize,
refresh,
+ orderBy,
}: {
pageToken: string;
pageSize: number;
refresh?: boolean;
+ orderBy?: string;
}) => {
const { nextPageToken, databases } = await databaseStore.fetchDatabases({
pageToken,
pageSize,
parent: props.parent,
filter: props.filter,
- orderBy: orderBy.value,
+ orderBy,
// Skip cache removal when refresh is false (loading more data).
skipCacheRemoval: !refresh,
});
@@ -123,7 +85,7 @@ const fetchDatabases = async ({
};
watch(
- [() => props.filter, () => props.parent, () => orderBy.value],
+ [() => props.filter, () => props.parent],
() => databasePagedTable.value?.refresh(),
{ deep: true }
);
diff --git a/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceV1Table.vue b/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceV1Table.vue
index 4ab6def903..7508c1e7b1 100644
--- a/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceV1Table.vue
+++ b/frontend/src/components/v2/Model/Instance/InstanceV1Table/InstanceV1Table.vue
@@ -41,6 +41,7 @@ import { NULL_ENVIRONMENT_NAME } from "@/types";
import type { Instance } from "@/types/proto-es/v1/instance_service_pb";
import { hostPortOfDataSource, hostPortOfInstanceV1, urlfy } from "@/utils";
import EnvironmentV1Name from "../../EnvironmentV1Name.vue";
+import { mapSorterStatus } from "../../utils";
type InstanceDataTableColumn = DataTableColumn<Instance> & {
hide?: boolean;
@@ -209,26 +210,16 @@ const columnList = computed((): InstanceDataTableColumn[] => {
render: (instance) => (instance.activation ? "Y" : ""),
};
- return [SELECTION, NAME, ENVIRONMENT, ADDRESS, LABELS, EXTERNAL_LINK, LICENSE]
- .filter((column) => !column.hide)
- .map((column) => {
- if (props.sorters === undefined || column.type) {
- return column;
- }
- const sorterIndex = props.sorters.findIndex(
- (s) => s.columnKey === column.key.toString()
- );
- if (sorterIndex < 0) {
- return column;
- }
- return {
- ...column,
- sorter: {
- multiple: sorterIndex,
- },
- sortOrder: props.sorters[sorterIndex].order,
- };
- });
+ const columns: InstanceDataTableColumn[] = [
+ SELECTION,
+ NAME,
+ ENVIRONMENT,
+ ADDRESS,
+ LABELS,
+ EXTERNAL_LINK,
+ LICENSE,
+ ].filter((column) => !column.hide);
+ return mapSorterStatus(columns, props.sorters);
});
const handleDataSourceToggle = (e: MouseEvent, instance: Instance) => {
diff --git a/frontend/src/components/v2/Model/Instance/PagedInstanceTable.vue b/frontend/src/components/v2/Model/Instance/PagedInstanceTable.vue
index 6cb4bf5cd2..114209ca57 100644
--- a/frontend/src/components/v2/Model/Instance/PagedInstanceTable.vue
+++ b/frontend/src/components/v2/Model/Instance/PagedInstanceTable.vue
@@ -3,21 +3,21 @@
ref="instancePagedTable"
:session-key="sessionKey"
:fetch-list="fetchInstances"
+ :order-keys="['title', 'environment']"
>
- <template #table="{ list, loading }">
+ <template #table="{ list, loading, sorters, onSortersUpdate }">
<InstanceV1Table
v-bind="$attrs"
:loading="loading"
:instance-list="list"
:sorters="sorters"
- @update:sorters="onSorterUpdate"
+ @update:sorters="onSortersUpdate"
/>
</template>
</PagedTable>
</template>
<script lang="tsx" setup>
-import { type DataTableSortState } from "naive-ui";
import { computed, ref, watch } from "vue";
import type { ComponentExposed } from "vue-component-type-helpers";
import PagedTable from "@/components/v2/Model/PagedTable.vue";
@@ -33,53 +33,20 @@ const props = defineProps<{
const instanceStore = useInstanceV1Store();
const instancePagedTable = ref<ComponentExposed<typeof PagedTable<Instance>>>();
-const sorters = ref<DataTableSortState[]>([
- {
- columnKey: "title",
- order: false,
- sorter: true,
- },
- {
- columnKey: "environment",
- order: false,
- sorter: true,
- },
-]);
-
-const onSorterUpdate = (sortStates: DataTableSortState[]) => {
- for (const sortState of sortStates) {
- const sorterIndex = sorters.value.findIndex(
- (s) => s.columnKey === sortState.columnKey
- );
- if (sorterIndex >= 0) {
- sorters.value[sorterIndex] = sortState;
- }
- }
-};
-
-const orderBy = computed(() => {
- return sorters.value
- .filter((sorter) => sorter.order)
- .map((sorter) => {
- const key = sorter.columnKey.toString();
- const order = sorter.order == "ascend" ? "asc" : "desc";
- return `${key} ${order}`;
- })
- .join(", ");
-});
-
const fetchInstances = async ({
pageToken,
pageSize,
+ orderBy,
}: {
pageToken: string;
pageSize: number;
+ orderBy?: string;
}) => {
const { nextPageToken, instances } = await instanceStore.fetchInstanceList({
pageToken,
pageSize,
filter: props.filter,
- orderBy: orderBy.value,
+ orderBy,
});
return {
nextPageToken: nextPageToken ?? "",
@@ -88,7 +55,7 @@ const fetchInstances = async ({
};
watch(
- [() => props.filter, () => orderBy.value],
+ () => props.filter,
() => instancePagedTable.value?.refresh(),
{ deep: true }
);
diff --git a/frontend/src/components/v2/Model/PagedProjectTable.vue b/frontend/src/components/v2/Model/PagedProjectTable.vue
index fdf523a64f..d02ddfec70 100644
--- a/frontend/src/components/v2/Model/PagedProjectTable.vue
+++ b/frontend/src/components/v2/Model/PagedProjectTable.vue
@@ -3,8 +3,9 @@
ref="projectPagedTable"
:session-key="sessionKey"
:fetch-list="fetchProjects"
+ :order-keys="['title']"
>
- <template #table="{ list, loading }">
+ <template #table="{ list, loading, sorters, onSortersUpdate }">
<ProjectV1Table
v-bind="$attrs"
:loading="loading"
@@ -13,7 +14,9 @@
:show-selection="showSelection"
:show-labels="showLabels"
:keyword="filter.query"
+ :sorters="sorters"
@update:selected-project-names="updateSelectedProjectNames"
+ @update:sorters="onSortersUpdate"
/>
</template>
</PagedTable>
@@ -63,14 +66,17 @@ defineExpose({ refresh });
const fetchProjects = async ({
pageToken,
pageSize,
+ orderBy,
}: {
pageToken: string;
pageSize: number;
+ orderBy?: string;
}) => {
const { nextPageToken, projects } = await projectStore.fetchProjectList({
pageToken,
pageSize,
filter: props.filter,
+ orderBy,
});
return {
nextPageToken: nextPageToken ?? "",
diff --git a/frontend/src/components/v2/Model/PagedTable.vue b/frontend/src/components/v2/Model/PagedTable.vue
index ad9cc0a56e..306b767725 100644
--- a/frontend/src/components/v2/Model/PagedTable.vue
+++ b/frontend/src/components/v2/Model/PagedTable.vue
@@ -1,6 +1,12 @@
<template>
<div class="flex flex-col gap-y-4">
- <slot name="table" :list="dataList" :loading="state.loading" />
+ <slot
+ name="table"
+ :list="dataList"
+ :loading="state.loading"
+ :sorters="sorters"
+ :on-sorters-update="onSortersUpdate"
+ />
<div :class="['flex items-center justify-end gap-x-2', footerClass]">
<div class="flex items-center gap-x-2">
@@ -34,7 +40,7 @@
<script lang="ts" setup generic="T extends { name: string }">
import { useDebounceFn } from "@vueuse/core";
import { sortBy, uniq } from "lodash-es";
-import { NButton, NSelect } from "naive-ui";
+import { type DataTableSortState, NButton, NSelect } from "naive-ui";
import { computed, type Ref, reactive, ref, watch } from "vue";
import { useAuthStore, useCurrentUserV1 } from "@/store";
import { getDefaultPagination, useDynamicLocalStorage } from "@/utils";
@@ -61,12 +67,15 @@ const props = withDefaults(
pageSize: number;
pageToken: string;
refresh?: boolean;
+ orderBy?: string;
}) => Promise<{ nextPageToken?: string; list: T[] }>;
+ orderKeys?: string[];
}>(),
{
hideLoadMore: false,
footerClass: "",
debounce: 500,
+ orderKeys: () => [],
}
);
@@ -76,6 +85,47 @@ const emit = defineEmits<{
const authStore = useAuthStore();
const currentUser = useCurrentUserV1();
+const sorters = ref<DataTableSortState[]>(
+ props.orderKeys.map((key) => ({
+ columnKey: key,
+ order: false,
+ sorter: true,
+ }))
+);
+
+const onSortersUpdate = (
+ sortStates: DataTableSortState[] | DataTableSortState | null
+) => {
+ if (!sortStates) {
+ // TODO(ed): should reset the sorters?
+ return;
+ }
+ let states: DataTableSortState[] = [];
+ if (Array.isArray(sortStates)) {
+ states = sortStates;
+ } else {
+ states = [sortStates];
+ }
+ for (const sortState of states) {
+ const sorterIndex = sorters.value.findIndex(
+ (s) => s.columnKey === sortState.columnKey
+ );
+ if (sorterIndex >= 0) {
+ sorters.value[sorterIndex] = sortState;
+ }
+ }
+};
+
+const orderBy = computed(() => {
+ return sorters.value
+ .filter((sorter) => sorter.order)
+ .map((sorter) => {
+ const key = sorter.columnKey.toString();
+ const order = sorter.order == "ascend" ? "asc" : "desc";
+ return `${key} ${order}`;
+ })
+ .join(", ");
+});
const options = computed(() => {
const defaultPageSize = getDefaultPagination();
@@ -127,6 +177,7 @@ const fetchData = async (refresh = false) => {
pageSize: pageSize.value,
pageToken: state.paginationToken,
refresh,
+ orderBy: orderBy.value,
});
if (refresh) {
dataList.value = list;
@@ -178,6 +229,11 @@ watch(
(list) => emit("list:update", list)
);
+watch(
+ () => orderBy.value,
+ () => refresh()
+);
+
const updateCache = (data: T[]) => {
for (const item of data) {
const index = dataList.value.findIndex((d) => d.name === item.name);
diff --git a/frontend/src/components/v2/Model/ProjectV1Table.vue b/frontend/src/components/v2/Model/ProjectV1Table.vue
index 80e39369e2..5c711d6575 100644
--- a/frontend/src/components/v2/Model/ProjectV1Table.vue
+++ b/frontend/src/components/v2/Model/ProjectV1Table.vue
@@ -13,12 +13,17 @@
:row-props="rowProps"
:paginate-single-page="false"
@update:checked-row-keys="updateSelectedProjects"
+ @update:sorter="$emit('update:sorters', $event)"
/>
</template>
<script lang="tsx" setup>
import { CheckIcon } from "lucide-vue-next";
-import { type DataTableColumn, NDataTable } from "naive-ui";
+import {
+ type DataTableColumn,
+ type DataTableSortState,
+ NDataTable,
+} from "naive-ui";
import { computed } from "vue";
import { useI18n } from "vue-i18n";
import { useRouter } from "vue-router";
@@ -29,6 +34,7 @@ import { getProjectName } from "@/store/modules/v1/common";
import type { Project } from "@/types/proto-es/v1/project_service_pb";
import { extractProjectResourceName, hasWorkspacePermissionV2 } from "@/utils";
import HighlightLabelText from "./HighlightLabelText.vue";
+import { mapSorterStatus } from "./utils";
type ProjectDataTableColumn = DataTableColumn<Project> & {
hide?: boolean;
@@ -49,6 +55,7 @@ const props = withDefaults(
showSelection?: boolean;
// Whether to show labels column (hidden in dropdowns for cleaner UI)
showLabels?: boolean;
+ sorters?: DataTableSortState[];
}>(),
{
bordered: true,
@@ -63,6 +70,7 @@ const props = withDefaults(
const emit = defineEmits<{
(event: "row-click", project: Project): void;
(event: "update:selected-project-names", projectNames: string[]): void;
+ (event: "update:sorters", sorters: DataTableSortState[]): void;
}>();
const { t } = useI18n();
@@ -81,7 +89,7 @@ const updateSelectedProjects = (checkedRowKeys: (string | number)[]) => {
};
const columnList = computed((): ProjectDataTableColumn[] => {
- return (
+ const columns: ProjectDataTableColumn[] = (
[
{
key: "selection",
@@ -150,6 +158,7 @@ const columnList = computed((): ProjectDataTableColumn[] => {
},
] as ProjectDataTableColumn[]
).filter((column) => !column.hide);
+ return mapSorterStatus(columns, props.sorters);
});
const rowProps = (project: Project) => {
diff --git a/frontend/src/components/v2/Model/utils.ts b/frontend/src/components/v2/Model/utils.ts
new file mode 100644
index 0000000000..e9812a00ec
--- /dev/null
+++ b/frontend/src/components/v2/Model/utils.ts
@@ -0,0 +1,29 @@
+import { type DataTableColumn, type DataTableSortState } from "naive-ui";
+
+export const mapSorterStatus = <T>(
+ columns: DataTableColumn<T>[],
+ sorters?: DataTableSortState[]
+): DataTableColumn<T>[] => {
+ if (!sorters) {
+ return columns;
+ }
+
+ return columns.map((column) => {
+ if (column.type) {
+ return column;
+ }
+ const sorterIndex = sorters.findIndex(
+ (s) => s.columnKey === column.key.toString()
+ );
+ if (sorterIndex < 0) {
+ return column;
+ }
+ return {
+ ...column,
+ sorter: {
+ multiple: sorterIndex,
+ },
+ sortOrder: sorters[sorterIndex].order,
+ };
+ });
+};
diff --git a/frontend/src/store/modules/v1/project.ts b/frontend/src/store/modules/v1/project.ts
index 4e9a2cf568..151a89d0a4 100644
--- a/frontend/src/store/modules/v1/project.ts
+++ b/frontend/src/store/modules/v1/project.ts
@@ -121,6 +121,7 @@ export const useProjectV1Store = defineStore("project_v1", () => {
pageToken?: string;
silent?: boolean;
filter?: ProjectFilter;
+ orderBy?: string;
}): Promise<{
projects: Project[];
nextPageToken?: string;
@@ -140,6 +141,7 @@ export const useProjectV1Store = defineStore("project_v1", () => {
...params,
pageToken,
filter: getListProjectFilter(params.filter ?? {}),
+ orderBy: params.orderBy,
showDeleted: params.filter?.state === State.DELETED ? true : false,
});
const connectResponse = await projectServiceClientConnect.listProjects(
@@ -155,6 +157,7 @@ export const useProjectV1Store = defineStore("project_v1", () => {
...params,
pageToken,
filter: getListProjectFilter(params.filter ?? {}),
+ orderBy: params.orderBy,
showDeleted: params.filter?.state === State.DELETED ? true : false,
});
const connectResponse =
diff --git a/frontend/src/types/proto-es/v1/audit_log_service_pb.d.ts b/frontend/src/types/proto-es/v1/audit_log_service_pb.d.ts
index 98f516ce25..c25a1c1b79 100644
--- a/frontend/src/types/proto-es/v1/audit_log_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/audit_log_service_pb.d.ts
@@ -47,7 +47,7 @@ export declare type SearchAuditLogsRequest = Message<"bytebase.v1.SearchAuditLog
/**
* The order by of the log.
- * Only support order by create_time.
+ * Only support order by create_time. The default sorting order is ascending.
* For example:
* - order_by = "create_time asc"
* - order_by = "create_time desc"
@@ -129,7 +129,7 @@ export declare type ExportAuditLogsRequest = Message<"bytebase.v1.ExportAuditLog
/**
* The order by of the log.
- * Only support order by create_time.
+ * Only support order by create_time. The default sorting order is ascending.
* For example:
* - order_by = "create_time asc"
* - order_by = "create_time desc"
diff --git a/frontend/src/types/proto-es/v1/database_service_pb.d.ts b/frontend/src/types/proto-es/v1/database_service_pb.d.ts
index 4e34b089bc..42169ffb29 100644
--- a/frontend/src/types/proto-es/v1/database_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/database_service_pb.d.ts
@@ -160,8 +160,9 @@ export declare type ListDatabasesRequest = Message<"bytebase.v1.ListDatabasesReq
/**
* The order by of databases.
- * Support name, project, instance
+ * Support name, project, instance. The default sorting order is ascending.
* For example:
+ * - order_by = "name" - order by name ascending
* - order_by = "name desc"
* - order_by = "name desc, project asc"
*
diff --git a/frontend/src/types/proto-es/v1/instance_service_pb.d.ts b/frontend/src/types/proto-es/v1/instance_service_pb.d.ts
index d4cb3b82ee..0e72c861e8 100644
--- a/frontend/src/types/proto-es/v1/instance_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/instance_service_pb.d.ts
@@ -107,8 +107,9 @@ export declare type ListInstancesRequest = Message<"bytebase.v1.ListInstancesReq
/**
* The order by of instances.
- * Support title, environment
+ * Support title, environment. The default sorting order is ascending.
* For example:
+ * - order_by = "title"
* - order_by = "title desc"
* - order_by = "title desc, environment asc"
*
diff --git a/frontend/src/types/proto-es/v1/project_service_pb.d.ts b/frontend/src/types/proto-es/v1/project_service_pb.d.ts
index 657461ec72..eccb180935 100644
--- a/frontend/src/types/proto-es/v1/project_service_pb.d.ts
+++ b/frontend/src/types/proto-es/v1/project_service_pb.d.ts
@@ -109,6 +109,18 @@ export declare type ListProjectsRequest = Message<"bytebase.v1.ListProjectsReque
* @generated from field: string filter = 4;
*/
filter: string;
+
+ /**
+ * The order by of projects.
+ * Support title. The default sorting order is ascending.
+ * For example:
+ * - order_by = "title"
+ * - order_by = "title desc"
+ * - order_by = "title asc"
+ *
+ * @generated from field: string order_by = 5;
+ */
+ orderBy: string;
};
/**
@@ -204,6 +216,18 @@ export declare type SearchProjectsRequest = Message<"bytebase.v1.SearchProjectsR
* @generated from field: string page_token = 4;
*/
pageToken: string;
+
+ /**
+ * The order by of projects.
+ * Support title. The default sorting order is ascending.
+ * For example:
+ * - order_by = "title"
+ * - order_by = "title desc"
+ * - order_by = "title asc"
+ *
+ * @generated from field: string order_by = 5;
+ */
+ orderBy: string;
};
/**
diff --git a/frontend/src/types/proto-es/v1/project_service_pb.js b/frontend/src/types/proto-es/v1/project_service_pb.js
index 0816a497b2..ddce93d51a 100644
--- a/frontend/src/types/proto-es/v1/project_service_pb.js
+++ b/frontend/src/types/proto-es/v1/project_service_pb.js
@@ -17,7 +17,7 @@ import { file_v1_iam_policy } from "./iam_policy_pb";
* Describes the file v1/project_service.proto.
*/
export const file_v1_project_service = /*@__PURE__*/
- fileDesc("Chh2MS9wcm9qZWN0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIj8KEUdldFByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiRgoXQmF0Y2hHZXRQcm9qZWN0c1JlcXVlc3QSKwoFbmFtZXMYASADKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiQgoYQmF0Y2hHZXRQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdCJiChNMaXN0UHJvamVjdHNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdlX3Rva2VuGAIgASgJEhQKDHNob3dfZGVsZXRlZBgDIAEoCBIOCgZmaWx0ZXIYBCABKAkiVwoUTGlzdFByb2plY3RzUmVzcG9uc2USJgoIcHJvamVjdHMYASADKAsyFC5ieXRlYmFzZS52MS5Qcm9qZWN0EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJkChVTZWFyY2hQcm9qZWN0c1JlcXVlc3QSFAoMc2hvd19kZWxldGVkGAEgASgIEg4KBmZpbHRlchgCIAEoCRIRCglwYWdlX3NpemUYAyABKAUSEgoKcGFnZV90b2tlbhgEIAEoCSJZChZTZWFyY2hQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiVgoUQ3JlYXRlUHJvamVjdFJlcXVlc3QSKgoHcHJvamVjdBgBIAEoCzIULmJ5dGViYXNlLnYxLlByb2plY3RCA+BBAhISCgpwcm9qZWN0X2lkGAIgASgJIooBChRVcGRhdGVQcm9qZWN0UmVxdWVzdBIqCgdwcm9qZWN0GAEgASgLMhQuYnl0ZWJhc2UudjEuUHJvamVjdEID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIImAKFERlbGV0ZVByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSDQoFZm9yY2UYAiABKAgSDQoFcHVyZ2UYAyABKAgiRAoWVW5kZWxldGVQcm9qZWN0UmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0IlgKGkJhdGNoRGVsZXRlUHJvamVjdHNSZXF1ZXN0EisKBW5hbWVzGAEgAygJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg0KBWZvcmNlGAIgASgIIjQKBUxhYmVsEg0KBXZhbHVlGAEgASgJEg0KBWNvbG9yGAIgASgJEg0KBWdyb3VwGAMgASgJIqwGCgdQcm9qZWN0EgwKBG5hbWUYASABKAkSIQoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRIXCgV0aXRsZRgDIAEoCUIIukgFcgMYyAESJgoId2ViaG9va3MYBCADKAsyFC5ieXRlYmFzZS52MS5XZWJob29rEiUKHWRhdGFfY2xhc3NpZmljYXRpb25fY29uZmlnX2lkGAUgASgJEigKDGlzc3VlX2xhYmVscxgGIAMoCzISLmJ5dGViYXNlLnYxLkxhYmVsEhoKEmZvcmNlX2lzc3VlX2xhYmVscxgHIAEoCBIbChNlbmZvcmNlX2lzc3VlX3RpdGxlGAogASgIEhoKEmF1dG9fZW5hYmxlX2JhY2t1cBgLIAEoCBIaChJza2lwX2JhY2t1cF9lcnJvcnMYDCABKAgSJQodcG9zdGdyZXNfZGF0YWJhc2VfdGVuYW50X21vZGUYDSABKAgSGwoTYWxsb3dfc2VsZl9hcHByb3ZhbBgOIAEoCBJJChZleGVjdXRpb25fcmV0cnlfcG9saWN5GA8gASgLMikuYnl0ZWJhc2UudjEuUHJvamVjdC5FeGVjdXRpb25SZXRyeVBvbGljeRIYChBjaV9zYW1wbGluZ19zaXplGBAgASgFEiIKGnBhcmFsbGVsX3Rhc2tzX3Blcl9yb2xsb3V0GBEgASgFEjAKBmxhYmVscxgSIAMoCzIgLmJ5dGViYXNlLnYxLlByb2plY3QuTGFiZWxzRW50cnkSGgoSZW5mb3JjZV9zcWxfcmV2aWV3GBMgASgIEh4KFnJlcXVpcmVfaXNzdWVfYXBwcm92YWwYFCABKAgSIwobcmVxdWlyZV9wbGFuX2NoZWNrX25vX2Vycm9yGBUgASgIGi8KFEV4ZWN1dGlvblJldHJ5UG9saWN5EhcKD21heGltdW1fcmV0cmllcxgBIAEoBRotCgtMYWJlbHNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBOi3qQSoKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EhJwcm9qZWN0cy97cHJvamVjdH0ibgoRQWRkV2ViaG9va1JlcXVlc3QSLQoHcHJvamVjdBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIqCgd3ZWJob29rGAIgASgLMhQuYnl0ZWJhc2UudjEuV2ViaG9va0ID4EECIooBChRVcGRhdGVXZWJob29rUmVxdWVzdBIqCgd3ZWJob29rGAEgASgLMhQuYnl0ZWJhc2UudjEuV2ViaG9va0ID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIkIKFFJlbW92ZVdlYmhvb2tSZXF1ZXN0EioKB3dlYmhvb2sYASABKAsyFC5ieXRlYmFzZS52MS5XZWJob29rQgPgQQIibwoSVGVzdFdlYmhvb2tSZXF1ZXN0Ei0KB3Byb2plY3QYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSKgoHd2ViaG9vaxgCIAEoCzIULmJ5dGViYXNlLnYxLldlYmhvb2tCA+BBAiIkChNUZXN0V2ViaG9va1Jlc3BvbnNlEg0KBWVycm9yGAEgASgJIoECCgdXZWJob29rEgwKBG5hbWUYASABKAkSKwoEdHlwZRgCIAEoDjIYLmJ5dGViYXNlLnYxLldlYmhvb2tUeXBlQgPgQQISEgoFdGl0bGUYAyABKAlCA+BBAhIQCgN1cmwYBCABKAlCA+BBAhIWCg5kaXJlY3RfbWVzc2FnZRgGIAEoCBI7ChJub3RpZmljYXRpb25fdHlwZXMYBSADKA4yGi5ieXRlYmFzZS52MS5BY3Rpdml0eS5UeXBlQgPgQQY6QOpBPQoUYnl0ZWJhc2UuY29tL1dlYmhvb2sSJXByb2plY3RzL3twcm9qZWN0fS93ZWJob29rcy97d2ViaG9va30irAIKCEFjdGl2aXR5Ip8CCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIQCgxJU1NVRV9DUkVBVEUQARIYChRJU1NVRV9DT01NRU5UX0NSRUFURRACEhYKEklTU1VFX0ZJRUxEX1VQREFURRADEhcKE0lTU1VFX1NUQVRVU19VUERBVEUQBBImCiJJU1NVRV9QSVBFTElORV9TVEFHRV9TVEFUVVNfVVBEQVRFEAUSGQoVSVNTVUVfQVBQUk9WQUxfTk9USUZZEAYSKQolSVNTVUVfUElQRUxJTkVfVEFTS19SVU5fU1RBVFVTX1VQREFURRAHEhkKFU5PVElGWV9JU1NVRV9BUFBST1ZFRBAIEhsKF05PVElGWV9QSVBFTElORV9ST0xMT1VUEAkyghIKDlByb2plY3RTZXJ2aWNlEn8KCkdldFByb2plY3QSHi5ieXRlYmFzZS52MS5HZXRQcm9qZWN0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiO9pBBG5hbWWK6jAPYmIucHJvamVjdHMuZ2V0kOowAYLT5JMCFxIVL3YxL3tuYW1lPXByb2plY3RzLyp9EpUBChBCYXRjaEdldFByb2plY3RzEiQuYnl0ZWJhc2UudjEuQmF0Y2hHZXRQcm9qZWN0c1JlcXVlc3QaJS5ieXRlYmFzZS52MS5CYXRjaEdldFByb2plY3RzUmVzcG9uc2UiNIrqMA9iYi5wcm9qZWN0cy5nZXSQ6jABgtPkkwIXEhUvdjEvcHJvamVjdHM6YmF0Y2hHZXQShAEKDExpc3RQcm9qZWN0cxIgLmJ5dGViYXNlLnYxLkxpc3RQcm9qZWN0c1JlcXVlc3QaIS5ieXRlYmFzZS52MS5MaXN0UHJvamVjdHNSZXNwb25zZSIv2kEAiuowEGJiLnByb2plY3RzLmxpc3SQ6jABgtPkkwIOEgwvdjEvcHJvamVjdHMSgAEKDlNlYXJjaFByb2plY3RzEiIuYnl0ZWJhc2UudjEuU2VhcmNoUHJvamVjdHNSZXF1ZXN0GiMuYnl0ZWJhc2UudjEuU2VhcmNoUHJvamVjdHNSZXNwb25zZSIl2kEAkOowAoLT5JMCGDoBKiITL3YxL3Byb2plY3RzOnNlYXJjaBKEAQoNQ3JlYXRlUHJvamVjdBIhLmJ5dGViYXNlLnYxLkNyZWF0ZVByb2plY3RSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCI62kEAiuowEmJiLnByb2plY3RzLmNyZWF0ZZDqMAGC0+STAhc6B3Byb2plY3QiDC92MS9wcm9qZWN0cxKoAQoNVXBkYXRlUHJvamVjdBIhLmJ5dGViYXNlLnYxLlVwZGF0ZVByb2plY3RSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCJe2kETcHJvamVjdCx1cGRhdGVfbWFza4rqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwIoOgdwcm9qZWN0Mh0vdjEve3Byb2plY3QubmFtZT1wcm9qZWN0cy8qfRKOAQoNRGVsZXRlUHJvamVjdBIhLmJ5dGViYXNlLnYxLkRlbGV0ZVByb2plY3RSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IkLaQQRuYW1liuowEmJiLnByb2plY3RzLmRlbGV0ZZDqMAGY6jABgtPkkwIXKhUvdjEve25hbWU9cHJvamVjdHMvKn0SlwEKD1VuZGVsZXRlUHJvamVjdBIjLmJ5dGViYXNlLnYxLlVuZGVsZXRlUHJvamVjdFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IkmK6jAUYmIucHJvamVjdHMudW5kZWxldGWQ6jABmOowAYLT5JMCIzoBKiIeL3YxL3tuYW1lPXByb2plY3RzLyp9OnVuZGVsZXRlEpkBChNCYXRjaERlbGV0ZVByb2plY3RzEicuYnl0ZWJhc2UudjEuQmF0Y2hEZWxldGVQcm9qZWN0c1JlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiQYrqMBJiYi5wcm9qZWN0cy5kZWxldGWQ6jABmOowAYLT5JMCHToBKiIYL3YxL3Byb2plY3RzOmJhdGNoRGVsZXRlEpgBCgxHZXRJYW1Qb2xpY3kSIC5ieXRlYmFzZS52MS5HZXRJYW1Qb2xpY3lSZXF1ZXN0GhYuYnl0ZWJhc2UudjEuSWFtUG9saWN5Ik6K6jAYYmIucHJvamVjdHMuZ2V0SWFtUG9saWN5kOowAYLT5JMCKBImL3YxL3tyZXNvdXJjZT1wcm9qZWN0cy8qfTpnZXRJYW1Qb2xpY3kSnwEKDFNldElhbVBvbGljeRIgLmJ5dGViYXNlLnYxLlNldElhbVBvbGljeVJlcXVlc3QaFi5ieXRlYmFzZS52MS5JYW1Qb2xpY3kiVYrqMBhiYi5wcm9qZWN0cy5zZXRJYW1Qb2xpY3mQ6jABmOowAYLT5JMCKzoBKiImL3YxL3tyZXNvdXJjZT1wcm9qZWN0cy8qfTpzZXRJYW1Qb2xpY3kSjAEKCkFkZFdlYmhvb2sSHi5ieXRlYmFzZS52MS5BZGRXZWJob29rUmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiSIrqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwIoOgEqIiMvdjEve3Byb2plY3Q9cHJvamVjdHMvKn06YWRkV2ViaG9vaxLBAQoNVXBkYXRlV2ViaG9vaxIhLmJ5dGViYXNlLnYxLlVwZGF0ZVdlYmhvb2tSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCJ32kETd2ViaG9vayx1cGRhdGVfbWFza4rqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwJBOgd3ZWJob29rMjYvdjEve3dlYmhvb2submFtZT1wcm9qZWN0cy8qL3dlYmhvb2tzLyp9OnVwZGF0ZVdlYmhvb2sSpQEKDVJlbW92ZVdlYmhvb2sSIS5ieXRlYmFzZS52MS5SZW1vdmVXZWJob29rUmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiW4rqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwI7OgEqIjYvdjEve3dlYmhvb2submFtZT1wcm9qZWN0cy8qL3dlYmhvb2tzLyp9OnJlbW92ZVdlYmhvb2sSmwEKC1Rlc3RXZWJob29rEh8uYnl0ZWJhc2UudjEuVGVzdFdlYmhvb2tSZXF1ZXN0GiAuYnl0ZWJhc2UudjEuVGVzdFdlYmhvb2tSZXNwb25zZSJJiuowEmJiLnByb2plY3RzLnVwZGF0ZZDqMAGC0+STAik6ASoiJC92MS97cHJvamVjdD1wcm9qZWN0cy8qfTp0ZXN0V2ViaG9va0KpAQoPY29tLmJ5dGViYXNlLnYxQhNQcm9qZWN0U2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_v1_annotation, file_v1_common, file_v1_iam_policy]);
+ fileDesc("Chh2MS9wcm9qZWN0X3NlcnZpY2UucHJvdG8SC2J5dGViYXNlLnYxIj8KEUdldFByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiRgoXQmF0Y2hHZXRQcm9qZWN0c1JlcXVlc3QSKwoFbmFtZXMYASADKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QiQgoYQmF0Y2hHZXRQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdCJ0ChNMaXN0UHJvamVjdHNSZXF1ZXN0EhEKCXBhZ2Vfc2l6ZRgBIAEoBRISCgpwYWdlX3Rva2VuGAIgASgJEhQKDHNob3dfZGVsZXRlZBgDIAEoCBIOCgZmaWx0ZXIYBCABKAkSEAoIb3JkZXJfYnkYBSABKAkiVwoUTGlzdFByb2plY3RzUmVzcG9uc2USJgoIcHJvamVjdHMYASADKAsyFC5ieXRlYmFzZS52MS5Qcm9qZWN0EhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJ2ChVTZWFyY2hQcm9qZWN0c1JlcXVlc3QSFAoMc2hvd19kZWxldGVkGAEgASgIEg4KBmZpbHRlchgCIAEoCRIRCglwYWdlX3NpemUYAyABKAUSEgoKcGFnZV90b2tlbhgEIAEoCRIQCghvcmRlcl9ieRgFIAEoCSJZChZTZWFyY2hQcm9qZWN0c1Jlc3BvbnNlEiYKCHByb2plY3RzGAEgAygLMhQuYnl0ZWJhc2UudjEuUHJvamVjdBIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAkiVgoUQ3JlYXRlUHJvamVjdFJlcXVlc3QSKgoHcHJvamVjdBgBIAEoCzIULmJ5dGViYXNlLnYxLlByb2plY3RCA+BBAhISCgpwcm9qZWN0X2lkGAIgASgJIooBChRVcGRhdGVQcm9qZWN0UmVxdWVzdBIqCgdwcm9qZWN0GAEgASgLMhQuYnl0ZWJhc2UudjEuUHJvamVjdEID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIImAKFERlbGV0ZVByb2plY3RSZXF1ZXN0EioKBG5hbWUYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSDQoFZm9yY2UYAiABKAgSDQoFcHVyZ2UYAyABKAgiRAoWVW5kZWxldGVQcm9qZWN0UmVxdWVzdBIqCgRuYW1lGAEgASgJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0IlgKGkJhdGNoRGVsZXRlUHJvamVjdHNSZXF1ZXN0EisKBW5hbWVzGAEgAygJQhzgQQL6QRYKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0Eg0KBWZvcmNlGAIgASgIIjQKBUxhYmVsEg0KBXZhbHVlGAEgASgJEg0KBWNvbG9yGAIgASgJEg0KBWdyb3VwGAMgASgJIqwGCgdQcm9qZWN0EgwKBG5hbWUYASABKAkSIQoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZRIXCgV0aXRsZRgDIAEoCUIIukgFcgMYyAESJgoId2ViaG9va3MYBCADKAsyFC5ieXRlYmFzZS52MS5XZWJob29rEiUKHWRhdGFfY2xhc3NpZmljYXRpb25fY29uZmlnX2lkGAUgASgJEigKDGlzc3VlX2xhYmVscxgGIAMoCzISLmJ5dGViYXNlLnYxLkxhYmVsEhoKEmZvcmNlX2lzc3VlX2xhYmVscxgHIAEoCBIbChNlbmZvcmNlX2lzc3VlX3RpdGxlGAogASgIEhoKEmF1dG9fZW5hYmxlX2JhY2t1cBgLIAEoCBIaChJza2lwX2JhY2t1cF9lcnJvcnMYDCABKAgSJQodcG9zdGdyZXNfZGF0YWJhc2VfdGVuYW50X21vZGUYDSABKAgSGwoTYWxsb3dfc2VsZl9hcHByb3ZhbBgOIAEoCBJJChZleGVjdXRpb25fcmV0cnlfcG9saWN5GA8gASgLMikuYnl0ZWJhc2UudjEuUHJvamVjdC5FeGVjdXRpb25SZXRyeVBvbGljeRIYChBjaV9zYW1wbGluZ19zaXplGBAgASgFEiIKGnBhcmFsbGVsX3Rhc2tzX3Blcl9yb2xsb3V0GBEgASgFEjAKBmxhYmVscxgSIAMoCzIgLmJ5dGViYXNlLnYxLlByb2plY3QuTGFiZWxzRW50cnkSGgoSZW5mb3JjZV9zcWxfcmV2aWV3GBMgASgIEh4KFnJlcXVpcmVfaXNzdWVfYXBwcm92YWwYFCABKAgSIwobcmVxdWlyZV9wbGFuX2NoZWNrX25vX2Vycm9yGBUgASgIGi8KFEV4ZWN1dGlvblJldHJ5UG9saWN5EhcKD21heGltdW1fcmV0cmllcxgBIAEoBRotCgtMYWJlbHNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBOi3qQSoKFGJ5dGViYXNlLmNvbS9Qcm9qZWN0EhJwcm9qZWN0cy97cHJvamVjdH0ibgoRQWRkV2ViaG9va1JlcXVlc3QSLQoHcHJvamVjdBgBIAEoCUIc4EEC+kEWChRieXRlYmFzZS5jb20vUHJvamVjdBIqCgd3ZWJob29rGAIgASgLMhQuYnl0ZWJhc2UudjEuV2ViaG9va0ID4EECIooBChRVcGRhdGVXZWJob29rUmVxdWVzdBIqCgd3ZWJob29rGAEgASgLMhQuYnl0ZWJhc2UudjEuV2ViaG9va0ID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIIkIKFFJlbW92ZVdlYmhvb2tSZXF1ZXN0EioKB3dlYmhvb2sYASABKAsyFC5ieXRlYmFzZS52MS5XZWJob29rQgPgQQIibwoSVGVzdFdlYmhvb2tSZXF1ZXN0Ei0KB3Byb2plY3QYASABKAlCHOBBAvpBFgoUYnl0ZWJhc2UuY29tL1Byb2plY3QSKgoHd2ViaG9vaxgCIAEoCzIULmJ5dGViYXNlLnYxLldlYmhvb2tCA+BBAiIkChNUZXN0V2ViaG9va1Jlc3BvbnNlEg0KBWVycm9yGAEgASgJIoECCgdXZWJob29rEgwKBG5hbWUYASABKAkSKwoEdHlwZRgCIAEoDjIYLmJ5dGViYXNlLnYxLldlYmhvb2tUeXBlQgPgQQISEgoFdGl0bGUYAyABKAlCA+BBAhIQCgN1cmwYBCABKAlCA+BBAhIWCg5kaXJlY3RfbWVzc2FnZRgGIAEoCBI7ChJub3RpZmljYXRpb25fdHlwZXMYBSADKA4yGi5ieXRlYmFzZS52MS5BY3Rpdml0eS5UeXBlQgPgQQY6QOpBPQoUYnl0ZWJhc2UuY29tL1dlYmhvb2sSJXByb2plY3RzL3twcm9qZWN0fS93ZWJob29rcy97d2ViaG9va30irAIKCEFjdGl2aXR5Ip8CCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIQCgxJU1NVRV9DUkVBVEUQARIYChRJU1NVRV9DT01NRU5UX0NSRUFURRACEhYKEklTU1VFX0ZJRUxEX1VQREFURRADEhcKE0lTU1VFX1NUQVRVU19VUERBVEUQBBImCiJJU1NVRV9QSVBFTElORV9TVEFHRV9TVEFUVVNfVVBEQVRFEAUSGQoVSVNTVUVfQVBQUk9WQUxfTk9USUZZEAYSKQolSVNTVUVfUElQRUxJTkVfVEFTS19SVU5fU1RBVFVTX1VQREFURRAHEhkKFU5PVElGWV9JU1NVRV9BUFBST1ZFRBAIEhsKF05PVElGWV9QSVBFTElORV9ST0xMT1VUEAkyghIKDlByb2plY3RTZXJ2aWNlEn8KCkdldFByb2plY3QSHi5ieXRlYmFzZS52MS5HZXRQcm9qZWN0UmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiO9pBBG5hbWWK6jAPYmIucHJvamVjdHMuZ2V0kOowAYLT5JMCFxIVL3YxL3tuYW1lPXByb2plY3RzLyp9EpUBChBCYXRjaEdldFByb2plY3RzEiQuYnl0ZWJhc2UudjEuQmF0Y2hHZXRQcm9qZWN0c1JlcXVlc3QaJS5ieXRlYmFzZS52MS5CYXRjaEdldFByb2plY3RzUmVzcG9uc2UiNIrqMA9iYi5wcm9qZWN0cy5nZXSQ6jABgtPkkwIXEhUvdjEvcHJvamVjdHM6YmF0Y2hHZXQShAEKDExpc3RQcm9qZWN0cxIgLmJ5dGViYXNlLnYxLkxpc3RQcm9qZWN0c1JlcXVlc3QaIS5ieXRlYmFzZS52MS5MaXN0UHJvamVjdHNSZXNwb25zZSIv2kEAiuowEGJiLnByb2plY3RzLmxpc3SQ6jABgtPkkwIOEgwvdjEvcHJvamVjdHMSgAEKDlNlYXJjaFByb2plY3RzEiIuYnl0ZWJhc2UudjEuU2VhcmNoUHJvamVjdHNSZXF1ZXN0GiMuYnl0ZWJhc2UudjEuU2VhcmNoUHJvamVjdHNSZXNwb25zZSIl2kEAkOowAoLT5JMCGDoBKiITL3YxL3Byb2plY3RzOnNlYXJjaBKEAQoNQ3JlYXRlUHJvamVjdBIhLmJ5dGViYXNlLnYxLkNyZWF0ZVByb2plY3RSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCI62kEAiuowEmJiLnByb2plY3RzLmNyZWF0ZZDqMAGC0+STAhc6B3Byb2plY3QiDC92MS9wcm9qZWN0cxKoAQoNVXBkYXRlUHJvamVjdBIhLmJ5dGViYXNlLnYxLlVwZGF0ZVByb2plY3RSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCJe2kETcHJvamVjdCx1cGRhdGVfbWFza4rqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwIoOgdwcm9qZWN0Mh0vdjEve3Byb2plY3QubmFtZT1wcm9qZWN0cy8qfRKOAQoNRGVsZXRlUHJvamVjdBIhLmJ5dGViYXNlLnYxLkRlbGV0ZVByb2plY3RSZXF1ZXN0GhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5IkLaQQRuYW1liuowEmJiLnByb2plY3RzLmRlbGV0ZZDqMAGY6jABgtPkkwIXKhUvdjEve25hbWU9cHJvamVjdHMvKn0SlwEKD1VuZGVsZXRlUHJvamVjdBIjLmJ5dGViYXNlLnYxLlVuZGVsZXRlUHJvamVjdFJlcXVlc3QaFC5ieXRlYmFzZS52MS5Qcm9qZWN0IkmK6jAUYmIucHJvamVjdHMudW5kZWxldGWQ6jABmOowAYLT5JMCIzoBKiIeL3YxL3tuYW1lPXByb2plY3RzLyp9OnVuZGVsZXRlEpkBChNCYXRjaERlbGV0ZVByb2plY3RzEicuYnl0ZWJhc2UudjEuQmF0Y2hEZWxldGVQcm9qZWN0c1JlcXVlc3QaFi5nb29nbGUucHJvdG9idWYuRW1wdHkiQYrqMBJiYi5wcm9qZWN0cy5kZWxldGWQ6jABmOowAYLT5JMCHToBKiIYL3YxL3Byb2plY3RzOmJhdGNoRGVsZXRlEpgBCgxHZXRJYW1Qb2xpY3kSIC5ieXRlYmFzZS52MS5HZXRJYW1Qb2xpY3lSZXF1ZXN0GhYuYnl0ZWJhc2UudjEuSWFtUG9saWN5Ik6K6jAYYmIucHJvamVjdHMuZ2V0SWFtUG9saWN5kOowAYLT5JMCKBImL3YxL3tyZXNvdXJjZT1wcm9qZWN0cy8qfTpnZXRJYW1Qb2xpY3kSnwEKDFNldElhbVBvbGljeRIgLmJ5dGViYXNlLnYxLlNldElhbVBvbGljeVJlcXVlc3QaFi5ieXRlYmFzZS52MS5JYW1Qb2xpY3kiVYrqMBhiYi5wcm9qZWN0cy5zZXRJYW1Qb2xpY3mQ6jABmOowAYLT5JMCKzoBKiImL3YxL3tyZXNvdXJjZT1wcm9qZWN0cy8qfTpzZXRJYW1Qb2xpY3kSjAEKCkFkZFdlYmhvb2sSHi5ieXRlYmFzZS52MS5BZGRXZWJob29rUmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiSIrqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwIoOgEqIiMvdjEve3Byb2plY3Q9cHJvamVjdHMvKn06YWRkV2ViaG9vaxLBAQoNVXBkYXRlV2ViaG9vaxIhLmJ5dGViYXNlLnYxLlVwZGF0ZVdlYmhvb2tSZXF1ZXN0GhQuYnl0ZWJhc2UudjEuUHJvamVjdCJ32kETd2ViaG9vayx1cGRhdGVfbWFza4rqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwJBOgd3ZWJob29rMjYvdjEve3dlYmhvb2submFtZT1wcm9qZWN0cy8qL3dlYmhvb2tzLyp9OnVwZGF0ZVdlYmhvb2sSpQEKDVJlbW92ZVdlYmhvb2sSIS5ieXRlYmFzZS52MS5SZW1vdmVXZWJob29rUmVxdWVzdBoULmJ5dGViYXNlLnYxLlByb2plY3QiW4rqMBJiYi5wcm9qZWN0cy51cGRhdGWQ6jABgtPkkwI7OgEqIjYvdjEve3dlYmhvb2submFtZT1wcm9qZWN0cy8qL3dlYmhvb2tzLyp9OnJlbW92ZVdlYmhvb2sSmwEKC1Rlc3RXZWJob29rEh8uYnl0ZWJhc2UudjEuVGVzdFdlYmhvb2tSZXF1ZXN0GiAuYnl0ZWJhc2UudjEuVGVzdFdlYmhvb2tSZXNwb25zZSJJiuowEmJiLnByb2plY3RzLnVwZGF0ZZDqMAGC0+STAik6ASoiJC92MS97cHJvamVjdD1wcm9qZWN0cy8qfTp0ZXN0V2ViaG9va0KpAQoPY29tLmJ5dGViYXNlLnYxQhNQcm9qZWN0U2VydmljZVByb3RvUAFaNGdpdGh1Yi5jb20vYnl0ZWJhc2UvYnl0ZWJhc2UvYmFja2VuZC9nZW5lcmF0ZWQtZ28vdjGiAgNCWFiqAgtCeXRlYmFzZS5WMcoCC0J5dGViYXNlXFYx4gIXQnl0ZWJhc2VcVjFcR1BCTWV0YWRhdGHqAgxCeXRlYmFzZTo6VjFiBnByb3RvMw", [file_buf_validate_validate, file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_empty, file_google_protobuf_field_mask, file_v1_annotation, file_v1_common, file_v1_iam_policy]);
/**
* Describes the message bytebase.v1.GetProjectRequest.
diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yaml
index 0f58331721..eb0630c1a3 100644
--- a/proto/gen/grpc-doc/openapi.yaml
+++ b/proto/gen/grpc-doc/openapi.yaml
@@ -1042,8 +1042,9 @@ paths:
in: query
description: |-
The order by of instances.
- Support title, environment
+ Support title, environment. The default sorting order is ascending.
For example:
+ - order_by = "title"
- order_by = "title desc"
- order_by = "title desc, environment asc"
schema:
@@ -1297,8 +1298,9 @@ paths:
in: query
description: |-
The order by of databases.
- Support name, project, instance
+ Support name, project, instance. The default sorting order is ascending.
For example:
+ - order_by = "name" - order by name ascending
- order_by = "name desc"
- order_by = "name desc, project asc"
schema:
@@ -3340,6 +3342,17 @@ paths:
Supports filtering by name, resource_id, state, and labels (e.g., labels.environment == "production").
schema:
type: string
+ - name: orderBy
+ in: query
+ description: |-
+ The order by of projects.
+ Support title. The default sorting order is ascending.
+ For example:
+ - order_by = "title"
+ - order_by = "title desc"
+ - order_by = "title asc"
+ schema:
+ type: string
responses:
"200":
description: OK
@@ -3870,8 +3883,9 @@ paths:
in: query
description: |-
The order by of databases.
- Support name, project, instance
+ Support name, project, instance. The default sorting order is ascending.
For example:
+ - order_by = "name" - order by name ascending
- order_by = "name desc"
- order_by = "name desc, project asc"
schema:
@@ -7577,8 +7591,9 @@ paths:
in: query
description: |-
The order by of databases.
- Support name, project, instance
+ Support name, project, instance. The default sorting order is ascending.
For example:
+ - order_by = "name" - order by name ascending
- order_by = "name desc"
- order_by = "name desc, project asc"
schema:
@@ -9854,7 +9869,7 @@ components:
type: string
description: |-
The order by of the log.
- Only support order by create_time.
+ Only support order by create_time. The default sorting order is ascending.
For example:
- order_by = "create_time asc"
- order_by = "create_time desc"
@@ -12854,6 +12869,8 @@ components:
format: enum
description: Role defines a set of permissions that can be assigned to users.
Rollout:
+ required:
+ - plan
type: object
properties:
name:
@@ -12861,6 +12878,11 @@ components:
description: |-
The resource name of the rollout.
Format: projects/{project}/plans/{plan}/rollout
+ plan:
+ type: string
+ description: |-
+ The plan that this rollout is based on.
+ Format: projects/{project}/plans/{plan}
title:
readOnly: true
type: string
@@ -12873,6 +12895,10 @@ components:
items:
$ref: '#/components/schemas/Stage'
description: Stages and thus tasks of the rollout.
+ creator:
+ readOnly: true
+ type: string
+ description: 'Format: users/[email protected]'
createTime:
readOnly: true
type: string
@@ -12881,6 +12907,12 @@ components:
readOnly: true
type: string
format: date-time
+ issue:
+ readOnly: true
+ type: string
+ description: |-
+ The issue associated with the rollout. Could be empty.
+ Format: projects/{project}/issues/{issue}
RolloutPolicy:
type: object
properties:
@@ -13348,7 +13380,7 @@ components:
type: string
description: |-
The order by of the log.
- Only support order by create_time.
+ Only support order by create_time. The default sorting order is ascending.
For example:
- order_by = "create_time asc"
- order_by = "create_time desc"
@@ -13477,6 +13509,15 @@ components:
When paginating, all other parameters provided to `SearchProjects` must match
the call that provided the page token.
+ orderBy:
+ type: string
+ description: |-
+ The order by of projects.
+ Support title. The default sorting order is ascending.
+ For example:
+ - order_by = "title"
+ - order_by = "title desc"
+ - order_by = "title asc"
SearchProjectsResponse:
type: object
properties:
diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.md
index cea24e694e..ad88eda573 100644
--- a/proto/gen/grpc-doc/v1/README.md
+++ b/proto/gen/grpc-doc/v1/README.md
@@ -2854,7 +2854,7 @@ Request message for exporting audit logs.
| ----- | ---- | ----- | ----------- |
| parent | [string](#string) | | |
| filter | [string](#string) | | The filter of the log. It should be a valid CEL expression. Check the filter field in the SearchAuditLogsRequest message. |
-| order_by | [string](#string) | | The order by of the log. Only support order by create_time. For example: - order_by = &#34;create_time asc&#34; - order_by = &#34;create_time desc&#34; |
+| order_by | [string](#string) | | The order by of the log. Only support order by create_time. The default sorting order is ascending. For example: - order_by = &#34;create_time asc&#34; - order_by = &#34;create_time desc&#34; |
| format | [ExportFormat](#bytebase-v1-ExportFormat) | | The export format. |
| page_size | [int32](#int32) | | The maximum number of logs to return. The service may return fewer than this value. If unspecified, at most 10 log entries will be returned. The maximum value is 5000; values above 5000 will be coerced to 5000. |
| page_token | [string](#string) | | A page token, received from a previous `ExportAuditLogs` call. Provide this to retrieve the subsequent page. |
@@ -2910,7 +2910,7 @@ Request message for searching audit logs.
Supported filter: - method: the API name, can be found in the docs, should start with &#34;/bytebase.v1.&#34; prefix. For example &#34;/bytebase.v1.UserService/CreateUser&#34;. Support &#34;==&#34; operator. - severity: support &#34;==&#34; operator, check Severity enum in AuditLog message for values. - user: the actor, should in &#34;users/{email}&#34; format, support &#34;==&#34; operator. - create_time: support &#34;&gt;=&#34; and &#34;&lt;=&#34; operator.
For example: - filter = &#34;method == &#39;/bytebase.v1.SQLService/Query&#39;&#34; - filter = &#34;method == &#39;/bytebase.v1.SQLService/Query&#39; &amp;&amp; severity == &#39;ERROR&#39;&#34; - filter = &#34;method == &#39;/bytebase.v1.SQLService/Query&#39; &amp;&amp; severity == &#39;ERROR&#39; &amp;&amp; user == &#39;users/[email protected]&#39;&#34; - filter = &#34;method == &#39;/bytebase.v1.SQLService/Query&#39; &amp;&amp; severity == &#39;ERROR&#39; &amp;&amp; create_time &lt;= &#39;2021-01-01T00:00:00Z&#39; &amp;&amp; create_time &gt;= &#39;2020-01-01T00:00:00Z&#39;&#34; |
-| order_by | [string](#string) | | The order by of the log. Only support order by create_time. For example: - order_by = &#34;create_time asc&#34; - order_by = &#34;create_time desc&#34; |
+| order_by | [string](#string) | | The order by of the log. Only support order by create_time. The default sorting order is ascending. For example: - order_by = &#34;create_time asc&#34; - order_by = &#34;create_time desc&#34; |
| page_size | [int32](#int32) | | The maximum number of logs to return. The service may return fewer than this value. If unspecified, at most 10 log entries will be returned. The maximum value is 5000; values above 5000 will be coerced to 5000. |
| page_token | [string](#string) | | A page token, received from a previous `SearchLogs` call. Provide this to retrieve the subsequent page. |
@@ -4186,7 +4186,7 @@ When paginating, all other parameters provided to `ListInstances` must match the
Supported filters: - name: the instance name, support &#34;==&#34; and &#34;.matches()&#34; operator. - resource_id: the instance id, support &#34;==&#34; and &#34;.matches()&#34; operator. - environment: the environment full name in &#34;environments/{id}&#34; format, support &#34;==&#34; operator. - state: the instance state, check State enum for values, support &#34;==&#34; operator. - engine: the instance engine, check Engine enum for values. Support &#34;==&#34;, &#34;in [xx]&#34;, &#34;!(in [xx])&#34; operator. - host: the instance host, support &#34;==&#34; and &#34;.matches()&#34; operator. - port: the instance port, support &#34;==&#34; and &#34;.matches()&#34; operator. - project: the project full name in &#34;projects/{id}&#34; format, support &#34;==&#34; operator. - labels.{key}: the instance label, support &#34;==&#34; and &#34;in&#34; operators.
For example: name == &#34;sample instance&#34; name.matches(&#34;sample&#34;) resource_id == &#34;sample-instance&#34; resource_id.matches(&#34;sample&#34;) state == &#34;DELETED&#34; environment == &#34;environments/test&#34; environment == &#34;&#34; (find instances which environment is not set) engine == &#34;MYSQL&#34; engine in [&#34;MYSQL&#34;, &#34;POSTGRES&#34;] !(engine in [&#34;MYSQL&#34;, &#34;POSTGRES&#34;]) host == &#34;127.0.0.1&#34; host.matches(&#34;127.0&#34;) port == &#34;54321&#34; port.matches(&#34;543&#34;) labels.org_group == &#34;infrastructure&#34; labels.environment in [&#34;prod&#34;, &#34;production&#34;] project == &#34;projects/sample-project&#34; You can combine filter conditions like: name.matches(&#34;sample&#34;) &amp;&amp; environment == &#34;environments/test&#34; host == &#34;127.0.0.1&#34; &amp;&amp; port == &#34;54321&#34; |
-| order_by | [string](#string) | | The order by of instances. Support title, environment For example: - order_by = &#34;title desc&#34; - order_by = &#34;title desc, environment asc&#34; |
+| order_by | [string](#string) | | The order by of instances. Support title, environment. The default sorting order is ascending. For example: - order_by = &#34;title&#34; - order_by = &#34;title desc&#34; - order_by = &#34;title desc, environment asc&#34; |
@@ -5193,7 +5193,7 @@ For example: environment == &#34;environments/{environment resource id}&#34; env
You can combine filter conditions like: environment == &#34;environments/prod&#34; &amp;&amp; name.matches(&#34;employee&#34;) |
| show_deleted | [bool](#bool) | | Show deleted database if specified. |
-| order_by | [string](#string) | | The order by of databases. Support name, project, instance For example: - order_by = &#34;name desc&#34; - order_by = &#34;name desc, project asc&#34; |
+| order_by | [string](#string) | | The order by of databases. Support name, project, instance. The default sorting order is ascending. For example: - order_by = &#34;name&#34; - order by name ascending - order_by = &#34;name desc&#34; - order_by = &#34;name desc, project asc&#34; |
@@ -7980,6 +7980,7 @@ A label for categorizing and organizing issues.
When paginating, all other parameters provided to `ListProjects` must match the call that provided the page token. |
| show_deleted | [bool](#bool) | | Show deleted projects if specified. |
| filter | [string](#string) | | Filter the project. Check filter for SearchProjectsRequest for details. Supports filtering by name, resource_id, state, and labels (e.g., labels.environment == &#34;production&#34;). |
+| order_by | [string](#string) | | The order by of projects. Support title. The default sorting order is ascending. For example: - order_by = &#34;title&#34; - order_by = &#34;title desc&#34; - order_by = &#34;title asc&#34; |
@@ -8099,6 +8100,7 @@ For example: name == &#34;project name&#34; name.matches(&#34;project name&#34;)
| page_token | [string](#string) | | A page token, received from a previous `SearchProjects` call. Provide this to retrieve the subsequent page.
When paginating, all other parameters provided to `SearchProjects` must match the call that provided the page token. |
+| order_by | [string](#string) | | The order by of projects. Support title. The default sorting order is ascending. For example: - order_by = &#34;title&#34; - order_by = &#34;title desc&#34; - order_by = &#34;title asc&#34; |
@@ -9582,10 +9584,13 @@ For example: update_time &gt;= &#34;2025-01-02T15:04:05Z07:00&#34; task_type in
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| name | [string](#string) | | The resource name of the rollout. Format: projects/{project}/plans/{plan}/rollout |
+| plan | [string](#string) | | The plan that this rollout is based on. Format: projects/{project}/plans/{plan} |
| title | [string](#string) | | The title of the rollout, inherited from the associated plan. This field is output only and cannot be directly set. |
| stages | [Stage](#bytebase-v1-Stage) | repeated | Stages and thus tasks of the rollout. |
+| creator | [string](#string) | | Format: users/[email protected] |
| create_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
| update_time | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | |
+| issue | [string](#string) | | The issue associated with the rollout. Could be empty. Format: projects/{project}/issues/{issue} |
@@ -10468,7 +10473,7 @@ PlanFeature represents the available features in Bytebase
| FEATURE_DATA_CLASSIFICATION | 50 | |
| FEATURE_SCIM | 51 | |
| FEATURE_DIRECTORY_SYNC | 52 | |
-| FEATURE_TOKEN_DURATION_CONTROL | 53 | |
+| FEATURE_SIGN_IN_FREQUENCY_CONTROL | 53 | |
| FEATURE_EXTERNAL_SECRET_MANAGER | 54 | |
| FEATURE_USER_EMAIL_DOMAIN_RESTRICTION | 55 | |
| FEATURE_PROJECT_MANAGEMENT | 56 | Administration &amp; Support |
diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.html
index f0dd4936ba..5f728fe5e8 100644
--- a/proto/gen/grpc-doc/v1/index.html
+++ b/proto/gen/grpc-doc/v1/index.html
@@ -8407,7 +8407,7 @@ Check the filter field in the SearchAuditLogsRequest message. </p></td>
<td><a href="#string">string</a></td>
<td></td>
<td><p>The order by of the log.
-Only support order by create_time.
+Only support order by create_time. The default sorting order is ascending.
For example:
- order_by = &#34;create_time asc&#34;
- order_by = &#34;create_time desc&#34; </p></td>
@@ -8552,7 +8552,7 @@ For example:
<td><a href="#string">string</a></td>
<td></td>
<td><p>The order by of the log.
-Only support order by create_time.
+Only support order by create_time. The default sorting order is ascending.
For example:
- order_by = &#34;create_time asc&#34;
- order_by = &#34;create_time desc&#34; </p></td>
@@ -11825,8 +11825,9 @@ host == &#34;127.0.0.1&#34; &amp;&amp; port == &#34;54321&#34; </p></td>
<td><a href="#string">string</a></td>
<td></td>
<td><p>The order by of instances.
-Support title, environment
+Support title, environment. The default sorting order is ascending.
For example:
+- order_by = &#34;title&#34;
- order_by = &#34;title desc&#34;
- order_by = &#34;title desc, environment asc&#34; </p></td>
</tr>
@@ -14589,8 +14590,9 @@ environment == &#34;environments/prod&#34; &amp;&amp; name.matches(&#34;employee
<td><a href="#string">string</a></td>
<td></td>
<td><p>The order by of databases.
-Support name, project, instance
+Support name, project, instance. The default sorting order is ascending.
For example:
+- order_by = &#34;name&#34; - order by name ascending
- order_by = &#34;name desc&#34;
- order_by = &#34;name desc, project asc&#34; </p></td>
</tr>
@@ -22408,6 +22410,18 @@ Check filter for SearchProjectsRequest for details.
Supports filtering by name, resource_id, state, and labels (e.g., labels.environment == &#34;production&#34;). </p></td>
</tr>
+ <tr>
+ <td>order_by</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The order by of projects.
+Support title. The default sorting order is ascending.
+For example:
+- order_by = &#34;title&#34;
+- order_by = &#34;title desc&#34;
+- order_by = &#34;title asc&#34; </p></td>
+ </tr>
+
</tbody>
</table>
@@ -22749,6 +22763,18 @@ When paginating, all other parameters provided to `SearchProjects` must match
the call that provided the page token. </p></td>
</tr>
+ <tr>
+ <td>order_by</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The order by of projects.
+Support title. The default sorting order is ascending.
+For example:
+- order_by = &#34;title&#34;
+- order_by = &#34;title desc&#34;
+- order_by = &#34;title asc&#34; </p></td>
+ </tr>
+
</tbody>
</table>
@@ -26860,6 +26886,14 @@ Use &#34;projects/{project}/plans/{plan}/rollout/stages/-/tasks/-&#34; to list a
Format: projects/{project}/plans/{plan}/rollout </p></td>
</tr>
+ <tr>
+ <td>plan</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The plan that this rollout is based on.
+Format: projects/{project}/plans/{plan} </p></td>
+ </tr>
+
<tr>
<td>title</td>
<td><a href="#string">string</a></td>
@@ -26875,6 +26909,13 @@ This field is output only and cannot be directly set. </p></td>
<td><p>Stages and thus tasks of the rollout. </p></td>
</tr>
+ <tr>
+ <td>creator</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>Format: users/[email protected] </p></td>
+ </tr>
+
<tr>
<td>create_time</td>
<td><a href="#google.protobuf.Timestamp">google.protobuf.Timestamp</a></td>
@@ -26889,6 +26930,14 @@ This field is output only and cannot be directly set. </p></td>
<td><p> </p></td>
</tr>
+ <tr>
+ <td>issue</td>
+ <td><a href="#string">string</a></td>
+ <td></td>
+ <td><p>The issue associated with the rollout. Could be empty.
+Format: projects/{project}/issues/{issue} </p></td>
+ </tr>
+
</tbody>
</table>
@@ -29495,7 +29544,7 @@ In this situation, `update_mask` is ignored. </p></td>
</tr>
<tr>
- <td>FEATURE_TOKEN_DURATION_CONTROL</td>
+ <td>FEATURE_SIGN_IN_FREQUENCY_CONTROL</td>
<td>53</td>
<td><p></p></td>
</tr>
diff --git a/proto/v1/v1/audit_log_service.proto b/proto/v1/v1/audit_log_service.proto
index 0ff40a92f2..fe6aaabc04 100644
--- a/proto/v1/v1/audit_log_service.proto
+++ b/proto/v1/v1/audit_log_service.proto
@@ -72,7 +72,7 @@ message SearchAuditLogsRequest {
string filter = 1;
// The order by of the log.
- // Only support order by create_time.
+ // Only support order by create_time. The default sorting order is ascending.
// For example:
// - order_by = "create_time asc"
// - order_by = "create_time desc"
@@ -111,7 +111,7 @@ message ExportAuditLogsRequest {
string filter = 1;
// The order by of the log.
- // Only support order by create_time.
+ // Only support order by create_time. The default sorting order is ascending.
// For example:
// - order_by = "create_time asc"
// - order_by = "create_time desc"
diff --git a/proto/v1/v1/database_service.proto b/proto/v1/v1/database_service.proto
index a5bdefbc69..5699cc2777 100644
--- a/proto/v1/v1/database_service.proto
+++ b/proto/v1/v1/database_service.proto
@@ -259,8 +259,9 @@ message ListDatabasesRequest {
bool show_deleted = 5;
// The order by of databases.
- // Support name, project, instance
+ // Support name, project, instance. The default sorting order is ascending.
// For example:
+ // - order_by = "name" - order by name ascending
// - order_by = "name desc"
// - order_by = "name desc, project asc"
string order_by = 6;
diff --git a/proto/v1/v1/instance_service.proto b/proto/v1/v1/instance_service.proto
index ab8aa3eca0..02b0827379 100644
--- a/proto/v1/v1/instance_service.proto
+++ b/proto/v1/v1/instance_service.proto
@@ -232,8 +232,9 @@ message ListInstancesRequest {
string filter = 4;
// The order by of instances.
- // Support title, environment
+ // Support title, environment. The default sorting order is ascending.
// For example:
+ // - order_by = "title"
// - order_by = "title desc"
// - order_by = "title desc, environment asc"
string order_by = 5;
diff --git a/proto/v1/v1/project_service.proto b/proto/v1/v1/project_service.proto
index b9cb9bc02e..ef1c7915e7 100644
--- a/proto/v1/v1/project_service.proto
+++ b/proto/v1/v1/project_service.proto
@@ -224,6 +224,14 @@ message ListProjectsRequest {
// Check filter for SearchProjectsRequest for details.
// Supports filtering by name, resource_id, state, and labels (e.g., labels.environment == "production").
string filter = 4;
+
+ // The order by of projects.
+ // Support title. The default sorting order is ascending.
+ // For example:
+ // - order_by = "title"
+ // - order_by = "title desc"
+ // - order_by = "title asc"
+ string order_by = 5;
}
message ListProjectsResponse {
@@ -277,6 +285,14 @@ message SearchProjectsRequest {
// When paginating, all other parameters provided to `SearchProjects` must match
// the call that provided the page token.
string page_token = 4;
+
+ // The order by of projects.
+ // Support title. The default sorting order is ascending.
+ // For example:
+ // - order_by = "title"
+ // - order_by = "title desc"
+ // - order_by = "title asc"
+ string order_by = 5;
}
message SearchProjectsResponse {