From e7b5bf8fd9e13fad583af72cdd519c7a8c8def69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 11 Oct 2020 16:26:34 +0100 Subject: [PATCH] feat(backend): configure UI animations defaults in config --- cmd/karma/tests/testscript/059_log_full_config_env.txt | 2 ++ cmd/karma/tests/testscript/060_log_full_config_file.txt | 2 ++ .../testscript/061_log_full_config_file_invalid_values.txt | 3 ++- internal/config/config.go | 1 + internal/config/config_test.go | 1 + internal/config/models.go | 1 + 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cmd/karma/tests/testscript/059_log_full_config_env.txt b/cmd/karma/tests/testscript/059_log_full_config_env.txt index 4b3142cf6..fb53b823a 100644 --- a/cmd/karma/tests/testscript/059_log_full_config_env.txt +++ b/cmd/karma/tests/testscript/059_log_full_config_env.txt @@ -60,6 +60,7 @@ env UI_REFRESH=10s env UI_HIDEFILTERSWHENIDLE=false env UI_COLORTITLEBAR=true env UI_THEME=dark +env UI_ANIMATIONS=false env UI_MINIMALGROUPWIDTH=300 env UI_ALERTSPERGROUP=2 env UI_COLLAPSEGROUPS=expanded @@ -189,6 +190,7 @@ level=info msg=" refresh: 10s" level=info msg=" hideFiltersWhenIdle: false" level=info msg=" colorTitlebar: true" level=info msg=" theme: dark" +level=info msg=" animations: false" level=info msg=" minimalGroupWidth: 300" level=info msg=" alertsPerGroup: 2" level=info msg=" collapseGroups: expanded" diff --git a/cmd/karma/tests/testscript/060_log_full_config_file.txt b/cmd/karma/tests/testscript/060_log_full_config_file.txt index 65d7e094b..92dddfed9 100644 --- a/cmd/karma/tests/testscript/060_log_full_config_file.txt +++ b/cmd/karma/tests/testscript/060_log_full_config_file.txt @@ -149,6 +149,7 @@ ui: hideFiltersWhenIdle: true colorTitlebar: false theme: auto + animations: false minimalGroupWidth: 420 alertsPerGroup: 5 collapseGroups: collapsedOnMobile @@ -436,6 +437,7 @@ level=info msg=" refresh: 10s" level=info msg=" hideFiltersWhenIdle: true" level=info msg=" colorTitlebar: false" level=info msg=" theme: auto" +level=info msg=" animations: false" level=info msg=" minimalGroupWidth: 420" level=info msg=" alertsPerGroup: 5" level=info msg=" collapseGroups: collapsedOnMobile" diff --git a/cmd/karma/tests/testscript/061_log_full_config_file_invalid_values.txt b/cmd/karma/tests/testscript/061_log_full_config_file_invalid_values.txt index 84b559154..f3ca97aaa 100644 --- a/cmd/karma/tests/testscript/061_log_full_config_file_invalid_values.txt +++ b/cmd/karma/tests/testscript/061_log_full_config_file_invalid_values.txt @@ -1,7 +1,7 @@ # Print out and compare logged config set via config file that includes invalid values karma.bin-should-fail-no-timestamp --config.file=karma.yaml --check-config ! stdout . -stderr 'Failed to unmarshal configuration: 12 error\(s\) decoding:' +stderr 'Failed to unmarshal configuration: 13 error\(s\) decoding:' -- karma.yaml -- alertmanager: @@ -54,6 +54,7 @@ ui: hideFiltersWhenIdle: z colorTitlebar: yum theme: x + animations: 1a minimalGroupWidth: abc4 alertsPerGroup: 5a collapseGroups: collapsedOanMobile diff --git a/internal/config/config.go b/internal/config/config.go index 4a443d76c..e39fc5eea 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -119,6 +119,7 @@ func SetupFlags(f *pflag.FlagSet) { f.Bool("ui.hideFiltersWhenIdle", true, "Hide the filters bar when idle") f.Bool("ui.colorTitlebar", false, "Color alert group titlebar based on alert state") f.String("ui.theme", "auto", "Default theme, 'light', 'dark' or 'auto' (follow browser preference)") + f.Bool("ui.animations", true, "Enable UI animations") f.Int("ui.minimalGroupWidth", 420, "Minimal width for each alert group on the grid") f.Int("ui.alertsPerGroup", 5, "Default number of alerts to show for each alert group") f.String("ui.collapseGroups", "collapsedOnMobile", "Default state for alert groups") diff --git a/internal/config/config_test.go b/internal/config/config_test.go index b248aa1e0..f8b915660 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -122,6 +122,7 @@ ui: hideFiltersWhenIdle: true colorTitlebar: false theme: auto + animations: true minimalGroupWidth: 420 alertsPerGroup: 5 collapseGroups: collapsedOnMobile diff --git a/internal/config/models.go b/internal/config/models.go index b2abb47bd..8f88a15f0 100644 --- a/internal/config/models.go +++ b/internal/config/models.go @@ -162,6 +162,7 @@ type configSchema struct { HideFiltersWhenIdle bool `yaml:"hideFiltersWhenIdle" koanf:"hideFiltersWhenIdle"` ColorTitlebar bool `yaml:"colorTitlebar" koanf:"colorTitlebar"` Theme string `yaml:"theme" koanf:"theme"` + Animations bool `yaml:"animations" koanf:"animations"` MinimalGroupWidth int `yaml:"minimalGroupWidth" koanf:"minimalGroupWidth"` AlertsPerGroup int `yaml:"alertsPerGroup" koanf:"alertsPerGroup"` CollapseGroups string `yaml:"collapseGroups" koanf:"collapseGroups"`