From 1cfdb3668afc4e431c8da5bc4f988ad345ddee48 Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Tue, 22 Jul 2025 21:01:39 -0700 Subject: [PATCH 1/3] validator: connect_lazy --- validation/src/main.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/validation/src/main.rs b/validation/src/main.rs index bf3f26f..980e2f5 100644 --- a/validation/src/main.rs +++ b/validation/src/main.rs @@ -57,13 +57,13 @@ async fn main()->Result<(),StartupError>{ // maps-service api let api_host_internal=std::env::var("API_HOST_INTERNAL").expect("API_HOST_INTERNAL env required"); - let (mapfixes,operations,scripts,script_policy,submissions)=tokio::try_join!( - crate::grpc::mapfixes::ValidatorMapfixesServiceClient::connect(api_host_internal.clone()), - crate::grpc::operations::ValidatorOperationsServiceClient::connect(api_host_internal.clone()), - crate::grpc::scripts::ValidatorScriptsServiceClient::connect(api_host_internal.clone()), - crate::grpc::script_policy::ValidatorScriptPolicyServiceClient::connect(api_host_internal.clone()), - crate::grpc::submissions::ValidatorSubmissionsServiceClient::connect(api_host_internal.clone()), - ).map_err(StartupError::API)?; + let endpoint=tonic::transport::Endpoint::new(api_host_internal).map_err(StartupError::API)?; + let channel=endpoint.connect_lazy(); + let mapfixes=crate::grpc::mapfixes::ValidatorMapfixesServiceClient::new(channel.clone()); + let operations=crate::grpc::operations::ValidatorOperationsServiceClient::new(channel.clone()); + let scripts=crate::grpc::scripts::ValidatorScriptsServiceClient::new(channel.clone()); + let script_policy=crate::grpc::script_policy::ValidatorScriptPolicyServiceClient::new(channel.clone()); + let submissions=crate::grpc::submissions::ValidatorSubmissionsServiceClient::new(channel); let message_handler=message_handler::MessageHandler::new(cloud_context,cookie_context,group_id,mapfixes,operations,scripts,script_policy,submissions); // nats -- 2.49.1 From 39ba12edd9eb7e6b0f1e50296149305bbf335356 Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Tue, 22 Jul 2025 21:29:47 -0700 Subject: [PATCH 2/3] web: add missing ResetSubmitting review button --- web/src/app/_components/review/ReviewButtons.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/src/app/_components/review/ReviewButtons.tsx b/web/src/app/_components/review/ReviewButtons.tsx index a2abcd0..a35282d 100644 --- a/web/src/app/_components/review/ReviewButtons.tsx +++ b/web/src/app/_components/review/ReviewButtons.tsx @@ -69,6 +69,13 @@ const ReviewButtons: React.FC = ({ color: "error" }); } + + if (status === Status.Submitting) { + buttons.push({ + action: ReviewActions.ResetSubmitting, + color: "warning" + }); + } } // Buttons for review role -- 2.49.1 From 70bbba60034273bb9d3d7cc7140234cf9b079572 Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Tue, 22 Jul 2025 21:40:32 -0700 Subject: [PATCH 3/3] submissions: fix gRPC (the code is completely wrong) I blame the programming language, wouldn't have happened in Rust --- pkg/validator_controller/mapfixes.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/validator_controller/mapfixes.go b/pkg/validator_controller/mapfixes.go index 8eb3607..bf33fcc 100644 --- a/pkg/validator_controller/mapfixes.go +++ b/pkg/validator_controller/mapfixes.go @@ -128,7 +128,7 @@ func (svc *Mapfixes) SetStatusSubmitted(ctx context.Context, params *validator.S // (Internal endpoint) Role Validator changes status from Submitting -> RequestChanges. // // POST /mapfixes/{MapfixID}/status/validator-request-changes -func (svc *Mapfixes) ActionMapfixRequestChanges(ctx context.Context, params *validator.MapfixID) (*validator.NullResponse, error) { +func (svc *Mapfixes) SetStatusRequestChanges(ctx context.Context, params *validator.MapfixID) (*validator.NullResponse, error) { MapfixID := int64(params.ID) // transaction target_status := model.MapfixStatusChangesRequested @@ -165,7 +165,7 @@ func (svc *Mapfixes) ActionMapfixRequestChanges(ctx context.Context, params *val // Role Validator changes status from Validating -> Validated. // // POST /mapfixes/{MapfixID}/status/validator-validated -func (svc *Mapfixes) ActionMapfixValidated(ctx context.Context, params *validator.MapfixID) (*validator.NullResponse, error) { +func (svc *Mapfixes) SetStatusValidated(ctx context.Context, params *validator.MapfixID) (*validator.NullResponse, error) { MapfixID := int64(params.ID) // transaction update := service.NewMapfixUpdate() @@ -184,7 +184,7 @@ func (svc *Mapfixes) ActionMapfixValidated(ctx context.Context, params *validato // (Internal endpoint) Role Validator changes status from Validating -> Accepted. // // POST /mapfixes/{MapfixID}/status/validator-failed -func (svc *Mapfixes) ActionMapfixAccepted(ctx context.Context, params *validator.MapfixID) (*validator.NullResponse, error) { +func (svc *Mapfixes) SetStatusFailed(ctx context.Context, params *validator.MapfixID) (*validator.NullResponse, error) { MapfixID := int64(params.ID) // transaction target_status := model.MapfixStatusAcceptedUnvalidated @@ -222,7 +222,7 @@ func (svc *Mapfixes) ActionMapfixAccepted(ctx context.Context, params *validator // (Internal endpoint) Role Validator changes status from Uploading -> Uploaded. // // POST /mapfixes/{MapfixID}/status/validator-uploaded -func (svc *Mapfixes) ActionMapfixUploaded(ctx context.Context, params *validator.MapfixID) (*validator.NullResponse, error) { +func (svc *Mapfixes) SetStatusUploaded(ctx context.Context, params *validator.MapfixID) (*validator.NullResponse, error) { MapfixID := int64(params.ID) // transaction target_status := model.MapfixStatusUploaded @@ -259,7 +259,7 @@ func (svc *Mapfixes) ActionMapfixUploaded(ctx context.Context, params *validator // Post an error to the audit log // // POST /mapfixes/{MapfixID}/error -func (svc *Mapfixes) CreateMapfixAuditError(ctx context.Context, params *validator.AuditErrorRequest) (*validator.NullResponse, error) { +func (svc *Mapfixes) CreateAuditError(ctx context.Context, params *validator.AuditErrorRequest) (*validator.NullResponse, error) { MapfixID := int64(params.ID) event_data := model.AuditEventDataError{ Error: params.ErrorMessage, @@ -286,7 +286,7 @@ func (svc *Mapfixes) CreateMapfixAuditError(ctx context.Context, params *validat // Post a checklist to the audit log // // POST /mapfixes/{MapfixID}/checklist -func (svc *Mapfixes) CreateMapfixAuditCheckList(ctx context.Context, params *validator.AuditChecklistRequest) (*validator.NullResponse, error) { +func (svc *Mapfixes) CreateAuditChecklist(ctx context.Context, params *validator.AuditChecklistRequest) (*validator.NullResponse, error) { MapfixID := int64(params.ID) check_list := make([]model.Check, len(params.CheckList)) for i, check := range params.CheckList { -- 2.49.1