Merge pull request #2309 from HicServices/task/RDMP-358-folders-in-project-cohorts

Task/rdmp 358 folders in project cohorts

Author: rdteviotdale

Rdmp.Core/Icons/IconProvision/CatalogueIcons.Designer.cs

@@ -514,9 +514,6 @@
   <data name="ProjectSavedCohortsNode" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\ProjectSavedCohortsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="CommittedCohortIdentificationNode" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\CommittedCohortIdentificationNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="collapseAllNodes" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\collapseAllNodes.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>

Rdmp.Core/Icons/IconProvision/CatalogueIcons.resx

@@ -208,7 +208,6 @@ public enum RDMPConcept
     LoadMetadataCatalogueLinkage,
     Setting,
     TicketingSystemReleaseStatus,
-    CommittedCohortIdentificationNode,
     AllDatasetsNode,
     RegexRedaction,
     RegexRedactionConfiguration,

Rdmp.Core/Icons/IconProvision/RDMPConcept.cs

@@ -13,6 +13,7 @@
 using Rdmp.Core.Caching.Pipeline;
 using Rdmp.Core.CohortCommitting.Pipeline;
 using Rdmp.Core.Curation.Data;
+using Rdmp.Core.Curation.Data.Cohort;
 using Rdmp.Core.Curation.Data.Pipelines;
 using Rdmp.Core.DataExport.Data;
 using Rdmp.Core.DataExport.DataExtraction.Pipeline;
@@ -238,6 +239,22 @@ private void AddChildren(FolderNode<Project> folder, DescendancyList descendancy
         );
     }
 
+    private void AddChildren(FolderNode<CohortIdentificationConfiguration> folder, DescendancyList descendancy)
+    {
+        foreach (var child in folder.ChildFolders)
+            //add subfolder children
+            AddChildren(child, descendancy.Add(child));
+
+        //add catalogues in folder
+        foreach (var cic in folder.ChildObjects) AddToDictionaries(new HashSet<object>() { cic }, descendancy.SetBetterRouteExists());
+
+        // Children are the folders + objects
+        AddToDictionaries(new HashSet<object>(
+                folder.ChildFolders.Cast<object>()
+                    .Union(folder.ChildObjects)), descendancy
+        );
+    }
+
     private void BuildSelectedDatasets()
     {
         _selectedDataSetsWithNoIsExtractionIdentifier =
@@ -347,7 +364,9 @@ private void AddChildren(ProjectCohortsNode projectCohortsNode, DescendancyList
         children.Add(savedCohortsNode);
         AddChildren(savedCohortsNode, descendancy.Add(savedCohortsNode));
 
-        var associatedCohortConfigurations = new CommittedCohortIdentificationNode(projectCohortsNode.Project);
+        var associatedCohortConfigurations = FolderHelper.BuildFolderTree(projectCohortsNode.Project.GetAssociatedCohortIdentificationConfigurations());
+        associatedCohortConfigurations.Name = "Associated Cohort Configurations";
+        associatedCohortConfigurations.Parent = new FolderNode<CohortIdentificationConfiguration>($"\\{projectCohortsNode.Project}\\{projectCohortsNode}");
         children.Add(associatedCohortConfigurations);
         AddChildren(associatedCohortConfigurations, descendancy.Add(associatedCohortConfigurations));
 
@@ -371,18 +390,6 @@ private void AddChildren(AssociatedCohortIdentificationTemplatesNode associatedC
         AddToDictionaries(children, descendancy);
     }
 
-    private void AddChildren(CommittedCohortIdentificationNode associatedCohortConfigurations, DescendancyList descendancy)
-    {
-        var children = new HashSet<object>();
-        var associatedCohorts = associatedCohortConfigurations.Project.GetAssociatedCohortIdentificationConfigurations();
-        foreach (var cohort in associatedCohorts)
-        {
-            children.Add(cohort);
-        }
-
-        AddToDictionaries(children, descendancy);
-    }
-
     private void AddChildren(ProjectSavedCohortsNode savedCohortsNode, DescendancyList descendancy)
     {
         var children = new HashSet<object>();

Rdmp.Core/Providers/DataExportChildProvider.cs

@@ -64,7 +64,7 @@ public NavigationTrack(Func<T, bool> aliveDelegate, Action<T> activate)
     public void Prune()
     {
         _navigationStack = new Stack<T>(_navigationStack.ToArray().Take(MaxHistory + 1).Reverse().Where(_isAlive));
-        _forward = new Stack<T>(_forward.AsEnumerable().ToArray().AsEnumerable().Reverse().Where(_isAlive));
+        _forward = new Stack<T>(_forward.ToArray().AsEnumerable().Reverse().Where(_isAlive));
     }
 
     /// <summary>