Merge branch 'develop'

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>

Author: pedrolamas

components.d.ts

@@ -1,10 +1,10 @@
 /* eslint-disable */
-/* prettier-ignore */
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
 export {}
 
+/* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
     ActionCommandPromptDialog: typeof import('./src/components/common/ActionCommandPromptDialog.vue')['default']

package-lock.json

@@ -34,34 +34,34 @@
   "dependencies": {
     "@ctrl/tinycolor": "^4.1.0",
     "@fontsource/raleway": "^5.0.19",
-    "@fontsource/roboto": "^5.0.13",
+    "@fontsource/roboto": "^5.0.14",
     "@irojs/iro-core": "^1.2.1",
     "@jaames/iro": "^5.5.2",
-    "axios": "^1.7.2",
+    "axios": "^1.7.4",
     "consola": "^3.2.3",
-    "dompurify": "^3.1.5",
-    "echarts": "^5.5.0",
+    "dompurify": "^3.1.6",
+    "echarts": "^5.5.1",
     "echarts-gl": "^2.0.9",
-    "hls.js": "^1.5.11",
+    "hls.js": "^1.5.14",
     "jwt-decode": "^4.0.0",
     "lodash-es": "^4.17.21",
-    "marked": "^13.0.0",
-    "marked-base-url": "^1.1.4",
+    "marked": "^14.0.0",
+    "marked-base-url": "^1.1.5",
     "md5": "^2.3.0",
-    "monaco-editor": "^0.49.0",
+    "monaco-editor": "^0.50.0",
     "monaco-editor-textmate": "^4.0.0",
     "monaco-textmate": "^3.0.1",
     "onigasm": "^2.2.5",
     "panzoom": "^9.4.3",
     "qr-scanner": "^1.4.2",
     "qrcode.vue": "^1.7.0",
-    "semver": "^7.6.2",
+    "semver": "^7.6.3",
     "shlex": "^2.1.2",
     "sortablejs": "^1.15.2",
     "uuid": "^10.0.0",
     "vue": "^2.7.16",
     "vue-class-component": "^7.2.6",
-    "vue-echarts": "^6.7.3",
+    "vue-echarts": "^7.0.2",
     "vue-i18n": "^8.28.2",
     "vue-inline-svg": "^2.1.4",
     "vue-json-viewer": "^2.2.22",
@@ -81,39 +81,39 @@
     "@types/jsdom": "^21.1.7",
     "@types/lodash-es": "^4.17.12",
     "@types/md5": "^2.3.5",
-    "@types/node": "^20.14.6",
+    "@types/node": "^20.14.15",
     "@types/semver": "^7.5.8",
     "@types/sortablejs": "^1.15.8",
-    "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^7.13.1",
-    "@typescript-eslint/parser": "^7.13.1",
+    "@types/uuid": "^10.0.0",
+    "@typescript-eslint/eslint-plugin": "^7.17.0",
+    "@typescript-eslint/parser": "^7.17.0",
     "@vitejs/plugin-vue2": "^2.3.1",
     "@vue/eslint-config-standard": "^8.0.1",
     "@vue/eslint-config-typescript": "^13.0.0",
     "@vue/test-utils": "^1.3.6",
     "@vue/tsconfig": "~0.1.3",
     "eslint": "^8.57.0",
-    "eslint-plugin-vue": "^9.26.0",
-    "husky": "^9.0.11",
-    "jsdom": "^24.1.0",
+    "eslint-plugin-vue": "^9.27.0",
+    "husky": "^9.1.4",
+    "jsdom": "^24.1.1",
     "mockdate": "^3.0.5",
     "monaco-vscode-textmate-theme-converter": "^0.1.7",
-    "rollup": "^4.18.0",
+    "rollup": "^4.20.0",
     "sass": "~1.32.13",
     "shx": "^0.3.4",
-    "skott": "^0.35.0",
+    "skott": "^0.35.2",
     "standard-version": "^9.5.0",
-    "typescript": "^5.4.5",
-    "unplugin-vue-components": "^0.27.0",
-    "vite": "^5.3.1",
-    "vite-plugin-checker": "^0.6.4",
+    "typescript": "^5.5.4",
+    "unplugin-vue-components": "^0.27.4",
+    "vite": "^5.4.0",
+    "vite-plugin-checker": "^0.7.2",
     "vite-plugin-monaco-editor": "^1.1.0",
-    "vite-plugin-pwa": "^0.20.0",
+    "vite-plugin-pwa": "^0.20.1",
     "vitest": "^1.6.0",
     "vue-debounce-decorator": "^1.0.1",
     "vue-i18n-extract": "^2.0.7",
     "vue-template-compiler": "^2.7.16",
-    "vue-tsc": "^1.8.27",
+    "vue-tsc": "^2.0.29",
     "workbox-build": "^7.1.1",
     "workbox-core": "^7.1.0",
     "workbox-routing": "^7.1.0",

package.json

@@ -15,7 +15,7 @@
           :key="peripheralGroup.type"
         >
           <div>
-            {{ $filters.startCase(peripheralGroup.type) }}
+            {{ $filters.prettyCase(peripheralGroup.type) }}
             <v-chip
               small
               link
@@ -85,7 +85,7 @@
               <v-col>
                 <v-card outlined>
                   <v-card-title>{{ device.device_name }}</v-card-title>
-                  <v-card-subtitle>{{ $filters.startCase(device.device_type) }}</v-card-subtitle>
+                  <v-card-subtitle>{{ $filters.prettyCase(device.device_type) }}</v-card-subtitle>
 
                   <v-card-text>
                     <v-row>

src/components/common/PeripheralsDialog.vue

@@ -91,7 +91,7 @@
 </template>
 
 <script lang="ts">
-import type { ArtifactVersion, HashVersion, OSPackage } from '@/store/version/types'
+import type { UpdatePackage } from '@/store/version/types'
 import { Component, Vue, Prop, VModel } from 'vue-property-decorator'
 
 @Component({})
@@ -100,7 +100,7 @@ export default class VersionInformationDialog extends Vue {
     open?: boolean
 
   @Prop({ type: Object })
-  readonly component!: HashVersion | ArtifactVersion | OSPackage
+  readonly component!: UpdatePackage
 
   // For HashVersions or ArtifacVersions, show the commit history.
   // For type system, show the packages available to update.
@@ -112,7 +112,7 @@ export default class VersionInformationDialog extends Vue {
 
   get baseUrl () {
     if ('owner' in this.component) {
-      return `https://github.com/${this.component.owner}/${this.component.key}`
+      return `https://github.com/${this.component.owner}/${this.component.repo_name || this.component.key}`
     }
     return ''
   }

src/components/settings/VersionInformationDialog.vue

@@ -180,7 +180,7 @@ import VersionStatus from './VersionStatus.vue'
 import VersionCommitHistoryDialog from './VersionInformationDialog.vue'
 import StateMixin from '@/mixins/state'
 import { SocketActions } from '@/api/socketActions'
-import type { ArtifactVersion, HashVersion, OSPackage } from '@/store/version/types'
+import type { VersionedUpdatePackage, UpdatePackage } from '@/store/version/types'
 
 @Component({
   components: {
@@ -219,7 +219,7 @@ export default class VersionSettings extends Mixins(StateMixin) {
     })
   }
 
-  packageTitle (component: HashVersion | OSPackage | ArtifactVersion) {
+  packageTitle (component: UpdatePackage) {
     if (component.key === 'system') {
       return this.$t('app.version.label.os_packages')
     }
@@ -231,7 +231,7 @@ export default class VersionSettings extends Mixins(StateMixin) {
     return this.$store.getters['version/hasUpdate'](component)
   }
 
-  inError (component: HashVersion | OSPackage | ArtifactVersion) {
+  inError (component: UpdatePackage) {
     const dirty = ('is_dirty' in component) ? component.is_dirty : false
     const valid = ('is_valid' in component) ? component.is_valid : true
     return (dirty || !valid)
@@ -262,7 +262,7 @@ export default class VersionSettings extends Mixins(StateMixin) {
   }
 
   // Will attempt to recover a component based on its type and current status.
-  handleRecoverComponent (component: HashVersion | OSPackage | ArtifactVersion) {
+  handleRecoverComponent (component: UpdatePackage) {
     this.$store.dispatch('version/onUpdateStatus', { busy: true })
     const dirty = ('is_dirty' in component) ? component.is_dirty : false
     const valid = ('is_valid' in component) ? component.is_valid : true
@@ -282,17 +282,17 @@ export default class VersionSettings extends Mixins(StateMixin) {
     }
   }
 
-  getBaseUrl (component: HashVersion | ArtifactVersion) {
+  getBaseUrl (component: VersionedUpdatePackage) {
     if ('remote_url' in component && component.remote_url) {
       return component.remote_url
     }
     if ('owner' in component) {
-      return `https://github.com/${component.owner}/${component.key}`
+      return `https://github.com/${component.owner}/${component.repo_name || component.key}`
     }
     return ''
   }
 
-  handleInformationDialog (component: HashVersion | OSPackage | ArtifactVersion) {
+  handleInformationDialog (component: UpdatePackage) {
     if (
       'commits_behind' in component ||
       'package_list' in component

src/components/settings/VersionSettings.vue

@@ -24,7 +24,7 @@
       <template v-for="(item, i) in heaters">
         <app-setting
           :key="`${i}heater`"
-          :title="$filters.startCase(item.name)"
+          :title="$filters.prettyCase(item.name)"
         >
           <v-checkbox
             v-model="preset.values[item.name].active"
@@ -53,7 +53,7 @@
       <template v-for="(item, i) in fans">
         <app-setting
           :key="`${i}fan`"
-          :title="$filters.startCase(item.name)"
+          :title="$filters.prettyCase(item.name)"
         >
           <v-checkbox
             v-model="preset.values[item.name].active"

src/components/settings/presets/PresetDialog.vue

@@ -162,7 +162,7 @@ export default class BedMeshChart extends Mixins(BrowserMixin) {
               <div>
                 <span style="display:inline-block;margin-right:4px;border-radius:10px;width:10px;height:10px;background-color:${params.color};"></span>
                 <span style="font-size:16px;color:${fontColor};font-weight:400;margin-left:2px">
-                  ${this.$filters.startCase(params.seriesName)}
+                  ${this.$filters.prettyCase(params.seriesName)}
                 </span>
                 <div style="clear: both"></div>
                 <span style="font-size:16px;color:${fontColor};font-weight:400;margin-left:2px">

src/components/widgets/bedmesh/BedMeshChart.vue

@@ -116,7 +116,7 @@ export default class CameraItem extends Vue {
 
   get cameraComponent () {
     if (this.camera.service) {
-      const componentName = `${this.$filters.startCase(this.camera.service).replace(/ /g, '')}Camera`
+      const componentName = `${this.$filters.prettyCase(this.camera.service).replace(/ /g, '')}Camera`
 
       if (componentName in CameraComponents) {
         return CameraComponents[componentName]

src/components/widgets/camera/CameraItem.vue

@@ -20,30 +20,36 @@
       </app-btn>
     </template>
 
-    <v-card-text>
-      <v-layout
+    <v-list>
+      <v-list-item
         v-for="item in sensors"
         :key="item.name"
-        align-center
-        justify-start
-        class="py-1"
       >
-        <span class="text-subtitle-1">{{ item.name }}</span>
-        <v-icon
-          :color="(item.filament_detected) ? 'success' : 'warning'"
-          class="ml-3"
-          left
-        >
-          {{ (item.filament_detected) ? '$checkedCircle' : '$alertCircle' }}
-        </v-icon>
-        <v-switch
-          class="ml-2"
-          color="success"
-          :input-value="item.enabled"
-          @change="changeSensor(item, $event)"
-        />
-      </v-layout>
-    </v-card-text>
+        <v-list-item-content>
+          <v-list-item-title>{{ item.prettyName }}</v-list-item-title>
+        </v-list-item-content>
+        <v-list-item-icon>
+          <v-icon
+            v-if="item.filament_detected"
+            color="success"
+          >
+            $checkedCircle
+          </v-icon>
+          <v-icon
+            v-else
+            color="warning"
+          >
+            $alertCircle
+          </v-icon>
+        </v-list-item-icon>
+        <v-list-item-action>
+          <v-switch
+            :input-value="item.enabled"
+            @change="changeSensor(item, $event)"
+          />
+        </v-list-item-action>
+      </v-list-item>
+    </v-list>
   </collapsable-card>
 </template>
 
@@ -62,8 +68,7 @@ export default class RunoutSensorsCard extends Mixins(StateMixin) {
   }
 
   changeSensor (item: RunoutSensor, value: boolean) {
-    const enable: number = (value) ? 1 : 0
-    this.sendGcode(`SET_FILAMENT_SENSOR SENSOR=${item.name} ENABLE=${enable}`)
+    this.sendGcode(`SET_FILAMENT_SENSOR SENSOR=${item.name} ENABLE=${+value}`)
   }
 }
 </script>