[UI Overhaul] Spike/refresh #2279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

JFriel wants to merge 49 commits into release/ui-overhaul from spike/refresh

Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -6,6 +6,7 @@
  
    using System;

    using System.Collections.Generic;

    using System.ComponentModel;

    using System.Data;

    using System.Diagnostics;

    using System.IO;

    @@ -163,9 +164,9 @@ public ActivateItems(ITheme theme, RefreshBus refreshBus, DockPanel mainDockPane
  
            IsAbleToLaunchSubprocesses = true;

        }

        protected override ICoreChildProvider GetChildProvider()

        protected override ICoreChildProvider GetChildProvider(bool force = false)

        {

            var provider = base.GetChildProvider();

            var provider = base.GetChildProvider(force);

            if (RefreshBus != null) RefreshBus.ChildProvider = provider;

    @@ -534,13 +535,13 @@ public PersistableObjectCollectionDockContent Activate(IObjectCollectionControl
  
            return floatable;

        }

        public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)

        public void RefreshBus_DoWork(object sender, DoWorkEventArgs e)

        {

            // if we don't want to do selective refresh or can't (because partial refreshes are not supported on the type)

            if (HardRefresh || !UserSettings.SelectiveRefresh || !CoreChildProvider.SelectiveRefresh(e.Object))

            if (HardRefresh || !UserSettings.SelectiveRefresh || !CoreChildProvider.SelectiveRefresh((IMapsDirectlyToDatabaseTable)e.Argument))

            {

                //update the child provider with a full refresh

                GetChildProvider();

                GetChildProvider(true);

                HardRefresh = false;

            }

    @@ -550,7 +551,7 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
  
        private void RefreshProblemProviders()

        {

            foreach (var p in ProblemProviders)

                p.RefreshProblems(CoreChildProvider);

                p.RefreshProblems(RefreshBus.ChildProvider);

        }

        /// <inheritdoc />

...dowManagement/ContentWindowTracking/Persistence/PersistableObjectCollectionDockContent.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -68,7 +68,7 @@ protected override string GetPersistString()
  
        }

        public override void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)

        public override void RefreshBus_DoWork(object sender, DoWorkEventArgs e)

        {

            var newTabName = _control.GetTabName();

    @@ -78,7 +78,7 @@ public override void RefreshBus_RefreshObject(object sender, RefreshObjectEventA
  
            TabText = newTabName;

            //pass the info on to the control

            _control.RefreshBus_RefreshObject(sender, e);

            _control.RefreshBus_DoWork(sender, e);

        }

        public override void HandleUserRequestingTabRefresh(IActivateItems activator)

...anagement/ContentWindowTracking/Persistence/PersistableSingleDatabaseObjectDockContent.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,8 +4,6 @@
  
    // 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.ComponentModel;

    using System.Windows.Forms;

    using Rdmp.Core.CommandExecution;

    using Rdmp.Core.Curation.Data;

    using Rdmp.Core.Curation.Data.Dashboarding;

    @@ -16,6 +14,9 @@
  
    using Rdmp.UI.Refreshing;

    using Rdmp.UI.TestsAndSetup.ServicePropogation;

    using ResearchDataManagementPlatform.WindowManagement.ExtenderFunctionality;

    using System.ComponentModel;

    using System.Windows.Forms;

    using static Rdmp.UI.Refreshing.IRefreshBusSubscriber;

    namespace ResearchDataManagementPlatform.WindowManagement.ContentWindowTracking.Persistence;

    @@ -61,14 +62,22 @@ protected override string GetPersistString()
  
                   DatabaseObject.GetType().FullName + s + DatabaseObject.ID;

        }

        public override void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)

        public override void RefreshBus_DoWork(object sender, DoWorkEventArgs e)

        {

            var newTabName = ((IRDMPSingleDatabaseObjectControl)Control).GetTabName();

            if (ParentForm is CustomFloatWindow floatWindow)

                floatWindow.Text = newTabName;

            TabText = newTabName;

            if (this.InvokeRequired)

            {

                RefreshCallback rb = new RefreshCallback(RefreshBus_DoWork);

                this.Invoke(rb, sender, e);

            }

            else

            {

                var newTabName = ((IRDMPSingleDatabaseObjectControl)Control).GetTabName();

                if (ParentForm is CustomFloatWindow floatWindow)

                    floatWindow.Text = newTabName;

                TabText = newTabName;

            }

        }

        public override void HandleUserRequestingTabRefresh(IActivateItems activator)

