i15-1: display the queue from the daq-queue-service by noemifrisina · Pull Request #45 · DiamondLightSource/atlas

noemifrisina · 2026-05-27T15:40:54Z

Fixes #23 and https://jira.diamond.ac.uk/browse/I15_1-1625

DominicOram

Looks like a great start, thank you. I think we should probably see if @zoharma and @douglaswinter have opinions too. Some comments in code. Additionally, my initial thoughts on the look/feel, feel free to spin into new issues/PR given the size of this PR already:

Should: There's no feedback when we can't connect to the queue, it just says it's running
Should: I don't really think ID is useful to be user facing
Should: The pause will pause after the next task in the queue is finished, I think it would be good to rename it to make that more obvious
Should: This PR includes stuff for the abort button, we should probably have the same button on the queue page (in fact maybe everywhere)
Could: It would be nicer if the drag and drop was entirely disabled for the current/past tasks so its more obvious you can't do it
Could: If there's nothing in the queue then having it saying it's running is a bit odd, maybe "Queue finished"?
Could: I think some tooltips on the column headers would be good
Nit: You can filter by the action column, this doesn't really make much sense
Nit: Status is an enum but when you filter by it you put in a string, might be nicer if the filter was an enum

DominicOram · 2026-06-01T17:15:46Z

+
+export type TaskStatus =
+  | "Waiting"
+  | "Claimed"


How do I trigger a claimed state in the queue?

This is leftover from before the queue refactor, I need to remove that type now as the correct one exists in generated/. Tasks can now only have the following status:

class Status(StrEnum): QUEUED = "Queued" IN_PROGRESS = "In progress" COMPLETE = "Complete" CANCELLED = "Cancelled"

Blueapi calls can be claimed though. This represents the time when the worker has popped the call from the queue but blueapi hasn't started running it yet. A task's status is derived from the status of the blueapi calls it has produced, so both a claimed and in_progress blueapi call make its parent task in_progress.

class CallStatus(StrEnum): WAITING = "Waiting" # Waiting in the queue CLAIMED = "Claimed" # Claimed by the worker IN_PROGRESS = "In progress" # In progress inside BlueAPI SUCCESS = "Success" # Completed successfully ERROR = "Error" # Error while trying to run

DominicOram · 2026-06-01T17:19:58Z

+  sampleId: string;
+  planRunning: string;
+  parameters: string;
+  //   parameters: PlanParameters;


Should: Remove commented out code

DominicOram · 2026-06-01T17:22:54Z

+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+
+// const QUEUE_SOCKET: string = "/api/daq-queue";
+const QUEUE_SOCKET: string = "http://127.0.0.1:8001";


Must: Can we have some way of generically configuring this so that it works for testing and prod

Have added an env variable to toggle between these, which also turns mock service worker on/off.

DominicOram · 2026-06-01T17:29:26Z

