Prefill share mail form

To have access to the translated content, the messages must be given
to the update function. There is no way to set the values in the view.
This commit is contained in:
eikek
2021-10-10 11:48:08 +02:00
parent 16ccddab9f
commit 9009ebcb39
7 changed files with 102 additions and 99 deletions

View File

@@ -13,11 +13,12 @@ import Comp.ShareManage
import Comp.SourceManage
import Comp.UserManage
import Data.Flags exposing (Flags)
import Messages.Page.CollectiveSettings exposing (Texts)
import Page.CollectiveSettings.Data exposing (..)
update : Flags -> Msg -> Model -> ( Model, Cmd Msg, Sub Msg )
update flags msg model =
update : Texts -> Flags -> Msg -> Model -> ( Model, Cmd Msg, Sub Msg )
update texts flags msg model =
case msg of
SetTab t ->
let
@@ -26,19 +27,19 @@ update flags msg model =
in
case t of
SourceTab ->
update flags (SourceMsg Comp.SourceManage.LoadSources) m
update texts flags (SourceMsg Comp.SourceManage.LoadSources) m
UserTab ->
update flags (UserMsg Comp.UserManage.LoadUsers) m
update texts flags (UserMsg Comp.UserManage.LoadUsers) m
InsightsTab ->
update flags Init m
update texts flags Init m
SettingsTab ->
update flags Init m
update texts flags Init m
ShareTab ->
update flags (ShareMsg Comp.ShareManage.loadShares) m
update texts flags (ShareMsg Comp.ShareManage.loadShares) m
SourceMsg m ->
let
@@ -50,7 +51,7 @@ update flags msg model =
ShareMsg lm ->
let
( sm, sc, ss ) =
Comp.ShareManage.update flags lm model.shareModel
Comp.ShareManage.update texts.shareManage flags lm model.shareModel
in
( { model | shareModel = sm }, Cmd.map ShareMsg sc, Sub.map ShareMsg ss )

View File

