From 3c1167d35936f85c8a468beb6b6455719a64b3b4 Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Fri, 19 Sep 2025 15:25:11 -0400
Subject: [PATCH] improve migration history

---
 .../Modules/Admin/SystemInfo/Index.razor       | 18 +++++++++++++++---
 .../Modules/Admin/SystemInfo/Index.resx        |  6 ++++++
 .../Repository/Context/MasterDBContext.cs      |  1 -
 .../Repository/Context/TenantDBContext.cs      |  1 +
 .../Repository/MigrationHistoryRepository.cs   | 10 ++++++----
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
index ca32bf86..3ce9f92f 100644
--- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -3,6 +3,7 @@
 @inject ISystemService SystemService
 @inject IInstallationService InstallationService
 @inject IMigrationHistoryService MigrationHistoryService
+@inject ITenantService TenantService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -174,11 +175,19 @@
             <button type="button" class="btn btn-danger" @onclick="ClearLog">@Localizer["Clear"]</button>
         </TabPanel>
         <TabPanel Name="Migrations" Heading="Migrations" ResourceKey="Migrations">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="tenant" HelpText="The name of the current database. Note that this is not the physical database name but rather the tenant name which is used within the framework to identify a database." ResourceKey="Tenant">Database: </Label>
+                    <div class="col-sm-9">
+                        <input id="tenant" class="form-control" @bind="@_tenant" readonly />
+                    </div>
+                </div>
+            </div>
             <Pager Items="@_history" SearchProperties="MigrationId">
                 <Header>
-                <th>@Localizer["Migration"]</th>
-                <th>@Localizer["Date"]</th>
-                <th>@Localizer["Version"]</th>
+                    <th>@Localizer["Migration"]</th>
+                    <th>@Localizer["Date"]</th>
+                    <th>@Localizer["Version"]</th>
                 </Header>
                 <Row>
                     <td>@context.MigrationId</td>
@@ -219,6 +228,7 @@
 
     private string _log = string.Empty;
 
+    private string _tenant = string.Empty;
     private List<MigrationHistory> _history;
 
     protected override async Task OnInitializedAsync()
@@ -259,6 +269,8 @@
             _log = systeminfo["Log"].ToString();
         }
 
+        var tenants = await TenantService.GetTenantsAsync();
+        _tenant = tenants.Find(item => item.TenantId == PageState.Site.TenantId).Name;
         _history = await MigrationHistoryService.GetMigrationHistoryAsync();
 
         _initialized = true;
diff --git a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
index d276da67..a4a292d4 100644
--- a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
@@ -318,4 +318,10 @@
   <data name="Version" xml:space="preserve">
     <value>Framework Version</value>
   </data>
+  <data name="Tenant.Text" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="Tenant.HelpText" xml:space="preserve">
+    <value>The name of the current database. Note that this is not the physical database name but rather the tenant name which is used within the framework to identify a database.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Server/Repository/Context/MasterDBContext.cs b/Oqtane.Server/Repository/Context/MasterDBContext.cs
index 1e8f6a1e..4ade9f28 100644
--- a/Oqtane.Server/Repository/Context/MasterDBContext.cs
+++ b/Oqtane.Server/Repository/Context/MasterDBContext.cs
@@ -69,7 +69,6 @@ namespace Oqtane.Repository
         public virtual DbSet<JobLog> JobLog { get; set; }
         public virtual DbSet<Setting> Setting { get; set; }
         public virtual DbSet<Theme> Theme { get; set; }
-        public virtual DbSet<MigrationHistory> MigrationHistory { get; set; }
 
         public override int SaveChanges()
         {
diff --git a/Oqtane.Server/Repository/Context/TenantDBContext.cs b/Oqtane.Server/Repository/Context/TenantDBContext.cs
index 599485f7..bb0e1c72 100644
--- a/Oqtane.Server/Repository/Context/TenantDBContext.cs
+++ b/Oqtane.Server/Repository/Context/TenantDBContext.cs
@@ -33,5 +33,6 @@ namespace Oqtane.Repository
         public virtual DbSet<SearchContentProperty> SearchContentProperty { get; set; }
         public virtual DbSet<SearchContentWord> SearchContentWord { get; set; }
         public virtual DbSet<SearchWord> SearchWord { get; set; }
+        public virtual DbSet<MigrationHistory> MigrationHistory { get; set; }
     }
 }
diff --git a/Oqtane.Server/Repository/MigrationHistoryRepository.cs b/Oqtane.Server/Repository/MigrationHistoryRepository.cs
index 27068198..5465dc08 100644
--- a/Oqtane.Server/Repository/MigrationHistoryRepository.cs
+++ b/Oqtane.Server/Repository/MigrationHistoryRepository.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
@@ -10,16 +11,17 @@ namespace Oqtane.Repository
     }
     public class MigrationHistoryRepository : IMigrationHistoryRepository
     {
-        private MasterDBContext _db;
+        private readonly IDbContextFactory<TenantDBContext> _dbContextFactory;
 
-        public MigrationHistoryRepository(MasterDBContext context)
+        public MigrationHistoryRepository(IDbContextFactory<TenantDBContext> dbContextFactory)
         {
-            _db = context;
+            _dbContextFactory = dbContextFactory;
         }
 
         public IEnumerable<MigrationHistory> GetMigrationHistory()
         {
-            return _db.MigrationHistory.ToList();
+            using var db = _dbContextFactory.CreateDbContext();
+            return db.MigrationHistory.ToList();
         }
     }
 }