Merge pull request #189 from Microsoft/PerthCharern/AdjustWorkbench

Small appearance fixes in Workbench

- Add missing scrollbar
- Update versions to V3.0.1 and V2.0 for accuracy

Author: PerthCharern

src/Microsoft.OpenApi.Workbench/MainModel.cs

@@ -30,20 +30,20 @@ public class MainModel : INotifyPropertyChanged
         /// <summary>
         /// Default format.
         /// </summary>
-        private string _format = "Yaml";
+        private OpenApiFormat _format = OpenApiFormat.Yaml;
 
         /// <summary>
         /// Default version.
         /// </summary>
-        private string _version = "V3";
+        private OpenApiSpecVersion _version = OpenApiSpecVersion.OpenApi3_0;
 
         public string Input
         {
             get => _input;
             set
             {
                 _input = value;
-                OnPropertyChanged("Input");
+                OnPropertyChanged(nameof(Input));
             }
         }
 
@@ -53,7 +53,7 @@ public string Output
             set
             {
                 _output = value;
-                OnPropertyChanged("Output");
+                OnPropertyChanged(nameof(Output));
             }
         }
 
@@ -63,7 +63,7 @@ public string Errors
             set
             {
                 _errors = value;
-                OnPropertyChanged("Errors");
+                OnPropertyChanged(nameof(Errors));
             }
         }
 
@@ -73,7 +73,7 @@ public string ParseTime
             set
             {
                 _parseTime = value;
-                OnPropertyChanged("ParseTime");
+                OnPropertyChanged(nameof(ParseTime));
             }
         }
 
@@ -83,54 +83,54 @@ public string RenderTime
             set
             {
                 _renderTime = value;
-                OnPropertyChanged("RenderTime");
+                OnPropertyChanged(nameof(RenderTime));
             }
         }
 
-        public string Format
+        public OpenApiFormat Format
         {
             get => _format;
             set
             {
                 _format = value;
-                OnPropertyChanged("IsYaml");
-                OnPropertyChanged("IsJson");
+                OnPropertyChanged(nameof(IsYaml));
+                OnPropertyChanged(nameof(IsJson));
             }
         }
 
-        public string Version
+        public OpenApiSpecVersion Version
         {
             get => _version;
             set
             {
                 _version = value;
-                OnPropertyChanged("IsV2");
-                OnPropertyChanged("IsV3");
+                OnPropertyChanged(nameof(IsV2_0));
+                OnPropertyChanged(nameof(IsV3_0));
             }
         }
 
         public bool IsYaml
         {
-            get => Format == "Yaml";
-            set => Format = "Yaml";
+            get => Format == OpenApiFormat.Yaml;
+            set => Format = OpenApiFormat.Yaml;
         }
 
         public bool IsJson
         {
-            get => Format == "JSON";
-            set => Format = "JSON";
+            get => Format == OpenApiFormat.Json;
+            set => Format = OpenApiFormat.Json;
         }
 
-        public bool IsV2
+        public bool IsV2_0
         {
-            get => Version == "V2";
-            set => Version = "V2";
+            get => Version == OpenApiSpecVersion.OpenApi2_0;
+            set => Version = OpenApiSpecVersion.OpenApi2_0;
         }
 
-        public bool IsV3
+        public bool IsV3_0
         {
-            get => Version == "V3";
-            set => Version = "V3";
+            get => Version == OpenApiSpecVersion.OpenApi3_0;
+            set => Version = OpenApiSpecVersion.OpenApi3_0;
         }
 
         /// <summary>
@@ -200,8 +200,8 @@ private string WriteContents(OpenApiDocument document)
             var outputStream = new MemoryStream();
             document.Serialize(
                 outputStream,
-                IsV3 ? OpenApiSpecVersion.OpenApi3_0 : OpenApiSpecVersion.OpenApi2_0,
-                _format == "Yaml" ? OpenApiFormat.Yaml : OpenApiFormat.Json);
+                Version,
+                Format);
 
             outputStream.Position = 0;
 

