Поправить баг с показом списка сюжетов (#3370)

Author: leotsarev

src/JoinRpg.Domain/ProjectEntityExtensions.cs

@@ -24,7 +24,7 @@ public static bool HasMasterAccess(this IProjectEntity entity, ICurrentUserAcces
     {
         ArgumentNullException.ThrowIfNull(entity);
 
-        return entity.Project.ProjectAcls.Where(acl => permission.GetPermssionExpression()(acl)).Any(pa => pa.UserId == currentUserAccessor.UserId);
+        return currentUserAccessor.UserIdOrDefault is int userId && entity.Project.ProjectAcls.Where(acl => permission.GetPermssionExpression()(acl)).Any(pa => pa.UserId == userId);
     }
 
     [Pure]
@@ -38,28 +38,13 @@ public static bool HasMasterAccess(this ProjectInfo entity, ICurrentUserAccessor
     }
 
     [Pure]
-    public static bool HasMasterAccess(this IProjectEntity entity, int? currentUserId, Permission permission)
+    public static bool HasMasterAccess(this IProjectEntity entity, int? currentUserId, Permission permission = Permission.None)
     {
         ArgumentNullException.ThrowIfNull(entity);
 
         return entity.Project.ProjectAcls.Where(acl => permission.GetPermssionExpression()(acl)).Any(pa => pa.UserId == currentUserId);
     }
 
-    public static bool HasMasterAccess(this IProjectEntity entity, int? currentUserId)
-    {
-        ArgumentNullException.ThrowIfNull(entity);
-
-        return entity.HasMasterAccess(currentUserId, acl => true);
-    }
-
-    public static bool HasMasterAccess(this IProjectEntity entity, ICurrentUserAccessor currentUserAccessor)
-    {
-        ArgumentNullException.ThrowIfNull(entity);
-        ArgumentNullException.ThrowIfNull(currentUserAccessor);
-
-        return entity.HasMasterAccess(currentUserAccessor.UserIdOrDefault, acl => true);
-    }
-
     public static T RequestMasterAccess<T>([NotNull] this T? field, ICurrentUserAccessor currentUserAccessor, Permission permission = Permission.None)
             where T : IProjectEntity
     {

src/JoinRpg.Portal/Views/Shared/Components/MainMenu/MainMenu.cshtml

@@ -1,32 +1,32 @@
-@using JoinRpg.Helpers
+@using JoinRpg.Helpers
 @model MainMenuViewModel
-    <nav class="navbar navbar-inverse navbar-fixed-top">
-        <div class="container">
-            <div class="navbar-header">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                @Html.ActionLink("JoinRpg", "Index", "Home", new { area = "" }, new { @class = "navbar-brand" })
-            </div>
-            <div class="navbar-collapse collapse">
-                <ul class="nav navbar-nav">
-                      <li class="dropdown">
+<nav class="navbar navbar-inverse navbar-fixed-top">
+    <div class="container">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            @Html.ActionLink("JoinRpg", "Index", "Home", new { area = "" }, new { @class = "navbar-brand" })
+        </div>
+        <div class="navbar-collapse collapse">
+            <ul class="nav navbar-nav">
+                <li class="dropdown">
 
-                        @if (Model.CurrentProjectId is not null)
-                        {
+                    @if (Model.CurrentProjectId is not null)
+                    {
 
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">@Model.CurrentProjectName <span class="caret"></span></a>
-                        }
-                        else 
-                        {
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Мои проекты и заявки <span class="caret"></span></a>
-                        }
+                    }
+                    else 
+                    {
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Мои проекты и заявки <span class="caret"></span></a>
+                    }
 
-                        <ul class="dropdown-menu">
-                            @foreach (var project in Model.ProjectLinks.OrderBy(p => p.ProjectName))
-                            {
+                    <ul class="dropdown-menu">
+                        @foreach (var project in Model.ProjectLinks.OrderBy(p => p.ProjectName).Take(20))
+                        {
                             <li>
                                 @if (!project.IAmMaster)
                                 {
@@ -37,8 +37,13 @@
                                 {
                                     @Html.ActionLink(@project.ProjectName, "Details", "Game", new { ProjectId = project.ProjectId.Value, area = "" }, null)
                                 }
-                              </li>
-                            }
+                            </li>
+                        }
+
+                        @if (Model.ProjectLinks.Length > 20)
+                        {
+                            <li><a asp-action="BrowseGames" asp-controller="Home">...Еще игры</a></li>
+                        }
 
                             @if (Model.ProjectLinks.Length > 0)
                             {

src/JoinRpg.Portal/Views/Shared/Components/ProjectMenu/PlayerMenu.cshtml

@@ -40,8 +40,8 @@
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Сюжеты <span class="caret"></span></a>
 
                         <ul class="dropdown-menu">
-                            <li>@Html.ActionLink("Все", "Index", "Plot", new { Model.ProjectId }, null)</li>
-                            <li>@Html.ActionLink("Одним списком", "FlatList", "Plot", new { Model.ProjectId }, null)</li>
+                            <li>@Html.ActionLink("Все", "Index", "PlotList", new { Model.ProjectId }, null)</li>
+                            <li>@Html.ActionLink("Одним списком", "FlatList", "PlotList", new { Model.ProjectId }, null)</li>
                         </ul>
                     </li>
                 }