feat: The Big One UI #47

Merged
j.gerla merged 115 commits from temp_screenshot_manual into dev 2026-01-28 08:27:30 +00:00

115 Commits

Author SHA1 Message Date
Twirre Meulenbelt
618bbd3356 chore: fix tests after changing allowed emotions 2026-01-27 17:44:02 +01:00
Twirre Meulenbelt
1708a02b8f chore: remove unused code 2026-01-27 17:23:25 +01:00
Twirre Meulenbelt
e59a8e5a4d chore: fix supported emotions 2026-01-27 17:19:29 +01:00
JGerla
129ee73613 feat: fixed saving warnings staying after loading a new program
ref: N25B-450
2026-01-27 16:55:18 +01:00
JGerla
4e99e7c6e5 feat: small fix to trigger node
ref: N25B-450
2026-01-27 13:33:52 +01:00
JGerla
0ac5a1973c Merge branch 'feat/editor-user-feedback' into temp_screenshot_manual
# Conflicts:
#	src/pages/VisProgPage/VisProg.tsx
#	src/pages/VisProgPage/visualProgrammingUI/nodes/BasicBeliefNode.tsx
2026-01-27 10:57:46 +01:00
JGerla
a85dbeaca6 refactor: adapted to fit the split made in monitoringPage
ref: N25B-450
2026-01-27 10:47:00 +01:00
Pim Hutting
09e6287f9d chore: edited a test to pass 2026-01-26 14:35:46 +01:00
Pim Hutting
8b40001038 Merge branch 'dev' into feat/monitoringpage-pim 2026-01-26 14:22:13 +01:00
JGerla
53568476d5 feat: added warnings to inferredBeliefNodes
ref: N25B-450
2026-01-23 18:30:26 +01:00
JGerla
58bd57818e Merge branch 'dev' into feat/editor-user-feedback
# Conflicts:
#	src/pages/VisProgPage/VisProg.tsx
#	src/pages/VisProgPage/visualProgrammingUI/VisProgStores.tsx
#	src/pages/VisProgPage/visualProgrammingUI/nodes/BasicBeliefNode.tsx
#	src/pages/VisProgPage/visualProgrammingUI/nodes/NormNode.tsx
#	src/pages/VisProgPage/visualProgrammingUI/nodes/TriggerNode.tsx
2026-01-23 18:23:46 +01:00
JGerla
ee79660276 feat: added documentation comments
ref: N25B-450
2026-01-23 18:18:08 +01:00
JGerla
85b84c2281 feat: added visibility toggle with autoHide option
ref: N25B-450
2026-01-23 17:10:48 +01:00
JGerla
820884f8aa fix: updated styles to work with darkMode
ref: N25B-450
2026-01-23 11:45:08 +01:00
JGerla
641d794cf0 fix: updated styles to work with darkMode
ref: N25B-450
2026-01-23 11:42:06 +01:00
JGerla
7757a04694 fix: fixed warning for missing plan in goal
ref: N25B-450
2026-01-22 20:34:48 +01:00
JGerla
2a6ead352d feat: added warning for missing plan in goal
ref: N25B-450
2026-01-22 20:34:20 +01:00
JGerla
274ffb0238 fix: fixed bug with warning rendering in the sidebar
ref: N25B-450
2026-01-22 18:19:36 +01:00
JGerla
a00fd02634 fix: fixed runProgram button being disabled if program is invalid
ref: N25B-450
2026-01-22 17:55:57 +01:00
JGerla
f6b692e420 test: removed test, as it can be tested manually with better accuracy and the test was causing issues instead of verifying functionality
ref: N25B-450
2026-01-22 16:28:36 +01:00
JGerla
2cbd905f0b style: updated comment
ref: N25B-450
2026-01-22 16:18:07 +01:00
JGerla
84d9cbb19d fix: fixed centering for jumptonode from warningSidebar
ref: N25B-450
2026-01-22 16:14:46 +01:00
JGerla
e5b438c17e fix: fixed tests
ref: N25B-450
2026-01-22 14:21:03 +01:00
JGerla
64dcdc49b3 fix: added missing key attribute to the warningListItem
ref: N25B-450
2026-01-22 13:56:35 +01:00
JGerla
9c64455a19 test: added tests for the warningSidebar
ref: N25B-450
2026-01-22 13:54:24 +01:00
JGerla
9f359de953 test: added tests for editorwarnings
ref: N25B-450
2026-01-22 13:31:02 +01:00
JGerla
9d2f5127c1 fix: fixed incorrect warningkey creation in unregisterWarningsForId
ref: N25B-450
2026-01-22 13:09:44 +01:00
JGerla
bb053fda21 feat: added title based tooltips and updated handle styling to reflect in and output handles
ref: N25B-450
2026-01-22 13:04:56 +01:00
JGerla
f92467b409 Merge branch 'dev' into feat/editor-user-feedback 2026-01-22 12:19:20 +01:00
JGerla
c9c7f55aa0 feat: removed usage of structuredClone inside the editorWarningSystem
ref: N25B-450
2026-01-22 12:02:20 +01:00
JGerla
d6d74d4c6b feat: made warnings undo redo safe and added warnings to phase nodes
ref: N25B-450
2026-01-22 11:26:48 +01:00
JGerla
e86c06c3e5 fix: fixed deleting behaviour
ref: N25B-450
2026-01-22 10:26:21 +01:00
Pim Hutting
9a555165e6 Merge branch 'dev' into feat/monitoringpage-pim 2026-01-22 10:19:46 +01:00
Pim Hutting
f73bbb9d02 chore: added tests and removed restart phase
this version also has recursive goals functional
2026-01-22 10:15:20 +01:00
JGerla
363054afda feat: updated visuals
ref: N25B-450
2026-01-20 14:00:01 +01:00
Pim Hutting
883f0a95a6 chore: only check if play is undefined 2026-01-20 13:55:34 +01:00
JGerla
327d1de621 feat: Added visual separation between global and node or handle specific warnings
ref: N25B-450
2026-01-20 12:54:47 +01:00
JGerla
3f6d95683d feat: Added visual separation between global and node or handle specific warnings
ref: N25B-450
2026-01-20 12:50:29 +01:00
Pim Hutting
a8f9965391 chore: added recursive goals to monitor page 2026-01-20 12:31:34 +01:00
JGerla
5d55ebaaa2 feat: Added global warning for incomplete program chain
ref: N25B-450
2026-01-20 11:53:51 +01:00
JGerla
23a02b2b4a Merge branch 'demo' into feat/editor-user-feedback 2026-01-20 11:13:22 +01:00
JGerla
487ee30923 feat: made jumpToNode select the node after focussing the editor
ref: N25B-450
2026-01-20 10:22:08 +01:00
Pim Hutting
2ca0c9c4c0 chore: added Storms change 2026-01-19 18:17:47 +01:00
Pim Hutting
dcc50fd978 feat: implemented basic version of reset phase
right now reset phase also clears LLM

