From a62c7d10b931515a6d4c44bd1e1210afb5b51d7f Mon Sep 17 00:00:00 2001 From: ISA Date: Thu, 19 Jun 2025 13:47:10 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20Bezeichnung=20in=20analoge=20Eing=C3=A4n?= =?UTF-8?q?ge=20anzeigen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- components/main/analogInputs/AnalogInputsTable.tsx | 7 +++++-- package-lock.json | 4 ++-- package.json | 2 +- redux/slices/analogInputsSlice.ts | 6 +++--- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.env.development b/.env.development index 0fb4329..a241818 100644 --- a/.env.development +++ b/.env.development @@ -6,5 +6,5 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false NEXT_PUBLIC_EXPORT_STATIC=false NEXT_PUBLIC_USE_CGI=false # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.421 +NEXT_PUBLIC_APP_VERSION=1.6.422 NEXT_PUBLIC_CPL_MODE=jsmock # json (Entwicklungsumgebung) oder jsmock (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter) \ No newline at end of file diff --git a/.env.production b/.env.production index ad23f8a..681a922 100644 --- a/.env.production +++ b/.env.production @@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL NEXT_PUBLIC_EXPORT_STATIC=true NEXT_PUBLIC_USE_CGI=true # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.421 +NEXT_PUBLIC_APP_VERSION=1.6.422 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/components/main/analogInputs/AnalogInputsTable.tsx b/components/main/analogInputs/AnalogInputsTable.tsx index a3afc23..a13dd7d 100644 --- a/components/main/analogInputs/AnalogInputsTable.tsx +++ b/components/main/analogInputs/AnalogInputsTable.tsx @@ -54,7 +54,10 @@ export default function AnalogInputsTable({ {Object.values(analogInputs) - .filter((e) => e?.id !== null && e?.id !== undefined) + .filter( + (e) => + e && typeof e.id === "number" && typeof e.label === "string" + ) .map((e, index) => ( handleSelect(e.id!)} > - {e.name || "----"} + {e.label || "----"} diff --git a/package-lock.json b/package-lock.json index 2bb5ba1..92cc37f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cpl-v4", - "version": "1.6.421", + "version": "1.6.422", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cpl-v4", - "version": "1.6.421", + "version": "1.6.422", "dependencies": { "@fontsource/roboto": "^5.1.0", "@iconify-icons/ri": "^1.2.10", diff --git a/package.json b/package.json index 9a8de23..b12e2c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cpl-v4", - "version": "1.6.421", + "version": "1.6.422", "private": true, "scripts": { "dev": "next dev", diff --git a/redux/slices/analogInputsSlice.ts b/redux/slices/analogInputsSlice.ts index 7aa4da9..c3dcd11 100644 --- a/redux/slices/analogInputsSlice.ts +++ b/redux/slices/analogInputsSlice.ts @@ -4,7 +4,7 @@ import { createSlice, PayloadAction, createAsyncThunk } from "@reduxjs/toolkit"; export interface AnalogInput { id: number | null; value: number | null; - name: string; + label: string; uW: boolean; uG: boolean; oW: boolean; @@ -19,7 +19,7 @@ export interface AnalogInputsState { const defaultAnalogInput: AnalogInput = { id: null, value: null, - name: "", + label: "", uW: false, uG: false, oW: false, @@ -52,7 +52,7 @@ export const loadFromWindow = createAsyncThunk( data[key] = { id: value[0], value: value[1], - name: value[2], + label: value[2], uW: value[3] === 1, uG: value[4] === 1, oW: value[5] === 1,