Task/rdmp 343 Cross-Project Commits Flow (#2261)

* add files

* update cancel

* fix cancel

* moving cics

* add projects column to cic tree

* update text

Author: JFriel

Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs

@@ -55,6 +55,7 @@
 using Rdmp.UI.Refreshing;
 using Rdmp.UI.Rules;
 using Rdmp.UI.SimpleDialogs;
+using Rdmp.UI.SimpleDialogs.Cohorts;
 using Rdmp.UI.SimpleDialogs.ForwardEngineering;
 using Rdmp.UI.SingleControlForms;
 using Rdmp.UI.SubComponents;
@@ -904,6 +905,12 @@ public override CohortCreationRequest GetCohortCreationRequest(ExternalCohortTab
         return ui.ShowDialog() == DialogResult.OK ? ui.Result : null;
     }
 
+    public override IProject CohortCommitProjectSelect(IProject currentProject,Project[] projects)
+    {
+        var ui = new CohortCommitProjectSelectionUI(this, currentProject, projects);
+        return ui.ShowDialog() == DialogResult.OK ? ui.Result : null; ;
+    }
+
     public override CohortHoldoutLookupRequest GetCohortHoldoutLookupRequest(ExternalCohortTable externalCohortTable,
         IProject project, CohortIdentificationConfiguration cic)
     {

CHANGELOG.md

@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [9.1.0] - Unreleased
 - Fix bug with duplicate searchables
+- Improve UI for committing cohorts across projects
 - Add the ability to Template Cohort Identification Configurations (see [Documentation\cohorts\CohortIdentificationConfigurationTemplates.md])
 - Require all deletes to enter a commit message when using the commit system
 - Introduce ability to view Catalogues in a flat view

Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration.cs

@@ -83,27 +83,47 @@ public override void Execute()
             }
         }
 
-        if (Project == null && BasicActivator.CoreChildProvider is DataExportChildProvider dx)
+
+        IProject currentProj = null;
+        ProjectCohortIdentificationConfigurationAssociation[] projAssociations = Array.Empty<ProjectCohortIdentificationConfigurationAssociation>();
+        if (BasicActivator.CoreChildProvider is DataExportChildProvider dx)
         {
-            var projAssociations = dx.AllProjectAssociatedCics
+            projAssociations = dx.AllProjectAssociatedCics
                 .Where(c => c.CohortIdentificationConfiguration_ID == cic.ID).ToArray();
-            if (projAssociations.Length == 1) Project = projAssociations[0].Project;
+            if (projAssociations.Length > 0)
+            {
+                currentProj = Project != null ? Project : projAssociations.Length == 1 ? projAssociations[0].Project : null;
+                Project = BasicActivator.CohortCommitProjectSelect(currentProj, BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjects<Project>().ToArray());
+                if (Project is null) return;
+            }
         }
 
         var auditLogBuilder = new ExtractableCohortAuditLogBuilder();
         var request = GetCohortCreationRequest(ExtractableCohortAuditLogBuilder.GetDescription(cic));
 
         //user choose to cancel the cohort creation request dialogue
         if (request == null)
+        {
+            Project = null;
             return;
+        }
 
         request.CohortIdentificationConfiguration = cic;
 
         var configureAndExecute = GetConfigureAndExecuteControl(request, $"Execute CIC {cic} and commit results", cic);
 
         configureAndExecute.PipelineExecutionFinishedsuccessfully += (s, u) => OnImportCompletedSuccessfully(cic);
 
-        configureAndExecute.Run(BasicActivator.RepositoryLocator, null, null, null);
+        var result = configureAndExecute.Run(BasicActivator.RepositoryLocator, null, null, null);
+        if (result ==0 && currentProj != null && currentProj.ID != Project.ID)
+        {
+            //move cic to new project
+            var oldAssociation = projAssociations.Where(a => a.Project_ID == currentProj.ID).FirstOrDefault();
+            if (oldAssociation != null)
+            {
+                oldAssociation.DeleteInDatabase();
+            }
+        }
     }
 
     private void OnImportCompletedSuccessfully(CohortIdentificationConfiguration cic)

