From 536b590080b589a807765b69612990d41ae97773 Mon Sep 17 00:00:00 2001 From: adripo <26493496+adripo@users.noreply.github.com> Date: Fri, 11 Nov 2022 00:19:51 +0100 Subject: [PATCH] feat: dynamic line stroke settings --- .../pkg/database/scrutiny_repository_migrations.go | 6 ++++++ webapp/backend/pkg/models/settings.go | 1 + webapp/frontend/src/app/core/config/app.config.ts | 6 ++++++ .../dashboard-settings.component.html | 11 +++++++++++ .../dashboard-settings.component.ts | 4 ++++ .../src/app/modules/dashboard/dashboard.component.ts | 2 +- 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/webapp/backend/pkg/database/scrutiny_repository_migrations.go b/webapp/backend/pkg/database/scrutiny_repository_migrations.go index 015428c..1c821be 100644 --- a/webapp/backend/pkg/database/scrutiny_repository_migrations.go +++ b/webapp/backend/pkg/database/scrutiny_repository_migrations.go @@ -325,6 +325,12 @@ func (sr *scrutinyRepository) Migrate(ctx context.Context) error { SettingDataType: "bool", SettingValueBool: false, }, + { + SettingKeyName: "line_stroke", + SettingKeyDescription: "Temperature chart line stroke ('smooth' | 'straight' | 'stepline')", + SettingDataType: "string", + SettingValueString: "smooth", + }, { SettingKeyName: "metrics.notify_level", diff --git a/webapp/backend/pkg/models/settings.go b/webapp/backend/pkg/models/settings.go index f06db84..f5564ef 100644 --- a/webapp/backend/pkg/models/settings.go +++ b/webapp/backend/pkg/models/settings.go @@ -14,6 +14,7 @@ type Settings struct { DashboardSort string `json:"dashboard_sort" mapstructure:"dashboard_sort"` TemperatureUnit string `json:"temperature_unit" mapstructure:"temperature_unit"` FileSizeSIUnits bool `json:"file_size_si_units" mapstructure:"file_size_si_units"` + LineStroke string `json:"line_stroke" mapstructure:"line_stroke"` Metrics struct { NotifyLevel int `json:"notify_level" mapstructure:"notify_level"` diff --git a/webapp/frontend/src/app/core/config/app.config.ts b/webapp/frontend/src/app/core/config/app.config.ts index 92f0451..c48d25a 100644 --- a/webapp/frontend/src/app/core/config/app.config.ts +++ b/webapp/frontend/src/app/core/config/app.config.ts @@ -10,6 +10,8 @@ export type DashboardSort = 'status' | 'title' | 'age' export type TemperatureUnit = 'celsius' | 'fahrenheit' +export type LineStroke = 'smooth' | 'straight' | 'stepline' + export enum MetricsNotifyLevel { Warn = 1, @@ -45,6 +47,8 @@ export interface AppConfig { file_size_si_units?: boolean; + line_stroke?: LineStroke; + // Settings from Scrutiny API metrics?: { @@ -73,6 +77,8 @@ export const appConfig: AppConfig = { temperature_unit: 'celsius', file_size_si_units: false, + line_stroke: 'smooth', + metrics: { notify_level: MetricsNotifyLevel.Fail, status_filter_attributes: MetricsStatusFilterAttributes.All, diff --git a/webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.html b/webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.html index 750d54d..69ebd76 100644 --- a/webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.html +++ b/webapp/frontend/src/app/layout/common/dashboard-settings/dashboard-settings.component.html @@ -53,6 +53,17 @@ +