Fix non-permanent state of history table after switching tabs

Author: sxprz

src/Main.re

@@ -48,6 +48,16 @@ let make = (~cil, ~goblint, ~warnings, ~meta, ~stats, ~file_loc) => {
     [|state.display|],
   );
 
+  let parameters = state |> ParameterUtils.getParameters;
+  Util.log(parameters);
+
+  let destructuredParameters = parameters |> ParameterUtils.concatParameters;
+  let (history, setHistory) = React.useState(_ => [|(destructuredParameters, Time.getLocalTime(), ParameterView.Executed)|]);
+
+  React.useEffect1(() => {
+      None
+  }, [|history|]);
+
   <div className="container-fluid">
   <header className="navbar navbar-dark fixed-top bg-dark flex-md-nowrap shadow p-1">
     <div className="navbar-brand mx-2" >{React.string("Gobview")}</div>
@@ -66,7 +76,7 @@ let make = (~cil, ~goblint, ~warnings, ~meta, ~stats, ~file_loc) => {
       | None => <div className="content d-flex flex-column h-75 overflow-auto p-4" />
       | Some(f) => <Content state display=f dispatch />
       }}
-      <Panel state dispatch />
+      <Panel state dispatch parameters={destructuredParameters} history setHistory />
     </div>
     <div className="col-3 border-start overflow-auto py-2 h-100">
         <SidebarRight

src/ui/panel/Panel.re

@@ -31,12 +31,7 @@ let make_nav_pills = (current, dispatch) => {
 };
 
 [@react.component]
-let make = (~state, ~dispatch) => {
-  let parameters =
-    switch (Yojson.Safe.Util.member("command", state.meta)) {
-    | `String(command) => command
-    | _ => ""
-    };
+let make = (~state, ~dispatch, ~parameters, ~history, ~setHistory) => {
 
   let locations = (state.goblint)#dead_locations;
 
@@ -46,7 +41,7 @@ let make = (~state, ~dispatch) => {
     | Some(Warnings) => <WarningView warnings={state.warnings} dispatch />
     | Some(DeadCode) => <DeadCodeView locations dispatch />
     | Some(Statistics) => <GvStatisticsView stats={state.stats} />
-    | Some(Parameters) => <ParameterView parameters />
+    | Some(Parameters) => <ParameterView parameters history setHistory />
     | _ => React.null
   };
 

src/ui/panel/ParameterView.re

@@ -1,4 +1,3 @@
-open Unix
 //open Lwt
 //open Cohttp
 //open Cohttp_lwt_unix
@@ -8,37 +7,12 @@ module ReactDOM = React.Dom
 
 type paramState = Executed | Executing | Canceled | Error;
 
-// TODO FIX BUG: make param history permanently available until GobView is closed again => clear afterwards
 [@react.component]
-let make = (~parameters) => {
-
-    let initParams =
-        parameters
-        |> String.split_on_char(' ')
-        |> List.map((s) => { String.sub(s, 1, String.length(s)-2)})
-        |> String.concat(" ");
-
-    let timeToString = (time) => {
-        string_of_int(time.tm_min)
-        |> String.cat(":")
-        |> String.cat(string_of_int(time.tm_hour))
-        |> String.cat(" ");
-    }
-
-    let getLocalTime = () => {
-        Unix.time()
-        |> Unix.localtime
-        |> timeToString;
-    }
+let make = (~parameters, ~history, ~setHistory) => {
 
-    let (history, setHistory) = React.useState(_ => [|(initParams, getLocalTime(), Executed)|]);
-    let (value, setValue) = React.useState(_ => initParams);
+    let (value, setValue) = React.useState(_ => parameters);
     let (disableCancel, setDisableCancel) = React.useState(_ => true);
 
-    React.useEffect1(() => {
-        None
-    }, [|history|]);
-
     React.useEffect1(() => {
         None
     }, [|value|]);
@@ -48,7 +22,7 @@ let make = (~parameters) => {
     };
 
     let on_submit = () => {
-        let newHistory = Array.append(history, [|(value, getLocalTime(), Executing)|])
+        let newHistory = Array.append(history, [|(value, Time.getLocalTime(), Executing)|])
         setHistory(_ => newHistory)
 
         // TODO transform param string with "' '" seperation mask
@@ -101,7 +75,7 @@ let make = (~parameters) => {
         )
     };
 
-    let list_elements = map_history_entry_to_list_entry(history);
+    let list_elements = history |> map_history_entry_to_list_entry;
 
     <div>
         <div className="input-group mb-2">

src/utils/ParameterUtils.re

@@ -0,0 +1,21 @@
+open State
+
+let concatParameters = (parameters) => {
+    parameters
+    |> String.split_on_char(' ')
+    |> List.map((s) => { String.sub(s, 1, String.length(s)-2)})
+    |> String.concat(" ")
+};
+
+let getParameters = (state) => {
+    switch (Yojson.Safe.Util.member("command", state.meta)) {
+        | `String(command) => command
+        | _ => ""
+    }
+};
+
+let constructParameters = (parameters) => {
+    parameters
+    |> String.split_on_char(' ')
+    |> List.map((s) => "'" |> String.cat(s) |> String.cat("'"))
+}

src/utils/Time.re

@@ -0,0 +1,21 @@
+open Unix
+
+let timeToString = (time) => {
+    let rawMinutes = string_of_int(time.tm_min);
+    let minutes = if (String.length(rawMinutes) == 1) {
+        "0"
+    } else {
+        ""
+    } ++ rawMinutes;
+
+    minutes
+    |> String.cat(":")
+    |> String.cat(string_of_int(time.tm_hour))
+    |> String.cat(" ");
+};
+
+let getLocalTime = () => {
+    Unix.time()
+    |> Unix.localtime
+    |> timeToString;
+};