refactor to use name 'firstDayOfWeek' everywhere

Signed-off-by: Martin Schimandl <martin.schimandl@gmail.com>
prometheus · Oct 15, 2022 · 8c04efd · 8c04efd
1 parent 4c6e34a
commit 8c04efd
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 28 deletions.
diff --git a/ui/app/index.html b/ui/app/index.html
@@ -20,7 +20,7 @@
             var app = Elm.Main.init({
                 flags: {
                     production: true,
-                    startWeekAtMonday: JSON.parse(localStorage.getItem('startWeekAtMonday')),
+                    firstDayOfWeek: JSON.parse(localStorage.getItem('firstDayOfWeek')),
                     defaultCreator: localStorage.getItem('defaultCreator'),
                     groupExpandAll: JSON.parse(localStorage.getItem('groupExpandAll'))
                 }
@@ -31,8 +31,8 @@
             app.ports.persistGroupExpandAll.subscribe(function(expanded) {
                 localStorage.setItem('groupExpandAll', JSON.stringify(expanded));
             });
-            app.ports.persistStartWeekAtMonday.subscribe(function(monday) {
-                localStorage.setItem('startWeekAtMonday', JSON.stringify(monday));
+            app.ports.persistFirstDayOfWeek.subscribe(function(firstDayOfWeek) {
+                localStorage.setItem('firstDayOfWeek', JSON.stringify(firstDayOfWeek));
             });
         </script>
     </body>

diff --git a/ui/app/src/Main.elm b/ui/app/src/Main.elm
@@ -88,24 +88,24 @@ init flags url key =
             else
                 "/"
 
-        startWeekAtMonday =
+        firstDayOfWeek =
             flags
-                |> Json.decodeValue (Json.field "startWeekAtMonday" Json.string)
+                |> Json.decodeValue (Json.field "firstDayOfWeek" Json.string)
                 |> Result.withDefault "Monday"
                 |> (\d ->
                         case d of
-                            "Monday" ->
-                                Monday
+                            "Sunday" ->
+                                Sunday
 
                             _ ->
-                                Sunday
+                                Monday
                    )
     in
     update (urlUpdate url)
         (Model
             (initSilenceList key)
             (initSilenceView key)
-            (initSilenceForm key startWeekAtMonday)
+            (initSilenceForm key firstDayOfWeek)
             (initAlertList key groupExpandAll)
             route
             filter
@@ -119,7 +119,7 @@ init flags url key =
             defaultCreator
             groupExpandAll
             key
-            { startOfWeek = startWeekAtMonday
+            { firstDayOfWeek = firstDayOfWeek
             }
         )
 

diff --git a/ui/app/src/Views/Settings/Types.elm b/ui/app/src/Views/Settings/Types.elm
@@ -4,9 +4,9 @@ import Utils.DateTimePicker.Utils exposing (FirstDayOfWeek)
 
 
 type alias Model =
-    { startOfWeek : FirstDayOfWeek
+    { firstDayOfWeek : FirstDayOfWeek
     }
 
 
 type SettingsMsg
-    = UpdateStartWeekAtMonday String
+    = UpdateFirstDayOfWeek String
diff --git a/ui/app/src/Views/Settings/Updates.elm b/ui/app/src/Views/Settings/Updates.elm
@@ -10,10 +10,10 @@ import Views.SilenceForm.Types
 update : SettingsMsg -> Model -> ( Model, Cmd Msg )
 update msg model =
     case msg of
-        UpdateStartWeekAtMonday startOfWeekString ->
+        Views.Settings.Types.UpdateFirstDayOfWeek firstDayOfWeekString ->
             let
-                startOfWeek =
-                    case startOfWeekString of
+                firstDayOfWeek =
+                    case firstDayOfWeekString of
                         "Monday" ->
                             Monday
 
@@ -23,27 +23,27 @@ update msg model =
                         _ ->
                             Monday
 
-                startOfWeekString2 =
-                    case startOfWeek of
+                firstDayOfWeekString2 =
+                    case firstDayOfWeek of
                         Monday ->
                             "Monday"
 
                         Sunday ->
                             "Sunday"
             in
-            ( { model | startOfWeek = startOfWeek }
+            ( { model | firstDayOfWeek = firstDayOfWeek }
             , Cmd.batch
                 [ Task.perform identity
                     (Task.succeed
                         (MsgForSilenceForm
-                            (UpdateFirstDayOfWeek
-                                startOfWeek
+                            (Views.SilenceForm.Types.UpdateFirstDayOfWeek
+                                firstDayOfWeek
                             )
                         )
                     )
-                , persistStartWeekAtMonday startOfWeekString2
+                , persistFirstDayOfWeek firstDayOfWeekString2
                 ]
             )
 
 
-port persistStartWeekAtMonday : String -> Cmd msg
+port persistFirstDayOfWeek : String -> Cmd msg
diff --git a/ui/app/src/Views/Settings/Views.elm b/ui/app/src/Views/Settings/Views.elm
@@ -10,24 +10,22 @@ import Views.Settings.Types exposing (Model, SettingsMsg(..))
 view : Model -> Html SettingsMsg
 view model =
     div []
-        [ h1 []
-            [ text "Settings" ]
-        , div [ class "form-group" ]
+        [ div [ class "form-group" ]
             [ label
                 [ for "select" ]
                 [ text "Start of Week:" ]
             , select
-                [ onInput UpdateStartWeekAtMonday, id "select", class "form-control" ]
+                [ onInput UpdateFirstDayOfWeek, id "select", class "form-control" ]
                 [ option
                     [ value "Monday"
                     , selected
-                        (model.startOfWeek == Monday)
+                        (model.firstDayOfWeek == Monday)
                     ]
                     [ text "Monday" ]
                 , option
                     [ value "Sunday"
                     , selected
-                        (model.startOfWeek == Sunday)
+                        (model.firstDayOfWeek == Sunday)
                     ]
                     [ text "Sunday" ]
                 ]