From 23fcc557e7087e109b8d396c9e8535afefadb7b3 Mon Sep 17 00:00:00 2001 From: ISA Date: Mon, 27 Jan 2025 10:31:11 +0100 Subject: [PATCH] TypeScript kein Syntaxsfehler --- package-lock.json | 9 +++- package.json | 3 +- pages/dashboard.tsx | 49 ++++++++++++++----- pages/{generate-hash.ts => generate-hash.tsx} | 2 + store/variablesSlice.ts | 14 +++--- tsconfig.json | 3 +- 6 files changed, 57 insertions(+), 23 deletions(-) rename pages/{generate-hash.ts => generate-hash.tsx} (95%) diff --git a/package-lock.json b/package-lock.json index 37046ab..debea4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,9 +35,10 @@ "devDependencies": { "@testing-library/jest-dom": "^6.6.3", "@testing-library/react": "^16.2.0", + "@types/bcryptjs": "^2.4.6", "@types/cypress": "^1.1.6", "@types/jest": "^29.5.14", - "@types/node": "22.10.10", + "@types/node": "^22.10.10", "@types/react": "^18.3.18", "@types/react-dom": "^18.3.5", "@types/react-modal": "^3.16.3", @@ -1595,6 +1596,12 @@ "@babel/types": "^7.20.7" } }, + "node_modules/@types/bcryptjs": { + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/@types/bcryptjs/-/bcryptjs-2.4.6.tgz", + "integrity": "sha512-9xlo6R2qDs5uixm0bcIqCeMCE6HiQsIyel9KQySStiyqNl2tnj2mP3DX1Nf56MD6KMenNNlBBsy3LJ7gUEQPXQ==", + "dev": true + }, "node_modules/@types/cypress": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/@types/cypress/-/cypress-1.1.6.tgz", diff --git a/package.json b/package.json index 8292de9..04fa320 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,10 @@ "devDependencies": { "@testing-library/jest-dom": "^6.6.3", "@testing-library/react": "^16.2.0", + "@types/bcryptjs": "^2.4.6", "@types/cypress": "^1.1.6", "@types/jest": "^29.5.14", - "@types/node": "22.10.10", + "@types/node": "^22.10.10", "@types/react": "^18.3.18", "@types/react-dom": "^18.3.5", "@types/react-modal": "^3.16.3", diff --git a/pages/dashboard.tsx b/pages/dashboard.tsx index 3bfdece..539fd2e 100644 --- a/pages/dashboard.tsx +++ b/pages/dashboard.tsx @@ -8,24 +8,39 @@ import CPLStatus from "../components/modulesStatus/CPLStatus"; import KabelModulStatus from "../components/modulesStatus/KabelModulStatus"; import { Icon } from "@iconify/react"; import { useSelector } from "react-redux"; +import { RootState } from "../store/store"; function Dashboard() { const router = useRouter(); // Redux-Variablen abrufen const rawLast20Messages = useSelector( - (state) => state.variables.last20Messages + (state: RootState) => state.variables.last20Messages + ); + const ip = useSelector((state: RootState) => state.variables.ip); + const subnet = useSelector((state: RootState) => state.variables.subnet); + const gateway = useSelector((state: RootState) => state.variables.gateway); + const appVersion = useSelector( + (state: RootState) => state.variables.appVersion + ); + const kueCableBreak = useSelector( + (state: RootState) => state.variables.kueCableBreak + ); + const kueOnline = useSelector( + (state: RootState) => state.variables.kueOnline + ); + const kueVersion = useSelector( + (state: RootState) => state.variables.kueVersion + ); + const kueAlarm1 = useSelector( + (state: RootState) => state.variables.kueAlarm1 + ); + const kueAlarm2 = useSelector( + (state: RootState) => state.variables.kueAlarm2 + ); + const kueGroundFault = useSelector( + (state: RootState) => state.variables.kueGroundFault ); - const ip = useSelector((state) => state.variables.ip); - const subnet = useSelector((state) => state.variables.subnet); - const gateway = useSelector((state) => state.variables.gateway); - const appVersion = useSelector((state) => state.variables.appVersion); - const kueCableBreak = useSelector((state) => state.variables.kueCableBreak); - const kueOnline = useSelector((state) => state.variables.kueOnline); - const kueVersion = useSelector((state) => state.variables.kueVersion); - const kueAlarm1 = useSelector((state) => state.variables.kueAlarm1); - const kueAlarm2 = useSelector((state) => state.variables.kueAlarm2); - const kueGroundFault = useSelector((state) => state.variables.kueGroundFault); // Hilfsfunktion zum Parsen der Nachrichten const parseMessages = (messages) => { @@ -54,7 +69,7 @@ function Dashboard() { }; const renderBaugruppentraeger = () => { - const baugruppen = []; + const baugruppen: JSX.Element[] = []; const numBaugruppen = Math.ceil(kueOnline.length / 8); for (let i = 0; i < numBaugruppen; i++) { @@ -157,7 +172,7 @@ function Dashboard() { )) ) : ( - + Keine Meldungen verfügbar. @@ -211,6 +226,7 @@ function Dashboard() {

{ip}

+
{gateway}

+
+ IP Address +
+

OPCUA Status

+

{ip}

+
+
); diff --git a/pages/generate-hash.ts b/pages/generate-hash.tsx similarity index 95% rename from pages/generate-hash.ts rename to pages/generate-hash.tsx index dc2e00b..44ee458 100644 --- a/pages/generate-hash.ts +++ b/pages/generate-hash.tsx @@ -1,4 +1,6 @@ // pages/generate-hash.js +import React from "react"; + import bcrypt from "bcryptjs"; export default function GenerateHash() { diff --git a/store/variablesSlice.ts b/store/variablesSlice.ts index 892dc28..b4986b3 100644 --- a/store/variablesSlice.ts +++ b/store/variablesSlice.ts @@ -26,20 +26,20 @@ export interface VariablesState { de: string | null; counter: number | null; flutter: string | null; - kueOnline: string[]; + kueOnline: string[] | number[]; kueID: string[]; kueIso: string[]; kuePSTmMinus96V: string[]; - kueAlarm1: string[]; - kueAlarm2: string[]; + kueAlarm1: number[]; + kueAlarm2: number[]; kueResidence: string[]; - kueCableBreak: string[]; - kueGroundFault: string[]; + kueCableBreak: number[]; + kueGroundFault: number[]; kueLimit1: number | null; kueLimit2Low: number | null; kueDelay1: number | null; kueLoopInterval: number | null; - kueVersion: number[] | null; + kueVersion: number[] | string[]; tdrAtten: number | null; tdrPulse: number | null; tdrSpeed: number | null; @@ -98,7 +98,7 @@ const initialState: VariablesState = { kueLimit2Low: null, kueDelay1: null, kueLoopInterval: null, - kueVersion: null, + kueVersion: [], tdrAtten: null, tdrPulse: null, tdrSpeed: null, diff --git a/tsconfig.json b/tsconfig.json index d347b20..74c61ea 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,7 +12,8 @@ "noEmit": true, "skipLibCheck": true, "types": [ - "cypress" + "cypress", + "node" ], "lib": [ "dom",