Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

better types

Blue Mouseaa75e9c74024
diff --git a/backend/apps/cloud/src/analytics/analytics.controller.ts b/backend/apps/cloud/src/analytics/analytics.controller.ts
index 8c64852a1..591917687 100644
--- a/backend/apps/cloud/src/analytics/analytics.controller.ts
+++ b/backend/apps/cloud/src/analytics/analytics.controller.ts
@@ -79,7 +79,10 @@ import { GetProfileDto, GetProfileSessionsDto } from './dto/get-profile.dto'
import { ErrorDto } from './dto/error.dto'
import { GetErrorsDto } from './dto/get-errors.dto'
import { GetErrorDto } from './dto/get-error.dto'
-import { GetErrorOverviewDto } from './dto/get-error-overview.dto'
+import {
+ GetErrorOverviewDto,
+ GetErrorOverviewOptions,
+} from './dto/get-error-overview.dto'
import { PatchStatusDto } from './dto/patch-status.dto'
import {
customEventTransformer,
@@ -1824,11 +1827,16 @@ export class AnalyticsController {
await this.analyticsService.checkBillingAccess(pid)
- let parsedOptions: { showResolved?: boolean } = {}
- try {
- parsedOptions = JSON.parse(options || '{}')
- } catch {
- // Ignore parse errors
+ let parsedOptions: GetErrorOverviewOptions = {}
+
+ if (typeof options === 'string') {
+ try {
+ parsedOptions = JSON.parse(options)
+ } catch {
+ // Ignore parse errors
+ }
+ } else {
+ parsedOptions = options || {}
}
let newTimeBucket = timeBucket
diff --git a/backend/apps/cloud/src/analytics/dto/get-error-overview.dto.ts b/backend/apps/cloud/src/analytics/dto/get-error-overview.dto.ts
index 908941164..afa9e0d34 100644
--- a/backend/apps/cloud/src/analytics/dto/get-error-overview.dto.ts
+++ b/backend/apps/cloud/src/analytics/dto/get-error-overview.dto.ts
@@ -1,6 +1,10 @@
import { PickType, ApiProperty } from '@nestjs/swagger'
import { GetDataDto } from './getData.dto'
+export interface GetErrorOverviewOptions {
+ showResolved?: boolean
+}
+
export class GetErrorOverviewDto extends PickType(GetDataDto, [
'pid',
'period',
@@ -15,6 +19,7 @@ export class GetErrorOverviewDto extends PickType(GetDataDto, [
showResolved: true,
},
description: 'Errors list options',
+ required: false,
})
- options?: string
+ options?: GetErrorOverviewOptions
}
diff --git a/backend/apps/community/src/analytics/analytics.controller.ts b/backend/apps/community/src/analytics/analytics.controller.ts
index 920517661..a0e88b2bf 100644
--- a/backend/apps/community/src/analytics/analytics.controller.ts
+++ b/backend/apps/community/src/analytics/analytics.controller.ts
@@ -67,7 +67,7 @@ import { GetSessionDto } from './dto/get-session.dto'
import { ErrorDto } from './dto/error.dto'
import { GetErrorsDto } from './dto/get-errors.dto'
import { GetErrorDto } from './dto/get-error.dto'
-import { GetErrorOverviewDto } from './dto/get-error-overview.dto'
+import { GetErrorOverviewDto, GetErrorOverviewOptions } from './dto/get-error-overview.dto'
import { PatchStatusDto } from './dto/patch-status.dto'
import {
customEventTransformer,
@@ -1750,11 +1750,16 @@ export class AnalyticsController {
headers['x-password'],
)
- let parsedOptions: { showResolved?: boolean } = {}
- try {
- parsedOptions = JSON.parse(options || '{}')
- } catch {
- // Ignore parse errors
+ let parsedOptions: GetErrorOverviewOptions = {}
+
+ if (typeof options === 'string') {
+ try {
+ parsedOptions = JSON.parse(options)
+ } catch {
+ // Ignore parse errors
+ }
+ } else {
+ parsedOptions = options || {}
}
let newTimeBucket = timeBucket
diff --git a/backend/apps/community/src/analytics/dto/get-error-overview.dto.ts b/backend/apps/community/src/analytics/dto/get-error-overview.dto.ts
index 908941164..afa9e0d34 100644
--- a/backend/apps/community/src/analytics/dto/get-error-overview.dto.ts
+++ b/backend/apps/community/src/analytics/dto/get-error-overview.dto.ts
@@ -1,6 +1,10 @@
import { PickType, ApiProperty } from '@nestjs/swagger'
import { GetDataDto } from './getData.dto'
+export interface GetErrorOverviewOptions {
+ showResolved?: boolean
+}
+
export class GetErrorOverviewDto extends PickType(GetDataDto, [
'pid',
'period',
@@ -15,6 +19,7 @@ export class GetErrorOverviewDto extends PickType(GetDataDto, [
showResolved: true,
},
description: 'Errors list options',
+ required: false,
})
- options?: string
+ options?: GetErrorOverviewOptions
}