@@ -27,6 +27,7 @@ import Data.ItemSelection
import Data.Items
import Data.SearchMode exposing (SearchMode)
import Data.UiSettings exposing (UiSettings)
import Messages.Page.Home exposing (Texts)
import Page exposing (Page(..))
import Page.Home.Data exposing (..)
import Process
@@ -48,8 +49,8 @@ type alias UpdateResult =
}
update : Maybe String -> Nav.Key -> Flags -> UiSettings -> Msg -> Model -> UpdateResult
update mId key flags settings msg model =
update : Maybe String -> Nav.Key -> Flags -> Texts -> UiSettings -> Msg -> Model -> UpdateResult
update mId key flags texts settings msg model =
case msg of
Init ->
let
@@ -63,7 +64,7 @@ update mId key flags settings msg model =
in
makeResult <|
Util.Update.andThen3
[ update mId key flags settings (SearchMenuMsg Comp.SearchMenu.Init)
[ update mId key flags texts settings (SearchMenuMsg Comp.SearchMenu.Init)
, doSearch searchParam
]
model
@@ -73,7 +74,7 @@ update mId key flags settings msg model =
nm =
{ model | searchOffset = 0, powerSearchInput = Comp.PowerSearchInput.init }
in
update mId key flags settings (SearchMenuMsg Comp.SearchMenu.ResetForm) nm
update mId key flags texts settings (SearchMenuMsg Comp.SearchMenu.ResetForm) nm
SearchMenuMsg m ->
let
@@ -119,7 +120,7 @@ update mId key flags settings msg model =
SetLinkTarget lt ->
case linkTargetMsg lt of
Just m ->
update mId key flags settings m model
update mId key flags texts settings m model
Nothing ->
makeResult ( model, Cmd.none, Sub.none )
@@ -167,7 +168,7 @@ update mId key flags settings msg model =
in
makeResult <|
Util.Update.andThen3
[ update mId key flags settings (ItemCardListMsg (Comp.ItemCardList.SetResults list))
[ update mId key flags texts settings (ItemCardListMsg (Comp.ItemCardList.SetResults list))
, if scroll then
scrollToCard mId
@@ -189,7 +190,7 @@ update mId key flags settings msg model =
, moreAvailable = list.groups /= []
}
in
update mId key flags settings (ItemCardListMsg (Comp.ItemCardList.AddResults list)) m
update mId key flags texts settings (ItemCardListMsg (Comp.ItemCardList.AddResults list)) m
ItemSearchAddResp (Err _) ->
withSub
@@ -289,18 +290,18 @@ update mId key flags settings msg model =
smMsg =
SearchMenuMsg (Comp.SearchMenu.SetTextSearch str)
in
update mId key flags settings smMsg model
update mId key flags texts settings smMsg model
ToggleSearchType ->
case model.searchTypeDropdownValue of
BasicSearch ->
update mId key flags settings (SearchMenuMsg Comp.SearchMenu.SetFulltextSearch) model
update mId key flags texts settings (SearchMenuMsg Comp.SearchMenu.SetFulltextSearch) model
ContentOnlySearch ->
update mId key flags settings (SearchMenuMsg Comp.SearchMenu.SetNamesSearch) model
update mId key flags texts settings (SearchMenuMsg Comp.SearchMenu.SetNamesSearch) model
KeyUpSearchbarMsg (Just Enter) ->
update mId key flags settings (DoSearch model.searchTypeDropdownValue) model
update mId key flags texts settings (DoSearch model.searchTypeDropdownValue) model
KeyUpSearchbarMsg _ ->
withSub ( model, Cmd.none )
@@ -614,6 +615,7 @@ update mId key flags settings msg model =
update mId
key
flags
texts
settings
(DoSearch model.searchTypeDropdownValue)
model_
@@ -676,7 +678,7 @@ update mId key flags settings msg model =
SelectView svm ->
let
result =
Comp.PublishItems.update flags lmsg svm.publishModel
Comp.PublishItems.update texts.publishItems flags lmsg svm.publishModel
nextView =
case result.outcome of
@@ -693,6 +695,7 @@ update mId key flags settings msg model =
update mId
key
flags
texts
settings
(DoSearch model.searchTypeDropdownValue)
model_
@@ -809,7 +812,7 @@ update mId key flags settings msg model =
model_ =
{ model | viewMode = viewMode }
in
update mId key flags settings (DoSearch model.lastSearchType) model_
update mId key flags texts settings (DoSearch model.lastSearchType) model_
SearchStatsResp result ->
let
@@ -819,7 +822,7 @@ update mId key flags settings msg model =
stats =
Result.withDefault model.searchStats result
in
update mId key flags settings lm { model | searchStats = stats }
update mId key flags texts settings lm { model | searchStats = stats }
TogglePreviewFullWidth ->
let
@@ -861,16 +864,16 @@ update mId key flags settings msg model =
makeResult ( model_, cmd_, Sub.map PowerSearchMsg result.subs )
Comp.PowerSearchInput.SubmitSearch ->
update mId key flags settings (DoSearch model_.searchTypeDropdownValue) model_
update mId key flags texts settings (DoSearch model_.searchTypeDropdownValue) model_
KeyUpPowerSearchbarMsg (Just Enter) ->
update mId key flags settings (DoSearch model.searchTypeDropdownValue) model
update mId key flags texts settings (DoSearch model.searchTypeDropdownValue) model
KeyUpPowerSearchbarMsg _ ->
withSub ( model, Cmd.none )
RemoveItem id ->
update mId key flags settings (ItemCardListMsg (Comp.ItemCardList.RemoveItem id)) model
update mId key flags texts settings (ItemCardListMsg (Comp.ItemCardList.RemoveItem id)) model
TogglePublishCurrentQueryView ->
case createQuery model of
@@ -889,7 +892,7 @@ update mId key flags settings msg model =
PublishView inPM ->
let
result =
Comp.PublishItems.update flags lmsg inPM
Comp.PublishItems.update texts.publishItems flags lmsg inPM
in
case result.outcome of
Comp.PublishItems.OutcomeInProgress ->