diff --git a/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/ApiUsageDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/ApiUsageDto.cs
index b1c49530e..ca8519950 100644
--- a/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/ApiUsageDto.cs
+++ b/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/ApiUsageDto.cs
@@ -34,13 +34,15 @@ namespace Squidex.Areas.Api.Controllers.Statistics.Models
public static ApiUsageDto FromStats(ApiStats stats)
{
- return new ApiUsageDto
+ var result = new ApiUsageDto
{
Date = stats.Date,
TotalBytes = stats.TotalBytes,
TotalCalls = stats.TotalCalls,
AverageElapsedMs = stats.AverageElapsedMs,
};
+
+ return result;
}
}
}
diff --git a/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/CurrentCallsDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/CurrentCallsDto.cs
deleted file mode 100644
index f51133f5c..000000000
--- a/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/CurrentCallsDto.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// ==========================================================================
-// Squidex Headless CMS
-// ==========================================================================
-// Copyright (c) Squidex UG (haftungsbeschränkt)
-// All rights reserved. Licensed under the MIT license.
-// ==========================================================================
-
-namespace Squidex.Areas.Api.Controllers.Statistics.Models
-{
- public sealed class CurrentCallsDto
- {
- ///
- /// The number of calls.
- ///
- public long Count { get; set; }
-
- ///
- /// The number of maximum allowed calls.
- ///
- public long MaxAllowed { get; set; }
- }
-}
diff --git a/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/StorageUsageDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/StorageUsageDto.cs
index fe0a55bae..b7258252a 100644
--- a/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/StorageUsageDto.cs
+++ b/backend/src/Squidex/Areas/Api/Controllers/Statistics/Models/StorageUsageDto.cs
@@ -20,16 +20,23 @@ namespace Squidex.Areas.Api.Controllers.Statistics.Models
///
/// The number of assets.
///
- public long Count { get; set; }
+ public long TotalCount { get; set; }
///
/// The size in bytes.
///
- public long Size { get; set; }
+ public long TotalSize { get; set; }
public static StorageUsageDto FromStats(AssetStats stats)
{
- return new StorageUsageDto { Date = stats.Date, Count = stats.TotalCount, Size = stats.TotalSize };
+ var result = new StorageUsageDto
+ {
+ Date = stats.Date,
+ TotalCount = stats.TotalCount,
+ TotalSize = stats.TotalSize
+ };
+
+ return result;
}
}
}
diff --git a/frontend/app/features/dashboard/pages/dashboard-page.component.ts b/frontend/app/features/dashboard/pages/dashboard-page.component.ts
index 4d6ec1a2d..d8fd532ba 100644
--- a/frontend/app/features/dashboard/pages/dashboard-page.component.ts
+++ b/frontend/app/features/dashboard/pages/dashboard-page.component.ts
@@ -151,7 +151,7 @@ export class DashboardPageComponent extends ResourceOwner implements OnInit {
backgroundColor: `rgba(${COLORS[0]}, 0.6)`,
borderColor: `rgba(${COLORS[0]}, 1)`,
borderWidth: 1,
- data: dtos.map(x => x.count)
+ data: dtos.map(x => x.totalCount)
}
]
};
@@ -166,7 +166,7 @@ export class DashboardPageComponent extends ResourceOwner implements OnInit {
backgroundColor: `rgba(${COLORS[0]}, 0.6)`,
borderColor: `rgba(${COLORS[0]}, 1)`,
borderWidth: 1,
- data: dtos.map(x => Math.round(100 * (x.size / (1024 * 1024))) / 100)
+ data: dtos.map(x => Math.round(100 * (x.totalSize / (1024 * 1024))) / 100)
}
]
};
diff --git a/frontend/app/shared/services/usages.service.spec.ts b/frontend/app/shared/services/usages.service.spec.ts
index 6494633fe..26c8f2bf0 100644
--- a/frontend/app/shared/services/usages.service.spec.ts
+++ b/frontend/app/shared/services/usages.service.spec.ts
@@ -99,13 +99,13 @@ describe('UsagesService', () => {
req.flush([
{
date: '2017-10-12',
- count: 10,
- size: 130
+ totalCount: 10,
+ totalSize: 130
},
{
date: '2017-10-13',
- count: 13,
- size: 170
+ totalCount: 13,
+ totalSize: 170
}
]);
diff --git a/frontend/app/shared/services/usages.service.ts b/frontend/app/shared/services/usages.service.ts
index 29ab4827e..4bb11fcaa 100644
--- a/frontend/app/shared/services/usages.service.ts
+++ b/frontend/app/shared/services/usages.service.ts
@@ -40,8 +40,8 @@ export class ApiUsageDto {
export class StorageUsageDto {
constructor(
public readonly date: DateTime,
- public readonly count: number,
- public readonly size: number
+ public readonly totalCount: number,
+ public readonly totalSize: number
) {
}
}
@@ -119,8 +119,8 @@ export class UsagesService {
const usages = body.map(item =>
new StorageUsageDto(
DateTime.parseISO_UTC(item.date),
- item.count,
- item.size));
+ item.totalCount,
+ item.totalSize));
return usages;
}),