From 6d639edc43483f2f22f3ad4d23a1291754b065b2 Mon Sep 17 00:00:00 2001 From: Vishnu Date: Thu, 3 Apr 2025 09:58:55 +0530 Subject: [PATCH 1/2] update socket connection URL to include '/Builder' path --- app/src/store/store.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/store/store.ts b/app/src/store/store.ts index 87f937c..bd903f2 100644 --- a/app/src/store/store.ts +++ b/app/src/store/store.ts @@ -12,7 +12,7 @@ export const useSocketStore = create((set: any, get: any) => ({ } const socket = io( - `http://${process.env.REACT_APP_SERVER_SOCKET_API_BASE_URL}`, + `http://${process.env.REACT_APP_SERVER_SOCKET_API_BASE_URL}/Builder`, { reconnection: false, auth: { email, organization }, From e848875fa0336b328eb7759f7bf2bfe17d5a8e56 Mon Sep 17 00:00:00 2001 From: gabriel Date: Thu, 3 Apr 2025 18:15:26 +0530 Subject: [PATCH 2/2] changed api for get iot inputs --- .../visualization/IotInputCards/BarChartInput.tsx | 2 +- .../IotInputCards/FleetEfficiencyInputComponent.tsx | 2 +- .../IotInputCards/FlotingWidgetInput.tsx | 2 +- .../visualization/IotInputCards/LineGrapInput.tsx | 2 +- .../visualization/IotInputCards/PieChartInput.tsx | 2 +- .../visualization/IotInputCards/Progress1Input.tsx | 2 +- .../visualization/IotInputCards/Progress2Input.tsx | 2 +- .../WarehouseThroughputInputComponent.tsx | 2 +- .../IotInputCards/Widget2InputCard3D.tsx | 2 +- .../IotInputCards/Widget4InputCard3D.tsx | 2 +- app/src/components/ui/componets/DraggableWidget.tsx | 12 ++++++------ 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/BarChartInput.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/BarChartInput.tsx index 8fe71a6..e5debde 100644 --- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/BarChartInput.tsx +++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/BarChartInput.tsx @@ -25,7 +25,7 @@ const BarChartInput = (props: Props) => { useEffect(() => { const fetchZoneData = async () => { try { - const response = await axios.get(`http://${iotApiUrl}/getinput`); + const response = await axios.get(`http://${iotApiUrl}/floatinput`); if (response.status === 200) { // console.log("dropdown data:", response.data); setDropDownData(response.data); diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/FleetEfficiencyInputComponent.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/FleetEfficiencyInputComponent.tsx index 3a86ea9..cd60d24 100644 --- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/FleetEfficiencyInputComponent.tsx +++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/FleetEfficiencyInputComponent.tsx @@ -25,7 +25,7 @@ const FleetEfficiencyInputComponent = (props: Props) => { useEffect(() => { const fetchZoneData = async () => { try { - const response = await axios.get(`http://${iotApiUrl}/getinput`); + const response = await axios.get(`http://${iotApiUrl}/floatinput`); if (response.status === 200) { // console.log("dropdown data:", response.data); setDropDownData(response.data); diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/FlotingWidgetInput.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/FlotingWidgetInput.tsx index 0a58634..e389802 100644 --- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/FlotingWidgetInput.tsx +++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/FlotingWidgetInput.tsx @@ -25,7 +25,7 @@ const FlotingWidgetInput = (props: Props) => { useEffect(() => { const fetchZoneData = async () => { try { - const response = await axios.get(`http://${iotApiUrl}/getinput`); + const response = await axios.get(`http://${iotApiUrl}/floatinput`); if (response.status === 200) { // console.log("dropdown data:", response.data); setDropDownData(response.data); diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/LineGrapInput.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/LineGrapInput.tsx index 017dc6d..6ab5ec3 100644 --- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/LineGrapInput.tsx +++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/LineGrapInput.tsx @@ -144,7 +144,7 @@ const LineGrapInput = (props: Props) => { useEffect(() => { const fetchZoneData = async () => { try { - const response = await axios.get(`http://${iotApiUrl}/getinput`); + const response = await axios.get(`http://${iotApiUrl}/floatinput`); if (response.status === 200) { // console.log("dropdown data:", response.data); setDropDownData(response.data); diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/PieChartInput.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/PieChartInput.tsx index e3bed25..56ef990 100644 --- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/PieChartInput.tsx +++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/PieChartInput.tsx @@ -25,7 +25,7 @@ const PieChartInput = (props: Props) => { useEffect(() => { const fetchZoneData = async () => { try { - const response = await axios.get(`http://${iotApiUrl}/getinput`); + const response = await axios.get(`http://${iotApiUrl}/floatinput`); if (response.status === 200) { // console.log("dropdown data:", response.data); setDropDownData(response.data); diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress1Input.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress1Input.tsx index 545df45..cd347b3 100644 --- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress1Input.tsx +++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress1Input.tsx @@ -25,7 +25,7 @@ const Progress1Input = (props: Props) => { useEffect(() => { const fetchZoneData = async () => { try { - const response = await axios.get(`http://${iotApiUrl}/getinput`); + const response = await axios.get(`http://${iotApiUrl}/floatinput`); if (response.status === 200) { // console.log("dropdown data:", response.data); setDropDownData(response.data); diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress2Input.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress2Input.tsx index 3a11a29..ba56e27 100644 --- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress2Input.tsx +++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/Progress2Input.tsx @@ -25,7 +25,7 @@ const Progress2Input = (props: Props) => { useEffect(() => { const fetchZoneData = async () => { try { - const response = await axios.get(`http://${iotApiUrl}/getinput`); + const response = await axios.get(`http://${iotApiUrl}/floatinput`); if (response.status === 200) { // console.log("dropdown data:", response.data); setDropDownData(response.data); diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/WarehouseThroughputInputComponent.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/WarehouseThroughputInputComponent.tsx index cd8cb96..c35211e 100644 --- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/WarehouseThroughputInputComponent.tsx +++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/WarehouseThroughputInputComponent.tsx @@ -25,7 +25,7 @@ const WarehouseThroughputInputComponent = (props: Props) => { useEffect(() => { const fetchZoneData = async () => { try { - const response = await axios.get(`http://${iotApiUrl}/getinput`); + const response = await axios.get(`http://${iotApiUrl}/floatinput`); if (response.status === 200) { // console.log("dropdown data:", response.data); setDropDownData(response.data); diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/Widget2InputCard3D.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/Widget2InputCard3D.tsx index bad0afc..ce13496 100644 --- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/Widget2InputCard3D.tsx +++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/Widget2InputCard3D.tsx @@ -27,7 +27,7 @@ const Widget2InputCard3D = (props: Props) => { useEffect(() => { const fetchZoneData = async () => { try { - const response = await axios.get(`http://${iotApiUrl}/getinput`); + const response = await axios.get(`http://${iotApiUrl}/floatinput`); if (response.status === 200) { // console.log("dropdown data:", response.data); setDropDownData(response.data); diff --git a/app/src/components/layout/sidebarRight/visualization/IotInputCards/Widget4InputCard3D.tsx b/app/src/components/layout/sidebarRight/visualization/IotInputCards/Widget4InputCard3D.tsx index 0be5489..43af417 100644 --- a/app/src/components/layout/sidebarRight/visualization/IotInputCards/Widget4InputCard3D.tsx +++ b/app/src/components/layout/sidebarRight/visualization/IotInputCards/Widget4InputCard3D.tsx @@ -27,7 +27,7 @@ const Widget4InputCard3D = (props: Props) => { useEffect(() => { const fetchZoneData = async () => { try { - const response = await axios.get(`http://${iotApiUrl}/getinput`); + const response = await axios.get(`http://${iotApiUrl}/floatinput`); if (response.status === 200) { // console.log("dropdown data:", response.data); setDropDownData(response.data); diff --git a/app/src/components/ui/componets/DraggableWidget.tsx b/app/src/components/ui/componets/DraggableWidget.tsx index e70fe2e..41727db 100644 --- a/app/src/components/ui/componets/DraggableWidget.tsx +++ b/app/src/components/ui/componets/DraggableWidget.tsx @@ -17,6 +17,7 @@ import { duplicateWidgetApi } from "../../../services/realTimeVisulization/zoneD import { deleteWidgetApi } from "../../../services/realTimeVisulization/zoneData/deleteWidgetApi"; import { useClickOutside } from "./functions/handleWidgetsOuterClick"; import { useSocketStore } from "../../../store/store"; +import { usePlayButtonStore } from "../../../store/usePlayButtonStore"; type Side = "top" | "bottom" | "left" | "right"; @@ -243,6 +244,7 @@ export const DraggableWidget = ({ // useClickOutside(chartWidget, () => { // setSelectedChartId(null); // }); + const { isPlaying } = usePlayButtonStore(); console.log('isPanelHidden: ', isPanelHidden); return ( @@ -250,9 +252,8 @@ export const DraggableWidget = ({