Merge branch 'master' of https://github.com/coderrio/Coderr.Server

jgauffin · jgauffin · commit fb73076df0fc · 2020-10-01T08:32:16.000+02:00
diff --git a/src/Server/Coderr.Server.ReportAnalyzer.Tests/Coderr.Server.ReportAnalyzer.Tests.csproj b/src/Server/Coderr.Server.ReportAnalyzer.Tests/Coderr.Server.ReportAnalyzer.Tests.csproj
@@ -0,0 +1,28 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net461</TargetFramework>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" Version="5.10.0" />
+    <PackageReference Include="NSubstitute" Version="4.2.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Coderr.Server.Domain\Coderr.Server.Domain.csproj" />
+    <ProjectReference Include="..\Coderr.Server.ReportAnalyzer\Coderr.Server.ReportAnalyzer.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}"></Service>
+  </ItemGroup>
+
+</Project>
diff --git a/src/Server/Coderr.Server.SqlServer/Core/Incidents/Queries/GetReportListHandler.cs b/src/Server/Coderr.Server.SqlServer/Core/Incidents/Queries/GetReportListHandler.cs
@@ -26,6 +26,11 @@ public async Task<GetReportListResult> HandleAsync(IMessageContext context, GetR
                 cmd.AddParameter("incidentId", query.IncidentId);
                 if (query.PageNumber > 0)
                 {
+                    if (query.PageSize == 0)
+                    {
+                        query.PageSize = 10;
+                    }
+
                     cmd.CommandText = "SELECT cast(count(Id) as int) FROM ErrorReports WHERE IncidentId = @incidentId";
                     totalCount = (int) cmd.ExecuteScalar();
 
diff --git a/src/Server/Coderr.Server.Web/ClientApp/boot.ts b/src/Server/Coderr.Server.Web/ClientApp/boot.ts
@@ -1,9 +1,10 @@
 import "bootstrap";
 import Vue from "vue";
 import VueRouter from "vue-router";
-import moment from "moment";
 import { AppRoot } from "./services/AppRoot"
 import { IUser } from "./vue-shim";
+import { DateTime } from 'luxon';
+import * as helpers from "./helpers";
 
 //Vue.use(VeeValidate);
 Vue.use(VueRouter);
@@ -18,8 +19,12 @@ declare module 'vue/types/vue' {
 
 Vue.filter("ago",
     (value: string) => {
-        if (!value) return "n/a";
-        return moment.utc(value).fromNow();
+        return helpers.ago(value);
+    });
+
+Vue.filter("monthDay",
+    (value: string | Date) => {
+        return helpers.monthDay(value);
     });
 
 Vue.filter("isoDate",
@@ -30,32 +35,17 @@ Vue.filter("isoDate",
 
 Vue.filter("niceTime",
     (value: string) => {
-        if (!value) return "n/a";
-        return moment.utc(value).local().format("LLLL");
+        return helpers.niceTime(value);
     });
 
 Vue.filter("agoOrDate",
     (value: string) => {
-        var today = moment(new Date());
-        var reportDate = moment(value);
-        var diff = reportDate.diff(today, "days");
-
-        if (!value) return "n/a";
-        return moment.utc(value).fromNow();
+        return helpers.agoOrDate(value);
     });
 
 Vue.filter("incidentState",
     (value: string) => {
-        switch (value) {
-            case "0":
-                return "New";
-            case "1":
-                return "Assigned";
-            case "2":
-                return "Ignored";
-            case "3":
-                return "Closed";
-        }
+        return helpers.incidentState(value);
     });
 
 Vue.component('context-navigator', require('./components/shared/incidents/ContextNavigator.vue.html').default);
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/report.ts b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/report.ts
@@ -19,7 +19,7 @@ export default class AnalyzeReportComponent extends Vue {
     indexInTotalSet = 0;
     totalCount = 0;
 
-    reportedAt = new Date();
+    reportedAt: string = '';
     stackTrace = '';
     reportId: number;
     incidentId: number;
@@ -105,7 +105,7 @@ export default class AnalyzeReportComponent extends Vue {
         AppRoot.Instance.apiClient.query<GetReportResult>(q)
             .then(report => {
                 this.stackTrace = report.StackTrace;
-                this.reportedAt = report.CreatedAtUtc;
+                this.reportedAt = this.$options.filters.niceTime(report.CreatedAtUtc);
                 this.contextCollections = report.ContextCollections;
                 this.userFeedback = report.UserFeedback;
                 if (report.EmailAddress != null) {
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/report.vue.html b/src/Server/Coderr.Server.Web/ClientApp/components/analyze/incidents/report.vue.html
@@ -2,7 +2,7 @@
     <div class="ReportsView">
         <div class="card">
             <div class="card-header">
-                Analyze reports, current: {{reportedAt|niceTime}}
+                Analyze reports, current: {{reportedAt}}
             </div>
             <div class="card-body">
                 <div v-if="userFeedback != null">
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/applications/application-details.ts b/src/Server/Coderr.Server.Web/ClientApp/components/applications/application-details.ts
@@ -4,9 +4,9 @@ import { GetApplicationInfo, GetApplicationInfoResult, GetApplicationOverview, G
 import Vue from "vue";
 import { Component } from "vue-property-decorator";
 import Chartist from "chartist";
-import * as moment from 'moment';
 import * as Incidents from "../../dto/Core/Incidents";
 import FindIncidentsResultItem = Incidents.FindIncidentsResultItem;
+import { DateTime } from 'luxon';
 
 
 interface ISeries {
@@ -103,7 +103,7 @@ export default class ApplicationDetailsComponent extends Vue {
                     if (index % 3 !== 0) {
                         return '';
                     }
-                    return moment(value).format('MMM D');
+                    return DateTime.utc(value).toFormat('MMM D');
                 }
             }
         };
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/deployment/home/home.ts b/src/Server/Coderr.Server.Web/ClientApp/components/deployment/home/home.ts
@@ -6,7 +6,7 @@ import {
 import Vue from "vue";
 import { Component, Watch } from "vue-property-decorator";
 import Chartist from "chartist";
-import moment from "moment";
+import { DateTime } from 'luxon';
 
 
 interface ISeries {
@@ -157,7 +157,7 @@ export default class DeploymentHomeComponent extends Vue {
                     //if (index % 3 !== 0) {
                     //    return '';
                     //}
-                    return moment(value).format('MMM D');
+                    return DateTime.fromISO(value).toFormat('MMM D');
                 }
             }
         };
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/deployment/version/summary.ts b/src/Server/Coderr.Server.Web/ClientApp/components/deployment/version/summary.ts
@@ -1,20 +1,10 @@
 import { AppRoot } from '../../../services/AppRoot';
-import {
-    GetVersionHistory, GetVersionHistoryResult, GetVersionHistorySeries,
-    GetApplicationVersions, GetApplicationVersionsResult, GetApplicationVersionsResultItem
-} from "../../../dto/Modules/Versions";
 import {
     GetIncidentStateSummary, GetIncidentStateSummaryResult,
     GetIncidentsForStates, GetIncidentsForStatesResult, GetIncidentsForStatesResultItem
 } from "../../../dto/Modules/History";
-import {
-    FindIncidents, FindIncidentsResult, FindIncidentsResultItem
-} from "../../../dto/Core/Incidents";
 import Vue from "vue";
 import { Component, Watch } from "vue-property-decorator";
-import moment from "moment";
-
-
 
 @Component
 export default class DeploymentSummaryComponent extends Vue {
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/discover/home/home.ts b/src/Server/Coderr.Server.Web/ClientApp/components/discover/home/home.ts
@@ -7,8 +7,8 @@ import { GetApplicationOverview, GetApplicationOverviewResult, GetApplicationLis
 import { Component, Mixins } from "vue-property-decorator";
 import { AppAware } from "@/AppMixins";
 import Chartist from "chartist";
-import * as moment from "moment";
 import { FindIncidentsResultItem } from "@/dto/Core/Incidents";
+import * as helpers from "@/helpers";
 
 interface ISeries {
     name?: string;
@@ -54,7 +54,6 @@ export default class DiscoverHomeComponent extends Mixins(AppAware) {
                 return;
             }
             if (applicationId === 0) {
-                console.log('generic');
                 this.applicationId = 0;
                 this.firstApplicationId = 0;
                 this.loadGenericOverview();
@@ -152,6 +151,7 @@ export default class DiscoverHomeComponent extends Mixins(AppAware) {
             labels.push(value);
         }
 
+
         var options = {
             fullWidth: true,
             chartPadding: {
@@ -162,11 +162,12 @@ export default class DiscoverHomeComponent extends Mixins(AppAware) {
                 offset: 0
             },
             axisX: {
-                labelInterpolationFnc(value: any, index: number, labels: any) {
+                labelInterpolationFnc(value: any, index: number, labels: any): string {
                     if (index % 3 !== 0) {
-                        return '';
+                        return "";
                     }
-                    return moment(value).format('MMM D');
+
+                    return helpers.monthDay(value);
                 }
             }
         };
@@ -211,11 +212,11 @@ export default class DiscoverHomeComponent extends Mixins(AppAware) {
                 low: 0
             },
             axisX: {
-                labelInterpolationFnc(value: any, index: number, labels: any) {
+                labelInterpolationFnc(value: Date, index: number, labels: any) {
                     if (index % 3 !== 0) {
                         return '';
                     }
-                    return moment(value).format('MMM D');
+                    return helpers.monthDay(value);
                 }
             }
         };
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/incident.ts b/src/Server/Coderr.Server.Web/ClientApp/components/discover/incidents/incident.ts
@@ -1,14 +1,12 @@
-import { PubSubService } from "../../../services/PubSub";
-import { IHighlight, IncidentService } from "@/services/incidents/IncidentService";
-import { AppRoot } from '../../../services/AppRoot';
-import { ApplicationMember } from "../../../services/applications/ApplicationService";
-import { GetIncident, GetIncidentResult, GetIncidentStatistics, GetIncidentStatisticsResult, ReportDay, QuickFact } from "../../../dto/Core/Incidents";
-import Vue from "vue";
-import { Component } from "vue-property-decorator";
+import { IHighlight } from "@/services/incidents/IncidentService";
+import { AppRoot } from '@/services/AppRoot';
+import { ApplicationMember } from "@/services/applications/ApplicationService";
+import { GetIncidentResult, ReportDay, QuickFact } from "@/dto/Core/Incidents";
+import { Component, Vue } from "vue-property-decorator";
 import Chartist from "chartist";
-import * as moment from 'moment';
 import * as Reports from "../../../dto/Core/Reports";
 
+import { DateTime } from 'luxon';
 @Component
 export default class IncidentComponent extends Vue {
     incidentId: number;
@@ -27,10 +25,11 @@ export default class IncidentComponent extends Vue {
                 this.isIgnored = result.IsIgnored;
                 this.isClosed = result.IsSolved;
                 result.Facts = result.Facts.filter(v => v.Value !== '0');
-                
+
                 if (result.AssignedToId > 0) {
                     var fact = new QuickFact();
-                    fact.Description = 'Assigned at ' + moment(result.AssignedAtUtc);
+                    console.log(result.AssignedAtUtc, typeof result.AssignedAtUtc);
+                    fact.Description = 'Assigned at ' + this.$options.filters.niceTime(result.AssignedAtUtc);
                     fact.Title = "Assigned to";
                     fact.Value = result.AssignedTo;
                     result.Facts.push(fact);
@@ -170,6 +169,7 @@ export default class IncidentComponent extends Vue {
         var labels: Date[] = [];
         var series: number[] = [];
         for (var i = 0; i < days.length; i++) {
+
             var value = new Date(days[i].Date);
             labels.push(value);
             series.push(days[i].Count);
@@ -181,11 +181,11 @@ export default class IncidentComponent extends Vue {
                 offset: 0
             },
             axisX: {
-                labelInterpolationFnc(value: any, index: number, labels: any) {
+                labelInterpolationFnc(value: Date, index: number, labels: any) {
                     if (index % 3 !== 0) {
                         return '';
                     }
-                    return moment(value).format('MMM D');
+                    return DateTime.fromJSDate(value).toFormat('LLL dd');
                 }
             }
         };
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/shared/incidents/ContextNavigator.ts b/src/Server/Coderr.Server.Web/ClientApp/components/shared/incidents/ContextNavigator.ts
@@ -52,7 +52,8 @@ export default class ContextNavigatorComponent extends Vue {
         AppRoot.Instance.apiClient.query<GetReportResult>(q)
             .then(report => {
                 this.currentReport = report;
-                this.currentReportName = new Date(report.CreatedAtUtc).toLocaleString();
+                //Date.parse()
+                this.currentReportName = this.$options.filters.niceTime(report.CreatedAtUtc);
                 //(<HTMLButtonElement>document.getElementById('reportChooser')).removeAttribute('disabled');
                 if (report.ContextCollections.length > 0) {
                     this.loadCollection(this.currentCollectionName);
diff --git a/src/Server/Coderr.Server.Web/ClientApp/components/shared/incidents/ContextNavigator.vue.html b/src/Server/Coderr.Server.Web/ClientApp/components/shared/incidents/ContextNavigator.vue.html
@@ -12,7 +12,7 @@
                 <div class="dropdown-menu">
                     <h6 class="dropdown-header">Select report</h6>
                     <div v-for="report in reports">
-                        <a class="dropdown-item" href="#" v-on:click.prevent="loadReport(report.Id)"><i class="fa-desktop fa text-muted"></i> {{report.CreatedAtUtc|ago}}</a>
+                        <a class="dropdown-item" href="#" v-on:click.prevent="loadReport(report.Id)"><i class="fa-desktop fa text-muted"></i> {{report.CreatedAtUtc|niceTime}}</a>
                     </div>
                 </div>
             </div>
diff --git a/src/Server/Coderr.Server.Web/ClientApp/dto/Core/Incidents.ts b/src/Server/Coderr.Server.Web/ClientApp/dto/Core/Incidents.ts
@@ -147,7 +147,7 @@ export class ReportDay
 {
     public static TYPE_NAME: string = 'ReportDay';
     public Count: number;
-    public Date: Date;
+    public Date: string;
 }
 export class SuggestedIncidentSolution
 {
diff --git a/src/Server/Coderr.Server.Web/ClientApp/dto/Core/Reports.ts b/src/Server/Coderr.Server.Web/ClientApp/dto/Core/Reports.ts
@@ -67,7 +67,7 @@ export class GetReportListResult
 export class GetReportListResultItem
 {
     public static TYPE_NAME: string = 'GetReportListResultItem';
-    public CreatedAtUtc: Date;
+    public CreatedAtUtc: string;
     public Id: number;
     public Message: string;
     public RemoteAddress: string;
@@ -76,7 +76,7 @@ export class GetReportResult
 {
     public static TYPE_NAME: string = 'GetReportResult';
     public ContextCollections: GetReportResultContextCollection[];
-    public CreatedAtUtc: Date;
+    public CreatedAtUtc: string;
     public EmailAddress: string;
     public ErrorId: string;
     public Exception: GetReportException;
diff --git a/src/Server/Coderr.Server.Web/ClientApp/helpers.ts b/src/Server/Coderr.Server.Web/ClientApp/helpers.ts
diff --git a/src/Server/Coderr.Server.Web/package-lock.json b/src/Server/Coderr.Server.Web/package-lock.json
diff --git a/src/Server/Coderr.Server.Web/package.json b/src/Server/Coderr.Server.Web/package.json

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@ import { GetApplicationInfo, GetApplicationInfoResult, GetApplicationOverview, G`
`4`	`4`	`import Vue from "vue";`
`5`	`5`	`import { Component } from "vue-property-decorator";`
`6`	`6`	`import Chartist from "chartist";`
`7`		`-import * as moment from 'moment';`
`8`	`7`	`import * as Incidents from "../../dto/Core/Incidents";`
`9`	`8`	`import FindIncidentsResultItem = Incidents.FindIncidentsResultItem;`
	`9`	`+import { DateTime } from 'luxon';`
`10`	`10`
`11`	`11`
`12`	`12`	`interface ISeries {`
`@@ -103,7 +103,7 @@ export default class ApplicationDetailsComponent extends Vue {`
`103`	`103`	`if (index % 3 !== 0) {`
`104`	`104`	`return '';`
`105`	`105`	`}`
`106`		`- return moment(value).format('MMM D');`
	`106`	`+ return DateTime.utc(value).toFormat('MMM D');`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`	`};`