pepperplus/pepperplus-ui
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: small fixes for merge

Browse Source
This commit is contained in:
Björn Otgaar
2026-01-07 13:15:46 +01:00
parent e6b0d7564d
commit d2d4dc1242
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/VisProgPage/visualProgrammingUI/nodes/NormNode.default.ts
View File

@@ -6,7 +6,7 @@ import type { NormNodeData } from "./NormNode";
export const NormNodeDefaults: NormNodeData = { export const NormNodeDefaults: NormNodeData = {
label: "Norm Node", label: "Norm Node",
droppable: true, droppable: true,
conditions: [], condition: undefined,
norm: "", norm: "",
hasReduce: true, hasReduce: true,
critical: false, critical: false,

11
src/pages/VisProgPage/visualProgrammingUI/nodes/NormNode.tsx
View File

@@ -20,10 +20,7 @@ import { BasicBeliefReduce } from './BasicBeliefNode';
export type NormNodeData = { export type NormNodeData = {
label: string; label: string;
droppable: boolean; droppable: boolean;
<<<<<<< HEAD
condition?: string; // id of this node's belief. condition?: string; // id of this node's belief.
=======
>>>>>>> demo
norm: string; norm: string;
hasReduce: boolean; hasReduce: boolean;
critical: boolean; critical: boolean;
@@ -73,15 +70,14 @@ export default function NormNode(props: NodeProps<NormNode>) {
/> />
</div> </div>
<<<<<<< HEAD
{data.condition && (<div className={"flex-row gap-md align-center"} data-testid="norm-condition-information"> {data.condition && (<div className={"flex-row gap-md align-center"} data-testid="norm-condition-information">
<label htmlFor={checkbox_id}>Condition/ Belief attached.</label> <label htmlFor={checkbox_id}>Condition/ Belief attached.</label>
</div>)} </div>)}
=======
<Handle type="source" position={Position.Right} id="norms"/> <Handle type="source" position={Position.Right} id="norms"/>
<Handle type="target" position={Position.Bottom} id="norms"/> <Handle type="target" position={Position.Bottom} id="norms"/>
>>>>>>> demo
</div> </div>
</>; </>;
}; };
@@ -95,8 +91,6 @@ export default function NormNode(props: NodeProps<NormNode>) {
export function NormReduce(node: Node, nodes: Node[]) { export function NormReduce(node: Node, nodes: Node[]) {
const data = node.data as NormNodeData; const data = node.data as NormNodeData;
<<<<<<< HEAD
=======
// conditions nodes - make sure to check for empty arrays // conditions nodes - make sure to check for empty arrays
const result: Record<string, unknown> = { const result: Record<string, unknown> = {
id: node.id, id: node.id,
@@ -105,7 +99,6 @@ export function NormReduce(node: Node, nodes: Node[]) {
critical: data.critical, critical: data.critical,
}; };
<<<<<<< HEAD
if (data.condition) { if (data.condition) {
const reducer = BasicBeliefReduce; // TODO: also add inferred. const reducer = BasicBeliefReduce; // TODO: also add inferred.
const conditionNode = nodes.find((node) => node.id === data.condition); const conditionNode = nodes.find((node) => node.id === data.condition);

2
src/pages/VisProgPage/visualProgrammingUI/nodes/PhaseNode.tsx
View File

@@ -101,7 +101,7 @@ export function PhaseReduce(node: Node, nodes: Node[]) {
// Build the result object // Build the result object
const result: Record<string, unknown> = { const result: Record<string, unknown> = {
id: thisnode.id, id: thisNode.id,
name: data.label, name: data.label,
}; };