code cleanup 🧹

src/Client/Client.fs

@@ -3,12 +3,10 @@ module Client
 open Elmish.Navigation
 open Elmish.UrlParser
 open Elmish
-open Elmish.React
-open Fable.React
 open Messages
+open Model
 open Update
 open Fable.Core.JsInterop
-open Routing
 let _ = importSideEffects "./style.scss"
 
 ///<summary> This is a basic test case used in Client unit tests </summary>
@@ -46,7 +44,7 @@ let View (model : Model) (dispatch : Msg -> unit) =
         ]
     )
 
-let ARCitect_subscription (initial: Messages.Model) : (SubId * Subscribe<Messages.Msg>) list =
+let ARCitect_subscription (initial: Model) : (SubId * Subscribe<Messages.Msg>) list =
     let subscription (dispatch: Messages.Msg -> unit) : System.IDisposable =
         let rmv = ARCitect.Interop.initEventListener (ARCitect.ARCitect.EventHandler dispatch)
         { new System.IDisposable with

src/Client/Client.fsproj

@@ -25,10 +25,8 @@
         <Compile Include="Api.fs" />
         <Compile Include="Routing.fs" />
         <Compile Include="OfficeInterop\InteropLogging.fs" />
-        <Compile Include="OfficeInterop\CustomXmlTypes.fs" />
         <Compile Include="OfficeInterop\Functions\Indexing.fs" />
         <Compile Include="OfficeInterop\Functions\BuildingBlockFunctions.fs" />
-        <Compile Include="OfficeInterop\Functions\CustomXmlFunctions.fs" />
         <Compile Include="OfficeInterop\HelperFunctions.fs" />
         <Compile Include="OfficeInterop\OfficeInterop.fs" />
         <Compile Include="States\ARCitect.fs" />
@@ -94,7 +92,7 @@
         <Compile Include="MainComponents\Metadata\Assay.fs" />
         <Compile Include="MainComponents\Metadata\Study.fs" />
         <Compile Include="MainComponents\Metadata\Investigation.fs" />
-        <Compile Include="MainComponents\NoTablesElement.fs" />
+        <Compile Include="MainComponents\NoFileElement.fs" />
         <Compile Include="MainComponents\ContextMenu.fs" />
         <Compile Include="MainComponents\Cells.fs" />
         <Compile Include="MainComponents\KeyboardShortcuts.fs" />

src/Client/MainComponents/Cells.fs

@@ -9,6 +9,7 @@ open Messages
 open Shared
 open ARCtrl
 open Components
+open Model
 
 module private CellComponents =
 
@@ -106,7 +107,7 @@ module private EventPresets =
 
     open Shared
 
-    let onClickSelect (index: int*int, isIdle:bool, selectedCells: Set<int*int>, model:Messages.Model, dispatch)=
+    let onClickSelect (index: int*int, isIdle:bool, selectedCells: Set<int*int>, model:Model, dispatch)=
         fun (e: Browser.Types.MouseEvent) ->
             // don't select cell if active(editable)
             if isIdle then

src/Client/MainComponents/ContextMenu.fs

@@ -4,7 +4,7 @@ open Feliz
 open Feliz.Bulma
 open Spreadsheet
 open ARCtrl
-open Messages
+open Model
 
 type private ContextFunctions = {
     DeleteRow       : (Browser.Types.MouseEvent -> unit) -> Browser.Types.MouseEvent -> unit

src/Client/MainComponents/FooterTabs.fs

@@ -3,6 +3,7 @@ module MainComponents.FooterTabs
 open Feliz
 open Feliz.Bulma
 open ARCtrl
+open Model
 
 type private FooterTab = {
     IsEditable: bool
@@ -95,7 +96,7 @@ let private dragleave_handler(state, setState) = fun (e: Browser.Types.DragEvent
     setState {state with IsDraggedOver = false}
 
 [<ReactComponent>]
-let Main (index: int, tables: ArcTables, model: Messages.Model, dispatch: Messages.Msg -> unit) =
+let Main (index: int, tables: ArcTables, model: Model, dispatch: Messages.Msg -> unit) =
     let table = tables.GetTableAt(index)
     let state, setState = React.useState(FooterTab.init(table.Name))
     let id = $"ReorderMe_{index}_{table.Name}"
@@ -161,7 +162,7 @@ let Main (index: int, tables: ArcTables, model: Messages.Model, dispatch: Messag
     ]
 
 [<ReactComponent>]
-let MainMetadata(model: Messages.Model, dispatch: Messages.Msg -> unit) =
+let MainMetadata(model: Model, dispatch: Messages.Msg -> unit) =
     let order = 0
     let id = "Metadata-Tab"
     let nav = Spreadsheet.ActiveView.Metadata
@@ -177,7 +178,7 @@ let MainMetadata(model: Messages.Model, dispatch: Messages.Msg -> unit) =
     ]
 
 [<ReactComponent>]
-let MainPlus(model: Messages.Model, dispatch: Messages.Msg -> unit) =
+let MainPlus(model: Model, dispatch: Messages.Msg -> unit) =
     let state, setState = React.useState(FooterTab.init())
     let order = System.Int32.MaxValue-1 // MaxValue will be sidebar toggle
     let id = "Add-Spreadsheet-Button"
@@ -206,7 +207,7 @@ let MainPlus(model: Messages.Model, dispatch: Messages.Msg -> unit) =
         ]
     ]
 
-let ToggleSidebar(model: Messages.Model, dispatch: Messages.Msg -> unit) =
+let ToggleSidebar(model: Model, dispatch: Messages.Msg -> unit) =
     let show = model.PersistentStorageState.ShowSideBar
     let order = System.Int32.MaxValue
     let id = "Toggle-Sidebar-Button"

src/Client/MainComponents/Metadata/Assay.fs

@@ -1,13 +1,14 @@
-module MainComponents.Metadata.Assay
+module MainComponents.Metadata.Assay
 
 open Feliz
 open Feliz.Bulma
 open Messages
 open ARCtrl
 open Shared
+open Model
 
 [<ReactComponent>]
-let Main(assay: ArcAssay, model: Messages.Model, dispatch: Msg -> unit) = 
+let Main(assay: ArcAssay, model: Model, dispatch: Msg -> unit) = 
     Bulma.section [
         FormComponents.TextInput (
             assay.Identifier,

src/Client/MainComponents/Metadata/Investigation.fs

@@ -9,8 +9,9 @@ open Browser.Types
 open Fable.Core.JsInterop
 open ARCtrl
 open Shared
+open Model
 
-let Main(inv: ArcInvestigation, model: Messages.Model, dispatch: Msg -> unit) = 
+let Main(inv: ArcInvestigation, model: Model, dispatch: Msg -> unit) = 
     Bulma.section [ 
         FormComponents.TextInput (
             inv.Identifier,

src/Client/MainComponents/Metadata/Study.fs

@@ -5,8 +5,9 @@ open Feliz.Bulma
 open Messages
 open ARCtrl
 open Shared
+open Model
 
-let Main(study: ArcStudy, assignedAssays: ArcAssay list, model: Messages.Model, dispatch: Msg -> unit) = 
+let Main(study: ArcStudy, assignedAssays: ArcAssay list, model: Model, dispatch: Msg -> unit) = 
     Bulma.section [ 
         FormComponents.TextInput (
             study.Identifier,

src/Client/MainComponents/Metadata/Template.fs

@@ -1,4 +1,4 @@
-module MainComponents.Metadata.Template
+module MainComponents.Metadata.Template
 
 open Feliz
 open Feliz.Bulma
@@ -10,9 +10,10 @@ open Fable.Core.JsInterop
 open ARCtrl
 open Shared
 open ARCtrl.Template
+open Model
 
 
-let Main(template: Template, model: Messages.Model, dispatch: Msg -> unit) = 
+let Main(template: Template, model: Model, dispatch: Msg -> unit) = 
     Bulma.section [
         FormComponents.GUIDInput (
             template.Id,

src/Client/MainComponents/Navbar.fs

@@ -8,6 +8,7 @@ open LocalHistory
 open Messages
 open Components.QuickAccessButton
 open MainComponents
+open Model
 
 let private quickAccessButtonListStart (state: LocalHistory.Model) dispatch =
     Html.div [
@@ -112,7 +113,7 @@ let private WidgetNavbarList (model, dispatch, addWidget: Widget -> unit) =
 
 
 [<ReactComponent>]
-let Main(model: Messages.Model, dispatch, widgets, setWidgets) =
+let Main(model: Model, dispatch, widgets, setWidgets) =
     let addWidget (widget: Widget) = 
         let add (widget) widgets = widget::widgets |> List.rev |> setWidgets
         if widgets |> List.contains widget then