From 37a166731de1e59fdd0af5d805353811c2b2ab4f Mon Sep 17 00:00:00 2001 From: yusing Date: Thu, 23 Jan 2025 05:24:13 +0800 Subject: [PATCH] fixes some tests --- internal/route/provider/all_fields.yaml | 2 +- internal/route/provider/docker_labels.yaml | 4 ++-- internal/route/provider/docker_test.go | 7 ++++--- internal/route/routes/routequery/query.go | 4 ---- next-release.md | 4 ++-- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/internal/route/provider/all_fields.yaml b/internal/route/provider/all_fields.yaml index 7af53fb..eff965a 100644 --- a/internal/route/provider/all_fields.yaml +++ b/internal/route/provider/all_fields.yaml @@ -26,7 +26,7 @@ example: # matching `example.y.z` hideXForwarded: homepage: name: Example App - icon: png/example.png + icon: png/adguard-home.png description: An example app category: example access_log: diff --git a/internal/route/provider/docker_labels.yaml b/internal/route/provider/docker_labels.yaml index 8ab6c21..cb07af7 100644 --- a/internal/route/provider/docker_labels.yaml +++ b/internal/route/provider/docker_labels.yaml @@ -27,7 +27,7 @@ proxy.app: | hideXForwarded: homepage: name: Example App - icon: png/example.png + icon: png/adguard-home.png description: An example app category: example access_log: @@ -89,7 +89,7 @@ proxy.app1.middlewares.cidr_whitelist: | message: IP not allowed proxy.app1.middlewares.hideXForwarded: proxy.app1.homepage.name: Example App -proxy.app1.homepage.icon: png/example.png +proxy.app1.homepage.icon: png/adguard-home.png proxy.app1.homepage.description: An example app proxy.app1.homepage.category: example proxy.app1.access_log.buffer_size: 100 diff --git a/internal/route/provider/docker_test.go b/internal/route/provider/docker_test.go index 823c9ea..ed075c8 100644 --- a/internal/route/provider/docker_test.go +++ b/internal/route/provider/docker_test.go @@ -85,7 +85,7 @@ func TestApplyLabel(t *testing.T) { "proxy.a.middlewares.middleware2.prop3": "value3", "proxy.a.middlewares.middleware2.prop4": "value4", "proxy.a.homepage.show": "true", - "proxy.a.homepage.icon": "png/example.png", + "proxy.a.homepage.icon": "png/adguard-home.png", "proxy.a.healthcheck.path": "/ping", "proxy.a.healthcheck.interval": "10s", }, @@ -130,9 +130,10 @@ func TestApplyLabel(t *testing.T) { ExpectEqual(t, b.Container.StopSignal, "SIGTERM") ExpectEqual(t, a.Homepage.Show, true) - ExpectEqual(t, a.Homepage.Icon.Value, "png/example.png") + ExpectEqual(t, a.Homepage.Hide, false) + ExpectEqual(t, a.Homepage.Icon.Value, "png/adguard-home.png") ExpectEqual(t, a.Homepage.Icon.Extra.FileType, "png") - ExpectEqual(t, a.Homepage.Icon.Extra.Name, "example") + ExpectEqual(t, a.Homepage.Icon.Extra.Name, "adguard-home") ExpectEqual(t, a.HealthCheck.Path, "/ping") ExpectEqual(t, a.HealthCheck.Interval, 10*time.Second) diff --git a/internal/route/routes/routequery/query.go b/internal/route/routes/routequery/query.go index 3674af0..e420e18 100644 --- a/internal/route/routes/routequery/query.go +++ b/internal/route/routes/routequery/query.go @@ -77,10 +77,6 @@ func HomepageConfig(useDefaultCategories bool, categoryFilter, providerFilter st return } - if item.Hide || !item.Show { - return - } - item.Alias = alias item.Provider = r.RawEntry().Provider diff --git a/next-release.md b/next-release.md index 182d326..f26b0fc 100644 --- a/next-release.md +++ b/next-release.md @@ -114,10 +114,10 @@ GoDoxy v0.8.2 expected changes on: method POST | method PUT do: error 403 Forbidden ``` - - **new** Brand new rewritten WebUI - View logs directly from WebUI - - Edit dashboard item config (overrides docker labels and include file) + - Edit dashboard app config (e.g. icon, name, category, etc.) + - Toggle show / hide apps - Health bubbles, latency, etc. rich info on dashboard items - **new** Support selfh.st icons: `@selfhst/.` _(e.g. `@selfhst/adguard-home.webp`)_ - also uses the display name on https://selfh.st/icons/ as default for our dashboard!