Changeset 13741 for branches/WebJobManager

Timestamp:

03/31/16 16:59:16 (9 years ago)

Author:

jlodewyc

Message:

#2582 Users: Load, show info, update and add

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager

Files:

• Controllers/HomeController.cs (modified) (2 diffs)
• Controllers/UserController.cs (modified) (4 diffs)
• Hubs/UserInfoHub.cs (added)
• Services/Imports/AccessAdministrationClient.cs (added)
• ViewModels/User/UserViewModel.cs (modified) (2 diffs)
• Views/Job/UploaderPartial/_UploaderPartial.cshtml (modified) (1 diff)
• Views/User/Index.cshtml (modified) (4 diffs)
• wwwroot/js/Scripts/UserInfoHubber.js (added)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/HomeController.cs

@@ -57 +57 @@
                 Common.Properties.Settings.Default.Save();
                 hiveServiceLocator.Username = loginName;
-                hiveServiceLocator.Password = password;
+                hiveServiceLocator.Password = password;//Not encrypted for login to service
                 hiveServiceLocator.UserId = model.userId;
 
@@ -73 +73 @@
                     model = new LoginViewModel();
                     model.errorMessage = "Wrong login, try again";
+                    return View("Index", model);
+                }
+                catch(SecurityAccessDeniedException e)
+                {
+                    ViewBag.Title = "Access denied - Login";
+                    model = new LoginViewModel();
+                    model.errorMessage = "Access denied, you have no permission to use this application." +
+                        "              Contact a HeuristicLab Hive admin to gain access.";
                     return View("Index", model);
                 }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Controllers/UserController.cs

@@ -50 +50 @@
 
                 ViewBag.Title = "Users";
-                // accessClient.RefreshUsers();
-                UserViewModel vm = new UserViewModel();
-                vm.users = new List<string>() { "Jean" };
+                UserViewModel vm = new UserViewModel(accessClient).refreshUsers();
+                ViewBag.SessionId = HttpContext.Session.GetString("UserId");
                 return View("Index", vm);
             }
@@ -60 +59 @@
             }
         }
+
         public IActionResult SelectUser(string id)
         {
@@ -66 +66 @@
             {
                 Guid curr = Guid.Parse(id);
-                UserViewModel vm = new UserViewModel();
-                vm.users = new List<string>() { "Jean" };
+                
+                UserViewModel vm = new UserViewModel(accessClient).refreshUsers();
                 if (curr == Guid.Empty)
                 {
-                    vm.SelectedUser = "";
                     ViewBag.Title = "Add User";
                 }
                 else
                 {
-                    vm.SelectedUser = "Jean";
-                    ViewBag.Title = "Jean";
+                    vm.SelectedUser = vm.getUserById(curr);
+                    ViewBag.title = vm.SelectedUser.UserName;
                 }
                 ViewBag.Title += " - Users";
+                ViewBag.SessionId = HttpContext.Session.GetString("UserId");
                 return View("Index", vm);
             }
@@ -86 +86 @@
             }
         }
+        [HttpPost]
+        public IActionResult saveUser(string inpusername, string inpfullname, string inpemail, string u)
+        {
+            init();
+            var uid = Guid.Parse(u);
+            Access.User user;
+            if (uid == Guid.Empty)
+                user = new Access.User();
+            else
+                user = accessClient.Users.Find(x => x.Id == uid);
+
+            user.Id = uid;
+            user.UserName = inpusername;
+            user.FullName = inpfullname;
+            user.Email = inpemail;
+
+
+            if (uid == Guid.Empty)
+            {
+                uid = accessClient.addUser(user);
+                ViewBag.Title = inpusername + " added - User";
+            }
+            else
+            {
+                accessClient.updateUser(user);
+                ViewBag.Title = inpusername + " updated - User";
+            }
+
+            return RedirectToAction( "SelectUser", new {  id =  uid.ToString()});
+
+        }
+
         #endregion
 

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/User/UserViewModel.cs

