fix: adjust ParameterSchema type for workspace creation (#2384)

Kira-Pilot · web-flow · commit 0f44048fccb9 · 2022-06-15T15:12:57.000-04:00
* add ability to activate users resolves #2254 * added test * PR feedback * guarding against null validation_contains field * fixing type for ParameterSchema resolves #2161
diff --git 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
@@ -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
@@ -29,7 +29,7 @@ export const ParameterInput: FC<ParameterInputProps> = ({ disabled, onChange, sc
 }
 
 const ParameterField: React.FC<ParameterInputProps> = ({ disabled, onChange, schema }) => {
-  if (schema.validation_contains.length > 0) {
+  if (schema.validation_contains && schema.validation_contains.length > 0) {
     return (
       <RadioGroup
         defaultValue={schema.default_source_value}

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ type ParameterSchema struct {`
`72`	`72`
`73`	`73`	`// This is a special array of items provided if the validation condition`
`74`	`74`	`// explicitly states the value must be one of a set.`
`75`		- ValidationContains []string `json:"validation_contains"`
	`75`	+ ValidationContains []string `json:"validation_contains,omitempty"`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`// CreateParameterRequest is used to create a new parameter value for a scope.`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ export interface ParameterSchema {`
`190`	`190`	`readonly validation_condition: string`
`191`	`191`	`readonly validation_type_system: string`
`192`	`192`	`readonly validation_value_type: string`
`193`		`- readonly validation_contains: string[]`
	`193`	`+ readonly validation_contains?: string[]`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`// From codersdk/provisionerdaemons.go:33:6`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ export const ParameterInput: FC<ParameterInputProps> = ({ disabled, onChange, sc`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`const ParameterField: React.FC<ParameterInputProps> = ({ disabled, onChange, schema }) => {`
`32`		`- if (schema.validation_contains.length > 0) {`
	`32`	`+ if (schema.validation_contains && schema.validation_contains.length > 0) {`
`33`	`33`	`return (`
`34`	`34`	`<RadioGroup`
`35`	`35`	`defaultValue={schema.default_source_value}`