From 806daaf7c94e29d2410e3511cc3f889ac02e9ac7 Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Fri, 13 May 2022 17:00:10 -0400
Subject: [PATCH] remove columns from main user management view  and migrate
 them to edit view

---
 Oqtane.Client/Modules/Admin/Users/Edit.razor  | 114 ++++++++++--------
 Oqtane.Client/Modules/Admin/Users/Index.razor |  19 ++-
 .../Resources/Modules/Admin/Users/Edit.resx   |  12 ++
 .../Resources/Modules/Admin/Users/Index.resx  |   6 -
 4 files changed, 85 insertions(+), 66 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Users/Edit.razor b/Oqtane.Client/Modules/Admin/Users/Edit.razor
index fa05cc6e..cb8339c0 100644
--- a/Oqtane.Client/Modules/Admin/Users/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor
@@ -72,8 +72,19 @@ else
                         </select>
                     </div>
                 </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="lastlogin" HelpText="The date and time when the user last signed in" ResourceKey="LastLogin"></Label>
+                    <div class="col-sm-9">
+                        <input id="lastlogin" class="form-control" @bind="@lastlogin" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="lastipaddress" HelpText="The IP Address of the user recorded during their last login" ResourceKey="LastIPAddress"></Label>
+                    <div class="col-sm-9">
+                        <input id="lastipaddress" class="form-control" @bind="@lastipaddress" readonly />
+                    </div>
+                </div>
             </div>
-
         }
     </TabPanel>
     <TabPanel Name="Profile" ResourceKey="Profile">
