Ismail/nodeMap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v1.0.8.1' into fix/ohne-externe-babel

Browse Source
This commit is contained in:
ISA
2025-02-05 10:27:36 +01:00
parent 580b9edb4c b6ba58fa96
commit f4210a4776
88 changed files with 5425 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
services/apiService.js
View File

@@ -1,8 +1,6 @@
// services/apiService.js
import * as config from "../config/config";
import SERVER_URL from "../config/urls";
const url = new URL(window.location.origin);
const originWithoutPort = `${url.protocol}//${url.hostname}`;
import * as urls from "../config/urls";
let timeoutId;
@@ -23,22 +21,19 @@ const fetchWithTimeout = async (url, options, timeout = 5000) => {
}
};
export const fetchGisStatusStations = async () => {
//idMap und idUser von URL Parameter hersuslesen
const idMap = url.searchParams.get("m");
const idUser = url.searchParams.get("u");
export const fetchGisStatusStations = async (idMap, idUser) => {
// Verhindere wiederholte schnelle API-Aufrufe durch Debouncing
if (timeoutId) {
clearTimeout(timeoutId);
}
timeoutId = setTimeout(async () => {
//const SERVER_URL = process.env.NEXT_PUBLIC_SERVER_URL;
const SERVER_URL = process.env.NEXT_PUBLIC_SERVER_URL;
try {
// Verwende das Timeout für die API-Anfrage
const response = await fetchWithTimeout(
`${originWithoutPort}/talas5/ClientData/WebServiceMap.asmx/GisStationsStatusDistrict?idMap=${idMap}&idUser=${idUser}`,
`${SERVER_URL}/talas5/ClientData/WebServiceMap.asmx/GisStationsStatusDistrict?idMap=${idMap}&idUser=${idUser}`,
{
method: "GET",
headers: {
@@ -141,13 +136,6 @@ export const fetchDeviceNameById = async (idLD) => {
// ----------------------------------------------
// services/apiService.js
export const fetchUserRights = async () => {
// Aktuelle URL abrufen
const url = new URL(window.location.href);
// idMap und idUser von URL-Parametern abrufen
const idMap = url.searchParams.get("m");
const idUser = url.searchParams.get("u");
// Zähler für API-Aufrufe in localStorage speichern
let userRightsRequestCount = localStorage.getItem("userRightsRequestCount") || 0;
userRightsRequestCount++;
@@ -155,16 +143,7 @@ export const fetchUserRights = async () => {
console.log(`fetchUserRights wurde ${userRightsRequestCount} Mal aufgerufen.`);
try {
// Basis-URL ohne Port abrufen
const protocol = window.location.protocol; // z. B. 'http:' oder 'https:'
const hostname = window.location.hostname; // z. B. 'example.com'
const originWithoutPort = `${protocol}//${hostname}`; // z. B. 'https://example.com'
console.log("originWithoutPort in fetchUserRights", originWithoutPort);
console.log("idMap in fetchUserRights", idMap);
console.log("idUser in fetchUserRights", idUser);
const response = await fetch(`${originWithoutPort}/talas5/ClientData/WebserviceMap.asmx/GisSystemStatic?idMap=${idMap}&idUser=${idUser}`, {
const response = await fetch(`${process.env.NEXT_PUBLIC_SERVER_URL}/talas5/ClientData/WebserviceMap.asmx/GisSystemStatic?idMap=${config.idMap}&idUser=${config.idUser}`, {
method: "GET",
headers: {
Connection: "close",
@@ -182,7 +161,7 @@ export const fetchUserRights = async () => {
throw new Error("Invalid response structure");
}
const rightsArray = data.Rights; // Rechte-Array abrufen
const rightsArray = data.Rights; // Nehmen an, dass 'Rights' das Array von Rechten ist
const userRightsIds = rightsArray.map((right) => right.IdRight);
return userRightsIds;