Merge pull request #659 from Sitecore/feature/657-Hide_Sitecore_9_instances_that_do_not_exist_in_Environments.json

#657 Hide Sitecore 9 and later instances that do not exist in Environments.json

Author: AndreyFilchenkov

src/SIM.Instances/InstanceManager.cs

@@ -130,7 +130,19 @@ public void Initialize([CanBeNull] string defaultRootFolder = null)
 
       List<Instance> instances = new List<Instance>();
 
-      if(ApplicationManager.IsIisRunning) {instances.AddRange(GetIISInstances());}
+      if(ApplicationManager.IsIisRunning) 
+      {
+        List<Instance> iisInstances = GetIISInstances().ToList();
+        if (!InstanceSettings.CoreInstancesShowWithoutEnviorenmentMembers.Value)
+        {
+          List<Instance> instancesWithoutMembers = iisInstances.Where(instance => instance.Type != Instance.InstanceType.Sitecore8AndEarlier && instance.SitecoreEnvironment.Members == null).ToList();
+          instances.AddRange(iisInstances.Except(instancesWithoutMembers));
+        }
+        else
+        {
+          instances.AddRange(iisInstances);
+        }
+      }
 
       if(ApplicationManager.IsDockerRunning) {instances.AddRange(GetContainerizedInstances());}
 

src/SIM.Instances/InstanceSettings.cs

@@ -0,0 +1,7 @@
+namespace SIM.Instances
+{
+  public static class InstanceSettings
+  {
+    public static readonly AdvancedProperty<bool> CoreInstancesShowWithoutEnviorenmentMembers = AdvancedSettings.Create("Core/Instances/ShowWithoutEnviorenmentMembers", false);
+  }
+}

src/SIM.Instances/SIM.Instances.csproj

@@ -81,6 +81,7 @@
   <ItemGroup>
     <Compile Include="ContainerizedInstance.cs" />
     <Compile Include="InstanceHelper.cs" />
+    <Compile Include="InstanceSettings.cs" />
     <Compile Include="InstanceState.cs" />
     <Compile Include="PartiallyCachedInstance.cs" />
     <Compile Include="Instance.cs" />

src/SIM.Tool.Windows/Dialogs/AdvancedSettingsDialog.xaml.cs

@@ -25,7 +25,8 @@ public AdvancedSettingsDialog()
       // workaround for #179
       var types = new[]
       {
-        typeof(SIM.Core.CoreAppSettings), 
+        typeof(SIM.Core.CoreAppSettings),
+        typeof(SIM.Instances.InstanceSettings),
         typeof(SIM.Tool.Base.WinAppSettings), 
         typeof(SIM.Tool.Windows.Properties.Settings), 
         typeof(SIM.Tool.Windows.WindowsSettings),