Merge pull request #15 from atc-net/hotfix/add-missing-can-comammnd-execute-guards

davidkallesen · web-flow · commit 1a6010b43e20 · 2023-11-16T14:13:56.000+01:00
fix: Add missing CanComammnd execute guards with DisableInstallationA…
diff --git a/src/Atc.Installer.Wpf.ComponentProvider.ElasticSearch/ElasticSearchServerComponentProviderViewModel.cs b/src/Atc.Installer.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/src/Atc.Installer.Wpf.ComponentProvider.InternetInformationServer/InternetInformationServerComponentProviderViewModel.cs b/src/Atc.Installer.Wpf.ComponentProvider.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/src/Atc.Installer.Wpf.ComponentProvider.PostgreSql/PostgreSqlServerComponentProviderViewModel.cs b/src/Atc.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/src/Atc.Installer.Wpf.ComponentProvider.WindowsApplication/WindowsApplicationComponentProviderViewModel.cs b/src/Atc.Installer.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;

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,8 @@ public override async Task ServiceStopCommandHandler()`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`public override bool CanServiceStartCommandHandler()`
`135`		`- => RunningState == ComponentRunningState.Stopped;`
	`135`	`+ => DisableInstallationActions &&`
	`136`	`+ RunningState == ComponentRunningState.Stopped;`
`136`	`137`
`137`	`138`	`public override async Task ServiceStartCommandHandler()`
`138`	`139`	`{`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,8 @@ public override async Task ServiceStopCommandHandler()`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`public override bool CanServiceStartCommandHandler()`
`298`		`- => RunningState == ComponentRunningState.Stopped;`
	`298`	`+ => !DisableInstallationActions &&`
	`299`	`+ RunningState == ComponentRunningState.Stopped;`
`299`	`300`
`300`	`301`	`public override async Task ServiceStartCommandHandler()`
`301`	`302`	`{`
`@@ -333,7 +334,8 @@ public override async Task ServiceStartCommandHandler()`
`333`	`334`
`334`	`335`	`public override bool CanServiceDeployCommandHandler()`
`335`	`336`	`{`
`336`		`- if (UnpackedZipFolderPath is null)`
	`337`	`+ if (DisableInstallationActions \|\|`
	`338`	`+ UnpackedZipFolderPath is null)`
`337`	`339`	`{`
`338`	`340`	`return false;`
`339`	`341`	`}`
`@@ -355,7 +357,8 @@ public override Task ServiceDeployAndStartCommandHandler()`
`355`	`357`
`356`	`358`	`public override bool CanServiceRemoveCommandHandler()`
`357`	`359`	`{`
`358`		`- if (InstallationFolderPath is null \|\|`
	`360`	`+ if (DisableInstallationActions \|\|`
	`361`	`+ InstallationFolderPath is null \|\|`
`359`	`362`	`InstalledMainFilePath is null)`
`360`	`363`	`{`
`361`	`364`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,8 @@ public override async Task ServiceStopCommandHandler()`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`public override bool CanServiceStartCommandHandler()`
`162`		`- => RunningState == ComponentRunningState.Stopped;`
	`162`	`+ => !DisableInstallationActions &&`
	`163`	`+ RunningState == ComponentRunningState.Stopped;`
`163`	`164`
`164`	`165`	`public override async Task ServiceStartCommandHandler()`
`165`	`166`	`{`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,8 @@ public override async Task ServiceStopCommandHandler()`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`public override bool CanServiceStartCommandHandler()`
`136`		`- => RunningState == ComponentRunningState.Stopped;`
	`136`	`+ => !DisableInstallationActions &&`
	`137`	`+ RunningState == ComponentRunningState.Stopped;`
`137`	`138`
`138`	`139`	`public override async Task ServiceStartCommandHandler()`
`139`	`140`	`{`
`@@ -195,7 +196,8 @@ public override async Task ServiceStartCommandHandler()`
`195`	`196`
`196`	`197`	`public override bool CanServiceDeployCommandHandler()`
`197`	`198`	`{`
`198`		`- if (UnpackedZipFolderPath is null)`
	`199`	`+ if (DisableInstallationActions \|\|`
	`200`	`+ UnpackedZipFolderPath is null)`
`199`	`201`	`{`
`200`	`202`	`return false;`
`201`	`203`	`}`
`@@ -217,7 +219,8 @@ public override Task ServiceDeployAndStartCommandHandler()`
`217`	`219`
`218`	`220`	`public override bool CanServiceRemoveCommandHandler()`
`219`	`221`	`{`
`220`		`- if (InstallationFolderPath is null \|\|`
	`222`	`+ if (DisableInstallationActions \|\|`
	`223`	`+ InstallationFolderPath is null \|\|`
`221`	`224`	`InstalledMainFilePath is null)`
`222`	`225`	`{`
`223`	`226`	`return false;`