Merge pull request #483 from geeksforsocialchange/keep-region-selection

fix: Maintain selected region when switching between pages
geeksforsocialchange · Dec 17, 2024 · 00a15d8 · 00a15d8
2 parents 2fe1679 + a98bb77
commit 00a15d8
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/app/Route/Events.elm b/app/Route/Events.elm
@@ -26,6 +26,7 @@ import Theme.RegionSelector
 import Time
 import UrlPath
 import View exposing (View)
+import Messages exposing (Msg(..))
 
 
 type alias Model =
@@ -66,7 +67,7 @@ update :
     -> Shared.Model
     -> Msg
     -> Model
-    -> ( Model, Effect.Effect Msg )
+    -> ( Model, Effect.Effect Msg, Maybe Shared.Msg )
 update app _ msg model =
     case msg of
         Theme.Page.Events.PaginatorMsg submsg ->
@@ -77,20 +78,23 @@ update app _ msg model =
                             Theme.Paginator.Day posix
                       }
                     , Effect.none
+                    , Nothing
                     )
 
                 Theme.Paginator.ClickedAllPastEvents ->
                     ( { model
                         | filterByDate = Theme.Paginator.Past
                       }
                     , Effect.none
+                    , Nothing
                     )
 
                 Theme.Paginator.ClickedAllFutureEvents ->
                     ( { model
                         | filterByDate = Theme.Paginator.Future
                       }
                     , Effect.none
+                    , Nothing
                     )
 
                 Theme.Paginator.GetTime newTime ->
@@ -99,6 +103,7 @@ update app _ msg model =
                         , nowTime = newTime
                       }
                     , Effect.none
+                    , Nothing
                     )
 
                 Theme.Paginator.ScrollRight ->
@@ -107,6 +112,7 @@ update app _ msg model =
                         (Theme.Paginator.scrollPagination Theme.Paginator.Right model.viewportWidth)
                         |> Cmd.map Theme.Page.Events.fromPaginatorMsg
                         |> Effect.fromCmd
+                    , Nothing
                     )
 
                 Theme.Paginator.ScrollLeft ->
@@ -115,21 +121,23 @@ update app _ msg model =
                         (Theme.Paginator.scrollPagination Theme.Paginator.Left model.viewportWidth)
                         |> Cmd.map Theme.Page.Events.fromPaginatorMsg
                         |> Effect.fromCmd
+                    , Nothing
                     )
 
                 Theme.Paginator.GotViewport viewport ->
-                    ( { model | viewportWidth = Maybe.withDefault model.viewportWidth (Just viewport.scene.width) }, Effect.none )
+                    ( { model | viewportWidth = Maybe.withDefault model.viewportWidth (Just viewport.scene.width) }, Effect.none, Nothing )
 
                 Theme.Paginator.NoOp ->
-                    ( model, Effect.none )
+                    ( model, Effect.none, Nothing )
 
         Theme.Page.Events.RegionSelectorMsg submsg ->
             case submsg of
-                Theme.RegionSelector.ClickedSelector regionId ->
+                Theme.RegionSelector.ClickedSelector tagId ->
                     ( { model
-                        | filterByRegion = regionId
+                        | filterByRegion = tagId
                       }
                     , Effect.none
+                    , Just (SetRegion tagId)
                     )
 
 
@@ -142,7 +150,7 @@ route : RouteBuilder.StatefulRoute RouteParams Data ActionData Model Msg
 route =
     RouteBuilder.single
         { data = data, head = head }
-        |> RouteBuilder.buildWithLocalState
+        |> RouteBuilder.buildWithSharedState
             { init = init
             , view = view
             , update = update

diff --git a/app/Route/Index.elm b/app/Route/Index.elm
@@ -23,6 +23,7 @@ import Theme.RegionSelector exposing (Msg(..))
 import Time
 import UrlPath
 import View
+import Messages exposing (Msg(..))
 
 
 type alias Model =
@@ -56,14 +57,15 @@ update :
     -> Shared.Model
     -> Msg
     -> Model
-    -> ( Model, Effect.Effect Msg )
+    -> ( Model, Effect.Effect Msg, Maybe Shared.Msg )
 update app _ msg model =
     case msg of
         ClickedSelector tagId ->
             ( { model
                 | filterByRegion = tagId
               }
             , Effect.none
+            , Just (SetRegion tagId)
             )
 
 
@@ -76,7 +78,7 @@ route : RouteBuilder.StatefulRoute RouteParams Data ActionData Model Msg
 route =
     RouteBuilder.single
         { data = data, head = head }
-        |> RouteBuilder.buildWithLocalState
+        |> RouteBuilder.buildWithSharedState
             { init = init
             , view = view
             , update = update

diff --git a/app/Route/Partners.elm b/app/Route/Partners.elm
@@ -21,6 +21,7 @@ import Theme.PageTemplate
 import Theme.RegionSelector exposing (Msg(..))
 import UrlPath
 import View
+import Messages exposing (Msg(..))
 
 
 type alias Model =
@@ -50,14 +51,15 @@ update :
     -> Shared.Model
     -> Msg
     -> Model
-    -> ( Model, Effect.Effect Msg )
+    -> ( Model, Effect.Effect Msg, Maybe Shared.Msg )
 update app _ msg model =
     case msg of
         ClickedSelector tagId ->
             ( { model
                 | filterByRegion = tagId
               }
             , Effect.none
+            , Just (SetRegion tagId)
             )
 
 
@@ -70,7 +72,7 @@ route : RouteBuilder.StatefulRoute RouteParams Data ActionData Model Msg
 route =
     RouteBuilder.single
         { data = data, head = head }
-        |> RouteBuilder.buildWithLocalState
+        |> RouteBuilder.buildWithSharedState
             { init = init
             , view = view
             , update = update

diff --git a/app/Shared.elm b/app/Shared.elm
@@ -123,6 +123,10 @@ update msg model =
         -- Shared
         SharedMsg _ ->
             ( model, Effect.none )
+
+        -- Update region filter
+        SetRegion tagId ->
+            ( { model | filterParam = Just (tagId) }, Effect.none )
 
 
 subscriptions : UrlPath -> Model -> Sub Msg

diff --git a/src/Messages.elm b/src/Messages.elm
@@ -14,6 +14,7 @@ type Msg
     | ToggleMenu
       -- Shared
     | SharedMsg SharedMsg
+    | SetRegion Int
 
 
 type SharedMsg