Merge branch 'develop'

Signed-off-by: Pedro Lamas <[email protected]>
fluidd-core · Mar 16, 2024 · c667f24 · c667f24
2 parents d1ef3a4 + ef13842
commit c667f24
Show file tree

Hide file tree

Showing 97 changed files with 2,540 additions and 1,518 deletions.
diff --git a/components.d.ts b/components.d.ts
@@ -17,7 +17,6 @@ declare module 'vue' {
     AppBtnGroup: typeof import('./src/components/ui/AppBtnGroup.vue')['default']
     AppBtnToolheadMove: typeof import('./src/components/ui/AppBtnToolheadMove.vue')['default']
     AppChart: typeof import('./src/components/ui/AppChart.vue')['default']
-    AppCodeView: typeof import('./src/components/ui/AppCodeView.vue')['default']
     AppColorPicker: typeof import('./src/components/ui/AppColorPicker.vue')['default']
     AppColumnPicker: typeof import('./src/components/ui/AppColumnPicker.vue')['default']
     AppDialog: typeof import('./src/components/ui/AppDialog.vue')['default']
@@ -40,6 +39,7 @@ declare module 'vue' {
     AppSetting: typeof import('./src/components/ui/AppSetting.vue')['default']
     AppSettingsNav: typeof import('./src/components/layout/AppSettingsNav.vue')['default']
     AppTextField: typeof import('./src/components/ui/AppTextField.vue')['default']
+    AppTextFieldWithCopy: typeof import('./src/components/ui/AppTextFieldWithCopy.vue')['default']
     AppThumbnailSize: typeof import('./src/components/ui/AppThumbnailSize.vue')['default']
     AppToolsDrawer: typeof import('./src/components/layout/AppToolsDrawer.vue')['default']
     AppUpDownBtnGroup: typeof import('./src/components/ui/AppUpDownBtnGroup.vue')['default']
@@ -51,6 +51,7 @@ declare module 'vue' {
     FlashMessage: typeof import('./src/components/common/FlashMessage.vue')['default']
     KlippyStatusCard: typeof import('./src/components/common/KlippyStatusCard.vue')['default']
     ManualProbeDialog: typeof import('./src/components/common/ManualProbeDialog.vue')['default']
+    PeripheralsDialog: typeof import('./src/components/common/PeripheralsDialog.vue')['default']
     PromiseWrapper: typeof import('./src/components/common/PromiseWrapper.vue')['default']
     RegisterServiceWorker: typeof import('./src/components/common/RegisterServiceWorker.vue')['default']
     RolloverLogsDialog: typeof import('./src/components/common/RolloverLogsDialog.vue')['default']

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,21 +35,23 @@
   "main": "index.js",
   "dependencies": {
     "@ctrl/tinycolor": "^4.0.3",
-    "@fontsource/raleway": "^5.0.16",
-    "@fontsource/roboto": "^5.0.8",
+    "@fontsource/raleway": "^5.0.17",
+    "@fontsource/roboto": "^5.0.12",
     "@irojs/iro-core": "^1.2.1",
     "@jaames/iro": "^5.5.2",
-    "axios": "^1.6.7",
+    "axios": "^1.6.8",
     "consola": "^3.2.3",
     "deepmerge": "^4.3.1",
-    "dompurify": "^3.0.8",
-    "echarts": "^5.4.3",
+    "dompurify": "^3.0.9",
+    "echarts": "^5.5.0",
     "echarts-gl": "^2.0.9",
-    "hls.js": "^1.5.4",
+    "hls.js": "^1.5.7",
     "jwt-decode": "^4.0.0",
     "lodash-es": "^4.17.21",
+    "marked": "^12.0.1",
+    "marked-base-url": "^1.1.3",
     "md5": "^2.3.0",
-    "monaco-editor": "^0.46.0",
+    "monaco-editor": "^0.47.0",
     "monaco-editor-textmate": "^4.0.0",
     "monaco-textmate": "^3.0.1",
     "onigasm": "^2.2.5",
@@ -62,7 +64,7 @@
     "uuid": "^9.0.1",
     "vue": "^2.7.16",
     "vue-class-component": "^7.2.6",
-    "vue-echarts": "^6.6.8",
+    "vue-echarts": "^6.6.9",
     "vue-i18n": "^8.28.2",
     "vue-inline-svg": "^2.1.3",
     "vue-json-viewer": "^2.2.22",
@@ -71,7 +73,7 @@
     "vue-router": "^3.6.5",
     "vue-virtual-scroller": "^1.1.2",
     "vue2-touch-events": "^3.2.3",
-    "vuetify": "^2.7.1",
+    "vuetify": "^2.7.2",
     "vuetify-confirm": "^2.0.6",
     "vuex": "^3.6.2"
   },
@@ -82,35 +84,35 @@
     "@types/jsdom": "^21.1.6",
     "@types/lodash-es": "^4.17.12",
     "@types/md5": "^2.3.5",
-    "@types/node": "^20.11.17",
-    "@types/semver": "^7.5.7",
-    "@types/sortablejs": "^1.15.7",
+    "@types/node": "^20.11.28",
+    "@types/semver": "^7.5.8",
+    "@types/sortablejs": "^1.15.8",
     "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
     "@vitejs/plugin-vue2": "^2.3.1",
     "@vue/eslint-config-standard": "^8.0.1",
-    "@vue/eslint-config-typescript": "^12.0.0",
+    "@vue/eslint-config-typescript": "^13.0.0",
     "@vue/test-utils": "^1.3.6",
     "@vue/tsconfig": "~0.1.3",
-    "eslint": "^8.56.0",
-    "eslint-plugin-vue": "^9.21.1",
-    "husky": "^9.0.10",
+    "eslint": "^8.57.0",
+    "eslint-plugin-vue": "^9.23.0",
+    "husky": "^9.0.11",
     "jsdom": "^24.0.0",
     "mockdate": "^3.0.5",
     "monaco-vscode-textmate-theme-converter": "^0.1.7",
-    "rollup": "^4.10.0",
+    "rollup": "^4.13.0",
     "sass": "~1.32.13",
     "shx": "^0.3.4",
-    "skott": "^0.32.1",
+    "skott": "^0.33.2",
     "standard-version": "^9.5.0",
-    "typescript": "^5.3.3",
+    "typescript": "^5.4.2",
     "unplugin-vue-components": "^0.26.0",
-    "vite": "^5.1.1",
+    "vite": "^5.1.6",
     "vite-plugin-checker": "^0.6.4",
     "vite-plugin-monaco-editor": "^1.1.0",
-    "vite-plugin-pwa": "^0.18.1",
-    "vitest": "^1.2.2",
+    "vite-plugin-pwa": "^0.19.4",
+    "vitest": "^1.4.0",
     "vue-debounce-decorator": "^1.0.1",
     "vue-i18n-extract": "^2.0.7",
     "vue-template-compiler": "^2.7.16",

diff --git a/src/api/httpClientActions.ts b/src/api/httpClientActions.ts
@@ -170,6 +170,16 @@ export const httpClientActions = {
     }, options)
   },
 
+  serverDatabaseItemDelete<T = unknown> (namespace: string, key: string, options?: AxiosRequestConfig) {
+    return this.delete<{
+      result: {
+        namespace: string,
+        key: string,
+        value: T
+      }
+    }>(`/server/database/item?namespace=${namespace}&key=${key}`, options)
+  },
+
   serverFilesUploadPost (file: File, path: string, root: string, print?: boolean, options?: AxiosRequestConfig) {
     const formData = new FormData()
 

diff --git a/src/api/socketActions.ts b/src/api/socketActions.ts
@@ -3,6 +3,7 @@ import { Globals, Waits } from '@/globals'
 import type { NotifyOptions } from '@/plugins/socketClient'
 import { consola } from 'consola'
 import type { TimelapseWritableSettings } from '@/store/timelapse/types'
+import type { WebcamConfig } from '@/store/webcams/types'
 
 const baseEmit = (method: string, options: NotifyOptions) => {
   if (!Vue.$socket) {
@@ -189,6 +190,46 @@ export const SocketActions = {
     )
   },
 
+  async machinePeripheralsUsb () {
+    baseEmit(
+      'machine.peripherals.usb', {
+        dispatch: 'server/onMachinePeripherals',
+        wait: Waits.onMachinePeripheralsUsb
+      }
+    )
+  },
+
+  async machinePeripheralsSerial () {
+    baseEmit(
+      'machine.peripherals.serial', {
+        dispatch: 'server/onMachinePeripherals',
+        wait: Waits.onMachinePeripheralsSerial
+      }
+    )
+  },
+
+  async machinePeripheralsVideo () {
+    baseEmit(
+      'machine.peripherals.video', {
+        dispatch: 'server/onMachinePeripherals',
+        wait: Waits.onMachinePeripheralsVideo
+      }
+    )
+  },
+
+  async machinePeripheralsCanbus (canbusInterface: string) {
+    const wait = `${Waits.onMachinePeripheralsCanbus}/${canbusInterface}`
+    baseEmit(
+      'machine.peripherals.canbus', {
+        dispatch: 'server/onMachinePeripheralsCanbus',
+        params: {
+          interface: canbusInterface
+        },
+        wait
+      }
+    )
+  },
+
   async machineTimelapseSetSettings (settings: Partial<TimelapseWritableSettings>, wait?: string) {
     baseEmit(
       'machine.timelapse.post_settings', {
@@ -704,6 +745,24 @@ export const SocketActions = {
     )
   },
 
+  async serverWebcamsWrite (webcam: WebcamConfig) {
+    baseEmit(
+      'server.webcams.post_item', {
+        params: webcam
+      }
+    )
+  },
+
+  async serverWebcamsDelete (uid: string) {
+    baseEmit(
+      'server.webcams.delete_item', {
+        params: {
+          uid
+        }
+      }
+    )
+  },
+
   async serverSensorsList () {
     baseEmit(
       'server.sensors.list', {

diff --git a/src/components/common/AddInstanceDialog.vue b/src/components/common/AddInstanceDialog.vue
@@ -4,17 +4,11 @@
     max-width="320"
     :save-button-disabled="!verified"
     :valid.sync="valid"
+    :title="$t('app.general.title.add_printer')"
+    :help-tooltip="$t('app.endpoint.tooltip.endpoint_examples')"
     persistent
     @save="addInstance"
   >
-    <template #title>
-      <span class="focus--text">{{ $t('app.general.title.add_printer') }}</span>
-      <v-spacer />
-      <app-inline-help bottom>
-        <span v-html="$t('app.endpoint.tooltip.endpoint_examples')" />
-      </app-inline-help>
-    </template>
-
     <v-card-text>
       <span v-html="helpTxt" />