- {inputFocus && inputValue.length > 2 && searchedEmail && searchedEmail.length > 0 && (
+
+ {isFocused && inputValue.length > 2 && searchResults.length > 0 && (
- {/* list available users here */}
- {searchedEmail.map((val: any, i: any) => (
-
{
- handleAddEmail(val)
- setInputFocus(false)
- }} key={i} >
- {val?.Email}
+ {searchResults.map(user => (
+
{
+ handleAddUser(user);
+ setIsFocused(false);
+ }}
+ >
+ {user.Email}
))}
@@ -134,4 +139,5 @@ const MultiEmailInvite: React.FC
= ({ users, getData }) => {
);
};
-export default MultiEmailInvite;
+
+export default MultiEmailInvite;
\ No newline at end of file
diff --git a/app/src/modules/builder/dfx/LoadBlueprint.tsx b/app/src/modules/builder/dfx/LoadBlueprint.tsx
index 1a95268..5763d26 100644
--- a/app/src/modules/builder/dfx/LoadBlueprint.tsx
+++ b/app/src/modules/builder/dfx/LoadBlueprint.tsx
@@ -1,5 +1,5 @@
import { useEffect, useRef } from 'react';
-import { useDfxUpload, useSocketStore, useToggleView, useUpdateScene } from '../../../store/builder/store';
+import { useActiveLayer, useDfxUpload, useSocketStore, useToggleView, useUpdateScene } from '../../../store/builder/store';
import { LineBasicMaterial, Line } from 'three';
import { TransformControls } from '@react-three/drei';
import { getWallPointsFromBlueprint } from './functions/getWallPointsFromBlueprint';
@@ -7,6 +7,8 @@ import * as Types from '../../../types/world/worldTypes';
import { useParams } from 'react-router-dom';
import { getUserData } from '../../../functions/getUserData';
import { useVersionContext } from '../version/versionContext';
+import { useBuilderStore } from '../../../store/builder/useBuilderStore';
+import { useSceneContext } from '../../scene/sceneContext';
/**
* DxfFile component handles the rendering and manipulation of DXf file data in a 3D scene.
@@ -15,48 +17,44 @@ import { useVersionContext } from '../version/versionContext';
*/
const DxfFile = () => {
// State management hooks
- const { dfxuploaded, dfxWallGenerate, setObjValue, objValue } = useDfxUpload();
+ const { dfxuploaded, dfxWallGenerate, setObjValue, objValue, setDfxUploaded } = useDfxUpload();
const { toggleView } = useToggleView();
const { socket } = useSocketStore();
const { selectedVersionStore } = useVersionContext();
const { selectedVersion } = selectedVersionStore();
const { projectId } = useParams();
const { userId, organization } = getUserData();
-
+ const { activeLayer } = useActiveLayer();
+ const { wallThickness, wallHeight, insideMaterial, outsideMaterial, } = useBuilderStore();
// Refs for storing line objects
const lineRefs = useRef([]);
+ const { wallStore } = useSceneContext();
+ const { addWall, } = wallStore();
+ const { walls } = wallStore();
/**
* Effect hook that runs when DXF wall generation is triggered.
* Loads initial points and lines from the DXF data and updates the scene.
*/
useEffect(() => {
+
if (dfxWallGenerate) {
- // Store generated lines in ref
- // lines.current.push(...dfxWallGenerate);
- // dfxWallGenerate.map((line: any) => {
- // const lineData = arrayLineToObject(line as Types.Line);
+ dfxWallGenerate.map((wall: Wall) => {
+ const data = {
+ wallData: wall,
+ projectId: projectId,
+ versionId: selectedVersion?.versionId || '',
+ userId: userId,
+ organization: organization
+ }
+ addWall(wall);
+ socket.emit('v1:model-Wall:add', data);
+ // API
- // //REST
-
- // // setLine(organization, lineData.layer!, lineData.line!, lineData.type!);
-
- // //SOCKET
-
- // const input = {
- // organization,
- // layer: lineData.layer,
- // line: lineData.line,
- // type: lineData.type,
- // socketId: socket.id,
- // versionId: selectedVersion?.versionId || '',
- // projectId,
- // userId
- // }
-
- // socket.emit('v1:Line:create', input);
-
- // })
+ // if (projectId) {
+ // upsertWallApi(projectId, selectedVersion?.versionId || '', wall);
+ // }
+ })
}
}, [dfxWallGenerate]);
@@ -78,10 +76,15 @@ const DxfFile = () => {
// Recalculate wall points based on new position
getWallPointsFromBlueprint({
objValue: { x: position.x, y: position.y, z: position.z },
- setDfxGenerate: () => { },
+ setDxfWallGenerate: () => { },
+ wallThickness, wallHeight, outsideMaterial, insideMaterial, activeLayer, addWall, walls
});
};
-
+ useEffect(() => {
+ if (!toggleView) {
+ setDfxUploaded([])
+ }
+ }, [toggleView])
return (
<>
{/* Render DXF lines with transform controls when DXF data is available and view is toggled */}
diff --git a/app/src/modules/builder/dfx/functions/getWallPointsFromBlueprint.ts b/app/src/modules/builder/dfx/functions/getWallPointsFromBlueprint.ts
index a1a5e45..2087899 100644
--- a/app/src/modules/builder/dfx/functions/getWallPointsFromBlueprint.ts
+++ b/app/src/modules/builder/dfx/functions/getWallPointsFromBlueprint.ts
@@ -1,11 +1,21 @@
import { MathUtils, Vector3, BufferGeometry } from "three";
+import { useActiveLayer } from "../../../../store/builder/store";
+import { useBuilderStore } from "../../../../store/builder/useBuilderStore";
+import { wait } from "@testing-library/user-event/dist/utils";
type DXFData = any; // Replace with actual DXF data type
type DXFEntity = any; // Replace with actual DXF entity type
type WallLineVertex = [Vector3, string, number, string]; // Represents a wall segment with start point, ID, weight, and type
interface Props {
parsedData?: DXFData; // Parsed DXF file data
- setDfxGenerate?: (walls: WallLineVertex[][]) => void; // Callback to set generated walls
+ setDxfWallGenerate?: any; // Callback to set generated walls
objValue: any; // Object position values for offset calculation
+ wallThickness: number;
+ wallHeight: number;
+ outsideMaterial: string;
+ insideMaterial: string;
+ activeLayer: number; // Active layer for wall points
+ addWall: (wall: Wall) => void; // Function to add a wall to the scene
+ walls: Wall[]; // Array of walls to be processed
}
/**
@@ -15,20 +25,36 @@ interface Props {
*
* @param {Props} params - Configuration parameters
* @param {DXFData} params.parsedData - Parsed DXF file data
- * @param {Function} params.setDfxGenerate - Callback to store generated walls
+ * @param {Function} params.setDxfWallGenerate - Callback to store generated walls
* @param {Object} params.objValue - Contains x,y,z offsets for position adjustment
*/
export function getWallPointsFromBlueprint({
parsedData,
- setDfxGenerate,
+ setDxfWallGenerate,
objValue,
+ wallThickness,
+ wallHeight,
+ outsideMaterial,
+ insideMaterial,
+ activeLayer,
+ addWall,
+ walls,
}: Props) {
// Early return if no data is provided
if (!parsedData) return;
if (!parsedData.entities) return;
const unit = 1000; // Conversion factor from millimeters to meters
- const wallVertex: WallLineVertex[][] = []; // Stores all generated wall segments
+ const wallVertex: any[] = []; // Array to store wall vertices
+ const findExistingPoint = (vec: Vector3): Point | undefined => {
+ for (const wall of wallVertex) {
+ for (const pt of wall.points) {
+ const pos = new Vector3(...pt.position);
+ if (pos.equals(vec)) return pt;
+ }
+ }
+ return undefined;
+ };
// Process each entity in the DXF file
parsedData.entities.forEach((entity: DXFEntity) => {
@@ -47,31 +73,41 @@ export function getWallPointsFromBlueprint({
-entity.vertices[1].y / unit
).add(new Vector3(objValue.x, 0, objValue.z));
- // Check if points already exist to avoid duplicates
- const existingStart = wallVertex
- .flat()
- .find((v) => v[0].equals(startVec));
- const startPoint: WallLineVertex = existingStart || [
- startVec,
- MathUtils.generateUUID(), // Generate unique ID for new points
- 1, // Default weight
- "WallLine", // Type identifier
- ];
+ // Create start and end points
+ const existingStart = findExistingPoint(startVec);
+ const startPoint: Point = existingStart || {
+ pointUuid: MathUtils.generateUUID(),
+ pointType: "Wall",
+ position: [startVec.x, startVec.y, startVec.z],
+ layer: activeLayer,
+ };
- const existingEnd = wallVertex.flat().find((v) => v[0].equals(endVec));
- const endPoint: WallLineVertex = existingEnd || [
- endVec,
- MathUtils.generateUUID(),
- 1,
- "WallLine",
- ];
+ const existingEnd = findExistingPoint(endVec);
+ const endPoint: Point = existingEnd || {
+ pointUuid: MathUtils.generateUUID(),
+ pointType: "Wall",
+ position: [endVec.x, endVec.y, endVec.z],
+ layer: activeLayer,
+ };
- // Add the line segment to our collection
- wallVertex.push([startPoint, endPoint]);
+ // Create the wall
+ const wallSet: Wall = {
+ wallUuid: MathUtils.generateUUID(),
+ points: [startPoint, endPoint], // Store start and end points
+ outsideMaterial: insideMaterial,
+ insideMaterial: outsideMaterial,
+ wallThickness: wallThickness,
+ wallHeight: wallHeight,
+ decals: [],
+ };
+ wallVertex.push(wallSet); // Store wall segment in array
+ // Add the wall to the scene
+ // addWall(wallSet);
}
+
// Handle LWPOLYLINE entities (connected line segments)
else if (entity.type === "LWPOLYLINE" && entity.vertices) {
- let firstPoint: WallLineVertex | undefined; // Store first point for closing the polyline
+ let firstPoint: Point | undefined; // Store first point for closing the polyline
// Process each vertex pair in the polyline
for (let i = 0; i < entity.vertices.length - 1; i++) {
@@ -88,37 +124,60 @@ export function getWallPointsFromBlueprint({
-entity.vertices[i + 1].y / unit
).add(new Vector3(objValue.x, 0, objValue.z));
- // Check for existing points
- const existingStart = wallVertex
- .flat()
- .find((v) => v[0].equals(startVec));
- const startPoint: WallLineVertex = existingStart || [
- startVec,
- MathUtils.generateUUID(),
- 1,
- "WallLine",
- ];
+ // Create start and end points
+ const existingStart = findExistingPoint(startVec);
+ const startPoint: Point = existingStart || {
+ pointUuid: MathUtils.generateUUID(), // Generate unique ID for new points
+ pointType: "Wall", // Type identifier
+ position: [startVec.x, startVec.y, startVec.z], // Position in 3D space
+ layer: activeLayer,
+ };
- const existingEnd = wallVertex.flat().find((v) => v[0].equals(endVec));
- const endPoint: WallLineVertex = existingEnd || [
- endVec,
- MathUtils.generateUUID(),
- 1,
- "WallLine",
- ];
+ const existingEnd = findExistingPoint(endVec);
+ const endPoint: Point = existingEnd || {
+ pointUuid: MathUtils.generateUUID(), // Generate unique ID for new points
+ pointType: "Wall", // Type identifier
+ position: [endVec.x, endVec.y, endVec.z], // Position in 3D space
+ layer: activeLayer,
+ };
- wallVertex.push([startPoint, endPoint]);
+ // Create the wall segment
+ const wallSet: Wall = {
+ wallUuid: MathUtils.generateUUID(),
+ points: [startPoint, endPoint], // Store start and end points
+ outsideMaterial: insideMaterial,
+ insideMaterial: outsideMaterial,
+ wallThickness: wallThickness,
+ wallHeight: wallHeight,
+ decals: [],
+ };
+ // Add the wall segment
+ // addWall(wallSet);
+ wallVertex.push(wallSet);
// Store first point and create closing segment if this is the last vertex
if (i === 0) firstPoint = startPoint;
if (i === entity.vertices.length - 2 && firstPoint) {
- wallVertex.push([endPoint, firstPoint]);
+ const closingWallSet: Wall = {
+ wallUuid: MathUtils.generateUUID(),
+ points: [endPoint, firstPoint], // Create closing segment
+ outsideMaterial: insideMaterial,
+ insideMaterial: outsideMaterial,
+ wallThickness: wallThickness,
+ wallHeight: wallHeight,
+ decals: [],
+ };
+ // Add the closing wall
+ wallVertex.push(closingWallSet);
+ // addWall(closingWallSet);
}
}
}
+
// Handle ARC entities
else if (entity.type === "ARC") {
const { center, radius, startAngle, endAngle } = entity;
+
// Validate required ARC properties
if (
!center ||
@@ -154,34 +213,46 @@ export function getWallPointsFromBlueprint({
const startVec = arcPoints[i];
const endVec = arcPoints[i + 1];
- // Check for existing points
- const existingStart = wallVertex
- .flat()
- .find((v) => v[0].equals(startVec));
- const startPoint: WallLineVertex = existingStart || [
- startVec,
- MathUtils.generateUUID(),
- 1,
- "WallLine",
- ];
+ // Create start and end points
+ const existingStart = findExistingPoint(startVec);
+ const startPoint: Point = existingStart || {
+ pointUuid: MathUtils.generateUUID(),
+ pointType: "Wall",
+ position: [startVec.x, startVec.y, startVec.z],
+ layer: activeLayer,
+ };
- const existingEnd = wallVertex.flat().find((v) => v[0].equals(endVec));
- const endPoint: WallLineVertex = existingEnd || [
- endVec,
- MathUtils.generateUUID(),
- 1,
- "WallLine",
- ];
+ const existingEnd = findExistingPoint(endVec);
+ const endPoint: Point = existingEnd || {
+ pointUuid: MathUtils.generateUUID(),
+ pointType: "Wall",
+ position: [endVec.x, endVec.y, endVec.z],
+ layer: activeLayer,
+ };
- wallVertex.push([startPoint, endPoint]);
+ // Create the wall segment
+ const wallSet: Wall = {
+ wallUuid: MathUtils.generateUUID(),
+ points: [startPoint, endPoint],
+ outsideMaterial: insideMaterial,
+ insideMaterial: outsideMaterial,
+ wallThickness: wallThickness,
+ wallHeight: wallHeight,
+ decals: [],
+ };
+
+ // Add the wall segment
+ // addWall(wallSet);
+ wallVertex.push(wallSet);
}
}
+
// Log unsupported entity types
else {
console.error("Unsupported entity type:", entity.type);
}
});
-
+ console.log("wallVertex: ", wallVertex);
// Return the generated walls through callback if provided
- setDfxGenerate && setDfxGenerate(wallVertex);
-}
+ setDxfWallGenerate && setDxfWallGenerate(wallVertex);
+}
diff --git a/app/src/modules/builder/wall/wallCreator/wallCreator.tsx b/app/src/modules/builder/wall/wallCreator/wallCreator.tsx
index a80a62d..24a2f95 100644
--- a/app/src/modules/builder/wall/wallCreator/wallCreator.tsx
+++ b/app/src/modules/builder/wall/wallCreator/wallCreator.tsx
@@ -71,6 +71,7 @@ function WallCreator() {
if (wallIntersect && !pointIntersects) {
const wall = getWallByPoints(wallIntersect.object.userData.points);
+ console.log('wall: ', wall);
if (wall) {
const ThroughPoint = wallIntersect.object.userData.path.getPoints(Constants.lineConfig.lineIntersectionPoints);
let intersectionPoint = getClosestIntersection(ThroughPoint, wallIntersect.point);
@@ -294,7 +295,9 @@ function WallCreator() {
position: [position.x, position.y, position.z],
layer: activeLayer
};
+ console.log('newPoint: ', newPoint);
+ console.log('snappedPoint: ', snappedPoint);
if (snappedPosition && snappedPoint) {
newPoint.pointUuid = snappedPoint.pointUuid;
newPoint.position = snappedPosition;
@@ -316,6 +319,7 @@ function WallCreator() {
}
}
+ console.log('tempPoints: ', tempPoints);
if (tempPoints.length === 0) {
setTempPoints([newPoint]);
setIsCreating(true);
@@ -330,6 +334,7 @@ function WallCreator() {
decals: []
};
addWall(wall);
+ console.log('wall: ', wall);
// API
diff --git a/app/src/modules/simulation/vehicle/navMesh/polygonGenerator.tsx b/app/src/modules/simulation/vehicle/navMesh/polygonGenerator.tsx
index 34d9f26..f22cef4 100644
--- a/app/src/modules/simulation/vehicle/navMesh/polygonGenerator.tsx
+++ b/app/src/modules/simulation/vehicle/navMesh/polygonGenerator.tsx
@@ -12,13 +12,12 @@ interface PolygonGeneratorProps {
export default function PolygonGenerator({
groupRef,
}: PolygonGeneratorProps) {
- const { aisleStore } = useSceneContext();
+ const { aisleStore, wallStore } = useSceneContext();
const { aisles } = aisleStore();
const { scene } = useThree();
+ const { walls } = wallStore();
useEffect(() => {
- // let allLines = arrayLinesToObject(lines.current);
- // const wallLines = allLines?.filter((line) => line?.type === "WallLine");
const result = aisles
.filter(
(aisle) =>
@@ -61,9 +60,12 @@ export default function PolygonGenerator({
});
});
- // const wallPoints = wallLines
- // .map((pair) => pair?.line.map((vals) => vals.position))
- // .filter((wall): wall is THREE.Vector3[] => !!wall);
+
+ const wallPoints: THREE.Vector3[][] = walls
+ .map((wall) =>
+ wall.points.map((pt) => new THREE.Vector3(pt.position[0], pt.position[1], pt.position[2]))
+ )
+ .filter(points => points.length === 2);
if (!result || result.some((line) => !line)) {
@@ -81,7 +83,7 @@ export default function PolygonGenerator({
const polygons = turf.polygonize(turf.featureCollection(validLineFeatures));
- // renderWallGeometry(wallPoints);
+ renderWallGeometry(wallPoints);
if (polygons.features.length > 0) {
polygons.features.forEach((feature) => {
@@ -116,7 +118,7 @@ export default function PolygonGenerator({
});
}
- }, [ aisles, scene]);
+ }, [aisles, scene, walls]);
const renderWallGeometry = (walls: THREE.Vector3[][]) => {
walls.forEach((wall) => {
diff --git a/app/src/pages/Project.tsx b/app/src/pages/Project.tsx
index c655469..bf01b3a 100644
--- a/app/src/pages/Project.tsx
+++ b/app/src/pages/Project.tsx
@@ -29,7 +29,6 @@ import { SceneProvider } from "../modules/scene/sceneContext";
import { getVersionHistoryApi } from "../services/factoryBuilder/versionControl/getVersionHistoryApi";
import { useVersionHistoryStore } from "../store/builder/useVersionHistoryStore";
import { VersionProvider } from "../modules/builder/version/versionContext";
-import { recentlyViewed } from "../services/dashboard/recentlyViewed";
import { sharedWithMeProjects } from "../services/dashboard/sharedWithMeProject";
const Project: React.FC = () => {
diff --git a/app/src/services/factoryBuilder/collab/getProjectSharedList.ts b/app/src/services/factoryBuilder/collab/getProjectSharedList.ts
index 5260a7a..0c39b99 100644
--- a/app/src/services/factoryBuilder/collab/getProjectSharedList.ts
+++ b/app/src/services/factoryBuilder/collab/getProjectSharedList.ts
@@ -14,6 +14,11 @@ export const getProjectSharedList = async (projectId: string) => {
},
}
);
+ const newAccessToken = response.headers.get("x-access-token");
+ if (newAccessToken) {
+ //console.log("New token received:", newAccessToken);
+ localStorage.setItem("token", newAccessToken);
+ }
if (!response.ok) {
throw new Error("Failed to get users");
diff --git a/app/src/services/factoryBuilder/collab/getSearchUsers.ts b/app/src/services/factoryBuilder/collab/getSearchUsers.ts
index 5915a11..01ab7a9 100644
--- a/app/src/services/factoryBuilder/collab/getSearchUsers.ts
+++ b/app/src/services/factoryBuilder/collab/getSearchUsers.ts
@@ -14,6 +14,11 @@ export const getSearchUsers = async (searchMail: string) => {
},
}
);
+ const newAccessToken = response.headers.get("x-access-token");
+ if (newAccessToken) {
+ //console.log("New token received:", newAccessToken);
+ localStorage.setItem("token", newAccessToken);
+ }
if (!response.ok) {
throw new Error("Failed to get users");
diff --git a/app/src/services/factoryBuilder/collab/shareAccess.ts b/app/src/services/factoryBuilder/collab/shareAccess.ts
index 4ecbf96..de7a824 100644
--- a/app/src/services/factoryBuilder/collab/shareAccess.ts
+++ b/app/src/services/factoryBuilder/collab/shareAccess.ts
@@ -9,7 +9,7 @@ export const shareAccess = async (
const body: any = {
projectId,
targetUserId,
- newAccessPoint
+ newAccessPoint,
};
try {
@@ -26,6 +26,11 @@ export const shareAccess = async (
body: JSON.stringify(body),
}
);
+ const newAccessToken = response.headers.get("x-access-token");
+ if (newAccessToken) {
+ //console.log("New token received:", newAccessToken);
+ localStorage.setItem("token", newAccessToken);
+ }
if (!response.ok) {
console.error("Failed to clearPanel in the zone");
diff --git a/app/src/services/factoryBuilder/collab/shareProject.ts b/app/src/services/factoryBuilder/collab/shareProject.ts
index 8ce2ff5..eb14ffe 100644
--- a/app/src/services/factoryBuilder/collab/shareProject.ts
+++ b/app/src/services/factoryBuilder/collab/shareProject.ts
@@ -12,6 +12,12 @@ export const shareProject = async (addUserId: string, projectId: string) => {
},
body: JSON.stringify({ addUserId, projectId }),
});
+ const newAccessToken = response.headers.get("x-access-token");
+ if (newAccessToken) {
+ //console.log("New token received:", newAccessToken);
+ localStorage.setItem("token", newAccessToken);
+ }
+
if (!response.ok) {
console.error("Failed to add project");
}
diff --git a/app/src/store/builder/store.ts b/app/src/store/builder/store.ts
index 860e618..06cb1fb 100644
--- a/app/src/store/builder/store.ts
+++ b/app/src/store/builder/store.ts
@@ -587,7 +587,7 @@ export const useDfxUpload = create((set: any) => ({
dfxWallGenerate: [],
objValue: { x: 0, y: 0, z: 0 },
setDfxUploaded: (x: any) => set({ dfxuploaded: x }),
- setDfxGenerate: (x: any) => set({ dfxWallGenerate: x }),
+ setDxfWallGenerate: (x: any) => set({ dfxWallGenerate: x }),
setObjValue: (x: any) => set({ objValue: x }),
}));
diff --git a/app/src/utils/shortcutkeys/handleShortcutKeys.ts b/app/src/utils/shortcutkeys/handleShortcutKeys.ts
index 7090eaa..1abe459 100644
--- a/app/src/utils/shortcutkeys/handleShortcutKeys.ts
+++ b/app/src/utils/shortcutkeys/handleShortcutKeys.ts
@@ -1,10 +1,14 @@
import React, { useEffect } from "react";
-import useModuleStore, { useSubModuleStore, useThreeDStore } from "../../store/useModuleStore";
+import useModuleStore, {
+ useSubModuleStore,
+ useThreeDStore,
+} from "../../store/useModuleStore";
import { usePlayerStore, useToggleStore } from "../../store/useUIToggleStore";
import useVersionHistoryVisibleStore, {
useActiveSubTool,
useActiveTool,
useAddAction,
+ useDfxUpload,
useRenameModeStore,
useSaveVersion,
useSelectedComment,
@@ -49,7 +53,7 @@ const KeyPressListener: React.FC = () => {
const { setCreateNewVersion } = useVersionHistoryStore();
const { setVersionHistoryVisible } = useVersionHistoryVisibleStore();
const { setSelectedComment } = useSelectedComment();
-
+ const { setDfxUploaded, setDxfWallGenerate } = useDfxUpload();
const isTextInput = (element: Element | null): boolean =>
element instanceof HTMLInputElement ||
element instanceof HTMLTextAreaElement ||
@@ -160,14 +164,14 @@ const KeyPressListener: React.FC = () => {
setCreateNewVersion(true);
setVersionHistoryVisible(true);
setSubModule("properties");
- setActiveModule('builder');
+ setActiveModule("builder");
break;
case "Ctrl+H":
if (!isPlaying) {
setVersionHistoryVisible(true);
setSubModule("properties");
- setActiveModule('builder');
+ setActiveModule("builder");
}
break;
@@ -195,6 +199,7 @@ const KeyPressListener: React.FC = () => {
clearComparisonProduct();
setIsLogListVisible(false);
setIsRenameMode(false);
+ setDfxUploaded([]);
setSelectedComment(null);
}