Dwinzo-Beta
/
Dwinzo_dev
4
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update response message checks and enhance loading state management across components

This commit is contained in:
Gomathi 2025-06-10 13:41:50 +05:30
parent 75eec533b6
commit 365d096d8e
8 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/components/layout/sidebarRight/properties/ZoneProperties.tsx
View File

@ -35,9 +35,9 @@ const ZoneProperties: React.FC = () => {
viewPortCenter: zoneTarget,
};
let response = await zoneCameraUpdate(zonesdata, organization,projectId);
let response = await zoneCameraUpdate(zonesdata, organization, projectId);
console.log('response: ', response);
if (response.message === "updated successfully") {
if (response.message === "zone updated") {
setEdit(false);
} else {
// console.log(response);
@ -59,10 +59,10 @@ const ZoneProperties: React.FC = () => {
zoneName: newName,
};
// Call your API to update the zone
let response = await zoneCameraUpdate(zonesdata, organization,projectId);
let response = await zoneCameraUpdate(zonesdata, organization, projectId);
console.log('response: ', response);
// console.log("response: ", response);
if (response.message === "updated successfully") {
if (response.message === "zone updated") {
setSelectedZone((prev) => ({ ...prev, zoneName: newName }));
setZones((prevZones: any[]) =>
prevZones.map((zone) =>
zone.zoneUuid === selectedZone.zoneUuid

5
app/src/components/ui/analysis/ProductionCapacity.tsx
View File

@ -93,7 +93,10 @@ const ThroughputSummary: React.FC = () => {
useEffect(() => {
// console.log('productionCapacityData > 0: ', productionCapacityData > 0);
if (productionCapacityData > 0) {
setIsLoading(false);
setTimeout(() => {
setIsLoading(false);
}, 3000)
console.log("productionCapacityData: ", productionCapacityData);
} else {
setIsLoading(true);

4
app/src/components/ui/analysis/ROISummary.tsx
View File

@ -80,7 +80,7 @@ const ROISummary = ({
const year = now.getFullYear();
return `${day} ${month}, ${year}`;
}
const [isLoading, setIsLoading] = useState(false);
const [isLoading, setIsLoading] = useState(true);
const { roiSummary } = useROISummaryData();
@ -88,7 +88,7 @@ const ROISummary = ({
if (roiSummary.productName) {
setTimeout(() => {
setIsLoading(false);
}, 4000)
}, 4500)
} else {
// If productName is empty, assume still loading
setIsLoading(true);

7
app/src/components/ui/analysis/ThroughputSummary.tsx
View File

@ -24,17 +24,14 @@ const ProductionCapacity = ({
const partialFillPercent =
((progressPercent / 100) * totalBars - barsToFill) * 100;
const [isLoading, setIsLoading] = useState(false);
const [isLoading, setIsLoading] = useState(true);
useEffect(() => {
if (throughputData > 0) {
setTimeout(() => {
setIsLoading(false);
}, 3000)
setIsLoading(false);
} else {
setIsLoading(true);
}
}, [throughputData])
return (

6
app/src/components/ui/list/List.tsx
View File

@ -119,17 +119,15 @@ const List: React.FC<ListProps> = ({ items = [], remove }) => {
alert("Zone name already exists. Please choose a different name.");
return; // DO NOT update state
}
const zonesdata = {
zoneUuid: selectedZone.zoneUuid,
zoneName: newName,
};
console.log('zonesdata: ', zonesdata);
const response = await zoneCameraUpdate(zonesdata, organization,projectId);
console.log('response: ', response);
if (response.message === "updated successfully") {
if (response.message === "zone updated") {
setSelectedZone((prev) => ({ ...prev, zoneName: newName }));
setZones((prevZones: any[]) =>
prevZones.map((zone) =>
zone.zoneUuid === selectedZone.zoneUuid

28
app/src/modules/simulation/analysis/throughPut/throughPutData.tsx
View File

@ -49,16 +49,15 @@ export default function ThroughPutData() {
if (item.type === "roboticArm") {
armBots.filter(arm => arm.modelUuid === item.modelUuid)
.forEach(arm => {
if (arm.activeTime >= 0) {
if (arm.activeTime > 0) {
process.push({ modelid: arm.modelUuid, modelName: arm.modelName, activeTime: arm?.activeTime })
totalActiveTime += arm.activeTime;
}
});
} else if (item.type === "vehicle") {
vehicles.filter(vehicle => vehicle.modelUuid === item.modelUuid)
.forEach(vehicle => {
if (vehicle.activeTime >= 0) {
if (vehicle.activeTime > 0) {
process.push({ modelid: vehicle.modelUuid, modelName: vehicle.modelName, activeTime: vehicle?.activeTime })
totalActiveTime += vehicle.activeTime;
@ -67,7 +66,7 @@ export default function ThroughPutData() {
} else if (item.type === "machine") {
machines.filter(machine => machine.modelUuid === item.modelUuid)
.forEach(machine => {
if (machine.activeTime >= 0) {
if (machine.activeTime > 0) {
process.push({ modelid: machine.modelUuid, modelName: machine.modelName, activeTime: machine?.activeTime })
totalActiveTime += machine.activeTime;
}
@ -75,16 +74,16 @@ export default function ThroughPutData() {
} else if (item.type === "transfer") {
conveyors.filter(conveyor => conveyor.modelUuid === item.modelUuid)
.forEach(conveyor => {
if (conveyor.activeTime >= 0) {
totalActiveTime += conveyor.activeTime;
if (conveyor.activeTime > 0) {
// totalActiveTime += conveyor.activeTime;
}
});
} else if (item.type === "storageUnit") {
storageUnits.filter(storage => storage.modelUuid === item.modelUuid)
.forEach(storage => {
if (storage.activeTime >= 0) {
totalActiveTime += storage.activeTime;
if (storage.activeTime > 0) {
// totalActiveTime += storage.activeTime;
//
}
});
}
@ -93,6 +92,7 @@ export default function ThroughPutData() {
totalItems += sequence.length;
});
console.log(totalActiveTime);
setMachineCount(totalItems);
setMachineActiveTime(totalActiveTime);
let arr = process.map((item: any) => ({
@ -181,12 +181,18 @@ export default function ThroughPutData() {
}
}
}
getMachineActive();
if (isPlaying) {
setTimeout(() => {
getMachineActive();
}, 500)
}
}, [armBots, materials, materialHistory, machines, vehicles, selectedProduct])
useEffect(() => {
if (machineActiveTime > 0 && materialCycleTime > 0 && machineCount > 0) {
console.log('machineActiveTime: ', machineActiveTime);
console.log('materialCycleTime: ', materialCycleTime);
console.log('machineCount: ', machineCount);
const utilization = machineActiveTime / 3600; // Active time per hour
const unitsPerMachinePerHour = 3600 / materialCycleTime;
const throughput = unitsPerMachinePerHour * machineCount * utilization;

2
app/src/modules/simulation/vehicle/instances/animator/vehicleAnimator.tsx
View File

@ -32,7 +32,7 @@ function VehicleAnimator({ path, handleCallBack, currentPhase, agvUuid, agvDetai
useEffect(() => {
if (currentPhase === 'stationed-pickup' && path.length > 0) {
console.log('path: ', path);
// console.log('path: ', path);
setCurrentPath(path);
setObjectRotation(agvDetail.point.action?.pickUpPoint?.rotation)
} else if (currentPhase === 'pickup-drop' && path.length > 0) {

6
app/src/pages/UserAuth.tsx
View File

@ -38,13 +38,12 @@ const UserAuth: React.FC = () => {
const { userId, organization } = getUserData();
const handleLogin = async (e: FormEvent<HTMLFormElement>) => {
e.preventDefault();
const organization = email.split("@")[1].split(".")[0];
try {
const res = await signInApi(email, password, organization, fingerprint);
console.log('res: ', res);
if (res.message.message === "login successfull") {
setError("");
setOrganization(organization);
@ -57,7 +56,10 @@ const UserAuth: React.FC = () => {
localStorage.setItem("refreshToken", res.message.refreshToken);
try {
console.log('res.message.userId: ', res.message.userId);
console.log('organization: ', organization);
const projects = await recentlyViewed(organization, res.message.userId);
console.log('projects: ', projects);
if (Object.values(projects.RecentlyViewed).length > 0) {
const firstId = (Object.values(projects?.RecentlyViewed || {})[0] as any)?._id;