Skip to content

Commit f8dcb1b

Browse files
committed
fixing type for ParameterSchema
resolves #2161
1 parent b2e9596 commit f8dcb1b

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

codersdk/parameters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ type ParameterSchema struct {
7272

7373
// This is a special array of items provided if the validation condition
7474
// explicitly states the value must be one of a set.
75-
ValidationContains []string `json:"validation_contains"`
75+
ValidationContains []string `json:"validation_contains,omitempty"`
7676
}
7777

7878
// CreateParameterRequest is used to create a new parameter value for a scope.

site/src/api/typesGenerated.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ export interface ParameterSchema {
190190
readonly validation_condition: string
191191
readonly validation_type_system: string
192192
readonly validation_value_type: string
193-
readonly validation_contains: string[]
193+
readonly validation_contains?: string[]
194194
}
195195

196196
// From codersdk/provisionerdaemons.go:33:6

site/src/components/ParameterInput/ParameterInput.tsx

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-disable @typescript-eslint/no-unnecessary-condition */
21
import FormControlLabel from "@material-ui/core/FormControlLabel"
32
import Radio from "@material-ui/core/Radio"
43
import RadioGroup from "@material-ui/core/RadioGroup"
@@ -38,16 +37,15 @@ const ParameterField: React.FC<ParameterInputProps> = ({ disabled, onChange, sch
3837
onChange(event.target.value)
3938
}}
4039
>
41-
{schema.validation_contains &&
42-
schema.validation_contains.map((item) => (
43-
<FormControlLabel
44-
disabled={disabled}
45-
key={item}
46-
value={item}
47-
control={<Radio color="primary" size="small" disableRipple />}
48-
label={item}
49-
/>
50-
))}
40+
{schema.validation_contains.map((item) => (
41+
<FormControlLabel
42+
disabled={disabled}
43+
key={item}
44+
value={item}
45+
control={<Radio color="primary" size="small" disableRipple />}
46+
label={item}
47+
/>
48+
))}
5149
</RadioGroup>
5250
)
5351
}

0 commit comments

Comments
 (0)