...gementPlatform/WindowManagement/ContentWindowTracking/Persistence/RDMPSingleControlTab.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -51,7 +51,7 @@ public RDMPSingleControlTab(RefreshBus refreshBus, Control c)
  
            Control = c;

        }

        public virtual void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)

        public virtual void RefreshBus_DoWork(object sender, DoWorkEventArgs e)

        {

        }

Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeUI.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -4,7 +4,6 @@
  
    // 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 Rdmp.Core;

    using Rdmp.Core.CommandExecution.AtomicCommands;

    using Rdmp.Core.CommandExecution.AtomicCommands.CatalogueCreationCommands;

    @@ -18,6 +17,9 @@
  
    using Rdmp.UI.ItemActivation;

    using Rdmp.UI.Refreshing;

    using Rdmp.UI.TestsAndSetup.ServicePropogation;

    using System;

    using System.ComponentModel;

    using static Rdmp.UI.Refreshing.IRefreshBusSubscriber;

    namespace ResearchDataManagementPlatform.WindowManagement.HomePane;

    @@ -79,8 +81,16 @@ protected override void OnLoad(EventArgs e)
  
            _activator.RefreshBus.EstablishLifetimeSubscription(this);

        }

        public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)

        public void RefreshBus_DoWork(object sender, DoWorkEventArgs e)

        {

            BuildCommandLists();

            if (boxCatalogue.InvokeRequired)

            {

                RefreshCallback rb = new RefreshCallback(RefreshBus_DoWork);

                this.Invoke(rb, sender, e);

            }

            else

            {

                BuildCommandLists();

            }

        }

    }

CHANGELOG.md

-Original file line number
+Diff line change
@@ Expand Up @@
     The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
     and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-    ## [9.1.1] - Unreleased
+    ## [9.1.1] - 2025-12-02
     - Allow Atlassian service workers to write to Confluence from RDMP
     ## [9.1.0] - 2025-11-24
@@ Expand Down @@

Documentation/CodeTutorials/CreatingANewCollectionTreeNode.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -138,7 +138,7 @@ private void AddChildren(ExtractionConfigurationsNode extractionConfigurationsNo
  
            children.Add(config);

        }

        AddToDictionaries(children, descendancy);

        //AddToDictionaries(children, descendancy);

    }

    ```

    @@ -247,7 +247,7 @@ private void AddChildren(ExtractionConfigurationsNode extractionConfigurationsNo
  
    		children.Add(config);

    	}

    	AddToDictionaries(children, descendancy);

    	//AddToDictionaries(children, descendancy);

    }

    private void AddChildren(FrozenExtractionConfigurationsNode frozenExtractionConfigurationsNode, DescendancyList descendancy)

    @@ -262,7 +262,7 @@ private void AddChildren(FrozenExtractionConfigurationsNode frozenExtractionConf
  
    		children.Add(config);

    	}

    	AddToDictionaries(children, descendancy);

    	//AddToDictionaries(children, descendancy);

    }

    ```

    Now when you run RDMP, the final tree should look something like:

Rdmp.Core.Tests/CommandExecution/ExecuteCommandRefreshBrokenCohortsTests.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,16 +11,18 @@ @@
     using Rdmp.Core.Providers;
     using Rdmp.Core.Repositories;
     using Rdmp.Core.ReusableLibraryCode.Checks;
