move frontend settings into the DB (for consistent settings handling).

Flattened settings object.

webapp/backend/pkg/database/migrations/m20220716214900/setting.go

@@ -12,6 +12,6 @@ type Setting struct {
 	SettingKeyDescription string `json:"setting_key_description"`
 	SettingDataType       string `json:"setting_data_type"`
 
-	SettingValueNumeric int64  `json:"setting_value_numeric"`
+	SettingValueNumeric int    `json:"setting_value_numeric"`
 	SettingValueString  string `json:"setting_value_string"`
 }

webapp/backend/pkg/database/scrutiny_repository_migrations.go

@@ -290,22 +290,53 @@ func (sr *scrutinyRepository) Migrate(ctx context.Context) error {
 
 				var defaultSettings = []m20220716214900.Setting{
 					{
-						SettingKeyName:        "metrics.notify.level",
+						SettingKeyName:        "theme",
+						SettingKeyDescription: "Frontend theme ('light' | 'dark' | 'system')",
+						SettingDataType:       "string",
+						SettingValueString:    "system", // options: 'light' | 'dark' | 'system'
+					},
+					{
+						SettingKeyName:        "layout",
+						SettingKeyDescription: "Frontend layout ('material')",
+						SettingDataType:       "string",
+						SettingValueString:    "material",
+					},
+					{
+						SettingKeyName:        "dashboardDisplay",
+						SettingKeyDescription: "Frontend device display title ('name' | 'serial_id' | 'uuid' | 'label')",
+						SettingDataType:       "string",
+						SettingValueString:    "name",
+					},
+					{
+						SettingKeyName:        "dashboardSort",
+						SettingKeyDescription: "Frontend device sort by ('status' | 'title' | 'age')",
+						SettingDataType:       "string",
+						SettingValueString:    "status",
+					},
+					{
+						SettingKeyName:        "temperatureUnit",
+						SettingKeyDescription: "Frontend temperature unit ('celsius' | 'fahrenheit')",
+						SettingDataType:       "string",
+						SettingValueString:    "celsius",
+					},
+
+					{
+						SettingKeyName:        "metrics.notifyLevel",
 						SettingKeyDescription: "Determines which device status will cause a notification (fail or warn)",
 						SettingDataType:       "numeric",
-						SettingValueNumeric:   int64(pkg.MetricsNotifyLevelFail), // options: 'fail' or 'warn'
+						SettingValueNumeric:   int(pkg.MetricsNotifyLevelFail), // options: 'fail' or 'warn'
 					},
 					{
-						SettingKeyName:        "metrics.status.filter_attributes",
+						SettingKeyName:        "metrics.statusFilterAttributes",
 						SettingKeyDescription: "Determines which attributes should impact device status",
 						SettingDataType:       "numeric",
-						SettingValueNumeric:   int64(pkg.MetricsStatusFilterAttributesAll), // options: 'all' or  'critical'
+						SettingValueNumeric:   int(pkg.MetricsStatusFilterAttributesAll), // options: 'all' or  'critical'
 					},
 					{
-						SettingKeyName:        "metrics.status.threshold",
+						SettingKeyName:        "metrics.statusThreshold",
 						SettingKeyDescription: "Determines which threshold should impact device status",
 						SettingDataType:       "numeric",
-						SettingValueNumeric:   int64(pkg.MetricsStatusThresholdBoth), // options: 'scrutiny', 'smart', 'both'
+						SettingValueNumeric:   int(pkg.MetricsStatusThresholdBoth), // options: 'scrutiny', 'smart', 'both'
 					},
 				}
 				return tx.Create(&defaultSettings).Error

webapp/backend/pkg/database/scrutiny_repository_settings.go

@@ -17,7 +17,7 @@ func (sr *scrutinyRepository) LoadSettings(ctx context.Context) (*models.Setting
 
 	// store retrieved settings in the AppConfig obj
 	for _, settingsEntry := range settingsEntries {
-		configKey := fmt.Sprintf("%s.%s", config.DBSETTING_SUBKEY, settingsEntry.SettingKeyName)
+		configKey := fmt.Sprintf("%s.%s", config.DB_USER_SETTINGS_SUBKEY, settingsEntry.SettingKeyName)
 
 		if settingsEntry.SettingDataType == "numeric" {
 			sr.appConfig.Set(configKey, settingsEntry.SettingValueNumeric)
@@ -28,7 +28,7 @@ func (sr *scrutinyRepository) LoadSettings(ctx context.Context) (*models.Setting
 
 	// unmarshal the dbsetting object data to a settings object.
 	var settings models.Settings
-	err := sr.appConfig.UnmarshalKey(config.DBSETTING_SUBKEY, &settings)
+	err := sr.appConfig.UnmarshalKey(config.DB_USER_SETTINGS_SUBKEY, &settings)
 	if err != nil {
 		return nil, err
 	}
@@ -36,7 +36,7 @@ func (sr *scrutinyRepository) LoadSettings(ctx context.Context) (*models.Setting
 }
 
 // testing
-// curl -d '{"metrics": { "notify": { "level": 5 }, "status": { "filter_attributes": 5, "threshold": 5 } }}' -H "Content-Type: application/json" -X POST http://localhost:9090/api/settings
+// curl -d '{"metrics": { "notifyLevel": 5, "statusFilterAttributes": 5, "statusThreshold": 5 }}' -H "Content-Type: application/json" -X POST http://localhost:9090/api/settings
 // SaveSettings will update settings in AppConfig object, then save the settings to the database.
 func (sr *scrutinyRepository) SaveSettings(ctx context.Context, settings models.Settings) error {
 
@@ -47,7 +47,7 @@ func (sr *scrutinyRepository) SaveSettings(ctx context.Context, settings models.
 		return err
 	}
 	settingsWrapperMap := map[string]interface{}{}
-	settingsWrapperMap[config.DBSETTING_SUBKEY] = *settingsMap
+	settingsWrapperMap[config.DB_USER_SETTINGS_SUBKEY] = *settingsMap
 	err = sr.appConfig.MergeConfigMap(settingsWrapperMap)
 	if err != nil {
 		return err
@@ -61,7 +61,7 @@ func (sr *scrutinyRepository) SaveSettings(ctx context.Context, settings models.
 
 	//update settingsEntries
 	for ndx, settingsEntry := range settingsEntries {
-		configKey := fmt.Sprintf("%s.%s", config.DBSETTING_SUBKEY, settingsEntry.SettingKeyName)
+		configKey := fmt.Sprintf("%s.%s", config.DB_USER_SETTINGS_SUBKEY, settingsEntry.SettingKeyName)
 
 		if settingsEntry.SettingDataType == "numeric" {
 			settingsEntries[ndx].SettingValueNumeric = sr.appConfig.GetInt(configKey)