From 6083a64ec05ef773ccb14f774ebcbceccdfcbc51 Mon Sep 17 00:00:00 2001
From: Oliver Kieselbach <oliver.kieselbach@outlook.com>
Date: Sun, 1 Mar 2026 15:02:17 +0100
Subject: [PATCH] layout re-order in admin-config + session table storage fix

---
 .../AutopilotMonitor.Agent/buildcounter.txt   |  2 +-
 .../Services/TableStorageService.Sessions.cs  |  2 -
 .../Models/SessionRegistration.cs             | 10 -----
 .../app/admin-configuration/page.tsx          | 44 +++++++++----------
 4 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/src/Agent/AutopilotMonitor.Agent/buildcounter.txt b/src/Agent/AutopilotMonitor.Agent/buildcounter.txt
index c75acbe2..b0d73241 100644
--- a/src/Agent/AutopilotMonitor.Agent/buildcounter.txt
+++ b/src/Agent/AutopilotMonitor.Agent/buildcounter.txt
@@ -1 +1 @@
-127
+129
diff --git a/src/Backend/AutopilotMonitor.Functions/Services/TableStorageService.Sessions.cs b/src/Backend/AutopilotMonitor.Functions/Services/TableStorageService.Sessions.cs
index a004445e..3e18f8c4 100644
--- a/src/Backend/AutopilotMonitor.Functions/Services/TableStorageService.Sessions.cs
+++ b/src/Backend/AutopilotMonitor.Functions/Services/TableStorageService.Sessions.cs
@@ -91,8 +91,6 @@ namespace AutopilotMonitor.Functions.Services
                     ["OsBuild"] = registration.OsBuild ?? string.Empty,
                     ["OsEdition"] = registration.OsEdition ?? string.Empty,
                     ["OsLanguage"] = registration.OsLanguage ?? string.Empty,
-                    ["AutopilotProfileName"] = registration.AutopilotProfileName ?? string.Empty,
-                    ["AutopilotProfileId"] = registration.AutopilotProfileId ?? string.Empty,
                     ["IsUserDriven"] = registration.IsUserDriven,
                     ["IsPreProvisioned"] = isPreProvisioned,
                     ["StartedAt"] = startedAt,
diff --git a/src/Shared/AutopilotMonitor.Shared/Models/SessionRegistration.cs b/src/Shared/AutopilotMonitor.Shared/Models/SessionRegistration.cs
index dd153af5..a5ca4e8c 100644
--- a/src/Shared/AutopilotMonitor.Shared/Models/SessionRegistration.cs
+++ b/src/Shared/AutopilotMonitor.Shared/Models/SessionRegistration.cs
@@ -52,16 +52,6 @@ namespace AutopilotMonitor.Shared.Models
         /// </summary>
         public string OsLanguage { get; set; }
 
-        /// <summary>
-        /// Autopilot profile name (if detectable)
-        /// </summary>
-        public string AutopilotProfileName { get; set; }
-
-        /// <summary>
-        /// Autopilot profile ID (if detectable)
-        /// </summary>
-        public string AutopilotProfileId { get; set; }
-
         /// <summary>
         /// Whether this is user-driven enrollment
         /// </summary>
diff --git a/src/Web/autopilot-monitor-web/app/admin-configuration/page.tsx b/src/Web/autopilot-monitor-web/app/admin-configuration/page.tsx
index da493317..9aae97a3 100644
--- a/src/Web/autopilot-monitor-web/app/admin-configuration/page.tsx
+++ b/src/Web/autopilot-monitor-web/app/admin-configuration/page.tsx
@@ -321,11 +321,25 @@ export default function AdminConfigurationPage() {
               setSuccessMessage={setSuccessMessage}
             />
 
-            {/* Maintenance + Reseed Sections */}
-            <MaintenanceSection
+            {/* Session Event Export */}
+            <SessionExportSection
+              tenants={tenants}
               getAccessToken={getAccessToken}
-              setError={setError}
-              setSuccessMessage={setSuccessMessage}
+            />
+
+            {/* Global Settings */}
+            <AdminConfigSettingsSection
+              loadingConfig={loadingConfig}
+              savingConfig={savingConfig}
+              adminConfig={adminConfig}
+              globalRateLimit={globalRateLimit}
+              setGlobalRateLimit={setGlobalRateLimit}
+              platformStatsBlobSasUrl={platformStatsBlobSasUrl}
+              setPlatformStatsBlobSasUrl={setPlatformStatsBlobSasUrl}
+              maxCollectorDurationHours={maxCollectorDurationHours}
+              setMaxCollectorDurationHours={setMaxCollectorDurationHours}
+              onSave={handleSaveAdminConfig}
+              onReset={handleResetAdminConfig}
             />
 
             {/* Diagnostics Log Paths */}
@@ -353,25 +367,11 @@ export default function AdminConfigurationPage() {
               setSuccessMessage={setSuccessMessage}
             />
 
-            {/* Session Event Export */}
-            <SessionExportSection
-              tenants={tenants}
+            {/* Maintenance + Reseed Sections */}
+            <MaintenanceSection
               getAccessToken={getAccessToken}
-            />
-
-            {/* Global Settings */}
-            <AdminConfigSettingsSection
-              loadingConfig={loadingConfig}
-              savingConfig={savingConfig}
-              adminConfig={adminConfig}
-              globalRateLimit={globalRateLimit}
-              setGlobalRateLimit={setGlobalRateLimit}
-              platformStatsBlobSasUrl={platformStatsBlobSasUrl}
-              setPlatformStatsBlobSasUrl={setPlatformStatsBlobSasUrl}
-              maxCollectorDurationHours={maxCollectorDurationHours}
-              setMaxCollectorDurationHours={setMaxCollectorDurationHours}
-              onSave={handleSaveAdminConfig}
-              onReset={handleResetAdminConfig}
+              setError={setError}
+              setSuccessMessage={setSuccessMessage}
             />
           </div>
         </main>