From 01aec0b0d4af92178d77c7bd6b914e0897bbf9b9 Mon Sep 17 00:00:00 2001 From: Sean Killeen Date: Mon, 14 Feb 2022 14:37:53 -0500 Subject: [PATCH] Revert "WIP: Button to remove exempt orgs (#131)" (#193) This reverts commit 070042adcb5974874200e544ec293393fe4d98de. --- .../OrgWideVisibilityController.cs | 23 ------------- .../Models/OrgWideVisibilitySettings.cs | 1 - .../Services/CachedGitHubService.cs | 5 --- src/Konmaripo.Web/Services/GitHubService.cs | 7 ---- src/Konmaripo.Web/Services/IGitHubService.cs | 1 - .../OrgWideVisibility/AddOrgMembers.cshtml | 34 ++++++------------- src/Konmaripo.Web/appsettings.json | 2 +- 7 files changed, 12 insertions(+), 61 deletions(-) diff --git a/src/Konmaripo.Web/Controllers/OrgWideVisibilityController.cs b/src/Konmaripo.Web/Controllers/OrgWideVisibilityController.cs index c8260b0..cbcb38f 100644 --- a/src/Konmaripo.Web/Controllers/OrgWideVisibilityController.cs +++ b/src/Konmaripo.Web/Controllers/OrgWideVisibilityController.cs @@ -52,31 +52,8 @@ public async Task CreateOrgWideTeam() return RedirectToAction("Index"); } - public IActionResult ExemptRepositoryCheck() - { - var tagName = _settings.ExemptionTagName; - - var repos = _gitHubService.GetRepositoriesWithTopicThatAreVisibleToTeam( - tagName, - _settings.AllOrgMembersGroupName); - - var vm = new ExemptRepositoryCheckViewModel(tagName, repos); - // TODO - return View(); - } } - public class ExemptRepositoryCheckViewModel - { - public string TagName { get; } - public List RepositoryNames { get; } - - public ExemptRepositoryCheckViewModel(string tagName, List repoNames) - { - TagName = tagName; - RepositoryNames = repoNames; - } - } public class OrgWideVisibilityIndexVM { public string OrgWideTeamName { get; } diff --git a/src/Konmaripo.Web/Models/OrgWideVisibilitySettings.cs b/src/Konmaripo.Web/Models/OrgWideVisibilitySettings.cs index 10d2e05..a50f07a 100644 --- a/src/Konmaripo.Web/Models/OrgWideVisibilitySettings.cs +++ b/src/Konmaripo.Web/Models/OrgWideVisibilitySettings.cs @@ -4,6 +4,5 @@ public class OrgWideVisibilitySettings { public string AllOrgMembersGroupName { get; set; } public string AllOrgMembersGroupDescription { get; set; } - public string ExemptionTagName { get; set; } } } \ No newline at end of file diff --git a/src/Konmaripo.Web/Services/CachedGitHubService.cs b/src/Konmaripo.Web/Services/CachedGitHubService.cs index 2a2d6cf..c33a494 100644 --- a/src/Konmaripo.Web/Services/CachedGitHubService.cs +++ b/src/Konmaripo.Web/Services/CachedGitHubService.cs @@ -138,11 +138,6 @@ public async Task AddMembersToTeam(int teamId, List loginsToAdd) await _gitHubService.AddMembersToTeam(teamId, loginsToAdd); } - public Task> GetRepositoriesWithTopicThatAreVisibleToTeam(string topicName, string teamName) - { - return _gitHubService.GetRepositoriesWithTopicThatAreVisibleToTeam(topicName, teamName); - } - public async Task> GetUsersNotInTeam(string teamName) { var allTeams = await GetAllTeams(); diff --git a/src/Konmaripo.Web/Services/GitHubService.cs b/src/Konmaripo.Web/Services/GitHubService.cs index 7c65311..7bc6b7e 100644 --- a/src/Konmaripo.Web/Services/GitHubService.cs +++ b/src/Konmaripo.Web/Services/GitHubService.cs @@ -194,12 +194,5 @@ public async Task AddMembersToTeam(int teamId, List loginsToAdd) await _githubClient.Organization.Team.AddOrEditMembership(teamId, login, request); } } - - public async Task> GetRepositoriesWithTopicThatAreVisibleToTeam(string topicName, string teamName) - { - var allRepos = await GetRepositoriesForOrganizationAsync(); - - // TODO Filter repos by topic. - } } } diff --git a/src/Konmaripo.Web/Services/IGitHubService.cs b/src/Konmaripo.Web/Services/IGitHubService.cs index 8cd3807..aa70300 100644 --- a/src/Konmaripo.Web/Services/IGitHubService.cs +++ b/src/Konmaripo.Web/Services/IGitHubService.cs @@ -27,6 +27,5 @@ public interface IGitHubService Task> GetTeamMembers(int teamId); Task AddMembersToTeam(string teamName, List loginsToAdd); Task AddMembersToTeam(int teamId, List loginsToAdd); - Task> GetRepositoriesWithTopicThatAreVisibleToTeam(string topicName, string teamName); } } \ No newline at end of file diff --git a/src/Konmaripo.Web/Views/OrgWideVisibility/AddOrgMembers.cshtml b/src/Konmaripo.Web/Views/OrgWideVisibility/AddOrgMembers.cshtml index 63f74b9..3d76883 100644 --- a/src/Konmaripo.Web/Views/OrgWideVisibility/AddOrgMembers.cshtml +++ b/src/Konmaripo.Web/Views/OrgWideVisibility/AddOrgMembers.cshtml @@ -11,34 +11,22 @@

Step 2: Add Missing team members

+

The @Model.Count below organization members are not a part of the org-wide group.

-@if (!Model.Any()) +
+@foreach (var row in Model.ToArray().Split(4)) { -
-

Great! No missing members.

-

All your org's members are within the group.

- @Html.ActionLink($"Next step: Remove access for exempt repositories", "ExemptRepositoryCheck", "OrgWideVisibility", null, new { @class = "btn btn-success", role = "button" }) -
- -} -else -{ -
- @foreach (var row in Model.ToArray().Split(4)) +
+ @foreach (var login in row) { -
- @foreach (var login in row) - { -
- @login -
- } +
+ @login
}
-
- @Html.ActionLink($"Add these {Model.Count} members to the group.", "AddOrgMembersList", "OrgWideVisibility", new { loginsToAdd = Model }, new { @class = "btn btn-success", role = "button" }) -
} - +
+
+ @Html.ActionLink($"Add these {Model.Count} members to the group.", "AddOrgMembersList", "OrgWideVisibility", new { loginsToAdd = Model }, new { @class = "btn btn-success", role = "button" }) +
diff --git a/src/Konmaripo.Web/appsettings.json b/src/Konmaripo.Web/appsettings.json index fdf52d1..d3eaab7 100644 --- a/src/Konmaripo.Web/appsettings.json +++ b/src/Konmaripo.Web/appsettings.json @@ -7,7 +7,7 @@ "OrgWideVisibilitySettings": { "AllOrgMembersGroupName": "all-org-members", "AllOrgMembersGroupDescription": "A group created by the Konmaripo tool, which includes everyone who is a member of the GitHub organization.", - "ExemptionTagName": "exempt-from-org-visibility" + "ExemptionTagName": "ExemptFromOrgWideVisibility" }, "ArchivalSettings": { "ArchivalUrl": "CHANGE_ME"