Create test for GenericArrayDataTableWidget

Author: BTSpeake

src/alc_aiidalab_widgets/widgets/tables.py

@@ -87,17 +87,14 @@ def _render_array(self, change: dict) -> None:
         if len(values.shape) > 2:
             self.children = [
                 self.array_selector,
-                HTML("<p>To many dimension to create 2D table from array.</p>"),
+                HTML("<p>To many dimensions to create 2D table from array.</p>"),
             ]
             return
         if len(values.shape) == 1:
             nrows = values.shape[0]
             ncols = 1
         else:
             ncols, nrows = values.shape  # type: ignore
-        values = values.reshape(1, -1)
-
-        # Unique styling prefix to prevent CSS bleeding into other Jupyter elements
 
         # Build Table Header (Column Indices)
         html = "<table style='width:100%; border: 1px solid #ddd; text-align: left; "
@@ -118,11 +115,19 @@ def _render_array(self, change: dict) -> None:
         for r in range(nrows):
             html += "<tr>"
             html += f'<th class="row-idx">{r}</th>'
-            for c in range(ncols):
-                val = values[c, r]
-                # Format floats to 6 decimals, leave ints/strings as they are
+            if ncols > 1:
+                for c in range(ncols):
+                    formatted_val = (
+                        f"{values[c, r]}"
+                        if isinstance(values[c, r], float | npfloat)
+                        else str(values[c, r])
+                    )
+                    html += f"<td>{formatted_val}</td>"
+            else:
                 formatted_val = (
-                    f"{val:.6f}" if isinstance(val, float | npfloat) else str(val)
+                    f"{values[r]:.6f}"
+                    if isinstance(values[r], float | npfloat)
+                    else str(values[r])
                 )
                 html += f"<td>{formatted_val}</td>"
             html += "</tr>"

tests/test_tables.py

@@ -4,7 +4,10 @@
 from aiida.orm import ArrayData
 from ipywidgets import HTML, Dropdown
 
-from alc_aiidalab_widgets.widgets.tables import XYZArrayDataTableWidget
+from alc_aiidalab_widgets.widgets.tables import (
+    GenericArrayDataTableWidget,
+    XYZArrayDataTableWidget,
+)
 
 
 def test_xyz_arraydata_table():
@@ -26,3 +29,37 @@ def test_xyz_arraydata_table():
     assert "4263.123456" in widget.children[1].value
     assert widget.children[0].value == "Array_2"
     assert "1.000000" in widget.children[1].value
+
+
+def test_generic_arraydata_table():
+    """Test the basic arraydata table viewer."""
+    array = ArrayData()
+    array1 = numpy.array([0, 1, 2, 32, 4, 5], dtype=float)
+    array2 = numpy.array([0, 1, 2, 32, 4, 5], dtype=int)
+    array3 = numpy.array([[0, 1, 2], [32, 4, 5]], dtype=int)
+    array4 = numpy.zeros((2, 2, 2), dtype=float)
+    array.set_array("Array_1", array1)
+    array.set_array("Array_2", array2)
+    array.set_array("Array_3", array3)
+    array.set_array("Array_4", array4)
+    widget = GenericArrayDataTableWidget(array)
+    assert isinstance(widget.children[0], Dropdown)
+    assert isinstance(widget.children[1], HTML)
+    assert "32.00000" in widget.children[1].value
+    assert "0.000000" in widget.children[1].value
+    assert widget.children[0].value == "Array_1"
+
+    widget.array_selector.index = 1
+    assert "32" in widget.children[1].value
+    assert widget.children[0].value == "Array_2"
+    assert "1" in widget.children[1].value
+    assert "Array 2" in widget.children[1].value
+
+    widget.array_selector.index = 2
+    assert widget.children[0].value == "Array_3"
+    assert "32" in widget.children[1].value
+    assert "1" in widget.children[1].value
+    assert "Array_3" not in widget.children[1].value
+
+    widget.array_selector.index = 3
+    assert "To many dimensions" in widget.children[1].value