Greatly improve form input robustness against sim input.

nfdi4plants · Dec 19, 2023 · a015edf · a015edf
1 parent 28b2382
commit a015edf
Show file tree

Hide file tree

Showing 7 changed files with 367 additions and 69 deletions.
diff --git a/src/Client/Helper.fs b/src/Client/Helper.fs
@@ -11,39 +11,39 @@ let logf a b =
 
 open System.Collections.Generic
 
-let mutable memoizations = Dictionary<string, int>(HashIdentity.Structural)
-
-let debounce<'T> (key: string) (timeout: int) (fn: 'T -> unit) value =
+let debounce<'T> (storage:Dictionary<string, int>) (key: string) (timeout: int) (fn: 'T -> unit) value =
     let key = key // fn.ToString()
     // Cancel previous debouncer
-    match memoizations.TryGetValue(key) with
+    match storage.TryGetValue(key) with
     | true, timeoutId -> printfn "CLEAR"; Fable.Core.JS.clearTimeout timeoutId
     | _ -> printfn "Not clear";()
 
     // Create a new timeout and memoize it
     let timeoutId = 
         Fable.Core.JS.setTimeout 
             (fun () -> 
-                memoizations.Remove(key) |> ignore
+                storage.Remove(key) |> ignore
                 fn value
             ) 
             timeout
-    memoizations.[key] <- timeoutId
+    storage.[key] <- timeoutId
 
-let debouncel<'T> (key: string) (timeout: int) (setLoading: bool -> unit) (fn: 'T -> unit) value =
+let debouncel<'T> (storage:Dictionary<string, int>) (key: string) (timeout: int) (setLoading: bool -> unit) (fn: 'T -> unit) value =
     let key = key // fn.ToString()
     // Cancel previous debouncer
-    match memoizations.TryGetValue(key) with
+    match storage.TryGetValue(key) with
     | true, timeoutId -> Fable.Core.JS.clearTimeout timeoutId
     | _ -> setLoading true; ()
 
     // Create a new timeout and memoize it
     let timeoutId = 
         Fable.Core.JS.setTimeout 
             (fun () -> 
-                memoizations.Remove(key) |> ignore
+                storage.Remove(key) |> ignore
                 setLoading false
                 fn value
             ) 
             timeout
-    memoizations.[key] <- timeoutId
+    storage.[key] <- timeoutId
+
+let newDebounceStorage = fun () -> Dictionary<string, int>(HashIdentity.Structural)
diff --git a/src/Client/MainComponents/Metadata/Assay.fs b/src/Client/MainComponents/Metadata/Assay.fs
@@ -2,11 +2,7 @@
 
 open Feliz
 open Feliz.Bulma
-
-open Spreadsheet
 open Messages
-open Browser.Types
-open Fable.Core.JsInterop
 open ARCtrl.ISA
 open Shared
 
@@ -43,11 +39,18 @@ let Main(assay: ArcAssay, model: Messages.Model, dispatch: Msg -> unit) =
                 assay.TechnologyPlatform <- oa
                 assay |> Assay |> Spreadsheet.UpdateArcFile |> SpreadsheetMsg |> dispatch
         )
-        FormComponents.PersonInput(
+        FormComponents.PersonsInput(
             assay.Performers,
             "Performers",
             fun persons ->
                 assay.Performers <- persons
                 assay |> Assay |> Spreadsheet.UpdateArcFile |> SpreadsheetMsg |> dispatch 
         )
+        FormComponents.CommentsInput(
+            assay.Comments,
+            "Comments",
+            fun comments ->
+                assay.Comments <- comments
+                assay |> Assay |> Spreadsheet.UpdateArcFile |> SpreadsheetMsg |> dispatch 
+        )
     ]