Skip to content

Commit

Permalink
Combined the 'Disable Extended Accidental Deletition Prevention' to t…
Browse files Browse the repository at this point in the history 
…he existing 'Disable Accidental Deletition Prevention'
  • Loading branch information
@BruAlcarazUlg
BruAlcarazUlg committed Jun 6, 2023
1 parent 33ac24e commit bfc195a
Show file tree
Hide file tree
Showing 14 changed files with 80 additions and 130 deletions.
2 changes: 0 additions & 2 deletions src/Common/Helpers/ConfigurationHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,6 @@ static MainSettings GetMainSettingsUsingConfiguration(TwoFilesConfiguration conf

resultProperties.DisableAccidentalDeletionPrevention = configuration.GetBoolValue
(ConfigurationParameters.DisableAccidentalDeletionPrevention, currentSettings.DisableAccidentalDeletionPrevention, writeToLog);
resultProperties.DisableExtendedAccidentalDeletionPrevention = configuration.GetBoolValue
(ConfigurationParameters.DisableExtendedAccidentalDeletionPrevention, currentSettings.DisableExtendedAccidentalDeletionPrevention, writeToLog);

resultProperties.ProxyOverrideDefault = configuration.GetBoolValue(ConfigurationParameters.ProxyOverrideDefault, currentSettings.ProxyOverrideDefault, writeToLog);
resultProperties.ProxyUseDefaultCredentials = configuration.GetBoolValue(ConfigurationParameters.ProxyUseDefaultCredentials, currentSettings.ProxyUseDefaultCredentials, writeToLog);
Expand Down
1 change: 0 additions & 1 deletion src/Common/Helpers/ConfigurationParameters.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ public static class ConfigurationParameters
public const string SelectedMessageCountsParameter = "selectedMessageCounts";
public const string MicrosoftServiceBusConnectionString = "Microsoft.ServiceBus.ConnectionString";
public const string DisableAccidentalDeletionPrevention = "disableAccidentalDeletionPrevention";
public const string DisableExtendedAccidentalDeletionPrevention = "disableExtendedAccidentalDeletionPrevention";

public const string ProxyOverrideDefault = "Proxy.OverrideDefault";
public const string ProxyAddress = "Proxy.Address";
Expand Down
4 changes: 0 additions & 4 deletions src/Common/Helpers/MainSettings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ public class MainSettings
public Enums.EncodingType EncodingType { get; set; }

public bool DisableAccidentalDeletionPrevention { get; set; }
public bool DisableExtendedAccidentalDeletionPrevention { get; set; }

public bool ProxyOverrideDefault { get; set; }
public string ProxyAddress { get; set; }
Expand Down Expand Up @@ -291,9 +290,6 @@ public object GetValue(string setting)
case ConfigurationParameters.DisableAccidentalDeletionPrevention:
return DisableAccidentalDeletionPrevention;

case ConfigurationParameters.DisableExtendedAccidentalDeletionPrevention:
return DisableExtendedAccidentalDeletionPrevention;

case ConfigurationParameters.Encoding:
return EncodingType;

Expand Down
8 changes: 4 additions & 4 deletions src/ServiceBusExplorer/Controls/HandleConsumerGroupControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,11 @@ private void btnCreateDelete_Click(object sender, EventArgs e)
{
var configuration = TwoFilesConfiguration.Create(TwoFilesConfiguration.GetCurrentConfigFileUse(), writeToLog);

bool disableExtendedAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableExtendedAccidentalDeletionPrevention,
defaultValue: false);
bool disableAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableAccidentalDeletionPrevention,
defaultValue: false);

if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {consumerGroupDescription.Name} {ConsumerGroupEntity.ToLower()}");
if (deleteForm.ShowDialog() == DialogResult.OK)
{
Expand Down
8 changes: 4 additions & 4 deletions src/ServiceBusExplorer/Controls/HandleEventHubControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,11 @@ private void btnCreateDelete_Click(object sender, EventArgs e)
{
var configuration = TwoFilesConfiguration.Create(TwoFilesConfiguration.GetCurrentConfigFileUse(), writeToLog);

bool disableExtendedAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableExtendedAccidentalDeletionPrevention,
defaultValue: false);
bool disableAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableAccidentalDeletionPrevention,
defaultValue: false);

