From 0557def0b699df4750c5cf05fb76fb6fce5a83b7 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Wed, 24 Dec 2025 11:18:22 +0100
Subject: [PATCH] add install date to firmware versions

---
 interface/src/app/status/Version.tsx | 186 ++++++++++++++++++++-------
 interface/src/types/system.ts        |   1 +
 mock-api/restServer.ts               |  30 +++--
 src/core/system.cpp                  |  32 +++--
 src/core/system.h                    |   6 +-
 src/web/WebStatusService.cpp         |   9 +-
 6 files changed, 192 insertions(+), 72 deletions(-)

diff --git a/interface/src/app/status/Version.tsx b/interface/src/app/status/Version.tsx
index 9e33e006a..d8fb7f2d2 100644
--- a/interface/src/app/status/Version.tsx
+++ b/interface/src/app/status/Version.tsx
@@ -86,6 +86,9 @@ const VersionInfoDialog = memo(
     showVersionInfo,
     latestVersion,
     latestDevVersion,
+    previousVersion,
+    partition,
+    size,
     locale,
     LL,
     onClose
@@ -93,6 +96,9 @@ const VersionInfoDialog = memo(
     showVersionInfo: number;
     latestVersion?: VersionInfo;
     latestDevVersion?: VersionInfo;
+    previousVersion?: VersionInfo | undefined;
+    partition: string;
+    size: number;
     locale: string;
     LL: TranslationFunctions;
     onClose: () => void;
@@ -100,8 +106,19 @@ const VersionInfoDialog = memo(
     if (showVersionInfo === 0) return null;
 
     const isStable = showVersionInfo === 1;
-    const version = isStable ? latestVersion : latestDevVersion;
-    const relNotesUrl = isStable ? STABLE_RELNOTES_URL : DEV_RELNOTES_URL;
+    const isDev = showVersionInfo === 2;
+    const isPrevious = showVersionInfo === 3;
+
+    const version = isStable
+      ? latestVersion
+      : isDev
+        ? latestDevVersion
+        : previousVersion;
+    const relNotesUrl = isStable
+      ? STABLE_RELNOTES_URL
+      : isDev
+        ? DEV_RELNOTES_URL
+        : '';
 
     return (
       <Dialog sx={dialogStyle} open={showVersionInfo !== 0} onClose={onClose}>
@@ -119,13 +136,17 @@ const VersionInfoDialog = memo(
                     pr: 1,
                     py: 0.5,
                     fontSize: 13,
-                    width: 90
+                    width: 140
                   }}
                 >
-                  {LL.TYPE(0)}
+                  {isPrevious ? LL.TYPE(0) : LL.RELEASE_TYPE()}
                 </TableCell>
                 <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
-                  {isStable ? LL.STABLE() : LL.DEVELOPMENT()}
+                  {isStable
+                    ? LL.STABLE()
+                    : isDev
+                      ? LL.DEVELOPMENT()
+                      : 'Partition ' + LL.VERSION()}
                 </TableCell>
               </TableRow>
               <TableRow sx={{ height: 24, borderBottom: 'none' }}>
@@ -143,9 +164,53 @@ const VersionInfoDialog = memo(
                   {LL.VERSION()}
                 </TableCell>
                 <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
-                  {version?.name}
+                  {isPrevious
+                    ? typeof version === 'string'
+                      ? version
+                      : version?.name
+                    : version?.name}
                 </TableCell>
               </TableRow>
+              {isPrevious && (
+                <TableRow sx={{ height: 24, borderBottom: 'none' }}>
+                  <TableCell
+                    component="th"
+                    scope="row"
+                    sx={{
+                      color: 'lightblue',
+                      borderBottom: 'none',
+                      pr: 1,
+                      py: 0.5,
+                      fontSize: 13
+                    }}
+                  >
+                    Partition
+                  </TableCell>
+                  <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
+                    {partition}
+                  </TableCell>
+                </TableRow>
+              )}
+              {isPrevious && (
+                <TableRow sx={{ height: 24, borderBottom: 'none' }}>
+                  <TableCell
+                    component="th"
+                    scope="row"
+                    sx={{
+                      color: 'lightblue',
+                      borderBottom: 'none',
+                      pr: 1,
+                      py: 0.5,
+                      fontSize: 13
+                    }}
+                  >
+                    Size
+                  </TableCell>
+                  <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
+                    {size} KB
+                  </TableCell>
+                </TableRow>
+              )}
               {version?.published_at && (
                 <TableRow sx={{ height: 24, borderBottom: 'none' }}>
                   <TableCell
@@ -159,7 +224,7 @@ const VersionInfoDialog = memo(
                       fontSize: 13
                     }}
                   >
-                    Build Date
+                    {isPrevious ? 'Install Date' : 'Build Date'}
                   </TableCell>
                   <TableCell sx={{ borderBottom: 'none', py: 0.5, fontSize: 13 }}>
                     {prettyDateTime(locale, new Date(version.published_at))}
@@ -170,15 +235,17 @@ const VersionInfoDialog = memo(
           </Table>
         </DialogContent>
         <DialogActions>
-          <Button
-            variant="outlined"
-            component="a"
-            href={relNotesUrl}
-            target="_blank"
-            color="primary"
-          >
-            Changelog
-          </Button>
+          {!isPrevious && (
+            <Button
+              variant="outlined"
+              component="a"
+              href={relNotesUrl}
+              target="_blank"
+              color="primary"
+            >
+              Changelog
+            </Button>
+          )}
           <Button variant="outlined" onClick={onClose} color="secondary">
             {LL.CLOSE()}
           </Button>
@@ -328,7 +395,9 @@ const Version = () => {
   const [restarting, setRestarting] = useState<boolean>(false);
   const [openInstallDialog, setOpenInstallDialog] = useState<boolean>(false);
 
-  const [previousVersion, setPreviousVersion] = useState<string>('');
+  const [previousVersion, setPreviousVersion] = useState<VersionInfo | undefined>(
+    undefined
+  );
   const [previousPartition, setPreviousPartition] = useState<string>('');
   const [openInstallPreviousDialog, setOpenInstallPreviousDialog] =
     useState<boolean>(false);
@@ -340,7 +409,8 @@ const Version = () => {
     useState<boolean>(false);
   const [internetLive, setInternetLive] = useState<boolean>(false);
   const [downloadOnly, setDownloadOnly] = useState<boolean>(false);
-  const [showVersionInfo, setShowVersionInfo] = useState<number>(0);
+  const [showVersionInfo, setShowVersionInfo] = useState<number>(0); // 1 = stable, 2 = dev, 3 = previous
+  const [firmwareSize, setFirmwareSize] = useState<number>(0);
 
   const { send: sendCheckUpgrade } = useRequest(
     (versions: string) => callAction({ action: 'checkUpgrade', param: versions }),
@@ -389,6 +459,16 @@ const Version = () => {
     [data?.emsesp_version]
   );
 
+  const setPreviousVersionInfo = useCallback(
+    (version: string, partition: string, size: number, install_date: string) => {
+      setShowVersionInfo(3);
+      setPreviousVersion({ name: version, published_at: install_date });
+      setPreviousPartition(partition);
+      setFirmwareSize(size);
+    },
+    []
+  );
+
   const doRestart = useCallback(async () => {
     await sendAPI({ device: 'system', cmd: 'restart', id: 0 }).catch(
       (error: Error) => {
@@ -418,11 +498,14 @@ const Version = () => {
     [sendSetPartition]
   );
 
-  const showPreviousDialog = useCallback((version: string, partition: string) => {
-    setOpenInstallPreviousDialog(true);
-    setPreviousVersion(version);
-    setPreviousPartition(partition);
-  }, []);
+  const showPreviousDialog = useCallback(
+    (version: string, partition: string, install_date: string) => {
+      setOpenInstallPreviousDialog(true);
+      setPreviousVersion({ name: version, published_at: install_date });
+      setPreviousPartition(partition);
+    },
+    []
+  );
 
   const showFirmwareDialog = useCallback((useDevVersion: boolean) => {
     setFetchDevVersion(useDevVersion);
@@ -439,6 +522,8 @@ const Version = () => {
 
   const handleVersionInfoClose = useCallback(() => {
     setShowVersionInfo(0);
+    setPreviousVersion(undefined);
+    setPreviousPartition('');
   }, []);
 
   // check upgrades - only once when both versions are available
@@ -485,7 +570,7 @@ const Version = () => {
               {LL.LATEST_VERSION(usingDevVersion ? LL.DEVELOPMENT() : LL.STABLE())}
             </span>
             <Button
-              sx={{ ml: 2 }}
+              sx={{ ml: 1 }}
               variant="outlined"
               size="small"
               onClick={() => showFirmwareDialog(showingDev)}
@@ -500,7 +585,7 @@ const Version = () => {
 
       return (
         <Button
-          sx={{ ml: 2 }}
+          sx={{ ml: 1 }}
           variant="outlined"
           color={choice === LL.UPDATE_AVAILABLE() ? 'success' : 'warning'}
           size="small"
@@ -528,14 +613,14 @@ const Version = () => {
     return (
       <>
         <Box p={2} border="1px solid grey" borderRadius={2}>
-          <Typography mb={2} variant="h6" color="primary">
+          <Typography mb={1} variant="h6" color="primary">
             {LL.THIS_VERSION()}
           </Typography>
 
           <Grid
             container
             direction="row"
-            rowSpacing={1}
+            // rowSpacing={0}
             sx={{
               justifyContent: 'flex-start',
               alignItems: 'baseline'
@@ -552,6 +637,12 @@ const Version = () => {
                     &nbsp; &#40;{data.build_flags}&#41;
                   </Typography>
                 )}
+                <IconButton
+                  onClick={() => setShowVersionInfo(isDev ? 2 : 1)}
+                  aria-label={LL.FIRMWARE_VERSION_INFO()}
+                >
+                  <InfoOutlinedIcon color="primary" sx={{ fontSize: 18 }} />
+                </IconButton>
               </Typography>
             </Grid>
 
@@ -584,20 +675,11 @@ const Version = () => {
                 </Typography>
               </Typography>
             </Grid>
-
-            <Grid size={{ xs: 4, md: 2 }}>
-              <Typography color="secondary">{LL.RELEASE_TYPE()}</Typography>
-            </Grid>
-            {isDev ? (
-              <Typography>{LL.DEVELOPMENT()}</Typography>
-            ) : (
-              <Typography>{LL.STABLE()}</Typography>
-            )}
           </Grid>
 
           {internetLive ? (
             <>
-              <Typography mt={2} mb={2} variant="h6" color="primary">
+              <Typography mt={4} mb={1} variant="h6" color="primary">
                 {LL.AVAILABLE_VERSION()}
               </Typography>
 
@@ -620,17 +702,32 @@ const Version = () => {
                     <Grid size={{ xs: 8, md: 10 }}>
                       {data.partitions.map((partition) => (
                         <Typography key={partition.partition} mb={1}>
-                          v{partition.version} ({partition.partition}:{' '}
-                          {partition.size}
-                          {' KB'})
+                          {partition.version}
+                          <IconButton
+                            onClick={() =>
+                              setPreviousVersionInfo(
+                                partition.version,
+                                partition.partition ?? '',
+                                partition.size ?? '',
+                                partition.install_date ?? ''
+                              )
+                            }
+                            aria-label={LL.FIRMWARE_VERSION_INFO()}
+                          >
+                            <InfoOutlinedIcon
+                              color="primary"
+                              sx={{ fontSize: 18 }}
+                            />
+                          </IconButton>
                           <Button
-                            sx={{ ml: 2 }}
+                            sx={{ ml: 0 }}
                             variant="outlined"
                             size="small"
                             onClick={() =>
                               showPreviousDialog(
                                 partition.version,
-                                partition.partition
+                                partition.partition,
+                                partition.install_date ?? ''
                               )
                             }
                           >
@@ -686,7 +783,10 @@ const Version = () => {
                 showVersionInfo={showVersionInfo}
                 latestVersion={latestVersion}
                 latestDevVersion={latestDevVersion}
+                previousVersion={previousVersion}
                 locale={locale}
+                partition={previousPartition}
+                size={firmwareSize}
                 LL={LL}
                 onClose={handleVersionInfoClose}
               />
@@ -703,7 +803,7 @@ const Version = () => {
               />
               <InstallPreviousDialog
                 openInstallPreviousDialog={openInstallPreviousDialog}
-                version={previousVersion}
+                version={previousVersion?.name || ''}
                 partition={previousPartition}
                 LL={LL}
                 onClose={closeInstallPreviousDialog}
diff --git a/interface/src/types/system.ts b/interface/src/types/system.ts
index f5d6602f7..b68ce3ce1 100644
--- a/interface/src/types/system.ts
+++ b/interface/src/types/system.ts
@@ -56,6 +56,7 @@ export interface SystemStatus {
     partition: string;
     version: string;
     size: number;
+    install_date?: string;
   }[];
   status: number; // System Status Codes which matches SYSTEM_STATUS in System.h
   developer_mode: boolean;
diff --git a/mock-api/restServer.ts b/mock-api/restServer.ts
index be394c6e6..2ae6c39d5 100644
--- a/mock-api/restServer.ts
+++ b/mock-api/restServer.ts
@@ -111,16 +111,18 @@ let system_status = {
     {
       partition: 'app1',
       version: '3.7.3-dev.41',
+      install_date: '2025-03-01T13:29:13.999Z',
       size: 4672
     },
     {
       partition: 'factory',
       version: '3.7.3-dev.39',
+      install_date: '2025-03-01T13:29:13.999Z',
       size: 4672
     }
   ],
   // partitions: [],
-  developer_mode: false,
+  developer_mode: true,
   model: '',
   // model: 'BBQKees Electronics EMS Gateway E32 V2 (E32 V2.0 P3/2024011)',
   // status: 0,
@@ -291,10 +293,10 @@ function updateMask(entity: any, de: any, dd: any) {
       const old_custom_name = dd.nodes[dd_objIndex].cn;
       console.log(
         'comparing names, old (' +
-        old_custom_name +
-        ') with new (' +
-        new_custom_name +
-        ')'
+          old_custom_name +
+          ') with new (' +
+          new_custom_name +
+          ')'
       );
       if (old_custom_name !== new_custom_name) {
         changed = true;
@@ -390,15 +392,15 @@ function check_upgrade(version: string) {
 
     console.log(
       'Upgrade this version (' +
-      THIS_VERSION +
-      ') to dev (' +
-      dev_version +
-      ') is ' +
-      (DEV_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO') +
-      ' and to stable (' +
-      stable_version +
-      ') is ' +
-      (STABLE_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO')
+        THIS_VERSION +
+        ') to dev (' +
+        dev_version +
+        ') is ' +
+        (DEV_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO') +
+        ' and to stable (' +
+        stable_version +
+        ') is ' +
+        (STABLE_VERSION_IS_UPGRADEABLE ? 'YES' : 'NO')
     );
     data = {
       emsesp_version: THIS_VERSION,
diff --git a/src/core/system.cpp b/src/core/system.cpp
index 370b47ab8..df1aa2255 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -301,10 +301,11 @@ void System::get_partition_info() {
 
 #ifdef EMSESP_STANDALONE
     // dummy data for standalone mode
-    partition_info_["app0"]    = {EMSESP_APP_VERSION, 0};
-    partition_info_["app1"]    = {"", 0};
-    partition_info_["factory"] = {"", 0};
-    partition_info_["boot"]    = {"", 0};
+    // version, size, install_date
+    partition_info_["app0"]    = {EMSESP_APP_VERSION, 0, ""};
+    partition_info_["app1"]    = {"", 0, ""};
+    partition_info_["factory"] = {"", 0, ""};
+    partition_info_["boot"]    = {"", 0, ""};
 #else
 
     auto current_partition = (const char *)esp_ota_get_running_partition()->label;
@@ -337,14 +338,27 @@ void System::get_partition_info() {
 
         // get the version from the NVS store, and add to map
         if (is_valid) {
-            PartitionInfo info;
-            info.size = part->size / 1024; // in KB
+            PartitionInfo p_info;
+            p_info.size = part->size / 1024; // set size in KB
+
+            // get version from NVS, if not found, use empty string
             if (EMSESP::nvs_.isKey(part->label)) {
-                info.version = EMSESP::nvs_.getString(part->label).c_str();
+                p_info.version = EMSESP::nvs_.getString(part->label).c_str();
             } else {
-                info.version = ""; // no version, empty string
+                p_info.version = "";
             }
-            partition_info_[part->label] = info;
+
+            // get install date from NTP if active and add
+            if (ntp_connected_) {
+                char   time_string[25];
+                time_t now = time(nullptr) - uuid::get_uptime_sec();
+                strftime(time_string, sizeof(time_string), "%FT%T%z", localtime(&now));
+                p_info.install_date = time_string;
+            } else {
+                p_info.install_date = "";
+            }
+
+            partition_info_[part->label] = p_info;
         }
 
         it = esp_partition_next(it);
diff --git a/src/core/system.h b/src/core/system.h
index 9705f7135..8ca6d0576 100644
--- a/src/core/system.h
+++ b/src/core/system.h
@@ -77,6 +77,7 @@ enum FUSE_VALUE : uint8_t { ALL = 0, MFG = 1, MODEL = 2, BOARD = 3, REV = 4, BAT
 struct PartitionInfo {
     std::string version;
     size_t      size;
+    std::string install_date; // optional, only available if NTP is connected
 };
 
 class System {
@@ -370,9 +371,10 @@ class System {
 
     static void remove_gpio(uint8_t pin, bool also_system = false); // remove a gpio from both valid (optional) and used lists
 
-    // Partition info map: partition name -> {version, size}
+    // Partition info map: partition name -> {version, size, install_date}
     std::map<std::string, PartitionInfo, std::less<>, AllocatorPSRAM<std::pair<const std::string, PartitionInfo>>> partition_info_;
-    static bool                                                                                                    set_partition(const char * partitionname);
+
+    static bool set_partition(const char * partitionname);
 
   private:
     static uuid::log::Logger logger_;
diff --git a/src/web/WebStatusService.cpp b/src/web/WebStatusService.cpp
index 1f604822d..fa29a91c0 100644
--- a/src/web/WebStatusService.cpp
+++ b/src/web/WebStatusService.cpp
@@ -154,10 +154,11 @@ void WebStatusService::systemStatus(AsyncWebServerRequest * request) {
         if (partition.first == (const char *)esp_ota_get_running_partition()->label || partition.second.version.empty() || partition.second.size == 0) {
             continue;
         }
-        JsonObject part   = partitions.add<JsonObject>();
-        part["partition"] = partition.first;
-        part["version"]   = partition.second.version;
-        part["size"]      = partition.second.size;
+        JsonObject part      = partitions.add<JsonObject>();
+        part["partition"]    = partition.first;
+        part["version"]      = partition.second.version;
+        part["size"]         = partition.second.size;
+        part["install_date"] = partition.second.install_date;
     }
 
     root["developer_mode"] = EMSESP::system_.developer_mode();