Merge pull request #600 from nfdi4plants/Bug_Swate_DataColumnsNotHidd…

…able Bug, Swate: Enable Hiding of Data Property Colums
nfdi4plants · Jan 10, 2025 · 13ddc14 · 13ddc14
2 parents 2663218 + d1ad801
commit 13ddc14
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/Client/MainComponents/Cells.fs b/src/Client/MainComponents/Cells.fs
@@ -161,7 +161,7 @@ type Cell =
                                 | TSR | TAN -> $"{columnType} ({cellValue})"
                                 | _ -> cellValue
                             let extendableButtonOpt =
-                                if columnType = Main && not header.IsSingleColumn then
+                                if (columnType = Main && not header.IsSingleColumn) || (columnType = Main && header.IsDataColumn) then
                                     extendHeaderButton(state_extend, columnIndex, setState_extend) |> Some
                                 else
                                     None

diff --git a/src/Client/MainComponents/SpreadsheetView/ArcTable.fs b/src/Client/MainComponents/SpreadsheetView/ArcTable.fs
@@ -25,7 +25,7 @@ let private CreateBodyCells (columnIndex, rowIndex, state:Set<int>, model:Model,
                 Cell.Empty()
             Cell.BodyTSR(index, cell, model, dispatch)
             Cell.BodyTAN(index, cell, model, dispatch)
-        elif header.IsDataColumn then
+        elif header.IsDataColumn && isExtended then
             if cell.isData then
                 Cell.BodyDataSelector(index, cell, model, dispatch)
                 Cell.BodyDataFormat(index, cell, model, dispatch)
@@ -48,9 +48,11 @@ let private CreateHeaderCells(columnIndex, state, setState, model, dispatch) =
                 Cell.HeaderTSR(columnIndex, header, state, setState, model, dispatch)
                 Cell.HeaderTAN(columnIndex, header, state, setState, model, dispatch)
         elif header.IsDataColumn then
-            Cell.HeaderDataSelector(columnIndex, header, state, setState, model, dispatch)
-            Cell.HeaderDataFormat(columnIndex, header, state, setState, model, dispatch)
-            Cell.HeaderDataSelectorFormat(columnIndex, header, state, setState, model, dispatch)
+            let isExtended = state.Contains columnIndex
+            if isExtended then
+                Cell.HeaderDataSelector(columnIndex, header, state, setState, model, dispatch)
+                Cell.HeaderDataFormat(columnIndex, header, state, setState, model, dispatch)
+                Cell.HeaderDataSelectorFormat(columnIndex, header, state, setState, model, dispatch)
         else
             ()
     ]

diff --git a/src/Client/MainComponents/SpreadsheetView/DataMap.fs b/src/Client/MainComponents/SpreadsheetView/DataMap.fs
@@ -26,7 +26,7 @@ let private CreateBodyCells(columnIndex, rowIndex, state: Set<int>, model, dispa
                 Cell.Empty()
             Cell.BodyTSR(index, cell, model, dispatch)
             Cell.BodyTAN(index, cell, model, dispatch)
-        elif header.IsDataColumn then
+        elif header.IsDataColumn && isExtended then
             if cell.isData then
                 Cell.BodyDataSelector(index, cell, model, dispatch)
                 Cell.BodyDataFormat(index, cell, model, dispatch)
@@ -35,7 +35,6 @@ let private CreateBodyCells(columnIndex, rowIndex, state: Set<int>, model, dispa
                 Cell.Empty()
                 Cell.Empty()
                 Cell.Empty()
-
     ]
 
 let private CreateHeaderCells(columnIndex, state, setState, model, dispatch) =