if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {eventHubDescription.Path} {EventHubEntity.ToLower()}");
if (deleteForm.ShowDialog() == DialogResult.OK)
{
Expand Down
6 changes: 3 additions & 3 deletions src/ServiceBusExplorer/Controls/HandleNotificationHubControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2012,11 +2012,11 @@ private async void btnCreateDelete_Click(object sender, EventArgs e)
{
var configuration = TwoFilesConfiguration.Create(TwoFilesConfiguration.GetCurrentConfigFileUse(), writeToLog);

bool disableExtendedAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableExtendedAccidentalDeletionPrevention,
bool disableAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableAccidentalDeletionPrevention,
defaultValue: false);

if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {notificationHubDescription.Path} {NotificationHubEntity.ToLower()}");

if (deleteForm.ShowDialog() == DialogResult.OK)
Expand Down
8 changes: 4 additions & 4 deletions src/ServiceBusExplorer/Controls/HandleQueueControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2007,11 +2007,11 @@ private async void btnCreateDelete_Click(object sender, EventArgs e)
{
var configuration = TwoFilesConfiguration.Create(TwoFilesConfiguration.GetCurrentConfigFileUse(), writeToLog);

bool disableExtendedAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableExtendedAccidentalDeletionPrevention,
defaultValue: false);
bool disableAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableAccidentalDeletionPrevention,
defaultValue: false);

if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {queueDescription.Path} {QueueEntity.ToLower()}");
if (deleteForm.ShowDialog() == DialogResult.OK)
{
Expand Down
8 changes: 4 additions & 4 deletions src/ServiceBusExplorer/Controls/HandleRelayControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,11 +412,11 @@ private async void btnCreateDelete_Click(object sender, EventArgs e)
{
var configuration = TwoFilesConfiguration.Create(TwoFilesConfiguration.GetCurrentConfigFileUse(), writeToLog);

bool disableExtendedAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableExtendedAccidentalDeletionPrevention,
defaultValue: false);
bool disableAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableAccidentalDeletionPrevention,
defaultValue: false);

if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {relayDescription.Path} {RelayEntity.ToLower()}");
if (deleteForm.ShowDialog() == DialogResult.OK)
{
Expand Down
8 changes: 4 additions & 4 deletions src/ServiceBusExplorer/Controls/HandleRuleControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,11 +252,11 @@ void btnCreateDelete_Click(object sender, EventArgs e)
{
var configuration = TwoFilesConfiguration.Create(TwoFilesConfiguration.GetCurrentConfigFileUse(), writeToLog);

bool disableExtendedAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableExtendedAccidentalDeletionPrevention,
defaultValue: false);
bool disableAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableAccidentalDeletionPrevention,
defaultValue: false);

if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {ruleWrapper.RuleDescription.Name} {RuleEntity.ToLower()}");
if (deleteForm.ShowDialog() == DialogResult.OK)
{
Expand Down
8 changes: 4 additions & 4 deletions src/ServiceBusExplorer/Controls/HandleSubscriptionControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1347,11 +1347,11 @@ private async void btnCreateDelete_Click(object sender, EventArgs e)
{
var configuration = TwoFilesConfiguration.Create(TwoFilesConfiguration.GetCurrentConfigFileUse(), writeToLog);

bool disableExtendedAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableExtendedAccidentalDeletionPrevention,
defaultValue: false);
bool disableAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableAccidentalDeletionPrevention,
defaultValue: false);

