fix: fix status groups in print history filter

Signed-off-by: Stefan Dej <meteyou@gmail.com>
mainsail-crew · Sep 23, 2024 · 59b07e1 · 59b07e1
1 parent 19f0116
commit 59b07e1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/components/charts/HistoryAllPrintStatusChart.vue b/src/components/charts/HistoryAllPrintStatusChart.vue
@@ -56,7 +56,7 @@ export default class HistoryAllPrintStatusChart extends Mixins(BaseMixin, ThemeM
             series: [
                 {
                     type: 'pie',
-                    data: this.printStatusArray,
+                    data: this.groupedPrintStatusArray,
                     avoidLabelOverlap: false,
                     radius: ['35%', '60%'],
                     emphasis: {
@@ -83,8 +83,8 @@ export default class HistoryAllPrintStatusChart extends Mixins(BaseMixin, ThemeM
         if (this.chart) this.chart.dispose()
     }
 
-    @Watch('printStatusArray')
-    printStatusArrayChanged(newVal: any) {
+    @Watch('groupedPrintStatusArray')
+    groupedPrintStatusArrayChanged(newVal: any) {
         this.chart?.setOption(
             {
                 series: {

diff --git a/src/components/mixins/historyStats.ts b/src/components/mixins/historyStats.ts
@@ -106,7 +106,7 @@ export default class HistoryStatsMixin extends Vue {
         const countSelected = this.$store.getters['server/history/getSelectedJobs'].length
         const orgArray = countSelected ? this.selectedPrintStatusChartData : this.allPrintStatusChartData
 
-        const output = orgArray.map((status) => ({
+        return orgArray.map((status) => ({
             ...status,
             name: status.displayName,
             value:
@@ -116,7 +116,9 @@ export default class HistoryStatsMixin extends Vue {
                       ? status.valueTime
                       : status.value,
         }))
+    }
 
-        return this.groupSmallEntries(output, 0.05)
+    get groupedPrintStatusArray() {
+        return this.groupSmallEntries(this.printStatusArray, 0.05)
     }
 }
diff --git a/src/components/panels/HistoryListPanel.vue b/src/components/panels/HistoryListPanel.vue
@@ -80,11 +80,8 @@
                                     @change="showPrintJobs = !showPrintJobs" />
                             </v-list-item>
                             <v-divider />
-                            <template v-if="allPrintStatusArray.length">
-                                <v-list-item
-                                    v-for="status of allPrintStatusArray"
-                                    :key="status.key"
-                                    class="minHeight36">
+                            <template v-if="printStatusArray.length">
+                                <v-list-item v-for="status of printStatusArray" :key="status.key" class="minHeight36">
                                     <v-checkbox
                                         class="mt-0"
                                         hide-details
@@ -179,6 +176,7 @@ import { GuiMaintenanceStateEntry, HistoryListRowMaintenance } from '@/store/gui
 import HistoryListEntryMaintenance from '@/components/panels/History/HistoryListEntryMaintenance.vue'
 import HistoryListPanelDeleteSelectedDialog from '@/components/dialogs/HistoryListPanelDeleteSelectedDialog.vue'
 import HistoryMixin from '@/components/mixins/history'
+import HistoryStatsMixin from '@/components/mixins/historyStats'
 
 export type HistoryListPanelRow = HistoryListRowJob | HistoryListRowMaintenance
 
@@ -202,7 +200,7 @@ export interface HistoryListPanelCol {
         Panel,
     },
 })
-export default class HistoryListPanel extends Mixins(BaseMixin, HistoryMixin) {
+export default class HistoryListPanel extends Mixins(BaseMixin, HistoryMixin, HistoryStatsMixin) {
     mdiCloseThick = mdiCloseThick
     mdiCog = mdiCog
     mdiDatabaseArrowDownOutline = mdiDatabaseArrowDownOutline