Created common view for list of groups

mathgaming · mathgaming · commit de92100f9493 · 2019-05-02T09:33:04.000+02:00
diff --git a/ITSWebMgmt/Controllers/ComputerController.cs b/ITSWebMgmt/Controllers/ComputerController.cs
@@ -57,7 +57,7 @@ public ActionResult LoadTab(string tabName, string computername)
                     break;
                 case "groups":
                     viewName = "Groups";
-                    break;
+                    return PartialView(viewName, new PartialGroupModel(ComputerModel.ADcache, "memberOf"));
                 case "tasks":
                     viewName = "Tasks";
                     break;
diff --git a/ITSWebMgmt/Models/Computer.cs b/ITSWebMgmt/Models/Computer.cs
@@ -56,8 +56,6 @@ public class ComputerModel
         public string SCCMDisk;
         public string ErrorCountMessage;
         public string ErrorMessages;
-        public string GroupSegment;
-        public string GroupsAllSegment;
         public bool ShowResultDiv = false;
         public bool ShowResultGetPassword = false;
         public bool ShowMoveComputerOUdiv = false;
diff --git a/ITSWebMgmt/Models/Group.cs b/ITSWebMgmt/Models/Group.cs
@@ -42,23 +42,17 @@ public void buildResult()
 
             if (GroupController.isFileShare(DistinguishedName))
             {
-                string[] tables = group.GetFileshareTables();
+                // TODO move to different view
+                /*string[] tables = group.GetFileshareTables();
                 GroupSegment = tables[0];
                 GroupsAllSegment = tables[1];
                 GroupOfSegment = tables[2];
                 GroupsOfAllSegment = tables[3];
 
                 FileshareInfo = "Contains information from the other fileshares with the other accesses<br>";
-                Title = "Fileshare Info";
-            }
-            else
-            {
-                GroupSegment = TableGenerator.BuildgroupssegmentLabel(getGroups("member"));
-                GroupsAllSegment = TableGenerator.BuildgroupssegmentLabel(getGroupsTransitive("member"));
-                GroupOfSegment = TableGenerator.BuildgroupssegmentLabel(getGroups("memberOf"));
-                GroupsOfAllSegment = TableGenerator.BuildgroupssegmentLabel(getGroupsTransitive("memberOf"));
-                Title = "Group Info";
+                Title = "Fileshare Info";*/
             }
+            Title = "Group Info";
         }
 
         private void buildRaw()
diff --git a/ITSWebMgmt/Models/PartialGroupModel.cs b/ITSWebMgmt/Models/PartialGroupModel.cs
@@ -0,0 +1,28 @@
+﻿using ITSWebMgmt.Caches;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace ITSWebMgmt.Models
+{
+    public class PartialGroupModel : WebMgmtModel<ADcache>
+    {
+        public List<string> GroupList;
+        public List<string> GroupListAll;
+        public string GroupSegment;
+        public string GroupsAllSegment;
+        public string AttributeName;
+        public string Title;
+
+        public List<string> getGroups(string name) => ADcache.getGroups(name);
+        public List<string> getGroupsTransitive(string name) => ADcache.getGroupsTransitive(name);
+
+        public PartialGroupModel(ADcache aDcache, string attributeName, string title = "Groups")
+        {
+            ADcache = aDcache;
+            AttributeName = attributeName;
+            Title = title;
+        }
+    }
+}
diff --git a/ITSWebMgmt/Models/User.cs b/ITSWebMgmt/Models/User.cs
@@ -69,11 +69,7 @@ public string[] getUserInfo()
         public string BasicInfoTable;
         public string BasicInfoRomaing;
         public string Print;
-        public string GroupSegment;
-        public string GroupsAllSegment;
-        public string Filesharessegment;
         public string CalAgenda;
-        public string Exchange;
         public string ServiceManager;
         public string ComputerInformation;
         public string Loginscript;
@@ -86,8 +82,6 @@ public string[] getUserInfo()
         public bool ShowErrorDiv = false;
         public bool ShowFixUserOU = false;
         public bool ShowLoginScript = false;
-        public List<string> GroupList;
-        public List<string> GroupListAll;
 
         public UserModel(UserController controller, string username, string adpath)
         {
diff --git a/ITSWebMgmt/Models/WebMgmtModel.cs b/ITSWebMgmt/Models/WebMgmtModel.cs
@@ -11,8 +11,6 @@ public abstract class WebMgmtModel<T> where T : ADcache
         public T ADcache;
         public string Path { get => ADcache.Path; }
         public virtual string adpath { get => ADcache.adpath; set { ADcache.adpath = value; } }
-        public List<string> getGroups(string name) => ADcache.getGroups(name);
-        public List<string> getGroupsTransitive(string name) => ADcache.getGroupsTransitive(name);
         public List<PropertyValueCollection> getAllProperties() => ADcache.getAllProperties();
     }
 }
