Merge remote-tracking branch 'origin/master'

jgauffin · jgauffin · commit 8299c0c7a7a5 · 2018-11-27T08:38:03.000+01:00
# Conflicts:
#	src/Server/Coderr.Server.Web/ClientApp/components/home/navmenu/navmenu.ts
#	src/Server/Coderr.Server.Web/npm-shrinkwrap.json
diff --git a/docs/screenshot.png b/docs/screenshot.png
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
@@ -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/discover/application/configure.ts b/src/Server/Coderr.Server.Web/ClientApp/components/discover/application/configure.ts
@@ -4,7 +4,7 @@ import { AppRoot } from '../../../services/AppRoot';
 import { FindIncidents, FindIncidentsResult, FindIncidentsResultItem } from '../../../dto/Core/Incidents'
 import * as Mine from '../../../dto/Common/Mine'
 import Vue from "vue";
-import { Component } from "vue-property-decorator";
+import { Component, Watch } from "vue-property-decorator";
 
 interface ILibrarySummary {
     clientFolderName: string;
@@ -14,6 +14,7 @@ interface ILibrarySummary {
 }
 @Component
 export default class ConfigureClientComponent extends Vue {
+    private lastLib: string;
     libraries: ILibrarySummary[] = [];
     instruction: string | null = null;
 
@@ -27,7 +28,6 @@ export default class ConfigureClientComponent extends Vue {
 
     created() {
         this.applicationId = parseInt(this.$route.params.applicationId, 10);
-
         var client = new http.HttpClient();
         client.get(ApiClient.ApiUrl + 'onboarding/libraries/')
             .then(response => {
@@ -44,32 +44,43 @@ export default class ConfigureClientComponent extends Vue {
     }
 
     mounted() {
-        this.applicationId = parseInt(this.$route.params.applicationId, 10);
         AppRoot.Instance.applicationService.get(this.applicationId)
             .then(app => {
                 this.sharedSecret = app.sharedSecret;
                 this.appKey = app.appKey;
             });
     }
 
+    @Watch('$route.params.applicationId')
+    onApplicationChanged(value: string, oldValue: string) {
+        if (!value) {
+            return;
+        }
+
+        this.applicationId = parseInt(value);
+        AppRoot.Instance.applicationService.get(this.applicationId)
+            .then(app => {
+                this.sharedSecret = app.sharedSecret;
+                this.appKey = app.appKey;
+                this.select(this.lastLib);
+            });
+    }
+
     goToSupport() {
         this.$router.push({
             name: "support",
             params: { type: "configuration" }
         });
     }
-    
+
     select(libName: string) {
-        var appInfo = AppRoot.Instance.currentUser.applications[0];
-        AppRoot.Instance.applicationService.get(appInfo.id)
-            .then(app => {
-                var client = new http.HttpClient();
-                client.get(ApiClient.ApiUrl + 'onboarding/library/' + libName + "/?appKey=" + app.appKey)
-                    .then(response => {
-                        this.instruction = response.body
-                            .replace('yourAppKey', this.appKey)
-                            .replace('yourSharedSecret', this.sharedSecret);
-                    });
+        this.lastLib = libName;
+        var client = new http.HttpClient();
+        client.get(ApiClient.ApiUrl + 'onboarding/library/' + libName + "/?appKey=" + this.appKey)
+            .then(response => {
+                this.instruction = response.body
+                    .replace('yourAppKey', this.appKey)
+                    .replace('yourSharedSecret', this.sharedSecret);
             });
         var buttons = document.querySelectorAll('.buttons button');
         for (var i = 0; i < buttons.length; i++) {
@@ -88,6 +99,7 @@ export default class ConfigureClientComponent extends Vue {
         var q = new FindIncidents();
         q.PageNumber = 1;
         q.ItemsPerPage = 1;
+        q.ApplicationIds = [this.applicationId];
         AppRoot.Instance.apiClient.query<FindIncidentsResult>(q)
             .then(result => {
                 if (result.TotalCount === 0) {
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/home/navmenu/navmenu.vue.html b/src/Server/Coderr.Server.Web/ClientApp/components/home/navmenu/navmenu.vue.html
@@ -30,7 +30,7 @@
                         </div>
                     </li>
                     <li class="nav-item">
-                        <router-link class="nav-link" :to="discoverLink">
+                        <router-link class="nav-link" :to="discoverLink" id="DiscoverMenu">
                             <span class="fa fa-binoculars"></span> Discover
                         </router-link>
                     </li>
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/manage/system/create/create.vue.html b/src/Server/Coderr.Server.Web/ClientApp/components/manage/system/create/create.vue.html
@@ -17,7 +17,7 @@
                                 <h3>Optional information</h3>
                                 <p>
                                     <em>
-                                        Specify the information below to see how your team compares to other similar teams.
+                                        Specify the information below to see how your team compares to other similar teams.<br />(Do you have more errors? Are you correcting more or less errors than other teams?)
                                     </em>
                                 </p>
                                 <div class="form-group">
@@ -32,7 +32,7 @@ <h3>Optional information</h3>
                                         Estimated number of errors
                                     </label>
                                     <input type="number" class="form-control" name="NumberOfErrors" v-model="estimatedNumberOfErrors" placeholder="1337" />
-                                    <em>Estimation of how many errors you think that Coderr will find during the first month for this application.</em>
+                                    <em>Estimation of how many errors you think that Coderr will find during the first month for this application. See how well you know your application.</em>
                                 </div>
                             </div>
                             <div class="form-group">
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/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
`@@ -261,11 +261,14 @@ private async Task GetApps(Dictionary<int, ApplicationUsageStatisticsDto> apps)`
`261`	`261`	`{`
`262`	`262`	`while (await reader.ReadAsync())`
`263`	`263`	`{`
	`264`	`+ var estimatedNumberOfErrors = reader[1];`
	`265`	`+ var numberOfDevelopers = reader[2];`
`264`	`266`	`var item = new ApplicationUsageStatisticsDto()`
`265`	`267`	`{`
`266`	`268`	`ApplicationId = reader.GetInt32(0),`
`267`		`- EstimatedNumberOfErrors= reader.GetFieldValue<int?>(1),`
`268`		`- NumberOfDevelopers = reader.GetFieldValue<decimal?>(2)`
	`269`	`+ EstimatedNumberOfErrors =`
	`270`	`+ estimatedNumberOfErrors is DBNull ? 0 : (int) estimatedNumberOfErrors,`
	`271`	`+ NumberOfDevelopers = numberOfDevelopers is DBNull ? 0 : (decimal) numberOfDevelopers`
`269`	`272`	`};`
`270`	`273`	`apps[item.ApplicationId] = item;`
`271`	`274`	`}`
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;`