fix(dui2): uses old report log as fallback in new report (#1586)

* preview bug fixes for rhino * updated all connector bindings * Update ConnectorBindingsTeklaStructure.Send.cs * updated how new report handles old report items
specklesystems · Sep 5, 2022 · 2d81760 · 2d81760
1 parent fbe528f
commit 2d81760
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/ConnectorRhinoCommand.cs b/ConnectorRhino/ConnectorRhino/ConnectorRhinoShared/Entry/ConnectorRhinoCommand.cs
@@ -28,7 +28,6 @@ public class SpeckleCommand : Command
     public static Window MainWindow { get; private set; }
 
 
-
     private static CancellationTokenSource Lifetime = null;
 
     public static Avalonia.Application AvaloniaApp { get; set; }
@@ -59,7 +58,6 @@ public static AppBuilder BuildAvaloniaApp()
     protected override Result RunCommand(RhinoDoc doc, RunMode mode)
     {
 
-
 #if DEBUG
       SpeckleRhinoConnectorPlugin.Instance.Init();
 #endif
@@ -73,7 +71,6 @@ protected override Result RunCommand(RhinoDoc doc, RunMode mode)
 #endif
       Rhino.UI.Panels.OpenPanel(typeof(Panel).GUID);
 
-
       return Result.Success;
     }
 

diff --git a/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs b/DesktopUI2/DesktopUI2/ViewModels/StreamViewModel.cs
@@ -320,7 +320,9 @@ public string Log
     {
       get
       {
-        string defaultMessage = "\nWelcome to the report! \n\nObjects you send or receive will appear here to help you understand how your document has changed.";
+        string defaultMessage = string.IsNullOrEmpty(Progress.Report.ConversionLogString) ? 
+          "\nWelcome to the report! \n\nObjects you send or receive will appear here to help you understand how your document has changed." :
+          Progress.Report.ConversionLogString;
 
         string reportInfo = $"\nOperation: {(PreviewOn ? "Preview " : "")}{(IsReceiver ? "Received at " : "Sent at ")}{DateTime.Now.ToLocalTime().ToString("dd/MM/yy HH:mm:ss")}";
         reportInfo += $"\nTotal: {Report.Count} objects";

diff --git a/DesktopUI2/DesktopUI2/Views/Pages/StreamEditView.xaml b/DesktopUI2/DesktopUI2/Views/Pages/StreamEditView.xaml
@@ -169,11 +169,6 @@
 
           <Grid RowDefinitions="auto,auto,auto,*" ColumnDefinitions="*,auto">
 
-            <!--  OLD REPORT, DEPRECATE AFTER ALL CONNECTOR BINDINGS ARE UPDATED WITH NEW APPOBJS  -->
-            <ScrollViewer Grid.Row="2" IsVisible="{Binding !HasReportItems}">
-              <TextBlock TextWrapping="Wrap" Margin="35,0,0,10" Text="{Binding Progress.Report.ConversionLogString}" />
-            </ScrollViewer>
-
             <!--  SUMMARY AND OPERATION ERRORS  -->
             <TextBlock
               Grid.Row="0"