Bug fixes

jgauffin · jgauffin · commit 2e819286e5b6 · 2018-10-29T21:05:32.000+01:00
diff --git a/src/Server/Coderr.Server.Api/Core/Incidents/Queries/FindIncidentsResultItem.cs b/src/Server/Coderr.Server.Api/Core/Incidents/Queries/FindIncidentsResultItem.cs
@@ -7,6 +7,8 @@ namespace Coderr.Server.Api.Core.Incidents.Queries
     /// </summary>
     public class FindIncidentsResultItem
     {
+        private string _name;
+
         /// <summary>
         ///     Creates new instance of <see cref="FindIncidentsResultItem" />.
         /// </summary>
@@ -53,6 +55,11 @@ protected FindIncidentsResultItem()
         /// </summary>
         public bool IsReOpened { get; set; }
 
+        /// <summary>
+        ///     When we recieved the last report.
+        /// </summary>
+        public DateTime LastReportReceivedAtUtc { get; set; }
+
         /// <summary>
         ///     When someone updated this incident (assigned/closed etc).
         /// </summary>
@@ -61,16 +68,20 @@ protected FindIncidentsResultItem()
         /// <summary>
         ///     Incident name
         /// </summary>
-        public string Name { get; private set; }
+        public string Name
+        {
+            set
+            {
+                if (value.Length > 40)
+                    value = value.Substring(0, 35) + "[...]";
+                _name = value;
+            }
+            get => _name;
+        }
 
         /// <summary>
         ///     Total number of received reports (increased even if the number of stored reports are at the limit)
         /// </summary>
         public int ReportCount { get; set; }
-
-        /// <summary>
-        /// When we recieved the last report.
-        /// </summary>
-        public DateTime LastReportReceivedAtUtc { get; set; }
     }
 }
diff --git a/src/Server/Coderr.Server.App/Coderr.Server.App.csproj b/src/Server/Coderr.Server.App/Coderr.Server.App.csproj
@@ -22,7 +22,7 @@
       <NoWarn>NU1701</NoWarn>
     </PackageReference>
     <PackageReference Include="DotNetCqs" Version="2.0.9" />
-    <PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
+    <PackageReference Include="Griffin.Framework" Version="2.0.1" />
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Markdig" Version="0.14.9" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
diff --git a/src/Server/Coderr.Server.App/Modules/MonthlyStats/CollectStatsJob.cs b/src/Server/Coderr.Server.App/Modules/MonthlyStats/CollectStatsJob.cs
@@ -36,14 +36,14 @@ public async Task ExecuteAsync()
                 return;
 
             var lastMonth = new DateTime(lastMonthDate.Year, lastMonthDate.Month, 1);
-            if (_config.Value.LatestUploadedMonth == null)
-            {
-                await ReportAllFoundMonths(lastMonth);
-                return;
-            }
+            //if (_config.Value.LatestUploadedMonth == null)
+            //{
+            //    await ReportAllFoundMonths(lastMonth);
+            //    return;
+            //}
 
-            if (_config.Value?.LatestUploadedMonth == lastMonth)
-                return;
+            //if (_config.Value?.LatestUploadedMonth == lastMonth)
+            //    return;
 
 
             await ReportMonth(lastMonth);
@@ -261,11 +261,14 @@ private async Task GetApps(Dictionary<int, ApplicationUsageStatisticsDto> apps)
                 {
                     while (await reader.ReadAsync())
                     {
+                        var estimatedNumberOfErrors = reader[1];
+                        var numberOfDevelopers = reader[2];
                         var item = new ApplicationUsageStatisticsDto()
                         {
                             ApplicationId = reader.GetInt32(0),
-                            EstimatedNumberOfErrors= reader.GetFieldValue<int?>(1),
-                            NumberOfDevelopers = reader.GetFieldValue<decimal?>(2)
+                            EstimatedNumberOfErrors =
+                                estimatedNumberOfErrors is DBNull ? 0 : (int) estimatedNumberOfErrors,
+                            NumberOfDevelopers = numberOfDevelopers is DBNull ? 0 : (decimal) numberOfDevelopers
                         };
                         apps[item.ApplicationId] = item;
                     }
diff --git a/src/Server/Coderr.Server.Infrastructure/Coderr.Server.Infrastructure.csproj b/src/Server/Coderr.Server.Infrastructure/Coderr.Server.Infrastructure.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="DotNetCqs" Version="2.0.9" />
-    <PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
+    <PackageReference Include="Griffin.Framework" Version="2.0.1" />
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
   </ItemGroup>
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Coderr.Server.ReportAnalyzer.csproj b/src/Server/Coderr.Server.ReportAnalyzer/Coderr.Server.ReportAnalyzer.csproj
@@ -10,7 +10,7 @@
     <PackageReference Include="DotNetCqs" Version="2.0.9" />
     <PackageReference Include="DotNetCqs.DependencyInjection.Microsoft" Version="1.0.0" />
     <PackageReference Include="DotNetCqs.Queues.AdoNet" Version="1.0.6" />
-    <PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
+    <PackageReference Include="Griffin.Framework" Version="2.0.1" />
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
diff --git a/src/Server/Coderr.Server.SqlServer/Coderr.Server.SqlServer.csproj b/src/Server/Coderr.Server.SqlServer/Coderr.Server.SqlServer.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
   <PackageReference Include="DotNetCqs" Version="2.0.9" />
-  <PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
+  <PackageReference Include="Griffin.Framework" Version="2.0.1" />
   <PackageReference Include="log4net" Version="2.0.8" />
   <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
     <PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
@@ -30,5 +30,6 @@
     <None Remove="Schema\Update.v13.sql" />
     <None Remove="Schema\Update.v14.sql" />
     <None Remove="Schema\Update.v15.sql" />
+    <None Remove="Schema\Update.v16.sql" />
   </ItemGroup>
 </Project>
diff --git a/src/Server/Coderr.Server.SqlServer/ReportAnalyzer/AnalyticsRepository.cs b/src/Server/Coderr.Server.SqlServer/ReportAnalyzer/AnalyticsRepository.cs
@@ -120,8 +120,8 @@ public void AddMissedReport(DateTime date)
             {
                 cmd.CommandText =
                     @"update IgnoredReports set NumberOfReports=NumberOfReports+1 WHERE date = @date;
-                        IF @@ROWCOUNT=0 insert into IgnoredReports(NumberOfReports) values(1);";
-                cmd.AddParameter("date", date);
+                        IF @@ROWCOUNT=0 insert into IgnoredReports(NumberOfReports, Date) values(1, Convert(date, GetUtcDate()));";
+                cmd.AddParameter("date", date.Date);
                 cmd.ExecuteNonQuery();
             }
         }
diff --git a/src/Server/Coderr.Server.SqlServer/Schema/Update.v16.sql b/src/Server/Coderr.Server.SqlServer/Schema/Update.v16.sql
@@ -0,0 +1,3 @@
+﻿alter table applications alter column NumberOfFtes decimal(4,1) null;
+
+UPDATE DatabaseSchema SET Version = 16;
diff --git a/src/Server/Coderr.Server.Web/Boot/Modules/BackgroundJobs.cs b/src/Server/Coderr.Server.Web/Boot/Modules/BackgroundJobs.cs
@@ -19,6 +19,7 @@ public void Start(StartContext context)
             var adapter = new DependencyInjectionAdapter(context.ServiceProvider);
 
             _backgroundJobManager = new BackgroundJobManager(adapter);
+            _backgroundJobManager.ExecuteSequentially = true;
             _backgroundJobManager.JobFailed += OnBackgroundJobFailed;
             _backgroundJobManager.StartInterval = TimeSpan.FromSeconds(Debugger.IsAttached ? 0 : 10);
             _backgroundJobManager.ExecuteInterval = TimeSpan.FromMinutes(3);