+    using Rdmp.Core.Startup;
     namespace Rdmp.Core.Tests.CommandExecution;
     internal class ExecuteCommandRefreshBrokenCohortsTests
     {
         [Test]
-        public void TestBrokenCohort()
+        public void TestBrokenCohort()//todo
         {
+            Startup.Startup.PreStartup();
             var repo = new MemoryDataExportRepository();
             var ect = new ExternalCohortTable(repo, "yarg", FAnsi.DatabaseType.MicrosoftSQLServer)
             {
                 Server = "IDontExist",
@@ Expand All / @@ -29,7 +31,6 @@ public void TestBrokenCohort() @@
                 ReleaseIdentifierField = "haha"
             };
             ect.SaveToDatabase();
             var cohort = new ExtractableCohort
             {
                 Repository = repo,
@@ Expand All / @@ -44,7 +45,9 @@ public void TestBrokenCohort() @@
             {
                 DisallowInput = true
             };
+            activator.Publish(ect);
+            activator.Publish(cohort);
+            _ = ((DataExportChildProvider)activator.CoreChildProvider).ProjectNumberToCohortsDictionary;
             Assert.That(((DataExportChildProvider)activator.CoreChildProvider).ForbidListedSources, Has.Count.EqualTo(1));
             var cmd = new ExecuteCommandRefreshBrokenCohorts(activator)
@@ Expand Down @@

Rdmp.Core.Tests/CommandExecution/ExecuteCommandSimilarTests.cs

This file was deleted.

Rdmp.Core.Tests/CommandExecution/TestCommandsAreSupported.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -156,7 +156,6 @@ public void Init() @@
         [TestCase(typeof(ExecuteCommandSetUserSetting))]
         [TestCase(typeof(ExecuteCommandShow))]
         [TestCase(typeof(ExecuteCommandShowRelatedObject))]
-        [TestCase(typeof(ExecuteCommandSimilar))]
         [TestCase(typeof(ExecuteCommandSyncTableInfo))]
         [TestCase(typeof(ExecuteCommandUnfreezeExtractionConfiguration))]
         [TestCase(typeof(ExecuteCommandUnMergeCohortIdentificationConfiguration))]
@@ Expand Down @@

Rdmp.Core.Tests/Curation/Anonymisation/ANOTableTests.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -215,7 +215,7 @@ public void SubstituteANOIdentifiers_2CHINumbers() @@
         }
         [Test]
-        public void SubstituteANOIdentifiers_PreviewWithoutPush()
+        public void SubstituteANOIdentifiers_PreviewWithoutPush()//todo
         {
             var anoTable = GetANOTable();
             anoTable.NumberOfCharactersToUseInAnonymousRepresentation = 0;
@@ Expand Down @@

Rdmp.Core.Tests/Curation/Integration/AllKeywordsDescribedTest.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -77,7 +77,7 @@ public void AllForeignKeysDescribed() @@
         }
         [Test]
-        public void AllUserIndexesDescribed()
+        public void AllUserIndexesDescribed()//todo
         {
             var allIndexes = new List<string>();
@@ Expand Down @@

Rdmp.Core.Tests/DataExport/DataRelease/S3BucketReleaseDestinationTests.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -82,15 +82,15 @@ private static void SetArgs(IArgument[] args, Dictionary<string, object> values)
  
        }

        [Test]

        public void AWSLoginTest()

        public void AWSLoginTest()//todo

        {

            var awss3 = new AWSS3("minio", Amazon.RegionEndpoint.EUWest2);

            Assert.DoesNotThrow(() => MakeBucket("logintest"));

            Assert.DoesNotThrow(() => DeleteBucket("logintest"));

        }

        [Test]

        public void ReleaseToAWSBasicTest()

        public void ReleaseToAWSBasicTest()//todo

        {

            MakeBucket("releasetoawsbasictest");

            DoExtraction();

    @@ -293,7 +293,7 @@ public void BadBucket()
  
        [Test]

        public void LocationAlreadyExists()

        public void LocationAlreadyExists()//todo

        {

            MakeBucket("locationalreadyexist");

Rdmp.Core.Tests/DataExport/ProjectCohortIdentificationConfigurationAssociationTests.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -59,9 +59,8 @@ public void TestOrphanCic() @@
             });
             //error should be reported in top right of program
-            var ex = Assert.Throws<Exception>(() =>
-                new DataExportChildProvider(new RepositoryProvider(memory), null, ThrowImmediatelyCheckNotifier.Quiet,
-                    null));
+            var dx = new DataExportChildProvider(new RepositoryProvider(memory), null, ThrowImmediatelyCheckNotifier.Quiet,null);
+            var ex = Assert.Throws<Exception>(() => _ = dx.ProjectRootFolder);
             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"));
@@ Expand All / @@ -70,6 +69,7 @@ public void TestOrphanCic() @@
                 IgnoreAllErrorsCheckNotifier.Instance, null);
             //the orphan cic should not appear in the tree view under Project=>Cohorts=>Associated Cics
+            var x = childProvider.GetChildren(p);
             var cohorts = childProvider.GetChildren(p).OfType<ProjectCohortsNode>().Single();
             var cics = childProvider.GetChildren(cohorts).OfType<ProjectCohortIdentificationConfigurationAssociationsNode>()
                 .First();
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[UI Overhaul] Spike/refresh #2279

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

[UI Overhaul] Spike/refresh #2279

Are you sure you want to change the base?

Uh oh!

[UI Overhaul] Spike/refresh #2279

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!