ref: N25B-400
2026-01-18 13:56:47 +01:00
Pim Hutting
2c4f24fbb6 chore: gesture test updated 2026-01-18 12:49:14 +01:00
Pim Hutting
0a243851b1 Merge branch 'feat/monitoringpage-pim' into feat/monitoringpage 2026-01-18 12:40:41 +01:00
Pim Hutting
cada85e253 chore: added tests for monitoringpage
also moved some functions from VisProg outside VisProg.tsx into
VisProgLogic.tsx so I can reuse it for the reset experiment function
of monitor page
Also fixed a small merge error in TriggerNodes.tsx

ref: N25B-400
2026-01-18 12:38:23 +01:00
JobvAlewijk
2aede38e4d feat: 10 basic gestures
ref: N25B-300
2026-01-17 16:09:13 +01:00
Pim Hutting
ab383d77c4 chore: fixed some tests 2026-01-17 16:04:47 +01:00
Pim Hutting
45ef5a353c Merge remote-tracking branch 'origin/feat/add-inferred-belief-node' into feat/monitoringpage 2026-01-16 15:39:20 +01:00
Pim Hutting
d8cae9f838 feat: added reset experiment (in UI)
ref:N25B-400
2026-01-16 14:25:26 +01:00
Pim Hutting
c4e3ab27b2 chore: among other things, fixed connection issue
fix: connection issue
conditional norm now able to undo
 and are updated via pings
goals are able to be achieved out of turn

ref: N25B-400
2026-01-16 12:57:22 +01:00
JGerla
5a9b78fdda feat: added jump to node on clicking the warning
ref: N25B-450
2026-01-15 16:24:08 +01:00
JGerla
a6f24b677f feat: added two new warnings
ref: N25B-450
2026-01-15 16:09:24 +01:00
JGerla
022a6708ea feat: added a Warnings sidebar
warnings are now displayed in the sidebar

ref: N25B-450
2026-01-15 16:04:09 +01:00
JGerla
f62f416af3 Merge remote-tracking branch 'origin/feat/editor-user-feedback' into feat/editor-user-feedback
# Conflicts:
#	src/pages/VisProgPage/VisProg.tsx
2026-01-15 14:23:55 +01:00
JGerla
385ec250cc feat: finished basic warning system
nodes can now register warnings to prevent running the program