+    enableRowDragging: true,
+    enableSorting: false,
+    muiRowDragHandleProps: ({ table }) => ({
+      onDragEnd: () => {


Should: I think some tests on the logic here would be good.

douglaswinter · 2026-06-02T08:34:37Z

Two top-level comments/questions: 1) How does this view relate to the design in Figma? 2) Echoing Dom's comment, we need tests for this, both plain unit tests for your queries and logic, and RTL tests for the rendering.

jacob720 · 2026-06-04T16:35:50Z

It's getting iteratively closer to the figma design, but still some differences:

Task params are all listed as a string rather than in individual columns as per the design i15-1: Investigate best way to display task params in queue #52
Currently can't get estimated run time from blueapi so run time, progress columns don't yet exist
Currently have a toggle to show historic tasks instead of having tabs for future, historic, all, tasks
Currently tasks can always be re-ordered, there's a toggle in the design
Can't select tasks to perform actions on them - there's just a cancel button
The pause/resume queue button and queue status text look a bit different to the design

In the interest of getting this merged + deployed asap, so the scientists can have a play around with it, I can spin these into separate issues to fix in future?

jacob720 · 2026-06-08T10:17:46Z

I've now added some tests. I've put the remaining comments from @DominicOram in a new issue: #56

zoharma · 2026-06-08T11:11:32Z

I'm adding all my comments, although some may be split to further issues and PRs:

Statuses should be small, and use outline by default (unless specifically needed to be filled - TBD).
Hide "Density" and "Full screen" buttons.
Hide "Actions" header actions and action-menu (no need to hide or filter for it).

Questions:

Can we show plan parameters as [Label: Value] list or expanded list in a different way? not showing the curly brackets?
Do we need "Sort order" on this? Or is it always to be shown by position order?
What does "Cancel" do? Can we rename to more explicit?

For later:

Sort should be hidden and activated on mode "Sort table" button, saved automatically, with an Exit button (this is so we don't have accidental ordering).
Spacing needs to be looked at. The default density to too big, and the small one is too tight. Need to tighten it slightly. I need to understand how the spacing works in MRT, not sure if this is done by changibg padding or the line size of object within. Also, action columns have smaller padding by default.

jacob720 · 2026-06-10T11:25:33Z

Can we show plan parameters as [Label: Value] list or expanded list in a different way? not showing the curly brackets?

Yeah I'll look into displaying this more nicely, see #52

Do we need "Sort order" on this? Or is it always to be shown by position order?

I think not, as I can't think of a case where you wouldn't want it to display in position order

What does "Cancel" do? Can we rename to more explicit?

This removes the task from the queue. Happy to rename it to something else, maybe Remove?

DominicOram

Thanks, good work! I'm still trying to get my head around react but this looks good. Couple of comments in code, additionally when I try and display historic tasks when running in mock mode I get an error

DominicOram · 2026-06-10T10:54:24Z

@@ -0,0 +1,9 @@
+{
+  "features": {


Should: Can you remove this and add to the .gitignore?

DominicOram · 2026-06-10T10:57:24Z

+import type { QueuedTasks } from "./tasks";
+
+const QUEUE_MODE = import.meta.env.VITE_QUEUE_MODE;
+const QUEUE_SOCKET: string =


Should: Can you add a link into #59 to tidy this up

DominicOram · 2026-06-10T10:59:09Z

@@ -0,0 +1,30 @@
+import type { TaskWithPosition } from "./generated";
+
+// Temporary parameters to see if things work in the first instance


Should: Can you link to an issue describing what we need to do to make this less temporary?

I don't think we need this now that I've generated typed from the queue API. I've deleted this

DominicOram · 2026-06-10T13:19:35Z

+    enableSorting: false,
+    enableDensityToggle: false,
+    enableFullScreenToggle: false,
+    muiRowDragHandleProps: ({ row, table }) => {


Could: Would be nice to test some of this dragging but I suspect that's a PITA

There's a test for calculateNewPosition

Sure but it would be nicer to have one on the control itself that we can move things around. It's no big deal though

DominicOram

Thanks, I tidied up the mocks a bit more. Just the one comment now

DominicOram · 2026-06-12T09:21:13Z


    - id: daq-queue
-      path: /api/daq-queue/
+      path: /api/blueapi/


Must: Is this right? I think we want the queue on different endpoints to blueapi? If not then we will need to change the endpoints in the code?

Discussed in person, this was just a typo, I will correct

DominicOram

Looks good to me. I think there's a few niggles but we should get this in now and iterate

DominicOram requested changes Jun 1, 2026

View reviewed changes

jacob720 force-pushed the 1625-display-queue branch 2 times, most recently from 6a0c321 to a839a06 Compare June 2, 2026 12:16

jacob720 force-pushed the 1625-display-queue branch from 0b3f29c to 468ae62 Compare June 4, 2026 16:47

jacob720 requested a review from DominicOram June 8, 2026 10:16

jacob720 mentioned this pull request Jun 8, 2026

i15-1: Improvements to the queue UI #56

Open

5 tasks

jacob720 marked this pull request as ready for review June 8, 2026 10:21

DominicOram mentioned this pull request Jun 10, 2026

Add vitest capability and tests to i15-1 #23

Closed

noemifrisina and others added 18 commits June 10, 2026 10:17

Save example queue - does not return to robot page for some reason

628e71d

Add daq queue to helm chart

f90ab19

Save basic query for interrogating the queue

1cc9276

A first displayed queue

c0a9717

Tidy up and add colour to chips

7d9d847

Display plan parameters as a string and add a comment about it

766ac30

Fix typing in test

ff7585e

Actually save the patch queue state

f0bbc56

Add generated types from queue fastapi

8423d9f

Update generated queue types

19f7ee6

Add script to generate queue types

a8a0161

Update mock data

0e7c48e

Add pause queue toggle button

380459a

Use SSE to get event driven updates

ef8f904

Add button to cancel tasks

4842f66

Allow re-ordering of tasks

c00f0be

Add toggle to show historic tasks and button to delete history

9165e79

Fix move task logic

1c957fc

jacob720 added 8 commits June 10, 2026 10:31

Make queue pause button smaller

6ea2328

Add tests for QueueView

a8b173a

Put move logic in a helper function

e9bbded

Add test for new position calculation

766aec7

Fix lint

03c13b8

Fix bug

3b54cb1

Fix some lint issues

bfdf52b

PR comments

a9b726e

jacob720 force-pushed the 1625-display-queue branch from c0c0253 to a9b726e Compare June 10, 2026 10:33

jacob720 and others added 5 commits June 10, 2026 10:37

Fix lockfile

b1660b3

Merge branch 'main' into 1625-display-queue

15b20d1

Fix lint in tests

fcf191f

Move generated folder

9e29162

Ignore lint for generated code

ffa221a

DominicOram requested changes Jun 10, 2026

View reviewed changes

jacob720 added 3 commits June 10, 2026 14:50

Try to fix deployed UI

5f1f547

Revert unneeded fix

25ce7bc

Remove .devcontainer/devcontainer-lock.json

14be2f3

jacob720 mentioned this pull request Jun 11, 2026

Create a system test environment #59

Open

PR comments

198474d

jacob720 requested a review from DominicOram June 11, 2026 13:56

Fix the mocks for the history of the queue

47d17f1

DominicOram requested changes Jun 12, 2026

View reviewed changes

Fix typo for endpoint

92151ca

DominicOram approved these changes Jun 12, 2026

View reviewed changes

DominicOram merged commit acb50b2 into main Jun 12, 2026
2 checks passed

DominicOram deleted the 1625-display-queue branch June 12, 2026 09:38

DominicOram mentioned this pull request Jun 12, 2026

Autogenerate schema types from supgergraph.graphql #68

Merged

DominicOram mentioned this pull request Jun 22, 2026

Tidy up testing against a local BlueAPI/DAQ queue #85

Closed

		@@ -0,0 +1,30 @@
		import type { TaskWithPosition } from "./generated";

		// Temporary parameters to see if things work in the first instance

Uh oh!

Conversation

noemifrisina commented May 27, 2026 • edited by DominicOram Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DominicOram left a comment • edited by jacob720 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jacob720 Jun 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

douglaswinter commented Jun 2, 2026

Uh oh!

jacob720 commented Jun 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jacob720 commented Jun 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zoharma commented Jun 8, 2026 • edited by jacob720 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jacob720 commented Jun 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DominicOram left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DominicOram left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DominicOram left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

noemifrisina commented May 27, 2026 •

edited by DominicOram

Loading

DominicOram left a comment •

edited by jacob720

Loading

jacob720 Jun 2, 2026 •

edited

Loading

jacob720 commented Jun 4, 2026 •

edited

Loading

jacob720 commented Jun 8, 2026 •

edited

Loading

zoharma commented Jun 8, 2026 •

edited by jacob720

Loading

jacob720 commented Jun 10, 2026 •

edited

Loading