ordered output and consistent installation time

Author: guohdd

comp/softwareinventory/impl/status.go

@@ -8,6 +8,7 @@ package softwareinventoryimpl
 import (
 	"embed"
 	"io"
+	"sort"
 	"strings"
 	"time"
 
@@ -70,6 +71,8 @@ func formatYYYYMMDD(ts string) (string, error) {
 // This method processes the cached inventory data and formats it for display
 // in the status output. It handles date formatting, computes statistics by
 // software type, and organizes the data by software ID for easy lookup.
+// Entries are sorted by Source (software type) and then by DisplayName for
+// easier navigation in the GUI and status output.
 // Note: Stats are computed from deduplicated entries to ensure consistency
 // between the total count and the breakdown by type.
 func (is *softwareInventory) populateStatus(status map[string]interface{}) {
@@ -84,21 +87,34 @@ func (is *softwareInventory) populateStatus(status map[string]interface{}) {
 		data[inventory.GetID()] = inventory
 	}
 
+	// Convert to slice and sort by Source (category), then DisplayName
+	sortedEntries := make([]software.Entry, 0, len(data))
+	for _, v := range data {
+		sortedEntries = append(sortedEntries, v.(software.Entry))
+	}
+	sort.Slice(sortedEntries, func(i, j int) bool {
+		// First sort by Source (software type)
+		if sortedEntries[i].Source != sortedEntries[j].Source {
+			return sortedEntries[i].Source < sortedEntries[j].Source
+		}
+		// Then sort by DisplayName within each category
+		return sortedEntries[i].DisplayName < sortedEntries[j].DisplayName
+	})
+
 	// Second pass: compute stats from deduplicated entries
 	// This ensures stats sum matches the total count
 	stats := map[string]int{}
 	brokenCount := 0
-	for _, v := range data {
-		inventory := v.(software.Entry)
+	for _, inventory := range sortedEntries {
 		stats[inventory.Source]++
 		if strings.Contains(inventory.Status, "broken") {
 			brokenCount++
 		}
 	}
 
-	status["software_inventory_metadata"] = data
+	status["software_inventory_metadata"] = sortedEntries
 	status["software_inventory_stats"] = stats
-	status["software_inventory_total"] = len(data)
+	status["software_inventory_total"] = len(sortedEntries)
 	// Only include broken count if there are broken entries
 	if brokenCount > 0 {
 		status["software_inventory_broken"] = brokenCount

comp/softwareinventory/impl/status_templates/inventoryHTML.tmpl

@@ -1,11 +1,11 @@
 <div class="stat">
   <span class="stat_title">Software Inventory Metadata</span>
-  {{- $swMap := index . "software_inventory_metadata" }}
-  {{- $total := index . "software_inventory_total" }}
-  {{- $stats := index . "software_inventory_stats" }}
-  {{- $broken := index . "software_inventory_broken" }}
-  {{- if index $swMap "error" }}
-    <div>Error refreshing software inventory: {{ index $swMap "error" }}</div>
+  {{- $swSlice := .software_inventory_metadata }}
+  {{- $total := .software_inventory_total }}
+  {{- $stats := .software_inventory_stats }}
+  {{- $broken := .software_inventory_broken }}
+  {{- if .error }}
+    <div>Error refreshing software inventory: {{ .error }}</div>
   {{- else }}
   <div style="margin-bottom: 1em; padding: 0.5em; background: #f5f5f5; border-radius: 4px;">
     <strong>Summary:</strong> {{ $total }} entries{{- if $broken }} (<span style="color: #d00;">{{ $broken }} broken</span>){{- end }}
@@ -28,7 +28,7 @@
     <span id="sw-filter-count" style="margin-left: 1em; color: #666;"></span>
   </div>
   <div id="sw-entries-container" class="stat_data inventory-scrollbox" style="max-height: 400px; overflow-y: auto;">
-    {{- range $productCode, $meta := $swMap }}
+    {{- range $meta := $swSlice }}
       <details class="sw-entry" data-sw-type="{{ $meta.Source }}">
         <summary>
         {{- if $meta.DisplayName }}{{ $meta.DisplayName }}{{ if $meta.Version }} {{ $meta.Version }}{{ end }}{{- else }}{{ $meta.ProductCode }}{{- end }}

pkg/inventory/software/collector.go

@@ -63,8 +63,10 @@ type Entry struct {
 	Version string `json:"version"`
 
 	// InstallDate is the date when the software was installed on the system.
-	// The format may vary by platform but is typically in ISO 8601 format
-	// or a platform-specific date format (e.g., "2023-01-15T10:30:00Z").
+	// The format is RFC3339 (ISO 8601): "2006-01-02T15:04:05Z07:00"
+	// For example: "2023-01-15T10:30:00Z"
+	// All timestamps are in UTC (indicated by the Z suffix).
+	// When displayed in the GUI/status output, it is formatted as "YYYY/MM/DD" (date only).
 	// This field is optional and may be empty if the installation date
 	// cannot be determined.
 	InstallDate string `json:"deployment_time,omitempty"`

pkg/inventory/software/collector_darwin_apps.go

@@ -177,7 +177,7 @@ func (c *applicationsCollector) Collect() ([]*Entry, []*Warning, error) {
 			// Get install date from file modification time
 			var installDate string
 			if info, err := os.Stat(appPath); err == nil {
-				installDate = info.ModTime().UTC().Format(time.RFC3339Nano)
+				installDate = info.ModTime().UTC().Format(time.RFC3339)
 			}
 
 			// Determine the software type and installation source

pkg/inventory/software/collector_darwin_homebrew.go

@@ -166,13 +166,13 @@ func (c *homebrewCollector) Collect() ([]*Entry, []*Warning, error) {
 				receiptPath := filepath.Join(versionPath, "INSTALL_RECEIPT.json")
 				if receipt, err := parseHomebrewReceipt(receiptPath); err == nil {
 					if receipt.Time > 0 {
-						installDate = time.Unix(receipt.Time, 0).UTC().Format(time.RFC3339Nano)
+						installDate = time.Unix(receipt.Time, 0).UTC().Format(time.RFC3339)
 					}
 					installedOnRequest = receipt.InstalledOnRequest
 				} else {
 					// Fall back to directory modification time
 					if info, err := os.Stat(versionPath); err == nil {
-						installDate = info.ModTime().UTC().Format(time.RFC3339Nano)
+						installDate = info.ModTime().UTC().Format(time.RFC3339)
 					}
 				}
 
@@ -273,7 +273,7 @@ func (c *homebrewCollector) Collect() ([]*Entry, []*Warning, error) {
 						// Get install date from directory
 						var installDate string
 						if info, err := os.Stat(versionPath); err == nil {
-							installDate = info.ModTime().UTC().Format(time.RFC3339Nano)
+							installDate = info.ModTime().UTC().Format(time.RFC3339)
 						}
 
 						entry := &Entry{

pkg/inventory/software/collector_darwin_kext.go

@@ -79,7 +79,7 @@ func (c *kernelExtensionsCollector) Collect() ([]*Entry, []*Warning, error) {
 			// Get install date from file modification time
 			var installDate string
 			if info, err := os.Stat(kextPath); err == nil {
-				installDate = info.ModTime().UTC().Format(time.RFC3339Nano)
+				installDate = info.ModTime().UTC().Format(time.RFC3339)
 			}
 
 			// Determine architecture

pkg/inventory/software/collector_darwin_macports.go

@@ -113,7 +113,7 @@ func (c *macPortsCollector) Collect() ([]*Entry, []*Warning, error) {
 			// Convert Unix timestamp to RFC3339
 			var installDateStr string
 			if installDate > 0 {
-				installDateStr = time.Unix(installDate, 0).UTC().Format(time.RFC3339Nano)
+				installDateStr = time.Unix(installDate, 0).UTC().Format(time.RFC3339)
 			}
 
 			// Determine status

pkg/inventory/software/collector_darwin_sysext.go

@@ -193,7 +193,7 @@ func (c *systemExtensionsCollector) Collect() ([]*Entry, []*Warning, error) {
 		var installDate string
 		if sysExt.OriginPath != "" {
 			if info, err := os.Stat(sysExt.OriginPath); err == nil {
-				installDate = info.ModTime().UTC().Format(time.RFC3339Nano)
+				installDate = info.ModTime().UTC().Format(time.RFC3339)
 			}
 		}