Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #129

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions frontend/src/components/nodes/responses/Response.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import { BotIcon } from "../../../icons/nodes/responses/BotIcon"
import { NodeComponentType } from "../../../types/NodeTypes"

const Response = ({ data }: NodeComponentType) => {
return (
<div className='w-full flex items-center justify-start text-start'>
<BotIcon className="ml-1" />
<p className='ml-2 w-full rounded text-base'>{data.response.data[0]?.text ?? "No text response"}</p>
</div>
)
return (
<div className="w-full flex items-center justify-start text-start">
<BotIcon className="ml-1" />
<p className="ml-2 w-full rounded text-base">{data.response.name}</p>
</div>
)
}

export default Response
213 changes: 63 additions & 150 deletions frontend/src/modals/NodeModal/NodeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,24 @@
import {
Button,
Input,
// ModalBody,
ModalContent,
// ModalFooter,
// ModalHeader,
ModalProps,
} from "@nextui-org/react";
import { Modal, ModalBody, ModalFooter, ModalHeader } from "../ModalComponents";
import { Edge, useReactFlow } from "@xyflow/react";
import { HelpCircle, TrashIcon } from "lucide-react";
import React, { useCallback, useContext, useEffect } from "react";
// import ModalComponent from "../../components/ModalComponent";
import { flowContext } from "../../contexts/flowContext";
import { undoRedoContext } from "../../contexts/undoRedoContext";
import EditPenIcon from "../../icons/EditPenIcon";
import { DefaultNodeDataType, DefaultNodeType } from "../../types/NodeTypes";
import ConditionRow from "./components/ConditionRow";
import { Button, Input, ModalProps } from "@nextui-org/react"
import { Modal, ModalBody, ModalFooter, ModalHeader } from "../ModalComponents"
import { Edge, useReactFlow } from "@xyflow/react"
import { HelpCircle, TrashIcon } from "lucide-react"
import React, { useCallback, useContext, useEffect } from "react"

import { flowContext } from "../../contexts/flowContext"
import { undoRedoContext } from "../../contexts/undoRedoContext"
import EditPenIcon from "../../icons/EditPenIcon"
import { DefaultNodeDataType, DefaultNodeType } from "../../types/NodeTypes"
import ConditionRow from "./components/ConditionRow"

type NodeModalProps = {
data: DefaultNodeDataType;
size?: ModalProps["size"];
isOpen: boolean;
onClose: () => void;
onResponseModalOpen: () => void;
nodeDataState: DefaultNodeDataType;
setNodeDataState: React.Dispatch<React.SetStateAction<DefaultNodeDataType>>;
};
data: DefaultNodeDataType
size?: ModalProps["size"]
isOpen: boolean
onClose: () => void
onResponseModalOpen: () => void
nodeDataState: DefaultNodeDataType
setNodeDataState: React.Dispatch<React.SetStateAction<DefaultNodeDataType>>
}

const NodeModal = ({
data,
Expand All @@ -40,23 +32,25 @@ const NodeModal = ({
const { getNodes, setNodes, updateNodeData } = useReactFlow<
DefaultNodeType,
Edge
>();
const { quietSaveFlows, validateNodeDeletion } = useContext(flowContext);
const { takeSnapshot } = useContext(undoRedoContext);
>()
const { quietSaveFlows, validateNodeDeletion } = useContext(flowContext)
const { takeSnapshot } = useContext(undoRedoContext)

useEffect(() => {
setNodeDataState(
getNodes().find((node) => node.data.id === data.id)?.data ?? data
);
)
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [isOpen]);
}, [isOpen])

const setDataStateValue = useCallback(
(e: React.ChangeEvent<HTMLInputElement>) => {
setNodeDataState({ ...nodeDataState, [e.target.name]: e.target.value });
setNodeDataState({ ...nodeDataState, [e.target.name]: e.target.value })
},
[nodeDataState, setNodeDataState]
);
)

console.log(nodeDataState, "nodeDataState")

const setTextResponseValue = (e: React.ChangeEvent<HTMLInputElement>) => {
setNodeDataState({
Expand All @@ -66,125 +60,43 @@ const NodeModal = ({
type: "text",
data: [{ text: e.target.value, priority: 1 }],
},
});
};
})
}

const onNodeSave = () => {
takeSnapshot();
updateNodeData(data.id, { ...nodeDataState });
quietSaveFlows();
onClose();
};
takeSnapshot()
updateNodeData(data.id, { ...nodeDataState })
quietSaveFlows()
onClose()
}

