From de9c6a7333548dd99370f72b98468213c31a5991 Mon Sep 17 00:00:00 2001 From: Ismail Ali Date: Tue, 15 Apr 2025 10:35:52 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20API=20Endpoint=20in=20fetchOpcUaSettings?= =?UTF-8?q?Service=20f=C3=BCr=20Development=20korrigiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - falsches .js im API Pfad entfernt - Development lädt jetzt korrekt /api/cpl/opcuaAPIHandler - Production bleibt unverändert --- config/webVersion.ts | 2 +- .../cpl/{opcuaSettingsAPIHandler.ts => opcuaAPIHandler.ts} | 2 +- pages/api/cpl/slotDataAPIHandler.ts | 3 +-- redux/thunks/fetchKueDataThunk.ts | 4 ++-- redux/thunks/fetchLast20MessagesThunk.ts | 2 +- redux/thunks/fetchOpcUaSettingsThunk.ts | 4 ++-- redux/thunks/fetchSystemSettingsThunk.ts | 2 +- services/fetchAnalogeEingaengeService.ts | 4 ++-- services/fetchDigitalOutputsService.ts | 4 ++-- services/fetchDigitaleEingaengeService.ts | 4 ++-- services/fetchKueDataService.ts | 4 ++-- services/fetchLast20MessagesService.ts | 2 +- services/fetchLoopChartDataService.ts | 2 +- services/fetchOpcUaSettingsService.ts | 4 ++-- services/fetchSingleTDMDataService.ts | 2 +- services/fetchSystemSettingsService.ts | 4 ++-- services/fetchTDRChartDataByIdService.ts | 4 ++-- services/fetchTDRReferenceCurveService.ts | 2 +- 18 files changed, 27 insertions(+), 28 deletions(-) rename pages/api/cpl/{opcuaSettingsAPIHandler.ts => opcuaAPIHandler.ts} (91%) diff --git a/config/webVersion.ts b/config/webVersion.ts index d463a0e..f29d94a 100644 --- a/config/webVersion.ts +++ b/config/webVersion.ts @@ -6,5 +6,5 @@ 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen). */ -const webVersion = "1.6.223"; +const webVersion = "1.6.224"; export default webVersion; diff --git a/pages/api/cpl/opcuaSettingsAPIHandler.ts b/pages/api/cpl/opcuaAPIHandler.ts similarity index 91% rename from pages/api/cpl/opcuaSettingsAPIHandler.ts rename to pages/api/cpl/opcuaAPIHandler.ts index 3a345c5..48f1213 100644 --- a/pages/api/cpl/opcuaSettingsAPIHandler.ts +++ b/pages/api/cpl/opcuaAPIHandler.ts @@ -1,4 +1,4 @@ -// /pages/api/cpl/opcuaSettingsAPIHandler.ts +// /pages/api/cpl/opcuaAPIHandler.ts import { NextApiRequest, NextApiResponse } from "next"; import path from "path"; diff --git a/pages/api/cpl/slotDataAPIHandler.ts b/pages/api/cpl/slotDataAPIHandler.ts index 9e4cf1c..9238bab 100644 --- a/pages/api/cpl/slotDataAPIHandler.ts +++ b/pages/api/cpl/slotDataAPIHandler.ts @@ -21,8 +21,7 @@ export default async function handler( const jsonFilePath = path.join( process.cwd(), - "public", - "CPLmockData", + "apiMockData", "kuesChartData", `slot${slot}`, `${messart}`, diff --git a/redux/thunks/fetchKueDataThunk.ts b/redux/thunks/fetchKueDataThunk.ts index 4e8efcf..00a8eb6 100644 --- a/redux/thunks/fetchKueDataThunk.ts +++ b/redux/thunks/fetchKueDataThunk.ts @@ -1,13 +1,13 @@ // ✅ Thunk: /redux/thunks/fetchKueDataThunk.ts import { createAsyncThunk } from "@reduxjs/toolkit"; -import { fetchKueData } from "../../services/fetchKueData"; +import { fetchKueDataService } from "../../services/fetchKueDataService"; import { setKueData } from "../slices/kueDataSlice"; export const fetchKueDataThunk = createAsyncThunk( "kueData/fetch", async (_, { dispatch }) => { - const data = await fetchKueData(); + const data = await fetchKueDataService(); if (data) { dispatch(setKueData(data)); } diff --git a/redux/thunks/fetchLast20MessagesThunk.ts b/redux/thunks/fetchLast20MessagesThunk.ts index bbc900c..0715bdd 100644 --- a/redux/thunks/fetchLast20MessagesThunk.ts +++ b/redux/thunks/fetchLast20MessagesThunk.ts @@ -1,6 +1,6 @@ // /redux/thunks/fetchLast20MessagesThunk.ts import { createAsyncThunk } from "@reduxjs/toolkit"; -import { fetchLast20MessagesFromWindow } from "../../services/fetchLast20Messages"; +import { fetchLast20MessagesFromWindow } from "../../services/fetchLast20MessagesService"; import { setLast20Messages } from "../slices/last20MessagesSlice"; export const fetchLast20MessagesThunk = createAsyncThunk( diff --git a/redux/thunks/fetchOpcUaSettingsThunk.ts b/redux/thunks/fetchOpcUaSettingsThunk.ts index 2ecb1bd..8ec545b 100644 --- a/redux/thunks/fetchOpcUaSettingsThunk.ts +++ b/redux/thunks/fetchOpcUaSettingsThunk.ts @@ -1,6 +1,6 @@ // ✅ 2. Thunk: /redux/thunks/fetchOpcUaSettingsThunk.ts import { createAsyncThunk } from "@reduxjs/toolkit"; -import { fetchOpcUaSettings } from "../../services/fetchOpcUaSettings"; +import { fetchOpcUaSettingsService } from "../../services/fetchOpcUaSettingsService"; import { setOpcUaZustand, setOpcUaEncryption, @@ -12,7 +12,7 @@ import { export const fetchOpcUaSettingsThunk = createAsyncThunk( "opcuaSettings/fetch", async (_, { dispatch }) => { - const data = await fetchOpcUaSettings(); + const data = await fetchOpcUaSettingsService(); if (!data) return; dispatch(setOpcUaZustand(data.zustand)); diff --git a/redux/thunks/fetchSystemSettingsThunk.ts b/redux/thunks/fetchSystemSettingsThunk.ts index 0a78266..b7ad9a7 100644 --- a/redux/thunks/fetchSystemSettingsThunk.ts +++ b/redux/thunks/fetchSystemSettingsThunk.ts @@ -1,6 +1,6 @@ // /redux/thunks/fetchSystemSettingsThunk.ts import { createAsyncThunk } from "@reduxjs/toolkit"; -import { fetchSystemSettings } from "../../services/fetchSystemSettings"; +import { fetchSystemSettings } from "../../services/fetchSystemSettingsService"; import { setSystemSettings } from "../slices/systemSettingsSlice"; export const fetchSystemSettingsThunk = createAsyncThunk( diff --git a/services/fetchAnalogeEingaengeService.ts b/services/fetchAnalogeEingaengeService.ts index b00e885..4427360 100644 --- a/services/fetchAnalogeEingaengeService.ts +++ b/services/fetchAnalogeEingaengeService.ts @@ -1,6 +1,6 @@ // services/fetchAnalogeEingaengeService.ts -export const fetchAnalogeEingaenge = async (): Promise | null> => { @@ -12,7 +12,7 @@ export const fetchAnalogeEingaenge = async (): Promise { +export const fetchDigitalOutputsService = async () => { if (typeof window === "undefined") return []; const scriptSrc = process.env.NEXT_PUBLIC_NODE_ENV === "production" ? "/CPL?/CPL/SERVICE/da.js" - : "/apiMockData/SERVICE/da.js"; + : "/api/cpl/digitaleAusgaengeAPIHandler"; await new Promise((resolve, reject) => { const script = document.createElement("script"); diff --git a/services/fetchDigitaleEingaengeService.ts b/services/fetchDigitaleEingaengeService.ts index fe18d2a..531d8e5 100644 --- a/services/fetchDigitaleEingaengeService.ts +++ b/services/fetchDigitaleEingaengeService.ts @@ -1,6 +1,6 @@ // ✅ Service: /services/fetchDigitaleEingaengeService.ts -export const fetchDigitaleEingaenge = async () => { +export const fetchDigitaleEingaengeService = async () => { try { if (typeof window === "undefined") return null; @@ -8,7 +8,7 @@ export const fetchDigitaleEingaenge = async () => { const scriptSrc = process.env.NEXT_PUBLIC_NODE_ENV === "production" ? "/CPL?/CPL/SERVICE/de.js" - : "/apiMockData/SERVICE/de.js"; + : "/api/cpl/digitaleEingaengeAPIHandler"; await new Promise((resolve, reject) => { const script = document.createElement("script"); diff --git a/services/fetchKueDataService.ts b/services/fetchKueDataService.ts index 528b681..19ffadb 100644 --- a/services/fetchKueDataService.ts +++ b/services/fetchKueDataService.ts @@ -1,9 +1,9 @@ // ✅ Service: /services/fetchKueDataService.ts -const devScriptPath = "/CPLmockData/SERVICE/kueData.js"; +const devScriptPath = "/api/cpl/kabelueberwachungAPIHandler"; const prodScriptPath = "/CPL?/CPL/SERVICE/kueData.js"; -export const fetchKueData = async () => { +export const fetchKueDataService = async () => { try { if (typeof window === "undefined") return null; diff --git a/services/fetchLast20MessagesService.ts b/services/fetchLast20MessagesService.ts index 318e669..838a6ef 100644 --- a/services/fetchLast20MessagesService.ts +++ b/services/fetchLast20MessagesService.ts @@ -8,7 +8,7 @@ export const fetchLast20MessagesFromWindow = async (): Promise< const isDev = process.env.NEXT_PUBLIC_NODE_ENV === "development"; const scriptSrc = isDev - ? "/api/cpl/last20Messages" // in Dev → per API geladen + ? "/api/cpl/last20MessagesAPIHandler" // in Dev → per API geladen : "/CPL?/CPL/SERVICE/Start.js"; // in Prod → echtes Script vom CPL await new Promise((resolve, reject) => { diff --git a/services/fetchLoopChartDataService.ts b/services/fetchLoopChartDataService.ts index b37d2c0..bf4f43d 100644 --- a/services/fetchLoopChartDataService.ts +++ b/services/fetchLoopChartDataService.ts @@ -24,7 +24,7 @@ const getApiUrl = ( return process.env.NEXT_PUBLIC_NODE_ENV === "development" ? // ? `/CPLmockData/kuesChartData/slot${slotNumber}/${typeFolder}/${mode}.json` - `/api/cpl/slotData?slot=${slotNumber}&messart=${typeFolder}&dia=${mode}&vonDatum=${vonDatum}&bisDatum=${bisDatum}` + `/api/cpl/slotDataAPIHandler?slot=${slotNumber}&messart=${typeFolder}&dia=${mode}&vonDatum=${vonDatum}&bisDatum=${bisDatum}` : `${window.location.origin}/CPL?seite.ACP&${mode}=${formatDate( vonDatum )};${formatDate(bisDatum)};${slotNumber};${type};`; diff --git a/services/fetchOpcUaSettingsService.ts b/services/fetchOpcUaSettingsService.ts index 3a2c732..8541a34 100644 --- a/services/fetchOpcUaSettingsService.ts +++ b/services/fetchOpcUaSettingsService.ts @@ -1,6 +1,6 @@ // ✅ 1. Service: /services/fetchOpcUaSettingsService.ts -export const fetchOpcUaSettings = async () => { +export const fetchOpcUaSettingsService = async () => { try { if (typeof window === "undefined") return null; @@ -8,7 +8,7 @@ export const fetchOpcUaSettings = async () => { const scriptSrc = process.env.NEXT_PUBLIC_NODE_ENV === "production" ? "/CPL?/CPL/SERVICE/opcua.js" - : "/apiMockData/SERVICE/opcua.js"; + : "/api/cpl/opcuaAPIHandler"; await new Promise((resolve, reject) => { const script = document.createElement("script"); diff --git a/services/fetchSingleTDMDataService.ts b/services/fetchSingleTDMDataService.ts index ac4f852..5f4d40f 100644 --- a/services/fetchSingleTDMDataService.ts +++ b/services/fetchSingleTDMDataService.ts @@ -1,6 +1,6 @@ // /services/fetchSingleTDMDataService.ts -export const fetchTDMDataBySlot = async (slot: number): Promise => { +export const fetchSingleTDMDataService = async (slot: number): Promise => { if (typeof window === "undefined") return null; const isDev = process.env.NEXT_PUBLIC_NODE_ENV === "development"; diff --git a/services/fetchSystemSettingsService.ts b/services/fetchSystemSettingsService.ts index 8a74a7e..8a584a3 100644 --- a/services/fetchSystemSettingsService.ts +++ b/services/fetchSystemSettingsService.ts @@ -1,12 +1,12 @@ // /services/fetchSystemSettingsService.ts -export const fetchSystemSettings = async () => { +export const fetchSystemSettingsService = async () => { try { if (typeof window === "undefined") return null; const isDev = process.env.NODE_ENV === "development"; const scriptSrc = process.env.NEXT_PUBLIC_NODE_ENV === "development" - ? "/apiMockData/SERVICE/system.js" + ? "/api/cpl/systemAPIHandler" : "/CPL?/CPL/SERVICE/system.js"; await new Promise((resolve, reject) => { diff --git a/services/fetchTDRChartDataByIdService.ts b/services/fetchTDRChartDataByIdService.ts index 55e3ec9..39ff123 100644 --- a/services/fetchTDRChartDataByIdService.ts +++ b/services/fetchTDRChartDataByIdService.ts @@ -1,12 +1,12 @@ // /services/fetchTDRChartDataByIdService.ts -export const fetchTDRChartDataById = async ( +export const fetchTDRChartDataByIdService = async ( id: number ): Promise => { const isDev = process.env.NEXT_PUBLIC_NODE_ENV === "development"; const url = isDev - ? `http://localhost:3000/apiMockData/TDR/${id}.json` + ? `/api/cpl/TDR/${id}.json` : `${window.location.origin}/CPL?Service/empty.acp&TDR=${id}`; try { diff --git a/services/fetchTDRReferenceCurveService.ts b/services/fetchTDRReferenceCurveService.ts index 80d4546..1098474 100644 --- a/services/fetchTDRReferenceCurveService.ts +++ b/services/fetchTDRReferenceCurveService.ts @@ -1,6 +1,6 @@ // /services/fetchTDRReferenceCurveService.ts -export const fetchTDRReferenceCurve = async ( +export const fetchTDRReferenceCurveService = async ( slot: number ): Promise => { // ✅ Erst aus localStorage lesen