Merge pull request #16 from bytedreamer/develop

bytedreamer · web-flow · commit 8804a1551236 · 2023-06-21T20:00:36.000-04:00
0.1.103 Pre-Release
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -23,7 +23,7 @@ variables:
 - name: minor
   value: 1
 - name: patch
-  value: 102
+  value: 103
 - name: AssemblyVersion
   value: $(major).$(minor).$(patch)
 
diff --git a/setup/Windows/SetupProject/Aporta.wxs b/setup/Windows/SetupProject/Aporta.wxs
diff --git a/setup/Windows/SetupProject/Product.wxs b/setup/Windows/SetupProject/Product.wxs
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util='http://schemas.microsoft.com/wix/UtilExtension'>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util='http://schemas.microsoft.com/wix/UtilExtension' xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension">
 	<Product Id="*" Name="Aporta" Language="1033" Version="!(bind.FileVersion.AportaService)" Manufacturer="Z-bit" UpgradeCode="3155e450-efaf-4294-a12b-097295667284">
 		<Package InstallerVersion="200" 
              Platform="x64"
@@ -57,6 +57,14 @@
           Part="last"
           Action="set"
           System="yes" />
+        <fire:FirewallException 
+            Id="FirewallException" 
+            Name="Aporta" 
+            Port="8443" 
+            Protocol="tcp" 
+            Scope="any" 
+            Program="$(var.BasePath)\Aporta.exe" 
+            IgnoreFailure="yes"/>
       </Component>
 
       <Component Id="Aporta_ServiceInstaller" Directory="INSTALLFOLDER" Guid="10C702B9-C283-421F-B166-771543D89A8B">
@@ -71,7 +79,7 @@
           Account="LocalSystem"
           ErrorControl="normal" />
         <ServiceControl
-          Id="ServiceInstaller"
+          Id="ServiceControl"
           Start="install"
           Stop="both"
           Remove="uninstall"
diff --git a/setup/Windows/SetupProject/SetupProject.wixproj b/setup/Windows/SetupProject/SetupProject.wixproj
@@ -43,6 +43,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <WixExtension Include="WixFirewallExtension">
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\WiX Toolset v3.11\bin\WixFirewallExtension.dll</HintPath>
+      <Name>WixFirewallExtension</Name>
+    </WixExtension>
     <WixExtension Include="WixUtilExtension">
       <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
       <Name>WixUtilExtension</Name>
diff --git a/src/Aporta.WebClient/Pages/configuration/Doors.razor b/src/Aporta.WebClient/Pages/configuration/Doors.razor
@@ -30,7 +30,7 @@ else
             {
                 <Alert Color="Color.Warning" Visible="true">
                     <AlertMessage>Add Door</AlertMessage>
-                    <AlertDescription>None are available</AlertDescription>
+                    <AlertDescription>No available access readers or inputs are configured in the drivers</AlertDescription>
                 </Alert>
             }
         </Column>
diff --git a/src/Aporta.WebClient/Pages/configuration/Inputs.razor b/src/Aporta.WebClient/Pages/configuration/Inputs.razor
@@ -30,7 +30,7 @@ else
             {
                 <Alert Color="Color.Warning" Visible="true">
                     <AlertMessage>Add Input</AlertMessage>
-                    <AlertDescription>None are available</AlertDescription>
+                    <AlertDescription>No available inputs are configured in the drivers</AlertDescription>
                 </Alert>
             }
         </Column>
diff --git a/src/Aporta.WebClient/Pages/configuration/Outputs.razor b/src/Aporta.WebClient/Pages/configuration/Outputs.razor
@@ -30,7 +30,7 @@ else
             {
                 <Alert Color="Color.Warning" Visible="true">
                     <AlertMessage>Add Output</AlertMessage>
-                    <AlertDescription>None are available</AlertDescription>
+                    <AlertDescription>No available outputs are configured in the drivers</AlertDescription>
                 </Alert>
             }
         </Column>

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ else`
`30`	`30`	`{`
`31`	`31`	`<Alert Color="Color.Warning" Visible="true">`
`32`	`32`	`<AlertMessage>Add Door</AlertMessage>`
`33`		`- <AlertDescription>None are available</AlertDescription>`
	`33`	`+ <AlertDescription>No available access readers or inputs are configured in the drivers</AlertDescription>`
`34`	`34`	`</Alert>`
`35`	`35`	`}`
`36`	`36`	`</Column>`