add no changes state to diff viewer (#11001) (#11014)

* add has changes state to diff viewer * update text + change engine on accept * typo Co-authored-by: Sylvester Knudsen <[email protected]>
DynamoDS · Aug 17, 2020 · ecf9e76 · ecf9e76
1 parent f845916
commit ecf9e76
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 1 deletion.
diff --git a/src/PythonMigrationViewExtension/Controls/BaseDiffViewer.xaml b/src/PythonMigrationViewExtension/Controls/BaseDiffViewer.xaml
@@ -29,6 +29,42 @@
             <DataTemplate DataType="{x:Type viewModels:SideBySideViewModel}">
                 <local:SideBySideControl DataContext="{Binding}" />
             </DataTemplate>
+            <Style x:Key="HasDifferenceController"
+                   TargetType="{x:Type ContentControl}">
+                <Style.Triggers>
+                    <DataTrigger Binding="{Binding Path=CurrentViewModel.HasChanges}"
+                                 Value="True">
+                        <Setter Property="Content"
+                                Value="{Binding Path=CurrentViewModel}">
+                        </Setter>
+                    </DataTrigger>
+                    <DataTrigger Binding="{Binding Path=CurrentViewModel.HasChanges}"
+                                 Value="False">
+                        <Setter Property="ContentTemplate">
+                            <Setter.Value>
+                                <DataTemplate>
+                                    <StackPanel Orientation="Vertical"
+                                                VerticalAlignment="Center"
+                                                Width="400">
+                                        <TextBlock Text="{x:Static p:Resources.MigrationAssistantNoChangesStateHeader}"
+                                                   TextAlignment="Center"
+                                                   HorizontalAlignment="Center"
+                                                   FontSize="24"
+                                                   Foreground="{StaticResource WorkspaceTabHeaderActiveTextBrush}"
+                                                   TextWrapping="Wrap" />
+                                        <TextBlock Text="{x:Static p:Resources.MigrationAssistantNoChangesStateMessage}"
+                                                   TextAlignment="Center"
+                                                   HorizontalAlignment="Center"
+                                                   FontSize="14"
+                                                   Foreground="{StaticResource WorkspaceTabHeaderActiveTextBrush}"
+                                                   TextWrapping="Wrap" />
+                                    </StackPanel>
+                                </DataTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </DataTrigger>
+                </Style.Triggers>
+            </Style>
         </ResourceDictionary>
     </Window.Resources>
 
@@ -56,8 +92,9 @@
             </Style>
         </Grid.Resources>
 
-        <ContentControl Content="{Binding CurrentViewModel}"
+        <ContentControl Style="{StaticResource HasDifferenceController}"
                         Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+
 
         <!-- Buttons row -->
         <Grid HorizontalAlignment="Stretch"

diff --git a/src/PythonMigrationViewExtension/Differ/IDiffViewViewModel.cs b/src/PythonMigrationViewExtension/Differ/IDiffViewViewModel.cs
@@ -3,6 +3,7 @@
     public interface IDiffViewViewModel
     {
         ViewMode ViewMode { get; }
+        bool HasChanges { get; }
     }
 
     public enum ViewMode

diff --git a/src/PythonMigrationViewExtension/Differ/InLineViewModel.cs b/src/PythonMigrationViewExtension/Differ/InLineViewModel.cs
@@ -8,6 +8,7 @@ public class InLineViewModel : IDiffViewViewModel
     {
         public ViewMode ViewMode { get; set; }
         public DiffPaneModel DiffModel { get; set; }
+        public bool HasChanges { get { return DiffModel.HasDifferences; } } 
 
         public InLineViewModel(SideBySideDiffModel diffModel)
         {

diff --git a/src/PythonMigrationViewExtension/Differ/SideBySideViewModel.cs b/src/PythonMigrationViewExtension/Differ/SideBySideViewModel.cs
@@ -8,6 +8,7 @@ public class SideBySideViewModel : IDiffViewViewModel
         public SideBySideDiffModel DiffModel { get; set; }
         public DiffPaneModel AfterPane { get { return DiffModel.NewText; } }
         public DiffPaneModel BeforePane { get { return DiffModel.OldText; } }
+        public bool HasChanges { get { return DiffModel.NewText.HasDifferences | DiffModel.OldText.HasDifferences; } }
 
         public SideBySideViewModel(SideBySideDiffModel diffModel)
         {

diff --git a/src/PythonMigrationViewExtension/MigrationAssistant/PythonMigrationAssistantViewModel.cs b/src/PythonMigrationViewExtension/MigrationAssistant/PythonMigrationAssistantViewModel.cs
@@ -68,6 +68,14 @@ private void MigrateCode()
         /// </summary>
         public void ChangeCode()
         {
+            if (!this.CurrentViewModel.HasChanges)
+            {
+                if (this.PythonNode.Engine == PythonEngineVersion.CPython3)
+                    return;
+                this.PythonNode.Engine = PythonEngineVersion.CPython3;
+                return;
+            }
+
             if (!Models.DynamoModel.IsTestMode && !File.Exists(GetMigrationAssistantDisclaimerDismissFile()))
             {
                 var warningMessage = new MigrationAssistantDisclaimer(this);

diff --git a/src/PythonMigrationViewExtension/Properties/Resources.Designer.cs b/src/PythonMigrationViewExtension/Properties/Resources.Designer.cs
diff --git a/src/PythonMigrationViewExtension/Properties/Resources.en-US.resx b/src/PythonMigrationViewExtension/Properties/Resources.en-US.resx
@@ -164,6 +164,12 @@ By clicking “Continue”, you are agreeing to implement the syntax changes to
   <data name="MigrationAssistantDisclaimerWindowTitle" xml:space="preserve">
     <value>Migration Assistant Disclaimer</value>
   </data>
+  <data name="MigrationAssistantNoChangesStateHeader" xml:space="preserve">
+    <value>Nothing to see here!</value>
+  </data>
+  <data name="MigrationAssistantNoChangesStateMessage" xml:space="preserve">
+    <value>Your code is ready to run with the Python 3 engine. Click accept and we'll switch to the Python 3 engine for you.</value>
+  </data>
   <data name="PackagedCustomNodesHeader" xml:space="preserve">
     <value>Packaged</value>
   </data>

diff --git a/src/PythonMigrationViewExtension/Properties/Resources.resx b/src/PythonMigrationViewExtension/Properties/Resources.resx
@@ -164,6 +164,12 @@ By clicking “Continue”, you are agreeing to implement the syntax changes to
   <data name="MigrationAssistantDisclaimerWindowTitle" xml:space="preserve">
     <value>Migration Assistant Disclaimer</value>
   </data>
+  <data name="MigrationAssistantNoChangesStateHeader" xml:space="preserve">
+    <value>Nothing to see here!</value>
+  </data>
+  <data name="MigrationAssistantNoChangesStateMessage" xml:space="preserve">
+    <value>Your code is ready to run with the Python 3 engine. Click accept and we'll switch to the Python 3 engine for you.</value>
+  </data>
   <data name="PackagedCustomNodesHeader" xml:space="preserve">
     <value>Packaged</value>
   </data>