@@ -137,63 +148,70 @@ else
 <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
 
 @code {
-    private int userid;
-    private string username = string.Empty;
-    private string _password = string.Empty;
+	private int userid;
+	private string username = string.Empty;
+	private string _password = string.Empty;
 	private string _passwordtype = "password";
 	private string _togglepassword = string.Empty;
-    private string confirm = string.Empty;
-    private string email = string.Empty;
-    private string displayname = string.Empty;
-    private FileManager filemanager;
-    private int photofileid = -1;
-    private File photo = null;
-    private List<Profile> profiles;
-    private Dictionary<string, string> settings;
-    private string category = string.Empty;
-    private string createdby;
-    private DateTime createdon;
-    private string modifiedby;
-    private DateTime modifiedon;
-    private string deletedby;
-    private DateTime? deletedon;
-    private string isdeleted;
+	private string confirm = string.Empty;
+	private string email = string.Empty;
+	private string displayname = string.Empty;
+	private FileManager filemanager;
+	private int photofileid = -1;
+	private File photo = null;
+	private string isdeleted;
+	private string lastlogin;
+	private string lastipaddress;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	private List<Profile> profiles;
+	private Dictionary<string, string> settings;
+	private string category = string.Empty;
 
-    protected override async Task OnParametersSetAsync()
-    {
-        try
-        {
-            if (PageState.QueryString.ContainsKey("id"))
-            {
-                _togglepassword = SharedLocalizer["ShowPassword"];
-                profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
-                userid = Int32.Parse(PageState.QueryString["id"]);
-                var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
-                if (user != null)
-                {
-                    username = user.Username;
-                    email = user.Email;
-                    displayname = user.DisplayName;
-                    if (user.PhotoFileId != null)
-                    {
-                        photofileid = user.PhotoFileId.Value;
-                        photo = await FileService.GetFileAsync(photofileid);
-                    }
-                    else
-                    {
-                        photofileid = -1;
-                        photo = null;
-                    }
-                    settings = await SettingService.GetUserSettingsAsync(user.UserId);
+	private string createdby;
+	private DateTime createdon;
+	private string modifiedby;
+	private DateTime modifiedon;
+	private string deletedby;
+	private DateTime? deletedon;
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	protected override async Task OnParametersSetAsync()
+	{
+		try
+		{
+			if (PageState.QueryString.ContainsKey("id"))
+			{
+				_togglepassword = SharedLocalizer["ShowPassword"];
+				profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+				userid = Int32.Parse(PageState.QueryString["id"]);
+				var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+				if (user != null)
+				{
+					username = user.Username;
+					email = user.Email;
+					displayname = user.DisplayName;
+					if (user.PhotoFileId != null)
+					{
+						photofileid = user.PhotoFileId.Value;
+						photo = await FileService.GetFileAsync(photofileid);
+					}
+					else
+					{
+						photofileid = -1;
+						photo = null;
+					}
+                    isdeleted = user.IsDeleted.ToString();
+					lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", user.LastLoginOn);
+					lastipaddress = user.LastIPAddress;
+
+					settings = await SettingService.GetUserSettingsAsync(user.UserId);
                     createdby = user.CreatedBy;
                     createdon = user.CreatedOn;
                     modifiedby = user.ModifiedBy;
                     modifiedon = user.ModifiedOn;
                     deletedby = user.DeletedBy;
                     deletedon = user.DeletedOn;
-                    isdeleted = user.IsDeleted.ToString();
                 }
             }
         }
diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor
index 79b5d028..63147056 100644
--- a/Oqtane.Client/Modules/Admin/Users/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Users/Index.razor
@@ -33,14 +33,12 @@ else
 			</div>
 			<Pager Items="@users" RowClass="align-middle">
 				<Header>
-				<th style="width: 1px;">&nbsp;</th>
-				<th style="width: 1px;">&nbsp;</th>
-				<th style="width: 1px;">&nbsp;</th>
-				<th>@SharedLocalizer["Username"]</th>
-				<th>@SharedLocalizer["Email"]</th>
-				<th>@Localizer["LastLoginOn"]</th>
-				<th>@Localizer["LastIPAddress"]</th>
-				<th>@Localizer["CreatedOn"]</th>
+					<th style="width: 1px;">&nbsp;</th>
+					<th style="width: 1px;">&nbsp;</th>
+					<th style="width: 1px;">&nbsp;</th>
+					<th>@SharedLocalizer["Username"]</th>
+					<th>@SharedLocalizer["Name"]</th>
+					<th>@Localizer["LastLoginOn"]</th>
 				</Header>
 				<Row>
 					<td>
@@ -54,10 +52,7 @@ else
 					</td>
 					<td>@context.User.Username</td>
 					<td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{1}</a>", @context.User.Email, @context.User.DisplayName))</td>
-					<td>@string.Format("{0:dd-MMM-yyyy HH:mm}",context.User.LastLoginOn)</td>
-                    <td>@context.User.LastIPAddress</td>
-                    <td>@string.Format("{0:dd-MMM-yyyy HH:mm}",context.User.CreatedOn)</td>
-
+					<td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", context.User.LastLoginOn)</td>
 				</Row>
 			</Pager>
 	</TabPanel>
diff --git a/Oqtane.Client/Resources/Modules/Admin/Users/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/Users/Edit.resx
index 831ba0ad..41446826 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Users/Edit.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Users/Edit.resx
@@ -186,4 +186,16 @@
   <data name="Password.Placeholder" xml:space="preserve">
     <value>Password</value>
   </data>
+  <data name="LastIPAddress.HelpText" xml:space="preserve">
+    <value>The IP Address of the user recorded during their last login</value>
+  </data>
+  <data name="LastIPAddress.Text" xml:space="preserve">
+    <value>Last IP Address: </value>
+  </data>
+  <data name="LastLogin.HelpText" xml:space="preserve">
+    <value>The date and time when the user last signed in</value>
+  </data>
+  <data name="LastLogin.Text" xml:space="preserve">
+    <value>Last Login:</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
index 7d8463de..2568b5a9 100644
--- a/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/Users/Index.resx
@@ -369,12 +369,6 @@
   <data name="Required" xml:space="preserve">
     <value>Required</value>
   </data>
-  <data name="CreatedOn" xml:space="preserve">
-    <value>Created On</value>
-  </data>
-  <data name="LastIPAddress" xml:space="preserve">
-    <value>Last IP Address</value>
-  </data>
   <data name="LastLoginOn" xml:space="preserve">
     <value>Last Login</value>
   </data>