From 98d99d2d118ac52d622c3f9980c199a5a5b7e498 Mon Sep 17 00:00:00 2001
From: Daviteusz <daviteusz0@gmail.com>
Date: Fri, 1 Sep 2023 22:43:47 +0200
Subject: [PATCH 01/13] locale(pl): Update Polish translations (#1544)

---
 src/locales/pl.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/locales/pl.json b/src/locales/pl.json
index 3366e927f..176cef674 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -468,13 +468,13 @@
         },
         "UpdatePanel": {
             "CheckForUpdates": "Sprawdź dostępność aktualizacji",
-            "Commits": "Zmiany",
-            "CommitsAvailable": "Brak nowych wydań | {count} dostępne wydanie | {count} dostępnych wydań",
-            "CommitsOnDate": "Zmiany w {date}",
-            "CommittedDaysAgo": "Wydano {days} dni temu",
-            "CommittedHoursAgo": "Wydano {hours} godzin temu",
-            "CommittedOnDate": "Wydano {date}",
-            "CommittedYesterday": "Wydano wczoraj",
+            "Commits": "Zatwierdzenia",
+            "CommitsAvailable": "Brak nowych zatwierdzeń | Dostępne zatwierdzenia: {count} | Dostępne zatwierdzenia: {count}",
+            "CommitsOnDate": "zatwierdzenia w {date}",
+            "CommittedDaysAgo": "zatwierdzono {days} dni temu",
+            "CommittedHoursAgo": "zatwierdzono {hours} godz. temu",
+            "CommittedOnDate": "zatwierdzono w {date}",
+            "CommittedYesterday": "zatwierdzono wczoraj",
             "Detached": "Osobne",
             "Dirty": "brudny",
             "Invalid": "Nieprawidłowe",
@@ -487,15 +487,15 @@
             "Upgrade": "Uaktualnij",
             "UpToDate": "aktualny",
             "Abort": "Przerwij",
-            "GenericUpdateQuestion": "Sprawdź historię zmian (jeśli jest dostępna) i stronę GitHub dla tego projektu, aby sprawdzić, czy konieczne są jakiekolwiek ręczne korekty dla tej aktualizacji.",
+            "GenericUpdateQuestion": "Sprawdź historię zatwierdzeń (jeśli dostępne) i stronę GitHub dla tego projektu, aby sprawdzić, czy konieczne są jakiekolwiek ręczne korekty dla tej aktualizacji.",
             "InitUpdateManager": "Menedżer aktualizacji nie został jeszcze zainicjowany. Jest to normalne zjawisko podczas pierwszego uruchomienia systemu. Kliknij przycisk odświeżania, aby zainicjować wszystkie komponenty.",
-            "MoonrakerUpdateQuestion": "Spowoduje to aktualizację API Moonraker. Zmiany w pliku moonraker.conf mogą być wymagane do dalszego korzystania z urządzenia.",
+            "MoonrakerUpdateQuestion": "Spowoduje to aktualizację API Moonrakera. Zmiany w pliku moonraker.conf mogą być wymagane do prawidłowego funkcjonowania drukarki.",
             "StartUpdate": "Rozpocznij aktualizację",
             "ThesePackagesCanBeUpgrade": "Te pakiety systemowe mogą być zaktualizowane:",
             "WebClientUpdateQuestion": "W niektórych przypadkach aktualizacja klienta sieciowego może spowodować zmiany, które mogą spowodować niezgodność. Więcej informacji można znaleźć w uwagach wydania.",
             "AreYouSure": "Czy na pewno?",
             "Close": "Zamknij",
-            "CommitHistory": "Historia zmian",
+            "CommitHistory": "Historia zatwierdzeń",
             "ConfigChanges": "Zmiany konfiguracji",
             "CountPackagesCanBeUpgraded": "Można uaktualnić {count} pakietów",
             "GitHubPage": "Strona GitHub",
@@ -504,7 +504,7 @@
             "LinkToGithub": "Link do GitHub",
             "KlipperUpdateQuestionFirmware": "Spowoduje to aktualizację oprogramowania hosta Klipper. Płyty sterujące z działającym firmware Klipper mogą wymagać flashowania ponownie skompilowanym firmware przed przywróceniem urządzenia do pracy.",
             "KlipperUpdateQuestionConfig": "Ta aktualizacja może również zawierać zmiany w parametrach konfiguracyjnych, które będą musiały zostać zmodyfikowane w pliku printer.cfg, szczegóły można znaleźć w dzienniku zmian.",
-            "MoreCommitsInfo": "Można tu wyświetlić maksymalnie 30 zmian. Aby zobaczyć wszystkie zmiany, kliknij poniższy link:",
+            "MoreCommitsInfo": "Można zobaczyć tutaj maksymalnie 30 zatwierdzeń. Kliknij poniższy przycisk, aby zobaczyć wszystkie:",
             "SoftRecovery": "Przywróć miękko",
             "UpdateWarning": "Ostrzeżenie o aktualizacji: {name}",
             "UpgradeableSystemPackages": "Pakiety systemowe, które można uaktualnić",

From 1aa9f341fa19f9273f05ec257c21fb46c4b1c562 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Mon, 4 Sep 2023 12:04:54 +0200
Subject: [PATCH 02/13] fix: fix min/max positions in heightmap current mesh
 data panel (#1533)

---
 src/pages/Heightmap.vue | 78 ++++++++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 32 deletions(-)

diff --git a/src/pages/Heightmap.vue b/src/pages/Heightmap.vue
index ad624fee8..660a93bf4 100644
--- a/src/pages/Heightmap.vue
+++ b/src/pages/Heightmap.vue
@@ -2,7 +2,7 @@
     <div>
         <v-row v-if="klipperReadyForGui">
             <v-col class="col-12 col-md-8 pb-0">
-                <panel card-class="heightmap-map-panel" :title="$t('Heightmap.Heightmap').toString()" :icon="mdiGrid">
+                <panel card-class="heightmap-map-panel" :title="$t('Heightmap.Heightmap')" :icon="mdiGrid">
                     <template #buttons>
                         <v-btn
                             icon
@@ -89,7 +89,7 @@
                                         ref="heightmap"
                                         :option="chartOptions"
                                         :init-options="{ renderer: 'canvas' }"
-                                        style="height: 400px; width: 100%; overflow: hidden"></e-chart>
+                                        style="height: 400px; width: 100%; overflow: hidden" />
                                 </v-col>
                             </v-row>
                             <v-row>
@@ -98,33 +98,33 @@
                                     <v-switch
                                         v-model="scaleGradient"
                                         :label="$t('Heightmap.ScaleGradient')"
-                                        class="mt-0 ml-5"></v-switch>
+                                        class="mt-0 ml-5" />
                                 </v-col>
                                 <v-col class="d-flex justify-center pt-0 pb-6 pb-lg-3">
                                     <v-checkbox
                                         v-model="showProbed"
                                         :label="$t('Heightmap.Probed')"
                                         hide-details
-                                        class="mx-3 mt-0"></v-checkbox>
+                                        class="mx-3 mt-0" />
                                     <v-checkbox
                                         v-model="showMesh"
                                         :label="$t('Heightmap.Mesh')"
                                         hide-details
-                                        class="mx-3 mt-0"></v-checkbox>
+                                        class="mx-3 mt-0" />
                                     <v-checkbox
                                         v-model="showFlat"
                                         :label="$t('Heightmap.Flat')"
                                         hide-details
-                                        class="mx-3 mt-0"></v-checkbox>
+                                        class="mx-3 mt-0" />
                                     <v-checkbox
                                         v-model="wireframe"
                                         :label="$t('Heightmap.Wireframe')"
                                         hide-details
-                                        class="mx-3 mt-0"></v-checkbox>
+                                        class="mx-3 mt-0" />
                                 </v-col>
                             </v-row>
                         </v-card-text>
-                        <v-divider></v-divider>
+                        <v-divider />
                         <v-card-text class="pt-0 pb-3">
                             <v-row>
                                 <v-col>
@@ -136,7 +136,7 @@
                                         :step="0.1"
                                         ticks="always"
                                         class="mt-4"
-                                        hide-details></v-slider>
+                                        hide-details />
                                 </v-col>
                             </v-row>
                         </v-card-text>
@@ -146,7 +146,7 @@
             <v-col class="col-12 col-md-4">
                 <panel
                     v-if="currentProfile"
-                    :title="$t('Heightmap.CurrentMesh.Headline').toString()"
+                    :title="$t('Heightmap.CurrentMesh.Headline')"
                     card-class="heightmap-current-mesh-panel"
                     :icon="mdiInformation"
                     :collapsible="true"
@@ -161,14 +161,14 @@
                                 </span>
                             </v-col>
                         </v-row>
-                        <v-divider class="my-3"></v-divider>
+                        <v-divider class="my-3" />
                         <v-row v-if="'data' in currentProfile" class="px-3">
                             <v-col>{{ $t('Heightmap.CurrentMesh.Size') }}</v-col>
                             <v-col class="text-right">
                                 {{ currentProfile.data.x_count }}x{{ currentProfile.data.y_count }}
                             </v-col>
                         </v-row>
-                        <v-divider class="my-3"></v-divider>
+                        <v-divider class="my-3" />
                         <v-row class="px-3">
                             <v-col>
                                 {{ $t('Heightmap.CurrentMesh.Max') }} [{{ bedMeshMaxPoint.positionX }},
@@ -176,7 +176,7 @@
                             </v-col>
                             <v-col class="text-right">{{ currentProfile.max.toFixed(3) }} mm</v-col>
                         </v-row>
-                        <v-divider class="my-3"></v-divider>
+                        <v-divider class="my-3" />
                         <v-row class="px-3">
                             <v-col>
                                 {{ $t('Heightmap.CurrentMesh.Min') }} [{{ bedMeshMinPoint.positionX }},
@@ -184,7 +184,7 @@
                             </v-col>
                             <v-col class="text-right">{{ currentProfile.min.toFixed(3) }} mm</v-col>
                         </v-row>
-                        <v-divider class="my-3"></v-divider>
+                        <v-divider class="my-3" />
                         <v-row class="px-3">
                             <v-col>{{ $t('Heightmap.CurrentMesh.Range') }}</v-col>
                             <v-col class="text-right">{{ currentProfile.variance.toFixed(3) }} mm</v-col>
@@ -192,14 +192,14 @@
                     </v-card-text>
                 </panel>
                 <panel
-                    :title="$t('Heightmap.Profiles').toString()"
+                    :title="$t('Heightmap.Profiles')"
                     card-class="heightmap-profiles-panel"
                     :icon="mdiStackOverflow"
                     :collapsible="true"
                     class="mt-6 mt-md-0">
                     <v-card-text v-if="profiles.length" class="px-0 py-3">
                         <template v-for="(profile, index) in profiles">
-                            <v-divider v-if="index" :key="'deliver_' + index" class="my-3"></v-divider>
+                            <v-divider v-if="index" :key="'deliver_' + index" class="my-3" />
                             <v-row :key="index" class="rowProfile">
                                 <v-col class="pl-6 py-0 colName">
                                     <span
@@ -275,7 +275,7 @@
         </v-row>
         <v-dialog v-model="renameDialog" persistent :max-width="400" @keydown.esc="renameDialog = false">
             <panel
-                :title="$t('Heightmap.RenameBedMeshProfile').toString()"
+                :title="$t('Heightmap.RenameBedMeshProfile')"
                 :icon="mdiGrid"
                 card-class="heightmap-rename-dialog"
                 :margin-bottom="false">
@@ -299,7 +299,7 @@
                         @keyup.enter="renameProfile" />
                 </v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <v-btn text @click="renameDialog = false">{{ $t('Heightmap.Abort') }}</v-btn>
                     <v-btn :disabled="isInvalidName" color="primary" text @click="renameProfile">
                         {{ $t('Heightmap.Rename') }}
@@ -313,7 +313,7 @@
             :max-width="400"
             @keydown.esc="calibrateDialog.boolShow = false">
             <panel
-                :title="$t('Heightmap.BedMeshCalibrate').toString()"
+                :title="$t('Heightmap.BedMeshCalibrate')"
                 :icon="mdiGrid"
                 card-class="heightmap-calibrate-dialog"
                 :margin-bottom="false">
@@ -337,7 +337,7 @@
                         @keyup.enter="calibrateMesh" />
                 </v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <v-btn text @click="calibrateDialog.boolShow = false">{{ $t('Heightmap.Abort') }}</v-btn>
                     <v-btn :disabled="calibrateDialog.isInvalidName" color="primary" text @click="calibrateMesh">
                         {{ $t('Heightmap.Calibrate') }}
@@ -347,7 +347,7 @@
         </v-dialog>
         <v-dialog v-model="removeDialog" persistent :max-width="400" @keydown.esc="removeDialog = false">
             <panel
-                :title="$t('Heightmap.BedMeshRemove').toString()"
+                :title="$t('Heightmap.BedMeshRemove')"
                 :icon="mdiGrid"
                 card-class="heightmap-remove-dialog"
                 :margin-bottom="false">
@@ -360,7 +360,7 @@
                     <p class="mb-0">{{ $t('Heightmap.DoYouReallyWantToDelete', { name: removeDialogProfile }) }}</p>
                 </v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <v-btn text @click="removeDialog = false">{{ $t('Heightmap.Abort') }}</v-btn>
                     <v-btn color="error" text @click="removeProfile">{{ $t('Heightmap.Remove') }}</v-btn>
                 </v-card-actions>
@@ -368,7 +368,7 @@
         </v-dialog>
         <v-dialog v-model="saveConfigDialog" persistent :max-width="400" @keydown.esc="saveConfigDialog = false">
             <panel
-                :title="$t('Heightmap.SAVE_CONFIG').toString()"
+                :title="$t('Heightmap.SAVE_CONFIG')"
                 :icon="mdiGrid"
                 card-class="heightmap-remove-save-dialog"
                 :margin-bottom="false">
@@ -381,7 +381,7 @@
                     <p class="mb-0">{{ $t('Heightmap.RemoveSaveDescription') }}</p>
                 </v-card-text>
                 <v-card-actions>
-                    <v-spacer></v-spacer>
+                    <v-spacer />
                     <template v-if="printerIsPrinting">
                         <v-btn text @click="saveConfigDialog = false">{{ $t('Heightmap.Ok') }}</v-btn>
                     </template>
@@ -971,6 +971,24 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
         return output
     }
 
+    get probed_matrix() {
+        return this.bed_mesh.probed_matrix ?? [[]]
+    }
+
+    get bedMeshXLength() {
+        let x_length = this.probed_matrix[0].length - 1
+        if (x_length < 1) x_length = 1
+
+        return x_length
+    }
+
+    get bedMeshYLength() {
+        let y_length = this.probed_matrix.length - 1
+        if (y_length < 1) y_length = 1
+
+        return y_length
+    }
+
     get bedMeshMaxPoint() {
         if (this.bed_mesh.profile_name === '') return { row: 0, col: 0, positionX: 0, positionY: 0, value: 0 }
 
@@ -988,15 +1006,13 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
         const positionX =
             Math.round(
                 (this.bed_mesh.mesh_min[0] +
-                    ((this.bed_mesh.mesh_max[0] - this.bed_mesh.mesh_min[0]) / this.bed_mesh.probed_matrix[0].length) *
-                        (col - 1)) *
+                    ((this.bed_mesh.mesh_max[0] - this.bed_mesh.mesh_min[0]) / this.bedMeshXLength) * (col - 1)) *
                     10
             ) / 10
         const positionY =
             Math.round(
                 (this.bed_mesh.mesh_min[1] +
-                    ((this.bed_mesh.mesh_max[1] - this.bed_mesh.mesh_min[1]) / this.bed_mesh.probed_matrix.length) *
-                        (row - 1)) *
+                    ((this.bed_mesh.mesh_max[1] - this.bed_mesh.mesh_min[1]) / this.bedMeshYLength) * (row - 1)) *
                     10
             ) / 10
 
@@ -1026,15 +1042,13 @@ export default class PageHeightmap extends Mixins(BaseMixin, ControlMixin) {
         const positionX =
             Math.round(
                 (this.bed_mesh.mesh_min[0] +
-                    ((this.bed_mesh.mesh_max[0] - this.bed_mesh.mesh_min[0]) / this.bed_mesh.probed_matrix[0].length) *
-                        (col - 1)) *
+                    ((this.bed_mesh.mesh_max[0] - this.bed_mesh.mesh_min[0]) / this.bedMeshXLength) * (col - 1)) *
                     10
             ) / 10
         const positionY =
             Math.round(
                 (this.bed_mesh.mesh_min[1] +
-                    ((this.bed_mesh.mesh_max[1] - this.bed_mesh.mesh_min[1]) / this.bed_mesh.probed_matrix.length) *
-                        (row - 1)) *
+                    ((this.bed_mesh.mesh_max[1] - this.bed_mesh.mesh_min[1]) / this.bedMeshYLength) * (row - 1)) *
                     10
             ) / 10
 

From fd293d21ec31a33252fee902f1b8e7e5fd248366 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Mon, 4 Sep 2023 12:05:08 +0200
Subject: [PATCH 03/13] fix: fix autorestart of webcam camerastreamer (#1546)

---
 .../webcams/WebrtcCameraStreamer.vue          | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/components/webcams/WebrtcCameraStreamer.vue b/src/components/webcams/WebrtcCameraStreamer.vue
index 91e8d49c7..010392985 100644
--- a/src/components/webcams/WebrtcCameraStreamer.vue
+++ b/src/components/webcams/WebrtcCameraStreamer.vue
@@ -30,6 +30,7 @@ export default class WebrtcCameraStreamer extends Mixins(BaseMixin, WebcamMixin)
     private remote_pc_id: string | null = null
     private aspectRatio: null | number = null
     private status: string = 'connecting'
+    private restartTimer: number | null = null
 
     @Prop({ required: true }) readonly camSettings!: GuiWebcamStateWebcam
     @Prop({ default: null }) declare readonly printerUrl: string | null
@@ -99,11 +100,15 @@ export default class WebrtcCameraStreamer extends Mixins(BaseMixin, WebcamMixin)
                 )
                 this.pc.addEventListener('connectionstatechange', () => {
                     this.status = (this.pc?.connectionState ?? '').toString()
+
+                    // clear restartTimer if it is set
+                    if (this.restartTimer) window.clearTimeout(this.restartTimer)
+
                     if (['failed', 'disconnected'].includes(this.status)) {
-                        setTimeout(async () => {
-                            await this.pc?.close()
-                            this.startStream()
-                        }, 500)
+                        // set restartTimer to restart stream after 5 seconds
+                        this.restartTimer = window.setTimeout(() => {
+                            this.restartStream()
+                        }, 5000)
                     }
                 })
                 this.pc.addEventListener('icecandidate', (e) => {
@@ -147,8 +152,16 @@ export default class WebrtcCameraStreamer extends Mixins(BaseMixin, WebcamMixin)
                 if (isFirefox) this.status = 'connected'
                 return response.json()
             })
-            .catch(function (e) {
+            .catch((e) => {
                 window.console.error(e)
+
+                // clear restartTimer if it is set
+                if (this.restartTimer) window.clearTimeout(this.restartTimer)
+
+                // set restartTimer to restart stream after 5 seconds
+                this.restartTimer = window.setTimeout(() => {
+                    this.restartStream()
+                }, 5000)
             })
     }
 
@@ -160,10 +173,16 @@ export default class WebrtcCameraStreamer extends Mixins(BaseMixin, WebcamMixin)
         this.pc?.close()
     }
 
+    restartStream() {
+        this.pc?.close()
+        setTimeout(async () => {
+            this.startStream()
+        }, 500)
+    }
+
     @Watch('url')
     async changedUrl() {
-        await this.pc?.close()
-        this.startStream()
+        this.restartStream()
     }
 }
 </script>

