Merging dev into main #49

Merged

8464960 merged 260 commits from dev into main

2026-01-28 10:48:52 +00:00

Author	SHA1	Message	Date
Gerla, J. (Justin)	9e06bf079b	Merge branch 'chore/adding-uu-strings' into 'dev' chore: added copyright strings and removed template page See merge request ics/sp/2025/n25b/pepperplus-ui!50	2026-01-28 10:34:36 +00:00
Gerla, J. (Justin)	eb5a6cddd7	chore: added copyright strings and removed template page	2026-01-28 10:34:36 +00:00
Björn Otgaar	60f7bad5d1	Merge branch 'feat/experiment-logs' into 'dev' Add experiment logs to the monitoring page See merge request ics/sp/2025/n25b/pepperplus-ui!48	2026-01-28 10:15:59 +00:00
Twirre	835de03a29	Add experiment logs to the monitoring page	2026-01-28 10:15:58 +00:00
Pim Hutting	78901ee25b	Merge branch 'temp_screenshot_manual' into 'dev' feat: The Big One UI See merge request ics/sp/2025/n25b/pepperplus-ui!47	2026-01-28 08:27:30 +00:00
Gerla, J. (Justin)	82785dc8cb	feat: The Big One UI	2026-01-28 08:27:30 +00:00
Twirre	f9e0eb95f8	Merge branch 'feat/add-inferred-belief-node' into 'dev' feat: added an inferred belief node to the editor See merge request ics/sp/2025/n25b/pepperplus-ui!42	2026-01-23 12:57:35 +00:00
Gerla, J. (Justin)	47c5e94b8f	feat: added an inferred belief node to the editor	2026-01-23 12:57:34 +00:00
Pim Hutting	b17d1e7618	Merge branch 'fix/correct-capitalization' into 'dev' chore: fix the capitalization of 3 characters to make sure they match. :) See merge request ics/sp/2025/n25b/pepperplus-ui!46	2026-01-23 10:42:36 +00:00
Björn Otgaar	ec211ccbc3	chore: fix the capitalization of 3 characters to make sure they match. :)	2026-01-23 11:25:30 +01:00
Gerla, J. (Justin)	6f4471ce6f	Merge branch 'demo' into 'dev' feat: merged demo into dev See merge request ics/sp/2025/n25b/pepperplus-ui!43	2026-01-20 11:10:58 +00:00
Pim Hutting	8c28dd6c1c	Merge branch 'feat/recursive-goal-making' into 'demo' Adding goal nodes automatically adds them to the plan, and correctly reduces them See merge request ics/sp/2025/n25b/pepperplus-ui!40	2026-01-19 14:00:04 +00:00
Björn Otgaar	e1257bdf48	Merge branch 'demo' into feat/recursive-goal-making	2026-01-13 12:33:27 +01:00
Björn Otgaar	3f7e196bb7	Merge branch 'feat/add-node-tooltips' into 'demo' feat: added node-tooltips to the editor See merge request ics/sp/2025/n25b/pepperplus-ui!39	2026-01-13 11:29:45 +00:00
Gerla, J. (Justin)	566c4c18cc	feat: added node-tooltips to the editor	2026-01-13 11:29:45 +00:00
Björn Otgaar	8ffc919e7e	fix: added a missing test, corrected the imports, added behavior for disconnected goals as last step ref: N25B-434	2026-01-10 11:26:26 +01:00
Björn Otgaar	a5a345b9a9	test: add tests for goal and triggers	2026-01-08 14:38:37 +01:00
Björn Otgaar	96afba2a1d	chore: add name field to trigger nodes	2026-01-08 14:09:44 +01:00
Björn Otgaar	c7ed3c8ef2	feat: added correct showing of goals with the description and can_fail ref: N25B-434	2026-01-08 12:31:46 +01:00
Björn Otgaar	e6f29a0f6b	chore: fix the eslint issues	2026-01-08 11:33:10 +01:00
Björn Otgaar	a4428c0d67	feat: automatic addition of goals to a current goal node, adding it to the plan, making sure the data stays correct. Also for the trigger nodes. :) ref: N25B-434	2026-01-07 17:55:54 +01:00
Kasper Marinus	5385bd72b1	Merge branch 'refactor/nodes-match-functionality' into 'demo' Refactor of visual programming page to fully match the CB's program schema. Includes overhaul of UI elements for plan creation. See merge request ics/sp/2025/n25b/pepperplus-ui!38	2026-01-07 15:19:46 +00:00
Björn Otgaar	e805c882fe	Merge branch 'refactor/nodes-match-functionality' into feat/recursive-goal-making	2026-01-07 15:51:14 +01:00
Björn Otgaar	35ab95bd35	chore: correct reducing	2026-01-07 15:50:45 +01:00
Björn Otgaar	ad8111d6c2	chore: initial branch commit	2026-01-07 15:44:56 +01:00
Björn Otgaar	4e07b95722	chore: fix specific (new) handles	2026-01-07 15:24:45 +01:00
Björn Otgaar	442df423d1	Merge branch 'demo' into refactor/nodes-match-functionality	2026-01-07 15:15:17 +01:00
Björn Otgaar	bd079a4121	Merge branch 'feat/add-connection-validation-and-limits' into 'demo' feat: added rule based connection validation and connection limits to the editor See merge request ics/sp/2025/n25b/pepperplus-ui!35	2026-01-07 13:32:54 +00:00
Gerla, J. (Justin)	9e7c192804	feat: added rule based connection validation and connection limits to the editor	2026-01-07 13:32:53 +00:00
Björn Otgaar	d2d4dc1242	fix: small fixes for merge	2026-01-07 13:15:46 +01:00
Björn Otgaar	e6b0d7564d	Merge branch 'demo' into refactor/nodes-match-functionality	2026-01-07 13:15:40 +01:00
Gerla, J. (Justin)	6d1c17e77b	Merge branch 'feat/conditional-norm' into 'demo' Conditional Norms See merge request ics/sp/2025/n25b/pepperplus-ui!34	2026-01-07 09:27:23 +00:00
Björn Otgaar	4e9a048c90	Conditional Norms	2026-01-07 09:27:23 +00:00
Björn Otgaar	c13fb7d33d	refactor: change the belief nodes to include a description part	2026-01-06 16:28:41 +01:00
Pim Hutting	0ad2d5935f	Merge branch 'fix/incorrect-phase-reduction-order' into 'demo' fix: incorrect phase reduction order See merge request ics/sp/2025/n25b/pepperplus-ui!33	2026-01-06 15:12:01 +00:00
Gerla, J. (Justin)	9b3414ba98	fix: incorrect phase reduction order	2026-01-06 15:12:00 +00:00
Björn Otgaar	381cb0c822	Merge branch 'demo' into refactor/nodes-match-functionality	2026-01-06 15:51:28 +01:00
Björn Otgaar	0b74763e24	chore: diffewrent semantic placeholder	2026-01-06 15:40:09 +01:00
Björn Otgaar	08374ac2c2	chore: fix the tests with 2 lines	2026-01-06 15:37:36 +01:00
Björn Otgaar	46c2e0ede6	chore: remove belief default text	2026-01-06 15:35:19 +01:00
Pim Hutting	9c80391fea	Merge branch 'feat/basic-belief-nodes' into 'demo' Create a basic belief node that can be used in further stages to create inferred belief and be inputs for other nodes. See merge request ics/sp/2025/n25b/pepperplus-ui!32	2026-01-06 14:29:13 +00:00
Björn Otgaar	f4745c736f	refactor: update the goal node to have a description for plans that need to be checked, and correctly give the value to the CB. ref: N25B-412	2026-01-06 15:28:31 +01:00
Björn Otgaar	508fa48be6	fix: fix the goal node's "can_fail" to have the correct property.	2026-01-06 14:47:56 +01:00
JobvAlewijk	9dae45e398	Merge branch 'feat/make-program-data-available-on-all-pages' into 'demo' feat: made (reduced) program data available on all pages See merge request ics/sp/2025/n25b/pepperplus-ui!36	2026-01-06 12:27:22 +00:00
Gerla, J. (Justin)	bd93b04bfd	feat: made (reduced) program data available on all pages	2026-01-06 12:27:22 +00:00
Björn Otgaar	216b136a75	chore: change goal text, correct output for gestures, allow step specific reducing, fix tests/ add tests for new things	2026-01-05 16:38:06 +01:00
JGerla	111400bd82	fix: fixed scrolling behavior inside editor when plan editor window is opened ref: N25B-412	2026-01-05 15:53:20 +01:00
Björn Otgaar	01d73b777a	chore: fix one test	2026-01-05 10:37:05 +01:00
Björn Otgaar	9f26edb6ec	chore: dont use object, use detected object.	2026-01-05 10:34:45 +01:00
Björn Otgaar	8f1367ed83	chore: emotion dropdown doesnt automatically assign new value	2026-01-05 10:30:29 +01:00
Björn Otgaar	bd2ffe622f	chore: remove old connect function from basic belief	2026-01-05 10:24:08 +01:00
Björn Otgaar	b4df868e26	Merge branch 'demo' into feat/basic-belief-nodes	2026-01-05 10:20:10 +01:00
Björn Otgaar	149b82cb66	feat: create tests, more integration testing, fix ID tests, use UUID (almost) everywhere ref: N25B-412	2026-01-04 18:29:19 +01:00
Björn Otgaar	c5f44536b7	feat: seperation of concerns for gesture value editor, adjusting output of nodes, integration testing, css file changes, and probably much more. ref: N25B-412	2026-01-04 15:18:07 +01:00
Björn Otgaar	444e8b0289	feat: fix a lot of small changes to match cb, add functionality for all plans, add tests for the new plan editor. even more i dont really know anymore. ref: N25B-412	2025-12-17 15:51:50 +01:00
Björn Otgaar	c1ef924be1	feat: create dialog for plan creation in triggers, make sure to bind the correct things in triggers. Change the norms to take one condition, rather than a list. yes, tests are probably still broken. ref: N25B-412	2025-12-16 18:21:19 +01:00
Björn Otgaar	0b29cb5858	chore: remove console log ref: N25B-392	2025-12-16 15:41:30 +01:00
Björn Otgaar	fcc279fb31	Merge branch 'demo' into feat/conditional-norm	2025-12-16 14:55:06 +01:00
Björn Otgaar	709dd28959	fix: fixing the tests ref: N25B-392	2025-12-16 14:52:57 +01:00
Björn Otgaar	099afebe98	test: extra norm tests ref: N25B-392	2025-12-16 14:31:00 +01:00
Pim Hutting	faaf67138d	Merge branch 'feat/norm-critical-checkbox' into 'demo' feat: add critical checkbox to the norm node, send it with the program, add test. See merge request ics/sp/2025/n25b/pepperplus-ui!29	2025-12-16 13:12:59 +00:00
JobvAlewijk	ed2e0ecb7b	Merge branch 'feat/quiet-llm' into 'dev' feat: implemented extra log level for LLM token stream See merge request ics/sp/2025/n25b/pepperplus-ui!30	2025-12-16 11:26:37 +00:00
Luijkx,S.O.H. (Storm)	c25073f20d	feat: implemented extra log level for LLM token stream	2025-12-16 11:26:35 +00:00
Björn Otgaar	8d4c3fc64b	feat: add conditions and beliefs, add tests ref: N25B-392	2025-12-16 12:03:48 +01:00
Björn Otgaar	7925023f25	fix: fix issues ariving from dev merge ref: N25B-408	2025-12-15 14:51:58 +01:00
Björn Otgaar	2faa42bd4c	Merge branch 'dev' into feat/basic-belief-nodes	2025-12-15 14:47:01 +01:00
Björn Otgaar	ae8ef317a4	test: tests for belief node ref: N25B-408	2025-12-15 13:04:53 +01:00
Björn Otgaar	757435e9f8	fix: fix the tests and creation of nodes. ref: N25B-408	2025-12-15 12:09:53 +01:00
Björn Otgaar	f22fe38e22	fix: revert the reduce change for eslint- might be done later in other way ref: N25B-408	2025-12-15 12:01:39 +01:00
Björn Otgaar	9d4f10213e	fix: update the recducer in phases to account for node-specific reducing ref: N25B-408	2025-12-15 11:59:12 +01:00
JobvAlewijk	905b9da815	Merge branch 'fix/edge-disconnections-are-not-reflected-in-reduced-program' into 'dev' fix: edge-disconnections-are-not-reflected-in-reduced-program See merge request ics/sp/2025/n25b/pepperplus-ui!31	2025-12-14 21:56:18 +00:00
Gerla, J. (Justin)	58ab95eee1	fix: edge-disconnections-are-not-reflected-in-reduced-program	2025-12-14 21:56:18 +00:00
Björn Otgaar	10d5a15c88	feat: basic belief node with the basic belief types defined in KB. ref: N25B-408	2025-12-11 14:12:26 +01:00
Björn Otgaar	62c8118650	Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Twirre <s.a.meulenbelt@students.uu.nl>	2025-12-11 09:54:39 +00:00
Björn Otgaar	d5480f957b	Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Twirre <s.a.meulenbelt@students.uu.nl>	2025-12-11 09:54:34 +00:00
Björn Otgaar	062e9e3f38	feat: add critical checkbox to the norm node, send it with the program, add test. ref: N25B-390	2025-12-10 15:38:54 +01:00
Pim Hutting	8149d67491	Merge branch 'fix/deep-clone-data' into 'dev' fix deep cloning bug where phases don't have their own children but store references See merge request ics/sp/2025/n25b/pepperplus-ui!27	2025-12-09 14:55:46 +00:00
JobvAlewijk	647ea1979a	Merge branch 'feat/save-load-nodes' into 'dev' Added loading/savior behaviour + buttons See merge request ics/sp/2025/n25b/pepperplus-ui!24	2025-12-09 14:46:26 +00:00
Pim Hutting	501f56e009	chore: solve merge conflicts with dev ref: N25B-189	2025-12-09 14:21:23 +01:00
JobvAlewijk	ed11680771	Merge branch 'dev' of ssh://git.science.uu.nl/ics/sp/2025/n25b/pepperplus-ui into fix/deep-clone-data	2025-12-07 17:07:00 +01:00
Gerla, J. (Justin)	80aa1fca2b	Merge branch 'test/new-ui-node-tests' into 'dev' test: high coverage for all UI tests See merge request ics/sp/2025/n25b/pepperplus-ui!26	2025-12-07 15:32:20 +00:00
JobvAlewijk	086caea737	test: high coverage for all UI tests	2025-12-07 15:32:20 +00:00
JobvAlewijk	c639a37dfc	Merge branch 'feat/undo-redo-support' into 'dev' feat: added undo and redo functionality See merge request ics/sp/2025/n25b/pepperplus-ui!25	2025-12-07 15:21:59 +00:00
Gerla, J. (Justin)	5e22ed8806	feat: added undo and redo functionality	2025-12-07 15:21:59 +00:00
Twirre Meulenbelt	1bfcfc0458	feat: use input element directly Previously, a button proxy was used which required the use of complicated reference management. Using the HTML `input` element directly simplifies the implementation. Also moved some styles. ref: N25B-189	2025-12-04 12:55:36 +01:00
Björn Otgaar	95397ceccc	fix: fix the tests by simulating user actions rather than the function, and avoid the cyclic dependancy which was present ref: N25B-371	2025-12-04 12:33:27 +01:00
Pim Hutting	e9ea0fb37e	Merge remote-tracking branch 'origin/dev' into feat/save-load-nodes	2025-12-04 11:04:56 +01:00
Pim Hutting	413fb05cd8	chore: applied feedback from merge request Removed all the DOM manipulations and created a utils file so npx eslint is happy. Also changed the tests to test the new version of the code. ref: N25B-189	2025-12-04 09:12:01 +01:00
JobvAlewijk	608bd54617	Merge branch 'feat/ci-cd' into 'dev' Add CI/CD to UI See merge request ics/sp/2025/n25b/pepperplus-ui!28	2025-12-03 15:12:17 +00:00
Björn Otgaar	c167144b4d	fix: fix eslint issues, adjust norm test for dev merge ref: N25B-371	2025-12-03 11:41:14 +01:00
Twirre Meulenbelt	d41a45793f	Merge remote-tracking branch 'origin/dev' into feat/ci-cd	2025-12-03 11:30:12 +01:00
Björn Otgaar	f0c250626f	Merge branch 'dev' into fix/deep-clone-data	2025-12-03 11:29:15 +01:00
Björn Otgaar	d9faeafe32	test: create test for phase node to account for the previous bug. ref: N25B-371	2025-12-03 11:28:15 +01:00
Björn Otgaar	df255a83b6	Merge branch 'feat/send-program' into 'dev' Send program to backend in the latest form See merge request ics/sp/2025/n25b/pepperplus-ui!22	2025-12-02 15:56:27 +00:00
Twirre Meulenbelt	e680ad3195	fix: add `test` script to package.json ref: N25B-366	2025-12-02 16:46:56 +01:00
Twirre Meulenbelt	ea85a05f27	fix: use install artifacts Uses install artifacts in later stages. ref: N25B-366	2025-12-02 16:42:00 +01:00
Twirre Meulenbelt	7d3c63630a	feat: introduce CI/CD runner Installs dependencies, checks style, runs tests. ref: N25B-366	2025-12-02 16:06:14 +01:00
Björn Otgaar	518045ed1c	Merge branch 'dev' into fix/deep-clone-data	2025-12-02 15:06:14 +01:00
Twirre Meulenbelt	3d7997e8d0	feat: introduce git hooks Make installing git hooks easy using Husky. Also, updating the commit message checks. Includes setup instructions in the README. ref: N25B-366	2025-12-02 15:02:48 +01:00
Björn Otgaar	fe13017f2d	test: test for the actual better clone- and make sure we use the JSON stringify and parse for this since tests are weird ref: N25B-371	2025-12-02 14:12:35 +01:00
JobvAlewijk	3bcc865dd8	build: merge dev ref: N25B-189	2025-12-02 12:56:53 +01:00
Björn Otgaar	7640c32830	fix: fix the creation of new phases so that the data is deepcloned instead of referenced	2025-12-02 12:47:38 +01:00
Björn Otgaar	a95fbd15e6	test: create universal tests and rewrite nodes to have optional parameters for more code coverage ref: N25B-362	2025-12-02 12:01:23 +01:00
JobvAlewijk	d4393e7635	test: scroll ref: N25B-292	2025-12-02 11:36:10 +01:00
Twirre Meulenbelt	ff4ee7e111	Merge remote-tracking branch 'origin/dev' into feat/send-program # Conflicts: # src/pages/VisProgPage/visualProgrammingUI/nodes/TriggerNode.tsx	2025-12-02 10:52:48 +01:00
JobvAlewijk	2261da9915	test: robot, and 2 nodes tests added. ref: N25B-292	2025-11-27 18:45:11 +01:00
Björn Otgaar	c5d9b8342d	chore: create new tests for the UI, namely normnode, and one for all nodes	2025-11-27 17:14:19 +01:00
Twirre Meulenbelt	381fdaca1a	fix: re-render TextField when input changes from parent ref: N25B-189	2025-11-27 10:58:09 +01:00
Gerla, J. (Justin)	0ec6f556c9	Merge branch 'docs/ui-documentation' into 'dev' docs: create-and-check-documentation See merge request ics/sp/2025/n25b/pepperplus-ui!23	2025-11-26 13:41:18 +00:00
Arthur van Assenbergh	10a2c0c3cd	docs: create-and-check-documentation	2025-11-26 13:41:18 +00:00
Pim Hutting	5287cb3bf3	Merge remote-tracking branch 'origin/dev' into feat/save-load-nodes	2025-11-26 14:05:38 +01:00
Twirre Meulenbelt	32c8c985c3	chore: more general type required	2025-11-25 11:06:11 +01:00
Twirre Meulenbelt	690880faa4	feat: send program to backend in the latest form ref: N25B-198	2025-11-25 10:55:57 +01:00
JobvAlewijk	f87c7fed03	Merge branch 'refactor/node-encapsulation' into 'dev' Refactoring all nodes functionality into their own files, create a modular framework for the visual programming. See merge request ics/sp/2025/n25b/pepperplus-ui!21	2025-11-20 15:00:00 +00:00
Björn Otgaar	79b645df88	chore: apply suggestions from threads for merge.	2025-11-20 14:53:42 +01:00
Björn Otgaar	1dfc14ede8	chore: remove unused style reference	2025-11-20 14:33:23 +01:00
Björn Otgaar	c84f730782	Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Twirre <s.a.meulenbelt@students.uu.nl>	2025-11-19 17:31:13 +00:00
Björn Otgaar	f892db7be2	Merge branch 'dev' into refactor/node-encapsulation	2025-11-19 10:47:56 +01:00
JobvAlewijk	4f7c730916	Merge branch 'docs/generate-html' into 'dev' Introduce documentation generator See merge request ics/sp/2025/n25b/pepperplus-ui!20	2025-11-19 09:30:54 +00:00
Björn Otgaar	1f70ebd799	chore: remove a single console.log that wasn't needed... :)	2025-11-19 10:21:46 +01:00
Björn Otgaar	f37df1c726	chore: cleanup broken tests, add extra documentation, make sure everything is clean and code style isn't inconsistant	2025-11-19 10:13:08 +01:00
Björn Otgaar	8c2e51114e	chore: delete graph tests that fail	2025-11-18 19:23:25 +01:00
Björn Otgaar	bd7620a182	chore: fix eslints and spelling	2025-11-18 18:49:11 +01:00
Björn Otgaar	bb4e9d0b26	fix: fixed the program reduce algorithm to be flexable and correctly use the different phase variables. ref: N25B-294	2025-11-18 18:47:08 +01:00
Björn Otgaar	0bbb6101ae	refactor: make sure that the droppable styles are kept, update some nodes to reflect their used functionality. ref: N25B-294	2025-11-18 15:36:18 +01:00
Björn Otgaar	3e73e78ee9	chore: merge the rest of the nodes back into this structure, and make sure that start and end nodes are not deletable.	2025-11-18 13:25:13 +01:00
Björn Otgaar	941658a817	Merge branch 'dev' into refactor/node-encapsulation	2025-11-18 12:35:53 +01:00
Twirre Meulenbelt	eabc7c8b04	docs: fix run command ref: N25B-288	2025-11-18 11:45:10 +01:00
Twirre Meulenbelt	000d221538	docs: introduce documentation generator ref: N25B-288	2025-11-18 10:23:45 +01:00
Björn Otgaar	047e22ce4d	chore: very small package fix	2025-11-17 16:15:39 +01:00
Björn Otgaar	35ff58eca8	refactor: defaults should be in their own file, respecting eslint/ react standards. all tests fail, obviously. ref: N25B-294	2025-11-17 16:00:36 +01:00
Björn Otgaar	c5dc825ca3	refactor: Initial working framework of node encapsulation works- polymorphic implementation of nodes in creating and connecting calls correct functions ref: N25B-294	2025-11-17 14:25:01 +01:00
Pim Hutting	96bd1c697c	Merge branch 'feat/show-connected-robots' into 'dev' feat: show connected robots in ui when getting cb pings See merge request ics/sp/2025/n25b/pepperplus-ui!15	2025-11-14 13:09:19 +00:00
JobvAlewijk	476c538464	build: fixed small merge conflict ref: N25B-142	2025-11-14 13:15:11 +01:00
2584433	fe8e04d305	Merge branch 'refactor/improve-orderPhases' into 'dev' refactor: removed unnecessary else blocks in orderPhases See merge request ics/sp/2025/n25b/pepperplus-ui!19	2025-11-14 11:46:44 +00:00
Gerla, J. (Justin)	2f7a48415b	refactor: removed unnecessary else blocks in orderPhases	2025-11-14 11:46:44 +00:00
Gerla, J. (Justin)	e5fee333fb	Merge branch 'feat/editable-norms-and-goals' into 'dev' Make nodes editable: norms, goals and keyword triggers See merge request ics/sp/2025/n25b/pepperplus-ui!18	2025-11-13 10:50:12 +00:00
Twirre	aeaf526797	Make nodes editable: norms, goals and keyword triggers	2025-11-13 10:50:12 +00:00
Gerla, J. (Justin)	f534f0cefa	Merge branch 'feat/logging' into 'dev' Add logging with filters See merge request ics/sp/2025/n25b/pepperplus-ui!16	2025-11-12 14:35:38 +00:00
Twirre	231d7a5ba1	Add logging with filters	2025-11-12 14:35:38 +00:00
Pim Hutting	221fbe42c2	chore: added tests got 50.72% code coverage. Not sure if it is feasible to mock import behaviour ref: N25B-189	2025-11-12 14:29:59 +01:00
Pim Hutting	22da2ca664	feat: added functionality of saving and loadiing for supported browsers, using the File System Access API. otherwise, fallback to download the file and then you can load from download ref: N25B-189	2025-11-12 11:17:15 +01:00
Björn Otgaar	be4fb0e7cd	Merge remote-tracking branch 'origin/dev' into feat/show-connected-robots	2025-11-12 11:05:59 +01:00
Pim Hutting	bb7d24b7be	chore: merge current dev into this branche ref: N25B-189	2025-11-12 09:36:22 +01:00
Pim Hutting	3cbf983b41	fix: save and load are now buttons Really small change so me and Arthur can work on this toegether at the same time feat: N25B-189	2025-11-11 16:32:37 +01:00
Tuurminator69	45e133e255	feat: added temporary dummy button menu ref: N25B-189	2025-11-11 16:05:25 +01:00
Gerla, J. (Justin)	b7eb0cb5ec	Merge branch 'feat/add-naming-component-to-editor-nodes' into 'dev' feat: added basic functionality for editable name bar See merge request ics/sp/2025/n25b/pepperplus-ui!17	2025-11-11 13:50:45 +00:00
Gerla, J. (Justin)	d4d1aecb8c	feat: added basic functionality for editable name bar	2025-11-11 13:50:45 +00:00
Björn Otgaar	87cf723c95	chore: fixed merge request suggestion for adding depency array	2025-11-11 11:42:28 +01:00
Björn Otgaar	df4346150e	chore: remove old code pt 2	2025-11-11 11:11:46 +01:00
Björn Otgaar	8733bb3c04	chore: remove old remnants from project	2025-11-11 10:25:27 +01:00
Björn Otgaar	1b8095376b	fix: fixed npx eslint (also accounting for justins part) ref: N25B-142	2025-11-05 17:21:36 +01:00
Björn Otgaar	571908cd70	Merge remote-tracking branch 'origin/dev' into feat/show-connected-robots	2025-11-05 16:22:46 +01:00
Gerla, J. (Justin)	04818f48d4	Merge branch 'feat/behavior-program-reduction-algorithm' into 'dev' feat: added a behavior program reduction algorithm See merge request ics/sp/2025/n25b/pepperplus-ui!14	2025-11-05 15:21:59 +00:00
Gerla, J. (Justin)	c4845c6738	feat: added a behavior program reduction algorithm	2025-11-05 15:21:59 +00:00
Björn Otgaar	333bd6e6fd	chore: single typing change	2025-11-05 16:11:36 +01:00
Björn Otgaar	5e707224cf	feat: Show connected robots finished with unit test 94% coverage ref: N25B-142	2025-10-30 15:47:09 +01:00
Björn Otgaar	6a88aa3d75	merge branch dev into show-connected-robots pt2	2025-10-30 14:57:50 +01:00
Björn Otgaar	32938edca8	Merge remote-tracking branch 'origin/dev' into feat/show-connected-robots	2025-10-30 14:57:18 +01:00
Björn Otgaar	4181454a73	feat: show robots page easier - quick connected sign. Quick reload - no need for manual reloads or anything. ref: N25B-142	2025-10-30 13:05:56 +01:00
Twirre	52b839ae51	Merge branch 'feat/visual-programming-interface' into 'dev' feat: added ReactFlow-based node graph See merge request ics/sp/2025/n25b/pepperplus-ui!11	2025-10-28 11:59:01 +00:00
JGerla	7b12ae1f5e	test: added test for addNode error added test for addNode error thrown on unexpected node type ref: N25B-114	2025-10-25 21:09:25 +02:00
JGerla	416025bf3f	test: added test for nodeId generation added test for addNode id generation ref: N25B-114	2025-10-25 20:59:41 +02:00
JGerla	9bfc39afa1	test: added test added test for addNode ref: N25B-114	2025-10-25 20:53:09 +02:00
JGerla	e1d6b08a1c	refactor: removed start and end nodes from the addNode functionality as they are not supported for manual adding removed unnecessary code. BREAKING: end and start nodes are no longer supported by the dnd addNode functionality. ref: N25B-114	2025-10-25 18:58:41 +02:00
JGerla	a0324479e6	refactor: removed start and end nodes from the addNode functionality as they are not supported for manual adding removed unnecessary code. BREAKING: end and start nodes are no longer supported by the dnd addNode functionality. ref: N25B-114	2025-10-25 18:41:57 +02:00
JGerla	b7cd925c2c	refactor: moved addNode function outside the handleNode definition Made sure to minimize responsibilities per function, by taking the addNode logic and moving it into its own function. ref: N25B-114	2025-10-25 18:29:53 +02:00
JGerla	e1d131e642	feat: updated the phase node creation to better assign ids to new phase and norm nodes. ref: N25B-114	2025-10-25 18:12:57 +02:00
JGerla	8038674167	test: added tests for deleteNode function ref: N25B-114	2025-10-25 17:13:42 +02:00
JGerla	8c698d1f8e	refactor: moved delete logic out of the toolbar declaration and into the FlowStore. BREAKING: changed type of FlowState ref: N25B-114	2025-10-25 16:58:23 +02:00
JGerla	c8484d28e5	test: added tests for onReconnectEnd ref: N25B-114	2025-10-25 16:03:57 +02:00
JGerla	48dabb86e0	test: updated the onReconnectStart test to reflect updated setupFlowTest.ts ref: N25B-114	2025-10-25 15:37:24 +02:00
JGerla	1f2b57fbcd	chore: updated setupFlowTests.ts to properly handle resetting of the flowState for each test ref: N25B-114	2025-10-25 15:34:49 +02:00
JGerla	2e2bd587d0	test: Added test for onReconnectStart ref: N25B-114	2025-10-25 15:27:50 +02:00
JGerla	42357217e5	test: Added test for onReconnect ref: N25B-114	2025-10-25 15:17:14 +02:00
JGerla	023e1d2b8b	test: Added tests for setNodes and setEdges. ref: N25B-114	2025-10-25 14:59:34 +02:00
JGerla	ea79de5ee5	style: restructured and renamed VisProg.test.tsx to VisProgStores.test.tsx renamed as the functionality being tested is contained within the VisProgStores.tsx file and thus the filename for the tests should reflect that relation, so order is preserved in the project. also added a second describe layer to group the tests for all FlowStore functions together for organisational purposes. ref: N25B-114	2025-10-25 13:57:37 +02:00
JGerla	b64d4fbd01	chore: added test coverage collection updated the jest configuration to generate a coverage report on the entire project when tests are run. this coverage report has been added to the the gitignore file as it is not relevant to store it in the online repository. ref: N25B-114	2025-10-25 13:54:18 +02:00
JGerla	8513be5a56	test: added test for onConnect event ref: N25B-114	2025-10-22 16:30:24 +02:00
JGerla	3bd1aa99e3	chore: added setupFlowTests.ts for ReactFlow specific testing added Setup config for mocking reactflow based on the provided information in ReactFlow documentation ref: N25B-114	2025-10-22 15:43:47 +02:00
JGerla	6a655f62f8	style: moved all logic from VisProgUI.tsx to VisProg.tsx and the css from VisProgUI.module.css to VisProg.module.css. made code easier to navigate, by removing an unnecessary set of files through combining logic into a mostly empty file that is suitable for hosting said logic. BREAKING: removed VisProgUI.module.css and removed VisProgUI.tsx, logic is now in VisProg.module.css and VisProg.tsx respectively ref: N25B-114	2025-10-22 15:12:29 +02:00
JGerla	34dd48ecb6	fix: updated jest.config.js to allow for folders in the test directory ref: N25B-212	2025-10-22 12:39:35 +02:00
JGerla	b365a8754e	style: moved inline styles to VisProgUI.module.css and used some existing classes to replace simple css ref: N25B-114	2025-10-22 12:31:04 +02:00
JGerla	e880e00b6d	style: changed VisProgUI.css to VisProgUI.module.css and updated relevant references ref: N25B-114	2025-10-22 12:12:16 +02:00
Björn Otgaar	ea17b95a53	Merge remote-tracking branch 'origin/dev' into feat/show-connected-robots	2025-10-22 12:00:00 +02:00
JGerla	1f56eff9a8	Merge remote-tracking branch 'origin/feat/visual-programming-interface' into feat/visual-programming-interface	2025-10-22 11:53:50 +02:00
JGerla	d3c327c100	fixup! build: moved dependencies for merge with dev	2025-10-22 11:53:30 +02:00
JGerla	5a6bcb9298	build: moved dependencies for merge with dev ref: N25B-114	2025-10-22 11:51:12 +02:00
JGerla	af7eb5ee73	build: added moved depencies for merge with dev ref: N25B-114	2025-10-22 11:50:29 +02:00
JGerla	f8c152ecfb	Merge remote-tracking branch 'origin/dev' into feat/visual-programming-interface # Conflicts: # package-lock.json	2025-10-22 11:44:10 +02:00
Twirre	6c5ccbdd07	Merge branch 'chore/set-up-testing' into 'dev' chore: set up jest for testing the UI See merge request ics/sp/2025/n25b/pepperplus-ui!13	2025-10-22 07:37:54 +00:00
JGerla	cbacf924f9	chore: added basic jest testing support also added an example test for the counter in the components.tsx file to demonstrate functionality of testing configuration. installed all dependencies for testing using --save-dev to make sure they are stored as dev dependencies ref: N25B-212	2025-10-21 22:18:10 +02:00
JGerla	7e739ef106	refactor: changes from feedback on merge request ref: N25B-114	2025-10-21 20:31:24 +02:00
Gerla, J. (Justin)	9235b82fa9	Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Twirre <s.a.meulenbelt@students.uu.nl>	2025-10-21 11:59:43 +00:00
2584433	b9ea7737b7	Merge branch 'fix/mac-notification-bug' into 'dev' fix: macBug See merge request ics/sp/2025/n25b/pepperplus-ui!12	2025-10-17 14:13:15 +00:00
2584433	dbb38f3e48	fix: macBug	2025-10-17 14:13:15 +00:00
JGerla	5cbcf30f68	feat: added VisProgPage to linked pages in Home.tsx and App.tsx BREAKING: renamed Sidebar to DndToolbar. ref: N25B-114	2025-10-12 13:56:06 +02:00
JGerla	cf77267e95	Merge remote-tracking branch 'origin/dev' into feat/visual-programming-interface # Conflicts: # src/App.tsx # src/pages/Home/Home.tsx # src/pages/TemplatePage/Template.tsx	2025-10-12 13:49:36 +02:00
JGerla	a9effb7c23	style: added comments to code and changed name of Sidebar to DndToolbar BREAKING: renamed Sidebar to DndToolbar. ref: N25B-114	2025-10-12 13:48:42 +02:00
JGerla	bd5887ed9f	style: reformated NodeDefinitions.tsx to be compliant with code standards ref: N25B-114	2025-10-09 17:00:16 +02:00
JGerla	ece94b0b02	style: reformated DragDropSidebar.tsx to be compliant with code standards ref: N25B-114	2025-10-09 16:55:08 +02:00
JGerla	ff8a617c5e	style: reformated VisProgStores.tsx to be compliant with code standards ref: N25B-114	2025-10-09 16:41:32 +02:00
JGerla	40af530fd5	style: reformated VisProg.tsx and VisProgTypes.tsx to be compliant with code standards ref: N25B-114	2025-10-09 16:38:52 +02:00
JGerla	f6fcd20462	refactor: reformated VisProgUI.tsx to be compliant with code standards some inline css was moved to VisProgUI.css ref: N25B-114	2025-10-09 16:35:38 +02:00
Björn Otgaar	fa046e6b2a	feat: dummy reload from CB added. ref: N25B-153	2025-10-08 17:41:29 +02:00
Björn Otgaar	1a0fd92e0f	chore: complete merging with functionality ref: N25B-142 additional comments: The reload from CB doesn't work yet.	2025-10-08 16:49:44 +02:00
JGerla	d0451f1795	style: updated comments and changed order of lines and fixed general inconsistencies in code-style ref: N25B-114	2025-10-08 16:39:56 +02:00
Björn Otgaar	60b925e4e7	chore: merged dev into show-connected-robots ref: N25B-142	2025-10-08 16:37:57 +02:00
JGerla	5b8213d5ef	refactor: moved visualProgrammingUI into page folder BREAKING: moved directory visualProgrammingUI and contents into VisProgPage ref: N25B-114	2025-10-08 16:31:11 +02:00
Björn Otgaar	ae91046a52	Merge branch 'feat/ui2cb-communication' into 'dev' A robot interaction page to send and receive messages from the robot See merge request ics/sp/2025/n25b/pepperplus-ui!10	2025-10-08 14:01:02 +00:00
Twirre Meulenbelt	d8ed8df982	feat: update robot interaction page This page is now fancier, shows messages streaming from the Control Backend. ref: N25B-164	2025-10-08 15:56:34 +02:00
JGerla	47266c4ef0	refactor: improved code style and naming BREAKING: renamed useStore to useFlowStore ref: N25B-114	2025-10-08 15:47:59 +02:00
Twirre Meulenbelt	23cef5206d	chore: merge remote-tracking branch 'origin/dev' into feat/ui2cb-communication ref: N25B-164	2025-10-08 15:40:25 +02:00
JGerla	1a5b1e7617	feat: moved the state handling logic for VisProgUI to a Zustand store all functional logic and state is now contained within a single Zustand store, and removed from the editor component definition ref: N25B-162	2025-10-08 15:19:49 +02:00
Björn Otgaar	3ccfe0bed4	Merge branch 'feat/redo-home-page' into 'dev' Home page improvements & basic CSS See merge request ics/sp/2025/n25b/pepperplus-ui!9	2025-10-08 13:17:48 +00:00
Twirre Meulenbelt	46cc5a087d	feat: basic home page Created a basic home page with links, a header with a link to home, some basic reusable CSS classes. ref: N25B-38	2025-10-08 15:03:44 +02:00
Björn Otgaar	72d61e3985	chore: fixed wrong imports and deleted some unnecessary prints. ref: N25B-142	2025-10-08 14:35:20 +02:00
Twirre	06096ce7d3	Merge branch 'chore/correct-branch-name' into 'dev' Fix branch naming regex pattern See merge request ics/sp/2025/n25b/pepperplus-ui!8	2025-10-08 11:10:46 +00:00
Twirre Meulenbelt	c515f32023	chore: fix branch naming regex pattern The previous pre-commit script allowed only branch names with three words. Should allow one to 6 words. ref: N25B-89	2025-10-08 13:07:47 +02:00
Björn Otgaar	ec4f45b984	fix: Keep the conencted robots in a global list ref: N25B-142	2025-10-08 12:40:01 +02:00
JGerla	59a38a3a12	feat: Updated editor layout to make use of ReactFlow Panel Components moved the draggable node collection inside the editor and attached it to a panel component inside the editor. also modified the css by creating seperate classes for the draggable nodes inside the ui element ref: N25B-114	2025-10-08 12:10:22 +02:00
JGerla	987b5efc3e	Merge remote-tracking branch 'origin/dev' into feat/visual-programming-interface	2025-10-08 11:37:42 +02:00
JGerla	d5c7b4636d	feat: added zustand package to dependencies ref: N25B-114	2025-10-08 11:35:41 +02:00
JGerla	2182e1cdb3	feat: removed option to add a start or end node to the editor Start and End nodes indicate the start and endpoint for program evaluation, for now adding more start points and end points would overcomplicate the initial implementation. Supporting multiple end nodes could be an interesting option to look into later in development. ref: N25B-114	2025-10-08 11:23:50 +02:00
JGerla	d6e78fc978	feat: repositioned Node sidebar to make use of the panel component provided by ReactFlow. ref: N25B-114	2025-10-08 11:14:04 +02:00
JGerla	07e1d84a62	feat: Added allowDelete param to nodeToolbar allowDelete lets developers decide if a nodetype should be deletable and if not it disables the delete button in the nodeToolbar ref: N25B-114	2025-10-08 10:27:34 +02:00
JGerla	705ff3ff2b	fix: changed edgetype to default floating was used as edgetype whilst floating wasn't available, ReactFlow automatically fell back to default. now it is changed to default in the code preventing potential unexpected behavior ref: N25B-114	2025-10-08 09:34:44 +02:00
2584433	f889fad732	Merge branch 'fix/readme-update-correct' into 'dev' readme change See merge request ics/sp/2025/n25b/pepperplus-ui!7	2025-10-07 14:38:32 +00:00
2584433	a9f0a8dabd	readme change	2025-10-07 14:38:31 +00:00
Björn Otgaar	b78cd53baa	feat: Show connected robots in the UI when connection event is received from CB. Added two test buttons to mimic events from CB. UI will listen to port localhost:8000 for data. use the data.event = "robot_connected" and data.event = "robot_disconnected". (robot) ID is required, name and port are optional but incentivized.	2025-10-07 15:05:05 +02:00
Kasper Marinus	2678d35c82	Merge branch 'style/git-automatic-hooks' into 'dev' style: added automatic hooks See merge request ics/sp/2025/n25b/pepperplus-ui!6	2025-10-06 08:00:59 +00:00
2584433	42e4d10c80	style: added automatic hooks	2025-10-06 08:00:59 +00:00
JGerla	4648e77289	fix: removed minimap as not yet intended to be added ref: N25B-114	2025-10-02 13:14:55 +02:00
JGerla	0a4a3fb46c	feat: fixed dark mode compliancy for nodes and background ref: N25B-114	2025-10-02 13:12:01 +02:00
JGerla	70ebb16359	feat: modified css styling for nodes to have different colors per type updated the nodes to have a different colour per NodeType, so it is easier to see what nodes are of what type in the graph. ref: N25B-114	2025-10-02 12:43:44 +02:00
Twirre Meulenbelt	10522b71c3	chore: combined some branches, improved style This demo branch contains code from multiple different branches. DO NOT MERGE this branch because it looks like I'm the author of all these changes.	2025-10-01 22:56:03 +02:00
JGerla	7780878447	feat: added Norm nodes and an extra handle on phase nodes ref: N25B-114	2025-10-01 17:13:55 +02:00
JGerla	1175ba3acc	Merge remote-tracking branch 'origin/feat/visual-programming-interface' into feat/visual-programming-interface # Conflicts: # src/visualProgrammingUI/components/NodeDefinitions.tsx	2025-10-01 15:56:34 +02:00
JGerla	6c22286b28	feat: added delete option to Nodes added a delete option to nodes, nodes now have strongly typed nodeProps to conform to typescript type safety norms. ref: N25B-114	2025-10-01 15:56:07 +02:00
JGerla	f9f5a71c47	feat: added delete option to Nodes added a delete option to nodes, nodes now have strongly typed nodeProps to conform to typescript type safety norms. ref: N25B-114	2025-10-01 15:51:24 +02:00
JGerla	b1b1c83d73	feat: added VisProgUI to a page ref: N25B-114	2025-10-01 14:22:31 +02:00
JGerla	af44d4cdab	Merge remote-tracking branch 'origin/dev' into feat/visual-programming-interface # Conflicts: # src/main.tsx	2025-10-01 14:08:23 +02:00
JobvAlewijk	96053e798a	fix: moved ui2cb communication into server	2025-10-01 14:06:30 +02:00
JobvAlewijk	f25e69718b	fix: merge dev into ui2cb	2025-10-01 13:54:56 +02:00
2584433	83e9f28573	Merge branch 'task/pages-to-navigate' into 'dev' feat: link and directory improvements See merge request ics/sp/2025/n25b/pepperplus-ui!5	2025-10-01 11:49:25 +00:00
JGerla	affdc0c3cd	feat: modified DnD sidebar to provide different node types Modified the drag and drop sidebar to create a node of the correct type instead of creating only default nodes, regardless of specified node types for a respective option. ref: N25B-114	2025-10-01 13:45:20 +02:00
JGerla	9df46c90a3	feat: added drag and drop menu for adding new nodes to flow added a sidebar that supports drag and dropping new nodes from the sidebar into the flow editor. also added a new package (neodrag) for easy draggable behavior outside the reactFlow editor. ref: N25B-114	2025-10-01 13:30:06 +02:00
Björn Otgaar	1d22ea3878	fix: fixed naming for pepper logo	2025-10-01 13:22:58 +02:00
JGerla	85eff77e28	Merge remote-tracking branch 'origin/feat/visual-programming-interface' into feat/visual-programming-interface # Conflicts: # src/visualProgrammingUI/components/NodeDefinitions.tsx	2025-10-01 10:59:33 +02:00
JGerla	79f0827b39	feat: created new nodes and a default nodeType added a type for defaultNodeData, this can house common data that all nodes should have. the other types can build on this defaultData. Also added an endNode and phaseNode to NodeDefinitions.tsx, together with a nodeData type for each new node type. ref: N25B-114	2025-10-01 10:58:43 +02:00
JGerla	54b5935829	feat: created new nodes and a default nodeType added a type for defaultNodeData, this can house common data that all nodes should have. the other types can build on this defaultData. Also added an endNode and phaseNode to NodeDefinitions.tsx, together with a nodeData type for each new node type. ref: N25B-114	2025-10-01 10:55:24 +02:00
JGerla	b991e92c37	feat: changed startNode to use custom type for data changed to startNode file to be a general file for custom node types, and created a custom type for the data property of StartNode. BREAKING: renamed StartNode.tsx to NodeDefinitions.tsx ref: N25B-114	2025-10-01 10:38:35 +02:00
Twirre Meulenbelt	c512739a25	feat: differentiate between SSE messages For spoken text, we have JSON data that can be differentiated from other data. We show this spoken text in a different UI field. ref: N25B-110	2025-10-01 10:17:16 +02:00
Björn Otgaar	427137eae1	feat: added pepper logo and link. ref: N25B-79	2025-09-30 17:48:32 +02:00
JGerla	e098ffebd6	feat: added a custom start node Defined a basic start node; it does not contain any further functionality but does provide a basis for implementing future custom nodes. ref: N25B-114	2025-09-30 16:13:48 +02:00
JobvAlewijk	63f97de164	feat: link and directory improvements Changing pages now happens via Link, directory has gotten a layout change with app becoming a starting point and every page requireing their own .tsx and .css file. Components have also been added where reocurring componennts can be made and reapplied in the project. ref: N25B-96	2025-09-30 16:03:02 +02:00
JGerla	10e5db057b	feat: updated styles of visProgUI Added a rounded outline to the editor and changed the edge to be an arrow so program-flow can be interpreted more easily from the UI. ref: N25B-114	2025-09-30 15:20:16 +02:00
JGerla	0eb5b65f67	feat: Added reconnectable edges Modified edges to support being disconnected and reconnected upon dragging their connection away from the currently connected node. ref: N25B-114	2025-09-30 14:53:53 +02:00
JGerla	e076331cfc	feat: added ReactFlow-based node graph Added ReactFlow to dependencies (@xyflow/react). Added a basic reactflow template to test functionality of reactFlow and to build the visual programming UI on top of. ref: N25B-114	2025-09-30 13:43:48 +02:00
Kasper	c577daa9e6	feat: add basic UI2CB and CB2UI communication By pressing the button, the text in the input field is sent to the CB. Every second, UI receives the current time from CB. ref: N25B-107 ref: N25B-110	2025-09-26 21:39:11 +02:00

Merging dev into main #49

260 Commits