fix: column names case insenative

closes #21
BrightGrafana · Feb 14, 2024 · efb9745 · efb9745
1 parent 6b4bd7f
commit efb9745
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/src/Tree-View.tsx b/src/Tree-View.tsx
@@ -43,11 +43,8 @@ export const TreeView = ({
       ...baseExpanded,
       ...getProvidedNodes(dashboardVariableName).flatMap((providedNodeId) => {
         const nodes = tree.getPath(providedNodeId);
-        // if (options.toggleMode === ToggleMode.NoTogle || options.toggleMode === ToggleMode.ChevronOnly) {
-        return nodes.filter((nodeId) => nodeId !== providedNodeId);
-        // }
 
-        // return nodes;
+        return nodes.filter((nodeId) => nodeId !== providedNodeId);
       }),
     ]),
   ]);
@@ -66,14 +63,8 @@ export const TreeView = ({
           ...expandedNodes,
           ...getProvidedNodes(dashboardVariableName).flatMap((providedNodeId) => {
             const nodes = tree.getPath(providedNodeId);
-            // if (
-            //   options.toggleMode === ToggleMode.NoTogle ||
-            //   options.toggleMode === ToggleMode.ChevronOnly ||
-            //   options.toggleMode === ToggleMode.SingleClick
-            // ) {
+
             return nodes.filter((nodeId) => nodeId !== providedNodeId);
-            // }
-            // return nodes;
           }),
         ]),
       ];
@@ -194,6 +185,7 @@ export const TreeView = ({
   const handleSelect = (event: React.SyntheticEvent, nodeIds: string[]) => {
     setSelected(nodeIds);
   };
+
   // still needed for keyboard toggle
   const handleToggle = (event: React.SyntheticEvent, nodeIds: string[]) => {
     if (options.toggleMode === ToggleMode.NoTogle) {

diff --git a/src/utils.ts b/src/utils.ts
@@ -71,9 +71,12 @@ export class Utils {
    * @returns {TreeNode[]} An array of Node objects.
    */
   static dfToNodeArray(df: DataFrame, idColumn: string, parentColumn: string, labelColumn: string): RawNode[] {
-    const data = new DataFrameView(df).toArray();
+    const dfv = new DataFrameView(df);
 
-    return data.map((dfRow) => ({
+    idColumn =
+      Object.keys(dfv.fields).find((key) => key.toLowerCase().trim() === idColumn.toLowerCase().trim()) || idColumn;
+
+    return dfv.toArray().map((dfRow) => ({
       name: `${dfRow[labelColumn]}`,
       id: `${dfRow[idColumn]}`,
       parent: dfRow[parentColumn] != null ? `${dfRow[parentColumn]}` : undefined,

diff --git a/src/validator.ts b/src/validator.ts
@@ -85,8 +85,12 @@ export class Validator {
     }
 
     // Validate column names
-    const colNames = Utils.getDataFrameColumnNames(data);
-    const requiredColumns = [options.idColumn, options.labelColumn, options.parentIdColumn];
+    const colNames = Utils.getDataFrameColumnNames(data).map((colName) => colName.toLowerCase().trim());
+    const requiredColumns = [
+      options.idColumn.toLowerCase().trim(),
+      options.labelColumn.toLowerCase().trim(),
+      options.parentIdColumn.toLowerCase().trim(),
+    ];
 
     for (const colName of requiredColumns) {
       if (!colNames.includes(colName)) {