12374195299

Committed 17 Dec 2024 01:38PM UTC coverage: 94.37% (+0.02%) from 94.353%

Build # 12374195299

Build Type

Pull #54

github

Committed by

lazToum

Commit Message

bump to 0.1.21

Pull Request Pull Request #54: Dev

Run Details

2377 of 2639 branches covered (90.07%)

Branch coverage included in aggregate %.

238 of 239 new or added lines in 40 files covered. (99.58%)

2 existing lines in 1 file now uncovered.

13513 of 14199 relevant lines covered (95.17%)

438.21 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

93.67

/src/waldiez/store/nodes/common.ts

import { Node, ReactFlowInstance } from '@xyflow/react';

import { getFlowRoot } from '@waldiez/utils';

const calculateNewNodePosition = (
  rfInstance: ReactFlowInstance | undefined,
  flowWrapper: HTMLElement,
  currentNodesCount: number,
  entriesDistance: number
) => {
  const zoom = rfInstance?.getZoom() ?? 1;
  const flowWrapperRect = flowWrapper.getBoundingClientRect();
  // take into account the zoom level
  // to calculate the number of nodes per row
  const canvasWidth = flowWrapperRect.width / zoom;
  const maxNodesPerRow = Math.floor(canvasWidth / (entriesDistance * 1.1));
  const x = (currentNodesCount % maxNodesPerRow) * entriesDistance;
  let y = Math.floor(currentNodesCount / maxNodesPerRow) * entriesDistance;
  // if first ROW, add +10 to y to avoid overlapping with the top elements
  if (y === 0) {
    y += 10;
  } else {
    y -= 5;
  }

  return { x, y };
};

export const getNewNodePosition = (
  currentNodesCount: number,
  flowId: string,
  rfInstance?: ReactFlowInstance,
  entriesDistance: number = 240
) => {
  const flowRoot = getFlowRoot(flowId);
  if (!flowRoot) {
    return { x: 0, y: 0 };
  }
  // flowRoot includes the sidebar
  // flowWrapper is the actual flow area
  const flowWrapper = flowRoot.querySelector('.react-flow-wrapper');
  if (!flowWrapper) {
    return { x: 0, y: 0 };
  }
  return calculateNewNodePosition(rfInstance, flowWrapper as HTMLElement, currentNodesCount, entriesDistance);
};

export const setViewPortTopLeft = (rfInstance?: ReactFlowInstance) => {
  if (rfInstance) {
    const zoom = rfInstance.getZoom();
    rfInstance.setViewport({
      zoom,
      x: 20,
      y: 40
    });
  }
};

export const reArrangeNodes = (
  nodes: Node[],
  flowId: string,
  nodeType: 'model' | 'skill',
  rfInstance?: ReactFlowInstance
) => {
  let nodesAdded = 0;
  const newNodes: Node[] = [];
  nodes.forEach(node => {
    if (node.type === nodeType) {
      const position = getNewNodePosition(nodesAdded, flowId, rfInstance);
      newNodes.push({ ...node, position });
      nodesAdded++;
    } else {
      newNodes.push(node);
    }
  });
  return newNodes;
};

1	import { Node, ReactFlowInstance } from '@xyflow/react';	1✔
2
3	import { getFlowRoot } from '@waldiez/utils';
4
5	const calculateNewNodePosition = (	1✔
6	rfInstance: ReactFlowInstance \| undefined,	130✔
7	flowWrapper: HTMLElement,	130✔
8	currentNodesCount: number,	130✔
9	entriesDistance: number	130✔
10	) => {	130✔
11	const zoom = rfInstance?.getZoom() ?? 1;	130✔
12	const flowWrapperRect = flowWrapper.getBoundingClientRect();	130✔
13	// take into account the zoom level
14	// to calculate the number of nodes per row
15	const canvasWidth = flowWrapperRect.width / zoom;	130✔
16	const maxNodesPerRow = Math.floor(canvasWidth / (entriesDistance * 1.1));	130✔
17	const x = (currentNodesCount % maxNodesPerRow) * entriesDistance;	130✔
18	let y = Math.floor(currentNodesCount / maxNodesPerRow) * entriesDistance;	130✔
19	// if first ROW, add +10 to y to avoid overlapping with the top elements
20	if (y === 0) {	130!
NEW 21	y += 10;	×
22	} else {	130✔
23	y -= 5;	130✔
24	}	130✔
25
26	return { x, y };	130✔
27	};	130✔
28
29	export const getNewNodePosition = (	1✔
30	currentNodesCount: number,	136✔
31	flowId: string,	136✔
32	rfInstance?: ReactFlowInstance,	136✔
33	entriesDistance: number = 240	136✔
34	) => {	136✔
35	const flowRoot = getFlowRoot(flowId);	136✔
36	if (!flowRoot) {	136✔
37	return { x: 0, y: 0 };	6✔
38	}	6✔
39	// flowRoot includes the sidebar
40	// flowWrapper is the actual flow area
41	const flowWrapper = flowRoot.querySelector('.react-flow-wrapper');	130✔
42	if (!flowWrapper) {	130!
43	return { x: 0, y: 0 };	×
44	}	×
45	return calculateNewNodePosition(rfInstance, flowWrapper as HTMLElement, currentNodesCount, entriesDistance);	130✔
46	};	130✔
47
48	export const setViewPortTopLeft = (rfInstance?: ReactFlowInstance) => {	1✔
49	if (rfInstance) {	20✔
50	const zoom = rfInstance.getZoom();	2✔
51	rfInstance.setViewport({	2✔
52	zoom,	2✔
53	x: 20,	2✔
54	y: 40	2✔
55	});	2✔
56	}	2✔
57	};	20✔
58
59	export const reArrangeNodes = (	1✔
60	nodes: Node[],	58✔
61	flowId: string,	58✔
62	nodeType: 'model' \| 'skill',	58✔
63	rfInstance?: ReactFlowInstance	58✔
64	) => {	58✔
65	let nodesAdded = 0;	58✔
66	const newNodes: Node[] = [];	58✔
67	nodes.forEach(node => {	58✔
68	if (node.type === nodeType) {	534✔
69	const position = getNewNodePosition(nodesAdded, flowId, rfInstance);	116✔
70	newNodes.push({ ...node, position });	116✔
71	nodesAdded++;	116✔
72	} else {	534✔
73	newNodes.push(node);	418✔
74	}	418✔
75	});	58✔
76	return newNodes;	58✔
77	};	58✔

waldiez / react / 12374195299

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous