From 4cd60625f9eb33f2dba065dfe7d7baf1bf83d0b9 Mon Sep 17 00:00:00 2001 From: Sam Smith Date: Thu, 7 Mar 2024 13:43:43 -0500 Subject: [PATCH 1/2] Rearranged UI --- .../Controllers/HomeController.cs | 100 +++++++++--------- .../Views/Home/Index.cshtml | 35 +++--- 2 files changed, 70 insertions(+), 65 deletions(-) diff --git a/src/RepoGovernance.Web/Controllers/HomeController.cs b/src/RepoGovernance.Web/Controllers/HomeController.cs index 7b000439..52431d36 100644 --- a/src/RepoGovernance.Web/Controllers/HomeController.cs +++ b/src/RepoGovernance.Web/Controllers/HomeController.cs @@ -18,56 +18,56 @@ public HomeController(SummaryItemsServiceApiClient ServiceApiClient) public async Task Index(bool isContributor = false) { - string currentUser = "samsmithnz"; - List summaryItems = await _ServiceApiClient.GetSummaryItems(currentUser); - List repoLanguages = new(); - Dictionary repoLanguagesDictonary = new(); - int total = 0; - foreach (SummaryItem summaryItem in summaryItems) - { - foreach (RepoLanguage repoLanguage in summaryItem.RepoLanguages) - { - total += repoLanguage.Total; - if (repoLanguage.Name != null) - { - if (repoLanguagesDictonary.ContainsKey(repoLanguage.Name)) - { - repoLanguagesDictonary[repoLanguage.Name] += repoLanguage.Total; - } - else - { - repoLanguagesDictonary.Add(repoLanguage.Name, repoLanguage.Total); - } - if (repoLanguages.Find(x => x.Name == repoLanguage.Name) == null) - { - repoLanguages.Add(new RepoLanguage - { - Name = repoLanguage.Name, - Total = repoLanguage.Total, - Color = repoLanguage.Color, - Percent = repoLanguage.Percent - }); - } - } - } - } - //Update the percent - foreach (KeyValuePair sortedLanguage in repoLanguagesDictonary.OrderByDescending(x => x.Value)) - { - RepoLanguage? repoLanguage = repoLanguages.Find(x => x.Name == sortedLanguage.Key); - if (repoLanguage != null) - { - repoLanguage.Total = sortedLanguage.Value; - repoLanguage.Percent = Math.Round((decimal)repoLanguage.Total / (decimal)total * 100M, 1); - } - } - - SummaryItemsIndex summaryItemsIndex = new() - { - SummaryItems = summaryItems, - SummaryRepoLanguages = repoLanguages.OrderByDescending(x => x.Total).ToList(), - IsContributor = isContributor - }; + //string currentUser = "samsmithnz"; + //List summaryItems = await _ServiceApiClient.GetSummaryItems(currentUser); + //List repoLanguages = new(); + //Dictionary repoLanguagesDictonary = new(); + //int total = 0; + //foreach (SummaryItem summaryItem in summaryItems) + //{ + // foreach (RepoLanguage repoLanguage in summaryItem.RepoLanguages) + // { + // total += repoLanguage.Total; + // if (repoLanguage.Name != null) + // { + // if (repoLanguagesDictonary.ContainsKey(repoLanguage.Name)) + // { + // repoLanguagesDictonary[repoLanguage.Name] += repoLanguage.Total; + // } + // else + // { + // repoLanguagesDictonary.Add(repoLanguage.Name, repoLanguage.Total); + // } + // if (repoLanguages.Find(x => x.Name == repoLanguage.Name) == null) + // { + // repoLanguages.Add(new RepoLanguage + // { + // Name = repoLanguage.Name, + // Total = repoLanguage.Total, + // Color = repoLanguage.Color, + // Percent = repoLanguage.Percent + // }); + // } + // } + // } + //} + ////Update the percent + //foreach (KeyValuePair sortedLanguage in repoLanguagesDictonary.OrderByDescending(x => x.Value)) + //{ + // RepoLanguage? repoLanguage = repoLanguages.Find(x => x.Name == sortedLanguage.Key); + // if (repoLanguage != null) + // { + // repoLanguage.Total = sortedLanguage.Value; + // repoLanguage.Percent = Math.Round((decimal)repoLanguage.Total / (decimal)total * 100M, 1); + // } + //} + + SummaryItemsIndex summaryItemsIndex = new(); + //{ + // SummaryItems = summaryItems, + // SummaryRepoLanguages = repoLanguages.OrderByDescending(x => x.Total).ToList(), + // IsContributor = isContributor + //}; return View(summaryItemsIndex); } diff --git a/src/RepoGovernance.Web/Views/Home/Index.cshtml b/src/RepoGovernance.Web/Views/Home/Index.cshtml index 1f39753b..278bdc1b 100644 --- a/src/RepoGovernance.Web/Views/Home/Index.cshtml +++ b/src/RepoGovernance.Web/Views/Home/Index.cshtml @@ -8,7 +8,7 @@ TimeSpan ts = new(); string lastUpdated = "[unknown]"; string user = "[unknown]"; - if (Model.SummaryItems.Count > 0) + if (Model.SummaryItems != null && Model.SummaryItems.Count > 0) { DateTime minDate = DateTime.Now; DateTime maxDate = DateTime.Now; @@ -27,6 +27,12 @@ lastUpdated = maxDate.ToString("dd-MMM-yyyy h:mm:sstt"); user = Model.SummaryItems[0].User; } + else + { + Model.SummaryItems = new(); + Model.SummaryRepoLanguages = new(); + Model.IsContributor = true; + } }
@@ -42,7 +48,6 @@ Total PRs: @Model.SummaryItems.Sum(x => x.PullRequests.Count)   Total issues: @Model.SummaryItems.Sum(x => x.TotalRecommendationCount)
-

 

@@ -58,7 +63,16 @@ } }
-
+ + +
+
+ @if (Model.IsContributor) + { + Update all. Warning- takes a ~minute +
+ Approve all open PRs. Warning- takes a ~minute + }
@@ -251,9 +265,9 @@
    -
  • Deprecated packages: @item.NuGetPackages.Count(n=>n.Type == "Deprecated")
    • -
  • Outdated packages: @item.NuGetPackages.Count(n=>n.Type == "Outdated")
    • -
  • Vulnerable packages: @item.NuGetPackages.Count(n=>n.Type == "Vulnerable")
    • +
  • Deprecated packages: @item.NuGetPackages.Count(n => n.Type == "Deprecated")
    • +
  • Outdated packages: @item.NuGetPackages.Count(n => n.Type == "Outdated")
    • +
  • Vulnerable packages: @item.NuGetPackages.Count(n => n.Type == "Vulnerable")
} @@ -312,13 +326,4 @@
} - From 95a0e1aa9fda5b9d2177fb7e552bd526afe1562e Mon Sep 17 00:00:00 2001 From: Sam Smith Date: Thu, 7 Mar 2024 18:37:40 -0500 Subject: [PATCH 2/2] restored home controller --- .../Controllers/HomeController.cs | 100 +++++++++--------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/src/RepoGovernance.Web/Controllers/HomeController.cs b/src/RepoGovernance.Web/Controllers/HomeController.cs index 52431d36..7b000439 100644 --- a/src/RepoGovernance.Web/Controllers/HomeController.cs +++ b/src/RepoGovernance.Web/Controllers/HomeController.cs @@ -18,56 +18,56 @@ public HomeController(SummaryItemsServiceApiClient ServiceApiClient) public async Task Index(bool isContributor = false) { - //string currentUser = "samsmithnz"; - //List summaryItems = await _ServiceApiClient.GetSummaryItems(currentUser); - //List repoLanguages = new(); - //Dictionary repoLanguagesDictonary = new(); - //int total = 0; - //foreach (SummaryItem summaryItem in summaryItems) - //{ - // foreach (RepoLanguage repoLanguage in summaryItem.RepoLanguages) - // { - // total += repoLanguage.Total; - // if (repoLanguage.Name != null) - // { - // if (repoLanguagesDictonary.ContainsKey(repoLanguage.Name)) - // { - // repoLanguagesDictonary[repoLanguage.Name] += repoLanguage.Total; - // } - // else - // { - // repoLanguagesDictonary.Add(repoLanguage.Name, repoLanguage.Total); - // } - // if (repoLanguages.Find(x => x.Name == repoLanguage.Name) == null) - // { - // repoLanguages.Add(new RepoLanguage - // { - // Name = repoLanguage.Name, - // Total = repoLanguage.Total, - // Color = repoLanguage.Color, - // Percent = repoLanguage.Percent - // }); - // } - // } - // } - //} - ////Update the percent - //foreach (KeyValuePair sortedLanguage in repoLanguagesDictonary.OrderByDescending(x => x.Value)) - //{ - // RepoLanguage? repoLanguage = repoLanguages.Find(x => x.Name == sortedLanguage.Key); - // if (repoLanguage != null) - // { - // repoLanguage.Total = sortedLanguage.Value; - // repoLanguage.Percent = Math.Round((decimal)repoLanguage.Total / (decimal)total * 100M, 1); - // } - //} - - SummaryItemsIndex summaryItemsIndex = new(); - //{ - // SummaryItems = summaryItems, - // SummaryRepoLanguages = repoLanguages.OrderByDescending(x => x.Total).ToList(), - // IsContributor = isContributor - //}; + string currentUser = "samsmithnz"; + List summaryItems = await _ServiceApiClient.GetSummaryItems(currentUser); + List repoLanguages = new(); + Dictionary repoLanguagesDictonary = new(); + int total = 0; + foreach (SummaryItem summaryItem in summaryItems) + { + foreach (RepoLanguage repoLanguage in summaryItem.RepoLanguages) + { + total += repoLanguage.Total; + if (repoLanguage.Name != null) + { + if (repoLanguagesDictonary.ContainsKey(repoLanguage.Name)) + { + repoLanguagesDictonary[repoLanguage.Name] += repoLanguage.Total; + } + else + { + repoLanguagesDictonary.Add(repoLanguage.Name, repoLanguage.Total); + } + if (repoLanguages.Find(x => x.Name == repoLanguage.Name) == null) + { + repoLanguages.Add(new RepoLanguage + { + Name = repoLanguage.Name, + Total = repoLanguage.Total, + Color = repoLanguage.Color, + Percent = repoLanguage.Percent + }); + } + } + } + } + //Update the percent + foreach (KeyValuePair sortedLanguage in repoLanguagesDictonary.OrderByDescending(x => x.Value)) + { + RepoLanguage? repoLanguage = repoLanguages.Find(x => x.Name == sortedLanguage.Key); + if (repoLanguage != null) + { + repoLanguage.Total = sortedLanguage.Value; + repoLanguage.Percent = Math.Round((decimal)repoLanguage.Total / (decimal)total * 100M, 1); + } + } + + SummaryItemsIndex summaryItemsIndex = new() + { + SummaryItems = summaryItems, + SummaryRepoLanguages = repoLanguages.OrderByDescending(x => x.Total).ToList(), + IsContributor = isContributor + }; return View(summaryItemsIndex); }