From 9f08afc138a429c3c114a75b2038ca06e985bcc9 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Tue, 5 Sep 2023 07:33:43 +0200
Subject: [PATCH 04/13] fix: fix missing reset options for print history data
 (#1534)

---
 .../settings/General/GeneralReset.vue         | 20 +++++++++++++++++--
 src/locales/en.json                           |  4 ----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/components/settings/General/GeneralReset.vue b/src/components/settings/General/GeneralReset.vue
index 8573611f4..d2553a1be 100644
--- a/src/components/settings/General/GeneralReset.vue
+++ b/src/components/settings/General/GeneralReset.vue
@@ -65,7 +65,7 @@ export default class SettingsGeneralTabResetDatabase extends Mixins(BaseMixin, S
     resetCheckboxes: string[] = []
 
     async mounted() {
-        this.resetableNamespaces = await this.loadBackupableNamespaces()
+        await this.loadResetableNamespaces()
     }
 
     onSelectResetCheckboxes(resetCheckboxes: string[]) {
@@ -78,10 +78,26 @@ export default class SettingsGeneralTabResetDatabase extends Mixins(BaseMixin, S
     }
 
     async openDialog() {
-        this.resetableNamespaces = await this.loadBackupableNamespaces()
+        await this.loadResetableNamespaces()
         this.showDialog = true
     }
 
+    async loadResetableNamespaces() {
+        this.resetableNamespaces = await this.loadBackupableNamespaces()
+
+        if (this.moonrakerComponents.includes('history')) {
+            this.resetableNamespaces.push({
+                value: 'history_jobs',
+                label: this.$t('Settings.GeneralTab.DbHistoryJobs'),
+            })
+
+            this.resetableNamespaces.push({
+                value: 'history_totals',
+                label: this.$t('Settings.GeneralTab.DbHistoryTotals'),
+            })
+        }
+    }
+
     closeDialog() {
         this.showDialog = false
     }
diff --git a/src/locales/en.json b/src/locales/en.json
index b7234078d..704471f03 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -506,10 +506,6 @@
             "KlipperUpdateQuestionConfig": "This update may also contain changes to config parameters that would need to be modified in the printer.cfg file, see the change log for details.",
             "MoonrakerUpdateQuestion": "This will update the Moonraker API. Changes to the moonraker.conf file may be required to continue using the machine.",
             "MoreCommitsInfo": "A maximum of 30 commits can be displayed here. To see all commits, please click on the following link:",
-            "Notification": {
-                "Detached": "Detached state is not an error nor is it a problem. It only means that additional commits exist in the local repository that do not exist in the remote repository.",
-                "Dirty": "The local repository has been modified and cannot be updated in this state. Please recover this repository."
-            },
             "OSPackages": "OS-Packages",
             "SoftRecovery": "Soft Recovery",
             "StartUpdate": "Start Update",

From e0f51667eb19505cccc34d858218f403d4d8d31c Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Tue, 5 Sep 2023 07:33:56 +0200
Subject: [PATCH 05/13] fix: fix some issues with the presets (#1529)

---
 src/store/gui/presets/getters.ts   | 34 ++++++++++++++++--------------
 src/store/gui/presets/mutations.ts |  7 ++----
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/store/gui/presets/getters.ts b/src/store/gui/presets/getters.ts
index 02c05d419..a00420a0b 100644
--- a/src/store/gui/presets/getters.ts
+++ b/src/store/gui/presets/getters.ts
@@ -33,22 +33,24 @@ export const getters: GetterTree<GuiPresetsState, any> = {
             text: '0 °C',
         })
 
-        if ('presets' in state) {
-            Object.keys(state.presets).forEach((id: string) => {
-                const preset = state.presets[id]
-
-                if (
-                    payload.name in preset.values &&
-                    preset.values[payload.name].bool &&
-                    output.findIndex((entry: preset) => entry.value === preset.values[payload.name].value) === -1
-                ) {
-                    output.push({
-                        value: preset.values[payload.name].value,
-                        text: preset.values[payload.name].value + ' °C',
-                    })
-                }
-            })
-        }
+        // return only 0 entry, if there is no presets set
+        if (!('presets' in state)) return output
+
+        Object.keys(state.presets).forEach((id: string) => {
+            const preset = state.presets[id]
+
+            if (
+                payload.name in preset.values &&
+                preset.values[payload.name].bool &&
+                output.findIndex((entry: preset) => entry.value === preset.values[payload.name].value) === -1
+            ) {
+                output.push({
+                    // @ts-ignore
+                    value: parseFloat(preset.values[payload.name].value),
+                    text: preset.values[payload.name].value + ' °C',
+                })
+            }
+        })
 
         return output.sort((a: preset, b: preset) => {
             if (a.value > b.value) return -1
diff --git a/src/store/gui/presets/mutations.ts b/src/store/gui/presets/mutations.ts
index 1a4085689..ebb9e80c7 100644
--- a/src/store/gui/presets/mutations.ts
+++ b/src/store/gui/presets/mutations.ts
@@ -22,12 +22,9 @@ export const mutations: MutationTree<GuiPresetsState> = {
     },
 
     update(state, payload) {
-        if (payload.id in state.presets) {
-            const preset = { ...state.presets[payload.id] }
-            Object.assign(preset, payload.values)
+        if (!(payload.id in state.presets)) return
 
-            Vue.set(state.presets, payload.id, preset)
-        }
+        Vue.set(state.presets, payload.id, payload.values)
     },
 
     updateCooldownGcode(state, payload) {

From ecaa894fbb7ae9cb2ebc1dbb9688b7eef312b740 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Tue, 5 Sep 2023 07:34:18 +0200
Subject: [PATCH 06/13] refactor: refactor ToolheadControlPanel (#1530)

---
 src/components/inputs/ToolSlider.vue          |  3 +-
 .../panels/ToolheadControlPanel.vue           | 32 +++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/components/inputs/ToolSlider.vue b/src/components/inputs/ToolSlider.vue
index 9b61a65b6..ba30623da 100644
--- a/src/components/inputs/ToolSlider.vue
+++ b/src/components/inputs/ToolSlider.vue
@@ -85,6 +85,7 @@ import { Component, Mixins, Prop, Watch } from 'vue-property-decorator'
 import { Debounce } from 'vue-debounce-decorator'
 import BaseMixin from '@/components/mixins/base'
 import { mdiLockOpenVariantOutline, mdiLockOutline, mdiMinus, mdiPlus, mdiRestart } from '@mdi/js'
+import { TranslateResult } from 'vue-i18n'
 
 @Component
 export default class ToolSlider extends Mixins(BaseMixin) {
@@ -107,7 +108,7 @@ export default class ToolSlider extends Mixins(BaseMixin) {
     @Prop({ type: Number, required: true }) declare readonly target: number
     @Prop({ type: String, required: true }) declare readonly command: string
     @Prop({ type: String, default: '' }) declare readonly attributeName: string
-    @Prop({ type: String, default: '' }) declare readonly label: string
+    @Prop({ default: '' }) declare readonly label: string | TranslateResult
     @Prop({ type: String, default: '' }) declare readonly icon: string
     @Prop({ type: String, default: '%' }) declare readonly unit: string
     @Prop({ type: Number, default: 1 }) declare readonly attributeScale: number
diff --git a/src/components/panels/ToolheadControlPanel.vue b/src/components/panels/ToolheadControlPanel.vue
index 1a2c3a814..25d0277c3 100644
--- a/src/components/panels/ToolheadControlPanel.vue
+++ b/src/components/panels/ToolheadControlPanel.vue
@@ -2,19 +2,11 @@
     <panel
         v-if="klipperReadyForGui"
         :icon="mdiGamepad"
-        :title="$t('Panels.ToolheadControlPanel.Headline').toString()"
+        :title="$t('Panels.ToolheadControlPanel.Headline')"
         :collapsible="true"
         card-class="toolhead-control-panel">
         <!-- PANEL-HEADER 3-DOT-MENU -->
-        <template
-            v-if="
-                (controlStyle !== 'bars' && (existsZtilt || existsQGL)) ||
-                existsBedScrews ||
-                existsBedTilt ||
-                existsDeltaCalibrate ||
-                existsScrewsTilt
-            "
-            #buttons>
+        <template v-if="showButtons" #buttons>
             <v-menu left offset-y :close-on-content-click="false" class="pa-0">
                 <template #activator="{ on, attrs }">
                     <v-btn icon tile v-bind="attrs" :disabled="['printing'].includes(printer_state)" v-on="on">
@@ -92,21 +84,21 @@
             </v-menu>
         </template>
         <!-- MOVE TO CONTROL -->
-        <move-to-control class="py-0 pt-3"></move-to-control>
+        <move-to-control class="py-0 pt-3" />
         <!-- AXIS CONTROL -->
         <v-container v-if="axisControlVisible">
-            <component :is="`${controlStyle}-control`"></component>
+            <component :is="`${controlStyle}-control`" />
         </v-container>
         <!-- Z-OFFSET CONTROL -->
-        <v-divider :class="{ 'mt-3': !axisControlVisible }"></v-divider>
+        <v-divider :class="{ 'mt-3': !axisControlVisible }" />
         <v-container>
-            <zoffset-control></zoffset-control>
+            <zoffset-control />
         </v-container>
         <!-- SPEED FACTOR -->
-        <v-divider></v-divider>
+        <v-divider />
         <v-container>
             <tool-slider
-                :label="$t('Panels.ToolheadControlPanel.SpeedFactor').toString()"
+                :label="$t('Panels.ToolheadControlPanel.SpeedFactor')"
                 :icon="mdiSpeedometer"
                 :target="speedFactor"
                 :min="1"
@@ -116,7 +108,7 @@
                 :dynamic-range="true"
                 :has-input-field="true"
                 command="M220"
-                attribute-name="S"></tool-slider>
+                attribute-name="S" />
         </v-container>
     </panel>
 </template>
@@ -172,5 +164,11 @@ export default class ToolheadControlPanel extends Mixins(BaseMixin, ControlMixin
     get axisControlVisible() {
         return !(this.isPrinting && (this.$store.state.gui.control.hideDuringPrint ?? false))
     }
+
+    get showButtons() {
+        if (this.controlStyle !== 'bars' && (this.existsZtilt || this.existsQGL)) return true
+
+        return this.existsBedScrews || this.existsBedTilt || this.existsDeltaCalibrate || this.existsScrewsTilt
+    }
 }
 </script>

From c87586aebbdd6e7eb4b1505ce286d69955899f04 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Thu, 14 Sep 2023 18:35:31 +0200
Subject: [PATCH 07/13] fix: fix macro parameter with spaces (#1551)

---
 src/components/inputs/MacroButton.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/inputs/MacroButton.vue b/src/components/inputs/MacroButton.vue
index 9819a25c6..89586f774 100644
--- a/src/components/inputs/MacroButton.vue
+++ b/src/components/inputs/MacroButton.vue
@@ -199,9 +199,13 @@ export default class MacroButton extends Mixins(BaseMixin) {
     sendWithParams() {
         let params: string[] = []
         this.paramArray.forEach((paramname: string) => {
-            if (this.params[paramname].value !== null && this.params[paramname].value !== '') {
+            let value = this.params[paramname].value?.toString().trim()
+
+            if (this.params[paramname].value !== null && value !== '') {
                 let tmp: string = paramname
-                tmp += this.isGcodeStyle ? this.params[paramname].value : `=${this.params[paramname].value}`
+                if (value?.includes(' ')) value = `"${value}"`
+
+                tmp += this.isGcodeStyle ? value : `=${value}`
 
                 params.push(tmp)
             }

From 5007646ff06b6fe4c4f1cb1820712df9f5210eda Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Tue, 19 Sep 2023 20:01:07 +0200
Subject: [PATCH 08/13] feat: add warning for outdated browsers (#1537)

---
 package-lock.json                      | 11 ++++++
 package.json                           |  1 +
 src/locales/de.json                    |  4 ++
 src/locales/en.json                    |  4 ++
 src/store/gui/notifications/getters.ts | 52 +++++++++++++++++++++++++-
 src/store/variables.ts                 |  1 +
 6 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 85359b3e2..ac924769e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,6 +25,7 @@
                 "axios": "^0.27.0",
                 "codemirror": "^6.0.1",
                 "core-js": "^3.16.0",
+                "detect-browser": "^5.3.0",
                 "echarts": "^5.2.2",
                 "echarts-gl": "^2.0.8",
                 "hls.js": "^1.3.3",
@@ -4991,6 +4992,11 @@
                 "node": ">=0.4.0"
             }
         },
+        "node_modules/detect-browser": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmjs.org/detect-browser/-/detect-browser-5.3.0.tgz",
+            "integrity": "sha512-53rsFbGdwMwlF7qvCt0ypLM5V5/Mbl0szB7GPN8y9NCcbknYOeVVXdrXEq+90IwAfrrzt6Hd+u2E2ntakICU8w=="
+        },
         "node_modules/dir-glob": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -14179,6 +14185,11 @@
             "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
             "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
         },
+        "detect-browser": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmjs.org/detect-browser/-/detect-browser-5.3.0.tgz",
+            "integrity": "sha512-53rsFbGdwMwlF7qvCt0ypLM5V5/Mbl0szB7GPN8y9NCcbknYOeVVXdrXEq+90IwAfrrzt6Hd+u2E2ntakICU8w=="
+        },
         "dir-glob": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
diff --git a/package.json b/package.json
index 5e74e7920..346a98df3 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
         "axios": "^0.27.0",
         "codemirror": "^6.0.1",
         "core-js": "^3.16.0",
+        "detect-browser": "^5.3.0",
         "echarts": "^5.2.2",
         "echarts-gl": "^2.0.8",
         "hls.js": "^1.3.3",
diff --git a/src/locales/de.json b/src/locales/de.json
index 6d7d1b593..d4da31f9e 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -1,6 +1,10 @@
 {
     "App": {
         "Notifications": {
+            "BrowserWarnings": {
+                "Headline": "Veralteter Browser",
+                "Description": "Die verwendete {name} Version ({version}) ist veraltet und wird nicht vollständig unterstützt. Mainsail benötigt die Version {minVersion} oder höher."
+            },
             "DependencyDescription": "Die momentane {name} Version unterstützt nicht alle Funktionen von Mainsail. Aktualisiere {name} mindestens auf Version {neededVersion}.",
             "DependencyName": "Abhängigkeit: {name}",
             "DismissAll": "Alles verwerfen",
diff --git a/src/locales/en.json b/src/locales/en.json
index 704471f03..9612e5638 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,6 +1,10 @@
 {
     "App": {
         "Notifications": {
+            "BrowserWarnings": {
+                "Headline": "Outdated Browser",
+                "Description": "{name} is outdated and not fully supported. The current version is {version}, but Mainsail requires version {minVersion} or higher."
+            },
             "DependencyDescription": "The current {name} version does not support all features of Mainsail. Update {name} to at least {neededVersion}.",
             "DependencyName": "Dependency: {name}",
             "DismissAll": "Dismiss all",
diff --git a/src/store/gui/notifications/getters.ts b/src/store/gui/notifications/getters.ts
index de456430d..a4072f186 100644
--- a/src/store/gui/notifications/getters.ts
+++ b/src/store/gui/notifications/getters.ts
@@ -5,6 +5,9 @@ import i18n from '@/plugins/i18n.js'
 import { RootStateDependency } from '@/store/types'
 import { sha256 } from 'js-sha256'
 import { PrinterStateKlipperConfigWarning } from '@/store/printer/types'
+import { detect } from 'detect-browser'
+import semver from 'semver'
+import { minBrowserVersions } from '@/store/variables'
 
 export const getters: GetterTree<GuiNotificationState, any> = {
     getNotifications: (state, getters) => {
@@ -22,12 +25,15 @@ export const getters: GetterTree<GuiNotificationState, any> = {
         // moonraker warnings
         notifications = notifications.concat(getters['getNotificationsMoonrakerWarnings'])
 
-        // moonraker failed compontents
+        // moonraker failed components
         notifications = notifications.concat(getters['getNotificationsMoonrakerFailedComponents'])
 
         // klipper warnings
         notifications = notifications.concat(getters['getNotificationsKlipperWarnings'])
 
+        // browser warnings
+        notifications = notifications.concat(getters['getNotificationsBrowserWarnings'])
+
         const mapType = {
             normal: 2,
             high: 1,
@@ -270,6 +276,50 @@ export const getters: GetterTree<GuiNotificationState, any> = {
         return notifications
     },
 
+    getNotificationsBrowserWarnings: (state, getters, rootState) => {
+        const notifications: GuiNotificationStateEntry[] = []
+
+        const browser = detect()
+        const date = rootState.server.system_boot_at ?? new Date()
+
+        // stop here, because no browser detected
+        if (browser === null) return notifications
+
+        // output browser information to console
+        window.console.debug(`Browser: ${browser.name} ${browser.version}, OS: ${browser.os}`)
+
+        // find browser requirement
+        const minBrowserVersion = minBrowserVersions.find(
+            (entry) => entry.name.toLowerCase() === browser.name.toLowerCase()
+        )
+
+        // stop here, because no browser requirement found
+        if (minBrowserVersion === undefined) return notifications
+
+        if (
+            semver.valid(browser.version) &&
+            semver.valid(minBrowserVersion.version) &&
+            semver.gt(minBrowserVersion.version, browser.version ?? '0.0.0')
+        ) {
+            notifications.push({
+                id: `browserWarning/${minBrowserVersion.name}/${minBrowserVersion.version}`,
+                priority: 'critical',
+                title: i18n.t('App.Notifications.BrowserWarnings.Headline').toString(),
+                description: i18n
+                    .t('App.Notifications.BrowserWarnings.Description', {
+                        name: minBrowserVersion.name,
+                        version: browser.version,
+                        minVersion: minBrowserVersion.version,
+                    })
+                    .toString(),
+                date,
+                dismissed: false,
+            } as GuiNotificationStateEntry)
+        }
+
+        return notifications
+    },
+
     getDismiss: (state, getters, rootState) => {
         const currentTime = new Date()
         const systemBootAt = rootState.server.system_boot_at ?? new Date()
diff --git a/src/store/variables.ts b/src/store/variables.ts
index d2a847be4..df540bde7 100644
--- a/src/store/variables.ts
+++ b/src/store/variables.ts
@@ -3,6 +3,7 @@ export const defaultPrimaryColor = '#2196f3'
 
 export const minKlipperVersion = 'v0.11.0-97'
 export const minMoonrakerVersion = 'v0.8.0-38'
+export const minBrowserVersions = [{ name: 'safari', version: '16.5.2' }]
 
 export const colorArray = ['#F44336', '#8e379d', '#03DAC5', '#3F51B5', '#ffde03', '#009688', '#E91E63']
 

From 9a2328ba69e6ec9eb3102b88d7261d5a73889a3c Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Tue, 19 Sep 2023 20:03:14 +0200
Subject: [PATCH 09/13] feat: automatic selection of the gcode offset save
 gcode (#1531)

---
 .../ToolheadControls/ZoffsetControl.vue       | 86 +++++++++----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/components/panels/ToolheadControls/ZoffsetControl.vue b/src/components/panels/ToolheadControls/ZoffsetControl.vue
index 2eae278c1..52f974cae 100644
--- a/src/components/panels/ToolheadControls/ZoffsetControl.vue
+++ b/src/components/panels/ToolheadControls/ZoffsetControl.vue
@@ -27,11 +27,7 @@
                                 <span v-if="!el.is.xsmall" class="ml-1">{{ $t('Panels.ZoffsetPanel.Clear') }}</span>
                             </v-btn>
                             <v-btn
-                                v-if="
-                                    z_gcode_offset !== 0 &&
-                                    ((existZOffsetApplyProbe && !existZOffsetApplyEndstop) ||
-                                        (!existZOffsetApplyProbe && existZOffsetApplyEndstop))
-                                "
+                                v-if="showSaveButton"
                                 color="primary"
                                 text
                                 small
@@ -41,31 +37,6 @@
                                 <v-icon small>{{ mdiContentSave }}</v-icon>
                                 <span v-if="!el.is.xsmall" class="ml-1">{{ $t('Panels.ZoffsetPanel.Save') }}</span>
                             </v-btn>
-                            <v-menu v-else-if="z_gcode_offset !== 0" offset-y left :close-on-content-click="false">
-                                <template #activator="{ on, attrs }">
-                                    <v-btn plain text small color="primary" v-bind="attrs" class="pl-2 pr-0" v-on="on">
-                                        <v-icon small>{{ mdiContentSave }}</v-icon>
-                                        <span v-if="!el.is.xsmall" class="ml-1">
-                                            {{ $t('Panels.ZoffsetPanel.Save') }}
-                                        </span>
-                                        <v-icon small>{{ mdiMenuDown }}</v-icon>
-                                    </v-btn>
-                                </template>
-                                <v-list dense>
-                                    <v-list-item>
-                                        <v-btn small style="width: 100%" @click="saveZOffsetToEndstop">
-                                            <v-icon left small>{{ mdiElectricSwitch }}</v-icon>
-                                            {{ $t('Panels.ZoffsetPanel.ToEndstop') }}
-                                        </v-btn>
-                                    </v-list-item>
-                                    <v-list-item>
-                                        <v-btn small style="width: 100%" @click="saveZOffsetToProbe">
-                                            <v-icon left small>{{ mdiElevator }}</v-icon>
-                                            {{ $t('Panels.ZoffsetPanel.ToProbe') }}
-                                        </v-btn>
-                                    </v-list-item>
-                                </v-list>
-                            </v-menu>
                         </div>
                     </v-col>
                 </v-row>
@@ -123,7 +94,7 @@
 
                 <v-dialog v-model="saveOffsetDialog" max-width="290">
                     <panel
-                        :title="$t('Panels.ZoffsetPanel.SaveInfoHeadline').toString()"
+                        :title="$t('Panels.ZoffsetPanel.SaveInfoHeadline')"
                         :icon="mdiInformation"
                         card-class="zoffset-saveinfo-dialog"
                         :margin-bottom="false">
@@ -160,12 +131,9 @@ import Responsive from '@/components/ui/Responsive.vue'
 
 import {
     mdiBroom,
-    mdiElectricSwitch,
-    mdiElevator,
     mdiContentSave,
     mdiArrowCollapseDown,
     mdiInformation,
-    mdiMenuDown,
     mdiArrowExpandUp,
     mdiLayersOutline,
 } from '@mdi/js'
@@ -174,16 +142,13 @@ import {
 })
 export default class ZoffsetControl extends Mixins(BaseMixin) {
     mdiBroom = mdiBroom
-    mdiElectricSwitch = mdiElectricSwitch
-    mdiElevator = mdiElevator
     mdiContentSave = mdiContentSave
     mdiArrowCollapseDown = mdiArrowCollapseDown
     mdiInformation = mdiInformation
-    mdiMenuDown = mdiMenuDown
     mdiArrowExpandUp = mdiArrowExpandUp
     mdiLayersOutline = mdiLayersOutline
 
-    private saveOffsetDialog = false
+    saveOffsetDialog = false
 
     get homing_origin() {
         return this.$store.state.printer?.gcode_move?.homing_origin ?? []
@@ -198,13 +163,37 @@ export default class ZoffsetControl extends Mixins(BaseMixin) {
     }
 
     get homed_axis() {
-        return this.$store.state.printer.toolhead.homed_axes ?? ''
+        return this.$store.state.printer.toolhead?.homed_axes ?? ''
     }
 
     get helplist() {
         return this.$store.state.printer.helplist ?? []
     }
 
+    get settings() {
+        return this.$store.state.printer.configfile?.settings ?? {}
+    }
+
+    get kinematics() {
+        return this.settings.printer?.kinematics ?? 'cartesian'
+    }
+
+    get stepper_name() {
+        if (this.kinematics === 'delta') return 'stepper_a'
+
+        return 'stepper_z'
+    }
+
+    get endstop_pin() {
+        const stepperConfig = this.settings[this.stepper_name] ?? {}
+
+        return stepperConfig?.endstop_pin
+    }
+
+    get isEndstopProbe() {
+        return this.endstop_pin.search('probe:z_virtual_endstop') !== -1
+    }
+
     get existZOffsetApplyProbe() {
         return this.helplist.findIndex((gcode: CommandHelp) => gcode.commandLow === 'z_offset_apply_probe') !== -1
     }
@@ -217,6 +206,17 @@ export default class ZoffsetControl extends Mixins(BaseMixin) {
         return this.$store.state.printer?.gcode_move?.homing_origin[2].toFixed(3)
     }
 
+    get showSaveButton() {
+        // hide button when offset is 0
+        if (this.z_gcode_offset === 0) return false
+
+        // show button when z endstop is probe and probe gcode exists
+        if (this.isEndstopProbe && this.existZOffsetApplyProbe) return true
+
+        // show button when z endstop is endstop and endstop gcode exists
+        return !this.isEndstopProbe && this.existZOffsetApplyEndstop
+    }
+
     sendBabyStepDown(offset: number): void {
         const gcode = `SET_GCODE_OFFSET Z_ADJUST=-${offset} ${this.homed_axis === 'xyz' ? 'MOVE=1' : ''}`
         this.$store.dispatch('server/addEvent', { message: gcode, type: 'command' })
@@ -236,12 +236,12 @@ export default class ZoffsetControl extends Mixins(BaseMixin) {
     }
 
     saveZOffset(): void {
-        if (this.existZOffsetApplyProbe && !this.existZOffsetApplyEndstop) {
+        if (this.isEndstopProbe && this.existZOffsetApplyProbe) {
             this.saveZOffsetToProbe()
+            return
         }
-        if (!this.existZOffsetApplyProbe && this.existZOffsetApplyEndstop) {
-            this.saveZOffsetToEndstop()
-        }
+
+        this.saveZOffsetToEndstop()
     }
 
     saveZOffsetToEndstop(): void {

From a0ad7e84ab454407d39010157b10e76eff3366c7 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Tue, 19 Sep 2023 20:04:22 +0200
Subject: [PATCH 10/13] feat: hide Moonraker power devices with a `_` as first
 char (#1545)

---
 src/components/TheTopCornerMenu.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/TheTopCornerMenu.vue b/src/components/TheTopCornerMenu.vue
index 97241b626..0690a4439 100644
--- a/src/components/TheTopCornerMenu.vue
+++ b/src/components/TheTopCornerMenu.vue
@@ -238,7 +238,9 @@ export default class TheTopCornerMenu extends Mixins(BaseMixin) {
     }
 
     get powerDevices() {
-        return this.$store.getters['server/power/getDevices']
+        const devices = this.$store.getters['server/power/getDevices'] ?? []
+
+        return devices.filter((device: ServerPowerStateDevice) => !device.device.startsWith('_'))
     }
 
     get service_states() {

From 09c25266422ba295c5b2a397df81c7a3b9f0d6a4 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Tue, 19 Sep 2023 20:04:36 +0200
Subject: [PATCH 11/13] feat: add option to block autoscroll in console (#1519)

---
 src/components/panels/MiniconsolePanel.vue | 58 +++++++++++++++-------
 src/locales/en.json                        |  2 +
 src/pages/Console.vue                      | 58 +++++++++++++++-------
 src/store/gui/console/index.ts             |  1 +
 src/store/gui/console/types.ts             |  1 +
 5 files changed, 82 insertions(+), 38 deletions(-)

diff --git a/src/components/panels/MiniconsolePanel.vue b/src/components/panels/MiniconsolePanel.vue
index 16a947f2d..93daad7a3 100644
--- a/src/components/panels/MiniconsolePanel.vue
+++ b/src/components/panels/MiniconsolePanel.vue
@@ -1,13 +1,3 @@
-<style scoped lang="scss">
-.consoleTable {
-    border-top: 1px solid rgba(255, 255, 255, 0.12);
-}
-
-.gcode-command-field {
-    font-family: 'Roboto Mono', monospace;
-}
-</style>
-
 <template>
     <panel
         v-if="socketIsConnected && klipperState !== 'disconnected'"
@@ -20,30 +10,37 @@
             <v-btn icon tile @click="clearConsole">
                 <v-icon small>{{ mdiTrashCan }}</v-icon>
             </v-btn>
-            <command-help-modal :in-toolbar="true" @onCommand="gcode = $event"></command-help-modal>
+            <command-help-modal :in-toolbar="true" @onCommand="gcode = $event" />
             <v-menu
                 :offset-y="true"
                 :close-on-content-click="false"
                 :title="$t('Panels.MiniconsolePanel.SetupConsole')">
                 <template #activator="{ on, attrs }">
                     <v-btn icon tile v-bind="attrs" v-on="on">
-                        <v-icon small>{{ mdiFilter }}</v-icon>
+                        <v-icon small>{{ mdiCog }}</v-icon>
                     </v-btn>
                 </template>
                 <v-list>
+                    <v-list-item v-if="consoleDirection === 'shell'" class="minHeight36">
+                        <v-checkbox
+                            v-model="autoscroll"
+                            class="mt-0"
+                            hide-details
+                            :label="$t('Panels.MiniconsolePanel.Autoscroll')" />
+                    </v-list-item>
                     <v-list-item class="minHeight36">
                         <v-checkbox
                             v-model="hideWaitTemperatures"
                             class="mt-0"
                             hide-details
-                            :label="$t('Panels.MiniconsolePanel.HideTemperatures')"></v-checkbox>
+                            :label="$t('Panels.MiniconsolePanel.HideTemperatures')" />
                     </v-list-item>
                     <v-list-item v-if="moonrakerComponents.includes('timelapse')" class="minHeight36">
                         <v-checkbox
                             v-model="hideTlCommands"
                             class="mt-0"
                             hide-details
-                            :label="$t('Panels.MiniconsolePanel.HideTimelapse')"></v-checkbox>
+                            :label="$t('Panels.MiniconsolePanel.HideTimelapse')" />
                     </v-list-item>
                     <v-list-item v-for="(filter, index) in customFilters" :key="index" class="minHeight36">
                         <v-checkbox
@@ -51,7 +48,7 @@
                             class="mt-0"
                             hide-details
                             :label="filter.name"
-                            @change="toggleFilter(filter)"></v-checkbox>
+                            @change="toggleFilter(filter)" />
                     </v-list-item>
                 </v-list>
             </v-menu>
@@ -93,7 +90,7 @@
                                 :events="events"
                                 :is-mini="true"
                                 @command-click="commandClick" />
-                            <v-divider></v-divider>
+                            <v-divider />
                         </overlay-scrollbars>
                     </v-col>
                 </v-row>
@@ -109,7 +106,7 @@ import BaseMixin from '@/components/mixins/base'
 import { CommandHelp, VTextareaType } from '@/store/printer/types'
 import ConsoleTable from '@/components/console/ConsoleTable.vue'
 import Panel from '@/components/ui/Panel.vue'
-import { mdiChevronDoubleRight, mdiConsoleLine, mdiFilter, mdiSend, mdiTrashCan } from '@mdi/js'
+import { mdiChevronDoubleRight, mdiCog, mdiConsoleLine, mdiSend, mdiTrashCan } from '@mdi/js'
 import CommandHelpModal from '@/components/CommandHelpModal.vue'
 
 @Component({
@@ -122,7 +119,7 @@ import CommandHelpModal from '@/components/CommandHelpModal.vue'
 export default class MiniconsolePanel extends Mixins(BaseMixin) {
     mdiTrashCan = mdiTrashCan
     mdiConsoleLine = mdiConsoleLine
-    mdiFilter = mdiFilter
+    mdiCog = mdiCog
     mdiSend = mdiSend
     mdiChevronDoubleRight = mdiChevronDoubleRight
 
@@ -155,13 +152,18 @@ export default class MiniconsolePanel extends Mixins(BaseMixin) {
 
     @Watch('events')
     eventsChanged() {
-        if (this.consoleDirection === 'shell') {
+        if (this.consoleDirection === 'shell' && this.autoscroll) {
             setTimeout(() => {
                 this.scrollToBottom()
             }, 50)
         }
     }
 
+    @Watch('autoscroll')
+    autoscrollChanged(newVal: boolean) {
+        if (newVal) this.scrollToBottom()
+    }
+
     clearConsole() {
         this.$store.dispatch('gui/console/clear')
     }
@@ -194,6 +196,14 @@ export default class MiniconsolePanel extends Mixins(BaseMixin) {
         return this.$store.state.gui.gcodehistory.entries ?? []
     }
 
+    get autoscroll(): boolean {
+        return this.$store.state.gui.console.autoscroll ?? true
+    }
+
+    set autoscroll(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'console.autoscroll', value: newVal })
+    }
+
     commandClick(msg: string): void {
         this.gcode = msg
 
@@ -325,3 +335,13 @@ export default class MiniconsolePanel extends Mixins(BaseMixin) {
     }
 }
 </script>
+
+<style scoped>
+.consoleTable {
+    border-top: 1px solid rgba(255, 255, 255, 0.12);
+}
+
+.gcode-command-field {
+    font-family: 'Roboto Mono', monospace;
+}
+</style>
diff --git a/src/locales/en.json b/src/locales/en.json
index 9612e5638..79bb8a749 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -137,6 +137,7 @@
         "TryAgain": "try again"
     },
     "Console": {
+        "Autoscroll": "Autoscroll",
         "CommandList": "Command list",
         "Empty": "Empty",
         "HideTemperatures": "Hide temperatures",
@@ -588,6 +589,7 @@
             "Send": "send"
         },
         "MiniconsolePanel": {
+            "Autoscroll": "Autoscroll",
             "Headline": "Console",
             "HideTemperatures": "Hide temperatures",
             "HideTimelapse": "Hide Timelapse",
diff --git a/src/pages/Console.vue b/src/pages/Console.vue
index a324187c3..e29799cee 100644
--- a/src/pages/Console.vue
+++ b/src/pages/Console.vue
@@ -1,14 +1,3 @@
-<style scoped>
-.consoleScrollContainer {
-    min-height: 200px;
-    height: calc(var(--app-height) - 180px);
-}
-
-.gcode-command-field {
-    font-family: 'Roboto Mono', monospace;
-}
-</style>
-
 <template>
     <div class="d-flex flex-column">
         <v-row :class="consoleDirection === 'table' ? 'order-0' : 'order-1 mt-3'">
@@ -41,7 +30,7 @@
                 <v-btn class="mr-3 px-2 minwidth-0" color="lightgray" @click="clearConsole">
                     <v-icon>{{ mdiTrashCan }}</v-icon>
                 </v-btn>
-                <command-help-modal @onCommand="gcode = $event"></command-help-modal>
+                <command-help-modal @onCommand="gcode = $event" />
                 <v-menu
                     offset-y
                     :top="consoleDirection === 'shell'"
@@ -49,23 +38,30 @@
                     :title="$t('Console.SetupConsole')">
                     <template #activator="{ on, attrs }">
                         <v-btn class="ml-3 px-2 minwidth-0" color="lightgray" v-bind="attrs" v-on="on">
-                            <v-icon>{{ mdiFilter }}</v-icon>
+                            <v-icon>{{ mdiCog }}</v-icon>
                         </v-btn>
                     </template>
                     <v-list>
+                        <v-list-item v-if="consoleDirection === 'shell'" class="minHeight36">
+                            <v-checkbox
+                                v-model="autoscroll"
+                                class="mt-0"
+                                hide-details
+                                :label="$t('Panels.MiniconsolePanel.Autoscroll')" />
+                        </v-list-item>
                         <v-list-item class="minHeight36">
                             <v-checkbox
                                 v-model="hideWaitTemperatures"
                                 class="mt-0"
                                 hide-details
-                                :label="$t('Console.HideTemperatures')"></v-checkbox>
+                                :label="$t('Console.HideTemperatures')" />
                         </v-list-item>
                         <v-list-item v-if="moonrakerComponents.includes('timelapse')" class="minHeight36">
                             <v-checkbox
                                 v-model="hideTlCommands"
                                 class="mt-0"
                                 hide-details
-                                :label="$t('Console.HideTimelapse')"></v-checkbox>
+                                :label="$t('Console.HideTimelapse')" />
                         </v-list-item>
                         <v-list-item v-for="(filter, index) in customFilters" :key="index" class="minHeight36">
                             <v-checkbox
@@ -73,7 +69,7 @@
                                 class="mt-0"
                                 hide-details
                                 :label="filter.name"
-                                @change="toggleFilter(filter)"></v-checkbox>
+                                @change="toggleFilter(filter)" />
                         </v-list-item>
                     </v-list>
                 </v-menu>
@@ -104,7 +100,7 @@ import ConsoleTable from '@/components/console/ConsoleTable.vue'
 import { CommandHelp, VTextareaType } from '@/store/printer/types'
 import { reverseString, strLongestEqual } from '@/plugins/helpers'
 import CommandHelpModal from '@/components/CommandHelpModal.vue'
-import { mdiChevronDoubleRight, mdiFilter, mdiSend, mdiTrashCan } from '@mdi/js'
+import { mdiChevronDoubleRight, mdiCog, mdiSend, mdiTrashCan } from '@mdi/js'
 
 @Component({
     components: {
@@ -122,7 +118,7 @@ export default class PageConsole extends Mixins(BaseMixin) {
      */
     mdiChevronDoubleRight = mdiChevronDoubleRight
     mdiSend = mdiSend
-    mdiFilter = mdiFilter
+    mdiCog = mdiCog
     mdiTrashCan = mdiTrashCan
 
     declare $refs: {
@@ -145,13 +141,18 @@ export default class PageConsole extends Mixins(BaseMixin) {
 
     @Watch('events')
     eventsChanged() {
-        if (this.consoleDirection === 'shell') {
+        if (this.consoleDirection === 'shell' && this.autoscroll) {
             setTimeout(() => {
                 this.scrollToBottom()
             }, 50)
         }
     }
 
+    @Watch('autoscroll')
+    autoscrollChanged(newVal: boolean) {
+        if (newVal) this.scrollToBottom()
+    }
+
     get hideWaitTemperatures(): boolean {
         return this.$store.state.gui.console.hideWaitTemperatures
     }
@@ -184,6 +185,14 @@ export default class PageConsole extends Mixins(BaseMixin) {
         return this.$store.state.gui.gcodehistory.entries ?? []
     }
 
+    get autoscroll(): boolean {
+        return this.$store.state.gui.console.autoscroll ?? true
+    }
+
+    set autoscroll(newVal) {
+        this.$store.dispatch('gui/saveSetting', { name: 'console.autoscroll', value: newVal })
+    }
+
     commandClick(msg: string): void {
         this.gcode = msg
 
@@ -304,3 +313,14 @@ export default class PageConsole extends Mixins(BaseMixin) {
     }
 }
 </script>
+
+<style scoped>
+.consoleScrollContainer {
+    min-height: 200px;
+    height: calc(var(--app-height) - 180px);
+}
+
+.gcode-command-field {
+    font-family: 'Roboto Mono', monospace;
+}
+</style>
diff --git a/src/store/gui/console/index.ts b/src/store/gui/console/index.ts
index 5466c4895..b152a5c7e 100644
--- a/src/store/gui/console/index.ts
+++ b/src/store/gui/console/index.ts
@@ -11,6 +11,7 @@ export const getDefaultState = (): GuiConsoleState => {
         direction: 'table',
         entryStyle: 'default',
         height: 300,
+        autoscroll: true,
         consolefilters: {},
     }
 }
diff --git a/src/store/gui/console/types.ts b/src/store/gui/console/types.ts
index a3f49274e..35e63cda8 100644
--- a/src/store/gui/console/types.ts
+++ b/src/store/gui/console/types.ts
@@ -5,6 +5,7 @@ export interface GuiConsoleState {
     direction: 'table' | 'shell'
     entryStyle: 'default' | 'compact'
     height: number
+    autoscroll: boolean
     consolefilters: {
         [key: string]: GuiConsoleStateFilter
     }

From bf04ec312e9bb8e23d9dfed3eff499791fe979b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 20:05:35 +0200
Subject: [PATCH 12/13] build(deps): bump tough-cookie and @cypress/request
 (#1517)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 130 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 102 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ac924769e..6149fed2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2282,9 +2282,9 @@
             }
         },
         "node_modules/@cypress/request": {
-            "version": "2.88.10",
-            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz",
-            "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==",
+            "version": "2.88.12",
+            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
+            "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
             "dev": true,
             "dependencies": {
                 "aws-sign2": "~0.7.0",
@@ -2300,9 +2300,9 @@
                 "json-stringify-safe": "~5.0.1",
                 "mime-types": "~2.1.19",
                 "performance-now": "^2.1.0",
-                "qs": "~6.5.2",
+                "qs": "~6.10.3",
                 "safe-buffer": "^5.1.2",
-                "tough-cookie": "~2.5.0",
+                "tough-cookie": "^4.1.3",
                 "tunnel-agent": "^0.6.0",
                 "uuid": "^8.3.2"
             },
@@ -8135,12 +8135,18 @@
             }
         },
         "node_modules/qs": {
-            "version": "6.5.3",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-            "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
+            "version": "6.10.4",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz",
+            "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==",
             "dev": true,
+            "dependencies": {
+                "side-channel": "^1.0.4"
+            },
             "engines": {
                 "node": ">=0.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
         "node_modules/querystring": {
@@ -8153,6 +8159,12 @@
                 "node": ">=0.4.x"
             }
         },
+        "node_modules/querystringify": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+            "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+            "dev": true
+        },
         "node_modules/queue-microtask": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -8311,6 +8323,12 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/requires-port": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+            "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+            "dev": true
+        },
         "node_modules/resize-detector": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/resize-detector/-/resize-detector-0.3.0.tgz",
@@ -9079,16 +9097,27 @@
             }
         },
         "node_modules/tough-cookie": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-            "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+            "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
             "dev": true,
             "dependencies": {
-                "psl": "^1.1.28",
-                "punycode": "^2.1.1"
+                "psl": "^1.1.33",
+                "punycode": "^2.1.1",
+                "universalify": "^0.2.0",
+                "url-parse": "^1.5.3"
             },
             "engines": {
-                "node": ">=0.8"
+                "node": ">=6"
+            }
+        },
+        "node_modules/tough-cookie/node_modules/universalify": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+            "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 4.0.0"
             }
         },
         "node_modules/tr46": {
@@ -9503,6 +9532,16 @@
                 "punycode": "^2.1.0"
             }
         },
+        "node_modules/url-parse": {
+            "version": "1.5.10",
+            "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+            "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+            "dev": true,
+            "dependencies": {
+                "querystringify": "^2.1.1",
+                "requires-port": "^1.0.0"
+            }
+        },
         "node_modules/util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -12167,9 +12206,9 @@
             "optional": true
         },
         "@cypress/request": {
-            "version": "2.88.10",
-            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz",
-            "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==",
+            "version": "2.88.12",
+            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
+            "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
             "dev": true,
             "requires": {
                 "aws-sign2": "~0.7.0",
@@ -12185,9 +12224,9 @@
                 "json-stringify-safe": "~5.0.1",
                 "mime-types": "~2.1.19",
                 "performance-now": "^2.1.0",
-                "qs": "~6.5.2",
+                "qs": "~6.10.3",
                 "safe-buffer": "^5.1.2",
-                "tough-cookie": "~2.5.0",
+                "tough-cookie": "^4.1.3",
                 "tunnel-agent": "^0.6.0",
                 "uuid": "^8.3.2"
             },
@@ -16398,10 +16437,13 @@
             "dev": true
         },
         "qs": {
-            "version": "6.5.3",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-            "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
-            "dev": true
+            "version": "6.10.4",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz",
+            "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==",
+            "dev": true,
+            "requires": {
+                "side-channel": "^1.0.4"
+            }
         },
         "querystring": {
             "version": "0.2.1",
@@ -16409,6 +16451,12 @@
             "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
             "dev": true
         },
+        "querystringify": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+            "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+            "dev": true
+        },
         "queue-microtask": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -16525,6 +16573,12 @@
             "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
             "dev": true
         },
+        "requires-port": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+            "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+            "dev": true
+        },
         "resize-detector": {
             "version": "0.3.0",
             "resolved": "https://registry.npmjs.org/resize-detector/-/resize-detector-0.3.0.tgz",
@@ -17083,13 +17137,23 @@
             }
         },
         "tough-cookie": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-            "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+            "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
             "dev": true,
             "requires": {
-                "psl": "^1.1.28",
-                "punycode": "^2.1.1"
+                "psl": "^1.1.33",
+                "punycode": "^2.1.1",
+                "universalify": "^0.2.0",
+                "url-parse": "^1.5.3"
+            },
+            "dependencies": {
+                "universalify": {
+                    "version": "0.2.0",
+                    "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+                    "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+                    "dev": true
+                }
             }
         },
         "tr46": {
@@ -17384,6 +17448,16 @@
                 "punycode": "^2.1.0"
             }
         },
+        "url-parse": {
+            "version": "1.5.10",
+            "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+            "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+            "dev": true,
+            "requires": {
+                "querystringify": "^2.1.1",
+                "requires-port": "^1.0.0"
+            }
+        },
         "util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",

From 7ae958934fd193be0325a2b8495d76b1d589738c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 20:22:43 +0200
Subject: [PATCH 13/13] build(deps): bump @cypress/request and cypress (#1560)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 152 ++++++++++++++++++++++++----------------------
 package.json      |   2 +-
 2 files changed, 80 insertions(+), 74 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6149fed2a..9ad68abb1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -67,7 +67,7 @@
                 "@typescript-eslint/parser": "^5.11.0",
                 "@vue/eslint-config-typescript": "^11.0.0",
                 "autoprefixer": "^10.4.2",
-                "cypress": "^10.0.0",
+                "cypress": "^13.2.0",
                 "eslint": "^8.9.0",
                 "eslint-config-prettier": "^8.3.0",
                 "eslint-plugin-jsonc": "^2.2.1",
@@ -2282,9 +2282,9 @@
             }
         },
         "node_modules/@cypress/request": {
-            "version": "2.88.12",
-            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
-            "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz",
+            "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==",
             "dev": true,
             "dependencies": {
                 "aws-sign2": "~0.7.0",
@@ -2300,7 +2300,7 @@
                 "json-stringify-safe": "~5.0.1",
                 "mime-types": "~2.1.19",
                 "performance-now": "^2.1.0",
-                "qs": "~6.10.3",
+                "qs": "6.10.4",
                 "safe-buffer": "^5.1.2",
                 "tough-cookie": "^4.1.3",
                 "tunnel-agent": "^0.6.0",
@@ -3035,9 +3035,9 @@
             }
         },
         "node_modules/@types/node": {
-            "version": "18.7.23",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.23.tgz",
-            "integrity": "sha512-DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg=="
+            "version": "18.17.17",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.17.tgz",
+            "integrity": "sha512-cOxcXsQ2sxiwkykdJqvyFS+MLQPLvIdwh5l6gNg8qF6s+C7XSkEWOZjK+XhUZd+mYvHV/180g2cnCcIl4l06Pw=="
         },
         "node_modules/@types/overlayscrollbars": {
             "version": "1.12.1",
@@ -3842,9 +3842,9 @@
             }
         },
         "node_modules/aws4": {
-            "version": "1.11.0",
-            "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-            "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+            "version": "1.12.0",
+            "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
+            "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
             "dev": true
         },
         "node_modules/axios": {
@@ -4340,9 +4340,9 @@
             }
         },
         "node_modules/commander": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-            "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+            "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
             "dev": true,
             "engines": {
                 "node": ">= 6"
@@ -4465,15 +4465,15 @@
             "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
         },
         "node_modules/cypress": {
-            "version": "10.9.0",
-            "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.9.0.tgz",
-            "integrity": "sha512-MjIWrRpc+bQM9U4kSSdATZWZ2hUqHGFEQTF7dfeZRa4MnalMtc88FIE49USWP2ZVtfy5WPBcgfBX+YorFqGElA==",
+            "version": "13.2.0",
+            "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz",
+            "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==",
             "dev": true,
             "hasInstallScript": true,
             "dependencies": {
-                "@cypress/request": "^2.88.10",
+                "@cypress/request": "^3.0.0",
                 "@cypress/xvfb": "^1.2.4",
-                "@types/node": "^14.14.31",
+                "@types/node": "^18.17.5",
                 "@types/sinonjs__fake-timers": "8.1.1",
                 "@types/sizzle": "^2.3.2",
                 "arch": "^2.2.0",
@@ -4485,10 +4485,10 @@
                 "check-more-types": "^2.24.0",
                 "cli-cursor": "^3.1.0",
                 "cli-table3": "~0.6.1",
-                "commander": "^5.1.0",
+                "commander": "^6.2.1",
                 "common-tags": "^1.8.0",
                 "dayjs": "^1.10.4",
-                "debug": "^4.3.2",
+                "debug": "^4.3.4",
                 "enquirer": "^2.3.6",
                 "eventemitter2": "6.4.7",
                 "execa": "4.1.0",
@@ -4503,12 +4503,13 @@
                 "listr2": "^3.8.3",
                 "lodash": "^4.17.21",
                 "log-symbols": "^4.0.0",
-                "minimist": "^1.2.6",
+                "minimist": "^1.2.8",
                 "ospath": "^1.2.2",
                 "pretty-bytes": "^5.6.0",
+                "process": "^0.11.10",
                 "proxy-from-env": "1.0.0",
                 "request-progress": "^3.0.0",
-                "semver": "^7.3.2",
+                "semver": "^7.5.3",
                 "supports-color": "^8.1.1",
                 "tmp": "~0.2.1",
                 "untildify": "^4.0.0",
@@ -4518,15 +4519,9 @@
                 "cypress": "bin/cypress"
             },
             "engines": {
-                "node": ">=12.0.0"
+                "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
             }
         },
-        "node_modules/cypress/node_modules/@types/node": {
-            "version": "14.18.31",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.31.tgz",
-            "integrity": "sha512-vQAnaReSQkEDa8uwAyQby8bYGKu84R/deEc6mg5T8fX6gzCn8QW6rziSgsti1fNvsrswKUKPnVTi7uoB+u62Mw==",
-            "dev": true
-        },
         "node_modules/d3": {
             "version": "7.6.1",
             "resolved": "https://registry.npmjs.org/d3/-/d3-7.6.1.tgz",
@@ -7667,10 +7662,13 @@
             }
         },
         "node_modules/minimist": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-            "dev": true
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+            "dev": true,
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
         },
         "node_modules/ms": {
             "version": "2.1.2",
@@ -8082,6 +8080,15 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/process": {
+            "version": "0.11.10",
+            "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+            "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6.0"
+            }
+        },
         "node_modules/proxy-from-env": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
@@ -8541,9 +8548,9 @@
             "integrity": "sha512-d7wDPgDV3DDiqulJjKiV2865wKsJ34YI+NDREbm+FySq6WuKOikwyNQcm+doLAZ1O6ltdO0SeKle2xMpN3Brgw=="
         },
         "node_modules/semver": {
-            "version": "7.5.2",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-            "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
             "dependencies": {
                 "lru-cache": "^6.0.0"
             },
@@ -12206,9 +12213,9 @@
             "optional": true
         },
         "@cypress/request": {
-            "version": "2.88.12",
-            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
-            "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz",
+            "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==",
             "dev": true,
             "requires": {
                 "aws-sign2": "~0.7.0",
@@ -12224,7 +12231,7 @@
                 "json-stringify-safe": "~5.0.1",
                 "mime-types": "~2.1.19",
                 "performance-now": "^2.1.0",
-                "qs": "~6.10.3",
+                "qs": "6.10.4",
                 "safe-buffer": "^5.1.2",
                 "tough-cookie": "^4.1.3",
                 "tunnel-agent": "^0.6.0",
@@ -12822,9 +12829,9 @@
             }
         },
         "@types/node": {
-            "version": "18.7.23",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.23.tgz",
-            "integrity": "sha512-DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg=="
+            "version": "18.17.17",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.17.tgz",
+            "integrity": "sha512-cOxcXsQ2sxiwkykdJqvyFS+MLQPLvIdwh5l6gNg8qF6s+C7XSkEWOZjK+XhUZd+mYvHV/180g2cnCcIl4l06Pw=="
         },
         "@types/overlayscrollbars": {
             "version": "1.12.1",
@@ -13385,9 +13392,9 @@
             "dev": true
         },
         "aws4": {
-            "version": "1.11.0",
-            "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
-            "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+            "version": "1.12.0",
+            "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
+            "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
             "dev": true
         },
         "axios": {
@@ -13736,9 +13743,9 @@
             }
         },
         "commander": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-            "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+            "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
             "dev": true
         },
         "common-tags": {
@@ -13833,14 +13840,14 @@
             "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
         },
         "cypress": {
-            "version": "10.9.0",
-            "resolved": "https://registry.npmjs.org/cypress/-/cypress-10.9.0.tgz",
-            "integrity": "sha512-MjIWrRpc+bQM9U4kSSdATZWZ2hUqHGFEQTF7dfeZRa4MnalMtc88FIE49USWP2ZVtfy5WPBcgfBX+YorFqGElA==",
+            "version": "13.2.0",
+            "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz",
+            "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==",
             "dev": true,
             "requires": {
-                "@cypress/request": "^2.88.10",
+                "@cypress/request": "^3.0.0",
                 "@cypress/xvfb": "^1.2.4",
-                "@types/node": "^14.14.31",
+                "@types/node": "^18.17.5",
                 "@types/sinonjs__fake-timers": "8.1.1",
                 "@types/sizzle": "^2.3.2",
                 "arch": "^2.2.0",
@@ -13852,10 +13859,10 @@
                 "check-more-types": "^2.24.0",
                 "cli-cursor": "^3.1.0",
                 "cli-table3": "~0.6.1",
-                "commander": "^5.1.0",
+                "commander": "^6.2.1",
                 "common-tags": "^1.8.0",
                 "dayjs": "^1.10.4",
-                "debug": "^4.3.2",
+                "debug": "^4.3.4",
                 "enquirer": "^2.3.6",
                 "eventemitter2": "6.4.7",
                 "execa": "4.1.0",
@@ -13870,24 +13877,17 @@
                 "listr2": "^3.8.3",
                 "lodash": "^4.17.21",
                 "log-symbols": "^4.0.0",
-                "minimist": "^1.2.6",
+                "minimist": "^1.2.8",
                 "ospath": "^1.2.2",
                 "pretty-bytes": "^5.6.0",
+                "process": "^0.11.10",
                 "proxy-from-env": "1.0.0",
                 "request-progress": "^3.0.0",
-                "semver": "^7.3.2",
+                "semver": "^7.5.3",
                 "supports-color": "^8.1.1",
                 "tmp": "~0.2.1",
                 "untildify": "^4.0.0",
                 "yauzl": "^2.10.0"
-            },
-            "dependencies": {
-                "@types/node": {
-                    "version": "14.18.31",
-                    "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.31.tgz",
-                    "integrity": "sha512-vQAnaReSQkEDa8uwAyQby8bYGKu84R/deEc6mg5T8fX6gzCn8QW6rziSgsti1fNvsrswKUKPnVTi7uoB+u62Mw==",
-                    "dev": true
-                }
             }
         },
         "d3": {
@@ -16110,9 +16110,9 @@
             }
         },
         "minimist": {
-            "version": "1.2.6",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-            "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
             "dev": true
         },
         "ms": {
@@ -16393,6 +16393,12 @@
             "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
             "dev": true
         },
+        "process": {
+            "version": "0.11.10",
+            "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+            "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+            "dev": true
+        },
         "proxy-from-env": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
@@ -16722,9 +16728,9 @@
             "integrity": "sha512-d7wDPgDV3DDiqulJjKiV2865wKsJ34YI+NDREbm+FySq6WuKOikwyNQcm+doLAZ1O6ltdO0SeKle2xMpN3Brgw=="
         },
         "semver": {
-            "version": "7.5.2",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.2.tgz",
-            "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
             "requires": {
                 "lru-cache": "^6.0.0"
             }
diff --git a/package.json b/package.json
index 346a98df3..347670b69 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
         "@typescript-eslint/parser": "^5.11.0",
         "@vue/eslint-config-typescript": "^11.0.0",
         "autoprefixer": "^10.4.2",
-        "cypress": "^10.0.0",
+        "cypress": "^13.2.0",
         "eslint": "^8.9.0",
         "eslint-config-prettier": "^8.3.0",
         "eslint-plugin-jsonc": "^2.2.1",