Folders Feature

JenkinsTray/BusinessComponents/ConfigurationService.cs

@@ -301,5 +301,14 @@ public void SetBalloonNotifications(bool value)
                 SaveConfiguration();
             }
         }
+
+        public void SetShowFolders(bool value)
+        {
+            if (GeneralSettings.ShowFolders != value)
+            {
+                GeneralSettings.ShowFolders = value;
+                SaveConfiguration();
+            }
+        }
     }
 }

JenkinsTray/BusinessComponents/JenkinsService.cs

@@ -37,6 +37,8 @@ public JenkinsService()
 
         public ClaimService ClaimService { get; set; }
 
+        public ConfigurationService ConfigurationService { get; set; }
+
         public IList<Project> LoadProjects(Server server)
         {
             var url = NetUtils.ConcatUrls(server.Url, "/api/xml?tree=jobs[name,url,color]");
@@ -59,29 +61,33 @@ public IList<Project> LoadProjects(Server server)
             return projects;
         }
 
-        public List<Project> GetProjects(XmlNodeList jobElements, Server server)
+        public List<Project> GetProjects(XmlNodeList jobElements, Server server, string folder = "")
         {
             var projects = new List<Project>();
-
+            
             foreach (XmlNode jobElement in jobElements)
             {
                 var projectName = jobElement.SelectSingleNode("name").InnerText;
                 var projectUrl = jobElement.SelectSingleNode("url").InnerText;
                 var projectColor = jobElement.SelectSingleNode("color");
                 // If the job is a folder we need to recursively get the jobs within.
-                if (jobElement.SelectSingleNode("color") == null)
+                if (projectColor == null)  //folders do not have a color node
                 {
                     var url = NetUtils.ConcatUrls(projectUrl, "/api/xml?tree=jobs[name,url,color]");
                     var xmlStr = DownloadString(server.Credentials, url, false, server.IgnoreUntrustedCertificate);
                     var xml = new XmlDocument();
                     xml.LoadXml(xmlStr);
                     var nodes = xml.SelectNodes("/folder/job");
-                    projects.AddRange(GetProjects(nodes, server));
+                    projects.AddRange(GetProjects(nodes, server, projectName));
                 }
                 else
                 {
                     var project = new Project();
                     project.Server = server;
+                    if (!string.IsNullOrEmpty(folder))
+                    {
+                        project.Folder = folder;
+                    }
                     project.Name = projectName;
                     project.Url = projectUrl;
 

JenkinsTray/Entities/GeneralSettings.cs

@@ -30,6 +30,9 @@ public GeneralSettings()
         [JsonProperty("checkForUpdates")]
         public bool CheckForUpdates { get; set; }
 
+        [JsonProperty("showFolders")]
+        public bool ShowFolders { get; set; }
+
         public ApplicationUpdateService ApplicationUpdateService { get; set; }
     }
 }

JenkinsTray/Entities/Project.cs

@@ -14,6 +14,9 @@ public Project()
 
         public Server Server { get; set; }
 
+        [JsonProperty("folder")]
+        public string Folder { get; set; }
+
         [JsonProperty("name")]
         public string Name { get; set; }
 
@@ -128,8 +131,11 @@ public override bool Equals(object obj)
             var other = obj as Project;
             if (other == null)
                 return false;
+            if (Server == null)
+                return false;
             return other.Server.Equals(Server)
-                   && other.Name == Name;
+                   && other.Name == Name
+                   && other.Folder == Folder;
         }
 
         public override string ToString()

JenkinsTray/Legacy/BusinessComponents/LegacyConfigurationService.cs

@@ -95,6 +95,7 @@ public Configuration LoadConfiguration()
             generalSettings.UpdateMainWindowIcon = propertiesFile.GetBoolValue("general.UpdateMainWindowIcon", true);
             generalSettings.IntegrateWithClaimPlugin = propertiesFile.GetBoolValue("general.IntegrateWithClaimPlugin",
                                                                                    true);
+            generalSettings.ShowFolders = propertiesFile.GetBoolValue("general.ShowFolders", false);
 
             var res = new Configuration
             {

JenkinsTray/UI/Controls/ProjectListControl.cs

@@ -15,7 +15,7 @@ public partial class ProjectListControl : XtraUserControl
     {
         private List<Project> projectsDataSource;
         private Server server;
-
+        
         public ProjectListControl()
         {
             InitializeComponent();
@@ -27,11 +27,18 @@ public ProjectListControl()
 
         public void Initialize()
         {
+            SetFoldersVisibility(ConfigurationService.GeneralSettings.ShowFolders);
+            ConfigurationService.ConfigurationUpdated += configurationService_ConfigurationUpdated;
         }
 
         public void UpdateProjectList(Server server)
         {
             this.server = server;
+            RefreshList();
+        }
+
+        private void RefreshList()
+        {
 #if SYNCRHONOUS
             List<Project> dataSource = new List<Project>();
 
@@ -55,7 +62,7 @@ public void UpdateProjectList(Server server)
             Enabled = false;
             var status = string.Format(JenkinsTrayResources.LoadingProjects_FormatString, server.Url);
             Controller.SetStatus(status, true);
-
+            
             // run the process in background
             var process = new Process("Loading project " + server.Url);
             IList<Project> projects = null;
@@ -94,6 +101,20 @@ private void SetProjectsDataSource(List<Project> dataSource)
             projectsGridControl.DataSource = projectsDataSource;
         }
 
+        private void configurationService_ConfigurationUpdated()
+        {
+            if (folderNameGridColumn.Visible != ConfigurationService.GeneralSettings.ShowFolders)
+            {
+                SetFoldersVisibility(ConfigurationService.GeneralSettings.ShowFolders);
+                RefreshList();
+            }
+        }
+
+        private void SetFoldersVisibility(bool showFolders)
+        {
+            folderNameGridColumn.Visible = showFolders;
+        }
+
         private void projectsGridView_CustomUnboundColumnData(object sender, CustomColumnDataEventArgs e)
         {
             if (e.IsGetData)

JenkinsTray/UI/MainForm.cs

@@ -69,13 +69,15 @@ protected override void OnLoad(EventArgs e)
             base.OnLoad(e);
             Initialize();
             UpdateClaimPluginIntegration();
+            SetFoldersVisibility();
             LoadIcons();
             LoadProjects();
         }
 
         private void configurationService_ConfigurationUpdated()
         {
             UpdateClaimPluginIntegration();
+            SetFoldersVisibility();
             LoadProjects();
             if (ConfigurationService.GeneralSettings.UpdateMainWindowIcon == false)
                 ResetIcon();
@@ -610,6 +612,11 @@ private void UpdateClaimPluginIntegration()
             }
         }
 
+        private void SetFoldersVisibility()
+        {
+            folderGridColumn.Visible = ConfigurationService.GeneralSettings.ShowFolders;
+        }
+
         private void acknowledgeProjectMenuItem_Click(object sender, EventArgs e)
         {
             var menuItem = sender as ToolStripMenuItem;
@@ -650,6 +657,11 @@ public string Server
                 get { return Project.Server.DisplayText; }
             }
 
+            public string Folder
+            {
+                get { return Project.Folder; }
+            }
+
             public string Name
             {
                 get { return ShowDisplayname && string.IsNullOrEmpty(Project.DisplayName) ? Project.Name : Project.DisplayName; }