Merge pull request #611 from nfdi4plants/Bug_Swate_ImportJsonError

Enable import of json tables
nfdi4plants · Jan 29, 2025 · ff21890 · ff21890
2 parents 9f3e2f1 + a40b698
commit ff21890
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/Client/Modals/SelectiveImportModal.fs b/src/Client/Modals/SelectiveImportModal.fs
@@ -173,11 +173,7 @@ type SelectiveImportModal =
             | Study (s,_) -> s.Tables, ArcFilesDiscriminate.Study
             | Template t -> ResizeArray([t.Table]), ArcFilesDiscriminate.Template
             | Investigation _ -> ResizeArray(), ArcFilesDiscriminate.Investigation
-        let columns =
-                tables
-                |> Array.ofSeq
-                |> Array.map (fun t -> Array.init t.Columns.Length (fun _ -> true))
-        let importDataState, setImportDataState = React.useState(SelectiveImportModalState.init())
+        let importDataState, setImportDataState = React.useState(SelectiveImportModalState.init(tables))
         let setMetadataImport = fun b ->
             if b then
                 {
@@ -186,7 +182,7 @@ type SelectiveImportModal =
                         ImportTables    = [for ti in 0 .. tables.Count-1 do {ImportTable.Index = ti; ImportTable.FullImport = true}]
                 } |> setImportDataState
             else
-                SelectiveImportModalState.init() |> setImportDataState
+                SelectiveImportModalState.init(tables) |> setImportDataState
         let addTableImport = fun (i: int) (fullImport: bool) ->
             let newImportTable: ImportTable = {Index = i; FullImport = fullImport}
             let newImportTables = newImportTable::importDataState.ImportTables |> List.distinct

diff --git a/src/Client/Pages/ProtocolTemplates/ProtocolView.fs b/src/Client/Pages/ProtocolTemplates/ProtocolView.fs
@@ -26,9 +26,9 @@ open JsonImport
 type Templates =
 
     [<ReactComponent>]
-    static member Main (model:Model, dispatch) =
+    static member Main (model: Model, dispatch) =
         let isProtocolSearch, setProtocolSearch = React.useState(false)
-        let importTypeStateData = React.useState(SelectiveImportModalState.init())
+        let importTypeStateData = React.useState(SelectiveImportModalState.init([]))
         if model.ProtocolState.TemplatesSelected.Length > 0 && (fst importTypeStateData).SelectedColumns.Length = 0 then
             let columns =
                 model.ProtocolState.TemplatesSelected

diff --git a/src/Client/Types.fs b/src/Client/Types.fs
@@ -1,6 +1,8 @@
 [<AutoOpen>]
 module Types
 
+open ARCtrl
+
 module JsonImport =
 
     [<RequireQualifiedAccess>]
@@ -17,12 +19,16 @@ module JsonImport =
         SelectedColumns: bool [] []
         TemplateName: string option
     } with
-        static member init() =
+        static member init(tables: seq<ArcTable>) =
+            let selectedColumns =
+                tables
+                |> Array.ofSeq
+                |> Array.map (fun t -> Array.init t.Columns.Length (fun _ -> true))
             {
                 ImportType = ARCtrl.TableJoinOptions.Headers
                 ImportMetadata = false
                 ImportTables = []
-                SelectedColumns = Array.empty
+                SelectedColumns = selectedColumns
                 TemplateName = None
             }
 

diff --git a/src/Client/Views/SpreadsheetView.fs b/src/Client/Views/SpreadsheetView.fs
@@ -35,7 +35,7 @@ open JsonImport
 [<ReactComponent>]
 let Main (model: Model, dispatch) =
     let widgets, setWidgets = React.useState([])
-    let importTypeStateData = React.useState(SelectiveImportModalState.init())
+    let importTypeStateData = React.useState(SelectiveImportModalState.init([]))
     let rmvWidget (widget: Widget) = widgets |> List.except [widget] |> setWidgets
     let bringWidgetToFront (widget: Widget) =
         let newList = widgets |> List.except [widget] |> fun x -> widget::x |> List.rev