Undo changes to pagestate

src/Client/Index.fs

@@ -31,7 +31,7 @@ let View (model : Model) (dispatch : Msg -> unit) =
             prop.className "flex w-full overflow-auto h-screen"
             prop.children [
                 Modals.ModalProvider.Main(model, dispatch)
-                match model.ProtocolState.IsHome, model.PersistentStorageState.Host with
+                match model.PageState.IsHome, model.PersistentStorageState.Host with
                 | false, _ ->
                     View.MainPageView.Main(model, dispatch)
                 | _, Some Swatehost.Excel ->

src/Client/Init.fs

@@ -9,6 +9,7 @@ open Update
 
 let initialModel =
     {
+        PageState                   = PageState                 .init()
         PersistentStorageState      = PersistentStorageState    .init()
         DevState                    = DevState                  .init()
         TermSearchState             = TermSearch.Model          .init()

src/Client/MainComponents/Widgets.fs

@@ -231,7 +231,7 @@ type Widget =
 
         let content =
             let switchContent =
-                if model.ProtocolState.TemplatesSelected.Length > 0 && model.ProtocolState.WidgetTypes = Routing.WidgetTypes.Protocol then
+                if model.ProtocolState.TemplatesSelected.Length > 0 && model.PageState.SidebarPage = Routing.SidebarPage.Protocol then
                     insertContent()
                 else selectContent()
             Html.div [

src/Client/Model.fs

@@ -125,6 +125,20 @@ type PersistentStorageState = {
         HasOntologiesLoaded     = false
     }
 
+type PageState = {
+    SidebarPage : Routing.SidebarPage
+    MainPage: Routing.MainPage
+} with
+    static member init () =
+        {
+            SidebarPage = SidebarPage.BuildingBlock
+            MainPage = MainPage.Default
+        }
+    member this.IsHome =
+        match this.MainPage with
+        | MainPage.Default -> true
+        | _ -> false
+
 module FilePicker =
     type Model = {
         FileNames   : (int*string) list
@@ -234,8 +248,6 @@ module Protocol =
         // ------ Protocol from Database ------
         TemplatesSelected   : ARCtrl.Template list
         Templates           : ARCtrl.Template []
-        WidgetTypes         : Routing.WidgetTypes
-        MainPage            : Routing.MainPage
     } with
         static member init () = {
             // Client
@@ -244,13 +256,7 @@ module Protocol =
             TemplatesSelected   = []
             // ------ Protocol from Database ------
             Templates           = [||]
-            WidgetTypes         = WidgetTypes.BuildingBlock
-            MainPage            = MainPage.Default
         }
-        member this.IsHome =
-            match this.MainPage with
-            | MainPage.Default  -> true
-            | _                 -> false
 
 type RequestBuildingBlockInfoStates =
 | Inactive
@@ -263,6 +269,8 @@ type RequestBuildingBlockInfoStates =
         | RequestDataBaseInformation    -> "Search Database "
 
 type Model = {
+    ///PageState
+    PageState               : PageState
     ///Data that needs to be persistent once loaded
     PersistentStorageState  : PersistentStorageState
     ///Error handling, Logging, etc.

src/Client/Pages/FilePicker/FilePickerView.fs

@@ -14,7 +14,7 @@ let update (filePickerMsg:FilePicker.Msg) (state: FilePicker.Model) (model: Mode
         let nextModel = {
             model with
                 Model.FilePickerState.FileNames = fileNames |> List.mapi (fun i x -> i + 1, x)
-                Model.ProtocolState.WidgetTypes = Routing.WidgetTypes.FilePicker
+                Model.PageState.SidebarPage = Routing.SidebarPage.FilePicker
         }
         let nextCmd = UpdateModel nextModel|> Cmd.ofMsg
         state, nextCmd

src/Client/Pages/ProtocolTemplates/ProtocolSearch.fs

@@ -15,14 +15,14 @@ module private HelperProtocolSearch =
             prop.children [
                 Html.ul [
                     Html.li [Html.a [
-                        prop.onClick (fun _ -> UpdateModel {model with Model.ProtocolState.WidgetTypes = Routing.WidgetTypes.Protocol} |> dispatch)
-                        prop.text (Routing.WidgetTypes.Protocol.AsStringRdbl)
+                        prop.onClick (fun _ -> UpdateModel {model with Model.PageState.SidebarPage = Routing.SidebarPage.Protocol} |> dispatch)
+                        prop.text (Routing.SidebarPage.Protocol.AsStringRdbl)
                     ]]
                     Html.li [
                         prop.className "is-active"
                         prop.children (Html.a [
-                            prop.onClick (fun _ -> UpdateModel {model with Model.ProtocolState.WidgetTypes = Routing.WidgetTypes.ProtocolSearch} |> dispatch)
-                            prop.text (Routing.WidgetTypes.ProtocolSearch.AsStringRdbl)
+                            prop.onClick (fun _ -> UpdateModel {model with Model.PageState.SidebarPage = Routing.SidebarPage.ProtocolSearch} |> dispatch)
+                            prop.text (Routing.SidebarPage.ProtocolSearch.AsStringRdbl)
                         ])
                     ]
                 ]

src/Client/Pages/ProtocolTemplates/ProtocolState.fs

@@ -58,7 +58,7 @@ module Protocol =
             let nextModel = {
                 model with
                     Model.ProtocolState.TemplatesSelected   = prots
-                    Model.ProtocolState.WidgetTypes         = Routing.WidgetTypes.Protocol
+                    Model.PageState.SidebarPage = Routing.SidebarPage.Protocol
             }
             state, Cmd.ofMsg (UpdateModel nextModel)
         | AddProtocol prot ->
@@ -70,7 +70,6 @@ module Protocol =
             let nextState = {
                 state with
                     TemplatesSelected   = templates
-                    WidgetTypes         = Routing.WidgetTypes.ProtocolSearch
             }
             nextState, Cmd.none
         | ProtocolIncreaseTimesUsed templateId ->

src/Client/Pages/ProtocolTemplates/SelectiveTemplateFromDB.fs

@@ -36,7 +36,7 @@ type SelectiveTemplateFromDB =
     /// <param name="dispatch"></param>
     static member ToProtocolSearchElement(model: Model) dispatch =
         Daisy.button.button [
-            prop.onClick(fun _ -> UpdateModel {model with Model.ProtocolState.WidgetTypes = Routing.WidgetTypes.ProtocolSearch} |> dispatch)
+            prop.onClick(fun _ -> UpdateModel {model with Model.PageState.SidebarPage = Routing.SidebarPage.ProtocolSearch} |> dispatch)
             button.primary
             button.block
             prop.text "Browse database"

src/Client/Routing.fs

@@ -4,7 +4,7 @@ open Elmish.UrlParser
 open Feliz
 
 [<RequireQualifiedAccess>]
-type WidgetTypes =
+type SidebarPage =
     | BuildingBlock
     | TermSearch
     | FilePicker

src/Client/SharedComponents/NavbarBurger.fs

@@ -52,7 +52,7 @@ type NavbarBurger =
     [<ReactComponent>]
     static member private Dropdown(isOpen, setIsOpen, model: Model.Model, dispatch) =
 
-        let navigateTo = fun (mainPage: Routing.MainPage) -> {model with Model.ProtocolState.MainPage = mainPage} |> Messages.UpdateModel |> dispatch
+        let navigateTo = fun (mainPage: Routing.MainPage) -> {model with Model.PageState.MainPage = mainPage} |> Messages.UpdateModel |> dispatch
         Components.BaseDropdown.Main(
             isOpen,
             setIsOpen,

src/Client/SidebarComponents/Tabs.fs

@@ -9,12 +9,12 @@ open Feliz.DaisyUI
 
 type Tabs =
 
-    static member private NavigationTab (pageLink: Routing.WidgetTypes) (model:Model) (dispatch:Msg-> unit) =
-        let isActive = pageLink = model.ProtocolState.WidgetTypes
+    static member private NavigationTab (pageLink: Routing.SidebarPage) (model:Model) (dispatch:Msg-> unit) =
+        let isActive = pageLink = model.PageState.SidebarPage
         Daisy.tab [
             if isActive then tab.active
             prop.className "navigation" // this class does not do anything, but disables <a> styling.
-            prop.onClick (fun e -> e.preventDefault(); UpdateModel { model with Model.ProtocolState.WidgetTypes = pageLink } |> dispatch)
+            prop.onClick (fun e -> e.preventDefault(); UpdateModel { model with Model.PageState.SidebarPage = pageLink } |> dispatch)
             prop.children (pageLink.AsIcon())
         ]
 
@@ -25,11 +25,11 @@ type Tabs =
             tabs.boxed
             prop.className "w-full"
             prop.children [
-                Tabs.NavigationTab Routing.WidgetTypes.BuildingBlock     model dispatch
-                Tabs.NavigationTab Routing.WidgetTypes.TermSearch        model dispatch
-                Tabs.NavigationTab Routing.WidgetTypes.Protocol          model dispatch
-                Tabs.NavigationTab Routing.WidgetTypes.FilePicker        model dispatch
-                Tabs.NavigationTab Routing.WidgetTypes.DataAnnotator     model dispatch
-                Tabs.NavigationTab Routing.WidgetTypes.JsonExport        model dispatch
+                Tabs.NavigationTab Routing.SidebarPage.BuildingBlock     model dispatch
+                Tabs.NavigationTab Routing.SidebarPage.TermSearch        model dispatch
+                Tabs.NavigationTab Routing.SidebarPage.Protocol          model dispatch
+                Tabs.NavigationTab Routing.SidebarPage.FilePicker        model dispatch
+                Tabs.NavigationTab Routing.SidebarPage.DataAnnotator     model dispatch
+                Tabs.NavigationTab Routing.SidebarPage.JsonExport        model dispatch
             ]
         ]

src/Client/Views/MainPageViews.fs

@@ -14,7 +14,7 @@ open MainPageUtil
 type MainPageView =
 
     static member DrawerSideContentItem (model: Model.Model, route: Routing.MainPage, onclick) =
-        let isActive = model.ProtocolState.MainPage = route
+        let isActive = model.PageState.MainPage = route
         Html.li [
             prop.onClick onclick
             prop.children [
@@ -35,7 +35,7 @@ type MainPageView =
                     prop.ariaLabel "Back to spreadsheet view"
                     button.link
                     button.sm
-                    prop.onClick (fun _ -> UpdateModel {model with Model.ProtocolState.MainPage = Routing.MainPage.Default} |> dispatch)
+                    prop.onClick (fun _ -> UpdateModel {model with Model.PageState.MainPage = Routing.MainPage.Default} |> dispatch)
                     prop.children [
                         Html.i [prop.className "fa-solid fa-arrow-left"]
                         Html.span "Back"
@@ -44,9 +44,9 @@ type MainPageView =
                 Html.ul [
                     prop.className "menu gap-y-1"
                     prop.children [
-                        MainPageView.DrawerSideContentItem(model, Routing.MainPage.Settings, fun _ -> UpdateModel {model with Model.ProtocolState.MainPage = Routing.MainPage.Settings} |> dispatch)
-                        MainPageView.DrawerSideContentItem(model, Routing.MainPage.About, fun _ -> UpdateModel {model with Model.ProtocolState.MainPage = Routing.MainPage.About} |> dispatch)
-                        MainPageView.DrawerSideContentItem(model, Routing.MainPage.PrivacyPolicy, fun _ -> UpdateModel {model with Model.ProtocolState.MainPage = Routing.MainPage.PrivacyPolicy} |> dispatch)
+                        MainPageView.DrawerSideContentItem(model, Routing.MainPage.Settings, fun _ -> UpdateModel {model with Model.PageState.MainPage = Routing.MainPage.Settings} |> dispatch)
+                        MainPageView.DrawerSideContentItem(model, Routing.MainPage.About, fun _ -> UpdateModel {model with Model.PageState.MainPage = Routing.MainPage.About} |> dispatch)
+                        MainPageView.DrawerSideContentItem(model, Routing.MainPage.PrivacyPolicy, fun _ -> UpdateModel {model with Model.PageState.MainPage = Routing.MainPage.PrivacyPolicy} |> dispatch)
                     ]
                 ]
             ]
@@ -78,7 +78,7 @@ type MainPageView =
 
             Html.div [
                 prop.ariaLabel "logo"
-                prop.onClick (fun _ -> UpdateModel {model with Model.ProtocolState.MainPage = Routing.MainPage.Default} |> dispatch)
+                prop.onClick (fun _ -> UpdateModel {model with Model.PageState.MainPage = Routing.MainPage.Default} |> dispatch)
                 prop.className "cursor-pointer"
                 prop.children [
                     Html.img [
@@ -90,7 +90,7 @@ type MainPageView =
         ]
 
     static member MainContent(model: Model.Model, dispatch) =
-        match model.ProtocolState.MainPage with
+        match model.PageState.MainPage with
         | Routing.MainPage.Settings ->
             Pages.Settings.Main(model, dispatch)
         | Routing.MainPage.About ->

src/Client/Views/SidebarView.fs

@@ -14,26 +14,26 @@ type SidebarView =
         Html.div [
             prop.className "grow overflow-y-auto"
             prop.children [
-                match model.ProtocolState with
-                | {WidgetTypes = Routing.WidgetTypes.BuildingBlock } ->
+                match model.PageState with
+                | {SidebarPage = Routing.SidebarPage.BuildingBlock } ->
                     BuildingBlock.Core.addBuildingBlockComponent model dispatch
 
-                | {WidgetTypes = Routing.WidgetTypes.TermSearch } ->
+                | {SidebarPage = Routing.SidebarPage.TermSearch } ->
                     TermSearch.Main (model, dispatch)
 
-                | {WidgetTypes = Routing.WidgetTypes.FilePicker } ->
+                | {SidebarPage = Routing.SidebarPage.FilePicker } ->
                     FilePicker.filePickerComponent model dispatch
 
-                | {WidgetTypes = Routing.WidgetTypes.Protocol } ->
+                | {SidebarPage = Routing.SidebarPage.Protocol } ->
                     Protocol.Templates.Main (model, dispatch)
 
-                | {WidgetTypes = Routing.WidgetTypes.DataAnnotator } ->
+                | {SidebarPage = Routing.SidebarPage.DataAnnotator } ->
                     Pages.DataAnnotator.Main(model, dispatch)
 
-                | {WidgetTypes = Routing.WidgetTypes.JsonExport } ->
+                | {SidebarPage = Routing.SidebarPage.JsonExport } ->
                     JsonExporter.Core.FileExporter.Main(model, dispatch)
 
-                | {WidgetTypes = Routing.WidgetTypes.ProtocolSearch } ->
+                | {SidebarPage = Routing.SidebarPage.ProtocolSearch } ->
                     Protocol.SearchContainer.Main model dispatch
             ]
         ]