Add easy to access navigation option to advanced search (Issue #91).

nfdi4plants · Jan 27, 2021 · 4e0d0c9 · 4e0d0c9
1 parent 374e326
commit 4e0d0c9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/Client/CustomComponents/AdvancedSearch.fs b/src/Client/CustomComponents/AdvancedSearch.fs
@@ -115,13 +115,16 @@ let advancedTermSearchComponent (model:Model) (dispatch: Msg -> unit) =
                         ]
                     ]
                     Dropdown.menu [Props[colorControl model.SiteStyleState.ColorMode];] [
-                        Dropdown.content [] [
+                        Dropdown.content [
+                            Props [Style [MaxHeight "180px"; OverflowY OverflowOptions.Scroll; MarginRight "-100px"; PaddingRight "100px"; Border "1px solid darkgrey"]]
+                        ] [
                             // all ontologies found in database
                             yield createOntologyDropdownItem model dispatch None
                             yield! (
                                 model.PersistentStorageState.SearchableOntologies
                                 |> Array.map snd
                                 |> Array.toList
+                                |> List.sortBy (fun o -> o.Name)
                                 |> List.map (fun ont -> createOntologyDropdownItem model dispatch (Some ont))
                             )
                         ]

diff --git a/src/Client/Views/AddBuildingBlockView.fs b/src/Client/Views/AddBuildingBlockView.fs
@@ -89,10 +89,10 @@ let addBuildingBlockComponent (model:Model) (dispatch:Msg -> unit) =
         OnKeyDown (fun k -> if k.key = "Enter" then k.preventDefault())
     ] [
         Label.label [Label.Size Size.IsLarge; Label.Props [Style [Color model.SiteStyleState.ColorMode.Accent]]][ str "Annotation building block selection"]
+        br []
 
         Field.div [] [
-            Label.label [Label.Props [Style [Color model.SiteStyleState.ColorMode.Accent]]] [ str "Building block"]
-            Help.help [] [str "Select the type of annotation building block (column) to add to the annotation table"]
+            Label.label [Label.Size Size.IsSmall; Label.Props [Style [Color model.SiteStyleState.ColorMode.Accent]]] [str "Select the type of annotation building block (column) to add to the annotation table."]
             Field.div [Field.HasAddons] [
                 Control.div [] [
                     Dropdown.dropdown [Dropdown.IsActive model.AddBuildingBlockState.ShowBuildingBlockSelection] [
@@ -155,9 +155,17 @@ let addBuildingBlockComponent (model:Model) (dispatch:Msg -> unit) =
                         // if BuildingBlockHasUnit = false then disabled = true
                         (model.AddBuildingBlockState.BuildingBlockHasUnit |> not)
                 ]
+
+                a [OnClick (fun _ -> ToggleModal (AutocompleteSearch.AutocompleteParameters<DbDomain.Term>.ofAddBuildingBlockState model.AddBuildingBlockState).ModalId |> AdvancedSearch |> dispatch)] [
+                    str "Use Advanced Search"
+                ]
+
             | _ -> ()
+
+
         ]
 
+
         // Fill selection confirmation
         Field.div [] [
             Control.div [] [

diff --git a/src/Client/Views/TermSearchView.fs b/src/Client/Views/TermSearchView.fs
@@ -48,6 +48,7 @@ let simpleSearchComponent (model:Model) (dispatch: Msg -> unit) =
         Label.label [Label.Size Size.IsLarge; Label.Props [Style [Color model.SiteStyleState.ColorMode.Accent]]][ str "Ontology term search"]
         br []
 
+        Label.label [Label.Size Size.IsSmall; Label.Props [Style [Color model.SiteStyleState.ColorMode.Accent]]] [str "Search for an ontology term to fill into the selected field(s)"]
         AutocompleteSearch.autocompleteTermSearchComponentOfParentOntology
             dispatch
             model.SiteStyleState.ColorMode
@@ -69,6 +70,9 @@ let simpleSearchComponent (model:Model) (dispatch: Msg -> unit) =
                 )
             ] [ str "Use related term directed search." ]
         ]
+        a [OnClick (fun _ -> ToggleModal (AutocompleteSearch.AutocompleteParameters<DbDomain.Term>.ofTermSearchState model.TermSearchState).ModalId |> AdvancedSearch |> dispatch)] [
+            str "Use Advanced Search"
+        ] 
 
         //Control.div [] [
 
@@ -85,7 +89,6 @@ let simpleSearchComponent (model:Model) (dispatch: Msg -> unit) =
             //    model.TermSearchState.Simple.HasSuggestionsLoading
             //    (createTermSuggestions model dispatch)
         //]
-        Help.help [] [str "When applicable, search for an ontology term to fill into the selected field(s)"]
     ]