From 42cd7093a9444c836f00a02bcbc5924355fcd451 Mon Sep 17 00:00:00 2001 From: Jacky Date: Mon, 22 Jul 2024 13:57:13 +0800 Subject: [PATCH] feat: hidden env management page and upgrade page when connect to remote node --- app/src/layouts/SideBar.vue | 6 ++++-- app/src/routes/index.ts | 12 +++++++++++- app/src/routes/type.d.ts | 2 +- go.mod | 6 +++--- go.sum | 7 +++++++ 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/src/layouts/SideBar.vue b/app/src/layouts/SideBar.vue index e857c10..dd2468f 100644 --- a/app/src/layouts/SideBar.vue +++ b/app/src/layouts/SideBar.vue @@ -51,7 +51,8 @@ const visible: ComputedRef = computed(() => { const res: sidebar[] = []; (sidebars.value || []).forEach(s => { - if (s.meta && s.meta.hiddenInSidebar) + if (s.meta && ((typeof s.meta.hiddenInSidebar === 'boolean' && s.meta.hiddenInSidebar) + || (typeof s.meta.hiddenInSidebar === 'function' && s.meta.hiddenInSidebar()))) return const t: sidebar = { @@ -62,7 +63,8 @@ const visible: ComputedRef = computed(() => { }; (s.children || []).forEach(c => { - if (c.meta && c.meta.hiddenInSidebar) + if (c.meta && ((typeof c.meta.hiddenInSidebar === 'boolean' && c.meta.hiddenInSidebar) + || (typeof c.meta.hiddenInSidebar === 'function' && c.meta.hiddenInSidebar()))) return t.children.push((c as unknown as sidebar)) diff --git a/app/src/routes/index.ts b/app/src/routes/index.ts index 4b2b0bc..10add44 100644 --- a/app/src/routes/index.ts +++ b/app/src/routes/index.ts @@ -17,7 +17,7 @@ import { } from '@ant-design/icons-vue' import NProgress from 'nprogress' -import { useUserStore } from '@/pinia' +import { useSettingsStore, useUserStore } from '@/pinia' import 'nprogress/nprogress.css' @@ -211,6 +211,11 @@ export const routes: RouteRecordRaw[] = [ meta: { name: () => $gettext('Environment'), icon: DatabaseOutlined, + hiddenInSidebar: (): boolean => { + const settings = useSettingsStore() + + return settings.is_remote + }, }, }, { @@ -261,6 +266,11 @@ export const routes: RouteRecordRaw[] = [ component: () => import('@/views/system/Upgrade.vue'), meta: { name: () => $gettext('Upgrade'), + hiddenInSidebar: (): boolean => { + const settings = useSettingsStore() + + return settings.is_remote + }, }, }], }, diff --git a/app/src/routes/type.d.ts b/app/src/routes/type.d.ts index f8e87e6..6ef6bb3 100644 --- a/app/src/routes/type.d.ts +++ b/app/src/routes/type.d.ts @@ -11,7 +11,7 @@ declare module 'vue-router' { interface RouteMeta { name: (() => string) icon?: AntDesignOutlinedIconType - hiddenInSidebar?: boolean + hiddenInSidebar?: boolean | (() => boolean) hideChildren?: boolean noAuth?: boolean status_code?: number diff --git a/go.mod b/go.mod index 94b3c1e..d923f55 100644 --- a/go.mod +++ b/go.mod @@ -21,6 +21,7 @@ require ( github.com/hpcloud/tail v1.0.0 github.com/jpillora/overseer v1.1.6 github.com/lib/pq v1.10.9 + github.com/minio/selfupdate v0.6.0 github.com/mitchellh/mapstructure v1.5.0 github.com/pkg/errors v0.9.1 github.com/pretty66/websocketproxy v0.0.0-20220507015215-930b3a686308 @@ -184,7 +185,6 @@ require ( github.com/microcosm-cc/bluemonday v1.0.27 // indirect github.com/miekg/dns v1.1.61 // indirect github.com/mimuret/golang-iij-dpf v0.9.1 // indirect - github.com/minio/selfupdate v0.6.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect @@ -228,8 +228,8 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/tdewolff/minify/v2 v2.20.37 // indirect github.com/tdewolff/parse/v2 v2.7.15 // indirect - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.967 // indirect - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.967 // indirect + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.968 // indirect + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.968 // indirect github.com/tklauser/go-sysconf v0.3.14 // indirect github.com/tklauser/numcpus v0.8.0 // indirect github.com/transip/gotransip/v6 v6.25.0 // indirect diff --git a/go.sum b/go.sum index bd6f3c3..95560c5 100644 --- a/go.sum +++ b/go.sum @@ -39,6 +39,7 @@ cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRY cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM= cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I= cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= +cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4= cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw= 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 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A= +github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= 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 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= 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 github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739/go.mod h1:XPuWBzvdUzhCuxWO1ojpXsyzsA5bFoS3tO/Q3kFuTG8= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.967 h1:ui73H/2pKk2aDCxaBCLAeMB3JlNgdCkn0nx1x0pqvf0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.967/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.968 h1:SdgunZB3WU2vNn3H9dJQ1Z2cQK61vN79zCfnHk3Cu3Y= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.968/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.967 h1:4w33xHFgyrlFZYoGkPQ3uhld8tqoezpObfmCBrdlFBY= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.967/go.mod h1:T0RlPIT2imBeCxLkWfzoiEVP1r5WwzC6becSq7wvSgU= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.968 h1:h7voJALWRkUX6w7obk9CWHppnJwZuQlreQJVDldVRxY= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dnspod v1.0.968/go.mod h1:3cwvPwyqYaYkzAsR4vbrE6mb3Ju9uY7Pj+wHYSVd3aw= github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU= github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY= github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=