Changeset 13862 for branches/WebJobManager

Timestamp:

05/30/16 16:52:40 (8 years ago)

Author:

jlodewyc

Message:

#2582 Start angular OKB manager, data loaded

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager

Files:

• Controllers/HomeController.cs (modified) (2 diffs)
• Controllers/JobController.cs (modified) (1 diff)
• Controllers/OkbManagementController.cs (added)
• Controllers/QueryController.cs (modified) (1 diff)
• Controllers/ResourceController.cs (modified) (1 diff)
• Controllers/UserController.cs (modified) (3 diffs)
• Hubs/CalendarHub.cs (modified) (1 diff)
• Hubs/OkbManagerHub.cs (added)
• Hubs/QueryHub.cs (modified) (1 diff)
• Hubs/UserInfoHub.cs (modified) (1 diff)
• Models/HiveWebUser.cs (modified) (5 diffs)
• Scripts/Hubs/OkbManagerHubber.js (added)
• Services/Imports/AccessAdministrationClient.cs (modified) (2 diffs)
• Services/Imports/HiveAdminClientWeb.cs (modified) (3 diffs)
• Services/Imports/HiveClientWeb.cs (modified) (1 diff)
• Services/Imports/HiveServiceLocatorWeb.cs (modified) (1 diff)
• Services/Imports/OkbAdministrationWebClient.cs (added)
• Services/Imports/QueryWebClient.cs (added)
• Services/JSONResolvers (added)
• Services/JSONResolvers/JsonTaskResolver.cs (added)
• Services/WebLoginService.cs (modified) (7 diffs)
• Startup.cs (modified) (1 diff)
• ViewModels/Jobs/FileOpeningViewModel.cs (modified) (2 diffs)
• ViewModels/Jobs/JobViewModel.cs (modified) (3 diffs)
• ViewModels/Jobs/UploadedJobViewModel.cs (modified) (3 diffs)
• ViewModels/LoginViewModel.cs (modified) (1 diff)
• ViewModels/MasterVM.cs (added)
• ViewModels/NavbarViewModel.cs (modified) (1 diff)
• ViewModels/OKB (added)
• ViewModels/OKB/OkbManagementVM.cs (added)
• ViewModels/OKB/QueryVM.cs (added)
• ViewModels/QueryVM.cs (deleted)
• ViewModels/User/UserViewModel.cs (modified) (3 diffs)
• Views/Job/Index.cshtml (modified) (1 diff)
• Views/Job/OpenFile.cshtml (modified) (1 diff)
• Views/Job/UploaderPartial/_UploaderPartial.cshtml (modified) (1 diff)
• Views/Job/Uploads.cshtml (modified) (1 diff)
• Views/OkbManagement (added)
• Views/OkbManagement/Index.cshtml (added)
• Views/Shared/Navbar.cshtml (modified) (1 diff)
• Views/User/Groups.cshtml (modified) (1 diff)
• Views/User/Index.cshtml (modified) (1 diff)
• Views/User/Roles.cshtml (modified) (1 diff)
• gruntfile.js (modified) (1 diff)
• wwwroot/js/hubs/okbmanagerhubber.js (added)
• wwwroot/js/hubs/queryhubber.js (added)

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

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Clients.Hive.WebJobManager.Services;
+
 using Microsoft.AspNetCore.Mvc;
 using System.ServiceModel.Security;
 using System;
+using Microsoft.AspNetCore.Http;
+using HeuristicLab.Clients.Hive.WebJobManager.Services;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
-using Microsoft.AspNetCore.Http;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
@@ -100 +102 @@
                     {
                         ViewBag.Title = "Login succesful";
-                        weblog.newLoginOKBOnly(model,q);
+                        weblog.newLoginOKBOnly(model,q, password);
                         HttpContext.Session.SetString("UserId", model.userId.ToString());
                         return RedirectToAction("Index", "Query");

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
+using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
+using HeuristicLab.Common;
+using HeuristicLab.Optimization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using Microsoft.Net.Http.Headers;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
-using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
-using Microsoft.AspNetCore.Http;
-
-using System.IO;
-using Microsoft.Net.Http.Headers;
-using Microsoft.AspNetCore.Hosting;
-using HeuristicLab.Common;
-using HeuristicLab.Optimization;
-using System.Threading;
-
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers

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

@@ -21 +21 @@
 
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
 using Microsoft.AspNetCore.Http;

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

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Models;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;

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

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels.User;
 using Microsoft.AspNetCore.Hosting;
@@ -27 +27 @@
 using Microsoft.AspNetCore.Mvc;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Mail;
-using System.ServiceModel.Security;
-using System.Threading.Tasks;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager.Controllers
@@ -191 +186 @@
                     accessClient.addMember(user, group);
                 }
