fix: API Endpoint in fetchOpcUaSettingsService für Development korrigiert
- falsches .js im API Pfad entfernt - Development lädt jetzt korrekt /api/cpl/opcuaAPIHandler - Production bleibt unverändert
This commit is contained in:
@@ -6,5 +6,5 @@
|
|||||||
2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
|
2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
|
||||||
|
|
||||||
*/
|
*/
|
||||||
const webVersion = "1.6.223";
|
const webVersion = "1.6.224";
|
||||||
export default webVersion;
|
export default webVersion;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// /pages/api/cpl/opcuaSettingsAPIHandler.ts
|
// /pages/api/cpl/opcuaAPIHandler.ts
|
||||||
|
|
||||||
import { NextApiRequest, NextApiResponse } from "next";
|
import { NextApiRequest, NextApiResponse } from "next";
|
||||||
import path from "path";
|
import path from "path";
|
||||||
@@ -21,8 +21,7 @@ export default async function handler(
|
|||||||
|
|
||||||
const jsonFilePath = path.join(
|
const jsonFilePath = path.join(
|
||||||
process.cwd(),
|
process.cwd(),
|
||||||
"public",
|
"apiMockData",
|
||||||
"CPLmockData",
|
|
||||||
"kuesChartData",
|
"kuesChartData",
|
||||||
`slot${slot}`,
|
`slot${slot}`,
|
||||||
`${messart}`,
|
`${messart}`,
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
// ✅ Thunk: /redux/thunks/fetchKueDataThunk.ts
|
// ✅ Thunk: /redux/thunks/fetchKueDataThunk.ts
|
||||||
|
|
||||||
import { createAsyncThunk } from "@reduxjs/toolkit";
|
import { createAsyncThunk } from "@reduxjs/toolkit";
|
||||||
import { fetchKueData } from "../../services/fetchKueData";
|
import { fetchKueDataService } from "../../services/fetchKueDataService";
|
||||||
import { setKueData } from "../slices/kueDataSlice";
|
import { setKueData } from "../slices/kueDataSlice";
|
||||||
|
|
||||||
export const fetchKueDataThunk = createAsyncThunk(
|
export const fetchKueDataThunk = createAsyncThunk(
|
||||||
"kueData/fetch",
|
"kueData/fetch",
|
||||||
async (_, { dispatch }) => {
|
async (_, { dispatch }) => {
|
||||||
const data = await fetchKueData();
|
const data = await fetchKueDataService();
|
||||||
if (data) {
|
if (data) {
|
||||||
dispatch(setKueData(data));
|
dispatch(setKueData(data));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// /redux/thunks/fetchLast20MessagesThunk.ts
|
// /redux/thunks/fetchLast20MessagesThunk.ts
|
||||||
import { createAsyncThunk } from "@reduxjs/toolkit";
|
import { createAsyncThunk } from "@reduxjs/toolkit";
|
||||||
import { fetchLast20MessagesFromWindow } from "../../services/fetchLast20Messages";
|
import { fetchLast20MessagesFromWindow } from "../../services/fetchLast20MessagesService";
|
||||||
import { setLast20Messages } from "../slices/last20MessagesSlice";
|
import { setLast20Messages } from "../slices/last20MessagesSlice";
|
||||||
|
|
||||||
export const fetchLast20MessagesThunk = createAsyncThunk(
|
export const fetchLast20MessagesThunk = createAsyncThunk(
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// ✅ 2. Thunk: /redux/thunks/fetchOpcUaSettingsThunk.ts
|
// ✅ 2. Thunk: /redux/thunks/fetchOpcUaSettingsThunk.ts
|
||||||
import { createAsyncThunk } from "@reduxjs/toolkit";
|
import { createAsyncThunk } from "@reduxjs/toolkit";
|
||||||
import { fetchOpcUaSettings } from "../../services/fetchOpcUaSettings";
|
import { fetchOpcUaSettingsService } from "../../services/fetchOpcUaSettingsService";
|
||||||
import {
|
import {
|
||||||
setOpcUaZustand,
|
setOpcUaZustand,
|
||||||
setOpcUaEncryption,
|
setOpcUaEncryption,
|
||||||
@@ -12,7 +12,7 @@ import {
|
|||||||
export const fetchOpcUaSettingsThunk = createAsyncThunk(
|
export const fetchOpcUaSettingsThunk = createAsyncThunk(
|
||||||
"opcuaSettings/fetch",
|
"opcuaSettings/fetch",
|
||||||
async (_, { dispatch }) => {
|
async (_, { dispatch }) => {
|
||||||
const data = await fetchOpcUaSettings();
|
const data = await fetchOpcUaSettingsService();
|
||||||
if (!data) return;
|
if (!data) return;
|
||||||
|
|
||||||
dispatch(setOpcUaZustand(data.zustand));
|
dispatch(setOpcUaZustand(data.zustand));
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// /redux/thunks/fetchSystemSettingsThunk.ts
|
// /redux/thunks/fetchSystemSettingsThunk.ts
|
||||||
import { createAsyncThunk } from "@reduxjs/toolkit";
|
import { createAsyncThunk } from "@reduxjs/toolkit";
|
||||||
import { fetchSystemSettings } from "../../services/fetchSystemSettings";
|
import { fetchSystemSettings } from "../../services/fetchSystemSettingsService";
|
||||||
import { setSystemSettings } from "../slices/systemSettingsSlice";
|
import { setSystemSettings } from "../slices/systemSettingsSlice";
|
||||||
|
|
||||||
export const fetchSystemSettingsThunk = createAsyncThunk(
|
export const fetchSystemSettingsThunk = createAsyncThunk(
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// services/fetchAnalogeEingaengeService.ts
|
// services/fetchAnalogeEingaengeService.ts
|
||||||
|
|
||||||
export const fetchAnalogeEingaenge = async (): Promise<Record<
|
export const fetchAnalogeEingaengeService = async (): Promise<Record<
|
||||||
string,
|
string,
|
||||||
any
|
any
|
||||||
> | null> => {
|
> | null> => {
|
||||||
@@ -12,7 +12,7 @@ export const fetchAnalogeEingaenge = async (): Promise<Record<
|
|||||||
|
|
||||||
// Skriptpfad abhängig von der Umgebung
|
// Skriptpfad abhängig von der Umgebung
|
||||||
const scriptSrc = isDevelopment
|
const scriptSrc = isDevelopment
|
||||||
? "/apiMockData/SERVICE/ae.js"
|
? "/api/cpl/analogeEingaengeAPIHandler"
|
||||||
: "/CPL?/CPL/SERVICE/ae.js";
|
: "/CPL?/CPL/SERVICE/ae.js";
|
||||||
|
|
||||||
// Skript dynamisch laden
|
// Skript dynamisch laden
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
// ✅ Service: /services/fetchDigitalOutputsService.ts
|
// ✅ Service: /services/fetchDigitalOutputsService.ts
|
||||||
|
|
||||||
export const fetchDigitalOutputs = async () => {
|
export const fetchDigitalOutputsService = async () => {
|
||||||
if (typeof window === "undefined") return [];
|
if (typeof window === "undefined") return [];
|
||||||
|
|
||||||
const scriptSrc =
|
const scriptSrc =
|
||||||
process.env.NEXT_PUBLIC_NODE_ENV === "production"
|
process.env.NEXT_PUBLIC_NODE_ENV === "production"
|
||||||
? "/CPL?/CPL/SERVICE/da.js"
|
? "/CPL?/CPL/SERVICE/da.js"
|
||||||
: "/apiMockData/SERVICE/da.js";
|
: "/api/cpl/digitaleAusgaengeAPIHandler";
|
||||||
|
|
||||||
await new Promise<void>((resolve, reject) => {
|
await new Promise<void>((resolve, reject) => {
|
||||||
const script = document.createElement("script");
|
const script = document.createElement("script");
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// ✅ Service: /services/fetchDigitaleEingaengeService.ts
|
// ✅ Service: /services/fetchDigitaleEingaengeService.ts
|
||||||
|
|
||||||
export const fetchDigitaleEingaenge = async () => {
|
export const fetchDigitaleEingaengeService = async () => {
|
||||||
try {
|
try {
|
||||||
if (typeof window === "undefined") return null;
|
if (typeof window === "undefined") return null;
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@ export const fetchDigitaleEingaenge = async () => {
|
|||||||
const scriptSrc =
|
const scriptSrc =
|
||||||
process.env.NEXT_PUBLIC_NODE_ENV === "production"
|
process.env.NEXT_PUBLIC_NODE_ENV === "production"
|
||||||
? "/CPL?/CPL/SERVICE/de.js"
|
? "/CPL?/CPL/SERVICE/de.js"
|
||||||
: "/apiMockData/SERVICE/de.js";
|
: "/api/cpl/digitaleEingaengeAPIHandler";
|
||||||
|
|
||||||
await new Promise<void>((resolve, reject) => {
|
await new Promise<void>((resolve, reject) => {
|
||||||
const script = document.createElement("script");
|
const script = document.createElement("script");
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
// ✅ Service: /services/fetchKueDataService.ts
|
// ✅ Service: /services/fetchKueDataService.ts
|
||||||
|
|
||||||
const devScriptPath = "/CPLmockData/SERVICE/kueData.js";
|
const devScriptPath = "/api/cpl/kabelueberwachungAPIHandler";
|
||||||
const prodScriptPath = "/CPL?/CPL/SERVICE/kueData.js";
|
const prodScriptPath = "/CPL?/CPL/SERVICE/kueData.js";
|
||||||
|
|
||||||
export const fetchKueData = async () => {
|
export const fetchKueDataService = async () => {
|
||||||
try {
|
try {
|
||||||
if (typeof window === "undefined") return null;
|
if (typeof window === "undefined") return null;
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ export const fetchLast20MessagesFromWindow = async (): Promise<
|
|||||||
const isDev = process.env.NEXT_PUBLIC_NODE_ENV === "development";
|
const isDev = process.env.NEXT_PUBLIC_NODE_ENV === "development";
|
||||||
|
|
||||||
const scriptSrc = isDev
|
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
|
: "/CPL?/CPL/SERVICE/Start.js"; // in Prod → echtes Script vom CPL
|
||||||
|
|
||||||
await new Promise<void>((resolve, reject) => {
|
await new Promise<void>((resolve, reject) => {
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ const getApiUrl = (
|
|||||||
|
|
||||||
return process.env.NEXT_PUBLIC_NODE_ENV === "development"
|
return process.env.NEXT_PUBLIC_NODE_ENV === "development"
|
||||||
? // ? `/CPLmockData/kuesChartData/slot${slotNumber}/${typeFolder}/${mode}.json`
|
? // ? `/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(
|
: `${window.location.origin}/CPL?seite.ACP&${mode}=${formatDate(
|
||||||
vonDatum
|
vonDatum
|
||||||
)};${formatDate(bisDatum)};${slotNumber};${type};`;
|
)};${formatDate(bisDatum)};${slotNumber};${type};`;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// ✅ 1. Service: /services/fetchOpcUaSettingsService.ts
|
// ✅ 1. Service: /services/fetchOpcUaSettingsService.ts
|
||||||
|
|
||||||
export const fetchOpcUaSettings = async () => {
|
export const fetchOpcUaSettingsService = async () => {
|
||||||
try {
|
try {
|
||||||
if (typeof window === "undefined") return null;
|
if (typeof window === "undefined") return null;
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@ export const fetchOpcUaSettings = async () => {
|
|||||||
const scriptSrc =
|
const scriptSrc =
|
||||||
process.env.NEXT_PUBLIC_NODE_ENV === "production"
|
process.env.NEXT_PUBLIC_NODE_ENV === "production"
|
||||||
? "/CPL?/CPL/SERVICE/opcua.js"
|
? "/CPL?/CPL/SERVICE/opcua.js"
|
||||||
: "/apiMockData/SERVICE/opcua.js";
|
: "/api/cpl/opcuaAPIHandler";
|
||||||
|
|
||||||
await new Promise<void>((resolve, reject) => {
|
await new Promise<void>((resolve, reject) => {
|
||||||
const script = document.createElement("script");
|
const script = document.createElement("script");
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// /services/fetchSingleTDMDataService.ts
|
// /services/fetchSingleTDMDataService.ts
|
||||||
|
|
||||||
export const fetchTDMDataBySlot = async (slot: number): Promise<any> => {
|
export const fetchSingleTDMDataService = async (slot: number): Promise<any> => {
|
||||||
if (typeof window === "undefined") return null;
|
if (typeof window === "undefined") return null;
|
||||||
|
|
||||||
const isDev = process.env.NEXT_PUBLIC_NODE_ENV === "development";
|
const isDev = process.env.NEXT_PUBLIC_NODE_ENV === "development";
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
// /services/fetchSystemSettingsService.ts
|
// /services/fetchSystemSettingsService.ts
|
||||||
export const fetchSystemSettings = async () => {
|
export const fetchSystemSettingsService = async () => {
|
||||||
try {
|
try {
|
||||||
if (typeof window === "undefined") return null;
|
if (typeof window === "undefined") return null;
|
||||||
|
|
||||||
const isDev = process.env.NODE_ENV === "development";
|
const isDev = process.env.NODE_ENV === "development";
|
||||||
const scriptSrc =
|
const scriptSrc =
|
||||||
process.env.NEXT_PUBLIC_NODE_ENV === "development"
|
process.env.NEXT_PUBLIC_NODE_ENV === "development"
|
||||||
? "/apiMockData/SERVICE/system.js"
|
? "/api/cpl/systemAPIHandler"
|
||||||
: "/CPL?/CPL/SERVICE/system.js";
|
: "/CPL?/CPL/SERVICE/system.js";
|
||||||
|
|
||||||
await new Promise<void>((resolve, reject) => {
|
await new Promise<void>((resolve, reject) => {
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
// /services/fetchTDRChartDataByIdService.ts
|
// /services/fetchTDRChartDataByIdService.ts
|
||||||
|
|
||||||
export const fetchTDRChartDataById = async (
|
export const fetchTDRChartDataByIdService = async (
|
||||||
id: number
|
id: number
|
||||||
): Promise<any[] | null> => {
|
): Promise<any[] | null> => {
|
||||||
const isDev = process.env.NEXT_PUBLIC_NODE_ENV === "development";
|
const isDev = process.env.NEXT_PUBLIC_NODE_ENV === "development";
|
||||||
|
|
||||||
const url = isDev
|
const url = isDev
|
||||||
? `http://localhost:3000/apiMockData/TDR/${id}.json`
|
? `/api/cpl/TDR/${id}.json`
|
||||||
: `${window.location.origin}/CPL?Service/empty.acp&TDR=${id}`;
|
: `${window.location.origin}/CPL?Service/empty.acp&TDR=${id}`;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// /services/fetchTDRReferenceCurveService.ts
|
// /services/fetchTDRReferenceCurveService.ts
|
||||||
|
|
||||||
export const fetchTDRReferenceCurve = async (
|
export const fetchTDRReferenceCurveService = async (
|
||||||
slot: number
|
slot: number
|
||||||
): Promise<any[] | null> => {
|
): Promise<any[] | null> => {
|
||||||
// ✅ Erst aus localStorage lesen
|
// ✅ Erst aus localStorage lesen
|
||||||
|
|||||||
Reference in New Issue
Block a user