From 18ce88649fdd7f8e1a54c2912e0d37ac0ad42453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Wed, 14 Feb 2024 23:49:46 +0100
Subject: [PATCH 01/14] feat: Add ability to add history item to queue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Dziekoński <michal.dziekonski+github@gmail.com>
---
 src/components/panels/HistoryListPanel.vue | 22 ++++++++++++++++++++++
 src/locales/en.json                        |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/src/components/panels/HistoryListPanel.vue b/src/components/panels/HistoryListPanel.vue
index 3ef8af0b9..3cafc1d74 100644
--- a/src/components/panels/HistoryListPanel.vue
+++ b/src/components/panels/HistoryListPanel.vue
@@ -223,6 +223,12 @@
                     <v-icon class="mr-1">{{ mdiPrinter }}</v-icon>
                     {{ $t('History.Reprint') }}
                 </v-list-item>
+                <v-list-item
+                    v-if="contextMenu.item.exists && isJobQueueAvailable"
+                    @click="addToQueue(contextMenu.item)">
+                    <v-icon class="mr-1">{{ mdiPlaylistPlus }}</v-icon>
+                    {{ $t('History.AddToQueue') }}
+                </v-list-item>
                 <v-list-item class="red--text" @click="deleteDialog = true">
                     <v-icon class="mr-1" color="error">{{ mdiDelete }}</v-icon>
                     {{ $t('History.Delete') }}
@@ -509,6 +515,7 @@ import {
     mdiDatabaseArrowDownOutline,
     mdiCog,
     mdiPrinter,
+    mdiPlaylistPlus,
     mdiTextBoxSearch,
     mdiFile,
     mdiFileDocumentMultipleOutline,
@@ -529,6 +536,7 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
     mdiDatabaseArrowDownOutline = mdiDatabaseArrowDownOutline
     mdiCog = mdiCog
     mdiPrinter = mdiPrinter
+    mdiPlaylistPlus = mdiPlaylistPlus
     mdiFileDocumentMultipleOutline = mdiFileDocumentMultipleOutline
     mdiTextBoxSearch = mdiTextBoxSearch
     mdiFile = mdiFile
@@ -785,6 +793,10 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
         return this.$store.state.gui.general?.language ?? 'en'
     }
 
+    get isJobQueueAvailable() {
+        return this.moonrakerComponents.includes('job_queue')
+    }
+
     refreshHistory() {
         this.$store.dispatch('socket/addLoading', { name: 'historyLoadAll' })
 
@@ -941,6 +953,16 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
             this.$socket.emit('printer.print.start', { filename: item.filename }, { action: 'switchToDashboard' })
     }
 