if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {subscriptionWrapper.SubscriptionDescription.Name} {SubscriptionEntity.ToLower()}");
if (deleteForm.ShowDialog() == DialogResult.OK)
{
Expand Down
8 changes: 4 additions & 4 deletions src/ServiceBusExplorer/Controls/HandleTopicControl.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,11 +487,11 @@ private async void btnCreateDelete_Click(object sender, EventArgs e)
{
var configuration = TwoFilesConfiguration.Create(TwoFilesConfiguration.GetCurrentConfigFileUse(), writeToLog);

bool disableExtendedAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableExtendedAccidentalDeletionPrevention,
defaultValue: false);
bool disableAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableAccidentalDeletionPrevention,
defaultValue: false);

if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {topicDescription.Path} {TopicEntity.ToLower()}");
if (deleteForm.ShowDialog() == DialogResult.OK)
{
Expand Down
18 changes: 8 additions & 10 deletions src/ServiceBusExplorer/Forms/MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,6 @@ private async void optionsToolStripMenuItem_Click(object sender, EventArgs e)

mainSettings.DisableAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableAccidentalDeletionPrevention, defaultValue: false, WriteToLog);
mainSettings.DisableExtendedAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableExtendedAccidentalDeletionPrevention, defaultValue: false, WriteToLog);

var lastConfigFileUse = configFileUse;

Expand Down Expand Up @@ -1949,8 +1947,8 @@ private async void deleteEntity_Click(object sender, EventArgs e)

var configuration = TwoFilesConfiguration.Create(configFileUse, WriteToLog);

bool disableExtendedAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableExtendedAccidentalDeletionPrevention,
bool disableAccidentalDeletionPrevention = configuration.GetBoolValue(
ConfigurationParameters.DisableAccidentalDeletionPrevention,
defaultValue: false);

// Root Node
Expand Down Expand Up @@ -2145,7 +2143,7 @@ private async void deleteEntity_Click(object sender, EventArgs e)
{
using (var deleteForm = new DeleteForm(queueDescription.Path, QueueEntity.ToLower()))
{
if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {queueDescription.Path} {QueueEntity.ToLower()}");

if (deleteForm.ShowDialog() == DialogResult.OK)
Expand Down Expand Up @@ -2173,7 +2171,7 @@ private async void deleteEntity_Click(object sender, EventArgs e)
{
using (var deleteForm = new DeleteForm(DeleteAllSubscriptions))
{
if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {subscriptionDescriptions.Count} subscriptions");

if (deleteForm.ShowDialog() == DialogResult.OK)
Expand All @@ -2190,7 +2188,7 @@ private async void deleteEntity_Click(object sender, EventArgs e)
{
using (var deleteForm = new DeleteForm(topicDescription.Path, TopicEntity.ToLower()))
{
if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {TopicEntity.ToLower()} {topicDescription.Path}");

if (deleteForm.ShowDialog() == DialogResult.OK)
Expand All @@ -2206,7 +2204,7 @@ private async void deleteEntity_Click(object sender, EventArgs e)
{
using (var deleteForm = new DeleteForm(relayDescription.Path, RelayEntity.ToLower()))
{
if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {RelayEntity.ToLower()} {relayDescription.Path}");

if (deleteForm.ShowDialog() == DialogResult.OK)
Expand Down Expand Up @@ -2296,7 +2294,7 @@ private async void deleteEntity_Click(object sender, EventArgs e)
{
if (deleteForm.ShowDialog() == DialogResult.OK)
{
if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {subscriptionDescriptions.Count()} subscriptions");

await serviceBusHelper.DeleteSubscriptions(subscriptionDescriptions);
Expand All @@ -2314,7 +2312,7 @@ private async void deleteEntity_Click(object sender, EventArgs e)
{
using (var deleteForm = new DeleteForm(subscriptionWrapper.SubscriptionDescription.Name, SubscriptionEntity.ToLower()))
{
if (!disableExtendedAccidentalDeletionPrevention)
if (!disableAccidentalDeletionPrevention)
deleteForm.ShowAccidentalDeletionPreventionCheck(configuration, $"Delete {SubscriptionEntity.ToLower()} {subscriptionWrapper.SubscriptionDescription.Name}");

if (deleteForm.ShowDialog() == DialogResult.OK)
Expand Down
Loading

0 comments on commit bfc195a

Please sign in to comment.