fix: only display section options which exists

Signed-off-by: Stefan Dej <[email protected]>
mainsail-crew · Dec 16, 2023 · a9bade9 · a9bade9
1 parent af5a3e1
commit a9bade9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/components/mixins/extruder.ts b/src/components/mixins/extruder.ts
@@ -1,7 +1,12 @@
 import Vue from 'vue'
 import { Component } from 'vue-property-decorator'
+import { PrinterStateExtruder } from '@/store/printer/types'
 @Component
 export default class ExtruderMixin extends Vue {
+    get extruders(): PrinterStateExtruder[] {
+        return this.$store.getters['printer/getExtruders']
+    }
+
     get activeExtruder(): string {
         return this.$store.state.printer.toolhead?.extruder
     }

diff --git a/src/components/panels/Extruder/ExtruderPanelSettings.vue b/src/components/panels/Extruder/ExtruderPanelSettings.vue
@@ -6,7 +6,7 @@
             </v-btn>
         </template>
         <v-list>
-            <v-list-item class="minHeight36">
+            <v-list-item v-if="toolchangeMacros.length" class="minHeight36">
                 <v-checkbox
                     v-model="showTools"
                     class="mt-0"
@@ -27,7 +27,7 @@
                     hide-details
                     :label="$t('Panels.ExtruderControlPanel.PressureAdvance')" />
             </v-list-item>
-            <v-list-item class="minHeight36">
+            <v-list-item v-if="existsFirmwareRetraction" class="minHeight36">
                 <v-checkbox
                     v-model="showFirmwareRetraction"
                     class="mt-0"
@@ -50,8 +50,9 @@ import Component from 'vue-class-component'
 import { Mixins } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import { mdiCog } from '@mdi/js'
+import ControlMixin from '@/components/mixins/control'
 @Component
-export default class ExtruderPanelSettings extends Mixins(BaseMixin) {
+export default class ExtruderPanelSettings extends Mixins(BaseMixin, ControlMixin) {
     mdiCog = mdiCog
 
     get showTools(): boolean {

diff --git a/src/components/panels/ExtruderControlPanel.vue b/src/components/panels/ExtruderControlPanel.vue
@@ -81,7 +81,7 @@
             <extruder-panel-settings />
         </template>
         <!-- TOOL SELECTOR BUTTONS -->
-        <extruder-control-panel-tools v-if="showTools" />
+        <extruder-control-panel-tools v-if="showTools && toolchangeMacros.length" />
         <!-- EXTRUSION FACTOR SLIDER -->
         <template v-if="showExtrusionFactor">
             <v-divider v-if="showTools" />
@@ -108,7 +108,7 @@
 <script lang="ts">
 import { mdiPrinter3dNozzle, mdiDotsVertical } from '@mdi/js'
 import { Component, Mixins } from 'vue-property-decorator'
-import { PrinterStateExtruder, PrinterStateMacro } from '@/store/printer/types'
+import { PrinterStateMacro } from '@/store/printer/types'
 import BaseMixin from '@/components/mixins/base'
 import ControlMixin from '@/components/mixins/control'
 import Panel from '@/components/ui/Panel.vue'
@@ -183,10 +183,6 @@ export default class ExtruderControlPanel extends Mixins(BaseMixin, ControlMixin
         return this.loadFilamentMacro !== undefined || this.unloadFilamentMacro !== undefined
     }
 
-    get extruders(): PrinterStateExtruder[] {
-        return this.$store.getters['printer/getExtruders']
-    }
-
     get showTools(): boolean {
         if (this.toolchangeMacros.length < 1) return false