+    async addToQueue(item: ServerHistoryStateJob) {
+        if (!item.exists || !this.isJobQueueAvailable) {
+            return
+        }
+
+        await this.$store.dispatch('server/jobQueue/addToQueue', [item.filename])
+
+        this.$toast.info(this.$t('History.AddToQueueSuccessful', { filename: item.filename }).toString())
+    }
+
     deleteJob() {
         this.$socket.emit(
             'server.history.delete_job',
diff --git a/src/locales/en.json b/src/locales/en.json
index 58639460a..80d2e0a42 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -321,6 +321,8 @@
     },
     "History": {
         "AddNote": "Add note",
+        "AddToQueue": "Add to Queue",
+        "AddToQueueSuccessful": "File {filename} added to Queue.",
         "AllJobs": "All",
         "AvgPrinttime": "Print Time - Ø",
         "Cancel": "Cancel",

From 64e2b4e52b607e226948be8943ed14b73b064823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Thu, 15 Feb 2024 00:56:27 +0100
Subject: [PATCH 02/14] feat: Add reusable AddBatchToQueueDialog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Dziekoński <michal.dziekonski+github@gmail.com>
---
 .../dialogs/AddBatchToQueueDialog.vue         | 116 ++++++++++++++++++
 src/locales/en.json                           |   5 +
 2 files changed, 121 insertions(+)
 create mode 100644 src/components/dialogs/AddBatchToQueueDialog.vue

diff --git a/src/components/dialogs/AddBatchToQueueDialog.vue b/src/components/dialogs/AddBatchToQueueDialog.vue
new file mode 100644
index 000000000..d6c61105d
--- /dev/null
+++ b/src/components/dialogs/AddBatchToQueueDialog.vue
@@ -0,0 +1,116 @@
+<template>
+    <v-dialog v-model="isVisible" max-width="400" @click:outside="closeDialog" @keydown.esc="closeDialog">
+        <panel
+            :title="$t('Dialogs.AddBatchToQueue.AddToQueue')"
+            card-class="gcode-files-add-to-queue-dialog"
+            :icon="mdiPlaylistPlus"
+            :margin-bottom="false">
+            <template #buttons>
+                <v-btn icon tile @click="closeDialog">
+                    <v-icon>{{ mdiCloseThick }}</v-icon>
+                </v-btn>
+            </template>
+
+            <v-card-text>
+                <v-text-field
+                    ref="inputFieldAddToQueueCount"
+                    v-model="count"
+                    :label="$t('Dialogs.AddBatchToQueue.Count')"
+                    required
+                    hide-spin-buttons
+                    type="number"
+                    :rules="countInputRules"
+                    @keyup.enter="addBatchToQueueAction">
+                    <template #append-outer>
+                        <div class="_spin_button_group">
+                            <v-btn class="mt-n3" icon plain small @click="count++">
+                                <v-icon>{{ mdiChevronUp }}</v-icon>
+                            </v-btn>
+                            <v-btn :disabled="count <= 1" class="mb-n3" icon plain small @click="count--">
+                                <v-icon>{{ mdiChevronDown }}</v-icon>
+                            </v-btn>
+                        </div>
+                    </template>
+                </v-text-field>
+            </v-card-text>
+            <v-card-actions>
+                <v-spacer></v-spacer>
+                <v-btn color="" text @click="closeDialog">{{ $t('Dialogs.AddBatchToQueue.Cancel') }}</v-btn>
+                <v-btn color="primary" text @click="addBatchToQueueAction">
+                    {{ $t('Dialogs.AddBatchToQueue.AddToQueue') }}
+                </v-btn>
+            </v-card-actions>
+        </panel>
+    </v-dialog>
+</template>
+
+<script lang="ts">
+import Component from 'vue-class-component'
+import { Mixins, Prop, Watch } from 'vue-property-decorator'
+import BaseMixin from '@/components/mixins/base'
+import { mdiChevronDown, mdiChevronUp, mdiPlaylistPlus, mdiCloseThick } from '@mdi/js'
+
+export interface addBatchToQueueDialogProps {
+    isVisible: boolean
+    filename: string
+}
+
+const defaultCount = 1
+
+@Component
+export default class AddBatchToQueueDialog extends Mixins(BaseMixin) {
+    mdiChevronDown = mdiChevronDown
+    mdiChevronUp = mdiChevronUp
+    mdiPlaylistPlus = mdiPlaylistPlus
+    mdiCloseThick = mdiCloseThick
+
+    /**
+     * Is dialog currently visible?
+     */
+    @Prop({ default: false }) declare readonly isVisible: addBatchToQueueDialogProps['isVisible']
+    /**
+     * Filename of the model to be added to the Queue.
+     */
+    @Prop({ required: true }) declare readonly filename: addBatchToQueueDialogProps['filename']
+
+    private count: number = defaultCount
+
+    private countInputRules = [
+        (value: string) => !!value || this.$t('JobQueue.InvalidCountEmpty'),
+        (value: string) => parseInt(value, 10) > 0 || this.$t('JobQueue.InvalidCountGreaterZero'),
+    ]
+
+    async addBatchToQueueAction() {
+        const filename = this.filename
+
+        const array: string[] = []
+        for (let i = 0; i < this.count; i++) {
+            array.push(filename)
+        }
+
+        await this.$store.dispatch('server/jobQueue/addToQueue', array)
+
+        this.closeDialog()
+    }
+
+    closeDialog() {
+        this.$emit('closeDialog')
+    }
+
+    @Watch('isVisible')
+    isVisibleChanged(newIsVisible: boolean) {
+        if (newIsVisible) {
+            this.count = defaultCount
+        }
+    }
+}
+</script>
+
+<style scoped>
+._spin_button_group {
+    width: 24px;
+    margin-top: -6px;
+    margin-left: -6px;
+    margin-bottom: -6px;
+}
+</style>
diff --git a/src/locales/en.json b/src/locales/en.json
index 80d2e0a42..749827185 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -154,6 +154,11 @@
             "Headline": "Start Job",
             "Print": "print",
             "Timelapse": "Timelapse"
+        },
+        "AddBatchToQueue": {
+            "AddToQueue": "Add to Queue",
+            "Count": "Count",
+            "Cancel": "Cancel"
         }
     },
     "Editor": {

From cdfe97fb3b308c7fbe5b064f2445066ebe52800a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Thu, 15 Feb 2024 00:58:44 +0100
Subject: [PATCH 03/14] feat: Use AddBatchToQueueDialog in Gcode files panel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Dziekoński <michal.dziekonski+github@gmail.com>
---
 src/components/panels/GcodefilesPanel.vue | 90 ++++-------------------
 1 file changed, 13 insertions(+), 77 deletions(-)

diff --git a/src/components/panels/GcodefilesPanel.vue b/src/components/panels/GcodefilesPanel.vue
index 052a61bde..944d94727 100644
--- a/src/components/panels/GcodefilesPanel.vue
+++ b/src/components/panels/GcodefilesPanel.vue
@@ -568,53 +568,10 @@
                 </v-card-actions>
             </panel>
         </v-dialog>
-        <v-dialog v-model="dialogAddBatchToQueue.show" max-width="400">
-            <panel
-                :title="$t('Files.AddToQueue')"
-                card-class="gcode-files-add-to-queue-dialog"
-                :icon="mdiPlaylistPlus"
-                :margin-bottom="false">
-                <template #buttons>
-                    <v-btn icon tile @click="dialogAddBatchToQueue.show = false">
-                        <v-icon>{{ mdiCloseThick }}</v-icon>
-                    </v-btn>
-                </template>
-
-                <v-card-text>
-                    <v-text-field
-                        ref="inputFieldAddToQueueCount"
-                        v-model="dialogAddBatchToQueue.count"
-                        :label="$t('Files.Count')"
-                        required
-                        hide-spin-buttons
-                        type="number"
-                        :rules="countInputRules"
-                        @keyup.enter="addBatchToQueueAction">
-                        <template #append-outer>
-                            <div class="_spin_button_group">
-                                <v-btn class="mt-n3" icon plain small @click="dialogAddBatchToQueue.count++">
-                                    <v-icon>{{ mdiChevronUp }}</v-icon>
-                                </v-btn>
-                                <v-btn
-                                    :disabled="dialogAddBatchToQueue.count <= 1"
-                                    class="mb-n3"
-                                    icon
-                                    plain
-                                    small
-                                    @click="dialogAddBatchToQueue.count--">
-                                    <v-icon>{{ mdiChevronDown }}</v-icon>
-                                </v-btn>
-                            </div>
-                        </template>
-                    </v-text-field>
-                </v-card-text>
-                <v-card-actions>
-                    <v-spacer></v-spacer>
-                    <v-btn color="" text @click="dialogAddBatchToQueue.show = false">{{ $t('Files.Cancel') }}</v-btn>
-                    <v-btn color="primary" text @click="addBatchToQueueAction">{{ $t('Files.AddToQueue') }}</v-btn>
-                </v-card-actions>
-            </panel>
-        </v-dialog>
+        <add-batch-to-queue-dialog
+            :is-visible="dialogAddBatchToQueue.isVisible"
+            :filename="dialogAddBatchToQueue.filename"
+            @closeDialog="closeAddBatchToQueueDialog" />
     </div>
 </template>
 
@@ -628,8 +585,6 @@ import Panel from '@/components/ui/Panel.vue'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
 import draggable from 'vuedraggable'
 import {
-    mdiChevronDown,
-    mdiChevronUp,
     mdiDragVertical,
     mdiCheckboxBlankOutline,
     mdiCheckboxMarked,
@@ -654,6 +609,7 @@ import {
     mdiContentCopy,
 } from '@mdi/js'
 import StartPrintDialog from '@/components/dialogs/StartPrintDialog.vue'
+import AddBatchToQueueDialog, { addBatchToQueueDialogProps } from '@/components/dialogs/AddBatchToQueueDialog.vue'
 import ControlMixin from '@/components/mixins/control'
 import PathNavigation from '@/components/ui/PathNavigation.vue'
 
@@ -675,12 +631,6 @@ interface dialogPrintFile {
     item: FileStateGcodefile
 }
 
-interface dialogAddBatchToQueue {
-    show: boolean
-    count: number
-    item: FileStateGcodefile
-}
-
 interface dialogRenameObject {
     show: boolean
     newName: string
@@ -698,11 +648,9 @@ interface tableColumnSetting {
 }
 
 @Component({
-    components: { StartPrintDialog, Panel, SettingsRow, PathNavigation, draggable },
+    components: { StartPrintDialog, AddBatchToQueueDialog, Panel, SettingsRow, PathNavigation, draggable },
 })
 export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
-    mdiChevronDown = mdiChevronDown
-    mdiChevronUp = mdiChevronUp
     mdiContentCopy = mdiContentCopy
     mdiFile = mdiFile
     mdiFileDocumentMultipleOutline = mdiFileDocumentMultipleOutline
@@ -779,10 +727,9 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
         item: { ...this.contextMenu.item },
     }
 
-    private dialogAddBatchToQueue: dialogAddBatchToQueue = {
-        show: false,
-        count: 1,
-        item: { ...this.contextMenu.item },
+    private dialogAddBatchToQueue: addBatchToQueueDialogProps = {
+        isVisible: false,
+        filename: '',
     }
 
     private dialogRenameFile: dialogRenameObject = {
@@ -1272,23 +1219,12 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
     }
 
     openAddBatchToQueueDialog(item: FileStateGcodefile) {
-        this.dialogAddBatchToQueue.show = true
-        this.dialogAddBatchToQueue.count = 1
-        this.dialogAddBatchToQueue.item = item
+        this.dialogAddBatchToQueue.isVisible = true
+        this.dialogAddBatchToQueue.filename = item.filename
     }
 
-    async addBatchToQueueAction() {
-        let filename = [this.currentPath, this.dialogAddBatchToQueue.item.filename].join('/')
-        if (filename.startsWith('/')) filename = filename.slice(1)
-
-        const array: string[] = []
-        for (let i = 0; i < this.dialogAddBatchToQueue.count; i++) {
-            array.push(filename)
-        }
-
-        await this.$store.dispatch('server/jobQueue/addToQueue', array)
-
-        this.dialogAddBatchToQueue.show = false
+    closeAddBatchToQueueDialog() {
+        this.dialogAddBatchToQueue.isVisible = false
     }
 
     changeMetadataVisible(name: string, value: boolean) {

From 390b9ad10b86303e6a3fb97ed8fd6de8a60913eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Thu, 15 Feb 2024 01:02:07 +0100
Subject: [PATCH 04/14] feat: Use AddBatchToQueueDialog in History list panel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Dziekoński <michal.dziekonski+github@gmail.com>
---
 src/components/panels/HistoryListPanel.vue | 28 +++++++++++++++++++++-
 src/locales/en.json                        |  1 +
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/components/panels/HistoryListPanel.vue b/src/components/panels/HistoryListPanel.vue
index 3cafc1d74..872f6ea86 100644
--- a/src/components/panels/HistoryListPanel.vue
+++ b/src/components/panels/HistoryListPanel.vue
@@ -229,6 +229,12 @@
                     <v-icon class="mr-1">{{ mdiPlaylistPlus }}</v-icon>
                     {{ $t('History.AddToQueue') }}
                 </v-list-item>
+                <v-list-item
+                    v-if="contextMenu.item.exists && isJobQueueAvailable"
+                    @click="openAddBatchToQueueDialog(contextMenu.item)">
+                    <v-icon class="mr-1">{{ mdiPlaylistPlus }}</v-icon>
+                    {{ $t('History.AddBatchToQueue') }}
+                </v-list-item>
                 <v-list-item class="red--text" @click="deleteDialog = true">
                     <v-icon class="mr-1" color="error">{{ mdiDelete }}</v-icon>
                     {{ $t('History.Delete') }}
@@ -499,6 +505,10 @@
                 </v-card-actions>
             </panel>
         </v-dialog>
+        <add-batch-to-queue-dialog
+            :is-visible="dialogAddBatchToQueue.isVisible"
+            :filename="dialogAddBatchToQueue.filename"
+            @closeDialog="closeAddBatchToQueueDialog" />
     </div>
 </template>
 
@@ -527,8 +537,10 @@ import {
     mdiNotebook,
     mdiFileCancel,
 } from '@mdi/js'
+import AddBatchToQueueDialog, { addBatchToQueueDialogProps } from '@/components/dialogs/AddBatchToQueueDialog.vue'
+
 @Component({
-    components: { Panel },
+    components: { Panel, AddBatchToQueueDialog },
 })
 export default class HistoryListPanel extends Mixins(BaseMixin) {
     mdiDatabaseExportOutline = mdiDatabaseExportOutline
@@ -567,6 +579,11 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
         boolShow: false,
     }
 
+    private dialogAddBatchToQueue: addBatchToQueueDialogProps = {
+        isVisible: false,
+        filename: '',
+    }
+
     private noteDialog: {
         item: ServerHistoryStateJob | null
         note: string
@@ -963,6 +980,15 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
         this.$toast.info(this.$t('History.AddToQueueSuccessful', { filename: item.filename }).toString())
     }
 
+    openAddBatchToQueueDialog(item: ServerHistoryStateJob) {
+        this.dialogAddBatchToQueue.isVisible = true
+        this.dialogAddBatchToQueue.filename = item.filename
+    }
+
+    closeAddBatchToQueueDialog() {
+        this.dialogAddBatchToQueue.isVisible = false
+    }
+
     deleteJob() {
         this.$socket.emit(
             'server.history.delete_job',
diff --git a/src/locales/en.json b/src/locales/en.json
index 749827185..830ddc21d 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -326,6 +326,7 @@
     },
     "History": {
         "AddNote": "Add note",
+        "AddBatchToQueue": "Add batch to Queue",
         "AddToQueue": "Add to Queue",
         "AddToQueueSuccessful": "File {filename} added to Queue.",
         "AllJobs": "All",

From 689d7e757d76ff15dd60e9e6d6669c09cf00e321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Thu, 15 Feb 2024 01:30:48 +0100
Subject: [PATCH 05/14] feat: Use AddBatchToQueueDialog in Status Gcode files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Dziekoński <michal.dziekonski+github@gmail.com>
---
 src/components/panels/Status/Gcodefiles.vue | 92 +++------------------
 1 file changed, 13 insertions(+), 79 deletions(-)

diff --git a/src/components/panels/Status/Gcodefiles.vue b/src/components/panels/Status/Gcodefiles.vue
index 6ddcb7a66..b62e4e260 100644
--- a/src/components/panels/Status/Gcodefiles.vue
+++ b/src/components/panels/Status/Gcodefiles.vue
@@ -173,53 +173,10 @@
             </panel>
         </v-dialog>
 
-        <v-dialog v-model="dialogAddBatchToQueue.show" max-width="400">
-            <panel
-                :title="$t('Files.AddToQueue')"
-                card-class="gcode-files-add-to-queue-dialog"
-                :icon="mdiPlaylistPlus"
-                :margin-bottom="false">
-                <template #buttons>
-                    <v-btn icon tile @click="dialogAddBatchToQueue.show = false">
-                        <v-icon>{{ mdiCloseThick }}</v-icon>
-                    </v-btn>
-                </template>
-
-                <v-card-text>
-                    <v-text-field
-                        ref="inputFieldAddToQueueCount"
-                        v-model="dialogAddBatchToQueue.count"
-                        :label="$t('Files.Count')"
-                        required
-                        hide-spin-buttons
-                        type="number"
-                        :rules="countInputRules"
-                        @keyup.enter="addBatchToQueueAction">
-                        <template #append-outer>
-                            <div class="_spin_button_group">
-                                <v-btn class="mt-n3" icon plain small @click="dialogAddBatchToQueue.count++">
-                                    <v-icon>{{ mdiChevronUp }}</v-icon>
-                                </v-btn>
-                                <v-btn
-                                    :disabled="dialogAddBatchToQueue.count <= 1"
-                                    class="mb-n3"
-                                    icon
-                                    plain
-                                    small
-                                    @click="dialogAddBatchToQueue.count--">
-                                    <v-icon>{{ mdiChevronDown }}</v-icon>
-                                </v-btn>
-                            </div>
-                        </template>
-                    </v-text-field>
-                </v-card-text>
-                <v-card-actions>
-                    <v-spacer></v-spacer>
-                    <v-btn color="" text @click="dialogAddBatchToQueue.show = false">{{ $t('Files.Cancel') }}</v-btn>
-                    <v-btn color="primary" text @click="addBatchToQueueAction">{{ $t('Files.AddToQueue') }}</v-btn>
-                </v-card-actions>
-            </panel>
-        </v-dialog>
+        <add-batch-to-queue-dialog
+            :is-visible="dialogAddBatchToQueue.isVisible"
+            :filename="dialogAddBatchToQueue.filename"
+            @closeDialog="closeAddBatchToQueueDialog" />
     </v-card>
 </template>
 
@@ -246,6 +203,7 @@ import {
 } from '@mdi/js'
 import Panel from '@/components/ui/Panel.vue'
 import { defaultBigThumbnailBackground } from '@/store/variables'
+import AddBatchToQueueDialog, { addBatchToQueueDialogProps } from '@/components/dialogs/AddBatchToQueueDialog.vue'
 
 interface dialogRenameObject {
     show: boolean
@@ -253,16 +211,11 @@ interface dialogRenameObject {
     item: FileStateGcodefile
 }
 
-interface dialogAddBatchToQueue {
-    show: boolean
-    count: number
-    item: FileStateGcodefile
-}
-
 @Component({
     components: {
         Panel,
         StartPrintDialog,
+        AddBatchToQueueDialog,
     },
 })
 export default class StatusPanelGcodefiles extends Mixins(BaseMixin, ControlMixin) {
@@ -320,10 +273,9 @@ export default class StatusPanelGcodefiles extends Mixins(BaseMixin, ControlMixi
         item: { ...this.dialogFile },
     }
 
-    private dialogAddBatchToQueue: dialogAddBatchToQueue = {
-        show: false,
-        count: 1,
-        item: { ...this.contextMenu.item },
+    private dialogAddBatchToQueue: addBatchToQueueDialogProps = {
+        isVisible: false,
+        filename: '',
     }
 
     private countInputRules = [
@@ -470,23 +422,12 @@ export default class StatusPanelGcodefiles extends Mixins(BaseMixin, ControlMixi
     }
 
     openAddBatchToQueueDialog(item: FileStateGcodefile) {
-        this.dialogAddBatchToQueue.show = true
-        this.dialogAddBatchToQueue.count = 1
-        this.dialogAddBatchToQueue.item = item
+        this.dialogAddBatchToQueue.isVisible = true
+        this.dialogAddBatchToQueue.filename = item.filename
     }
 
-    async addBatchToQueueAction() {
-        let filename = [this.currentPath, this.dialogAddBatchToQueue.item.filename].join('/')
-        if (filename.startsWith('/')) filename = filename.slice(1)
-
-        const array: string[] = []
-        for (let i = 0; i < this.dialogAddBatchToQueue.count; i++) {
-            array.push(filename)
-        }
-
-        await this.$store.dispatch('server/jobQueue/addToQueue', array)
-
-        this.dialogAddBatchToQueue.show = false
+    closeAddBatchToQueueDialog() {
+        this.dialogAddBatchToQueue.isVisible = false
     }
 
     view3D(item: FileStateGcodefile) {
@@ -571,11 +512,4 @@ export default class StatusPanelGcodefiles extends Mixins(BaseMixin, ControlMixi
 .filesGcodeCard {
     position: relative;
 }
-
-._spin_button_group {
-    width: 24px;
-    margin-top: -6px;
-    margin-left: -6px;
-    margin-bottom: -6px;
-}
 </style>

From db148f4c6a50c3763b3d14f0cb8e12105c8ee8f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Thu, 15 Feb 2024 01:33:07 +0100
Subject: [PATCH 06/14] feat: Remove dead code & adjust filename creation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Dziekoński <michal.dziekonski+github@gmail.com>
---
 src/components/panels/GcodefilesPanel.vue | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/components/panels/GcodefilesPanel.vue b/src/components/panels/GcodefilesPanel.vue
index 944d94727..66ec7d5a9 100644
--- a/src/components/panels/GcodefilesPanel.vue
+++ b/src/components/panels/GcodefilesPanel.vue
@@ -1219,8 +1219,11 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
     }
 
     openAddBatchToQueueDialog(item: FileStateGcodefile) {
+        let filename = [this.currentPath, item.filename].join('/')
+        if (filename.startsWith('/')) filename = filename.slice(1)
+
         this.dialogAddBatchToQueue.isVisible = true
-        this.dialogAddBatchToQueue.filename = item.filename
+        this.dialogAddBatchToQueue.filename = filename
     }
 
     closeAddBatchToQueueDialog() {
@@ -1485,15 +1488,6 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
 }
 </script>
 
-<style scoped>
-._spin_button_group {
-    width: 24px;
-    margin-top: -6px;
-    margin-left: -6px;
-    margin-bottom: -6px;
-}
-</style>
-
 <style>
 /*noinspection CssUnusedSymbol*/
 .files-table .v-data-table-header__icon {

From 01fa0b680b231808241bf10a96a8404ee5c8452c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Thu, 15 Feb 2024 01:34:18 +0100
Subject: [PATCH 07/14] feat: Linting fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Dziekoński <michal.dziekonski+github@gmail.com>
---
 src/locales/en.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 830ddc21d..7bae47725 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -147,6 +147,11 @@
         "SetupConsole": "Setup Console"
     },
     "Dialogs": {
+        "AddBatchToQueue": {
+            "AddToQueue": "Add to Queue",
+            "Cancel": "Cancel",
+            "Count": "Count"
+        },
         "StartPrint": {
             "Cancel": "Cancel",
             "DoYouWantToStartFilename": "Do you want to start {filename}?",
@@ -154,11 +159,6 @@
             "Headline": "Start Job",
             "Print": "print",
             "Timelapse": "Timelapse"
-        },
-        "AddBatchToQueue": {
-            "AddToQueue": "Add to Queue",
-            "Count": "Count",
-            "Cancel": "Cancel"
         }
     },
     "Editor": {
@@ -325,8 +325,8 @@
         "Wireframe": "Wireframe"
     },
     "History": {
-        "AddNote": "Add note",
         "AddBatchToQueue": "Add batch to Queue",
+        "AddNote": "Add note",
         "AddToQueue": "Add to Queue",
         "AddToQueueSuccessful": "File {filename} added to Queue.",
         "AllJobs": "All",

From 0fa26048b53b7087a395c7935de71a5b0a52d299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Thu, 15 Feb 2024 01:38:45 +0100
Subject: [PATCH 08/14] feat: Add add batch to queue feedback in History
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Dziekoński <michal.dziekonski+github@gmail.com>
---
 src/components/dialogs/AddBatchToQueueDialog.vue |  9 +++++++++
 src/components/panels/HistoryListPanel.vue       | 12 ++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/components/dialogs/AddBatchToQueueDialog.vue b/src/components/dialogs/AddBatchToQueueDialog.vue
index d6c61105d..f4b223999 100644
--- a/src/components/dialogs/AddBatchToQueueDialog.vue
+++ b/src/components/dialogs/AddBatchToQueueDialog.vue
@@ -55,6 +55,10 @@ export interface addBatchToQueueDialogProps {
     filename: string
 }
 
+export interface addBatchToQueueEventData {
+    filename: string
+}
+
 const defaultCount = 1
 
 @Component
@@ -90,9 +94,14 @@ export default class AddBatchToQueueDialog extends Mixins(BaseMixin) {
 
         await this.$store.dispatch('server/jobQueue/addToQueue', array)
 
+        this.emitAddToQueueEvent({ filename })
         this.closeDialog()
     }
 
+    emitAddToQueueEvent(eventData: addBatchToQueueEventData) {
+        this.$emit('addToQueue', eventData)
+    }
+
     closeDialog() {
         this.$emit('closeDialog')
     }
diff --git a/src/components/panels/HistoryListPanel.vue b/src/components/panels/HistoryListPanel.vue
index 872f6ea86..ade4b54ac 100644
--- a/src/components/panels/HistoryListPanel.vue
+++ b/src/components/panels/HistoryListPanel.vue
@@ -508,7 +508,8 @@
         <add-batch-to-queue-dialog
             :is-visible="dialogAddBatchToQueue.isVisible"
             :filename="dialogAddBatchToQueue.filename"
-            @closeDialog="closeAddBatchToQueueDialog" />
+            @closeDialog="closeAddBatchToQueueDialog"
+            @addToQueue="showAddBatchToQueueFeedbackToast" />
     </div>
 </template>
 
@@ -537,7 +538,10 @@ import {
     mdiNotebook,
     mdiFileCancel,
 } from '@mdi/js'
-import AddBatchToQueueDialog, { addBatchToQueueDialogProps } from '@/components/dialogs/AddBatchToQueueDialog.vue'
+import AddBatchToQueueDialog, {
+    addBatchToQueueDialogProps,
+    addBatchToQueueEventData,
+} from '@/components/dialogs/AddBatchToQueueDialog.vue'
 
 @Component({
     components: { Panel, AddBatchToQueueDialog },
@@ -985,6 +989,10 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
         this.dialogAddBatchToQueue.filename = item.filename
     }
 
+    showAddBatchToQueueFeedbackToast(eventData: addBatchToQueueEventData) {
+        this.$toast.info(this.$t('History.AddToQueueSuccessful', { filename: eventData.filename }).toString())
+    }
+
     closeAddBatchToQueueDialog() {
         this.dialogAddBatchToQueue.isVisible = false
     }

From 935bba775dfa1a2c8c48afc31f2eec2f387c00dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Thu, 15 Feb 2024 01:44:12 +0100
Subject: [PATCH 09/14] feat: History callback safeguards (for completeness)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Dziekoński <michal.dziekonski+github@gmail.com>
---
 src/components/panels/HistoryListPanel.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/panels/HistoryListPanel.vue b/src/components/panels/HistoryListPanel.vue
index ade4b54ac..0b3be4188 100644
--- a/src/components/panels/HistoryListPanel.vue
+++ b/src/components/panels/HistoryListPanel.vue
@@ -985,6 +985,10 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
     }
 
     openAddBatchToQueueDialog(item: ServerHistoryStateJob) {
+        if (!item.exists || !this.isJobQueueAvailable) {
+            return
+        }
+
         this.dialogAddBatchToQueue.isVisible = true
         this.dialogAddBatchToQueue.filename = item.filename
     }

From bf5dd33a07192927769a68be071c0e4e7154355a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dzieko=C5=84ski?=
 <michal.dziekonski+github@gmail.com>
Date: Thu, 15 Feb 2024 01:59:45 +0100
Subject: [PATCH 10/14] feat: Add proper form validation to
 AddBatchToQueueDialog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Dziekoński <michal.dziekonski+github@gmail.com>
---
 .../dialogs/AddBatchToQueueDialog.vue         | 108 ++++++++++++------
 1 file changed, 71 insertions(+), 37 deletions(-)

diff --git a/src/components/dialogs/AddBatchToQueueDialog.vue b/src/components/dialogs/AddBatchToQueueDialog.vue
index f4b223999..69bce1968 100644
--- a/src/components/dialogs/AddBatchToQueueDialog.vue
+++ b/src/components/dialogs/AddBatchToQueueDialog.vue
@@ -11,35 +11,42 @@
                 </v-btn>
             </template>
 
-            <v-card-text>
-                <v-text-field
-                    ref="inputFieldAddToQueueCount"
-                    v-model="count"
-                    :label="$t('Dialogs.AddBatchToQueue.Count')"
-                    required
-                    hide-spin-buttons
-                    type="number"
-                    :rules="countInputRules"
-                    @keyup.enter="addBatchToQueueAction">
-                    <template #append-outer>
-                        <div class="_spin_button_group">
-                            <v-btn class="mt-n3" icon plain small @click="count++">
-                                <v-icon>{{ mdiChevronUp }}</v-icon>
-                            </v-btn>
-                            <v-btn :disabled="count <= 1" class="mb-n3" icon plain small @click="count--">
-                                <v-icon>{{ mdiChevronDown }}</v-icon>
-                            </v-btn>
-                        </div>
-                    </template>
-                </v-text-field>
-            </v-card-text>
-            <v-card-actions>
-                <v-spacer></v-spacer>
-                <v-btn color="" text @click="closeDialog">{{ $t('Dialogs.AddBatchToQueue.Cancel') }}</v-btn>
-                <v-btn color="primary" text @click="addBatchToQueueAction">
-                    {{ $t('Dialogs.AddBatchToQueue.AddToQueue') }}
-                </v-btn>
-            </v-card-actions>
+            <v-form v-model="form.isValid" @submit.prevent="addBatchToQueueAction">
+                <v-card-text>
+                    <v-text-field
+                        ref="inputFieldAddToQueueCount"
+                        v-model="form.inputs.count"
+                        :label="$t('Dialogs.AddBatchToQueue.Count')"
+                        required
+                        hide-spin-buttons
+                        type="number"
+                        :rules="rules.count">
+                        <template #append-outer>
+                            <div class="_spin_button_group">
+                                <v-btn class="mt-n3" icon plain small @click="form.inputs.count++">
+                                    <v-icon>{{ mdiChevronUp }}</v-icon>
+                                </v-btn>
+                                <v-btn
+                                    :disabled="form.inputs.count <= 1"
+                                    class="mb-n3"
+                                    icon
+                                    plain
+                                    small
+                                    @click="form.inputs.count--">
+                                    <v-icon>{{ mdiChevronDown }}</v-icon>
+                                </v-btn>
+                            </div>
+                        </template>
+                    </v-text-field>
+                </v-card-text>
+                <v-card-actions>
+                    <v-spacer></v-spacer>
+                    <v-btn color="" text @click="closeDialog">{{ $t('Dialogs.AddBatchToQueue.Cancel') }}</v-btn>
+                    <v-btn color="primary" text type="submit" :disabled="!form.isValid">
+                        {{ $t('Dialogs.AddBatchToQueue.AddToQueue') }}
+                    </v-btn>
+                </v-card-actions>
+            </v-form>
         </panel>
     </v-dialog>
 </template>
@@ -59,7 +66,23 @@ export interface addBatchToQueueEventData {
     filename: string
 }
 
-const defaultCount = 1
+interface formState {
+    isValid: boolean
+    inputs: {
+        count: number
+    }
+}
+
+const defaultFormInputs: formState['inputs'] = {
+    count: 1,
+}
+
+const defaultFormState: formState = {
+    isValid: false,
+    inputs: {
+        ...defaultFormInputs,
+    },
+}
 
 @Component
 export default class AddBatchToQueueDialog extends Mixins(BaseMixin) {
@@ -77,18 +100,20 @@ export default class AddBatchToQueueDialog extends Mixins(BaseMixin) {
      */
     @Prop({ required: true }) declare readonly filename: addBatchToQueueDialogProps['filename']
 
-    private count: number = defaultCount
+    private form: formState = defaultFormState
 
-    private countInputRules = [
-        (value: string) => !!value || this.$t('JobQueue.InvalidCountEmpty'),
-        (value: string) => parseInt(value, 10) > 0 || this.$t('JobQueue.InvalidCountGreaterZero'),
-    ]
+    private rules = {
+        count: [
+            (value: string) => !!value || this.$t('JobQueue.InvalidCountEmpty'),
+            (value: string) => parseInt(value, 10) > 0 || this.$t('JobQueue.InvalidCountGreaterZero'),
+        ],
+    }
 
     async addBatchToQueueAction() {
         const filename = this.filename
 
         const array: string[] = []
-        for (let i = 0; i < this.count; i++) {
+        for (let i = 0; i < this.form.inputs.count; i++) {
             array.push(filename)
         }
 
@@ -106,10 +131,19 @@ export default class AddBatchToQueueDialog extends Mixins(BaseMixin) {
         this.$emit('closeDialog')
     }
 
+    resetFormState() {
+        this.form = {
+            ...defaultFormState,
+            inputs: {
+                ...defaultFormInputs,
+            },
+        }
+    }
+
     @Watch('isVisible')
     isVisibleChanged(newIsVisible: boolean) {
         if (newIsVisible) {
-            this.count = defaultCount
+            this.resetFormState()
         }
     }
 }

From c8d02e442dc51aa0d8ae2af0c78128416f9f43eb Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Thu, 15 Feb 2024 22:06:50 +0100
Subject: [PATCH 11/14] refactor: simplify some code parts

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 .../dialogs/AddBatchToQueueDialog.vue         | 99 ++++++-------------
 src/components/panels/GcodefilesPanel.vue     |  6 +-
 src/components/panels/HistoryListPanel.vue    | 27 ++---
 src/components/panels/Status/Gcodefiles.vue   | 10 +-
 src/locales/en.json                           |  7 --
 5 files changed, 41 insertions(+), 108 deletions(-)

diff --git a/src/components/dialogs/AddBatchToQueueDialog.vue b/src/components/dialogs/AddBatchToQueueDialog.vue
index 69bce1968..9c42604fa 100644
--- a/src/components/dialogs/AddBatchToQueueDialog.vue
+++ b/src/components/dialogs/AddBatchToQueueDialog.vue
@@ -1,7 +1,7 @@
 <template>
-    <v-dialog v-model="isVisible" max-width="400" @click:outside="closeDialog" @keydown.esc="closeDialog">
+    <v-dialog :value="isVisible" :max-width="400" @click:outside="closeDialog" @keydown.esc="closeDialog">
         <panel
-            :title="$t('Dialogs.AddBatchToQueue.AddToQueue')"
+            :title="$t('Files.AddToQueue')"
             card-class="gcode-files-add-to-queue-dialog"
             :icon="mdiPlaylistPlus"
             :margin-bottom="false">
@@ -11,28 +11,22 @@
                 </v-btn>
             </template>
 
-            <v-form v-model="form.isValid" @submit.prevent="addBatchToQueueAction">
+            <v-form v-model="isValid" @submit.prevent="addBatchToQueueAction">
                 <v-card-text>
                     <v-text-field
                         ref="inputFieldAddToQueueCount"
-                        v-model="form.inputs.count"
-                        :label="$t('Dialogs.AddBatchToQueue.Count')"
+                        v-model="input"
+                        :label="$t('Files.Count')"
                         required
                         hide-spin-buttons
                         type="number"
                         :rules="rules.count">
                         <template #append-outer>
                             <div class="_spin_button_group">
-                                <v-btn class="mt-n3" icon plain small @click="form.inputs.count++">
+                                <v-btn class="mt-n3" icon plain small @click="input++">
                                     <v-icon>{{ mdiChevronUp }}</v-icon>
                                 </v-btn>
-                                <v-btn
-                                    :disabled="form.inputs.count <= 1"
-                                    class="mb-n3"
-                                    icon
-                                    plain
-                                    small
-                                    @click="form.inputs.count--">
+                                <v-btn :disabled="input <= 1" class="mb-n3" icon plain small @click="input--">
                                     <v-icon>{{ mdiChevronDown }}</v-icon>
                                 </v-btn>
                             </div>
@@ -40,10 +34,10 @@
                     </v-text-field>
                 </v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
-                    <v-btn color="" text @click="closeDialog">{{ $t('Dialogs.AddBatchToQueue.Cancel') }}</v-btn>
-                    <v-btn color="primary" text type="submit" :disabled="!form.isValid">
-                        {{ $t('Dialogs.AddBatchToQueue.AddToQueue') }}
+                    <v-spacer />
+                    <v-btn text @click="closeDialog">{{ $t('Files.Cancel') }}</v-btn>
+                    <v-btn color="primary" text type="submit" :disabled="!isValid">
+                        {{ $t('Files.AddToQueue') }}
                     </v-btn>
                 </v-card-actions>
             </v-form>
@@ -57,33 +51,6 @@ import { Mixins, Prop, Watch } from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
 import { mdiChevronDown, mdiChevronUp, mdiPlaylistPlus, mdiCloseThick } from '@mdi/js'
 
-export interface addBatchToQueueDialogProps {
-    isVisible: boolean
-    filename: string
-}
-
-export interface addBatchToQueueEventData {
-    filename: string
-}
-
-interface formState {
-    isValid: boolean
-    inputs: {
-        count: number
-    }
-}
-
-const defaultFormInputs: formState['inputs'] = {
-    count: 1,
-}
-
-const defaultFormState: formState = {
-    isValid: false,
-    inputs: {
-        ...defaultFormInputs,
-    },
-}
-
 @Component
 export default class AddBatchToQueueDialog extends Mixins(BaseMixin) {
     mdiChevronDown = mdiChevronDown
@@ -92,17 +59,23 @@ export default class AddBatchToQueueDialog extends Mixins(BaseMixin) {
     mdiCloseThick = mdiCloseThick
 
     /**
-     * Is dialog currently visible?
+     * Is the dialog currently visible?
+     */
+    @Prop({ type: Boolean, default: false }) declare readonly isVisible: boolean
+
+    /**
+     * Should there be a toast message after the file was added to the queue?
      */
-    @Prop({ default: false }) declare readonly isVisible: addBatchToQueueDialogProps['isVisible']
+    @Prop({ type: Boolean, default: false }) declare readonly showToast: boolean
     /**
      * Filename of the model to be added to the Queue.
      */
-    @Prop({ required: true }) declare readonly filename: addBatchToQueueDialogProps['filename']
+    @Prop({ type: String, required: true }) declare readonly filename: string
 
-    private form: formState = defaultFormState
+    isValid = false
+    input: number = 1
 
-    private rules = {
+    rules = {
         count: [
             (value: string) => !!value || this.$t('JobQueue.InvalidCountEmpty'),
             (value: string) => parseInt(value, 10) > 0 || this.$t('JobQueue.InvalidCountGreaterZero'),
@@ -110,41 +83,27 @@ export default class AddBatchToQueueDialog extends Mixins(BaseMixin) {
     }
 
     async addBatchToQueueAction() {
-        const filename = this.filename
-
-        const array: string[] = []
-        for (let i = 0; i < this.form.inputs.count; i++) {
-            array.push(filename)
-        }
+        const array: string[] = new Array(this.input).fill(this.filename)
 
         await this.$store.dispatch('server/jobQueue/addToQueue', array)
 
-        this.emitAddToQueueEvent({ filename })
-        this.closeDialog()
-    }
+        if (this.showToast)
+            this.$toast.info(this.$t('History.AddToQueueSuccessful', { filename: this.filename }).toString())
 
-    emitAddToQueueEvent(eventData: addBatchToQueueEventData) {
-        this.$emit('addToQueue', eventData)
+        this.closeDialog()
     }
 
     closeDialog() {
-        this.$emit('closeDialog')
+        this.$emit('close')
     }
 
     resetFormState() {
-        this.form = {
-            ...defaultFormState,
-            inputs: {
-                ...defaultFormInputs,
-            },
-        }
+        this.input = 1
     }
 
     @Watch('isVisible')
     isVisibleChanged(newIsVisible: boolean) {
-        if (newIsVisible) {
-            this.resetFormState()
-        }
+        if (newIsVisible) this.resetFormState()
     }
 }
 </script>
diff --git a/src/components/panels/GcodefilesPanel.vue b/src/components/panels/GcodefilesPanel.vue
index 66ec7d5a9..712ba6136 100644
--- a/src/components/panels/GcodefilesPanel.vue
+++ b/src/components/panels/GcodefilesPanel.vue
@@ -571,7 +571,7 @@
         <add-batch-to-queue-dialog
             :is-visible="dialogAddBatchToQueue.isVisible"
             :filename="dialogAddBatchToQueue.filename"
-            @closeDialog="closeAddBatchToQueueDialog" />
+            @close="closeAddBatchToQueueDialog" />
     </div>
 </template>
 
@@ -609,7 +609,7 @@ import {
     mdiContentCopy,
 } from '@mdi/js'
 import StartPrintDialog from '@/components/dialogs/StartPrintDialog.vue'
-import AddBatchToQueueDialog, { addBatchToQueueDialogProps } from '@/components/dialogs/AddBatchToQueueDialog.vue'
+import AddBatchToQueueDialog from '@/components/dialogs/AddBatchToQueueDialog.vue'
 import ControlMixin from '@/components/mixins/control'
 import PathNavigation from '@/components/ui/PathNavigation.vue'
 
@@ -727,7 +727,7 @@ export default class GcodefilesPanel extends Mixins(BaseMixin, ControlMixin) {
         item: { ...this.contextMenu.item },
     }
 
-    private dialogAddBatchToQueue: addBatchToQueueDialogProps = {
+    dialogAddBatchToQueue: { isVisible: boolean; filename: string } = {
         isVisible: false,
         filename: '',
     }
diff --git a/src/components/panels/HistoryListPanel.vue b/src/components/panels/HistoryListPanel.vue
index 0b3be4188..1c0e6e52c 100644
--- a/src/components/panels/HistoryListPanel.vue
+++ b/src/components/panels/HistoryListPanel.vue
@@ -227,13 +227,13 @@
                     v-if="contextMenu.item.exists && isJobQueueAvailable"
                     @click="addToQueue(contextMenu.item)">
                     <v-icon class="mr-1">{{ mdiPlaylistPlus }}</v-icon>
-                    {{ $t('History.AddToQueue') }}
+                    {{ $t('Files.AddToQueue') }}
                 </v-list-item>
                 <v-list-item
                     v-if="contextMenu.item.exists && isJobQueueAvailable"
                     @click="openAddBatchToQueueDialog(contextMenu.item)">
                     <v-icon class="mr-1">{{ mdiPlaylistPlus }}</v-icon>
-                    {{ $t('History.AddBatchToQueue') }}
+                    {{ $t('Files.AddBatchToQueue') }}
                 </v-list-item>
                 <v-list-item class="red--text" @click="deleteDialog = true">
                     <v-icon class="mr-1" color="error">{{ mdiDelete }}</v-icon>
@@ -507,9 +507,9 @@
         </v-dialog>
         <add-batch-to-queue-dialog
             :is-visible="dialogAddBatchToQueue.isVisible"
+            :show-toast="true"
             :filename="dialogAddBatchToQueue.filename"
-            @closeDialog="closeAddBatchToQueueDialog"
-            @addToQueue="showAddBatchToQueueFeedbackToast" />
+            @close="closeAddBatchToQueueDialog" />
     </div>
 </template>
 
@@ -538,10 +538,7 @@ import {
     mdiNotebook,
     mdiFileCancel,
 } from '@mdi/js'
-import AddBatchToQueueDialog, {
-    addBatchToQueueDialogProps,
-    addBatchToQueueEventData,
-} from '@/components/dialogs/AddBatchToQueueDialog.vue'
+import AddBatchToQueueDialog from '@/components/dialogs/AddBatchToQueueDialog.vue'
 
 @Component({
     components: { Panel, AddBatchToQueueDialog },
@@ -583,7 +580,7 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
         boolShow: false,
     }
 
-    private dialogAddBatchToQueue: addBatchToQueueDialogProps = {
+    dialogAddBatchToQueue: { isVisible: boolean; filename: string } = {
         isVisible: false,
         filename: '',
     }
@@ -975,28 +972,16 @@ export default class HistoryListPanel extends Mixins(BaseMixin) {
     }
 
     async addToQueue(item: ServerHistoryStateJob) {
-        if (!item.exists || !this.isJobQueueAvailable) {
-            return
-        }
-
         await this.$store.dispatch('server/jobQueue/addToQueue', [item.filename])
 
         this.$toast.info(this.$t('History.AddToQueueSuccessful', { filename: item.filename }).toString())
     }
 
     openAddBatchToQueueDialog(item: ServerHistoryStateJob) {
-        if (!item.exists || !this.isJobQueueAvailable) {
-            return
-        }
-
         this.dialogAddBatchToQueue.isVisible = true
         this.dialogAddBatchToQueue.filename = item.filename
     }
 
-    showAddBatchToQueueFeedbackToast(eventData: addBatchToQueueEventData) {
-        this.$toast.info(this.$t('History.AddToQueueSuccessful', { filename: eventData.filename }).toString())
-    }
-
     closeAddBatchToQueueDialog() {
         this.dialogAddBatchToQueue.isVisible = false
     }
diff --git a/src/components/panels/Status/Gcodefiles.vue b/src/components/panels/Status/Gcodefiles.vue
index b62e4e260..d2a38e6fa 100644
--- a/src/components/panels/Status/Gcodefiles.vue
+++ b/src/components/panels/Status/Gcodefiles.vue
@@ -176,7 +176,7 @@
         <add-batch-to-queue-dialog
             :is-visible="dialogAddBatchToQueue.isVisible"
             :filename="dialogAddBatchToQueue.filename"
-            @closeDialog="closeAddBatchToQueueDialog" />
+            @close="closeAddBatchToQueueDialog" />
     </v-card>
 </template>
 
@@ -188,8 +188,6 @@ import ControlMixin from '@/components/mixins/control'
 import { FileStateGcodefile } from '@/store/files/types'
 import StartPrintDialog from '@/components/dialogs/StartPrintDialog.vue'
 import {
-    mdiChevronDown,
-    mdiChevronUp,
     mdiFile,
     mdiPlay,
     mdiPlaylistPlus,
@@ -203,7 +201,7 @@ import {
 } from '@mdi/js'
 import Panel from '@/components/ui/Panel.vue'
 import { defaultBigThumbnailBackground } from '@/store/variables'
-import AddBatchToQueueDialog, { addBatchToQueueDialogProps } from '@/components/dialogs/AddBatchToQueueDialog.vue'
+import AddBatchToQueueDialog from '@/components/dialogs/AddBatchToQueueDialog.vue'
 
 interface dialogRenameObject {
     show: boolean
@@ -219,8 +217,6 @@ interface dialogRenameObject {
     },
 })
 export default class StatusPanelGcodefiles extends Mixins(BaseMixin, ControlMixin) {
-    mdiChevronDown = mdiChevronDown
-    mdiChevronUp = mdiChevronUp
     mdiFile = mdiFile
     mdiPlay = mdiPlay
     mdiPlaylistPlus = mdiPlaylistPlus
@@ -273,7 +269,7 @@ export default class StatusPanelGcodefiles extends Mixins(BaseMixin, ControlMixi
         item: { ...this.dialogFile },
     }
 
-    private dialogAddBatchToQueue: addBatchToQueueDialogProps = {
+    dialogAddBatchToQueue: { isVisible: boolean; filename: string } = {
         isVisible: false,
         filename: '',
     }
diff --git a/src/locales/en.json b/src/locales/en.json
index 7bae47725..2cc93bb02 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -147,11 +147,6 @@
         "SetupConsole": "Setup Console"
     },
     "Dialogs": {
-        "AddBatchToQueue": {
-            "AddToQueue": "Add to Queue",
-            "Cancel": "Cancel",
-            "Count": "Count"
-        },
         "StartPrint": {
             "Cancel": "Cancel",
             "DoYouWantToStartFilename": "Do you want to start {filename}?",
@@ -325,9 +320,7 @@
         "Wireframe": "Wireframe"
     },
     "History": {
-        "AddBatchToQueue": "Add batch to Queue",
         "AddNote": "Add note",
-        "AddToQueue": "Add to Queue",
         "AddToQueueSuccessful": "File {filename} added to Queue.",
         "AllJobs": "All",
         "AvgPrinttime": "Print Time - Ø",

From c48852993fcdd07eb5944f3aea2b768568063379 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Thu, 15 Feb 2024 22:07:45 +0100
Subject: [PATCH 12/14] style: add an line break

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/dialogs/AddBatchToQueueDialog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/dialogs/AddBatchToQueueDialog.vue b/src/components/dialogs/AddBatchToQueueDialog.vue
index 9c42604fa..3a75c3448 100644
--- a/src/components/dialogs/AddBatchToQueueDialog.vue
+++ b/src/components/dialogs/AddBatchToQueueDialog.vue
@@ -67,6 +67,7 @@ export default class AddBatchToQueueDialog extends Mixins(BaseMixin) {
      * Should there be a toast message after the file was added to the queue?
      */
     @Prop({ type: Boolean, default: false }) declare readonly showToast: boolean
+
     /**
      * Filename of the model to be added to the Queue.
      */

From 5a4c2118f0f138b1957806a70a9db003447bfed0 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Thu, 15 Feb 2024 22:25:41 +0100
Subject: [PATCH 13/14] fix: fix addBatch function

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/dialogs/AddBatchToQueueDialog.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/dialogs/AddBatchToQueueDialog.vue b/src/components/dialogs/AddBatchToQueueDialog.vue
index 3a75c3448..f98c958c9 100644
--- a/src/components/dialogs/AddBatchToQueueDialog.vue
+++ b/src/components/dialogs/AddBatchToQueueDialog.vue
@@ -74,7 +74,8 @@ export default class AddBatchToQueueDialog extends Mixins(BaseMixin) {
     @Prop({ type: String, required: true }) declare readonly filename: string
 
     isValid = false
-    input: number = 1
+    // because of the text field, the input is always a string
+    input: string = '1'
 
     rules = {
         count: [
@@ -84,7 +85,7 @@ export default class AddBatchToQueueDialog extends Mixins(BaseMixin) {
     }
 
     async addBatchToQueueAction() {
-        const array: string[] = new Array(this.input).fill(this.filename)
+        const array = Array(parseInt(this.input)).fill(this.filename)
 
         await this.$store.dispatch('server/jobQueue/addToQueue', array)
 
@@ -99,7 +100,7 @@ export default class AddBatchToQueueDialog extends Mixins(BaseMixin) {
     }
 
     resetFormState() {
-        this.input = 1
+        this.input = '1'
     }
 
     @Watch('isVisible')

From 181fa9ebd3491c232b00f6e309e13f8ac193f2f9 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Thu, 15 Feb 2024 22:25:51 +0100
Subject: [PATCH 14/14] fix: fix empty job queue output

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/panels/Status/Jobqueue.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/panels/Status/Jobqueue.vue b/src/components/panels/Status/Jobqueue.vue
index 85ca50dd9..e9ee73c94 100644
--- a/src/components/panels/Status/Jobqueue.vue
+++ b/src/components/panels/Status/Jobqueue.vue
@@ -13,7 +13,9 @@
                 </v-col>
             </v-row>
         </template>
-        <div v-else class="text-center">{{ $t('Panels.StatusPanel.EmptyJobqueue') }}</div>
+        <div v-else>
+            <p class="body-2 my-3 text-center text--disabled">{{ $t('Panels.StatusPanel.EmptyJobqueue') }}</p>
+        </div>
     </v-card>
 </template>