Remove form message on updates

This commit is contained in:
Eike Kettner 2020-04-21 21:50:46 +02:00
parent 2723d6b43b
commit af5b62c057

View File

@ -163,6 +163,7 @@ update flags msg model =
( { model ( { model
| schedule = cs | schedule = cs
, scheduleModel = cm , scheduleModel = cm
, formMsg = Nothing
} }
, Cmd.map CalEventMsg cc , Cmd.map CalEventMsg cc
) )
@ -172,17 +173,25 @@ update flags msg model =
( em, ec, rec ) = ( em, ec, rec ) =
Comp.EmailInput.update flags model.recipients m model.recipientsModel Comp.EmailInput.update flags model.recipients m model.recipientsModel
in in
( { model | recipients = rec, recipientsModel = em } ( { model
| recipients = rec
, recipientsModel = em
, formMsg = Nothing
}
, Cmd.map RecipientMsg ec , Cmd.map RecipientMsg ec
) )
ConnMsg m -> ConnMsg m ->
let let
( cm, _ ) = ( cm, cc ) =
-- dropdown doesn't use cmd!!
Comp.Dropdown.update m model.connectionModel Comp.Dropdown.update m model.connectionModel
in in
( { model | connectionModel = cm }, Cmd.none ) ( { model
| connectionModel = cm
, formMsg = Nothing
}
, Cmd.map ConnMsg cc
)
ConnResp (Ok list) -> ConnResp (Ok list) ->
let let
@ -226,7 +235,10 @@ update flags msg model =
( m2, c2 ) = ( m2, c2 ) =
Comp.Dropdown.update m model.tagInclModel Comp.Dropdown.update m model.tagInclModel
in in
( { model | tagInclModel = m2 } ( { model
| tagInclModel = m2
, formMsg = Nothing
}
, Cmd.map TagIncMsg c2 , Cmd.map TagIncMsg c2
) )
@ -235,7 +247,10 @@ update flags msg model =
( m2, c2 ) = ( m2, c2 ) =
Comp.Dropdown.update m model.tagExclModel Comp.Dropdown.update m model.tagExclModel
in in
( { model | tagExclModel = m2 } ( { model
| tagExclModel = m2
, formMsg = Nothing
}
, Cmd.map TagExcMsg c2 , Cmd.map TagExcMsg c2
) )
@ -250,8 +265,11 @@ update flags msg model =
] ]
{ model | loading = model.loading - 1 } { model | loading = model.loading - 1 }
GetTagsResp (Err _) -> GetTagsResp (Err err) ->
( { model | loading = model.loading - 1 } ( { model
| loading = model.loading - 1
, formMsg = Just (BasicResult False (Util.Http.errorToString err))
}
, Cmd.none , Cmd.none
) )
@ -263,12 +281,18 @@ update flags msg model =
( { model ( { model
| remindDaysModel = pm | remindDaysModel = pm
, remindDays = val , remindDays = val
, formMsg = Nothing
} }
, Cmd.none , Cmd.none
) )
ToggleEnabled -> ToggleEnabled ->
( { model | enabled = not model.enabled }, Cmd.none ) ( { model
| enabled = not model.enabled
, formMsg = Nothing
}
, Cmd.none
)
SetNotificationSettings (Ok s) -> SetNotificationSettings (Ok s) ->
let let
@ -299,6 +323,7 @@ update flags msg model =
, enabled = s.enabled , enabled = s.enabled
, schedule = Data.Validated.Unknown newSchedule , schedule = Data.Validated.Unknown newSchedule
, scheduleModel = sm , scheduleModel = sm
, formMsg = Nothing
, loading = model.loading - 1 , loading = model.loading - 1
} }
, Cmd.batch , Cmd.batch