From d05fba06ece1f514cc7262492f284c3c982b7653 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Tue, 19 Jul 2022 14:33:51 -0400
Subject: [PATCH] add Environment to System Info

---
 Oqtane.Client/Modules/Admin/SystemInfo/Index.razor     | 10 +++++++++-
 .../Resources/Modules/Admin/SystemInfo/Index.resx      |  6 ++++++
 Oqtane.Server/Controllers/SystemController.cs          |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
index 7b3a149f..38291a66 100644
--- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -38,7 +38,13 @@
                     <input id="ipaddress" class="form-control" @bind="@_ipaddress" readonly />
                 </div>
             </div>
-            <div class="row mb-1 align-items-center">
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="environment" HelpText="Environment name" ResourceKey="Environment">Environment: </Label>
+				<div class="col-sm-9">
+					<input id="environment" class="form-control" @bind="@_environment" readonly />
+				</div>
+			</div>
+			<div class="row mb-1 align-items-center">
                 <Label Class="col-sm-3" For="contentrootpath" HelpText="Root Path" ResourceKey="ContentRootPath">Root Path: </Label>
                 <div class="col-sm-9">
                     <input id="contentrootpath" class="form-control" @bind="@_contentrootpath" readonly />
@@ -152,6 +158,7 @@
 	private string _osversion = string.Empty;
 	private string _machinename = string.Empty;
 	private string _ipaddress = string.Empty;
+	private string _environment = string.Empty;
 	private string _contentrootpath = string.Empty;
 	private string _webrootpath = string.Empty;
 	private string _servertime = string.Empty;
@@ -176,6 +183,7 @@
 			_osversion = systeminfo["OSVersion"].ToString();
 			_machinename = systeminfo["MachineName"].ToString();
 			_ipaddress = systeminfo["IPAddress"].ToString();
+			_environment = systeminfo["Environment"].ToString();
 			_contentrootpath = systeminfo["ContentRootPath"].ToString();
 			_webrootpath = systeminfo["WebRootPath"].ToString();
 			_servertime = systeminfo["ServerTime"].ToString() + " UTC";
diff --git a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
index ed9f15b6..9876218b 100644
--- a/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/SystemInfo/Index.resx
@@ -270,4 +270,10 @@
   <data name="WorkingSet.Text" xml:space="preserve">
     <value>Memory Allocation:</value>
   </data>
+  <data name="Environment.HelpText" xml:space="preserve">
+    <value>Environment Name</value>
+  </data>
+  <data name="Environment.Text" xml:space="preserve">
+    <value>Environment:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Server/Controllers/SystemController.cs b/Oqtane.Server/Controllers/SystemController.cs
index c0bdd44e..efe0d9e8 100644
--- a/Oqtane.Server/Controllers/SystemController.cs
+++ b/Oqtane.Server/Controllers/SystemController.cs
@@ -38,6 +38,7 @@ namespace Oqtane.Controllers
                     systeminfo.Add("TickCount", Environment.TickCount64.ToString());
                     systeminfo.Add("ContentRootPath", _environment.ContentRootPath);
                     systeminfo.Add("WebRootPath", _environment.WebRootPath);
+                    systeminfo.Add("Environment", _environment.EnvironmentName);
                     systeminfo.Add("ServerTime", DateTime.UtcNow.ToString());
                     var feature = HttpContext.Features.Get<IHttpConnectionFeature>();
                     systeminfo.Add("IPAddress", feature?.LocalIpAddress?.ToString());