@@ -1 @@
-using System;
+using HeuristicLab.Clients.Access.Administration;
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10 +11 @@
 
         public string message { get; set; }
-        public List<string> users { get; set; }//temp
+        public AccessAdministrationClient accessClient { get; set; }
+        public List<Access.User> users { get; set; }
+        public List<Access.Role> roles { get; set; }
+        public List<Access.UserGroup> ugroups { get; set; }
 
-        public string SelectedUser { get; set; }//temp
+        public Access.User SelectedUser { get; set; }
 
-        public UserViewModel()
+        public UserViewModel(AccessAdministrationClient ac)
         {
-            users = new List<string>();
+            users = new List<Access.User>();
+            accessClient = ac;
+            SelectedUser = new Access.User();
+            
+        }
+        public UserViewModel refreshUsers()
+        {
+            accessClient.RefreshUsers();
+            users = accessClient.Users.ToList();
+            return this;
+        }
+        public UserViewModel refreshRoles()
+        {
+            accessClient.RefreshRoles();
+            roles = accessClient.Roles.ToList();
+            return this;
+        }
+        public UserViewModel refreshGroups()
+        {
+            accessClient.RefreshUserGroups();
+            ugroups= accessClient.Groups.ToList();
+            return this;
+        }
+        public Access.User getUserById(Guid id)
+        {
+            return users.Find(x => x.Id == id);
         }
     }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/UploaderPartial/_UploaderPartial.cshtml

@@ -58 +58 @@
                 </div>
             </div>
-            <button style=" box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+            <button style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
                             text-shadow:2px 2px black;"
                    disabled

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/User/Index.cshtml

@@ -1 +1 @@
 @using HeuristicLab.Clients.Hive.WebJobManager.ViewModels.User;
 @model UserViewModel
+<div id="userId" style="display:none">@ViewBag.SessionId</div>
 <div>
 
@@ -53 +54 @@
                     </a>
                     <a class="btn btn-success btn-block
-                       @(Model.SelectedUser == "" ? "active" : "")
+                       @(Model.SelectedUser.Id == Guid.Empty ? "active" : "")
                        "
                        asp-controller="User"
@@ -63 +64 @@
                         <i class="fa fa-user-plus"></i> Add new user
                     </a>
-                    @foreach(var user in Model.users)
+                    @foreach (var user in Model.users)
                     {
-                        <a class="btn  btn-default @(user == Model.SelectedUser ? "active" : "" )"
+                        <a class="btn  btn-default @( user.Id == Model.SelectedUser.Id ? "active" : "" )"
                            style="box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);"
                            asp-controller="User"
                            asp-action="SelectUser"
-                           asp-route-id="@Guid.NewGuid()"
+                           asp-route-id="@user.Id"
                            onclick="showUser()">
-                            @user
+                            @user.UserName (@user.FullName)
                         </a>
                     }
@@ -97 +98 @@
                 </i>
             </p>
