SelfPrivacy/selfprivacy.org.app
1
0
Fork 0
mirror of https://git.selfprivacy.org/kherel/selfprivacy.org.app.git synced 2024-09-21 10:57:52 +00:00
Code Issues Projects Releases Wiki Activity

fix: Do not hide period selector from the memory usage page

Browse source
This commit is contained in:
Inex Code 2024-07-30 16:48:30 +03:00
parent 4246b50a24
commit 51b6e0ab41
3 changed files with 80 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assets/translations/en.json
View file

@ -144,7 +144,8 @@
"unsupported": "You can't view resource usage charts without the server provider token.",
"system": "System",
"ssh_users": "SSH users",
"ram_usage": "Average usage: {average}. Maximum: {max}."
"ram_usage": "Average usage: {average}. Maximum: {max}.",
"failed_to_load_memory_metrics": "Couldn't load memory usage data. This might be a connection issue, or there is not enough data yet."
},
"server": {
"card_title": "Server",

139
lib/ui/pages/server_details/memory_usage_by_service_screen.dart
View file

@ -33,92 +33,97 @@ class _MemoryUsageByServiceContents extends StatelessWidget {
final Period period = cubit.state.period;
final MetricsState state = cubit.state;
final List<Widget> children = [];
if (state is MetricsUnsupported ||
(state is MetricsLoaded && state.memoryMetrics == null)) {
return BrandHeroScreen(
heroTitle: 'resource_chart.memory'.tr(),
children: [
Center(
child: Center(
children.addAll([
Center(
child: Center(
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 32.0),
child: EmptyPagePlaceholder(
title: 'basis.error'.tr(),
description:
'resource_chart.failed_to_load_memory_metrics'.tr(),
iconData: Icons.error_outline_outlined,
),
),
),
],
);
),
]);
}
if (state is MetricsLoading) {
return BrandHeroScreen(
heroTitle: 'resource_chart.memory'.tr(),
children: const [
Center(
children.addAll([
const Center(
child: Padding(
padding: EdgeInsets.symmetric(vertical: 32.0),
child: CircularProgressIndicator(),
),
],
);
),
]);
}
final averageUsageByServices =
(state as MetricsLoaded).memoryMetrics!.averageMetricsByService;
final maxUsageByServices = state.memoryMetrics!.maxMetricsByService;
if (state is MetricsLoaded && state.memoryMetrics != null) {
final averageUsageByServices =
state.memoryMetrics!.averageMetricsByService;
final maxUsageByServices = state.memoryMetrics!.maxMetricsByService;
// For each service, gather average and max usages
final List<Widget> children = [];
for (final slice in averageUsageByServices.keys.sorted()) {
final DiskSize averageUsage =
DiskSize(byte: averageUsageByServices[slice]?.toInt() ?? 0);
final DiskSize maxUsage =
DiskSize(byte: maxUsageByServices[slice]?.toInt() ?? 0);
String? serviceName;
Widget? icon;
if (slice == 'system') {
serviceName = 'resource_chart.system'.tr();
icon = const Icon(BrandIcons.server);
} else if (slice == 'user') {
serviceName = 'resource_chart.ssh_users'.tr();
icon = const Icon(BrandIcons.terminal);
} else {
final service = context
.read<ServicesBloc>()
.state
.getServiceById(slice.replaceAll('_', '-'));
serviceName = service?.displayName ?? slice;
icon = service?.svgIcon != null
? SvgPicture.string(
service!.svgIcon,
width: 22.0,
height: 24.0,
colorFilter: ColorFilter.mode(
Theme.of(context).colorScheme.onBackground,
BlendMode.srcIn,
),
)
: const Icon(BrandIcons.box);
}
// For each service, gather average and max usages
for (final slice in averageUsageByServices.keys.sorted()) {
final DiskSize averageUsage =
DiskSize(byte: averageUsageByServices[slice]?.toInt() ?? 0);
final DiskSize maxUsage =
DiskSize(byte: maxUsageByServices[slice]?.toInt() ?? 0);
String? serviceName;
Widget? icon;
if (slice == 'system') {
serviceName = 'resource_chart.system'.tr();
icon = const Icon(BrandIcons.server);
} else if (slice == 'user') {
serviceName = 'resource_chart.ssh_users'.tr();
icon = const Icon(BrandIcons.terminal);
} else {
final service = context
.read<ServicesBloc>()
.state
.getServiceById(slice.replaceAll('_', '-'));
serviceName = service?.displayName ?? slice;
icon = service?.svgIcon != null
? SvgPicture.string(
service!.svgIcon,
width: 22.0,
height: 24.0,
colorFilter: ColorFilter.mode(
Theme.of(context).colorScheme.onBackground,
BlendMode.srcIn,
),
)
: const Icon(BrandIcons.box);
}
if (serviceName == slice &&
averageUsage.byte == 0 &&
maxUsage.byte == 0) {
continue;
}
if (serviceName == slice &&
averageUsage.byte == 0 &&
maxUsage.byte == 0) {
continue;
}
children.add(
ListTile(
title: Text(serviceName),
subtitle: Text(
'resource_chart.ram_usage'.tr(
namedArgs: {
'average': averageUsage.toString(),
'max': maxUsage.toString(),
},
children.add(
ListTile(
title: Text(serviceName),
subtitle: Text(
'resource_chart.ram_usage'.tr(
namedArgs: {
'average': averageUsage.toString(),
'max': maxUsage.toString(),
},
),
),
dense: true,
leading: icon,
),
dense: true,
leading: icon,
),
);
);
}
}
return BrandHeroScreen(

10
lib/ui/pages/services/config_item_fields/basic_enum_config_item.dart
View file

@ -32,10 +32,12 @@ class _BasicEnumConfigItemState extends State<BasicEnumConfigItem> {
DropdownMenuItem<String>(
value: widget.configItem.value,
enabled: false,
child: Text(widget.configItem.value,
style: Theme.of(context).textTheme.titleMedium!.copyWith(
color: Theme.of(context).colorScheme.error.withOpacity(0.7),
)),
child: Text(
widget.configItem.value,
style: Theme.of(context).textTheme.titleMedium!.copyWith(
color: Theme.of(context).colorScheme.error.withOpacity(0.7),
),
),
),
);
}