From c85b0ee0baf62ff3281d61ef011c9e68b8a193cf Mon Sep 17 00:00:00 2001 From: ISA Date: Wed, 18 Dec 2024 21:12:53 +0100 Subject: [PATCH] =?UTF-8?q?Postfix=20*Slice.js=20in=20slices=20folder=20?= =?UTF-8?q?=20G=C3=A4ngige=20Praxis:=20*Slice.js=20Verwendung:=20Wenn=20du?= =?UTF-8?q?=20Redux=20Toolkit=20und=20createSlice=20nutzt,=20ist=20der=20P?= =?UTF-8?q?ostfix=20Slice=20g=C3=A4ngiger.=20Begr=C3=BCndung:=20createSlic?= =?UTF-8?q?e=20ist=20ein=20Begriff=20aus=20Redux=20Toolkit.=20Der=20Name?= =?UTF-8?q?=20vermittelt,=20dass=20die=20Datei=20nicht=20nur=20den=20Reduc?= =?UTF-8?q?er=20enth=C3=A4lt,=20sondern=20auch=20Aktionen=20und=20den=20in?= =?UTF-8?q?itialen=20Zustand.=20H=C3=A4ufig=20in=20modernen=20Projekten=20?= =?UTF-8?q?verwendet.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/DataSheet.js | 10 +++++----- components/MapComponent.js | 18 +++++++++--------- components/MapComponent.test.js | 4 ++-- components/PoiUpdateModal.js | 4 ++-- components/ShowAddStationPopup.js | 2 +- components/pois/AddPoiModalWindow.js | 2 +- components/pois/PoiUpdateModal.js | 6 +++--- components/pois/PoiUpdateModalWrapper.js | 2 +- hooks/useCreateAndSetDevices.js | 2 +- hooks/useMapComponentState.js | 2 +- hooks/useMarkerLayers.js | 2 +- pages/index.js | 2 +- .../{currentPoiState.js => currentPoiSlice.js} | 0 .../{mapLayersState.js => mapLayersSlice.js} | 0 ...LayerVisible.js => poiLayerVisibleSlice.js} | 0 ...leState.js => poiLayerVisibleStateSlice.js} | 0 ...State.js => polylineEventsDisabledSlice.js} | 0 ...leState.js => polylineLayerVisibleSlice.js} | 0 ...ersStore.js => readPoiMarkersStoreSlice.js} | 0 ...lectedAreaState.js => selectedAreaSlice.js} | 0 ...selectedPoiState.js => selectedPoiSlice.js} | 0 ...lParameterState.js => urlParameterSlice.js} | 0 ...zoomTriggerState.js => zoomTriggerSlice.js} | 0 utils/createAndSetDevices.js | 2 +- utils/setupPolylines.js | 2 +- 25 files changed, 30 insertions(+), 30 deletions(-) rename redux/slices/{currentPoiState.js => currentPoiSlice.js} (100%) rename redux/slices/{mapLayersState.js => mapLayersSlice.js} (100%) rename redux/slices/{poiLayerVisible.js => poiLayerVisibleSlice.js} (100%) rename redux/slices/{poiLayerVisibleState.js => poiLayerVisibleStateSlice.js} (100%) rename redux/slices/{polylineEventsDisabledState.js => polylineEventsDisabledSlice.js} (100%) rename redux/slices/{polylineLayerVisibleState.js => polylineLayerVisibleSlice.js} (100%) rename redux/slices/{readPoiMarkersStore.js => readPoiMarkersStoreSlice.js} (100%) rename redux/slices/{selectedAreaState.js => selectedAreaSlice.js} (100%) rename redux/slices/{selectedPoiState.js => selectedPoiSlice.js} (100%) rename redux/slices/{urlParameterState.js => urlParameterSlice.js} (100%) rename redux/slices/{zoomTriggerState.js => zoomTriggerSlice.js} (100%) diff --git a/components/DataSheet.js b/components/DataSheet.js index 4860c8a81..289f964dc 100644 --- a/components/DataSheet.js +++ b/components/DataSheet.js @@ -2,12 +2,12 @@ import React, { useEffect, useState } from "react"; import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil"; import { gisStationsStaticDistrictState } from "../redux/slices/gisStationsStaticDistrictSlice"; import { gisSystemStaticState } from "../redux/slices/gisSystemStaticSlice"; -import { mapLayersState } from "../redux/slices/mapLayersState"; -import { selectedAreaState } from "../redux/slices/selectedAreaState"; -import { zoomTriggerState } from "../redux/slices/zoomTriggerState.js"; -import { poiLayerVisibleState } from "../redux/slices/poiLayerVisibleState"; +import { mapLayersState } from "../redux/slices/mapLayersSlice"; +import { selectedAreaState } from "../redux/slices/selectedAreaSlice"; +import { zoomTriggerState } from "../redux/slices/zoomTriggerSlice.js"; +import { poiLayerVisibleState } from "../redux/slices/poiLayerVisibleStateSlice"; import EditModeToggle from "./EditModeToggle"; -import { polylineLayerVisibleState } from "../redux/slices/polylineLayerVisibleState"; // Import für Polyline-Visibility +import { polylineLayerVisibleState } from "../redux/slices/polylineLayerVisibleSlice"; // Import für Polyline-Visibility function DataSheet() { const [editMode, setEditMode] = useState(false); // Zustand für editMode diff --git a/components/MapComponent.js b/components/MapComponent.js index ef5efff92..d1ce6d33f 100644 --- a/components/MapComponent.js +++ b/components/MapComponent.js @@ -11,19 +11,19 @@ import DataSheet from "./DataSheet.js"; import { useRecoilState, useRecoilValue, useSetRecoilState } from "recoil"; import { gisStationsStaticDistrictState } from "../redux/slices/gisStationsStaticDistrictSlice"; import { gisSystemStaticState } from "../redux/slices/gisSystemStaticSlice"; -import { mapLayersState } from "../redux/slices/mapLayersState"; -import { selectedAreaState } from "../redux/slices/selectedAreaState"; -import { zoomTriggerState } from "../redux/slices/zoomTriggerState.js"; +import { mapLayersState } from "../redux/slices/mapLayersSlice"; +import { selectedAreaState } from "../redux/slices/selectedAreaSlice"; +import { zoomTriggerState } from "../redux/slices/zoomTriggerSlice.js"; import AddPoiModalWindow from "./pois/AddPoiModalWindow.js"; import { poiReadFromDbTriggerAtom } from "../redux/slices/poiReadFromDbTriggerSlice"; import { InformationCircleIcon } from "@heroicons/react/20/solid"; // oder 'outline' import PoiUpdateModal from "./pois/PoiUpdateModal.js"; -import { selectedPoiState } from "../redux/slices/selectedPoiState.js"; -import { currentPoiState } from "../redux/slices/currentPoiState.js"; +import { selectedPoiState } from "../redux/slices/selectedPoiSlice.js"; +import { currentPoiState } from "../redux/slices/currentPoiSlice.js"; import { ToastContainer, toast } from "react-toastify"; import "react-toastify/dist/ReactToastify.css"; -import { mapIdState, userIdState } from "../redux/slices/urlParameterState.js"; -import { poiLayerVisibleState } from "../redux/slices/poiLayerVisibleState.js"; +import { mapIdState, userIdState } from "../redux/slices/urlParameterSlice.js"; +import { poiLayerVisibleState } from "../redux/slices/poiLayerVisibleStateSlice.js"; import plusRoundIcon from "./PlusRoundIcon.js"; import { createAndSetDevices } from "../utils/createAndSetDevices.js"; import { restoreMapSettings, checkOverlappingMarkers } from "../utils/mapUtils.js"; @@ -48,9 +48,9 @@ import useLineData from "../hooks/useLineData.js"; //import { useCreateAndSetDevices } from "../hooks/useCreateAndSetDevices"; import { useMapComponentState } from "../hooks/useMapComponentState"; -import { polylineEventsDisabledState } from "../redux/slices/polylineEventsDisabledState"; +import { polylineEventsDisabledState } from "../redux/slices/polylineEventsDisabledSlice"; import { disablePolylineEvents, enablePolylineEvents } from "../utils/setupPolylines"; -import { polylineLayerVisibleState } from "../redux/slices/polylineLayerVisibleState"; +import { polylineLayerVisibleState } from "../redux/slices/polylineLayerVisibleSlice"; const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { const polylineVisible = useRecoilValue(polylineLayerVisibleState); diff --git a/components/MapComponent.test.js b/components/MapComponent.test.js index 46d40fabf..9a0a72729 100644 --- a/components/MapComponent.test.js +++ b/components/MapComponent.test.js @@ -2,8 +2,8 @@ import React from "react"; import { render, screen, fireEvent } from "@testing-library/react"; import { RecoilRoot } from "recoil"; import MapComponent from "./MapComponent"; -import { mapLayersState } from "../store/atoms/mapLayersState"; -import { poiLayerVisibleState } from "../store/atoms/poiLayerVisibleState"; +import { mapLayersState } from "../store/atoms/mapLayersSlice"; +import { poiLayerVisibleState } from "../store/atoms/poiLayerVisibleStateSlice"; import "@testing-library/jest-dom"; describe("MapComponent - TK-Komponenten Tests", () => { diff --git a/components/PoiUpdateModal.js b/components/PoiUpdateModal.js index 17fc068df..9e4919dbc 100644 --- a/components/PoiUpdateModal.js +++ b/components/PoiUpdateModal.js @@ -2,8 +2,8 @@ import React, { useState, useEffect } from "react"; import { useRecoilValue } from "recoil"; -import { selectedPoiState } from "../redux/slices/selectedPoiState"; -import { currentPoiState } from "../redux/slices/currentPoiState"; +import { selectedPoiState } from "../redux/slices/selectedPoiSlice"; +import { currentPoiState } from "../redux/slices/currentPoiSlice"; const PoiUpdateModal = ({ onClose, poiData }) => { const currentPoi = useRecoilValue(currentPoiState); diff --git a/components/ShowAddStationPopup.js b/components/ShowAddStationPopup.js index 6bafa5cbd..205a655af 100644 --- a/components/ShowAddStationPopup.js +++ b/components/ShowAddStationPopup.js @@ -2,7 +2,7 @@ import React, { useState, useEffect, use } from "react"; import ReactDOM from "react-dom"; import { useRecoilValue, useRecoilState, useSetRecoilState } from "recoil"; -import { readPoiMarkersStore } from "../redux/slices/readPoiMarkersStore.js"; +import { readPoiMarkersStore } from "../redux/slices/readPoiMarkersStoreSlice.js"; import { poiReadFromDbTriggerAtom } from "../redux/slices/poiReadFromDbTriggerSlice"; const ShowAddStationPopup = ({ onClose, map, latlng }) => { diff --git a/components/pois/AddPoiModalWindow.js b/components/pois/AddPoiModalWindow.js index eacc9b0bb..fe4c1d6cd 100644 --- a/components/pois/AddPoiModalWindow.js +++ b/components/pois/AddPoiModalWindow.js @@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react"; import Select from "react-select"; // Importiere react-select import { useSetRecoilState, useRecoilState } from "recoil"; -import { mapLayersState } from "../../redux/slices/mapLayersState"; +import { mapLayersState } from "../../redux/slices/mapLayersSlice"; import { poiReadFromDbTriggerAtom } from "../../redux/slices/poiReadFromDbTriggerSlice"; const AddPoiModalWindow = ({ onClose, map, latlng }) => { diff --git a/components/pois/PoiUpdateModal.js b/components/pois/PoiUpdateModal.js index b65962d37..87979cdda 100644 --- a/components/pois/PoiUpdateModal.js +++ b/components/pois/PoiUpdateModal.js @@ -2,9 +2,9 @@ import React, { useState, useEffect } from "react"; import Select from "react-select"; // Importiere react-select import { useRecoilState } from "recoil"; -import { selectedPoiState } from "../../redux/slices/selectedPoiState"; -import { currentPoiState } from "../../redux/slices/currentPoiState"; -import { mapLayersState } from "../../redux/slices/mapLayersState"; +import { selectedPoiState } from "../../redux/slices/selectedPoiSlice"; +import { currentPoiState } from "../../redux/slices/currentPoiSlice"; +import { mapLayersState } from "../../redux/slices/mapLayersSlice"; const PoiUpdateModal = ({ onClose, poiData, onSubmit }) => { const currentPoi = useRecoilState(currentPoiState); diff --git a/components/pois/PoiUpdateModalWrapper.js b/components/pois/PoiUpdateModalWrapper.js index 841039c9c..4916c9cd6 100644 --- a/components/pois/PoiUpdateModalWrapper.js +++ b/components/pois/PoiUpdateModalWrapper.js @@ -2,7 +2,7 @@ import React, { useState } from "react"; import PoiUpdateModal from "./PoiUpdateModal"; import { useRecoilValue, useSetRecoilState } from "recoil"; -import { currentPoiState, selectedPoiState } from "../../redux/slices/currentPoiState"; +import { currentPoiState, selectedPoiState } from "../../redux/slices/currentPoiSlice"; import { poiReadFromDbTriggerAtom } from "../../redux/slices/poiReadFromDbTriggerSlice"; const PoiUpdateModalWrapper = ({ show, onClose, latlng }) => { diff --git a/hooks/useCreateAndSetDevices.js b/hooks/useCreateAndSetDevices.js index 81446affd..b92042746 100644 --- a/hooks/useCreateAndSetDevices.js +++ b/hooks/useCreateAndSetDevices.js @@ -1,7 +1,7 @@ // /hooks/useCreateAndSetDevices.js import { useEffect } from "react"; import { useRecoilState } from "recoil"; -import { polylineEventsDisabledState } from "../redux/slices/polylineEventsDisabledState"; +import { polylineEventsDisabledState } from "../redux/slices/polylineEventsDisabledSlice"; import { createAndSetDevices } from "../utils/createAndSetDevices"; const useCreateAndSetDevices = (systemId, setMarkersFunction, GisSystemStatic, priorityConfig) => { diff --git a/hooks/useMapComponentState.js b/hooks/useMapComponentState.js index 24cc78a8b..959d8f422 100644 --- a/hooks/useMapComponentState.js +++ b/hooks/useMapComponentState.js @@ -2,7 +2,7 @@ import { useState, useEffect } from "react"; import usePoiTypData from "./usePoiTypData"; import { useRecoilValue } from "recoil"; -import { poiLayerVisibleState } from "../redux/slices/poiLayerVisible"; +import { poiLayerVisibleState } from "../redux/slices/poiLayerVisibleSlice"; export const useMapComponentState = () => { const { poiTypData, isPoiTypLoaded } = usePoiTypData("/api/talas_v5_DB/poiTyp/readPoiTyp"); diff --git a/hooks/useMarkerLayers.js b/hooks/useMarkerLayers.js index 1cd298438..f4b10ebe0 100644 --- a/hooks/useMarkerLayers.js +++ b/hooks/useMarkerLayers.js @@ -1,7 +1,7 @@ // hooks/useMarkerLayers.js import { useEffect } from "react"; import { useRecoilValue } from "recoil"; -import { mapLayersState } from "../redux/slices/mapLayersState"; +import { mapLayersState } from "../redux/slices/mapLayersSlice"; const useMarkerLayers = (map, markers, layerType) => { const mapLayersVisibility = useRecoilValue(mapLayersState); diff --git a/pages/index.js b/pages/index.js index f8b9e5764..f919db412 100644 --- a/pages/index.js +++ b/pages/index.js @@ -1,7 +1,7 @@ import React, { useEffect, useState } from "react"; import dynamic from "next/dynamic"; import { useRecoilState, useRecoilValue } from "recoil"; -import { readPoiMarkersStore } from "../redux/slices/readPoiMarkersStore.js"; +import { readPoiMarkersStore } from "../redux/slices/readPoiMarkersStoreSlice.js"; import { poiReadFromDbTriggerAtom } from "../redux/slices/poiReadFromDbTriggerSlice"; const MapComponentWithNoSSR = dynamic(() => import("../components/MapComponent"), { ssr: false }); diff --git a/redux/slices/currentPoiState.js b/redux/slices/currentPoiSlice.js similarity index 100% rename from redux/slices/currentPoiState.js rename to redux/slices/currentPoiSlice.js diff --git a/redux/slices/mapLayersState.js b/redux/slices/mapLayersSlice.js similarity index 100% rename from redux/slices/mapLayersState.js rename to redux/slices/mapLayersSlice.js diff --git a/redux/slices/poiLayerVisible.js b/redux/slices/poiLayerVisibleSlice.js similarity index 100% rename from redux/slices/poiLayerVisible.js rename to redux/slices/poiLayerVisibleSlice.js diff --git a/redux/slices/poiLayerVisibleState.js b/redux/slices/poiLayerVisibleStateSlice.js similarity index 100% rename from redux/slices/poiLayerVisibleState.js rename to redux/slices/poiLayerVisibleStateSlice.js diff --git a/redux/slices/polylineEventsDisabledState.js b/redux/slices/polylineEventsDisabledSlice.js similarity index 100% rename from redux/slices/polylineEventsDisabledState.js rename to redux/slices/polylineEventsDisabledSlice.js diff --git a/redux/slices/polylineLayerVisibleState.js b/redux/slices/polylineLayerVisibleSlice.js similarity index 100% rename from redux/slices/polylineLayerVisibleState.js rename to redux/slices/polylineLayerVisibleSlice.js diff --git a/redux/slices/readPoiMarkersStore.js b/redux/slices/readPoiMarkersStoreSlice.js similarity index 100% rename from redux/slices/readPoiMarkersStore.js rename to redux/slices/readPoiMarkersStoreSlice.js diff --git a/redux/slices/selectedAreaState.js b/redux/slices/selectedAreaSlice.js similarity index 100% rename from redux/slices/selectedAreaState.js rename to redux/slices/selectedAreaSlice.js diff --git a/redux/slices/selectedPoiState.js b/redux/slices/selectedPoiSlice.js similarity index 100% rename from redux/slices/selectedPoiState.js rename to redux/slices/selectedPoiSlice.js diff --git a/redux/slices/urlParameterState.js b/redux/slices/urlParameterSlice.js similarity index 100% rename from redux/slices/urlParameterState.js rename to redux/slices/urlParameterSlice.js diff --git a/redux/slices/zoomTriggerState.js b/redux/slices/zoomTriggerSlice.js similarity index 100% rename from redux/slices/zoomTriggerState.js rename to redux/slices/zoomTriggerSlice.js diff --git a/utils/createAndSetDevices.js b/utils/createAndSetDevices.js index 5ea568c71..9a8208afb 100644 --- a/utils/createAndSetDevices.js +++ b/utils/createAndSetDevices.js @@ -6,7 +6,7 @@ import "leaflet.smooth_marker_bouncing"; import { toast } from "react-toastify"; import * as config from "../config/config.js"; import { disablePolylineEvents, enablePolylineEvents } from "./setupPolylines"; // Importiere die Funktion zum Deaktivieren der Polyline-Ereignisse -import { setPolylineEventsDisabled } from "../redux/slices/polylineEventsDisabledState"; // Importiere den Recoil-Atom-Zustand +import { setPolylineEventsDisabled } from "../redux/slices/polylineEventsDisabledSlice"; // Importiere den Recoil-Atom-Zustand import { SERVER_URL } from "../config/urls.js"; // Funktion zum Bestimmen der Priorität basierend auf dem Icon-Pfad diff --git a/utils/setupPolylines.js b/utils/setupPolylines.js index 63a061f10..9cc8f418b 100644 --- a/utils/setupPolylines.js +++ b/utils/setupPolylines.js @@ -10,7 +10,7 @@ import endIcon from "../components/gisPolylines/icons/EndIcon"; import { redrawPolyline } from "./mapUtils"; import { openInNewTab } from "./openInNewTab"; import { toast } from "react-toastify"; -import { polylineLayerVisibleState } from "../redux/slices/polylineLayerVisibleState"; +import { polylineLayerVisibleState } from "../redux/slices/polylineLayerVisibleSlice"; import { useRecoilValue } from "recoil"; const protocol = window.location.protocol; // z. B. 'http:' oder 'https:'