Bugfix/rdmp 362 dupe list project cic

.github/workflows/build.yml

@@ -308,4 +308,4 @@ jobs:
           file: dist/*
           tag: ${{ github.ref }}
           overwrite: true
-          file_glob: true 
+          file_glob: true 

CHANGELOG.md

@@ -8,12 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add Internal Note to Catalogue
 - Fix issue where project associations were not copied when a CIC was cloned
 - Fix issue with using Internal Catalogues in Cohort Identification Configurations
+- Simplify Project Cohorts tree
 - Fix bug with copying project specific Catalogues between Projects when committing a Cohort
 - Remove Tree filters from UI
 - Fix issue with Web File Downloader not releasing files after download complete
 - Fix Extraction primary Key case sensitivity issue
-
-## [9.1.2] - Unreleased
 - Automatically fetch user settings from previous versions of RDMP when installing the latest version
 - Allow new columns to be added to archive extractions
 - Simplify use of Extraction Progress

Rdmp.Core.Tests/DataExport/ProjectCohortIdentificationConfigurationAssociationTests.cs

@@ -57,23 +57,5 @@ public void TestOrphanCic()
             //relationship from p should resolve to the cic
             Assert.That(p.GetAssociatedCohortIdentificationConfigurations(), Is.Empty);
         });
-
-        //error should be reported in top right of program
-        var ex = Assert.Throws<Exception>(() =>
-            new DataExportChildProvider(new RepositoryProvider(memory), null, ThrowImmediatelyCheckNotifier.Quiet,
-                null));
-        Assert.That(
-            ex.Message, Does.Match(@"Failed to find Associated Cohort Identification Configuration with ID \d+ which was supposed to be associated with my proj"));
-
-        //but UI should still respond
-        var childProvider = new DataExportChildProvider(new RepositoryProvider(memory), null,
-            IgnoreAllErrorsCheckNotifier.Instance, null);
-
-        //the orphan cic should not appear in the tree view under Project=>Cohorts=>Associated Cics
-        var cohorts = childProvider.GetChildren(p).OfType<ProjectCohortsNode>().Single();
-        var cics = childProvider.GetChildren(cohorts).OfType<ProjectCohortIdentificationConfigurationAssociationsNode>()
-            .First();
-
-        Assert.That(childProvider.GetChildren(cics), Is.Empty);
     }
 }

Rdmp.Core/CommandExecution/AtomicCommandFactory.cs

@@ -509,6 +509,8 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
             //associate with project
             yield return new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(_activator)
             { Weight = -50.3f, OverrideCommandName = "Associate with Project" }.SetTarget(cic);
+            yield return new ExecuteCommandRemoveCohortIdentificationConfigurationProjectAssociation(_activator)
+            { Weight = -50.2f, OverrideCommandName = "Remove Association with Project" }.SetTarget(pcic != null?pcic:cic);
 
         }
 
@@ -842,15 +844,6 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
             { OverrideCommandName = "Add New Cohort From Table", Weight = -4.6f }.SetTarget(projCohorts.Project);
         }
 
-        if (Is(o, out ProjectCohortIdentificationConfigurationAssociationsNode pccan))
-        {
-            yield return new ExecuteCommandCreateNewCohortIdentificationConfiguration(_activator)
-            { OverrideCommandName = "Add New Cohort Builder Query", Weight = -5.1f }.SetTarget(pccan.Project);
-            yield return new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(_activator)
-            { OverrideCommandName = "Add Existing Cohort Builder Query (link to)", Weight = -5f }
-                .SetTarget(pccan.Project);
-        }
-
         if (Is(o, out ProjectSavedCohortsNode savedCohortsNode))
         {
             yield return

Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRemoveCohortIdentificationConfigurationProjectAssociation.cs

@@ -0,0 +1,114 @@
+// Copyright (c) The University of Dundee 2018-2019
+// This file is part of the Research Data Management Platform (RDMP).
+// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
+
+using System;
+using System.Linq;
+using Rdmp.Core.Curation.Data;
+using Rdmp.Core.Curation.Data.Cohort;
+using Rdmp.Core.DataExport.Data;
+using Rdmp.Core.Icons.IconProvision;
+using Rdmp.Core.Providers;
+using Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+
+namespace Rdmp.Core.CommandExecution.AtomicCommands;
+
+public sealed class ExecuteCommandRemoveCohortIdentificationConfigurationProjectAssociation : BasicCommandExecution,
+    IAtomicCommandWithTarget
+{
+    private Project _project;
+    private CohortIdentificationConfiguration _cic;
+    private ProjectCohortIdentificationConfigurationAssociation[] _existingAssociations;
+    private ProjectCohortIdentificationConfigurationAssociation _associationToDelete;
+    private IBasicActivateItems _activator;
+    public ExecuteCommandRemoveCohortIdentificationConfigurationProjectAssociation(IBasicActivateItems activator) :
+        base(activator)
+    {
+        _activator = activator;
+        if (!activator.CoreChildProvider.AllCohortIdentificationConfigurations.Any())
+            SetImpossible("There are no Cohort Identification Configurations yet");
+
+    }
+
+    public override string GetCommandHelp() =>
+        "Specifies that the Cohort Identification Configuration (query) is only for use generating cohorts for extractions of the specified project";
+
+    public override void Execute()
+    {
+        if (_project is null && _cic is null && _associationToDelete is null)
+        {
+            _cic = (CohortIdentificationConfiguration)_activator.SelectOne("Select a Cohort Identification Configuration", _activator.RepositoryLocator.CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>().ToArray());
+            if (_cic is null) return;
+        }
+        if (_cic is not null && _project is null && _associationToDelete is null)
+        {
+
+            _existingAssociations = _activator.RepositoryLocator.DataExportRepository.GetAllObjectsWhere<ProjectCohortIdentificationConfigurationAssociation>("CohortIdentificationConfiguration_ID", _cic.ID);
+        }
+        if (_cic is null && _project is not null && _associationToDelete is null)
+        {
+
+            _existingAssociations = _activator.RepositoryLocator.DataExportRepository.GetAllObjectsWhere<ProjectCohortIdentificationConfigurationAssociation>("Project_ID", _project.ID);
+        }
+        if (_cic != null && _project != null && _associationToDelete is null)
+        {
+            _associationToDelete = _activator.RepositoryLocator.DataExportRepository.GetAllObjectsWhere<ProjectCohortIdentificationConfigurationAssociation>("Project_ID", _project.ID).Where(pac => pac.CohortIdentificationConfiguration_ID == _cic.ID).First();
+        }
+        if (_associationToDelete is null)
+        {
+            if (_cic is not null && _project is null)
+            {
+                var projects = _existingAssociations.Select(a => a.Project).ToArray();
+                var selectedProject = (Project)_activator.SelectOne("Select the project to remove the association with", projects);
+                _associationToDelete = _existingAssociations.Where(pac => pac.Project_ID == selectedProject.ID).First();
+
+            }
+            else if (_cic is null && _project is not null)
+            {
+                var cics = _existingAssociations.Select(a => a.CohortIdentificationConfiguration).ToArray();
+                var selectedCic = (CohortIdentificationConfiguration)_activator.SelectOne("Select the cohort to remove the association with", cics);
+                _associationToDelete = _existingAssociations.Where(pac => pac.CohortIdentificationConfiguration_ID == selectedCic.ID).First();
+
+            }
+            else
+            {
+                _associationToDelete = (ProjectCohortIdentificationConfigurationAssociation)_activator.SelectOne("Select the association to remove", _existingAssociations);
+            }
+        }
+        if (_associationToDelete is null) return;
+
+        _associationToDelete.DeleteInDatabase();
+        Publish(_project);
+        Publish(_cic);
+        base.Execute();
+    }
+
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        //if we know the cic the context is 'pick a project'
+        _cic != null
+            ? iconProvider.GetImage(RDMPConcept.Project, OverlayKind.Delete)
+            :
+            //if we know the _project the context is 'pick a cic'  (or if we don't know either then just use this icon too)
+            iconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration, OverlayKind.Delete);
+
+    public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
+    {
+        switch (target)
+        {
+            case Project project:
+                _project = project;
+                break;
+            case CohortIdentificationConfiguration configuration:
+                _cic = configuration;
+                break;
+            case ProjectCohortIdentificationConfigurationAssociation association:
+                _associationToDelete = association;
+                break;
+        }
+        return this;
+    }
+}

Rdmp.Core/Icons/IconProvision/CatalogueIcons.resx

@@ -508,9 +508,6 @@
   <data name="AllCohortsNode" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\AllCohortsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="ProjectCohortIdentificationConfigurationAssociationsNode" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\ProjectCohortIdentificationConfigurationAssociationsNode.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <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>

Rdmp.Core/Icons/IconProvision/RDMPConcept.cs

@@ -98,7 +98,6 @@ public enum RDMPConcept
 
     AllCohortsNode,
     ProjectsNode,
-    ProjectCohortIdentificationConfigurationAssociationsNode,
     ProjectSavedCohortsNode,
     ExtractableDataSetsNode,
     ExtractionDirectoryNode,

Rdmp.Core/Providers/DataExportChildProvider.cs

@@ -356,9 +356,6 @@ private void AddChildren(ProjectCataloguesNode projectCataloguesNode, Descendanc
     private void AddChildren(ProjectCohortsNode projectCohortsNode, DescendancyList descendancy)
     {
         var children = new HashSet<object>();
-        var projectCiCsNode = new ProjectCohortIdentificationConfigurationAssociationsNode(projectCohortsNode.Project);
-        children.Add(projectCiCsNode);
-        AddChildren(projectCiCsNode, descendancy.Add(projectCiCsNode));
 
         var savedCohortsNode = new ProjectSavedCohortsNode(projectCohortsNode.Project);
         children.Add(savedCohortsNode);
@@ -405,38 +402,6 @@ private void AddChildren(ProjectSavedCohortsNode savedCohortsNode, DescendancyLi
         AddToDictionaries(children, descendancy);
     }
 
-    private void AddChildren(ProjectCohortIdentificationConfigurationAssociationsNode projectCiCsNode,
-        DescendancyList descendancy)
-    {
-        //add the associations
-        var children = new HashSet<object>();
-        foreach (var association in AllProjectAssociatedCics.Where(assoc =>
-                     assoc.Project_ID == projectCiCsNode.Project.ID))
-        {
-            var matchingCic = AllCohortIdentificationConfigurations.SingleOrDefault(cic =>
-                cic.ID == association.CohortIdentificationConfiguration_ID) ?? AllTemplateCohortIdentificationConfigurations.SingleOrDefault(cic =>
-                cic.ID == association.CohortIdentificationConfiguration_ID);
-
-            if (matchingCic == null)
-            {
-                _errorsCheckNotifier.OnCheckPerformed(
-                    new CheckEventArgs(
-                        $"Failed to find Associated Cohort Identification Configuration with ID {association.CohortIdentificationConfiguration_ID} which was supposed to be associated with {association.Project}",
-                        CheckResult
-                            .Fail)); //inject knowledge of what the cic is so it doesn't have to be fetched during ToString
-            }
-            else
-            {
-                association.InjectKnown(matchingCic);
-
-                //document that it is a child of the project cics node
-                children.Add(association);
-            }
-        }
-
-        AddToDictionaries(children, descendancy);
-    }
-
     private void AddChildren(ExtractionConfigurationsNode extractionConfigurationsNode, DescendancyList descendancy)
     {
         var children = new HashSet<object>();

Rdmp.Core/Providers/DescendancyList.cs

@@ -40,7 +40,6 @@ public class DescendancyList
             typeof(LoadStageNode),
             typeof(PreLoadDiscardedColumnsNode),
             typeof(ProjectCataloguesNode),
-            typeof(ProjectCohortIdentificationConfigurationAssociationsNode)
         });
 
     /// <summary>

Rdmp.Core/Providers/Nodes/Nodes.cd

@@ -55,14 +55,6 @@
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Rdmp.Core.Providers.Nodes.ProjectCohortNodes.ProjectCohortIdentificationConfigurationAssociationsNode" Collapsed="true">
-    <Position X="38.75" Y="3" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAEAAAAAAAAAAAAEgAAACAAAAAAAAIAAAAAAAAAAAAA=</HashCode>
-      <FileName>Providers\Nodes\ProjectCohortNodes\ProjectCohortIdentificationConfigurationAssociationsNode.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
   <Class Name="Rdmp.Core.Providers.Nodes.ProjectCohortNodes.ProjectCohortsNode" Collapsed="true">
     <Position X="23" Y="4.25" Width="1.5" />
     <TypeIdentifier>