From 0f44048fccb9ace789a55ce9f28ca8f212db3ea2 Mon Sep 17 00:00:00 2001 From: Kira Pilot Date: Wed, 15 Jun 2022 15:12:57 -0400 Subject: [PATCH] fix: adjust ParameterSchema type for workspace creation (#2384) * add ability to activate users resolves #2254 * added test * PR feedback * guarding against null validation_contains field * fixing type for ParameterSchema resolves #2161 --- codersdk/parameters.go | 2 +- site/src/api/typesGenerated.ts | 2 +- site/src/components/ParameterInput/ParameterInput.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/codersdk/parameters.go b/codersdk/parameters.go index 073efafb63..57df03d560 100644 --- a/codersdk/parameters.go +++ b/codersdk/parameters.go @@ -72,7 +72,7 @@ type ParameterSchema struct { // This is a special array of items provided if the validation condition // explicitly states the value must be one of a set. - ValidationContains []string `json:"validation_contains"` + ValidationContains []string `json:"validation_contains,omitempty"` } // CreateParameterRequest is used to create a new parameter value for a scope. diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts index 61415137f3..bb03123545 100644 --- a/site/src/api/typesGenerated.ts +++ b/site/src/api/typesGenerated.ts @@ -190,7 +190,7 @@ export interface ParameterSchema { readonly validation_condition: string readonly validation_type_system: string readonly validation_value_type: string - readonly validation_contains: string[] + readonly validation_contains?: string[] } // From codersdk/provisionerdaemons.go:33:6 diff --git a/site/src/components/ParameterInput/ParameterInput.tsx b/site/src/components/ParameterInput/ParameterInput.tsx index a12d3c07f0..638acdac7a 100644 --- a/site/src/components/ParameterInput/ParameterInput.tsx +++ b/site/src/components/ParameterInput/ParameterInput.tsx @@ -29,7 +29,7 @@ export const ParameterInput: FC = ({ disabled, onChange, sc } const ParameterField: React.FC = ({ disabled, onChange, schema }) => { - if (schema.validation_contains.length > 0) { + if (schema.validation_contains && schema.validation_contains.length > 0) { return (