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

added api fallback for sockets

Browse Source
This commit is contained in:
Jerald-Golden-B
2025-09-01 17:36:40 +05:30
parent 765f4acb57
commit 8e7c5a1aa0
43 changed files with 2034 additions and 1863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/components/Dashboard/DashboardHome.tsx
View File

@@ -66,7 +66,7 @@ const DashboardHome: React.FC = () => {
// );
//
//socket for delete Project
// SOCKET for delete Project
const deleteProject = {
projectId,
organization,
@@ -98,6 +98,8 @@ const DashboardHome: React.FC = () => {
projectName: string,
thumbnail: string
) => {
if (projectSocket) {
const duplicateRecentProjectData = {
userId,
thumbnail,
@@ -107,6 +109,7 @@ const DashboardHome: React.FC = () => {
projectName,
};
projectSocket.emit("v1:project:Duplicate", duplicateRecentProjectData);
}
};
const renderProjects = () => {

5
app/src/components/Dashboard/DashboardProjects.tsx
View File

@@ -77,7 +77,7 @@ const DashboardProjects: React.FC = () => {
userId,
};
//socket for deleting the project
// SOCKET for deleting the project
if (projectSocket) {
projectSocket.emit("v1:project:delete", deleteProjects);
} else {
@@ -110,7 +110,7 @@ const DashboardProjects: React.FC = () => {
// projectName
// );
// console.log("duplicatedProject: ", duplicatedProject);
if (projectSocket) {
const duplicateProjectData = {
userId,
thumbnail,
@@ -120,6 +120,7 @@ const DashboardProjects: React.FC = () => {
projectName,
};
projectSocket.emit("v1:project:Duplicate", duplicateProjectData);
}
};
const renderProjects = () => {

10
app/src/components/Dashboard/SidePannel.tsx
View File

@@ -38,12 +38,13 @@ const SidePannel: React.FC<SidePannelProps> = ({ setActiveTab, activeTab }) => {
const handleCreateNewProject = async () => {
const token = localStorage.getItem("token");
const refreshToken = localStorage.getItem("refreshToken");
console.log("refreshToken: ", refreshToken);
if (!token || !refreshToken) {
console.error('token expired');
return;
}
try {
const projectId = generateProjectId();
useSocketStore
.getState()
.initializeSocket(email, organization, token, refreshToken);
useSocketStore.getState().initializeSocket(email, organization, token, refreshToken);
//API for creating new Project
// const project = await createProject(
@@ -60,7 +61,6 @@ const SidePannel: React.FC<SidePannelProps> = ({ setActiveTab, activeTab }) => {
projectUuid: projectId,
};
console.log("projectSocket: ", projectSocket);
if (projectSocket) {
const handleResponse = (data: any) => {
if (data.message === "Project created successfully") {

2
app/src/components/layout/sidebarLeft/assetList/Assets.tsx
View File

@@ -75,7 +75,7 @@ const Assets: React.FC = () => {
return (
<div className="assets-container-main">
<Search onChange={setSearchValue} value={searchValue} />
<Search debounced onChange={setSearchValue} value={searchValue} />
<div className="assets-list-section">
<section>
{isLoading ? (

2
app/src/components/layout/sidebarRight/properties/AisleProperties.tsx
View File

@@ -282,7 +282,7 @@ const AisleProperties: React.FC = () => {
<button
key={val.id}
title={val.brief || val.id}
className={`aisle-list ${aisleColor === val.color ? "selected" : ""}`}
className={`aisle-list ${aisleColor === val.id ? "selected" : ""}`}
onClick={() => setAisleColor(val.id)}
aria-pressed={aisleColor === val.id}
>

9
app/src/components/layout/sidebarRight/properties/SelectedAisleProperties.tsx
View File

@@ -20,6 +20,8 @@ import { useSocketStore } from "../../../../store/builder/store";
import { getUserData } from "../../../../functions/getUserData";
import { aisleTextureList } from "./AisleProperties";
import { upsertAisleApi } from "../../../../services/factoryBuilder/aisle/upsertAisleApi";
const SelectedAisleProperties: React.FC = () => {
const [collapsePresets, setCollapsePresets] = useState(false);
const [collapseTexture, setCollapseTexture] = useState(true);
@@ -44,9 +46,13 @@ const SelectedAisleProperties: React.FC = () => {
const updateBackend = (updatedAisle: Aisle) => {
if (updatedAisle && projectId) {
if (!socket?.active) {
// API
// upsertAisleApi(updatedAisle.aisleUuid, updatedAisle.points, updatedAisle.type, projectId, selectedVersion?.versionId || '');
upsertAisleApi(updatedAisle.aisleUuid, updatedAisle.points, updatedAisle.type, projectId, selectedVersion?.versionId || '');
} else {
// SOCKET
@@ -63,6 +69,7 @@ const SelectedAisleProperties: React.FC = () => {
socket.emit('v1:model-aisle:add', data);
}
}
}
const aisleTypes: {
name: string;

14
app/src/components/layout/sidebarRight/properties/SelectedDecalProperties.tsx
View File

@@ -7,8 +7,8 @@ import { useSocketStore } from "../../../../store/builder/store";
import InputRange from "../../../ui/inputs/InputRange";
import { getUserData } from "../../../../functions/getUserData";
// import { upsertWallApi } from "../../../../services/factoryBuilder/wall/upsertWallApi";
// import { upsertFloorApi } from "../../../../services/factoryBuilder/floor/upsertFloorApi";
import { upsertWallApi } from "../../../../services/factoryBuilder/wall/upsertWallApi";
import { upsertFloorApi } from "../../../../services/factoryBuilder/floor/upsertFloorApi";
const SelectedDecalProperties = () => {
const { selectedDecal, setSelectedDecal } = useBuilderStore();
@@ -24,9 +24,11 @@ const SelectedDecalProperties = () => {
const updateBackend = (updatedData: Wall | Floor) => {
if ('wallUuid' in updatedData) {
if (projectId && updatedData) {
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', updatedData);
upsertWallApi(projectId, selectedVersion?.versionId || '', updatedData);
} else {
// SOCKET
@@ -40,11 +42,14 @@ const SelectedDecalProperties = () => {
socket.emit('v1:model-Wall:add', data);
}
}
} else if ('floorUuid' in updatedData) {
if (projectId && updatedData) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedData);
upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedData);
} else {
// SOCKET
@@ -60,6 +65,7 @@ const SelectedDecalProperties = () => {
}
}
}
}
const handleRotationChange = (value: number) => {
if (!selectedDecal) return;

22
app/src/components/layout/sidebarRight/properties/SelectedFloorProperties.tsx
View File

@@ -10,7 +10,7 @@ import { getUserData } from "../../../../functions/getUserData";
import { useSocketStore } from "../../../../store/builder/store";
import { materials } from "./FloorProperties";
// import { upsertFloorApi } from "../../../../services/factoryBuilder/floor/upsertFloorApi";
import { upsertFloorApi } from "../../../../services/factoryBuilder/floor/upsertFloorApi";
const SelectedFloorProperties = () => {
const [depth, setDepth] = useState("");
@@ -43,10 +43,12 @@ const SelectedFloorProperties = () => {
if (!isNaN(parsed) && floor) {
const updatedFloor = updateFloor(floor.floorUuid, { floorDepth: parsed });
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
} else {
// SOCKET
@@ -61,6 +63,7 @@ const SelectedFloorProperties = () => {
socket.emit('v1:model-Floor:add', data);
}
}
}
};
const handleBevelChange = (val: string) => {
@@ -69,10 +72,12 @@ const SelectedFloorProperties = () => {
if (!isNaN(parsed) && floor) {
const updatedFloor = updateFloor(floor.floorUuid, { bevelStrength: parsed });
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
} else {
// SOCKET
@@ -87,6 +92,7 @@ const SelectedFloorProperties = () => {
socket.emit('v1:model-Floor:add', data);
}
}
}
};
const handleIsBeveledToggle = () => {
@@ -94,10 +100,12 @@ const SelectedFloorProperties = () => {
if (!floor) return;
const updatedFloor = updateFloor(floor.floorUuid, { isBeveled: !floor.isBeveled });
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
} else {
// SOCKET
@@ -111,6 +119,7 @@ const SelectedFloorProperties = () => {
socket.emit('v1:model-Floor:add', data);
}
}
};
@@ -119,10 +128,12 @@ const SelectedFloorProperties = () => {
const key = activeSurface === "top" ? "topMaterial" : "sideMaterial";
const updatedFloor = updateFloor(floor.floorUuid, { [key]: material.textureId });
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
} else {
// SOCKET
@@ -136,6 +147,7 @@ const SelectedFloorProperties = () => {
socket.emit('v1:model-Floor:add', data);
}
}
};

15
app/src/components/layout/sidebarRight/properties/SelectedWallProperties.tsx
View File

@@ -11,7 +11,7 @@ import { useParams } from "react-router-dom";
import { getUserData } from "../../../../functions/getUserData";
import { useSocketStore } from "../../../../store/builder/store";
// import { upsertWallApi } from "../../../../services/factoryBuilder/wall/upsertWallApi";
import { upsertWallApi } from "../../../../services/factoryBuilder/wall/upsertWallApi";
const SelectedWallProperties = () => {
const [height, setHeight] = useState("");
@@ -47,10 +47,12 @@ const SelectedWallProperties = () => {
if (!isNaN(height) && wall) {
const updatedWall = updateWall(wall.wallUuid, { wallHeight: height });
if (updatedWall && projectId) {
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
} else {
// SOCKET
@@ -65,6 +67,7 @@ const SelectedWallProperties = () => {
socket.emit('v1:model-Wall:add', data);
}
}
}
};
const handleThicknessChange = (val: string) => {
@@ -73,10 +76,12 @@ const SelectedWallProperties = () => {
if (!isNaN(thickness) && wall) {
const updatedWall = updateWall(wall.wallUuid, { wallThickness: thickness });
if (updatedWall && projectId) {
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
} else {
// SOCKET
@@ -91,6 +96,7 @@ const SelectedWallProperties = () => {
socket.emit('v1:model-Wall:add', data);
}
}
}
};
const handleSelectMaterial = (material: { textureId: string; textureName: string }) => {
@@ -99,10 +105,12 @@ const SelectedWallProperties = () => {
const updated = (activeSide === "side1" ? { insideMaterial: material.textureId } : { outsideMaterial: material.textureId })
const updatedWall = updateWall(wall.wallUuid, updated);
if (updatedWall && projectId) {
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
} else {
// SOCKET
@@ -116,6 +124,7 @@ const SelectedWallProperties = () => {
socket.emit('v1:model-Wall:add', data);
}
}
};
if (!wall) return null;

34
app/src/components/ui/collaboration/Messages.tsx
View File

@@ -65,22 +65,23 @@ const Messages: React.FC<MessageProps> = ({ val, i, setMessages, mode, setIsEdit
if (isEditableThread && editedThread) {
try {
// const editThreadTitle = await editThreadTitleApi(projectId, (val as CommentSchema).threadId, value, selectedVersion?.versionId || "")
// if (editThreadTitle.message == "ThreadTitle updated Successfully") {
// const editedThread: CommentSchema = {
// state: 'active',
// threadId: editThreadTitle.data.replyId,
// creatorId: userId,
// createdAt: getRelativeTime(editThreadTitle.data.createdAt),
// threadTitle: value,
// lastUpdatedAt: new Date().toISOString(),
// position: editThreadTitle.data.position,
// rotation: [0, 0, 0],
// comments: [],
// }
// updateComment((val as CommentSchema).threadId, editedThread)
// }
// projectId, userId, threadTitle, organization, threadId
if (!threadSocket?.active) {
const editThreadTitle = await editThreadTitleApi(projectId, (val as CommentSchema).threadId, value, selectedVersion?.versionId || "")
if (editThreadTitle.message == "ThreadTitle updated Successfully") {
const editedThread: CommentSchema = {
state: 'active',
threadId: editThreadTitle.data.replyId,
creatorId: userId,
createdAt: getRelativeTime(editThreadTitle.data.createdAt),
threadTitle: value,
lastUpdatedAt: new Date().toISOString(),
position: editThreadTitle.data.position,
rotation: [0, 0, 0],
comments: [],
}
updateComment((val as CommentSchema).threadId, editedThread)
}
} else {
const threadEdit = {
projectId,
userId,
@@ -91,6 +92,7 @@ const Messages: React.FC<MessageProps> = ({ val, i, setMessages, mode, setIsEdit
}
threadSocket.emit('v1:thread:updateTitle', threadEdit)
}
} catch {
}
} else {

29
app/src/components/ui/inputs/Search.tsx
View File

@@ -5,12 +5,14 @@ interface SearchProps {
value?: string | null; // The current value of the search input
placeholder?: string; // Placeholder text for the input
onChange: (value: string) => void; // Callback function to handle input changes
debounced?: boolean; // New prop: whether to debounce onChange
}
const Search: React.FC<SearchProps> = ({
value = "",
placeholder = "Search",
onChange,
debounced = false, // Default false
}) => {
// State to track the input value and focus status
const [inputValue, setInputValue] = useState(value);
@@ -19,7 +21,10 @@ const Search: React.FC<SearchProps> = ({
const handleInputChange = (event: ChangeEvent<HTMLInputElement>) => {
const newValue = event.target.value;
setInputValue(newValue);
onChange(newValue); // Call the onChange prop with the new value
if (!debounced) {
onChange(newValue); // Immediate call if not debounced
}
};
useEffect(() => {
@@ -29,25 +34,35 @@ const Search: React.FC<SearchProps> = ({
}
}, [value]);
// Handle debounced effect
useEffect(() => {
if (!debounced) return;
const timer = setTimeout(() => {
onChange(inputValue ?? "");
}, 500);
return () => clearTimeout(timer);
}, [inputValue, debounced, onChange]);
const handleClear = () => {
echo.warn("Search field cleared.");
console.warn("Search field cleared.");
setInputValue("");
onChange(""); // Clear the input value
onChange(""); // Clear immediately
};
const handleFocus = () => {
setIsFocused(true); // Set focus state to true
setIsFocused(true);
};
const handleBlur = () => {
setIsFocused(false); // Set focus state to false
setIsFocused(false);
};
return (
<div className="search-wrapper">
<div
className={`search-container ${
isFocused || inputValue ? "active" : ""
className={`search-container ${isFocused || inputValue ? "active" : ""
}`}
>
<div className="icon-container">

16
app/src/modules/builder/Decal/decalCreator/decalCreator.tsx
View File

@@ -9,8 +9,8 @@ import { useVersionContext } from '../../version/versionContext';
import { getUserData } from '../../../../functions/getUserData';
// import { upsertWallApi } from '../../../../services/factoryBuilder/wall/upsertWallApi';
// import { upsertFloorApi } from '../../../../services/factoryBuilder/floor/upsertFloorApi';
import { upsertWallApi } from '../../../../services/factoryBuilder/wall/upsertWallApi';
import { upsertFloorApi } from '../../../../services/factoryBuilder/floor/upsertFloorApi';
function DecalCreator() {
const { wallStore, floorStore } = useSceneContext();
@@ -63,10 +63,12 @@ function DecalCreator() {
setTimeout(() => {
const updatedWall = getWallById(wallIntersect.object.userData.wallUuid);
if (updatedWall) {
if (projectId && updatedWall) {
if (projectId) {
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
} else {
// SOCKET
@@ -81,6 +83,7 @@ function DecalCreator() {
socket.emit('v1:model-Wall:add', data);
}
}
}
}, 0)
} else if (floorIntersect) {
const floor = getFloorById(floorIntersect.object.userData.floorUuid);
@@ -107,9 +110,11 @@ function DecalCreator() {
setTimeout(() => {
const updatedFloor = getFloorById(floorIntersect.object.userData.floorUuid);
if (projectId && updatedFloor) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedFloor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedFloor);
} else {
// SOCKET
@@ -123,6 +128,7 @@ function DecalCreator() {
socket.emit('v1:model-Floor:add', data);
}
}
}, 0)
}
}

26
app/src/modules/builder/Decal/eventHandler/useDecalEventHandlers.ts
View File

@@ -13,8 +13,8 @@ import { useSceneContext } from '../../../scene/sceneContext';
import { detectModifierKeys } from '../../../../utils/shortcutkeys/detectModifierKeys';
import handleDecalPositionSnap from '../functions/handleDecalPositionSnap';
// import { upsertWallApi } from '../../../../services/factoryBuilder/wall/upsertWallApi';
// import { upsertFloorApi } from '../../../../services/factoryBuilder/floor/upsertFloorApi';
import { upsertWallApi } from '../../../../services/factoryBuilder/wall/upsertWallApi';
import { upsertFloorApi } from '../../../../services/factoryBuilder/floor/upsertFloorApi';
export function useDecalEventHandlers({
parent,
@@ -147,10 +147,12 @@ export function useDecalEventHandlers({
setTimeout(() => {
const updatedWall = getWallById(parent.wallUuid);
if (updatedWall) {
if (projectId && updatedWall) {
if (projectId) {
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
} else {
// SOCKET
@@ -165,15 +167,18 @@ export function useDecalEventHandlers({
socket.emit('v1:model-Wall:add', data);
}
}
}
}, 0)
} else if ('floorUuid' in parent) {
setTimeout(() => {
const updatedFloor = parent;
if (projectId && updatedFloor) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedFloor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedFloor);
} else {
// SOCKET
@@ -187,6 +192,7 @@ export function useDecalEventHandlers({
socket.emit('v1:model-Floor:add', data);
}
}
}, 0)
}
}
@@ -197,9 +203,11 @@ export function useDecalEventHandlers({
const updatedWall = removeDecalInWall(decalUuid);
if (projectId && updatedWall) {
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
} else {
// SOCKET
@@ -213,13 +221,16 @@ export function useDecalEventHandlers({
socket.emit('v1:model-Wall:add', data);
}
}
} else if ('floorUuid' in parent) {
const updatedFloor = removeDecalInFloor(decalUuid);
if (projectId && updatedFloor) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedFloor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedFloor);
} else {
// SOCKET
@@ -235,6 +246,7 @@ export function useDecalEventHandlers({
}
}
}
}
const handlePointerDown = (e: ThreeEvent<MouseEvent>) => {
if (visible && !toggleView && activeModule === 'builder') {

435
app/src/modules/builder/aisle/aisleCreator/aisleCreator.tsx
View File

@@ -10,7 +10,7 @@ import ReferenceAisle from './referenceAisle';
import ReferencePoint from '../../point/reference/referencePoint';
import { getUserData } from '../../../../functions/getUserData';
// import { upsertAisleApi } from '../../../../services/factoryBuilder/aisle/upsertAisleApi';
import { upsertAisleApi } from '../../../../services/factoryBuilder/aisle/upsertAisleApi';
function AisleCreator() {
const { scene, camera, raycaster, gl, pointer } = useThree();
@@ -93,431 +93,70 @@ function AisleCreator() {
}
}
if (aisleType === 'solid-aisle') {
const aisleConfigs: Record<string, (color: string) => any> = {
"solid-aisle": (color) => ({ aisleType: "solid-aisle", aisleColor: color, aisleWidth }),
"dashed-aisle": (color) => ({ aisleType: "dashed-aisle", aisleColor: color, aisleWidth, dashLength, gapLength }),
"dotted-aisle": (color) => ({ aisleType: "dotted-aisle", aisleColor: color, dotRadius, gapLength }),
"arrow-aisle": (color) => ({ aisleType: "arrow-aisle", aisleColor: color, aisleWidth }),
"arrows-aisle": (color) => ({ aisleType: "arrows-aisle", aisleColor: color, aisleWidth, aisleLength, gapLength }),
"arc-aisle": (color) => ({ aisleType: "arc-aisle", aisleColor: color, aisleWidth, isFlipped }),
"circle-aisle": (color) => ({ aisleType: "circle-aisle", aisleColor: color, aisleWidth }),
"junction-aisle": (color) => ({ aisleType: "junction-aisle", aisleColor: color, aisleWidth, isFlipped })
};
if (!aisleType || !(aisleType in aisleConfigs)) return;
if (tempPoints.length === 0) {
setTempPoints([newPoint]);
setIsCreating(true);
} else {
return;
}
const aisle: Aisle = {
aisleUuid: THREE.MathUtils.generateUUID(),
points: [tempPoints[0], newPoint],
type: {
aisleType: 'solid-aisle',
aisleColor: aisleColor,
aisleWidth: aisleWidth
}
type: aisleConfigs[aisleType](aisleColor)
};
addAisle(aisle);
push2D({
type: 'Draw',
actions: [
{
actionType: 'Line-Create',
point: {
type: 'Aisle',
lineData: aisle,
timeStamp: new Date().toISOString(),
}
}
],
})
type: "Draw",
actions: [{
actionType: "Line-Create",
point: { type: "Aisle", lineData: aisle, timeStamp: new Date().toISOString() }
}]
});
addAilseToBackend(aisle);
setTempPoints([newPoint]);
};
const addAilseToBackend = (aisle: Aisle) => {
if (projectId) {
if (!socket?.active) {
// API
// upsertAisleApi(aisle.aisleUuid, aisle.points, aisle.type, projectId, selectedVersion?.versionId || '')
upsertAisleApi(aisle.aisleUuid, aisle.points, aisle.type, projectId, selectedVersion?.versionId || '')
// SOCKET
socket.emit('v1:model-aisle:add', {
projectId: projectId,
versionId: selectedVersion?.versionId || '',
userId: userId,
organization: organization,
aisleUuid: aisle.aisleUuid,
points: aisle.points,
type: aisle.type
})
}
setTempPoints([newPoint]);
}
} else if (aisleType === 'dashed-aisle') {
if (tempPoints.length === 0) {
setTempPoints([newPoint]);
setIsCreating(true);
} else {
const aisle: Aisle = {
aisleUuid: THREE.MathUtils.generateUUID(),
points: [tempPoints[0], newPoint],
type: {
aisleType: 'dashed-aisle',
aisleColor: aisleColor,
aisleWidth: aisleWidth,
dashLength: dashLength,
gapLength: gapLength
}
};
addAisle(aisle);
push2D({
type: 'Draw',
actions: [
{
actionType: 'Line-Create',
point: {
type: 'Aisle',
lineData: aisle,
timeStamp: new Date().toISOString(),
}
}
],
})
if (projectId) {
// API
// upsertAisleApi(aisle.aisleUuid, aisle.points, aisle.type, projectId, selectedVersion?.versionId || '')
// SOCKET
socket.emit('v1:model-aisle:add', {
projectId: projectId,
versionId: selectedVersion?.versionId || '',
userId: userId,
organization: organization,
socket.emit("v1:model-aisle:add", {
projectId,
versionId: selectedVersion?.versionId || "",
userId,
organization,
aisleUuid: aisle.aisleUuid,
points: aisle.points,
type: aisle.type
})
}
setTempPoints([newPoint]);
}
} else if (aisleType === 'dotted-aisle') {
if (tempPoints.length === 0) {
setTempPoints([newPoint]);
setIsCreating(true);
} else {
const aisle: Aisle = {
aisleUuid: THREE.MathUtils.generateUUID(),
points: [tempPoints[0], newPoint],
type: {
aisleType: 'dotted-aisle',
aisleColor: aisleColor,
dotRadius: dotRadius,
gapLength: gapLength
}
};
addAisle(aisle);
push2D({
type: 'Draw',
actions: [
{
actionType: 'Line-Create',
point: {
type: 'Aisle',
lineData: aisle,
timeStamp: new Date().toISOString(),
});
}
}
],
})
if (projectId) {
// API
// upsertAisleApi(aisle.aisleUuid, aisle.points, aisle.type, projectId, selectedVersion?.versionId || '')
// SOCKET
socket.emit('v1:model-aisle:add', {
projectId: projectId,
versionId: selectedVersion?.versionId || '',
userId: userId,
organization: organization,
aisleUuid: aisle.aisleUuid,
points: aisle.points,
type: aisle.type
})
}
setTempPoints([newPoint]);
}
} else if (aisleType === 'arrow-aisle') {
if (tempPoints.length === 0) {
setTempPoints([newPoint]);
setIsCreating(true);
} else {
const aisle: Aisle = {
aisleUuid: THREE.MathUtils.generateUUID(),
points: [tempPoints[0], newPoint],
type: {
aisleType: 'arrow-aisle',
aisleColor: aisleColor,
aisleWidth: aisleWidth
}
};
addAisle(aisle);
push2D({
type: 'Draw',
actions: [
{
actionType: 'Line-Create',
point: {
type: 'Aisle',
lineData: aisle,
timeStamp: new Date().toISOString(),
}
}
],
})
if (projectId) {
// API
// upsertAisleApi(aisle.aisleUuid, aisle.points, aisle.type, projectId, selectedVersion?.versionId || '')
// SOCKET
socket.emit('v1:model-aisle:add', {
projectId: projectId,
versionId: selectedVersion?.versionId || '',
userId: userId,
organization: organization,
aisleUuid: aisle.aisleUuid,
points: aisle.points,
type: aisle.type
})
}
setTempPoints([newPoint]);
}
} else if (aisleType === 'arrows-aisle') {
if (tempPoints.length === 0) {
setTempPoints([newPoint]);
setIsCreating(true);
} else {
const aisle: Aisle = {
aisleUuid: THREE.MathUtils.generateUUID(),
points: [tempPoints[0], newPoint],
type: {
aisleType: 'arrows-aisle',
aisleColor: aisleColor,
aisleWidth: aisleWidth,
aisleLength: aisleLength,
gapLength: gapLength
}
};
addAisle(aisle);
push2D({
type: 'Draw',
actions: [
{
actionType: 'Line-Create',
point: {
type: 'Aisle',
lineData: aisle,
timeStamp: new Date().toISOString(),
}
}
],
})
if (projectId) {
// API
// upsertAisleApi(aisle.aisleUuid, aisle.points, aisle.type, projectId, selectedVersion?.versionId || '')
// SOCKET
socket.emit('v1:model-aisle:add', {
projectId: projectId,
versionId: selectedVersion?.versionId || '',
userId: userId,
organization: organization,
aisleUuid: aisle.aisleUuid,
points: aisle.points,
type: aisle.type
})
}
setTempPoints([newPoint]);
}
} else if (aisleType === 'arc-aisle') {
if (tempPoints.length === 0) {
setTempPoints([newPoint]);
setIsCreating(true);
} else {
const aisle: Aisle = {
aisleUuid: THREE.MathUtils.generateUUID(),
points: [tempPoints[0], newPoint],
type: {
aisleType: 'arc-aisle',
aisleColor: aisleColor,
aisleWidth: aisleWidth,
isFlipped: isFlipped
}
};
addAisle(aisle);
push2D({
type: 'Draw',
actions: [
{
actionType: 'Line-Create',
point: {
type: 'Aisle',
lineData: aisle,
timeStamp: new Date().toISOString(),
}
}
],
})
if (projectId) {
// API
// upsertAisleApi(aisle.aisleUuid, aisle.points, aisle.type, projectId, selectedVersion?.versionId || '')
// SOCKET
socket.emit('v1:model-aisle:add', {
projectId: projectId,
versionId: selectedVersion?.versionId || '',
userId: userId,
organization: organization,
aisleUuid: aisle.aisleUuid,
points: aisle.points,
type: aisle.type
})
}
setTempPoints([newPoint]);
}
} else if (aisleType === 'circle-aisle') {
if (tempPoints.length === 0) {
setTempPoints([newPoint]);
setIsCreating(true);
} else {
const aisle: Aisle = {
aisleUuid: THREE.MathUtils.generateUUID(),
points: [tempPoints[0], newPoint],
type: {
aisleType: 'circle-aisle',
aisleColor: aisleColor,
aisleWidth: aisleWidth
}
};
addAisle(aisle);
push2D({
type: 'Draw',
actions: [
{
actionType: 'Line-Create',
point: {
type: 'Aisle',
lineData: aisle,
timeStamp: new Date().toISOString(),
}
}
],
})
if (projectId) {
// API
// upsertAisleApi(aisle.aisleUuid, aisle.points, aisle.type, projectId, selectedVersion?.versionId || '')
// SOCKET
socket.emit('v1:model-aisle:add', {
projectId: projectId,
versionId: selectedVersion?.versionId || '',
userId: userId,
organization: organization,
aisleUuid: aisle.aisleUuid,
points: aisle.points,
type: aisle.type
})
}
setTempPoints([newPoint]);
}
} else if (aisleType === 'junction-aisle') {
if (tempPoints.length === 0) {
setTempPoints([newPoint]);
setIsCreating(true);
} else {
const aisle: Aisle = {
aisleUuid: THREE.MathUtils.generateUUID(),
points: [tempPoints[0], newPoint],
type: {
aisleType: 'junction-aisle',
aisleColor: aisleColor,
aisleWidth: aisleWidth,
isFlipped: isFlipped
}
};
addAisle(aisle);
push2D({
type: 'Draw',
actions: [
{
actionType: 'Line-Create',
point: {
type: 'Aisle',
lineData: aisle,
timeStamp: new Date().toISOString(),
}
}
],
})
if (projectId) {
// API
// upsertAisleApi(aisle.aisleUuid, aisle.points, aisle.type, projectId, selectedVersion?.versionId || '')
// SOCKET
socket.emit('v1:model-aisle:add', {
projectId: projectId,
versionId: selectedVersion?.versionId || '',
userId: userId,
organization: organization,
aisleUuid: aisle.aisleUuid,
points: aisle.points,
type: aisle.type
})
}
setTempPoints([newPoint]);
}
}
};
const onContext = (event: any) => {
event.preventDefault();

65
app/src/modules/builder/asset/functions/addAssetModel.ts
View File

@@ -7,14 +7,14 @@ import * as CONSTANTS from "../../../../types/world/worldConstants";
import PointsCalculator from "../../../simulation/events/points/functions/pointsCalculator";
import { getUserData } from "../../../../functions/getUserData";
// import { setAssetsApi } from '../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
import { setAssetsApi } from '../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
async function addAssetModel(
scene: THREE.Scene,
raycaster: THREE.Raycaster,
camera: THREE.Camera,
pointer: THREE.Vector2,
socket: Socket<any>,
socket: Socket<any> | null,
selectedItem: any,
setSelectedItem: any,
addEvent: (event: EventsSchema) => void,
@@ -106,7 +106,7 @@ async function handleModelLoad(
selectedItem: any,
addEvent: (event: EventsSchema) => void,
addAsset: (asset: Asset) => void,
socket: Socket<any>,
socket: Socket<any> | null,
versionId: string,
projectId?: string,
userId?: string
@@ -140,22 +140,6 @@ async function handleModelLoad(
opacity: 1,
};
// API
// await setAssetsApi(
// organization,
// newFloorItem.modelUuid,
// newFloorItem.modelName,
// newFloorItem.assetId,
// newFloorItem.position,
// { x: 0, y: 0, z: 0 },
// false,
// true,
// );
// SOCKET
if (selectedItem.type) {
const data = PointsCalculator(
selectedItem.type,
@@ -449,14 +433,34 @@ async function handleModelLoad(
rotation: { x: model.rotation.x, y: model.rotation.y, z: model.rotation.z, },
isLocked: false,
isVisible: true,
socketId: socket.id,
socketId: socket?.id || '',
eventData: eventData,
versionId: versionId,
projectId: projectId,
userId: userId,
};
if (!socket?.active) {
// API
setAssetsApi({
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
position: newFloorItem.position,
assetId: newFloorItem.assetId,
rotation: { x: model.rotation.x, y: model.rotation.y, z: model.rotation.z, },
eventData: eventData,
isLocked: false,
isVisible: true,
versionId: versionId,
projectId: projectId,
});
} else {
// SOCKET
socket.emit("v1:model-asset:add", completeData);
}
const asset: Asset = {
modelUuid: completeData.modelUuid,
@@ -482,13 +486,32 @@ async function handleModelLoad(
rotation: { x: model.rotation.x, y: model.rotation.y, z: model.rotation.z, },
isLocked: false,
isVisible: true,
socketId: socket.id,
socketId: socket?.id || '',
versionId: versionId,
projectId: projectId,
userId: userId,
};
if (!socket?.active) {
// API
setAssetsApi({
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
position: newFloorItem.position,
assetId: newFloorItem.assetId,
rotation: { x: model.rotation.x, y: model.rotation.y, z: model.rotation.z, },
isLocked: false,
isVisible: true,
versionId: versionId,
projectId: projectId,
});
} else {
// SOCKET
socket.emit("v1:model-asset:add", data);
}
const asset = {
modelUuid: data.modelUuid,

13
app/src/modules/builder/asset/models/model/eventHandlers/useEventHandlers.ts
View File

@@ -16,7 +16,7 @@ import { useSelectedAsset } from '../../../../../../store/simulation/useSimulati
import { useBuilderStore } from '../../../../../../store/builder/useBuilderStore';
import { upsertProductOrEventApi } from '../../../../../../services/simulation/products/UpsertProductOrEventApi';
// import { deleteFloorItem } from '../../../../../../services/factoryBuilder/asset/floorAsset/deleteFloorItemApi';
import { deleteFloorItem } from '../../../../../../services/factoryBuilder/asset/floorAsset/deleteFloorItemApi';
export function useModelEventHandlers({
boundingBox,
@@ -146,10 +146,13 @@ export function useModelEventHandlers({
if (leftDrag.current || toggleView) return;
if (activeTool === 'delete' && deletableFloorAsset && deletableFloorAsset.uuid === asset.modelUuid) {
if (!socket?.active) {
// REST
// const response = await deleteFloorItem(organization, asset.modelUuid, asset.modelName);
deleteFloorItem(organization, asset.modelUuid, asset.modelName);
} else {
// SOCKET
const data = {
@@ -162,7 +165,8 @@ export function useModelEventHandlers({
projectId
}
const response = socket.emit('v1:model-asset:delete', data)
socket.emit('v1:model-asset:delete', data)
}
removeEvent(asset.modelUuid);
const updatedEvents = deleteEvent(asset.modelUuid);
@@ -176,8 +180,6 @@ export function useModelEventHandlers({
);
})
if (response) {
removeAsset(asset.modelUuid);
push3D({
@@ -196,7 +198,6 @@ export function useModelEventHandlers({
});
echo.success("Model Removed!");
}
} else if (activeModule === 'simulation' && subModule === "simulations" && activeTool === 'pen') {
if (asset.eventData && asset.eventData.type === 'Conveyor') {

17
app/src/modules/builder/dfx/LoadBlueprint.tsx
View File

@@ -9,6 +9,8 @@ import { useVersionContext } from '../version/versionContext';
import { useBuilderStore } from '../../../store/builder/useBuilderStore';
import { useSceneContext } from '../../scene/sceneContext';
import { upsertWallApi } from '../../../services/factoryBuilder/wall/upsertWallApi';
/**
* DxfFile component handles the rendering and manipulation of DXf file data in a 3D scene.
* It processes the DXF data to create points and lines representing walls and allows
@@ -39,6 +41,14 @@ const DxfFile = () => {
if (dfxWallGenerate) {
dfxWallGenerate.map((wall: Wall) => {
if (projectId) {
if (!socket?.active) {
// API
upsertWallApi(projectId, selectedVersion?.versionId || '', wall);
} else {
// SOCKET
const data = {
wallData: wall,
projectId: projectId,
@@ -48,11 +58,8 @@ const DxfFile = () => {
}
addWall(wall);
socket.emit('v1:model-Wall:add', data);
// API
// if (projectId) {
// upsertWallApi(projectId, selectedVersion?.versionId || '', wall);
// }
}
}
})
}
}, [dfxWallGenerate]);

20
app/src/modules/builder/floor/floorCreator/floorCreator.tsx
View File

@@ -10,7 +10,7 @@ import { getUserData } from '../../../../functions/getUserData';
import ReferencePoint from '../../point/reference/referencePoint';
import ReferenceFloor from './referenceFloor';
// import { upsertFloorApi } from '../../../../services/factoryBuilder/floor/upsertFloorApi';
import { upsertFloorApi } from '../../../../services/factoryBuilder/floor/upsertFloorApi';
function FloorCreator() {
const { scene, camera, raycaster, gl, pointer } = useThree();
@@ -120,10 +120,12 @@ function FloorCreator() {
})
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
} else {
// SOCKET
@@ -136,7 +138,7 @@ function FloorCreator() {
}
socket.emit('v1:model-Floor:add', data);
}
}
setTempPoints([]);
setIsCreating(false);
@@ -174,10 +176,12 @@ function FloorCreator() {
})
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
} else {
// SOCKET
@@ -190,7 +194,7 @@ function FloorCreator() {
}
socket.emit('v1:model-Floor:add', data);
}
}
setTempPoints([]);
setIsCreating(false);
@@ -238,10 +242,12 @@ function FloorCreator() {
})
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
} else {
// SOCKET
@@ -254,7 +260,7 @@ function FloorCreator() {
}
socket.emit('v1:model-Floor:add', data);
}
}
}
setTempPoints([]);

68
app/src/modules/builder/line/line.tsx
View File

@@ -13,14 +13,14 @@ import { handleCanvasCursors } from '../../../utils/mouseUtils/handleCanvasCurso
import { useSelectedPoints } from '../../../store/simulation/useSimulationStore';
import { calculateAssetTransformationOnWall } from '../wallAsset/Instances/Instance/functions/calculateAssetTransformationOnWall';
// import { upsertWallApi } from '../../../services/factoryBuilder/wall/upsertWallApi';
// import { deleteWallApi } from '../../../services/factoryBuilder/wall/deleteWallApi';
// import { upsertFloorApi } from '../../../services/factoryBuilder/floor/upsertFloorApi';
// import { deleteFloorApi } from '../../../services/factoryBuilder/floor/deleteFloorApi';
// import { deleteZoneApi } from '../../../services/factoryBuilder/zone/deleteZoneApi';
// import { upsertZoneApi } from '../../../services/factoryBuilder/zone/upsertZoneApi';
// import { upsertWallAssetApi } from '../../../services/factoryBuilder/asset/wallAsset/upsertWallAssetApi';
// import { deleteWallAssetApi } from '../../../services/factoryBuilder/asset/wallAsset/deleteWallAssetApi';
import { upsertWallApi } from '../../../services/factoryBuilder/wall/upsertWallApi';
import { deleteWallApi } from '../../../services/factoryBuilder/wall/deleteWallApi';
import { upsertFloorApi } from '../../../services/factoryBuilder/floor/upsertFloorApi';
import { deleteFloorApi } from '../../../services/factoryBuilder/floor/deleteFloorApi';
import { deleteZoneApi } from '../../../services/factoryBuilder/zone/deleteZoneApi';
import { upsertZoneApi } from '../../../services/factoryBuilder/zone/upsertZoneApi';
import { upsertWallAssetApi } from '../../../services/factoryBuilder/asset/wallAsset/upsertWallAssetApi';
import { deleteWallAssetApi } from '../../../services/factoryBuilder/asset/wallAsset/deleteWallAssetApi';
interface LineProps {
points: [Point, Point];
@@ -120,10 +120,12 @@ function Line({ points }: Readonly<LineProps>) {
if (projectId && asset) {
removeWallAsset(asset.modelUuid);
if (!socket?.active) {
// API
// deleteWallAssetApi(projectId, selectedVersion?.versionId || '', asset.modelUuid, asset.wallUuid);
deleteWallAssetApi(projectId, selectedVersion?.versionId || '', asset.modelUuid, asset.wallUuid);
} else {
// SOCKET
@@ -137,13 +139,15 @@ function Line({ points }: Readonly<LineProps>) {
}
socket.emit('v1:wall-asset:delete', data);
}
}
})
if (!socket?.active) {
// API
// deleteWallApi(projectId, selectedVersion?.versionId || '', removedWall.wallUuid);
deleteWallApi(projectId, selectedVersion?.versionId || '', removedWall.wallUuid);
} else {
// SOCKET
@@ -156,6 +160,7 @@ function Line({ points }: Readonly<LineProps>) {
}
socket.emit('v1:model-Wall:delete', data);
}
push2D({
type: 'Draw',
@@ -180,10 +185,12 @@ function Line({ points }: Readonly<LineProps>) {
if (removedFloors.length > 0) {
removedFloors.forEach(floor => {
if (projectId) {
if (!socket?.active) {
// API
// deleteFloorApi(projectId, selectedVersion?.versionId || '', floor.floorUuid);
deleteFloorApi(projectId, selectedVersion?.versionId || '', floor.floorUuid);
} else {
// SOCKET
@@ -197,6 +204,7 @@ function Line({ points }: Readonly<LineProps>) {
socket.emit('v1:model-Floor:delete', data);
}
}
});
const removedFloorsData = removedFloors.map((floor) => ({
@@ -218,10 +226,12 @@ function Line({ points }: Readonly<LineProps>) {
if (updatedFloors.length > 0) {
updatedFloors.forEach(floor => {
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
} else {
// SOCKET
@@ -235,6 +245,7 @@ function Line({ points }: Readonly<LineProps>) {
socket.emit('v1:model-Floor:add', data);
}
}
});
const updatedFloorsData = updatedFloors.map((floor) => ({
@@ -263,10 +274,12 @@ function Line({ points }: Readonly<LineProps>) {
if (removedZones.length > 0) {
removedZones.forEach(zone => {
if (projectId) {
if (!socket?.active) {
// API
// deleteZoneApi(projectId, selectedVersion?.versionId || '', zone.zoneUuid);
deleteZoneApi(projectId, selectedVersion?.versionId || '', zone.zoneUuid);
} else {
// SOCKET
@@ -280,6 +293,7 @@ function Line({ points }: Readonly<LineProps>) {
socket.emit('v1:zone:delete', data);
}
}
});
const removedZonesData = removedZones.map((zone) => ({
@@ -301,10 +315,12 @@ function Line({ points }: Readonly<LineProps>) {
if (updatedZones.length > 0) {
updatedZones.forEach(zone => {
if (projectId) {
if (!socket?.active) {
// API
// upsertZoneApi(projectId, selectedVersion?.versionId || '', zone);
upsertZoneApi(projectId, selectedVersion?.versionId || '', zone);
} else {
// SOCKET
@@ -318,6 +334,7 @@ function Line({ points }: Readonly<LineProps>) {
socket.emit('v1:zone:add', data);
}
}
});
const updatedZonesData = updatedZones.map((zone) => ({
@@ -435,9 +452,11 @@ function Line({ points }: Readonly<LineProps>) {
});
if (projectId && updatedWallAsset) {
if (!socket?.active) {
// API
// upsertWallAssetApi(projectId, selectedVersion?.versionId || '', updatedWallAsset);
upsertWallAssetApi(projectId, selectedVersion?.versionId || '', updatedWallAsset);
} else {
// SOCKET
@@ -451,12 +470,16 @@ function Line({ points }: Readonly<LineProps>) {
socket.emit('v1:wall-asset:add', data);
}
}
});
}
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
} else {
// SOCKET
@@ -469,6 +492,7 @@ function Line({ points }: Readonly<LineProps>) {
}
socket.emit('v1:model-Wall:add', data);
}
})
if (initialPositions.walls && initialPositions.walls.length > 0) {
@@ -495,10 +519,12 @@ function Line({ points }: Readonly<LineProps>) {
if (updatedFloors.length > 0 && projectId) {
updatedFloors.forEach(updatedFloor => {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedFloor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedFloor);
} else {
// SOCKET
@@ -511,6 +537,7 @@ function Line({ points }: Readonly<LineProps>) {
}
socket.emit('v1:model-Floor:add', data);
}
})
if (initialPositions.floors && initialPositions.floors.length > 0) {
@@ -537,10 +564,12 @@ function Line({ points }: Readonly<LineProps>) {
if (updatedZones.length > 0 && projectId) {
updatedZones.forEach(updatedZone => {
if (!socket?.active) {
// API
// upsertZoneApi(projectId, selectedVersion?.versionId || '', updatedZone);
upsertZoneApi(projectId, selectedVersion?.versionId || '', updatedZone);
} else {
// SOCKET
@@ -553,6 +582,7 @@ function Line({ points }: Readonly<LineProps>) {
}
socket.emit('v1:zone:add', data);
}
})
if (initialPositions.zones && initialPositions.zones.length > 0) {

81
app/src/modules/builder/point/point.tsx
View File

@@ -11,16 +11,16 @@ import { useParams } from 'react-router-dom';
import { useVersionContext } from '../version/versionContext';
import { useSceneContext } from '../../scene/sceneContext';
// import { upsertAisleApi } from '../../../services/factoryBuilder/aisle/upsertAisleApi';
// import { deleteAisleApi } from '../../../services/factoryBuilder/aisle/deleteAisleApi';
// import { upsertWallApi } from '../../../services/factoryBuilder/wall/upsertWallApi';
// import { deleteWallApi } from '../../../services/factoryBuilder/wall/deleteWallApi';
// import { upsertFloorApi } from '../../../services/factoryBuilder/floor/upsertFloorApi';
// import { deleteFloorApi } from '../../../services/factoryBuilder/floor/deleteFloorApi';
// import { upsertZoneApi } from '../../../services/factoryBuilder/zone/upsertZoneApi';
// import { deleteZoneApi } from '../../../services/factoryBuilder/zone/deleteZoneApi';
// import { upsertWallAssetApi } from '../../../services/factoryBuilder/asset/wallAsset/upsertWallAssetApi';
// import { deleteWallAssetApi } from '../../../services/factoryBuilder/asset/wallAsset/deleteWallAssetApi';
import { upsertAisleApi } from '../../../services/factoryBuilder/aisle/upsertAisleApi';
import { deleteAisleApi } from '../../../services/factoryBuilder/aisle/deleteAisleApi';
import { upsertWallApi } from '../../../services/factoryBuilder/wall/upsertWallApi';
import { deleteWallApi } from '../../../services/factoryBuilder/wall/deleteWallApi';
import { upsertFloorApi } from '../../../services/factoryBuilder/floor/upsertFloorApi';
import { deleteFloorApi } from '../../../services/factoryBuilder/floor/deleteFloorApi';
import { upsertZoneApi } from '../../../services/factoryBuilder/zone/upsertZoneApi';
import { deleteZoneApi } from '../../../services/factoryBuilder/zone/deleteZoneApi';
import { upsertWallAssetApi } from '../../../services/factoryBuilder/asset/wallAsset/upsertWallAssetApi';
import { deleteWallAssetApi } from '../../../services/factoryBuilder/asset/wallAsset/deleteWallAssetApi';
import { getUserData } from '../../../functions/getUserData';
import { handleCanvasCursors } from '../../../utils/mouseUtils/handleCanvasCursors';
@@ -190,10 +190,12 @@ function Point({ point }: { readonly point: Point }) {
const updatedAisles = getAislesByPointId(point.pointUuid);
if (updatedAisles.length > 0 && projectId) {
updatedAisles.forEach((updatedAisle) => {
if (!socket?.active) {
// API
// upsertAisleApi(updatedAisle.aisleUuid, updatedAisle.points, updatedAisle.type, projectId, selectedVersion?.versionId || '');
upsertAisleApi(updatedAisle.aisleUuid, updatedAisle.points, updatedAisle.type, projectId, selectedVersion?.versionId || '');
} else {
// SOCKET
@@ -206,6 +208,7 @@ function Point({ point }: { readonly point: Point }) {
points: updatedAisle.points,
type: updatedAisle.type
})
}
})
if (initialStates.aisles && initialStates.aisles.length > 0) {
@@ -244,9 +247,11 @@ function Point({ point }: { readonly point: Point }) {
});
if (projectId && updatedWallAsset) {
if (!socket?.active) {
// API
// upsertWallAssetApi(projectId, selectedVersion?.versionId || '', updatedWallAsset);
upsertWallAssetApi(projectId, selectedVersion?.versionId || '', updatedWallAsset);
} else {
// SOCKET
@@ -260,12 +265,16 @@ function Point({ point }: { readonly point: Point }) {
socket.emit('v1:wall-asset:add', data);
}
}
});
}
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
} else {
// SOCKET
@@ -278,6 +287,7 @@ function Point({ point }: { readonly point: Point }) {
}
socket.emit('v1:model-Wall:add', data);
}
});
}
@@ -301,10 +311,12 @@ function Point({ point }: { readonly point: Point }) {
const updatedFloors = getFloorsByPointId(point.pointUuid);
if (updatedFloors && updatedFloors.length > 0 && projectId) {
updatedFloors.forEach((updatedFloor) => {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedFloor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedFloor);
} else {
// SOCKET
@@ -317,6 +329,7 @@ function Point({ point }: { readonly point: Point }) {
}
socket.emit('v1:model-Floor:add', data);
}
});
}
@@ -340,10 +353,12 @@ function Point({ point }: { readonly point: Point }) {
const updatedZones = getZonesByPointId(point.pointUuid);
if (updatedZones && updatedZones.length > 0 && projectId) {
updatedZones.forEach((updatedZone) => {
if (!socket?.active) {
// API
// upsertZoneApi(projectId, selectedVersion?.versionId || '', updatedZone);
upsertZoneApi(projectId, selectedVersion?.versionId || '', updatedZone);
} else {
// SOCKET
@@ -356,6 +371,7 @@ function Point({ point }: { readonly point: Point }) {
}
socket.emit('v1:zone:add', data);
}
});
}
@@ -388,10 +404,12 @@ function Point({ point }: { readonly point: Point }) {
if (removedAisles.length > 0) {
removedAisles.forEach(aisle => {
if (projectId) {
if (!socket?.active) {
// API
// deleteAisleApi(aisle.aisleUuid, projectId, selectedVersion?.versionId || '');
deleteAisleApi(aisle.aisleUuid, projectId, selectedVersion?.versionId || '');
} else {
// SOCKET
@@ -404,6 +422,7 @@ function Point({ point }: { readonly point: Point }) {
}
socket.emit('v1:model-aisle:delete', data);
}
}
});
@@ -436,10 +455,12 @@ function Point({ point }: { readonly point: Point }) {
if (projectId && asset) {
removeWallAsset(asset.modelUuid);
if (!socket?.active) {
// API
// deleteWallAssetApi(projectId, selectedVersion?.versionId || '', asset.modelUuid, asset.wallUuid);
deleteWallAssetApi(projectId, selectedVersion?.versionId || '', asset.modelUuid, asset.wallUuid);
} else {
// SOCKET
@@ -453,15 +474,18 @@ function Point({ point }: { readonly point: Point }) {
}
socket.emit('v1:wall-asset:delete', data);
}
}
})
if (projectId) {
if (!socket?.active) {
// API
// deleteWallApi(projectId, selectedVersion?.versionId || '', wall.wallUuid);
deleteWallApi(projectId, selectedVersion?.versionId || '', wall.wallUuid);
} else {
// SOCKET
@@ -475,6 +499,7 @@ function Point({ point }: { readonly point: Point }) {
socket.emit('v1:model-Wall:delete', data);
}
}
});
const removedWallsData = removedWalls.map((wall) => ({
@@ -501,10 +526,12 @@ function Point({ point }: { readonly point: Point }) {
if (removedFloors.length > 0) {
removedFloors.forEach(floor => {
if (projectId) {
if (!socket?.active) {
// API
// deleteFloorApi(projectId, selectedVersion?.versionId || '', floor.floorUuid);
deleteFloorApi(projectId, selectedVersion?.versionId || '', floor.floorUuid);
} else {
// SOCKET
@@ -518,6 +545,7 @@ function Point({ point }: { readonly point: Point }) {
socket.emit('v1:model-Floor:delete', data);
}
}
});
const removedFloorsData = removedFloors.map((floor) => ({
@@ -539,10 +567,12 @@ function Point({ point }: { readonly point: Point }) {
if (updatedFloors.length > 0) {
updatedFloors.forEach(floor => {
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
} else {
// SOCKET
@@ -556,6 +586,7 @@ function Point({ point }: { readonly point: Point }) {
socket.emit('v1:model-Floor:add', data);
}
}
});
const updatedFloorsData = updatedFloors.map((floor) => ({
@@ -583,10 +614,12 @@ function Point({ point }: { readonly point: Point }) {
if (removedZones.length > 0) {
removedZones.forEach(zone => {
if (projectId) {
if (!socket?.active) {
// API
// deleteZoneApi(projectId, selectedVersion?.versionId || '', zone.zoneUuid);
deleteZoneApi(projectId, selectedVersion?.versionId || '', zone.zoneUuid);
} else {
// SOCKET
@@ -600,6 +633,7 @@ function Point({ point }: { readonly point: Point }) {
socket.emit('v1:zone:delete', data);
}
}
});
const removedZonesData = removedZones.map((zone) => ({
@@ -621,10 +655,12 @@ function Point({ point }: { readonly point: Point }) {
if (updatedZones.length > 0) {
updatedZones.forEach(zone => {
if (projectId) {
if (!socket?.active) {
// API
// upsertZoneApi(projectId, selectedVersion?.versionId || '', zone);
upsertZoneApi(projectId, selectedVersion?.versionId || '', zone);
} else {
// SOCKET
@@ -638,6 +674,7 @@ function Point({ point }: { readonly point: Point }) {
socket.emit('v1:zone:add', data);
}
}
});
const updatedZonesData = updatedZones.map((zone) => ({

63
app/src/modules/builder/wall/wallCreator/wallCreator.tsx
View File

@@ -12,8 +12,8 @@ import getClosestIntersection from '../../line/helpers/getClosestIntersection';
import ReferencePoint from '../../point/reference/referencePoint';
import ReferenceWall from './referenceWall';
// import { upsertWallApi } from '../../../../services/factoryBuilder/wall/upsertWallApi';
// import { deleteWallApi } from '../../../../services/factoryBuilder/wall/deleteWallApi';
import { upsertWallApi } from '../../../../services/factoryBuilder/wall/upsertWallApi';
import { deleteWallApi } from '../../../../services/factoryBuilder/wall/deleteWallApi';
function WallCreator() {
const { scene, camera, raycaster, gl, pointer } = useThree();
@@ -94,10 +94,12 @@ function WallCreator() {
removeWall(wall.wallUuid);
if (projectId) {
if (!socket?.active) {
// API
// deleteWallApi(projectId, selectedVersion?.versionId || '', wall.wallUuid);
deleteWallApi(projectId, selectedVersion?.versionId || '', wall.wallUuid);
} else {
// SOCKET
@@ -110,6 +112,7 @@ function WallCreator() {
}
socket.emit('v1:model-Wall:delete', data);
}
}
@@ -147,11 +150,12 @@ function WallCreator() {
addWall(wall2);
if (projectId) {
if (!socket?.active) {
// API
// if (projectId) {
// upsertWallApi(projectId, selectedVersion?.versionId || '', wall2);
// }
upsertWallApi(projectId, selectedVersion?.versionId || '', wall2);
} else {
// SOCKET
@@ -164,6 +168,8 @@ function WallCreator() {
}
socket.emit('v1:model-Wall:add', data);
}
}
const wall3: Wall = {
wallUuid: THREE.MathUtils.generateUUID(),
@@ -204,11 +210,12 @@ function WallCreator() {
],
})
if (projectId) {
if (!socket?.active) {
// API
// if (projectId) {
// upsertWallApi(projectId, selectedVersion?.versionId || '', wall3);
// }
upsertWallApi(projectId, selectedVersion?.versionId || '', wall3);
} else {
// SOCKET
@@ -221,6 +228,8 @@ function WallCreator() {
}
socket.emit('v1:model-Wall:add', data2);
}
}
setTempPoints([newPoint]);
setIsCreating(true);
@@ -237,11 +246,12 @@ function WallCreator() {
addWall(wall1);
if (projectId) {
if (!socket?.active) {
// API
// if (projectId) {
// upsertWallApi(projectId, selectedVersion?.versionId || '', wall1);
// }
upsertWallApi(projectId, selectedVersion?.versionId || '', wall1);
} else {
// SOCKET
@@ -254,6 +264,8 @@ function WallCreator() {
}
socket.emit('v1:model-Wall:add', data);
}
}
const wall2: Wall = {
wallUuid: THREE.MathUtils.generateUUID(),
@@ -267,11 +279,12 @@ function WallCreator() {
addWall(wall2);
if (projectId) {
if (!socket?.active) {
// API
// if (projectId) {
// upsertWallApi(projectId, selectedVersion?.versionId || '', wall2);
// }
upsertWallApi(projectId, selectedVersion?.versionId || '', wall2);
} else {
// SOCKET
@@ -284,6 +297,8 @@ function WallCreator() {
}
socket.emit('v1:model-Wall:add', data1);
}
}
const wall3: Wall = {
wallUuid: THREE.MathUtils.generateUUID(),
@@ -328,11 +343,12 @@ function WallCreator() {
],
})
if (projectId) {
if (!socket?.active) {
// API
// if (projectId) {
// upsertWallApi(projectId, selectedVersion?.versionId || '', wall3);
// }
upsertWallApi(projectId, selectedVersion?.versionId || '', wall3);
} else {
// SOCKET
@@ -345,6 +361,8 @@ function WallCreator() {
}
socket.emit('v1:model-Wall:add', data3);
}
}
setTempPoints([newPoint]);
}
@@ -411,11 +429,12 @@ function WallCreator() {
],
})
if (projectId) {
if (!socket?.active) {
// API
// if (projectId) {
// upsertWallApi(projectId, selectedVersion?.versionId || '', wall);
// }
upsertWallApi(projectId, selectedVersion?.versionId || '', wall);
} else {
// SOCKET
@@ -428,6 +447,8 @@ function WallCreator() {
}
socket.emit('v1:model-Wall:add', data);
}
}
setTempPoints([newPoint]);
}

16
app/src/modules/builder/wallAsset/Instances/Instance/wallAssetInstance.tsx
View File

@@ -14,8 +14,8 @@ import { useVersionContext } from '../../../version/versionContext';
import { getUserData } from '../../../../../functions/getUserData';
import closestPointOnLineSegment from '../../../line/helpers/getClosestPointOnLineSegment';
// import { upsertWallAssetApi } from '../../../../../services/factoryBuilder/asset/wallAsset/upsertWallAssetApi';
// import { deleteWallAssetApi } from '../../../../../services/factoryBuilder/asset/wallAsset/deleteWallAssetApi';
import { upsertWallAssetApi } from '../../../../../services/factoryBuilder/asset/wallAsset/upsertWallAssetApi';
import { deleteWallAssetApi } from '../../../../../services/factoryBuilder/asset/wallAsset/deleteWallAssetApi';
function WallAssetInstance({ wallAsset }: { wallAsset: WallAsset }) {
const url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`;
@@ -126,10 +126,12 @@ function WallAssetInstance({ wallAsset }: { wallAsset: WallAsset }) {
const updatedWallAsset = getWallAssetById(wallAsset.modelUuid);
if (projectId && updatedWallAsset) {
if (!socket?.active) {
// API
// upsertWallAssetApi(projectId, selectedVersion?.versionId || '', updatedWallAsset);
upsertWallAssetApi(projectId, selectedVersion?.versionId || '', updatedWallAsset);
} else {
// SOCKET
@@ -142,7 +144,7 @@ function WallAssetInstance({ wallAsset }: { wallAsset: WallAsset }) {
}
socket.emit('v1:wall-asset:add', data);
}
}
}
}
@@ -194,10 +196,12 @@ function WallAssetInstance({ wallAsset }: { wallAsset: WallAsset }) {
const removedWallAsset = removeWallAsset(wallAsset.modelUuid);
if (projectId && removedWallAsset) {
if (!socket?.active) {
// API
// deleteWallAssetApi(projectId, selectedVersion?.versionId || '', removedWallAsset.modelUuid, removedWallAsset.wallUuid);
deleteWallAssetApi(projectId, selectedVersion?.versionId || '', removedWallAsset.modelUuid, removedWallAsset.wallUuid);
} else {
// SOCKET
@@ -211,7 +215,7 @@ function WallAssetInstance({ wallAsset }: { wallAsset: WallAsset }) {
}
socket.emit('v1:wall-asset:delete', data);
}
}
}
}, [activeTool, activeModule, deletableWallAsset, socket])

8
app/src/modules/builder/wallAsset/wallAssetCreator.tsx
View File

@@ -9,7 +9,7 @@ import { useVersionContext } from '../version/versionContext';
import { getUserData } from '../../../functions/getUserData';
import closestPointOnLineSegment from '../line/helpers/getClosestPointOnLineSegment';
// import { upsertWallAssetApi } from '../../../services/factoryBuilder/asset/wallAsset/upsertWallAssetApi';
import { upsertWallAssetApi } from '../../../services/factoryBuilder/asset/wallAsset/upsertWallAssetApi';
function WallAssetCreator() {
const { socket } = useSocketStore();
@@ -62,10 +62,12 @@ function WallAssetCreator() {
addWallAsset(newWallAsset);
if (projectId) {
if (!socket?.active) {
// API
// upsertWallAssetApi(projectId, selectedVersion?.versionId || '', newWallAsset);
upsertWallAssetApi(projectId, selectedVersion?.versionId || '', newWallAsset);
} else {
// SOCKET
@@ -78,7 +80,7 @@ function WallAssetCreator() {
}
socket.emit('v1:wall-asset:add', data);
}
}
}
}

21
app/src/modules/builder/zone/zoneCreator/zoneCreator.tsx
View File

@@ -10,7 +10,7 @@ import { getUserData } from '../../../../functions/getUserData';
import ReferencePoint from '../../point/reference/referencePoint';
import ReferenceZone from './referenceZone';
// import { upsertZoneApi } from '../../../../services/factoryBuilder/zone/upsertZoneApi';
import { upsertZoneApi } from '../../../../services/factoryBuilder/zone/upsertZoneApi';
function ZoneCreator() {
const { scene, camera, raycaster, gl, pointer } = useThree();
@@ -33,7 +33,6 @@ function ZoneCreator() {
const [isCreating, setIsCreating] = useState(false);
const { zoneColor, zoneHeight, snappedPosition, snappedPoint, setSnappedPoint, setSnappedPosition } = useBuilderStore();
useEffect(() => {
const canvasElement = gl.domElement;
@@ -119,10 +118,12 @@ function ZoneCreator() {
})
if (projectId) {
if (!socket?.active) {
// API
// upsertZoneApi(projectId, selectedVersion?.versionId || '', zone);
upsertZoneApi(projectId, selectedVersion?.versionId || '', zone);
} else {
// SOCKET
@@ -135,7 +136,7 @@ function ZoneCreator() {
}
socket.emit('v1:zone:add', data);
}
}
setTempPoints([]);
setIsCreating(false);
@@ -171,10 +172,12 @@ function ZoneCreator() {
})
if (projectId) {
if (!socket?.active) {
// API
// upsertZoneApi(projectId, selectedVersion?.versionId || '', zone);
upsertZoneApi(projectId, selectedVersion?.versionId || '', zone);
} else {
// SOCKET
@@ -187,7 +190,7 @@ function ZoneCreator() {
}
socket.emit('v1:zone:add', data);
}
}
setTempPoints([]);
setIsCreating(false);
@@ -233,10 +236,12 @@ function ZoneCreator() {
})
if (projectId) {
if (!socket?.active) {
// API
// upsertZoneApi(projectId, selectedVersion?.versionId || '', zone);
upsertZoneApi(projectId, selectedVersion?.versionId || '', zone);
} else {
// SOCKET
@@ -249,7 +254,7 @@ function ZoneCreator() {
}
socket.emit('v1:zone:add', data);
}
}
}
setTempPoints([]);

4
app/src/modules/collaboration/socket/socketResponses.dev.tsx
View File

@@ -5,13 +5,17 @@ export default function SocketResponses() {
const { socket } = useSocketStore();
useEffect(() => {
if (socket) {
socket.on("v1:model-asset:response:add", (data: any) => {
// console.log('data: ', data);
});
}
return () => {
if (socket) {
socket.off("v1:model-asset:response:add");
}
}
}, [socket])
return (

4
app/src/modules/scene/controls/controls.tsx
View File

@@ -48,7 +48,7 @@ export default function Controls() {
}, []);
useEffect(() => {
if (resetCamera) {
if (resetCamera && socket) {
controlsRef.current?.setPosition(...CONSTANTS.threeDimension.defaultPosition);
controlsRef.current?.setTarget(...CONSTANTS.threeDimension.defaultTarget);
controlsRef.current?.rotateAzimuthTo(CONSTANTS.threeDimension.defaultAzimuth);
@@ -75,7 +75,7 @@ export default function Controls() {
let intervalId: NodeJS.Timeout | null = null;
const handleRest = () => {
if (hasInteracted && controlsRef.current && state.camera.position && !toggleView) {
if (hasInteracted && controlsRef.current && state.camera.position && !toggleView && socket) {
const position = state.camera.position;
if (position.x === 0 && position.y === 0 && position.z === 0) return;
updateCamPosition(controlsRef, socket, position, state.camera.rotation, projectId);

34
app/src/modules/scene/controls/selectionControls/selection2D/moveControls2D.tsx
View File

@@ -11,10 +11,11 @@ import { useSelectedPoints } from "../../../../../store/simulation/useSimulation
import useModuleStore from "../../../../../store/useModuleStore";
import { calculateAssetTransformationOnWall } from "../../../../builder/wallAsset/Instances/Instance/functions/calculateAssetTransformationOnWall";
// import { upsertAisleApi } from "../../../../../services/factoryBuilder/aisle/upsertAisleApi";
// import { upsertWallApi } from "../../../../../services/factoryBuilder/wall/upsertWallApi";
// import { upsertFloorApi } from "../../../../../services/factoryBuilder/floor/upsertFloorApi";
// import { upsertZoneApi } from "../../../../../services/factoryBuilder/zone/upsertZoneApi";
import { upsertAisleApi } from "../../../../../services/factoryBuilder/aisle/upsertAisleApi";
import { upsertWallApi } from "../../../../../services/factoryBuilder/wall/upsertWallApi";
import { upsertFloorApi } from "../../../../../services/factoryBuilder/floor/upsertFloorApi";
import { upsertZoneApi } from "../../../../../services/factoryBuilder/zone/upsertZoneApi";
import { upsertWallAssetApi } from "../../../../../services/factoryBuilder/asset/wallAsset/upsertWallAssetApi";
function MoveControls2D({
movedObjects,
@@ -270,9 +271,11 @@ function MoveControls2D({
if (updatedAisles.length > 0 && projectId) {
updatedAisles.forEach((updatedAisle) => {
if (!socket?.active) {
// API
// upsertAisleApi(updatedAisle.aisleUuid, updatedAisle.points, updatedAisle.type, projectId, selectedVersion?.versionId || '');
upsertAisleApi(updatedAisle.aisleUuid, updatedAisle.points, updatedAisle.type, projectId, selectedVersion?.versionId || '');
} else {
// SOCKET
@@ -285,6 +288,7 @@ function MoveControls2D({
points: updatedAisle.points,
type: updatedAisle.type
});
}
const old = initialStates[movedObject.uuid];
if (old) {
@@ -330,9 +334,11 @@ function MoveControls2D({
});
}
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
upsertWallApi(projectId, selectedVersion?.versionId || '', updatedWall);
} else {
// SOCKET
@@ -343,6 +349,7 @@ function MoveControls2D({
userId,
organization
});
}
const old = initialStates[movedObject.uuid];
if (old) {
@@ -371,9 +378,11 @@ function MoveControls2D({
if (updatedFloors?.length && projectId) {
updatedFloors.forEach(updatedFloor => {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedFloor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedFloor);
} else {
// SOCKET
@@ -384,6 +393,7 @@ function MoveControls2D({
userId,
organization
});
}
const updatedFloorsData = updatedFloors.map((floor) => {
const originalFloor = Floors.find(f => f.floorUuid === floor.floorUuid) || floor;
@@ -410,9 +420,11 @@ function MoveControls2D({
if (updatedZones?.length && projectId) {
updatedZones.forEach(updatedZone => {
if (!socket?.active) {
// API
// upsertZoneApi(projectId, selectedVersion?.versionId || '', updatedZone);
upsertZoneApi(projectId, selectedVersion?.versionId || '', updatedZone);
} else {
// SOCKET
@@ -423,6 +435,7 @@ function MoveControls2D({
userId,
organization
});
}
const updatedZonesData = updatedZones.map((zone) => {
const originalZone = Zones.find(z => z.zoneUuid === zone.zoneUuid) || zone;
@@ -459,9 +472,11 @@ function MoveControls2D({
rotation: updatedWallAsset.rotation
});
if (!socket?.active) {
// API
// upsertWallAssetApi(projectId, selectedVersion?.versionId || '', updatedWallAsset);
upsertWallAssetApi(projectId, selectedVersion?.versionId || '', updatedWallAsset);
} else {
// SOCKET
@@ -475,6 +490,7 @@ function MoveControls2D({
socket.emit('v1:wall-asset:add', data);
}
}
});
}

50
app/src/modules/scene/controls/selectionControls/selection2D/selectionControls2D.tsx
View File

@@ -14,12 +14,13 @@ import { useSelectedPoints } from "../../../../../store/simulation/useSimulation
import { useBuilderStore } from "../../../../../store/builder/useBuilderStore";
import MoveControls2D from "./moveControls2D";
// import { deleteAisleApi } from "../../../../../services/factoryBuilder/aisle/deleteAisleApi";
// import { deleteWallApi } from "../../../../../services/factoryBuilder/wall/deleteWallApi";
// import { deleteFloorApi } from "../../../../../services/factoryBuilder/floor/deleteFloorApi";
// import { upsertFloorApi } from "../../../../../services/factoryBuilder/floor/upsertFloorApi";
// import { deleteZoneApi } from "../../../../../services/factoryBuilder/zone/deleteZoneApi";
// import { upsertZoneApi } from "../../../../../services/factoryBuilder/zone/upsertZoneApi";
import { deleteAisleApi } from "../../../../../services/factoryBuilder/aisle/deleteAisleApi";
import { deleteWallApi } from "../../../../../services/factoryBuilder/wall/deleteWallApi";
import { deleteFloorApi } from "../../../../../services/factoryBuilder/floor/deleteFloorApi";
import { upsertFloorApi } from "../../../../../services/factoryBuilder/floor/upsertFloorApi";
import { deleteZoneApi } from "../../../../../services/factoryBuilder/zone/deleteZoneApi";
import { upsertZoneApi } from "../../../../../services/factoryBuilder/zone/upsertZoneApi";
import { deleteWallAssetApi } from "../../../../../services/factoryBuilder/asset/wallAsset/deleteWallAssetApi";
const SelectionControls2D: React.FC = () => {
const { camera, controls, gl, scene, pointer } = useThree();
@@ -240,10 +241,12 @@ const SelectionControls2D: React.FC = () => {
if (removedAisles.length > 0) {
removedAisles.forEach(aisle => {
if (projectId) {
if (!socket?.active) {
// API
// deleteAisleApi(aisle.aisleUuid, projectId, selectedVersion?.versionId || '');
deleteAisleApi(aisle.aisleUuid, projectId, selectedVersion?.versionId || '');
} else {
// SOCKET
@@ -257,6 +260,7 @@ const SelectionControls2D: React.FC = () => {
socket.emit('v1:model-aisle:delete', data);
}
}
});
const removedAislesData = removedAisles.map((aisle) => ({
@@ -280,9 +284,12 @@ const SelectionControls2D: React.FC = () => {
removeWallAsset(asset.modelUuid);
if (!socket?.active) {
// API
// deleteWallAssetApi(projectId, selectedVersion?.versionId || '', asset.modelUuid, asset.wallUuid);
deleteWallAssetApi(projectId, selectedVersion?.versionId || '', asset.modelUuid, asset.wallUuid);
} else {
// SOCKET
@@ -296,15 +303,17 @@ const SelectionControls2D: React.FC = () => {
}
socket.emit('v1:wall-asset:delete', data);
}
}
})
if (projectId) {
if (!socket?.active) {
// API
// deleteWallApi(projectId, selectedVersion?.versionId || '', wall.wallUuid);
deleteWallApi(projectId, selectedVersion?.versionId || '', wall.wallUuid);
} else {
// SOCKET
@@ -318,6 +327,7 @@ const SelectionControls2D: React.FC = () => {
socket.emit('v1:model-Wall:delete', data);
}
}
});
const removedWallsData = removedWalls.map((wall) => ({
@@ -335,10 +345,12 @@ const SelectionControls2D: React.FC = () => {
if (removedFloors.length > 0) {
removedFloors.forEach(floor => {
if (projectId) {
if (!socket?.active) {
// API
// deleteFloorApi(projectId, selectedVersion?.versionId || '', floor.floorUuid);
deleteFloorApi(projectId, selectedVersion?.versionId || '', floor.floorUuid);
} else {
// SOCKET
@@ -352,6 +364,7 @@ const SelectionControls2D: React.FC = () => {
socket.emit('v1:model-Floor:delete', data);
}
}
});
const removedFloorsData = removedFloors.map((floor) => ({
@@ -365,10 +378,12 @@ const SelectionControls2D: React.FC = () => {
if (updatedFloors.length > 0) {
updatedFloors.forEach(floor => {
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
upsertFloorApi(projectId, selectedVersion?.versionId || '', floor);
} else {
// SOCKET
@@ -382,6 +397,7 @@ const SelectionControls2D: React.FC = () => {
socket.emit('v1:model-Floor:add', data);
}
}
});
const updatedFloorsData = updatedFloors.map((floor) => ({
@@ -400,10 +416,12 @@ const SelectionControls2D: React.FC = () => {
if (removedZones.length > 0) {
removedZones.forEach(zone => {
if (projectId) {
if (!socket?.active) {
// API
// deleteZoneApi(projectId, selectedVersion?.versionId || '', zone.zoneUuid);
deleteZoneApi(projectId, selectedVersion?.versionId || '', zone.zoneUuid);
} else {
// SOCKET
@@ -417,6 +435,7 @@ const SelectionControls2D: React.FC = () => {
socket.emit('v1:zone:delete', data);
}
}
});
const removedZonesData = removedZones.map((zone) => ({
@@ -430,10 +449,12 @@ const SelectionControls2D: React.FC = () => {
if (updatedZones.length > 0) {
updatedZones.forEach(zone => {
if (projectId) {
if (!socket?.active) {
// API
// upsertZoneApi(projectId, selectedVersion?.versionId || '', zone);
upsertZoneApi(projectId, selectedVersion?.versionId || '', zone);
} else {
// SOCKET
@@ -447,6 +468,7 @@ const SelectionControls2D: React.FC = () => {
socket.emit('v1:zone:add', data);
}
}
});
const updatedZonesData = updatedZones.map((zone) => ({

41
app/src/modules/scene/controls/selectionControls/selection3D/copyPasteControls3D.tsx
View File

@@ -10,7 +10,7 @@ import { getUserData } from "../../../../../functions/getUserData";
import { useSceneContext } from "../../../sceneContext";
import { useVersionContext } from "../../../../builder/version/versionContext";
// import { setAssetsApi } from "../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi";
import { setAssetsApi } from "../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi";
const CopyPasteControls3D = () => {
const { camera, controls, gl, scene, pointer, raycaster } = useThree();
@@ -481,20 +481,34 @@ const CopyPasteControls3D = () => {
rotation: { x: pastedAsset.rotation.x, y: pastedAsset.rotation.y, z: pastedAsset.rotation.z },
isLocked: false,
isVisible: true,
socketId: socket.id,
socketId: socket?.id,
eventData: eventData,
versionId: selectedVersion?.versionId || '',
userId,
projectId
};
if (!socket?.active) {
// REST
// await setAssetsApi(data);
setAssetsApi({
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
assetId: newFloorItem.assetId,
position: [position.x, 0, position.z],
rotation: { x: pastedAsset.rotation.x, y: pastedAsset.rotation.y, z: pastedAsset.rotation.z },
isLocked: false,
isVisible: true,
eventData: eventData,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
// SOCKET
socket.emit("v1:model-asset:add", data);
}
const asset: Asset = {
modelUuid: data.modelUuid,
@@ -520,13 +534,32 @@ const CopyPasteControls3D = () => {
rotation: { x: pastedAsset.rotation.x, y: pastedAsset.rotation.y, z: pastedAsset.rotation.z },
isLocked: false,
isVisible: true,
socketId: socket.id,
socketId: socket?.id,
versionId: selectedVersion?.versionId || '',
projectId,
userId
};
if (!socket?.active) {
// REST
setAssetsApi({
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
assetId: newFloorItem.assetId,
position: [position.x, 0, position.z],
rotation: { x: pastedAsset.rotation.x, y: pastedAsset.rotation.y, z: pastedAsset.rotation.z },
isLocked: false,
isVisible: true,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
// SOCKET
socket.emit("v1:model-asset:add", data);
}
const asset: Asset = {
modelUuid: data.modelUuid,

42
app/src/modules/scene/controls/selectionControls/selection3D/duplicationControls3D.tsx
View File

@@ -11,7 +11,7 @@ import { useSceneContext } from "../../../sceneContext";
import { useVersionContext } from "../../../../builder/version/versionContext";
import { handleAssetPositionSnap } from "./functions/handleAssetPositionSnap";
// import { setAssetsApi } from "../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi";
import { setAssetsApi } from "../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi";
const DuplicationControls3D = () => {
const { camera, controls, gl, scene, pointer, raycaster } = useThree();
@@ -550,20 +550,34 @@ const DuplicationControls3D = () => {
rotation: { x: duplicatedAsset.rotation.x, y: duplicatedAsset.rotation.y, z: duplicatedAsset.rotation.z },
isLocked: false,
isVisible: true,
socketId: socket.id,
socketId: socket?.id,
eventData: eventData,
versionId: selectedVersion?.versionId || '',
userId,
projectId
};
if (!socket?.active) {
// REST
// await setAssetsApi(data);
setAssetsApi({
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
assetId: newFloorItem.assetId,
position: [position.x, position.y, position.z],
rotation: { x: duplicatedAsset.rotation.x, y: duplicatedAsset.rotation.y, z: duplicatedAsset.rotation.z },
isLocked: false,
isVisible: true,
eventData: eventData,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
// SOCKET
socket.emit("v1:model-asset:add", data);
}
const asset: Asset = {
modelUuid: data.modelUuid,
@@ -589,14 +603,32 @@ const DuplicationControls3D = () => {
rotation: { x: duplicatedAsset.rotation.x, y: duplicatedAsset.rotation.y, z: duplicatedAsset.rotation.z },
isLocked: false,
isVisible: true,
socketId: socket.id,
socketId: socket?.id,
versionId: selectedVersion?.versionId || '',
projectId,
userId
};
socket.emit("v1:model-asset:add", data);
if (!socket?.active) {
// REST
setAssetsApi({
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
assetId: newFloorItem.assetId,
position: [position.x, position.y, position.z],
rotation: { x: duplicatedAsset.rotation.x, y: duplicatedAsset.rotation.y, z: duplicatedAsset.rotation.z },
isLocked: false,
isVisible: true,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
// SOCKET
socket.emit("v1:model-asset:add", data);
}
const asset: Asset = {
modelUuid: data.modelUuid,
modelName: data.modelName,

19
app/src/modules/scene/controls/selectionControls/selection3D/moveControls3D.tsx
View File

@@ -14,7 +14,7 @@ import { useSceneContext } from "../../../sceneContext";
import { useVersionContext } from "../../../../builder/version/versionContext";
import useModuleStore from "../../../../../store/useModuleStore";
// import { setAssetsApi } from '../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
import { setAssetsApi } from '../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
function MoveControls3D({ boundingBoxRef }: any) {
const { camera, controls, gl, scene, pointer, raycaster } = useThree();
@@ -420,20 +420,33 @@ function MoveControls3D({ boundingBoxRef }: any) {
rotation: { x: movedAsset.rotation.x, y: movedAsset.rotation.y, z: movedAsset.rotation.z },
isLocked: false,
isVisible: true,
socketId: socket.id,
socketId: socket?.id,
versionId: selectedVersion?.versionId || '',
projectId,
userId
};
if (!socket?.active) {
// REST
// await setAssetsApi(data);
setAssetsApi({
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
assetId: newFloorItem.assetId,
position: newFloorItem.position,
rotation: { x: movedAsset.rotation.x, y: movedAsset.rotation.y, z: movedAsset.rotation.z },
isLocked: false,
isVisible: true,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
// SOCKET
socket.emit("v1:model-asset:add", data);
}
}
});
if (assetsToUpdate.length > 0) {

19
app/src/modules/scene/controls/selectionControls/selection3D/rotateControls3D.tsx
View File

@@ -13,7 +13,7 @@ import { detectModifierKeys } from "../../../../../utils/shortcutkeys/detectModi
import { handleAssetRotationSnap } from "./functions/handleAssetRotationSnap";
import useModuleStore from "../../../../../store/useModuleStore";
// import { setAssetsApi } from '../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
import { setAssetsApi } from '../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
function RotateControls3D() {
const { camera, gl, scene, pointer, raycaster } = useThree();
@@ -364,20 +364,33 @@ function RotateControls3D() {
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z },
isLocked: false,
isVisible: true,
socketId: socket.id,
socketId: socket?.id,
versionId: selectedVersion?.versionId || '',
projectId,
userId
};
if (!socket?.active) {
// REST
// await setAssetsApi(data);
setAssetsApi({
modelUuid: newFloorItem.modelUuid,
modelName: newFloorItem.modelName,
assetId: newFloorItem.assetId,
position: newFloorItem.position,
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z },
isLocked: false,
isVisible: true,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
// SOCKET
socket.emit("v1:model-asset:add", data);
}
}
});
if (assetsToUpdate.length > 0) {

14
app/src/modules/scene/controls/selectionControls/selection3D/selectionControls3D.tsx
View File

@@ -19,7 +19,7 @@ import RotateControls3D from "./rotateControls3D";
import TransformControls3D from "./transformControls3D";
import { useBuilderStore } from "../../../../../store/builder/useBuilderStore";
// import { deleteFloorItem } from '../../../../../services/factoryBuilder/asset/floorAsset/deleteFloorItemApi';
import { deleteFloorItem } from '../../../../../services/factoryBuilder/asset/floorAsset/deleteFloorItemApi';
const SelectionControls3D: React.FC = () => {
const { camera, controls, gl, scene, raycaster, pointer } = useThree();
@@ -284,9 +284,13 @@ const SelectionControls3D: React.FC = () => {
const asset = getAssetById(selectedMesh.userData.modelUuid);
if (!asset) return;
if (!socket?.active) {
// REST
// const response = deleteFloorItem(organization, selectedMesh.userData.modelUuid, selectedMesh.userData.modelName);
deleteFloorItem(organization, selectedMesh.userData.modelUuid, selectedMesh.userData.modelName);
} else {
// SOCKET
@@ -300,7 +304,8 @@ const SelectionControls3D: React.FC = () => {
userId
};
const response = socket.emit("v1:model-asset:delete", data);
socket.emit("v1:model-asset:delete", data);
}
eventStore.getState().removeEvent(selectedMesh.uuid);
const updatedEvents = productStore.getState().deleteEvent(selectedMesh.uuid);
@@ -314,12 +319,9 @@ const SelectionControls3D: React.FC = () => {
);
})
if (response) {
removeAsset(selectedMesh.uuid);
echo.success("Model Removed!");
}
selectedMesh.traverse((child: THREE.Object3D) => {
if (child instanceof THREE.Mesh) {

29
app/src/modules/scene/controls/selectionControls/selection3D/transformControls3D.tsx
View File

@@ -11,7 +11,7 @@ import { useParams } from 'react-router-dom';
import { getUserData } from '../../../../../functions/getUserData';
import { upsertProductOrEventApi } from '../../../../../services/simulation/products/UpsertProductOrEventApi';
import { detectModifierKeys } from '../../../../../utils/shortcutkeys/detectModifierKeys';
// import { setAssetsApi } from '../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
import { setAssetsApi } from '../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi';
function TransformControls3D() {
const { toolMode } = useToolMode();
@@ -135,18 +135,22 @@ function TransformControls3D() {
}
}
//REST
// setAssetsApi(
// organization,
// asset.modelUuid,
// asset.modelName,
// [obj.position.x, 0, obj.position.z],
// { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z },
// asset.assetId,
// false,
// true,
// );
if (!socket?.active) {
// API
setAssetsApi({
modelUuid: asset.modelUuid,
modelName: asset.modelName,
assetId: asset.assetId,
position: [obj.position.x, obj.position.y, obj.position.z],
rotation: { x: obj.rotation.x, y: obj.rotation.y, z: obj.rotation.z },
isLocked: false,
isVisible: true,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
// SOCKET
@@ -166,6 +170,7 @@ function TransformControls3D() {
};
socket.emit("v1:model-asset:add", data);
}
});
}, [selectedAssets, setSelectedAssets, getAssetById, updateAsset, eventStore, productStore, selectedProduct, updateBackend, projectId, organization, socket, selectedVersion, userId, push3D]);

29
app/src/modules/scene/controls/transformControls/transformControls.tsx
View File

@@ -12,7 +12,7 @@ import { useBuilderStore } from "../../../../store/builder/useBuilderStore";
import { detectModifierKeys } from "../../../../utils/shortcutkeys/detectModifierKeys";
import { upsertProductOrEventApi } from "../../../../services/simulation/products/UpsertProductOrEventApi";
// import { setAssetsApi } from "../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi";
import { setAssetsApi } from "../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi";
export default function TransformControl() {
const state = useThree();
@@ -110,18 +110,22 @@ export default function TransformControl() {
rotation: [selectedFloorAsset.rotation.x, selectedFloorAsset.rotation.y, selectedFloorAsset.rotation.z] as [number, number, number],
});
//REST
if (!socket?.active) {
// await setAssetsApi(
// organization,
// asset.modelUuid,
// asset.modelName,
// [selectedFloorAsset.position.x, 0, selectedFloorAsset.position.z,
// { "x": selectedFloorAsset.rotation.x, "y": selectedFloorAsset.rotation.y, "z": selectedFloorAsset.rotation.z },
// asset.assetId,
// false,
// true,
// );
// API
setAssetsApi({
modelUuid: asset.modelUuid,
modelName: asset.modelName,
assetId: asset.assetId,
position: [selectedFloorAsset.position.x, 0, selectedFloorAsset.position.z] as [number, number, number],
rotation: { x: selectedFloorAsset.rotation.x, y: selectedFloorAsset.rotation.y, z: selectedFloorAsset.rotation.z },
isLocked: false,
isVisible: true,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
// SOCKET
@@ -141,6 +145,7 @@ export default function TransformControl() {
};
socket.emit("v1:model-asset:add", data);
}
push3D({
type: 'Scene',

76
app/src/modules/scene/controls/undoRedoControls/handlers/use2DRedoHandler.ts
View File

@@ -4,17 +4,17 @@ import { useVersionContext } from "../../../../builder/version/versionContext";
import { useSceneContext } from "../../../sceneContext";
import { useSocketStore } from "../../../../../store/builder/store";
// import { upsertWallApi } from "../../../../../services/factoryBuilder/wall/upsertWallApi";
// import { deleteWallApi } from "../../../../../services/factoryBuilder/wall/deleteWallApi";
import { upsertWallApi } from "../../../../../services/factoryBuilder/wall/upsertWallApi";
import { deleteWallApi } from "../../../../../services/factoryBuilder/wall/deleteWallApi";
// import { upsertZoneApi } from "../../../../../services/factoryBuilder/zone/upsertZoneApi";
// import { deleteZoneApi } from "../../../../../services/factoryBuilder/zone/deleteZoneApi";
import { upsertZoneApi } from "../../../../../services/factoryBuilder/zone/upsertZoneApi";
import { deleteZoneApi } from "../../../../../services/factoryBuilder/zone/deleteZoneApi";
// import { upsertFloorApi } from "../../../../../services/factoryBuilder/floor/upsertFloorApi";
// import { deleteFloorApi } from "../../../../../services/factoryBuilder/floor/deleteFloorApi";
import { upsertFloorApi } from "../../../../../services/factoryBuilder/floor/upsertFloorApi";
import { deleteFloorApi } from "../../../../../services/factoryBuilder/floor/deleteFloorApi";
// import { upsertAisleApi } from "../../../../../services/factoryBuilder/aisle/upsertAisleApi";
// import { deleteAisleApi } from "../../../../../services/factoryBuilder/aisle/deleteAisleApi";
import { upsertAisleApi } from "../../../../../services/factoryBuilder/aisle/upsertAisleApi";
import { deleteAisleApi } from "../../../../../services/factoryBuilder/aisle/deleteAisleApi";
function use2DRedoHandler() {
const { undoRedo2DStore, wallStore, floorStore, zoneStore, aisleStore } = useSceneContext();
@@ -100,9 +100,11 @@ function use2DRedoHandler() {
const createWallFromBackend = (wallData: Wall) => {
addWall(wallData);
if (projectId) {
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', wallData);
upsertWallApi(projectId, selectedVersion?.versionId || '', wallData);
} else {
// SOCKET
@@ -116,14 +118,17 @@ function use2DRedoHandler() {
socket.emit('v1:model-Wall:add', data);
}
}
};
const removeWallFromBackend = (wallUuid: string) => {
removeWall(wallUuid);
if (projectId) {
if (!socket?.active) {
// API
// deleteWallApi(projectId, selectedVersion?.versionId || '', wallUuid);
deleteWallApi(projectId, selectedVersion?.versionId || '', wallUuid);
} else {
// SOCKET
@@ -137,14 +142,17 @@ function use2DRedoHandler() {
socket.emit('v1:model-Wall:delete', data);
}
}
};
const updateWallFromBackend = (wallUuid: string, updatedData: Wall) => {
updateWall(wallUuid, updatedData);
if (projectId) {
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', updatedData);
upsertWallApi(projectId, selectedVersion?.versionId || '', updatedData);
} else {
// SOCKET
@@ -158,14 +166,17 @@ function use2DRedoHandler() {
socket.emit('v1:model-Wall:add', data);
}
}
};
const createFloorFromBackend = (floorData: Floor) => {
addFloor(floorData);
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', floorData);
upsertFloorApi(projectId, selectedVersion?.versionId || '', floorData);
} else {
// SOCKET
@@ -179,14 +190,17 @@ function use2DRedoHandler() {
socket.emit('v1:model-Floor:add', data);
}
}
};
const removeFloorFromBackend = (floorUuid: string) => {
removeFloor(floorUuid);
if (projectId) {
if (!socket?.active) {
// API
// deleteFloorApi(projectId, selectedVersion?.versionId || '', floorUuid);
deleteFloorApi(projectId, selectedVersion?.versionId || '', floorUuid);
} else {
// SOCKET
@@ -200,14 +214,17 @@ function use2DRedoHandler() {
socket.emit('v1:model-Floor:delete', data);
}
}
};
const updateFloorFromBackend = (floorUuid: string, updatedData: Floor) => {
updateFloor(floorUuid, updatedData);
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedData);
upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedData);
} else {
// SOCKET
@@ -221,14 +238,17 @@ function use2DRedoHandler() {
socket.emit('v1:model-Floor:add', data);
}
}
};
const createZoneFromBackend = (zoneData: Zone) => {
addZone(zoneData);
if (projectId) {
if (!socket?.active) {
// API
// upsertZoneApi(projectId, selectedVersion?.versionId || '', zoneData);
upsertZoneApi(projectId, selectedVersion?.versionId || '', zoneData);
} else {
// SOCKET
@@ -242,14 +262,17 @@ function use2DRedoHandler() {
socket.emit('v1:zone:add', data);
}
}
};
const removeZoneFromBackend = (zoneUuid: string) => {
removeZone(zoneUuid);
if (projectId) {
if (!socket?.active) {
// API
// deleteZoneApi(projectId, selectedVersion?.versionId || '', zoneUuid);
deleteZoneApi(projectId, selectedVersion?.versionId || '', zoneUuid);
} else {
// SOCKET
@@ -263,14 +286,17 @@ function use2DRedoHandler() {
socket.emit('v1:zone:delete', data);
}
}
};
const updateZoneFromBackend = (zoneUuid: string, updatedData: Zone) => {
updateZone(zoneUuid, updatedData);
if (projectId) {
if (!socket?.active) {
// API
// upsertZoneApi(projectId, selectedVersion?.versionId || '', updatedData);
upsertZoneApi(projectId, selectedVersion?.versionId || '', updatedData);
} else {
// SOCKET
@@ -284,14 +310,17 @@ function use2DRedoHandler() {
socket.emit('v1:zone:add', data);
}
}
};
const createAisleFromBackend = (aisleData: Aisle) => {
addAisle(aisleData);
if (projectId) {
if (!socket?.active) {
// API
// upsertAisleApi(projectId, selectedVersion?.versionId || '', aisleData);
upsertAisleApi(aisleData.aisleUuid, aisleData.points, aisleData.type, projectId, selectedVersion?.versionId || '');
} else {
// SOCKET
@@ -305,14 +334,17 @@ function use2DRedoHandler() {
socket.emit('v1:model-aisle:add', data);
}
}
};
const removeAisleFromBackend = (aisleUuid: string) => {
removeAisle(aisleUuid);
if (projectId) {
if (!socket?.active) {
// API
// deleteAisleApi(projectId, selectedVersion?.versionId || '', aisleUuid);
deleteAisleApi(projectId, selectedVersion?.versionId || '', aisleUuid);
} else {
// SOCKET
@@ -326,14 +358,17 @@ function use2DRedoHandler() {
socket.emit('v1:model-aisle:delete', data);
}
}
};
const updateAisleFromBackend = (aisleUuid: string, updatedData: Aisle) => {
updateAisle(aisleUuid, updatedData);
if (projectId) {
if (!socket?.active) {
// API
// upsertAisleApi(projectId, selectedVersion?.versionId || '', updatedData);
upsertAisleApi(updatedData.aisleUuid, updatedData.points, updatedData.type, projectId, selectedVersion?.versionId || '');
} else {
// SOCKET
@@ -347,6 +382,7 @@ function use2DRedoHandler() {
socket.emit('v1:model-aisle:add', data);
}
}
};
return { handleRedo };

76
app/src/modules/scene/controls/undoRedoControls/handlers/use2DUndoHandler.ts
View File

@@ -4,17 +4,17 @@ import { useVersionContext } from "../../../../builder/version/versionContext";
import { useSceneContext } from "../../../sceneContext";
import { useSocketStore } from "../../../../../store/builder/store";
// import { upsertWallApi } from "../../../../../services/factoryBuilder/wall/upsertWallApi";
// import { deleteWallApi } from "../../../../../services/factoryBuilder/wall/deleteWallApi";
import { upsertWallApi } from "../../../../../services/factoryBuilder/wall/upsertWallApi";
import { deleteWallApi } from "../../../../../services/factoryBuilder/wall/deleteWallApi";
// import { upsertZoneApi } from "../../../../../services/factoryBuilder/zone/upsertZoneApi";
// import { deleteWallApi } from "../../../../../services/factoryBuilder/wall/deleteWallApi";
import { upsertZoneApi } from "../../../../../services/factoryBuilder/zone/upsertZoneApi";
import { deleteZoneApi } from "../../../../../services/factoryBuilder/zone/deleteZoneApi";
// import { upsertFloorApi } from "../../../../../services/factoryBuilder/floor/upsertFloorApi";
// import { deleteFloorApi } from "../../../../../services/factoryBuilder/floor/deleteFloorApi";
import { upsertFloorApi } from "../../../../../services/factoryBuilder/floor/upsertFloorApi";
import { deleteFloorApi } from "../../../../../services/factoryBuilder/floor/deleteFloorApi";
// import { upsertAisleApi } from "../../../../../services/factoryBuilder/aisle/upsertAisleApi";
// import { deleteAisleApi } from "../../../../../services/factoryBuilder/aisle/deleteAisleApi";
import { upsertAisleApi } from "../../../../../services/factoryBuilder/aisle/upsertAisleApi";
import { deleteAisleApi } from "../../../../../services/factoryBuilder/aisle/deleteAisleApi";
function use2DUndoHandler() {
const { undoRedo2DStore, wallStore, floorStore, zoneStore, aisleStore } = useSceneContext();
@@ -100,9 +100,11 @@ function use2DUndoHandler() {
const createWallToBackend = (wallData: Wall) => {
addWall(wallData);
if (projectId) {
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', wallData);
upsertWallApi(projectId, selectedVersion?.versionId || '', wallData);
} else {
// SOCKET
@@ -116,14 +118,17 @@ function use2DUndoHandler() {
socket.emit('v1:model-Wall:add', data);
}
}
};
const removeWallToBackend = (wallUuid: string) => {
removeWall(wallUuid);
if (projectId) {
if (!socket?.active) {
// API
// deleteWallApi(projectId, selectedVersion?.versionId || '', wallUuid);
deleteWallApi(projectId, selectedVersion?.versionId || '', wallUuid);
} else {
// SOCKET
@@ -137,14 +142,17 @@ function use2DUndoHandler() {
socket.emit('v1:model-Wall:delete', data);
}
}
};
const updateWallToBackend = (wallUuid: string, updatedData: Wall) => {
updateWall(wallUuid, updatedData);
if (projectId) {
if (!socket?.active) {
// API
// upsertWallApi(projectId, selectedVersion?.versionId || '', updatedData);
upsertWallApi(projectId, selectedVersion?.versionId || '', updatedData);
} else {
// SOCKET
@@ -158,14 +166,17 @@ function use2DUndoHandler() {
socket.emit('v1:model-Wall:add', data);
}
}
};
const createFloorToBackend = (floorData: Floor) => {
addFloor(floorData);
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', floorData);
upsertFloorApi(projectId, selectedVersion?.versionId || '', floorData);
} else {
// SOCKET
@@ -179,14 +190,17 @@ function use2DUndoHandler() {
socket.emit('v1:model-Floor:add', data);
}
}
};
const removeFloorToBackend = (floorUuid: string) => {
removeFloor(floorUuid);
if (projectId) {
if (!socket?.active) {
// API
// deleteFloorApi(projectId, selectedVersion?.versionId || '', floorUuid);
deleteFloorApi(projectId, selectedVersion?.versionId || '', floorUuid);
} else {
// SOCKET
@@ -200,14 +214,17 @@ function use2DUndoHandler() {
socket.emit('v1:model-Floor:delete', data);
}
}
};
const updateFloorToBackend = (floorUuid: string, updatedData: Floor) => {
updateFloor(floorUuid, updatedData);
if (projectId) {
if (!socket?.active) {
// API
// upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedData);
upsertFloorApi(projectId, selectedVersion?.versionId || '', updatedData);
} else {
// SOCKET
@@ -221,14 +238,17 @@ function use2DUndoHandler() {
socket.emit('v1:model-Floor:add', data);
}
}
};
const createZoneToBackend = (zoneData: Zone) => {
addZone(zoneData);
if (projectId) {
if (!socket?.active) {
// API
// upsertZoneApi(projectId, selectedVersion?.versionId || '', zoneData);
upsertZoneApi(projectId, selectedVersion?.versionId || '', zoneData);
} else {
// SOCKET
@@ -242,14 +262,17 @@ function use2DUndoHandler() {
socket.emit('v1:zone:add', data);
}
}
};
const removeZoneToBackend = (zoneUuid: string) => {
removeZone(zoneUuid);
if (projectId) {
if (!socket?.active) {
// API
// deleteZoneApi(projectId, selectedVersion?.versionId || '', zoneUuid);
deleteZoneApi(projectId, selectedVersion?.versionId || '', zoneUuid);
} else {
// SOCKET
@@ -263,14 +286,17 @@ function use2DUndoHandler() {
socket.emit('v1:zone:delete', data);
}
}
};
const updateZoneToBackend = (zoneUuid: string, updatedData: Zone) => {
updateZone(zoneUuid, updatedData);
if (projectId) {
if (!socket?.active) {
// API
// upsertZoneApi(projectId, selectedVersion?.versionId || '', updatedData);
upsertZoneApi(projectId, selectedVersion?.versionId || '', updatedData);
} else {
// SOCKET
@@ -284,14 +310,17 @@ function use2DUndoHandler() {
socket.emit('v1:zone:add', data);
}
}
};
const createAisleToBackend = (aisleData: Aisle) => {
addAisle(aisleData);
if (projectId) {
if (!socket?.active) {
// API
// upsertAisleApi(projectId, selectedVersion?.versionId || '', aisleData);
upsertAisleApi(aisleData.aisleUuid, aisleData.points, aisleData.type, projectId, selectedVersion?.versionId || '');
} else {
// SOCKET
@@ -305,14 +334,17 @@ function use2DUndoHandler() {
socket.emit('v1:model-aisle:add', data);
}
}
};
const removeAisleToBackend = (aisleUuid: string) => {
removeAisle(aisleUuid);
if (projectId) {
if (!socket?.active) {
// API
// deleteAisleApi(projectId, selectedVersion?.versionId || '', aisleUuid);
deleteAisleApi(projectId, selectedVersion?.versionId || '', aisleUuid);
} else {
// SOCKET
@@ -326,14 +358,17 @@ function use2DUndoHandler() {
socket.emit('v1:model-aisle:delete', data);
}
}
};
const updateAisleToBackend = (aisleUuid: string, updatedData: Aisle) => {
updateAisle(aisleUuid, updatedData);
if (projectId) {
if (!socket?.active) {
// API
// upsertAisleApi(projectId, selectedVersion?.versionId || '', updatedData);
upsertAisleApi(updatedData.aisleUuid, updatedData.points, updatedData.type, projectId, selectedVersion?.versionId || '');
} else {
// SOCKET
@@ -347,6 +382,7 @@ function use2DUndoHandler() {
socket.emit('v1:model-aisle:add', data);
}
}
};
return { handleUndo };

93
app/src/modules/scene/controls/undoRedoControls/handlers/use3DRedoHandler.ts
View File

@@ -7,8 +7,8 @@ import { useSocketStore } from "../../../../../store/builder/store";
import { upsertProductOrEventApi } from "../../../../../services/simulation/products/UpsertProductOrEventApi";
// import { setAssetsApi } from "../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi";
// import { deleteFloorItem } from "../../../../../services/factoryBuilder/asset/floorAsset/deleteFloorItemApi";
import { setAssetsApi } from "../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi";
import { deleteFloorItem } from "../../../../../services/factoryBuilder/asset/floorAsset/deleteFloorItemApi";
function use3DRedoHandler() {
const { undoRedo3DStore, assetStore, productStore, eventStore } = useSceneContext();
@@ -138,7 +138,7 @@ function use3DRedoHandler() {
isLocked: false,
isVisible: true,
eventData: {},
socketId: socket.id,
socketId: socket?.id,
versionId: selectedVersion?.versionId || '',
projectId,
userId
@@ -149,20 +149,36 @@ function use3DRedoHandler() {
addEvent(assetData.eventData as EventsSchema);
}
// API
if (!socket?.active) {
// REST
// setAssetsApi(data);
setAssetsApi({
modelUuid: assetData.modelUuid,
modelName: assetData.modelName,
assetId: assetData.assetId,
position: assetData.position,
rotation: { x: assetData.rotation[0], y: assetData.rotation[1], z: assetData.rotation[2] },
isLocked: false,
isVisible: true,
eventData: data.eventData,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
// SOCKET
socket.emit("v1:model-asset:add", data);
}
}
}
const deleteAssetToBackend = (assetData: Asset) => {
if (!socket?.active) {
// REST
// const response = deleteFloorItem(organization, assetData.modelUuid, assetData.modelName);
deleteFloorItem(organization, assetData.modelUuid, assetData.modelName);
} else {
// SOCKET
@@ -176,7 +192,8 @@ function use3DRedoHandler() {
projectId
}
const response = socket.emit('v1:model-asset:delete', data)
socket.emit('v1:model-asset:delete', data)
}
removeEvent(assetData.modelUuid);
const updatedEvents = deleteEvent(assetData.modelUuid);
@@ -190,11 +207,8 @@ function use3DRedoHandler() {
);
})
if (response) {
removeAsset(assetData.modelUuid);
}
}
const updateAssetToBackend = (modelUuid: string, updatedData: Asset) => {
updateAsset(modelUuid, updatedData);
@@ -208,21 +222,34 @@ function use3DRedoHandler() {
rotation: { x: updatedData.rotation[0], y: updatedData.rotation[1], z: updatedData.rotation[2] },
isLocked: false,
isVisible: true,
socketId: socket.id,
socketId: socket?.id,
versionId: selectedVersion?.versionId || '',
projectId,
userId
};
// API
if (!socket?.active) {
// REST
// setAssetsApi(data);
setAssetsApi({
modelUuid: updatedData.modelUuid,
modelName: updatedData.modelName,
assetId: updatedData.assetId,
position: updatedData.position,
rotation: { x: updatedData.rotation[0], y: updatedData.rotation[1], z: updatedData.rotation[2] },
isLocked: false,
isVisible: true,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
// SOCKET
socket.emit("v1:model-asset:add", data);
}
}
}
const copyAssetToBackend = (assetData: Asset) => {
addAsset(assetData);
@@ -237,7 +264,7 @@ function use3DRedoHandler() {
isLocked: false,
isVisible: true,
eventData: {},
socketId: socket.id,
socketId: socket?.id,
versionId: selectedVersion?.versionId || '',
projectId,
userId
@@ -248,15 +275,29 @@ function use3DRedoHandler() {
addEvent(assetData.eventData as EventsSchema);
}
// API
if (!socket?.active) {
// REST
// setAssetsApi(data);
setAssetsApi({
modelUuid: assetData.modelUuid,
modelName: assetData.modelName,
assetId: assetData.assetId,
position: assetData.position,
rotation: { x: assetData.rotation[0], y: assetData.rotation[1], z: assetData.rotation[2] },
isLocked: false,
isVisible: true,
eventData: data.eventData,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
// SOCKET
socket.emit("v1:model-asset:add", data);
}
}
}
const duplicateAssetToBackend = (assetData: Asset) => {
addAsset(assetData);
@@ -271,7 +312,7 @@ function use3DRedoHandler() {
isLocked: false,
isVisible: true,
eventData: {},
socketId: socket.id,
socketId: socket?.id,
versionId: selectedVersion?.versionId || '',
projectId,
userId
@@ -282,15 +323,29 @@ function use3DRedoHandler() {
addEvent(assetData.eventData as EventsSchema);
}
// API
if (!socket?.active) {
//REST
// setAssetsApi(data);
setAssetsApi({
modelUuid: assetData.modelUuid,
modelName: assetData.modelName,
assetId: assetData.assetId,
position: assetData.position,
rotation: { x: assetData.rotation[0], y: assetData.rotation[1], z: assetData.rotation[2] },
isLocked: false,
isVisible: true,
eventData: data.eventData,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
//SOCKET
socket.emit("v1:model-asset:add", data);
}
}
}
const addWallAssetToBackend = (assetData: WallAsset) => {

73
app/src/modules/scene/controls/undoRedoControls/handlers/use3DUndoHandler.ts
View File

@@ -7,8 +7,8 @@ import { useSocketStore } from "../../../../../store/builder/store";
import { upsertProductOrEventApi } from "../../../../../services/simulation/products/UpsertProductOrEventApi";
// import { setAssetsApi } from "../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi";
// import { deleteFloorItem } from "../../../../../services/factoryBuilder/asset/floorAsset/deleteFloorItemApi";
import { setAssetsApi } from "../../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi";
import { deleteFloorItem } from "../../../../../services/factoryBuilder/asset/floorAsset/deleteFloorItemApi";
function use3DUndoHandler() {
const { undoRedo3DStore, assetStore, productStore, eventStore } = useSceneContext();
@@ -137,7 +137,7 @@ function use3DUndoHandler() {
isLocked: false,
isVisible: true,
eventData: {},
socketId: socket.id,
socketId: socket?.id,
versionId: selectedVersion?.versionId || '',
projectId,
userId
@@ -148,20 +148,36 @@ function use3DUndoHandler() {
addEvent(assetData.eventData as EventsSchema);
}
// API
if (!socket?.active) {
// REST
// setAssetsApi(data);
setAssetsApi({
modelUuid: assetData.modelUuid,
modelName: assetData.modelName,
assetId: assetData.assetId,
position: assetData.position,
rotation: { x: assetData.rotation[0], y: assetData.rotation[1], z: assetData.rotation[2] },
isLocked: false,
isVisible: true,
eventData: data.eventData,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
// SOCKET
socket.emit("v1:model-asset:add", data);
}
}
}
const deleteAssetToBackend = (assetData: Asset) => {
if (!socket?.active) {
// REST
// const response = deleteFloorItem(organization, assetData.modelUuid, assetData.modelName);
deleteFloorItem(organization, assetData.modelUuid, assetData.modelName);
} else {
// SOCKET
@@ -175,7 +191,8 @@ function use3DUndoHandler() {
projectId
}
const response = socket.emit('v1:model-asset:delete', data)
socket.emit('v1:model-asset:delete', data)
}
removeEvent(assetData.modelUuid);
const updatedEvents = deleteEvent(assetData.modelUuid);
@@ -189,11 +206,8 @@ function use3DUndoHandler() {
);
})
if (response) {
removeAsset(assetData.modelUuid);
}
}
const updateAssetToBackend = (modelUuid: string, updatedData: Asset) => {
updateAsset(modelUuid, updatedData);
@@ -207,26 +221,41 @@ function use3DUndoHandler() {
rotation: { x: updatedData.rotation[0], y: updatedData.rotation[1], z: updatedData.rotation[2] },
isLocked: false,
isVisible: true,
socketId: socket.id,
socketId: socket?.id,
versionId: selectedVersion?.versionId || '',
projectId,
userId
};
// API
if (!socket?.active) {
// REST
// setAssetsApi(data);
setAssetsApi({
modelUuid: updatedData.modelUuid,
modelName: updatedData.modelName,
assetId: updatedData.assetId,
position: updatedData.position,
rotation: { x: updatedData.rotation[0], y: updatedData.rotation[1], z: updatedData.rotation[2] },
isLocked: false,
isVisible: true,
versionId: selectedVersion?.versionId || '',
projectId: projectId,
});
} else {
// SOCKET
socket.emit("v1:model-asset:add", data);
}
}
}
const copyAssetToBackend = (assetData: Asset) => {
if (!socket?.active) {
// REST
// const response = deleteFloorItem(organization, assetData.modelUuid, assetData.modelName);
deleteFloorItem(organization, assetData.modelUuid, assetData.modelName);
} else {
// SOCKET
@@ -240,7 +269,8 @@ function use3DUndoHandler() {
projectId
}
const response = socket.emit('v1:model-asset:delete', data)
socket.emit('v1:model-asset:delete', data)
}
removeEvent(assetData.modelUuid);
const updatedEvents = deleteEvent(assetData.modelUuid);
@@ -254,16 +284,15 @@ function use3DUndoHandler() {
);
})
if (response) {
removeAsset(assetData.modelUuid);
}
}
const duplicateAssetToBackend = (assetData: Asset) => {
if (!socket?.active) {
// REST
// const response = deleteFloorItem(organization, assetData.modelUuid, assetData.modelName);
deleteFloorItem(organization, assetData.modelUuid, assetData.modelName);
} else {
// SOCKET
@@ -277,7 +306,8 @@ function use3DUndoHandler() {
projectId
}
const response = socket.emit('v1:model-asset:delete', data)
socket.emit('v1:model-asset:delete', data)
}
removeEvent(assetData.modelUuid);
const updatedEvents = deleteEvent(assetData.modelUuid);
@@ -291,11 +321,8 @@ function use3DUndoHandler() {
);
})
if (response) {
removeAsset(assetData.modelUuid);
}
}
const addWallAssetToBackend = (assetData: WallAsset) => {

4
app/src/modules/scene/scene.tsx
View File

@@ -34,11 +34,11 @@ export default function Scene({ layout }: { readonly layout: "Main Layout" | "Co
useEffect(() => {
if (!projectId || loadingProgress !== 0) return;
getAllProjects(userId, organization).then((projects) => {
if (!projects || !projects.Projects) return;
if (!projects.Projects) return;
let project = projects.Projects.find((val: any) => val.projectUuid === projectId || val._id === projectId);
const canvas = document.getElementById("sceneCanvas")?.getElementsByTagName("canvas")[0];
if (!canvas) return;
compressImage((canvas as HTMLCanvasElement)?.toDataURL("image/png")).then((screenshotDataUrl) => {
compressImage(canvas.toDataURL("image/png")).then((screenshotDataUrl) => {
const updateProjects = {
projectId: project?._id,
organization,

2
app/src/pages/Dashboard.tsx
View File

@@ -17,7 +17,7 @@ const Dashboard: React.FC = () => {
useEffect(() => {
const token = localStorage.getItem("token");
const refreshToken = localStorage.getItem("refreshToken")
if (token) {
if (token && refreshToken) {
useSocketStore.getState().initializeSocket(email, organization, token, refreshToken);
} else {

2
app/src/pages/Project.tsx
View File

@@ -102,7 +102,7 @@ const Project: React.FC = () => {
const token = localStorage.getItem("token");
const refreshToken = localStorage.getItem("refreshToken");
echo.warn('Validating token');
if (token) {
if (token && refreshToken) {
useSocketStore
.getState()
.initializeSocket(email, organization, token, refreshToken);

32
app/src/store/builder/store.ts
View File

@@ -1,10 +1,28 @@
import { Object3D } from "three";
import { create } from "zustand";
import { io } from "socket.io-client";
import * as CONSTANTS from "../../types/world/worldConstants";
export const useSocketStore = create<any>((set: any, get: any) => ({
type SocketStore = {
socket: ReturnType<typeof io> | null;
visualizationSocket?: ReturnType<typeof io> | null;
dashBoardSocket?: ReturnType<typeof io> | null;
projectSocket?: ReturnType<typeof io> | null;
threadSocket?: ReturnType<typeof io> | null;
initializeSocket: (
email?: string,
organization?: string,
token?: string,
refreshToken?: string
) => void;
disconnectSocket: () => void;
};
export const useSocketStore = create<SocketStore>((set, get) => ({
socket: null,
visualizationSocket: null,
dashBoardSocket: null,
projectSocket: null,
threadSocket: null,
initializeSocket: (
email?: string,
organization?: string,
@@ -63,13 +81,19 @@ export const useSocketStore = create<any>((set: any, get: any) => ({
});
},
disconnectSocket: () => {
set((state: any) => {
set((state) => {
state.socket?.disconnect();
state.visualizationSocket?.disconnect();
state.dashBoardSocket?.disconnect();
state.projectSocket?.disconnect();
state.threadSocket?.disconnect();
return { socket: null };
return {
socket: null,
visualizationSocket: null,
dashBoardSocket: null,
projectSocket: null,
threadSocket: null,
};
});
},
}));