-                return RedirectToAction("SelectUser", new { id = uid.ToString() });
+                if (uid != Guid.Empty && uid == weblog.getCurrentUser(userId).currentUser.Id)
+                    return RedirectToAction("Index", "Home");//Logout if current user
+                else
+                    return RedirectToAction("SelectUser", new { id = uid.ToString() });
             }
             else

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Hubs/CalendarHub.cs

@@ -21 +21 @@
 
 
-using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels.User;
 using Microsoft.AspNetCore.SignalR;

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Hubs/QueryHub.cs

@@ -21 +21 @@
 
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using HeuristicLab.Clients.OKB.Query;
 using Microsoft.AspNetCore.SignalR;

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Hubs/UserInfoHub.cs

@@ -21 +21 @@
 
 
-using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Controllers;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels.User;
 using Microsoft.AspNetCore.SignalR;

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Models/HiveWebUser.cs

@@ -48 +48 @@
         public HiveWebUser updateUserInfo()
         {
-            
+
             try
             {
@@ -57 +57 @@
                 access.RefreshUserGroups();
                 access.RefreshRoles();
-            
+
                 currentUser = access.Users.Find(x => x.UserName == username);
                 subscribedGroups = access.CallAccessService(x => x.GetUserGroupsOfUser(currentUser.Id));
                 accessRoles = access.CallAccessService(x => x.GetRolesOfCurrentUser());
             }
-            catch(SecurityAccessDeniedException e)
+            catch (Exception e)
             {
-                currentUser = new User();
-                currentUser.FullName = username;
-                subscribedGroups = new List<UserGroup>();
-                accessRoles = new List<Role>();
+                if (e is SecurityAccessDeniedException || e is NullReferenceException)
+                {
+                    currentUser = new User();
+                    currentUser.FullName = username;
+                    subscribedGroups = new List<UserGroup>();
+                    accessRoles = new List<Role>();
+                }
+                else
+                    throw e;
             }
-            
+
             return this;
 
@@ -75 +80 @@
         public bool HasUserAdminAccess()
         {
-            if(accessRoles.Find(x => x.Name == "AccessService Administrator") != null)
+            if (accessRoles.Find(x => x.Name == "AccessService Administrator") != null || weblog.getAccessAdminClient(webIdToken) != null)
             {
                 return true;
@@ -83 +88 @@
         public bool hasResourceAdminAccess()
         {
-            if(accessRoles.Find(x =>x.Name == "Hive Administrator" ) != null
-                && accessRoles.Find(x => x.Name == "AccessService Administrator") != null)
+            if ((accessRoles.Find(x => x.Name == "Hive Administrator") != null
+                && accessRoles.Find(x => x.Name == "AccessService Administrator") != null))
             {
                 return true;
@@ -92 +97 @@
         public bool hasOKBAccess()
         {
-            if (OKBOnly || accessRoles.Find(x => x.Name == "OKB User") != null || accessRoles.Find(x => x.Name == "OKB Administrator") != null)
+            if (OKBOnly || accessRoles.Find(x => x.Name == "OKB User") != null || accessRoles.Find(x => x.Name == "OKB Administrator") != null
+                || weblog.getQueryClient(webIdToken) != null)
+            {
+                return true;
+            }
+            return false;
+        }
+        public bool hasOKBAdminAccess()
+        {
+            if (OKBOnly)
+            {
+                if (weblog.getOkbAdminClient(webIdToken) != null)
+                    return true;
+            }
+            else if (accessRoles.Find(x => x.Name == "OKB Administrator") != null || weblog.getOkbAdminClient(webIdToken) != null)
             {
                 return true;

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/AccessAdministrationClient.cs

@@ -26 +26 @@
 using System.ServiceModel;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
-using HeuristicLab.Clients.Hive.WebJobManager.Services;
 using System.Collections.Generic;
 using System.ServiceModel.Security;
-
-namespace HeuristicLab.Clients.Access.Administration
+using HeuristicLab.Clients.Access;
+
+namespace HeuristicLab.Clients.Hive.WebJobManager.Services.Imports
 {
     /// <summary>
@@ -485 +485 @@
         }
         #endregion
+
+        internal bool CheckLogin()
+        {
+            try
+            {
+                this.RefreshUsers();
+                return true;
+            }
+            catch (SecurityAccessDeniedException e)
+            {
+                return false;
+            }
+            catch (MessageSecurityException e)
+            {
+                return false;
+            }
+        }
     }
 }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/HiveAdminClientWeb.cs

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Clients.Hive.WebJobManager.Services;
-
-namespace HeuristicLab.Clients.Hive
+using System.ServiceModel.Security;
+
+namespace HeuristicLab.Clients.Hive.WebJobManager.Services.Imports
 {
     [Item("Hive Administrator", "Hive Administrator")]
@@ -99 +100 @@
                 });
             }
-            catch
-            {
-                throw;
+            catch(Exception e)
+            {
+                throw e;
             }
             finally
@@ -200 +201 @@
             }
         }
+
+        internal bool CheckLogin()
+        {
+            try
+            {
+                this.Refresh();
+                return true;
+            }
+            catch (MessageSecurityException e)
+            {
+                return false;
+            }
+            catch(SecurityAccessDeniedException e)
+            {
+                return false;
+            }
+        }
     }
 }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/HiveClientWeb.cs

