From 0a7e1f629e52b0127e0fd8659eb00f3cf8547c40 Mon Sep 17 00:00:00 2001 From: proddy Date: Thu, 23 Mar 2023 20:29:01 +0100 Subject: [PATCH] use number as table id's - #1126 --- interface/package.json | 22 +- interface/src/project/SettingsScheduler.tsx | 12 +- interface/src/project/types.ts | 6 +- interface/yarn.lock | 424 ++++++++++---------- mock-api/package.json | 2 +- mock-api/server.js | 22 +- mock-api/yarn.lock | 10 +- src/web/WebSchedulerService.cpp | 2 +- src/web/WebStatusService.cpp | 16 +- 9 files changed, 254 insertions(+), 262 deletions(-) diff --git a/interface/package.json b/interface/package.json index 9ad5a4fb9..04fdd48a3 100644 --- a/interface/package.json +++ b/interface/package.json @@ -24,11 +24,11 @@ "@emotion/styled": "^11.10.6", "@msgpack/msgpack": "^2.8.0", "@mui/icons-material": "^5.11.11", - "@mui/material": "^5.11.13", + "@mui/material": "^5.11.14", "@remix-run/router": "^1.4.0", - "@table-library/react-table-library": "4.0.29", + "@table-library/react-table-library": "4.1.0", "@types/lodash-es": "^4.17.7", - "@types/node": "^18.15.3", + "@types/node": "^18.15.5", "@types/react": "^18.0.28", "@types/react-dom": "^18.0.11", "@types/react-router-dom": "^5.3.3", @@ -44,21 +44,21 @@ "react-dropzone": "^14.2.3", "react-icons": "^4.8.0", "react-router-dom": "^6.9.0", - "react-toastify": "^9.1.1", + "react-toastify": "^9.1.2", "sockette": "^2.0.6", "typesafe-i18n": "^5.24.2", - "typescript": "^4.9.5" + "typescript": "^5.0.2" }, "devDependencies": { "@types/mime-types": "^2", "@types/styled-components": "^5", - "@typescript-eslint/eslint-plugin": "^5.55.0", - "@typescript-eslint/parser": "^5.55.0", + "@typescript-eslint/eslint-plugin": "^5.56.0", + "@typescript-eslint/parser": "^5.56.0", "@vitejs/plugin-react-swc": "^3.2.0", "eslint": "^8.36.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb-typescript": "^17.0.0", - "eslint-config-prettier": "^8.7.0", + "eslint-config-prettier": "^8.8.0", "eslint-import-resolver-typescript": "^3.5.3", "eslint-plugin-deprecation": "^1.3.3", "eslint-plugin-import": "^2.27.5", @@ -66,12 +66,12 @@ "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-react": "^7.32.2", "eslint-plugin-react-hooks": "^4.6.0", - "nodemon": "^2.0.21", + "nodemon": "^2.0.22", "npm-run-all": "^4.1.5", - "prettier": "^2.8.4", + "prettier": "^2.8.6", "rollup-plugin-visualizer": "^5.9.0", "terser": "^5.16.6", - "vite": "^4.1.4", + "vite": "^4.2.1", "vite-plugin-minify": "^1.5.2", "vite-plugin-svgr": "^2.4.0", "vite-tsconfig-paths": "^4.0.7" diff --git a/interface/src/project/SettingsScheduler.tsx b/interface/src/project/SettingsScheduler.tsx index 8d4e200a0..b4681f184 100644 --- a/interface/src/project/SettingsScheduler.tsx +++ b/interface/src/project/SettingsScheduler.tsx @@ -52,15 +52,7 @@ import { useI18nContext } from 'i18n/i18n-react'; import * as EMSESP from './api'; function makeid() { - let result = ''; - const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; - const charactersLength = characters.length; - let counter = 0; - while (counter < 4) { - result += characters.charAt(Math.floor(Math.random() * charactersLength)); - counter += 1; - } - return result; + return Math.floor(Math.random() * (Math.floor(200) - 100) + 100); } const SettingsScheduler: FC = () => { @@ -70,7 +62,7 @@ const SettingsScheduler: FC = () => { const blocker = useBlocker(numChanges !== 0); const emptySchedule = { - id: '0', + id: 0, active: false, deleted: false, flags: 0, diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts index 2b09477fa..53edba81f 100644 --- a/interface/src/project/types.ts +++ b/interface/src/project/types.ts @@ -43,7 +43,7 @@ export enum busConnectionStatus { } export interface Stat { - id: string; // id - needs to be a string + id: number; // id s: number; // success f: number; // fail q: number; // quality @@ -305,7 +305,7 @@ export enum DeviceEntityMask { } export interface ScheduleItem { - id: string; // unique index + id: number; // unique index active: boolean; deleted?: boolean; // optional flags: number; @@ -313,7 +313,7 @@ export interface ScheduleItem { cmd: string; value: string; name?: string; // optional - o_id?: string; + o_id?: number; o_active?: boolean; o_deleted?: boolean; o_flags?: number; diff --git a/interface/yarn.lock b/interface/yarn.lock index 7002aa7fa..130b61a35 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -406,156 +406,156 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/android-arm64@npm:0.16.17" +"@esbuild/android-arm64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/android-arm64@npm:0.17.12" conditions: os=android & cpu=arm64 languageName: node linkType: hard -"@esbuild/android-arm@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/android-arm@npm:0.16.17" +"@esbuild/android-arm@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/android-arm@npm:0.17.12" conditions: os=android & cpu=arm languageName: node linkType: hard -"@esbuild/android-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/android-x64@npm:0.16.17" +"@esbuild/android-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/android-x64@npm:0.17.12" conditions: os=android & cpu=x64 languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/darwin-arm64@npm:0.16.17" +"@esbuild/darwin-arm64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/darwin-arm64@npm:0.17.12" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/darwin-x64@npm:0.16.17" +"@esbuild/darwin-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/darwin-x64@npm:0.17.12" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/freebsd-arm64@npm:0.16.17" +"@esbuild/freebsd-arm64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/freebsd-arm64@npm:0.17.12" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/freebsd-x64@npm:0.16.17" +"@esbuild/freebsd-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/freebsd-x64@npm:0.17.12" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-arm64@npm:0.16.17" +"@esbuild/linux-arm64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-arm64@npm:0.17.12" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-arm@npm:0.16.17" +"@esbuild/linux-arm@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-arm@npm:0.17.12" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-ia32@npm:0.16.17" +"@esbuild/linux-ia32@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-ia32@npm:0.17.12" conditions: os=linux & cpu=ia32 languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-loong64@npm:0.16.17" +"@esbuild/linux-loong64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-loong64@npm:0.17.12" conditions: os=linux & cpu=loong64 languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-mips64el@npm:0.16.17" +"@esbuild/linux-mips64el@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-mips64el@npm:0.17.12" conditions: os=linux & cpu=mips64el languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-ppc64@npm:0.16.17" +"@esbuild/linux-ppc64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-ppc64@npm:0.17.12" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-riscv64@npm:0.16.17" +"@esbuild/linux-riscv64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-riscv64@npm:0.17.12" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-s390x@npm:0.16.17" +"@esbuild/linux-s390x@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-s390x@npm:0.17.12" conditions: os=linux & cpu=s390x languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/linux-x64@npm:0.16.17" +"@esbuild/linux-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/linux-x64@npm:0.17.12" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/netbsd-x64@npm:0.16.17" +"@esbuild/netbsd-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/netbsd-x64@npm:0.17.12" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/openbsd-x64@npm:0.16.17" +"@esbuild/openbsd-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/openbsd-x64@npm:0.17.12" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/sunos-x64@npm:0.16.17" +"@esbuild/sunos-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/sunos-x64@npm:0.17.12" conditions: os=sunos & cpu=x64 languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/win32-arm64@npm:0.16.17" +"@esbuild/win32-arm64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/win32-arm64@npm:0.17.12" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/win32-ia32@npm:0.16.17" +"@esbuild/win32-ia32@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/win32-ia32@npm:0.17.12" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.16.17": - version: 0.16.17 - resolution: "@esbuild/win32-x64@npm:0.16.17" +"@esbuild/win32-x64@npm:0.17.12": + version: 0.17.12 + resolution: "@esbuild/win32-x64@npm:0.17.12" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -703,9 +703,9 @@ __metadata: languageName: node linkType: hard -"@mui/base@npm:5.0.0-alpha.121": - version: 5.0.0-alpha.121 - resolution: "@mui/base@npm:5.0.0-alpha.121" +"@mui/base@npm:5.0.0-alpha.122": + version: 5.0.0-alpha.122 + resolution: "@mui/base@npm:5.0.0-alpha.122" dependencies: "@babel/runtime": ^7.21.0 "@emotion/is-prop-valid": ^1.2.0 @@ -722,14 +722,14 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: b14c9b5ed631058a0ef780a78c5e9129c67338baa4f65a4ab90e23f68410e24d133a9c19f195c136325338b5f444600e43cdd817430b546b73e5371b5d24f32f + checksum: 6d229f6f736074a41e0cf787cc5ef98eba23a52044d7edf22fcc42f03250275fd1b4bb4a7ab47fc1f1aec06bf777bde5474229cc381e515eefee8876f2d8cd5c languageName: node linkType: hard -"@mui/core-downloads-tracker@npm:^5.11.13": - version: 5.11.13 - resolution: "@mui/core-downloads-tracker@npm:5.11.13" - checksum: b8a32c9fc4beac4b596afe5fd3d2aecc2449e59d9e58a7ae6fbe528249fa6eabff3abf9195233eb7a46d523d6f1dc5c4ae95e1a69c287182c81311508c07c2c6 +"@mui/core-downloads-tracker@npm:^5.11.14": + version: 5.11.14 + resolution: "@mui/core-downloads-tracker@npm:5.11.14" + checksum: 8b1b42e125b15136ee82d2cb48354202b87beb8e20defcf3a8b758b033732444d09446d85a28c23b0dcaa8b5d067bc20bdd654c9adf551d826b142b4b09d7dd7 languageName: node linkType: hard @@ -749,14 +749,14 @@ __metadata: languageName: node linkType: hard -"@mui/material@npm:^5.11.13": - version: 5.11.13 - resolution: "@mui/material@npm:5.11.13" +"@mui/material@npm:^5.11.14": + version: 5.11.14 + resolution: "@mui/material@npm:5.11.14" dependencies: "@babel/runtime": ^7.21.0 - "@mui/base": 5.0.0-alpha.121 - "@mui/core-downloads-tracker": ^5.11.13 - "@mui/system": ^5.11.13 + "@mui/base": 5.0.0-alpha.122 + "@mui/core-downloads-tracker": ^5.11.14 + "@mui/system": ^5.11.14 "@mui/types": ^7.2.3 "@mui/utils": ^5.11.13 "@types/react-transition-group": ^4.4.5 @@ -778,7 +778,7 @@ __metadata: optional: true "@types/react": optional: true - checksum: 008e7e79bff7f193724c80308c9751151fc61dcaa76ce8f96d11473280ec6d78f61c9bdb8d23f0869e78b9359aa0bdd5164953d57a4e2f7160280f5d2a6b0b2d + checksum: 48fdd56ee55da6d551b8b716b8a080afe2276a62e0441efdd58be3b10ab1204d196a8ecc5f35ac23b8e9c7f5d6884ce37966cdcf8846771fe8ccc5ca626a8e1e languageName: node linkType: hard @@ -820,9 +820,9 @@ __metadata: languageName: node linkType: hard -"@mui/system@npm:^5.11.13": - version: 5.11.13 - resolution: "@mui/system@npm:5.11.13" +"@mui/system@npm:^5.11.14": + version: 5.11.14 + resolution: "@mui/system@npm:5.11.14" dependencies: "@babel/runtime": ^7.21.0 "@mui/private-theming": ^5.11.13 @@ -844,7 +844,7 @@ __metadata: optional: true "@types/react": optional: true - checksum: e6f1852ecf3dc901645c096f650950b858f5a5e53fc72ca68a7565e844d0841681c79402c3b63100574d1863b3af88d84b832bc680e8dae3a4a2147c7c9aee0f + checksum: a9df588ee7358438244ba5115f1f3bfe548b4c9077280204b6f6d4b98f20fd93f76bc36bf1430848b64e5c3a495ecb0e5000379932faa3dfb92360a34262f301 languageName: node linkType: hard @@ -1218,9 +1218,9 @@ __metadata: languageName: node linkType: hard -"@table-library/react-table-library@npm:4.0.29": - version: 4.0.29 - resolution: "@table-library/react-table-library@npm:4.0.29" +"@table-library/react-table-library@npm:4.1.0": + version: 4.1.0 + resolution: "@table-library/react-table-library@npm:4.1.0" dependencies: clsx: 1.1.1 react-virtualized-auto-sizer: 1.0.7 @@ -1229,7 +1229,7 @@ __metadata: "@emotion/react": ">= 11" react: ">=16.8.0" react-dom: ">=16.8.0" - checksum: f0daace88cc8fe20d23a7f0430c293cd737ae9d0f5deb8ef17eec238917ae0fd1d196453e2a8549cdd6e92533c4e2469dc0aeb6333555502b8b1e5df4ab2bdf4 + checksum: 75c63f8ede610269375d638266dc34bde78d315ac7d7332fae351ecb44e51d88b237557f2080ad1d824675b2d917db9b4b4710a99081de1d97117b9d670d1411 languageName: node linkType: hard @@ -1343,10 +1343,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^18.15.3": - version: 18.15.3 - resolution: "@types/node@npm:18.15.3" - checksum: 31b1d92475a82c30de29aa6c0771b18a276552d191283b4423ba2d61b3f01159bf0d02576c0b7cc834b043997893800db6bb47f246083ed85aa45e79c80875d7 +"@types/node@npm:^18.15.5": + version: 18.15.5 + resolution: "@types/node@npm:18.15.5" + checksum: 5fbf3453bd5ce1402bb2964e55d928fc8a8a7de5451b1b0fe66587fecb8a3eb86854ca9cefa5076a5971e2cff00e1773ceeb5d872a54f6c6ddfbbc1064b4e91a languageName: node linkType: hard @@ -1464,14 +1464,14 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.55.0": - version: 5.55.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.55.0" +"@typescript-eslint/eslint-plugin@npm:^5.56.0": + version: 5.56.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.56.0" dependencies: "@eslint-community/regexpp": ^4.4.0 - "@typescript-eslint/scope-manager": 5.55.0 - "@typescript-eslint/type-utils": 5.55.0 - "@typescript-eslint/utils": 5.55.0 + "@typescript-eslint/scope-manager": 5.56.0 + "@typescript-eslint/type-utils": 5.56.0 + "@typescript-eslint/utils": 5.56.0 debug: ^4.3.4 grapheme-splitter: ^1.0.4 ignore: ^5.2.0 @@ -1484,7 +1484,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: e3239ec6016eeb73b8b4d8310581978e28b8d3378140a8eb70bd8e33ffd332266020c19d493e0ccae4edfd4abd6097608718c50308fe6288f4ffeb8e4784efd9 + checksum: 2eed4a4ed8279950ad553252e8623e947ffdee39b0d677a13f6e4e2d863ea1cbc5d683ff189e55d0de6fd5a25afd72d3c3a9ab7ae417d5405a21ead907e1b154 languageName: node linkType: hard @@ -1499,20 +1499,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.55.0": - version: 5.55.0 - resolution: "@typescript-eslint/parser@npm:5.55.0" +"@typescript-eslint/parser@npm:^5.56.0": + version: 5.56.0 + resolution: "@typescript-eslint/parser@npm:5.56.0" dependencies: - "@typescript-eslint/scope-manager": 5.55.0 - "@typescript-eslint/types": 5.55.0 - "@typescript-eslint/typescript-estree": 5.55.0 + "@typescript-eslint/scope-manager": 5.56.0 + "@typescript-eslint/types": 5.56.0 + "@typescript-eslint/typescript-estree": 5.56.0 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 48a20dc7e67960b5168b77bfb9d11d053a21d57bb83cf7b59f750191cbca5eea3b4636a8e6e75cc0aca5a84cdef91fed5440934fc2935f8c6fa71630a253a50c + checksum: eb25490290bd5e22f9c42603dedc0d2d8ee845553e3cf48ea377bd5dc22440d3463f8b84be637b6a2b37cd9ea56b21e4e43007a0a69998948d9c8965c03fe1aa languageName: node linkType: hard @@ -1526,22 +1526,22 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.55.0": - version: 5.55.0 - resolution: "@typescript-eslint/scope-manager@npm:5.55.0" +"@typescript-eslint/scope-manager@npm:5.56.0": + version: 5.56.0 + resolution: "@typescript-eslint/scope-manager@npm:5.56.0" dependencies: - "@typescript-eslint/types": 5.55.0 - "@typescript-eslint/visitor-keys": 5.55.0 - checksum: f253db88f69a29e4abe2f567d0a611cc3e7fb1a911a2cc54a2f6baf16e3de4d1883b3f8e45ee61b3db9fa5543dda0fd7b608de9d28ba6173ab49bfd17ff90cad + "@typescript-eslint/types": 5.56.0 + "@typescript-eslint/visitor-keys": 5.56.0 + checksum: bacac255ee52148cee6622be2811c0d7e25419058b89f1a11f4c1303faef4535a0a1237549f9556ec1d7a297c640ce4357183a1a8465d72e1393b7d8fb43874b languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.55.0": - version: 5.55.0 - resolution: "@typescript-eslint/type-utils@npm:5.55.0" +"@typescript-eslint/type-utils@npm:5.56.0": + version: 5.56.0 + resolution: "@typescript-eslint/type-utils@npm:5.56.0" dependencies: - "@typescript-eslint/typescript-estree": 5.55.0 - "@typescript-eslint/utils": 5.55.0 + "@typescript-eslint/typescript-estree": 5.56.0 + "@typescript-eslint/utils": 5.56.0 debug: ^4.3.4 tsutils: ^3.21.0 peerDependencies: @@ -1549,7 +1549,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 5c60d441355b51f96b596324068c10605c74abb46748c0bbc6d8f7f2ea40acb6b4bda3b537105fa189172324c56d18bd88e7102e67f99f8c03bc05c6d0e2023d + checksum: 3dd1fcfadad18790b900a3d90f6617904adb6b0e2bd1e1edb6ebf239e1399865ca9098647405385feb4252d8b2b4577883e6fd3ef8d00bdd521d6070972d486b languageName: node linkType: hard @@ -1560,10 +1560,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.55.0": - version: 5.55.0 - resolution: "@typescript-eslint/types@npm:5.55.0" - checksum: 7d851f09a2106514d3a9c7164d34758f30abfe554e3c7a02be75cdc7e16644e23ca32840a8f39a0321bc509927fb4d98ce91b22b21e8544ac56cef33b815a864 +"@typescript-eslint/types@npm:5.56.0": + version: 5.56.0 + resolution: "@typescript-eslint/types@npm:5.56.0" + checksum: 82ca11553bbb1bbfcaf7e7760b03c0d898940238dc002552c21af3e58f7d482c64c3c6cf0666521aff2a1e7b4b58bb6e4d9a00b1e4998a16b5039f5d288d003a languageName: node linkType: hard @@ -1585,12 +1585,12 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.55.0": - version: 5.55.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.55.0" +"@typescript-eslint/typescript-estree@npm:5.56.0": + version: 5.56.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.56.0" dependencies: - "@typescript-eslint/types": 5.55.0 - "@typescript-eslint/visitor-keys": 5.55.0 + "@typescript-eslint/types": 5.56.0 + "@typescript-eslint/visitor-keys": 5.56.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -1599,7 +1599,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: d24a11aee3d01067018d99804f420aecb8af88e43bf170d5d14f6480bd378c0a81ce49a37f5d6c36e5f0f319e3fa8b099720f295f2767338be1a4f7e9a5323e1 + checksum: ec3e85201786aa9adddba7cb834a9f330a7f55c729ee9ccf847dbdc2f7437b760f3774152ccad6d0aa48d13fd78df766c880e3a7ca42e01a20aba0e1a1ed61c5 languageName: node linkType: hard @@ -1621,21 +1621,21 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.55.0": - version: 5.55.0 - resolution: "@typescript-eslint/utils@npm:5.55.0" +"@typescript-eslint/utils@npm:5.56.0": + version: 5.56.0 + resolution: "@typescript-eslint/utils@npm:5.56.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@types/json-schema": ^7.0.9 "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.55.0 - "@typescript-eslint/types": 5.55.0 - "@typescript-eslint/typescript-estree": 5.55.0 + "@typescript-eslint/scope-manager": 5.56.0 + "@typescript-eslint/types": 5.56.0 + "@typescript-eslint/typescript-estree": 5.56.0 eslint-scope: ^5.1.1 semver: ^7.3.7 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 368cfc3fb9d6af6901e739e2e41c3f7f1c1244576607445f4f59d95eccb237f73e1a75e7f0816ec9a32a0f1ec6bb4a3602a99e17e70fe184e62f7c69dcbe4b8d + checksum: 413e8d4bf7023ee5ba4f695b62e796a1f94930bb92fe5aa0cee58f63b9837116c23f618825a9c671f610e50f5630188b6059b4ed6b05a2a3336f01d8e977becb languageName: node linkType: hard @@ -1649,13 +1649,13 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.55.0": - version: 5.55.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.55.0" +"@typescript-eslint/visitor-keys@npm:5.56.0": + version: 5.56.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.56.0" dependencies: - "@typescript-eslint/types": 5.55.0 + "@typescript-eslint/types": 5.56.0 eslint-visitor-keys: ^3.3.0 - checksum: 0b24c72dff99dd2cf41c19d20067f8ab20a38aa2e82c79c5530bec7cf651031e95c80702fc21c813c9b94e5f3d4cd210f13967b2966ef38abe548cb5f05848a3 + checksum: 568fda40134e153d7befb59b55698f7919ba780d2d3431d8745feabf2e0fbb8aa7a02173b3c467dd20a0f6594e5248a1f82bb25d6c37827716d77452e86cad29 languageName: node linkType: hard @@ -1797,18 +1797,18 @@ __metadata: "@emotion/styled": ^11.10.6 "@msgpack/msgpack": ^2.8.0 "@mui/icons-material": ^5.11.11 - "@mui/material": ^5.11.13 + "@mui/material": ^5.11.14 "@remix-run/router": ^1.4.0 - "@table-library/react-table-library": 4.0.29 + "@table-library/react-table-library": 4.1.0 "@types/lodash-es": ^4.17.7 "@types/mime-types": ^2 - "@types/node": ^18.15.3 + "@types/node": ^18.15.5 "@types/react": ^18.0.28 "@types/react-dom": ^18.0.11 "@types/react-router-dom": ^5.3.3 "@types/styled-components": ^5 - "@typescript-eslint/eslint-plugin": ^5.55.0 - "@typescript-eslint/parser": ^5.55.0 + "@typescript-eslint/eslint-plugin": ^5.56.0 + "@typescript-eslint/parser": ^5.56.0 "@vitejs/plugin-react-swc": ^3.2.0 "@yarnpkg/pnpify": ^4.0.0-rc.40 async-validator: ^4.2.5 @@ -1816,7 +1816,7 @@ __metadata: eslint: ^8.36.0 eslint-config-airbnb: ^19.0.4 eslint-config-airbnb-typescript: ^17.0.0 - eslint-config-prettier: ^8.7.0 + eslint-config-prettier: ^8.8.0 eslint-import-resolver-typescript: ^3.5.3 eslint-plugin-deprecation: ^1.3.3 eslint-plugin-import: ^2.27.5 @@ -1828,21 +1828,21 @@ __metadata: jwt-decode: ^3.1.2 lodash-es: ^4.17.21 mime-types: ^2.1.35 - nodemon: ^2.0.21 + nodemon: ^2.0.22 npm-run-all: ^4.1.5 - prettier: ^2.8.4 + prettier: ^2.8.6 react: latest react-dom: latest react-dropzone: ^14.2.3 react-icons: ^4.8.0 react-router-dom: ^6.9.0 - react-toastify: ^9.1.1 + react-toastify: ^9.1.2 rollup-plugin-visualizer: ^5.9.0 sockette: ^2.0.6 terser: ^5.16.6 typesafe-i18n: ^5.24.2 - typescript: ^4.9.5 - vite: ^4.1.4 + typescript: ^5.0.2 + vite: ^4.2.1 vite-plugin-minify: ^1.5.2 vite-plugin-svgr: ^2.4.0 vite-tsconfig-paths: ^4.0.7 @@ -2879,32 +2879,32 @@ __metadata: languageName: node linkType: hard -"esbuild@npm:^0.16.14": - version: 0.16.17 - resolution: "esbuild@npm:0.16.17" +"esbuild@npm:^0.17.5": + version: 0.17.12 + resolution: "esbuild@npm:0.17.12" dependencies: - "@esbuild/android-arm": 0.16.17 - "@esbuild/android-arm64": 0.16.17 - "@esbuild/android-x64": 0.16.17 - "@esbuild/darwin-arm64": 0.16.17 - "@esbuild/darwin-x64": 0.16.17 - "@esbuild/freebsd-arm64": 0.16.17 - "@esbuild/freebsd-x64": 0.16.17 - "@esbuild/linux-arm": 0.16.17 - "@esbuild/linux-arm64": 0.16.17 - "@esbuild/linux-ia32": 0.16.17 - "@esbuild/linux-loong64": 0.16.17 - "@esbuild/linux-mips64el": 0.16.17 - "@esbuild/linux-ppc64": 0.16.17 - "@esbuild/linux-riscv64": 0.16.17 - "@esbuild/linux-s390x": 0.16.17 - "@esbuild/linux-x64": 0.16.17 - "@esbuild/netbsd-x64": 0.16.17 - "@esbuild/openbsd-x64": 0.16.17 - "@esbuild/sunos-x64": 0.16.17 - "@esbuild/win32-arm64": 0.16.17 - "@esbuild/win32-ia32": 0.16.17 - "@esbuild/win32-x64": 0.16.17 + "@esbuild/android-arm": 0.17.12 + "@esbuild/android-arm64": 0.17.12 + "@esbuild/android-x64": 0.17.12 + "@esbuild/darwin-arm64": 0.17.12 + "@esbuild/darwin-x64": 0.17.12 + "@esbuild/freebsd-arm64": 0.17.12 + "@esbuild/freebsd-x64": 0.17.12 + "@esbuild/linux-arm": 0.17.12 + "@esbuild/linux-arm64": 0.17.12 + "@esbuild/linux-ia32": 0.17.12 + "@esbuild/linux-loong64": 0.17.12 + "@esbuild/linux-mips64el": 0.17.12 + "@esbuild/linux-ppc64": 0.17.12 + "@esbuild/linux-riscv64": 0.17.12 + "@esbuild/linux-s390x": 0.17.12 + "@esbuild/linux-x64": 0.17.12 + "@esbuild/netbsd-x64": 0.17.12 + "@esbuild/openbsd-x64": 0.17.12 + "@esbuild/sunos-x64": 0.17.12 + "@esbuild/win32-arm64": 0.17.12 + "@esbuild/win32-ia32": 0.17.12 + "@esbuild/win32-x64": 0.17.12 dependenciesMeta: "@esbuild/android-arm": optional: true @@ -2952,7 +2952,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 4c2cc609ecfb426554bc3f75beb92d89eb2d0c515cfceebaa36c7599d7dcaab7056b70f6d6b51e72b45951ddf9021ee28e356cf205f8e42cc055d522312ea30c + checksum: ea6d33eb1bc6c9e00dcee5e253c7e935251b4801d376661fd9f19a9dcffc27f970078a6f7116d6c78ee825ceff9b974594b0b616bd560ce4d875a951aa92977b languageName: node linkType: hard @@ -3023,14 +3023,14 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:^8.7.0": - version: 8.7.0 - resolution: "eslint-config-prettier@npm:8.7.0" +"eslint-config-prettier@npm:^8.8.0": + version: 8.8.0 + resolution: "eslint-config-prettier@npm:8.8.0" peerDependencies: eslint: ">=7.0.0" bin: eslint-config-prettier: bin/cli.js - checksum: b05bc7f2296ce3e0925c14147849706544870e0382d38af2352d709a6cf8521bdaff2bd8e5021f1780e570775a8ffa1d2bac28b8065d90d43a3f1f98fd26ce52 + checksum: 1e94c3882c4d5e41e1dcfa2c368dbccbfe3134f6ac7d40101644d3bfbe3eb2f2ffac757f3145910b5eacf20c0e85e02b91293d3126d770cbf3dc390b3564681c languageName: node linkType: hard @@ -4830,9 +4830,9 @@ __metadata: languageName: node linkType: hard -"nodemon@npm:^2.0.21": - version: 2.0.21 - resolution: "nodemon@npm:2.0.21" +"nodemon@npm:^2.0.22": + version: 2.0.22 + resolution: "nodemon@npm:2.0.22" dependencies: chokidar: ^3.5.2 debug: ^3.2.7 @@ -4846,7 +4846,7 @@ __metadata: undefsafe: ^2.0.5 bin: nodemon: bin/nodemon.js - checksum: 0b9fe2d11fd95c51b66d61bd1ee85cddf579c9e674c9429752a74f445f1b98576235ae860858783728baa3666c87e4ef938ab67167cc34fe4bb8fcec74d6885b + checksum: 9c987e139748f5b5c480c6c9080bdc97304ee7d29172b7b3da1a7db590b1323ad57b96346304e9b522b0e445c336dc393ccd3f9f45c73b20d476d2347890dcd0 languageName: node linkType: hard @@ -5260,12 +5260,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:^2.8.4": - version: 2.8.4 - resolution: "prettier@npm:2.8.4" +"prettier@npm:^2.8.6": + version: 2.8.6 + resolution: "prettier@npm:2.8.6" bin: prettier: bin-prettier.js - checksum: c173064bf3df57b6d93d19aa98753b9b9dd7657212e33b41ada8e2e9f9884066bb9ca0b4005b89b3ab137efffdf8fbe0b462785aba20364798ff4303aadda57e + checksum: 8ac94fa67aec0e65743ea15ebf954ef2f1e52638abd129dc04e8b49e8bb3224c0233c98df6b5c98efd31bd2a43866590486559438ee4ead09dc81be389068572 languageName: node linkType: hard @@ -5414,15 +5414,15 @@ __metadata: languageName: node linkType: hard -"react-toastify@npm:^9.1.1": - version: 9.1.1 - resolution: "react-toastify@npm:9.1.1" +"react-toastify@npm:^9.1.2": + version: 9.1.2 + resolution: "react-toastify@npm:9.1.2" dependencies: clsx: ^1.1.1 peerDependencies: react: ">=16" react-dom: ">=16" - checksum: 2039255539961a9b4d77b2656f120b20abe46cb0c699a7f3c0af23b4ef669d9c4d24dae6b8f4954b5efd83edf6d6e23614a29e94e9ee0d2647741fba9ba2db85 + checksum: 0b21851bbb03592aa6e318ca62622016a6aa37cc52484c4a2fee39ce38c9933993e570c8ad9375f0a7061d3401fd175796b74f851b7d5a711b4802e0a3f9f34a languageName: node linkType: hard @@ -5655,9 +5655,9 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^3.10.0": - version: 3.18.0 - resolution: "rollup@npm:3.18.0" +"rollup@npm:^3.18.0": + version: 3.19.1 + resolution: "rollup@npm:3.19.1" dependencies: fsevents: ~2.3.2 dependenciesMeta: @@ -5665,7 +5665,7 @@ __metadata: optional: true bin: rollup: dist/bin/rollup - checksum: 0bcd1abb1cc383abdd09b5594de862ecb2f946e950954bb472a370289bdc4499aea8d04477be55ce205450d973d38ad255f0dc6926162500a251d73bf0e60e6f + checksum: f78198c6de224b26650c70b16db156762d1fcceeb375d34fb2c76fc5b23a78f712c3c881d3248e6f277a511589e20d50c247bcf5c7920f1ddc0a43cadf9f0140 languageName: node linkType: hard @@ -6306,23 +6306,23 @@ __metadata: languageName: node linkType: hard -"typescript@npm:^4.9.5": - version: 4.9.5 - resolution: "typescript@npm:4.9.5" +"typescript@npm:^5.0.2": + version: 5.0.2 + resolution: "typescript@npm:5.0.2" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db + checksum: bef1dcd166acfc6934b2ec4d72f93edb8961a5fab36b8dd2aaf6f4f4cd5c0210f2e0850aef4724f3b4913d5aef203a94a28ded731b370880c8bcff7e4ff91fc1 languageName: node linkType: hard -"typescript@patch:typescript@^4.9.5#~builtin": - version: 4.9.5 - resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin::version=4.9.5&hash=23ec76" +"typescript@patch:typescript@^5.0.2#~builtin": + version: 5.0.2 + resolution: "typescript@patch:typescript@npm%3A5.0.2#~builtin::version=5.0.2&hash=1f5320" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: ab417a2f398380c90a6cf5a5f74badd17866adf57f1165617d6a551f059c3ba0a3e4da0d147b3ac5681db9ac76a303c5876394b13b3de75fdd5b1eaa06181c9d + checksum: bdbf3d0aac0d6cf010fbe0536753dc19f278eb4aba88140dcd25487dfe1c56ca8b33abc0dcd42078790a939b08ebc4046f3e9bb961d77d3d2c3cfa9829da4d53 languageName: node linkType: hard @@ -6442,15 +6442,15 @@ __metadata: languageName: node linkType: hard -"vite@npm:^4.1.4": - version: 4.1.4 - resolution: "vite@npm:4.1.4" +"vite@npm:^4.2.1": + version: 4.2.1 + resolution: "vite@npm:4.2.1" dependencies: - esbuild: ^0.16.14 + esbuild: ^0.17.5 fsevents: ~2.3.2 postcss: ^8.4.21 resolve: ^1.22.1 - rollup: ^3.10.0 + rollup: ^3.18.0 peerDependencies: "@types/node": ">= 14" less: "*" @@ -6476,7 +6476,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 50a9a1f2e29e0ee8fefdec60314d38fb9b746df0bb6ae5a8114014b5bfd95e0fc9b29c0d5e73939361ba53af7eb66c7d20c5656bbe53a783e96540bd3b907c47 + checksum: 70eb162ffc299017a3c310e3adc95e9661def6b17aafd1f8e5e02e516766060435590dbe3df1e4e95acc3583c728a76e91f07c546221d1e701f1b2b021293f45 languageName: node linkType: hard diff --git a/mock-api/package.json b/mock-api/package.json index c67046344..037532186 100644 --- a/mock-api/package.json +++ b/mock-api/package.json @@ -12,7 +12,7 @@ "@msgpack/msgpack": "^2.8.0", "compression": "^1.7.4", "express": "^4.18.2", - "nodemon": "^2.0.21" + "nodemon": "^2.0.22" }, "packageManager": "yarn@3.4.1" } diff --git a/mock-api/server.js b/mock-api/server.js index f3e964276..d156ec90a 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -450,13 +450,13 @@ const status = { num_sensors: 1, num_analogs: 1, stats: [ - { id: '0', s: 56506, f: 11, q: 100 }, - { id: '1', s: 9026, f: 0, q: 100 }, - { id: '2', s: 33, f: 2, q: 95 }, - { id: '3', s: 56506, f: 11, q: 100 }, - { id: '4', s: 0, f: 0, q: 100 }, - { id: '5', s: 12, f: 10, q: 20 }, - { id: '6', s: 0, f: 0, q: 0 } + { id: 0, s: 56506, f: 11, q: 100 }, + { id: 1, s: 9026, f: 0, q: 100 }, + { id: 2, s: 33, f: 2, q: 95 }, + { id: 3, s: 56506, f: 11, q: 100 }, + { id: 4, s: 0, f: 0, q: 100 }, + { id: 5, s: 12, f: 10, q: 20 }, + { id: 6, s: 0, f: 0, q: 0 } ] }; @@ -603,7 +603,7 @@ const emsesp_devicedata_4 = { let emsesp_schedule = { schedule: [ { - id: '1', + id: 1, active: true, flags: 6, time: '07:30', @@ -612,7 +612,7 @@ let emsesp_schedule = { name: 'day_mode' }, { - id: '2', + id: 2, active: true, flags: 31, time: '23:00', @@ -621,7 +621,7 @@ let emsesp_schedule = { name: 'night_mode' }, { - id: '3', + id: 3, active: true, flags: 10, time: '00:00', @@ -630,7 +630,7 @@ let emsesp_schedule = { name: 'temp_20' }, { - id: '4', + id: 4, active: false, flags: 1, time: '04:00', diff --git a/mock-api/yarn.lock b/mock-api/yarn.lock index 80c7bf270..a3c713119 100644 --- a/mock-api/yarn.lock +++ b/mock-api/yarn.lock @@ -117,7 +117,7 @@ __metadata: "@msgpack/msgpack": ^2.8.0 compression: ^1.7.4 express: ^4.18.2 - nodemon: ^2.0.21 + nodemon: ^2.0.22 languageName: unknown linkType: soft @@ -1120,9 +1120,9 @@ __metadata: languageName: node linkType: hard -"nodemon@npm:^2.0.21": - version: 2.0.21 - resolution: "nodemon@npm:2.0.21" +"nodemon@npm:^2.0.22": + version: 2.0.22 + resolution: "nodemon@npm:2.0.22" dependencies: chokidar: ^3.5.2 debug: ^3.2.7 @@ -1136,7 +1136,7 @@ __metadata: undefsafe: ^2.0.5 bin: nodemon: bin/nodemon.js - checksum: 0b9fe2d11fd95c51b66d61bd1ee85cddf579c9e674c9429752a74f445f1b98576235ae860858783728baa3666c87e4ef938ab67167cc34fe4bb8fcec74d6885b + checksum: 9c987e139748f5b5c480c6c9080bdc97304ee7d29172b7b3da1a7db590b1323ad57b96346304e9b522b0e445c336dc393ccd3f9f45c73b20d476d2347890dcd0 languageName: node linkType: hard diff --git a/src/web/WebSchedulerService.cpp b/src/web/WebSchedulerService.cpp index 8a9cfe5ae..9581e7988 100644 --- a/src/web/WebSchedulerService.cpp +++ b/src/web/WebSchedulerService.cpp @@ -41,7 +41,7 @@ void WebScheduler::read(WebScheduler & webScheduler, JsonObject & root) { char s[3]; for (const ScheduleItem & scheduleItem : webScheduler.scheduleItems) { JsonObject si = schedule.createNestedObject(); - si["id"] = Helpers::smallitoa(s, ++counter); // id is only used to render the table and must be unique + si["id"] = counter++; // id is only used to render the table and must be unique si["active"] = scheduleItem.active; si["flags"] = scheduleItem.flags; si["time"] = scheduleItem.time; diff --git a/src/web/WebStatusService.cpp b/src/web/WebStatusService.cpp index ab3fc935d..0b76bba61 100644 --- a/src/web/WebStatusService.cpp +++ b/src/web/WebStatusService.cpp @@ -131,47 +131,47 @@ void WebStatusService::webStatusService(AsyncWebServerRequest * request) { JsonObject statJson; statJson = statsJson.createNestedObject(); - statJson["id"] = "0"; + statJson["id"] = 0; statJson["s"] = EMSESP::rxservice_.telegram_count(); statJson["f"] = EMSESP::rxservice_.telegram_error_count(); statJson["q"] = EMSESP::rxservice_.quality(); statJson = statsJson.createNestedObject(); - statJson["id"] = "1"; + statJson["id"] = 1; statJson["s"] = EMSESP::txservice_.telegram_read_count(); statJson["f"] = EMSESP::txservice_.telegram_read_fail_count(); statJson["q"] = EMSESP::txservice_.read_quality(); statJson = statsJson.createNestedObject(); - statJson["id"] = "2"; + statJson["id"] = 2; statJson["s"] = EMSESP::txservice_.telegram_write_count(); statJson["f"] = EMSESP::txservice_.telegram_write_fail_count(); statJson["q"] = EMSESP::txservice_.write_quality(); if (EMSESP::dallassensor_.dallas_enabled()) { statJson = statsJson.createNestedObject(); - statJson["id"] = "3"; + statJson["id"] = 3; statJson["s"] = EMSESP::dallassensor_.reads(); statJson["f"] = EMSESP::dallassensor_.fails(); statJson["q"] = EMSESP::dallassensor_.reads() == 0 ? 100 : 100 - (uint8_t)((100 * EMSESP::dallassensor_.fails()) / EMSESP::dallassensor_.reads()); } if (EMSESP::analog_enabled()) { statJson = statsJson.createNestedObject(); - statJson["id"] = "4"; + statJson["id"] = 4; statJson["s"] = EMSESP::analogsensor_.reads(); statJson["f"] = EMSESP::analogsensor_.fails(); statJson["q"] = EMSESP::analogsensor_.reads() == 0 ? 100 : 100 - (uint8_t)((100 * EMSESP::analogsensor_.fails()) / EMSESP::analogsensor_.reads()); } if (Mqtt::enabled()) { statJson = statsJson.createNestedObject(); - statJson["id"] = "5"; + statJson["id"] = 5; statJson["s"] = Mqtt::publish_count(); statJson["f"] = Mqtt::publish_fails(); statJson["q"] = Mqtt::publish_count() == 0 ? 100 : 100 - (uint8_t)((100 * Mqtt::publish_fails()) / (Mqtt::publish_count() + Mqtt::publish_fails())); } statJson = statsJson.createNestedObject(); - statJson["id"] = "6"; + statJson["id"] = 6; statJson["s"] = WebAPIService::api_count(); // + WebAPIService::api_fails(); statJson["f"] = WebAPIService::api_fails(); statJson["q"] = @@ -180,7 +180,7 @@ void WebStatusService::webStatusService(AsyncWebServerRequest * request) { #ifndef EMSESP_STANDALONE if (EMSESP::system_.syslog_enabled()) { statJson = statsJson.createNestedObject(); - statJson["id"] = "7"; + statJson["id"] = 7; statJson["s"] = EMSESP::system_.syslog_count(); statJson["f"] = EMSESP::system_.syslog_fails(); statJson["q"] = EMSESP::system_.syslog_count() == 0