|
65 | 65 | var mapsByName = Model.Maps.ToDictionary(m => m.MapName, StringComparer.OrdinalIgnoreCase); |
66 | 66 | var serverMapNames = Model.ServerMaps.Select(m => m.Name).ToHashSet(StringComparer.OrdinalIgnoreCase); |
67 | 67 | var serverMapsByName = Model.ServerMaps.ToDictionary(m => m.Name, StringComparer.OrdinalIgnoreCase); |
| 68 | + |
| 69 | + var activeRotMaps = Model.ActiveRotation?.MapRotationMaps ?? []; |
| 70 | + var missingFromHost = activeRotMaps.Count(rm => |
| 71 | + { |
| 72 | + var mn = mapsById.TryGetValue(rm.MapId, out var m) ? m.MapName : null; |
| 73 | + return mn != null && !serverMapNames.Contains(mn); |
| 74 | + }); |
| 75 | + var problematicCount = activeRotMaps.Count(rm => mapsById.TryGetValue(rm.MapId, out var m) && m.MapStatus == MapHealthStatus.Problematic); |
| 76 | + var blacklistedCount = activeRotMaps.Count(rm => mapsById.TryGetValue(rm.MapId, out var m) && m.MapStatus == MapHealthStatus.Blacklisted); |
| 77 | + var sortedRotMaps = Model.ActiveRotation?.MapRotationMaps?.OrderBy(m => m.SortOrder).ToList() ?? []; |
68 | 78 | } |
69 | 79 |
|
70 | 80 | @* Tab 1: Current Rotation *@ |
|
86 | 96 | · @(Model.ActiveRotation.MapRotationMaps?.Count ?? 0) maps · Version @Model.ActiveRotation.Version |
87 | 97 | </small> |
88 | 98 | </div> |
89 | | - @{ |
90 | | - var rotMapsForHealth = Model.ActiveRotation.MapRotationMaps ?? []; |
91 | | - var missingFromHost = rotMapsForHealth.Count(rm => |
92 | | - { |
93 | | - var mapName = mapsById.TryGetValue(rm.MapId, out var m) ? m.MapName : null; |
94 | | - return mapName != null && !serverMapNames.Contains(mapName); |
95 | | - }); |
96 | | - var problematicCount = rotMapsForHealth.Count(rm => mapsById.TryGetValue(rm.MapId, out var m) && m.MapStatus == MapHealthStatus.Problematic); |
97 | | - var blacklistedCount = rotMapsForHealth.Count(rm => mapsById.TryGetValue(rm.MapId, out var m) && m.MapStatus == MapHealthStatus.Blacklisted); |
98 | | - } |
99 | 99 | @if (missingFromHost > 0 || problematicCount > 0 || blacklistedCount > 0) |
100 | 100 | { |
101 | 101 | <div class="alert alert-warning py-2 mb-3"> |
|
127 | 127 | </tr> |
128 | 128 | </thead> |
129 | 129 | <tbody> |
130 | | - @{ var sortedRotMaps = Model.ActiveRotation.MapRotationMaps?.OrderBy(m => m.SortOrder).ToList() ?? []; } |
131 | 130 | @for (var i = 0; i < sortedRotMaps.Count; i++) |
132 | 131 | { |
133 | 132 | var rotMap = sortedRotMaps[i]; |
|
370 | 369 | @{ |
371 | 370 | var rotMaps = rotation?.MapRotationMaps ?? []; |
372 | 371 | var healthIssues = rotMaps.Count(rm => mapsById.TryGetValue(rm.MapId, out var m) && m.MapStatus != MapHealthStatus.OK); |
373 | | - var notOnHost = rotMaps.Count(rm => { |
374 | | - var mapName = mapsById.TryGetValue(rm.MapId, out var m) ? m.MapName : null; |
375 | | - return mapName != null && !serverMapNames.Contains(mapName); |
376 | | - }); |
| 372 | + var notOnHost = rotMaps.Count(rm => mapsById.TryGetValue(rm.MapId, out var m) && m.MapName != null && !serverMapNames.Contains(m.MapName)); |
377 | 373 | var totalWarnings = healthIssues + notOnHost; |
378 | 374 | } |
379 | 375 | @if (totalWarnings > 0) |
|
0 commit comments