Enable naming of radioGroup to enable usage in swate alpha

nfdi4plants · Dec 4, 2024 · 95dcf24 · 95dcf24
1 parent 9cf7d21
commit 95dcf24
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 6 deletions.
diff --git a/src/Client/MainComponents/Widgets.fs b/src/Client/MainComponents/Widgets.fs
@@ -6,6 +6,7 @@ open Browser.Types
 open LocalStorage.Widgets
 open Modals
 open Types.TableImport
+open Types.JsonImport
 
 module private InitExtensions =
 
@@ -213,9 +214,13 @@ type Widget =
     [<ReactComponent>]
     static member Templates (model: Model, dispatch, rmv: MouseEvent -> unit) =
         let templates, setTemplates = React.useState(model.ProtocolState.Templates)
-        let selectedColumnsLength = if model.ProtocolState.TemplateSelected.IsSome then model.ProtocolState.TemplateSelected.Value.Table.Columns.Length else 0
-        let selectedColumns, setSelectedColumns = React.useState(SelectedColumns.init selectedColumnsLength)
         let config, setConfig = React.useState(TemplateFilterConfig.init)
+        let selectedColumnsLength =
+            if model.ProtocolState.TemplateSelected.IsSome then
+                model.ProtocolState.TemplateSelected.Value.Table.Columns.Length
+            else 0
+        let selectedColumns, setSelectedColumns = React.useState(SelectedColumns.init selectedColumnsLength)
+        let importTypeState, setImportTypeState = React.useState(SelectiveImportModalState.init)
         let filteredTemplates = Protocol.Search.filterTemplates (templates, config)
         React.useEffectOnce(fun _ -> Messages.Protocol.GetAllProtocolsRequest |> Messages.ProtocolMsg |> dispatch)
         React.useEffect((fun _ -> setTemplates model.ProtocolState.Templates), [|box model.ProtocolState.Templates|])
@@ -229,7 +234,35 @@ type Widget =
                 Html.div [
                     prop.style [style.maxHeight (length.px 350); style.overflow.auto]
                     prop.children [
-                        SelectiveTemplateFromDBModal.Main(model, dispatch)
+                        SidebarComponents.SidebarLayout.LogicContainer [
+                            Html.div [
+                                SelectiveTemplateFromDBModal.ToProtocolSearchElement model dispatch
+                            ]
+                            if model.ProtocolState.TemplateSelected.IsSome then                    
+                                Html.div [
+                                    SelectiveImportModal.RadioPluginsBox(
+                                        "Import Type",
+                                        "fa-solid fa-cog",
+                                        importTypeState.ImportType,
+                                        "importType ",
+                                        [|
+                                            ARCtrl.TableJoinOptions.Headers, " Column Headers";
+                                            ARCtrl.TableJoinOptions.WithUnit, " ..With Units";
+                                            ARCtrl.TableJoinOptions.WithValues, " ..With Values";
+                                        |],
+                                        fun importType -> {importTypeState with ImportType = importType} |> setImportTypeState
+                                    )
+                                ]
+                                Html.div [
+                                    ModalElements.Box(
+                                        model.ProtocolState.TemplateSelected.Value.Name,
+                                        "",
+                                        SelectiveTemplateFromDBModal.displaySelectedProtocolElements(model, selectedColumns, setSelectedColumns, dispatch, false))
+                                ]
+                            Html.div [
+                                SelectiveTemplateFromDBModal.AddFromDBToTableButton model selectedColumns importTypeState dispatch
+                            ]
+                        ]
                     ]
                 ]
             ]

diff --git a/src/Client/Modals/ModalElements.fs b/src/Client/Modals/ModalElements.fs
@@ -27,7 +27,7 @@ type ModalElements =
             prop.text text
         ]
 
-    static member RadioPlugin(radioGroup: string, txt:string, isChecked, onChange: bool -> unit, ?isDisabled: bool) =
+    static member RadioPlugin(radioGroup: string, txt: string, isChecked, onChange: bool -> unit, ?isDisabled: bool) =
         let isDisabled = defaultArg isDisabled false
         Daisy.formControl [
             Daisy.label [

diff --git a/src/Client/Modals/SelectiveImportModal.fs b/src/Client/Modals/SelectiveImportModal.fs
@@ -13,10 +13,10 @@ open Components
 
 type SelectiveImportModal =
 
-    static member RadioPluginsBox(boxName, icon, importType: TableJoinOptions, radioData: (TableJoinOptions * string)[], setImportType: TableJoinOptions -> unit) =
+    static member RadioPluginsBox(boxName, icon, importType: TableJoinOptions, radioGroupName, radioData: (TableJoinOptions * string)[], setImportType: TableJoinOptions -> unit) =
         let myradio(target: TableJoinOptions, txt: string) =
             let isChecked = importType = target
-            ModalElements.RadioPlugin("importType", txt, isChecked, fun (b: bool) -> if b then setImportType target)
+            ModalElements.RadioPlugin(radioGroupName, txt, isChecked, fun (b: bool) -> if b then setImportType target)
         ModalElements.Box (boxName, icon, React.fragment [
             Html.div [
                 for i in 0..radioData.Length-1 do
@@ -206,6 +206,7 @@ type SelectiveImportModal =
                             "Import Type",
                             "fa-solid fa-cog",
                             state.ImportType,
+                            "importType",
                             [|
                                 ARCtrl.TableJoinOptions.Headers,    " Column Headers";
                                 ARCtrl.TableJoinOptions.WithUnit,   " ..With Units";

diff --git a/src/Client/Pages/ProtocolTemplates/SelectiveTemplateFromDB.fs b/src/Client/Pages/ProtocolTemplates/SelectiveTemplateFromDB.fs
@@ -74,6 +74,7 @@ type SelectiveTemplateFromDBModal =
                         "Import Type",
                         "fa-solid fa-cog",
                         importTypeState.ImportType,
+                        "importType",
                         [|
                             ARCtrl.TableJoinOptions.Headers, " Column Headers";
                             ARCtrl.TableJoinOptions.WithUnit, " ..With Units";