{isGroupNode && (
-
{isOpen && (
-
+
{groupHierarchy.map((item) => (
{
- 1 ? "multi-selection" : ""}`}
- >
- {selectedAssets.length > 1
- ? `${selectedAssets.length} items selected`
- : `${groupHierarchy.length} root items`}
+ 1 ? "multi-selection" : ""}`}>
+ {selectedAssets.length > 1 ? `${selectedAssets.length} items selected` : `${groupHierarchy.length} root items`}
diff --git a/app/src/modules/builder/wall/wallCreator/wallCreator.tsx b/app/src/modules/builder/wall/wallCreator/wallCreator.tsx
index 709cc50..c7697ed 100644
--- a/app/src/modules/builder/wall/wallCreator/wallCreator.tsx
+++ b/app/src/modules/builder/wall/wallCreator/wallCreator.tsx
@@ -61,7 +61,7 @@ function WallCreator() {
const addWallToBackend = (wall: Wall) => {
if (projectId) {
- if (!builderSocket?.connected) {
+ if (builderSocket?.connected) {
// API
upsertWallApi(projectId, selectedVersion?.versionId || "", wall)
@@ -104,7 +104,7 @@ function WallCreator() {
organization: organization,
};
- builderSocket.emit("v1:model-Wall:add", data);
+ // builderSocket.emit("v1:model-Wall:add", data);
setTempPoints([]);
setIsCreating(false);
diff --git a/app/src/modules/scene/controls/assetControls/groupControls.tsx b/app/src/modules/scene/controls/assetControls/groupControls.tsx
index ba04658..1b92838 100644
--- a/app/src/modules/scene/controls/assetControls/groupControls.tsx
+++ b/app/src/modules/scene/controls/assetControls/groupControls.tsx
@@ -11,14 +11,15 @@ import useCallBackOnKey from "../../../../utils/hooks/useCallBackOnKey";
import generateUniqueAssetGroupName from "../../../builder/asset/functions/generateUniqueAssetGroupName";
import { setAssetsApi } from "../../../../services/factoryBuilder/asset/floorAsset/setAssetsApi";
import { getAssetGroupsApi } from "../../../../services/factoryBuilder/group/assetGroup/getAssetGroupsApi";
+import { createAssetGroupApi } from "../../../../services/factoryBuilder/group/assetGroup/createAssetGroupApi";
function GroupControls() {
const { projectId } = useParams();
const { builderSocket } = useSocketStore();
const { assetStore, undoRedo3DStore, versionStore, assetGroupStore } = useSceneContext();
- const { assetGroups, addGroup, buildHierarchy } = assetGroupStore();
+ const { assetGroups, addGroup, setGroups, buildHierarchy } = assetGroupStore();
const { push3D } = undoRedo3DStore();
- const { assets, selectedAssets, pastedObjects, duplicatedObjects, movedObjects, rotatedObjects } = assetStore();
+ const { assets, selectedAssets, pastedObjects, duplicatedObjects, movedObjects, rotatedObjects, getSelectedAssetUuids } = assetStore();
const { updateAssetInScene, removeAssetFromScene } = useAssetResponseHandler();
const { contextAction, setContextAction } = useContextActionStore();
const { selectedVersion } = versionStore();
@@ -29,6 +30,9 @@ function GroupControls() {
getAssetGroupsApi(projectId, selectedVersion.versionId).then((data) => {
console.log("data: ", data);
+ if (data && data.length > 0) {
+ setGroups(data);
+ }
});
}, [projectId, selectedVersion]);
@@ -43,18 +47,12 @@ function GroupControls() {
setContextAction(null);
groupSelection();
}
- }, [contextAction]);
+ }, [contextAction, projectId, selectedVersion]);
const groupSelection = () => {
- const assetUuids: string[] = [];
+ const assetUuids: string[] = getSelectedAssetUuids();
- selectedAssets.forEach((selectedAsset) => {
- if (selectedAsset.userData.modelUuid) {
- assetUuids.push(selectedAsset.userData.modelUuid);
- }
- });
-
- if (assetUuids.length > 0) {
+ if (assetUuids.length > 0 && projectId && selectedVersion) {
const groupName = generateUniqueAssetGroupName({ baseName: "Group", existingGroups: assetGroups });
const assetGroup: AssetGroup = {
@@ -67,7 +65,21 @@ function GroupControls() {
return { type: "Asset", childrenUuid: assetUuid };
}),
};
- addGroup(assetGroup);
+ console.log("assetGroup: ", assetGroup);
+ // addGroup(assetGroup);
+
+ createAssetGroupApi({
+ projectId,
+ versionId: selectedVersion.versionId,
+ groupUuid: assetGroup.groupUuid,
+ groupName: assetGroup.groupName,
+ isVisible: assetGroup.isVisible,
+ isExpanded: assetGroup.isExpanded,
+ isLocked: assetGroup.isLocked,
+ childrens: assetGroup.childrens,
+ }).then((data) => {
+ console.log("data: ", data);
+ });
}
};
@@ -81,6 +93,8 @@ function GroupControls() {
{ dependencies: [pastedObjects, duplicatedObjects, movedObjects, rotatedObjects, selectedAssets, selectedVersion, builderSocket, projectId, userId, organization], noRepeat: true }
);
+ useCallBackOnKey(() => {}, "Alt+G", { dependencies: [], noRepeat: true });
+
return null;
}
diff --git a/app/src/services/factoryBuilder/group/assetGroup/createAssetGroupApi.ts b/app/src/services/factoryBuilder/group/assetGroup/createAssetGroupApi.ts
index d4b49cd..c6072c0 100644
--- a/app/src/services/factoryBuilder/group/assetGroup/createAssetGroupApi.ts
+++ b/app/src/services/factoryBuilder/group/assetGroup/createAssetGroupApi.ts
@@ -1,37 +1,44 @@
const url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_URL}`;
-interface Props {
+export const createAssetGroupApi = async ({
+ projectId,
+ versionId,
+ groupUuid,
+ groupName,
+ isVisible,
+ isExpanded,
+ isLocked,
+ childrens,
+}: {
projectId: string;
versionId: string;
groupUuid: string;
groupName: string;
- isVisible: string;
- isExpanded: string;
- isLocked: string;
+ isVisible: boolean;
+ isExpanded: boolean;
+ isLocked: boolean;
childrens: {
type: "Asset" | "Group";
childrenUuid: string;
}[];
-}
-
-export const createAssetGroupApi = async (props: Props) => {
+}) => {
try {
- const response = await fetch(`${url_Backend_dwinzo}/api/V1/assetgroup/${props.projectId}/${props.versionId}`, {
+ const response = await fetch(`${url_Backend_dwinzo}/api/V1/assetgroup/${projectId}/${versionId}`, {
method: "POST",
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${localStorage.getItem("token") || ""}`,
token: localStorage.getItem("token") || "",
refresh_token: localStorage.getItem("refreshToken") || "",
- body: JSON.stringify({
- groupUuid: props.groupUuid,
- groupName: props.groupName,
- isVisible: props.isVisible,
- isExpanded: props.isExpanded,
- isLocked: props.isLocked,
- childrens: props.childrens,
- }),
},
+ body: JSON.stringify({
+ groupUuid: groupUuid,
+ groupName: groupName,
+ isVisible: isVisible,
+ isExpanded: isExpanded,
+ isLocked: isLocked,
+ childrens: childrens,
+ }),
});
const newAccessToken = response.headers.get("x-access-token");
diff --git a/app/src/services/factoryBuilder/group/assetGroup/getAssetGroupsApi.ts b/app/src/services/factoryBuilder/group/assetGroup/getAssetGroupsApi.ts
index 7ad4a08..8fa9c8d 100644
--- a/app/src/services/factoryBuilder/group/assetGroup/getAssetGroupsApi.ts
+++ b/app/src/services/factoryBuilder/group/assetGroup/getAssetGroupsApi.ts
@@ -2,7 +2,7 @@ let url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_REST_API_BASE_UR
export const getAssetGroupsApi = async (projectId: string, versionId: string) => {
try {
- const response = await fetch(`${url_Backend_dwinzo}/api/V1/assetGroups/${projectId}/${versionId}`, {
+ const response = await fetch(`${url_Backend_dwinzo}/api/V1/assetgroups/${projectId}/${versionId}`, {
method: "GET",
headers: {
Authorization: "Bearer
",