update layout

nfdi4plants · Dec 3, 2024 · c2064a5 · c2064a5
1 parent 450cda8
commit c2064a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/Client/Modals/SelectiveTemplateFromDB.fs b/src/Client/Modals/SelectiveTemplateFromDB.fs
@@ -66,7 +66,7 @@ type SelectiveTemplateFromDBModal =
             else 0
         let selectedColumns, setSelectedColumns = React.useState(SelectedColumns.init length)
         let importTypeState, setImportTypeState = React.useState(SelectiveImportModalState.init)
-        Html.div [
+        SelectiveTemplateFromDBModal.LogicContainer [
             Html.div [
                 Daisy.button.button [
                     prop.onClick(fun _ -> UpdateModel { model with Model.PageState.SidebarPage = Routing.SidebarPage.ProtocolSearch } |> dispatch)
@@ -75,9 +75,8 @@ type SelectiveTemplateFromDBModal =
                     prop.text "Browse database"
                 ]
                 if model.ProtocolState.TemplateSelected.IsSome then
-                    SelectiveTemplateFromDBModal.LogicContainer [
+                    Html.div [
                         Html.div [
-                            SelectiveTemplateFromDBModal.displaySelectedProtocolElements(model, selectedColumns, setSelectedColumns, dispatch, false)
                             ModalElements.RadioPluginsBox(
                                 "Import Type",
                                 "fa-solid fa-cog",
@@ -89,8 +88,14 @@ type SelectiveTemplateFromDBModal =
                                 |],
                                 fun importType -> {importTypeState with ImportType = importType} |> setImportTypeState
                             )
+                            ModalElements.Box(
+                                model.ProtocolState.TemplateSelected.Value.Name,
+                                "",
+                                SelectiveTemplateFromDBModal.displaySelectedProtocolElements(model, selectedColumns, setSelectedColumns, dispatch, false))
                         ]
                     ]
-                SelectiveTemplateFromDBModal.addFromDBToTableButton model selectedColumns importTypeState dispatch
+                Html.div [
+                    SelectiveTemplateFromDBModal.addFromDBToTableButton model selectedColumns importTypeState dispatch
+                ]
             ]
         ]
diff --git a/src/Client/Pages/ProtocolTemplates/TemplateFromFile.fs b/src/Client/Pages/ProtocolTemplates/TemplateFromFile.fs
@@ -106,10 +106,6 @@ type TemplateFromFile =
                 Modals.Import.SelectiveImportModal.Main (af, dispatch, rmv = (fun _ -> TemplateFromFileState.init() |> setState))
             | None -> Html.none
             Html.div [
-                SidebarComponents.SidebarLayout.Description (Html.p [
-                    Html.b "Import JSON files."
-                    Html.text " You can use \"Json Export\" to create these files from existing Swate tables. "
-                ])
                 Daisy.join [
                     prop.className "w-full"
                     prop.children [