Skip to content

Commit 42cd709

Browse files
0xJacky0xJacky
committed
feat: hidden env management page and upgrade page when connect to remote node
1 parent 852838a commit 42cd709

File tree

5 files changed

+26
-7
lines changed

5 files changed

+26
-7
lines changed

‎app/src/layouts/SideBar.vue‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ const visible: ComputedRef<sidebar[]> = computed(() => {
5151
const res: sidebar[] = [];
5252
5353
(sidebars.value || []).forEach(s => {
54-
if (s.meta && s.meta.hiddenInSidebar)
54+
if (s.meta && ((typeof s.meta.hiddenInSidebar === 'boolean' && s.meta.hiddenInSidebar)
55+
|| (typeof s.meta.hiddenInSidebar === 'function' && s.meta.hiddenInSidebar())))
5556
return
5657
5758
const t: sidebar = {
@@ -62,7 +63,8 @@ const visible: ComputedRef<sidebar[]> = computed(() => {
6263
};
6364
6465
(s.children || []).forEach(c => {
65-
if (c.meta && c.meta.hiddenInSidebar)
66+
if (c.meta && ((typeof c.meta.hiddenInSidebar === 'boolean' && c.meta.hiddenInSidebar)
67+
|| (typeof c.meta.hiddenInSidebar === 'function' && c.meta.hiddenInSidebar())))
6668
return
6769
6870
t.children.push((c as unknown as sidebar))

‎app/src/routes/index.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
} from '@ant-design/icons-vue'
1818
import NProgress from 'nprogress'
1919

20-
import { useUserStore } from '@/pinia'
20+
import { useSettingsStore, useUserStore } from '@/pinia'
2121

2222
import 'nprogress/nprogress.css'
2323

@@ -211,6 +211,11 @@ export const routes: RouteRecordRaw[] = [
211211
meta: {
212212
name: () => $gettext('Environment'),
213213
icon: DatabaseOutlined,
214+
hiddenInSidebar: (): boolean => {
215+
const settings = useSettingsStore()
216+
217+
return settings.is_remote
218+
},
214219
},
215220
},
216221
{
@@ -261,6 +266,11 @@ export const routes: RouteRecordRaw[] = [
261266
component: () => import('@/views/system/Upgrade.vue'),
262267
meta: {
263268
name: () => $gettext('Upgrade'),
269+
hiddenInSidebar: (): boolean => {
270+
const settings = useSettingsStore()
271+
272+
return settings.is_remote
273+
},
264274
},
265275
}],
266276
},

‎app/src/routes/type.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ declare module 'vue-router' {
1111
interface RouteMeta {
1212
name: (() => string)
1313
icon?: AntDesignOutlinedIconType
14-
hiddenInSidebar?: boolean
14+
hiddenInSidebar?: boolean | (() => boolean)
1515
hideChildren?: boolean
1616
noAuth?: boolean
1717
status_code?: number

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ require (
2121
github.com/hpcloud/tail v1.0.0
2222
github.com/jpillora/overseer v1.1.6
2323
github.com/lib/pq v1.10.9
24+
github.com/minio/selfupdate v0.6.0
2425
github.com/mitchellh/mapstructure v1.5.0
2526
github.com/pkg/errors v0.9.1
2627
github.com/pretty66/websocketproxy v0.0.0-20220507015215-930b3a686308
@@ -184,7 +185,6 @@ require (
184185
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
185186
github.com/miekg/dns v1.1.61 // indirect
186187
github.com/mimuret/golang-iij-dpf v0.9.1 // indirect
187-
github.com/minio/selfupdate v0.6.0 // indirect
188188
github.com/mitchellh/go-homedir v1.1.0 // indirect
189189
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
190190
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -228,8 +228,8 @@ require (
228228
github.com/stretchr/objx v0.5.2 // indirect
229229
github.com/tdewolff/minify/v2 v2.20.37 // indirect
230230
github.com/tdewolff/parse/v2 v2.7.15 // indirect
231-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.967 // indirect
232-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.967 // indirect
231+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.968 // indirect
232+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.968 // indirect
233233
github.com/tklauser/go-sysconf v0.3.14 // indirect
234234
github.com/tklauser/numcpus v0.8.0 // indirect
235235
github.com/transip/gotransip/v6 v6.25.0 // indirect

‎go.sum‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRY
3939
cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
4040
cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
4141
cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
42+
cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14=
4243
cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
4344
cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
4445
cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=
@@ -955,6 +956,7 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV
955956
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
956957
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
957958
github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
959+
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
958960
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
959961
github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
960962
github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
@@ -1427,6 +1429,7 @@ github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaR
14271429
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
14281430
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
14291431
github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
1432+
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
14301433
github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
14311434
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
14321435
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
@@ -1613,8 +1616,12 @@ github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03
16131616
github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8=
16141617
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.967 h1:ui73H/2pKk2aDCxaBCLAeMB3JlNgdCkn0nx1x0pqvf0=
16151618
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.967/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
1619+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.968 h1:SdgunZB3WU2vNn3H9dJQ1Z2cQK61vN79zCfnHk3Cu3Y=
1620+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.968/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0=
16161621
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.967 h1:4w33xHFgyrlFZYoGkPQ3uhld8tqoezpObfmCBrdlFBY=
16171622
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.967/go.mod h1:T0RlPIT2imBeCxLkWfzoiEVP1r5WwzC6becSq7wvSgU=
1623+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.968 h1:h7voJALWRkUX6w7obk9CWHppnJwZuQlreQJVDldVRxY=
1624+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.968/go.mod h1:3cwvPwyqYaYkzAsR4vbrE6mb3Ju9uY7Pj+wHYSVd3aw=
16181625
github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
16191626
github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
16201627
github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=

0 commit comments

Comments
 (0)