diff --git a/README.md b/README.md index 92ea4bf8..e51a1a9e 100644 --- a/README.md +++ b/README.md @@ -250,7 +250,7 @@ If you want to test it locally, see [Docker](#docker). | `ui.custom-css` | Custom CSS | `""` | | `ui.dark-mode` | Whether to enable dark mode by default. Note that this is superseded by the user's operating system theme preferences. | `true` | | `ui.default-sort-by` | Default sorting option for endpoints in the dashboard. Can be `name`, `group`, or `health`. Note that user preferences override this. | `name` | -| `ui.default-filter-by` | Default filter option for endpoints in the dashboard. Can be `nothing`, `failing`, or `unstable`. Note that user preferences override this. | `nothing` | +| `ui.default-filter-by` | Default filter option for endpoints in the dashboard. Can be `none`, `failing`, or `unstable`. Note that user preferences override this. | `none` | | `maintenance` | [Maintenance configuration](#maintenance). | `{}` | If you want more verbose logging, you may set the `GATUS_LOG_LEVEL` environment variable to `DEBUG`. diff --git a/config/ui/ui.go b/config/ui/ui.go index 3200477b..649007a3 100644 --- a/config/ui/ui.go +++ b/config/ui/ui.go @@ -17,7 +17,7 @@ const ( defaultLink = "" defaultCustomCSS = "" defaultSortBy = "name" - defaultFilterBy = "nothing" + defaultFilterBy = "none" ) var ( @@ -25,7 +25,7 @@ var ( ErrButtonValidationFailed = errors.New("invalid button configuration: missing required name or link") ErrInvalidDefaultSortBy = errors.New("invalid default-sort-by value: must be 'name', 'group', or 'health'") - ErrInvalidDefaultFilterBy = errors.New("invalid default-filter-by value: must be 'nothing', 'failing', or 'unstable'") + ErrInvalidDefaultFilterBy = errors.New("invalid default-filter-by value: must be 'none', 'failing', or 'unstable'") ) // Config is the configuration for the UI of Gatus @@ -39,7 +39,7 @@ type Config struct { CustomCSS string `yaml:"custom-css,omitempty"` // Custom CSS to include in the page DarkMode *bool `yaml:"dark-mode,omitempty"` // DarkMode is a flag to enable dark mode by default DefaultSortBy string `yaml:"default-sort-by,omitempty"` // DefaultSortBy is the default sort option ('name', 'group', 'health') - DefaultFilterBy string `yaml:"default-filter-by,omitempty"` // DefaultFilterBy is the default filter option ('nothing', 'failing', 'unstable') + DefaultFilterBy string `yaml:"default-filter-by,omitempty"` // DefaultFilterBy is the default filter option ('none', 'failing', 'unstable') ////////////////////////////////////////////// // Non-configurable - used for UI rendering // @@ -114,7 +114,7 @@ func (cfg *Config) ValidateAndSetDefaults() error { } if len(cfg.DefaultFilterBy) == 0 { cfg.DefaultFilterBy = defaultFilterBy - } else if cfg.DefaultFilterBy != "nothing" && cfg.DefaultFilterBy != "failing" && cfg.DefaultFilterBy != "unstable" { + } else if cfg.DefaultFilterBy != "none" && cfg.DefaultFilterBy != "failing" && cfg.DefaultFilterBy != "unstable" { return ErrInvalidDefaultFilterBy } for _, btn := range cfg.Buttons { diff --git a/config/ui/ui_test.go b/config/ui/ui_test.go index 4a4e274b..86cf5d5b 100644 --- a/config/ui/ui_test.go +++ b/config/ui/ui_test.go @@ -155,10 +155,10 @@ func TestConfig_ValidateAndSetDefaults_DefaultFilterBy(t *testing.T) { ExpectedValue: defaultFilterBy, }, { - Name: "ValidDefaultFilterBy_nothing", - DefaultFilterBy: "nothing", + Name: "ValidDefaultFilterBy_none", + DefaultFilterBy: "none", ExpectedError: nil, - ExpectedValue: "nothing", + ExpectedValue: "none", }, { Name: "ValidDefaultFilterBy_failing", diff --git a/web/app/src/components/SearchBar.vue b/web/app/src/components/SearchBar.vue index fb0c7552..3fc4e90e 100644 --- a/web/app/src/components/SearchBar.vue +++ b/web/app/src/components/SearchBar.vue @@ -20,7 +20,7 @@