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

Merging dev into main #49

Merged
8464960 merged 260 commits from dev into main 2026-01-28 10:48:52 +00:00
Conversation 3 Commits 260 Files Changed 145 +17 -12
6 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c167144b4d - Show all commits

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

@@ -79,7 +79,7 @@ export function PhaseReduce(node: Node, nodes: Node[]) {
.map(([t]) => t); .map(([t]) => t);
// children nodes - make sure to check for empty arrays // children nodes - make sure to check for empty arrays
let childrenNodes: any[] = []; let childrenNodes: Node[] = [];
if (data.children) if (data.children)
childrenNodes = nodes.filter((node) => data.children.includes(node.id)); childrenNodes = nodes.filter((node) => data.children.includes(node.id));

4
test/pages/visProgPage/visualProgrammingUI/nodes/NormNode.test.tsx
View File

@@ -115,8 +115,8 @@ describe('NormNode', () => {
/> />
); );
let norm = screen.getByText("Norm :") const norm = screen.getByText("Norm :")
expect(norm).toBeInTheDocument; expect(norm).toBeInTheDocument();
}); });
it('should render with dragging state', () => { it('should render with dragging state', () => {

4
test/pages/visProgPage/visualProgrammingUI/nodes/PhaseNode.test.tsx
View File

@@ -22,8 +22,8 @@ describe('PhaseNode', () => {
expect(p1.data.children).toEqual(p2.data.children); expect(p1.data.children).toEqual(p2.data.children);
// Add nodes to children // Add nodes to children
let p1_data = p1.data as PhaseNodeData; const p1_data = p1.data as PhaseNodeData;
let p2_data = p2.data as PhaseNodeData; const p2_data = p2.data as PhaseNodeData;
p1_data.children.push("norm-1"); p1_data.children.push("norm-1");
p2_data.children.push("norm-2"); p2_data.children.push("norm-2");
p2_data.children.push("goal-1"); p2_data.children.push("goal-1");

10
test/pages/visProgPage/visualProgrammingUI/nodes/TriggerNode.test.tsx
View File

@@ -197,8 +197,14 @@ describe('TriggerNode', () => {
const result = TriggerReduce(triggerNode, allNodes); const result = TriggerReduce(triggerNode, allNodes);
expect(result).toEqual({ expect(result).toEqual({
label: 'Keyword Trigger', id: "trigger-1",
list: [{ id: 'kw1', keyword: 'hello' }], type: "keywords",
label: 'Keyword Trigger',
keywords: [
{
"id": "kw1",
"keyword": "hello",
},],
}); });
}); });
}); });

7
test/pages/visProgPage/visualProgrammingUI/nodes/UniversalNodes.test.tsx
View File

@@ -48,9 +48,10 @@ describe('NormNode', () => {
test.each(getAllTypes())('it should render %s node with the default data', (nodeType) => { test.each(getAllTypes())('it should render %s node with the default data', (nodeType) => {
const lengthBefore = screen.getAllByText(/.*/).length; const lengthBefore = screen.getAllByText(/.*/).length;
let newNode = createNode(nodeType + "1", nodeType, {x: 200, y:200}, {}) const newNode = createNode(nodeType + "1", nodeType, {x: 200, y:200}, {})
let uiElement = Object.entries(NodeTypes).find(([t])=>t==nodeType)?.[1]!; const uiElement = Object.entries(NodeTypes).find(([t])=>t==nodeType)?.[1];
let props = { expect(uiElement).toBeDefined();
const props = {
id:newNode.id, id:newNode.id,
type:newNode.type as string, type:newNode.type as string,
data:newNode.data as any, data:newNode.data as any,

2
test/test-utils/test-utils.tsx
View File

@@ -31,5 +31,3 @@ export function resetFlowStore() {
}); });
} }
// Re-export everything from testing library
export * from '@testing-library/react';