From 8624851cf5a05ad56d822641326faa271a03fe28 Mon Sep 17 00:00:00 2001
From: Jokob-sk <jokob.sk@gmail.com>
Date: Wed, 25 Jan 2023 23:50:02 +1100
Subject: [PATCH] Prep work for flat tree

---
 docker-compose.yml |  4 +--
 front/network.php  | 68 ++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ff2cfab4..36febe49 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,9 +7,9 @@ services:
     network_mode: "host"
     restart: unless-stopped
     volumes:
-      - ${APP_DATA_LOCATION}/pialert/config2:/home/pi/pialert/config
+      - ${APP_DATA_LOCATION}/pialert/config:/home/pi/pialert/config
       # - ${APP_DATA_LOCATION}/pialert/db/pialert.db:/home/pi/pialert/db/pialert.db
-      - ${APP_DATA_LOCATION}/pialert/db2:/home/pi/pialert/db      
+      - ${APP_DATA_LOCATION}/pialert/db:/home/pi/pialert/db      
       # (optional) useful for debugging if you have issues setting up the container
       - ${LOGS_LOCATION}:/home/pi/pialert/front/log      
       # DELETE START anyone trying to use this file: comment out / delete BELOW lines, they are only for development purposes
diff --git a/front/network.php b/front/network.php
index 3831a04d..c70c7bd1 100755
--- a/front/network.php
+++ b/front/network.php
@@ -504,6 +504,45 @@
   var treeLoadedAlready = false;
   var hiddenMacs = [];
 
+  // ---------------------------------------------------------------------------
+  function formatFlatDevicesList()
+  {
+    devList = getDevicesList()
+
+    result = []
+
+    for(i=0;i<devList.length;i++)
+    {
+      node = devList[i]
+
+      if(!hiddenMacs.includes(node.parentMac))
+      {
+          result.push(
+          { 
+            name: node.name,      
+            path: '',
+            mac: node.mac,
+            id: node.mac,
+            parentMac: node.parentMac,
+            icon: node.icon,
+            type: node.type,
+            status: node.status,
+            hasChildren: true,
+            hiddenChildren: true,
+            qty: 5,
+            // children:  children
+          })
+
+      }
+
+    }
+
+    console.log(result)
+
+    return result;
+  }
+
+  // ---------------------------------------------------------------------------
   function getChildren(node, list, path)
   {
     var children = [];
@@ -529,6 +568,7 @@
       name: node.name,      
       path: path,
       mac: node.mac,
+      id: node.mac,
       parentMac: node.parentMac,
       icon: node.icon,
       type: node.type,
@@ -582,6 +622,27 @@
     // re-attach any onclick events
     attachTreeEvents();   
   }
+  // ---------------------------------------------------------------------------
+  function toggleFlatSubTree(parentMac, treePath)
+  {
+    // treePath = treePath.split('|')
+
+    if(!hiddenMacs.includes(parentMac))
+    {
+      hiddenMacs.push(parentMac)
+    }
+    else
+    {
+      removeItemFromArray(hiddenMacs, parentMac)
+    }
+
+    list = formatFlatDevicesList();
+
+    myTree.refresh(list);
+
+    // re-attach any onclick events
+    attachTreeEvents();   
+  }
 
   // --------------------------------------------------------------------------- 
   function attachTreeEvents()
@@ -646,20 +707,23 @@
           // console.log(this)  
         },
       mainAxisNodeSpacing: 'auto',
+      // mainAxisNodeSpacing: 3,
       secondaryAxisNodeSpacing: 0.3,
       nodeHeight: '25',    
       marginTop: '5',
       hasZoom: false,
       hasPan: false,
       // marginLeft: '15',
-      idKey: "name",
+      idKey: "id",
       hasFlatData: false,
+      // hasFlatData: true,
       linkWidth: (nodeData) => 3,
       relationnalField: "children",
+      // relationnalField: "parentMac",
       });
 
       myTree.refresh(myHierarchy);
-      
+      // myTree.refresh(formatFlatDevicesList());  //hasFlatData       
     }
 
   // ---------------------------------------------------------------------------