Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
feat: list database support order by (#18669)
ecmadao952c523ec842
diff --git a/backend/api/mcp/gen/openapi.yaml b/backend/api/mcp/gen/openapi.yamlindex 6878dfcebb..75f9453190 100644--- a/backend/api/mcp/gen/openapi.yaml+++ b/backend/api/mcp/gen/openapi.yaml@@ -11213,6 +11213,15 @@ components:type: booleantitle: show_deleteddescription: Show deleted database if specified.+ orderBy:+ type: string+ title: order_by+ description: |-+ The order by of databases.+ Support name, project, instance+ For example:+ - order_by = "name desc"+ - order_by = "name desc, project asc"title: ListDatabasesRequestadditionalProperties: falsebytebase.v1.ListDatabasesResponse:diff --git a/backend/api/v1/audit_log_service.go b/backend/api/v1/audit_log_service.goindex 8f754e68b6..ed6ed8c179 100644--- a/backend/api/v1/audit_log_service.go+++ b/backend/api/v1/audit_log_service.go@@ -10,7 +10,6 @@ import ("google.golang.org/protobuf/types/known/timestamppb""github.com/bytebase/bytebase/backend/common"- "github.com/bytebase/bytebase/backend/common/qb""github.com/bytebase/bytebase/backend/component/export""github.com/bytebase/bytebase/backend/enterprise"storepb "github.com/bytebase/bytebase/backend/generated-go/store"@@ -44,10 +43,10 @@ func (s *AuditLogService) SearchAuditLogs(ctx context.Context, request *connect.// Apply retention-based filtering based on the planretentionCutoff := s.licenseService.GetAuditLogRetentionCutoff()if retentionCutoff != nil {- filterQ = applyRetentionFilter(filterQ, retentionCutoff)+ filterQ = store.ApplyRetentionFilter(filterQ, retentionCutoff)}- orderByKeys, err := getSearchAuditLogsOrderByKeys(request.Msg.OrderBy)+ orderByKeys, err := store.GetAuditLogOrders(request.Msg.OrderBy)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)}@@ -63,7 +62,7 @@ func (s *AuditLogService) SearchAuditLogs(ctx context.Context, request *connect.limitPlusOne := offset.limit + 1var project *string- if request.Msg.Parent != "" {+ if request.Msg.Parent != "" && request.Msg.Parent != "projects/-" {project = &request.Msg.Parent}auditLogFind := &store.AuditLogFind{@@ -201,49 +200,3 @@ func convertToAuditLogSeverity(s storepb.AuditLog_Severity) v1pb.AuditLog_Severireturn v1pb.AuditLog_SEVERITY_UNSPECIFIED}}--func getSearchAuditLogsOrderByKeys(orderBy string) ([]store.OrderByKey, error) {- keys, err := parseOrderBy(orderBy)- if err != nil {- return nil, err- }-- orderByKeys := []store.OrderByKey{}- for _, orderByKey := range keys {- key := ""- if orderByKey.key == "create_time" {- key = "created_at"- }- if key == "" {- return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("invalid order by key %v", orderByKey.key))- }-- sortOrder := store.ASC- if !orderByKey.isAscend {- sortOrder = store.DESC- }- orderByKeys = append(orderByKeys, store.OrderByKey{- Key: key,- SortOrder: sortOrder,- })- }- return orderByKeys, nil-}--// applyRetentionFilter merges retention-based filtering with user-provided filters.-func applyRetentionFilter(userFilterQ *qb.Query, cutoff *time.Time) *qb.Query {- if cutoff == nil {- return userFilterQ- }-- retentionQ := qb.Q().Space("created_at >= ?", *cutoff)- if userFilterQ == nil {- return qb.Q().Space("(?)", retentionQ)- }-- // Combine with existing filter using AND- q := qb.Q()- q.Space("?", userFilterQ)- q.And("?", retentionQ)- return qb.Q().Space("(?)", q)-}diff --git a/backend/api/v1/audit_log_service_test.go b/backend/api/v1/audit_log_service_test.goindex 1751c693ff..2e85dacf4f 100644--- a/backend/api/v1/audit_log_service_test.go+++ b/backend/api/v1/audit_log_service_test.go@@ -7,95 +7,9 @@ import ("github.com/stretchr/testify/assert""github.com/stretchr/testify/require"- "github.com/bytebase/bytebase/backend/common/qb"v1pb "github.com/bytebase/bytebase/backend/generated-go/v1")-func TestApplyRetentionFilter(t *testing.T) {- now := time.Now()- sevenDaysAgo := now.AddDate(0, 0, -7)-- tests := []struct {- name string- userFilterQ *qb.Query- cutoff *time.Time- wantSQLPattern []string // Pattern to match in SQL- description string- }{- {- name: "No retention cutoff (Enterprise plan)",- userFilterQ: qb.Q().Space("payload->>'method' = ?", "/bytebase.v1.SQLService/Query"),- cutoff: nil,- wantSQLPattern: []string{- "payload->>'method' = $1",- },- description: "Should return user filter unchanged when no cutoff",- },- {- name: "Apply retention to empty filter (Team plan)",- userFilterQ: nil,- cutoff: &sevenDaysAgo,- wantSQLPattern: []string{- "created_at >= $1",- },- description: "Should create retention filter when no user filter",- },- {- name: "Merge retention with existing filter (Team plan)",- userFilterQ: qb.Q().Space("payload->>'method' = ?", "/bytebase.v1.SQLService/Query"),- cutoff: &sevenDaysAgo,- wantSQLPattern: []string{- "payload->>'method' = $1",- "AND",- "created_at >= $2",- },- description: "Should combine user filter with retention filter using AND",- },- {- name: "Complex filter with retention",- userFilterQ: qb.Q().Space("payload->>'method' = ?", "/bytebase.v1.SQLService/Query").And("payload->>'severity' = ?", "ERROR"),- cutoff: &sevenDaysAgo,- wantSQLPattern: []string{- "payload->>'method' = $1",- "AND",- "payload->>'severity' = $2",- "AND",- "created_at >= $3",- },- description: "Should handle complex filters with multiple conditions",- },- }-- for _, tt := range tests {- t.Run(tt.name, func(t *testing.T) {- got := applyRetentionFilter(tt.userFilterQ, tt.cutoff)-- require.NotNil(t, got, tt.description)-- sql, args, err := got.ToSQL()- require.NoError(t, err)-- // Check that all expected patterns are in the SQL- for _, pattern := range tt.wantSQLPattern {- assert.Contains(t, sql, pattern, "SQL should contain expected pattern: %s", pattern)- }-- // For time comparisons in args, we just check the type- hasTimeArg := false- for _, arg := range args {- if _, ok := arg.(time.Time); ok {- hasTimeArg = true- break- }- }-- if tt.cutoff != nil {- assert.True(t, hasTimeArg, "Should have time argument when cutoff is set")- }- })- }-}-func TestGetAuditLogRetentionDays(t *testing.T) {// This test would require mocking the LicenseService// For now, we'll create a simple test that validates the logicdiff --git a/backend/api/v1/common.go b/backend/api/v1/common.goindex 12062e31cb..e71d68e3ba 100644--- a/backend/api/v1/common.go+++ b/backend/api/v1/common.go@@ -72,35 +72,6 @@ func validateLabels(labels map[string]string) error {return nil}-type orderByKey struct {- key string- isAscend bool-}--func parseOrderBy(orderBy string) ([]orderByKey, error) {- if orderBy == "" {- return nil, nil- }-- var result []orderByKey- re := regexp.MustCompile(`(\w+)\s*(asc|desc)?`)- matches := re.FindAllStringSubmatch(orderBy, -1)- for _, match := range matches {- if len(match) > 3 {- return nil, errors.Errorf("invalid order by %q", orderBy)- }- key := orderByKey{- key: match[1],- isAscend: true,- }- if len(match) == 3 && match[2] == "desc" {- key.isAscend = false- }- result = append(result, key)- }- return result, nil-}-type Expression struct {Key stringOperator OperatorTypediff --git a/backend/api/v1/common_test.go b/backend/api/v1/common_test.goindex 30a7c01146..9b97d1cce0 100644--- a/backend/api/v1/common_test.go+++ b/backend/api/v1/common_test.go@@ -90,56 +90,6 @@ func TestParseFilter(t *testing.T) {}}-func TestParseOrderBy(t *testing.T) {- testCases := []struct {- input string- want []orderByKey- err error- }{- {- input: "start_time",- want: []orderByKey{- {- key: "start_time",- isAscend: true,- },- },- },- {- input: "start_time desc",- want: []orderByKey{- {- key: "start_time",- isAscend: false,- },- },- },- {- input: "start_time desc, count",- want: []orderByKey{- {- key: "start_time",- isAscend: false,- },- {- key: "count",- isAscend: true,- },- },- },- }-- for _, test := range testCases {- got, err := parseOrderBy(test.input)- if test.err != nil {- require.EqualError(t, err, test.err.Error())- } else {- require.NoError(t, err)- require.Equal(t, test.want, got)- }- }-}-func TestIsValidateOnlyRequest(t *testing.T) {tests := []struct {name stringdiff --git a/backend/api/v1/database_service.go b/backend/api/v1/database_service.goindex 5185811c18..4fb0d88405 100644--- a/backend/api/v1/database_service.go+++ b/backend/api/v1/database_service.go@@ -187,6 +187,12 @@ func (s *DatabaseService) ListDatabases(ctx context.Context, req *connect.RequesShowDeleted: req.Msg.ShowDeleted,}+ orderByKeys, err := store.GetDatabaseOrders(req.Msg.OrderBy)+ if err != nil {+ return nil, connect.NewError(connect.CodeInvalidArgument, err)+ }+ find.OrderByKeys = orderByKeys+filterQ, err := store.GetListDatabaseFilter(req.Msg.Filter)if err != nil {return nil, connect.NewError(connect.CodeInvalidArgument, err)diff --git a/backend/generated-go/v1/database_service.pb.go b/backend/generated-go/v1/database_service.pb.goindex 02181428d5..bb19062c2d 100644--- a/backend/generated-go/v1/database_service.pb.go+++ b/backend/generated-go/v1/database_service.pb.go@@ -819,7 +819,13 @@ type ListDatabasesRequest struct {// environment == "environments/prod" && name.matches("employee")Filter string `protobuf:"bytes,4,opt,name=filter,proto3" json:"filter,omitempty"`// Show deleted database if specified.- ShowDeleted bool `protobuf:"varint,5,opt,name=show_deleted,json=showDeleted,proto3" json:"show_deleted,omitempty"`+ 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+ // For example:+ // - 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"`unknownFields protoimpl.UnknownFieldssizeCache protoimpl.SizeCache}@@ -889,6 +895,13 @@ func (x *ListDatabasesRequest) GetShowDeleted() bool {return false}+func (x *ListDatabasesRequest) GetOrderBy() string {+ if x != nil {+ return x.OrderBy+ }+ return ""+}+type ListDatabasesResponse struct {state protoimpl.MessageState `protogen:"open.v1"`// The databases from the specified request.@@ -5635,14 +5648,15 @@ const file_v1_database_service_proto_rawDesc = "" +"\x05names\x18\x02 \x03(\tB\x1d\xe0A\x02\xfaA\x17\n" +"\x15bytebase.com/DatabaseR\x05names\"P\n" +"\x19BatchGetDatabasesResponse\x123\n" +- "\tdatabases\x18\x01 \x03(\v2\x15.bytebase.v1.DatabaseR\tdatabases\"\xc4\x01\n" ++ "\tdatabases\x18\x01 \x03(\v2\x15.bytebase.v1.DatabaseR\tdatabases\"\xdf\x01\n" +"\x14ListDatabasesRequest\x125\n" +"\x06parent\x18\x01 \x01(\tB\x1d\xe0A\x02\xfaA\x17\x12\x15bytebase.com/DatabaseR\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!\n" +- "\fshow_deleted\x18\x05 \x01(\bR\vshowDeleted\"t\n" ++ "\fshow_deleted\x18\x05 \x01(\bR\vshowDeleted\x12\x19\n" ++ "\border_by\x18\x06 \x01(\tR\aorderBy\"t\n" +"\x15ListDatabasesResponse\x123\n" +"\tdatabases\x18\x01 \x03(\v2\x15.bytebase.v1.DatabaseR\tdatabases\x12&\n" +"\x0fnext_page_token\x18\x02 \x01(\tR\rnextPageToken\"\xb1\x01\n" +diff --git a/backend/generated-go/v1/database_service_equal.pb.go b/backend/generated-go/v1/database_service_equal.pb.goindex d237ab896d..1fdfb4bc1f 100644--- a/backend/generated-go/v1/database_service_equal.pb.go+++ b/backend/generated-go/v1/database_service_equal.pb.go@@ -83,6 +83,9 @@ func (x *ListDatabasesRequest) Equal(y *ListDatabasesRequest) bool {if x.ShowDeleted != y.ShowDeleted {return false}+ if x.OrderBy != y.OrderBy {+ return false+ }return true}diff --git a/backend/store/audit_log.go b/backend/store/audit_log.goindex 5585a24296..ffcf02d5fb 100644--- a/backend/store/audit_log.go+++ b/backend/store/audit_log.go@@ -28,7 +28,7 @@ type AuditLogFind struct {FilterQ *qb.QueryLimit *intOffset *int- OrderByKeys []OrderByKey+ OrderByKeys []*OrderByKey}func (s *Store) CreateAuditLog(ctx context.Context, payload *storepb.AuditLog) error {@@ -209,3 +209,42 @@ func GetSearchAuditLogsFilter(filter string) (*qb.Query, error) {}return qb.Q().Space("(?)", q), nil}++// ApplyRetentionFilter merges retention-based filtering with user-provided filters.+func ApplyRetentionFilter(userFilterQ *qb.Query, cutoff *time.Time) *qb.Query {+ if cutoff == nil {+ return userFilterQ+ }++ retentionQ := qb.Q().Space("created_at >= ?", *cutoff)+ if userFilterQ == nil {+ return qb.Q().Space("(?)", retentionQ)+ }++ // Combine with existing filter using AND+ q := qb.Q()+ q.Space("?", userFilterQ)+ q.And("?", retentionQ)+ return qb.Q().Space("(?)", q)+}++func GetAuditLogOrders(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 != "create_time" {+ return nil, errors.Errorf(`only support order by "create_time"`)+ }++ return []*OrderByKey{+ {+ Key: "created_at",+ SortOrder: keys[0].SortOrder,+ },+ }, nil+}diff --git a/backend/store/audit_log_test.go b/backend/store/audit_log_test.gonew file mode 100644index 0000000000..012f2a5184--- /dev/null+++ b/backend/store/audit_log_test.go@@ -0,0 +1,96 @@+package store++import (+ "testing"+ "time"++ "github.com/stretchr/testify/assert"+ "github.com/stretchr/testify/require"++ "github.com/bytebase/bytebase/backend/common/qb"+)++func TestApplyRetentionFilter(t *testing.T) {+ now := time.Now()+ sevenDaysAgo := now.AddDate(0, 0, -7)++ tests := []struct {+ name string+ userFilterQ *qb.Query+ cutoff *time.Time+ wantSQLPattern []string // Pattern to match in SQL+ description string+ }{+ {+ name: "No retention cutoff (Enterprise plan)",+ userFilterQ: qb.Q().Space("payload->>'method' = ?", "/bytebase.v1.SQLService/Query"),+ cutoff: nil,+ wantSQLPattern: []string{+ "payload->>'method' = $1",+ },+ description: "Should return user filter unchanged when no cutoff",+ },+ {+ name: "Apply retention to empty filter (Team plan)",+ userFilterQ: nil,+ cutoff: &sevenDaysAgo,+ wantSQLPattern: []string{+ "created_at >= $1",+ },+ description: "Should create retention filter when no user filter",+ },+ {+ name: "Merge retention with existing filter (Team plan)",+ userFilterQ: qb.Q().Space("payload->>'method' = ?", "/bytebase.v1.SQLService/Query"),+ cutoff: &sevenDaysAgo,+ wantSQLPattern: []string{+ "payload->>'method' = $1",+ "AND",+ "created_at >= $2",+ },+ description: "Should combine user filter with retention filter using AND",+ },+ {+ name: "Complex filter with retention",+ userFilterQ: qb.Q().Space("payload->>'method' = ?", "/bytebase.v1.SQLService/Query").And("payload->>'severity' = ?", "ERROR"),+ cutoff: &sevenDaysAgo,+ wantSQLPattern: []string{+ "payload->>'method' = $1",+ "AND",+ "payload->>'severity' = $2",+ "AND",+ "created_at >= $3",+ },+ description: "Should handle complex filters with multiple conditions",+ },+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ got := ApplyRetentionFilter(tt.userFilterQ, tt.cutoff)++ require.NotNil(t, got, tt.description)++ sql, args, err := got.ToSQL()+ require.NoError(t, err)++ // Check that all expected patterns are in the SQL+ for _, pattern := range tt.wantSQLPattern {+ assert.Contains(t, sql, pattern, "SQL should contain expected pattern: %s", pattern)+ }++ // For time comparisons in args, we just check the type+ hasTimeArg := false+ for _, arg := range args {+ if _, ok := arg.(time.Time); ok {+ hasTimeArg = true+ break+ }+ }++ if tt.cutoff != nil {+ assert.True(t, hasTimeArg, "Should have time argument when cutoff is set")+ }+ })+ }+}diff --git a/backend/store/common.go b/backend/store/common.goindex 9170e5f86c..a6d1ccbbe4 100644--- a/backend/store/common.go+++ b/backend/store/common.go@@ -1,5 +1,11 @@package store+import (+ "regexp"++ "github.com/pkg/errors"+)+// RowStatus is the status for a row.type RowStatus string@@ -28,3 +34,27 @@ type OrderByKey struct {Key stringSortOrder SortOrder}++func parseOrderBy(orderBy string) ([]*OrderByKey, error) {+ if orderBy == "" {+ return nil, nil+ }++ var result []*OrderByKey+ re := regexp.MustCompile(`(\w+)\s*(asc|desc)?`)+ matches := re.FindAllStringSubmatch(orderBy, -1)+ for _, match := range matches {+ if len(match) > 3 {+ return nil, errors.Errorf("invalid order by %q", orderBy)+ }+ key := &OrderByKey{+ Key: match[1],+ SortOrder: ASC,+ }+ if len(match) == 3 && match[2] == "desc" {+ key.SortOrder = DESC+ }+ result = append(result, key)+ }+ return result, nil+}diff --git a/backend/store/common_test.go b/backend/store/common_test.gonew file mode 100644index 0000000000..b3a93cccc7--- /dev/null+++ b/backend/store/common_test.go@@ -0,0 +1,57 @@+package store++import (+ "testing"++ "github.com/stretchr/testify/require"+)++func TestParseOrderBy(t *testing.T) {+ testCases := []struct {+ input string+ want []*OrderByKey+ err error+ }{+ {+ input: "start_time",+ want: []*OrderByKey{+ {+ Key: "start_time",+ SortOrder: ASC,+ },+ },+ },+ {+ input: "start_time desc",+ want: []*OrderByKey{+ {+ Key: "start_time",+ SortOrder: DESC,+ },+ },+ },+ {+ input: "start_time desc, count",+ want: []*OrderByKey{+ {+ Key: "start_time",+ SortOrder: DESC,+ },+ {+ Key: "count",+ SortOrder: ASC,+ },+ },+ },+ }++ for _, test := range testCases {+ got, err := parseOrderBy(test.input)+ if test.err != nil {+ require.EqualError(t, err, test.err.Error())+ } else {+ require.NoError(t, err)+ require.Equal(t, test.want, got)+ }+ }+}diff --git a/backend/store/database.go b/backend/store/database.goindex 1ecfa8d704..cc97598b2c 100644--- a/backend/store/database.go+++ b/backend/store/database.go@@ -68,9 +68,10 @@ type FindDatabaseMessage struct {// This is used for existing tasks with archived databases.ShowDeleted bool- FilterQ *qb.Query- Limit *int- Offset *int+ FilterQ *qb.Query+ Limit *int+ Offset *int+ OrderByKeys []*OrderByKey}// GetDatabase gets a database.@@ -167,9 +168,18 @@ func (s *Store) ListDatabases(ctx context.Context, find *FindDatabaseMessage) ([instance.metadata->>'engine'FROM ?WHERE ?- ORDER BY db.project, db.instance, db.name`, from, where)+ 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 db.project, db.instance, db.name")+ }+if v := find.Limit; v != nil {q.Space("LIMIT ?", *v)}@@ -717,3 +727,34 @@ func GetListDatabaseFilter(filter string) (*qb.Query, error) {}return qb.Q().Space("(?)", filterQ), nil}++func GetDatabaseOrders(orderBy string) ([]*OrderByKey, error) {+ keys, err := parseOrderBy(orderBy)+ if err != nil {+ return nil, err+ }++ orderByKeys := []*OrderByKey{}+ for _, orderByKey := range keys {+ switch orderByKey.Key {+ case "name":+ orderByKeys = append(orderByKeys, &OrderByKey{+ Key: "db.name",+ SortOrder: orderByKey.SortOrder,+ })+ case "instance":+ orderByKeys = append(orderByKeys, &OrderByKey{+ Key: "db.instance",+ SortOrder: orderByKey.SortOrder,+ })+ case "project":+ orderByKeys = append(orderByKeys, &OrderByKey{+ Key: "db.project",+ SortOrder: orderByKey.SortOrder,+ })+ default:+ return nil, errors.Errorf(`invalid order key "%v"`, orderByKey.Key)+ }+ }+ return orderByKeys, nil+}diff --git a/frontend/src/components/AuditLog/AuditLogDataTable.vue b/frontend/src/components/AuditLog/AuditLogDataTable.vueindex fc8982767a..f3f00a9f91 100644--- a/frontend/src/components/AuditLog/AuditLogDataTable.vue+++ b/frontend/src/components/AuditLog/AuditLogDataTable.vue@@ -6,6 +6,7 @@:striped="true":loading="loading":row-key="(data: AuditLog) => data.name"+ @update:sorter="$emit('update:sorters', $event)"/></template>@@ -15,7 +16,12 @@ import { createRegistry, toJsonString } from "@bufbuild/protobuf";import { AnySchema } from "@bufbuild/protobuf/wkt";import dayjs from "dayjs";import { ExternalLinkIcon } from "lucide-vue-next";-import { type DataTableColumn, NButton, NDataTable } from "naive-ui";+import {+ type DataTableColumn,+ type DataTableSortState,+ NButton,+ NDataTable,+} from "naive-ui";import { computed } from "vue";import { useI18n } from "vue-i18n";import { ProjectV1Name } from "@/components/v2";@@ -61,6 +67,7 @@ const props = withDefaults(auditLogList: AuditLog[];showProject?: boolean;loading?: boolean;+ sorters?: DataTableSortState[];}>(),{showProject: true,@@ -68,13 +75,17 @@ const props = withDefaults(});+defineEmits<{+ (event: "update:sorters", sorters: DataTableSortState[]): void;+}>();+const { t } = useI18n();const columnList = computed((): AuditDataTableColumn[] => {return ([{- key: "created-ts",+ key: "create_time",title: t("audit-log.table.created-ts"),width: 220,resizable: true,@@ -218,7 +229,26 @@ const columnList = computed((): AuditDataTableColumn[] => {},},] as AuditDataTableColumn[]- ).filter((column) => !column.hide);+ )+ .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 getViewLink = (auditLog: AuditLog): string | null => {diff --git a/frontend/src/components/AuditLog/AuditLogSearch/utils.ts b/frontend/src/components/AuditLog/AuditLogSearch/utils.tsindex 0d0c81d972..eee2401ee7 100644--- a/frontend/src/components/AuditLog/AuditLogSearch/utils.ts+++ b/frontend/src/components/AuditLog/AuditLogSearch/utils.ts@@ -1,5 +1,4 @@-import { projectNamePrefix } from "@/store/modules/v1/common";-import type { SearchAuditLogsParams } from "@/types";+import type { AuditLogFilter } from "@/types";import { AuditLog_Severity } from "@/types/proto-es/v1/audit_log_service_pb";import {getTsRangeFromSearchParams,@@ -7,18 +6,13 @@ import {type SearchParams,} from "@/utils";-export const buildSearchAuditLogParams = (+export const buildAuditLogFilter = (searchParams: SearchParams-): SearchAuditLogsParams => {+): AuditLogFilter => {const levelScope = getValueFromSearchParams(searchParams, "level");const createdTsRange = getTsRangeFromSearchParams(searchParams, "created");- const params: SearchAuditLogsParams = {- parent: getValueFromSearchParams(- searchParams,- "project",- projectNamePrefix- ),+ const params: AuditLogFilter = {method: getValueFromSearchParams(searchParams, "method"),userEmail: getValueFromSearchParams(searchParams, "actor"),};diff --git a/frontend/src/components/AuditLog/PagedAuditLogDataTable.vue b/frontend/src/components/AuditLog/PagedAuditLogDataTable.vuenew file mode 100644index 0000000000..f1f3c18380--- /dev/null+++ b/frontend/src/components/AuditLog/PagedAuditLogDataTable.vue@@ -0,0 +1,127 @@+<template>+ <PagedTable+ ref="auditPagedTable"+ :session-key="`bb.page-audit-log-table.settings-audit-log-v1-table.${parent}`"+ :fetch-list="fetchAuditLog"+ >+ <template #table="{ list, loading }">+ <AuditLogDataTable+ :key="`audit-log-table.${parent}`"+ :audit-log-list="list"+ :show-project="false"+ :loading="loading"+ v-model:sorters="sorters"+ />+ </template>+ </PagedTable>+</template>++<script lang="tsx" setup>+import dayjs from "dayjs";+import { type DataTableSortState } from "naive-ui";+import { computed, 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";+import type {+ DownloadContent,+ ExportOption,+} from "@/components/DataExportButton.vue";+import PagedTable from "@/components/v2/Model/PagedTable.vue";+import { useAuditLogStore } from "@/store";+import type { AuditLogFilter } from "@/types";+import type { AuditLog } from "@/types/proto-es/v1/audit_log_service_pb";+import { ExportFormat } from "@/types/proto-es/v1/common_pb";++const props = defineProps<{+ parent: string;+ filter: AuditLogFilter;+}>();++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,+}: {+ pageToken: string;+ pageSize: number;+}) => {+ const { nextPageToken, auditLogs } = await auditLogStore.fetchAuditLogs({+ pageToken,+ pageSize,+ parent: props.parent,+ filter: props.filter,+ orderBy: orderBy.value,+ });+ return { nextPageToken, list: auditLogs };+};++watch(+ () => [props.filter, props.parent, orderBy.value],+ () => auditPagedTable.value?.refresh(),+ { deep: true }+);++const handleExport = async ({+ options,+ resolve,+ reject,+}: {+ options: ExportOption;+ reject: (reason?: unknown) => void;+ resolve: (content: DownloadContent[]) => void;+}) => {+ let pageToken = "";+ let i = 0;+ const contents: DownloadContent[] = [];++ try {+ while (i === 0 || pageToken !== "") {+ i++;+ const { content, nextPageToken } = await auditLogStore.exportAuditLogs({+ search: {+ parent: props.parent,+ filter: props.filter,+ orderBy: orderBy.value,+ pageSize: 5000, // The maximum page size is 5000+ pageToken,+ },+ format: options.format,+ });+ pageToken = nextPageToken;+ contents.push({+ content,+ filename: `audit-log.file${i}.${dayjs(new Date()).format("YYYY-MM-DDTHH-mm-ss")}.${ExportFormat[options.format].toLowerCase()}`,+ });+ }+ resolve(contents);+ } catch (err) {+ reject(err);+ }+};++defineExpose({+ handleExport,+});+</script>\ No newline at end of filediff --git a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vueindex 39deda3d29..b758a4dfe0 100644--- a/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue+++ b/frontend/src/components/v2/Model/DatabaseV1Table/DatabaseV1Table.vue@@ -14,11 +14,16 @@@update:checked-row-keys="(val) => $emit('update:selected-database-names', val as string[])"+ @update:sorter="$emit('update:sorters', $event)"/></template><script setup lang="tsx">-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 { EnvironmentV1Name, InstanceV1Name } from "@/components/v2";@@ -62,6 +67,7 @@ const props = withDefaults(defaultPageSize: number;disabled: boolean;};+ sorters?: DataTableSortState[];}>(),{mode: "ALL",@@ -77,6 +83,7 @@ const props = withDefaults(const emit = defineEmits<{(event: "update:selected-database-names", val: string[]): void;+ (event: "update:sorters", sorters: DataTableSortState[]): void;}>();const { t } = useI18n();@@ -96,7 +103,7 @@ const columnList = computed((): DatabaseDataTableColumn[] => {},};const NAME: DatabaseDataTableColumn = {- key: "title",+ key: "name",title: t("common.name"),resizable: true,render: (data) => {@@ -188,9 +195,31 @@ const columnList = computed((): DatabaseDataTableColumn[] => {["PROJECT_SHORT", [NAME, ENVIRONMENT, SCHEMA_VERSION, INSTANCE, ADDRESS]],]);- return [SELECTION, ...(columnsMap.get(props.mode) || [])].filter(- (column) => !column.hide- );+ return (+ [+ 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,+ };+ });});const rowProps = (database: ComposedDatabase) => {diff --git a/frontend/src/components/v2/Model/DatabaseV1Table/PagedDatabaseTable.vue b/frontend/src/components/v2/Model/DatabaseV1Table/PagedDatabaseTable.vueindex e2ed99234d..b66fd8f2c8 100644--- a/frontend/src/components/v2/Model/DatabaseV1Table/PagedDatabaseTable.vue+++ b/frontend/src/components/v2/Model/DatabaseV1Table/PagedDatabaseTable.vue@@ -14,13 +14,16 @@:database-list="list":keyword="filter.query":row-click="handleDatabaseClick"+ :sorters="sorters"+ @update:sorters="onSorterUpdate"/></template></PagedTable></template><script setup lang="tsx">-import { ref, watch } from "vue";+import { type DataTableSortState } from "naive-ui";+import { computed, 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";@@ -55,6 +58,46 @@ 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,@@ -69,6 +112,7 @@ const fetchDatabases = async ({pageSize,parent: props.parent,filter: props.filter,+ orderBy: orderBy.value,// Skip cache removal when refresh is false (loading more data).skipCacheRemoval: !refresh,});@@ -79,7 +123,7 @@ const fetchDatabases = async ({};watch(- () => [props.filter, props.parent],+ () => [props.filter, props.parent, orderBy.value],() => databasePagedTable.value?.refresh(),{ deep: true });diff --git a/frontend/src/store/modules/v1/auditLog.ts b/frontend/src/store/modules/v1/auditLog.tsindex 215cd3066d..e842747b3e 100644--- a/frontend/src/store/modules/v1/auditLog.ts+++ b/frontend/src/store/modules/v1/auditLog.ts@@ -3,7 +3,7 @@ import dayjs from "dayjs";import utc from "dayjs/plugin/utc";import { defineStore } from "pinia";import { auditLogServiceClientConnect } from "@/grpcweb";-import type { SearchAuditLogsParams } from "@/types";+import type { AuditLogFilter, SearchAuditLogsParams } from "@/types";import {AuditLog_Severity,ExportAuditLogsRequestSchema,@@ -14,7 +14,7 @@ import { userNamePrefix } from "./common";dayjs.extend(utc);-const buildFilter = (search: SearchAuditLogsParams): string => {+const buildFilter = (search: AuditLogFilter): string => {const filter: string[] = [];if (search.method) {filter.push(`method == "${search.method}"`);@@ -42,8 +42,8 @@ export const useAuditLogStore = defineStore("audit_log", () => {const fetchAuditLogs = async (search: SearchAuditLogsParams) => {const request = create(SearchAuditLogsRequestSchema, {parent: search.parent,- filter: buildFilter(search),- orderBy: search.order ? `create_time ${search.order}` : undefined,+ filter: buildFilter(search.filter),+ orderBy: search.orderBy,pageSize: search.pageSize,pageToken: search.pageToken,});@@ -54,24 +54,20 @@ export const useAuditLogStore = defineStore("audit_log", () => {const exportAuditLogs = async ({search,format,- pageSize,- pageToken,}: {search: SearchAuditLogsParams;format: ExportFormat;- pageSize: number;- pageToken: string;}): Promise<{content: Uint8Array;nextPageToken: string;}> => {const request = create(ExportAuditLogsRequestSchema, {parent: search.parent,- filter: buildFilter(search),- orderBy: search.order ? `create_time ${search.order}` : undefined,+ filter: buildFilter(search.filter),+ orderBy: search.orderBy,format,- pageSize,- pageToken,+ pageSize: search.pageSize,+ pageToken: search.pageToken,});return await auditLogServiceClientConnect.exportAuditLogs(request);};diff --git a/frontend/src/store/modules/v1/database.ts b/frontend/src/store/modules/v1/database.tsindex b6488a9f74..1af282b6bc 100644--- a/frontend/src/store/modules/v1/database.ts+++ b/frontend/src/store/modules/v1/database.ts@@ -186,6 +186,7 @@ export const useDatabaseV1Store = defineStore("database_v1", () => {parent: string;filter?: DatabaseFilter;skipCacheRemoval?: boolean;+ orderBy?: string;}): Promise<{databases: ComposedDatabase[];nextPageToken: string;@@ -201,6 +202,7 @@ export const useDatabaseV1Store = defineStore("database_v1", () => {parent: params.parent,pageSize: params.pageSize,pageToken: params.pageToken,+ orderBy: params.orderBy,showDeleted: params.filter?.showDeleted,filter: getListDatabaseFilter(params.filter ?? {}),});diff --git a/frontend/src/types/auditLog.ts b/frontend/src/types/auditLog.tsindex 35de56edd3..5856fb7704 100644--- a/frontend/src/types/auditLog.ts+++ b/frontend/src/types/auditLog.ts@@ -1,13 +1,17 @@import { AuditLog_Severity } from "./proto-es/v1/audit_log_service_pb";-export interface SearchAuditLogsParams {- parent?: string;+export interface AuditLogFilter {method?: string;level?: AuditLog_Severity;userEmail?: string;createdTsAfter?: number;createdTsBefore?: number;- order?: "asc" | "desc";+}++export interface SearchAuditLogsParams {+ parent?: string;+ filter: AuditLogFilter;pageSize?: number;pageToken?: string;+ orderBy?: string;}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.tsindex a42ffaa41e..4e34b089bc 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@@ -157,6 +157,17 @@ export declare type ListDatabasesRequest = Message<"bytebase.v1.ListDatabasesReq* @generated from field: bool show_deleted = 5;*/showDeleted: boolean;++ /**+ * The order by of databases.+ * Support name, project, instance+ * For example:+ * - order_by = "name desc"+ * - order_by = "name desc, project asc"+ *+ * @generated from field: string order_by = 6;+ */+ orderBy: string;};/**diff --git a/frontend/src/types/proto-es/v1/database_service_pb.js b/frontend/src/types/proto-es/v1/database_service_pb.jsindex 063e3c67aa..43fe8796cd 100644--- a/frontend/src/types/proto-es/v1/database_service_pb.js+++ b/frontend/src/types/proto-es/v1/database_service_pb.js@@ -16,7 +16,7 @@ import { file_v1_instance_service } from "./instance_service_pb";* Describes the file v1/database_service.proto.*/export const file_v1_database_service = /*@__PURE__*/- fileDesc("Chl2MS9kYXRhYmFzZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJBChJHZXREYXRhYmFzZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2UidwoYQmF0Y2hHZXREYXRhYmFzZXNSZXF1ZXN0Ei0KBnBhcmVudBgBIAEoCUId4EEC+kEXEhVieXRlYmFzZS5jb20vRGF0YWJhc2USLAoFbmFtZXMYAiADKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlIkUKGUJhdGNoR2V0RGF0YWJhc2VzUmVzcG9uc2USKAoJZGF0YWJhc2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuRGF0YWJhc2UikgEKFExpc3REYXRhYmFzZXNSZXF1ZXN0Ei0KBnBhcmVudBgBIAEoCUId4EEC+kEXEhVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJEhQKDHNob3dfZGVsZXRlZBgFIAEoCCJaChVMaXN0RGF0YWJhc2VzUmVzcG9uc2USKAoJZGF0YWJhc2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuRGF0YWJhc2USFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIo0BChVVcGRhdGVEYXRhYmFzZVJlcXVlc3QSLAoIZGF0YWJhc2UYASABKAsyFS5ieXRlYmFzZS52MS5EYXRhYmFzZUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIImgKG0JhdGNoVXBkYXRlRGF0YWJhc2VzUmVxdWVzdBIOCgZwYXJlbnQYASABKAkSOQoIcmVxdWVzdHMYAiADKAsyIi5ieXRlYmFzZS52MS5VcGRhdGVEYXRhYmFzZVJlcXVlc3RCA+BBAiJIChxCYXRjaFVwZGF0ZURhdGFiYXNlc1Jlc3BvbnNlEigKCWRhdGFiYXNlcxgBIAMoCzIVLmJ5dGViYXNlLnYxLkRhdGFiYXNlIlkKGUJhdGNoU3luY0RhdGFiYXNlc1JlcXVlc3QSDgoGcGFyZW50GAEgASgJEiwKBW5hbWVzGAIgAygJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZSIcChpCYXRjaFN5bmNEYXRhYmFzZXNSZXNwb25zZSJCChNTeW5jRGF0YWJhc2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlIhYKFFN5bmNEYXRhYmFzZVJlc3BvbnNlInAKGkdldERhdGFiYXNlTWV0YWRhdGFSZXF1ZXN0EjMKBG5hbWUYASABKAlCJeBBAvpBHwodYnl0ZWJhc2UuY29tL0RhdGFiYXNlTWV0YWRhdGESDgoGZmlsdGVyGAIgASgJEg0KBWxpbWl0GAMgASgFIk0KGEdldERhdGFiYXNlU2NoZW1hUmVxdWVzdBIxCgRuYW1lGAEgASgJQiPgQQL6QR0KG2J5dGViYXNlLmNvbS9EYXRhYmFzZVNjaGVtYSLYAQobR2V0RGF0YWJhc2VTRExTY2hlbWFSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEkIKBmZvcm1hdBgCIAEoDjIyLmJ5dGViYXNlLnYxLkdldERhdGFiYXNlU0RMU2NoZW1hUmVxdWVzdC5TRExGb3JtYXQiSAoJU0RMRm9ybWF0EhoKFlNETF9GT1JNQVRfVU5TUEVDSUZJRUQQABIPCgtTSU5HTEVfRklMRRABEg4KCk1VTFRJX0ZJTEUQAiJxChFEaWZmU2NoZW1hUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIQCgZzY2hlbWEYAiABKAlIABITCgljaGFuZ2Vsb2cYAyABKAlIAEIICgZ0YXJnZXQiIgoSRGlmZlNjaGVtYVJlc3BvbnNlEgwKBGRpZmYYASABKAkivAQKCERhdGFiYXNlEgwKBG5hbWUYASABKAkSJgoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZUID4EEDEj0KFHN1Y2Nlc3NmdWxfc3luY190aW1lGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEg8KB3Byb2plY3QYBCABKAkSGwoOc2NoZW1hX3ZlcnNpb24YBSABKAlCA+BBAxIdCgtlbnZpcm9ubWVudBgGIAEoCUID4EEBSACIAQESJwoVZWZmZWN0aXZlX2Vudmlyb25tZW50GAcgASgJQgPgQQNIAYgBARIxCgZsYWJlbHMYCCADKAsyIS5ieXRlYmFzZS52MS5EYXRhYmFzZS5MYWJlbHNFbnRyeRI9ChFpbnN0YW5jZV9yZXNvdXJjZRgJIAEoCzIdLmJ5dGViYXNlLnYxLkluc3RhbmNlUmVzb3VyY2VCA+BBAxIdChBiYWNrdXBfYXZhaWxhYmxlGAogASgIQgPgQQMSFAoHZHJpZnRlZBgLIAEoCEID4EEDGi0KC0xhYmVsc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAE6RepBQgoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEilpbnN0YW5jZXMve2luc3RhbmNlfS9kYXRhYmFzZXMve2RhdGFiYXNlfUIOCgxfZW52aXJvbm1lbnRCGAoWX2VmZmVjdGl2ZV9lbnZpcm9ubWVudCKoAgoQRGF0YWJhc2VNZXRhZGF0YRIMCgRuYW1lGAEgASgJEiwKB3NjaGVtYXMYAiADKAsyGy5ieXRlYmFzZS52MS5TY2hlbWFNZXRhZGF0YRIVCg1jaGFyYWN0ZXJfc2V0GAMgASgJEhEKCWNvbGxhdGlvbhgEIAEoCRIyCgpleHRlbnNpb25zGAUgAygLMh4uYnl0ZWJhc2UudjEuRXh0ZW5zaW9uTWV0YWRhdGESDQoFb3duZXIYBiABKAkSEwoLc2VhcmNoX3BhdGgYByABKAk6VupBUwodYnl0ZWJhc2UuY29tL0RhdGFiYXNlTWV0YWRhdGESMmluc3RhbmNlcy97aW5zdGFuY2V9L2RhdGFiYXNlcy97ZGF0YWJhc2V9L21ldGFkYXRhIqYFCg5TY2hlbWFNZXRhZGF0YRIMCgRuYW1lGAEgASgJEioKBnRhYmxlcxgCIAMoCzIaLmJ5dGViYXNlLnYxLlRhYmxlTWV0YWRhdGESOwoPZXh0ZXJuYWxfdGFibGVzGAMgAygLMiIuYnl0ZWJhc2UudjEuRXh0ZXJuYWxUYWJsZU1ldGFkYXRhEigKBXZpZXdzGAQgAygLMhkuYnl0ZWJhc2UudjEuVmlld01ldGFkYXRhEjAKCWZ1bmN0aW9ucxgFIAMoCzIdLmJ5dGViYXNlLnYxLkZ1bmN0aW9uTWV0YWRhdGESMgoKcHJvY2VkdXJlcxgGIAMoCzIeLmJ5dGViYXNlLnYxLlByb2NlZHVyZU1ldGFkYXRhEiwKB3N0cmVhbXMYByADKAsyGy5ieXRlYmFzZS52MS5TdHJlYW1NZXRhZGF0YRIoCgV0YXNrcxgIIAMoCzIZLmJ5dGViYXNlLnYxLlRhc2tNZXRhZGF0YRJBChJtYXRlcmlhbGl6ZWRfdmlld3MYCSADKAsyJS5ieXRlYmFzZS52MS5NYXRlcmlhbGl6ZWRWaWV3TWV0YWRhdGESLgoIcGFja2FnZXMYCiADKAsyHC5ieXRlYmFzZS52MS5QYWNrYWdlTWV0YWRhdGESDQoFb3duZXIYCyABKAkSMAoJc2VxdWVuY2VzGAwgAygLMh0uYnl0ZWJhc2UudjEuU2VxdWVuY2VNZXRhZGF0YRIqCgZldmVudHMYDSADKAsyGi5ieXRlYmFzZS52MS5FdmVudE1ldGFkYXRhEjEKCmVudW1fdHlwZXMYDiADKAsyHS5ieXRlYmFzZS52MS5FbnVtVHlwZU1ldGFkYXRhEhEKCXNraXBfZHVtcBgPIAEoCBIPCgdjb21tZW50GBAgASgJIlQKEEVudW1UeXBlTWV0YWRhdGESDAoEbmFtZRgBIAEoCRIOCgZ2YWx1ZXMYAiADKAkSDwoHY29tbWVudBgDIAEoCRIRCglza2lwX2R1bXAYBCABKAgiowEKDUV2ZW50TWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgpkZWZpbml0aW9uGAIgASgJEhEKCXRpbWVfem9uZRgDIAEoCRIQCghzcWxfbW9kZRgEIAEoCRIcChRjaGFyYWN0ZXJfc2V0X2NsaWVudBgFIAEoCRIcChRjb2xsYXRpb25fY29ubmVjdGlvbhgGIAEoCRIPCgdjb21tZW50GAcgASgJIoECChBTZXF1ZW5jZU1ldGFkYXRhEgwKBG5hbWUYASABKAkSEQoJZGF0YV90eXBlGAIgASgJEg0KBXN0YXJ0GAMgASgJEhEKCW1pbl92YWx1ZRgEIAEoCRIRCgltYXhfdmFsdWUYBSABKAkSEQoJaW5jcmVtZW50GAYgASgJEg0KBWN5Y2xlGAcgASgIEhIKCmNhY2hlX3NpemUYCCABKAkSEgoKbGFzdF92YWx1ZRgJIAEoCRITCgtvd25lcl90YWJsZRgKIAEoCRIUCgxvd25lcl9jb2x1bW4YCyABKAkSDwoHY29tbWVudBgMIAEoCRIRCglza2lwX2R1bXAYDSABKAgivgEKD1RyaWdnZXJNZXRhZGF0YRIMCgRuYW1lGAEgASgJEg0KBWV2ZW50GAIgASgJEg4KBnRpbWluZxgDIAEoCRIMCgRib2R5GAQgASgJEhAKCHNxbF9tb2RlGAUgASgJEhwKFGNoYXJhY3Rlcl9zZXRfY2xpZW50GAYgASgJEhwKFGNvbGxhdGlvbl9jb25uZWN0aW9uGAcgASgJEg8KB2NvbW1lbnQYCCABKAkSEQoJc2tpcF9kdW1wGAkgASgIIpEBChVFeHRlcm5hbFRhYmxlTWV0YWRhdGESDAoEbmFtZRgBIAEoCRIcChRleHRlcm5hbF9zZXJ2ZXJfbmFtZRgCIAEoCRIeChZleHRlcm5hbF9kYXRhYmFzZV9uYW1lGAMgASgJEiwKB2NvbHVtbnMYBCADKAsyGy5ieXRlYmFzZS52MS5Db2x1bW5NZXRhZGF0YSLsBAoNVGFibGVNZXRhZGF0YRIMCgRuYW1lGAEgASgJEiwKB2NvbHVtbnMYAiADKAsyGy5ieXRlYmFzZS52MS5Db2x1bW5NZXRhZGF0YRIrCgdpbmRleGVzGAMgAygLMhouYnl0ZWJhc2UudjEuSW5kZXhNZXRhZGF0YRIOCgZlbmdpbmUYBCABKAkSEQoJY29sbGF0aW9uGAUgASgJEg8KB2NoYXJzZXQYBiABKAkSEQoJcm93X2NvdW50GAcgASgDEhEKCWRhdGFfc2l6ZRgIIAEoAxISCgppbmRleF9zaXplGAkgASgDEhEKCWRhdGFfZnJlZRgKIAEoAxIWCg5jcmVhdGVfb3B0aW9ucxgLIAEoCRIPCgdjb21tZW50GAwgASgJEjUKDGZvcmVpZ25fa2V5cxgNIAMoCzIfLmJ5dGViYXNlLnYxLkZvcmVpZ25LZXlNZXRhZGF0YRI3CgpwYXJ0aXRpb25zGA4gAygLMiMuYnl0ZWJhc2UudjEuVGFibGVQYXJ0aXRpb25NZXRhZGF0YRI/ChFjaGVja19jb25zdHJhaW50cxgPIAMoCzIkLmJ5dGViYXNlLnYxLkNoZWNrQ29uc3RyYWludE1ldGFkYXRhEg0KBW93bmVyGBAgASgJEhQKDHNvcnRpbmdfa2V5cxgRIAMoCRIuCgh0cmlnZ2VycxgSIAMoCzIcLmJ5dGViYXNlLnYxLlRyaWdnZXJNZXRhZGF0YRIRCglza2lwX2R1bXAYEyABKAgSFQoNc2hhcmRpbmdfaW5mbxgUIAEoCRIYChBwcmltYXJ5X2tleV90eXBlGBUgASgJIjsKF0NoZWNrQ29uc3RyYWludE1ldGFkYXRhEgwKBG5hbWUYASABKAkSEgoKZXhwcmVzc2lvbhgCIAEoCSLNAwoWVGFibGVQYXJ0aXRpb25NZXRhZGF0YRIMCgRuYW1lGAEgASgJEjYKBHR5cGUYAiABKA4yKC5ieXRlYmFzZS52MS5UYWJsZVBhcnRpdGlvbk1ldGFkYXRhLlR5cGUSEgoKZXhwcmVzc2lvbhgDIAEoCRINCgV2YWx1ZRgEIAEoCRITCgt1c2VfZGVmYXVsdBgFIAEoCRI6Cg1zdWJwYXJ0aXRpb25zGAYgAygLMiMuYnl0ZWJhc2UudjEuVGFibGVQYXJ0aXRpb25NZXRhZGF0YRIrCgdpbmRleGVzGAcgAygLMhouYnl0ZWJhc2UudjEuSW5kZXhNZXRhZGF0YRI/ChFjaGVja19jb25zdHJhaW50cxgIIAMoCzIkLmJ5dGViYXNlLnYxLkNoZWNrQ29uc3RyYWludE1ldGFkYXRhIooBCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIJCgVSQU5HRRABEhEKDVJBTkdFX0NPTFVNTlMQAhIICgRMSVNUEAMSEAoMTElTVF9DT0xVTU5TEAQSCAoESEFTSBAFEg8KC0xJTkVBUl9IQVNIEAYSBwoDS0VZEAcSDgoKTElORUFSX0tFWRAIIp8ECg5Db2x1bW5NZXRhZGF0YRIMCgRuYW1lGAEgASgJEhAKCHBvc2l0aW9uGAIgASgFEhMKC2hhc19kZWZhdWx0GAMgASgIEg8KB2RlZmF1bHQYBCABKAkSFwoPZGVmYXVsdF9vbl9udWxsGAUgASgIEhEKCW9uX3VwZGF0ZRgGIAEoCRIQCghudWxsYWJsZRgHIAEoCBIMCgR0eXBlGAggASgJEhUKDWNoYXJhY3Rlcl9zZXQYCSABKAkSEQoJY29sbGF0aW9uGAogASgJEg8KB2NvbW1lbnQYCyABKAkSMwoKZ2VuZXJhdGlvbhgMIAEoCzIfLmJ5dGViYXNlLnYxLkdlbmVyYXRpb25NZXRhZGF0YRITCgtpc19pZGVudGl0eRgNIAEoCBJLChNpZGVudGl0eV9nZW5lcmF0aW9uGA4gASgOMi4uYnl0ZWJhc2UudjEuQ29sdW1uTWV0YWRhdGEuSWRlbnRpdHlHZW5lcmF0aW9uEhUKDWlkZW50aXR5X3NlZWQYDyABKAMSGgoSaWRlbnRpdHlfaW5jcmVtZW50GBAgASgDEh8KF2RlZmF1bHRfY29uc3RyYWludF9uYW1lGBEgASgJIlUKEklkZW50aXR5R2VuZXJhdGlvbhIjCh9JREVOVElUWV9HRU5FUkFUSU9OX1VOU1BFQ0lGSUVEEAASCgoGQUxXQVlTEAESDgoKQllfREVGQVVMVBACIpMBChJHZW5lcmF0aW9uTWV0YWRhdGESMgoEdHlwZRgBIAEoDjIkLmJ5dGViYXNlLnYxLkdlbmVyYXRpb25NZXRhZGF0YS5UeXBlEhIKCmV4cHJlc3Npb24YAiABKAkiNQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCwoHVklSVFVBTBABEgoKBlNUT1JFRBACIu0BCgxWaWV3TWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgpkZWZpbml0aW9uGAIgASgJEg8KB2NvbW1lbnQYAyABKAkSOQoSZGVwZW5kZW5jeV9jb2x1bW5zGAQgAygLMh0uYnl0ZWJhc2UudjEuRGVwZW5kZW5jeUNvbHVtbhIsCgdjb2x1bW5zGAUgAygLMhsuYnl0ZWJhc2UudjEuQ29sdW1uTWV0YWRhdGESLgoIdHJpZ2dlcnMYBiADKAsyHC5ieXRlYmFzZS52MS5UcmlnZ2VyTWV0YWRhdGESEQoJc2tpcF9kdW1wGAcgASgIIkEKEERlcGVuZGVuY3lDb2x1bW4SDgoGc2NoZW1hGAEgASgJEg0KBXRhYmxlGAIgASgJEg4KBmNvbHVtbhgDIAEoCSL4AQoYTWF0ZXJpYWxpemVkVmlld01ldGFkYXRhEgwKBG5hbWUYASABKAkSEgoKZGVmaW5pdGlvbhgCIAEoCRIPCgdjb21tZW50GAMgASgJEjkKEmRlcGVuZGVuY3lfY29sdW1ucxgEIAMoCzIdLmJ5dGViYXNlLnYxLkRlcGVuZGVuY3lDb2x1bW4SLgoIdHJpZ2dlcnMYBSADKAsyHC5ieXRlYmFzZS52MS5UcmlnZ2VyTWV0YWRhdGESKwoHaW5kZXhlcxgGIAMoCzIaLmJ5dGViYXNlLnYxLkluZGV4TWV0YWRhdGESEQoJc2tpcF9kdW1wGAcgASgIIjAKD0RlcGVuZGVuY3lUYWJsZRIOCgZzY2hlbWEYASABKAkSDQoFdGFibGUYAiABKAkijgIKEEZ1bmN0aW9uTWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgpkZWZpbml0aW9uGAIgASgJEhEKCXNpZ25hdHVyZRgDIAEoCRIcChRjaGFyYWN0ZXJfc2V0X2NsaWVudBgEIAEoCRIcChRjb2xsYXRpb25fY29ubmVjdGlvbhgFIAEoCRIaChJkYXRhYmFzZV9jb2xsYXRpb24YBiABKAkSEAoIc3FsX21vZGUYByABKAkSDwoHY29tbWVudBgIIAEoCRI3ChFkZXBlbmRlbmN5X3RhYmxlcxgJIAMoCzIcLmJ5dGViYXNlLnYxLkRlcGVuZGVuY3lUYWJsZRIRCglza2lwX2R1bXAYCiABKAgi1gEKEVByb2NlZHVyZU1ldGFkYXRhEgwKBG5hbWUYASABKAkSEgoKZGVmaW5pdGlvbhgCIAEoCRIRCglzaWduYXR1cmUYAyABKAkSHAoUY2hhcmFjdGVyX3NldF9jbGllbnQYBCABKAkSHAoUY29sbGF0aW9uX2Nvbm5lY3Rpb24YBSABKAkSGgoSZGF0YWJhc2VfY29sbGF0aW9uGAYgASgJEhAKCHNxbF9tb2RlGAcgASgJEg8KB2NvbW1lbnQYCSABKAkSEQoJc2tpcF9kdW1wGAggASgIIjMKD1BhY2thZ2VNZXRhZGF0YRIMCgRuYW1lGAEgASgJEhIKCmRlZmluaXRpb24YAiABKAkilgIKDFRhc2tNZXRhZGF0YRIMCgRuYW1lGAEgASgJEgoKAmlkGAIgASgJEg0KBW93bmVyGAMgASgJEg8KB2NvbW1lbnQYBCABKAkSEQoJd2FyZWhvdXNlGAUgASgJEhAKCHNjaGVkdWxlGAYgASgJEhQKDHByZWRlY2Vzc29ycxgHIAMoCRIuCgVzdGF0ZRgIIAEoDjIfLmJ5dGViYXNlLnYxLlRhc2tNZXRhZGF0YS5TdGF0ZRIRCgljb25kaXRpb24YCSABKAkSEgoKZGVmaW5pdGlvbhgKIAEoCSI6CgVTdGF0ZRIVChFTVEFURV9VTlNQRUNJRklFRBAAEgsKB1NUQVJURUQQARINCglTVVNQRU5ERUQQAiLLAgoOU3RyZWFtTWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgp0YWJsZV9uYW1lGAIgASgJEg0KBW93bmVyGAMgASgJEg8KB2NvbW1lbnQYBCABKAkSLgoEdHlwZRgFIAEoDjIgLmJ5dGViYXNlLnYxLlN0cmVhbU1ldGFkYXRhLlR5cGUSDQoFc3RhbGUYBiABKAgSLgoEbW9kZRgHIAEoDjIgLmJ5dGViYXNlLnYxLlN0cmVhbU1ldGFkYXRhLk1vZGUSEgoKZGVmaW5pdGlvbhgIIAEoCSInCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIJCgVERUxUQRABIksKBE1vZGUSFAoQTU9ERV9VTlNQRUNJRklFRBAAEgsKB0RFRkFVTFQQARIPCgtBUFBFTkRfT05MWRACEg8KC0lOU0VSVF9PTkxZEAMivQEKElNwYXRpYWxJbmRleENvbmZpZxIOCgZtZXRob2QYASABKAkSNQoMdGVzc2VsbGF0aW9uGAIgASgLMh8uYnl0ZWJhc2UudjEuVGVzc2VsbGF0aW9uQ29uZmlnEisKB3N0b3JhZ2UYAyABKAsyGi5ieXRlYmFzZS52MS5TdG9yYWdlQ29uZmlnEjMKC2RpbWVuc2lvbmFsGAQgASgLMh4uYnl0ZWJhc2UudjEuRGltZW5zaW9uYWxDb25maWcimwEKElRlc3NlbGxhdGlvbkNvbmZpZxIOCgZzY2hlbWUYASABKAkSKwoLZ3JpZF9sZXZlbHMYAiADKAsyFi5ieXRlYmFzZS52MS5HcmlkTGV2ZWwSGAoQY2VsbHNfcGVyX29iamVjdBgDIAEoBRIuCgxib3VuZGluZ19ib3gYBCABKAsyGC5ieXRlYmFzZS52MS5Cb3VuZGluZ0JveCIrCglHcmlkTGV2ZWwSDQoFbGV2ZWwYASABKAUSDwoHZGVuc2l0eRgCIAEoCSJFCgtCb3VuZGluZ0JveBIMCgR4bWluGAEgASgBEgwKBHltaW4YAiABKAESDAoEeG1heBgDIAEoARIMCgR5bWF4GAQgASgBIr4CCg1TdG9yYWdlQ29uZmlnEhIKCmZpbGxmYWN0b3IYASABKAUSEQoJYnVmZmVyaW5nGAIgASgJEhIKCnRhYmxlc3BhY2UYAyABKAkSFwoPd29ya190YWJsZXNwYWNlGAQgASgJEhEKCXNkb19sZXZlbBgFIAEoBRIXCg9jb21taXRfaW50ZXJ2YWwYBiABKAUSEQoJcGFkX2luZGV4GAcgASgIEhYKDnNvcnRfaW5fdGVtcGRiGAggASgJEhUKDWRyb3BfZXhpc3RpbmcYCSABKAgSDgoGb25saW5lGAogASgIEhcKD2FsbG93X3Jvd19sb2NrcxgLIAEoCBIYChBhbGxvd19wYWdlX2xvY2tzGAwgASgIEg4KBm1heGRvcBgNIAEoBRIYChBkYXRhX2NvbXByZXNzaW9uGA4gASgJIn8KEURpbWVuc2lvbmFsQ29uZmlnEhIKCmRpbWVuc2lvbnMYASABKAUSEQoJZGF0YV90eXBlGAIgASgJEgwKBHNyaWQYAyABKAUSNQoLY29uc3RyYWludHMYBCADKAsyIC5ieXRlYmFzZS52MS5EaW1lbnNpb25Db25zdHJhaW50ImEKE0RpbWVuc2lvbkNvbnN0cmFpbnQSEQoJZGltZW5zaW9uGAEgASgJEhEKCW1pbl92YWx1ZRgCIAEoARIRCgltYXhfdmFsdWUYAyABKAESEQoJdG9sZXJhbmNlGAQgASgBIo0DCg1JbmRleE1ldGFkYXRhEgwKBG5hbWUYASABKAkSEwoLZXhwcmVzc2lvbnMYAiADKAkSEgoKa2V5X2xlbmd0aBgDIAMoAxISCgpkZXNjZW5kaW5nGAQgAygIEgwKBHR5cGUYBSABKAkSDgoGdW5pcXVlGAYgASgIEg8KB3ByaW1hcnkYByABKAgSDwoHdmlzaWJsZRgIIAEoCBIPCgdjb21tZW50GAkgASgJEhIKCmRlZmluaXRpb24YCiABKAkSGwoTcGFyZW50X2luZGV4X3NjaGVtYRgLIAEoCRIZChFwYXJlbnRfaW5kZXhfbmFtZRgMIAEoCRITCgtncmFudWxhcml0eRgNIAEoAxIVCg1pc19jb25zdHJhaW50GA4gASgIEjcKDnNwYXRpYWxfY29uZmlnGA8gASgLMh8uYnl0ZWJhc2UudjEuU3BhdGlhbEluZGV4Q29uZmlnEhUKDW9wY2xhc3NfbmFtZXMYECADKAkSGAoQb3BjbGFzc19kZWZhdWx0cxgRIAMoCCJXChFFeHRlbnNpb25NZXRhZGF0YRIMCgRuYW1lGAEgASgJEg4KBnNjaGVtYRgCIAEoCRIPCgd2ZXJzaW9uGAMgASgJEhMKC2Rlc2NyaXB0aW9uGAQgASgJIr4BChJGb3JlaWduS2V5TWV0YWRhdGESDAoEbmFtZRgBIAEoCRIPCgdjb2x1bW5zGAIgAygJEhkKEXJlZmVyZW5jZWRfc2NoZW1hGAMgASgJEhgKEHJlZmVyZW5jZWRfdGFibGUYBCABKAkSGgoScmVmZXJlbmNlZF9jb2x1bW5zGAUgAygJEhEKCW9uX2RlbGV0ZRgGIAEoCRIRCglvbl91cGRhdGUYByABKAkSEgoKbWF0Y2hfdHlwZRgIIAEoCSIgCg5EYXRhYmFzZVNjaGVtYRIOCgZzY2hlbWEYASABKAkiPgoRRGF0YWJhc2VTRExTY2hlbWESDgoGc2NoZW1hGAEgASgMEhkKDGNvbnRlbnRfdHlwZRgCIAEoCUID4EEDIqcBChVMaXN0Q2hhbmdlbG9nc1JlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIoCgR2aWV3GAQgASgOMhouYnl0ZWJhc2UudjEuQ2hhbmdlbG9nVmlldxIOCgZmaWx0ZXIYBSABKAkiXQoWTGlzdENoYW5nZWxvZ3NSZXNwb25zZRIqCgpjaGFuZ2Vsb2dzGAEgAygLMhYuYnl0ZWJhc2UudjEuQ2hhbmdlbG9nEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJ1ChNHZXRDaGFuZ2Vsb2dSZXF1ZXN0EjQKBG5hbWUYASABKAlCJuBBAvpBIAoeYnl0ZWJhc2UuY29tL0RhdGFiYXNlQ2hhbmdlbG9nEigKBHZpZXcYAiABKA4yGi5ieXRlYmFzZS52MS5DaGFuZ2Vsb2dWaWV3It8ECglDaGFuZ2Vsb2cSDAoEbmFtZRgBIAEoCRIvCgtjcmVhdGVfdGltZRgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLQoGc3RhdHVzGAMgASgOMh0uYnl0ZWJhc2UudjEuQ2hhbmdlbG9nLlN0YXR1cxIRCglzdGF0ZW1lbnQYBCABKAkSFgoOc3RhdGVtZW50X3NpemUYBSABKAMSFwoPc3RhdGVtZW50X3NoZWV0GAYgASgJEg4KBnNjaGVtYRgHIAEoCRITCgtzY2hlbWFfc2l6ZRgIIAEoAxITCgtwcmV2X3NjaGVtYRgJIAEoCRIYChBwcmV2X3NjaGVtYV9zaXplGAogASgDEhAKCHRhc2tfcnVuGAsgASgJEg8KB3ZlcnNpb24YDCABKAkSEAoIcmV2aXNpb24YDSABKAkSKQoEdHlwZRgOIAEoDjIbLmJ5dGViYXNlLnYxLkNoYW5nZWxvZy5UeXBlIkMKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABILCgdQRU5ESU5HEAESCAoERE9ORRACEgoKBkZBSUxFRBADIkAKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEgwKCEJBU0VMSU5FEAESCwoHTUlHUkFURRACEgcKA1NETBADOmXqQWIKHmJ5dGViYXNlLmNvbS9EYXRhYmFzZUNoYW5nZWxvZxJAaW5zdGFuY2VzL3tpbnN0YW5jZX0vZGF0YWJhc2VzL3tkYXRhYmFzZX0vY2hhbmdlbG9ncy97Y2hhbmdlbG9nfSLxAgoWR2V0U2NoZW1hU3RyaW5nUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRI8CgR0eXBlGAIgASgOMi4uYnl0ZWJhc2UudjEuR2V0U2NoZW1hU3RyaW5nUmVxdWVzdC5PYmplY3RUeXBlEg4KBnNjaGVtYRgDIAEoCRIOCgZvYmplY3QYBCABKAkSLwoIbWV0YWRhdGEYBSABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhIpoBCgpPYmplY3RUeXBlEhsKF09CSkVDVF9UWVBFX1VOU1BFQ0lGSUVEEAASDAoIREFUQUJBU0UQARIKCgZTQ0hFTUEQAhIJCgVUQUJMRRADEggKBFZJRVcQBBIVChFNQVRFUklBTElaRURfVklFVxAFEgwKCEZVTkNUSU9OEAYSDQoJUFJPQ0VEVVJFEAcSDAoIU0VRVUVOQ0UQCCIwChdHZXRTY2hlbWFTdHJpbmdSZXNwb25zZRIVCg1zY2hlbWFfc3RyaW5nGAEgASgJKmIKDUNoYW5nZWxvZ1ZpZXcSHgoaQ0hBTkdFTE9HX1ZJRVdfVU5TUEVDSUZJRUQQABIYChRDSEFOR0VMT0dfVklFV19CQVNJQxABEhcKE0NIQU5HRUxPR19WSUVXX0ZVTEwQAjLsFAoPRGF0YWJhc2VTZXJ2aWNlEpABCgtHZXREYXRhYmFzZRIfLmJ5dGViYXNlLnYxLkdldERhdGFiYXNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkRhdGFiYXNlIknaQQRuYW1liuowEGJiLmRhdGFiYXNlcy5nZXSQ6jABgtPkkwIkEiIvdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9Et0BChFCYXRjaEdldERhdGFiYXNlcxIlLmJ5dGViYXNlLnYxLkJhdGNoR2V0RGF0YWJhc2VzUmVxdWVzdBomLmJ5dGViYXNlLnYxLkJhdGNoR2V0RGF0YWJhc2VzUmVzcG9uc2UieYrqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAoLT5JMCW1otEisvdjEve3BhcmVudD1pbnN0YW5jZXMvKn0vZGF0YWJhc2VzOmJhdGNoR2V0EiovdjEve3BhcmVudD1wcm9qZWN0cy8qfS9kYXRhYmFzZXM6YmF0Y2hHZXQS6wEKDUxpc3REYXRhYmFzZXMSIS5ieXRlYmFzZS52MS5MaXN0RGF0YWJhc2VzUmVxdWVzdBoiLmJ5dGViYXNlLnYxLkxpc3REYXRhYmFzZXNSZXNwb25zZSKSAdpBAIrqMBFiYi5kYXRhYmFzZXMubGlzdJDqMAKC0+STAnBaJBIiL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyp9L2RhdGFiYXNlc1olEiMvdjEve3BhcmVudD13b3Jrc3BhY2VzLyp9L2RhdGFiYXNlcxIhL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vZGF0YWJhc2VzEsABCg5VcGRhdGVEYXRhYmFzZRIiLmJ5dGViYXNlLnYxLlVwZGF0ZURhdGFiYXNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkRhdGFiYXNlInPaQRRkYXRhYmFzZSx1cGRhdGVfbWFza4rqMBNiYi5kYXRhYmFzZXMudXBkYXRlkOowAZjqMAGC0+STAjc6CGRhdGFiYXNlMisvdjEve2RhdGFiYXNlLm5hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9EsUBChRCYXRjaFVwZGF0ZURhdGFiYXNlcxIoLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlRGF0YWJhc2VzUmVxdWVzdBopLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlRGF0YWJhc2VzUmVzcG9uc2UiWIrqMBNiYi5kYXRhYmFzZXMudXBkYXRlkOowAZjqMAGC0+STAjM6ASoiLi92MS97cGFyZW50PWluc3RhbmNlcy8qfS9kYXRhYmFzZXM6YmF0Y2hVcGRhdGUSoAEKDFN5bmNEYXRhYmFzZRIgLmJ5dGViYXNlLnYxLlN5bmNEYXRhYmFzZVJlcXVlc3QaIS5ieXRlYmFzZS52MS5TeW5jRGF0YWJhc2VSZXNwb25zZSJLiuowEWJiLmRhdGFiYXNlcy5zeW5jkOowAYLT5JMCLDoBKiInL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpzeW5jErcBChJCYXRjaFN5bmNEYXRhYmFzZXMSJi5ieXRlYmFzZS52MS5CYXRjaFN5bmNEYXRhYmFzZXNSZXF1ZXN0GicuYnl0ZWJhc2UudjEuQmF0Y2hTeW5jRGF0YWJhc2VzUmVzcG9uc2UiUIrqMBFiYi5kYXRhYmFzZXMuc3luY5DqMAGC0+STAjE6ASoiLC92MS97cGFyZW50PWluc3RhbmNlcy8qfS9kYXRhYmFzZXM6YmF0Y2hTeW5jErABChNHZXREYXRhYmFzZU1ldGFkYXRhEicuYnl0ZWJhc2UudjEuR2V0RGF0YWJhc2VNZXRhZGF0YVJlcXVlc3QaHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhIlGK6jAWYmIuZGF0YWJhc2VzLmdldFNjaGVtYZDqMAGC0+STAi0SKy92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9tZXRhZGF0YX0SqAEKEUdldERhdGFiYXNlU2NoZW1hEiUuYnl0ZWJhc2UudjEuR2V0RGF0YWJhc2VTY2hlbWFSZXF1ZXN0GhsuYnl0ZWJhc2UudjEuRGF0YWJhc2VTY2hlbWEiT4rqMBZiYi5kYXRhYmFzZXMuZ2V0U2NoZW1hkOowAYLT5JMCKxIpL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3NjaGVtYX0StAEKFEdldERhdGFiYXNlU0RMU2NoZW1hEiguYnl0ZWJhc2UudjEuR2V0RGF0YWJhc2VTRExTY2hlbWFSZXF1ZXN0Gh4uYnl0ZWJhc2UudjEuRGF0YWJhc2VTRExTY2hlbWEiUorqMBZiYi5kYXRhYmFzZXMuZ2V0U2NoZW1hkOowAYLT5JMCLhIsL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3NkbFNjaGVtYX0S4QEKCkRpZmZTY2hlbWESHi5ieXRlYmFzZS52MS5EaWZmU2NoZW1hUmVxdWVzdBofLmJ5dGViYXNlLnYxLkRpZmZTY2hlbWFSZXNwb25zZSKRAYrqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAYLT5JMCczoBKlo/OgEqIjovdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovY2hhbmdlbG9ncy8qfTpkaWZmU2NoZW1hIi0vdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9OmRpZmZTY2hlbWEStQEKDkxpc3RDaGFuZ2Vsb2dzEiIuYnl0ZWJhc2UudjEuTGlzdENoYW5nZWxvZ3NSZXF1ZXN0GiMuYnl0ZWJhc2UudjEuTGlzdENoYW5nZWxvZ3NSZXNwb25zZSJa2kEGcGFyZW50iuowEmJiLmNoYW5nZWxvZ3MubGlzdJDqMAGC0+STAjESLy92MS97cGFyZW50PWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfS9jaGFuZ2Vsb2dzEqEBCgxHZXRDaGFuZ2Vsb2cSIC5ieXRlYmFzZS52MS5HZXRDaGFuZ2Vsb2dSZXF1ZXN0GhYuYnl0ZWJhc2UudjEuQ2hhbmdlbG9nIlfaQQRuYW1liuowEWJiLmNoYW5nZWxvZ3MuZ2V0kOowAYLT5JMCMRIvL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL2NoYW5nZWxvZ3MvKn0SugEKD0dldFNjaGVtYVN0cmluZxIjLmJ5dGViYXNlLnYxLkdldFNjaGVtYVN0cmluZ1JlcXVlc3QaJC5ieXRlYmFzZS52MS5HZXRTY2hlbWFTdHJpbmdSZXNwb25zZSJc2kEEbmFtZYrqMBZiYi5kYXRhYmFzZXMuZ2V0U2NoZW1hkOowAYLT5JMCMRIvL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3NjaGVtYVN0cmluZ31CqgEKD2NvbS5ieXRlYmFzZS52MUIURGF0YWJhc2VTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_instance_service]);+ fileDesc("Chl2MS9kYXRhYmFzZV9zZXJ2aWNlLnByb3RvEgtieXRlYmFzZS52MSJBChJHZXREYXRhYmFzZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2UidwoYQmF0Y2hHZXREYXRhYmFzZXNSZXF1ZXN0Ei0KBnBhcmVudBgBIAEoCUId4EEC+kEXEhVieXRlYmFzZS5jb20vRGF0YWJhc2USLAoFbmFtZXMYAiADKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlIkUKGUJhdGNoR2V0RGF0YWJhc2VzUmVzcG9uc2USKAoJZGF0YWJhc2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuRGF0YWJhc2UipAEKFExpc3REYXRhYmFzZXNSZXF1ZXN0Ei0KBnBhcmVudBgBIAEoCUId4EEC+kEXEhVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJcGFnZV9zaXplGAIgASgFEhIKCnBhZ2VfdG9rZW4YAyABKAkSDgoGZmlsdGVyGAQgASgJEhQKDHNob3dfZGVsZXRlZBgFIAEoCBIQCghvcmRlcl9ieRgGIAEoCSJaChVMaXN0RGF0YWJhc2VzUmVzcG9uc2USKAoJZGF0YWJhc2VzGAEgAygLMhUuYnl0ZWJhc2UudjEuRGF0YWJhc2USFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJIo0BChVVcGRhdGVEYXRhYmFzZVJlcXVlc3QSLAoIZGF0YWJhc2UYASABKAsyFS5ieXRlYmFzZS52MS5EYXRhYmFzZUID4EECEi8KC3VwZGF0ZV9tYXNrGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkZpZWxkTWFzaxIVCg1hbGxvd19taXNzaW5nGAMgASgIImgKG0JhdGNoVXBkYXRlRGF0YWJhc2VzUmVxdWVzdBIOCgZwYXJlbnQYASABKAkSOQoIcmVxdWVzdHMYAiADKAsyIi5ieXRlYmFzZS52MS5VcGRhdGVEYXRhYmFzZVJlcXVlc3RCA+BBAiJIChxCYXRjaFVwZGF0ZURhdGFiYXNlc1Jlc3BvbnNlEigKCWRhdGFiYXNlcxgBIAMoCzIVLmJ5dGViYXNlLnYxLkRhdGFiYXNlIlkKGUJhdGNoU3luY0RhdGFiYXNlc1JlcXVlc3QSDgoGcGFyZW50GAEgASgJEiwKBW5hbWVzGAIgAygJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZSIcChpCYXRjaFN5bmNEYXRhYmFzZXNSZXNwb25zZSJCChNTeW5jRGF0YWJhc2VSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlIhYKFFN5bmNEYXRhYmFzZVJlc3BvbnNlInAKGkdldERhdGFiYXNlTWV0YWRhdGFSZXF1ZXN0EjMKBG5hbWUYASABKAlCJeBBAvpBHwodYnl0ZWJhc2UuY29tL0RhdGFiYXNlTWV0YWRhdGESDgoGZmlsdGVyGAIgASgJEg0KBWxpbWl0GAMgASgFIk0KGEdldERhdGFiYXNlU2NoZW1hUmVxdWVzdBIxCgRuYW1lGAEgASgJQiPgQQL6QR0KG2J5dGViYXNlLmNvbS9EYXRhYmFzZVNjaGVtYSLYAQobR2V0RGF0YWJhc2VTRExTY2hlbWFSZXF1ZXN0EisKBG5hbWUYASABKAlCHeBBAvpBFwoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEkIKBmZvcm1hdBgCIAEoDjIyLmJ5dGViYXNlLnYxLkdldERhdGFiYXNlU0RMU2NoZW1hUmVxdWVzdC5TRExGb3JtYXQiSAoJU0RMRm9ybWF0EhoKFlNETF9GT1JNQVRfVU5TUEVDSUZJRUQQABIPCgtTSU5HTEVfRklMRRABEg4KCk1VTFRJX0ZJTEUQAiJxChFEaWZmU2NoZW1hUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIQCgZzY2hlbWEYAiABKAlIABITCgljaGFuZ2Vsb2cYAyABKAlIAEIICgZ0YXJnZXQiIgoSRGlmZlNjaGVtYVJlc3BvbnNlEgwKBGRpZmYYASABKAkivAQKCERhdGFiYXNlEgwKBG5hbWUYASABKAkSJgoFc3RhdGUYAiABKA4yEi5ieXRlYmFzZS52MS5TdGF0ZUID4EEDEj0KFHN1Y2Nlc3NmdWxfc3luY190aW1lGAMgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEg8KB3Byb2plY3QYBCABKAkSGwoOc2NoZW1hX3ZlcnNpb24YBSABKAlCA+BBAxIdCgtlbnZpcm9ubWVudBgGIAEoCUID4EEBSACIAQESJwoVZWZmZWN0aXZlX2Vudmlyb25tZW50GAcgASgJQgPgQQNIAYgBARIxCgZsYWJlbHMYCCADKAsyIS5ieXRlYmFzZS52MS5EYXRhYmFzZS5MYWJlbHNFbnRyeRI9ChFpbnN0YW5jZV9yZXNvdXJjZRgJIAEoCzIdLmJ5dGViYXNlLnYxLkluc3RhbmNlUmVzb3VyY2VCA+BBAxIdChBiYWNrdXBfYXZhaWxhYmxlGAogASgIQgPgQQMSFAoHZHJpZnRlZBgLIAEoCEID4EEDGi0KC0xhYmVsc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAE6RepBQgoVYnl0ZWJhc2UuY29tL0RhdGFiYXNlEilpbnN0YW5jZXMve2luc3RhbmNlfS9kYXRhYmFzZXMve2RhdGFiYXNlfUIOCgxfZW52aXJvbm1lbnRCGAoWX2VmZmVjdGl2ZV9lbnZpcm9ubWVudCKoAgoQRGF0YWJhc2VNZXRhZGF0YRIMCgRuYW1lGAEgASgJEiwKB3NjaGVtYXMYAiADKAsyGy5ieXRlYmFzZS52MS5TY2hlbWFNZXRhZGF0YRIVCg1jaGFyYWN0ZXJfc2V0GAMgASgJEhEKCWNvbGxhdGlvbhgEIAEoCRIyCgpleHRlbnNpb25zGAUgAygLMh4uYnl0ZWJhc2UudjEuRXh0ZW5zaW9uTWV0YWRhdGESDQoFb3duZXIYBiABKAkSEwoLc2VhcmNoX3BhdGgYByABKAk6VupBUwodYnl0ZWJhc2UuY29tL0RhdGFiYXNlTWV0YWRhdGESMmluc3RhbmNlcy97aW5zdGFuY2V9L2RhdGFiYXNlcy97ZGF0YWJhc2V9L21ldGFkYXRhIqYFCg5TY2hlbWFNZXRhZGF0YRIMCgRuYW1lGAEgASgJEioKBnRhYmxlcxgCIAMoCzIaLmJ5dGViYXNlLnYxLlRhYmxlTWV0YWRhdGESOwoPZXh0ZXJuYWxfdGFibGVzGAMgAygLMiIuYnl0ZWJhc2UudjEuRXh0ZXJuYWxUYWJsZU1ldGFkYXRhEigKBXZpZXdzGAQgAygLMhkuYnl0ZWJhc2UudjEuVmlld01ldGFkYXRhEjAKCWZ1bmN0aW9ucxgFIAMoCzIdLmJ5dGViYXNlLnYxLkZ1bmN0aW9uTWV0YWRhdGESMgoKcHJvY2VkdXJlcxgGIAMoCzIeLmJ5dGViYXNlLnYxLlByb2NlZHVyZU1ldGFkYXRhEiwKB3N0cmVhbXMYByADKAsyGy5ieXRlYmFzZS52MS5TdHJlYW1NZXRhZGF0YRIoCgV0YXNrcxgIIAMoCzIZLmJ5dGViYXNlLnYxLlRhc2tNZXRhZGF0YRJBChJtYXRlcmlhbGl6ZWRfdmlld3MYCSADKAsyJS5ieXRlYmFzZS52MS5NYXRlcmlhbGl6ZWRWaWV3TWV0YWRhdGESLgoIcGFja2FnZXMYCiADKAsyHC5ieXRlYmFzZS52MS5QYWNrYWdlTWV0YWRhdGESDQoFb3duZXIYCyABKAkSMAoJc2VxdWVuY2VzGAwgAygLMh0uYnl0ZWJhc2UudjEuU2VxdWVuY2VNZXRhZGF0YRIqCgZldmVudHMYDSADKAsyGi5ieXRlYmFzZS52MS5FdmVudE1ldGFkYXRhEjEKCmVudW1fdHlwZXMYDiADKAsyHS5ieXRlYmFzZS52MS5FbnVtVHlwZU1ldGFkYXRhEhEKCXNraXBfZHVtcBgPIAEoCBIPCgdjb21tZW50GBAgASgJIlQKEEVudW1UeXBlTWV0YWRhdGESDAoEbmFtZRgBIAEoCRIOCgZ2YWx1ZXMYAiADKAkSDwoHY29tbWVudBgDIAEoCRIRCglza2lwX2R1bXAYBCABKAgiowEKDUV2ZW50TWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgpkZWZpbml0aW9uGAIgASgJEhEKCXRpbWVfem9uZRgDIAEoCRIQCghzcWxfbW9kZRgEIAEoCRIcChRjaGFyYWN0ZXJfc2V0X2NsaWVudBgFIAEoCRIcChRjb2xsYXRpb25fY29ubmVjdGlvbhgGIAEoCRIPCgdjb21tZW50GAcgASgJIoECChBTZXF1ZW5jZU1ldGFkYXRhEgwKBG5hbWUYASABKAkSEQoJZGF0YV90eXBlGAIgASgJEg0KBXN0YXJ0GAMgASgJEhEKCW1pbl92YWx1ZRgEIAEoCRIRCgltYXhfdmFsdWUYBSABKAkSEQoJaW5jcmVtZW50GAYgASgJEg0KBWN5Y2xlGAcgASgIEhIKCmNhY2hlX3NpemUYCCABKAkSEgoKbGFzdF92YWx1ZRgJIAEoCRITCgtvd25lcl90YWJsZRgKIAEoCRIUCgxvd25lcl9jb2x1bW4YCyABKAkSDwoHY29tbWVudBgMIAEoCRIRCglza2lwX2R1bXAYDSABKAgivgEKD1RyaWdnZXJNZXRhZGF0YRIMCgRuYW1lGAEgASgJEg0KBWV2ZW50GAIgASgJEg4KBnRpbWluZxgDIAEoCRIMCgRib2R5GAQgASgJEhAKCHNxbF9tb2RlGAUgASgJEhwKFGNoYXJhY3Rlcl9zZXRfY2xpZW50GAYgASgJEhwKFGNvbGxhdGlvbl9jb25uZWN0aW9uGAcgASgJEg8KB2NvbW1lbnQYCCABKAkSEQoJc2tpcF9kdW1wGAkgASgIIpEBChVFeHRlcm5hbFRhYmxlTWV0YWRhdGESDAoEbmFtZRgBIAEoCRIcChRleHRlcm5hbF9zZXJ2ZXJfbmFtZRgCIAEoCRIeChZleHRlcm5hbF9kYXRhYmFzZV9uYW1lGAMgASgJEiwKB2NvbHVtbnMYBCADKAsyGy5ieXRlYmFzZS52MS5Db2x1bW5NZXRhZGF0YSLsBAoNVGFibGVNZXRhZGF0YRIMCgRuYW1lGAEgASgJEiwKB2NvbHVtbnMYAiADKAsyGy5ieXRlYmFzZS52MS5Db2x1bW5NZXRhZGF0YRIrCgdpbmRleGVzGAMgAygLMhouYnl0ZWJhc2UudjEuSW5kZXhNZXRhZGF0YRIOCgZlbmdpbmUYBCABKAkSEQoJY29sbGF0aW9uGAUgASgJEg8KB2NoYXJzZXQYBiABKAkSEQoJcm93X2NvdW50GAcgASgDEhEKCWRhdGFfc2l6ZRgIIAEoAxISCgppbmRleF9zaXplGAkgASgDEhEKCWRhdGFfZnJlZRgKIAEoAxIWCg5jcmVhdGVfb3B0aW9ucxgLIAEoCRIPCgdjb21tZW50GAwgASgJEjUKDGZvcmVpZ25fa2V5cxgNIAMoCzIfLmJ5dGViYXNlLnYxLkZvcmVpZ25LZXlNZXRhZGF0YRI3CgpwYXJ0aXRpb25zGA4gAygLMiMuYnl0ZWJhc2UudjEuVGFibGVQYXJ0aXRpb25NZXRhZGF0YRI/ChFjaGVja19jb25zdHJhaW50cxgPIAMoCzIkLmJ5dGViYXNlLnYxLkNoZWNrQ29uc3RyYWludE1ldGFkYXRhEg0KBW93bmVyGBAgASgJEhQKDHNvcnRpbmdfa2V5cxgRIAMoCRIuCgh0cmlnZ2VycxgSIAMoCzIcLmJ5dGViYXNlLnYxLlRyaWdnZXJNZXRhZGF0YRIRCglza2lwX2R1bXAYEyABKAgSFQoNc2hhcmRpbmdfaW5mbxgUIAEoCRIYChBwcmltYXJ5X2tleV90eXBlGBUgASgJIjsKF0NoZWNrQ29uc3RyYWludE1ldGFkYXRhEgwKBG5hbWUYASABKAkSEgoKZXhwcmVzc2lvbhgCIAEoCSLNAwoWVGFibGVQYXJ0aXRpb25NZXRhZGF0YRIMCgRuYW1lGAEgASgJEjYKBHR5cGUYAiABKA4yKC5ieXRlYmFzZS52MS5UYWJsZVBhcnRpdGlvbk1ldGFkYXRhLlR5cGUSEgoKZXhwcmVzc2lvbhgDIAEoCRINCgV2YWx1ZRgEIAEoCRITCgt1c2VfZGVmYXVsdBgFIAEoCRI6Cg1zdWJwYXJ0aXRpb25zGAYgAygLMiMuYnl0ZWJhc2UudjEuVGFibGVQYXJ0aXRpb25NZXRhZGF0YRIrCgdpbmRleGVzGAcgAygLMhouYnl0ZWJhc2UudjEuSW5kZXhNZXRhZGF0YRI/ChFjaGVja19jb25zdHJhaW50cxgIIAMoCzIkLmJ5dGViYXNlLnYxLkNoZWNrQ29uc3RyYWludE1ldGFkYXRhIooBCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIJCgVSQU5HRRABEhEKDVJBTkdFX0NPTFVNTlMQAhIICgRMSVNUEAMSEAoMTElTVF9DT0xVTU5TEAQSCAoESEFTSBAFEg8KC0xJTkVBUl9IQVNIEAYSBwoDS0VZEAcSDgoKTElORUFSX0tFWRAIIp8ECg5Db2x1bW5NZXRhZGF0YRIMCgRuYW1lGAEgASgJEhAKCHBvc2l0aW9uGAIgASgFEhMKC2hhc19kZWZhdWx0GAMgASgIEg8KB2RlZmF1bHQYBCABKAkSFwoPZGVmYXVsdF9vbl9udWxsGAUgASgIEhEKCW9uX3VwZGF0ZRgGIAEoCRIQCghudWxsYWJsZRgHIAEoCBIMCgR0eXBlGAggASgJEhUKDWNoYXJhY3Rlcl9zZXQYCSABKAkSEQoJY29sbGF0aW9uGAogASgJEg8KB2NvbW1lbnQYCyABKAkSMwoKZ2VuZXJhdGlvbhgMIAEoCzIfLmJ5dGViYXNlLnYxLkdlbmVyYXRpb25NZXRhZGF0YRITCgtpc19pZGVudGl0eRgNIAEoCBJLChNpZGVudGl0eV9nZW5lcmF0aW9uGA4gASgOMi4uYnl0ZWJhc2UudjEuQ29sdW1uTWV0YWRhdGEuSWRlbnRpdHlHZW5lcmF0aW9uEhUKDWlkZW50aXR5X3NlZWQYDyABKAMSGgoSaWRlbnRpdHlfaW5jcmVtZW50GBAgASgDEh8KF2RlZmF1bHRfY29uc3RyYWludF9uYW1lGBEgASgJIlUKEklkZW50aXR5R2VuZXJhdGlvbhIjCh9JREVOVElUWV9HRU5FUkFUSU9OX1VOU1BFQ0lGSUVEEAASCgoGQUxXQVlTEAESDgoKQllfREVGQVVMVBACIpMBChJHZW5lcmF0aW9uTWV0YWRhdGESMgoEdHlwZRgBIAEoDjIkLmJ5dGViYXNlLnYxLkdlbmVyYXRpb25NZXRhZGF0YS5UeXBlEhIKCmV4cHJlc3Npb24YAiABKAkiNQoEVHlwZRIUChBUWVBFX1VOU1BFQ0lGSUVEEAASCwoHVklSVFVBTBABEgoKBlNUT1JFRBACIu0BCgxWaWV3TWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgpkZWZpbml0aW9uGAIgASgJEg8KB2NvbW1lbnQYAyABKAkSOQoSZGVwZW5kZW5jeV9jb2x1bW5zGAQgAygLMh0uYnl0ZWJhc2UudjEuRGVwZW5kZW5jeUNvbHVtbhIsCgdjb2x1bW5zGAUgAygLMhsuYnl0ZWJhc2UudjEuQ29sdW1uTWV0YWRhdGESLgoIdHJpZ2dlcnMYBiADKAsyHC5ieXRlYmFzZS52MS5UcmlnZ2VyTWV0YWRhdGESEQoJc2tpcF9kdW1wGAcgASgIIkEKEERlcGVuZGVuY3lDb2x1bW4SDgoGc2NoZW1hGAEgASgJEg0KBXRhYmxlGAIgASgJEg4KBmNvbHVtbhgDIAEoCSL4AQoYTWF0ZXJpYWxpemVkVmlld01ldGFkYXRhEgwKBG5hbWUYASABKAkSEgoKZGVmaW5pdGlvbhgCIAEoCRIPCgdjb21tZW50GAMgASgJEjkKEmRlcGVuZGVuY3lfY29sdW1ucxgEIAMoCzIdLmJ5dGViYXNlLnYxLkRlcGVuZGVuY3lDb2x1bW4SLgoIdHJpZ2dlcnMYBSADKAsyHC5ieXRlYmFzZS52MS5UcmlnZ2VyTWV0YWRhdGESKwoHaW5kZXhlcxgGIAMoCzIaLmJ5dGViYXNlLnYxLkluZGV4TWV0YWRhdGESEQoJc2tpcF9kdW1wGAcgASgIIjAKD0RlcGVuZGVuY3lUYWJsZRIOCgZzY2hlbWEYASABKAkSDQoFdGFibGUYAiABKAkijgIKEEZ1bmN0aW9uTWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgpkZWZpbml0aW9uGAIgASgJEhEKCXNpZ25hdHVyZRgDIAEoCRIcChRjaGFyYWN0ZXJfc2V0X2NsaWVudBgEIAEoCRIcChRjb2xsYXRpb25fY29ubmVjdGlvbhgFIAEoCRIaChJkYXRhYmFzZV9jb2xsYXRpb24YBiABKAkSEAoIc3FsX21vZGUYByABKAkSDwoHY29tbWVudBgIIAEoCRI3ChFkZXBlbmRlbmN5X3RhYmxlcxgJIAMoCzIcLmJ5dGViYXNlLnYxLkRlcGVuZGVuY3lUYWJsZRIRCglza2lwX2R1bXAYCiABKAgi1gEKEVByb2NlZHVyZU1ldGFkYXRhEgwKBG5hbWUYASABKAkSEgoKZGVmaW5pdGlvbhgCIAEoCRIRCglzaWduYXR1cmUYAyABKAkSHAoUY2hhcmFjdGVyX3NldF9jbGllbnQYBCABKAkSHAoUY29sbGF0aW9uX2Nvbm5lY3Rpb24YBSABKAkSGgoSZGF0YWJhc2VfY29sbGF0aW9uGAYgASgJEhAKCHNxbF9tb2RlGAcgASgJEg8KB2NvbW1lbnQYCSABKAkSEQoJc2tpcF9kdW1wGAggASgIIjMKD1BhY2thZ2VNZXRhZGF0YRIMCgRuYW1lGAEgASgJEhIKCmRlZmluaXRpb24YAiABKAkilgIKDFRhc2tNZXRhZGF0YRIMCgRuYW1lGAEgASgJEgoKAmlkGAIgASgJEg0KBW93bmVyGAMgASgJEg8KB2NvbW1lbnQYBCABKAkSEQoJd2FyZWhvdXNlGAUgASgJEhAKCHNjaGVkdWxlGAYgASgJEhQKDHByZWRlY2Vzc29ycxgHIAMoCRIuCgVzdGF0ZRgIIAEoDjIfLmJ5dGViYXNlLnYxLlRhc2tNZXRhZGF0YS5TdGF0ZRIRCgljb25kaXRpb24YCSABKAkSEgoKZGVmaW5pdGlvbhgKIAEoCSI6CgVTdGF0ZRIVChFTVEFURV9VTlNQRUNJRklFRBAAEgsKB1NUQVJURUQQARINCglTVVNQRU5ERUQQAiLLAgoOU3RyZWFtTWV0YWRhdGESDAoEbmFtZRgBIAEoCRISCgp0YWJsZV9uYW1lGAIgASgJEg0KBW93bmVyGAMgASgJEg8KB2NvbW1lbnQYBCABKAkSLgoEdHlwZRgFIAEoDjIgLmJ5dGViYXNlLnYxLlN0cmVhbU1ldGFkYXRhLlR5cGUSDQoFc3RhbGUYBiABKAgSLgoEbW9kZRgHIAEoDjIgLmJ5dGViYXNlLnYxLlN0cmVhbU1ldGFkYXRhLk1vZGUSEgoKZGVmaW5pdGlvbhgIIAEoCSInCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIJCgVERUxUQRABIksKBE1vZGUSFAoQTU9ERV9VTlNQRUNJRklFRBAAEgsKB0RFRkFVTFQQARIPCgtBUFBFTkRfT05MWRACEg8KC0lOU0VSVF9PTkxZEAMivQEKElNwYXRpYWxJbmRleENvbmZpZxIOCgZtZXRob2QYASABKAkSNQoMdGVzc2VsbGF0aW9uGAIgASgLMh8uYnl0ZWJhc2UudjEuVGVzc2VsbGF0aW9uQ29uZmlnEisKB3N0b3JhZ2UYAyABKAsyGi5ieXRlYmFzZS52MS5TdG9yYWdlQ29uZmlnEjMKC2RpbWVuc2lvbmFsGAQgASgLMh4uYnl0ZWJhc2UudjEuRGltZW5zaW9uYWxDb25maWcimwEKElRlc3NlbGxhdGlvbkNvbmZpZxIOCgZzY2hlbWUYASABKAkSKwoLZ3JpZF9sZXZlbHMYAiADKAsyFi5ieXRlYmFzZS52MS5HcmlkTGV2ZWwSGAoQY2VsbHNfcGVyX29iamVjdBgDIAEoBRIuCgxib3VuZGluZ19ib3gYBCABKAsyGC5ieXRlYmFzZS52MS5Cb3VuZGluZ0JveCIrCglHcmlkTGV2ZWwSDQoFbGV2ZWwYASABKAUSDwoHZGVuc2l0eRgCIAEoCSJFCgtCb3VuZGluZ0JveBIMCgR4bWluGAEgASgBEgwKBHltaW4YAiABKAESDAoEeG1heBgDIAEoARIMCgR5bWF4GAQgASgBIr4CCg1TdG9yYWdlQ29uZmlnEhIKCmZpbGxmYWN0b3IYASABKAUSEQoJYnVmZmVyaW5nGAIgASgJEhIKCnRhYmxlc3BhY2UYAyABKAkSFwoPd29ya190YWJsZXNwYWNlGAQgASgJEhEKCXNkb19sZXZlbBgFIAEoBRIXCg9jb21taXRfaW50ZXJ2YWwYBiABKAUSEQoJcGFkX2luZGV4GAcgASgIEhYKDnNvcnRfaW5fdGVtcGRiGAggASgJEhUKDWRyb3BfZXhpc3RpbmcYCSABKAgSDgoGb25saW5lGAogASgIEhcKD2FsbG93X3Jvd19sb2NrcxgLIAEoCBIYChBhbGxvd19wYWdlX2xvY2tzGAwgASgIEg4KBm1heGRvcBgNIAEoBRIYChBkYXRhX2NvbXByZXNzaW9uGA4gASgJIn8KEURpbWVuc2lvbmFsQ29uZmlnEhIKCmRpbWVuc2lvbnMYASABKAUSEQoJZGF0YV90eXBlGAIgASgJEgwKBHNyaWQYAyABKAUSNQoLY29uc3RyYWludHMYBCADKAsyIC5ieXRlYmFzZS52MS5EaW1lbnNpb25Db25zdHJhaW50ImEKE0RpbWVuc2lvbkNvbnN0cmFpbnQSEQoJZGltZW5zaW9uGAEgASgJEhEKCW1pbl92YWx1ZRgCIAEoARIRCgltYXhfdmFsdWUYAyABKAESEQoJdG9sZXJhbmNlGAQgASgBIo0DCg1JbmRleE1ldGFkYXRhEgwKBG5hbWUYASABKAkSEwoLZXhwcmVzc2lvbnMYAiADKAkSEgoKa2V5X2xlbmd0aBgDIAMoAxISCgpkZXNjZW5kaW5nGAQgAygIEgwKBHR5cGUYBSABKAkSDgoGdW5pcXVlGAYgASgIEg8KB3ByaW1hcnkYByABKAgSDwoHdmlzaWJsZRgIIAEoCBIPCgdjb21tZW50GAkgASgJEhIKCmRlZmluaXRpb24YCiABKAkSGwoTcGFyZW50X2luZGV4X3NjaGVtYRgLIAEoCRIZChFwYXJlbnRfaW5kZXhfbmFtZRgMIAEoCRITCgtncmFudWxhcml0eRgNIAEoAxIVCg1pc19jb25zdHJhaW50GA4gASgIEjcKDnNwYXRpYWxfY29uZmlnGA8gASgLMh8uYnl0ZWJhc2UudjEuU3BhdGlhbEluZGV4Q29uZmlnEhUKDW9wY2xhc3NfbmFtZXMYECADKAkSGAoQb3BjbGFzc19kZWZhdWx0cxgRIAMoCCJXChFFeHRlbnNpb25NZXRhZGF0YRIMCgRuYW1lGAEgASgJEg4KBnNjaGVtYRgCIAEoCRIPCgd2ZXJzaW9uGAMgASgJEhMKC2Rlc2NyaXB0aW9uGAQgASgJIr4BChJGb3JlaWduS2V5TWV0YWRhdGESDAoEbmFtZRgBIAEoCRIPCgdjb2x1bW5zGAIgAygJEhkKEXJlZmVyZW5jZWRfc2NoZW1hGAMgASgJEhgKEHJlZmVyZW5jZWRfdGFibGUYBCABKAkSGgoScmVmZXJlbmNlZF9jb2x1bW5zGAUgAygJEhEKCW9uX2RlbGV0ZRgGIAEoCRIRCglvbl91cGRhdGUYByABKAkSEgoKbWF0Y2hfdHlwZRgIIAEoCSIgCg5EYXRhYmFzZVNjaGVtYRIOCgZzY2hlbWEYASABKAkiPgoRRGF0YWJhc2VTRExTY2hlbWESDgoGc2NoZW1hGAEgASgMEhkKDGNvbnRlbnRfdHlwZRgCIAEoCUID4EEDIqcBChVMaXN0Q2hhbmdlbG9nc1JlcXVlc3QSLQoGcGFyZW50GAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglwYWdlX3NpemUYAiABKAUSEgoKcGFnZV90b2tlbhgDIAEoCRIoCgR2aWV3GAQgASgOMhouYnl0ZWJhc2UudjEuQ2hhbmdlbG9nVmlldxIOCgZmaWx0ZXIYBSABKAkiXQoWTGlzdENoYW5nZWxvZ3NSZXNwb25zZRIqCgpjaGFuZ2Vsb2dzGAEgAygLMhYuYnl0ZWJhc2UudjEuQ2hhbmdlbG9nEhcKD25leHRfcGFnZV90b2tlbhgCIAEoCSJ1ChNHZXRDaGFuZ2Vsb2dSZXF1ZXN0EjQKBG5hbWUYASABKAlCJuBBAvpBIAoeYnl0ZWJhc2UuY29tL0RhdGFiYXNlQ2hhbmdlbG9nEigKBHZpZXcYAiABKA4yGi5ieXRlYmFzZS52MS5DaGFuZ2Vsb2dWaWV3It8ECglDaGFuZ2Vsb2cSDAoEbmFtZRgBIAEoCRIvCgtjcmVhdGVfdGltZRgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASLQoGc3RhdHVzGAMgASgOMh0uYnl0ZWJhc2UudjEuQ2hhbmdlbG9nLlN0YXR1cxIRCglzdGF0ZW1lbnQYBCABKAkSFgoOc3RhdGVtZW50X3NpemUYBSABKAMSFwoPc3RhdGVtZW50X3NoZWV0GAYgASgJEg4KBnNjaGVtYRgHIAEoCRITCgtzY2hlbWFfc2l6ZRgIIAEoAxITCgtwcmV2X3NjaGVtYRgJIAEoCRIYChBwcmV2X3NjaGVtYV9zaXplGAogASgDEhAKCHRhc2tfcnVuGAsgASgJEg8KB3ZlcnNpb24YDCABKAkSEAoIcmV2aXNpb24YDSABKAkSKQoEdHlwZRgOIAEoDjIbLmJ5dGViYXNlLnYxLkNoYW5nZWxvZy5UeXBlIkMKBlN0YXR1cxIWChJTVEFUVVNfVU5TUEVDSUZJRUQQABILCgdQRU5ESU5HEAESCAoERE9ORRACEgoKBkZBSUxFRBADIkAKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEgwKCEJBU0VMSU5FEAESCwoHTUlHUkFURRACEgcKA1NETBADOmXqQWIKHmJ5dGViYXNlLmNvbS9EYXRhYmFzZUNoYW5nZWxvZxJAaW5zdGFuY2VzL3tpbnN0YW5jZX0vZGF0YWJhc2VzL3tkYXRhYmFzZX0vY2hhbmdlbG9ncy97Y2hhbmdlbG9nfSLxAgoWR2V0U2NoZW1hU3RyaW5nUmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRI8CgR0eXBlGAIgASgOMi4uYnl0ZWJhc2UudjEuR2V0U2NoZW1hU3RyaW5nUmVxdWVzdC5PYmplY3RUeXBlEg4KBnNjaGVtYRgDIAEoCRIOCgZvYmplY3QYBCABKAkSLwoIbWV0YWRhdGEYBSABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhIpoBCgpPYmplY3RUeXBlEhsKF09CSkVDVF9UWVBFX1VOU1BFQ0lGSUVEEAASDAoIREFUQUJBU0UQARIKCgZTQ0hFTUEQAhIJCgVUQUJMRRADEggKBFZJRVcQBBIVChFNQVRFUklBTElaRURfVklFVxAFEgwKCEZVTkNUSU9OEAYSDQoJUFJPQ0VEVVJFEAcSDAoIU0VRVUVOQ0UQCCIwChdHZXRTY2hlbWFTdHJpbmdSZXNwb25zZRIVCg1zY2hlbWFfc3RyaW5nGAEgASgJKmIKDUNoYW5nZWxvZ1ZpZXcSHgoaQ0hBTkdFTE9HX1ZJRVdfVU5TUEVDSUZJRUQQABIYChRDSEFOR0VMT0dfVklFV19CQVNJQxABEhcKE0NIQU5HRUxPR19WSUVXX0ZVTEwQAjLsFAoPRGF0YWJhc2VTZXJ2aWNlEpABCgtHZXREYXRhYmFzZRIfLmJ5dGViYXNlLnYxLkdldERhdGFiYXNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkRhdGFiYXNlIknaQQRuYW1liuowEGJiLmRhdGFiYXNlcy5nZXSQ6jABgtPkkwIkEiIvdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9Et0BChFCYXRjaEdldERhdGFiYXNlcxIlLmJ5dGViYXNlLnYxLkJhdGNoR2V0RGF0YWJhc2VzUmVxdWVzdBomLmJ5dGViYXNlLnYxLkJhdGNoR2V0RGF0YWJhc2VzUmVzcG9uc2UieYrqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAoLT5JMCW1otEisvdjEve3BhcmVudD1pbnN0YW5jZXMvKn0vZGF0YWJhc2VzOmJhdGNoR2V0EiovdjEve3BhcmVudD1wcm9qZWN0cy8qfS9kYXRhYmFzZXM6YmF0Y2hHZXQS6wEKDUxpc3REYXRhYmFzZXMSIS5ieXRlYmFzZS52MS5MaXN0RGF0YWJhc2VzUmVxdWVzdBoiLmJ5dGViYXNlLnYxLkxpc3REYXRhYmFzZXNSZXNwb25zZSKSAdpBAIrqMBFiYi5kYXRhYmFzZXMubGlzdJDqMAKC0+STAnBaJBIiL3YxL3twYXJlbnQ9aW5zdGFuY2VzLyp9L2RhdGFiYXNlc1olEiMvdjEve3BhcmVudD13b3Jrc3BhY2VzLyp9L2RhdGFiYXNlcxIhL3YxL3twYXJlbnQ9cHJvamVjdHMvKn0vZGF0YWJhc2VzEsABCg5VcGRhdGVEYXRhYmFzZRIiLmJ5dGViYXNlLnYxLlVwZGF0ZURhdGFiYXNlUmVxdWVzdBoVLmJ5dGViYXNlLnYxLkRhdGFiYXNlInPaQRRkYXRhYmFzZSx1cGRhdGVfbWFza4rqMBNiYi5kYXRhYmFzZXMudXBkYXRlkOowAZjqMAGC0+STAjc6CGRhdGFiYXNlMisvdjEve2RhdGFiYXNlLm5hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9EsUBChRCYXRjaFVwZGF0ZURhdGFiYXNlcxIoLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlRGF0YWJhc2VzUmVxdWVzdBopLmJ5dGViYXNlLnYxLkJhdGNoVXBkYXRlRGF0YWJhc2VzUmVzcG9uc2UiWIrqMBNiYi5kYXRhYmFzZXMudXBkYXRlkOowAZjqMAGC0+STAjM6ASoiLi92MS97cGFyZW50PWluc3RhbmNlcy8qfS9kYXRhYmFzZXM6YmF0Y2hVcGRhdGUSoAEKDFN5bmNEYXRhYmFzZRIgLmJ5dGViYXNlLnYxLlN5bmNEYXRhYmFzZVJlcXVlc3QaIS5ieXRlYmFzZS52MS5TeW5jRGF0YWJhc2VSZXNwb25zZSJLiuowEWJiLmRhdGFiYXNlcy5zeW5jkOowAYLT5JMCLDoBKiInL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpzeW5jErcBChJCYXRjaFN5bmNEYXRhYmFzZXMSJi5ieXRlYmFzZS52MS5CYXRjaFN5bmNEYXRhYmFzZXNSZXF1ZXN0GicuYnl0ZWJhc2UudjEuQmF0Y2hTeW5jRGF0YWJhc2VzUmVzcG9uc2UiUIrqMBFiYi5kYXRhYmFzZXMuc3luY5DqMAGC0+STAjE6ASoiLC92MS97cGFyZW50PWluc3RhbmNlcy8qfS9kYXRhYmFzZXM6YmF0Y2hTeW5jErABChNHZXREYXRhYmFzZU1ldGFkYXRhEicuYnl0ZWJhc2UudjEuR2V0RGF0YWJhc2VNZXRhZGF0YVJlcXVlc3QaHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhIlGK6jAWYmIuZGF0YWJhc2VzLmdldFNjaGVtYZDqMAGC0+STAi0SKy92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKi9tZXRhZGF0YX0SqAEKEUdldERhdGFiYXNlU2NoZW1hEiUuYnl0ZWJhc2UudjEuR2V0RGF0YWJhc2VTY2hlbWFSZXF1ZXN0GhsuYnl0ZWJhc2UudjEuRGF0YWJhc2VTY2hlbWEiT4rqMBZiYi5kYXRhYmFzZXMuZ2V0U2NoZW1hkOowAYLT5JMCKxIpL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3NjaGVtYX0StAEKFEdldERhdGFiYXNlU0RMU2NoZW1hEiguYnl0ZWJhc2UudjEuR2V0RGF0YWJhc2VTRExTY2hlbWFSZXF1ZXN0Gh4uYnl0ZWJhc2UudjEuRGF0YWJhc2VTRExTY2hlbWEiUorqMBZiYi5kYXRhYmFzZXMuZ2V0U2NoZW1hkOowAYLT5JMCLhIsL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3NkbFNjaGVtYX0S4QEKCkRpZmZTY2hlbWESHi5ieXRlYmFzZS52MS5EaWZmU2NoZW1hUmVxdWVzdBofLmJ5dGViYXNlLnYxLkRpZmZTY2hlbWFSZXNwb25zZSKRAYrqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAYLT5JMCczoBKlo/OgEqIjovdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyovY2hhbmdlbG9ncy8qfTpkaWZmU2NoZW1hIi0vdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9OmRpZmZTY2hlbWEStQEKDkxpc3RDaGFuZ2Vsb2dzEiIuYnl0ZWJhc2UudjEuTGlzdENoYW5nZWxvZ3NSZXF1ZXN0GiMuYnl0ZWJhc2UudjEuTGlzdENoYW5nZWxvZ3NSZXNwb25zZSJa2kEGcGFyZW50iuowEmJiLmNoYW5nZWxvZ3MubGlzdJDqMAGC0+STAjESLy92MS97cGFyZW50PWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfS9jaGFuZ2Vsb2dzEqEBCgxHZXRDaGFuZ2Vsb2cSIC5ieXRlYmFzZS52MS5HZXRDaGFuZ2Vsb2dSZXF1ZXN0GhYuYnl0ZWJhc2UudjEuQ2hhbmdlbG9nIlfaQQRuYW1liuowEWJiLmNoYW5nZWxvZ3MuZ2V0kOowAYLT5JMCMRIvL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL2NoYW5nZWxvZ3MvKn0SugEKD0dldFNjaGVtYVN0cmluZxIjLmJ5dGViYXNlLnYxLkdldFNjaGVtYVN0cmluZ1JlcXVlc3QaJC5ieXRlYmFzZS52MS5HZXRTY2hlbWFTdHJpbmdSZXNwb25zZSJc2kEEbmFtZYrqMBZiYi5kYXRhYmFzZXMuZ2V0U2NoZW1hkOowAYLT5JMCMRIvL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qL3NjaGVtYVN0cmluZ31CqgEKD2NvbS5ieXRlYmFzZS52MUIURGF0YWJhc2VTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_client, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_field_mask, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_instance_service]);/*** Describes the message bytebase.v1.GetDatabaseRequest.diff --git a/frontend/src/views/SettingWorkspaceAuditLog.vue b/frontend/src/views/SettingWorkspaceAuditLog.vueindex f415ef09f2..9123ffbe40 100644--- a/frontend/src/views/SettingWorkspaceAuditLog.vue+++ b/frontend/src/views/SettingWorkspaceAuditLog.vue@@ -13,25 +13,17 @@:tooltip="disableExportTip":view-mode="'DROPDOWN'":disabled="!hasAuditLogFeature || !!disableExportTip"- @export="handleExport"+ @export="(params) => pagedAuditLogDataTableRef?.handleExport(params)"/></template></AuditLogSearch>- <PagedTable+ <PagedAuditLogDataTablev-if="hasAuditLogFeature"- ref="auditLogPagedTable"- session-key="bb.page-audit-log-table.settings-audit-log-v1-table"- :fetch-list="fetchAuditLog"- >- <template #table="{ list, loading }">- <AuditLogDataTable- key="audit-log-table"- :loading="loading"- :audit-log-list="list"- />- </template>- </PagedTable>+ ref="pagedAuditLogDataTableRef"+ :parent="parent"+ :filter="searchAuditLogs"+ /><NEmpty class="py-12 border rounded-sm" v-else /></div></template>@@ -39,22 +31,16 @@<script lang="ts" setup>import dayjs from "dayjs";import { NEmpty } from "naive-ui";-import { computed, reactive, ref, watch } from "vue";-import type { ComponentExposed } from "vue-component-type-helpers";+import { computed, reactive, ref } from "vue";import { useI18n } from "vue-i18n";-import AuditLogDataTable from "@/components/AuditLog/AuditLogDataTable.vue";import AuditLogSearch from "@/components/AuditLog/AuditLogSearch";-import { buildSearchAuditLogParams } from "@/components/AuditLog/AuditLogSearch/utils";-import type {- DownloadContent,- ExportOption,-} from "@/components/DataExportButton.vue";+import { buildAuditLogFilter } from "@/components/AuditLog/AuditLogSearch/utils";+import PagedAuditLogDataTable from "@/components/AuditLog/PagedAuditLogDataTable.vue";import DataExportButton from "@/components/DataExportButton.vue";import { FeatureAttention } from "@/components/FeatureGuard";-import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { featureToRef, useAuditLogStore } from "@/store";-import { type SearchAuditLogsParams } from "@/types";-import type { AuditLog } from "@/types/proto-es/v1/audit_log_service_pb";+import { featureToRef } from "@/store";+import { projectNamePrefix } from "@/store/modules/v1/common";+import { type AuditLogFilter } from "@/types";import { ExportFormat } from "@/types/proto-es/v1/common_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import { type SearchParams } from "@/utils";@@ -82,36 +68,15 @@ const state = reactive<LocalState>({params: defaultSearchParams(),});const { t } = useI18n();-const auditLogStore = useAuditLogStore();-const auditLogPagedTable = ref<ComponentExposed<typeof PagedTable<AuditLog>>>();const hasAuditLogFeature = featureToRef(PlanFeature.FEATURE_AUDIT_LOG);+const pagedAuditLogDataTableRef =+ ref<InstanceType<typeof PagedAuditLogDataTable>>();-const searchAuditLogs = computed((): SearchAuditLogsParams => {- return {- ...buildSearchAuditLogParams(state.params),- order: "desc",- };-});--const fetchAuditLog = async ({- pageToken,- pageSize,-}: {- pageToken: string;- pageSize: number;-}) => {- const { nextPageToken, auditLogs } = await auditLogStore.fetchAuditLogs({- ...searchAuditLogs.value,- pageToken,- pageSize,- });- return { nextPageToken, list: auditLogs };-};+const parent = computed(() => `${projectNamePrefix}-`);-watch(- () => JSON.stringify(searchAuditLogs.value),- () => auditLogPagedTable.value?.refresh()-);+const searchAuditLogs = computed((): AuditLogFilter => {+ return buildAuditLogFilter(state.params);+});const disableExportTip = computed(() => {if (@@ -129,38 +94,4 @@ const disableExportTip = computed(() => {}return "";});--const handleExport = async ({- options,- resolve,- reject,-}: {- options: ExportOption;- reject: (reason?: unknown) => void;- resolve: (content: DownloadContent[]) => void;-}) => {- let pageToken = "";- let i = 0;- const contents: DownloadContent[] = [];-- try {- while (i === 0 || pageToken !== "") {- i++;- const { content, nextPageToken } = await auditLogStore.exportAuditLogs({- search: searchAuditLogs.value,- format: options.format,- pageSize: 5000, // The maximum page size is 5000- pageToken,- });- pageToken = nextPageToken;- contents.push({- content,- filename: `audit-log.file${i}.${dayjs(new Date()).format("YYYY-MM-DDTHH-mm-ss")}.${ExportFormat[options.format].toLowerCase()}`,- });- }- resolve(contents);- } catch (err) {- reject(err);- }-};</script>diff --git a/frontend/src/views/project/ProjectAuditLogDashboard.vue b/frontend/src/views/project/ProjectAuditLogDashboard.vueindex 79e0743a90..e501fdc2da 100644--- a/frontend/src/views/project/ProjectAuditLogDashboard.vue+++ b/frontend/src/views/project/ProjectAuditLogDashboard.vue@@ -13,26 +13,17 @@:tooltip="disableExportTip":view-mode="'DROPDOWN'":disabled="!hasAuditLogFeature || !!disableExportTip"- @export="handleExport"+ @export="(params) => pagedAuditLogDataTableRef?.handleExport(params)"/></template></AuditLogSearch>- <PagedTable+ <PagedAuditLogDataTablev-if="hasAuditLogFeature"- ref="auditLogPagedTable"- :session-key="`bb.page-audit-log-table.settings-audit-log-v1-table.${projectId}`"- :fetch-list="fetchAuditLog"- >- <template #table="{ list, loading }">- <AuditLogDataTable- :key="`audit-log-table.${projectId}`"- :audit-log-list="list"- :show-project="false"- :loading="loading"- />- </template>- </PagedTable>+ ref="pagedAuditLogDataTableRef"+ :parent="projectName"+ :filter="searchAuditLogs"+ /><NEmpty class="py-12 border rounded-sm" v-else /></div></template>@@ -41,22 +32,15 @@import dayjs from "dayjs";import { NEmpty } from "naive-ui";import { computed, reactive, ref, watch } from "vue";-// https://github.com/vuejs/language-tools/issues/3206-import type { ComponentExposed } from "vue-component-type-helpers";import { useI18n } from "vue-i18n";-import AuditLogDataTable from "@/components/AuditLog/AuditLogDataTable.vue";import AuditLogSearch from "@/components/AuditLog/AuditLogSearch";-import { buildSearchAuditLogParams } from "@/components/AuditLog/AuditLogSearch/utils";-import type {- DownloadContent,- ExportOption,-} from "@/components/DataExportButton.vue";+import { buildAuditLogFilter } from "@/components/AuditLog/AuditLogSearch/utils";+import PagedAuditLogDataTable from "@/components/AuditLog/PagedAuditLogDataTable.vue";import DataExportButton from "@/components/DataExportButton.vue";import { FeatureAttention } from "@/components/FeatureGuard";-import PagedTable from "@/components/v2/Model/PagedTable.vue";-import { featureToRef, useAuditLogStore } from "@/store";-import { type SearchAuditLogsParams } from "@/types";-import type { AuditLog } from "@/types/proto-es/v1/audit_log_service_pb";+import { featureToRef } from "@/store";+import { projectNamePrefix } from "@/store/modules/v1/common";+import type { AuditLogFilter } from "@/types";import { ExportFormat } from "@/types/proto-es/v1/common_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import type { SearchParams, SearchScope } from "@/utils";@@ -73,6 +57,8 @@ const readonlyScopes = computed((): SearchScope[] => {return [{ id: "project", value: props.projectId, readonly: true }];});+const projectName = computed(() => `${projectNamePrefix}${props.projectId}`);+const defaultSearchParams = () => {const to = dayjs().endOf("day");const from = to.add(-30, "day");@@ -100,36 +86,13 @@ watch(const { t } = useI18n();const hasAuditLogFeature = featureToRef(PlanFeature.FEATURE_AUDIT_LOG);-const auditLogPagedTable = ref<ComponentExposed<typeof PagedTable<AuditLog>>>();-const auditLogStore = useAuditLogStore();+const pagedAuditLogDataTableRef =+ ref<InstanceType<typeof PagedAuditLogDataTable>>();-const searchAuditLogs = computed((): SearchAuditLogsParams => {- return {- ...buildSearchAuditLogParams(state.params),- order: "desc",- };+const searchAuditLogs = computed((): AuditLogFilter => {+ return buildAuditLogFilter(state.params);});-const fetchAuditLog = async ({- pageToken,- pageSize,-}: {- pageToken: string;- pageSize: number;-}) => {- const { nextPageToken, auditLogs } = await auditLogStore.fetchAuditLogs({- ...searchAuditLogs.value,- pageToken,- pageSize,- });- return { nextPageToken, list: auditLogs };-};--watch(- () => JSON.stringify(searchAuditLogs.value),- () => auditLogPagedTable.value?.refresh()-);-const disableExportTip = computed(() => {if (!searchAuditLogs.value.createdTsAfter ||@@ -146,38 +109,4 @@ const disableExportTip = computed(() => {}return "";});--const handleExport = async ({- options,- resolve,- reject,-}: {- options: ExportOption;- reject: (reason?: unknown) => void;- resolve: (content: DownloadContent[]) => void;-}) => {- let pageToken = "";- let i = 0;- const contents: DownloadContent[] = [];-- try {- while (i === 0 || pageToken !== "") {- i++;- const { content, nextPageToken } = await auditLogStore.exportAuditLogs({- search: searchAuditLogs.value,- format: options.format,- pageSize: 5000, // The maximum page size is 5000- pageToken,- });- pageToken = nextPageToken;- contents.push({- content,- filename: `audit-log.file${i}.${dayjs(new Date()).format("YYYY-MM-DDTHH-mm-ss")}.${ExportFormat[options.format].toLowerCase()}`,- });- }- resolve(contents);- } catch (err) {- reject(err);- }-};</script>diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex c293681364..d21763e1c0 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -1283,6 +1283,16 @@ paths:description: Show deleted database if specified.schema:type: boolean+ - name: orderBy+ in: query+ description: |-+ The order by of databases.+ Support name, project, instance+ For example:+ - order_by = "name desc"+ - order_by = "name desc, project asc"+ schema:+ type: stringresponses:"200":description: OK@@ -3846,6 +3856,16 @@ paths:description: Show deleted database if specified.schema:type: boolean+ - name: orderBy+ in: query+ description: |-+ The order by of databases.+ Support name, project, instance+ For example:+ - order_by = "name desc"+ - order_by = "name desc, project asc"+ schema:+ type: stringresponses:"200":description: OK@@ -7543,6 +7563,16 @@ paths:description: Show deleted database if specified.schema:type: boolean+ - name: orderBy+ in: query+ description: |-+ The order by of databases.+ Support name, project, instance+ For example:+ - order_by = "name desc"+ - order_by = "name desc, project asc"+ schema:+ type: stringresponses:"200":description: OKdiff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 3bf2d1013b..e9fccc42de 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -5192,6 +5192,7 @@ For example: environment == "environments/{environment resource id}" envYou can combine filter conditions like: environment == "environments/prod" && name.matches("employee") || 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 = "name desc" - order_by = "name desc, project asc" |diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 5666801f63..e879398f89 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -14573,6 +14573,17 @@ environment == "environments/prod" && name.matches("employee<td><p>Show deleted database if specified. </p></td></tr>+ <tr>+ <td>order_by</td>+ <td><a href="#string">string</a></td>+ <td></td>+ <td><p>The order by of databases.+Support name, project, instance+For example:+- order_by = "name desc"+- order_by = "name desc, project asc" </p></td>+ </tr>+</tbody></table>diff --git a/proto/v1/v1/database_service.proto b/proto/v1/v1/database_service.protoindex 5fa602126c..a5bdefbc69 100644--- a/proto/v1/v1/database_service.proto+++ b/proto/v1/v1/database_service.proto@@ -257,6 +257,13 @@ message ListDatabasesRequest {// Show deleted database if specified.bool show_deleted = 5;++ // The order by of databases.+ // Support name, project, instance+ // For example:+ // - order_by = "name desc"+ // - order_by = "name desc, project asc"+ string order_by = 6;}message ListDatabasesResponse {