Rdmp.Core/CommandExecution/BasicActivateItems.cs

@@ -666,14 +666,20 @@ public virtual CohortCreationRequest GetCohortCreationRequest(ExternalCohortTabl
             RepositoryLocator.DataExportRepository, cohortInitialDescription);
     }
 
+    public virtual IProject CohortCommitProjectSelect(IProject currentProject, Project[] projects)
+    {
+        return currentProject;
+    }
+
+
     /// <inheritdoc/>
     public virtual CohortHoldoutLookupRequest GetCohortHoldoutLookupRequest(ExternalCohortTable externalCohortTable, IProject project, CohortIdentificationConfiguration cic)
     {
 
         if (!TypeText("Name", "Enter name for cohort", 255, null, out var name, false))
             throw new Exception("User chose not to enter a name for the cohort and none was provided");
 
-        return new CohortHoldoutLookupRequest(cic, "empty", 1,false,"","");
+        return new CohortHoldoutLookupRequest(cic, "empty", 1, false, "", "");
     }
 
     /// <inheritdoc/>

Rdmp.Core/CommandExecution/IBasicActivateItems.cs

@@ -173,6 +173,7 @@ public interface IBasicActivateItems
     CohortCreationRequest GetCohortCreationRequest(ExternalCohortTable externalCohortTable, IProject project,
         string cohortInitialDescription);
 
+    IProject CohortCommitProjectSelect(IProject currentProject, Project[] projects);
 
 
     CohortHoldoutLookupRequest GetCohortHoldoutLookupRequest(ExternalCohortTable externalCohortTable, IProject project, CohortIdentificationConfiguration cic);

Rdmp.UI/Collections/CohortIdentificationCollectionUI.Designer.cs

@@ -13,6 +13,7 @@
 using Rdmp.Core.Curation.Data;
 using Rdmp.Core.Curation.Data.Cohort;
 using Rdmp.Core.Icons.IconProvision;
+using Rdmp.Core.Providers;
 using Rdmp.Core.Providers.Nodes.CohortNodes;
 using Rdmp.UI.CommandExecution.AtomicCommands;
 using Rdmp.UI.CommandExecution.AtomicCommands.UIFactory;
@@ -37,6 +38,7 @@ public CohortIdentificationCollectionUI()
     {
         InitializeComponent();
         olvFrozen.AspectGetter = FrozenAspectGetter;
+        olvAssociatedProjects.AspectGetter = AssociatedProjectsAspectGetter;
     }
 
     public override void SetItemActivator(IActivateItems activator)
@@ -114,6 +116,7 @@ public override void SetItemActivator(IActivateItems activator)
         if (_firstTime)
         {
             CommonTreeFunctionality.SetupColumnTracking(olvName, new Guid("f8a42259-ce5a-4006-8ab8-e0305fce05aa"));
+            CommonTreeFunctionality.SetupColumnTracking(olvAssociatedProjects, new Guid("f8a42259-ce5a-4006-8ab8-e0305fce05aa"));
             CommonTreeFunctionality.SetupColumnTracking(olvFrozen, new Guid("d1e155ef-a28f-41b5-81e4-b763627ddb3c"));
 
             tlvCohortIdentificationConfigurations.Expand(rootFolder);
@@ -148,7 +151,17 @@ root is FolderNode<CohortIdentificationConfiguration> f
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
     }
-
+    private string AssociatedProjectsAspectGetter(object o)
+    {
+        var cic = o as CohortIdentificationConfiguration;
+        if (cic != null)
+        {
+            var dx = Activator.CoreChildProvider as DataExportChildProvider;
+            var associations = dx.AllProjectAssociatedCics.Where(c => c.CohortIdentificationConfiguration_ID == cic.ID);
+            return string.Join(", ", associations.Select(a => a.Project.ID));
+        }
+        return "";
+    }
     private string FrozenAspectGetter(object o) =>
         o is CohortIdentificationConfiguration cic ? cic.Frozen ? "Yes" : "No" : null;
 }