Commit 33fd131

committed

Change to use oneOf instead of enum for select boxes.

1 parent ba44db1 commit 33fd131Copy full SHA for 33fd131

File tree

+41

-6

lines changed

+41

-6

lines changed

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,29 @@ init =`
`57`	`57`	`, string "blue"`
`58`	`58`	`]`
`59`	`59`	`)`
	`60`	`+ , ( "airport"`
	`61`	`+ , buildSchema`
	`62`	`+ \|> withTitle "Select an airport"`
	`63`	`+ \|> withNullableType "string"`
	`64`	`+ \|> withDefault (string "ARN")`
	`65`	`+ \|> withOneOf`
	`66`	`+ [ buildSchema`
	`67`	`+ \|> withTitle "Stockholm Arlanda"`
	`68`	`+ \|> withConst (string "ARN")`
	`69`	`+ , buildSchema`
	`70`	`+ \|> withTitle "London Heathrow"`
	`71`	`+ \|> withConst (string "LHR")`
	`72`	`+ , buildSchema`
	`73`	`+ \|> withTitle "Dubai International Airport"`
	`74`	`+ \|> withConst (string "DXB")`
	`75`	`+ , buildSchema`
	`76`	`+ \|> withTitle "Paris Charles de Gaulle"`
	`77`	`+ \|> withConst (string "CDG")`
	`78`	`+ , buildSchema`
	`79`	`+ \|> withTitle "Other"`
	`80`	`+ \|> withDescription "Enter airport IATA code"`
	`81`	`+ ]`
	`82`	`+ )`
`60`	`83`	`, ( "contact"`
`61`	`84`	`, buildSchema`
`62`	`85`	`\|> withType "object"`

Lines changed: 18 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ fieldView path schema type_ form =`
`74`	`74`	`txt schema (getFieldAsString path form)`
`75`	`75`
`76`	`76`	`StringType ->`
`77`		`- case schema.enum of`
	`77`	`+ case schema.oneOf of`
`78`	`78`	`Just _ ->`
`79`	`79`	`select schema (getFieldAsString path form)`
`80`	`80`
`@@ -159,12 +159,9 @@ select : SubSchema -> F.FieldState ValidationError String -> Html F.Msg`
`159`	`159`	`select schema f =`
`160`	`160`	`let`
`161`	`161`	`options =`
`162`		`- case schema.enum of`
	`162`	`+ case schema.oneOf of`
`163`	`163`	`Just values ->`
`164`		`- values`
`165`		`- \|> List.map (Json.Decode.decodeValue Json.Decode.string)`
`166`		`- \|> List.map (Result.withDefault "")`
`167`		`- \|> List.map (\str -> ( str, str ))`
	`164`	`+ List.map option values`
`168`	`165`
`169`	`166`	`Nothing ->`
`170`	`167`	`[]`
`@@ -177,6 +174,21 @@ select schema f =`
`177`	`174`	`]`
`178`	`175`
`179`	`176`
	`177`	`+option : Schema -> ( String, String )`
	`178`	`+option schema =`
	`179`	`+ case schema of`
	`180`	`+ BooleanSchema _ ->`
	`181`	`+ ( "", "" )`
	`182`	`+`
	`183`	`+ ObjectSchema schema_ ->`
	`184`	`+ ( schema_.const`
	`185`	`+ \|> Maybe.map (Json.Decode.decodeValue Json.Decode.string)`
	`186`	`+ \|> Maybe.map (Result.withDefault "")`
	`187`	`+ \|> Maybe.withDefault ""`
	`188`	`+ , schema_.title \|> Maybe.withDefault ""`
	`189`	`+ )`
	`190`	`+`
	`191`	`+`
`180`	`192`	`field : SubSchema -> F.FieldState ValidationError String -> Html F.Msg -> Html F.Msg`
`181`	`193`	`field schema f content =`
`182`	`194`	`fieldset`

Comments

(0)