const onNodeDelete = () => {
const is_deletion_valid = validateNodeDeletion({
data,
id: data.id,
position: { x: 0, y: 0 },
type: "default_node",
});
if (!is_deletion_valid) return -1;
takeSnapshot();
const nodes = getNodes();
const new_nodes = nodes.filter((node) => node.data.id !== data.id);
setNodes(new_nodes);
quietSaveFlows();
onClose();
};
})
if (!is_deletion_valid) return -1
takeSnapshot()
const nodes = getNodes()
const new_nodes = nodes.filter((node) => node.data.id !== data.id)
setNodes(new_nodes)
quietSaveFlows()
onClose()
}

const deleteCondition = (id: string) => {
if (nodeDataState.conditions) {
setNodeDataState({
...nodeDataState,
conditions: nodeDataState.conditions.filter((c) => c.id !== id),
});
})
}
};
}

return (
<>
{/* <ModalComponent
className="bg-background min-h-[584px]"
motionProps={{
initial: { opacity: 0, scale: 0.95 },
animate: { opacity: 1, scale: 1 },
}}
isOpen={true}
onClose={onClose}
size={size}
>
<ModalContent>
<ModalHeader>{"Edit node"}</ModalHeader>
<ModalBody>
<label></label>
<div className="grid gap-4">
<Input
label="Name"
labelPlacement="outside"
placeholder="Enter node's name here"
variant="bordered"
name="name"
value={nodeDataState.name}
onChange={setDataStateValue}
/>
<span className="relative">
<Input
label="Response"
labelPlacement="outside"
placeholder="Enter node's response here"
name="response"
variant="bordered"
disabled
value={nodeDataState.response?.data[0].text ?? "No text response"}
onChange={setTextResponseValue}
/>
<button
onClick={() => {
onResponseModalOpen();
}}
className="absolute right-3 top-9"
>
<EditPenIcon />
</button>
</span>
</div>
<div>
<p className="text-sm font-medium mb-2 mt-2"> Conditions (x) </p>
<div className="border border-border rounded-xl">
<div className="grid grid-cols-3 gap-4 px-4 py-2">
<div>NAME</div>
<div>PRIORITY</div>
<div>ACTIONS</div>
</div>
<div className="grid">
{nodeDataState.conditions?.map((cnd) => (
<ConditionRow
deleteConditionFn={deleteCondition}
key={cnd.id}
cnd={cnd}
/>
))}
</div>
</div>
</div>
</ModalBody>
<ModalFooter className="flex justify-between items-center">
<div className="flex items-center justify-start gap-2">
<Button isIconOnly className="rounded-full">
<HelpCircle />
</Button>
<Button onClick={onNodeDelete} className="hover:bg-red-500" isIconOnly>
<TrashIcon />
</Button>
</div>
<div>
<Button onClick={onNodeSave} className="bg-foreground text-background">
Save node
</Button>
</div>
</ModalFooter>
</ModalContent>
</ModalComponent> */}
<Modal
className="min-h-[584px] flex flex-col"
size={size}
Expand Down Expand Up @@ -212,12 +124,12 @@ const NodeModal = ({
name="response"
variant="bordered"
disabled
value={nodeDataState.response?.data[0].text ?? "No text response"}
value={nodeDataState.response?.name}
onChange={setTextResponseValue}
/>
<button
onClick={() => {
onResponseModalOpen();
onResponseModalOpen()
}}
className="absolute right-3 top-9"
>
Expand All @@ -234,13 +146,18 @@ const NodeModal = ({
<div>ACTIONS</div>
</div>
<div className="grid">
{nodeDataState.conditions?.map((cnd) => (
<ConditionRow
deleteConditionFn={deleteCondition}
key={cnd.id}
cnd={cnd}
/>
))}
{nodeDataState.conditions?.map(
(cnd) => (
console.log(cnd),
(
<ConditionRow
deleteConditionFn={deleteCondition}
key={cnd.id}
cnd={cnd}
/>
)
)
)}
</div>
</div>
</div>
Expand All @@ -262,11 +179,7 @@ const NodeModal = ({
</ModalFooter>
</Modal>
</>
);
};

//flex py-4 px-6 flex-initial text-large font-semibold hedr
// class="flex flex-1 flex-col gap-3 px-6 py-2" body
//flex-row gap-2 px-6 py-4 flex justify-between items-center futer
)
}

export default NodeModal;
export default NodeModal
Loading