-            <div id="content">
-
-                </div>
+            <div class="col-sm-8"
+                 id="content"
+                 style="padding:5px; padding-left:10px;">
+                @if (Model.SelectedUser != null)
+                {
+                    <div class="panel panel-default"
+                         style="border-width:2px!important;padding:17px;
+                        box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);">
+                        <div class="row">
+                            <h2 style="padding-left:20px">
+                                @if (Model.SelectedUser.Id != Guid.Empty)
+                                {
+                                    @Model.SelectedUser.UserName;
+                                }
+                                else
+                                {
+                                   @("Add new user")
+
+                                }
+                            </h2>
+                            <form class="form-horizontal"
+                                   method="post"
+                                  asp-action="saveUser"
+                                  asp-controller="User" enctype="multipart/form-data">
+                                <div class="form-group">
+                                    <label for="inpusername"
+                                           class="col-sm-3 control-label">
+                                        Username
+                                    </label>
+                                    <div class="col-sm-8">
+                                        <input type="text"
+                                               class="form-control"
+                                               id="inpusername"
+                                               name="inpusername"
+                                               placeholder="Username"
+                                               onchange="triggerSave()"
+                                               value="@Model.SelectedUser.UserName">
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label for="inpfullname"
+                                           class="col-sm-3 control-label">
+                                        Full name
+                                    </label>
+                                    <div class="col-sm-8">
+                                        <input type="text"
+                                               class="form-control"
+                                               id="inpfullname"
+                                               name="inpfullname"
+                                               placeholder="Full name"
+                                               onchange="triggerSave()"
+                                               value="@Model.SelectedUser.FullName">
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label for="inpemail"
+                                           class="col-sm-3 control-label">
+                                        Email
+                                    </label>
+                                    <div class="col-sm-8">
+                                        <input type="email"
+                                               class="form-control"
+                                               id="inpemail"
+                                               name="inpemail"
+                                               placeholder="Email"
+                                               onchange="triggerSave()"
+                                               value="@Model.SelectedUser.Email">
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">
+                                        User id
+                                    </label>
+                                    <label class="col-sm-8 control-label" style="text-align:left">
+                                        @Model.SelectedUser.Id
+                                    </label>
+                                    <input type="text"
+                                           style="display:none"
+                                           id="u"
+                                           name="u"
+                                           value="@Model.SelectedUser.Id" />
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">
+                                        Last login
+                                    </label>
+                                    <label class="col-sm-8 control-label" style="text-align:left">
+                                        @Model.SelectedUser.LastLoginDate.AddHours(2).ToString()
+                                    </label>
+                                </div>
+                                <div class="form-group">
+                                    <label class="col-sm-3 control-label">
+                                        Last activity
+                                    </label>
+                                    <label class="col-sm-8 control-label" style="text-align:left">
+                                        @Model.SelectedUser.LastActivityDate.AddHours(2).ToString()
+                                    </label>
+                                </div>
+                                @if (Model.SelectedUser.Id == Guid.Empty)
+                                {
+                                    <div class="form-group">
+                                        <div class="col-sm-offset-3 col-sm-9">
+                                            <button type="submit"
+                                                    id="inpsaver"
+                                                    disabled
+                                                    class="btn btn-lg btn-default">
+                                                Add user
+                                            </button>
+                                        </div>
+                                    </div>
+
+
+                                }
+                                else
+                                {
+                                    <div class="form-group">
+                                        <label class="col-sm-3 control-label">
+                                            Last activity
+                                        </label>
+                                        <div id="inppassreset">
+                                            <button type="button"
+                                                    onclick="resetPass('@(Model.SelectedUser.Id)')"
+                                                    class="btn btn-lg btn-default">
+                                                Reset password
+                                            </button>
+                                        </div>
+                                    </div>
+                                    <div class="form-group">
+                                        <div class="col-sm-offset-3 col-sm-9">
+                                            <button type="submit"
+                                                    id="inpsaver"
+                                                    disabled
+                                                    class="btn btn-lg btn-default">
+                                                Save changes
+                                            </button>
+                                        </div>
+                                    </div>
+
+
+                                }
+                                <script type="text/javascript">
+                                    function triggerSave() {
+                                        if ($("#inpusername").val() != "" &&
+                                            $("#inpfullname").val() != "" &&
+                                            $("#inpemail").val() != "") {
+                                            document.getElementById("inpsaver").className = "btn btn-lg btn-success";
+                                            document.getElementById("inpsaver").disabled = false;
+                                        }
+                                        else {
+                                            document.getElementById("inpsaver").className = "btn btn-lg btn-default";
+                                            document.getElementById("inpsaver").disabled = true;
+
+                                        }
+
+                                    }
+                                </script>
+                            </form>
+
+                        </div>
+                    </div>
+
+                }
+
+
+
+
+            </div>
         }
     </div>
+
+    <script src="~/js/scripts/userinfohubber.js" type="text/javascript"></script>
     <script type="text/javascript">
         function showSaver() {