diff --git a/Doobry.Tests/packages.config b/Doobry.Tests/packages.config index f95d2e1..c66d224 100644 --- a/Doobry.Tests/packages.config +++ b/Doobry.Tests/packages.config @@ -1,23 +1,23 @@  - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Doobry/Doobry.csproj b/Doobry/Doobry.csproj index f58bd50..6ab193c 100644 --- a/Doobry/Doobry.csproj +++ b/Doobry/Doobry.csproj @@ -80,9 +80,8 @@ ..\packages\MaterialDesignThemes.2.2.1-ci761\lib\net45\MaterialDesignThemes.Wpf.dll True - - ..\packages\Microsoft.Azure.DocumentDB.1.10.0\lib\net45\Microsoft.Azure.Documents.Client.dll - True + + ..\packages\Microsoft.Azure.DocumentDB.1.22.0\lib\net45\Microsoft.Azure.Documents.Client.dll ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll @@ -196,6 +195,7 @@ + @@ -317,7 +317,9 @@ ResXFileCodeGenerator Resources.Designer.cs - + + Designer + SettingsSingleFileGenerator Settings.Designer.cs @@ -445,9 +447,9 @@ foreach (var item in filesToCleanup) This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - + diff --git a/Doobry/Features/QueryDeveloper/ResultSetExplorerViewModel.cs b/Doobry/Features/QueryDeveloper/ResultSetExplorerViewModel.cs index 6c607b8..0113b70 100644 --- a/Doobry/Features/QueryDeveloper/ResultSetExplorerViewModel.cs +++ b/Doobry/Features/QueryDeveloper/ResultSetExplorerViewModel.cs @@ -8,6 +8,7 @@ using System.Windows.Input; using Doobry.Infrastructure; + namespace Doobry.Features.QueryDeveloper { public class ResultSetExplorerViewModel : INotifyPropertyChanged @@ -15,6 +16,7 @@ public class ResultSetExplorerViewModel : INotifyPropertyChanged private int _selectedRow = -1; private ResultSet _resultSet; private bool _isError; + private bool _isQueryDetails; private string _error; public ResultSetExplorerViewModel(ICommand fetchMoreCommand, ICommand editDocumentCommand, @@ -40,21 +42,26 @@ public ResultSet ResultSet if (!string.IsNullOrEmpty(_resultSet.Error)) { IsError = true; + IsQueryDetails = false; Error = _resultSet.Error; SelectedRow = -1; } else { IsError = false; + IsQueryDetails = true; Error = null; if (_resultSet.Results.Count > 0) SelectedRow = 0; else SelectedRow = -1; + + } } else SelectedRow = -1; + } } @@ -66,6 +73,12 @@ public ResultSet ResultSet public ICommand SaveDocumentCommand { get; } + public bool IsQueryDetails + { + get { return _isQueryDetails; } + private set { this.MutateVerbose(ref _isQueryDetails, value, RaisePropertyChanged()); } + } + public bool IsError { get { return _isError; } diff --git a/Doobry/Settings/ConnectionsManager.xaml b/Doobry/Settings/ConnectionsManager.xaml index 66cc040..5d7ed8a 100644 --- a/Doobry/Settings/ConnectionsManager.xaml +++ b/Doobry/Settings/ConnectionsManager.xaml @@ -58,6 +58,13 @@ CommandParameter="{Binding }"> +