From 50d6811dea090caba805b9fc1854be5b096aba80 Mon Sep 17 00:00:00 2001
From: Simon Rho <srho@juniper.net>
Date: Wed, 11 Dec 2024 12:08:43 -0500
Subject: [PATCH] Fix: Inventory export now fills in optional fields.

---
 jccm/package.json                  |  2 +-
 jccm/src/Frontend/Layout/Header.js | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/jccm/package.json b/jccm/package.json
index d5ea6ee..06cdb6a 100644
--- a/jccm/package.json
+++ b/jccm/package.json
@@ -2,7 +2,7 @@
     "name": "jccm",
     "productName": "Juniper Cloud Connection Manager",
     "description": "Juniper Cloud Connection Manager",
-    "version": "1.2.12",
+    "version": "1.2.13",
     "main": ".webpack/main",
     "scripts": {
         "start": "pkill -9 node; nodemon --watch ./src --ext js,json --ignore ./src/Frontend/ --exec 'electron-forge start'",
diff --git a/jccm/src/Frontend/Layout/Header.js b/jccm/src/Frontend/Layout/Header.js
index 3d83fd6..328a307 100644
--- a/jccm/src/Frontend/Layout/Header.js
+++ b/jccm/src/Frontend/Layout/Header.js
@@ -246,11 +246,13 @@ export default () => {
             port: 'port',
             username: 'username',
             password: 'password',
-            'facts.hardwareModel': 'hardware model',
-            'facts.osName': 'os name',
-            'facts.osVersion': 'os version',
-            'facts.serialNumber': 'serial number',
-            'facts.hostName': 'host name',
+            'facts.systemInformation.hardwareModel': 'hardware model',
+            'facts.systemInformation.osName': 'os name',
+            'facts.systemInformation.osVersion': 'os version',
+            'facts.systemInformation.serialNumber': 'serial number',
+            'facts.systemInformation.hostName': 'host name',
+            'facts.routeSummaryInformation.routerId': 'router id',
+            'facts.interface.name': 'interface name',
         };
 
         // Create columnOrder for consistency and ordering in the Excel file
@@ -264,6 +266,8 @@ export default () => {
             }
         });
 
+        console.log('>>>> inventoryWithFacts:', inventoryWithFacts);
+
         const orderedData = inventoryWithFacts.map((item) => {
             const orderedRow = {};
             columnOrder.forEach((key) => {