@@ -33 +33 @@
 using HeuristicLab.PluginInfrastructure;
 using TS = System.Threading.Tasks;
-using HeuristicLab.Clients.Hive.WebJobManager.Services;
-using HeuristicLab.Clients.Common.Properties;
 using Microsoft.AspNetCore.Hosting;
-using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
-
-namespace HeuristicLab.Clients.Hive.WebJobManager
+
+namespace HeuristicLab.Clients.Hive.WebJobManager.Services.Imports
 {
     /// <summary>

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/Imports/HiveServiceLocatorWeb.cs

@@ -11 +11 @@
 using System.Threading.Tasks;
 
-namespace HeuristicLab.Clients.Hive.WebJobManager.Services
+namespace HeuristicLab.Clients.Hive.WebJobManager.Services.Imports
 {
     /// <summary>

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Services/WebLoginService.cs

@@ -21 +21 @@
 
 
-using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Models;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using HeuristicLab.Clients.Hive.WebJobManager.ViewModels;
 using System;
@@ -48 +48 @@
         private List<HiveWebUser> loggedinUsers;
         private List<QueryWebClient> queryclients;
+        private List<OkbAdministrationWebClient> okbmanclients;
         /// <summary>
         /// Service instance that keeps all the information per user seperated. Data is in  different lists so 
@@ -77 +78 @@
             adminclients = new List<HiveAdminClientWeb>();
             loggedinUsers = new List<HiveWebUser>();
-            queryclients = new List<QueryWebClient>(); 
+            queryclients = new List<QueryWebClient>();
+            okbmanclients = new List<OkbAdministrationWebClient>();
         }
         /// <summary>
@@ -94 +96 @@
             loggedIn.Add(log);
             locators.Add(loc);
+            
             webclients.Add(new HiveClientWeb(loc, log.userId));
             fileopeners.Add(new FileOpeningService(log.userId));
             jobopeners.Add(new FileOpeningService(log.userId));
-            accessclients.Add(new AccessAdministrationClient(log.userId));
-            adminclients.Add(new HiveAdminClientWeb(log.userId));
+            var acc = new AccessAdministrationClient(log.userId);
+            if(acc.CheckLogin())
+                accessclients.Add(acc);
             loggedinUsers.Add(new HiveWebUser(log.userId, log.loginName, false).updateUserInfo());
-            queryclients.Add(new QueryWebClient(log.userId));
-        }
-        public void newLoginOKBOnly(LoginViewModel log, QueryWebClient qwc)
+            var ad = new HiveAdminClientWeb(log.userId);
+            if(ad.CheckLogin())
+                adminclients.Add(ad);  
+            var qu = new QueryWebClient(log.userId);
+            if(qu.CheckLogin())
+                queryclients.Add(qu);
+            var okb = new OkbAdministrationWebClient(log.userId);
+            if (okb.CheckLogin())
+                okbmanclients.Add(okb);
+        }
+        public void newLoginOKBOnly(LoginViewModel log, QueryWebClient qwc, string pass)
         {
             destroyPossiblePreviousSessions(log.loginName);
@@ -113 +125 @@
             queryclients.Add(qwc);
             loggedinUsers.Add(new HiveWebUser(log.userId, log.loginName, true).updateUserInfo());
+            var okb = new OkbAdministrationWebClient(log, pass);
+            if (okb.CheckLogin())
+                okbmanclients.Add(okb);
             
         }
