Skip to content

Commit 1f1c0a8

Browse files
committed
fix(proxy-group): exclude hidden groups from filter
1 parent 8bea5d4 commit 1f1c0a8

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

frontend/src/utils/tray.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,16 @@ const getTrayMenus = () => {
8787

8888
if (!groupMenusHidden) {
8989
groupMenus = Object.values(proxies)
90-
.filter(
91-
(v) =>
92-
[
93-
ProxyGroupType.Selector,
94-
ProxyGroupType.UrlTest,
95-
ProxyGroupType.Fallback,
96-
ProxyGroupType.Relay,
97-
ProxyGroupType.LoadBalance,
98-
].includes(v.type as ProxyGroupType) && v.name !== 'GLOBAL',
99-
)
90+
.filter((v) => {
91+
if (v.hidden || v.name === 'GLOBAL') return false
92+
return [
93+
ProxyGroupType.Selector,
94+
ProxyGroupType.UrlTest,
95+
ProxyGroupType.Fallback,
96+
ProxyGroupType.Relay,
97+
ProxyGroupType.LoadBalance,
98+
].includes(v.type as ProxyGroupType)
99+
})
100100
.sort((a, b) => {
101101
const aIndex = proxies.GLOBAL?.all.indexOf(a.name) || 0
102102
const bIndex = proxies.GLOBAL?.all.indexOf(b.name) || 0

frontend/src/views/HomeView/components/GroupsController.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ const kernelApiStore = useKernelApiStore()
3131
const groups = computed(() => {
3232
const { proxies } = kernelApiStore
3333
return Object.values(proxies)
34-
.filter(
35-
(v) =>
36-
[
37-
ProxyGroupType.Selector,
38-
ProxyGroupType.UrlTest,
39-
ProxyGroupType.Fallback,
40-
ProxyGroupType.Relay,
41-
ProxyGroupType.LoadBalance,
42-
].includes(v.type as ProxyGroupType) && v.name !== 'GLOBAL',
43-
)
34+
.filter((v) => {
35+
if (v.hidden || v.name === 'GLOBAL') return false
36+
return [
37+
ProxyGroupType.Selector,
38+
ProxyGroupType.UrlTest,
39+
ProxyGroupType.Fallback,
40+
ProxyGroupType.Relay,
41+
ProxyGroupType.LoadBalance,
42+
].includes(v.type as ProxyGroupType)
43+
})
4444
.sort((a, b) => {
4545
const aIndex = proxies.GLOBAL?.all.indexOf(a.name) || 0
4646
const bIndex = proxies.GLOBAL?.all.indexOf(b.name) || 0

0 commit comments

Comments
 (0)