fixing issue #101. (#102)

sachabruttin · May 24, 2023 · a6f2bb3 · a6f2bb3
1 parent 339c71f
commit a6f2bb3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/src/CosmosDbExplorer.Core/Models/CosmosConnection.cs b/src/CosmosDbExplorer.Core/Models/CosmosConnection.cs
@@ -11,17 +11,19 @@ public CosmosConnection(Guid id)
  {
  Id = id;
  EnableEndpointDiscovery = true;
+ LimitToEndpoint = false;
  }
 
  [JsonConstructor]
- public CosmosConnection(Guid? id, string? label, Uri? endpoint, string? secret, ConnectionType connectionType, bool enableEndpointDiscovery, Color? accentColor)
+ public CosmosConnection(Guid? id, string? label, Uri? endpoint, string? secret, ConnectionType connectionType, bool enableEndpointDiscovery, bool limitToEndpoint, Color? accentColor)
  {
  Id = id ?? Guid.NewGuid();
  Label = label;
  DatabaseUri = endpoint;
  AuthenticationKey = secret;
  ConnectionType = connectionType;
  EnableEndpointDiscovery = enableEndpointDiscovery;
+ LimitToEndpoint = limitToEndpoint;
  AccentColor = accentColor;
  }
 
@@ -43,6 +45,9 @@ public CosmosConnection(Guid? id, string? label, Uri? endpoint, string? secret,
  [JsonProperty]
  public bool EnableEndpointDiscovery { get; protected set; }
 
+ [JsonProperty]
+ public bool LimitToEndpoint { get; protected set; }
+
  [JsonProperty]
  public Color? AccentColor { get; protected set; }
 

diff --git a/src/CosmosDbExplorer.Core/Services/CosmosClientService.cs b/src/CosmosDbExplorer.Core/Services/CosmosClientService.cs
@@ -32,7 +32,8 @@ private CosmosClient CreateClient(CosmosConnection connection)
  var options = new CosmosClientOptions
  {
  ConnectionMode = connection.ConnectionType == ConnectionType.Gateway ? ConnectionMode.Gateway : ConnectionMode.Direct,
- EnableTcpConnectionEndpointRediscovery = connection.EnableEndpointDiscovery
+ EnableTcpConnectionEndpointRediscovery = connection.EnableEndpointDiscovery,
+ LimitToEndpoint = connection.LimitToEndpoint
  };
 
  return new CosmosClient(accountEndpoint: connection.DatabaseUri?.ToString(), authKeyOrResourceToken: connection.AuthenticationKey, options);

diff --git a/src/CosmosDbExplorer/ViewModels/AccountSettingsViewModel.cs b/src/CosmosDbExplorer/ViewModels/AccountSettingsViewModel.cs
@@ -48,6 +48,8 @@ public AccountSettingsViewModel(IPersistAndRestoreService persistAndRestoreServi
 
  public bool EnableEndpointDiscovery { get; set; }
 
+ public bool LimitToEndpoint { get; set; }
+
  public Color? AccentColor { get; set; }
 
  public Action<bool?>? SetResult { get; set; }
@@ -93,7 +95,7 @@ public void SaveCommandExecute()
  ? System.Drawing.Color.Transparent
  : System.Drawing.Color.FromArgb(AccentColor.Value.A, AccentColor.Value.R, AccentColor.Value.G, AccentColor.Value.B);
 
- var connection = new CosmosConnection(_connection.Id, Label, new Uri(AccountEndpoint), AccountSecret, ConnectionType, EnableEndpointDiscovery, accentColor);
+ var connection = new CosmosConnection(_connection.Id, Label, new Uri(AccountEndpoint), AccountSecret, ConnectionType, EnableEndpointDiscovery, LimitToEndpoint, accentColor);
 
  _persistAndRestoreService.PersistConnection(connection);
  Messenger.Send(new ConnectionSettingSavedMessage(connection));
@@ -130,6 +132,7 @@ private void SetConnection(CosmosConnection connection)
  }
 
  EnableEndpointDiscovery = _connection.EnableEndpointDiscovery;
+ LimitToEndpoint = _connection.LimitToEndpoint;
  }
 
  private void OnClose()

diff --git a/src/CosmosDbExplorer/Views/AccountSettingsPage.xaml b/src/CosmosDbExplorer/Views/AccountSettingsPage.xaml
@@ -12,9 +12,9 @@
  xmlns:viewmodels="clr-namespace:CosmosDbExplorer.ViewModels"
  Title="{Binding Title}"
  Width="850"
- Height="350"
+ Height="400"
  d:DataContext="{d:DesignInstance Type=viewmodels:AccountSettingsViewModel}"
- d:DesignHeight="350"
+ d:DesignHeight="400"
  d:DesignWidth="850"
  Style="{DynamicResource MahApps.Styles.Page}"
  mc:Ignorable="d">
@@ -141,6 +141,16 @@
  Grid.Column="1"
  IsChecked="{Binding EnableEndpointDiscovery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
  </Grid>
+ <Grid Margin="{StaticResource XSmallTopMargin}">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="200px" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <TextBlock Style="{StaticResource BodyTextStyle}" Grid.Row="6" Grid.Column="0" Text="Limit to Endpoint" />
+ <CheckBox Grid.Row="6" Grid.Column="1" 
+ IsChecked="{Binding LimitToEndpoint, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+ </Grid>
  </StackPanel>
 
  <mah:ToggleSwitch