Add is_a directed search functionality to term search (#34)

build.fsx

@@ -216,7 +216,7 @@ Target.create "LocalConnectionStringSetup" (fun conf ->
         ]
         [
             (Path.combine __SOURCE_DIRECTORY__ ".db/docker-compose.yml")
-            (Path.combine __SOURCE_DIRECTORY__ "src/Server/Server.fs")
+            (Path.combine __SOURCE_DIRECTORY__ "src/Server/DevelopmentConnectionString.fs")
         ]
 
     Trace.trace msg

package.json

@@ -22,7 +22,7 @@
         "react": "^16.10.2",
         "react-dom": "^16.10.2",
         "remotedev": "^0.2.9",
-        "resolve-url-loader": "^3.1.0",
+        "resolve-url-loader": "^3.1.2",
         "sass": "^1.27.0",
         "sass-loader": "^9.0.3",
         "selfsigned": "^1.10.8",

src/Client/AuxFunctions.fs

@@ -0,0 +1,8 @@
+module AuxFunctions
+
+open System.Text.RegularExpressions
+
+let (|Regex|_|) pattern input =
+    let m = Regex.Match(input, pattern)
+    if m.Success then Some(m.Value)
+    else None

src/Client/Client.fs

@@ -55,20 +55,22 @@ let init (pageOpt: Routing.Page option) : Model * Cmd<Msg> =
 let view (model : Model) (dispatch : Msg -> unit) =
 
     match model.PageState.CurrentPage with
-    | Routing.Page.TermSearch ->
+    | Routing.Page.AddBuildingBlock ->
         BaseView.baseViewComponent model dispatch [
-            TermSearchView.termSearchComponent model dispatch
+            AddBuildingBlockView.addBuildingBlockComponent model dispatch
         ] [
-            str "Footer content"
+            AddBuildingBlockView.addBuildingBlockFooterComponent model dispatch
         ]
 
-    | Routing.Page.AddBuildingBlock ->
+
+    | Routing.Page.TermSearch ->
         BaseView.baseViewComponent model dispatch [
-            AddBuildingBlockView.addBuildingBlockComponent model dispatch
+            TermSearchView.termSearchComponent model dispatch
         ] [
-            AddBuildingBlockView.addBuildingBlockFooterComponent model dispatch
+            str "Footer content"
         ]
 
+
     | Routing.Page.FilePicker ->
         BaseView.baseViewComponent model dispatch [
             FilePickerView.filePickerComponent model dispatch
@@ -93,28 +95,28 @@ let view (model : Model) (dispatch : Msg -> unit) =
     | Routing.Page.Home ->
         div [] [str "soos"]
 
-    | _ ->
-        div [   Style [MinHeight "100vh"; BackgroundColor model.SiteStyleState.ColorMode.BodyBackground; Color model.SiteStyleState.ColorMode.Text;]
-            ] [
-            Container.container [Container.IsFluid] [
-                br []
-                br []
-                Button.buttonComponent model.SiteStyleState.ColorMode true "make a test db insert xd" (fun _ -> ((sprintf "Me am test %A" (System.Guid.NewGuid())),"1","Me is testerino",System.DateTime.UtcNow,"MEEEMuser") |> TestOntologyInsert |> Request |> Api|> dispatch)
-                Button.buttonComponent model.SiteStyleState.ColorMode true "idk man=(" (fun _ -> TryExcel |> ExcelInterop |> dispatch)
-                Button.buttonComponent model.SiteStyleState.ColorMode true "create annoation table" (fun _ -> model.SiteStyleState.IsDarkMode |> CreateAnnotationTable |> ExcelInterop |> dispatch)
-                Button.buttonComponent model.SiteStyleState.ColorMode true "Log table metadata" (fun _ -> LogTableMetadata |> Dev |> dispatch)
-                Button.buttonComponent model.SiteStyleState.ColorMode true "Log table metadata" (fun _ -> LogTableMetadata |> Dev |> dispatch)
-
-                Footer.footer [ Props [ExcelColors.colorControl model.SiteStyleState.ColorMode]] [
-                    Content.content [
-                        Content.Modifiers [ Modifier.TextAlignment (Screen.All, TextAlignment.Left)]
-                        Content.Props [ExcelColors.colorControl model.SiteStyleState.ColorMode] 
-                    ][
-
-                    ]
-                ] 
-            ]
-        ]
+    //| _ ->
+    //    div [   Style [MinHeight "100vh"; BackgroundColor model.SiteStyleState.ColorMode.BodyBackground; Color model.SiteStyleState.ColorMode.Text;]
+    //        ] [
+    //        Container.container [Container.IsFluid] [
+    //            br []
+    //            br []
+    //            Button.buttonComponent model.SiteStyleState.ColorMode true "make a test db insert xd" (fun _ -> ((sprintf "Me am test %A" (System.Guid.NewGuid())),"1","Me is testerino",System.DateTime.UtcNow,"MEEEMuser") |> TestOntologyInsert |> Request |> Api|> dispatch)
+    //            Button.buttonComponent model.SiteStyleState.ColorMode true "idk man=(" (fun _ -> TryExcel |> ExcelInterop |> dispatch)
+    //            Button.buttonComponent model.SiteStyleState.ColorMode true "create annoation table" (fun _ -> model.SiteStyleState.IsDarkMode |> CreateAnnotationTable |> ExcelInterop |> dispatch)
+    //            Button.buttonComponent model.SiteStyleState.ColorMode true "Log table metadata" (fun _ -> LogTableMetadata |> Dev |> dispatch)
+    //            Button.buttonComponent model.SiteStyleState.ColorMode true "Log table metadata" (fun _ -> LogTableMetadata |> Dev |> dispatch)
+
+    //            Footer.footer [ Props [ExcelColors.colorControl model.SiteStyleState.ColorMode]] [
+    //                Content.content [
+    //                    Content.Modifiers [ Modifier.TextAlignment (Screen.All, TextAlignment.Left)]
+    //                    Content.Props [ExcelColors.colorControl model.SiteStyleState.ColorMode] 
+    //                ][
+
+    //                ]
+    //            ] 
+        //    ]
+        //]
 
 #if DEBUG
 open Elmish.Debug

src/Client/Client.fsproj

@@ -9,6 +9,7 @@
         <None Include="paket.references" />
         <None Include="style.scss" />
         <Compile Include="Version.fs" />
+        <Compile Include="AuxFunctions.fs" />
         <Compile Include="Routing.fs" />
         <Compile Include="ExcelColors.fs" />
         <Compile Include="OfficeJS.fs" />

src/Client/CustomComponents/AdvancedSearch.fs

@@ -26,7 +26,7 @@ let createOntologyDropdownItem (model:Model) (dispatch:Msg -> unit) (ont: DbDoma
         Dropdown.Item.Props [
             TabIndex 0
             OnClick (fun _ -> ont |> OntologySuggestionUsed |> AdvancedSearch |> dispatch)
-            OnKeyDown (fun k -> if (int k.keyCode) = 13 then ont |> OntologySuggestionUsed |> AdvancedSearch |> dispatch)
+            OnKeyDown (fun k -> if k.key = "Enter" then ont |> OntologySuggestionUsed |> AdvancedSearch |> dispatch)
             colorControl model.SiteStyleState.ColorMode
         ]
 
@@ -72,7 +72,7 @@ let createAdvancedTermSearchResultRows (model:Model) (dispatch: Msg -> unit) (su
 let advancedTermSearchComponent (model:Model) (dispatch: Msg -> unit) =
     form [
         OnSubmit    (fun e -> e.preventDefault())
-        OnKeyDown   (fun k -> if (int k.keyCode) = 13 then k.preventDefault())
+        OnKeyDown   (fun k -> if k.key = "Enter" then k.preventDefault())
     ] [
         Field.div [] [
             Label.label [Label.Props [Style [Color model.SiteStyleState.ColorMode.Accent]]] [ str "Ontology"]
@@ -261,7 +261,7 @@ let advancedSearchModal (model:Model) (id:string) (dispatch: Msg -> unit) (resul
             Modal.Card.foot [] [
                 form [
                     OnSubmit    (fun e -> e.preventDefault())
-                    OnKeyDown   (fun k -> if (int k.keyCode) = 13 then k.preventDefault())
+                    OnKeyDown   (fun k -> if k.key = "Enter" then k.preventDefault())
                 ] [
                     Field.div [Field.HasAddons;Field.IsExpanded] [
                         Control.div [Control.IsExpanded] [

src/Client/CustomComponents/AutocompleteSearch.fs

@@ -69,11 +69,11 @@ with
         DropDownIsLoading       = state.HasSuggestionsLoading
 
         OnInputChangeMsg        = (SearchTermTextChange >> TermSearch )
-        OnSuggestionSelect      = (fun (term:DbDomain.Term) -> term.Name |> TermSuggestionUsed |> TermSearch)
+        OnSuggestionSelect      = (fun (term:DbDomain.Term) -> term |> TermSuggestionUsed |> TermSearch)
 
         HasAdvancedSearch       = true
         AdvancedSearchLinkText  = "Cant find the Term you are looking for?"
-        OnAdvancedSearch        = (fun (term:DbDomain.Term) -> term.Name |> TermSuggestionUsed |> TermSearch )
+        OnAdvancedSearch        = (fun (term:DbDomain.Term) -> term |> TermSuggestionUsed |> TermSearch )
     }
 
     static member ofAddBuildingBlockUnitState (state:AddBuildingBlockState) : AutocompleteParameters<DbDomain.Term> = {
@@ -123,7 +123,7 @@ let createAutocompleteSuggestions
             |> Array.map (fun sugg ->
                 tr [
                     OnClick (fun _ -> sugg.Data |> autocompleteParams.OnSuggestionSelect |> dispatch)
-                    OnKeyDown (fun k -> if (int k.keyCode) = 13 then sugg.Data |> autocompleteParams.OnSuggestionSelect |> dispatch)
+                    OnKeyDown (fun k -> if k.key = "Enter" then sugg.Data |> autocompleteParams.OnSuggestionSelect |> dispatch)
                     TabIndex 0
                     colorControl colorMode
                     Class "suggestion"
@@ -201,19 +201,71 @@ let autocompleteTermSearchComponent
     = 
     Control.div [Control.IsExpanded] [
         AdvancedSearch.advancedSearchModal model autocompleteParams.Id dispatch autocompleteParams.OnAdvancedSearch
-        Input.input [   Input.Placeholder inputPlaceholderText
-                        match inputSize with
-                        | Some size -> Input.Size size
-                        | _ -> ()
-                        Input.Props [
-                            ExcelColors.colorControl colorMode
-                            //OnFocus (fun e -> alert "focusout")
-                            //OnBlur  (fun e -> alert "focusin")
-                        ]           
-                        Input.OnChange (fun e -> e.Value |> autocompleteParams.OnInputChangeMsg |> dispatch)
-                        Input.Value autocompleteParams.StateBinding
+        Input.input [
+            Input.Placeholder inputPlaceholderText
+            match inputSize with
+            | Some size -> Input.Size size
+            | _ -> ()
+            Input.Props [
+                ExcelColors.colorControl colorMode
+                //OnFocus (fun e -> alert "focusout")
+                //OnBlur  (fun e -> alert "focusin")
+            ]           
+            Input.OnChange (fun e -> e.Value |> autocompleteParams.OnInputChangeMsg |> dispatch)
+            Input.Value autocompleteParams.StateBinding
 
-                    ]
+        ]
+        autocompleteDropdownComponent
+            dispatch
+            colorMode
+            autocompleteParams.DropDownIsVisible
+            autocompleteParams.DropDownIsLoading
+            (createAutocompleteSuggestions dispatch colorMode autocompleteParams)
+    ]
+
+let autocompleteTermSearchComponentOfParentOntology
+    (dispatch: Msg -> unit)
+    (colorMode:ColorMode)
+    (model:Model)
+    (inputPlaceholderText   : string)
+    (inputSize              : ISize option)
+    (autocompleteParams     : AutocompleteParameters<DbDomain.Term>)
+
+    =
+    let parentOntologyNotificationElement =
+        Control.p [][
+            Button.button [
+                Button.IsStatic true
+                match inputSize with
+                | Some size -> Button.Size size
+                | _ -> ()
+            ] [str (sprintf "%A" model.TermSearchState.ParentOntology.Value)]
+        ]
+
+    Control.div [Control.IsExpanded] [
+        AdvancedSearch.advancedSearchModal model autocompleteParams.Id dispatch autocompleteParams.OnAdvancedSearch
+        Field.div [Field.HasAddons][
+            if model.TermSearchState.ParentOntology.IsSome && model.TermSearchState.SearchByParentOntology then parentOntologyNotificationElement
+            Control.p [Control.IsExpanded][
+                Input.input [
+                    Input.Placeholder inputPlaceholderText
+                    match inputSize with
+                    | Some size -> Input.Size size
+                    | _ -> ()
+                    Input.Props [
+                        ExcelColors.colorControl colorMode
+                        //OnFocus (fun e -> alert "focusout")
+                        //OnBlur  (fun e -> alert "focusin")
+                        OnFocus (fun e ->
+                            //GenericLog ("Info","FOCUSED!") |> Dev |> dispatch
+                            GetParentTerm |> ExcelInterop |> dispatch
+                        )
+                    ]           
+                    Input.OnChange (fun e -> e.Value |> autocompleteParams.OnInputChangeMsg |> dispatch)
+                    Input.Value autocompleteParams.StateBinding
+                ]
+            ]
+        ]
         autocompleteDropdownComponent
             dispatch
             colorMode

src/Client/Messages.fs

@@ -12,17 +12,20 @@ type ExcelInteropMsg =
     | SyncContext               of string
     | InSync                    of string
     | TryExcel
-    | FillSelection             of string
+    | FillSelection             of string * (DbDomain.Term option)
     | AddColumn                 of colname:string * formatString:string
-    | FormatColumn              of colname:string * formatString:string
+    | FormatColumn              of colname:string * cloind:float * formatString:string
     | CreateAnnotationTable     of bool
     | AnnotationtableCreated    of string
     | AnnotationTableExists     of bool
+    | GetParentTerm
 
 type TermSearchMsg =
+    | ToggleSearchByParentOntology
     | SearchTermTextChange      of string
-    | TermSuggestionUsed        of string
+    | TermSuggestionUsed        of DbDomain.Term
     | NewSuggestions            of DbDomain.Term []
+    | StoreParentOntologyFromOfficeInterop  of obj option
 
 type AdvancedSearchMsg =
     | ResetAdvancedSearchState
@@ -44,6 +47,7 @@ type DevMsg =
 type ApiRequestMsg =
     | TestOntologyInsert                        of (string*string*string*System.DateTime*string)
     | GetNewTermSuggestions                     of string
+    | GetNewTermSuggestionsByParentTerm         of string*string
     | GetNewBuildingBlockNameSuggestions        of string
     | GetNewUnitTermSuggestions                 of string
     | GetNewAdvancedTermSearchResults           of AdvancedTermSearchOptions