Merge pull request #15 from atc-net/hotfix/add-missing-can-comammnd-e…

…xecute-guards fix: Add missing CanComammnd execute guards with DisableInstallationA…
atc-net · Nov 16, 2023 · 1a6010b · 1a6010b
2 parents d1ec770 + 19cdbfb
commit 1a6010b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/...ller.Wpf.ComponentProvider.ElasticSearch/ElasticSearchServerComponentProviderViewModel.cs b/...ller.Wpf.ComponentProvider.ElasticSearch/ElasticSearchServerComponentProviderViewModel.cs
@@ -132,7 +132,8 @@ public override async Task ServiceStopCommandHandler()
     }
 
     public override bool CanServiceStartCommandHandler()
-        => RunningState == ComponentRunningState.Stopped;
+        => DisableInstallationActions &&
+           RunningState == ComponentRunningState.Stopped;
 
     public override async Task ServiceStartCommandHandler()
     {

diff --git a/...Provider.InternetInformationServer/InternetInformationServerComponentProviderViewModel.cs b/...Provider.InternetInformationServer/InternetInformationServerComponentProviderViewModel.cs
@@ -295,7 +295,8 @@ public override async Task ServiceStopCommandHandler()
     }
 
     public override bool CanServiceStartCommandHandler()
-        => RunningState == ComponentRunningState.Stopped;
+        => !DisableInstallationActions &&
+           RunningState == ComponentRunningState.Stopped;
 
     public override async Task ServiceStartCommandHandler()
     {
@@ -333,7 +334,8 @@ public override async Task ServiceStartCommandHandler()
 
     public override bool CanServiceDeployCommandHandler()
     {
-        if (UnpackedZipFolderPath is null)
+        if (DisableInstallationActions ||
+            UnpackedZipFolderPath is null)
         {
             return false;
         }
@@ -355,7 +357,8 @@ public override Task ServiceDeployAndStartCommandHandler()
 
     public override bool CanServiceRemoveCommandHandler()
     {
-        if (InstallationFolderPath is null ||
+        if (DisableInstallationActions ||
+            InstallationFolderPath is null ||
             InstalledMainFilePath is null)
         {
             return false;

diff --git a/....Installer.Wpf.ComponentProvider.PostgreSql/PostgreSqlServerComponentProviderViewModel.cs b/....Installer.Wpf.ComponentProvider.PostgreSql/PostgreSqlServerComponentProviderViewModel.cs
@@ -159,7 +159,8 @@ public override async Task ServiceStopCommandHandler()
     }
 
     public override bool CanServiceStartCommandHandler()
-        => RunningState == ComponentRunningState.Stopped;
+        => !DisableInstallationActions &&
+           RunningState == ComponentRunningState.Stopped;
 
     public override async Task ServiceStartCommandHandler()
     {

diff --git a/....Wpf.ComponentProvider.WindowsApplication/WindowsApplicationComponentProviderViewModel.cs b/....Wpf.ComponentProvider.WindowsApplication/WindowsApplicationComponentProviderViewModel.cs
@@ -133,7 +133,8 @@ public override async Task ServiceStopCommandHandler()
     }
 
     public override bool CanServiceStartCommandHandler()
-        => RunningState == ComponentRunningState.Stopped;
+        => !DisableInstallationActions &&
+           RunningState == ComponentRunningState.Stopped;
 
     public override async Task ServiceStartCommandHandler()
     {
@@ -195,7 +196,8 @@ public override async Task ServiceStartCommandHandler()
 
     public override bool CanServiceDeployCommandHandler()
     {
-        if (UnpackedZipFolderPath is null)
+        if (DisableInstallationActions ||
+            UnpackedZipFolderPath is null)
         {
             return false;
         }
@@ -217,7 +219,8 @@ public override Task ServiceDeployAndStartCommandHandler()
 
     public override bool CanServiceRemoveCommandHandler()
     {
-        if (InstallationFolderPath is null ||
+        if (DisableInstallationActions ||
+            InstallationFolderPath is null ||
             InstalledMainFilePath is null)
         {
             return false;