Skip to content

Bluesky plan manager implementation #3481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shroffk merged 9 commits into from
Aug 4, 2025
Merged

Bluesky plan manager implementation #3481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a410710
feat: added ui events for plans and table items
JMit-dev Jul 30, 2025
37c0627
feat: queue item plan creation method
JMit-dev Jul 30, 2025
ea4ad04
feat: plan viewer/editor tab switch and queue item events
JMit-dev Jul 30, 2025
e922bc7
feat: plan manager tab switch controller
JMit-dev Jul 30, 2025
aea6dd9
feat: plan queue controller queue item selection event
JMit-dev Jul 30, 2025
45d4a17
feat: plan viewer and editor
JMit-dev Jul 30, 2025
f3117af
fix: fxml name mismatch
JMit-dev Jul 30, 2025
c1395bd
Merge branch 'ControlSystemStudio:master' into plan-manager
JMit-dev Jul 30, 2025
5e2d635
feat: added xls file support
JMit-dev Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/queue-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,11 @@
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.19.1</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
</project>
26 changes: 21 additions & 5 deletions ...ue-server/src/main/java/org/phoebus/applications/queueserver/client/RunEngineService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ public final class RunEngineService {
/* ---- Ping & status --------------------------------------------------- */

public Envelope<?> ping() throws Exception { return http.call(ApiEndpoint.PING, NoBody.INSTANCE); }
public StatusResponse status() throws Exception {
public StatusResponse status() throws Exception {
LOG.log(Level.FINEST, "Fetching status");
return http.send(ApiEndpoint.STATUS, NoBody.INSTANCE, StatusResponse.class);
return http.send(ApiEndpoint.STATUS, NoBody.INSTANCE, StatusResponse.class);
}
public Envelope<?> configGet() throws Exception { return http.call(ApiEndpoint.CONFIG_GET, NoBody.INSTANCE); }

Expand Down Expand Up @@ -136,6 +136,22 @@ public Envelope<?> queueItemAddBatch(List<QueueItem> items,
public Envelope<?> queueItemAddBatch(QueueItemMoveBatch body ) throws Exception { return http.call(ApiEndpoint.QUEUE_ITEM_ADD_BATCH, body); }
public Envelope<?> queueItemGet(Object params ) throws Exception { return http.call(ApiEndpoint.QUEUE_ITEM_GET, params); }
public Envelope<?> queueItemUpdate(Object b ) throws Exception { return http.call(ApiEndpoint.QUEUE_ITEM_UPDATE, b); }

public Envelope<?> queueItemUpdate(QueueItem item) throws Exception {
Map<String, Object> updateRequest = Map.of(
"item", Map.of(
"item_type", item.itemType(),
"name", item.name(),
"args", item.args(),
"kwargs", item.kwargs(),
"item_uid", item.itemUid()
),
"user", item.user() != null ? item.user() : "GUI Client",
"user_group", item.userGroup() != null ? item.userGroup() : "primary",
"replace", true
);
return queueItemUpdate(updateRequest);
}
public Envelope<?> queueItemRemove(Object b ) throws Exception { return http.call(ApiEndpoint.QUEUE_ITEM_REMOVE, b); }
public Envelope<?> queueItemRemoveBatch(Object b) throws Exception {return http.call(ApiEndpoint.QUEUE_ITEM_REMOVE_BATCH,b); }
public Envelope<?> queueItemMove(Object b ) throws Exception { return http.call(ApiEndpoint.QUEUE_ITEM_MOVE, b); }
Expand Down Expand Up @@ -234,9 +250,9 @@ public Envelope<?> rePause(String option) throws Exception {
/* ---- Permissions & allowed lists ------------------------------------ */

public Envelope<?> plansAllowed() throws Exception { return http.call(ApiEndpoint.PLANS_ALLOWED, NoBody.INSTANCE); }
public Map<String, Object> plansAllowedRaw() throws Exception {
public Map<String, Object> plansAllowedRaw() throws Exception {
LOG.log(Level.FINE, "Fetching plans allowed (raw)");
return http.send(ApiEndpoint.PLANS_ALLOWED, NoBody.INSTANCE);
return http.send(ApiEndpoint.PLANS_ALLOWED, NoBody.INSTANCE);
}
public Envelope<?> devicesAllowed() throws Exception { return http.call(ApiEndpoint.DEVICES_ALLOWED, NoBody.INSTANCE); }
public Envelope<?> plansExisting() throws Exception { return http.call(ApiEndpoint.PLANS_EXISTING, NoBody.INSTANCE); }
Expand Down Expand Up @@ -276,4 +292,4 @@ public Map<String, Object> plansAllowedRaw() throws Exception {
public Envelope<?> whoAmI() throws Exception { return http.call(ApiEndpoint.WHOAMI, NoBody.INSTANCE); }
public Envelope<?> apiScopes() throws Exception { return http.call(ApiEndpoint.API_SCOPES, NoBody.INSTANCE); }
public Envelope<?> logout() throws Exception { return http.call(ApiEndpoint.LOGOUT, NoBody.INSTANCE); }
}
}
Loading