Merge branch 'develop' into feat/customize-extruder-panel

mainsail-crew · Dec 8, 2023 · dc04474 · dc04474
2 parents c0d2df2 + 9395a81
commit dc04474
Show file tree

Hide file tree

Showing 59 changed files with 2,667 additions and 1,625 deletions.
diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml
@@ -0,0 +1,36 @@
+name: Check PR title
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - edited
+      - synchronize
+
+jobs:
+  lint:
+    name: Validate PR title
+    runs-on: ubuntu-latest
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          types: |
+            fix
+            feat
+            perf
+            refactor
+            style
+            locale
+            docs
+            test
+            chore
+            build
+            ci
+            revert
+          requireScope: false
+          ignoreLabels: |
+            bot
+            ignore-semantic-pull-request
diff --git a/.github/workflows/check_locale.yml b/.github/workflows/check_locale.yml
@@ -43,7 +43,7 @@ jobs:
             npm run i18n-extract -- --languageFiles=src/locales/${file##*/} --output=i18n-extract/${file##*/}
             MISSING=$(cat i18n-extract/${file##*/} | jq '.missingKeys | length')
             UNUSED=$(cat i18n-extract/${file##*/} | jq '.unusedKeys | length')
-            echo "::set-output name=$file::|${file##*/}|${MISSING}|${UNUSED}|"
+            echo "$file=|${file##*/}|${MISSING}|${UNUSED}|" >> $GITHUB_OUTPUT
           done
       - name: Comment PR
         uses: thollander/actions-comment-pull-request@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/cliff-release.toml b/cliff-release.toml
@@ -9,11 +9,11 @@ header = """
 # https://tera.netlify.app/docs/#introduction
 body = """
 {% for group, commits in commits | group_by(attribute="group") %}\
-    ### {{ group | split(pat="$") | last | upper_first }}
+    ### {{ group | striptags | trim | upper_first }}
     {% for commit in commits
     | filter(attribute="scope")
     | sort(attribute="scope") %}
-        - **{{commit.scope}}**: {{ commit.message | upper_first | trim }} | [{{ commit.id | truncate(length=7, end="") }}]({{ commit.id }})\
+        - **{{commit.scope}}**: {{ commit.message | upper_first | trim }}\
         {%- if commit.breaking %}
         {% raw %}  {% endraw %}- **BREAKING**: {{commit.breaking_description}}
         {%- endif -%}
@@ -23,7 +23,7 @@ body = """
         {%- if commit.scope -%}
         {% else -%}
         {% raw %}\n{% endraw %}\
-        - {{ commit.message | upper_first | trim }} | [{{ commit.id | truncate(length=7, end="") }}]({{ commit.id }})\
+        - {{ commit.message | upper_first | trim }}\
         {%- if commit.breaking %}
         {% raw %}  {% endraw %}- **BREAKING**: {{commit.breaking_description}}
         {%- endif -%}
@@ -39,28 +39,42 @@ trim = true
 footer = """
 """
 
+# postprocessors
+postprocessors = [
+    { pattern = '<REPO>', replace = "https://github.com/mainsail-crew/mainsail" }, # replace repository URL
+]
+
+
 [git]
 # allow only conventional commits
 # https://www.conventionalcommits.org
 conventional_commits = true
 filter_unconventional = true
 # regex for parsing and grouping commits
 commit_parsers = [
+
+    # Commits to skip
     { message = "^docs\\(changelog\\):", group = "Changelog", skip = true}, # Old redundant commits
-    { message = "^chore\\(changelog\\): update changelog", group = "Changelog", skip = true}, # Old redundant commits
     { message = "^chore: push version number to", group = "9$Other", skip = true}, # Old redundant commits
-    { message = "^feat(\\(.*\\))?:", group = "1$Features"},
-    { message = "^feature(\\(.*\\))?:", group = "1$Features"},
-    { message = "^fix(\\(.*\\))?:", group = "2$Bug Fixes and Improvements"},
-    { message = "^docs(\\(.*\\))?:", group = "7$Documentation"},
-    { message = "^perf(\\(.*\\))?:", group = "3$Performance"},
-    { message = "^refactor(\\(.*\\))?:", group = "4$Refactor"},
-    { message = "^style(\\(.*\\))?:", group = "5$Styling"},
-    { message = "^test(\\(.*\\))?:", group = "9$Other"},
-    { message = "^locale(\\(.*\\))?:", group = "6$Localization"},
-    { message = "^chore(\\(.*\\))?:", group = "9$Other"},
+    { message = "^chore\\(changelog\\): update changelog", group = "Changelog", skip = true}, # Old redundant commits
+
+    # Commits to parse
+    { message = "^feat(\\(.*\\))?:", group = "<!-- 1 -->Features"},
+    { message = "^feature(\\(.*\\))?:", group = "<!-- 1 -->Features"},
+    { message = "^fix(\\(.*\\))?:", group = "<!-- 2 -->Bug Fixes and Improvements"},
+    { message = "^perf(\\(.*\\))?:", group = "<!-- 3 -->Performance"},
+    { message = "^refactor(\\(.*\\))?:", group = "<!-- 4 -->Refactor"},
+    { message = "^style(\\(.*\\))?:", group = "<!-- 5 -->Styling"},
+    { message = "^locale(\\(.*\\))?:", group = "<!-- 6 -->Localization"},
+    { message = "^docs(\\(.*\\))?:", group = "<!-- 7 -->Documentation"},
+    { message = "^test(\\(.*\\))?:", group = "<!-- 8 -->Other"},
+    { message = "^chore(\\(.*\\))?:", group = "<!-- 8 -->Other"},
+
     { body = ".*security", group = "Security"},
 ]
+commit_preprocessors = [
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](<REPO>/pull/${2}))" },
+]
 # filter out the commits that are not matched by commit parsers
 filter_commits = true
 ignore_tags="v*-(beta|rc)*"

diff --git a/cliff.toml b/cliff.toml
@@ -17,11 +17,11 @@ body = """
     ## [unreleased]
 {% endif %}\
 {% for group, commits in commits | group_by(attribute="group") %}\
-    ### {{ group | split(pat="$") | last | upper_first }}
+    ### {{ group | striptags | trim | upper_first }}
     {% for commit in commits
     | filter(attribute="scope")
     | sort(attribute="scope") %}
-        - **{{commit.scope}}**: {{ commit.message | upper_first | trim }} | [{{ commit.id | truncate(length=7, end="") }}]({{ commit.id }})\
+        - **{{commit.scope}}**: {{ commit.message | upper_first | trim }}\
         {%- if commit.breaking %}
         {% raw %}  {% endraw %}- **BREAKING**: {{commit.breaking_description}}
         {%- endif -%}
@@ -30,7 +30,7 @@ body = """
         {%- if commit.scope -%}
         {% else -%}
         {% raw %}\n{% endraw %}\
-        - {{ commit.message | upper_first | trim }} | [{{ commit.id | truncate(length=7, end="") }}]({{ commit.id }})\
+        - {{ commit.message | upper_first | trim }}\
         {%- if commit.breaking %}
         {% raw %}  {% endraw %}- **BREAKING**: {{commit.breaking_description}}
         {%- endif -%}
@@ -45,28 +45,42 @@ trim = true
 footer = """
 """
 
+# postprocessors
+postprocessors = [
+    { pattern = '<REPO>', replace = "https://github.com/mainsail-crew/mainsail" }, # replace repository URL
+]
+
 [git]
 # allow only conventional commits
 # https://www.conventionalcommits.org
 conventional_commits = true
 filter_unconventional = false
 # regex for parsing and grouping commits
 commit_parsers = [
+
+    # Commits to skip
     { message = "^docs\\(changelog\\):", group = "Changelog", skip = true}, # Old redundant commits
-    { message = "^chore\\(changelog\\): update changelog", group = "Changelog", skip = true}, # Old redundant commits
     { message = "^chore: push version number to", group = "9$Other", skip = true}, # Old redundant commits
-    { message = "^feat(\\(.*\\))?:", group = "1$Features"},
-    { message = "^feature(\\(.*\\))?:", group = "1$Features"},
-    { message = "^fix(\\(.*\\))?:", group = "2$Bug Fixes and Improvements"},
-    { message = "^docs(\\(.*\\))?:", group = "7$Documentation"},
-    { message = "^perf(\\(.*\\))?:", group = "3$Performance"},
-    { message = "^refactor(\\(.*\\))?:", group = "4$Refactor"},
-    { message = "^style(\\(.*\\))?:", group = "5$Styling"},
-    { message = "^test(\\(.*\\))?:", group = "9$Other"},
-    { message = "^locale(\\(.*\\))?:", group = "6$Localization"},
-    { message = "^chore(\\(.*\\))?:", group = "9$Other"},
-    { body = ".*security", group = "Security"},
+    { message = "^chore\\(changelog\\): update changelog", group = "Changelog", skip = true}, # Old redundant commits
+
+    # Commits to parse
+    { message = "^feat(\\(.*\\))?:", group = "<!-- 1 -->Features"},
+    { message = "^feature(\\(.*\\))?:", group = "<!-- 1 -->Features"},
+    { message = "^fix(\\(.*\\))?:", group = "<!-- 2 -->Bug Fixes and Improvements"},
+    { message = "^perf(\\(.*\\))?:", group = "<!-- 3 -->Performance"},
+    { message = "^refactor(\\(.*\\))?:", group = "<!-- 4 -->Refactor"},
+    { message = "^style(\\(.*\\))?:", group = "<!-- 5 -->Styling"},
+    { message = "^locale(\\(.*\\))?:", group = "<!-- 6 -->Localization"},
+    { message = "^docs(\\(.*\\))?:", group = "<!-- 7 -->Documentation"},
+    { message = "^test(\\(.*\\))?:", group = "<!-- 8 -->Other"},
+    { message = "^chore(\\(.*\\))?:", group = "<!-- 8 -->Other"},
+
     { message = "release v2.1.2", group = "Release"}, # workaround for v2.1.2 release
+
+    { body = ".*security", group = "Security"},
+]
+commit_preprocessors = [
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](<REPO>/pull/${2}))" },
 ]
 # filter out the commits that are not matched by commit parsers
 filter_commits = true

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
         "@lezer/highlight": "^1.0.0",
         "@sindarius/gcodeviewer": "^3.2.2",
         "@uiw/codemirror-theme-vscode": "^4.19.11",
-        "axios": "^0.27.0",
+        "axios": "^1.6.0",
         "codemirror": "^6.0.1",
         "core-js": "^3.16.0",
         "detect-browser": "^5.3.0",
@@ -94,7 +94,7 @@
         "start-server-and-test": "^2.0.0",
         "typescript": "^4.5.5",
         "unplugin-vue-components": "^0.22.12",
-        "vite": "^4.4.9",
+        "vite": "^4.4.12",
         "vite-plugin-checker": "^0.6.0",
         "vite-plugin-package-version": "^1.0.2",
         "vite-plugin-pwa": "^0.16.4",

diff --git a/src/App.vue b/src/App.vue
@@ -17,6 +17,7 @@
             <the-manual-probe-dialog />
             <the-bed-screws-dialog />
             <the-screws-tilt-adjust-dialog />
+            <the-macro-prompt />
         </template>
         <the-select-printer-dialog v-else-if="instancesDB !== 'moonraker'" />
         <the-connecting-dialog v-else />
@@ -41,11 +42,13 @@ import TheManualProbeDialog from '@/components/dialogs/TheManualProbeDialog.vue'
 import TheBedScrewsDialog from '@/components/dialogs/TheBedScrewsDialog.vue'
 import TheScrewsTiltAdjustDialog from '@/components/dialogs/TheScrewsTiltAdjustDialog.vue'
 import { setAndLoadLocale } from './plugins/i18n'
+import TheMacroPrompt from '@/components/dialogs/TheMacroPrompt.vue'
 
 Component.registerHooks(['metaInfo'])
 
 @Component({
     components: {
+        TheMacroPrompt,
         TheTimelapseRenderingSnackbar,
         TheEditor,
         TheSelectPrinterDialog,

diff --git a/src/components/TheSettingsMenu.vue b/src/components/TheSettingsMenu.vue
@@ -100,8 +100,11 @@ import {
     mdiWebcam,
     mdiDipSwitch,
     mdiMenu,
+    mdiGrid,
 } from '@mdi/js'
 import SettingsMiscellaneousTab from '@/components/settings/SettingsMiscellaneousTab.vue'
+import SettingsHeightmapTab from '@/components/settings/SettingsHeightmapTab.vue'
+
 @Component({
     components: {
         Panel,
@@ -119,6 +122,7 @@ import SettingsMiscellaneousTab from '@/components/settings/SettingsMiscellaneou
         SettingsTimelapseTab,
         SettingsMiscellaneousTab,
         SettingsNavigationTab,
+        SettingsHeightmapTab,
     },
 })
 export default class TheSettingsMenu extends Mixins(BaseMixin) {
@@ -202,6 +206,11 @@ export default class TheSettingsMenu extends Mixins(BaseMixin) {
                 name: 'navigation',
                 title: this.$t('Settings.NavigationTab.Navigation'),
             },
+            {
+                icon: mdiGrid,
+                name: 'heightmap',
+                title: this.$t('Settings.HeightmapTab.Heightmap'),
+            },
         ]
 
         if (this.moonrakerComponents.includes('timelapse')) {

diff --git a/src/components/charts/TempChart.vue b/src/components/charts/TempChart.vue
@@ -319,7 +319,7 @@ export default class TempChart extends Mixins(BaseMixin) {
             }
             if (seriesNameTarget in dataset.value) {
                 output += ' / '
-                const value = dataset.value[seriesNameTemperature]
+                const value = dataset.value[seriesNameTarget]
                 output += value !== null ? value.toFixed(1) : '--'
             }
             output += '°C'