From 2a4288e11d1d57cc3ff13bb3f9f5f3c4886f8a05 Mon Sep 17 00:00:00 2001 From: Proddy Date: Thu, 14 Apr 2022 11:44:01 +0200 Subject: [PATCH 01/21] initial commit with new table code --- interface/package-lock.json | 735 +++++++++++++++--------- interface/package.json | 15 +- interface/src/project/DashboardData.tsx | 717 ++++++++++++++--------- interface/src/project/types.ts | 16 +- mock-api/server.js | 191 +++--- 5 files changed, 1020 insertions(+), 654 deletions(-) diff --git a/interface/package-lock.json b/interface/package-lock.json index 3272ddc92..eec53f3ca 100644 --- a/interface/package-lock.json +++ b/interface/package-lock.json @@ -11,10 +11,11 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@msgpack/msgpack": "^2.7.2", - "@mui/icons-material": "^5.6.0", - "@mui/material": "^5.6.0", + "@mui/icons-material": "^5.6.1", + "@mui/material": "^5.6.1", + "@table-library/react-table-library": "^2.0.32", "@types/lodash": "^4.14.181", - "@types/node": "^17.0.23", + "@types/node": "^17.0.24", "@types/react": "^17.0.43", "@types/react-dom": "^17.0.14", "@types/react-router-dom": "^5.3.3", @@ -23,15 +24,15 @@ "http-proxy-middleware": "^2.0.4", "jwt-decode": "^3.1.2", "lodash": "^4.17.21", - "notistack": "^2.0.3", + "notistack": "^2.0.4", "parse-ms": "^3.0.0", "react": "^17.0.2", "react-app-rewired": "^2.2.1", "react-dom": "^17.0.2", - "react-dropzone": "^12.0.4", + "react-dropzone": "^12.0.5", "react-icons": "^4.3.1", "react-router-dom": "^6.3.0", - "react-scripts": "5.0.0", + "react-scripts": "5.0.1", "sockette": "^2.0.6", "typescript": "^4.6.3" }, @@ -2855,15 +2856,15 @@ } }, "node_modules/@mui/base": { - "version": "5.0.0-alpha.75", - "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.75.tgz", - "integrity": "sha512-eQ8SP2ML5nJyOdSqmk26ezg/eEP1k42Z+k6uMfNbgHZc8iZwgw9iVe+6g5j/qZPKS88AtxVG8YsLLZkXT82/Bw==", + "version": "5.0.0-alpha.76", + "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.76.tgz", + "integrity": "sha512-Pd0l4DvjXiGRyipn/CTDlYB2XrJwhpLktVXvbvcmzL2SMDaNprSarZqBkPHIubkulmRDZEEcnFDrpKgeSJDg4A==", "dependencies": { "@babel/runtime": "^7.17.2", "@emotion/is-prop-valid": "^1.1.2", "@mui/types": "^7.1.3", - "@mui/utils": "^5.6.0", - "@popperjs/core": "^2.11.4", + "@mui/utils": "^5.6.1", + "@popperjs/core": "^2.11.5", "clsx": "^1.1.1", "prop-types": "^15.7.2", "react-is": "^17.0.2" @@ -2876,7 +2877,7 @@ "url": "https://opencollective.com/mui" }, "peerDependencies": { - "@types/react": "^16.8.6 || ^17.0.0 || ^18.0.0", + "@types/react": "^17.0.0 || ^18.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -2887,9 +2888,9 @@ } }, "node_modules/@mui/icons-material": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.6.0.tgz", - "integrity": "sha512-2GDGt+/BbwM3oVkF84b9FFKQdQ9TxBJIRnTwT99vO2mimdfJaojxMRB2lkysm9tUY4HOf0yoU6O//X6GTC0Zhw==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.6.1.tgz", + "integrity": "sha512-I1x8u+FRLOmoJpRJASMx9UG+jZrSkNLyRQmBXivQQwXu3m3iasMoaKYhhI0J18t8+FWktbkNTp63oEUHE9Gw0Q==", "dependencies": { "@babel/runtime": "^7.17.2" }, @@ -2902,7 +2903,7 @@ }, "peerDependencies": { "@mui/material": "^5.0.0", - "@types/react": "^16.8.6 || ^17.0.0 || ^18.0.0", + "@types/react": "^17.0.0 || ^18.0.0", "react": "^17.0.0 || ^18.0.0" }, "peerDependenciesMeta": { @@ -2912,15 +2913,15 @@ } }, "node_modules/@mui/material": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.6.0.tgz", - "integrity": "sha512-yh4FoRRPTgJWjv1oIu3YuvfYGD/WOEnyGizQ9fKs+hlMjIc0rzFpyUCo++P/3BUd0/hRKcI8D8mrpJK9OiOy1g==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.6.1.tgz", + "integrity": "sha512-xg6pPq+1jxWupwmPpnfmsHNjrsOe2xynUQWrRfcH8WHrrr1sQulq0VF4gORq/l8DD8a/jb4s8SsC20e/e6mHKQ==", "dependencies": { "@babel/runtime": "^7.17.2", - "@mui/base": "5.0.0-alpha.75", - "@mui/system": "^5.6.0", + "@mui/base": "5.0.0-alpha.76", + "@mui/system": "^5.6.1", "@mui/types": "^7.1.3", - "@mui/utils": "^5.6.0", + "@mui/utils": "^5.6.1", "@types/react-transition-group": "^4.4.4", "clsx": "^1.1.1", "csstype": "^3.0.11", @@ -2939,7 +2940,7 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@types/react": "^16.8.6 || ^17.0.0 || ^18.0.0", + "@types/react": "^17.0.0 || ^18.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -2956,12 +2957,12 @@ } }, "node_modules/@mui/private-theming": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.6.0.tgz", - "integrity": "sha512-62jUFaMGfW3nvq/worcOAEiY++rWd44tpWShq4o97DybWmmWvEFYlBIuHEcXrtBIK/cloaQw8jqelQIFZeiVdw==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.6.1.tgz", + "integrity": "sha512-8lgh+tUt/3ftStfvml3dwAzhW3fe/cUFjLcBViOTnWk7UixWR79me4qehsO4NVj0THpu3d2qclrLzdD8qBAWAQ==", "dependencies": { "@babel/runtime": "^7.17.2", - "@mui/utils": "^5.6.0", + "@mui/utils": "^5.6.1", "prop-types": "^15.7.2" }, "engines": { @@ -2972,7 +2973,7 @@ "url": "https://opencollective.com/mui" }, "peerDependencies": { - "@types/react": "^16.8.6 || ^17.0.0 || ^18.0.0", + "@types/react": "^17.0.0 || ^18.0.0", "react": "^17.0.0 || ^18.0.0" }, "peerDependenciesMeta": { @@ -2982,9 +2983,9 @@ } }, "node_modules/@mui/styled-engine": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.6.0.tgz", - "integrity": "sha512-K1WPKTruJTPA49cub0HtDCBBvosPKizqgZ4RenAfWz/ldlFtM4p7e7Mt3YEnNWTOJMHvDGcEke1tCuELkVAMyA==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.6.1.tgz", + "integrity": "sha512-jEhH6TBY8jc9S8yVncXmoTYTbATjEu44RMFXj6sIYfKr5NArVwTwRo3JexLL0t3BOAiYM4xsFLgfKEIvB9SAeQ==", "dependencies": { "@babel/runtime": "^7.17.2", "@emotion/cache": "^11.7.1", @@ -3012,15 +3013,15 @@ } }, "node_modules/@mui/system": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.6.0.tgz", - "integrity": "sha512-FoytH73hY78Dll6F0fg7AI/hnpplygbFeW0HsqBfwFWrt2PMc2YSq2ICqHzd2CZPIhzEgRHDTSI8bMTLtG9W7A==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.6.1.tgz", + "integrity": "sha512-Y5pDvEOK6VOY+0vgNeyDuEEO5QCinhXbZQDyLOlaGLKuAoRGLXO9pcSsjZoGkewYZitXD44EDfgBQ+BqsAfgUA==", "dependencies": { "@babel/runtime": "^7.17.2", - "@mui/private-theming": "^5.6.0", - "@mui/styled-engine": "^5.6.0", + "@mui/private-theming": "^5.6.1", + "@mui/styled-engine": "^5.6.1", "@mui/types": "^7.1.3", - "@mui/utils": "^5.6.0", + "@mui/utils": "^5.6.1", "clsx": "^1.1.1", "csstype": "^3.0.11", "prop-types": "^15.7.2" @@ -3035,7 +3036,7 @@ "peerDependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", - "@types/react": "^16.8.6 || ^17.0.0 || ^18.0.0", + "@types/react": "^17.0.0 || ^18.0.0", "react": "^17.0.0 || ^18.0.0" }, "peerDependenciesMeta": { @@ -3064,9 +3065,9 @@ } }, "node_modules/@mui/utils": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.6.0.tgz", - "integrity": "sha512-LbZKkCOn4243vbEVGbaKV7t6eN6kz7t95DR6AcUCRk4daH3l7CXPYkWsyzysRWdXgSzHmIyrgg4FZKzTy0dTHQ==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.6.1.tgz", + "integrity": "sha512-CPrzrkiBusCZBLWu0Sg5MJvR3fKJyK3gKecLVX012LULyqg2U64Oz04BKhfkbtBrPBbSQxM+DWW9B1c9hmV9nQ==", "dependencies": { "@babel/runtime": "^7.17.2", "@types/prop-types": "^15.7.4", @@ -3258,9 +3259,9 @@ "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==" }, "node_modules/@rushstack/eslint-patch": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz", - "integrity": "sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.2.tgz", + "integrity": "sha512-oe5WJEDaVsW8fBlGT7udrSCgOwWfoYHQOmSpnh8X+0GXpqqcRCP8k4y+Dxb0taWJDPpB+rdDUtumIiBwkY9qGA==" }, "node_modules/@sindresorhus/is": { "version": "0.14.0", @@ -3547,6 +3548,22 @@ "node": ">=6" } }, + "node_modules/@table-library/react-table-library": { + "version": "2.0.32", + "resolved": "https://registry.npmjs.org/@table-library/react-table-library/-/react-table-library-2.0.32.tgz", + "integrity": "sha512-hHxR5DkAdU+62rRukjId1XqdI1ZkWQhdmvYwJM60StrFpah0nbpk8/HG21k7mFdlwjoO7HtDgWDDReLDUbPS7Q==", + "dependencies": { + "clsx": "1.1.1", + "react-virtualized-auto-sizer": "1.0.6", + "react-window": "1.8.6", + "use-double-click": "1.0.5" + }, + "peerDependencies": { + "@emotion/react": ">= 11", + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, "node_modules/@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -3746,9 +3763,9 @@ "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==" }, "node_modules/@types/node": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz", - "integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==" + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.24.tgz", + "integrity": "sha512-aveCYRQbgTH9Pssp1voEP7HiuWlD2jW2BO56w+bVrJn04i61yh6mRfoKO6hEYQD9vF+W8Chkwc6j1M36uPkx4g==" }, "node_modules/@types/parse-json": { "version": "4.0.0", @@ -3908,13 +3925,13 @@ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz", - "integrity": "sha512-tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.19.0.tgz", + "integrity": "sha512-w59GpFqDYGnWFim9p6TGJz7a3qWeENJuAKCqjGSx+Hq/bwq3RZwXYqy98KIfN85yDqz9mq6QXiY5h0FjGQLyEg==", "dependencies": { - "@typescript-eslint/scope-manager": "5.18.0", - "@typescript-eslint/type-utils": "5.18.0", - "@typescript-eslint/utils": "5.18.0", + "@typescript-eslint/scope-manager": "5.19.0", + "@typescript-eslint/type-utils": "5.19.0", + "@typescript-eslint/utils": "5.19.0", "debug": "^4.3.2", "functional-red-black-tree": "^1.0.1", "ignore": "^5.1.8", @@ -3939,26 +3956,37 @@ } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { - "version": "7.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz", - "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==", + "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dependencies": { - "lru-cache": "^7.4.0" + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "dependencies": { + "lru-cache": "^6.0.0" }, "bin": { "semver": "bin/semver.js" }, "engines": { - "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0" + "node": ">=10" } }, "node_modules/@typescript-eslint/experimental-utils": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.18.0.tgz", - "integrity": "sha512-hypiw5N0aM2aH91/uMmG7RpyUH3PN/iOhilMwkMFZIbm/Bn/G3ZnbaYdSoAN4PG/XHQjdhBYLi0ZoRZsRYT4hA==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.19.0.tgz", + "integrity": "sha512-F+X/TTzmb2UXbghY1LrNLNDjMcGZMhKzXuzvu0xD+YEB77EamLM7zMOLuz2kP5807IJRDLBoAFFPYa7HT62sYg==", "dependencies": { - "@typescript-eslint/utils": "5.18.0" + "@typescript-eslint/utils": "5.19.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -3972,13 +4000,13 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.18.0.tgz", - "integrity": "sha512-+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.19.0.tgz", + "integrity": "sha512-yhktJjMCJX8BSBczh1F/uY8wGRYrBeyn84kH6oyqdIJwTGKmzX5Qiq49LRQ0Jh0LXnWijEziSo6BRqny8nqLVQ==", "dependencies": { - "@typescript-eslint/scope-manager": "5.18.0", - "@typescript-eslint/types": "5.18.0", - "@typescript-eslint/typescript-estree": "5.18.0", + "@typescript-eslint/scope-manager": "5.19.0", + "@typescript-eslint/types": "5.19.0", + "@typescript-eslint/typescript-estree": "5.19.0", "debug": "^4.3.2" }, "engines": { @@ -3998,12 +4026,12 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz", - "integrity": "sha512-C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.19.0.tgz", + "integrity": "sha512-Fz+VrjLmwq5fbQn5W7cIJZ066HxLMKvDEmf4eu1tZ8O956aoX45jAuBB76miAECMTODyUxH61AQM7q4/GOMQ5g==", "dependencies": { - "@typescript-eslint/types": "5.18.0", - "@typescript-eslint/visitor-keys": "5.18.0" + "@typescript-eslint/types": "5.19.0", + "@typescript-eslint/visitor-keys": "5.19.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -4014,11 +4042,11 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz", - "integrity": "sha512-vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.19.0.tgz", + "integrity": "sha512-O6XQ4RI4rQcBGshTQAYBUIGsKqrKeuIOz9v8bckXZnSeXjn/1+BDZndHLe10UplQeJLXDNbaZYrAytKNQO2T4Q==", "dependencies": { - "@typescript-eslint/utils": "5.18.0", + "@typescript-eslint/utils": "5.19.0", "debug": "^4.3.2", "tsutils": "^3.21.0" }, @@ -4039,9 +4067,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.18.0.tgz", - "integrity": "sha512-bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.19.0.tgz", + "integrity": "sha512-zR1ithF4Iyq1wLwkDcT+qFnhs8L5VUtjgac212ftiOP/ZZUOCuuF2DeGiZZGQXGoHA50OreZqLH5NjDcDqn34w==", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -4051,12 +4079,12 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz", - "integrity": "sha512-wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.19.0.tgz", + "integrity": "sha512-dRPuD4ocXdaE1BM/dNR21elSEUPKaWgowCA0bqJ6YbYkvtrPVEvZ+zqcX5a8ECYn3q5iBSSUcBBD42ubaOp0Hw==", "dependencies": { - "@typescript-eslint/types": "5.18.0", - "@typescript-eslint/visitor-keys": "5.18.0", + "@typescript-eslint/types": "5.19.0", + "@typescript-eslint/visitor-keys": "5.19.0", "debug": "^4.3.2", "globby": "^11.0.4", "is-glob": "^4.0.3", @@ -4076,29 +4104,40 @@ } } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz", - "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==", + "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dependencies": { - "lru-cache": "^7.4.0" + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "dependencies": { + "lru-cache": "^6.0.0" }, "bin": { "semver": "bin/semver.js" }, "engines": { - "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0" + "node": ">=10" } }, "node_modules/@typescript-eslint/utils": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.18.0.tgz", - "integrity": "sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.19.0.tgz", + "integrity": "sha512-ZuEckdupXpXamKvFz/Ql8YnePh2ZWcwz7APICzJL985Rp5C2AYcHO62oJzIqNhAMtMK6XvrlBTZeNG8n7gS3lQ==", "dependencies": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.18.0", - "@typescript-eslint/types": "5.18.0", - "@typescript-eslint/typescript-estree": "5.18.0", + "@typescript-eslint/scope-manager": "5.19.0", + "@typescript-eslint/types": "5.19.0", + "@typescript-eslint/typescript-estree": "5.19.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -4134,11 +4173,11 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz", - "integrity": "sha512-Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.19.0.tgz", + "integrity": "sha512-Ym7zZoMDZcAKWsULi2s7UMLREdVQdScPQ/fKWMYefarCztWlHPFVJo8racf8R0Gc8FAEJ2eD4of8As1oFtnQlQ==", "dependencies": { - "@typescript-eslint/types": "5.18.0", + "@typescript-eslint/types": "5.19.0", "eslint-visitor-keys": "^3.0.0" }, "engines": { @@ -4601,13 +4640,14 @@ } }, "node_modules/array.prototype.flat": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz", - "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz", + "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.19.0" + "es-abstract": "^1.19.2", + "es-shim-unscopables": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -4617,13 +4657,14 @@ } }, "node_modules/array.prototype.flatmap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz", - "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz", + "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==", "dependencies": { - "call-bind": "^1.0.0", + "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.19.0" + "es-abstract": "^1.19.2", + "es-shim-unscopables": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -6848,6 +6889,14 @@ "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==" }, + "node_modules/es-shim-unscopables": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", + "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "dependencies": { + "has": "^1.0.3" + } + }, "node_modules/es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -7026,9 +7075,9 @@ } }, "node_modules/eslint-config-react-app": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.0.tgz", - "integrity": "sha512-xyymoxtIt1EOsSaGag+/jmcywRuieQoA2JbPCjnw9HukFj9/97aGPoZVFioaotzk1K5Qt9sHO5EutZbkrAXS0g==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz", + "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==", "dependencies": { "@babel/core": "^7.16.0", "@babel/eslint-parser": "^7.16.3", @@ -7327,9 +7376,9 @@ } }, "node_modules/eslint-plugin-testing-library": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.2.1.tgz", - "integrity": "sha512-88qJv6uzYALtiYJDzhelP3ov0Px/GLgnu+UekjjDxL2nMyvgdTyboKqcDBsvFPmAeizlCoSWOjeBN4DxO0BxaA==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.3.1.tgz", + "integrity": "sha512-OfF4dlG/q6ck6DL3P8Z0FPdK0dU5K57gsBu7eUcaVbwYKaNzjgejnXiM9CCUevppORkvfek+9D3Uj/9ZZ8Vz8g==", "dependencies": { "@typescript-eslint/utils": "^5.13.0" }, @@ -8071,9 +8120,9 @@ } }, "node_modules/fork-ts-checker-webpack-plugin": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz", - "integrity": "sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.1.tgz", + "integrity": "sha512-x1wumpHOEf4gDROmKTaB6i4/Q6H3LwmjVO7fIX47vBwlZbtPjU33hgoMuD/Q/y6SU8bnuYSoN6ZQOLshGp0T/g==", "dependencies": { "@babel/code-frame": "^7.8.3", "@types/json-schema": "^7.0.5", @@ -8175,6 +8224,17 @@ "node": ">=8" } }, + "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", @@ -8193,17 +8253,17 @@ } }, "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "7.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz", - "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "dependencies": { - "lru-cache": "^7.4.0" + "lru-cache": "^6.0.0" }, "bin": { "semver": "bin/semver.js" }, "engines": { - "node": "^10.0.0 || ^12.0.0 || ^14.0.0 || >=16.0.0" + "node": ">=10" } }, "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": { @@ -11695,6 +11755,11 @@ "node": ">= 4.0.0" } }, + "node_modules/memoize-one": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz", + "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==" + }, "node_modules/memorystream": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", @@ -12078,9 +12143,9 @@ } }, "node_modules/notistack": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/notistack/-/notistack-2.0.3.tgz", - "integrity": "sha512-krmVFtTO9kEY1Pa4NrbyexrjiRcV6TqBM2xLx8nuDea1g96Z/OZfkvVLmYKkTvoSJ3jyQntWK16z86ssW5kt4A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/notistack/-/notistack-2.0.4.tgz", + "integrity": "sha512-kOJmKvTG91ElMzi4aHu82BDe1liQ0zMrBp+TnWJptgowDsTbeTKbZmsRqJNIj145BmlOtZsEE9xjcrN46zVo3w==", "dependencies": { "clsx": "^1.1.0", "hoist-non-react-statics": "^3.3.0" @@ -12093,8 +12158,8 @@ "@emotion/react": "^11.4.1", "@emotion/styled": "^11.3.0", "@mui/material": "^5.0.0", - "react": "^16.8.0 || ^17.0.0", - "react-dom": "^16.8.0 || ^17.0.0" + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" }, "peerDependenciesMeta": { "@emotion/react": { @@ -14192,9 +14257,9 @@ } }, "node_modules/react-dev-utils": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.0.tgz", - "integrity": "sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ==", + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz", + "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==", "dependencies": { "@babel/code-frame": "^7.16.0", "address": "^1.1.2", @@ -14215,7 +14280,7 @@ "open": "^8.4.0", "pkg-up": "^3.1.0", "prompts": "^2.4.2", - "react-error-overlay": "^6.0.10", + "react-error-overlay": "^6.0.11", "recursive-readdir": "^2.2.2", "shell-quote": "^1.7.3", "strip-ansi": "^6.0.1", @@ -14365,9 +14430,9 @@ } }, "node_modules/react-dropzone": { - "version": "12.0.4", - "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.4.tgz", - "integrity": "sha512-fcqHEYe1MzAghU6/Hz86lHDlBNsA+lO48nAcm7/wA+kIzwS6uuJbUG33tBZjksj7GAZ1iUQ6NHwjUURPmSGang==", + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.5.tgz", + "integrity": "sha512-zUjZigD0VJ91CSm9T1h7ErxFReBLaa9sjS2dUL0+inb0RROZpSJTNDHPY1rrBES5V2NXhF8v0kghmaHc81BMFg==", "dependencies": { "attr-accept": "^2.2.2", "file-selector": "^0.4.0", @@ -14381,9 +14446,9 @@ } }, "node_modules/react-error-overlay": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.10.tgz", - "integrity": "sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA==" + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz", + "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==" }, "node_modules/react-icons": { "version": "4.3.1", @@ -14431,9 +14496,9 @@ } }, "node_modules/react-scripts": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.0.tgz", - "integrity": "sha512-3i0L2CyIlROz7mxETEdfif6Sfhh9Lfpzi10CtcGs1emDQStmZfWjJbAIMtRD0opVUjQuFWqHZyRZ9PPzKCFxWg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz", + "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==", "dependencies": { "@babel/core": "^7.16.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3", @@ -14451,7 +14516,7 @@ "dotenv": "^10.0.0", "dotenv-expand": "^5.1.0", "eslint": "^8.3.0", - "eslint-config-react-app": "^7.0.0", + "eslint-config-react-app": "^7.0.1", "eslint-webpack-plugin": "^3.1.1", "file-loader": "^6.2.0", "fs-extra": "^10.0.0", @@ -14468,7 +14533,7 @@ "postcss-preset-env": "^7.0.1", "prompts": "^2.4.2", "react-app-polyfill": "^3.0.0", - "react-dev-utils": "^12.0.0", + "react-dev-utils": "^12.0.1", "react-refresh": "^0.11.0", "resolve": "^1.20.0", "resolve-url-loader": "^4.0.0", @@ -14531,6 +14596,34 @@ "react-dom": ">=16.6.0" } }, + "node_modules/react-virtualized-auto-sizer": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.6.tgz", + "integrity": "sha512-7tQ0BmZqfVF6YYEWcIGuoR3OdYe8I/ZFbNclFlGOC3pMqunkYF/oL30NCjSGl9sMEb17AnzixDz98Kqc3N76HQ==", + "engines": { + "node": ">8.0.0" + }, + "peerDependencies": { + "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0", + "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0" + } + }, + "node_modules/react-window": { + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.6.tgz", + "integrity": "sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg==", + "dependencies": { + "@babel/runtime": "^7.0.0", + "memoize-one": ">=3.1.1 <6" + }, + "engines": { + "node": ">8.0.0" + }, + "peerDependencies": { + "react": "^15.0.0 || ^16.0.0 || ^17.0.0", + "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0" + } + }, "node_modules/read-pkg": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", @@ -16583,6 +16676,19 @@ "node": ">=4" } }, + "node_modules/use-double-click": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/use-double-click/-/use-double-click-1.0.5.tgz", + "integrity": "sha512-71LUca6NtzpzHYlcfM/dOdmwvmvpMbzeIVQpN87w+DctpLiMCXtZpsN8FNWPgHpPBtNhvucPUHIDh5al8D8C7w==", + "engines": { + "node": ">=8", + "npm": ">=5" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -17541,6 +17647,11 @@ "node": ">=10" } }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "node_modules/yaml": { "version": "1.10.2", "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", @@ -19525,38 +19636,38 @@ "integrity": "sha512-rYEi46+gIzufyYUAoHDnRzkWGxajpD9vVXFQ3g1vbjrBm6P7MBmm+s/fqPa46sxa+8FOUdEuRQKaugo5a4JWpw==" }, "@mui/base": { - "version": "5.0.0-alpha.75", - "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.75.tgz", - "integrity": "sha512-eQ8SP2ML5nJyOdSqmk26ezg/eEP1k42Z+k6uMfNbgHZc8iZwgw9iVe+6g5j/qZPKS88AtxVG8YsLLZkXT82/Bw==", + "version": "5.0.0-alpha.76", + "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.76.tgz", + "integrity": "sha512-Pd0l4DvjXiGRyipn/CTDlYB2XrJwhpLktVXvbvcmzL2SMDaNprSarZqBkPHIubkulmRDZEEcnFDrpKgeSJDg4A==", "requires": { "@babel/runtime": "^7.17.2", "@emotion/is-prop-valid": "^1.1.2", "@mui/types": "^7.1.3", - "@mui/utils": "^5.6.0", - "@popperjs/core": "^2.11.4", + "@mui/utils": "^5.6.1", + "@popperjs/core": "^2.11.5", "clsx": "^1.1.1", "prop-types": "^15.7.2", "react-is": "^17.0.2" } }, "@mui/icons-material": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.6.0.tgz", - "integrity": "sha512-2GDGt+/BbwM3oVkF84b9FFKQdQ9TxBJIRnTwT99vO2mimdfJaojxMRB2lkysm9tUY4HOf0yoU6O//X6GTC0Zhw==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.6.1.tgz", + "integrity": "sha512-I1x8u+FRLOmoJpRJASMx9UG+jZrSkNLyRQmBXivQQwXu3m3iasMoaKYhhI0J18t8+FWktbkNTp63oEUHE9Gw0Q==", "requires": { "@babel/runtime": "^7.17.2" } }, "@mui/material": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.6.0.tgz", - "integrity": "sha512-yh4FoRRPTgJWjv1oIu3YuvfYGD/WOEnyGizQ9fKs+hlMjIc0rzFpyUCo++P/3BUd0/hRKcI8D8mrpJK9OiOy1g==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.6.1.tgz", + "integrity": "sha512-xg6pPq+1jxWupwmPpnfmsHNjrsOe2xynUQWrRfcH8WHrrr1sQulq0VF4gORq/l8DD8a/jb4s8SsC20e/e6mHKQ==", "requires": { "@babel/runtime": "^7.17.2", - "@mui/base": "5.0.0-alpha.75", - "@mui/system": "^5.6.0", + "@mui/base": "5.0.0-alpha.76", + "@mui/system": "^5.6.1", "@mui/types": "^7.1.3", - "@mui/utils": "^5.6.0", + "@mui/utils": "^5.6.1", "@types/react-transition-group": "^4.4.4", "clsx": "^1.1.1", "csstype": "^3.0.11", @@ -19567,19 +19678,19 @@ } }, "@mui/private-theming": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.6.0.tgz", - "integrity": "sha512-62jUFaMGfW3nvq/worcOAEiY++rWd44tpWShq4o97DybWmmWvEFYlBIuHEcXrtBIK/cloaQw8jqelQIFZeiVdw==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.6.1.tgz", + "integrity": "sha512-8lgh+tUt/3ftStfvml3dwAzhW3fe/cUFjLcBViOTnWk7UixWR79me4qehsO4NVj0THpu3d2qclrLzdD8qBAWAQ==", "requires": { "@babel/runtime": "^7.17.2", - "@mui/utils": "^5.6.0", + "@mui/utils": "^5.6.1", "prop-types": "^15.7.2" } }, "@mui/styled-engine": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.6.0.tgz", - "integrity": "sha512-K1WPKTruJTPA49cub0HtDCBBvosPKizqgZ4RenAfWz/ldlFtM4p7e7Mt3YEnNWTOJMHvDGcEke1tCuELkVAMyA==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.6.1.tgz", + "integrity": "sha512-jEhH6TBY8jc9S8yVncXmoTYTbATjEu44RMFXj6sIYfKr5NArVwTwRo3JexLL0t3BOAiYM4xsFLgfKEIvB9SAeQ==", "requires": { "@babel/runtime": "^7.17.2", "@emotion/cache": "^11.7.1", @@ -19587,15 +19698,15 @@ } }, "@mui/system": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.6.0.tgz", - "integrity": "sha512-FoytH73hY78Dll6F0fg7AI/hnpplygbFeW0HsqBfwFWrt2PMc2YSq2ICqHzd2CZPIhzEgRHDTSI8bMTLtG9W7A==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.6.1.tgz", + "integrity": "sha512-Y5pDvEOK6VOY+0vgNeyDuEEO5QCinhXbZQDyLOlaGLKuAoRGLXO9pcSsjZoGkewYZitXD44EDfgBQ+BqsAfgUA==", "requires": { "@babel/runtime": "^7.17.2", - "@mui/private-theming": "^5.6.0", - "@mui/styled-engine": "^5.6.0", + "@mui/private-theming": "^5.6.1", + "@mui/styled-engine": "^5.6.1", "@mui/types": "^7.1.3", - "@mui/utils": "^5.6.0", + "@mui/utils": "^5.6.1", "clsx": "^1.1.1", "csstype": "^3.0.11", "prop-types": "^15.7.2" @@ -19608,9 +19719,9 @@ "requires": {} }, "@mui/utils": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.6.0.tgz", - "integrity": "sha512-LbZKkCOn4243vbEVGbaKV7t6eN6kz7t95DR6AcUCRk4daH3l7CXPYkWsyzysRWdXgSzHmIyrgg4FZKzTy0dTHQ==", + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.6.1.tgz", + "integrity": "sha512-CPrzrkiBusCZBLWu0Sg5MJvR3fKJyK3gKecLVX012LULyqg2U64Oz04BKhfkbtBrPBbSQxM+DWW9B1c9hmV9nQ==", "requires": { "@babel/runtime": "^7.17.2", "@types/prop-types": "^15.7.4", @@ -19719,9 +19830,9 @@ } }, "@rushstack/eslint-patch": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.1.tgz", - "integrity": "sha512-BUyKJGdDWqvWC5GEhyOiUrGNi9iJUr4CU0O2WxJL6QJhHeeA/NVBalH+FeK0r/x/W0rPymXt5s78TDS7d6lCwg==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.2.tgz", + "integrity": "sha512-oe5WJEDaVsW8fBlGT7udrSCgOwWfoYHQOmSpnh8X+0GXpqqcRCP8k4y+Dxb0taWJDPpB+rdDUtumIiBwkY9qGA==" }, "@sindresorhus/is": { "version": "0.14.0", @@ -19902,6 +20013,17 @@ "defer-to-connect": "^1.0.1" } }, + "@table-library/react-table-library": { + "version": "2.0.32", + "resolved": "https://registry.npmjs.org/@table-library/react-table-library/-/react-table-library-2.0.32.tgz", + "integrity": "sha512-hHxR5DkAdU+62rRukjId1XqdI1ZkWQhdmvYwJM60StrFpah0nbpk8/HG21k7mFdlwjoO7HtDgWDDReLDUbPS7Q==", + "requires": { + "clsx": "1.1.1", + "react-virtualized-auto-sizer": "1.0.6", + "react-window": "1.8.6", + "use-double-click": "1.0.5" + } + }, "@tootallnate/once": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", @@ -20095,9 +20217,9 @@ "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==" }, "@types/node": { - "version": "17.0.23", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz", - "integrity": "sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==" + "version": "17.0.24", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.24.tgz", + "integrity": "sha512-aveCYRQbgTH9Pssp1voEP7HiuWlD2jW2BO56w+bVrJn04i61yh6mRfoKO6hEYQD9vF+W8Chkwc6j1M36uPkx4g==" }, "@types/parse-json": { "version": "4.0.0", @@ -20257,13 +20379,13 @@ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==" }, "@typescript-eslint/eslint-plugin": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz", - "integrity": "sha512-tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.19.0.tgz", + "integrity": "sha512-w59GpFqDYGnWFim9p6TGJz7a3qWeENJuAKCqjGSx+Hq/bwq3RZwXYqy98KIfN85yDqz9mq6QXiY5h0FjGQLyEg==", "requires": { - "@typescript-eslint/scope-manager": "5.18.0", - "@typescript-eslint/type-utils": "5.18.0", - "@typescript-eslint/utils": "5.18.0", + "@typescript-eslint/scope-manager": "5.19.0", + "@typescript-eslint/type-utils": "5.19.0", + "@typescript-eslint/utils": "5.19.0", "debug": "^4.3.2", "functional-red-black-tree": "^1.0.1", "ignore": "^5.1.8", @@ -20272,66 +20394,74 @@ "tsutils": "^3.21.0" }, "dependencies": { - "semver": { - "version": "7.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz", - "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==", + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "requires": { - "lru-cache": "^7.4.0" + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "requires": { + "lru-cache": "^6.0.0" } } } }, "@typescript-eslint/experimental-utils": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.18.0.tgz", - "integrity": "sha512-hypiw5N0aM2aH91/uMmG7RpyUH3PN/iOhilMwkMFZIbm/Bn/G3ZnbaYdSoAN4PG/XHQjdhBYLi0ZoRZsRYT4hA==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.19.0.tgz", + "integrity": "sha512-F+X/TTzmb2UXbghY1LrNLNDjMcGZMhKzXuzvu0xD+YEB77EamLM7zMOLuz2kP5807IJRDLBoAFFPYa7HT62sYg==", "requires": { - "@typescript-eslint/utils": "5.18.0" + "@typescript-eslint/utils": "5.19.0" } }, "@typescript-eslint/parser": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.18.0.tgz", - "integrity": "sha512-+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.19.0.tgz", + "integrity": "sha512-yhktJjMCJX8BSBczh1F/uY8wGRYrBeyn84kH6oyqdIJwTGKmzX5Qiq49LRQ0Jh0LXnWijEziSo6BRqny8nqLVQ==", "requires": { - "@typescript-eslint/scope-manager": "5.18.0", - "@typescript-eslint/types": "5.18.0", - "@typescript-eslint/typescript-estree": "5.18.0", + "@typescript-eslint/scope-manager": "5.19.0", + "@typescript-eslint/types": "5.19.0", + "@typescript-eslint/typescript-estree": "5.19.0", "debug": "^4.3.2" } }, "@typescript-eslint/scope-manager": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz", - "integrity": "sha512-C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.19.0.tgz", + "integrity": "sha512-Fz+VrjLmwq5fbQn5W7cIJZ066HxLMKvDEmf4eu1tZ8O956aoX45jAuBB76miAECMTODyUxH61AQM7q4/GOMQ5g==", "requires": { - "@typescript-eslint/types": "5.18.0", - "@typescript-eslint/visitor-keys": "5.18.0" + "@typescript-eslint/types": "5.19.0", + "@typescript-eslint/visitor-keys": "5.19.0" } }, "@typescript-eslint/type-utils": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz", - "integrity": "sha512-vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.19.0.tgz", + "integrity": "sha512-O6XQ4RI4rQcBGshTQAYBUIGsKqrKeuIOz9v8bckXZnSeXjn/1+BDZndHLe10UplQeJLXDNbaZYrAytKNQO2T4Q==", "requires": { - "@typescript-eslint/utils": "5.18.0", + "@typescript-eslint/utils": "5.19.0", "debug": "^4.3.2", "tsutils": "^3.21.0" } }, "@typescript-eslint/types": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.18.0.tgz", - "integrity": "sha512-bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw==" + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.19.0.tgz", + "integrity": "sha512-zR1ithF4Iyq1wLwkDcT+qFnhs8L5VUtjgac212ftiOP/ZZUOCuuF2DeGiZZGQXGoHA50OreZqLH5NjDcDqn34w==" }, "@typescript-eslint/typescript-estree": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz", - "integrity": "sha512-wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.19.0.tgz", + "integrity": "sha512-dRPuD4ocXdaE1BM/dNR21elSEUPKaWgowCA0bqJ6YbYkvtrPVEvZ+zqcX5a8ECYn3q5iBSSUcBBD42ubaOp0Hw==", "requires": { - "@typescript-eslint/types": "5.18.0", - "@typescript-eslint/visitor-keys": "5.18.0", + "@typescript-eslint/types": "5.19.0", + "@typescript-eslint/visitor-keys": "5.19.0", "debug": "^4.3.2", "globby": "^11.0.4", "is-glob": "^4.0.3", @@ -20339,25 +20469,33 @@ "tsutils": "^3.21.0" }, "dependencies": { - "semver": { - "version": "7.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz", - "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==", + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "requires": { - "lru-cache": "^7.4.0" + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", + "requires": { + "lru-cache": "^6.0.0" } } } }, "@typescript-eslint/utils": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.18.0.tgz", - "integrity": "sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.19.0.tgz", + "integrity": "sha512-ZuEckdupXpXamKvFz/Ql8YnePh2ZWcwz7APICzJL985Rp5C2AYcHO62oJzIqNhAMtMK6XvrlBTZeNG8n7gS3lQ==", "requires": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.18.0", - "@typescript-eslint/types": "5.18.0", - "@typescript-eslint/typescript-estree": "5.18.0", + "@typescript-eslint/scope-manager": "5.19.0", + "@typescript-eslint/types": "5.19.0", + "@typescript-eslint/typescript-estree": "5.19.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -20379,11 +20517,11 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz", - "integrity": "sha512-Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.19.0.tgz", + "integrity": "sha512-Ym7zZoMDZcAKWsULi2s7UMLREdVQdScPQ/fKWMYefarCztWlHPFVJo8racf8R0Gc8FAEJ2eD4of8As1oFtnQlQ==", "requires": { - "@typescript-eslint/types": "5.18.0", + "@typescript-eslint/types": "5.19.0", "eslint-visitor-keys": "^3.0.0" } }, @@ -20757,23 +20895,25 @@ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==" }, "array.prototype.flat": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz", - "integrity": "sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz", + "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==", "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.19.0" + "es-abstract": "^1.19.2", + "es-shim-unscopables": "^1.0.0" } }, "array.prototype.flatmap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz", - "integrity": "sha512-08u6rVyi1Lj7oqWbS9nUxliETrtIROT4XGTA4D/LWGten6E3ocm7cy9SIrmNHOL5XVbVuckUp3X6Xyg8/zpvHA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz", + "integrity": "sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==", "requires": { - "call-bind": "^1.0.0", + "call-bind": "^1.0.2", "define-properties": "^1.1.3", - "es-abstract": "^1.19.0" + "es-abstract": "^1.19.2", + "es-shim-unscopables": "^1.0.0" } }, "asap": { @@ -22420,6 +22560,14 @@ "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==" }, + "es-shim-unscopables": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", + "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "requires": { + "has": "^1.0.3" + } + }, "es-to-primitive": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", @@ -22664,9 +22812,9 @@ } }, "eslint-config-react-app": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.0.tgz", - "integrity": "sha512-xyymoxtIt1EOsSaGag+/jmcywRuieQoA2JbPCjnw9HukFj9/97aGPoZVFioaotzk1K5Qt9sHO5EutZbkrAXS0g==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz", + "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==", "requires": { "@babel/core": "^7.16.0", "@babel/eslint-parser": "^7.16.3", @@ -22891,9 +23039,9 @@ "requires": {} }, "eslint-plugin-testing-library": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.2.1.tgz", - "integrity": "sha512-88qJv6uzYALtiYJDzhelP3ov0Px/GLgnu+UekjjDxL2nMyvgdTyboKqcDBsvFPmAeizlCoSWOjeBN4DxO0BxaA==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.3.1.tgz", + "integrity": "sha512-OfF4dlG/q6ck6DL3P8Z0FPdK0dU5K57gsBu7eUcaVbwYKaNzjgejnXiM9CCUevppORkvfek+9D3Uj/9ZZ8Vz8g==", "requires": { "@typescript-eslint/utils": "^5.13.0" } @@ -23302,9 +23450,9 @@ "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" }, "fork-ts-checker-webpack-plugin": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz", - "integrity": "sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.1.tgz", + "integrity": "sha512-x1wumpHOEf4gDROmKTaB6i4/Q6H3LwmjVO7fIX47vBwlZbtPjU33hgoMuD/Q/y6SU8bnuYSoN6ZQOLshGp0T/g==", "requires": { "@babel/code-frame": "^7.8.3", "@types/json-schema": "^7.0.5", @@ -23367,6 +23515,14 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, "schema-utils": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", @@ -23378,11 +23534,11 @@ } }, "semver": { - "version": "7.3.6", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.6.tgz", - "integrity": "sha512-HZWqcgwLsjaX1HBD31msI/rXktuIhS+lWvdE4kN9z+8IVT4Itc7vqU2WvYsyD6/sjYCt4dEKH/m1M3dwI9CC5w==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "requires": { - "lru-cache": "^7.4.0" + "lru-cache": "^6.0.0" } }, "supports-color": { @@ -25913,6 +26069,11 @@ "fs-monkey": "1.0.3" } }, + "memoize-one": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz", + "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==" + }, "memorystream": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", @@ -26192,9 +26353,9 @@ "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==" }, "notistack": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/notistack/-/notistack-2.0.3.tgz", - "integrity": "sha512-krmVFtTO9kEY1Pa4NrbyexrjiRcV6TqBM2xLx8nuDea1g96Z/OZfkvVLmYKkTvoSJ3jyQntWK16z86ssW5kt4A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/notistack/-/notistack-2.0.4.tgz", + "integrity": "sha512-kOJmKvTG91ElMzi4aHu82BDe1liQ0zMrBp+TnWJptgowDsTbeTKbZmsRqJNIj145BmlOtZsEE9xjcrN46zVo3w==", "requires": { "clsx": "^1.1.0", "hoist-non-react-statics": "^3.3.0" @@ -27566,9 +27727,9 @@ } }, "react-dev-utils": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.0.tgz", - "integrity": "sha512-xBQkitdxozPxt1YZ9O1097EJiVpwHr9FoAuEVURCKV0Av8NBERovJauzP7bo1ThvuhZ4shsQ1AJiu4vQpoT1AQ==", + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz", + "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==", "requires": { "@babel/code-frame": "^7.16.0", "address": "^1.1.2", @@ -27589,7 +27750,7 @@ "open": "^8.4.0", "pkg-up": "^3.1.0", "prompts": "^2.4.2", - "react-error-overlay": "^6.0.10", + "react-error-overlay": "^6.0.11", "recursive-readdir": "^2.2.2", "shell-quote": "^1.7.3", "strip-ansi": "^6.0.1", @@ -27693,9 +27854,9 @@ } }, "react-dropzone": { - "version": "12.0.4", - "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.4.tgz", - "integrity": "sha512-fcqHEYe1MzAghU6/Hz86lHDlBNsA+lO48nAcm7/wA+kIzwS6uuJbUG33tBZjksj7GAZ1iUQ6NHwjUURPmSGang==", + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-12.0.5.tgz", + "integrity": "sha512-zUjZigD0VJ91CSm9T1h7ErxFReBLaa9sjS2dUL0+inb0RROZpSJTNDHPY1rrBES5V2NXhF8v0kghmaHc81BMFg==", "requires": { "attr-accept": "^2.2.2", "file-selector": "^0.4.0", @@ -27703,9 +27864,9 @@ } }, "react-error-overlay": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.10.tgz", - "integrity": "sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA==" + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz", + "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==" }, "react-icons": { "version": "4.3.1", @@ -27741,9 +27902,9 @@ } }, "react-scripts": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.0.tgz", - "integrity": "sha512-3i0L2CyIlROz7mxETEdfif6Sfhh9Lfpzi10CtcGs1emDQStmZfWjJbAIMtRD0opVUjQuFWqHZyRZ9PPzKCFxWg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz", + "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==", "requires": { "@babel/core": "^7.16.0", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3", @@ -27761,7 +27922,7 @@ "dotenv": "^10.0.0", "dotenv-expand": "^5.1.0", "eslint": "^8.3.0", - "eslint-config-react-app": "^7.0.0", + "eslint-config-react-app": "^7.0.1", "eslint-webpack-plugin": "^3.1.1", "file-loader": "^6.2.0", "fs-extra": "^10.0.0", @@ -27779,7 +27940,7 @@ "postcss-preset-env": "^7.0.1", "prompts": "^2.4.2", "react-app-polyfill": "^3.0.0", - "react-dev-utils": "^12.0.0", + "react-dev-utils": "^12.0.1", "react-refresh": "^0.11.0", "resolve": "^1.20.0", "resolve-url-loader": "^4.0.0", @@ -27816,6 +27977,21 @@ "prop-types": "^15.6.2" } }, + "react-virtualized-auto-sizer": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.6.tgz", + "integrity": "sha512-7tQ0BmZqfVF6YYEWcIGuoR3OdYe8I/ZFbNclFlGOC3pMqunkYF/oL30NCjSGl9sMEb17AnzixDz98Kqc3N76HQ==", + "requires": {} + }, + "react-window": { + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.6.tgz", + "integrity": "sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg==", + "requires": { + "@babel/runtime": "^7.0.0", + "memoize-one": ">=3.1.1 <6" + } + }, "read-pkg": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", @@ -29346,6 +29522,12 @@ "prepend-http": "^2.0.0" } }, + "use-double-click": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/use-double-click/-/use-double-click-1.0.5.tgz", + "integrity": "sha512-71LUca6NtzpzHYlcfM/dOdmwvmvpMbzeIVQpN87w+DctpLiMCXtZpsN8FNWPgHpPBtNhvucPUHIDh5al8D8C7w==", + "requires": {} + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -30103,6 +30285,11 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "yaml": { "version": "1.10.2", "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", diff --git a/interface/package.json b/interface/package.json index c3688025f..5001fd899 100644 --- a/interface/package.json +++ b/interface/package.json @@ -7,10 +7,11 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@msgpack/msgpack": "^2.7.2", - "@mui/icons-material": "^5.6.0", - "@mui/material": "^5.6.0", + "@mui/icons-material": "^5.6.1", + "@mui/material": "^5.6.1", + "@table-library/react-table-library": "^2.0.32", "@types/lodash": "^4.14.181", - "@types/node": "^17.0.23", + "@types/node": "^17.0.24", "@types/react": "^17.0.43", "@types/react-dom": "^17.0.14", "@types/react-router-dom": "^5.3.3", @@ -19,15 +20,15 @@ "http-proxy-middleware": "^2.0.4", "jwt-decode": "^3.1.2", "lodash": "^4.17.21", - "notistack": "^2.0.3", + "notistack": "^2.0.4", "parse-ms": "^3.0.0", "react": "^17.0.2", - "react-dom": "^17.0.2", "react-app-rewired": "^2.2.1", - "react-dropzone": "^12.0.4", + "react-dom": "^17.0.2", + "react-dropzone": "^12.0.5", "react-icons": "^4.3.1", "react-router-dom": "^6.3.0", - "react-scripts": "5.0.0", + "react-scripts": "5.0.1", "sockette": "^2.0.6", "typescript": "^4.6.3" }, diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index 21cf4072c..3c64dc673 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -1,11 +1,7 @@ -import { FC, useState, useContext, useEffect } from 'react'; +import { FC, useState, useContext, useCallback, useEffect } from 'react'; import { Button, - Table, - TableBody, - TableHead, - TableRow, Typography, Box, Dialog, @@ -20,15 +16,18 @@ import { ListItem, ListItemText, Grid, - useMediaQuery + FormControlLabel, + Checkbox } from '@mui/material'; -import TableCell, { tableCellClasses } from '@mui/material/TableCell'; - -import { styled } from '@mui/material/styles'; - import { useSnackbar } from 'notistack'; +import { Table } from '@table-library/react-table-library/table'; +import { useTheme } from '@table-library/react-table-library/theme'; +import { useSort, HeaderCellSort } from '@table-library/react-table-library/sort'; +import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table'; +import { useRowSelect } from '@table-library/react-table-library/select'; + import RefreshIcon from '@mui/icons-material/Refresh'; import EditIcon from '@mui/icons-material/Edit'; import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined'; @@ -37,10 +36,11 @@ import CancelIcon from '@mui/icons-material/Cancel'; import SendIcon from '@mui/icons-material/TrendingFlat'; import SaveIcon from '@mui/icons-material/Save'; import RemoveIcon from '@mui/icons-material/RemoveCircleOutline'; -import FavoriteBorderIcon from '@mui/icons-material/FavoriteBorder'; import PlayArrowIcon from '@mui/icons-material/PlayArrow'; import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined'; import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined'; +import KeyboardArrowUpOutlinedIcon from '@mui/icons-material/KeyboardArrowUpOutlined'; +import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined'; import DeviceIcon from './DeviceIcon'; @@ -54,10 +54,11 @@ import { ButtonRow, FormLoader, ValidatedTextField, SectionContent, MessageBox } import * as EMSESP from './api'; -import { numberValue, updateValue, extractErrorMessage, useRest } from '../utils'; +import { numberValue, updateValue, extractErrorMessage } from '../utils'; import { SensorData, + Device, CoreData, DeviceData, DeviceValue, @@ -70,81 +71,255 @@ import { DeviceEntityMask } from './types'; -const StyledTableCell = styled(TableCell)(({ theme }) => ({ - [`&.${tableCellClasses.head}`]: { - backgroundColor: theme.palette.common.black, - color: theme.palette.common.white, - fontSize: 14 - } -})); - -const StyledTableRow = styled(TableRow)(({ theme }) => ({ - '&:nth-of-type(odd)': { - backgroundColor: theme.palette.action.hover - }, - '&:hover': { - backgroundColor: theme.palette.info.light - } -})); - const DashboardData: FC = () => { - const { loadData, data, errorMessage } = useRest({ read: EMSESP.readCoreData }); - const { me } = useContext(AuthenticatedContext); const { enqueueSnackbar } = useSnackbar(); - const [deviceData, setDeviceData] = useState(); - const [sensorData, setSensorData] = useState(); + const [errorMessage, setErrorMessage] = useState(); + const [coreData, setCoreData] = useState({ devices: [], active_sensors: 0, analog_enabled: false }); + const [deviceData, setDeviceData] = useState({ label: '', data: [] }); + const [sensorData, setSensorData] = useState({ sensors: [], analogs: [] }); const [deviceValue, setDeviceValue] = useState(); const [sensor, setSensor] = useState(); const [analog, setAnalog] = useState(); - const [selectedDevice, setSelectedDevice] = useState(); const [deviceDialog, setDeviceDialog] = useState(-1); + const [onlyFav, setOnlyFav] = useState(false); - const desktopWindow = useMediaQuery('(min-width:600px)'); + const device_theme = useTheme({ + BaseRow: ` + font-size: 14px; + color: white; + height: 46px; + &:focus { + z-index: 2; + border-top: 1px solid #177ac9; + border-bottom: 1px solid #177ac9; + } + `, + HeaderRow: ` + background-color: black; + font-size: 14px; + border-bottom: 1px solid #e0e0e0; + `, + Row: ` + background-color: #1e1e1e; + border-top: 1px solid #565656; + border-bottom: 1px solid #565656; + position: relative; + z-index: 1; + &:not(:last-of-type) { + margin-bottom: -1px; + } + &:not(:first-of-type) { + margin-top: -1px; + } + &:hover { + z-index: 2; + color: white; + border-top: 1px solid #177ac9; + border-bottom: 1px solid #177ac9; + }, + &.tr.tr-body.row-select.row-select-single-selected, &.tr.tr-body.row-select.row-select-selected { + background-color: #3d4752; + color: white; + font-weight: normal; + z-index: 2; + border-top: 1px solid #177ac9; + border-bottom: 1px solid #177ac9; + } + `, + BaseCell: ` + border-top: 1px solid transparent; + border-right: 1px solid transparent; + border-bottom: 1px solid transparent; + &:nth-of-type(1) { + min-width: 42px; + width: 42px; + div { + width: 100%; + } + } + &:nth-of-type(2) { + min-width: 120px; + width: 120px; + } + &:nth-of-type(3) { + flex: 1; + } + &:nth-of-type(4) { + text-align: center; + max-width: 100px; + } + &:last-of-type { + text-align: right; + min-width: 64px; + } + ` + }); - const refreshAllData = () => { - if (analog || sensor || deviceValue) { - return; + const data_theme = useTheme({ + BaseRow: ` + font-size: 14px; + color: white; + height: 32px; + `, + HeaderRow: ` + background-color: black; + font-size: 14px; + border-bottom: 1px solid #e0e0e0; + `, + Row: ` + &:nth-of-type(odd) { + background-color: #303030; + } + &:nth-of-type(even) { + background-color: #1e1e1e; + } + border-top: 1px solid #565656; + border-bottom: 1px solid #565656; + position: relative; + z-index: 1; + &:not(:last-of-type) { + margin-bottom: -1px; + } + &:not(:first-of-type) { + margin-top: -1px; + } + &:hover { + z-index: 2; + border-top: 1px solid #177ac9; + border-bottom: 1px solid #177ac9; + color: white; + cursor: 'pointer', + } + `, + BaseCell: ` + border-top: 1px solid transparent; + border-right: 1px solid transparent; + border-bottom: 1px solid transparent; + &:last-of-type { + text-align: right; + min-width: 64px; + } + ` + }); + + const analog_sort = useSort( + { nodes: sensorData.analogs }, + { + state: { + sortKey: 'GPIO', + reverse: false + } + }, + { + sortIcon: { + iconDefault: null, + iconUp: , + iconDown: + }, + sortFns: { + GPIO: (array) => array.sort((a, b) => a.i - b.i), + NAME: (array) => array.sort((a, b) => a.n.localeCompare(b.n)), + TYPE: (array) => array.sort((a, b) => a.t - b.t) + } } - loadData(); - if (sensorData) { - fetchSensorData(); - } else if (selectedDevice) { - fetchDeviceData(selectedDevice); + ); + + const sensor_sort = useSort( + { nodes: sensorData.sensors }, + { + state: { + sortKey: 'NAME', + reverse: false + } + }, + { + sortIcon: { + iconDefault: null, + iconUp: , + iconDown: + }, + sortFns: { + NAME: (array) => array.sort((a, b) => a.id.localeCompare(b.id)), + TEMPERATURE: (array) => array.sort((a, b) => a.id.localeCompare(b.id)) + } } - }; + ); + + const dv_sort = useSort( + { nodes: deviceData.data }, + {}, + { + sortIcon: { + margin: '0px', + iconDefault: null, + iconUp: , + iconDown: + }, + sortFns: { + NAME: (array) => array.sort((a, b) => a.id.slice(2).localeCompare(b.id.slice(2))) + } + } + ); + + const device_select = useRowSelect( + { nodes: coreData.devices }, + { + onChange: onSelectChange + } + ); + + function onSelectChange(action: any, state: any) { + if (action.type === 'ADD_BY_ID_EXCLUSIVELY') { + refreshData(); + } else { + setSensorData({ sensors: [], analogs: [] }); + } + } const refreshData = () => { - if (analog || sensor || deviceValue) { + const selectedDevice = device_select.state.id; + if (selectedDevice === 'sensor') { + fetchSensorData(); return; } - if (sensorData) { - fetchSensorData(); - } else if (selectedDevice) { + + setSensorData({ sensors: [], analogs: [] }); + if (selectedDevice) { fetchDeviceData(selectedDevice); } else { - loadData(); + fetchCoreData(); } }; + const fetchCoreData = useCallback(async () => { + try { + setCoreData((await EMSESP.readCoreData()).data); + } catch (error: any) { + setErrorMessage(extractErrorMessage(error, 'Failed to fetch core data')); + } + }, []); + + useEffect(() => { + fetchCoreData(); + }, [fetchCoreData]); + useEffect(() => { const timer = setInterval(() => refreshData(), 60000); return () => { clearInterval(timer); }; // eslint-disable-next-line - }, [analog, sensor, deviceValue, sensorData, selectedDevice]); + }, [analog, sensor, deviceValue, sensorData]); - const fetchDeviceData = async (unique_id: number) => { + const fetchDeviceData = async (id: string) => { + const unique_id = parseInt(id); try { setDeviceData((await EMSESP.readDeviceData({ id: unique_id })).data); } catch (error: any) { - enqueueSnackbar(extractErrorMessage(error, 'Problem fetching device data'), { variant: 'error' }); - } finally { - setSelectedDevice(unique_id); - setSensorData(undefined); + setErrorMessage(extractErrorMessage(error, 'Problem fetching device data')); } }; @@ -152,9 +327,7 @@ const DashboardData: FC = () => { try { setSensorData((await EMSESP.readSensorData()).data); } catch (error: any) { - enqueueSnackbar(extractErrorMessage(error, 'Problem fetching sensor data'), { variant: 'error' }); - } finally { - setSelectedDevice(undefined); + setErrorMessage(extractErrorMessage(error, 'Problem fetching sensor data')); } }; @@ -192,10 +365,10 @@ const DashboardData: FC = () => { } const sendDeviceValue = async () => { - if (selectedDevice && deviceValue) { + if (deviceValue) { try { const response = await EMSESP.writeValue({ - id: selectedDevice, + id: Number(device_select.state.id), devicevalue: deviceValue }); if (response.status === 204) { @@ -207,11 +380,10 @@ const DashboardData: FC = () => { } setDeviceValue(undefined); } catch (error: any) { - enqueueSnackbar(extractErrorMessage(error, 'Problem writing value'), { variant: 'error' }); + setErrorMessage(extractErrorMessage(error, 'Problem writing value')); } finally { + refreshData(); setDeviceValue(undefined); - fetchDeviceData(selectedDevice); - loadData(); } } }; @@ -225,7 +397,7 @@ const DashboardData: FC = () => { {deviceValue.l && ( { {!deviceValue.l && ( { }; const addAnalogSensor = () => { - setAnalog({ i: 0, n: '', u: 0, v: 0, o: 0, t: 0, f: 1 }); + setAnalog({ id: '0', n: '', u: 0, v: 0, o: 0, t: 0, f: 1 }); }; const sendSensor = async () => { if (sensor) { try { const response = await EMSESP.writeSensor({ - id_str: sensor.is, + id_str: sensor.id, name: sensor.n, offset: sensor.o }); @@ -299,7 +471,7 @@ const DashboardData: FC = () => { } setSensor(undefined); } catch (error: any) { - enqueueSnackbar(extractErrorMessage(error, 'Problem updating sensor'), { variant: 'error' }); + setErrorMessage(extractErrorMessage(error, 'Problem updating sensor')); } finally { setSensor(undefined); fetchSensorData(); @@ -314,7 +486,7 @@ const DashboardData: FC = () => { Edit Temperature Sensor - Sensor ID {sensor.is} + Sensor ID {sensor.id} @@ -369,32 +541,32 @@ const DashboardData: FC = () => { }; const renderDeviceDialog = () => { - if (data && data.devices.length > 0 && deviceDialog !== -1) { + if (coreData && coreData.devices.length > 0 && deviceDialog !== -1) { return ( setDeviceDialog(-1)}> Device Details - + - + - + - + - + @@ -408,104 +580,86 @@ const DashboardData: FC = () => { } }; - const toggleDeviceData = (index: number) => { - loadData(); - if (selectedDevice === index) { - setSelectedDevice(undefined); - } else { - fetchDeviceData(index); - } - }; - - const toggleSensorData = () => { - loadData(); - if (sensorData) { - setSensorData(undefined); - } else { - fetchSensorData(); - } - }; - const renderCoreData = () => { - if (!data) { - return ; + if (!coreData) { + return ; } + console.log('** Rendering main data'); + return ( - {data.devices.length === 0 && } - - - - - TYPE - - {desktopWindow && DESCRIPTION} - ENTITIES - - - - - {data.devices.map((device, index) => ( - device.e && toggleDeviceData(device.i)} - > - - - - {device.t} - {desktopWindow && {device.n}} - {device.e} - - setDeviceDialog(index)}> - - - - - ))} - {(data.active_sensors > 0 || data.analog_enabled) && ( - toggleSensorData()}> - - - - Sensors - {desktopWindow && Attached EMS-ESP Sensors} - {data.active_sensors} - - addAnalogSensor()} disabled={!data.analog_enabled}> - - - - - )} - + {coreData.devices.length === 0 && } + +
+ {(tableList: any) => ( + <> +
+ + + TYPE + DESCRIPTION + ENTITIES + + +
+ + {tableList.map((device: Device, index: number) => ( + + + + + {device.t} + {device.n} + {device.e} + + setDeviceDialog(index)}> + + + + + ))} + {(coreData.active_sensors > 0 || coreData.analog_enabled) && ( + + + + + Sensors + Attached EMS-ESP Sensors + {coreData.active_sensors} + + addAnalogSensor()}> + + + + + )} + + + )}
); }; const renderDeviceData = () => { - if (data?.devices.length === 0 || !deviceData || !selectedDevice) { + if (!device_select.state.id || device_select.state.id === 'sensor') { return; } - const hasMask = (entityName: string, mask: number) => (parseInt(entityName.slice(0, 2), 16) & mask) === mask; + const hasMask = (id: string, mask: number) => (parseInt(id.slice(0, 2), 16) & mask) === mask; const sendCommand = (dv: DeviceValue) => { - if (dv.c && me.admin && !hasMask(dv.n, DeviceEntityMask.DV_READONLY)) { + if (dv.c && me.admin && !hasMask(dv.id, DeviceEntityMask.DV_READONLY)) { setDeviceValue(dv); } }; const renderNameCell = (dv: DeviceValue) => ( <> - {dv.n.slice(2)}  - {hasMask(dv.n, DeviceEntityMask.DV_FAVORITE) && } - {hasMask(dv.n, DeviceEntityMask.DV_READONLY) && } - {hasMask(dv.n, DeviceEntityMask.DV_API_MQTT_EXCLUDE) && ( + {dv.id.slice(2)}  + {hasMask(dv.id, DeviceEntityMask.DV_READONLY) && } + {hasMask(dv.id, DeviceEntityMask.DV_API_MQTT_EXCLUDE) && ( )} @@ -516,47 +670,67 @@ const DashboardData: FC = () => { {deviceData.label} - - - - - ENTITY NAME - VALUE - - - - {deviceData.data.map((dv, i) => ( - sendCommand(dv)}> - - {dv.c && me.admin && !hasMask(dv.n, DeviceEntityMask.DV_READONLY) && ( - - - - )} - - - {renderNameCell(dv)} - - - {isCmdOnly(dv) ? : formatValue(dv.v, dv.u)} - - - ))} - + + setOnlyFav(!onlyFav)} />} + label="show favorites only" + /> + +
hasMask(dv.id, DeviceEntityMask.DV_FAVORITE)) + : deviceData.data + }} + theme={data_theme} + sort={dv_sort} + > + {(tableList: any) => ( + <> +
+ + + ENTITY NAME + + VALUE + + +
+ + {tableList.map((dv: DeviceValue) => ( + sendCommand(dv)}> + {renderNameCell(dv)} + {formatValue(dv.v, dv.u)} + + {dv.c && me.admin && !hasMask(dv.id, DeviceEntityMask.DV_READONLY) && ( + sendCommand(dv)}> + {isCmdOnly(dv) ? ( + + ) : ( + + )} + + )} + + + ))} + + + )}
); }; - const updateSensor = (sensordata: Sensor) => { - if (sensordata && me.admin) { - setSensor(sensordata); + const updateSensor = (s: Sensor) => { + if (s && me.admin) { + setSensor(s); } }; - const updateAnalog = (analogdata: Analog) => { + const updateAnalog = (a: Analog) => { if (me.admin) { - setAnalog(analogdata); + setAnalog(a); } }; @@ -565,31 +739,36 @@ const DashboardData: FC = () => { Temperature Sensors - - - - - NAME - TEMPERATURE - - - - {sensorData?.sensors.map((sensor_data) => ( - updateSensor(sensor_data)}> - - {me.admin && ( - - - - )} - - - {sensor_data.n} - - {formatValue(sensor_data.t, sensor_data.u)} - - ))} - + +
+ {(tableList: any) => ( + <> +
+ + + NAME + + TEMPERATURE + + +
+ + {tableList.map((s: Sensor) => ( + updateSensor(s)}> + {s.n} + {formatValue(s.t, s.u)} + + {me.admin && ( + updateSensor(s)}> + + + )} + + + ))} + + + )}
); @@ -599,35 +778,44 @@ const DashboardData: FC = () => { Analog Sensors - - - - - GPIO - NAME - TYPE - VALUE - - - - {sensorData?.analogs.map((analog_data) => ( - updateAnalog(analog_data)}> - - {me.admin && ( - - - - )} - - - {analog_data.i} - - {analog_data.n} - {AnalogTypeNames[analog_data.t]} - {formatValue(analog_data.v, analog_data.u)} - - ))} - + +
+ {(tableList: any) => ( + <> +
+ + + GPIO + + + NAME + + + TYPE + + VALUE + + +
+ + {tableList.map((a: Analog) => ( + updateAnalog(a)}> + {a.id} + {a.n} + {AnalogTypeNames[a.t]} + {formatValue(a.v, a.u)} + + {me.admin && ( + updateAnalog(a)}> + + + )} + + + ))} + + + )}
); @@ -636,7 +824,7 @@ const DashboardData: FC = () => { if (analog) { try { const response = await EMSESP.writeAnalog({ - id: analog.i, + id: analog.id, name: analog.n, offset: analog.o, factor: analog.f, @@ -664,7 +852,7 @@ const DashboardData: FC = () => { if (analog) { try { const response = await EMSESP.writeAnalog({ - id: analog.i, + id: analog.id, name: analog.n, offset: analog.o, factor: analog.f, @@ -697,10 +885,11 @@ const DashboardData: FC = () => { { )} - {analog.t === AnalogType.DIGITAL_OUT && (analog.i === 25 || analog.i === 26) && ( + {analog.t === AnalogType.DIGITAL_OUT && (analog.id === '25' || analog.id === '26') && ( <> { )} - {analog.t === AnalogType.DIGITAL_OUT && analog.i !== 25 && analog.i !== 26 && ( + {analog.t === AnalogType.DIGITAL_OUT && analog.id !== '25' && analog.id !== '26' && ( <> { } }; - const content = () => { - if (!data) { - return ; - } - - return ( - <> - {renderCoreData()} - {renderDeviceData()} - {renderDeviceDialog()} - {sensorData && sensorData.sensors.length > 0 && renderDallasData()} - {sensorData && sensorData.analogs.length > 0 && renderAnalogData()} - {renderDeviceValueDialog()} - {renderSensorDialog()} - {renderAnalogDialog()} - - - - - ); - }; - return ( - {content()} + {renderCoreData()} + {renderDeviceData()} + {renderDeviceDialog()} + {sensorData.sensors.length !== 0 && renderDallasData()} + {sensorData.analogs.length !== 0 && renderAnalogData()} + {renderDeviceValueDialog()} + {renderSensorDialog()} + {renderAnalogDialog()} + + + ); }; diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts index dc73bbe5e..d3d096aea 100644 --- a/interface/src/project/types.ts +++ b/interface/src/project/types.ts @@ -69,7 +69,7 @@ export interface Status { } export interface Device { - i: number; // id + id: string; // id index t: string; // type b: string; // brand n: string; // name @@ -80,7 +80,7 @@ export interface Device { } export interface Sensor { - is: string; // id string + id: string; // id string n: string; // name/alias t?: number; // temp, optional o: number; // offset @@ -88,7 +88,7 @@ export interface Sensor { } export interface Analog { - i: number; + id: string; // id string, is GPIO n: string; v?: number; u: number; @@ -126,11 +126,11 @@ export interface Devices { } export interface DeviceValue { + id: string; // index, contains mask+name v?: any; // value, in any format u: number; // uom - n: string; // name - c: string; // command - l: string[]; // list + c?: string; // command + l?: string[]; // list h?: string; // help text, optional s?: string; // steps for up/down, optional m?: string; // min, optional @@ -143,8 +143,8 @@ export interface DeviceData { } export interface DeviceEntity { - v?: any; // value, in any format n: string; // name + v?: any; // value, in any format s: string; // shortname m: number; // mask om?: number; // original mask before edits @@ -277,7 +277,7 @@ export interface WriteValue { } export interface WriteAnalog { - id: number; + id: string; name: string; factor: number; offset: number; diff --git a/mock-api/server.js b/mock-api/server.js index 49e86fa46..0645388ad 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -253,7 +253,7 @@ const UPLOAD_FIRMWARE_ENDPOINT = REST_ENDPOINT_ROOT + 'uploadFirmware' const SIGN_IN_ENDPOINT = REST_ENDPOINT_ROOT + 'signIn' const GENERATE_TOKEN_ENDPOINT = REST_ENDPOINT_ROOT + 'generateToken' const system_status = { - emsesp_version: '3.4.0demo', + emsesp_version: '3.4demo', esp_platform: 'ESP32', max_alloc_heap: 113792, psram_size: 0, @@ -364,7 +364,7 @@ const emsesp_devices = { const emsesp_coredata = { devices: [ { - i: 2, + id: '2', t: 'Boiler', s: 'Boiler', b: 'Nefit', @@ -375,7 +375,7 @@ const emsesp_coredata = { e: 68, }, { - i: 1, + id: '1', t: 'Thermostat', s: 'Thermostat', b: '', @@ -386,7 +386,7 @@ const emsesp_coredata = { e: 5, }, { - i: 4, + id: '4', t: 'Thermostat', s: 'Thermostat', b: 'Buderus', @@ -403,17 +403,17 @@ const emsesp_coredata = { const emsesp_sensordata = { sensors: [ - { is: '28-233D-9497-0C03', n: 'Dallas 1', t: 25.7, o: 1.2, u: 1 }, - { is: '28-243D-7437-1E3A', n: 'Dallas 2 outside', t: 26.1, o: 0, u: 1 }, - { is: '28-243E-7437-1E3B', n: 'Zolder', t: 27.1, o: 0, u: 16 }, - { is: '28-183D-1892-0C33', n: 'Roof', o: 2, u: 1 }, + { id: '28-233D-9497-0C03', n: 'Dallas 1', t: 25.7, o: 1.2, u: 1 }, + { id: '28-243D-7437-1E3A', n: 'Dallas 2 outside', t: 26.1, o: 0, u: 1 }, + { id: '28-243E-7437-1E3B', n: 'Zolder', t: 27.1, o: 0, u: 16 }, + { id: '28-183D-1892-0C33', n: 'Roof', o: 2, u: 1 }, ], // sensors: [], analogs: [ - { i: 36, n: 'motor', u: 0, o: 17, f: 0, t: 0 }, - { i: 37, n: 'External switch', v: 13, u: 0, o: 17, f: 0, t: 1 }, - { i: 39, n: 'Pulse count', v: 144, u: 0, o: 0, f: 0, t: 2 }, - { i: 40, n: 'Pressure', v: 16, u: 17, o: 0, f: 0, t: 3 }, + { id: '36', n: 'motor', u: 0, o: 17, f: 0, t: 0 }, + { id: '37', n: 'External switch', v: 13, u: 0, o: 17, f: 0, t: 1 }, + { id: '39', n: 'Pulse count', v: 144, u: 0, o: 0, f: 0, t: 2 }, + { id: '40', n: 'Pressure', v: 16, u: 17, o: 0, f: 0, t: 3 }, ], // analogs: [], } @@ -455,31 +455,28 @@ const emsesp_devicedata_1 = { { v: '(0)', u: 0, - n: '00error code', - c: '', + id: '00error code', }, { v: '14:54:39 06/06/2021', u: 0, - n: '00date/time', - c: '', + id: '00date/time', }, { v: 18, u: 1, - n: '00hc1 selected room temperature', + id: '00hc1 selected room temperature', c: 'hc1/seltemp', }, { v: 22.6, u: 1, - n: '00hc1 current room temperature', - c: '', + id: '00hc1 current room temperature', }, { v: 'auto', u: 0, - n: '00hc1 mode', + id: '00hc1 mode', c: 'hc1/mode', }, ], @@ -488,81 +485,81 @@ const emsesp_devicedata_1 = { const emsesp_devicedata_2 = { label: 'Boiler: Nefit GBx72/Trendline/Cerapur/Greenstar Si/27i', data: [ - { u: 0, n: '08reset', c: 'reset', l: ['-', 'maintenance', 'error'] }, - { v: 'false', u: 0, n: '08heating active' }, - { v: 'false', u: 0, n: '04tapwater active' }, - { v: 5, u: 1, n: '04selected flow temperature', c: 'selflowtemp' }, - { v: 0, u: 3, n: '0Eburner selected max power', c: 'selburnpow' }, - { v: 0, u: 3, n: '00heating pump modulation' }, - { v: 53.4, u: 1, n: '00current flow temperature' }, - { v: 52.7, u: 1, n: '00return temperature' }, - { v: 1.3, u: 10, n: '00system pressure' }, - { v: 54.9, u: 1, n: '00actual boiler temperature' }, - { v: 'false', u: 0, n: '00gas' }, - { v: 'false', u: 0, n: '00gas stage 2' }, - { v: 0, u: 9, n: '00flame current' }, - { v: 'false', u: 0, n: '00heating pump' }, - { v: 'false', u: 0, n: '00fan' }, - { v: 'false', u: 0, n: '00ignition' }, - { v: 'false', u: 0, n: '00oil preheating' }, - { v: 'true', u: 0, n: '00heating activated', c: 'heatingactivated', l: ['off', 'on'] }, - { v: 80, u: 1, n: '00heating temperature', c: 'heatingtemp' }, - { v: 70, u: 3, n: '00burner pump max power', c: 'pumpmodmax' }, - { v: 30, u: 3, n: '00burner pump min power', c: 'pumpmodmin' }, - { v: 1, u: 8, n: '00pump delay', c: 'pumpdelay' }, - { v: 10, u: 8, n: '00burner min period', c: 'burnminperiod' }, - { v: 0, u: 3, n: '00burner min power', c: 'burnminpower' }, - { v: 50, u: 3, n: '00burner max power', c: 'burnmaxpower' }, - { v: -6, u: 2, n: '00hysteresis on temperature', c: 'boilhyston' }, - { v: 6, u: 2, n: '00hysteresis off temperature', c: 'boilhystoff' }, - { v: 0, u: 1, n: '00set flow temperature' }, - { v: 0, u: 3, n: '00burner set power' }, - { v: 0, u: 3, n: '00burner current power' }, - { v: 326323, u: 0, n: '00burner starts' }, - { v: 553437, u: 8, n: '00total burner operating time' }, - { v: 451286, u: 8, n: '00total heat operating time' }, - { v: 4672173, u: 8, n: '00total UBA operating time' }, - { v: '1C(210) 06.06.2020 12:07 (0 min)', u: 0, n: '00last error code' }, - { v: '0H', u: 0, n: '00service code' }, - { v: 203, u: 0, n: '00service code number' }, - { v: 'H00', u: 0, n: '00maintenance message' }, - { v: 'manual', u: 0, n: '00maintenance scheduled', c: 'maintenance', l: ['off', 'time', 'date', 'manual'] }, - { v: 6000, u: 7, n: '00time to next maintenance', c: 'maintenancetime' }, - { v: '01.01.2012', u: 0, n: '00next maintenance date', c: 'maintenancedate', o: 'Format: < dd.mm.yyyy >' }, - { v: 'true', u: 0, n: '00dhw turn on/off', c: 'wwtapactivated', l: ['off', 'on'] }, - { v: 62, u: 1, n: '00dhw set temperature' }, - { v: 60, u: 1, n: '00dhw selected temperature', c: 'wwseltemp' }, - { v: 'flow', u: 0, n: '00dhw type' }, - { v: 'hot', u: 0, n: '00dhw comfort', c: 'wwcomfort', l: ['hot', 'eco', 'intelligent'] }, - { v: 40, u: 2, n: '00dhw flow temperature offset', c: 'wwflowtempoffset' }, - { v: 100, u: 3, n: '00dhw max power', c: 'wwmaxpower' }, - { v: 'false', u: 0, n: '00dhw circulation pump available', c: 'wwcircpump', l: ['off', 'on'] }, - { v: '3-way valve', u: 0, n: '00dhw charging type' }, - { v: -5, u: 2, n: '00dhw hysteresis on temperature', c: 'wwhyston' }, - { v: 0, u: 2, n: '00dhw hysteresis off temperature', c: 'wwhystoff' }, - { v: 70, u: 1, n: '00dhw disinfection temperature', c: 'wwdisinfectiontemp' }, + { u: 0, id: '08reset', c: 'reset', l: ['-', 'maintenance', 'error'] }, + { v: 'false', u: 0, id: '08heating active' }, + { v: 'false', u: 0, id: '04tapwater active' }, + { v: 5, u: 1, id: '04selected flow temperature', c: 'selflowtemp' }, + { v: 0, u: 3, id: '0Eburner selected max power', c: 'selburnpow' }, + { v: 0, u: 3, id: '00heating pump modulation' }, + { v: 53.4, u: 1, id: '00current flow temperature' }, + { v: 52.7, u: 1, id: '00return temperature' }, + { v: 1.3, u: 10, id: '00system pressure' }, + { v: 54.9, u: 1, id: '00actual boiler temperature' }, + { v: 'false', u: 0, id: '00gas' }, + { v: 'false', u: 0, id: '00gas stage 2' }, + { v: 0, u: 9, id: '00flame current' }, + { v: 'false', u: 0, id: '00heating pump' }, + { v: 'false', u: 0, id: '00fan' }, + { v: 'false', u: 0, id: '00ignition' }, + { v: 'false', u: 0, id: '00oil preheating' }, + { v: 'true', u: 0, id: '00heating activated', c: 'heatingactivated', l: ['off', 'on'] }, + { v: 80, u: 1, id: '00heating temperature', c: 'heatingtemp' }, + { v: 70, u: 3, id: '00burner pump max power', c: 'pumpmodmax' }, + { v: 30, u: 3, id: '00burner pump min power', c: 'pumpmodmin' }, + { v: 1, u: 8, id: '00pump delay', c: 'pumpdelay' }, + { v: 10, u: 8, id: '00burner min period', c: 'burnminperiod' }, + { v: 0, u: 3, id: '00burner min power', c: 'burnminpower' }, + { v: 50, u: 3, id: '00burner max power', c: 'burnmaxpower' }, + { v: -6, u: 2, id: '00hysteresis on temperature', c: 'boilhyston' }, + { v: 6, u: 2, id: '00hysteresis off temperature', c: 'boilhystoff' }, + { v: 0, u: 1, id: '00set flow temperature' }, + { v: 0, u: 3, id: '00burner set power' }, + { v: 0, u: 3, id: '00burner current power' }, + { v: 326323, u: 0, id: '00burner starts' }, + { v: 553437, u: 8, id: '00total burner operating time' }, + { v: 451286, u: 8, id: '00total heat operating time' }, + { v: 4672173, u: 8, id: '00total UBA operating time' }, + { v: '1C(210) 06.06.2020 12:07 (0 min)', u: 0, id: '00last error code' }, + { v: '0H', u: 0, id: '00service code' }, + { v: 203, u: 0, id: '00service code number' }, + { v: 'H00', u: 0, id: '00maintenance message' }, + { v: 'manual', u: 0, id: '00maintenance scheduled', c: 'maintenance', l: ['off', 'time', 'date', 'manual'] }, + { v: 6000, u: 7, id: '00time to next maintenance', c: 'maintenancetime' }, + { v: '01.01.2012', u: 0, id: '00next maintenance date', c: 'maintenancedate', o: 'Format: < dd.mm.yyyy >' }, + { v: 'true', u: 0, id: '00dhw turn on/off', c: 'wwtapactivated', l: ['off', 'on'] }, + { v: 62, u: 1, id: '00dhw set temperature' }, + { v: 60, u: 1, id: '00dhw selected temperature', c: 'wwseltemp' }, + { v: 'flow', u: 0, id: '00dhw type' }, + { v: 'hot', u: 0, id: '00dhw comfort', c: 'wwcomfort', l: ['hot', 'eco', 'intelligent'] }, + { v: 40, u: 2, id: '00dhw flow temperature offset', c: 'wwflowtempoffset' }, + { v: 100, u: 3, id: '00dhw max power', c: 'wwmaxpower' }, + { v: 'false', u: 0, id: '00dhw circulation pump available', c: 'wwcircpump', l: ['off', 'on'] }, + { v: '3-way valve', u: 0, id: '00dhw charging type' }, + { v: -5, u: 2, id: '00dhw hysteresis on temperature', c: 'wwhyston' }, + { v: 0, u: 2, id: '00dhw hysteresis off temperature', c: 'wwhystoff' }, + { v: 70, u: 1, id: '00dhw disinfection temperature', c: 'wwdisinfectiontemp' }, { v: 'off', u: 0, - n: '00dhw circulation pump mode', + id: '00dhw circulation pump mode', c: 'wwcircmode', l: ['off', '1x3min', '2x3min', '3x3min', '4x3min', '5x3min', '6x3min', 'continuous'], }, - { v: 'false', u: 0, n: '00dhw circulation active', c: 'wwcirc', l: ['off', 'on'] }, - { v: 47.3, u: 1, n: '00dhw current intern temperature' }, - { v: 0, u: 4, n: '00dhw current tap water flow' }, - { v: 47.3, u: 1, n: '00dhw storage intern temperature' }, - { v: 'true', u: 0, n: '00dhw activated', c: 'wwactivated', l: ['off', 'on'] }, - { v: 'false', u: 0, n: '00dhw one time charging', c: 'wwonetime', l: ['off', 'on'] }, - { v: 'false', u: 0, n: '00dhw disinfecting', c: 'wwdisinfecting', l: ['off', 'on'] }, - { v: 'false', u: 0, n: '00dhw charging' }, - { v: 'false', u: 0, n: '00dhw recharging' }, - { v: 'true', u: 0, n: '00dhw temperature ok' }, - { v: 'false', u: 0, n: '00dhw active' }, - { v: 'true', u: 0, n: '00dhw 3way valve active' }, - { v: 0, u: 3, n: '00dhw set pump power' }, - { v: 288768, u: 0, n: '00dhw starts' }, - { v: 102151, u: 8, n: '00dhw active time' }, + { v: 'false', u: 0, id: '00dhw circulation active', c: 'wwcirc', l: ['off', 'on'] }, + { v: 47.3, u: 1, id: '00dhw current intern temperature' }, + { v: 0, u: 4, id: '00dhw current tap water flow' }, + { v: 47.3, u: 1, id: '00dhw storage intern temperature' }, + { v: 'true', u: 0, id: '00dhw activated', c: 'wwactivated', l: ['off', 'on'] }, + { v: 'false', u: 0, id: '00dhw one time charging', c: 'wwonetime', l: ['off', 'on'] }, + { v: 'false', u: 0, id: '00dhw disinfecting', c: 'wwdisinfecting', l: ['off', 'on'] }, + { v: 'false', u: 0, id: '00dhw charging' }, + { v: 'false', u: 0, id: '00dhw recharging' }, + { v: 'true', u: 0, id: '00dhw temperature ok' }, + { v: 'false', u: 0, id: '00dhw active' }, + { v: 'true', u: 0, id: '00dhw 3way valve active' }, + { v: 0, u: 3, id: '00dhw set pump power' }, + { v: 288768, u: 0, id: '00dhw starts' }, + { v: 102151, u: 8, id: '00dhw active time' }, ], } @@ -572,19 +569,19 @@ const emsesp_devicedata_4 = { { v: 16, u: 1, - n: '00hc2 selected room temperature', + id: '00hc2 selected room temperature', c: 'hc2/seltemp', }, { v: 18.6, u: 1, - n: '00hc2 current room temperature', + id: '00hc2 current room temperature', c: '', }, { v: 'off', u: 0, - n: '00hc2 mode', + id: '00hc2 mode', c: 'hc2/mode', }, ], @@ -870,9 +867,12 @@ rest_server.post(EMSESP_SETTINGS_ENDPOINT, (req, res) => { // res.status(200).json(settings); // no restart needed }) rest_server.get(EMSESP_CORE_DATA_ENDPOINT, (req, res) => { + console.log('send back core data...') res.json(emsesp_coredata) }) rest_server.get(EMSESP_SENSOR_DATA_ENDPOINT, (req, res) => { + console.log('send back sensor data...') + res.json(emsesp_sensordata) }) rest_server.get(EMSESP_DEVICES_ENDPOINT, (req, res) => { @@ -887,6 +887,7 @@ rest_server.get(EMSESP_STATUS_ENDPOINT, (req, res) => { }) rest_server.post(EMSESP_DEVICEDATA_ENDPOINT, (req, res) => { const id = req.body.id + console.log('send back device data for ' + id) if (id === 1) { const encoded = msgpack.encode(emsesp_devicedata_1) res.write(encoded, 'binary') @@ -986,7 +987,7 @@ rest_server.post(EMSESP_WRITE_VALUE_ENDPOINT, (req, res) => { rest_server.post(EMSESP_WRITE_SENSOR_ENDPOINT, (req, res) => { const sensor = req.body console.log('Write sensor: ' + JSON.stringify(sensor)) - objIndex = emsesp_sensordata.sensors.findIndex((obj) => obj.is == sensor.id_str) + objIndex = emsesp_sensordata.sensors.findIndex((obj) => obj.id == sensor.id_str) emsesp_sensordata.sensors[objIndex].n = sensor.name emsesp_sensordata.sensors[objIndex].o = sensor.offset res.sendStatus(200) @@ -995,12 +996,12 @@ rest_server.post(EMSESP_WRITE_SENSOR_ENDPOINT, (req, res) => { rest_server.post(EMSESP_WRITE_ANALOG_ENDPOINT, (req, res) => { const analog = req.body console.log('Write analog: ' + JSON.stringify(analog)) - objIndex = emsesp_sensordata.analogs.findIndex((obj) => obj.i == analog.id) + objIndex = emsesp_sensordata.analogs.findIndex((obj) => obj.id == analog.id) if (objIndex === -1) { console.log('new analog') emsesp_sensordata.analogs.push({ - i: analog.id, + id: analog.id, n: analog.name, f: analog.factor, o: analog.offset, From cd5fef6891727281c9e23dd51f420686b3f07ab6 Mon Sep 17 00:00:00 2001 From: Proddy Date: Thu, 14 Apr 2022 18:25:50 +0200 Subject: [PATCH 02/21] add export button --- interface/src/project/DashboardData.tsx | 208 +++++++++++++++++++----- interface/src/project/types.ts | 13 +- mock-api/server.js | 19 ++- 3 files changed, 186 insertions(+), 54 deletions(-) diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index 3c64dc673..0ba5600c5 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -24,10 +24,11 @@ import { useSnackbar } from 'notistack'; import { Table } from '@table-library/react-table-library/table'; import { useTheme } from '@table-library/react-table-library/theme'; -import { useSort, HeaderCellSort } from '@table-library/react-table-library/sort'; +import { useSort } from '@table-library/react-table-library/sort'; import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table'; import { useRowSelect } from '@table-library/react-table-library/select'; +import DownloadIcon from '@mui/icons-material/GetApp'; import RefreshIcon from '@mui/icons-material/Refresh'; import EditIcon from '@mui/icons-material/Edit'; import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined'; @@ -98,8 +99,8 @@ const DashboardData: FC = () => { } `, HeaderRow: ` + text-transform: uppercase; background-color: black; - font-size: 14px; border-bottom: 1px solid #e0e0e0; `, Row: ` @@ -165,8 +166,9 @@ const DashboardData: FC = () => { height: 32px; `, HeaderRow: ` + text-transform: uppercase; background-color: black; - font-size: 14px; + color: #90CAF9; border-bottom: 1px solid #e0e0e0; `, Row: ` @@ -195,6 +197,7 @@ const DashboardData: FC = () => { } `, BaseCell: ` + padding-left: 8px; border-top: 1px solid transparent; border-right: 1px solid transparent; border-bottom: 1px solid transparent; @@ -202,9 +205,22 @@ const DashboardData: FC = () => { text-align: right; min-width: 64px; } + `, + HeaderCell: ` + padding-left: 0px; ` }); + const getSortIcon = (state: any, sortKey: any) => { + if (state.sortKey === sortKey && state.reverse) { + return ; + } + + if (state.sortKey === sortKey && !state.reverse) { + return ; + } + }; + const analog_sort = useSort( { nodes: sensorData.analogs }, { @@ -222,7 +238,8 @@ const DashboardData: FC = () => { sortFns: { GPIO: (array) => array.sort((a, b) => a.i - b.i), NAME: (array) => array.sort((a, b) => a.n.localeCompare(b.n)), - TYPE: (array) => array.sort((a, b) => a.t - b.t) + TYPE: (array) => array.sort((a, b) => a.t - b.t), + VALUE: (array) => array.sort((a, b) => a.v.toString().localeCompare(b.v.toString())) } } ); @@ -250,16 +267,21 @@ const DashboardData: FC = () => { const dv_sort = useSort( { nodes: deviceData.data }, - {}, + { + state: { + sortKey: 'NAME', + reverse: false + } + }, { sortIcon: { - margin: '0px', iconDefault: null, iconUp: , iconDown: }, sortFns: { - NAME: (array) => array.sort((a, b) => a.id.slice(2).localeCompare(b.id.slice(2))) + NAME: (array) => array.sort((a, b) => a.id.slice(2).localeCompare(b.id.slice(2))), + VALUE: (array) => array.sort((a, b) => a.v.toString().localeCompare(b.v.toString())) } } ); @@ -279,6 +301,52 @@ const DashboardData: FC = () => { } } + const escapeCsvCell = (cell: any) => { + if (cell == null) { + return ''; + } + const sc = cell.toString().trim(); + if (sc === '' || sc === '""') { + return sc; + } + if (sc.includes('"') || sc.includes(',') || sc.includes('\n') || sc.includes('\r')) { + return '"' + sc.replace(/"/g, '""') + '"'; + } + return sc; + }; + + const makeCsvData = (columns: any, data: any) => { + return data.reduce((csvString: any, rowItem: any) => { + return csvString + columns.map(({ accessor }: any) => escapeCsvCell(accessor(rowItem))).join(',') + '\r\n'; + }, columns.map(({ name }: any) => escapeCsvCell(name)).join(',') + '\r\n'); + }; + + const downloadAsCsv = (columns: any, data: any, filename: string) => { + const csvData = makeCsvData(columns, data); + const csvFile = new Blob([csvData], { type: 'text/csv' }); + const downloadLink = document.createElement('a'); + + downloadLink.download = filename; + downloadLink.href = window.URL.createObjectURL(csvFile); + document.body.appendChild(downloadLink); + downloadLink.click(); + document.body.removeChild(downloadLink); + }; + + const hasMask = (id: string, mask: number) => (parseInt(id.slice(0, 2), 16) & mask) === mask; + + const handleDownloadCsv = () => { + const columns = [ + { accessor: (dv: any) => dv.id.slice(2), name: 'Entity' }, + { accessor: (dv: any) => formatValue(dv.v, dv.u), name: 'Value' } + ]; + downloadAsCsv( + columns, + onlyFav ? deviceData.data.filter((dv) => hasMask(dv.id, DeviceEntityMask.DV_FAVORITE)) : deviceData.data, + 'device_entities' + ); + }; + const refreshData = () => { const selectedDevice = device_select.state.id; if (selectedDevice === 'sensor') { @@ -451,7 +519,7 @@ const DashboardData: FC = () => { }; const addAnalogSensor = () => { - setAnalog({ id: '0', n: '', u: 0, v: 0, o: 0, t: 0, f: 1 }); + setAnalog({ id: '0', i: 0, n: '', u: 0, v: 0, o: 0, t: 0, f: 1 }); }; const sendSensor = async () => { @@ -585,8 +653,6 @@ const DashboardData: FC = () => { return ; } - console.log('** Rendering main data'); - return ( {coreData.devices.length === 0 && } @@ -647,8 +713,6 @@ const DashboardData: FC = () => { return; } - const hasMask = (id: string, mask: number) => (parseInt(id.slice(0, 2), 16) & mask) === mask; - const sendCommand = (dv: DeviceValue) => { if (dv.c && me.admin && !hasMask(dv.id, DeviceEntityMask.DV_READONLY)) { setDeviceValue(dv); @@ -672,8 +736,8 @@ const DashboardData: FC = () => { setOnlyFav(!onlyFav)} />} - label="show favorites only" + control={ setOnlyFav(!onlyFav)} />} + label={favorites only} /> { <>
- - ENTITY NAME - - VALUE + + + + + +
@@ -745,10 +825,26 @@ const DashboardData: FC = () => { <>
- - NAME - - TEMPERATURE + + + + + +
@@ -784,16 +880,46 @@ const DashboardData: FC = () => { <>
- - GPIO - - - NAME - - - TYPE - - VALUE + + + + + + + + + + + +
@@ -803,7 +929,7 @@ const DashboardData: FC = () => { {a.id}{a.n}{AnalogTypeNames[a.t]} - {formatValue(a.v, a.u)} + {a.t ? formatValue(a.v, a.u) : ''} {me.admin && ( updateAnalog(a)}> @@ -824,7 +950,7 @@ const DashboardData: FC = () => { if (analog) { try { const response = await EMSESP.writeAnalog({ - id: analog.id, + i: analog.i, name: analog.n, offset: analog.o, factor: analog.f, @@ -852,7 +978,7 @@ const DashboardData: FC = () => { if (analog) { try { const response = await EMSESP.writeAnalog({ - id: analog.id, + i: analog.i, name: analog.n, offset: analog.o, factor: analog.f, @@ -885,11 +1011,10 @@ const DashboardData: FC = () => { { + {device_select.state.id && device_select.state.id !== 'sensor' && ( + + )} ); diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts index d3d096aea..db3433a10 100644 --- a/interface/src/project/types.ts +++ b/interface/src/project/types.ts @@ -88,9 +88,10 @@ export interface Sensor { } export interface Analog { - id: string; // id string, is GPIO + id: string; // id string + i: number; // GPIO n: string; - v?: number; + v: number; // is optional u: number; o: number; f: number; @@ -127,10 +128,10 @@ export interface Devices { export interface DeviceValue { id: string; // index, contains mask+name - v?: any; // value, in any format + v: any; // value, in any format u: number; // uom - c?: string; // command - l?: string[]; // list + c?: string; // command, optional + l?: string[]; // list, optional h?: string; // help text, optional s?: string; // steps for up/down, optional m?: string; // min, optional @@ -277,7 +278,7 @@ export interface WriteValue { } export interface WriteAnalog { - id: string; + i: number; name: string; factor: number; offset: number; diff --git a/mock-api/server.js b/mock-api/server.js index 0645388ad..66fbacdf5 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -410,10 +410,10 @@ const emsesp_sensordata = { ], // sensors: [], analogs: [ - { id: '36', n: 'motor', u: 0, o: 17, f: 0, t: 0 }, - { id: '37', n: 'External switch', v: 13, u: 0, o: 17, f: 0, t: 1 }, - { id: '39', n: 'Pulse count', v: 144, u: 0, o: 0, f: 0, t: 2 }, - { id: '40', n: 'Pressure', v: 16, u: 17, o: 0, f: 0, t: 3 }, + { id: '36', i: 36, n: 'motor', v: 0, u: 0, o: 17, f: 0, t: 0 }, + { id: '37', i: 37, n: 'External switch', v: 13, u: 0, o: 17, f: 0, t: 1 }, + { id: '39', i: 39, n: 'Pulse count', v: 144, u: 0, o: 0, f: 0, t: 2 }, + { id: '40', i: 40, n: 'Pressure', v: 16, u: 17, o: 0, f: 0, t: 3 }, ], // analogs: [], } @@ -485,7 +485,7 @@ const emsesp_devicedata_1 = { const emsesp_devicedata_2 = { label: 'Boiler: Nefit GBx72/Trendline/Cerapur/Greenstar Si/27i', data: [ - { u: 0, id: '08reset', c: 'reset', l: ['-', 'maintenance', 'error'] }, + { v: 0, u: 0, id: '08reset', c: 'reset', l: ['-', 'maintenance', 'error'] }, { v: 'false', u: 0, id: '08heating active' }, { v: 'false', u: 0, id: '04tapwater active' }, { v: 5, u: 1, id: '04selected flow temperature', c: 'selflowtemp' }, @@ -872,7 +872,6 @@ rest_server.get(EMSESP_CORE_DATA_ENDPOINT, (req, res) => { }) rest_server.get(EMSESP_SENSOR_DATA_ENDPOINT, (req, res) => { console.log('send back sensor data...') - res.json(emsesp_sensordata) }) rest_server.get(EMSESP_DEVICES_ENDPOINT, (req, res) => { @@ -996,12 +995,13 @@ rest_server.post(EMSESP_WRITE_SENSOR_ENDPOINT, (req, res) => { rest_server.post(EMSESP_WRITE_ANALOG_ENDPOINT, (req, res) => { const analog = req.body console.log('Write analog: ' + JSON.stringify(analog)) - objIndex = emsesp_sensordata.analogs.findIndex((obj) => obj.id == analog.id) + objIndex = emsesp_sensordata.analogs.findIndex((obj) => obj.i == analog.i) if (objIndex === -1) { console.log('new analog') emsesp_sensordata.analogs.push({ - id: analog.id, + id: analog.i.toString(), + i: analog.i, n: analog.name, f: analog.factor, o: analog.offset, @@ -1010,9 +1010,10 @@ rest_server.post(EMSESP_WRITE_ANALOG_ENDPOINT, (req, res) => { }) } else { if (analog.type === -1) { - console.log('removing analog ' + analog.id) + console.log('removing analog ' + analog.i) emsesp_sensordata.analogs[objIndex].t = -1 } else { + console.log('updating analog ' + analog.i) emsesp_sensordata.analogs[objIndex].n = analog.name emsesp_sensordata.analogs[objIndex].o = analog.offset emsesp_sensordata.analogs[objIndex].f = analog.factor From 4b3b9524ef0911cd58c06244d9f012de518a60b0 Mon Sep 17 00:00:00 2001 From: Proddy Date: Fri, 15 Apr 2022 13:04:52 +0200 Subject: [PATCH 03/21] changes to backend, some refactoring --- interface/src/project/DashboardData.tsx | 146 +++++++-------- interface/src/project/types.ts | 6 +- mock-api/server.js | 12 +- src/analogsensor.cpp | 112 ++++++------ src/analogsensor.h | 12 +- src/dallassensor.cpp | 76 ++++---- src/dallassensor.h | 14 +- src/emsdevice.cpp | 224 ++++++++++++------------ src/emsesp.cpp | 4 +- src/system.cpp | 4 +- src/web/WebCustomizationService.cpp | 8 +- src/web/WebCustomizationService.h | 6 +- src/web/WebDataService.cpp | 45 +++-- 13 files changed, 340 insertions(+), 329 deletions(-) diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index 0ba5600c5..32edb00ad 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -51,7 +51,7 @@ import { formatDurationMin, pluralize } from '../utils'; import { AuthenticatedContext } from '../contexts/authentication'; -import { ButtonRow, FormLoader, ValidatedTextField, SectionContent, MessageBox } from '../components'; +import { ButtonRow, ValidatedTextField, SectionContent, MessageBox } from '../components'; import * as EMSESP from './api'; @@ -77,7 +77,6 @@ const DashboardData: FC = () => { const { enqueueSnackbar } = useSnackbar(); - const [errorMessage, setErrorMessage] = useState(); const [coreData, setCoreData] = useState({ devices: [], active_sensors: 0, analog_enabled: false }); const [deviceData, setDeviceData] = useState({ label: '', data: [] }); const [sensorData, setSensorData] = useState({ sensors: [], analogs: [] }); @@ -286,6 +285,11 @@ const DashboardData: FC = () => { } ); + const paul = () => { + console.log('paul'); + sensor_sort.fns.onToggleSort({ sortKey: 'NAME' }); + }; + const device_select = useRowSelect( { nodes: coreData.devices }, { @@ -338,7 +342,8 @@ const DashboardData: FC = () => { const handleDownloadCsv = () => { const columns = [ { accessor: (dv: any) => dv.id.slice(2), name: 'Entity' }, - { accessor: (dv: any) => formatValue(dv.v, dv.u), name: 'Value' } + { accessor: (dv: any) => dv.v, name: 'Value' }, + { accessor: (dv: any) => (dv.u >= 1 && dv.u <= 2 ? 'C' : DeviceValueUOM_s[dv.u]), name: 'UoM' } ]; downloadAsCsv( columns, @@ -366,9 +371,9 @@ const DashboardData: FC = () => { try { setCoreData((await EMSESP.readCoreData()).data); } catch (error: any) { - setErrorMessage(extractErrorMessage(error, 'Failed to fetch core data')); + enqueueSnackbar(extractErrorMessage(error, 'Failed to fetch core data'), { variant: 'error' }); } - }, []); + }, [enqueueSnackbar]); useEffect(() => { fetchCoreData(); @@ -387,7 +392,7 @@ const DashboardData: FC = () => { try { setDeviceData((await EMSESP.readDeviceData({ id: unique_id })).data); } catch (error: any) { - setErrorMessage(extractErrorMessage(error, 'Problem fetching device data')); + enqueueSnackbar(extractErrorMessage(error, 'Problem fetching device data'), { variant: 'error' }); } }; @@ -395,7 +400,7 @@ const DashboardData: FC = () => { try { setSensorData((await EMSESP.readSensorData()).data); } catch (error: any) { - setErrorMessage(extractErrorMessage(error, 'Problem fetching sensor data')); + enqueueSnackbar(extractErrorMessage(error, 'Problem fetching sensor data'), { variant: 'error' }); } }; @@ -448,7 +453,7 @@ const DashboardData: FC = () => { } setDeviceValue(undefined); } catch (error: any) { - setErrorMessage(extractErrorMessage(error, 'Problem writing value')); + enqueueSnackbar(extractErrorMessage(error, 'Problem writing value'), { variant: 'error' }); } finally { refreshData(); setDeviceValue(undefined); @@ -519,7 +524,7 @@ const DashboardData: FC = () => { }; const addAnalogSensor = () => { - setAnalog({ id: '0', i: 0, n: '', u: 0, v: 0, o: 0, t: 0, f: 1 }); + setAnalog({ id: '0', g: 0, n: '', u: 0, v: 0, o: 0, t: 0, f: 1 }); }; const sendSensor = async () => { @@ -539,7 +544,7 @@ const DashboardData: FC = () => { } setSensor(undefined); } catch (error: any) { - setErrorMessage(extractErrorMessage(error, 'Problem updating sensor')); + enqueueSnackbar(extractErrorMessage(error, 'Problem updating sensor'), { variant: 'error' }); } finally { setSensor(undefined); fetchSensorData(); @@ -648,65 +653,59 @@ const DashboardData: FC = () => { } }; - const renderCoreData = () => { - if (!coreData) { - return ; - } + const renderCoreData = () => ( + + {coreData.devices.length === 0 && } - return ( - - {coreData.devices.length === 0 && } - -
- {(tableList: any) => ( - <> -
- - - TYPE - DESCRIPTION - ENTITIES - - -
- - {tableList.map((device: Device, index: number) => ( - - - - - {device.t} - {device.n} - {device.e} - - setDeviceDialog(index)}> - - - - - ))} - {(coreData.active_sensors > 0 || coreData.analog_enabled) && ( - - - - - Sensors - Attached EMS-ESP Sensors - {coreData.active_sensors} - - addAnalogSensor()}> - - - - - )} - - - )} -
- - ); - }; + + {(tableList: any) => ( + <> +
+ + + TYPE + DESCRIPTION + ENTITIES + + +
+ + {tableList.map((device: Device, index: number) => ( + + + + + {device.t} + {device.n} + {device.e} + + setDeviceDialog(index)}> + + + + + ))} + {(coreData.active_sensors > 0 || coreData.analog_enabled) && ( + + + + + Sensors + Attached EMS-ESP Sensors + {coreData.active_sensors} + + addAnalogSensor()}> + + + + + )} + + + )} +
+ + ); const renderDeviceData = () => { if (!device_select.state.id || device_select.state.id === 'sensor') { @@ -830,7 +829,8 @@ const DashboardData: FC = () => { fullWidth style={{ fontSize: '14px', justifyContent: 'flex-start' }} endIcon={getSortIcon(sensor_sort.state, 'NAME')} - onClick={() => sensor_sort.fns.onToggleSort({ sortKey: 'NAME' })} + // onClick={() => sensor_sort.fns.onToggleSort({ sortKey: 'NAME' })} + onClick={() => paul()} > NAME @@ -950,7 +950,7 @@ const DashboardData: FC = () => { if (analog) { try { const response = await EMSESP.writeAnalog({ - i: analog.i, + gpio: analog.g, name: analog.n, offset: analog.o, factor: analog.f, @@ -978,7 +978,7 @@ const DashboardData: FC = () => { if (analog) { try { const response = await EMSESP.writeAnalog({ - i: analog.i, + gpio: analog.g, name: analog.n, offset: analog.o, factor: analog.f, @@ -1011,9 +1011,9 @@ const DashboardData: FC = () => { = AnalogType::DIGITAL_OUT) && (sensor_.type() != sensor.type || sensor_.offset() != sensor.offset || sensor_.factor() != sensor.factor)) { @@ -94,12 +94,12 @@ void AnalogSensor::reload() { for (const auto & sensor : settings.analogCustomizations) { bool found = false; for (const auto & sensor_ : sensors_) { - if (sensor_.id() == sensor.id) { + if (sensor_.gpio() == sensor.gpio) { found = true; } } if (!found) { - sensors_.emplace_back(sensor.id, sensor.name, sensor.offset, sensor.factor, sensor.uom, sensor.type); + sensors_.emplace_back(sensor.gpio, sensor.name, sensor.offset, sensor.factor, sensor.uom, sensor.type); sensors_.back().ha_registered = false; // this will trigger recrate of the HA config if (sensor.type == AnalogType::COUNTER || sensor.type >= AnalogType::DIGITAL_OUT) { sensors_.back().set_value(sensor.offset); @@ -112,64 +112,64 @@ void AnalogSensor::reload() { }); // sort the list based on GPIO (id) - std::sort(sensors_.begin(), sensors_.end(), [](const Sensor & a, const Sensor & b) { return a.id() < b.id(); }); + // std::sort(sensors_.begin(), sensors_.end(), [](const Sensor & a, const Sensor & b) { return a.id() < b.id(); }); // activate each sensor for (auto & sensor : sensors_) { sensor.ha_registered = false; // force HA configs to be re-created if (sensor.type() == AnalogType::ADC) { - LOG_DEBUG(F("Adding analog ADC sensor on GPIO%d"), sensor.id()); + LOG_DEBUG(F("Adding analog ADC sensor on GPIO%d"), sensor.gpio()); // analogSetPinAttenuation does not work with analogReadMilliVolts sensor.analog_ = 0; // initialize sensor.last_reading_ = 0; } else if (sensor.type() == AnalogType::COUNTER) { - LOG_DEBUG(F("Adding analog I/O Counter sensor on GPIO%d"), sensor.id()); - pinMode(sensor.id(), INPUT_PULLUP); - if (sensor.id() == 25 || sensor.id() == 26) { - dacWrite(sensor.id(), 255); + LOG_DEBUG(F("Adding analog I/O Counter sensor on GPIO%d"), sensor.gpio()); + pinMode(sensor.gpio(), INPUT_PULLUP); + if (sensor.gpio() == 25 || sensor.gpio() == 26) { + dacWrite(sensor.gpio(), 255); } sensor.polltime_ = 0; - sensor.poll_ = digitalRead(sensor.id()); + sensor.poll_ = digitalRead(sensor.gpio()); publish_sensor(sensor); } else if (sensor.type() == AnalogType::TIMER || sensor.type() == AnalogType::RATE) { - LOG_DEBUG(F("Adding analog Timer/Rate sensor on GPIO%d"), sensor.id()); - pinMode(sensor.id(), INPUT_PULLUP); + LOG_DEBUG(F("Adding analog Timer/Rate sensor on GPIO%d"), sensor.gpio()); + pinMode(sensor.gpio(), INPUT_PULLUP); sensor.polltime_ = uuid::get_uptime(); sensor.last_polltime_ = uuid::get_uptime(); - sensor.poll_ = digitalRead(sensor.id()); + sensor.poll_ = digitalRead(sensor.gpio()); sensor.set_offset(0); sensor.set_value(0); publish_sensor(sensor); } else if (sensor.type() == AnalogType::DIGITAL_IN) { - LOG_DEBUG(F("Adding analog Read sensor on GPIO%d"), sensor.id()); - pinMode(sensor.id(), INPUT_PULLUP); - sensor.set_value(digitalRead(sensor.id())); // initial value - sensor.set_uom(0); // no uom, just for safe measures + LOG_DEBUG(F("Adding analog Read sensor on GPIO%d"), sensor.gpio()); + pinMode(sensor.gpio(), INPUT_PULLUP); + sensor.set_value(digitalRead(sensor.gpio())); // initial value + sensor.set_uom(0); // no uom, just for safe measures sensor.polltime_ = 0; - sensor.poll_ = digitalRead(sensor.id()); + sensor.poll_ = digitalRead(sensor.gpio()); publish_sensor(sensor); } else if (sensor.type() == AnalogType::DIGITAL_OUT) { - LOG_DEBUG(F("Adding analog Write sensor on GPIO%d"), sensor.id()); - pinMode(sensor.id(), OUTPUT); - if (sensor.id() == 25 || sensor.id() == 26) { + LOG_DEBUG(F("Adding analog Write sensor on GPIO%d"), sensor.gpio()); + pinMode(sensor.gpio(), OUTPUT); + if (sensor.gpio() == 25 || sensor.gpio() == 26) { if (sensor.offset() > 255) { sensor.set_offset(255); } else if (sensor.offset() < 0) { sensor.set_offset(0); } - dacWrite(sensor.id(), sensor.offset()); + dacWrite(sensor.gpio(), sensor.offset()); sensor.set_value(sensor.offset()); } else { - digitalWrite(sensor.id(), sensor.offset() > 0 ? 1 : 0); - sensor.set_value(digitalRead(sensor.id())); + digitalWrite(sensor.gpio(), sensor.offset() > 0 ? 1 : 0); + sensor.set_value(digitalRead(sensor.gpio())); } sensor.set_uom(0); // no uom, just for safe measures publish_sensor(sensor); } else if (sensor.type() >= AnalogType::PWM_0) { - LOG_DEBUG(F("Adding PWM output sensor on GPIO%d"), sensor.id()); + LOG_DEBUG(F("Adding PWM output sensor on GPIO%d"), sensor.gpio()); uint channel = sensor.type() - AnalogType::PWM_0; ledcSetup(channel, sensor.factor(), 13); - ledcAttachPin(sensor.id(), channel); + ledcAttachPin(sensor.gpio(), channel); if (sensor.offset() > 100) { sensor.set_offset(100); } else if (sensor.offset() < 0) { @@ -193,8 +193,8 @@ void AnalogSensor::measure() { // go through the list of adc sensors for (auto & sensor : sensors_) { if (sensor.type() == AnalogType::ADC) { - uint16_t a = analogReadMilliVolts(sensor.id()); // e.g. ADC1_CHANNEL_0_GPIO_NUM - if (!sensor.analog_) { // init first time + uint16_t a = analogReadMilliVolts(sensor.gpio()); // e.g. ADC1_CHANNEL_0_GPIO_NUM + if (!sensor.analog_) { // init first time sensor.analog_ = a; sensor.sum_ = a * 512; } else { // simple moving average filter @@ -218,7 +218,7 @@ void AnalogSensor::measure() { if (sensor.type() == AnalogType::DIGITAL_IN || sensor.type() == AnalogType::COUNTER || sensor.type() == AnalogType::TIMER || sensor.type() == AnalogType::RATE) { auto old_value = sensor.value(); // remember current value before reading - auto current_reading = digitalRead(sensor.id()); + auto current_reading = digitalRead(sensor.gpio()); if (sensor.poll_ != current_reading) { // check for pinchange sensor.polltime_ = uuid::get_uptime(); // remember time of pinchange sensor.poll_ = current_reading; @@ -258,17 +258,17 @@ void AnalogSensor::loop() { } // update analog information name and offset -bool AnalogSensor::update(uint8_t id, const std::string & name, float offset, float factor, uint8_t uom, int8_t type) { +bool AnalogSensor::update(uint8_t gpio, const std::string & name, float offset, float factor, uint8_t uom, int8_t type) { boolean found_sensor = false; // see if we can find the sensor in our customization list EMSESP::webCustomizationService.update( [&](WebCustomization & settings) { for (auto & AnalogCustomization : settings.analogCustomizations) { - if (AnalogCustomization.id == id) { + if (AnalogCustomization.gpio == gpio) { found_sensor = true; // found the record // see if it's marked for deletion if (type == AnalogType::MARK_DELETED) { - LOG_DEBUG(F("Removing analog sensor ID %d"), id); + LOG_DEBUG(F("Removing analog sensor GPIO %d"), gpio); settings.analogCustomizations.remove(AnalogCustomization); } else { // update existing record @@ -277,7 +277,7 @@ bool AnalogSensor::update(uint8_t id, const std::string & name, float offset, fl AnalogCustomization.factor = factor; AnalogCustomization.uom = uom; AnalogCustomization.type = type; - LOG_DEBUG(F("Customizing existing analog sensor ID %d"), id); + LOG_DEBUG(F("Customizing existing analog GPIO %d"), gpio); } return StateUpdateResult::CHANGED; // persist the change } @@ -288,7 +288,7 @@ bool AnalogSensor::update(uint8_t id, const std::string & name, float offset, fl // if the sensor exists and we're using HA, delete the old HA record if (found_sensor && Mqtt::ha_enabled()) { - remove_ha_topic(id); // id is the GPIO + remove_ha_topic(gpio); // the GPIO } // we didn't find it, it's new, so create and store it @@ -296,14 +296,14 @@ bool AnalogSensor::update(uint8_t id, const std::string & name, float offset, fl EMSESP::webCustomizationService.update( [&](WebCustomization & settings) { auto newSensor = AnalogCustomization(); - newSensor.id = id; + newSensor.gpio = gpio; newSensor.name = name; newSensor.offset = offset; newSensor.factor = factor; newSensor.uom = uom; newSensor.type = type; settings.analogCustomizations.push_back(newSensor); - LOG_DEBUG(F("Adding new customization for analog sensor ID %d"), id); + LOG_DEBUG(F("Adding new customization for analog sensor GPIO %d"), gpio); return StateUpdateResult::CHANGED; // persist the change }, "local"); @@ -339,15 +339,15 @@ void AnalogSensor::publish_sensor(const Sensor & sensor) const { } // send empty config topic to remove the entry from HA -void AnalogSensor::remove_ha_topic(const uint8_t id) const { +void AnalogSensor::remove_ha_topic(const uint8_t gpio) const { if (!Mqtt::ha_enabled()) { return; } #ifdef EMSESP_DEBUG - LOG_DEBUG(F("Removing HA config for analog sensor ID %d"), id); + LOG_DEBUG(F("Removing HA config for analog sensor GPIO %d"), gpio); #endif char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf(topic, sizeof(topic), "sensor/%s/analogsensor_%d/config", Mqtt::base().c_str(), id); + snprintf(topic, sizeof(topic), "sensor/%s/analogsensor_%d/config", Mqtt::base().c_str(), gpio); Mqtt::publish_ha(topic); } @@ -372,7 +372,7 @@ void AnalogSensor::publish_values(const bool force) { if (Mqtt::is_nested() || Mqtt::ha_enabled()) { // nested char s[10]; - JsonObject dataSensor = doc.createNestedObject(Helpers::smallitoa(s, sensor.id())); + JsonObject dataSensor = doc.createNestedObject(Helpers::smallitoa(s, sensor.gpio())); dataSensor["name"] = sensor.name(); switch (sensor.type()) { case AnalogType::COUNTER: @@ -391,7 +391,7 @@ void AnalogSensor::publish_values(const bool force) { // create HA config if (Mqtt::ha_enabled() && (!sensor.ha_registered || force)) { - LOG_DEBUG(F("Recreating HA config for analog sensor ID %d"), sensor.id()); + LOG_DEBUG(F("Recreating HA config for analog sensor GPIO %d"), sensor.gpio()); StaticJsonDocument config; @@ -400,13 +400,13 @@ void AnalogSensor::publish_values(const bool force) { config["stat_t"] = stat_t; char str[50]; - snprintf(str, sizeof(str), "{{value_json['%d'].value}}", sensor.id()); + snprintf(str, sizeof(str), "{{value_json['%d'].value}}", sensor.gpio()); config["val_tpl"] = str; snprintf(str, sizeof(str), "Analog Sensor %s", sensor.name().c_str()); config["name"] = str; - snprintf(str, sizeof(str), "analogsensor_%d", sensor.id()); + snprintf(str, sizeof(str), "analogsensor_%d", sensor.gpio()); config["uniq_id"] = str; JsonObject dev = config.createNestedObject("dev"); @@ -414,7 +414,7 @@ void AnalogSensor::publish_values(const bool force) { ids.add("ems-esp"); char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; - snprintf(topic, sizeof(topic), "sensor/%s/analogsensor_%d/config", Mqtt::base().c_str(), sensor.id()); + snprintf(topic, sizeof(topic), "sensor/%s/analogsensor_%d/config", Mqtt::base().c_str(), sensor.gpio()); Mqtt::publish_ha(topic, config.as()); @@ -437,7 +437,7 @@ void AnalogSensor::publish_values(const bool force) { bool AnalogSensor::get_value_info(JsonObject & output, const char * cmd, const int8_t id) const { for (const auto & sensor : sensors_) { if (strcmp(cmd, sensor.name().c_str()) == 0) { - output["id"] = sensor.id(); + output["gpio"] = sensor.gpio(); output["name"] = sensor.name(); output["type"] = sensor.type(); output["uom"] = sensor.uom(); @@ -460,7 +460,7 @@ bool AnalogSensor::command_info(const char * value, const int8_t id, JsonObject for (const auto & sensor : sensors_) { if (id == -1) { // show number and id JsonObject dataSensor = output.createNestedObject(sensor.name()); - dataSensor["id"] = sensor.id(); + dataSensor["gpio"] = sensor.gpio(); dataSensor["type"] = FL_(enum_sensortype)[sensor.type()]; if (sensor.type() == AnalogType::ADC) { dataSensor["uom"] = EMSdevice::uom_to_string(sensor.uom()); @@ -486,8 +486,8 @@ bool AnalogSensor::command_info(const char * value, const int8_t id, JsonObject } // this creates the sensor, initializing everything -AnalogSensor::Sensor::Sensor(const uint8_t id, const std::string & name, const float offset, const float factor, const uint8_t uom, const int8_t type) - : id_(id) +AnalogSensor::Sensor::Sensor(const uint8_t gpio, const std::string & name, const float offset, const float factor, const uint8_t uom, const int8_t type) + : gpio_(gpio) , name_(name) , offset_(offset) , factor_(factor) @@ -500,20 +500,20 @@ AnalogSensor::Sensor::Sensor(const uint8_t id, const std::string & name, const f std::string AnalogSensor::Sensor::name() const { if (name_.empty()) { char name[50]; - snprintf(name, sizeof(name), "Analog Sensor GPIO%d", id_); + snprintf(name, sizeof(name), "Analog Sensor GPIO%d", gpio_); return name; } return name_; } // set the counter value, id is gpio-no -bool AnalogSensor::command_setvalue(const char * value, const int8_t id) { +bool AnalogSensor::command_setvalue(const char * value, const int8_t gpio) { float val; if (!Helpers::value2float(value, val)) { return false; } for (auto & sensor : sensors_) { - if (sensor.id() == id) { + if (sensor.gpio() == gpio) { if (sensor.type() == AnalogType::COUNTER) { if (val < 0 || value[0] == '+') { // sign corrects values sensor.set_offset(sensor.value() + val); @@ -529,18 +529,18 @@ bool AnalogSensor::command_setvalue(const char * value, const int8_t id) { return true; } else if (sensor.type() == AnalogType::DIGITAL_OUT) { uint8_t v = val; - if (sensor.id() == 25 || sensor.id() == 26) { + if (sensor.gpio() == 25 || sensor.gpio() == 26) { sensor.set_offset(v); sensor.set_value(v); - pinMode(sensor.id(), OUTPUT); - dacWrite(sensor.id(), sensor.offset()); + pinMode(sensor.gpio(), OUTPUT); + dacWrite(sensor.gpio(), sensor.offset()); publish_sensor(sensor); return true; } else if (v == 0 || v == 1) { sensor.set_offset(v); sensor.set_value(v); - pinMode(sensor.id(), OUTPUT); - digitalWrite(sensor.id(), sensor.offset() > 0 ? 1 : 0); + pinMode(sensor.gpio(), OUTPUT); + digitalWrite(sensor.gpio(), sensor.offset() > 0 ? 1 : 0); publish_sensor(sensor); return true; } diff --git a/src/analogsensor.h b/src/analogsensor.h index fc7f72ea6..3c10c11c8 100644 --- a/src/analogsensor.h +++ b/src/analogsensor.h @@ -36,7 +36,7 @@ class AnalogSensor { public: class Sensor { public: - Sensor(const uint8_t id, const std::string & name, const float offset, const float factor, const uint8_t uom, const int8_t type); + Sensor(const uint8_t gpio, const std::string & name, const float offset, const float factor, const uint8_t uom, const int8_t type); ~Sensor() = default; void set_offset(const float offset) { @@ -48,8 +48,8 @@ class AnalogSensor { name_ = name; } - uint8_t id() const { - return id_; + uint8_t gpio() const { + return gpio_; } float value() const { @@ -99,7 +99,7 @@ class AnalogSensor { uint32_t last_polltime_ = 0; // for timer private: - uint8_t id_; + uint8_t gpio_; std::string name_; float offset_; float factor_; @@ -157,7 +157,7 @@ class AnalogSensor { return sensors_.size(); } - bool update(uint8_t id, const std::string & name, float offset, float factor, uint8_t uom, int8_t type); + bool update(uint8_t gpio, const std::string & name, float offset, float factor, uint8_t uom, int8_t type); bool get_value_info(JsonObject & output, const char * cmd, const int8_t id) const; #ifdef EMSESP_DEBUG @@ -171,7 +171,7 @@ class AnalogSensor { static uuid::log::Logger logger_; void remove_ha_topic(const uint8_t id) const; - bool command_setvalue(const char * value, const int8_t id); + bool command_setvalue(const char * value, const int8_t gpio); void measure(); bool command_info(const char * value, const int8_t id, JsonObject & output) const; bool command_commands(const char * value, const int8_t id, JsonObject & output); diff --git a/src/dallassensor.cpp b/src/dallassensor.cpp index 3d4be1a15..bb4d3f624 100644 --- a/src/dallassensor.cpp +++ b/src/dallassensor.cpp @@ -149,7 +149,7 @@ void DallasSensor::loop() { // check if we already have this sensor bool found = false; for (auto & sensor : sensors_) { - if (sensor.id() == get_id(addr)) { + if (sensor.internal_id() == get_id(addr)) { t += sensor.offset(); if (t != sensor.temperature_c) { publish_sensor(sensor); @@ -171,7 +171,7 @@ void DallasSensor::loop() { sensors_.back().apply_customization(); publish_sensor(sensors_.back()); // call publish single // sort the sensors based on name - std::sort(sensors_.begin(), sensors_.end(), [](const Sensor & a, const Sensor & b) { return a.name() < b.name(); }); + // std::sort(sensors_.begin(), sensors_.end(), [](const Sensor & a, const Sensor & b) { return a.name() < b.name(); }); } } else { sensorfails_++; @@ -180,12 +180,12 @@ void DallasSensor::loop() { default: sensorfails_++; - LOG_ERROR(F("Unknown dallas sensor %s"), Sensor(addr).id_str().c_str()); + LOG_ERROR(F("Unknown dallas sensor %s"), Sensor(addr).id().c_str()); break; } } else { sensorfails_++; - LOG_ERROR(F("Invalid dallas sensor %s"), Sensor(addr).id_str().c_str()); + LOG_ERROR(F("Invalid dallas sensor %s"), Sensor(addr).id().c_str()); } } else { if (!parasite_) { @@ -229,7 +229,7 @@ bool DallasSensor::temperature_convert_complete() { int16_t DallasSensor::get_temperature_c(const uint8_t addr[]) { #ifndef EMSESP_STANDALONE if (!bus_.reset()) { - LOG_ERROR(F("Bus reset failed before reading scratchpad from %s"), Sensor(addr).id_str().c_str()); + LOG_ERROR(F("Bus reset failed before reading scratchpad from %s"), Sensor(addr).id().c_str()); return EMS_VALUE_SHORT_NOTSET; } YIELD; @@ -241,7 +241,7 @@ int16_t DallasSensor::get_temperature_c(const uint8_t addr[]) { YIELD; if (!bus_.reset()) { - LOG_ERROR(F("Bus reset failed after reading scratchpad from %s"), Sensor(addr).id_str().c_str()); + LOG_ERROR(F("Bus reset failed after reading scratchpad from %s"), Sensor(addr).id().c_str()); return EMS_VALUE_SHORT_NOTSET; } YIELD; @@ -257,7 +257,7 @@ int16_t DallasSensor::get_temperature_c(const uint8_t addr[]) { scratchpad[6], scratchpad[7], scratchpad[8], - Sensor(addr).id_str().c_str()); + Sensor(addr).id().c_str()); return EMS_VALUE_SHORT_NOTSET; } @@ -290,15 +290,15 @@ int16_t DallasSensor::get_temperature_c(const uint8_t addr[]) { } // update dallas information name and offset -bool DallasSensor::update(const std::string & id_str, const std::string & name, int16_t offset) { +bool DallasSensor::update(const std::string & id, const std::string & name, int16_t offset) { // find the sensor for (auto & sensor : sensors_) { - if (sensor.id_str() == id_str) { + if (sensor.id() == id) { // found a match, update the sensor object // if HA is enabled then delete the old record if (Mqtt::ha_enabled()) { - remove_ha_topic(id_str); + remove_ha_topic(id); } sensor.set_name(name); @@ -310,21 +310,21 @@ bool DallasSensor::update(const std::string & id_str, const std::string & name, // look it up to see if it exists bool found = false; for (auto & SensorCustomization : settings.sensorCustomizations) { - if (SensorCustomization.id_str == id_str) { + if (SensorCustomization.id == id) { SensorCustomization.name = name; SensorCustomization.offset = offset; found = true; - LOG_DEBUG(F("Customizing existing sensor ID %s"), id_str.c_str()); + LOG_DEBUG(F("Customizing existing sensor ID %s"), id.c_str()); break; } } if (!found) { SensorCustomization newSensor = SensorCustomization(); - newSensor.id_str = id_str; + newSensor.id = id; newSensor.name = name; newSensor.offset = offset; settings.sensorCustomizations.push_back(newSensor); - LOG_DEBUG(F("Adding new customization for sensor ID %s"), id_str.c_str()); + LOG_DEBUG(F("Adding new customization for sensor ID %s"), id.c_str()); } sensor.ha_registered = false; // it's changed so we may need to recreate the HA config return StateUpdateResult::CHANGED; @@ -361,7 +361,7 @@ bool DallasSensor::command_info(const char * value, const int8_t id, JsonObject for (const auto & sensor : sensors_) { if (id == -1) { // show number and id JsonObject dataSensor = output.createNestedObject(sensor.name()); - dataSensor["id_str"] = sensor.id_str(); + dataSensor["id"] = sensor.id(); if (Helpers::hasValue(sensor.temperature_c)) { dataSensor["temp"] = Helpers::round2((float)(sensor.temperature_c), 10, EMSESP::system_.fahrenheit() ? 2 : 0); } @@ -377,8 +377,8 @@ bool DallasSensor::command_info(const char * value, const int8_t id, JsonObject bool DallasSensor::get_value_info(JsonObject & output, const char * cmd, const int8_t id) { for (const auto & sensor : sensors_) { if (strcmp(cmd, sensor.name().c_str()) == 0) { - output["id_str"] = sensor.id_str(); - output["name"] = sensor.name(); + output["id"] = sensor.id(); + output["name"] = sensor.name(); if (Helpers::hasValue(sensor.temperature_c)) { output["value"] = Helpers::round2((float)(sensor.temperature_c), 10, EMSESP::system_.fahrenheit() ? 2 : 0); } @@ -408,15 +408,15 @@ void DallasSensor::publish_sensor(const Sensor & sensor) { } // send empty config topic to remove the entry from HA -void DallasSensor::remove_ha_topic(const std::string & id_str) { +void DallasSensor::remove_ha_topic(const std::string & id) { if (!Mqtt::ha_enabled()) { return; } #ifdef EMSESP_DEBUG - LOG_DEBUG(F("Removing HA config for temperature sensor ID %s"), id_str.c_str()); + LOG_DEBUG(F("Removing HA config for temperature sensor ID %s"), id.c_str()); #endif // use '_' as HA doesn't like '-' in the topic name - std::string sensorid = id_str; + std::string sensorid = id; std::replace(sensorid.begin(), sensorid.end(), '-', '_'); char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; snprintf(topic, sizeof(topic), "sensor/%s/dallassensor_%s/config", Mqtt::base().c_str(), sensorid.c_str()); @@ -442,7 +442,7 @@ void DallasSensor::publish_values(const bool force) { for (auto & sensor : sensors_) { bool has_value = Helpers::hasValue(sensor.temperature_c); if (Mqtt::is_nested() || Mqtt::ha_enabled()) { - JsonObject dataSensor = doc.createNestedObject(sensor.id_str()); + JsonObject dataSensor = doc.createNestedObject(sensor.id()); dataSensor["name"] = sensor.name(); if (has_value) { dataSensor["temp"] = Helpers::round2((float)(sensor.temperature_c), 10, EMSESP::system_.fahrenheit() ? 2 : 0); @@ -455,7 +455,7 @@ void DallasSensor::publish_values(const bool force) { // to e.g. homeassistant/sensor/ems-esp/dallassensor_28-233D-9497-0C03/config if (Mqtt::ha_enabled()) { if (!sensor.ha_registered || force) { - LOG_DEBUG(F("Recreating HA config for sensor ID %s"), sensor.id_str().c_str()); + LOG_DEBUG(F("Recreating HA config for sensor ID %s"), sensor.id().c_str()); StaticJsonDocument config; config["dev_cla"] = FJSON("temperature"); @@ -467,13 +467,13 @@ void DallasSensor::publish_values(const bool force) { config["unit_of_meas"] = EMSdevice::uom_to_string(DeviceValueUOM::DEGREES); char str[50]; - snprintf(str, sizeof(str), "{{value_json['%s'].temp}}", sensor.id_str().c_str()); + snprintf(str, sizeof(str), "{{value_json['%s'].temp}}", sensor.id().c_str()); config["val_tpl"] = str; snprintf(str, sizeof(str), "Temperature Sensor %s", sensor.name().c_str()); config["name"] = str; - snprintf(str, sizeof(str), "dallasensor_%s", sensor.id_str().c_str()); + snprintf(str, sizeof(str), "dallasensor_%s", sensor.id().c_str()); config["uniq_id"] = str; JsonObject dev = config.createNestedObject("dev"); @@ -482,7 +482,7 @@ void DallasSensor::publish_values(const bool force) { char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; // use '_' as HA doesn't like '-' in the topic name - std::string sensorid = sensor.id_str(); + std::string sensorid = sensor.id(); std::replace(sensorid.begin(), sensorid.end(), '-', '_'); snprintf(topic, sizeof(topic), "sensor/%s/dallassensor_%s/config", Mqtt::base().c_str(), sensorid.c_str()); @@ -500,18 +500,18 @@ void DallasSensor::publish_values(const bool force) { // skip crc from id DallasSensor::Sensor::Sensor(const uint8_t addr[]) - : id_(((uint64_t)addr[0] << 48) | ((uint64_t)addr[1] << 40) | ((uint64_t)addr[2] << 32) | ((uint64_t)addr[3] << 24) | ((uint64_t)addr[4] << 16) - | ((uint64_t)addr[5] << 8) | ((uint64_t)addr[6])) { + : internal_id_(((uint64_t)addr[0] << 48) | ((uint64_t)addr[1] << 40) | ((uint64_t)addr[2] << 32) | ((uint64_t)addr[3] << 24) | ((uint64_t)addr[4] << 16) + | ((uint64_t)addr[5] << 8) | ((uint64_t)addr[6])) { // create ID string - char id[20]; - snprintf(id, - sizeof(id), + char id_str[20]; + snprintf(id_str, + sizeof(id_str), "%02X-%04X-%04X-%04X", - (unsigned int)(id_ >> 48) & 0xFF, - (unsigned int)(id_ >> 32) & 0xFFFF, - (unsigned int)(id_ >> 16) & 0xFFFF, - (unsigned int)(id_)&0xFFFF); - id_str_ = std::string(id); + (unsigned int)(internal_id_ >> 48) & 0xFF, + (unsigned int)(internal_id_ >> 32) & 0xFFFF, + (unsigned int)(internal_id_ >> 16) & 0xFFFF, + (unsigned int)(internal_id_)&0xFFFF); + id_ = std::string(id_str); name_ = std::string{}; // name (alias) is empty offset_ = 0; // 0 degrees offset } @@ -525,7 +525,7 @@ uint64_t DallasSensor::get_id(const uint8_t addr[]) { // if empty, return the ID as a string std::string DallasSensor::Sensor::name() const { if (name_.empty()) { - return id_str_; + return id_; } return name_; } @@ -538,9 +538,9 @@ bool DallasSensor::Sensor::apply_customization() { if (!sensors.empty()) { for (const auto & sensor : sensors) { #if defined(EMSESP_DEBUG) - LOG_DEBUG(F("Loading customization for dallas sensor %s"), sensor.id_str.c_str()); + LOG_DEBUG(F("Loading customization for dallas sensor %s"), sensor.id.c_str()); #endif - if (id_str_ == sensor.id_str) { + if (id_ == sensor.id) { set_name(sensor.name); set_offset(sensor.offset); return true; diff --git a/src/dallassensor.h b/src/dallassensor.h index c9567e32f..009db5fa6 100644 --- a/src/dallassensor.h +++ b/src/dallassensor.h @@ -40,12 +40,12 @@ class DallasSensor { Sensor(const uint8_t addr[]); ~Sensor() = default; - uint64_t id() const { - return id_; + uint64_t internal_id() const { + return internal_id_; } - std::string id_str() const { - return id_str_; + std::string id() const { + return id_; } int16_t offset() const { @@ -67,8 +67,8 @@ class DallasSensor { bool ha_registered = false; private: - uint64_t id_; - std::string id_str_; + uint64_t internal_id_; + std::string id_; std::string name_; int16_t offset_; }; @@ -109,7 +109,7 @@ class DallasSensor { return sensors_.size(); } - bool update(const std::string & id_str, const std::string & name, int16_t offset); + bool update(const std::string & id, const std::string & name, int16_t offset); #ifdef EMSESP_DEBUG void test(); diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp index 4711ddcbf..fe52772a7 100644 --- a/src/emsdevice.cpp +++ b/src/emsdevice.cpp @@ -656,119 +656,118 @@ void EMSdevice::generate_values_web(JsonObject & output) { output["label"] = to_string_short(); JsonArray data = output.createNestedArray("data"); - // do two passes. First for all entities marked as favorites, then for all others. This sorts the list. - for (int8_t fav = 1; fav >= 0; fav--) { - for (auto & dv : devicevalues_) { - // check conditions: - // 1. full_name cannot be empty - // 2. it must have a valid value, if it is not a command like 'reset' - // 3. show favorites first - bool show = (fav && dv.has_state(DeviceValueState::DV_FAVORITE)) || (!fav && !dv.has_state(DeviceValueState::DV_FAVORITE)); - if (show && !dv.has_state(DeviceValueState::DV_WEB_EXCLUDE) && dv.full_name && (dv.hasValue() || (dv.type == DeviceValueType::CMD))) { - JsonObject obj = data.createNestedObject(); // create the object, we know there is a value - uint8_t fahrenheit = 0; + for (auto & dv : devicevalues_) { + // check conditions: + // 1. full_name cannot be empty + // 2. it must have a valid value, if it is not a command like 'reset' + // 3. show favorites first + if (!dv.has_state(DeviceValueState::DV_WEB_EXCLUDE) && dv.full_name && (dv.hasValue() || (dv.type == DeviceValueType::CMD))) { + JsonObject obj = data.createNestedObject(); // create the object, we know there is a value + uint8_t fahrenheit = 0; - // handle Booleans (true, false), use strings, no native true/false) - if (dv.type == DeviceValueType::BOOL) { - bool value_b = (bool)*(uint8_t *)(dv.value_p); - if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) { - obj["v"] = value_b ? 1 : 0; - } else { - char s[7]; - obj["v"] = Helpers::render_boolean(s, value_b); - } - } - - // handle TEXT strings - else if (dv.type == DeviceValueType::STRING) { - obj["v"] = (char *)(dv.value_p); - } - - // handle ENUMs - else if ((dv.type == DeviceValueType::ENUM) && (*(uint8_t *)(dv.value_p) < dv.options_size)) { - obj["v"] = dv.options[*(uint8_t *)(dv.value_p)]; - } - - // handle numbers - else { - // If a divider is specified, do the division to 2 decimals places and send back as double/float - // otherwise force as an integer whole - // the nested if's is necessary due to the way the ArduinoJson templates are pre-processed by the compiler - int8_t divider = (dv.options_size == 1) ? Helpers::atoint(read_flash_string(dv.options[0]).c_str()) : 0; - fahrenheit = !EMSESP::system_.fahrenheit() ? 0 : (dv.uom == DeviceValueUOM::DEGREES) ? 2 : (dv.uom == DeviceValueUOM::DEGREES_R) ? 1 : 0; - - if ((dv.type == DeviceValueType::INT) && Helpers::hasValue(*(int8_t *)(dv.value_p))) { - obj["v"] = Helpers::round2(*(int8_t *)(dv.value_p), divider, fahrenheit); - } else if ((dv.type == DeviceValueType::UINT) && Helpers::hasValue(*(uint8_t *)(dv.value_p))) { - obj["v"] = Helpers::round2(*(uint8_t *)(dv.value_p), divider, fahrenheit); - } else if ((dv.type == DeviceValueType::SHORT) && Helpers::hasValue(*(int16_t *)(dv.value_p))) { - obj["v"] = Helpers::round2(*(int16_t *)(dv.value_p), divider, fahrenheit); - } else if ((dv.type == DeviceValueType::USHORT) && Helpers::hasValue(*(uint16_t *)(dv.value_p))) { - obj["v"] = Helpers::round2(*(uint16_t *)(dv.value_p), divider, fahrenheit); - } else if ((dv.type == DeviceValueType::ULONG) && Helpers::hasValue(*(uint32_t *)(dv.value_p))) { - obj["v"] = Helpers::round2(*(uint32_t *)(dv.value_p), divider, fahrenheit); - } else if ((dv.type == DeviceValueType::TIME) && Helpers::hasValue(*(uint32_t *)(dv.value_p))) { - uint32_t time_value = *(uint32_t *)(dv.value_p); - obj["v"] = (divider > 0) ? time_value / divider : time_value; // sometimes we need to divide by 60 - } - } - - // add the unit of measure (uom) - obj["u"] = fahrenheit ? (uint8_t)DeviceValueUOM::FAHRENHEIT : dv.uom; - - auto mask = Helpers::hextoa((uint8_t)(dv.state >> 4), false); // create mask to a 2-char string - - // add name, prefixing the tag if it exists - if ((dv.tag == DeviceValueTAG::TAG_NONE) || tag_to_string(dv.tag).empty()) { - obj["n"] = mask + read_flash_string(dv.full_name); - } else if (dv.tag < DeviceValueTAG::TAG_HC1) { - obj["n"] = mask + tag_to_string(dv.tag) + " " + read_flash_string(dv.full_name); + // handle Booleans (true, false), use strings, no native true/false) + if (dv.type == DeviceValueType::BOOL) { + bool value_b = (bool)*(uint8_t *)(dv.value_p); + if (EMSESP::system_.bool_format() == BOOL_FORMAT_10) { + obj["v"] = value_b ? 1 : 0; } else { - obj["n"] = mask + tag_to_string(dv.tag) + " " + read_flash_string(dv.full_name); + char s[7]; + obj["v"] = Helpers::render_boolean(s, value_b); } + } - // add commands and options - if (dv.has_cmd && !dv.has_state(DeviceValueState::DV_READONLY)) { - // add the name of the Command function - if (dv.tag >= DeviceValueTAG::TAG_HC1) { - obj["c"] = tag_to_mqtt(dv.tag) + "/" + read_flash_string(dv.short_name); - } else { - obj["c"] = dv.short_name; - } - // add the Command options - if (dv.type == DeviceValueType::ENUM || (dv.type == DeviceValueType::CMD && dv.options_size > 1)) { - JsonArray l = obj.createNestedArray("l"); - for (uint8_t i = 0; i < dv.options_size; i++) { - if (!read_flash_string(dv.options[i]).empty()) { - l.add(read_flash_string(dv.options[i])); - } - } - } else if (dv.type == DeviceValueType::BOOL) { - JsonArray l = obj.createNestedArray("l"); - char result[10]; - l.add(Helpers::render_boolean(result, false)); - l.add(Helpers::render_boolean(result, true)); - } - // add command help template - else if (dv.type == DeviceValueType::STRING || dv.type == DeviceValueType::CMD) { - if (dv.options_size == 1) { - obj["h"] = dv.options[0]; + // handle TEXT strings + else if (dv.type == DeviceValueType::STRING) { + obj["v"] = (char *)(dv.value_p); + } + + // handle ENUMs + else if ((dv.type == DeviceValueType::ENUM) && (*(uint8_t *)(dv.value_p) < dv.options_size)) { + obj["v"] = dv.options[*(uint8_t *)(dv.value_p)]; + } + + // handle numbers + else { + // If a divider is specified, do the division to 2 decimals places and send back as double/float + // otherwise force as an integer whole + // the nested if's is necessary due to the way the ArduinoJson templates are pre-processed by the compiler + int8_t divider = (dv.options_size == 1) ? Helpers::atoint(read_flash_string(dv.options[0]).c_str()) : 0; + fahrenheit = !EMSESP::system_.fahrenheit() ? 0 : (dv.uom == DeviceValueUOM::DEGREES) ? 2 : (dv.uom == DeviceValueUOM::DEGREES_R) ? 1 : 0; + + if ((dv.type == DeviceValueType::INT) && Helpers::hasValue(*(int8_t *)(dv.value_p))) { + obj["v"] = Helpers::round2(*(int8_t *)(dv.value_p), divider, fahrenheit); + } else if ((dv.type == DeviceValueType::UINT) && Helpers::hasValue(*(uint8_t *)(dv.value_p))) { + obj["v"] = Helpers::round2(*(uint8_t *)(dv.value_p), divider, fahrenheit); + } else if ((dv.type == DeviceValueType::SHORT) && Helpers::hasValue(*(int16_t *)(dv.value_p))) { + obj["v"] = Helpers::round2(*(int16_t *)(dv.value_p), divider, fahrenheit); + } else if ((dv.type == DeviceValueType::USHORT) && Helpers::hasValue(*(uint16_t *)(dv.value_p))) { + obj["v"] = Helpers::round2(*(uint16_t *)(dv.value_p), divider, fahrenheit); + } else if ((dv.type == DeviceValueType::ULONG) && Helpers::hasValue(*(uint32_t *)(dv.value_p))) { + obj["v"] = Helpers::round2(*(uint32_t *)(dv.value_p), divider, fahrenheit); + } else if ((dv.type == DeviceValueType::TIME) && Helpers::hasValue(*(uint32_t *)(dv.value_p))) { + uint32_t time_value = *(uint32_t *)(dv.value_p); + obj["v"] = (divider > 0) ? time_value / divider : time_value; // sometimes we need to divide by 60 + } else { + // must have a value for sorting to work + obj["v"] = ""; + } + } + + // add the unit of measure (uom) + obj["u"] = fahrenheit ? (uint8_t)DeviceValueUOM::FAHRENHEIT : dv.uom; + + auto mask = Helpers::hextoa((uint8_t)(dv.state >> 4), false); // create mask to a 2-char string + + // add name, prefixing the tag if it exists. This is the id used for the table sorting + if ((dv.tag == DeviceValueTAG::TAG_NONE) || tag_to_string(dv.tag).empty()) { + obj["id"] = mask + read_flash_string(dv.full_name); + } else if (dv.tag < DeviceValueTAG::TAG_HC1) { + obj["id"] = mask + tag_to_string(dv.tag) + " " + read_flash_string(dv.full_name); + } else { + obj["id"] = mask + tag_to_string(dv.tag) + " " + read_flash_string(dv.full_name); + } + + // add commands and options + if (dv.has_cmd && !dv.has_state(DeviceValueState::DV_READONLY)) { + // add the name of the Command function + if (dv.tag >= DeviceValueTAG::TAG_HC1) { + obj["c"] = tag_to_mqtt(dv.tag) + "/" + read_flash_string(dv.short_name); + } else { + obj["c"] = dv.short_name; + } + // add the Command options + if (dv.type == DeviceValueType::ENUM || (dv.type == DeviceValueType::CMD && dv.options_size > 1)) { + JsonArray l = obj.createNestedArray("l"); + for (uint8_t i = 0; i < dv.options_size; i++) { + if (!read_flash_string(dv.options[i]).empty()) { + l.add(read_flash_string(dv.options[i])); } } - // add steps to numeric values with divider/multiplier - else { - int8_t divider = (dv.options_size == 1) ? Helpers::atoint(read_flash_string(dv.options[0]).c_str()) : 0; - char s[10]; - if (divider > 0) { - obj["s"] = Helpers::render_value(s, (float)1 / divider, 1); - } else if (divider < 0) { - obj["s"] = Helpers::render_value(s, (-1) * divider, 0); - } - int16_t dv_set_min, dv_set_max; - if (dv.get_min_max(dv_set_min, dv_set_max)) { - obj["m"] = Helpers::render_value(s, dv_set_min, 0); - obj["x"] = Helpers::render_value(s, dv_set_max, 0); - } + } else if (dv.type == DeviceValueType::BOOL) { + JsonArray l = obj.createNestedArray("l"); + char result[10]; + l.add(Helpers::render_boolean(result, false)); + l.add(Helpers::render_boolean(result, true)); + } + // add command help template + else if (dv.type == DeviceValueType::STRING || dv.type == DeviceValueType::CMD) { + if (dv.options_size == 1) { + obj["h"] = dv.options[0]; + } + } + // add steps to numeric values with divider/multiplier + else { + int8_t divider = (dv.options_size == 1) ? Helpers::atoint(read_flash_string(dv.options[0]).c_str()) : 0; + char s[10]; + if (divider > 0) { + obj["s"] = Helpers::render_value(s, (float)1 / divider, 1); + } else if (divider < 0) { + obj["s"] = Helpers::render_value(s, (-1) * divider, 0); + } + int16_t dv_set_min, dv_set_max; + if (dv.get_min_max(dv_set_min, dv_set_max)) { + obj["m"] = Helpers::render_value(s, dv_set_min, 0); + obj["x"] = Helpers::render_value(s, dv_set_max, 0); } } } @@ -838,19 +837,22 @@ void EMSdevice::generate_values_web_all(JsonArray & output) { obj["v"] = (divider > 0) ? time_value / divider : time_value * factor; // sometimes we need to divide by 60 } } + } else { + // must always have v for sorting to work in web + obj["v"] = ""; } - // add name, prefixing the tag if it exists + // add name, prefixing the tag if it exists as the id (key for table sorting) if (dv.full_name) { if ((dv.tag == DeviceValueTAG::TAG_NONE) || tag_to_string(dv.tag).empty()) { - obj["n"] = dv.full_name; + obj["id"] = dv.full_name; } else { char name[50]; snprintf(name, sizeof(name), "%s %s", tag_to_string(dv.tag).c_str(), read_flash_string(dv.full_name).c_str()); - obj["n"] = name; + obj["id"] = name; } } else { - obj["n"] = ""; + obj["id"] = ""; } // shortname diff --git a/src/emsesp.cpp b/src/emsesp.cpp index f2e8e93b8..4e37ee919 100644 --- a/src/emsesp.cpp +++ b/src/emsesp.cpp @@ -432,12 +432,12 @@ void EMSESP::show_sensor_values(uuid::console::Shell & shell) { (fahrenheit == 0) ? 'C' : 'F', COLOR_RESET, Helpers::render_value(s2, sensor.offset(), 10, fahrenheit), - sensor.id_str().c_str()); + sensor.id().c_str()); } else { shell.printfln(F(" %s (offset %s, ID: %s)"), sensor.name().c_str(), Helpers::render_value(s, sensor.offset(), 10, fahrenheit), - sensor.id_str().c_str()); + sensor.id().c_str()); } } shell.println(); diff --git a/src/system.cpp b/src/system.cpp index f2063415f..4eaa88ec0 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -1036,7 +1036,7 @@ bool System::command_customizations(const char * value, const int8_t id, JsonObj JsonArray sensorsJson = node.createNestedArray("sensors"); for (const auto & sensor : settings.sensorCustomizations) { JsonObject sensorJson = sensorsJson.createNestedObject(); - sensorJson["id_str"] = sensor.id_str; // key, is + sensorJson["id"] = sensor.id; // key sensorJson["name"] = sensor.name; // n sensorJson["offset"] = sensor.offset; // o } @@ -1044,7 +1044,7 @@ bool System::command_customizations(const char * value, const int8_t id, JsonObj JsonArray analogJson = node.createNestedArray("analogs"); for (const AnalogCustomization & sensor : settings.analogCustomizations) { JsonObject sensorJson = analogJson.createNestedObject(); - sensorJson["gpio"] = sensor.id; + sensorJson["gpio"] = sensor.gpio; sensorJson["name"] = sensor.name; if (EMSESP::system_.enum_format() == ENUM_FORMAT_INDEX) { sensorJson["type"] = sensor.type; diff --git a/src/web/WebCustomizationService.cpp b/src/web/WebCustomizationService.cpp index 3b01c0291..3a0afb88e 100644 --- a/src/web/WebCustomizationService.cpp +++ b/src/web/WebCustomizationService.cpp @@ -61,7 +61,7 @@ void WebCustomization::read(WebCustomization & settings, JsonObject & root) { JsonArray sensorsJson = root.createNestedArray("sensors"); for (const SensorCustomization & sensor : settings.sensorCustomizations) { JsonObject sensorJson = sensorsJson.createNestedObject(); - sensorJson["id_str"] = sensor.id_str; // is + sensorJson["id"] = sensor.id; // is sensorJson["name"] = sensor.name; // n sensorJson["offset"] = sensor.offset; // o } @@ -70,7 +70,7 @@ void WebCustomization::read(WebCustomization & settings, JsonObject & root) { JsonArray analogJson = root.createNestedArray("analogs"); for (const AnalogCustomization & sensor : settings.analogCustomizations) { JsonObject sensorJson = analogJson.createNestedObject(); - sensorJson["id"] = sensor.id; // i + sensorJson["gpio"] = sensor.gpio; // g sensorJson["name"] = sensor.name; // n sensorJson["offset"] = sensor.offset; // o sensorJson["factor"] = sensor.factor; // f @@ -101,7 +101,7 @@ StateUpdateResult WebCustomization::update(JsonObject & root, WebCustomization & for (const JsonObject sensorJson : root["sensors"].as()) { // create each of the sensor, overwritting any previous settings auto sensor = SensorCustomization(); - sensor.id_str = sensorJson["id_str"].as(); + sensor.id = sensorJson["id"].as(); sensor.name = sensorJson["name"].as(); sensor.offset = sensorJson["offset"]; settings.sensorCustomizations.push_back(sensor); // add to list @@ -114,7 +114,7 @@ StateUpdateResult WebCustomization::update(JsonObject & root, WebCustomization & for (const JsonObject analogJson : root["analogs"].as()) { // create each of the sensor, overwritting any previous settings auto sensor = AnalogCustomization(); - sensor.id = analogJson["id"]; + sensor.gpio = analogJson["gpio"]; sensor.name = analogJson["name"].as(); sensor.offset = analogJson["offset"]; sensor.factor = analogJson["factor"]; diff --git a/src/web/WebCustomizationService.h b/src/web/WebCustomizationService.h index 526259dbe..d595c1f43 100644 --- a/src/web/WebCustomizationService.h +++ b/src/web/WebCustomizationService.h @@ -35,14 +35,14 @@ namespace emsesp { // Customization for dallas sensor class SensorCustomization { public: - std::string id_str; + std::string id; std::string name; uint16_t offset; }; class AnalogCustomization { public: - uint8_t id; + uint8_t gpio; std::string name; float offset; float factor; @@ -51,7 +51,7 @@ class AnalogCustomization { // used for removing from a list bool operator==(const AnalogCustomization & a) const { - return id == a.id; + return gpio == a.gpio; } bool operator!=(const AnalogCustomization & a) const { return !operator==(a); diff --git a/src/web/WebDataService.cpp b/src/web/WebDataService.cpp index b4d61dc65..d1df1596e 100644 --- a/src/web/WebDataService.cpp +++ b/src/web/WebDataService.cpp @@ -76,17 +76,18 @@ void WebDataService::core_data(AsyncWebServerRequest * request) { // list is already sorted by device type // Ignore Contoller JsonArray devices = root.createNestedArray("devices"); + char buffer[3]; for (const auto & emsdevice : EMSESP::emsdevices) { if (emsdevice && (emsdevice->device_type() != EMSdevice::DeviceType::CONTROLLER || emsdevice->count_entities() > 0)) { JsonObject obj = devices.createNestedObject(); - obj["i"] = emsdevice->unique_id(); // a unique id - obj["t"] = emsdevice->device_type_name(); // type - obj["b"] = emsdevice->brand_to_string(); // brand - obj["n"] = emsdevice->name(); // name - obj["d"] = emsdevice->device_id(); // deviceid - obj["p"] = emsdevice->product_id(); // productid - obj["v"] = emsdevice->version(); // version - obj["e"] = emsdevice->count_entities(); // number of entities (device values) + obj["id"] = Helpers::smallitoa(buffer, emsdevice->unique_id()); // a unique id as a string + obj["t"] = emsdevice->device_type_name(); // type + obj["b"] = emsdevice->brand_to_string(); // brand + obj["n"] = emsdevice->name(); // name + obj["d"] = emsdevice->device_id(); // deviceid + obj["p"] = emsdevice->product_id(); // productid + obj["v"] = emsdevice->version(); // version + obj["e"] = emsdevice->count_entities(); // number of entities (device values) } } @@ -110,8 +111,8 @@ void WebDataService::sensor_data(AsyncWebServerRequest * request) { if (EMSESP::dallassensor_.have_sensors()) { for (const auto & sensor : EMSESP::dallassensor_.sensors()) { JsonObject obj = sensors.createNestedObject(); - obj["is"] = sensor.id_str(); // id - obj["n"] = sensor.name(); // name + obj["id"] = sensor.id(); // id as string + obj["n"] = sensor.name(); // name if (EMSESP::system_.fahrenheit()) { if (Helpers::hasValue(sensor.temperature_c)) { obj["t"] = (float)sensor.temperature_c * 0.18 + 32; @@ -129,14 +130,16 @@ void WebDataService::sensor_data(AsyncWebServerRequest * request) { } // analog sensors - // assume list is already sorted by id JsonArray analogs = root.createNestedArray("analogs"); if (EMSESP::analog_enabled() && EMSESP::analogsensor_.have_sensors()) { + uint8_t count = 0; + char buffer[3]; for (const auto & sensor : EMSESP::analogsensor_.sensors()) { // don't send if it's marked for removal if (sensor.type() != AnalogSensor::AnalogType::MARK_DELETED) { JsonObject obj = analogs.createNestedObject(); - obj["i"] = sensor.id(); + obj["id"] = Helpers::smallitoa(buffer, ++count); // needed for sorting table + obj["g"] = sensor.gpio(); obj["n"] = sensor.name(); obj["u"] = sensor.uom(); obj["o"] = sensor.offset(); @@ -145,6 +148,8 @@ void WebDataService::sensor_data(AsyncWebServerRequest * request) { if (sensor.type() != AnalogSensor::AnalogType::NOTUSED) { obj["v"] = Helpers::round2(sensor.value(), 0); // is optional and is a float + } else { + obj["v"] = 0; // must have a value for web sorting to work } } } @@ -169,6 +174,12 @@ void WebDataService::device_data(AsyncWebServerRequest * request, JsonVariant & #ifndef EMSESP_STANDALONE JsonObject output = response->getRoot(); emsdevice->generate_values_web(output); +#endif + +#ifdef EMSESP_USE_SERIAL +#ifdef EMSESP_DEBUG + serializeJson(output, Serial); +#endif #endif response->setLength(); request->send(response); @@ -246,8 +257,8 @@ void WebDataService::write_sensor(AsyncWebServerRequest * request, JsonVariant & if (json.is()) { JsonObject sensor = json; - std::string id_str = sensor["id_str"]; // this is the key - std::string name = sensor["name"]; + std::string id = sensor["id"]; // this is the key + std::string name = sensor["name"]; // calculate offset. We'll convert it to an int and * 10 float offset = sensor["offset"]; @@ -255,7 +266,7 @@ void WebDataService::write_sensor(AsyncWebServerRequest * request, JsonVariant & if (EMSESP::system_.fahrenheit()) { offset10 = offset / 0.18; } - ok = EMSESP::dallassensor_.update(id_str, name, offset10); + ok = EMSESP::dallassensor_.update(id, name, offset10); } AsyncWebServerResponse * response = request->beginResponse(ok ? 200 : 204); @@ -268,13 +279,13 @@ void WebDataService::write_analog(AsyncWebServerRequest * request, JsonVariant & if (json.is()) { JsonObject analog = json; - uint8_t id = analog["id"]; // this is the unique key + uint8_t gpio = analog["gpio"]; // this is the unique key, the GPIO std::string name = analog["name"]; float factor = analog["factor"]; float offset = analog["offset"]; uint8_t uom = analog["uom"]; int8_t type = analog["type"]; - ok = EMSESP::analogsensor_.update(id, name, offset, factor, uom, type); + ok = EMSESP::analogsensor_.update(gpio, name, offset, factor, uom, type); } AsyncWebServerResponse * response = request->beginResponse(ok ? 200 : 204); From 04a374c3803ba47f6c2b1d37db9224c72695ef2a Mon Sep 17 00:00:00 2001 From: Proddy Date: Fri, 15 Apr 2022 16:22:05 +0200 Subject: [PATCH 04/21] more tables --- .../framework/security/ManageUsersForm.tsx | 181 +++++++++++------- interface/src/project/DashboardStatus.tsx | 151 ++++++++------- interface/src/project/types.ts | 31 +-- interface/src/types/security.ts | 1 + lib/framework/SecuritySettingsService.h | 1 + mock-api/server.js | 40 ++-- src/web/WebDataService.cpp | 11 +- src/web/WebStatusService.cpp | 79 +++++--- 8 files changed, 275 insertions(+), 220 deletions(-) diff --git a/interface/src/framework/security/ManageUsersForm.tsx b/interface/src/framework/security/ManageUsersForm.tsx index f5dbfaae2..16c30560d 100644 --- a/interface/src/framework/security/ManageUsersForm.tsx +++ b/interface/src/framework/security/ManageUsersForm.tsx @@ -1,6 +1,6 @@ import { FC, useContext, useState } from 'react'; -import { Button, IconButton, Table, TableBody, TableCell, TableFooter, TableHead, TableRow } from '@mui/material'; +import { Button, IconButton, Box } from '@mui/material'; import SaveIcon from '@mui/icons-material/Save'; import DeleteIcon from '@mui/icons-material/Delete'; import PersonAddIcon from '@mui/icons-material/PersonAdd'; @@ -9,6 +9,10 @@ import CheckIcon from '@mui/icons-material/Check'; import CloseIcon from '@mui/icons-material/Close'; import VpnKeyIcon from '@mui/icons-material/VpnKey'; +import { Table } from '@table-library/react-table-library/table'; +import { useTheme } from '@table-library/react-table-library/theme'; +import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table'; + import * as SecurityApi from '../../api/security'; import { SecuritySettings, User } from '../../types'; import { ButtonRow, FormLoader, MessageBox, SectionContent } from '../../components'; @@ -19,16 +23,6 @@ import { AuthenticatedContext } from '../../contexts/authentication'; import GenerateToken from './GenerateToken'; import UserForm from './UserForm'; -function compareUsers(a: User, b: User) { - if (a.username < b.username) { - return -1; - } - if (a.username > b.username) { - return 1; - } - return 0; -} - const ManageUsersForm: FC = () => { const { loadData, saving, data, setData, saveData, errorMessage } = useRest({ read: SecurityApi.readSecuritySettings, @@ -40,6 +34,45 @@ const ManageUsersForm: FC = () => { const [generatingToken, setGeneratingToken] = useState(); const authenticatedContext = useContext(AuthenticatedContext); + const table_theme = useTheme({ + BaseRow: ` + font-size: 14px; + color: white; + `, + HeaderRow: ` + text-transform: uppercase; + background-color: black; + color: #90CAF9; + border-bottom: 1px solid #e0e0e0; + `, + Row: ` + &:nth-of-type(odd) { + background-color: #303030; + } + &:nth-of-type(even) { + background-color: #1e1e1e; + } + border-top: 1px solid #565656; + border-bottom: 1px solid #565656; + position: relative; + z-index: 1; + &:not(:last-of-type) { + margin-bottom: -1px; + } + &:not(:first-of-type) { + margin-top: -1px; + } + &:hover { + color: white; + } + `, + BaseCell: ` + border-top: 1px solid transparent; + border-right: 1px solid transparent; + border-bottom: 1px solid transparent; + ` + }); + const content = () => { if (!data) { return ; @@ -48,13 +81,14 @@ const ManageUsersForm: FC = () => { const noAdminConfigured = () => !data.users.find((u) => u.admin); const removeUser = (toRemove: User) => { - const users = data.users.filter((u) => u.username !== toRemove.username); + const users = data.users.filter((u) => u.id !== toRemove.id); setData({ ...data, users }); }; const createUser = () => { setCreating(true); setUser({ + id: '', username: '', password: '', admin: true @@ -72,7 +106,7 @@ const ManageUsersForm: FC = () => { const doneEditingUser = () => { if (user) { - const users = [...data.users.filter((u) => u.username !== user.username), user]; + const users = [...data.users.filter((u) => u.id !== user.id), user]; setData({ ...data, users }); setUser(undefined); } @@ -82,8 +116,8 @@ const ManageUsersForm: FC = () => { setGeneratingToken(undefined); }; - const generateToken = (username: string) => { - setGeneratingToken(username); + const generateToken = (id: string) => { + setGeneratingToken(id); }; const onSubmit = async () => { @@ -93,66 +127,71 @@ const ManageUsersForm: FC = () => { return ( <> - - - - Username - is Admin? - - - - - {data.users.sort(compareUsers).map((u) => ( - - - {u.username} - - {u.admin ? : } - - generateToken(u.username)} - > - - - removeUser(u)}> - - - editUser(u)}> - - - - - ))} - - - - - - - - - +
+ {(tableList: any) => ( + <> +
+ + USERNAME + IS ADMIN + + +
+ + {tableList.map((u: User, index: number) => ( + + {u.id} + {u.admin ? : } + + generateToken(u.id)} + > + + + removeUser(u)}> + + + editUser(u)}> + + + + + ))} + + + )}
+ {noAdminConfigured() && ( )} - - - + + + + + + + + + + + + + status !== busConnectionStatus.BUS_STATUS_OFFLINE; const busStatusHighlight = ({ status }: Status, theme: Theme) => { @@ -60,7 +56,7 @@ const busStatus = ({ status }: Status) => { case busConnectionStatus.BUS_STATUS_CONNECTED: return 'Connected'; case busConnectionStatus.BUS_STATUS_TX_ERRORS: - return 'Tx issues - try a different Tx-Mode'; + return 'Tx issues - try a different Tx Mode'; case busConnectionStatus.BUS_STATUS_OFFLINE: return 'Disconnected'; default: @@ -68,41 +64,17 @@ const busStatus = ({ status }: Status) => { } }; -const formatRow = (name: string, success: number, fail: number, quality: number) => { - if (success === 0 && fail === 0) { - return ( - - {name} - - - - - ); +const showQuality = (stat: Stat) => { + if (stat.q === 0 || stat.s + stat.f === 0) { + return; } - - return ( - - {name} - {Intl.NumberFormat().format(success)} - {Intl.NumberFormat().format(fail)} - {showQuality(quality)} - - ); -}; - -const showQuality = (quality: number) => { - if (quality === 0) { - return ; + if (stat.q === 100) { + return
{stat.q}%
; } - - if (quality === 100) { - return {quality}%; - } - - if (quality >= 95) { - return {quality}%; + if (stat.q >= 95) { + return
{stat.q}%
; } else { - return {quality}%; + return
{stat.q}%
; } }; @@ -115,6 +87,48 @@ const DashboardStatus: FC = () => { const { me } = useContext(AuthenticatedContext); + const stats_theme = tableTheme({ + BaseRow: ` + font-size: 14px; + color: white; + `, + HeaderRow: ` + text-transform: uppercase; + background-color: black; + color: #90CAF9; + border-bottom: 1px solid #e0e0e0; + `, + Row: ` + &:nth-of-type(odd) { + background-color: #303030; + } + &:nth-of-type(even) { + background-color: #1e1e1e; + } + border-top: 1px solid #565656; + border-bottom: 1px solid #565656; + position: relative; + z-index: 1; + &:not(:last-of-type) { + margin-bottom: -1px; + } + &:not(:first-of-type) { + margin-top: -1px; + } + &:hover { + color: white; + } + `, + BaseCell: ` + border-top: 1px solid transparent; + border-right: 1px solid transparent; + border-bottom: 1px solid transparent; + &:nth-of-type(1) { + flex: 1; + } + ` + }); + useEffect(() => { const timer = setInterval(() => loadData(), 30000); return () => { @@ -183,27 +197,30 @@ const DashboardStatus: FC = () => { /> - - - - - - SUCCESS - FAIL - QUALITY - - - - {formatRow('EMS Telegrams Received (Rx)', data.rx_received, data.rx_fails, data.rx_quality)} - {formatRow('EMS Reads (Tx)', data.tx_reads, data.tx_read_fails, data.tx_read_quality)} - {formatRow('EMS Writes (Tx)', data.tx_writes, data.tx_write_fails, data.tx_write_quality)} - {formatRow('Temperature Sensor Reads', data.sensor_reads, data.sensor_fails, data.sensor_quality)} - {formatRow('Analog Sensor Reads', data.analog_reads, data.analog_fails, data.analog_quality)} - {formatRow('MQTT Publishes', data.mqtt_count, data.mqtt_fails, data.mqtt_quality)} - {formatRow('API Calls', data.api_calls, data.api_fails, data.api_quality)} - -
- + + {(tableList: any) => ( + <> +
+ + + SUCCESS + FAIL + QUALITY + +
+ + {tableList.map((stat: Stat, index: number) => ( + + {stat.id} + {Intl.NumberFormat().format(stat.s)} + {Intl.NumberFormat().format(stat.f)} + {showQuality(stat)} + + ))} + + + )} +
{renderScanDialog()} diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts index ac63dee65..b41053881 100644 --- a/interface/src/project/types.ts +++ b/interface/src/project/types.ts @@ -38,36 +38,21 @@ export enum busConnectionStatus { BUS_STATUS_OFFLINE = 2 } +export interface Stat { + id: string; // name + s: number; // success + f: number; // fail + q: number; // quality +} export interface Status { status: busConnectionStatus; tx_mode: number; - rx_received: number; - tx_reads: number; - tx_writes: number; - rx_quality: number; - tx_read_quality: number; - tx_write_quality: number; - tx_read_fails: number; - tx_write_fails: number; - rx_fails: number; - sensor_fails: number; - sensor_reads: number; - sensor_quality: number; - analog_fails: number; - analog_reads: number; - analog_quality: number; - mqtt_count: number; - mqtt_fails: number; - mqtt_quality: number; - api_calls: number; - api_fails: number; - api_quality: number; + uptime: number; num_devices: number; num_sensors: number; num_analogs: number; - uptime: number; + stats: Stat[]; } - export interface Device { id: string; // id index t: string; // type diff --git a/interface/src/types/security.ts b/interface/src/types/security.ts index 90db06a1e..472248b12 100644 --- a/interface/src/types/security.ts +++ b/interface/src/types/security.ts @@ -1,4 +1,5 @@ export interface User { + id: string; // needed for Table username: string; password: string; admin: boolean; diff --git a/lib/framework/SecuritySettingsService.h b/lib/framework/SecuritySettingsService.h index cdbd8d085..51f57461e 100644 --- a/lib/framework/SecuritySettingsService.h +++ b/lib/framework/SecuritySettingsService.h @@ -43,6 +43,7 @@ class SecuritySettings { JsonArray users = root.createNestedArray("users"); for (User user : settings.users) { JsonObject userRoot = users.createNestedObject(); + userRoot["id"] = user.username; // for React Table userRoot["username"] = user.username; userRoot["password"] = user.password; userRoot["admin"] = user.admin; diff --git a/mock-api/server.js b/mock-api/server.js index 4bcfec3f7..0a8bdd56f 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -270,8 +270,8 @@ const system_status = { security_settings = { jwt_secret: 'naughty!', users: [ - { username: 'admin', password: 'admin', admin: true }, - { username: 'guest', password: 'guest', admin: false }, + { id: 'admin', username: 'admin', password: 'admin', admin: true }, + { id: 'guest', username: 'guest', password: 'guest', admin: false }, ], } const features = { @@ -417,33 +417,21 @@ const emsesp_sensordata = { } const status = { - analog_fails: 0, - analog_quality: 100, - analog_reads: 203, - api_calls: 4, - api_fails: 0, - api_quality: 100, - mqtt_count: 40243, - mqtt_fails: 0, - mqtt_quality: 100, - num_analogs: 1, - num_devices: 2, - num_sensors: 1, - rx_fails: 11, - rx_quality: 100, - rx_received: 56506, - sensor_fails: 0, - sensor_quality: 100, - sensor_reads: 15438, status: 0, tx_mode: 1, - tx_read_fails: 0, - tx_read_quality: 100, - tx_reads: 9026, - tx_write_fails: 2, - tx_write_quality: 95, - tx_writes: 33, uptime: 77186, + num_devices: 2, + num_sensors: 1, + num_analogs: 1, + stats: [ + { id: 'EMS Telegrams Received (Rx)', s: 56506, f: 11, q: 100 }, + { id: 'EMS Reads (Tx)', s: 9026, f: 0, q: 100 }, + { id: 'EMS Writes (Tx)', s: 33, f: 2, q: 95 }, + { id: 'Temperature Sensor Reads', s: 56506, f: 11, q: 100 }, + { id: 'Analog Sensor Reads', s: 0, f: 0, q: 100 }, + { id: 'MQTT Publishes', s: 12, f: 10, q: 20 }, + { id: 'API Calls', s: 0, f: 0, q: 0 }, + ], } // Dashboard data diff --git a/src/web/WebDataService.cpp b/src/web/WebDataService.cpp index d1df1596e..0d9347ce5 100644 --- a/src/web/WebDataService.cpp +++ b/src/web/WebDataService.cpp @@ -176,11 +176,12 @@ void WebDataService::device_data(AsyncWebServerRequest * request, JsonVariant & emsdevice->generate_values_web(output); #endif -#ifdef EMSESP_USE_SERIAL -#ifdef EMSESP_DEBUG - serializeJson(output, Serial); -#endif -#endif + // #ifdef EMSESP_USE_SERIAL + // #ifdef EMSESP_DEBUG + // serializeJson(output, Serial); + // #endif + // #endif + response->setLength(); request->send(response); return; diff --git a/src/web/WebStatusService.cpp b/src/web/WebStatusService.cpp index bb9dd3050..f4122656b 100644 --- a/src/web/WebStatusService.cpp +++ b/src/web/WebStatusService.cpp @@ -129,34 +129,57 @@ void WebStatusService::webStatusService(AsyncWebServerRequest * request) { auto * response = new AsyncJsonResponse(false, EMSESP_JSON_SIZE_MEDIUM_DYN); JsonObject root = response->getRoot(); - root["status"] = EMSESP::bus_status(); // 0, 1 or 2 - root["num_devices"] = EMSESP::count_devices(); // excluding Controller - root["num_sensors"] = EMSESP::dallassensor_.no_sensors(); - root["num_analogs"] = EMSESP::analogsensor_.no_sensors(); - root["tx_mode"] = EMSESP::txservice_.tx_mode(); - root["rx_received"] = EMSESP::rxservice_.telegram_count(); - root["tx_reads"] = EMSESP::txservice_.telegram_read_count(); - root["tx_writes"] = EMSESP::txservice_.telegram_write_count(); - root["rx_quality"] = EMSESP::rxservice_.quality(); - root["tx_read_quality"] = EMSESP::txservice_.read_quality(); - root["tx_write_quality"] = EMSESP::txservice_.write_quality(); - root["rx_fails"] = EMSESP::rxservice_.telegram_error_count(); - root["tx_read_fails"] = EMSESP::txservice_.telegram_read_fail_count(); - root["tx_write_fails"] = EMSESP::txservice_.telegram_write_fail_count(); - root["sensor_fails"] = EMSESP::dallassensor_.fails(); - root["sensor_reads"] = EMSESP::dallassensor_.reads(); - root["sensor_quality"] = EMSESP::dallassensor_.reads() == 0 ? 100 : 100 - (uint8_t)((100 * EMSESP::dallassensor_.fails()) / EMSESP::dallassensor_.reads()); - root["analog_fails"] = EMSESP::analogsensor_.fails(); - root["analog_reads"] = EMSESP::analogsensor_.reads(); - root["analog_quality"] = EMSESP::analogsensor_.reads() == 0 ? 100 : 100 - (uint8_t)((100 * EMSESP::analogsensor_.fails()) / EMSESP::analogsensor_.reads()); - root["mqtt_fails"] = Mqtt::publish_fails(); - root["mqtt_count"] = Mqtt::publish_count(); - root["mqtt_quality"] = Mqtt::publish_count() == 0 ? 100 : 100 - (Mqtt::publish_fails() * 100) / (Mqtt::publish_count() + Mqtt::publish_fails()); - root["api_calls"] = WebAPIService::api_count(); // + WebAPIService::api_fails(); - root["api_fails"] = WebAPIService::api_fails(); - root["api_quality"] = - WebAPIService::api_count() == 0 ? 100 : 100 - (WebAPIService::api_fails() * 100) / (WebAPIService::api_count() + WebAPIService::api_fails()); - root["uptime"] = EMSbus::bus_uptime(); + root["status"] = EMSESP::bus_status(); // 0, 1 or 2 + root["tx_mode"] = EMSESP::txservice_.tx_mode(); + root["uptime"] = EMSbus::bus_uptime(); + root["num_devices"] = EMSESP::count_devices(); // excluding Controller + root["num_sensors"] = EMSESP::dallassensor_.no_sensors(); + root["num_analogs"] = EMSESP::analogsensor_.no_sensors(); + + JsonArray statsJson = root.createNestedArray("stats"); + JsonObject statJson; + + statJson = statsJson.createNestedObject(); + statJson["id"] = "EMS Telegrams Received (Rx)"; + statJson["s"] = EMSESP::rxservice_.telegram_count(); + statJson["f"] = EMSESP::rxservice_.telegram_error_count(); + statJson["q"] = EMSESP::rxservice_.quality(); + + statJson = statsJson.createNestedObject(); + statJson["id"] = "EMS Reads (Tx)"; + 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"] = "EMS Writes (Tx)"; + statJson["s"] = EMSESP::txservice_.telegram_write_count(); + statJson["f"] = EMSESP::txservice_.telegram_write_fail_count(); + statJson["q"] = EMSESP::txservice_.write_quality(); + + statJson = statsJson.createNestedObject(); + statJson["id"] = "Temperature Sensor Reads"; + 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()); + + statJson = statsJson.createNestedObject(); + statJson["id"] = "Analog Sensor Reads"; + 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()); + + statJson = statsJson.createNestedObject(); + statJson["id"] = "MQTT Publishes"; + statJson["s"] = Mqtt::publish_count(); + statJson["f"] = Mqtt::publish_fails(); + statJson["q"] = Mqtt::publish_count() == 0 ? 100 : 100 - (Mqtt::publish_fails() * 100) / (Mqtt::publish_count() + Mqtt::publish_fails()); + + statJson = statsJson.createNestedObject(); + statJson["id"] = "API Calls"; + statJson["s"] = WebAPIService::api_count(); // + WebAPIService::api_fails(); + statJson["f"] = WebAPIService::api_fails(); + statJson["q"] = WebAPIService::api_count() == 0 ? 100 : 100 - (WebAPIService::api_fails() * 100) / (WebAPIService::api_count() + WebAPIService::api_fails()); response->setLength(); request->send(response); From 2f21c896a6906bbc59e7258e64ad54abed9d3ea1 Mon Sep 17 00:00:00 2001 From: Proddy Date: Fri, 15 Apr 2022 18:40:35 +0200 Subject: [PATCH 05/21] fix dallas sensor checking --- interface/src/project/DashboardData.tsx | 6 +++--- interface/src/project/types.ts | 2 +- mock-api/server.js | 2 +- src/dallassensor.cpp | 8 ++++---- src/dallassensor.h | 2 +- src/test/test.cpp | 5 +++++ 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index 32edb00ad..e3009ccc4 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -235,7 +235,7 @@ const DashboardData: FC = () => { iconDown: }, sortFns: { - GPIO: (array) => array.sort((a, b) => a.i - b.i), + GPIO: (array) => array.sort((a, b) => a.g - b.g), NAME: (array) => array.sort((a, b) => a.n.localeCompare(b.n)), TYPE: (array) => array.sort((a, b) => a.t - b.t), VALUE: (array) => array.sort((a, b) => a.v.toString().localeCompare(b.v.toString())) @@ -531,7 +531,7 @@ const DashboardData: FC = () => { if (sensor) { try { const response = await EMSESP.writeSensor({ - id_str: sensor.id, + id: sensor.id, name: sensor.n, offset: sensor.o }); @@ -926,7 +926,7 @@ const DashboardData: FC = () => { {tableList.map((a: Analog) => ( updateAnalog(a)}> - {a.id} + {a.g} {a.n} {AnalogTypeNames[a.t]} {a.t ? formatValue(a.v, a.u) : ''} diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts index b41053881..bcf2815e3 100644 --- a/interface/src/project/types.ts +++ b/interface/src/project/types.ts @@ -84,7 +84,7 @@ export interface Analog { } export interface WriteSensor { - id_str: string; + id: string; name: string; offset: number; } diff --git a/mock-api/server.js b/mock-api/server.js index 0a8bdd56f..d188ecc83 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -972,7 +972,7 @@ rest_server.post(EMSESP_WRITE_VALUE_ENDPOINT, (req, res) => { rest_server.post(EMSESP_WRITE_SENSOR_ENDPOINT, (req, res) => { const sensor = req.body console.log('Write sensor: ' + JSON.stringify(sensor)) - objIndex = emsesp_sensordata.sensors.findIndex((obj) => obj.id == sensor.id_str) + objIndex = emsesp_sensordata.sensors.findIndex((obj) => obj.id == sensor.id) emsesp_sensordata.sensors[objIndex].n = sensor.name emsesp_sensordata.sensors[objIndex].o = sensor.offset res.sendStatus(200) diff --git a/src/dallassensor.cpp b/src/dallassensor.cpp index bb4d3f624..a66e070fd 100644 --- a/src/dallassensor.cpp +++ b/src/dallassensor.cpp @@ -503,15 +503,15 @@ DallasSensor::Sensor::Sensor(const uint8_t addr[]) : internal_id_(((uint64_t)addr[0] << 48) | ((uint64_t)addr[1] << 40) | ((uint64_t)addr[2] << 32) | ((uint64_t)addr[3] << 24) | ((uint64_t)addr[4] << 16) | ((uint64_t)addr[5] << 8) | ((uint64_t)addr[6])) { // create ID string - char id_str[20]; - snprintf(id_str, - sizeof(id_str), + char id_s[20]; + snprintf(id_s, + sizeof(id_s), "%02X-%04X-%04X-%04X", (unsigned int)(internal_id_ >> 48) & 0xFF, (unsigned int)(internal_id_ >> 32) & 0xFFFF, (unsigned int)(internal_id_ >> 16) & 0xFFFF, (unsigned int)(internal_id_)&0xFFFF); - id_ = std::string(id_str); + id_ = std::string(id_s); name_ = std::string{}; // name (alias) is empty offset_ = 0; // 0 degrees offset } diff --git a/src/dallassensor.h b/src/dallassensor.h index 009db5fa6..78bc9e29d 100644 --- a/src/dallassensor.h +++ b/src/dallassensor.h @@ -150,7 +150,7 @@ class DallasSensor { bool temperature_convert_complete(); int16_t get_temperature_c(const uint8_t addr[]); uint64_t get_id(const uint8_t addr[]); - void remove_ha_topic(const std::string & id_str); + void remove_ha_topic(const std::string & id); bool command_info(const char * value, const int8_t id, JsonObject & output); bool command_commands(const char * value, const int8_t id, JsonObject & output); diff --git a/src/test/test.cpp b/src/test/test.cpp index 52e546ce4..029636c9f 100644 --- a/src/test/test.cpp +++ b/src/test/test.cpp @@ -550,6 +550,11 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const if (command == "dallas") { shell.printfln(F("Testing adding Dallas sensor")); + emsesp::EMSESP::dallassensor_.test(); + } + + if (command == "dallas_full") { + shell.printfln(F("Testing adding and changing Dallas sensor")); Mqtt::ha_enabled(true); Mqtt::nested_format(1); // Mqtt::nested_format(0); From 275044bd78a63c2391cdc50f1312ff6b39d8da22 Mon Sep 17 00:00:00 2001 From: Proddy Date: Sat, 16 Apr 2022 09:04:34 +0200 Subject: [PATCH 06/21] customizations table part 1 --- interface/src/project/DashboardData.tsx | 8 +- .../src/project/SettingsCustomization.tsx | 203 +++++++++++++----- interface/src/project/types.ts | 2 +- mock-api/server.js | 174 +++++++-------- 4 files changed, 234 insertions(+), 153 deletions(-) diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index e3009ccc4..235fb8ece 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -285,11 +285,6 @@ const DashboardData: FC = () => { } ); - const paul = () => { - console.log('paul'); - sensor_sort.fns.onToggleSort({ sortKey: 'NAME' }); - }; - const device_select = useRowSelect( { nodes: coreData.devices }, { @@ -829,8 +824,7 @@ const DashboardData: FC = () => { fullWidth style={{ fontSize: '14px', justifyContent: 'flex-start' }} endIcon={getSortIcon(sensor_sort.state, 'NAME')} - // onClick={() => sensor_sort.fns.onToggleSort({ sortKey: 'NAME' })} - onClick={() => paul()} + onClick={() => sensor_sort.fns.onToggleSort({ sortKey: 'NAME' })} > NAME diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx index 3eba6cbc2..88fa675e9 100644 --- a/interface/src/project/SettingsCustomization.tsx +++ b/interface/src/project/SettingsCustomization.tsx @@ -2,10 +2,6 @@ import { FC, useState, useEffect, useCallback } from 'react'; import { Button, - Table, - TableBody, - TableHead, - TableRow, Typography, Box, MenuItem, @@ -17,19 +13,22 @@ import { ToggleButtonGroup } from '@mui/material'; -import TableCell, { tableCellClasses } from '@mui/material/TableCell'; - -import { styled } from '@mui/material/styles'; +import { Table } from '@table-library/react-table-library/table'; +import { useTheme } from '@table-library/react-table-library/theme'; +import { useSort } from '@table-library/react-table-library/sort'; +import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table'; import { useSnackbar } from 'notistack'; import SaveIcon from '@mui/icons-material/Save'; import CancelIcon from '@mui/icons-material/Cancel'; import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined'; -import FavoriteBorderOutlinedIcon from '@mui/icons-material/FavoriteBorderOutlined'; +import StarIcon from '@mui/icons-material/Star'; import VisibilityOffOutlinedIcon from '@mui/icons-material/VisibilityOffOutlined'; import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined'; import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore'; +import KeyboardArrowUpOutlinedIcon from '@mui/icons-material/KeyboardArrowUpOutlined'; +import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined'; import { ButtonRow, FormLoader, ValidatedTextField, SectionContent } from '../components'; @@ -39,16 +38,10 @@ import { extractErrorMessage } from '../utils'; import { DeviceShort, Devices, DeviceEntity } from './types'; -const StyledTableCell = styled(TableCell)(({ theme }) => ({ - [`&.${tableCellClasses.head}`]: { - backgroundColor: '#607d8b' - } -})); - const SettingsCustomization: FC = () => { const { enqueueSnackbar } = useSnackbar(); - const [deviceEntities, setDeviceEntities] = useState(); + const [deviceEntities, setDeviceEntities] = useState([{ id: '', v: 0, s: '', m: 0, w: false }]); const [devices, setDevices] = useState(); const [errorMessage, setErrorMessage] = useState(); const [selectedDevice, setSelectedDevice] = useState(0); @@ -57,6 +50,86 @@ const SettingsCustomization: FC = () => { // eslint-disable-next-line const [masks, setMasks] = useState(() => ['']); + const entities_theme = useTheme({ + BaseRow: ` + font-size: 14px; + color: white; + height: 32px; + `, + HeaderRow: ` + text-transform: uppercase; + background-color: black; + border-bottom: 1px solid #e0e0e0; + color: #90CAF9; + `, + Row: ` + background-color: #1e1e1e; + border-top: 1px solid #565656; + border-bottom: 1px solid #565656; + position: relative; + z-index: 1; + &:not(:last-of-type) { + margin-bottom: -1px; + } + &:not(:first-of-type) { + margin-top: -1px; + } + &:hover { + z-index: 2; + color: white; + border-top: 1px solid #177ac9; + border-bottom: 1px solid #177ac9; + }, + &.tr.tr-body.row-select.row-select-single-selected, &.tr.tr-body.row-select.row-select-selected { + background-color: #3d4752; + color: white; + font-weight: normal; + z-index: 2; + border-top: 1px solid #177ac9; + border-bottom: 1px solid #177ac9; + } + `, + BaseCell: ` + border-top: 1px solid transparent; + border-right: 1px solid transparent; + border-bottom: 1px solid transparent; + &:nth-of-type(1) { + min-width: 128px; + width: 128px; + } + ` + }); + + const getSortIcon = (state: any, sortKey: any) => { + if (state.sortKey === sortKey && state.reverse) { + return ; + } + + if (state.sortKey === sortKey && !state.reverse) { + return ; + } + }; + + const entity_sort = useSort( + { nodes: deviceEntities }, + { + state: { + sortKey: 'NAME', + reverse: false + } + }, + { + sortIcon: { + iconDefault: null, + iconUp: , + iconDown: + }, + sortFns: { + NAME: (array) => array.sort((a, b) => a.id.localeCompare(b.id)) + } + } + ); + const fetchDevices = useCallback(async () => { try { setDevices((await EMSESP.readDevices()).data); @@ -119,7 +192,7 @@ const SettingsCustomization: FC = () => { Select a device and customize each of its entities using the options: - +  mark it as favorite to be listed at the top of the Dashboard @@ -205,7 +278,7 @@ const SettingsCustomization: FC = () => { const getMask = (de: DeviceEntity) => { var new_masks = []; - if ((de.m & 1) === 1 || de.n === '') { + if ((de.m & 1) === 1 || de.id === '') { new_masks.push('1'); } if ((de.m & 2) === 2) { @@ -222,47 +295,61 @@ const SettingsCustomization: FC = () => { }; return ( - - - - OPTIONS - ENTITY NAME (CODE) - VALUE - - - - {deviceEntities.map((de) => ( - - - { - setMask(de, mask); - }} - > - - - - - - - - - - - - - - - - {de.n} ({de.s}) - - {formatValue(de.v)} - - ))} - +
+ {(tableList: any) => ( + <> +
+ + OPTIONS + + + + VALUE + + +
+ + {tableList.map((de: DeviceEntity) => ( + + + { + setMask(de, mask); + }} + > + + + + + + + + + + + + + + + + {de.id} ({de.s}) + + {formatValue(de.v)} + + ))} + + + )}
); }; diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts index bcf2815e3..c78745e55 100644 --- a/interface/src/project/types.ts +++ b/interface/src/project/types.ts @@ -129,7 +129,7 @@ export interface DeviceData { } export interface DeviceEntity { - n: string; // name + id: string; // name v: any; // value, in any format s: string; // shortname m: number; // mask diff --git a/mock-api/server.js b/mock-api/server.js index d188ecc83..972cd7ccc 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -576,35 +576,35 @@ const emsesp_devicedata_4 = { const emsesp_deviceentities_1 = [ { v: '(0)', - n: 'error code', + id: 'error code', s: 'errorcode', m: 0, w: false, }, { v: '14:54:39 06/06/2021', - n: 'date/time', + id: 'date/time', s: 'datetime', m: 0, w: false, }, { v: 18.2, - n: 'hc1 selected room temperature', + id: 'hc1 selected room temperature', s: 'hc1/seltemp', m: 0, w: true, }, { v: 22.6, - n: 'hc1 current room temperature', + id: 'hc1 current room temperature', s: 'hc1/curtemp', m: 0, w: false, }, { v: 'auto', - n: 'hc1 mode', + id: 'hc1 mode', s: 'hc1/mode', m: 0, w: true, @@ -612,105 +612,105 @@ const emsesp_deviceentities_1 = [ ] const emsesp_deviceentities_2 = [ - { v: false, n: 'heating active', s: 'heatingactive', m: 0 }, - { v: false, n: 'tapwater active', s: 'tapwateractive', m: 0 }, - { v: 5, n: 'selected flow temperature', s: 'selflowtemp', m: 0 }, - { v: 0, n: 'burner selected max power', s: 'selburnpow', m: 0 }, - { v: 0, n: 'heating pump modulation', s: 'heatingpumpmod', m: 0 }, - { n: 'heating pump 2 modulation', s: 'heatingpump2mod', m: 0 }, - { n: 'outside temperature', s: 'outdoortemp', m: 0 }, - { v: 53, n: 'current flow temperature', s: 'curflowtemp', m: 0 }, - { v: 51.8, n: 'return temperature', s: 'rettemp', m: 0 }, - { n: 'mixing switch temperature', s: 'switchtemp', m: 0 }, - { v: 1.3, n: 'system pressure', s: 'syspress', m: 0 }, - { v: 54.6, n: 'actual boiler temperature', s: 'boiltemp', m: 0 }, - { n: 'exhaust temperature', s: 'exhausttemp', m: 0 }, - { v: false, n: 'gas', s: 'burngas', m: 0 }, - { v: false, n: 'gas stage 2', s: 'burngas2', m: 0 }, - { v: 0, n: 'flame current', s: 'flamecurr', m: 0 }, - { v: false, n: 'heating pump', s: 'heatingpump', m: 0 }, - { v: false, n: 'fan', s: 'fanwork', m: 0 }, - { v: false, n: 'ignition', s: 'ignwork', m: 0 }, - { v: false, n: 'oil preheating', s: 'oilpreheat', m: 0 }, - { v: true, n: 'heating activated', s: 'heatingactivated', m: 0 }, - { v: 80, n: 'heating temperature', s: 'heatingtemp', m: 0 }, - { v: 70, n: 'burner pump max power', s: 'pumpmodmax', m: 0 }, - { v: 30, n: 'burner pump min power', s: 'pumpmodmin', m: 0 }, - { v: 1, n: 'pump delay', s: 'pumpdelay', m: 0 }, - { v: 10, n: 'burner min period', s: 'burnminperiod', m: 0 }, - { v: 0, n: 'burner min power', s: 'burnminpower', m: 0 }, - { v: 50, n: 'burner max power', s: 'burnmaxpower', m: 0 }, - { v: -6, n: 'hysteresis on temperature', s: 'boilhyston', m: 0 }, - { v: 6, n: 'hysteresis off temperature', s: 'boilhystoff', m: 0 }, - { v: 0, n: 'set flow temperature', s: 'setflowtemp', m: 0 }, - { v: 0, n: 'burner set power', s: 'setburnpow', m: 0 }, - { v: 0, n: 'burner current power', s: 'curburnpow', m: 0 }, - { v: 326323, n: 'burner starts', s: 'burnstarts', m: 0 }, - { v: 553437, n: 'total burner operating time', s: 'burnworkmin', m: 0 }, - { v: 451286, n: 'total heat operating time', s: 'heatworkmin', m: 0 }, - { v: 4672175, n: 'total UBA operating time', s: 'ubauptime', m: 0 }, - { v: '1C(210) 06.06.2020 12:07 (0 min)', n: 'last error code', s: 'lastcode', m: 0 }, - { v: '0H', n: 'service code', s: 'servicecode', m: 0 }, - { v: 203, n: 'service code number', s: 'servicecodenumber', m: 0 }, - { v: 'H00', n: 'maintenance message', s: 'maintenancemessage', m: 0 }, - { v: 'manual', n: 'maintenance scheduled', s: 'maintenance', m: 0 }, - { v: 6000, n: 'time to next maintenance', s: 'maintenancetime', m: 0 }, - { v: '01.01.2012', n: 'next maintenance date', s: 'maintenancedate', m: 0 }, - { v: true, n: 'dhw turn on/off', s: 'wwtapactivated', m: 0 }, - { v: 62, n: 'dhw set temperature', s: 'wwsettemp', m: 0 }, - { v: 60, n: 'dhw selected temperature', s: 'wwseltemp', m: 0 }, - { n: 'dhw selected lower temperature', s: 'wwseltemplow', m: 2 }, - { n: 'dhw selected temperature for off', s: 'wwseltempoff', m: 2 }, - { n: 'dhw single charge temperature', s: 'wwseltempsingle', m: 2 }, - { v: 'flow', n: 'dhw type', s: 'wwtype', m: 0 }, - { v: 'hot', n: 'dhw comfort', s: 'wwcomfort', m: 0 }, - { v: 40, n: 'dhw flow temperature offset', s: 'wwflowtempoffset', m: 0 }, - { v: 100, n: 'dhw max power', s: 'wwmaxpower', m: 0 }, - { v: false, n: 'dhw circulation pump available', s: 'wwcircpump', m: 0 }, - { v: '3-way valve', n: 'dhw charging type', s: 'wwchargetype', m: 0 }, - { v: -5, n: 'dhw hysteresis on temperature', s: 'wwhyston', m: 0 }, - { v: 0, n: 'dhw hysteresis off temperature', s: 'wwhystoff', m: 0 }, - { v: 70, n: 'dhw disinfection temperature', s: 'wwdisinfectiontemp', m: 0 }, - { v: 'off', n: 'dhw circulation pump mode', s: 'wwcircmode', m: 0 }, - { v: false, n: 'dhw circulation active', s: 'wwcirc', m: 0 }, - { v: 46.4, n: 'dhw current intern temperature', s: 'wwcurtemp', m: 0 }, - { n: 'dhw current extern temperature', s: 'wwcurtemp2', m: 2 }, - { v: 0, n: 'dhw current tap water flow', s: 'wwcurflow', m: 0 }, - { v: 46.3, n: 'dhw storage intern temperature', s: 'wwstoragetemp1', m: 0 }, - { n: 'dhw storage extern temperature', s: 'wwstoragetemp2', m: 2 }, - { v: true, n: 'dhw activated', s: 'wwactivated', m: 0 }, - { v: false, n: 'dhw one time charging', s: 'wwonetime', m: 0 }, - { v: false, n: 'dhw disinfecting', s: 'wwdisinfecting', m: 0 }, - { v: false, n: 'dhw charging', s: 'wwcharging', m: 0 }, - { v: false, n: 'dhw recharging', s: 'wwrecharging', m: 0 }, - { v: true, n: 'dhw temperature ok', s: 'wwtempok', m: 0 }, - { v: false, n: 'dhw active', s: 'wwactive', m: 0 }, - { v: true, n: 'dhw 3way valve active', s: 'ww3wayvalve', m: 0 }, - { v: 0, n: 'dhw set pump power', s: 'wwsetpumppower', m: 0 }, - { n: 'dhw mixer temperature', s: 'wwmixertemp', m: 2 }, - { n: 'dhw cylinder middle temperature (TS3)', s: 'wwcylmiddletemp', m: 2 }, - { v: 288768, n: 'dhw starts', s: 'wwstarts', m: 0 }, - { v: 102151, n: 'dhw active time', s: 'wwworkm', m: 0 }, + { v: false, id: 'heating active', s: 'heatingactive', m: 0 }, + { v: false, id: 'tapwater active', s: 'tapwateractive', m: 0 }, + { v: 5, id: 'selected flow temperature', s: 'selflowtemp', m: 0 }, + { v: 0, id: 'burner selected max power', s: 'selburnpow', m: 0 }, + { v: 0, id: 'heating pump modulation', s: 'heatingpumpmod', m: 0 }, + { id: 'heating pump 2 modulation', s: 'heatingpump2mod', m: 0 }, + { id: 'outside temperature', s: 'outdoortemp', m: 0 }, + { v: 53, id: 'current flow temperature', s: 'curflowtemp', m: 0 }, + { v: 51.8, id: 'return temperature', s: 'rettemp', m: 0 }, + { id: 'mixing switch temperature', s: 'switchtemp', m: 0 }, + { v: 1.3, id: 'system pressure', s: 'syspress', m: 0 }, + { v: 54.6, id: 'actual boiler temperature', s: 'boiltemp', m: 0 }, + { id: 'exhaust temperature', s: 'exhausttemp', m: 0 }, + { v: false, id: 'gas', s: 'burngas', m: 0 }, + { v: false, id: 'gas stage 2', s: 'burngas2', m: 0 }, + { v: 0, id: 'flame current', s: 'flamecurr', m: 0 }, + { v: false, id: 'heating pump', s: 'heatingpump', m: 0 }, + { v: false, id: 'fan', s: 'fanwork', m: 0 }, + { v: false, id: 'ignition', s: 'ignwork', m: 0 }, + { v: false, id: 'oil preheating', s: 'oilpreheat', m: 0 }, + { v: true, id: 'heating activated', s: 'heatingactivated', m: 0 }, + { v: 80, id: 'heating temperature', s: 'heatingtemp', m: 0 }, + { v: 70, id: 'burner pump max power', s: 'pumpmodmax', m: 0 }, + { v: 30, id: 'burner pump min power', s: 'pumpmodmin', m: 0 }, + { v: 1, id: 'pump delay', s: 'pumpdelay', m: 0 }, + { v: 10, id: 'burner min period', s: 'burnminperiod', m: 0 }, + { v: 0, id: 'burner min power', s: 'burnminpower', m: 0 }, + { v: 50, id: 'burner max power', s: 'burnmaxpower', m: 0 }, + { v: -6, id: 'hysteresis on temperature', s: 'boilhyston', m: 0 }, + { v: 6, id: 'hysteresis off temperature', s: 'boilhystoff', m: 0 }, + { v: 0, id: 'set flow temperature', s: 'setflowtemp', m: 0 }, + { v: 0, id: 'burner set power', s: 'setburnpow', m: 0 }, + { v: 0, id: 'burner current power', s: 'curburnpow', m: 0 }, + { v: 326323, id: 'burner starts', s: 'burnstarts', m: 0 }, + { v: 553437, id: 'total burner operating time', s: 'burnworkmin', m: 0 }, + { v: 451286, id: 'total heat operating time', s: 'heatworkmin', m: 0 }, + { v: 4672175, id: 'total UBA operating time', s: 'ubauptime', m: 0 }, + { v: '1C(210) 06.06.2020 12:07 (0 min)', id: 'last error code', s: 'lastcode', m: 0 }, + { v: '0H', id: 'service code', s: 'servicecode', m: 0 }, + { v: 203, id: 'service code number', s: 'servicecodenumber', m: 0 }, + { v: 'H00', id: 'maintenance message', s: 'maintenancemessage', m: 0 }, + { v: 'manual', id: 'maintenance scheduled', s: 'maintenance', m: 0 }, + { v: 6000, id: 'time to next maintenance', s: 'maintenancetime', m: 0 }, + { v: '01.01.2012', id: 'next maintenance date', s: 'maintenancedate', m: 0 }, + { v: true, id: 'dhw turn on/off', s: 'wwtapactivated', m: 0 }, + { v: 62, id: 'dhw set temperature', s: 'wwsettemp', m: 0 }, + { v: 60, id: 'dhw selected temperature', s: 'wwseltemp', m: 0 }, + { id: 'dhw selected lower temperature', s: 'wwseltemplow', m: 2 }, + { id: 'dhw selected temperature for off', s: 'wwseltempoff', m: 2 }, + { id: 'dhw single charge temperature', s: 'wwseltempsingle', m: 2 }, + { v: 'flow', id: 'dhw type', s: 'wwtype', m: 0 }, + { v: 'hot', id: 'dhw comfort', s: 'wwcomfort', m: 0 }, + { v: 40, id: 'dhw flow temperature offset', s: 'wwflowtempoffset', m: 0 }, + { v: 100, id: 'dhw max power', s: 'wwmaxpower', m: 0 }, + { v: false, id: 'dhw circulation pump available', s: 'wwcircpump', m: 0 }, + { v: '3-way valve', id: 'dhw charging type', s: 'wwchargetype', m: 0 }, + { v: -5, id: 'dhw hysteresis on temperature', s: 'wwhyston', m: 0 }, + { v: 0, id: 'dhw hysteresis off temperature', s: 'wwhystoff', m: 0 }, + { v: 70, id: 'dhw disinfection temperature', s: 'wwdisinfectiontemp', m: 0 }, + { v: 'off', id: 'dhw circulation pump mode', s: 'wwcircmode', m: 0 }, + { v: false, id: 'dhw circulation active', s: 'wwcirc', m: 0 }, + { v: 46.4, id: 'dhw current intern temperature', s: 'wwcurtemp', m: 0 }, + { id: 'dhw current extern temperature', s: 'wwcurtemp2', m: 2 }, + { v: 0, id: 'dhw current tap water flow', s: 'wwcurflow', m: 0 }, + { v: 46.3, id: 'dhw storage intern temperature', s: 'wwstoragetemp1', m: 0 }, + { id: 'dhw storage extern temperature', s: 'wwstoragetemp2', m: 2 }, + { v: true, id: 'dhw activated', s: 'wwactivated', m: 0 }, + { v: false, id: 'dhw one time charging', s: 'wwonetime', m: 0 }, + { v: false, id: 'dhw disinfecting', s: 'wwdisinfecting', m: 0 }, + { v: false, id: 'dhw charging', s: 'wwcharging', m: 0 }, + { v: false, id: 'dhw recharging', s: 'wwrecharging', m: 0 }, + { v: true, id: 'dhw temperature ok', s: 'wwtempok', m: 0 }, + { v: false, id: 'dhw active', s: 'wwactive', m: 0 }, + { v: true, id: 'dhw 3way valve active', s: 'ww3wayvalve', m: 0 }, + { v: 0, id: 'dhw set pump power', s: 'wwsetpumppower', m: 0 }, + { id: 'dhw mixer temperature', s: 'wwmixertemp', m: 2 }, + { id: 'dhw cylinder middle temperature (TS3)', s: 'wwcylmiddletemp', m: 2 }, + { v: 288768, id: 'dhw starts', s: 'wwstarts', m: 0 }, + { v: 102151, id: 'dhw active time', s: 'wwworkm', m: 0 }, ] const emsesp_deviceentities_4 = [ { v: 16, - n: 'hc2 selected room temperature', + id: 'hc2 selected room temperature', s: 'hc2/seltemp', m: 0, w: true, }, { v: 18.5, - n: 'hc2 current room temperature', + id: 'hc2 current room temperature', s: 'hc2/curtemp', m: 3, w: false, }, { v: 'off', - n: 'hc2 mode', + id: 'hc2 mode', s: 'hc2/mode', m: 3, w: true, From 9d7820d15593ef3f257f7b2ad72cf30c9df8bbdd Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 16 Apr 2022 15:31:46 +0200 Subject: [PATCH 07/21] togglebutton --- interface/src/project/DashboardData.tsx | 4 +- .../src/project/SettingsCustomization.tsx | 184 +++++++++++------- mock-api/server.js | 13 +- 3 files changed, 128 insertions(+), 73 deletions(-) diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index 235fb8ece..bac7800a1 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -661,7 +661,7 @@ const DashboardData: FC = () => { TYPE DESCRIPTION ENTITIES - + @@ -767,7 +767,7 @@ const DashboardData: FC = () => { VALUE - + diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx index 88fa675e9..e392cd03e 100644 --- a/interface/src/project/SettingsCustomization.tsx +++ b/interface/src/project/SettingsCustomization.tsx @@ -10,6 +10,7 @@ import { DialogContent, DialogTitle, ToggleButton, + IconButton, ToggleButtonGroup } from '@mui/material'; @@ -36,7 +37,7 @@ import * as EMSESP from './api'; import { extractErrorMessage } from '../utils'; -import { DeviceShort, Devices, DeviceEntity } from './types'; +import { DeviceShort, Devices, DeviceEntity, DeviceEntityMask } from './types'; const SettingsCustomization: FC = () => { const { enqueueSnackbar } = useSnackbar(); @@ -46,16 +47,20 @@ const SettingsCustomization: FC = () => { const [errorMessage, setErrorMessage] = useState(); const [selectedDevice, setSelectedDevice] = useState(0); const [confirmReset, setConfirmReset] = useState(false); + const [selectedFilters, setSelectedFilters] = useState(DeviceEntityMask.DV_FAVORITE); // eslint-disable-next-line const [masks, setMasks] = useState(() => ['']); const entities_theme = useTheme({ + Table: ` + height: 100%; + `, BaseRow: ` font-size: 14px; color: white; height: 32px; - `, + `, HeaderRow: ` text-transform: uppercase; background-color: black; @@ -88,14 +93,19 @@ const SettingsCustomization: FC = () => { border-top: 1px solid #177ac9; border-bottom: 1px solid #177ac9; } - `, + `, BaseCell: ` border-top: 1px solid transparent; border-right: 1px solid transparent; border-bottom: 1px solid transparent; &:nth-of-type(1) { - min-width: 128px; - width: 128px; + width: 130px; + } + &:nth-of-type(2) { + flex: 1; + } + &:last-of-type { + text-align: right; } ` }); @@ -192,7 +202,7 @@ const SettingsCustomization: FC = () => { Select a device and customize each of its entities using the options: - +  mark it as favorite to be listed at the top of the Dashboard @@ -263,10 +273,15 @@ const SettingsCustomization: FC = () => { }; const renderDeviceData = () => { - if (devices?.devices.length === 0 || !deviceEntities) { + if (devices?.devices.length === 0 || deviceEntities[0].id === '') { return; } + const hasMask = (de: DeviceEntity) => { + return de.m & selectedFilters; + return (de.m & DeviceEntityMask.DV_FAVORITE) === DeviceEntityMask.DV_FAVORITE; + }; + const setMask = (de: DeviceEntity, newMask: string[]) => { var new_mask = 0; for (let entry of newMask) { @@ -295,62 +310,95 @@ const SettingsCustomization: FC = () => { }; return ( - - {(tableList: any) => ( - <> -
- - OPTIONS - - - - VALUE - - -
- - {tableList.map((de: DeviceEntity) => ( - - - { - setMask(de, mask); - }} + <> + setSelectedDevice(8)}> + + + + { + // setMask(de, mask); + }} + > + + + + + + + + + + + + + + +
hasMask(de)) }} + theme={entities_theme} + sort={entity_sort} + layout={{ custom: true, horizontalScroll: true }} + > + {(tableList: any) => ( + <> +
+ + OPTIONS + +
+ NAME + + + VALUE + + + + + {tableList.map((de: DeviceEntity) => ( + + + { + setMask(de, mask); + }} + > + + + + + + + + + + + + + + + + {de.id} ({de.s}) + + {formatValue(de.v)} + + ))} + + + )} + + ); }; @@ -390,12 +438,18 @@ const SettingsCustomization: FC = () => { const content = () => { return ( - <> +
Device Entities {renderDeviceList()} - {renderDeviceData()} +
+ {renderDeviceData()} +
@@ -416,7 +470,7 @@ const SettingsCustomization: FC = () => { {renderResetDialog()} - +
); }; diff --git a/mock-api/server.js b/mock-api/server.js index 972cd7ccc..bfd5a0c8e 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -698,7 +698,7 @@ const emsesp_deviceentities_4 = [ v: 16, id: 'hc2 selected room temperature', s: 'hc2/seltemp', - m: 0, + m: 8, w: true, }, { @@ -916,15 +916,15 @@ function updateMask(entity, de, dd) { objIndex = de.findIndex((obj) => obj.s == name) if (objIndex !== -1) { de[objIndex].m = new_mask - const fullname = de[objIndex].n - objIndex = dd.data.findIndex((obj) => obj.n.slice(2) == fullname) + const fullname = de[objIndex].id + objIndex = dd.data.findIndex((obj) => obj.id.slice(2) == fullname) if (objIndex !== -1) { // see if the mask has changed - const old_mask = parseInt(dd.data[objIndex].n.slice(0, 2), 16) + const old_mask = parseInt(dd.data[objIndex].id.slice(0, 2), 16) if (old_mask !== new_mask) { const mask_hex = entity.slice(0, 2) - console.log('Updating ' + dd.data[objIndex].n + ' -> ' + mask_hex + fullname) - dd.data[objIndex].n = mask_hex + fullname + console.log('Updating ' + dd.data[objIndex].id + ' -> ' + mask_hex + fullname) + dd.data[objIndex].id = mask_hex + fullname } } } else { @@ -934,6 +934,7 @@ function updateMask(entity, de, dd) { rest_server.post(EMSESP_MASKED_ENTITIES_ENDPOINT, (req, res) => { const id = req.body.id + console.log('customization id = ' + id) console.log(req.body.entity_ids) for (const entity of req.body.entity_ids) { if (id === 1) { From 615e86d177f8a121a0d0a27b49b3ea3965978f0d Mon Sep 17 00:00:00 2001 From: Proddy Date: Sat, 16 Apr 2022 16:58:49 +0200 Subject: [PATCH 08/21] update --- .../src/project/SettingsCustomization.tsx | 125 ++++++++---------- 1 file changed, 52 insertions(+), 73 deletions(-) diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx index e392cd03e..805210275 100644 --- a/interface/src/project/SettingsCustomization.tsx +++ b/interface/src/project/SettingsCustomization.tsx @@ -10,8 +10,8 @@ import { DialogContent, DialogTitle, ToggleButton, - IconButton, - ToggleButtonGroup + ToggleButtonGroup, + Tooltip } from '@mui/material'; import { Table } from '@table-library/react-table-library/table'; @@ -37,7 +37,7 @@ import * as EMSESP from './api'; import { extractErrorMessage } from '../utils'; -import { DeviceShort, Devices, DeviceEntity, DeviceEntityMask } from './types'; +import { DeviceShort, Devices, DeviceEntity } from './types'; const SettingsCustomization: FC = () => { const { enqueueSnackbar } = useSnackbar(); @@ -47,7 +47,7 @@ const SettingsCustomization: FC = () => { const [errorMessage, setErrorMessage] = useState(); const [selectedDevice, setSelectedDevice] = useState(0); const [confirmReset, setConfirmReset] = useState(false); - const [selectedFilters, setSelectedFilters] = useState(DeviceEntityMask.DV_FAVORITE); + const [selectedFilters, setSelectedFilters] = useState(15); // eslint-disable-next-line const [masks, setMasks] = useState(() => ['']); @@ -200,23 +200,7 @@ const SettingsCustomization: FC = () => { return ( <> - Select a device and customize each of its entities using the options: - - -  mark it as favorite to be listed at the top of the Dashboard - - - -  make it read-only, only if it has write operation available - - - -  excluded it from MQTT and API outputs - - - -  hide it from the Dashboard - + Select a device and customize each of its entities using the options. { return; } - const hasMask = (de: DeviceEntity) => { - return de.m & selectedFilters; - return (de.m & DeviceEntityMask.DV_FAVORITE) === DeviceEntityMask.DV_FAVORITE; - }; - - const setMask = (de: DeviceEntity, newMask: string[]) => { + const getMaskNumber = (newMask: string[]) => { var new_mask = 0; for (let entry of newMask) { new_mask |= Number(entry); } - de.m = new_mask; - setMasks(newMask); + return new_mask; }; - const getMask = (de: DeviceEntity) => { + const getMaskString = (m: number) => { var new_masks = []; - if ((de.m & 1) === 1 || de.id === '') { + if ((m & 1) === 1) { new_masks.push('1'); } - if ((de.m & 2) === 2) { + if ((m & 2) === 2) { new_masks.push('2'); } - if ((de.m & 4) === 4 && de.w) { + if ((m & 4) === 4) { new_masks.push('4'); } - if ((de.m & 8) === 8) { + if ((m & 8) === 8) { new_masks.push('8'); } - return new_masks; }; return ( <> - setSelectedDevice(8)}> - - - - { - // setMask(de, mask); - }} - > - - - - - - - - - - - - - + + Apply filter:  + { + setSelectedFilters(getMaskNumber(mask)); + }} + > + + + + + + + + + + + + + + + + + + + + + + hasMask(de)) }} + data={{ nodes: deviceEntities.filter((de) => de.m & selectedFilters || !selectedFilters) }} theme={entities_theme} sort={entity_sort} - layout={{ custom: true, horizontalScroll: true }} + layout={{ custom: true }} > {(tableList: any) => ( <> @@ -369,9 +353,10 @@ const SettingsCustomization: FC = () => { { - setMask(de, mask); + de.m = getMaskNumber(mask); + setMasks(['']); }} > @@ -438,18 +423,12 @@ const SettingsCustomization: FC = () => { const content = () => { return ( -
+ <> Device Entities {renderDeviceList()} -
- {renderDeviceData()} -
+ {renderDeviceData()} @@ -470,7 +449,7 @@ const SettingsCustomization: FC = () => { {renderResetDialog()} -
+ ); }; From 3acb9c456e10e3d6e8a40fb507fbb8982df127d7 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 16 Apr 2022 18:16:01 +0200 Subject: [PATCH 09/21] formatting --- .../src/project/SettingsCustomization.tsx | 7 +- mock-api/server.js | 144 +++++++++--------- 2 files changed, 75 insertions(+), 76 deletions(-) diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx index 805210275..905647f06 100644 --- a/interface/src/project/SettingsCustomization.tsx +++ b/interface/src/project/SettingsCustomization.tsx @@ -47,7 +47,7 @@ const SettingsCustomization: FC = () => { const [errorMessage, setErrorMessage] = useState(); const [selectedDevice, setSelectedDevice] = useState(0); const [confirmReset, setConfirmReset] = useState(false); - const [selectedFilters, setSelectedFilters] = useState(15); + const [selectedFilters, setSelectedFilters] = useState(0); // eslint-disable-next-line const [masks, setMasks] = useState(() => ['']); @@ -288,7 +288,7 @@ const SettingsCustomization: FC = () => { return ( <> - + Apply filter:  { - - +
de.m & selectedFilters || !selectedFilters) }} theme={entities_theme} diff --git a/mock-api/server.js b/mock-api/server.js index bfd5a0c8e..ae20b680e 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -612,85 +612,85 @@ const emsesp_deviceentities_1 = [ ] const emsesp_deviceentities_2 = [ - { v: false, id: 'heating active', s: 'heatingactive', m: 0 }, - { v: false, id: 'tapwater active', s: 'tapwateractive', m: 0 }, - { v: 5, id: 'selected flow temperature', s: 'selflowtemp', m: 0 }, - { v: 0, id: 'burner selected max power', s: 'selburnpow', m: 0 }, - { v: 0, id: 'heating pump modulation', s: 'heatingpumpmod', m: 0 }, - { id: 'heating pump 2 modulation', s: 'heatingpump2mod', m: 0 }, - { id: 'outside temperature', s: 'outdoortemp', m: 0 }, - { v: 53, id: 'current flow temperature', s: 'curflowtemp', m: 0 }, - { v: 51.8, id: 'return temperature', s: 'rettemp', m: 0 }, - { id: 'mixing switch temperature', s: 'switchtemp', m: 0 }, - { v: 1.3, id: 'system pressure', s: 'syspress', m: 0 }, - { v: 54.6, id: 'actual boiler temperature', s: 'boiltemp', m: 0 }, - { id: 'exhaust temperature', s: 'exhausttemp', m: 0 }, - { v: false, id: 'gas', s: 'burngas', m: 0 }, - { v: false, id: 'gas stage 2', s: 'burngas2', m: 0 }, - { v: 0, id: 'flame current', s: 'flamecurr', m: 0 }, - { v: false, id: 'heating pump', s: 'heatingpump', m: 0 }, - { v: false, id: 'fan', s: 'fanwork', m: 0 }, - { v: false, id: 'ignition', s: 'ignwork', m: 0 }, - { v: false, id: 'oil preheating', s: 'oilpreheat', m: 0 }, - { v: true, id: 'heating activated', s: 'heatingactivated', m: 0 }, - { v: 80, id: 'heating temperature', s: 'heatingtemp', m: 0 }, - { v: 70, id: 'burner pump max power', s: 'pumpmodmax', m: 0 }, - { v: 30, id: 'burner pump min power', s: 'pumpmodmin', m: 0 }, - { v: 1, id: 'pump delay', s: 'pumpdelay', m: 0 }, - { v: 10, id: 'burner min period', s: 'burnminperiod', m: 0 }, - { v: 0, id: 'burner min power', s: 'burnminpower', m: 0 }, - { v: 50, id: 'burner max power', s: 'burnmaxpower', m: 0 }, - { v: -6, id: 'hysteresis on temperature', s: 'boilhyston', m: 0 }, - { v: 6, id: 'hysteresis off temperature', s: 'boilhystoff', m: 0 }, - { v: 0, id: 'set flow temperature', s: 'setflowtemp', m: 0 }, - { v: 0, id: 'burner set power', s: 'setburnpow', m: 0 }, - { v: 0, id: 'burner current power', s: 'curburnpow', m: 0 }, - { v: 326323, id: 'burner starts', s: 'burnstarts', m: 0 }, - { v: 553437, id: 'total burner operating time', s: 'burnworkmin', m: 0 }, - { v: 451286, id: 'total heat operating time', s: 'heatworkmin', m: 0 }, - { v: 4672175, id: 'total UBA operating time', s: 'ubauptime', m: 0 }, - { v: '1C(210) 06.06.2020 12:07 (0 min)', id: 'last error code', s: 'lastcode', m: 0 }, - { v: '0H', id: 'service code', s: 'servicecode', m: 0 }, - { v: 203, id: 'service code number', s: 'servicecodenumber', m: 0 }, - { v: 'H00', id: 'maintenance message', s: 'maintenancemessage', m: 0 }, - { v: 'manual', id: 'maintenance scheduled', s: 'maintenance', m: 0 }, - { v: 6000, id: 'time to next maintenance', s: 'maintenancetime', m: 0 }, - { v: '01.01.2012', id: 'next maintenance date', s: 'maintenancedate', m: 0 }, - { v: true, id: 'dhw turn on/off', s: 'wwtapactivated', m: 0 }, - { v: 62, id: 'dhw set temperature', s: 'wwsettemp', m: 0 }, - { v: 60, id: 'dhw selected temperature', s: 'wwseltemp', m: 0 }, + { v: false, id: 'heating active', s: 'heatingactive', m: 0, w: false }, + { v: false, id: 'tapwater active', s: 'tapwateractive', m: 0, w: false }, + { v: 5, id: 'selected flow temperature', s: 'selflowtemp', m: 0, w: true }, + { v: 0, id: 'burner selected max power', s: 'selburnpow', m: 0, w: true }, + { v: 0, id: 'heating pump modulation', s: 'heatingpumpmod', m: 0, w: false }, + { id: 'heating pump 2 modulation', s: 'heatingpump2mod', m: 0, w: false }, + { id: 'outside temperature', s: 'outdoortemp', m: 0, w: false }, + { v: 53, id: 'current flow temperature', s: 'curflowtemp', m: 0, w: false }, + { v: 51.8, id: 'return temperature', s: 'rettemp', m: 0, w: false }, + { id: 'mixing switch temperature', s: 'switchtemp', m: 0, w: false }, + { v: 1.3, id: 'system pressure', s: 'syspress', m: 0, w: false }, + { v: 54.6, id: 'actual boiler temperature', s: 'boiltemp', m: 0, w: false }, + { id: 'exhaust temperature', s: 'exhausttemp', m: 0, w: false }, + { v: false, id: 'gas', s: 'burngas', m: 0, w: false }, + { v: false, id: 'gas stage 2', s: 'burngas2', m: 0, w: false }, + { v: 0, id: 'flame current', s: 'flamecurr', m: 0, w: false }, + { v: false, id: 'heating pump', s: 'heatingpump', m: 0, w: false }, + { v: false, id: 'fan', s: 'fanwork', m: 0, w: false }, + { v: false, id: 'ignition', s: 'ignwork', m: 0, w: false }, + { v: false, id: 'oil preheating', s: 'oilpreheat', m: 0, w: false }, + { v: true, id: 'heating activated', s: 'heatingactivated', m: 0, w: false }, + { v: 80, id: 'heating temperature', s: 'heatingtemp', m: 0, w: false }, + { v: 70, id: 'burner pump max power', s: 'pumpmodmax', m: 0, w: false }, + { v: 30, id: 'burner pump min power', s: 'pumpmodmin', m: 0, w: false }, + { v: 1, id: 'pump delay', s: 'pumpdelay', m: 0, w: false }, + { v: 10, id: 'burner min period', s: 'burnminperiod', m: 0, w: false }, + { v: 0, id: 'burner min power', s: 'burnminpower', m: 0, w: false }, + { v: 50, id: 'burner max power', s: 'burnmaxpower', m: 0, w: false }, + { v: -6, id: 'hysteresis on temperature', s: 'boilhyston', m: 0, w: false }, + { v: 6, id: 'hysteresis off temperature', s: 'boilhystoff', m: 0, w: false }, + { v: 0, id: 'set flow temperature', s: 'setflowtemp', m: 0, w: true }, + { v: 0, id: 'burner set power', s: 'setburnpow', m: 0, w: false }, + { v: 0, id: 'burner current power', s: 'curburnpow', m: 0, w: false }, + { v: 326323, id: 'burner starts', s: 'burnstarts', m: 0, w: false }, + { v: 553437, id: 'total burner operating time', s: 'burnworkmin', m: 0, w: false }, + { v: 451286, id: 'total heat operating time', s: 'heatworkmin', m: 0, w: false }, + { v: 4672175, id: 'total UBA operating time', s: 'ubauptime', m: 0, w: false }, + { v: '1C(210) 06.06.2020 12:07 (0 min)', id: 'last error code', s: 'lastcode', m: 0, w: false }, + { v: '0H', id: 'service code', s: 'servicecode', m: 0, w: false }, + { v: 203, id: 'service code number', s: 'servicecodenumber', m: 0, w: false }, + { v: 'H00', id: 'maintenance message', s: 'maintenancemessage', m: 0, w: false }, + { v: 'manual', id: 'maintenance scheduled', s: 'maintenance', m: 0, w: false }, + { v: 6000, id: 'time to next maintenance', s: 'maintenancetime', m: 0, w: false }, + { v: '01.01.2012', id: 'next maintenance date', s: 'maintenancedate', m: 0, w: false }, + { v: true, id: 'dhw turn on/off', s: 'wwtapactivated', m: 0, w: false }, + { v: 62, id: 'dhw set temperature', s: 'wwsettemp', m: 0, w: false }, + { v: 60, id: 'dhw selected temperature', s: 'wwseltemp', m: 0, w: true }, { id: 'dhw selected lower temperature', s: 'wwseltemplow', m: 2 }, { id: 'dhw selected temperature for off', s: 'wwseltempoff', m: 2 }, { id: 'dhw single charge temperature', s: 'wwseltempsingle', m: 2 }, - { v: 'flow', id: 'dhw type', s: 'wwtype', m: 0 }, - { v: 'hot', id: 'dhw comfort', s: 'wwcomfort', m: 0 }, - { v: 40, id: 'dhw flow temperature offset', s: 'wwflowtempoffset', m: 0 }, - { v: 100, id: 'dhw max power', s: 'wwmaxpower', m: 0 }, - { v: false, id: 'dhw circulation pump available', s: 'wwcircpump', m: 0 }, - { v: '3-way valve', id: 'dhw charging type', s: 'wwchargetype', m: 0 }, - { v: -5, id: 'dhw hysteresis on temperature', s: 'wwhyston', m: 0 }, - { v: 0, id: 'dhw hysteresis off temperature', s: 'wwhystoff', m: 0 }, - { v: 70, id: 'dhw disinfection temperature', s: 'wwdisinfectiontemp', m: 0 }, - { v: 'off', id: 'dhw circulation pump mode', s: 'wwcircmode', m: 0 }, - { v: false, id: 'dhw circulation active', s: 'wwcirc', m: 0 }, - { v: 46.4, id: 'dhw current intern temperature', s: 'wwcurtemp', m: 0 }, + { v: 'flow', id: 'dhw type', s: 'wwtype', m: 0, w: false }, + { v: 'hot', id: 'dhw comfort', s: 'wwcomfort', m: 0, w: false }, + { v: 40, id: 'dhw flow temperature offset', s: 'wwflowtempoffset', m: 0, w: false }, + { v: 100, id: 'dhw max power', s: 'wwmaxpower', m: 0, w: false }, + { v: false, id: 'dhw circulation pump available', s: 'wwcircpump', m: 0, w: false }, + { v: '3-way valve', id: 'dhw charging type', s: 'wwchargetype', m: 0, w: false }, + { v: -5, id: 'dhw hysteresis on temperature', s: 'wwhyston', m: 0, w: false }, + { v: 0, id: 'dhw hysteresis off temperature', s: 'wwhystoff', m: 0, w: false }, + { v: 70, id: 'dhw disinfection temperature', s: 'wwdisinfectiontemp', m: 0, w: false }, + { v: 'off', id: 'dhw circulation pump mode', s: 'wwcircmode', m: 0, w: false }, + { v: false, id: 'dhw circulation active', s: 'wwcirc', m: 0, w: false }, + { v: 46.4, id: 'dhw current intern temperature', s: 'wwcurtemp', m: 0, w: false }, { id: 'dhw current extern temperature', s: 'wwcurtemp2', m: 2 }, - { v: 0, id: 'dhw current tap water flow', s: 'wwcurflow', m: 0 }, - { v: 46.3, id: 'dhw storage intern temperature', s: 'wwstoragetemp1', m: 0 }, + { v: 0, id: 'dhw current tap water flow', s: 'wwcurflow', m: 0, w: false }, + { v: 46.3, id: 'dhw storage intern temperature', s: 'wwstoragetemp1', m: 0, w: false }, { id: 'dhw storage extern temperature', s: 'wwstoragetemp2', m: 2 }, - { v: true, id: 'dhw activated', s: 'wwactivated', m: 0 }, - { v: false, id: 'dhw one time charging', s: 'wwonetime', m: 0 }, - { v: false, id: 'dhw disinfecting', s: 'wwdisinfecting', m: 0 }, - { v: false, id: 'dhw charging', s: 'wwcharging', m: 0 }, - { v: false, id: 'dhw recharging', s: 'wwrecharging', m: 0 }, - { v: true, id: 'dhw temperature ok', s: 'wwtempok', m: 0 }, - { v: false, id: 'dhw active', s: 'wwactive', m: 0 }, - { v: true, id: 'dhw 3way valve active', s: 'ww3wayvalve', m: 0 }, - { v: 0, id: 'dhw set pump power', s: 'wwsetpumppower', m: 0 }, + { v: true, id: 'dhw activated', s: 'wwactivated', m: 0, w: false }, + { v: false, id: 'dhw one time charging', s: 'wwonetime', m: 0, w: false }, + { v: false, id: 'dhw disinfecting', s: 'wwdisinfecting', m: 0, w: false }, + { v: false, id: 'dhw charging', s: 'wwcharging', m: 0, w: false }, + { v: false, id: 'dhw recharging', s: 'wwrecharging', m: 0, w: false }, + { v: true, id: 'dhw temperature ok', s: 'wwtempok', m: 0, w: false }, + { v: false, id: 'dhw active', s: 'wwactive', m: 0, w: false }, + { v: true, id: 'dhw 3way valve active', s: 'ww3wayvalve', m: 0, w: false }, + { v: 0, id: 'dhw set pump power', s: 'wwsetpumppower', m: 0, w: true }, { id: 'dhw mixer temperature', s: 'wwmixertemp', m: 2 }, { id: 'dhw cylinder middle temperature (TS3)', s: 'wwcylmiddletemp', m: 2 }, - { v: 288768, id: 'dhw starts', s: 'wwstarts', m: 0 }, - { v: 102151, id: 'dhw active time', s: 'wwworkm', m: 0 }, + { v: 288768, id: 'dhw starts', s: 'wwstarts', m: 0, w: false }, + { v: 102151, id: 'dhw active time', s: 'wwworkm', m: 0, w: false }, ] const emsesp_deviceentities_4 = [ From 3c9cad2717c8d966cdec408d887a2878c4a206a2 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 17 Apr 2022 20:52:24 +0200 Subject: [PATCH 10/21] add set all enabled button --- interface/src/framework/ap/APSettingsForm.tsx | 1 + .../src/project/SettingsCustomization.tsx | 100 ++++++++++++------ 2 files changed, 66 insertions(+), 35 deletions(-) diff --git a/interface/src/framework/ap/APSettingsForm.tsx b/interface/src/framework/ap/APSettingsForm.tsx index f15c6b802..8080f4f0f 100644 --- a/interface/src/framework/ap/APSettingsForm.tsx +++ b/interface/src/framework/ap/APSettingsForm.tsx @@ -14,6 +14,7 @@ import { ValidatedPasswordField, ValidatedTextField } from '../../components'; + import { APProvisionMode, APSettings } from '../../types'; import { numberValue, updateValue, useRest } from '../../utils'; import * as APApi from '../../api/ap'; diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx index 905647f06..ad9ab5b90 100644 --- a/interface/src/project/SettingsCustomization.tsx +++ b/interface/src/project/SettingsCustomization.tsx @@ -11,7 +11,8 @@ import { DialogTitle, ToggleButton, ToggleButtonGroup, - Tooltip + Tooltip, + Grid } from '@mui/material'; import { Table } from '@table-library/react-table-library/table'; @@ -37,7 +38,7 @@ import * as EMSESP from './api'; import { extractErrorMessage } from '../utils'; -import { DeviceShort, Devices, DeviceEntity } from './types'; +import { DeviceShort, Devices, DeviceEntity, DeviceEntityMask } from './types'; const SettingsCustomization: FC = () => { const { enqueueSnackbar } = useSnackbar(); @@ -286,40 +287,69 @@ const SettingsCustomization: FC = () => { return new_masks; }; + const maskDisabled = (set: boolean) => { + setDeviceEntities( + deviceEntities + .filter((de) => de.m & selectedFilters || !selectedFilters) + .map(({ m, ...entities }) => ({ + ...entities, + m: set + ? m | (DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE) + : m & ~(DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE) + })) + ); + }; + return ( <> - - Apply filter:  - { - setSelectedFilters(getMaskNumber(mask)); - }} - > - - - - - - - - - - - - - - - - - - - - - - + + + + Apply filter:  + + + + { + setSelectedFilters(getMaskNumber(mask)); + }} + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
de.m & selectedFilters || !selectedFilters) }} theme={entities_theme} @@ -401,7 +431,7 @@ const SettingsCustomization: FC = () => { setConfirmReset(false)}> Reset - Are you sure you want remove all customizations? EMS-ESP will then restart. + Are you sure you want remove all customizations including the settings of Temperature and Analog sensors? - + diff --git a/interface/src/project/DashboardStatus.tsx b/interface/src/project/DashboardStatus.tsx index 1397f9797..4a0df9df1 100644 --- a/interface/src/project/DashboardStatus.tsx +++ b/interface/src/project/DashboardStatus.tsx @@ -91,7 +91,7 @@ const DashboardStatus: FC = () => { BaseRow: ` font-size: 14px; color: white; - `, + `, HeaderRow: ` text-transform: uppercase; background-color: black; @@ -118,7 +118,7 @@ const DashboardStatus: FC = () => { &:hover { color: white; } - `, + `, BaseCell: ` border-top: 1px solid transparent; border-right: 1px solid transparent; diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx index ca7077c0c..801cf228a 100644 --- a/interface/src/project/SettingsCustomization.tsx +++ b/interface/src/project/SettingsCustomization.tsx @@ -54,9 +54,6 @@ const SettingsCustomization: FC = () => { const [masks, setMasks] = useState(() => ['']); const entities_theme = useTheme({ - Table: ` - height: 100%; - `, BaseRow: ` font-size: 14px; color: white; @@ -100,13 +97,13 @@ const SettingsCustomization: FC = () => { border-right: 1px solid transparent; border-bottom: 1px solid transparent; &:nth-of-type(1) { - width: 130px; + left: 0px; + min-width: 124px; + width: 124px; } &:nth-of-type(2) { - flex: 1; - } - &:last-of-type { - text-align: right; + min-width: 70%; + width: 70%; } ` }); @@ -302,10 +299,19 @@ const SettingsCustomization: FC = () => { return ( <> - + - - Apply filter:  + + Set filter:  @@ -354,13 +360,13 @@ const SettingsCustomization: FC = () => { data={{ nodes: deviceEntities.filter((de) => de.m & selectedFilters || !selectedFilters) }} theme={entities_theme} sort={entity_sort} - layout={{ custom: true }} + layout={{ custom: true, horizontalScroll: true }} > {(tableList: any) => ( <>
- OPTIONS + OPTIONS - VALUE + VALUE
diff --git a/mock-api/server.js b/mock-api/server.js index ae20b680e..898d644e0 100644 --- a/mock-api/server.js +++ b/mock-api/server.js @@ -555,19 +555,19 @@ const emsesp_devicedata_4 = { { v: 16, u: 1, - id: '00hc2 selected room temperature', + id: '08hc2 selected room temperature', c: 'hc2/seltemp', }, { v: 18.6, u: 1, - id: '00hc2 current room temperature', + id: '02hc2 current room temperature', c: '', }, { v: 'off', u: 0, - id: '00hc2 mode', + id: '02hc2 mode', c: 'hc2/mode', }, ], @@ -705,14 +705,14 @@ const emsesp_deviceentities_4 = [ v: 18.5, id: 'hc2 current room temperature', s: 'hc2/curtemp', - m: 3, + m: 2, w: false, }, { v: 'off', id: 'hc2 mode', s: 'hc2/mode', - m: 3, + m: 2, w: true, }, ] diff --git a/src/analogsensor.cpp b/src/analogsensor.cpp index 9c78d6760..7a6856f53 100644 --- a/src/analogsensor.cpp +++ b/src/analogsensor.cpp @@ -460,7 +460,7 @@ bool AnalogSensor::command_info(const char * value, const int8_t id, JsonObject for (const auto & sensor : sensors_) { if (id == -1) { // show number and id JsonObject dataSensor = output.createNestedObject(sensor.name()); - dataSensor["gpio"] = sensor.gpio(); + dataSensor["gpio"] = sensor.gpio(); dataSensor["type"] = FL_(enum_sensortype)[sensor.type()]; if (sensor.type() == AnalogType::ADC) { dataSensor["uom"] = EMSdevice::uom_to_string(sensor.uom()); diff --git a/src/devices/boiler.h b/src/devices/boiler.h index 00d019898..71e71365c 100644 --- a/src/devices/boiler.h +++ b/src/devices/boiler.h @@ -193,7 +193,7 @@ class Boiler : public EMSdevice { // Pool unit int8_t poolSetTemp_; -/* + /* * Hybrid heatpump with telegram 0xBB is readable and writeable in boiler and thermostat * thermostat always overwrites settings in boiler * enable settings here if no thermostat is used in system diff --git a/src/version.h b/src/version.h index 16885163f..bc33dab7b 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.4.0b12" +#define EMSESP_APP_VERSION "3.4.0b12t" diff --git a/src/web/WebCustomizationService.cpp b/src/web/WebCustomizationService.cpp index 3a0afb88e..2634030fd 100644 --- a/src/web/WebCustomizationService.cpp +++ b/src/web/WebCustomizationService.cpp @@ -61,7 +61,7 @@ void WebCustomization::read(WebCustomization & settings, JsonObject & root) { JsonArray sensorsJson = root.createNestedArray("sensors"); for (const SensorCustomization & sensor : settings.sensorCustomizations) { JsonObject sensorJson = sensorsJson.createNestedObject(); - sensorJson["id"] = sensor.id; // is + sensorJson["id"] = sensor.id; // is sensorJson["name"] = sensor.name; // n sensorJson["offset"] = sensor.offset; // o } @@ -101,7 +101,7 @@ StateUpdateResult WebCustomization::update(JsonObject & root, WebCustomization & for (const JsonObject sensorJson : root["sensors"].as()) { // create each of the sensor, overwritting any previous settings auto sensor = SensorCustomization(); - sensor.id = sensorJson["id"].as(); + sensor.id = sensorJson["id"].as(); sensor.name = sensorJson["name"].as(); sensor.offset = sensorJson["offset"]; settings.sensorCustomizations.push_back(sensor); // add to list From 22595b0f24517786e611f81b064a6c3105c25042 Mon Sep 17 00:00:00 2001 From: Proddy Date: Mon, 18 Apr 2022 12:54:44 +0200 Subject: [PATCH 13/21] show resize column header bars, disable default sorting --- interface/src/project/DashboardData.tsx | 39 +++++++------------ .../src/project/SettingsCustomization.tsx | 18 +++++---- src/version.h | 2 +- 3 files changed, 25 insertions(+), 34 deletions(-) diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index ca072071d..a4e32ae00 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -42,6 +42,7 @@ import EditOffOutlinedIcon from '@mui/icons-material/EditOffOutlined'; import CommentsDisabledOutlinedIcon from '@mui/icons-material/CommentsDisabledOutlined'; import KeyboardArrowUpOutlinedIcon from '@mui/icons-material/KeyboardArrowUpOutlined'; import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined'; +import UnfoldMoreOutlinedIcon from '@mui/icons-material/UnfoldMoreOutlined'; import StarIcon from '@mui/icons-material/Star'; import DeviceIcon from './DeviceIcon'; @@ -208,6 +209,9 @@ const DashboardData: FC = () => { `, HeaderCell: ` padding-left: 0px; + &:not(:last-of-type) { + border-right: 1px solid #565656; + } ` }); @@ -215,23 +219,18 @@ const DashboardData: FC = () => { if (state.sortKey === sortKey && state.reverse) { return ; } - if (state.sortKey === sortKey && !state.reverse) { return ; } + return ; }; const analog_sort = useSort( { nodes: sensorData.analogs }, - { - state: { - sortKey: 'GPIO', - reverse: false - } - }, + {}, { sortIcon: { - iconDefault: null, + iconDefault: , iconUp: , iconDown: }, @@ -246,15 +245,10 @@ const DashboardData: FC = () => { const sensor_sort = useSort( { nodes: sensorData.sensors }, - { - state: { - sortKey: 'NAME', - reverse: false - } - }, + {}, { sortIcon: { - iconDefault: null, + iconDefault: , iconUp: , iconDown: }, @@ -267,15 +261,10 @@ const DashboardData: FC = () => { const dv_sort = useSort( { nodes: deviceData.data }, - { - state: { - sortKey: 'NAME', - reverse: false - } - }, + {}, { sortIcon: { - iconDefault: null, + iconDefault: , iconUp: , iconDown: }, @@ -759,7 +748,7 @@ const DashboardData: FC = () => { ENTITY NAME - + - + - + -
de.m & selectedFilters || !selectedFilters) }} + data={{ + nodes: deviceEntities.filter( + (de) => (de.m & selectedFilters || !selectedFilters) && de.id.toLowerCase().includes(search.toLowerCase()) + ) + }} theme={entities_theme} sort={entity_sort} layout={{ custom: true, horizontalScroll: true }} diff --git a/src/version.h b/src/version.h index 7814cfaf4..a7efafb90 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.4.0b12t2" +#define EMSESP_APP_VERSION "3.4.0b12t3" From 56860da4af001de4a71c87ed8e98e4e85c6a2c1d Mon Sep 17 00:00:00 2001 From: proddy Date: Wed, 20 Apr 2022 18:06:26 -0400 Subject: [PATCH 15/21] remove TODO on sorting --- src/devices/thermostat.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index ec265050d..f2dc222a4 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -346,7 +346,7 @@ std::shared_ptr Thermostat::heating_circuit(std::sha heating_circuits_.push_back(new_hc); // sort based on hc number so there's a nice order when displaying - // TODO temporarily commented out the HC sorting until I'm 100% sure the return object still references the newly created object + // NOTE temporarily commented out the HC sorting until I'm 100% sure the return object still references the newly created object // not sure if new_hc and heating_circuits_.back() will still reference the new HC after its sorted - to check! // std::sort(heating_circuits_.begin(), heating_circuits_.end()); From 726b4fcc0b4e5dbed78705654fe3b2108688c703 Mon Sep 17 00:00:00 2001 From: proddy Date: Wed, 20 Apr 2022 18:06:35 -0400 Subject: [PATCH 16/21] more updates to tables --- interface/package-lock.json | 14 +-- interface/package.json | 2 +- interface/src/project/DashboardData.tsx | 45 +++---- interface/src/project/DashboardStatus.tsx | 2 +- .../src/project/SettingsCustomization.tsx | 115 +++++++++++------- src/version.h | 2 +- 6 files changed, 99 insertions(+), 81 deletions(-) diff --git a/interface/package-lock.json b/interface/package-lock.json index 6fded4ef9..33d9c64ef 100644 --- a/interface/package-lock.json +++ b/interface/package-lock.json @@ -21,7 +21,7 @@ "@types/react-router-dom": "^5.3.3", "async-validator": "^4.0.7", "axios": "^0.26.1", - "http-proxy-middleware": "^2.0.4", + "http-proxy-middleware": "^2.0.6", "jwt-decode": "^3.1.2", "lodash": "^4.17.21", "notistack": "^2.0.4", @@ -8879,9 +8879,9 @@ } }, "node_modules/http-proxy-middleware": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz", - "integrity": "sha512-m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", + "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", "dependencies": { "@types/http-proxy": "^1.17.8", "http-proxy": "^1.18.1", @@ -23917,9 +23917,9 @@ } }, "http-proxy-middleware": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.4.tgz", - "integrity": "sha512-m/4FxX17SUvz4lJ5WPXOHDUuCwIqXLfLHs1s0uZ3oYjhoXlx9csYxaOa0ElDEJ+h8Q4iJ1s+lTMbiCa4EXIJqg==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", + "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", "requires": { "@types/http-proxy": "^1.17.8", "http-proxy": "^1.18.1", diff --git a/interface/package.json b/interface/package.json index 103e24276..131a7195a 100644 --- a/interface/package.json +++ b/interface/package.json @@ -17,7 +17,7 @@ "@types/react-router-dom": "^5.3.3", "async-validator": "^4.0.7", "axios": "^0.26.1", - "http-proxy-middleware": "^2.0.4", + "http-proxy-middleware": "^2.0.6", "jwt-decode": "^3.1.2", "lodash": "^4.17.21", "notistack": "^2.0.4", diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index a4e32ae00..ccd5e6209 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -102,7 +102,9 @@ const DashboardData: FC = () => { HeaderRow: ` text-transform: uppercase; background-color: black; + color: #90CAF9; border-bottom: 1px solid #e0e0e0; + font-weight: 500; `, Row: ` background-color: #1e1e1e; @@ -171,6 +173,7 @@ const DashboardData: FC = () => { background-color: black; color: #90CAF9; border-bottom: 1px solid #e0e0e0; + font-weight: 500; `, Row: ` &:nth-of-type(odd) { @@ -237,8 +240,7 @@ const DashboardData: FC = () => { sortFns: { GPIO: (array) => array.sort((a, b) => a.g - b.g), NAME: (array) => array.sort((a, b) => a.n.localeCompare(b.n)), - TYPE: (array) => array.sort((a, b) => a.t - b.t), - VALUE: (array) => array.sort((a, b) => a.v.toString().localeCompare(b.v.toString())) + TYPE: (array) => array.sort((a, b) => a.t - b.t) } } ); @@ -269,8 +271,7 @@ const DashboardData: FC = () => { iconDown: }, sortFns: { - NAME: (array) => array.sort((a, b) => a.id.slice(2).localeCompare(b.id.slice(2))), - VALUE: (array) => array.sort((a, b) => a.v.toString().localeCompare(b.v.toString())) + NAME: (array) => array.sort((a, b) => a.id.slice(2).localeCompare(b.id.slice(2))) } } ); @@ -337,8 +338,7 @@ const DashboardData: FC = () => { ); }; - const refreshData = () => { - const selectedDevice = device_select.state.id; + const refreshDataIndex = (selectedDevice: string) => { if (selectedDevice === 'sensor') { fetchSensorData(); return; @@ -352,6 +352,10 @@ const DashboardData: FC = () => { } }; + const refreshData = () => { + refreshDataIndex(device_select.state.id); + }; + const fetchCoreData = useCallback(async () => { try { setCoreData((await EMSESP.readCoreData()).data); @@ -641,7 +645,6 @@ const DashboardData: FC = () => { const renderCoreData = () => ( {coreData.devices.length === 0 && } -
{(tableList: any) => ( <> @@ -658,7 +661,9 @@ const DashboardData: FC = () => { {tableList.map((device: Device, index: number) => ( + {/* refreshDataIndex(device.id)}> */} + {/* */} {device.t} {device.n} @@ -673,7 +678,9 @@ const DashboardData: FC = () => { {(coreData.active_sensors > 0 || coreData.analog_enabled) && ( + {/* refreshDataIndex('sensor')}> */} + {/* */} Sensors Attached EMS-ESP Sensors @@ -722,7 +729,7 @@ const DashboardData: FC = () => { setOnlyFav(!onlyFav)} />} - label={favorites only} + label={show only favorites} />
{ ENTITY NAME - - - + VALUE @@ -895,16 +893,7 @@ const DashboardData: FC = () => { TYPE - - - + VALUE diff --git a/interface/src/project/DashboardStatus.tsx b/interface/src/project/DashboardStatus.tsx index 4a0df9df1..1e9d7113f 100644 --- a/interface/src/project/DashboardStatus.tsx +++ b/interface/src/project/DashboardStatus.tsx @@ -209,7 +209,7 @@ const DashboardStatus: FC = () => { - {tableList.map((stat: Stat, index: number) => ( + {tableList.map((stat: Stat) => ( {stat.id} {Intl.NumberFormat().format(stat.s)} diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx index b64e08e58..e22e2aa07 100644 --- a/interface/src/project/SettingsCustomization.tsx +++ b/interface/src/project/SettingsCustomization.tsx @@ -34,6 +34,7 @@ import KeyboardArrowUpOutlinedIcon from '@mui/icons-material/KeyboardArrowUpOutl import KeyboardArrowDownOutlinedIcon from '@mui/icons-material/KeyboardArrowDownOutlined'; import UnfoldMoreOutlinedIcon from '@mui/icons-material/UnfoldMoreOutlined'; import SearchIcon from '@mui/icons-material/Search'; +import FilterListIcon from '@mui/icons-material/FilterList'; import { ButtonRow, FormLoader, ValidatedTextField, SectionContent } from '../components'; @@ -68,6 +69,7 @@ const SettingsCustomization: FC = () => { background-color: black; border-bottom: 1px solid #e0e0e0; color: #90CAF9; + font-weight: 500; `, Row: ` background-color: #1e1e1e; @@ -97,6 +99,7 @@ const SettingsCustomization: FC = () => { } `, BaseCell: ` + padding-left: 8px; border-top: 1px solid transparent; border-right: 1px solid transparent; border-bottom: 1px solid transparent; @@ -104,6 +107,8 @@ const SettingsCustomization: FC = () => { left: 0px; min-width: 124px; width: 124px; + padding-left: 0px; + } &:nth-of-type(2) { min-width: 70%; @@ -111,10 +116,13 @@ const SettingsCustomization: FC = () => { } `, HeaderCell: ` - padding-left: 0px; - &:nth-of-type(2) { - border-right: 1px solid #565656; - } + padding-left: 0px; + &:nth-of-type(1) { + padding-left: 24px; + } + &:nth-of-type(2) { + border-right: 1px solid #565656; + } ` }); @@ -288,34 +296,53 @@ const SettingsCustomization: FC = () => { const maskDisabled = (set: boolean) => { setDeviceEntities( - deviceEntities - .filter((de) => de.m & selectedFilters || !selectedFilters) - .map(({ m, ...entities }) => ({ - ...entities, - m: set - ? m | (DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE) - : m & ~(DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE) - })) + deviceEntities.map(function (de) { + if ((de.m & selectedFilters || !selectedFilters) && de.id.toLowerCase().includes(search.toLowerCase())) { + return { + ...de, + m: set + ? de.m | (DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE) + : de.m & ~(DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE) + }; + } else { + return de; + } + }) ); }; + const shown_data = deviceEntities.filter( + (de) => (de.m & selectedFilters || !selectedFilters) && de.id.toLowerCase().includes(search.toLowerCase()) + ); + return ( <> - + - - Filter:  + + #: + + + {shown_data.length}/{deviceEntities.length} + + + + : + + + { + setSearch(event.target.value); + }} + /> + + + : + { + - - - { - setSearch(event.target.value); - }} - /> - + + : - -
(de.m & selectedFilters || !selectedFilters) && de.id.toLowerCase().includes(search.toLowerCase()) - ) - }} + data={{ nodes: shown_data }} theme={entities_theme} sort={entity_sort} layout={{ custom: true, horizontalScroll: true }} @@ -414,7 +443,7 @@ const SettingsCustomization: FC = () => { - + diff --git a/src/version.h b/src/version.h index a7efafb90..2c5e4afad 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.4.0b12t3" +#define EMSESP_APP_VERSION "3.4.0b12t4" From 9ff497914e8c44d8aef70bb3b588d53cd927f1c7 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 24 Apr 2022 14:20:16 -0400 Subject: [PATCH 17/21] fix to arduino 3.5.0 --- platformio.ini | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/platformio.ini b/platformio.ini index 1effc65e3..2b4a1b130 100644 --- a/platformio.ini +++ b/platformio.ini @@ -61,10 +61,7 @@ extra_scripts = pre:scripts/build_interface.py scripts/rename_fw.py board = esp32dev -platform = espressif32 -; platform_packages = -; toolchain-xtensa32@~2.80400.0 -; framework-arduinoespressif32@https://github.com/espressif/arduino-esp32.git +platform = espressif32@3.5.0 board_build.partitions = esp32_partition_app1984k_spiffs64k.csv build_flags = ${common.build_flags} build_unflags = ${common.unbuild_flags} From c0c33d80c7380c358f9dc904bf06a7c4111c7f64 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 24 Apr 2022 14:20:30 -0400 Subject: [PATCH 18/21] fix typo in sorting --- interface/src/project/DashboardData.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index ccd5e6209..7f59fb344 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -255,8 +255,8 @@ const DashboardData: FC = () => { iconDown: }, sortFns: { - NAME: (array) => array.sort((a, b) => a.id.localeCompare(b.id)), - TEMPERATURE: (array) => array.sort((a, b) => a.id.localeCompare(b.id)) + NAME: (array) => array.sort((a, b) => a.n.localeCompare(b.n)), + TEMPERATURE: (array) => array.sort((a, b) => a.t - b.t) } } ); From b2a885bf3f4c0126aa411d57fab0d6cc046c01e7 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 24 Apr 2022 14:20:49 -0400 Subject: [PATCH 19/21] hide web also deselects favourite --- .../src/project/SettingsCustomization.tsx | 204 +++++++++--------- 1 file changed, 106 insertions(+), 98 deletions(-) diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx index e22e2aa07..bb1a031bd 100644 --- a/interface/src/project/SettingsCustomization.tsx +++ b/interface/src/project/SettingsCustomization.tsx @@ -120,8 +120,8 @@ const SettingsCustomization: FC = () => { &:nth-of-type(1) { padding-left: 24px; } - &:nth-of-type(2) { - border-right: 1px solid #565656; + &:nth-of-type(3) { + border-left: 1px solid #565656; } ` }); @@ -151,6 +151,11 @@ const SettingsCustomization: FC = () => { } ); + const sort_name = () => { + console.log(entity_sort); + entity_sort.fns.onToggleSort({ sortKey: 'NAME' }); + }; + const fetchDevices = useCallback(async () => { try { setDevices((await EMSESP.readDevices()).data); @@ -187,55 +192,75 @@ const SettingsCustomization: FC = () => { return value; } - const renderDeviceList = () => { - if (!devices) { - return ; + const getMaskNumber = (newMask: string[]) => { + var new_mask = 0; + for (let entry of newMask) { + new_mask |= Number(entry); } + return new_mask; + }; - function compareDevices(a: DeviceShort, b: DeviceShort) { - if (a.s < b.s) { - return -1; - } - if (a.s > b.s) { - return 1; - } - return 0; + const getMaskString = (m: number) => { + var new_masks = []; + if ((m & 1) === 1) { + new_masks.push('1'); } + if ((m & 2) === 2) { + new_masks.push('2'); + } + if ((m & 4) === 4) { + new_masks.push('4'); + } + if ((m & 8) === 8) { + new_masks.push('8'); + } + return new_masks; + }; - const changeSelectedDevice = (event: React.ChangeEvent) => { - const selected_device = parseInt(event.target.value, 10); - setSelectedDevice(selected_device); - fetchDeviceEntities(selected_device); - }; - - return ( - <> - - Select a device and customize each of its entities using the options. - - - - Select a device... - - {devices.devices.sort(compareDevices).map((device: DeviceShort, index) => ( - - {device.s} - - ))} - - + const maskDisabled = (set: boolean) => { + setDeviceEntities( + deviceEntities.map(function (de) { + if ((de.m & selectedFilters || !selectedFilters) && de.id.toLowerCase().includes(search.toLowerCase())) { + return { + ...de, + m: set + ? de.m | (DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE) + : de.m & ~(DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE) + }; + } else { + return de; + } + }) ); }; + function compareDevices(a: DeviceShort, b: DeviceShort) { + if (a.s < b.s) { + return -1; + } + if (a.s > b.s) { + return 1; + } + return 0; + } + + const changeSelectedDevice = (event: React.ChangeEvent) => { + const selected_device = parseInt(event.target.value, 10); + setSelectedDevice(selected_device); + fetchDeviceEntities(selected_device); + }; + + const resetCustomization = async () => { + try { + await EMSESP.resetCustomizations(); + enqueueSnackbar('All customizations have been removed. Restarting...', { variant: 'info' }); + } catch (error: any) { + enqueueSnackbar(extractErrorMessage(error, 'Problem resetting customizations'), { variant: 'error' }); + } finally { + setConfirmReset(false); + } + }; + const saveCustomization = async () => { if (deviceEntities && selectedDevice) { const masked_entities = deviceEntities @@ -264,53 +289,44 @@ const SettingsCustomization: FC = () => { } }; + const renderDeviceList = () => { + if (!devices) { + return ; + } + + return ( + <> + + Select a device and customize each of its entities using the options. + + + + Select a device... + + {devices.devices.sort(compareDevices).map((device: DeviceShort, index) => ( + + {device.s} + + ))} + + + ); + }; + const renderDeviceData = () => { if (devices?.devices.length === 0 || deviceEntities[0].id === '') { return; } - const getMaskNumber = (newMask: string[]) => { - var new_mask = 0; - for (let entry of newMask) { - new_mask |= Number(entry); - } - return new_mask; - }; - - const getMaskString = (m: number) => { - var new_masks = []; - if ((m & 1) === 1) { - new_masks.push('1'); - } - if ((m & 2) === 2) { - new_masks.push('2'); - } - if ((m & 4) === 4) { - new_masks.push('4'); - } - if ((m & 8) === 8) { - new_masks.push('8'); - } - return new_masks; - }; - - const maskDisabled = (set: boolean) => { - setDeviceEntities( - deviceEntities.map(function (de) { - if ((de.m & selectedFilters || !selectedFilters) && de.id.toLowerCase().includes(search.toLowerCase())) { - return { - ...de, - m: set - ? de.m | (DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE) - : de.m & ~(DeviceEntityMask.DV_API_MQTT_EXCLUDE | DeviceEntityMask.DV_WEB_EXCLUDE) - }; - } else { - return de; - } - }) - ); - }; - const shown_data = deviceEntities.filter( (de) => (de.m & selectedFilters || !selectedFilters) && de.id.toLowerCase().includes(search.toLowerCase()) ); @@ -418,7 +434,7 @@ const SettingsCustomization: FC = () => { fullWidth style={{ fontSize: '14px', justifyContent: 'flex-start' }} endIcon={getSortIcon(entity_sort.state, 'NAME')} - onClick={() => entity_sort.fns.onToggleSort({ sortKey: 'NAME' })} + onClick={() => sort_name()} > NAME @@ -437,6 +453,9 @@ const SettingsCustomization: FC = () => { value={getMaskString(de.m)} onChange={(event, mask) => { de.m = getMaskNumber(mask); + if (de.m & DeviceEntityMask.DV_WEB_EXCLUDE) { + de.m = de.m & ~DeviceEntityMask.DV_FAVORITE; + } setMasks(['']); }} > @@ -468,17 +487,6 @@ const SettingsCustomization: FC = () => { ); }; - const resetCustomization = async () => { - try { - await EMSESP.resetCustomizations(); - enqueueSnackbar('All customizations have been removed. Restarting...', { variant: 'info' }); - } catch (error: any) { - enqueueSnackbar(extractErrorMessage(error, 'Problem resetting customizations'), { variant: 'error' }); - } finally { - setConfirmReset(false); - } - }; - const renderResetDialog = () => ( setConfirmReset(false)}> Reset From 271b36c60280b3e59e731ac48f62d261610940da Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 24 Apr 2022 19:18:02 -0400 Subject: [PATCH 20/21] update packages --- interface/package-lock.json | 42 ++++++++++++++++++------------------- interface/package.json | 6 +++--- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/interface/package-lock.json b/interface/package-lock.json index 33d9c64ef..22b7b9914 100644 --- a/interface/package-lock.json +++ b/interface/package-lock.json @@ -13,13 +13,13 @@ "@msgpack/msgpack": "^2.7.2", "@mui/icons-material": "^5.6.2", "@mui/material": "^5.6.2", - "@table-library/react-table-library": "^3.0.0", + "@table-library/react-table-library": "^3.1.0", "@types/lodash": "^4.14.182", - "@types/node": "^17.0.25", + "@types/node": "^17.0.26", "@types/react": "^17.0.43", "@types/react-dom": "^17.0.14", "@types/react-router-dom": "^5.3.3", - "async-validator": "^4.0.7", + "async-validator": "^4.0.8", "axios": "^0.26.1", "http-proxy-middleware": "^2.0.6", "jwt-decode": "^3.1.2", @@ -3549,9 +3549,9 @@ } }, "node_modules/@table-library/react-table-library": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@table-library/react-table-library/-/react-table-library-3.0.0.tgz", - "integrity": "sha512-XkFS6+M1oWfno9raVjLWzcP/wSUwm50xzBozHMORRMO4NZ484TBr+f+tTcgyl5eJnEJxSNAkEClv+iB9t0QR+Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@table-library/react-table-library/-/react-table-library-3.1.0.tgz", + "integrity": "sha512-YCWmLPdElk/4+VPSxDcgQXlJx+jxYH2xJwr8NXm9e1AEy17K8mtrjzD5SQXDOiVT8vSOzD21eEldfIaI/kooHA==", "dependencies": { "clsx": "1.1.1", "react-virtualized-auto-sizer": "1.0.6", @@ -3763,9 +3763,9 @@ "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==" }, "node_modules/@types/node": { - "version": "17.0.25", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz", - "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==" + "version": "17.0.26", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.26.tgz", + "integrity": "sha512-z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A==" }, "node_modules/@types/parse-json": { "version": "4.0.0", @@ -4670,9 +4670,9 @@ } }, "node_modules/async-validator": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.0.7.tgz", - "integrity": "sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ==" + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.0.8.tgz", + "integrity": "sha512-vx1kyOCuSJqB5IVatlybUkV/e22sdx+V0XohCWbBfbbzbiLFt6fHxfWg6UEBhFw0gVgZtaSLTJtugmP4rdGQAQ==" }, "node_modules/asynckit": { "version": "0.4.0", @@ -19933,9 +19933,9 @@ } }, "@table-library/react-table-library": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@table-library/react-table-library/-/react-table-library-3.0.0.tgz", - "integrity": "sha512-XkFS6+M1oWfno9raVjLWzcP/wSUwm50xzBozHMORRMO4NZ484TBr+f+tTcgyl5eJnEJxSNAkEClv+iB9t0QR+Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@table-library/react-table-library/-/react-table-library-3.1.0.tgz", + "integrity": "sha512-YCWmLPdElk/4+VPSxDcgQXlJx+jxYH2xJwr8NXm9e1AEy17K8mtrjzD5SQXDOiVT8vSOzD21eEldfIaI/kooHA==", "requires": { "clsx": "1.1.1", "react-virtualized-auto-sizer": "1.0.6", @@ -20136,9 +20136,9 @@ "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==" }, "@types/node": { - "version": "17.0.25", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz", - "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==" + "version": "17.0.26", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.26.tgz", + "integrity": "sha512-z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A==" }, "@types/parse-json": { "version": "4.0.0", @@ -20838,9 +20838,9 @@ } }, "async-validator": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.0.7.tgz", - "integrity": "sha512-Pj2IR7u8hmUEDOwB++su6baaRi+QvsgajuFB9j95foM1N2gy5HM4z60hfusIO0fBPG5uLAEl6yCJr1jNSVugEQ==" + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-4.0.8.tgz", + "integrity": "sha512-vx1kyOCuSJqB5IVatlybUkV/e22sdx+V0XohCWbBfbbzbiLFt6fHxfWg6UEBhFw0gVgZtaSLTJtugmP4rdGQAQ==" }, "asynckit": { "version": "0.4.0", diff --git a/interface/package.json b/interface/package.json index 131a7195a..b79479f39 100644 --- a/interface/package.json +++ b/interface/package.json @@ -9,13 +9,13 @@ "@msgpack/msgpack": "^2.7.2", "@mui/icons-material": "^5.6.2", "@mui/material": "^5.6.2", - "@table-library/react-table-library": "^3.0.0", + "@table-library/react-table-library": "^3.1.0", "@types/lodash": "^4.14.182", - "@types/node": "^17.0.25", + "@types/node": "^17.0.26", "@types/react": "^17.0.43", "@types/react-dom": "^17.0.14", "@types/react-router-dom": "^5.3.3", - "async-validator": "^4.0.7", + "async-validator": "^4.0.8", "axios": "^0.26.1", "http-proxy-middleware": "^2.0.6", "jwt-decode": "^3.1.2", From c80d5c6bbf2b21fb88af0a5d17f955c4a49055a0 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 24 Apr 2022 19:18:19 -0400 Subject: [PATCH 21/21] fix sort when click on icon and 3-way sort cycle --- interface/src/project/DashboardData.tsx | 3 ++- interface/src/project/SettingsCustomization.tsx | 10 +++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/interface/src/project/DashboardData.tsx b/interface/src/project/DashboardData.tsx index 7f59fb344..ca8781858 100644 --- a/interface/src/project/DashboardData.tsx +++ b/interface/src/project/DashboardData.tsx @@ -24,7 +24,7 @@ import { useSnackbar } from 'notistack'; import { Table } from '@table-library/react-table-library/table'; import { useTheme } from '@table-library/react-table-library/theme'; -import { useSort } from '@table-library/react-table-library/sort'; +import { useSort, SortToggleType } from '@table-library/react-table-library/sort'; import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table'; import { useRowSelect } from '@table-library/react-table-library/select'; @@ -270,6 +270,7 @@ const DashboardData: FC = () => { iconUp: , iconDown: }, + sortToggleType: SortToggleType.AlternateWithReset, sortFns: { NAME: (array) => array.sort((a, b) => a.id.slice(2).localeCompare(b.id.slice(2))) } diff --git a/interface/src/project/SettingsCustomization.tsx b/interface/src/project/SettingsCustomization.tsx index bb1a031bd..c8c020ddf 100644 --- a/interface/src/project/SettingsCustomization.tsx +++ b/interface/src/project/SettingsCustomization.tsx @@ -18,7 +18,7 @@ import { import { Table } from '@table-library/react-table-library/table'; import { useTheme } from '@table-library/react-table-library/theme'; -import { useSort } from '@table-library/react-table-library/sort'; +import { useSort, SortToggleType } from '@table-library/react-table-library/sort'; import { Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table'; import { useSnackbar } from 'notistack'; @@ -145,17 +145,13 @@ const SettingsCustomization: FC = () => { iconUp: , iconDown: }, + sortToggleType: SortToggleType.AlternateWithReset, sortFns: { NAME: (array) => array.sort((a, b) => a.id.localeCompare(b.id)) } } ); - const sort_name = () => { - console.log(entity_sort); - entity_sort.fns.onToggleSort({ sortKey: 'NAME' }); - }; - const fetchDevices = useCallback(async () => { try { setDevices((await EMSESP.readDevices()).data); @@ -434,7 +430,7 @@ const SettingsCustomization: FC = () => { fullWidth style={{ fontSize: '14px', justifyContent: 'flex-start' }} endIcon={getSortIcon(entity_sort.state, 'NAME')} - onClick={() => sort_name()} + onClick={() => entity_sort.fns.onToggleSort({ sortKey: 'NAME' })} > NAME