From 6c1bd3162128c4552bb6c5f45e3766d198528675 Mon Sep 17 00:00:00 2001
From: ohumeniuk <oleksandr.humeniuk@onseo.biz>
Date: Mon, 20 Nov 2017 08:19:59 +0200
Subject: [PATCH] added version to welcome screen + removing node_modules and
 dist folders during update

---
 .gitignore                                    |  1 +
 .../CustomActions/CustomAction.cs             |  3 ++
 .../MainInstaller/MainInstaller.wixproj       |  1 +
 .../MainInstaller/WelcomeDlgModified.wxs      | 34 +++++++++++++++++++
 .../WixUI_InstallDirModified.wxs              |  4 +--
 5 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 eFormAPI/Installation/MainInstaller/WelcomeDlgModified.wxs

diff --git a/.gitignore b/.gitignore
index 6ea292cf22..81dbd1e7be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,3 +79,4 @@ eFormAPI/Installation/CustomActions/bin/x64/Release/CustomActions.dll
 eFormAPI/Installation/CustomActions/bin/x64/Release/Microsoft.Deployment.WindowsInstaller.dll
 eFormAPI/Installation/CustomActions/bin/x64/Release/Microsoft.Deployment.WindowsInstaller.xml
 eFormAPI/Installation/CustomActions/bin/x64/Release/Microsoft.Web.Administration.dll
+eFormAPI/Installation/MainInstaller/BuildedCustomActions/System.Management.Automation.dll
diff --git a/eFormAPI/Installation/CustomActions/CustomAction.cs b/eFormAPI/Installation/CustomActions/CustomAction.cs
index c038533ce6..fc1e156dad 100644
--- a/eFormAPI/Installation/CustomActions/CustomAction.cs
+++ b/eFormAPI/Installation/CustomActions/CustomAction.cs
@@ -306,6 +306,9 @@ public static ActionResult UpdateCA(Session session)
                 RunProcess(@"C:\Program Files\nodejs\node.exe", "svc.js uninstall", uiIisDir);
                 IncrementProgressBar(session);
 
+                DeleteDirectory(Path.Combine(uiIisDir, "node_modules"));
+                DeleteDirectory(Path.Combine(uiIisDir, "dist"));
+
                 session.Log("Set proper names to folders");
 
                 DirectoryCopy(apiTemp, webApiLocation);
diff --git a/eFormAPI/Installation/MainInstaller/MainInstaller.wixproj b/eFormAPI/Installation/MainInstaller/MainInstaller.wixproj
index 46281967f5..1452bc17f9 100644
--- a/eFormAPI/Installation/MainInstaller/MainInstaller.wixproj
+++ b/eFormAPI/Installation/MainInstaller/MainInstaller.wixproj
@@ -30,6 +30,7 @@
     <Compile Include="DomainNameSelectDlg.wxs" />
     <Compile Include="ProgressModifiedDlg.wxs" />
     <Compile Include="VerifyReadyModifiedDlg.wxs" />
+    <Compile Include="WelcomeDlgModified.wxs" />
     <Compile Include="WixUI_InstallDirModified.wxs" />
     <Compile Include="Product.wxs" />
   </ItemGroup>
diff --git a/eFormAPI/Installation/MainInstaller/WelcomeDlgModified.wxs b/eFormAPI/Installation/MainInstaller/WelcomeDlgModified.wxs
new file mode 100644
index 0000000000..c7a148c79c
--- /dev/null
+++ b/eFormAPI/Installation/MainInstaller/WelcomeDlgModified.wxs
@@ -0,0 +1,34 @@
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <UI>
+      <Dialog Id="WelcomeDlgModified" Width="370" Height="270" Title="!(loc.WelcomeDlg_Title)">
+        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" >
+          <Publish Property="WixUI_InstallMode" Value="Update">Installed AND PATCH</Publish>
+        </Control>
+        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
+          <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+        </Control>
+        <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
+        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+        <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" >
+          <Condition Action="show">NOT Installed OR NOT PATCH</Condition>
+          <Condition Action="hide">Installed AND PATCH</Condition>
+        </Control>
+        <Control Id="PatchDescription" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeUpdateDlgDescriptionUpdate)" >
+          <Condition Action="show">Installed AND PATCH</Condition>
+          <Condition Action="hide">NOT Installed OR NOT PATCH</Condition>
+        </Control>
+        <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
+        <Control Id="Ver" Type="Text" X="3" Y="260" Width="100" Height="60" Transparent="yes" NoPrefix="yes" Text="[ProductVersion]" />
+      </Dialog>
+
+      
+      
+      <InstallUISequence>
+        <Show Dialog="WelcomeDlg" Before="ProgressDlg" Overridable="no">0</Show>
+        <Show Dialog="WelcomeDlgModified" Before="ProgressDlg" >NOT Installed OR PATCH</Show>
+      </InstallUISequence>
+    </UI>
+  </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/eFormAPI/Installation/MainInstaller/WixUI_InstallDirModified.wxs b/eFormAPI/Installation/MainInstaller/WixUI_InstallDirModified.wxs
index 7e6b653389..75a091ba02 100644
--- a/eFormAPI/Installation/MainInstaller/WixUI_InstallDirModified.wxs
+++ b/eFormAPI/Installation/MainInstaller/WixUI_InstallDirModified.wxs
@@ -22,12 +22,12 @@
 
       <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
 
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeModifiedDlg">1</Publish>
+      <Publish Dialog="WelcomeDlgModified" Control="Next" Event="NewDialog" Value="MaintenanceTypeModifiedDlg">1</Publish>
 
       <Publish Dialog="MaintenanceTypeModifiedDlg" Control="Update" Event="NewDialog" Value="DomainNameSelectDlg">1</Publish>
       <Publish Dialog="MaintenanceTypeModifiedDlg" Control="Remove" Event="NewDialog" Value="DomainNameSelectDlg">1</Publish>
       <Publish Dialog="MaintenanceTypeModifiedDlg" Control="Install" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
-      <Publish Dialog="MaintenanceTypeModifiedDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeModifiedDlg" Control="Back" Event="NewDialog" Value="WelcomeDlgModified">1</Publish>
 
       <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeModifiedDlg">1</Publish>
       <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="DomainNameDlg"></Publish>