From 32ff893f99576a486d1c22da15317e4e6dc815c3 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Sat, 12 May 2018 22:27:17 -0400 Subject: [PATCH] Replace "obj" with JSMap typ which emulates Map but is backed by a plain JS object --- .../service_compiler/templates/fs/fable.fs | 4 +- src/web/ui/src/Access.fs | 2 +- src/web/ui/src/Users/State.fs | 48 ++++++-------- src/web/ui/src/Util/JSMap.fs | 63 +++++++++++++++++++ src/web/ui/src/ui.fsproj | 1 + 5 files changed, 85 insertions(+), 33 deletions(-) create mode 100644 src/web/ui/src/Util/JSMap.fs diff --git a/src/lib/api/service_compiler/templates/fs/fable.fs b/src/lib/api/service_compiler/templates/fs/fable.fs index d7e579aab..8cd5c3385 100644 --- a/src/lib/api/service_compiler/templates/fs/fable.fs +++ b/src/lib/api/service_compiler/templates/fs/fable.fs @@ -1,6 +1,7 @@ // Generated code -- You probably should not edit namespace rec {{package}} open Fable.Core +open JSMap open google.protobuf {{#each enum_type}} @@ -28,8 +29,7 @@ type {{name}} = { {{#each field}} {{#if type.isdict}} - // Use Fable.Core.DynamicExtensions - {{fsescape nAme}} : obj + {{fsescape nAme}} : JSMap<{{type.fstype}}> {{else}} {{#if type.islist}} {{fsescape nAme}} : {{type.fstype}}[] diff --git a/src/web/ui/src/Access.fs b/src/web/ui/src/Access.fs index 021a1422e..5e7dd16fe 100644 --- a/src/web/ui/src/Access.fs +++ b/src/web/ui/src/Access.fs @@ -66,7 +66,7 @@ module Accounts = investmentDecisionId = "" executionDecisionId = "" clientId = "" - miscTags = obj() + miscTags = JSMap.empty } iceAccountData = { nybitHouse="" diff --git a/src/web/ui/src/Users/State.fs b/src/web/ui/src/Users/State.fs index 4a69fb890..8120c04d7 100644 --- a/src/web/ui/src/Users/State.fs +++ b/src/web/ui/src/Users/State.fs @@ -11,7 +11,6 @@ open System.Xml open Fable.PowerPack.PromiseImpl open bts.api.admin open Global -open Fable.Core.DynamicExtensions let getAdminData (admin:IAdminService) = Cmd.ofPromise @@ -40,7 +39,7 @@ let defaultScratchUser = { } userData = { - accountPermissions = { accountPermissions = obj() } + accountPermissions = { accountPermissions = JSMap.empty } exchangeUserData = { cmeData = { @@ -49,7 +48,7 @@ let defaultScratchUser = { smpId = "" textA = "" textB = "" - miscTags = Map.empty + miscTags = JSMap.empty smpInstruction = "" maxOrderRatePerConnection = "" } @@ -136,8 +135,6 @@ let createUser (admin:IAdminService) (user:BTSUser) = promise { return ErrorOccured (sprintf "Error creating user: %s" result.errorText) } -let mapMiscTags (str:string) = ofJson str - let applyUpdate (field:UserField) (user:BTSUser) = match field with | Name n -> { user with name = n } @@ -148,7 +145,9 @@ let applyUpdate (field:UserField) (user:BTSUser) = | SMPID smpid -> { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with cmeData = { user.userData.exchangeUserData.cmeData with smpId = smpid }}}} | SMPInstruction smpi -> { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with cmeData = { user.userData.exchangeUserData.cmeData with smpInstruction = smpi }}}} | MaxOrderRatePerConnection morpc -> { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with cmeData = { user.userData.exchangeUserData.cmeData with maxOrderRatePerConnection = morpc }}}} - | MiscTags mt -> { user with userData = { user.userData with exchangeUserData = { user.userData.exchangeUserData with cmeData = { user.userData.exchangeUserData.cmeData with miscTags = mapMiscTags mt }}}} + | MiscTags _ -> + // pending revamp of map edit control + user | CBOTEntitlement ent -> { user with userData = { user.userData with exchangeMdEntitlementData = { user.userData.exchangeMdEntitlementData with cmeData = { user.userData.exchangeMdEntitlementData.cmeData with cbotEntitlement = { user.userData.exchangeMdEntitlementData.cmeData.cbotEntitlement with canView = ent }}}}} | CMEEntitlement ent -> { user with userData = { user.userData with exchangeMdEntitlementData = { user.userData.exchangeMdEntitlementData with cmeData = { user.userData.exchangeMdEntitlementData.cmeData with cmeEntitlement = { user.userData.exchangeMdEntitlementData.cmeData.cmeEntitlement with canView = ent }}}}} | NYMEXEntitlement ent -> { user with userData = { user.userData with exchangeMdEntitlementData = { user.userData.exchangeMdEntitlementData with cmeData = { user.userData.exchangeMdEntitlementData.cmeData with nymexEntitlement = { user.userData.exchangeMdEntitlementData.cmeData.nymexEntitlement with canView = ent }}}}} @@ -156,32 +155,21 @@ let applyUpdate (field:UserField) (user:BTSUser) = | COMEXEntitlement ent -> { user with userData = { user.userData with exchangeMdEntitlementData = { user.userData.exchangeMdEntitlementData with cmeData = { user.userData.exchangeMdEntitlementData.cmeData with comexEntitlement = { user.userData.exchangeMdEntitlementData.cmeData.comexEntitlement with canView = ent }}}}} | CMEEuropeEntitlement ent ->{ user with userData = { user.userData with exchangeMdEntitlementData = { user.userData.exchangeMdEntitlementData with cmeData = { user.userData.exchangeMdEntitlementData.cmeData with cmeEuropeEntitlement = { user.userData.exchangeMdEntitlementData.cmeData.cmeEuropeEntitlement with canView = ent }}}}} | AddAccount id -> - let pairs = Reflection.objToPairs user.userData.accountPermissions.accountPermissions - let tmpPermissions = { - tradingPermission = { - submitMarketOrders = true - submitGtcOrders = false - algoTradingPermission = { - submitIcebergOrders = false - submitTimeBoxOrders = false - submitSpreaderOrders = false - } - } - adminPermission = { hasPermissions = true } - } - let newPairs = (id, tmpPermissions) :: List.ofArray pairs - let tempobj = Reflection.pairsToObj newPairs - { user with userData = { user.userData with accountPermissions = { user.userData.accountPermissions with accountPermissions = tempobj }}} + let tmpPermissions = + { adminPermission = { hasPermissions = true } + tradingPermission = + { submitMarketOrders = true + submitGtcOrders = false + algoTradingPermission = + { submitIcebergOrders = false + submitTimeBoxOrders = false + submitSpreaderOrders = false } } } + let newAccountPermissions = JSMap.add id tmpPermissions user.userData.accountPermissions.accountPermissions + let newUserData = { user.userData with accountPermissions = { user.userData.accountPermissions with accountPermissions = newAccountPermissions } } + { user with userData = newUserData } | RemoveAccount id -> - let pairs = Reflection.objToPairs user.userData.accountPermissions.accountPermissions - let lst = List.ofArray pairs - let newLst = List.filter (fun a -> - let b, _ = a - b <> id - ) lst - - let newObj = Reflection.pairsToObj newLst + let newObj = JSMap.remove id user.userData.accountPermissions.accountPermissions { user with userData = { user.userData with accountPermissions = { user.userData.accountPermissions with accountPermissions = newObj }}} let update msg (model:Users.Types.Model) : Model * Cmd = diff --git a/src/web/ui/src/Util/JSMap.fs b/src/web/ui/src/Util/JSMap.fs new file mode 100644 index 000000000..f1330bb9e --- /dev/null +++ b/src/web/ui/src/Util/JSMap.fs @@ -0,0 +1,63 @@ +[] +module JSMap +open Fable.Core.JsInterop +open Fable.Core.DynamicExtensions +open Fable.Core + +module private Interop = + open Fable.Core + open Fable.Core.JsInterop + [] + let keys _ : string[] = jsNative + + [] + let values<'a> _ : 'a[] = jsNative + let pairs<'a> o = + Array.zip (keys o) (values<'a> o) + let spread<'a> (a:'a) (b:obj) : 'a = Imports.DynamicService.merge (a,b) + + +type Key = string +[] +type JSMap<'a> = | JSMap of obj + +let ofArray<'a> (a:(Key*'a)[]) : JSMap<'a> = JSMap a +let toArray<'a> (m:JSMap<'a>) : (Key*'a)[] = + match m with | JSMap j -> Interop.pairs<'a> j + +let ofList<'a> (l: (Key*'a) list) = JSMap l +let toList m = m |> toArray |> List.ofArray + + +let add<'a> (k:Key) (v:'a) (map:JSMap<'a>) = + Interop.spread map (createObj [k ==> v]) + +let empty<'a> : JSMap<'a> = JSMap <| createObj [] + +let exists<'a> pred map = + let pairs = Interop.pairs<'a> map + Array.exists pred pairs + +let filter<'a> pred map = + Interop.pairs<'a> map + |> Array.where pred + |> ofArray + +let find<'a> key (map:JSMap<'a>) = + match map with + | JSMap o -> + o.[key] |> unbox<'a> + +let containsKey key (map:JSMap<'a>) = + Interop.keys map |> Array.contains key + +let remove<'a> key (map:JSMap<'a>) = + match map with + | JSMap m -> + Interop.pairs m + |> Array.where (fun (k,_) -> k <> key) + |> ofArray<'a> + +let tryFind key (map:JSMap<'a>) : 'a option = + map.[key] |> unbox + diff --git a/src/web/ui/src/ui.fsproj b/src/web/ui/src/ui.fsproj index 134533165..7830fb8e4 100644 --- a/src/web/ui/src/ui.fsproj +++ b/src/web/ui/src/ui.fsproj @@ -6,6 +6,7 @@ +