diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 16168e0cd..0fd415185 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -6,7 +6,6 @@ open Fable.Helpers.React open Fable.Helpers.React.Props open Button open bts.api.admin -open ReactGrid open DataGrid open bts.api.orderman open Fable.Import @@ -66,12 +65,11 @@ let generalView model dispatch = Fields.checkbox "Is Active" account.isActive [] (IsActive >> Update >> dispatch) ] - let clipLimitsView model dispatch = mappedDataGridWithAddDelete "Clip Limits" ClipLimits.descriptor - [ EnableCellSelect true ] + [ ReactGrid.EnableCellSelect true ] model.scratch.securityClipLimits.limit (DeleteClipLimit>>dispatch) (ClipLimits>>dispatch) @@ -80,7 +78,7 @@ let productLimits model dispatch = mappedDataGridWithAddDelete "Product Limits" ProductLimits.descriptor - [ EnableCellSelect true; MinHeight 200 ] + [ ReactGrid.EnableCellSelect true; ReactGrid.MinHeight 200 ] model.scratch.productPositionLimits (DeleteProductLimit>>dispatch) (ProductLimits>>dispatch) @@ -89,7 +87,7 @@ let securityLimits model dispatch = mappedDataGridWithAddDelete "Security Limits" SecurityLimits.descriptor - [ EnableCellSelect true; MinHeight 200 ] + [ ReactGrid.EnableCellSelect true; ReactGrid.MinHeight 200 ] model.scratch.securityPositionLimits (DeleteSecurityLimit>>dispatch) (SecurityLimits>>dispatch) @@ -118,7 +116,7 @@ let exchangeSettings model dispatch = let tabContent model dispatch = - div [] [ + div [Key (string model.scratch.id)] [ (match model.tab with | General -> generalView model dispatch | ClipLimitsTab -> clipLimitsView model dispatch diff --git a/src/web/ui/src/App.fs b/src/web/ui/src/App.fs index df37fb8a9..6a62c36a2 100644 --- a/src/web/ui/src/App.fs +++ b/src/web/ui/src/App.fs @@ -122,5 +122,5 @@ Program.mkProgram init update root |> Program.withDebugger |> Program.withHMR #endif -|> Program.withReact "elmish-app" +|> Program.withReactUnoptimized "elmish-app" |> Program.run diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index 87dc482a1..e54aca411 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -107,12 +107,14 @@ let orderRoutingTabContent (model:Model) (dispatch:Msg->Unit) = ] let tabContent (model:Model) (dispatch:Msg->Unit) = - match model.currentTab, (State.userIsSelected model.scratchUser State.defaultScratchUser) with - | _, false -> p [Style [ Color "Red" ]] [ str "Select a User" ] - | Tab.General, true -> generalTabContent model dispatch - | Tab.Accounts, true -> accountsTabContent model dispatch - | Tab.MDEntitlements, true -> mdEntitlementsTabContent model dispatch - | Tab.OrderRouting, true -> orderRoutingTabContent model dispatch + div [Key (string model.scratchUser.id)] [ + (match model.currentTab, (State.userIsSelected model.scratchUser State.defaultScratchUser) with + | _, false -> p [Style [ Color "Red" ]] [ str "Select a User" ] + | Tab.General, true -> generalTabContent model dispatch + | Tab.Accounts, true -> accountsTabContent model dispatch + | Tab.MDEntitlements, true -> mdEntitlementsTabContent model dispatch + | Tab.OrderRouting, true -> orderRoutingTabContent model dispatch) + ] let userControls (usersList:BTSUser list) (currentUser:BTSUser) (dispatch:Msg->Unit) (disabled:bool)= div [ ClassName "field is-grouped has-addons" ]