= ({
className={`zone ${selectedZone.zoneName === zoneName ? "active" : ""
}`}
onClick={() => {
- useDroppedObjectsStore.getState().setZone(zoneName, zonesData[zoneName]?.zoneId);
handleSelect2dZoneData(zonesData[zoneName]?.zoneId, zoneName)
}}
>
diff --git a/app/src/components/ui/componets/DraggableWidget.tsx b/app/src/components/ui/componets/DraggableWidget.tsx
index 9c17c03..14916b0 100644
--- a/app/src/components/ui/componets/DraggableWidget.tsx
+++ b/app/src/components/ui/componets/DraggableWidget.tsx
@@ -11,6 +11,8 @@ import {
KebabIcon,
} from "../../icons/ExportCommonIcons";
import { useEffect, useRef, useState } from "react";
+import { duplicateWidgetApi } from "../../../services/realTimeVisulization/zoneData/duplicateWidget";
+import { deleteWidgetApi } from "../../../services/realTimeVisulization/zoneData/deleteWidgetApi";
type Side = "top" | "bottom" | "left" | "right";
@@ -34,9 +36,9 @@ export const DraggableWidget = ({
}: {
selectedZone: {
zoneName: string;
+ zoneId: string;
activeSides: Side[];
panelOrder: Side[];
-
lockedPanels: Side[];
widgets: Widget[];
};
@@ -79,21 +81,28 @@ export const DraggableWidget = ({
const isPanelHidden = hiddenPanels.includes(widget.panel);
- const deleteSelectedChart = () => {
- console.log('widget.id: ', widget.id);
- const updatedWidgets = selectedZone.widgets.filter(
- (w: Widget) => w.id !== widget.id
- );
- console.log('updatedWidgets: ', updatedWidgets);
+ const deleteSelectedChart = async () => {
+ try {
+ const email = localStorage.getItem("email") || "";
+ const organization = email?.split("@")[1]?.split(".")[0];
+ const response = await deleteWidgetApi(widget.id, organization);
+ if (response?.message === "Widget deleted successfully") {
+ const updatedWidgets = selectedZone.widgets.filter(
+ (w: Widget) => w.id !== widget.id
+ );
+ setSelectedZone((prevZone: any) => ({
+ ...prevZone,
+ widgets: updatedWidgets,
+ }));
+ }
+ } catch (error) {
- setSelectedZone((prevZone: any) => ({
- ...prevZone,
- widgets: updatedWidgets,
- }));
-
- setOpenKebabId(null);
+ } finally {
+ setOpenKebabId(null);
+ }
};
+
const getCurrentWidgetCount = (panel: Side) =>
selectedZone.widgets.filter((w) => w.panel === panel).length;
@@ -121,21 +130,32 @@ export const DraggableWidget = ({
return currentWidgetCount >= panelCapacity;
};
- const duplicateWidget = () => {
- const duplicatedWidget: Widget = {
- ...widget,
- id: `${widget.id}-copy-${Date.now()}`,
- };
- setSelectedZone((prevZone: any) => ({
- ...prevZone,
- widgets: [...prevZone.widgets, duplicatedWidget],
- }));
+ const duplicateWidget = async () => {
+ try {
+ const email = localStorage.getItem("email") || "";
+ const organization = email?.split("@")[1]?.split(".")[0];
- setOpenKebabId(null);
+ const duplicatedWidget: Widget = {
+ ...widget,
+ id: `${widget.id}-copy-${Date.now()}`,
+ };
+ const response = await duplicateWidgetApi(selectedZone.zoneId, organization, duplicatedWidget);
+ if (response?.message === "Widget created successfully") {
+ setSelectedZone((prevZone: any) => ({
+ ...prevZone,
+ widgets: [...prevZone.widgets, duplicatedWidget],
+ }));
+ }
+ } catch (error) {
+
+ } finally {
+ setOpenKebabId(null);
+ }
};
+
const handleKebabClick = (event: React.MouseEvent
) => {
event.stopPropagation();
if (openKebabId === widget.id) {
@@ -176,7 +196,6 @@ export const DraggableWidget = ({
};
const handleDrop = (event: React.DragEvent) => {
-
event.preventDefault();
const fromIndex = parseInt(event.dataTransfer.getData("text/plain"), 10); // Get the dragged widget's index
const toIndex = index; // The index of the widget where the drop occurred
diff --git a/app/src/components/ui/componets/Dropped3dWidget.tsx b/app/src/components/ui/componets/Dropped3dWidget.tsx
index e0e2a7d..10dd343 100644
--- a/app/src/components/ui/componets/Dropped3dWidget.tsx
+++ b/app/src/components/ui/componets/Dropped3dWidget.tsx
@@ -1,7 +1,7 @@
import { useThree } from "@react-three/fiber";
import React, { useState, useEffect } from "react";
-import { useAsset3dWidget } from "../../../store/store";
+import { useAsset3dWidget, useWidgetSubOption } from "../../../store/store";
import useModuleStore from "../../../store/useModuleStore";
import { ThreeState } from "../../../types/world/worldTypes";
import * as THREE from "three";
@@ -9,71 +9,80 @@ import Throughput from "../../layout/3D-cards/cards/Throughput";
import ProductionCapacity from "../../layout/3D-cards/cards/ProductionCapacity";
import ReturnOfInvestment from "../../layout/3D-cards/cards/ReturnOfInvestment";
import StateWorking from "../../layout/3D-cards/cards/StateWorking";
+import { useSelectedZoneStore } from "../../../store/useZoneStore";
export default function Dropped3dWidgets() {
- const { widgetSelect } = useAsset3dWidget();
+ const { widgetSelect, setWidgetSelect } = useAsset3dWidget();
const { activeModule } = useModuleStore();
const { raycaster, gl, scene }: ThreeState = useThree();
+ const { selectedZone } = useSelectedZoneStore(); // Get currently selected zone
+ const { widgetSubOption, setWidgetSubOption } = useWidgetSubOption()
+ // π₯ Store widget positions per zone
+ const [zoneWidgets, setZoneWidgets] = useState // Widget type -> Positions array
+ >>({});
- // π₯ Store multiple instances per widget type
- const [widgetPositions, setWidgetPositions] = useState>({});
useEffect(() => {
- if (activeModule !== "visualization") return;
+ if (widgetSubOption === "Floating") return
+ // if (activeModule !== "visualization") return;
const canvasElement = gl.domElement;
-
const onDrop = (event: DragEvent) => {
event.preventDefault(); // Prevent default browser behavior
+ if (widgetSubOption === "3D") {
+ if (selectedZone.zoneName === "") return
+ if (!widgetSelect?.startsWith("ui")) return;
+ const group1 = scene.getObjectByName("itemsGroup");
+ if (!group1) return;
+ const Assets = group1.children
+ .map((val) => scene.getObjectByProperty("uuid", val.uuid))
+ .filter(Boolean) as THREE.Object3D[];
+ const intersects = raycaster.intersectObjects(scene.children, true).filter(
+ (intersect) =>
+ !intersect.object.name.includes("Roof") &&
+ !intersect.object.name.includes("agv-collider") &&
+ !intersect.object.name.includes("MeasurementReference") &&
+ !intersect.object.userData.isPathObject &&
+ !(intersect.object.type === "GridHelper")
+ );
+ if (intersects.length > 0) {
+ const { x, y, z } = intersects[0].point;
- if (!widgetSelect.startsWith("ui")) return;
-
-
- const group1 = scene.getObjectByName("itemsGroup");
- if (!group1) return;
-
-
-
- const Assets = group1.children
- .map((val) => scene.getObjectByProperty("uuid", val.uuid))
- .filter(Boolean) as THREE.Object3D[];
-
-
- const intersects = raycaster.intersectObjects(Assets);
-
- if (intersects.length > 0) {
- const { x, y, z } = intersects[0].point;
-
-
- // β
Allow multiple instances by storing positions in an array
- setWidgetPositions((prev) => ({
- ...prev,
- [widgetSelect]: [...(prev[widgetSelect] || []), [x, y, z]],
- }));
+ setZoneWidgets((prev) => ({
+ ...prev,
+ [selectedZone.zoneId]: {
+ ...(prev[selectedZone.zoneId] || {}),
+ [widgetSelect]: [...(prev[selectedZone.zoneId]?.[widgetSelect] || []), [x, y, z]],
+ },
+ }));
+ }
}
};
canvasElement.addEventListener("drop", onDrop);
-
return () => {
- canvasElement.removeEventListener("drop", onDrop);
+ canvasElement.removeEventListener("drop", onDrop)
+ // setWidgetSelect()
};
- }, [widgetSelect, activeModule]);
+ }, [widgetSelect, activeModule, widgetSubOption]);
return (
<>
- {widgetPositions["ui-Widget 1"]?.map((pos, index) => (
+ {zoneWidgets[selectedZone.zoneId]?.["ui-Widget 1"]?.map((pos, index) => (
))}
- {widgetPositions["ui-Widget 2"]?.map((pos, index) => (
+ {zoneWidgets[selectedZone.zoneId]?.["ui-Widget 2"]?.map((pos, index) => (
))}
- {widgetPositions["ui-Widget 3"]?.map((pos, index) => (
+ {zoneWidgets[selectedZone.zoneId]?.["ui-Widget 3"]?.map((pos, index) => (
))}
- {widgetPositions["ui-Widget 4"]?.map((pos, index) => (
+ {zoneWidgets[selectedZone.zoneId]?.["ui-Widget 4"]?.map((pos, index) => (
))}
);
}
+
diff --git a/app/src/components/ui/componets/DroppedFloatingWidgets.tsx b/app/src/components/ui/componets/DroppedFloatingWidgets.tsx
index ffddc23..bf19bb9 100644
--- a/app/src/components/ui/componets/DroppedFloatingWidgets.tsx
+++ b/app/src/components/ui/componets/DroppedFloatingWidgets.tsx
@@ -1,59 +1,79 @@
-
-
-
import { WalletIcon } from "../../icons/3dChartIcons";
import { useEffect, useRef, useState } from "react";
import { Line } from "react-chartjs-2";
-import { useDroppedObjectsStore, Zones } from "../../../store/useDroppedObjectsStore";
+import {
+ useDroppedObjectsStore,
+ Zones,
+} from "../../../store/useDroppedObjectsStore";
+import useModuleStore from "../../../store/useModuleStore";
+import { determinePosition } from "./functions/determinePosition";
+import { getActiveProperties } from "./functions/getActiveProperties";
+import { addingFloatingWidgets } from "../../../services/realTimeVisulization/zoneData/addFloatingWidgets";
const DroppedObjects: React.FC = () => {
const zones = useDroppedObjectsStore((state) => state.zones);
- const updateObjectPosition = useDroppedObjectsStore((state) => state.updateObjectPosition);
- const [draggingIndex, setDraggingIndex] = useState<{ zone: string; index: number } | null>(null);
+
+ const updateObjectPosition = useDroppedObjectsStore(
+ (state) => state.updateObjectPosition
+ );
+ const [draggingIndex, setDraggingIndex] = useState<{
+ zone: string;
+ index: number;
+ } | null>(null);
const [offset, setOffset] = useState<[number, number] | null>(null);
const positionRef = useRef<[number, number] | null>(null);
const animationRef = useRef(null);
+ const { activeModule } = useModuleStore();
- // useEffect(() => {
- // const initialZones: Record = {
- // "Zone 1": {
- // zoneName: "Zone 1",
- // zoneId: "2e996073-546c-470c-8323-55bd3700c6aa",
- // objects: [
- // {
- // header: "Todayβs Money",
- // value: 53000, // β
Converted to number
- // per: "+55%",
- // className: "floating total-card",
- // position: [146, 214], // β
No need for 'as' here
- // },
- // {
- // header: "New Clients",
- // value: 250, // β
Converted to number
- // per: "+12%",
- // className: "floating total-card",
- // position: [344, 295],
- // },
- // ],
- // },
- // };
-
- // useDroppedObjectsStore.setState({ zones: initialZones });
- // }, []);
-
+ // Get the first zone and its objects
const zoneEntries = Object.entries(zones);
if (zoneEntries.length === 0) return null; // No zone, nothing to render
const [zoneName, zone] = zoneEntries[0]; // Only render the first zone
+ // Handle pointer down event
function handlePointerDown(event: React.PointerEvent, index: number) {
const obj = zone.objects[index];
- const offsetX = event.clientX - obj.position[1];
- const offsetY = event.clientY - obj.position[0];
+ const container = document.getElementById("real-time-vis-canvas");
+ if (!container) return;
+
+ const rect = container.getBoundingClientRect();
+ const relativeX = event.clientX - rect.left;
+ const relativeY = event.clientY - rect.top;
+
+ // Determine which properties are active for this object
+ const [activeProp1, activeProp2] = getActiveProperties(obj.position);
+
+ // Calculate the offset based on the active properties
+ let offsetX = 0;
+ let offsetY = 0;
+
+ if (activeProp1 === "top") {
+ offsetY =
+ relativeY -
+ (typeof obj.position.top === "number" ? obj.position.top : 0);
+ } else if (activeProp1 === "bottom") {
+ offsetY =
+ rect.height -
+ relativeY -
+ (typeof obj.position.bottom === "number" ? obj.position.bottom : 0);
+ }
+
+ if (activeProp2 === "left") {
+ offsetX =
+ relativeX -
+ (typeof obj.position.left === "number" ? obj.position.left : 0);
+ } else if (activeProp2 === "right") {
+ offsetX =
+ rect.width -
+ relativeX -
+ (typeof obj.position.right === "number" ? obj.position.right : 0);
+ }
setDraggingIndex({ zone: zoneName, index });
setOffset([offsetY, offsetX]);
}
+ // Handle pointer move event
function handlePointerMove(event: React.PointerEvent) {
if (!draggingIndex || !offset) return;
@@ -61,34 +81,92 @@ const DroppedObjects: React.FC = () => {
if (!container) return;
const rect = container.getBoundingClientRect();
+ const relativeX = event.clientX - rect.left;
+ const relativeY = event.clientY - rect.top;
- let newX = event.clientX - offset[1];
- let newY = event.clientY - offset[0];
+ // Determine which properties are active for the dragged object
+ const obj = zone.objects[draggingIndex.index];
+ const [activeProp1, activeProp2] = getActiveProperties(obj.position);
+ // Calculate the new position based on the active properties
+ let newX = 0;
+ let newY = 0;
+
+ if (activeProp2 === "left") {
+ newX = relativeX - offset[1];
+ } else if (activeProp2 === "right") {
+ newX = rect.width - (relativeX + offset[1]);
+ }
+
+ if (activeProp1 === "top") {
+ newY = relativeY - offset[0];
+ } else if (activeProp1 === "bottom") {
+ newY = rect.height - (relativeY + offset[0]);
+ }
+
+ // Ensure the object stays within the canvas boundaries
newX = Math.max(0, Math.min(rect.width - 50, newX));
newY = Math.max(0, Math.min(rect.height - 50, newY));
+ // Update the position reference
positionRef.current = [newY, newX];
+ // Update the object's position using requestAnimationFrame for smoother animations
if (!animationRef.current) {
animationRef.current = requestAnimationFrame(() => {
if (positionRef.current) {
- updateObjectPosition(zoneName, draggingIndex.index, positionRef.current);
+ updateObjectPosition(zoneName, draggingIndex.index, {
+ ...obj.position,
+ [activeProp1]: positionRef.current[0],
+ [activeProp2]: positionRef.current[1],
+ });
}
animationRef.current = null;
});
}
}
- function handlePointerUp() {
- setDraggingIndex(null);
- setOffset(null);
- if (animationRef.current) {
- cancelAnimationFrame(animationRef.current);
- animationRef.current = null;
+ // Handle pointer up event
+ async function handlePointerUp(event: React.MouseEvent) {
+ try {
+ if (!draggingIndex || !offset) return;
+
+ const email = localStorage.getItem("email") || "";
+ const organization = email?.split("@")[1]?.split(".")[0];
+ const container = document.getElementById("real-time-vis-canvas");
+ if (!container) throw new Error("Canvas container not found");
+
+ const rect = container.getBoundingClientRect();
+ const relativeX = event.clientX - rect.left;
+ const relativeY = event.clientY - rect.top;
+
+ // Recalculate the position using determinePosition
+ const newPosition = determinePosition(rect, relativeX, relativeY);
+
+ // Validate the dragging index and get the object
+ if (!zone.objects[draggingIndex.index]) {
+ throw new Error("Dragged object not found in the zone");
+ }
+ const obj = { ...zone.objects[draggingIndex.index], position: newPosition };
+ let response = await addingFloatingWidgets(zone.zoneId, organization, obj);
+ if (response.message === "Widget updated successfully") {
+ updateObjectPosition(zoneName, draggingIndex.index, newPosition);
+ }
+
+ // Reset states
+ setDraggingIndex(null);
+ setOffset(null);
+
+ if (animationRef.current) {
+ cancelAnimationFrame(animationRef.current);
+ animationRef.current = null;
+ }
+ } catch (error) {
+
}
}
+
return (
{zone.objects.map((obj, index) => (
@@ -96,14 +174,29 @@ const DroppedObjects: React.FC = () => {
key={`${zoneName}-${index}`}
className={obj.className}
style={{
- top: obj.position[0] + "px",
- left: obj.position[1] + "px",
- transition: draggingIndex?.index === index ? "none" : "transform 0.1s ease-out",
+ position: "absolute",
+ top:
+ typeof obj.position.top !== "string"
+ ? `${obj.position.top}px`
+ : "auto",
+ left:
+ typeof obj.position.left !== "string"
+ ? `${obj.position.left}px`
+ : "auto",
+ right:
+ typeof obj.position.right !== "string"
+ ? `${obj.position.right}px`
+ : "auto",
+ bottom:
+ typeof obj.position.bottom !== "string"
+ ? `${obj.position.bottom}px`
+ : "auto",
+ // transition: draggingIndex?.index === index ? "none" : "transform 0.1s ease-out",
}}
onPointerDown={(event) => handlePointerDown(event, index)}
>
{obj.className === "floating total-card" ? (
-
+ <>
{obj.header}
@@ -114,9 +207,9 @@ const DroppedObjects: React.FC = () => {
-
+
) : obj.className === "warehouseThroughput floating" ? (
-
+ <>
Warehouse Throughput
@@ -126,9 +219,9 @@ const DroppedObjects: React.FC = () => {
{/* */}
-
+
) : obj.className === "fleetEfficiency floating" ? (
-
+ <>
Fleet Efficiency
@@ -148,7 +241,7 @@ const DroppedObjects: React.FC = () => {
100%
-
+
) : null}
))}
@@ -156,59 +249,4 @@ const DroppedObjects: React.FC = () => {
);
};
-
-
-
-
export default DroppedObjects;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-// import { Html } from "@react-three/drei";
-// import { useDroppedObjectsStore } from "../../../store/store";
-// import { CartIcon, DocumentIcon, GlobeIcon, WalletIcon } from "../../icons/3dChartIcons";
-// import SimpleCard from "../realTimeVis/floating/SimpleCard";
-
-// const ICON_MAP: Record
>> = {
-// WalletIcon,
-// GlobeIcon,
-// DocumentIcon,
-// CartIcon
-// };
-// const DroppedObjects: React.FC = () => {
-// const objects = useDroppedObjectsStore((state) => state.objects); // Get objects from Zustand store
-//
-
-// return (
-// <>
-// {objects.map((obj, index) => {
-// const IconComponent = obj.Icon || WalletIcon; // Use obj.Icon directly if it exists
-// return (
-//
-// );
-// })}
-//
-// );
-// };
-
-// export default DroppedObjects;
diff --git a/app/src/components/ui/componets/Panel.tsx b/app/src/components/ui/componets/Panel.tsx
index 1d4cc44..6500119 100644
--- a/app/src/components/ui/componets/Panel.tsx
+++ b/app/src/components/ui/componets/Panel.tsx
@@ -149,7 +149,7 @@ const Panel: React.FC = ({
};
try {
let response = await addingWidgets(selectedZone.zoneId, organization, newWidget);
- console.log("response: ", response);
+
if (response.message === "Widget created successfully") {
setSelectedZone((prev) => ({
...prev,
diff --git a/app/src/components/ui/componets/RealTimeVisulization.tsx b/app/src/components/ui/componets/RealTimeVisulization.tsx
index 17dd452..45db987 100644
--- a/app/src/components/ui/componets/RealTimeVisulization.tsx
+++ b/app/src/components/ui/componets/RealTimeVisulization.tsx
@@ -9,9 +9,15 @@ import useModuleStore from "../../../store/useModuleStore";
import DroppedObjects from "./DroppedFloatingWidgets";
import { useDroppedObjectsStore } from "../../../store/useDroppedObjectsStore";
-import { useAsset3dWidget, useZones } from "../../../store/store";
-import { getZoneData } from "../../../services/realTimeVisulization/zoneData/getZones";
+import {
+ useAsset3dWidget,
+ useWidgetSubOption,
+ useZones,
+} from "../../../store/store";
import { getZone2dData } from "../../../services/realTimeVisulization/zoneData/getZoneData";
+import { generateUniqueId } from "../../../functions/generateUniqueId";
+import { determinePosition } from "./functions/determinePosition";
+import { addingFloatingWidgets } from "../../../services/realTimeVisulization/zoneData/addFloatingWidgets";
type Side = "top" | "bottom" | "left" | "right";
@@ -49,6 +55,8 @@ const RealTimeVisulization: React.FC = () => {
Record
>({});
const { widgetSelect, setWidgetSelect } = useAsset3dWidget();
+ const { widgetSubOption, setWidgetSubOption } = useWidgetSubOption();
+
useEffect(() => {
async function GetZoneData() {
const email = localStorage.getItem("email") || "";
@@ -103,48 +111,67 @@ const RealTimeVisulization: React.FC = () => {
useEffect(() => {}, [floatingWidgets]);
- const handleDrop = (event: React.DragEvent) => {
- event.preventDefault();
- const data = event.dataTransfer.getData("text/plain");
- if (widgetSelect !== "") return;
- if (!data || selectedZone.zoneName === "") return;
+ const handleDrop = async (event: React.DragEvent) => {
+ try {
+ event.preventDefault();
+ const email = localStorage.getItem("email") || "";
+ const organization = email?.split("@")[1]?.split(".")[0];
- const droppedData = JSON.parse(data);
- const canvasElement = document.getElementById("real-time-vis-canvas");
- if (!canvasElement) return;
+ const data = event.dataTransfer.getData("text/plain");
+ // if (widgetSelect !== "") return;
+ if (widgetSubOption === "3D") return;
+ if (!data || selectedZone.zoneName === "") return;
- const canvasRect = canvasElement.getBoundingClientRect();
- const relativeX = event.clientX - canvasRect.left;
- const relativeY = event.clientY - canvasRect.top;
+ const droppedData = JSON.parse(data);
+ const canvasElement = document.getElementById("real-time-vis-canvas");
+ if (!canvasElement) throw new Error("Canvas element not found");
- const newObject = {
- ...droppedData,
- position: [relativeY, relativeX], // Y first because of top/left style
- };
- // Only set zone if itβs not already in the store (prevents overwriting objects)
- const existingZone =
- useDroppedObjectsStore.getState().zones[selectedZone.zoneName];
- if (!existingZone) {
- useDroppedObjectsStore
- .getState()
- .setZone(selectedZone.zoneName, selectedZone.zoneId);
- }
- // Add the dropped object to the zone
- useDroppedObjectsStore
- .getState()
- .addObject(selectedZone.zoneName, newObject);
- setFloatingWidgets((prevWidgets) => ({
- ...prevWidgets,
- [selectedZone.zoneName]: {
- ...prevWidgets[selectedZone.zoneName],
- zoneName: selectedZone.zoneName,
- zoneId: selectedZone.zoneId,
- objects: [
- ...(prevWidgets[selectedZone.zoneName]?.objects || []),
- newObject,
- ],
- },
- }));
+ const canvasRect = canvasElement.getBoundingClientRect();
+ const relativeX = event.clientX - canvasRect.left;
+ const relativeY = event.clientY - canvasRect.top;
+
+ const newObject = {
+ ...droppedData,
+ id: generateUniqueId(),
+ position: determinePosition(canvasRect, relativeX, relativeY),
+ };
+
+ let response = await addingFloatingWidgets(
+ selectedZone.zoneId,
+ organization,
+ newObject
+ );
+
+ // Only set zone if itβs not already in the store (prevents overwriting objects)
+ const existingZone =
+ useDroppedObjectsStore.getState().zones[selectedZone.zoneName];
+ if (!existingZone) {
+ useDroppedObjectsStore
+ .getState()
+ .setZone(selectedZone.zoneName, selectedZone.zoneId);
+ }
+
+ // Add the dropped object to the zone if the API call is successful
+ if (response.message === "FloatWidget created successfully") {
+ useDroppedObjectsStore
+ .getState()
+ .addObject(selectedZone.zoneName, newObject);
+ }
+
+ // Update floating widgets state
+ setFloatingWidgets((prevWidgets) => ({
+ ...prevWidgets,
+ [selectedZone.zoneName]: {
+ ...prevWidgets[selectedZone.zoneName],
+ zoneName: selectedZone.zoneName,
+ zoneId: selectedZone.zoneId,
+ objects: [
+ ...(prevWidgets[selectedZone.zoneName]?.objects || []),
+ newObject,
+ ],
+ },
+ }));
+ } catch (error) {}
};
return (
diff --git a/app/src/components/ui/componets/functions/convertAutoToNumeric.ts b/app/src/components/ui/componets/functions/convertAutoToNumeric.ts
new file mode 100644
index 0000000..3addac2
--- /dev/null
+++ b/app/src/components/ui/componets/functions/convertAutoToNumeric.ts
@@ -0,0 +1,41 @@
+import { getActiveProperties } from "./getActiveProperties";
+
+export const convertAutoToNumeric = (
+ canvasRect: DOMRect,
+ position: {
+ top: number | "auto";
+ left: number | "auto";
+ right: number | "auto";
+ bottom: number | "auto";
+ }
+): { top: number; left: number; right: number; bottom: number } => {
+ const { width, height } = canvasRect;
+
+ // Determine which properties are active
+ const [activeProp1, activeProp2] = getActiveProperties(position);
+
+ let top = typeof position.top !== "string" ? position.top : 0;
+ let left = typeof position.left !== "string" ? position.left : 0;
+ let right = typeof position.right !== "string" ? position.right : 0;
+ let bottom = typeof position.bottom !== "string" ? position.bottom : 0;
+
+ // Calculate missing properties based on active properties
+ if (activeProp1 === "top") {
+ bottom = height - top;
+ } else if (activeProp1 === "bottom") {
+ top = height - bottom;
+ }
+
+ if (activeProp2 === "left") {
+ right = width - left;
+ } else if (activeProp2 === "right") {
+ left = width - right;
+ }
+
+ return {
+ top,
+ left,
+ right,
+ bottom,
+ };
+};
diff --git a/app/src/components/ui/componets/functions/determinePosition.ts b/app/src/components/ui/componets/functions/determinePosition.ts
new file mode 100644
index 0000000..0fcd727
--- /dev/null
+++ b/app/src/components/ui/componets/functions/determinePosition.ts
@@ -0,0 +1,64 @@
+export function determinePosition(
+ canvasRect: DOMRect,
+ relativeX: number,
+ relativeY: number
+): {
+ top: number | "auto";
+ left: number | "auto";
+ right: number | "auto";
+ bottom: number | "auto";
+} {
+ // Calculate the midpoints of the canvas
+ const centerX = canvasRect.width / 2;
+ const centerY = canvasRect.height / 2;
+
+ // Initialize position with default values
+ let position: {
+ top: number | "auto";
+ left: number | "auto";
+ right: number | "auto";
+ bottom: number | "auto";
+ };
+
+ if (relativeY < centerY) {
+ // Top half
+ if (relativeX < centerX) {
+ // Left side
+ position = {
+ top: relativeY,
+ left: relativeX,
+ right: "auto",
+ bottom: "auto",
+ };
+ } else {
+ // Right side
+ position = {
+ top: relativeY,
+ right: canvasRect.width - relativeX,
+ left: "auto",
+ bottom: "auto",
+ };
+ }
+ } else {
+ // Bottom half
+ if (relativeX < centerX) {
+ // Left side
+ position = {
+ bottom: canvasRect.height - relativeY,
+ left: relativeX,
+ right: "auto",
+ top: "auto",
+ };
+ } else {
+ // Right side
+ position = {
+ bottom: canvasRect.height - relativeY,
+ right: canvasRect.width - relativeX,
+ left: "auto",
+ top: "auto",
+ };
+ }
+ }
+
+ return position;
+}
diff --git a/app/src/components/ui/componets/functions/getActiveProperties.ts b/app/src/components/ui/componets/functions/getActiveProperties.ts
new file mode 100644
index 0000000..2cb0b1b
--- /dev/null
+++ b/app/src/components/ui/componets/functions/getActiveProperties.ts
@@ -0,0 +1,17 @@
+export const getActiveProperties = (position: {
+ top: number | "auto";
+ left: number | "auto";
+ right: number | "auto";
+ bottom: number | "auto";
+}) => {
+ let activeProps: ["top", "left"] | ["bottom", "right"] = ["top", "left"]; // Default to top-left
+
+ if (
+ typeof position.bottom !== "string" &&
+ typeof position.right !== "string"
+ ) {
+ activeProps = ["bottom", "right"];
+ }
+
+ return activeProps;
+};
diff --git a/app/src/components/ui/componets/zoneCameraTarget.tsx b/app/src/components/ui/componets/zoneCameraTarget.tsx
index 57804b9..f022b32 100644
--- a/app/src/components/ui/componets/zoneCameraTarget.tsx
+++ b/app/src/components/ui/componets/zoneCameraTarget.tsx
@@ -14,6 +14,7 @@ export default function ZoneCentreTarget() {
const { Edit, setEdit } = useEditPosition();
+
useEffect(() => {
if (
selectedZone.zoneViewPortTarget &&
@@ -39,22 +40,22 @@ export default function ZoneCentreTarget() {
if (centrePoint.length > 0) {
- let camPosition = new THREE.Vector3(...selectedZone.zoneViewPortPosition);
- let CamTarget = new THREE.Vector3(...selectedZone.zoneViewPortTarget);
+ // let camPosition = new THREE.Vector3(...selectedZone.zoneViewPortPosition);
+ // let CamTarget = new THREE.Vector3(...selectedZone.zoneViewPortTarget);
- const direction = new THREE.Vector3().subVectors(CamTarget, camPosition).normalize();
+ // const direction = new THREE.Vector3().subVectors(CamTarget, camPosition).normalize();
- const worldUp = new THREE.Vector3(0, 0, 1);
- const right = new THREE.Vector3().crossVectors(worldUp, direction).normalize();
- const up = new THREE.Vector3().crossVectors(direction, right).normalize();
- const offsetPosition = up.clone().multiplyScalar(20);
- camPosition.add(offsetPosition);
+ // const worldUp = new THREE.Vector3(0, 0, 1);
+ // const right = new THREE.Vector3().crossVectors(worldUp, direction).normalize();
+ // const up = new THREE.Vector3().crossVectors(direction, right).normalize();
+ // const offsetPosition = up.clone().multiplyScalar(20);
+ // camPosition.add(offsetPosition);
const setCam = async () => {
controls.setLookAt(centrePoint[0], 100, centrePoint[2], ...centrePoint, true);
setTimeout(() => {
controls?.setLookAt(
- ...camPosition.toArray(),
+ ...selectedZone.zoneViewPortPosition,
selectedZone.zoneViewPortTarget[0],
selectedZone.zoneViewPortTarget[1],
selectedZone.zoneViewPortTarget[2],
@@ -65,21 +66,9 @@ export default function ZoneCentreTarget() {
setCam();
} else {
- let camPosition = new THREE.Vector3(...selectedZone.zoneViewPortPosition);
- let CamTarget = new THREE.Vector3(...selectedZone.zoneViewPortTarget);
-
- const direction = new THREE.Vector3().subVectors(CamTarget, camPosition).normalize();
-
- const worldUp = new THREE.Vector3(0, 0, 1);
- const right = new THREE.Vector3().crossVectors(worldUp, direction).normalize();
- const up = new THREE.Vector3().crossVectors(direction, right).normalize();
-
- const offsetPosition = up.clone().multiplyScalar(20);
-
- camPosition.add(offsetPosition);
const setCam = async () => {
controls?.setLookAt(
- ...camPosition.toArray(),
+ ...selectedZone.zoneViewPortPosition,
selectedZone.zoneViewPortTarget[0],
selectedZone.zoneViewPortTarget[1],
selectedZone.zoneViewPortTarget[2],
diff --git a/app/src/components/ui/list/DropDownList.tsx b/app/src/components/ui/list/DropDownList.tsx
index 4ff51ca..e77f35b 100644
--- a/app/src/components/ui/list/DropDownList.tsx
+++ b/app/src/components/ui/list/DropDownList.tsx
@@ -32,7 +32,7 @@ const DropDownList: React.FC = ({
listType = "default",
remove,
}) => {
-
+
const [isOpen, setIsOpen] = useState(defaultOpen);
const { zones, setZones } = useZones()
@@ -43,6 +43,17 @@ const DropDownList: React.FC = ({
const { selectedZone, setSelectedZone } = useSelectedZoneStore();
useEffect(() => {
+ // console.log(zones);
+ // setZoneDataList([
+ // { id: "2e996073-546c-470c-8323-55bd3700c6aa", name: "zone1" },
+ // { id: "3f473bf0-197c-471c-a71f-943fc9ca2b47", name: "zone2" },
+ // { id: "905e8fb6-9e18-469b-9474-e0478fb9601b", name: "zone3" },
+ // { id: "9d9efcbe-8e96-47eb-bfad-128a9e4c532e", name: "zone4" },
+ // { id: "884f3d29-eb5a-49a5-abe9-d11971c08e85", name: "zone5" },
+ // { id: "70fa55cd-b5c9-4f80-a8c4-6319af3bfb4e", name: "zone6" },
+ // ])
+
+
const value = (zones || []).map((val: { zoneId: string; zoneName: string }) => ({
id: val.zoneId,
name: val.zoneName
diff --git a/app/src/components/ui/list/List.tsx b/app/src/components/ui/list/List.tsx
index 7a7da8d..0b2e63b 100644
--- a/app/src/components/ui/list/List.tsx
+++ b/app/src/components/ui/list/List.tsx
@@ -1,9 +1,9 @@
-import React from "react";
+import React, { useEffect } from "react";
import RenameInput from "../inputs/RenameInput";
import { EyeIcon, LockIcon, RmoveIcon } from "../../icons/ExportCommonIcons";
import { useSelectedZoneStore } from "../../../store/useZoneStore";
import { getZoneData } from "../../../services/realTimeVisulization/zoneData/getZones";
-import { useSubModuleStore } from "../../../store/useModuleStore";
+import useModuleStore, { useSubModuleStore } from "../../../store/useModuleStore";
interface ListProps {
items?: { id: string; name: string }[]; // Optional array of items to render
@@ -12,27 +12,55 @@ interface ListProps {
}
const List: React.FC = ({ items = [], remove }) => {
- const { setSelectedZone } = useSelectedZoneStore();
+ const { activeModule, setActiveModule } = useModuleStore();
+ const { selectedZone, setSelectedZone } = useSelectedZoneStore();
const { setSubModule } = useSubModuleStore();
+ useEffect(() => {
+ useSelectedZoneStore.getState().setSelectedZone({
+ zoneName: "",
+ activeSides: [],
+ panelOrder: [],
+ lockedPanels: [],
+ zoneId: "",
+ zoneViewPortTarget: [],
+ zoneViewPortPosition: [],
+ widgets: [],
+ });
+ }, [activeModule]);
+
async function handleSelectZone(id: string) {
- setSubModule("zoneProperties")
- const email = localStorage.getItem('email')
- const organization = (email!.split("@")[1]).split(".")[0];
- let response = await getZoneData(id, organization)
- setSelectedZone({
- zoneName: response?.zoneName,
- activeSides: response?.activeSides || [],
- panelOrder: response?.panelOrder || [],
- lockedPanels: response?.lockedPanels || [],
- widgets: response?.widgets || [],
- zoneId: response?.zoneId,
- zoneViewPortTarget: response?.viewPortCenter || [],
- zoneViewPortPosition:
- response?.viewPortposition || [],
- });
+ try {
+ // Avoid re-fetching if the same zone is already selected
+ if (selectedZone?.zoneId === id) {
+ console.log("Zone is already selected:", selectedZone.zoneName);
+ return;
+ }
+ setSubModule("zoneProperties");
+
+ const email = localStorage.getItem("email");
+ const organization = email?.split("@")[1]?.split(".")[0] || "";
+
+ let response = await getZoneData(id, organization);
+
+ setSelectedZone({
+ zoneName: response?.zoneName,
+ activeSides: response?.activeSides || [],
+ panelOrder: response?.panelOrder || [],
+ lockedPanels: response?.lockedPanels || [],
+ widgets: response?.widgets || [],
+ zoneId: response?.zoneId,
+ zoneViewPortTarget: response?.viewPortCenter || [],
+ zoneViewPortPosition: response?.viewPortposition || [],
+ });
+
+ console.log("Zone selected:", response?.zoneName);
+ } catch (error) {
+ console.error("Error selecting zone:", error);
+ }
}
+
return (
<>
{items.length > 0 ? (
diff --git a/app/src/components/ui/realTimeVis/floating/FleetEfficiency.tsx b/app/src/components/ui/realTimeVis/floating/FleetEfficiency.tsx
index 03c00e8..07e5f19 100644
--- a/app/src/components/ui/realTimeVis/floating/FleetEfficiency.tsx
+++ b/app/src/components/ui/realTimeVis/floating/FleetEfficiency.tsx
@@ -14,8 +14,6 @@ const FleetEfficiency = () => {
per: progress,
});
-
- console.log("Dragged Data:", cardData);
event.dataTransfer.setData("text/plain", cardData);
};
diff --git a/app/src/components/ui/realTimeVis/floating/SimpleCard.tsx b/app/src/components/ui/realTimeVis/floating/SimpleCard.tsx
index ee996bd..0c36977 100644
--- a/app/src/components/ui/realTimeVis/floating/SimpleCard.tsx
+++ b/app/src/components/ui/realTimeVis/floating/SimpleCard.tsx
@@ -23,6 +23,7 @@ const SimpleCard: React.FC = ({
value,
per,
icon: Icon,
+
className: event.currentTarget.className,
position: [rect.top, rect.left], // β
Store position
});
diff --git a/app/src/modules/scene/scene.tsx b/app/src/modules/scene/scene.tsx
index ac74240..74693b4 100644
--- a/app/src/modules/scene/scene.tsx
+++ b/app/src/modules/scene/scene.tsx
@@ -21,6 +21,7 @@ import DroppedObjects from "../../components/ui/componets/DroppedFloatingWidgets
import ZoneCentreTarget from "../../components/ui/componets/zoneCameraTarget";
import ProductionCapacity from "../../components/layout/3D-cards/cards/ProductionCapacity";
import Dropped3dWidgets from "../../components/ui/componets/Dropped3dWidget";
+import { useWidgetSubOption } from "../../store/store";
export default function Scene() {
@@ -31,9 +32,6 @@ export default function Scene() {
{ name: "right", keys: ["ArrowRight", "d", "D"] },
], [])
-
-
-
return (