Merge pull request #42 from microting/master

Updates

Author: Gid733

.travis.yml

@@ -32,11 +32,11 @@ script:
   - cd eform-client && npm install
   - npm start &
   - sleep 40
-  - dotnet run --project ../eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj &
+  - dotnet run --project ../eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj > dotnet_log 2>&1 &
   - sleep 40
   - npm run testheadless
-  - sleep 30
-  - dotnet run --project ../eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj &
+  - sleep 40
+  - dotnet run --project ../eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj > dotnet_log 2>&1 &
   - sleep 40
   - npm run testheadless2
 after_success:

README.md

@@ -1,6 +1,6 @@
 # eform-angular-frontend 
 build status
-[![Build Status](https://travis-ci.org/microting/eform-angular-frontend.svg?branch=netcore)](https://travis-ci.org/microting/eform-angular-frontend)
+[![Build Status](https://travis-ci.org/microting/eform-angular-frontend.svg?branch=master)](https://travis-ci.org/microting/eform-angular-frontend)
 
 An Angular (6.1.10) Frontend for integrating with the Microting eForm API v1.
 

eFormAPI/Installation/CustomActions/CustomAction.cs

@@ -440,9 +440,20 @@ public static ActionResult UpdateCA(Session session)
                 try
                 {
                     BackupPluginSettings(session, uiIisDir);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("We got an exception trying to do backup " + ex.Message);
+                }
+
+                try
+                {
                     DeleteDirectory(Path.Combine(uiIisDir, "src"));
                 }
-                catch { }
+                catch (Exception ex)
+                {
+                    MessageBox.Show("We got an exception trying to delete folder src " + ex.Message);
+                }
 
                 session.Log("Set proper names to folders");
 

eFormAPI/eFormAPI.Web.Integration.Tests/eFormAPI.Web.Integration.Tests.csproj

@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Microting.eForm" Version="3.0.114" />
+    <PackageReference Include="Microting.eForm" Version="3.0.125" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
   </ItemGroup>

eFormAPI/eFormAPI.Web.Tests/eFormAPI.Web.Tests.csproj

@@ -7,10 +7,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="Microting.eForm" Version="3.0.114" />
+    <PackageReference Include="Microting.eForm" Version="3.0.125" />
     <PackageReference Include="NUnit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
-    <PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.81" />
+    <PackageReference Include="Microting.eFormApi.BasePn" Version="1.1.85" />
   </ItemGroup>
 
   <ItemGroup>

eFormAPI/eFormAPI.Web/Hosting/Helpers/PluginHelper.cs

@@ -23,37 +23,44 @@ public static class PluginHelper
         public static List<IEformPlugin> GetPlugins(IConfiguration configuration)
         {
             // Load info from database
-            List<EformPlugin> eformPlugins;
+            List<EformPlugin> eformPlugins = null;
             var newPlugins = new List<EformPlugin>();
             var contextFactory = new BaseDbContextFactory();
             using (var dbContext = contextFactory.CreateDbContext(new[] {configuration.MyConnectionString()}))
             {
-                eformPlugins = dbContext.EformPlugins
-                    .AsNoTracking()
-                    .ToList();
+                try
+                {
+                    eformPlugins = dbContext.EformPlugins
+                        .AsNoTracking()
+                        .ToList();
+                } catch {}
             }
             var plugins = new List<IEformPlugin>();
             // create plugin loaders
-            foreach (var plugin in GetAllPlugins())
+            if (eformPlugins != null)
             {
-                var eformPlugin = eformPlugins.FirstOrDefault(x => x.PluginId == plugin.PluginId);
-                if (eformPlugin != null)
+                foreach (var plugin in GetAllPlugins())
                 {
-                    if (eformPlugin.Status ==  (int) PluginStatus.Enabled)
+                    var eformPlugin = eformPlugins.FirstOrDefault(x => x.PluginId == plugin.PluginId);
+                    if (eformPlugin != null)
                     {
-                        plugins.Add(plugin);
+                        if (eformPlugin.Status ==  (int) PluginStatus.Enabled)
+                        {
+                            plugins.Add(plugin);
+                        }
                     }
-                }
-                else
-                {
-                    newPlugins.Add(new EformPlugin()
+                    else
                     {
-                        PluginId = plugin.PluginId,
-                        ConnectionString = "...",
-                        Status = (int) PluginStatus.Disabled
-                    });
+                        newPlugins.Add(new EformPlugin()
+                        {
+                            PluginId = plugin.PluginId,
+                            ConnectionString = "...",
+                            Status = (int) PluginStatus.Disabled
+                        });
+                    }
                 }
             }
+            
 
             using (var dbContext = contextFactory.CreateDbContext(new[] {configuration.MyConnectionString()}))
             {

eFormAPI/eFormAPI.Web/Migrations/20180916221611_Init.Designer.cs

@@ -17,8 +17,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
             if (migrationBuilder.ActiveProvider == "Pomelo.EntityFrameworkCore.MySql")
             {
                 DbConfig.IsMySQL = true;
-                autoIDGenStrategy = "MySQL:ValueGeneratedOnAdd";
-                autoIDGenStrategyValue = true;
+                autoIDGenStrategy = "MySql:ValueGenerationStrategy";
+                autoIDGenStrategyValue = MySqlValueGenerationStrategy.IdentityColumn;
             }
             migrationBuilder.CreateTable(
                 name: "SecurityGroups",