ref: N25B-450
2026-01-15 14:23:35 +01:00
JGerla
35bf3ad9e5 feat: finished basic warning system
nodes can now register warnings to prevent running the program

ref: N25B-450
2026-01-15 14:22:50 +01:00
JGerla
66daafe1f0 feat: added disabling of runProgram button if program is not valid
ref: N25B-450
2026-01-15 12:21:09 +01:00
JGerla
5d650b36ce feat: implemented the rest of the warning registry
ref: N25B-450
2026-01-15 12:15:32 +01:00
Pim Hutting
a98a87f8ce refactor: renamed Components.tsx
renamed it to MonitoringPageComponents.tsx

ref: N25B-400
2026-01-15 09:26:40 +01:00
Pim Hutting
714ee34bbe refactor: move all ZMQ to API
also removed a lot of logs to the console to avoid cluttering

ref: N25B-400
2026-01-15 09:24:51 +01:00
Pim Hutting
7d00f35990 feat: made unachieve norm possible
also small fix of formatting keywords said -> keyword said in plan
as we are only able to detect single keywords
(multiple keywords are possible with inferred beliefs)

ref: N25B-400
2026-01-15 09:04:32 +01:00
JGerla
e9acab456e feat: implemented getWarningsBySeverity
ref: N25B-450
2026-01-14 16:59:28 +01:00
JGerla
1a8670ba13 feat: implemented delete all warnings for a node
ref: N25B-450
2026-01-14 16:52:43 +01:00
JGerla
f174623a4c feat: implemented basic add and remove functions
ref: N25B-450
2026-01-14 16:46:50 +01:00
JGerla
b3b77b94ad feat: slightly modified structure for better global logic
ref: N25B-450
2026-01-14 16:11:48 +01:00
JGerla
67558a7ac7 feat: added full definition of editor warning infrastructure
Everything is now defined architecturally, and can be implemented properly.

ref: N25B-450
2026-01-14 16:04:44 +01:00
JGerla
f99ad7ad2e feat: added tooltip and patched potential breaking point in mode toggle for the new node
ref: N25B-433
2026-01-14 13:57:58 +01:00
JGerla
33f520d310 Merge branch 'demo' into feat/add-inferred-belief-node
# Conflicts:
#	src/pages/VisProgPage/VisProg.module.css
#	src/pages/VisProgPage/visualProgrammingUI/NodeRegistry.ts
2026-01-14 13:48:57 +01:00
JGerla
1bec74a078 test: wrote tests for inferred Belief node
ref: N25B-433
2026-01-14 13:47:54 +01:00
JGerla
1f0237baac refactor: moved the nobeliefCyclerule into BeliefGlobals, and fixed function and filenaming
ref: N25B-433
2026-01-14 13:44:59 +01:00
Storm
5e245a00da chore: remove useState import 2026-01-13 12:39:48 +01:00
Storm
1e951968dd Merge remote-tracking branch 'origin/demo' into feat/monitoringpage 2026-01-13 12:39:25 +01:00
Björn Otgaar
108fdeeedc chore: gptd data typing and tests fixing 2026-01-13 12:03:49 +01:00
Björn Otgaar
79d889c10e chore: revert components page, fixing the test 2026-01-13 11:43:24 +01:00
Björn Otgaar
bac94d5f8c chore: remove unused imports 2026-01-13 11:41:58 +01:00
JGerla
3d6e065dd5 feat: added rule to prevent one belief being connected to both inferredBelief inputs
ref: N25B-433
2026-01-13 11:32:23 +01:00
JGerla
f8f0f12128 style: added documentation to the InferredBelief Node
ref: N25B-433
2026-01-13 09:26:02 +01:00
JGerla
2d9f430a30 style: cleaned up code for InferredBeliefNode.tsx
ref: N25B-433
2026-01-13 08:59:34 +01:00
JGerla
f8acdda03c feat: added rule to prevent cyclical connections between inferred belief nodes
ref: N25B-433
2026-01-13 08:52:50 +01:00
Pim Hutting
f95b1148d9 chore: made last page access more sensible
still didnt work with CB

ref: N25B-400
2026-01-13 00:53:41 +01:00
Pim Hutting
46d900305a chore: made activatable elements clickable
ref: N25B-400
2026-01-12 19:41:05 +01:00
Pim Hutting
c4a4c52ecc Merge remote-tracking branch 'origin/feat/recursive-goal-making' into feat/monitoringpage 2026-01-12 17:16:52 +01:00
JGerla
b869f7c071 feat: added reduce and connection logic
A rule still needs to be added to the inferred belief handles to prevent cyclical inferredBeliefs, but aside from that logic ifs finished.

