Dragging template aggregate to add filters to SelectedDatasets

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ...
 
+### Added
+
+- Template cohort builder aggregates can be dragged onto extraction datasets to import the container tree [#1307](https://github.com/HicServices/RDMP/issues/1307)
+
 ## [7.0.17] - 2022-08-01
 
 ### Added

Rdmp.Core/CommandExecution/Combining/AggregateConfigurationCombineable.cs

@@ -6,6 +6,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Rdmp.Core.Curation.Data;
 using Rdmp.Core.Curation.Data.Aggregation;
 using Rdmp.Core.Curation.Data.Cohort;
 using Rdmp.Core.Curation.Data.Cohort.Joinables;
@@ -53,6 +54,11 @@ public class AggregateConfigurationCombineable : ICombineToMakeCommand
         /// </summary>
         public AggregateConfiguration[] JoinableUsersIfAny { get; set; }
 
+        /// <summary>
+        /// True if the <see cref="Aggregate"/> has an <see cref="ExtendedProperty"/> declaring it as a reusable template
+        /// </summary>
+        public bool IsTemplate { get; set; }
+
         /// <summary>
         /// Creates a new instance, popualtes <see cref="Aggregate"/> and discovers all other state cached fields (e.g.
         /// <see cref="JoinableDeclarationIfAny"/> etc).
@@ -64,6 +70,8 @@ public AggregateConfigurationCombineable(AggregateConfiguration aggregate)
 
             IsPatientIndexTable = Aggregate.IsJoinablePatientIndexTable();
 
+            IsTemplate = aggregate.CatalogueRepository.GetExtendedProperties(ExtendedProperty.IsTemplate,aggregate).Any(p=> Equals(p.Value, "true"));
+
             //is the aggregate part of cohort identification
             CohortIdentificationConfigurationIfAny = Aggregate.GetCohortIdentificationConfigurationIfAny();
 

Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsSelectedDataSets.cs

@@ -31,9 +31,17 @@ public override void Activate(SelectedDataSets target)
 
         public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, SelectedDataSets target, InsertOption insertOption = InsertOption.Default)
         {
-
+            // if use drops a reusable template aggregate (e.g. from Cohort Builder)
+            if(cmd is AggregateConfigurationCombineable ac && ac.IsTemplate && ac.Aggregate.RootFilterContainer_ID != null)
+            {
+                // offer to import the WHERE containers
+                return new ExecuteCommandImportFilterContainerTree(ItemActivator, target, ac.Aggregate);
+            }
+
             if(cmd is ContainerCombineable cc)
-                return new ExecuteCommandImportFilterContainerTree(ItemActivator,target,cc.Container);
+            {
+                return new ExecuteCommandImportFilterContainerTree(ItemActivator, target, cc.Container);
+            }
 
             return null;
         }