diff --git a/src/components/TheSidebar.vue b/src/components/TheSidebar.vue index c6ce91cd..f19592c5 100644 --- a/src/components/TheSidebar.vue +++ b/src/components/TheSidebar.vue @@ -147,17 +147,14 @@ export default class TheSidebarAlt extends Mixins(BaseMixin) { } showInNavi(route: AppRoute): boolean { - let bool = true + if (['shutdown', 'error', 'disconnected'].includes(this.klippy_state) && !route.alwaysShow) return false + else if (route.title === 'Webcam' && !this.boolNaviWebcam) return false + else if (route.moonrakerComponent && !this.moonrakerComponents.includes(route.moonrakerComponent)) return false + else if (route.registeredDirectory && !this.registeredDirectories.includes(route.registeredDirectory)) return false + else if (route.klipperComponent && !(route.klipperComponent in this.klipperConfigfileSettings)) return false + else if (route.klipperIsConnected && !this.klippyIsConnected) return false - if (['shutdown', 'error', 'disconnected'].includes(this.klippy_state) && !route.alwaysShow) bool = false - - if (route.title === 'Webcam' && !this.boolNaviWebcam) bool = false - - if (route.moonrakerComponent && !this.moonrakerComponents.includes(route.moonrakerComponent)) bool = false - if (route.registeredDirectory && !this.registeredDirectories.includes(route.registeredDirectory)) bool = false - if (route.klipperComponent && !(route.klipperComponent in this.klipperConfigfileSettings)) bool = false - - return bool + return true } mounted() { diff --git a/src/routes/index.ts b/src/routes/index.ts index f0cb3102..146f1eb6 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -41,6 +41,7 @@ const routes: AppRoute[] = [ component: Console, alwaysShow: true, showInNavi: true, + klipperIsConnected: true }, { title: 'Heightmap', @@ -117,5 +118,6 @@ export interface AppRoute { registeredDirectory?: string, moonrakerComponent?: string, klipperComponent?: string, + klipperIsConnected?: boolean, children?: AppRoute[] }