ref: N25B-433
2026-01-12 16:44:25 +01:00
JGerla
0a4940bdd0 feat: made a basic version of inferredBeliefNode without all functionality
full reduce and connection logic is still missing

ref: N25B-433
2026-01-12 15:34:44 +01:00
Pim Hutting
96242fa6b0 chore: fix connection error
was connected to wrong endpoint after merge

ref: N25B-400
2026-01-12 15:17:38 +01:00
Pim Hutting
c2486f5f43 Merge branch 'feat/monitoringpage-pim' into feat/monitoringpage 2026-01-12 13:04:15 +01:00
Pim Hutting
f0c67c00dc fix: update goals and trigger/norms.. correctly
feat: N25B-400
2026-01-12 12:49:00 +01:00
Björn Otgaar
a0a4687aeb chore: add support for dark mode in monitoring page 2026-01-10 12:14:37 +01:00
Pim Hutting
71443c7fb6 feat: added scroll bar to simple program
note that it will take quite a lot of items
for the simple prog to be filled up, only when it's
overflown the scroll bar will appear

ref: N25B-400
2026-01-08 15:19:38 +01:00
Pim Hutting
39f013c47f feat: goals now update in UI
ref: N25B-400
2026-01-08 14:51:02 +01:00
Björn Otgaar
6e1eb25bbc feat: add robot connection
ref: N25B-400
2026-01-08 14:01:42 +01:00
Pim Hutting
f2c01f67ac feat: small implementation change
ref: N25B-400
2026-01-08 11:26:31 +01:00
Pim Hutting
14cfc2bf15 fix: removed unused imports
ref: N25B-400
2026-01-08 11:01:19 +01:00
Pim Hutting
a2b4847ca4 Merge remote-tracking branch 'origin/demo' into feat/monitoringpage-pim 2026-01-08 09:54:48 +01:00
Björn Otgaar
a1e242e391 feat: added the functionality for the play, pause, next phase, reset phase, reset experiment buttons
ref: N25B-400
2026-01-07 18:31:56 +01:00
Pim Hutting
4356f201ab feat: added endpoint
ref:N25B-400
2026-01-07 17:39:20 +01:00
Björn Otgaar
c9df87929b feat: add the buttons for next, reset phase and reset experiment
ref: N25B-400
2026-01-07 15:09:44 +01:00
Björn Otgaar
57ebe724db Merge remote-tracking branch 'origin/feat/monitoringpage-pim' into feat/monitoringpage-bjorn 2026-01-07 11:55:20 +01:00
Björn Otgaar
794e638081 feat: start with functionality
ref: N25B-400
2026-01-07 11:54:29 +01:00
Pim Hutting
12ef2ef86e feat: added forced speech/gestures +overrides
ref: N25B-400
2026-01-06 15:15:36 +01:00
Tuurminator69
0fefefe7f0 feat: removed the temporary access to MP from Home
ref: N25B-398
2026-01-05 17:41:36 +01:00
Tuurminator69
9601f56ea9 feat: merged most of simpleprogram into MP
ref: N25B-398
2026-01-05 17:35:32 +01:00
Tuurminator69
873b1cfb0b Merge branch 'feat/simple-program-page' of git.science.uu.nl:ics/sp/2025/n25b/pepperplus-ui into feat/monitoringpage 2026-01-05 16:41:51 +01:00
Tuurminator69
4bd67debf3 feat: added and changed the monitoringpage a lot
ref: N25B-398
2026-01-04 20:07:44 +01:00
Tuurminator69
e53e1a3958 feat: can go to a skeleton monitoringpage
ref: N25B-398
2026-01-03 21:59:51 +01:00
Tuurminator69
7a89b0aedd feat: added a skeleton for the monitoringpage.
ref: N25B-398
2026-01-03 21:07:32 +01:00
JobvAlewijk
7b05c7344c feat: added tests
ref: N25B-399
2026-01-02 21:06:41 +01:00
JobvAlewijk
d80ced547c feat: SimpleProgram no longer relies on types
ref: N25B-399
2026-01-02 20:55:24 +01:00
JobvAlewijk
cd1aa84f89 feat: using programstore
ref: N25B-399
2026-01-02 20:43:20 +01:00
JobvAlewijk
469a6c7a69 build: merge
ref: N25B-402
2026-01-02 19:56:01 +01:00
JobvAlewijk
b0a5e4770c feat: improved visuals and structure
ref: N25B-402
2025-12-30 20:56:05 +01:00
JobvAlewijk
f0fe520ea0 feat: first version of simple program shown
shows up if you run the program

ref: N25B-405
2025-12-30 18:10:51 +01:00
JGerla
b10dbae488 test: added tests for the ProgramStore
also added documentation

ref: N25B-428
2025-12-20 22:58:22 +01:00