diff --git a/ITSWebMgmt/Views/Computer/Groups.cshtml b/ITSWebMgmt/Views/Computer/Groups.cshtml
diff --git a/ITSWebMgmt/Views/Group/Index.cshtml b/ITSWebMgmt/Views/Group/Index.cshtml
@@ -3,7 +3,6 @@
 @{
     ViewData["Title"] = "GroupInfo";
 }
-
         <!-- Loader -->
         <div id="loader">
             <div class="ui active dimmer" style="display: none">
@@ -23,11 +22,7 @@
             -->
         </div>
 
-
-
         <!-- page content -->
-
-
         <script>
             $(document).ready(function () {
                 $('.menu .item').tab({ history: false });
@@ -37,10 +32,6 @@
         <br />
         <br />
         <div runat="server" id="ResultDiv">
-
-
-
-
             <div class="ui grid">
                 <div class="four wide column">
                     <div class="ui vertical fluid tabular menu">
@@ -103,36 +94,12 @@
                         </table>
                     </div>
                     <div class="ui tab segment" data-tab="members">
-                        <h2>Members</h2>
                         @Html.Raw(Model.FileshareInfo)
-                        <div class="ui two item menu">
-                            <a data-tab="groups-direct" class="item">Direct Groups</a>
-                            <a data-tab="groups-all" class="item"> Recursive groups</a>
-                        </div>
-
-                        <div class="ui active tab segment" data-tab="groups-direct">
-                            @Html.Raw(Model.GroupSegment)
-                        </div>
-
-                        <div class="ui tab segment" data-tab="groups-all">
-                            @Html.Raw(Model.GroupsAllSegment)
-                        </div>
+                        @Html.Partial("Groups", new PartialGroupModel(Model.ADcache, "member", "Members"))
                     </div>
                     <div class="ui tab segment" data-tab="memberOf">
-                        <h2>Member Of</h2>
                         @Html.Raw(Model.FileshareInfo)
-                        <div class="ui two item menu">
-                            <a data-tab="groups-direct" class="item">Direct Groups</a>
-                            <a data-tab="groups-all" class="item"> Recursive groups</a>
-                        </div>
-
-                        <div class="ui active tab segment" data-tab="groups-direct">
-                            @Html.Raw(Model.GroupOfSegment)
-                        </div>
-
-                        <div class="ui tab segment" data-tab="groups-all">
-                            @Html.Raw(Model.GroupsOfAllSegment)
-                        </div>
+                        @Html.Partial("Groups", new PartialGroupModel(Model.ADcache, "memberOf", "Members Of"))
                     </div>
                     <div class="ui tab segment" data-tab="rawData">
                         <h2>Raw Data</h2>
diff --git a/ITSWebMgmt/Views/Shared/GroupList.cshtml b/ITSWebMgmt/Views/Shared/GroupList.cshtml
diff --git a/ITSWebMgmt/Views/Shared/Groups.cshtml b/ITSWebMgmt/Views/Shared/Groups.cshtml
@@ -1,12 +1,13 @@
-﻿@model ITSWebMgmt.Models.UserModel
+﻿@model ITSWebMgmt.Models.PartialGroupModel
+
 @using ITSWebMgmt.Helpers
 @{
-    Model.GroupList = Model.ADcache.getGroups("memberOf");
-    Model.GroupListAll = Model.ADcache.getGroupsTransitive("memberOf");
+    Model.GroupList = Model.ADcache.getGroups(Model.AttributeName);
+    Model.GroupListAll = Model.ADcache.getGroupsTransitive(Model.AttributeName);
     Model.GroupSegment = TableGenerator.BuildgroupssegmentLabel(Model.GroupList);
     Model.GroupsAllSegment = TableGenerator.BuildgroupssegmentLabel(Model.GroupListAll);
 }
-<h2>Groups</h2>
+<h2>@Html.LabelFor(m => m.Title)</h2>
 <div class="ui two item menu">
     <a data-tab="groups-direct" class="item">Direct Groups</a>
     <a data-tab="groups-all" class="item">Recursive groups</a>
diff --git a/ITSWebMgmt/Views/User/Exchange.cshtml b/ITSWebMgmt/Views/User/Exchange.cshtml
@@ -1,17 +1,17 @@
-﻿@model ITSWebMgmt.Models.UserModel
+﻿@model ITSWebMgmt.Models.PartialGroupModel
 @using System.Web
-@{ 
+@{
     string transitiv = "";
 
-    if (Model.GroupListAll.Count == 0)
+    if (Model.getGroupsTransitive(Model.AttributeName).Count == 0)
     {
         transitiv = "<h3>NB: Listen viser kun direkte medlemsskaber, kunne ikke finde fuld liste på denne Domain Controller eller domæne</h3>";
     }
 
     var helper = new HTMLTableHelper(new string[] { "Type", "Domain", "Name", "Access" });
 
     //Select Exchange groups and convert to list of ExchangeMailboxGroup
-    var exchangeMailboxGroupList = Model.GroupList.Where<string>(group => (group.StartsWith("CN=MBX_"))).Select(x => new ExchangeMailboxGroup(x));
+    var exchangeMailboxGroupList = Model.getGroups(Model.AttributeName).Where<string>(group => (group.StartsWith("CN=MBX_"))).Select(x => new ExchangeMailboxGroup(x));
 
     foreach (ExchangeMailboxGroup e in exchangeMailboxGroupList)
     {
@@ -22,7 +22,6 @@
         helper.AddRow(new string[] { type, domain, nameFormated, access });
     }
 
-    Model.Exchange = transitiv + helper.GetTable();
+    <h2>Exchange</h2>
+    @Html.Raw(transitiv + helper.GetTable());
 }
-<h2>Exchange</h2>
-@Html.Raw(Model.Exchange)
diff --git a/ITSWebMgmt/Views/User/Fileshares.cshtml b/ITSWebMgmt/Views/User/Fileshares.cshtml
@@ -1,18 +1,19 @@
-﻿@model ITSWebMgmt.Models.UserModel
+﻿@model ITSWebMgmt.Models.PartialGroupModel
 @using ITSWebMgmt.Controllers
 @using System.Web
-@{ 
+@{
     string transitiv = "";
 
-    if (Model.GroupListAll.Count == 0)
+    if (Model.getGroupsTransitive(Model.AttributeName).Count == 0)
     {
         transitiv = "<h3>NB: Listen viser kun direkte medlemsskaber, kunne ikke finde fuld liste på denne Domain Controller eller domæne</h3>";
     }
 
     var helper = new HTMLTableHelper(new string[] { "Type", "Domain", "Name", "Access" });
 
     //Filter fileshare groups and convert to Fileshare Objects
-    var fileshareList = Model.GroupList.Where((string value) => {
+    var fileshareList = Model.getGroups(Model.AttributeName).Where((string value) =>
+    {
         return GroupController.isFileShare(value);
     }).Select(x => new Fileshare(x));
 
@@ -22,7 +23,6 @@
         helper.AddRow(new string[] { f.Type, f.Domain, nameWithLink, f.Access });
     }
 
-    Model.Filesharessegment = transitiv + helper.GetTable();
+    <h2>Fileshares</h2>
+    @Html.Raw(transitiv + helper.GetTable());
 }
-<h2>Fileshares</h2>
-@Html.Raw(Model.Filesharessegment)
diff --git a/ITSWebMgmt/Views/User/Index.cshtml b/ITSWebMgmt/Views/User/Index.cshtml
@@ -94,10 +94,10 @@
                 <div class="ui active tab segment" data-tab="basicinfo">@Html.Partial("BasicInfo", Model)</div>
                 <div class="ui tab segment" data-tab="advancedinfo">advanced</div>
                 <div class="ui tab segment" data-tab="print">@Html.Partial("Print", Model)</div>
-                <div class="ui tab segment" data-tab="groups">@Html.Partial("Groups", Model)</div>
-                <div class="ui tab segment" data-tab="fileshares">@Html.Partial("Fileshares", Model)</div>
+                <div class="ui tab segment" data-tab="groups">@Html.Partial("Groups", new PartialGroupModel(Model.ADcache, "memberOf"))</div>
+                <div class="ui tab segment" data-tab="fileshares">@Html.Partial("Fileshares", new PartialGroupModel(Model.ADcache, "memberOf"))</div>
                 <div class="ui tab segment" data-tab="calAgenda">@Html.Partial("CalendarAgenda", Model)</div>
-                <div class="ui tab segment" data-tab="exchange">@Html.Partial("Exchange", Model)</div>
+                <div class="ui tab segment" data-tab="exchange">@Html.Partial("Exchange", new PartialGroupModel(Model.ADcache, "memberOf"))</div>
                 <div class="ui tab segment" data-tab="servicemanager">@Html.Partial("ServiceManager", Model)</div>
                 <div class="ui tab segment" data-tab="computerInformation">@Html.Partial("ComputerInformation", Model)</div>
                 <div class="ui tab segment" data-tab="loginscript" id="divLoginscript">@Html.Partial("Loginscript", Model)</div>

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ public abstract class WebMgmtModel<T> where T : ADcache`
`11`	`11`	`public T ADcache;`
`12`	`12`	`public string Path { get => ADcache.Path; }`
`13`	`13`	`public virtual string adpath { get => ADcache.adpath; set { ADcache.adpath = value; } }`
`14`		`- public List<string> getGroups(string name) => ADcache.getGroups(name);`
`15`		`- public List<string> getGroupsTransitive(string name) => ADcache.getGroupsTransitive(name);`
`16`	`14`	`public List<PropertyValueCollection> getAllProperties() => ADcache.getAllProperties();`
`17`	`15`	`}`
`18`	`16`	`}`