@@ -194 +209 @@
         {
             return loggedinUsers.Find(x => x.webIdToken == id);
+        }
+
+        public OkbAdministrationWebClient getOkbAdminClient(Guid id)
+        {
+            return okbmanclients.Find(x => x.UserId == id);
         }
         /// <summary>
@@ -209 +229 @@
             adminclients.RemoveAll(x => x.userId == id);
             queryclients.RemoveAll(x => x.UserId == id);
+            okbmanclients.RemoveAll(x => x.UserId == id);
             loggedIn.RemoveAll(x => x.userId == id);
             loggedinUsers.RemoveAll(x => x.webIdToken == id);

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Startup.cs

@@ -32 +32 @@
 using System.Linq;
 using Microsoft.CodeAnalysis;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 
 namespace HeuristicLab.Clients.Hive.WebJobManager

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/Jobs/FileOpeningViewModel.cs

@@ -30 +30 @@
     /// Opening files
     /// </summary>
-    public class FileOpeningViewModel
+    public class FileOpeningViewModel :MasterVM
     {
         public OptimizerHiveTask SelectedTask { get; set; }
@@ -37 +37 @@
         public Experiment SelectedExperiment { get; set; }
         public BatchRun SelectedBatchRun { get; set; }
-        public string message { get; set; }
-        public HiveWebUser currentUser { get; set; }
 
-        public FileOpeningViewModel(HiveWebUser hwu)
-        {
-            currentUser = hwu;
-        }
+        public FileOpeningViewModel(HiveWebUser hwu) : base(hwu)
+        { }
     }
 }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/Jobs/JobViewModel.cs

@@ -30 +30 @@
     /// Keeps list of loaded jobs
     /// </summary>
-    public class JobViewModel
+    public class JobViewModel : MasterVM
     {
-        public HiveWebUser currentUser { get; set; }
         public List<RefreshableJob> userJobs { get; set; }
 
@@ -38 +37 @@
 
         public List<HiveTask> selectedHiveTasks { get; set; }
-        public string message { get; set; }
-        public JobViewModel(HiveWebUser hwu)
+        public JobViewModel(HiveWebUser hwu) : base(hwu)
         {
             userJobs = null;
@@ -45 +43 @@
             selectedHiveTasks = new List<HiveTask>();
             message = "";
-            currentUser = hwu;
         }
     }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/Jobs/UploadedJobViewModel.cs

@@ -11 +11 @@
     /// Used to show data of uploaded files
     /// </summary>
-    public class UploadedJobViewModel
+    public class UploadedJobViewModel : MasterVM
     {
-        public UploadedJobViewModel(HiveWebUser hwu)
+        public UploadedJobViewModel(HiveWebUser hwu) : base(hwu)
         {
             FullDatePaths = new List<string>();
@@ -20 +20 @@
             DisplayFilesPaths = new List<string>();
             SelectedIndex = -1;
-            currentUser = hwu;
         }
         public void clear()
@@ -35 +34 @@
         public List<string> DisplayFilesPaths { get; set; }
         public int SelectedIndex { get; set; }
-        public string message { get; set; }
-        public HiveWebUser currentUser { get; set; }
         
     }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/LoginViewModel.cs

@@ -28 +28 @@
     /// Used for login
     /// </summary>
