From c153c0671f567a0a9ecdbd8e00dc3348ddf59af8 Mon Sep 17 00:00:00 2001 From: David Dal Busco Date: Thu, 9 Jan 2025 08:34:41 +0100 Subject: [PATCH 1/2] fix: default strategy data source Signed-off-by: David Dal Busco --- .../monitoring/MonitoringDefaultStrategy.svelte | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/frontend/src/lib/components/monitoring/MonitoringDefaultStrategy.svelte b/src/frontend/src/lib/components/monitoring/MonitoringDefaultStrategy.svelte index 2633842c3..98231ad57 100644 --- a/src/frontend/src/lib/components/monitoring/MonitoringDefaultStrategy.svelte +++ b/src/frontend/src/lib/components/monitoring/MonitoringDefaultStrategy.svelte @@ -4,17 +4,17 @@ import MonitoringSentence from '$lib/components/modals/MonitoringSentence.svelte'; import Value from '$lib/components/ui/Value.svelte'; import { - missionControlMonitoring, - missionControlSettingsLoaded + missionControlConfigMonitoring, + missionControlUserDataLoaded } from '$lib/derived/mission-control.derived'; import { i18n } from '$lib/stores/i18n.store'; let monitoringStrategy = $derived( - fromNullable(fromNullable($missionControlMonitoring?.cycles ?? [])?.strategy ?? []) + fromNullable(fromNullable($missionControlConfigMonitoring?.cycles ?? [])?.default_strategy ?? []) ); -{#if $missionControlSettingsLoaded} +{#if $missionControlUserDataLoaded}
{#snippet label()} @@ -25,7 +25,7 @@ {#if nonNullish(monitoringStrategy)} {:else} - ​ + {$i18n.core.none} {/if}

From 267e75d445e50c61e2afee8dbd578d506a4290ec Mon Sep 17 00:00:00 2001 From: David Dal Busco Date: Thu, 9 Jan 2025 08:42:51 +0100 Subject: [PATCH 2/2] chore: fmt Signed-off-by: David Dal Busco --- .../components/monitoring/MonitoringDefaultStrategy.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/lib/components/monitoring/MonitoringDefaultStrategy.svelte b/src/frontend/src/lib/components/monitoring/MonitoringDefaultStrategy.svelte index 98231ad57..f4c81cc56 100644 --- a/src/frontend/src/lib/components/monitoring/MonitoringDefaultStrategy.svelte +++ b/src/frontend/src/lib/components/monitoring/MonitoringDefaultStrategy.svelte @@ -10,7 +10,9 @@ import { i18n } from '$lib/stores/i18n.store'; let monitoringStrategy = $derived( - fromNullable(fromNullable($missionControlConfigMonitoring?.cycles ?? [])?.default_strategy ?? []) + fromNullable( + fromNullable($missionControlConfigMonitoring?.cycles ?? [])?.default_strategy ?? [] + ) );