Cp 13834 13859 (#13862)

* ALSO-5603 Add parameter hiding autocomplete options from the UI (#13834) * ALSO-5603 Add parameter hiding autocomplete options from the UI * ALSO-5603 Use IPreferences for hide autocomplete option This needs to avoid breaking compatibility * ALSO-5603 Add hide autocomplete option to the settings * ALSO-5603 Fix unit test * ALSO-5603 Hide missing ML complete controls if hiding option is set (#13859) --------- Co-authored-by: spodo99 <[email protected]>
DynamoDS · Mar 31, 2023 · ac1ae39 · ac1ae39
1 parent d4f200d
commit ac1ae39
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 5 deletions.
diff --git a/src/DynamoCore/Configuration/IPreferences.cs b/src/DynamoCore/Configuration/IPreferences.cs
@@ -182,6 +182,18 @@ internal interface IDisablePackageLoadingPreferences
         bool DisableCustomPackageLocations { get; set; }
     }
 
+    /// <summary>
+    /// Temporary interface to avoid breaking changes.
+    /// TODO: Merge with StartupConfiguration for 3.0 (DYN-1699)
+    /// </summary>
+    internal interface IHideAutocompleteMethodOptions
+    {
+        /// <summary>
+        /// If true, autocomplete method options are hidden from UI 
+        /// </summary>
+        bool HideAutocompleteMethodOptions { get; set; }
+    }
+
     /// <summary>
     /// Represents data about active state of preview background
     /// </summary>

diff --git a/src/DynamoCore/Configuration/PreferenceSettings.cs b/src/DynamoCore/Configuration/PreferenceSettings.cs
@@ -45,7 +45,7 @@ internal static void CopyProperties(this PreferenceSettings source, PreferenceSe
     /// from a XML file from DYNAMO_SETTINGS_FILE.
     /// When GUI is closed, the settings are saved back into the XML file.
     /// </summary>
-    public class PreferenceSettings : NotificationObject, IPreferences, IRenderPrecisionPreference, IDisablePackageLoadingPreferences, ILogSource
+    public class PreferenceSettings : NotificationObject, IPreferences, IRenderPrecisionPreference, IDisablePackageLoadingPreferences, ILogSource, IHideAutocompleteMethodOptions
     {
         private string numberFormat;
         private string lastUpdateDownloadPath;
@@ -525,6 +525,11 @@ public string PythonTemplateFilePath
         /// </summary>
         public int MLRecommendationNumberOfResults { get; set; }
 
+        /// <summary>
+        /// If true, autocomplete method options are hidden from UI 
+        /// </summary>
+        public bool HideAutocompleteMethodOptions { get; set; }
+
         /// <summary>
         /// This defines if user wants to see the enabled Dynamo Notification Center.
         /// </summary>
@@ -767,6 +772,7 @@ public PreferenceSettings()
             HideNodesBelowSpecificConfidenceLevel = false;
             MLRecommendationConfidenceLevel = 10;
             MLRecommendationNumberOfResults = 10;
+            HideAutocompleteMethodOptions = false;
             EnableNotificationCenter = true;
             isStaticSplashScreenEnabled = true;
             DefaultPythonEngine = string.Empty;

diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -738,7 +738,7 @@ protected DynamoViewModel(StartConfiguration startConfiguration)
             model.ComputeModelDeserialized += model_ComputeModelDeserialized;
             model.RequestNotification += model_RequestNotification;
 
-            preferencesViewModel = new PreferencesViewModel(this);
+            preferencesViewModel = new PreferencesViewModel(this);            
 
             if (!DynamoModel.IsTestMode && !DynamoModel.IsHeadless)
             {

diff --git a/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs b/src/DynamoCoreWpf/ViewModels/Menu/PreferencesViewModel.cs
@@ -827,6 +827,17 @@ public bool NotificationCenterIsChecked
 
         #region [ Node Autocomplete ]
 
+        /// <summary>
+        /// If true, autocomplete method options are hidden from UI 
+        /// </summary>
+        public bool HideAutocompleteMethodOptions
+        {
+            get
+            {
+                return preferenceSettings.HideAutocompleteMethodOptions;
+            }
+        }
+
         /// <summary>
         /// Controls the IsChecked property in the "Node autocomplete" toogle button
         /// </summary>

diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
@@ -743,19 +743,20 @@
                                         </Image>
                                     </StackPanel>
 
-                                    <StackPanel Orientation="Horizontal" Margin="0,-5,0,0" Grid.Row="1">
+                                    <StackPanel Orientation="Horizontal" Margin="0,-5,0,0" Grid.Row="1"
+                                                Visibility="{Binding HideAutocompleteMethodOptions, Converter={StaticResource InverseBoolToVisibilityCollapsedConverter}}">
                                         <!-- This Grid contains controls for selecting the Node autocomplete method -->
                                         <Grid Margin="60,0,0,0">
                                             <Grid.RowDefinitions>
                                                 <RowDefinition Height="Auto" />
                                                 <RowDefinition Height="*" />
                                                 <RowDefinition Height="*" />
                                             </Grid.RowDefinitions>
-                                            <Label Grid.Row="0"
+                                            <Label Grid.Row="0" 
                                                 Margin="-8,15,10,3"                                               
                                                 Content="{x:Static p:Resources.PreferencesNodeAutocompleteMethod}" 
                                                 Foreground="{StaticResource PreferencesWindowFontColor}"/>
-                                            <Grid Grid.Row="1">
+                                            <Grid Grid.Row="1" >
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition x:Name="colObjectType" Width="Auto"/>
                                                     <ColumnDefinition x:Name="colMachineLearning" Width="Auto"/>

diff --git a/test/settings/DynamoSettings-NewSettings.xml b/test/settings/DynamoSettings-NewSettings.xml
@@ -65,6 +65,7 @@
   <HideNodesBelowSpecificConfidenceLevel>true</HideNodesBelowSpecificConfidenceLevel>
   <MLRecommendationConfidenceLevel>99</MLRecommendationConfidenceLevel>
   <MLRecommendationNumberOfResults>5</MLRecommendationNumberOfResults>
+  <HideAutocompleteMethodOptions>true</HideAutocompleteMethodOptions>
   <EnableNotificationCenter>false</EnableNotificationCenter>
   <EnableStaticSplashScreen>false</EnableStaticSplashScreen>
   <DefaultPythonEngine/>