From 7ba16cc9b558a26dec20f518d074f4b432cade09 Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Fri, 8 Mar 2024 08:02:25 +0100 Subject: [PATCH 1/6] ci: update actions in release workflow to fix node16 deprecates (#1779) --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ceed8fa2a..3106510be 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,7 +60,7 @@ jobs: fetch-depth: 0 - name: Install node - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 20 @@ -117,7 +117,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: 'develop' token: ${{ secrets.PAT }} @@ -141,7 +141,7 @@ jobs: - name: Show CHANGELOG run: | cat CHANGELOG.md - - uses: stefanzweifel/git-auto-commit-action@v4 + - uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: 'docs(changelog): update changelog' file_pattern: CHANGELOG.md From a3b5b33d9956d80f7a15d2f839e88906c8110078 Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Fri, 8 Mar 2024 08:03:19 +0100 Subject: [PATCH 2/6] fix: hide moonraker backups when "Hide backup files" is enabled (#1801) --- src/components/panels/Machine/ConfigFilesPanel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/panels/Machine/ConfigFilesPanel.vue b/src/components/panels/Machine/ConfigFilesPanel.vue index 293738e96..227a144fb 100644 --- a/src/components/panels/Machine/ConfigFilesPanel.vue +++ b/src/components/panels/Machine/ConfigFilesPanel.vue @@ -843,7 +843,7 @@ export default class ConfigFilesPanel extends Mixins(BaseMixin, ThemeMixin) { if (this.hideBackupFiles) { const backupFileMatcher = /.*\/?printer-\d{8}_\d{6}\.cfg$/ - files = files.filter((file) => !file.filename.match(backupFileMatcher)) + files = files.filter((file) => !file.filename.match(backupFileMatcher) && !file.filename.endsWith('.bkp')) } return files From 972266d2268c385f690dbbf0f894ab7298e7e071 Mon Sep 17 00:00:00 2001 From: ReDragon710 Date: Thu, 14 Mar 2024 00:31:20 +0200 Subject: [PATCH 3/6] feat: Add confirmation dialog to cooldown button (#1808) Co-authored-by: Stefan Dej --- src/components/dialogs/CoolDownDialog.vue | 56 +++++++++++++++++++ .../Temperature/TemperaturePanelPresets.vue | 29 ++++++++-- .../settings/SettingsUiSettingsTab.vue | 15 +++++ src/locales/en.json | 8 +++ src/store/gui/index.ts | 1 + src/store/gui/types.ts | 1 + 6 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 src/components/dialogs/CoolDownDialog.vue diff --git a/src/components/dialogs/CoolDownDialog.vue b/src/components/dialogs/CoolDownDialog.vue new file mode 100644 index 000000000..2d9dfa4ef --- /dev/null +++ b/src/components/dialogs/CoolDownDialog.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/src/components/panels/Temperature/TemperaturePanelPresets.vue b/src/components/panels/Temperature/TemperaturePanelPresets.vue index 6f4fbdf4e..a54464573 100644 --- a/src/components/panels/Temperature/TemperaturePanelPresets.vue +++ b/src/components/panels/Temperature/TemperaturePanelPresets.vue @@ -25,7 +25,7 @@ - +
{{ mdiSnowflake }} {{ $t('Panels.TemperaturePanel.Cooldown') }} @@ -39,10 +39,11 @@ :text="$vuetify.breakpoint.mdAndUp" tile color="primary" - @click="cooldown"> + @click="btnCoolDown"> {{ mdiSnowflake }} {{ $t('Panels.TemperaturePanel.Cooldown') }} +
@@ -51,13 +52,19 @@ import Component from 'vue-class-component' import { Mixins } from 'vue-property-decorator' import BaseMixin from '@/components/mixins/base' import { GuiPresetsStatePreset } from '@/store/gui/presets/types' -import { mdiFire, mdiMenuDown, mdiSnowflake } from '@mdi/js' +import { mdiFire, mdiMenuDown, mdiSnowflake, mdiCloseThick } from '@mdi/js' +import CoolDownDialog from '@/components/dialogs/CoolDownDialog.vue' -@Component +@Component({ + components: { CoolDownDialog }, +}) export default class TemperaturePanelPresets extends Mixins(BaseMixin) { mdiFire = mdiFire mdiMenuDown = mdiMenuDown mdiSnowflake = mdiSnowflake + mdiCloseThick = mdiCloseThick + + showCoolDownDialog = false get presets(): GuiPresetsStatePreset[] { return this.$store.getters['gui/presets/getPresets'] ?? [] @@ -67,6 +74,10 @@ export default class TemperaturePanelPresets extends Mixins(BaseMixin) { return this.$store.getters['gui/presets/getCooldownGcode'] } + get confirmOnCoolDown(): boolean { + return this.$store.state.gui.uiSettings.confirmOnCoolDown + } + preheat(preset: GuiPresetsStatePreset): void { for (const [name, attributes] of Object.entries(preset.values)) { if (attributes.bool) { @@ -100,7 +111,17 @@ export default class TemperaturePanelPresets extends Mixins(BaseMixin) { } } + btnCoolDown(): void { + if (this.confirmOnCoolDown) { + this.showCoolDownDialog = true + return + } + + this.cooldown() + } + cooldown(): void { + this.showCoolDownDialog = false this.$store.dispatch('server/addEvent', { message: this.cooldownGcode, type: 'command' }) this.$socket.emit('printer.gcode.script', { script: this.cooldownGcode }) } diff --git a/src/components/settings/SettingsUiSettingsTab.vue b/src/components/settings/SettingsUiSettingsTab.vue index bd4ba51e2..96d4a7556 100644 --- a/src/components/settings/SettingsUiSettingsTab.vue +++ b/src/components/settings/SettingsUiSettingsTab.vue @@ -142,6 +142,13 @@ + + + + { lockSlidersOnTouchDevices: true, lockSlidersDelay: 1.5, confirmOnEmergencyStop: false, + confirmOnCoolDown: false, confirmOnPowerDeviceChange: false, boolBigThumbnail: true, bigThumbnailBackground: defaultBigThumbnailBackground, diff --git a/src/store/gui/types.ts b/src/store/gui/types.ts index 930961603..7b4dfee09 100644 --- a/src/store/gui/types.ts +++ b/src/store/gui/types.ts @@ -105,6 +105,7 @@ export interface GuiState { lockSlidersOnTouchDevices: boolean lockSlidersDelay: number confirmOnEmergencyStop: boolean + confirmOnCoolDown: boolean confirmOnPowerDeviceChange: boolean boolBigThumbnail: boolean bigThumbnailBackground: string From 0f060d9fd0e5192f4520f9fec72d0b6345914ddf Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Tue, 19 Mar 2024 22:22:35 +0100 Subject: [PATCH 4/6] fix: hide crowsnest backups when "Hide backup files" is enabled (#1824) --- src/components/panels/Machine/ConfigFilesPanel.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/panels/Machine/ConfigFilesPanel.vue b/src/components/panels/Machine/ConfigFilesPanel.vue index 227a144fb..a02bd2649 100644 --- a/src/components/panels/Machine/ConfigFilesPanel.vue +++ b/src/components/panels/Machine/ConfigFilesPanel.vue @@ -842,8 +842,15 @@ export default class ConfigFilesPanel extends Mixins(BaseMixin, ThemeMixin) { } if (this.hideBackupFiles) { - const backupFileMatcher = /.*\/?printer-\d{8}_\d{6}\.cfg$/ - files = files.filter((file) => !file.filename.match(backupFileMatcher) && !file.filename.endsWith('.bkp')) + const klipperBackupFileMatcher = /^printer-\d{8}_\d{6}\.cfg$/ + const crowsnestBackupFileMatcher = /^crowsnest\.conf\.\d{4}-\d{2}-\d{2}-\d{4}$/ + + files = files.filter( + (file) => + !file.filename.match(klipperBackupFileMatcher) && + !file.filename.match(crowsnestBackupFileMatcher) && + !file.filename.endsWith('.bkp') + ) } return files From d14eee6d2985d97ff1ed96b389b57987f2070c8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 18:27:23 +0100 Subject: [PATCH 5/6] build(deps): bump follow-redirects from 1.15.4 to 1.15.6 (#1820) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa968f738..0c1fb3601 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6118,9 +6118,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "funding": [ { "type": "individual", From c8594406420cb99632e993b2840215c3ceb580be Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Thu, 21 Mar 2024 18:27:52 +0100 Subject: [PATCH 6/6] fix: fix typo issues with save zoffset for probes (#1821) --- src/components/mixins/zoffset.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/mixins/zoffset.ts b/src/components/mixins/zoffset.ts index c4f8b63de..9785f34ca 100644 --- a/src/components/mixins/zoffset.ts +++ b/src/components/mixins/zoffset.ts @@ -32,14 +32,15 @@ export default class ZoffsetMixin extends Vue { get endstop_pin() { const stepperConfig = this.settings[this.stepper_name] ?? {} - return stepperConfig?.endstop_pin + return stepperConfig?.endstop_pin.trim() } get zOffset(): number { return this.$store.state.printer?.gcode_move?.homing_origin[2].toFixed(3) } get isEndstopProbe() { - return this.endstop_pin.search('probe:z_virtual_endstop') !== -1 + // remove spaces and search for probe:z_virtual_endstop + return this.endstop_pin.replaceAll(' ', '').search('probe:z_virtual_endstop') !== -1 } get existZOffsetApplyProbe() {