diff --git a/AUTHORS b/AUTHORS index 45413df90..f592676d3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -8,8 +8,10 @@ dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Eugene Sysmanov Evgeny Sysmanov ImgBotApp +ismael FALL Lucas Germano Manfred Touron <94029+moul@users.noreply.github.com> Manfred Touron +Mikatech moul-bot Renovate Bot diff --git a/api/dvmodel.proto b/api/dvmodel.proto index 6fef273f3..186a5d17f 100644 --- a/api/dvmodel.proto +++ b/api/dvmodel.proto @@ -97,6 +97,7 @@ message Task { int32 num_comments = 18 [(gogoproto.moretags) = "quad:\"schema:numComments,optional\""]; int32 num_upvotes = 19 [(gogoproto.moretags) = "quad:\"schema:numUpvotes,optional\""]; int32 num_downvotes = 20 [(gogoproto.moretags) = "quad:\"schema:numDownvotes,optional\""]; + string estimated_duration = 21 [(gogoproto.moretags) = "quad:\"schema:estimated_duration,optional\""]; // relationships string has_author = 100 [(gogoproto.moretags) = "quad:\"hasAuthor,optional\"", (gogoproto.casttype) = "github.com/cayleygraph/quad.IRI"]; diff --git a/gen.sum b/gen.sum index ff2ad033f..c1007e04a 100644 --- a/gen.sum +++ b/gen.sum @@ -1,4 +1,4 @@ 0271e60d2d55746c2c410f3ea3bc86cfa427771c ./api/dvserver.proto -2d7cf12f3c53d2b5556de9d6156a3164a925d010 ./api/dvmodel.proto -9d67fc501482df629020cc3a7c57a1289024af53 Makefile -c63c3a8e378f732b40b981a46041fcc72981e6ea go.sum +88ad959456f1a62bde50639586e44e685d46c7c3 Makefile +9e80d3d5711a66b3b26fb5aef6d53f2a3e506d10 go.sum +fa7dc52caf24e8db45353353c77204803912bbd0 ./api/dvmodel.proto diff --git a/go.mod b/go.mod index 8eb37445c..70b33459c 100644 --- a/go.mod +++ b/go.mod @@ -24,6 +24,7 @@ require ( github.com/stretchr/testify v1.7.0 github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502 github.com/treastech/logger v0.0.0-20180705232552-e381e9ecf2e3 + github.com/xhit/go-str2duration/v2 v2.0.0 go.uber.org/zap v1.17.0 golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 golang.org/x/tools v0.1.7 diff --git a/go.sum b/go.sum index cde05b526..76d01862c 100644 --- a/go.sum +++ b/go.sum @@ -598,6 +598,8 @@ github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= +github.com/xhit/go-str2duration/v2 v2.0.0 h1:uFtk6FWB375bP7ewQl+/1wBcn840GPhnySOdcz/okPE= +github.com/xhit/go-str2duration/v2 v2.0.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= diff --git a/internal/dvmodel/dvmodel.pb.go b/internal/dvmodel/dvmodel.pb.go index f0a05c2da..3ba978b67 100644 --- a/internal/dvmodel/dvmodel.pb.go +++ b/internal/dvmodel/dvmodel.pb.go @@ -274,21 +274,22 @@ var xxx_messageInfo_Owner proto.InternalMessageInfo // It can be closed and can have due dates. // It's the entity used for Issues, Pull Requests, Merge Requests, Cards, Epics, Milestones, Stories. type Task struct { - ID github_com_cayleygraph_quad.IRI `protobuf:"bytes,1,opt,name=id,proto3,casttype=github.com/cayleygraph/quad.IRI" json:"id,omitempty" quad:"@id"` - CreatedAt *time.Time `protobuf:"bytes,3,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at,omitempty" quad:"schema:createdAt,optional"` - UpdatedAt *time.Time `protobuf:"bytes,4,opt,name=updated_at,json=updatedAt,proto3,stdtime" json:"updated_at,omitempty" quad:"schema:updatedAt,optional"` - LocalID string `protobuf:"bytes,5,opt,name=local_id,json=localId,proto3" json:"local_id,omitempty" quad:"schema:localId,optional"` - Kind Task_Kind `protobuf:"varint,10,opt,name=kind,proto3,enum=depviz.model.Task_Kind" json:"kind,omitempty" quad:"schema:kind,optional"` - Title string `protobuf:"bytes,11,opt,name=title,proto3" json:"title,omitempty" quad:"schema:title,optional"` - Description string `protobuf:"bytes,12,opt,name=description,proto3" json:"description,omitempty" quad:"schema:description,optional"` - Driver Driver `protobuf:"varint,13,opt,name=driver,proto3,enum=depviz.model.Driver" json:"driver,omitempty" quad:"schema:driver,optional"` - DueOn *time.Time `protobuf:"bytes,14,opt,name=due_on,json=dueOn,proto3,stdtime" json:"due_on,omitempty" quad:"schema:dueOn,optional"` - CompletedAt *time.Time `protobuf:"bytes,15,opt,name=completed_at,json=completedAt,proto3,stdtime" json:"completed_at,omitempty" quad:"schema:completedAt,optional"` - State Task_State `protobuf:"varint,16,opt,name=state,proto3,enum=depviz.model.Task_State" json:"state,omitempty" quad:"schema:state,optional"` - IsLocked bool `protobuf:"varint,17,opt,name=is_locked,json=isLocked,proto3" json:"is_locked,omitempty" quad:"schema:isLocked,optional"` - NumComments int32 `protobuf:"varint,18,opt,name=num_comments,json=numComments,proto3" json:"num_comments,omitempty" quad:"schema:numComments,optional"` - NumUpvotes int32 `protobuf:"varint,19,opt,name=num_upvotes,json=numUpvotes,proto3" json:"num_upvotes,omitempty" quad:"schema:numUpvotes,optional"` - NumDownvotes int32 `protobuf:"varint,20,opt,name=num_downvotes,json=numDownvotes,proto3" json:"num_downvotes,omitempty" quad:"schema:numDownvotes,optional"` + ID github_com_cayleygraph_quad.IRI `protobuf:"bytes,1,opt,name=id,proto3,casttype=github.com/cayleygraph/quad.IRI" json:"id,omitempty" quad:"@id"` + CreatedAt *time.Time `protobuf:"bytes,3,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at,omitempty" quad:"schema:createdAt,optional"` + UpdatedAt *time.Time `protobuf:"bytes,4,opt,name=updated_at,json=updatedAt,proto3,stdtime" json:"updated_at,omitempty" quad:"schema:updatedAt,optional"` + LocalID string `protobuf:"bytes,5,opt,name=local_id,json=localId,proto3" json:"local_id,omitempty" quad:"schema:localId,optional"` + Kind Task_Kind `protobuf:"varint,10,opt,name=kind,proto3,enum=depviz.model.Task_Kind" json:"kind,omitempty" quad:"schema:kind,optional"` + Title string `protobuf:"bytes,11,opt,name=title,proto3" json:"title,omitempty" quad:"schema:title,optional"` + Description string `protobuf:"bytes,12,opt,name=description,proto3" json:"description,omitempty" quad:"schema:description,optional"` + Driver Driver `protobuf:"varint,13,opt,name=driver,proto3,enum=depviz.model.Driver" json:"driver,omitempty" quad:"schema:driver,optional"` + DueOn *time.Time `protobuf:"bytes,14,opt,name=due_on,json=dueOn,proto3,stdtime" json:"due_on,omitempty" quad:"schema:dueOn,optional"` + CompletedAt *time.Time `protobuf:"bytes,15,opt,name=completed_at,json=completedAt,proto3,stdtime" json:"completed_at,omitempty" quad:"schema:completedAt,optional"` + State Task_State `protobuf:"varint,16,opt,name=state,proto3,enum=depviz.model.Task_State" json:"state,omitempty" quad:"schema:state,optional"` + IsLocked bool `protobuf:"varint,17,opt,name=is_locked,json=isLocked,proto3" json:"is_locked,omitempty" quad:"schema:isLocked,optional"` + NumComments int32 `protobuf:"varint,18,opt,name=num_comments,json=numComments,proto3" json:"num_comments,omitempty" quad:"schema:numComments,optional"` + NumUpvotes int32 `protobuf:"varint,19,opt,name=num_upvotes,json=numUpvotes,proto3" json:"num_upvotes,omitempty" quad:"schema:numUpvotes,optional"` + NumDownvotes int32 `protobuf:"varint,20,opt,name=num_downvotes,json=numDownvotes,proto3" json:"num_downvotes,omitempty" quad:"schema:numDownvotes,optional"` + EstimatedDuration string `protobuf:"bytes,21,opt,name=estimated_duration,json=estimatedDuration,proto3" json:"estimated_duration,omitempty" quad:"schema:estimated_duration,optional"` // relationships HasAuthor github_com_cayleygraph_quad.IRI `protobuf:"bytes,100,opt,name=has_author,json=hasAuthor,proto3,casttype=github.com/cayleygraph/quad.IRI" json:"has_author,omitempty" quad:"hasAuthor,optional"` HasOwner github_com_cayleygraph_quad.IRI `protobuf:"bytes,101,opt,name=has_owner,json=hasOwner,proto3,casttype=github.com/cayleygraph/quad.IRI" json:"has_owner,omitempty" quad:"hasOwner,optional"` @@ -449,99 +450,101 @@ func init() { proto.RegisterFile("dvmodel.proto", fileDescriptor_106647ce772da30 func init() { golang_proto.RegisterFile("dvmodel.proto", fileDescriptor_106647ce772da30c) } var fileDescriptor_106647ce772da30c = []byte{ - // 1468 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0xcd, 0x6e, 0xdb, 0xc6, - 0x16, 0x16, 0x65, 0x4b, 0xb1, 0x8e, 0xe4, 0x98, 0x99, 0xe4, 0xe2, 0xf2, 0xfa, 0xde, 0x2b, 0x2a, - 0x4a, 0xdb, 0x08, 0x6d, 0x22, 0xa1, 0x29, 0x90, 0x02, 0x01, 0x8a, 0xc4, 0xb2, 0x9b, 0x44, 0xa8, - 0x53, 0x1b, 0x8a, 0x8d, 0x02, 0x69, 0x0b, 0x61, 0x24, 0x8e, 0xc5, 0xa9, 0x48, 0x0e, 0xc3, 0x21, - 0x6d, 0x24, 0xaf, 0xd0, 0x4d, 0x1e, 0xa3, 0x4f, 0xd0, 0x75, 0x97, 0x5e, 0x74, 0x91, 0x65, 0x57, - 0x6c, 0x63, 0xbf, 0x81, 0x56, 0x45, 0x57, 0xc5, 0x0c, 0x49, 0x89, 0xb4, 0x95, 0x34, 0x0a, 0xdc, - 0x74, 0x93, 0x9d, 0x78, 0x7e, 0xbe, 0xef, 0xcc, 0x9c, 0x99, 0x8f, 0x87, 0x82, 0x65, 0x63, 0xdf, - 0x66, 0x06, 0xb1, 0x9a, 0xae, 0xc7, 0x7c, 0x86, 0x2a, 0x06, 0x71, 0xf7, 0xe9, 0xd3, 0xa6, 0xb4, - 0xad, 0xea, 0x43, 0xc6, 0x86, 0x16, 0x69, 0x49, 0x5f, 0x3f, 0xd8, 0x6b, 0xf9, 0xd4, 0x26, 0xdc, - 0xc7, 0xb6, 0x1b, 0x85, 0xaf, 0x5e, 0x1f, 0x52, 0xdf, 0x0c, 0xfa, 0xcd, 0x01, 0xb3, 0x5b, 0x43, - 0x36, 0x64, 0xd3, 0x48, 0xf1, 0x24, 0x1f, 0xe4, 0xaf, 0x28, 0xbc, 0xfe, 0x73, 0x09, 0x0a, 0x5b, - 0x07, 0x0e, 0xf1, 0xd0, 0x3d, 0xc8, 0x53, 0x43, 0x53, 0x6a, 0x4a, 0xa3, 0xd4, 0xfe, 0xf4, 0x28, - 0xd4, 0xf3, 0x9d, 0x8d, 0x71, 0xa8, 0xc3, 0xe3, 0x00, 0x1b, 0xb7, 0xea, 0x77, 0xa8, 0x51, 0xff, - 0x23, 0xd4, 0xf5, 0x14, 0xf8, 0x00, 0x3f, 0xb1, 0xc8, 0x93, 0xa1, 0x87, 0x5d, 0xb3, 0x25, 0x82, - 0x9a, 0x9d, 0x6e, 0xa7, 0x9b, 0xa7, 0x06, 0x1a, 0x02, 0x0c, 0x3c, 0x82, 0x7d, 0x62, 0xf4, 0xb0, - 0xaf, 0x2d, 0xd4, 0x94, 0x46, 0xf9, 0xc6, 0x6a, 0x33, 0xaa, 0xbb, 0x99, 0x54, 0xd3, 0xdc, 0x49, - 0xea, 0x6e, 0x5f, 0x3b, 0x0c, 0x75, 0x65, 0x1c, 0xea, 0xb5, 0x88, 0x8a, 0x0f, 0x4c, 0x62, 0xe3, - 0x5b, 0x31, 0xc4, 0x9a, 0x7f, 0x8d, 0xb9, 0x3e, 0x65, 0x0e, 0xb6, 0xea, 0xcf, 0x7e, 0xd5, 0x95, - 0x6e, 0x69, 0xe2, 0x10, 0x44, 0x81, 0x6b, 0x24, 0x44, 0x8b, 0x6f, 0x48, 0x14, 0x43, 0x9c, 0x26, - 0x9a, 0x38, 0xd0, 0x7d, 0x58, 0xb2, 0xd8, 0x00, 0x5b, 0x3d, 0x6a, 0x68, 0x05, 0xb9, 0x41, 0xd7, - 0x8f, 0x42, 0xfd, 0xdc, 0xa6, 0xb0, 0xc9, 0x5d, 0xaa, 0x66, 0x10, 0x65, 0x6c, 0xc7, 0x98, 0xe2, - 0x75, 0xcf, 0xc5, 0x26, 0xf4, 0x00, 0x16, 0x47, 0xd4, 0x31, 0x34, 0xa8, 0x29, 0x8d, 0xf3, 0x37, - 0xb4, 0x66, 0xba, 0xb7, 0x4d, 0xd9, 0x87, 0xe6, 0x17, 0xd4, 0x31, 0xda, 0xfa, 0x38, 0xd4, 0xff, - 0x9b, 0x01, 0x15, 0x69, 0x29, 0x44, 0x09, 0x83, 0xd6, 0x01, 0xb8, 0xc9, 0x3c, 0xbf, 0xe7, 0x60, - 0x9b, 0x68, 0x65, 0x59, 0xda, 0x7b, 0xa7, 0x56, 0x28, 0x43, 0xbe, 0xc4, 0x36, 0x49, 0xe5, 0x97, - 0x26, 0x46, 0x74, 0x07, 0x4a, 0x7b, 0x81, 0x65, 0x45, 0x18, 0x15, 0x89, 0x71, 0x65, 0x1c, 0xea, - 0x7a, 0x06, 0x43, 0x44, 0x9c, 0x80, 0x58, 0x4a, 0x6c, 0x68, 0x0b, 0x8a, 0x86, 0x47, 0xf7, 0x89, - 0xa7, 0x2d, 0xcb, 0x75, 0x5d, 0xca, 0xae, 0x6b, 0x43, 0xfa, 0xda, 0x97, 0xc7, 0xa1, 0xfe, 0xff, - 0x0c, 0x68, 0x94, 0x94, 0x82, 0x8c, 0x61, 0xd0, 0x6d, 0x58, 0x32, 0x99, 0x4d, 0x5c, 0x3c, 0x24, - 0xda, 0xf9, 0x97, 0x54, 0x94, 0x04, 0xa4, 0x2b, 0x4a, 0x6c, 0xe8, 0x3e, 0x94, 0x0d, 0xc2, 0x07, - 0x1e, 0x95, 0x3e, 0x6d, 0x45, 0x62, 0x7c, 0x30, 0x0e, 0xf5, 0x7a, 0xb6, 0x80, 0x69, 0x4c, 0x0a, - 0x26, 0x9d, 0x8a, 0xf6, 0xa0, 0xbc, 0xc7, 0xbc, 0x51, 0x8f, 0xfb, 0xd8, 0x0f, 0xb8, 0xa6, 0xca, - 0x05, 0x56, 0x67, 0x35, 0xee, 0x2e, 0xf3, 0x46, 0x0f, 0x65, 0x54, 0xfb, 0xfd, 0x71, 0xa8, 0x5f, - 0xce, 0xee, 0xdf, 0xc4, 0x99, 0x22, 0x82, 0xa9, 0x15, 0x6d, 0x03, 0xe0, 0x7d, 0xec, 0x63, 0xaf, - 0x17, 0x78, 0x96, 0x76, 0x41, 0x16, 0xfc, 0xf1, 0x51, 0xa8, 0x97, 0xd6, 0xa4, 0x75, 0xb7, 0xbb, - 0x79, 0xaa, 0xaf, 0x51, 0xfc, 0xae, 0x67, 0xa5, 0xfb, 0x3a, 0x31, 0xa2, 0x6f, 0xa0, 0x64, 0x62, - 0xde, 0x63, 0xa2, 0x38, 0xcd, 0x90, 0x80, 0xb7, 0xc7, 0xa1, 0xae, 0x45, 0x18, 0x26, 0xe6, 0xb2, - 0xec, 0x69, 0xee, 0xeb, 0xdc, 0xef, 0xa5, 0x24, 0xad, 0xbe, 0x0b, 0x8b, 0xe2, 0xa4, 0xa2, 0x15, - 0x28, 0xef, 0x3a, 0x23, 0x87, 0x1d, 0x38, 0xe2, 0x51, 0xcd, 0xa1, 0x25, 0x58, 0xdc, 0xe5, 0xc4, - 0x53, 0x15, 0xa4, 0x42, 0x65, 0xcb, 0x1b, 0x62, 0x87, 0x3e, 0xc5, 0x82, 0x42, 0xcd, 0x0b, 0xdf, - 0x0e, 0xc1, 0xb6, 0xba, 0x20, 0x7e, 0x75, 0x89, 0xcb, 0xd4, 0x45, 0x54, 0x81, 0xa5, 0x6d, 0x8f, - 0xed, 0x53, 0x83, 0x78, 0x6a, 0xa1, 0xfe, 0x19, 0xc0, 0x74, 0x1f, 0xd1, 0xbf, 0xe0, 0x42, 0x0c, - 0x3e, 0x35, 0xaa, 0x39, 0x04, 0x50, 0xec, 0x70, 0x61, 0x51, 0x15, 0x91, 0xde, 0xe1, 0x0f, 0x59, - 0xe0, 0x0d, 0x88, 0x9a, 0xaf, 0xff, 0x78, 0x11, 0x16, 0x77, 0x30, 0x1f, 0xbd, 0x53, 0xb3, 0xb7, - 0xa1, 0x66, 0x9b, 0x19, 0x35, 0xfb, 0x77, 0xf6, 0x52, 0x88, 0x36, 0xcc, 0x25, 0x66, 0x37, 0xa1, - 0xe0, 0x53, 0xdf, 0x4a, 0x74, 0xac, 0x36, 0x0e, 0xf5, 0xff, 0x65, 0xb2, 0xa4, 0x37, 0x95, 0x16, - 0x85, 0x9f, 0xbc, 0xeb, 0x95, 0x37, 0xbf, 0xeb, 0x67, 0xae, 0x63, 0x5f, 0x43, 0xd1, 0x08, 0x48, - 0x8f, 0x39, 0x52, 0xc5, 0x5e, 0xdd, 0xcf, 0x46, 0xdc, 0xcf, 0xec, 0x9a, 0x8d, 0x80, 0x6c, 0x39, - 0x27, 0x7a, 0x59, 0x90, 0x46, 0x64, 0x43, 0x65, 0xc0, 0x6c, 0xd7, 0x22, 0xf1, 0x91, 0x59, 0xf9, - 0x4b, 0x8a, 0x66, 0x4c, 0x91, 0xdd, 0x98, 0x09, 0xc8, 0xa9, 0x43, 0x53, 0x4e, 0xb9, 0xd0, 0x36, - 0x14, 0x84, 0x06, 0x92, 0x58, 0x02, 0xb5, 0x19, 0xdd, 0x16, 0x17, 0x94, 0xcc, 0x68, 0x9c, 0xcc, - 0x4b, 0x37, 0x4e, 0x1a, 0xd0, 0x06, 0x94, 0x28, 0xef, 0x59, 0x6c, 0x30, 0x22, 0x86, 0x54, 0xbc, - 0xa5, 0xf6, 0xd5, 0xb8, 0xc2, 0xac, 0xd4, 0x53, 0xbe, 0x29, 0x83, 0xd2, 0x52, 0x9f, 0xd8, 0x50, - 0x07, 0x2a, 0x4e, 0x60, 0xf7, 0x06, 0xcc, 0xb6, 0x89, 0xe3, 0x73, 0x0d, 0xd5, 0x94, 0x46, 0x61, - 0x46, 0xff, 0x9d, 0xc0, 0x5e, 0x8f, 0x63, 0xd2, 0xfd, 0x4f, 0x99, 0xd1, 0x5d, 0x10, 0x8f, 0xbd, - 0xc0, 0xdd, 0x67, 0x3e, 0xe1, 0xda, 0x45, 0x89, 0x74, 0x5a, 0xcb, 0x9d, 0xc0, 0xde, 0x8d, 0x42, - 0xd2, 0x5a, 0x3e, 0xb5, 0xa2, 0x4d, 0x58, 0x16, 0x38, 0x06, 0x3b, 0x70, 0x22, 0xa4, 0x4b, 0x12, - 0xe9, 0xea, 0x38, 0xd4, 0xaf, 0x9c, 0x44, 0xda, 0x48, 0x82, 0x52, 0x58, 0x95, 0xb4, 0x1d, 0xf5, - 0x00, 0x84, 0x8e, 0xe3, 0xc0, 0x37, 0x59, 0x22, 0xe4, 0x77, 0xc6, 0xa1, 0xfe, 0x9f, 0x89, 0x90, - 0xaf, 0x49, 0xd7, 0x7c, 0x4a, 0x5e, 0x9a, 0xe4, 0x65, 0x5f, 0x14, 0xe4, 0x8c, 0x5f, 0x14, 0xc8, - 0x84, 0x65, 0x81, 0x6e, 0x53, 0x8b, 0x70, 0x9f, 0x39, 0x44, 0xdb, 0x93, 0x0c, 0xeb, 0xd3, 0x53, - 0x62, 0x62, 0xfe, 0x20, 0xf1, 0xce, 0xc7, 0x52, 0x49, 0xa7, 0x22, 0x02, 0x15, 0xb9, 0x51, 0x9c, - 0xd3, 0xa1, 0x43, 0x88, 0x36, 0xac, 0x2d, 0x34, 0x4a, 0xed, 0xf6, 0x54, 0x7d, 0xc4, 0x92, 0x63, - 0xe7, 0x7c, 0x3c, 0xe5, 0x54, 0x66, 0x42, 0xe3, 0x91, 0x7d, 0x4a, 0x0e, 0x88, 0xa7, 0x99, 0x33, - 0x68, 0xba, 0xb1, 0x73, 0x7e, 0x9a, 0x24, 0x33, 0xe9, 0x8a, 0x85, 0xfb, 0xc4, 0xd2, 0xa8, 0xe4, - 0xc8, 0x76, 0x65, 0x53, 0x78, 0xe6, 0xef, 0x8a, 0x4c, 0x43, 0x16, 0xac, 0x50, 0xde, 0x33, 0x88, - 0x4b, 0x1c, 0x83, 0x3a, 0x43, 0x21, 0x51, 0xdf, 0x49, 0x8e, 0x8d, 0xa9, 0xba, 0x51, 0xbe, 0x91, - 0xf8, 0xd3, 0x1a, 0xf4, 0x3a, 0x44, 0xcb, 0x99, 0x5c, 0xd4, 0x87, 0x32, 0xe5, 0xbd, 0xbe, 0xb8, - 0xea, 0xd4, 0x19, 0x6a, 0x23, 0xc9, 0xb4, 0x36, 0x0e, 0xf5, 0xd5, 0x84, 0xa9, 0x1d, 0xfb, 0xe6, - 0xa3, 0x81, 0x69, 0x62, 0xbc, 0x22, 0x8f, 0x58, 0xf2, 0x15, 0x7a, 0x40, 0x7d, 0x53, 0xb3, 0x4e, - 0xaf, 0xa8, 0x1b, 0xf9, 0xbf, 0xa2, 0xbe, 0x39, 0xf7, 0x8a, 0x52, 0xb9, 0xe8, 0x5b, 0x00, 0xca, - 0x7b, 0x2e, 0xf6, 0xfc, 0x1e, 0xdb, 0xd3, 0xec, 0x93, 0xed, 0xa1, 0x7c, 0x1b, 0x7b, 0xfe, 0xd6, - 0xde, 0x9c, 0xed, 0x49, 0xd2, 0xd0, 0x23, 0x10, 0xad, 0x92, 0xf8, 0x9a, 0x73, 0x36, 0xe0, 0xe7, - 0x4c, 0x2c, 0xf3, 0xea, 0xfd, 0x97, 0x4d, 0x6e, 0x25, 0x28, 0x74, 0x38, 0x0f, 0x48, 0x34, 0xba, - 0x3d, 0x20, 0xde, 0x90, 0x74, 0xc9, 0xe3, 0x80, 0x70, 0x5f, 0xcd, 0xa3, 0x65, 0x28, 0x4d, 0x6e, - 0x5a, 0x34, 0xbf, 0x7d, 0xee, 0xd2, 0x81, 0xba, 0x28, 0xb2, 0x1e, 0xfa, 0xcc, 0x7b, 0xa2, 0x16, - 0x84, 0x71, 0x1d, 0x7b, 0x86, 0x5a, 0xac, 0xb7, 0x84, 0x51, 0x68, 0xbc, 0x0a, 0x95, 0x98, 0x44, - 0x3e, 0x47, 0xf3, 0xe1, 0x96, 0x4b, 0x1c, 0x55, 0x11, 0x63, 0xdc, 0xba, 0xc5, 0x38, 0x31, 0xd4, - 0x7c, 0xfd, 0xb0, 0x08, 0x85, 0x1d, 0xe6, 0xd2, 0xc1, 0xbb, 0xc9, 0xed, 0x1f, 0xff, 0x0e, 0x95, - 0x7d, 0x78, 0x2b, 0xa3, 0xdb, 0x74, 0xe0, 0xaa, 0x9c, 0xcd, 0xc0, 0x75, 0x13, 0x0a, 0x03, 0x66, - 0xb1, 0x68, 0x80, 0x9b, 0x55, 0x88, 0xf4, 0xa6, 0x0b, 0x91, 0x86, 0x93, 0x33, 0xe4, 0xf9, 0x37, - 0x9f, 0x21, 0xff, 0xde, 0xaf, 0xae, 0xfa, 0x2b, 0xee, 0xae, 0x14, 0x76, 0x55, 0xa9, 0x7f, 0xaf, - 0x40, 0xa1, 0x8d, 0xfd, 0x81, 0x89, 0x1a, 0x50, 0xf0, 0x31, 0x1f, 0x71, 0x4d, 0xa9, 0x2d, 0x34, - 0xca, 0x37, 0xd0, 0xe9, 0x91, 0xad, 0x1b, 0x05, 0xa0, 0x8f, 0xa0, 0x28, 0x2b, 0xe6, 0x5a, 0x5e, - 0x86, 0x5e, 0x9c, 0xf1, 0x81, 0xdb, 0x8d, 0x43, 0x44, 0xb0, 0x2f, 0x8e, 0x08, 0xd7, 0x16, 0x66, - 0x05, 0xcb, 0xe3, 0xd3, 0x8d, 0x43, 0x3e, 0xbc, 0x0a, 0xc5, 0xa8, 0x8d, 0xe8, 0x02, 0x2c, 0xc7, - 0x35, 0x47, 0x86, 0xe8, 0x43, 0xee, 0x1e, 0xf5, 0xef, 0x07, 0x7d, 0x55, 0x69, 0x77, 0x0e, 0x5f, - 0x54, 0x73, 0xbf, 0xbf, 0xa8, 0xe6, 0x7e, 0x38, 0xaa, 0xe6, 0x0e, 0x8f, 0xaa, 0xca, 0xf3, 0xa3, - 0xaa, 0xf2, 0xdb, 0x51, 0x55, 0x79, 0x76, 0x5c, 0xcd, 0xfd, 0x74, 0x5c, 0x55, 0x9e, 0x1f, 0x57, - 0x73, 0xbf, 0x1c, 0x57, 0x73, 0x8f, 0x74, 0x9b, 0x05, 0x56, 0x93, 0xb2, 0x56, 0x44, 0xdb, 0xa2, - 0x8e, 0x4f, 0x3c, 0x07, 0x5b, 0xad, 0xf8, 0x8f, 0xb3, 0x7e, 0x51, 0x5e, 0xba, 0x4f, 0xfe, 0x0c, - 0x00, 0x00, 0xff, 0xff, 0x37, 0xbc, 0x21, 0x80, 0x4a, 0x13, 0x00, 0x00, + // 1503 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x41, 0x6f, 0xdb, 0x46, + 0x16, 0x16, 0x65, 0x4b, 0xb1, 0x9e, 0xe4, 0x98, 0x9e, 0x24, 0x58, 0xae, 0x77, 0x57, 0x54, 0x94, + 0xdd, 0x8d, 0xda, 0x26, 0x12, 0x9a, 0x02, 0x29, 0x10, 0xa0, 0x48, 0x2c, 0xbb, 0x49, 0x84, 0x3a, + 0xb5, 0xa1, 0xd8, 0x28, 0x90, 0xa6, 0x10, 0x46, 0xe2, 0x58, 0x9a, 0x8a, 0xe4, 0x30, 0x1c, 0xd2, + 0x46, 0xf2, 0x17, 0x7a, 0xc9, 0xa1, 0x3f, 0xa2, 0x3f, 0xa3, 0x47, 0x1f, 0x7a, 0xc8, 0xb1, 0x27, + 0xb6, 0xb1, 0xff, 0x81, 0x4e, 0x45, 0x4f, 0xc5, 0x0c, 0x49, 0x89, 0xb4, 0x94, 0x34, 0x0a, 0xdc, + 0xf4, 0x92, 0x9b, 0xf8, 0xde, 0xf7, 0xbe, 0xef, 0x0d, 0xdf, 0xcc, 0x9b, 0x47, 0xc1, 0xb2, 0x71, + 0x60, 0x31, 0x83, 0x98, 0x75, 0xc7, 0x65, 0x1e, 0x43, 0x25, 0x83, 0x38, 0x07, 0xf4, 0x59, 0x5d, + 0xda, 0xd6, 0xf4, 0x3e, 0x63, 0x7d, 0x93, 0x34, 0xa4, 0xaf, 0xeb, 0xef, 0x37, 0x3c, 0x6a, 0x11, + 0xee, 0x61, 0xcb, 0x09, 0xe1, 0x6b, 0xd7, 0xfb, 0xd4, 0x1b, 0xf8, 0xdd, 0x7a, 0x8f, 0x59, 0x8d, + 0x3e, 0xeb, 0xb3, 0x09, 0x52, 0x3c, 0xc9, 0x07, 0xf9, 0x2b, 0x84, 0x57, 0x7f, 0x2a, 0x40, 0x6e, + 0xfb, 0xd0, 0x26, 0x2e, 0xba, 0x07, 0x59, 0x6a, 0x68, 0x4a, 0x45, 0xa9, 0x15, 0x9a, 0x9f, 0x1e, + 0x07, 0x7a, 0xb6, 0xb5, 0x39, 0x0a, 0x74, 0x78, 0xe2, 0x63, 0xe3, 0x56, 0xf5, 0x0e, 0x35, 0xaa, + 0xbf, 0x07, 0xba, 0x9e, 0x20, 0xef, 0xe1, 0xa7, 0x26, 0x79, 0xda, 0x77, 0xb1, 0x33, 0x68, 0x08, + 0x50, 0xbd, 0xd5, 0x6e, 0xb5, 0xb3, 0xd4, 0x40, 0x7d, 0x80, 0x9e, 0x4b, 0xb0, 0x47, 0x8c, 0x0e, + 0xf6, 0xb4, 0x85, 0x8a, 0x52, 0x2b, 0xde, 0x58, 0xab, 0x87, 0x79, 0xd7, 0xe3, 0x6c, 0xea, 0xbb, + 0x71, 0xde, 0xcd, 0x6b, 0x47, 0x81, 0xae, 0x8c, 0x02, 0xbd, 0x12, 0x4a, 0xf1, 0xde, 0x80, 0x58, + 0xf8, 0x56, 0x44, 0xb1, 0xee, 0x5d, 0x63, 0x8e, 0x47, 0x99, 0x8d, 0xcd, 0xea, 0xf3, 0x5f, 0x74, + 0xa5, 0x5d, 0x18, 0x3b, 0x84, 0x90, 0xef, 0x18, 0xb1, 0xd0, 0xe2, 0x5b, 0x0a, 0x45, 0x14, 0xd3, + 0x42, 0x63, 0x07, 0xba, 0x0f, 0x4b, 0x26, 0xeb, 0x61, 0xb3, 0x43, 0x0d, 0x2d, 0x27, 0x5f, 0xd0, + 0xf5, 0xe3, 0x40, 0x3f, 0xb7, 0x25, 0x6c, 0xf2, 0x2d, 0x95, 0x53, 0x8c, 0x12, 0xdb, 0x32, 0x26, + 0x7c, 0xed, 0x73, 0x91, 0x09, 0x3d, 0x80, 0xc5, 0x21, 0xb5, 0x0d, 0x0d, 0x2a, 0x4a, 0xed, 0xfc, + 0x0d, 0xad, 0x9e, 0xac, 0x6d, 0x5d, 0xd6, 0xa1, 0xfe, 0x05, 0xb5, 0x8d, 0xa6, 0x3e, 0x0a, 0xf4, + 0x7f, 0xa5, 0x48, 0x45, 0x58, 0x82, 0x51, 0xd2, 0xa0, 0x0d, 0x00, 0x3e, 0x60, 0xae, 0xd7, 0xb1, + 0xb1, 0x45, 0xb4, 0xa2, 0x4c, 0xed, 0xbf, 0x53, 0x2b, 0x94, 0x90, 0x2f, 0xb1, 0x45, 0x12, 0xf1, + 0x85, 0xb1, 0x11, 0xdd, 0x81, 0xc2, 0xbe, 0x6f, 0x9a, 0x21, 0x47, 0x49, 0x72, 0x5c, 0x19, 0x05, + 0xba, 0x9e, 0xe2, 0x10, 0x88, 0x53, 0x14, 0x4b, 0xb1, 0x0d, 0x6d, 0x43, 0xde, 0x70, 0xe9, 0x01, + 0x71, 0xb5, 0x65, 0xb9, 0xae, 0x8b, 0xe9, 0x75, 0x6d, 0x4a, 0x5f, 0xf3, 0xf2, 0x28, 0xd0, 0xff, + 0x93, 0x22, 0x0d, 0x83, 0x12, 0x94, 0x11, 0x0d, 0xba, 0x0d, 0x4b, 0x03, 0x66, 0x11, 0x07, 0xf7, + 0x89, 0x76, 0xfe, 0x15, 0x19, 0xc5, 0x80, 0x64, 0x46, 0xb1, 0x0d, 0xdd, 0x87, 0xa2, 0x41, 0x78, + 0xcf, 0xa5, 0xd2, 0xa7, 0xad, 0x48, 0x8e, 0xff, 0x8f, 0x02, 0xbd, 0x9a, 0x4e, 0x60, 0x82, 0x49, + 0xd0, 0x24, 0x43, 0xd1, 0x3e, 0x14, 0xf7, 0x99, 0x3b, 0xec, 0x70, 0x0f, 0x7b, 0x3e, 0xd7, 0x54, + 0xb9, 0xc0, 0xf2, 0xac, 0xc2, 0xdd, 0x65, 0xee, 0xf0, 0xa1, 0x44, 0x35, 0xff, 0x37, 0x0a, 0xf4, + 0xcb, 0xe9, 0xf7, 0x37, 0x76, 0x26, 0x84, 0x60, 0x62, 0x45, 0x3b, 0x00, 0xf8, 0x00, 0x7b, 0xd8, + 0xed, 0xf8, 0xae, 0xa9, 0xad, 0xca, 0x84, 0x3f, 0x3e, 0x0e, 0xf4, 0xc2, 0xba, 0xb4, 0xee, 0xb5, + 0xb7, 0xa6, 0xea, 0x1a, 0xe2, 0xf7, 0x5c, 0x33, 0x59, 0xd7, 0xb1, 0x11, 0x3d, 0x86, 0xc2, 0x00, + 0xf3, 0x0e, 0x13, 0xc9, 0x69, 0x86, 0x24, 0xbc, 0x3d, 0x0a, 0x74, 0x2d, 0xe4, 0x18, 0x60, 0x2e, + 0xd3, 0x9e, 0xc4, 0xbe, 0xc9, 0xf9, 0x5e, 0x8a, 0xc3, 0xaa, 0x7b, 0xb0, 0x28, 0x76, 0x2a, 0x5a, + 0x81, 0xe2, 0x9e, 0x3d, 0xb4, 0xd9, 0xa1, 0x2d, 0x1e, 0xd5, 0x0c, 0x5a, 0x82, 0xc5, 0x3d, 0x4e, + 0x5c, 0x55, 0x41, 0x2a, 0x94, 0xb6, 0xdd, 0x3e, 0xb6, 0xe9, 0x33, 0x2c, 0x24, 0xd4, 0xac, 0xf0, + 0xed, 0x12, 0x6c, 0xa9, 0x0b, 0xe2, 0x57, 0x9b, 0x38, 0x4c, 0x5d, 0x44, 0x25, 0x58, 0xda, 0x71, + 0xd9, 0x01, 0x35, 0x88, 0xab, 0xe6, 0xaa, 0x9f, 0x01, 0x4c, 0xde, 0x23, 0xba, 0x04, 0xab, 0x11, + 0xf9, 0xc4, 0xa8, 0x66, 0x10, 0x40, 0xbe, 0xc5, 0x85, 0x45, 0x55, 0x44, 0x78, 0x8b, 0x3f, 0x64, + 0xbe, 0xdb, 0x23, 0x6a, 0xb6, 0xfa, 0xfd, 0x45, 0x58, 0xdc, 0xc5, 0x7c, 0xf8, 0xbe, 0x9b, 0xbd, + 0x8b, 0x6e, 0xb6, 0x95, 0xea, 0x66, 0xff, 0x48, 0x1f, 0x0a, 0x51, 0x86, 0xb9, 0x9a, 0xd9, 0x4d, + 0xc8, 0x79, 0xd4, 0x33, 0xe3, 0x3e, 0x56, 0x19, 0x05, 0xfa, 0xbf, 0x53, 0x51, 0xd2, 0x9b, 0x08, + 0x0b, 0xe1, 0xa7, 0xcf, 0x7a, 0xe9, 0xed, 0xcf, 0xfa, 0x99, 0xf7, 0xb1, 0xaf, 0x21, 0x6f, 0xf8, + 0xa4, 0xc3, 0x6c, 0xd9, 0xc5, 0x5e, 0x5f, 0xcf, 0x5a, 0x54, 0xcf, 0xf4, 0x9a, 0x0d, 0x9f, 0x6c, + 0xdb, 0xa7, 0x6a, 0x99, 0x93, 0x46, 0x64, 0x41, 0xa9, 0xc7, 0x2c, 0xc7, 0x24, 0xd1, 0x96, 0x59, + 0xf9, 0x53, 0x89, 0x7a, 0x24, 0x91, 0x7e, 0x31, 0x63, 0x92, 0xa9, 0x4d, 0x53, 0x4c, 0xb8, 0xd0, + 0x0e, 0xe4, 0x44, 0x0f, 0x24, 0x51, 0x0b, 0xd4, 0x66, 0x54, 0x5b, 0x1c, 0x50, 0x32, 0xa3, 0x70, + 0x32, 0x2e, 0x59, 0x38, 0x69, 0x40, 0x9b, 0x50, 0xa0, 0xbc, 0x63, 0xb2, 0xde, 0x90, 0x18, 0xb2, + 0xe3, 0x2d, 0x35, 0xaf, 0x46, 0x19, 0xa6, 0x5b, 0x3d, 0xe5, 0x5b, 0x12, 0x94, 0x6c, 0xf5, 0xb1, + 0x0d, 0xb5, 0xa0, 0x64, 0xfb, 0x56, 0xa7, 0xc7, 0x2c, 0x8b, 0xd8, 0x1e, 0xd7, 0x50, 0x45, 0xa9, + 0xe5, 0x66, 0xd4, 0xdf, 0xf6, 0xad, 0x8d, 0x08, 0x93, 0xac, 0x7f, 0xc2, 0x8c, 0xee, 0x82, 0x78, + 0xec, 0xf8, 0xce, 0x01, 0xf3, 0x08, 0xd7, 0x2e, 0x48, 0xa6, 0xe9, 0x5e, 0x6e, 0xfb, 0xd6, 0x5e, + 0x08, 0x49, 0xf6, 0xf2, 0x89, 0x15, 0x6d, 0xc1, 0xb2, 0xe0, 0x31, 0xd8, 0xa1, 0x1d, 0x32, 0x5d, + 0x94, 0x4c, 0x57, 0x47, 0x81, 0x7e, 0xe5, 0x34, 0xd3, 0x66, 0x0c, 0x4a, 0x70, 0x95, 0x92, 0x76, + 0xf4, 0x18, 0x10, 0xe1, 0x1e, 0xb5, 0x64, 0x6b, 0x30, 0x7c, 0x57, 0x36, 0x53, 0xed, 0x52, 0x78, + 0x72, 0x47, 0x81, 0xfe, 0x41, 0x8a, 0x72, 0x1a, 0x9a, 0x20, 0x5e, 0x1d, 0x7b, 0x37, 0x23, 0x27, + 0xea, 0x00, 0x88, 0x5b, 0x02, 0xfb, 0xde, 0x80, 0xc5, 0xd7, 0xc4, 0x9d, 0x51, 0xa0, 0xff, 0x73, + 0x7c, 0x4d, 0xac, 0x4b, 0xd7, 0x7c, 0xf7, 0x44, 0x61, 0x1c, 0x97, 0xbe, 0x86, 0xc8, 0x19, 0x5f, + 0x43, 0x68, 0x00, 0xcb, 0x82, 0xdd, 0xa2, 0x26, 0xe1, 0x1e, 0xb3, 0x89, 0xb6, 0x2f, 0x15, 0x36, + 0x26, 0x7b, 0x70, 0x80, 0xf9, 0x83, 0xd8, 0x3b, 0x9f, 0x4a, 0x29, 0x19, 0x8a, 0x08, 0x94, 0xe4, + 0x8b, 0xe2, 0x9c, 0xf6, 0x6d, 0x42, 0xb4, 0x7e, 0x65, 0xa1, 0x56, 0x68, 0x36, 0x27, 0xbd, 0x4d, + 0x2c, 0x39, 0x72, 0xce, 0xa7, 0x53, 0x4c, 0x44, 0xc6, 0x32, 0x2e, 0x39, 0xa0, 0xe4, 0x90, 0xb8, + 0xda, 0x60, 0x86, 0x4c, 0x3b, 0x72, 0xce, 0x2f, 0x13, 0x47, 0xc6, 0x55, 0x31, 0x71, 0x97, 0x98, + 0x1a, 0x95, 0x1a, 0xe9, 0xaa, 0x6c, 0x09, 0xcf, 0xfc, 0x55, 0x91, 0x61, 0xc8, 0x84, 0x15, 0xca, + 0x3b, 0x06, 0x71, 0x88, 0x6d, 0x50, 0xbb, 0x2f, 0x1a, 0xe0, 0xb7, 0x52, 0x63, 0x73, 0xd2, 0x3b, + 0x29, 0xdf, 0x8c, 0xfd, 0xc9, 0x0e, 0xf7, 0x26, 0x42, 0xcb, 0xa9, 0x58, 0xd4, 0x85, 0x22, 0xe5, + 0x9d, 0xae, 0x68, 0x24, 0xd4, 0xee, 0x6b, 0x43, 0xa9, 0xb4, 0x3e, 0x0a, 0xf4, 0xb5, 0x58, 0xa9, + 0x19, 0xf9, 0xe6, 0x93, 0x81, 0x49, 0x60, 0xb4, 0x22, 0x97, 0x98, 0xf2, 0x68, 0x1d, 0x52, 0x6f, + 0xa0, 0x99, 0xd3, 0x2b, 0x6a, 0x87, 0xfe, 0xaf, 0xa8, 0x37, 0x98, 0x7b, 0x45, 0x89, 0x58, 0xf4, + 0x0d, 0x00, 0xe5, 0x1d, 0x07, 0xbb, 0x5e, 0x87, 0xed, 0x6b, 0xd6, 0xe9, 0xf2, 0x50, 0xbe, 0x83, + 0x5d, 0x6f, 0x7b, 0x7f, 0xce, 0xf2, 0xc4, 0x61, 0xe8, 0x11, 0x88, 0x52, 0x49, 0x7e, 0xcd, 0x3e, + 0x1b, 0xf2, 0x73, 0x03, 0x2c, 0xe3, 0xaa, 0xdd, 0x57, 0xcd, 0x85, 0x05, 0xc8, 0xb5, 0x38, 0xf7, + 0x49, 0x38, 0x18, 0x3e, 0x20, 0x6e, 0x9f, 0xb4, 0xc9, 0x13, 0x9f, 0x70, 0x4f, 0xcd, 0xa2, 0x65, + 0x28, 0x8c, 0x4f, 0x5a, 0x38, 0x1d, 0x7e, 0xee, 0xd0, 0x9e, 0xba, 0x28, 0xa2, 0x1e, 0x7a, 0xcc, + 0x7d, 0xaa, 0xe6, 0x84, 0x71, 0x03, 0xbb, 0x86, 0x9a, 0xaf, 0x36, 0x84, 0x51, 0xdc, 0x20, 0x2a, + 0x94, 0x22, 0x11, 0xf9, 0x1c, 0x4e, 0x9f, 0xdb, 0x0e, 0xb1, 0x55, 0x45, 0x0c, 0x89, 0x1b, 0x26, + 0xe3, 0xc4, 0x50, 0xb3, 0xd5, 0xa3, 0x3c, 0xe4, 0x76, 0x99, 0x43, 0x7b, 0xef, 0xe7, 0xc2, 0xbf, + 0xfd, 0x2b, 0x57, 0xd6, 0xe1, 0x9d, 0x0c, 0x86, 0x93, 0x71, 0xae, 0x74, 0x36, 0xe3, 0xdc, 0x4d, + 0xc8, 0xf5, 0x98, 0xc9, 0xc2, 0xf1, 0x70, 0x56, 0x22, 0xd2, 0x9b, 0x4c, 0x44, 0x1a, 0x4e, 0x4f, + 0xa8, 0xe7, 0xdf, 0x7e, 0x42, 0xfd, 0x6b, 0xbf, 0xe9, 0xaa, 0xaf, 0x39, 0xbb, 0xb2, 0xb1, 0xab, + 0x4a, 0xf5, 0x3b, 0x05, 0x72, 0x4d, 0xec, 0xf5, 0x06, 0xa8, 0x06, 0x39, 0x0f, 0xf3, 0x21, 0xd7, + 0x94, 0xca, 0x42, 0xad, 0x78, 0x03, 0x4d, 0x0f, 0x84, 0xed, 0x10, 0x80, 0x3e, 0x82, 0xbc, 0xcc, + 0x98, 0x6b, 0x59, 0x09, 0xbd, 0x30, 0xe3, 0xf3, 0xb9, 0x1d, 0x41, 0x04, 0xd8, 0x13, 0x5b, 0x84, + 0x6b, 0x0b, 0xb3, 0xc0, 0x72, 0xfb, 0xb4, 0x23, 0xc8, 0x87, 0x57, 0x21, 0x1f, 0x96, 0x11, 0xad, + 0xc2, 0x72, 0x94, 0x73, 0x68, 0x08, 0x3f, 0x13, 0xef, 0x51, 0xef, 0xbe, 0xdf, 0x55, 0x95, 0x66, + 0xeb, 0xe8, 0x65, 0x39, 0xf3, 0xdb, 0xcb, 0x72, 0xe6, 0x87, 0xe3, 0x72, 0xe6, 0xe8, 0xb8, 0xac, + 0xbc, 0x38, 0x2e, 0x2b, 0xbf, 0x1e, 0x97, 0x95, 0xe7, 0x27, 0xe5, 0xcc, 0x8f, 0x27, 0x65, 0xe5, + 0xc5, 0x49, 0x39, 0xf3, 0xf3, 0x49, 0x39, 0xf3, 0x48, 0xb7, 0x98, 0x6f, 0xd6, 0x29, 0x6b, 0x84, + 0xb2, 0x0d, 0x6a, 0x7b, 0xc4, 0xb5, 0xb1, 0xd9, 0x88, 0xfe, 0x96, 0xeb, 0xe6, 0xe5, 0xa1, 0xfb, + 0xe4, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x52, 0x5c, 0x43, 0x53, 0xa8, 0x13, 0x00, 0x00, } func (m *Owner) Marshal() (dAtA []byte, err error) { @@ -799,6 +802,15 @@ func (m *Task) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0xa2 } + if len(m.EstimatedDuration) > 0 { + i -= len(m.EstimatedDuration) + copy(dAtA[i:], m.EstimatedDuration) + i = encodeVarintDvmodel(dAtA, i, uint64(len(m.EstimatedDuration))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa + } if m.NumDownvotes != 0 { i = encodeVarintDvmodel(dAtA, i, uint64(m.NumDownvotes)) i-- @@ -1210,6 +1222,10 @@ func (m *Task) Size() (n int) { if m.NumDownvotes != 0 { n += 2 + sovDvmodel(uint64(m.NumDownvotes)) } + l = len(m.EstimatedDuration) + if l > 0 { + n += 2 + l + sovDvmodel(uint64(l)) + } l = len(m.HasAuthor) if l > 0 { n += 2 + l + sovDvmodel(uint64(l)) @@ -2223,6 +2239,38 @@ func (m *Task) Unmarshal(dAtA []byte) error { break } } + case 21: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EstimatedDuration", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDvmodel + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthDvmodel + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDvmodel + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.EstimatedDuration = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex case 100: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field HasAuthor", wireType) diff --git a/internal/githubprovider/model.go b/internal/githubprovider/model.go index 6685d83d8..da72f19e8 100644 --- a/internal/githubprovider/model.go +++ b/internal/githubprovider/model.go @@ -2,9 +2,11 @@ package githubprovider import ( "fmt" + "regexp" "github.com/cayleygraph/quad" "github.com/google/go-github/v30/github" + "github.com/xhit/go-str2duration/v2" "go.uber.org/zap" "moul.io/depviz/v3/internal/dvmodel" "moul.io/depviz/v3/internal/dvparser" @@ -12,6 +14,11 @@ import ( "moul.io/multipmuri/pmbodyparser" ) +const ( + InvalidDuration string = "invalid" + UndefinedDuration string = "undefined" +) + func fromIssues(issues []*github.Issue, logger *zap.Logger) dvmodel.Batch { batch := dvmodel.Batch{} for _, issue := range issues { @@ -48,6 +55,7 @@ func fromIssue(batch *dvmodel.Batch, input *github.Issue) error { NumUpvotes: int32(*input.Reactions.PlusOne), NumDownvotes: int32(*input.Reactions.MinusOne), } + issue.EstimatedDuration = parseDuration(issue.Description) if input.PullRequestLinks != nil { // is PR issue.Kind = dvmodel.Task_MergeRequest } else { // is issue @@ -139,11 +147,23 @@ func fromIssue(batch *dvmodel.Batch, input *github.Issue) error { return fmt.Errorf("unsupported pmbodyparser.Kind: %v", relationship.Kind) } } - batch.Tasks = append(batch.Tasks, &issue) return nil } +func parseDuration(body string) string { + compile := regexp.MustCompile(`time[ \t]+([w|d|h|m|0-9]+)`) + match := compile.FindStringSubmatch(body) + if len(match) < 2 || len(match[1]) == 0 { + return UndefinedDuration + } + _, err := str2duration.ParseDuration(match[1]) + if err != nil { + return InvalidDuration + } + return match[1] +} + func fromUser(batch *dvmodel.Batch, input *github.User) (*dvmodel.Owner, error) { entity, err := dvparser.ParseTarget(input.GetHTMLURL()) if err != nil { diff --git a/web/src/ui/Visualizer/renderers/GraphCard.js b/web/src/ui/Visualizer/renderers/GraphCard.js index 4b61275f7..89815962f 100644 --- a/web/src/ui/Visualizer/renderers/GraphCard.js +++ b/web/src/ui/Visualizer/renderers/GraphCard.js @@ -1,6 +1,7 @@ import React from 'react' import { renderToStaticMarkup } from 'react-dom/server' import Issue from '../../components/icons/Issue' +import Hourglass from '../../components/icons/Hourglass' import Pr from '../../components/icons/Pr' import Comments from '../../components/icons/Comments' import Github from '../../components/icons/Github' @@ -24,7 +25,8 @@ const GraphCard = (data, type) => { default: break } - + let estimatedDuration = "" + if (data.estimated_duration !== undefined && data.estimated_duration !== "undefined") { estimatedDuration = data.estimated_duration} const cardTemplate = (
@@ -37,7 +39,7 @@ const GraphCard = (data, type) => {
-
+
@@ -47,6 +49,11 @@ const GraphCard = (data, type) => {
{data.title.replace(/"/gi, '\'')}
+ {estimatedDuration && ( +
+ {" "}{estimatedDuration} +
+ )}
{/*
diff --git a/web/src/ui/Visualizer/renderers/card.scss b/web/src/ui/Visualizer/renderers/card.scss index c3b51c0a5..2ed50d1b8 100644 --- a/web/src/ui/Visualizer/renderers/card.scss +++ b/web/src/ui/Visualizer/renderers/card.scss @@ -60,6 +60,12 @@ width: 405px; display: block; } + .estimated-time { + font-size: 18px; + line-height: 25px; + height: 105px; + width: 405px; + } .b-body-top { margin-bottom: 15px; position: relative; diff --git a/web/src/ui/components/icons/Hourglass.js b/web/src/ui/components/icons/Hourglass.js new file mode 100644 index 000000000..b54904354 --- /dev/null +++ b/web/src/ui/components/icons/Hourglass.js @@ -0,0 +1,26 @@ +import React from 'react' + +const HourglassIcon = () => ( + + + + + + + + + + + + + + + + + + + + +) + +export default HourglassIcon