src/Microsoft.OpenApi.Workbench/MainWindow.xaml

@@ -11,32 +11,31 @@
             <ColumnDefinition/>
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <TextBox x:Name="txtInput" Text="{Binding Input}" Margin="10" TextWrapping="Wrap" AcceptsReturn="True" FontFamily="Consolas" />
+        <TextBox x:Name="txtInput" Text="{Binding Input}" VerticalScrollBarVisibility="Auto" Margin="10" TextWrapping="Wrap" AcceptsReturn="True" FontFamily="Consolas" />
         <DockPanel Grid.Column="1" Margin="0,10" >
-      <StackPanel Orientation="Horizontal"  DockPanel.Dock="Top">
-        <Button Content="Convert" VerticalAlignment="Center" HorizontalAlignment="Left" Height="20" Margin="10" Width="131" Click="Button_Click" Grid.Column="1"/>
-        <StackPanel Orientation="Vertical"  DockPanel.Dock="Top">
-          <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-            <Label>Format:</Label>
-            <RadioButton GroupName="Format" Content="Yaml" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsYaml }" />
-            <RadioButton GroupName="Format" Content="JSON" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsJson }" />
-          </StackPanel>
-          <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-            <Label>Version:</Label>
-            <RadioButton GroupName="Format" Content="V3" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsV3 }" />
-            <RadioButton GroupName="Format" Content="V2" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsV2 }" />
-          </StackPanel>
-        </StackPanel>
-      </StackPanel>
-            
+            <StackPanel Orientation="Horizontal"  DockPanel.Dock="Top">
+                <Button Content="Convert" VerticalAlignment="Center" HorizontalAlignment="Left" Height="20" Margin="10" Width="131" Click="Button_Click" Grid.Column="1"/>
+                <StackPanel Orientation="Vertical"  DockPanel.Dock="Top">
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                        <Label>Format:</Label>
+                        <RadioButton GroupName="Format" Content="YAML" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsYaml}" />
+                        <RadioButton GroupName="Format" Content="JSON" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsJson}" />
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                        <Label>Version:</Label>
+                        <RadioButton GroupName="Format" Content="V3.0.1" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsV3_0}" />
+                        <RadioButton GroupName="Format" Content="V2.0" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsV2_0}" />
+                    </StackPanel>
+                </StackPanel>
+            </StackPanel>
             <TextBox x:Name="txtErrors"  Margin="10,10,10,10" TextWrapping="Wrap" Text="{Binding Errors}"  Background="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}" DockPanel.Dock="Top" MaxHeight="100" ScrollViewer.VerticalScrollBarVisibility="Auto" IsReadOnlyCaretVisible="True" IsManipulationEnabled="True" />
             <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
                 <Label>Parsing: </Label>
                 <TextBlock x:Name="txtParseTime" Text="{Binding ParseTime}" Width="100" VerticalAlignment="Center"/>
                 <Label>Rendering:</Label>
                 <TextBlock x:Name="txtRenderTime" Text="{Binding RenderTime}" VerticalAlignment="Center"/>
             </StackPanel>
-            <TextBox x:Name="txtOutput" Text="{Binding Output}" VerticalScrollBarVisibility="Auto" Margin="10,10,10,10" VerticalAlignment="Stretch" TextWrapping="Wrap" Background="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}" FontFamily="Consolas" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Stretch" IsManipulationEnabled="True" HorizontalScrollBarVisibility="Auto" DockPanel.Dock="Top" />
+            <TextBox x:Name="txtOutput" Text="{Binding Output}" VerticalScrollBarVisibility="Auto" Margin="10,10,10,0" VerticalAlignment="Stretch" TextWrapping="Wrap" Background="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}" FontFamily="Consolas" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Stretch" IsManipulationEnabled="True" HorizontalScrollBarVisibility="Auto" DockPanel.Dock="Top" />
 
     </DockPanel>
     </Grid>