diff --git a/src/Server/Coderr.Server.Web/ClientApp/boot.ts b/src/Server/Coderr.Server.Web/ClientApp/boot.ts
@@ -276,6 +276,9 @@ AppRoot.Instance.loadCurrentUser()
 
             }
         });
+        ourVue.$router.beforeEach((to, from, next) => {
+            next();
+        });
         ourVue.$router.afterEach((to, from) => {
             hooks.afterRoute(to.path, from.path);
         })
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/incident.ts b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/incident.ts
@@ -65,14 +65,6 @@ export default class AnalyzeIncidentComponent extends Vue {
                     });
                     return;
                 }
-                AppRoot.Instance.incidentService.getMine(null, this.incident.Id)
-                    .then(incidents => {
-                        if (incidents.length === 0) {
-                            this.$router.push({ name: "discover" });
-                        } else {
-                            this.$router.push({ name: "analyzeHome" });
-                        }
-                    });
             });
     }
 
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/menu.ts b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/menu.ts
@@ -20,8 +20,8 @@ export default class AnalyzeMenuComponent extends Vue {
     incidentId: number | null = null;
 
     created() {
-        MyIncidents.Instance.subscribeOnSelectedIncident(this.onIncidentSelected);
-        MyIncidents.Instance.subscribeOnListChanges(this.onListChanged);
+        MyIncidents.Instance.subscribeOnSelectedIncident(x => this.onIncidentSelected(x));
+        MyIncidents.Instance.subscribeOnListChanges(() => this.onListChanged());
         MyIncidents.Instance.ready()
             .then(x => {
                 this.incidents = MyIncidents.Instance.myIncidents;
@@ -61,7 +61,6 @@ export default class AnalyzeMenuComponent extends Vue {
         if (!this.incidentId && this.incidents.length > 0) {
             this.incidentId = this.incidents[0].incidentId;
             MyIncidents.Instance.switchIncident(this.incidentId);
-            this.$router.push({ name: 'analyzeIncident', params: { incidentId: this.incidentId.toString() } });
         }
     }
 
@@ -70,12 +69,7 @@ export default class AnalyzeMenuComponent extends Vue {
             this.title = '(Select an incident)';
             this.incidentId = null;
         } else {
-
-            // update URL
-            if (this.incidentId !== incident.incidentId) {
-                this.$router.push({ name: 'analyzeIncident', params: { incidentId: incident.incidentId.toString() } });
-            }
-
+            this.$router.push({ name: 'analyzeIncident', params: { incidentId: incident.incidentId.toString() } });
             this.title = incident.shortTitle;
             this.incidentId = incident.incidentId;
         }
@@ -92,6 +86,7 @@ export default class AnalyzeMenuComponent extends Vue {
         } else {
             var newIncidentId = parseInt(value, 10);
             if (this.incidentId === newIncidentId) {
+                console.log('exiting')
                 return;
             }
             this.incidentId = newIncidentId;
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/myincidents.ts b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/myincidents.ts
@@ -40,7 +40,7 @@ export class MyIncidents {
     selectedIncident: IMyIncident | null;
     menuTitle = '';
 
-    selectedApplicationId: number | null;
+    selectedApplicationId: number | null = null;
 
     constructor() {
         this.loadPromise$ = this.loadMyIncidentsFromBackend();
@@ -171,6 +171,8 @@ export class MyIncidents {
                 this.allMyIncidents$.push(item);
             }
         });
+        this.filterMyIncidents();
+        this.triggerIncidentListCallbacks();
     }
 
     private filterMyIncidents() {
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/home/navmenu/navmenu.ts b/src/Server/Coderr.Server.Web/ClientApp/components/home/navmenu/navmenu.ts
@@ -79,7 +79,6 @@ export default class NavMenuComponent extends Vue {
             }
         });
         PubSubService.Instance.subscribe(MenuApi.MessagingTopics.SetApplication, ctx => {
-            console.log('SET', ctx.message)
             var msg = <MenuApi.SetApplication>ctx.message.body;
             this.changeApplication(msg.applicationId);
         });
@@ -129,11 +128,11 @@ export default class NavMenuComponent extends Vue {
             }
             return;
         } else if (currentRoute.path.indexOf('/discover') === 0) {
-            this.$router.push({ name: 'discover', params: { applicationId: applicationId.toString() } });
+            this.$router.push({ name: 'discover', params: { applicationId: applicationId == null ? null : applicationId.toString() } });
         } else if (currentRoute.path.indexOf('/analyze') === 0) {
-            this.$router.push({ name: 'analyzeHome', params: { applicationId: applicationId.toString() } });
+            this.$router.push({ name: 'analyzeHome', params: { applicationId: applicationId == null ? null : applicationId.toString() } });
         } else  {
-            const route = { name: currentRoute.name, params: { applicationId: applicationId.toString() } };
+            const route = { name: currentRoute.name, params: { applicationId: applicationId == null ? null : applicationId.toString() } };
             this.$router.push(route);
         }
 
diff --git a/src/Server/Coderr.Server.Web/ClientApp/services/AppRoot.ts b/src/Server/Coderr.Server.Web/ClientApp/services/AppRoot.ts
@@ -124,7 +124,7 @@ export class AppRoot {
                 localForage.getItem(options.name);
             })
             .catch(reason => {
-                console.log('ERRROR', reason);
+                console.log('ERROR', reason);
             });
     }
 