-    public class LoginViewModel
+    public class LoginViewModel // NOT MASTERVM => Starts the user login 
     {
         /// <summary>

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/ViewModels/NavbarViewModel.cs

@@ -24 +24 @@
 namespace HeuristicLab.Clients.Hive.WebJobManager.ViewModels
 {
-    public class NavbarViewModel
+    public class NavbarViewModel : MasterVM
     {
 
         public string Active { get; set; }
-        public HiveWebUser User { get; set; }
 
-        public NavbarViewModel(string ac, HiveWebUser hwu )
+        public NavbarViewModel(string ac, HiveWebUser hwu ) : base(hwu)
         {
             Active = ac;
-            User = hwu;
         }
     }

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

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Clients.Access.Administration;
 using HeuristicLab.Clients.Hive.WebJobManager.Models;
+using HeuristicLab.Clients.Hive.WebJobManager.Services.Imports;
 using System;
 using System.Collections.Generic;
@@ -31 +31 @@
     /// ViewModel containing User/Group/Role data
     /// </summary>
-    public class UserViewModel
+    public class UserViewModel : MasterVM
     {
-        public HiveWebUser currentUser { get; set; }
-        public string message { get; set; }
         public AccessAdministrationClient accessClient { get; set; }
         public List<Access.User> users { get; set; }
@@ -52 +50 @@
         /// </summary>
         /// <param name="ac">AccessAdminClient for connection</param>
-        public UserViewModel(AccessAdministrationClient ac, HiveWebUser hwu)
+        public UserViewModel(AccessAdministrationClient ac, HiveWebUser hwu) : base(hwu)
         {
-            currentUser = hwu;
             users = new List<Access.User>();
             accessClient = ac;

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

@@ -8 +8 @@
 <div class="animated fadeIn">
     <!-- Main nav menu-->
-    @Html.Partial("Navbar", new NavbarViewModel("Job", Model.currentUser))
+    @Html.Partial("Navbar", new NavbarViewModel("Job", Model.User))
 
     <!-- Job menu-->

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/OpenFile.cshtml

@@ -14 +14 @@
     <div id="userId" style="display:none">@ViewBag.SessionId</div>
     <!-- Main nav menu -->
-    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.currentUser))
+    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.User))
 
     <!-- Job menu-->

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

@@ -48 +48 @@
                     <span class="input-group-addon"
                           id="basic-addon3">
-                        .../uploads/@(Model.currentUser.currentUser.UserName != null ?  Model.currentUser.currentUser.UserName : Model.currentUser.currentUser.FullName)/
+                        .../uploads/@(Model.User.currentUser.UserName != null ?  Model.User.currentUser.UserName : Model.User.currentUser.FullName)/
                     </span>
                     <input type="text"

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Job/Uploads.cshtml

@@ -5 +5 @@
 <div class="animated fadeIn">
 
-    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.currentUser))
+    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("Job", Model.User))
 
     <ul class="nav nav-pills nav-justified">

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Views/Shared/Navbar.cshtml

@@ -77 +77 @@
     </li>
     <li role="presentation"
+        class="@(Model.Active == "OKBAdmin" ? "active" : "")
+        @(Model.User.hasOKBAdminAccess() == false ? "disabled" : "")
+        ">
+        @if ( Model.User.hasOKBAdminAccess())
+            {
+            <a asp-controller="OkbManagement"
+               asp-action="Index"
+               accesskey="q">
+                OKB management
+            </a>
+        }
+        else
+        {
+            <a>OKB management</a>
+        }
+
+    </li>
+    <li role="presentation"
         class="pull-right ">
         

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

@@ -5 +5 @@
 <div class="animated fadeIn">
 
-    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
+    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.User))
 
     <ul class="nav nav-pills nav-justified">

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

@@ -4 +4 @@
 <div class="animated fadeIn">
 
-    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
+    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.User))
 
     <ul class="nav nav-pills nav-justified">

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

@@ -5 +5 @@
 <div class="animated fadeIn">
 
-    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.currentUser))
+    @Html.Partial("Navbar", new HeuristicLab.Clients.Hive.WebJobManager.ViewModels.NavbarViewModel("User", Model.User))
 
     <ul class="nav nav-pills nav-justified">

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/gruntfile.js

@@ -57 +57 @@
                 files:{
                     'wwwroot/js/hubs/calendarhubber.js': 'Scripts/Hubs/CalendarHubber.js',
-                    'wwwroot/js/hubs/queryhubber.js': 'Scripts/Hubs/QueryHubber.js'
+                    'wwwroot/js/hubs/queryhubber.js': 'Scripts/Hubs/QueryHubber.js',
+                    'wwwroot/js/hubs/okbmanagerhubber.js': 'Scripts/Hubs/OkbManagerHubber.js'
                 }
             }