Enriquece inventário do Windows e layout dos cards

apps/desktop/src-tauri/src/agent.rs

@@ -693,6 +693,7 @@ fn collect_windows_extended() -> serde_json::Value {
     // Informações de build/edição e ativação
     let os_info = ps(r#"
       $cv = Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion';
+      $os = Get-CimInstance Win32_OperatingSystem -ErrorAction SilentlyContinue;
       $lsItems = Get-CimInstance -Query "SELECT Name, LicenseStatus, PartialProductKey FROM SoftwareLicensingProduct WHERE PartialProductKey IS NOT NULL" | Where-Object { $_.Name -like 'Windows*' };
       $activatedItem = $lsItems | Where-Object { $_.LicenseStatus -eq 1 } | Select-Object -First 1;
       $primaryItem = if ($activatedItem) { $activatedItem } else { $lsItems | Select-Object -First 1 };
@@ -704,6 +705,16 @@ fn collect_windows_extended() -> serde_json::Value {
         DisplayVersion         = $cv.DisplayVersion
         ReleaseId              = $cv.ReleaseId
         EditionID              = $cv.EditionID
+        UBR                    = $cv.UBR
+        CompositionEditionID   = $cv.CompositionEditionID
+        InstallationType       = $cv.InstallationType
+        InstallDate            = $cv.InstallDate
+        InstallationDate       = $os.InstallDate
+        InstalledOn            = $os.InstallDate
+        Version                = $os.Version
+        BuildNumber            = $os.BuildNumber
+        Caption                = $os.Caption
+        FeatureExperiencePack  = $cv.FeatureExperiencePack
         LicenseStatus          = $lsCode
         IsActivated            = ($activatedItem -ne $null)
       }

src/components/admin/machines/admin-machines-overview.tsx

@@ -202,6 +202,14 @@ function readNumber(record: Record<string, unknown>, ...keys: string[]): number
   return undefined
 }
 
+function readText(record: Record<string, unknown>, ...keys: string[]): string | undefined {
+  const stringValue = readString(record, ...keys)
+  if (stringValue) return stringValue
+  const numberValue = readNumber(record, ...keys)
+  if (typeof numberValue === "number") return String(numberValue)
+  return undefined
+}
+
 function parseWindowsInstallDate(value: unknown): Date | null {
   if (!value) return null
   if (value instanceof Date) return value
@@ -265,6 +273,7 @@ type WindowsOsInfo = {
   editionId?: string
   displayVersion?: string
   releaseId?: string
+  version?: string
   currentBuild?: string
   currentBuildNumber?: string
   licenseStatus?: number
@@ -278,26 +287,32 @@ function parseWindowsOsInfo(raw: unknown): WindowsOsInfo | null {
   const parseRecord = (value: Record<string, unknown>) => {
     const read = (k: string, ...alts: string[]) => readString(value, k, ...alts)
     const readNum = (...keys: string[]) => readNumber(value, ...keys)
+    const readFlexible = (...keys: string[]) => readText(value, ...keys)
+
+    const family = read("Family")
+    const edition = read("Edition")
 
     const productName =
-      read("ProductName", "productName", "Name", "name") ??
+      readFlexible("ProductName", "productName", "Name", "name", "Caption", "caption") ??
-      (read("Family") && read("Edition") ? `${read("Family")} ${read("Edition")}` : undefined)
+      (family && edition ? `${family} ${edition}` : family ?? edition ?? undefined)
 
     const editionId =
-      read("EditionID", "editionId", "Edition", "edition", "SkuEdition", "skuEdition") ?? undefined
+      readFlexible("EditionID", "editionId", "Edition", "edition", "SkuEdition", "skuEdition", "CompositionEditionID", "compositionEditionId") ??
+      undefined
 
-    const displayVersion =
+    const displayVersion = readFlexible("DisplayVersion", "displayVersion")
-      read("DisplayVersion", "displayVersion", "Version", "version") ??
+    const versionValue =
-      read("ReleaseId", "releaseId")
+      readFlexible("Version", "version", "ReleaseId", "releaseId") ?? displayVersion
 
     const baseBuild =
-      read("CurrentBuildNumber", "currentBuildNumber", "CurrentBuild", "currentBuild", "OSBuild", "osBuild") ??
+      readFlexible("CurrentBuildNumber", "currentBuildNumber", "CurrentBuild", "currentBuild", "OSBuild", "osBuild", "BuildNumber", "buildNumber") ??
       undefined
-    const ubr = read("UBR") ?? (readNum("UBR") ? String(readNum("UBR")) : undefined)
+    const ubrRaw = readFlexible("UBR")
-    const currentBuildNumber = baseBuild ? (ubr && /^\d+$/.test(ubr) ? `${baseBuild}.${ubr}` : baseBuild) : undefined
+    const licenseStatus = readNum("LicenseStatus", "licenseStatus")
+    const currentBuildNumber =
+      baseBuild && ubrRaw && /^\d+$/.test(ubrRaw) ? `${baseBuild}.${ubrRaw}` : baseBuild ?? readFlexible("BuildNumber", "buildNumber")
     const currentBuild = baseBuild
 
-    const licenseStatus = readNum("LicenseStatus", "licenseStatus")
     const isActivatedRaw = value["IsActivated"] ?? value["isActivated"]
     const isActivated =
       typeof isActivatedRaw === "boolean"
@@ -313,13 +328,14 @@ function parseWindowsOsInfo(raw: unknown): WindowsOsInfo | null {
       parseWindowsInstallDate(value["InstalledOn"])
 
     const experience =
-      read("Experience", "experience", "FeatureExperiencePack", "featureExperiencePack") ??
+      readFlexible("Experience", "experience", "FeatureExperiencePack", "featureExperiencePack") ??
       (currentBuildNumber ? `OS Build ${currentBuildNumber}` : undefined)
 
     return {
       productName,
       editionId,
       displayVersion,
+      version: versionValue,
       releaseId: read("ReleaseId", "releaseId"),
       currentBuild,
       currentBuildNumber,
@@ -845,7 +861,7 @@ export function MachineDetails({ machine }: MachineDetailsProps) {
     return []
   }, [windowsSoftwareRaw])
   const windowsEditionLabel = windowsOsInfo?.productName ?? windowsOsInfo?.editionId ?? null
-  const windowsVersionLabel = windowsOsInfo?.displayVersion ?? windowsOsInfo?.releaseId ?? null
+  const windowsVersionLabel = windowsOsInfo?.displayVersion ?? windowsOsInfo?.version ?? windowsOsInfo?.releaseId ?? null
   const windowsBuildLabel = windowsOsInfo?.currentBuildNumber ?? windowsOsInfo?.currentBuild ?? null
   const windowsInstallDateLabel = windowsOsInfo?.installDate ? formatAbsoluteDateTime(windowsOsInfo.installDate) : null
   const windowsExperienceLabel = windowsOsInfo?.experience ?? null
@@ -1487,12 +1503,12 @@ export function MachineDetails({ machine }: MachineDetailsProps) {
                       <Card className="border-slate-200">
                         <CardContent className="flex items-center gap-3 py-3">
                           <Terminal className="size-5 text-slate-500" />
-                          <div className="min-w-0">
+                          <div className="min-w-0 space-y-0.5">
-                            <p className="truncate text-xs text-muted-foreground">Windows</p>
+                            <p className="text-xs text-muted-foreground">Windows</p>
-                            <p className="truncate text-sm font-semibold text-foreground">
+                            <p className="break-words text-sm font-semibold text-foreground">
                               {windowsEditionLabel ?? machine?.osName ?? "—"}
                             </p>
-                            <p className="truncate text-xs text-muted-foreground">
+                            <p className="break-words text-xs text-muted-foreground">
                               {windowsVersionLabel ?? windowsBuildLabel ?? "Versão desconhecida"}
                             </p>
                           </div>
@@ -1501,9 +1517,11 @@ export function MachineDetails({ machine }: MachineDetailsProps) {
                       <Card className="border-slate-200">
                         <CardContent className="flex items-center gap-3 py-3">
                           <Monitor className="size-5 text-slate-500" />
-                          <div className="min-w-0">
+                          <div className="min-w-0 space-y-0.5">
-                            <p className="truncate text-xs text-muted-foreground">GPU</p>
+                            <p className="text-xs text-muted-foreground">GPU</p>
-                            <p className="truncate text-sm font-semibold text-foreground">{(windowsPrimaryGpu ?? primaryGpu)?.name ?? "—"}</p>
+                            <p className="break-words text-sm font-semibold text-foreground">
+                              {(windowsPrimaryGpu ?? primaryGpu)?.name ?? "—"}
+                            </p>
                           </div>
                         </CardContent>
                       </Card>