Skip to content

Commit 0560a22

Browse files
fix: change per-folder config settings behaviour to match other IDEs
1 parent 635b96c commit 0560a22

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Snyk.VisualStudio.Extension.2022/Settings/SnykSolutionOptionsUserControl.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,10 @@ private void AutoOrganizationCheckBox_CheckedChanged(object sender, EventArgs e)
8383
{
8484
// When checkbox is ticked (auto mode):
8585
// - orgSetByUser is set to false
86-
// - preferredOrg is set to ""
8786
// - preferredOrgTextField is set to the value of autoDeterminedOrg
8887
if (isAutoMode)
8988
{
9089
await this.serviceProvider.SnykOptionsManager.SaveOrgSetByUserAsync(false);
91-
await this.serviceProvider.SnykOptionsManager.SavePreferredOrgAsync("");
92-
9390
// Update text field to show auto-determined org
9491
var autoDeterminedOrg = await this.serviceProvider.SnykOptionsManager.GetAutoDeterminedOrgAsync();
9592
this.organizationTextBox.Text = autoDeterminedOrg;
@@ -99,12 +96,15 @@ private void AutoOrganizationCheckBox_CheckedChanged(object sender, EventArgs e)
9996
{
10097
// When checkbox is unticked (manual mode):
10198
// - orgSetByUser is set to true
102-
// - preferredOrgTextField is set to ""
99+
// - preferredOrgTextField is set to the previously saved value.
103100
await this.serviceProvider.SnykOptionsManager.SaveOrgSetByUserAsync(true);
104-
await this.serviceProvider.SnykOptionsManager.SavePreferredOrgAsync("");
105-
this.organizationTextBox.Text = "";
106-
this.Organization = "";
101+
var preferredOrg = await this.serviceProvider.SnykOptionsManager.GetPreferredOrgAsync();
102+
this.organizationTextBox.Text = preferredOrg;
103+
this.Organization = preferredOrg;
107104
}
105+
106+
// Disable the Preferred Organization field if Auto-select Organization is enabled.
107+
this.organizationTextBox.Enabled = !isAutoMode;
108108

109109
Logger.Information("Auto organization state updated: {IsAutoMode}", isAutoMode);
110110
}).FireAndForget();

0 commit comments

Comments
 (0)