diff --git a/src/web/ui/src/Users/View.fs b/src/web/ui/src/Users/View.fs index 52b909315..28f16abbf 100644 --- a/src/web/ui/src/Users/View.fs +++ b/src/web/ui/src/Users/View.fs @@ -49,16 +49,19 @@ let accountNameLookup (accountsList:BTSAccount list) (id:string) = let accountsTabContent (model:Model) (dispatch:Msg->Unit) = let accountPermissions = model.scratchUser.userData.accountPermissions.accountPermissions - let keys = Global.Reflection.keys accountPermissions - let rws:TableControl.row list = [for i in keys do yield { + let keys = + Global.Reflection.keys accountPermissions + |> Array.map (fun i -> i, accountNameLookup model.accountsList i) + Fable.Import.Browser.console.log keys + let rws:TableControl.row list = [for (key,name) in keys do yield { cells = [ { - content = str (accountNameLookup model.accountsList i) + content = str name className = "" isHeader = false } { - content = Button.button "" "is-light" "times" Button.Enabled (fun _ -> i |> (RemoveAccount >> UpdateField >> dispatch)) + content = Button.button "" "is-light" "times" Button.Enabled (fun _ -> key |> (RemoveAccount >> UpdateField >> dispatch)) className = "" isHeader = false } @@ -67,10 +70,19 @@ let accountsTabContent (model:Model) (dispatch:Msg->Unit) = header = None } ] - let acclist0 = List.filter (fun a -> a.isPresent) model.accountsList - let acclist1 = List.map (fun a -> a.id.ToString(), a.name) acclist0 - let accMap = Map.ofList(acclist1) - let rows = rws @ [{cells = [ {content = Fields.mapSelect "" accMap "Add Account" (AddAccount >> UpdateField >> dispatch); className = ""; isHeader = true } ]; className = ""; header = None }] + let keymap = + keys |> Array.map snd |> Set.ofArray + let accMap = + model.accountsList + |> List.filter (fun a -> a.isPresent && not <| keymap.Contains a.name) + |> List.map (fun a -> a.id.ToString(), a.name) + |> Map.ofList + Fable.Import.Browser.console.log accMap + + let rows = + if not (Map.isEmpty accMap) then + rws @ [{cells = [ {content = Fields.mapSelect "" accMap "Add Account" (AddAccount >> UpdateField >> dispatch); className = ""; isHeader = true } ]; className = ""; header = None }] + else rws //let headers:TableControl.row = {cells = [ {content = str "Accounts"; className = ""; isHeader = true }; {content = str "Remove"; className = ""; isHeader = true } ]; className = ""; header = None } div [] [