diff --git a/src/Server/Coderr.Server.Web/Coderr.Server.Web.csproj b/src/Server/Coderr.Server.Web/Coderr.Server.Web.csproj
@@ -6,7 +6,7 @@
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <IsPackable>false</IsPackable>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <Version>2.0.0-rc02</Version>
+    <Version>2.0.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -21,7 +21,7 @@
   <ItemGroup>
     <PackageReference Include="Coderr.Client.AspNetCore.Mvc" Version="1.1.3" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
-    <PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
+    <PackageReference Include="Griffin.Framework" Version="2.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.3" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.3" />
   </ItemGroup>
diff --git a/src/Server/Coderr.Server.Web/npm-shrinkwrap.json b/src/Server/Coderr.Server.Web/npm-shrinkwrap.json
diff --git a/src/Server/Coderr.Server.Web/wwwroot/dist/main.js b/src/Server/Coderr.Server.Web/wwwroot/dist/main.js
diff --git a/src/Server/Coderr.Server.Web/wwwroot/dist/main.js.map b/src/Server/Coderr.Server.Web/wwwroot/dist/main.js.map

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,8 @@ public void AddMissedReport(DateTime date)`
`120`	`120`	`{`
`121`	`121`	`cmd.CommandText =`
`122`	`122`	`@"update IgnoredReports set NumberOfReports=NumberOfReports+1 WHERE date = @date;`
`123`		`- IF @@ROWCOUNT=0 insert into IgnoredReports(NumberOfReports) values(1);";`
`124`		`- cmd.AddParameter("date", date);`
	`123`	`+ IF @@ROWCOUNT=0 insert into IgnoredReports(NumberOfReports, Date) values(1, Convert(date, GetUtcDate()));";`
	`124`	`+ cmd.AddParameter("date", date.Date);`
`125`	`125`	`cmd.ExecuteNonQuery();`
`126`	`126`	`}`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+alter table applications alter column NumberOfFtes decimal(4,1) null;`
	`2`	`+`
	`3`	`+UPDATE DatabaseSchema SET Version = 16;`
Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,9 @@ AppRoot.Instance.loadCurrentUser()`
`276`	`276`
`277`	`277`	`}`
`278`	`278`	`});`
	`279`	`+ ourVue.$router.beforeEach((to, from, next) => {`
	`280`	`+ next();`
	`281`	`+ });`
`279`	`282`	`ourVue.$router.afterEach((to, from) => {`
`280`	`283`	`hooks.afterRoute(to.path, from.path);`
`281`	`284`	`})`