From c0e134981cb494f12c72fbbd3e5c4de513327520 Mon Sep 17 00:00:00 2001 From: Kostya Date: Tue, 13 Oct 2026 13:14:50 +0300 Subject: ui-fx: support running as one logged-in user of a server The shared UI assumed the whole market was local: it showed nothing until a file was loaded, let the user act as anyone in the list and offered to create events by hand. None of that holds for a client of a shared server. AppState and AppView now take an optional session user. When it is set: - the tabs show from the start, since other users' events are there whether or not we loaded a file ourselves; - the acting user is fixed, and the user list becomes a directory of the other users with their balance and role; - the buttons that create events are hidden, and the Users tab gets a Deposit Funds button with a small dialog; - loading a file skips the two-second pause Ex2 asked for. Without a session user everything behaves as before. Also keep the event's Trade and Close buttons from collapsing to an ellipsis when the description is long. --- .../java/market/guess/ui/desktop/AppState.java | 20 +++++++ .../main/java/market/guess/ui/desktop/AppView.java | 11 +++- .../guess/ui/desktop/components/ModalDialog.java | 3 +- .../ui/desktop/controllers/AppController.java | 42 ++++++++++++-- .../controllers/DepositDialogController.java | 64 ++++++++++++++++++++++ .../desktop/controllers/EventsTabController.java | 3 + .../ui/desktop/controllers/UsersTabController.java | 23 ++++++++ .../guess/ui/desktop/task/InitialLoadTask.java | 6 +- 8 files changed, 164 insertions(+), 8 deletions(-) create mode 100644 ui-fx/src/main/java/market/guess/ui/desktop/controllers/DepositDialogController.java (limited to 'ui-fx/src/main/java/market') diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/AppState.java b/ui-fx/src/main/java/market/guess/ui/desktop/AppState.java index 728d4e8..b116833 100644 --- a/ui-fx/src/main/java/market/guess/ui/desktop/AppState.java +++ b/ui-fx/src/main/java/market/guess/ui/desktop/AppState.java @@ -45,6 +45,7 @@ public final class AppState { private final CatalogContext catalogContext; private final GuessMarketContext marketContext; private final AccountContext accountContext; + private final String sessionUser; private final StringProperty loadedFile = new SimpleStringProperty(null); @@ -88,9 +89,19 @@ public final class AppState { CatalogContext catalogContext, GuessMarketContext marketContext, AccountContext accountContext) { + this(catalogContext, marketContext, accountContext, null); + } + + public AppState( + CatalogContext catalogContext, + GuessMarketContext marketContext, + AccountContext accountContext, + String sessionUser) { this.catalogContext = catalogContext; this.marketContext = marketContext; this.accountContext = accountContext; + this.sessionUser = sessionUser; + actingUserName.set(sessionUser); selectedEventId.addListener((obs, oldVal, newVal) -> updateSelectedEvent()); events.addListener((ListChangeListener) c -> updateSelectedEvent()); @@ -302,6 +313,9 @@ public final class AppState { boolean isMm = allEvents.stream().anyMatch(e -> e.mm != null && acc.owner().equalsIgnoreCase(e.mm)); String role = isMm ? "Market Maker" : "Trader"; + if (acc.owner().equalsIgnoreCase(sessionUser)) { + role += " (you)"; + } UserData u = new UserData(acc.owner(), role, bal, acc.blocked(), isMm); @@ -442,6 +456,10 @@ public final class AppState { actingUser.set(u); } + public boolean isRemote() { + return sessionUser != null; + } + public CatalogContext getCatalogContext() { return catalogContext; } @@ -514,6 +532,7 @@ public final class AppState { } public void setActingUserName(String name) { + if (isRemote()) return; this.actingUserName.set(name); } @@ -530,6 +549,7 @@ public final class AppState { } public void setActingUser(UserData u) { + if (isRemote()) return; this.actingUser.set(u); if (u != null) { this.actingUserName.set(u.name); diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/AppView.java b/ui-fx/src/main/java/market/guess/ui/desktop/AppView.java index b17d3a8..665c9ef 100644 --- a/ui-fx/src/main/java/market/guess/ui/desktop/AppView.java +++ b/ui-fx/src/main/java/market/guess/ui/desktop/AppView.java @@ -34,11 +34,20 @@ public final class AppView { CatalogContext catalogContext, GuessMarketContext marketContext, AccountContext accountContext) { + this(stage, catalogContext, marketContext, accountContext, null); + } + + public AppView( + Stage stage, + CatalogContext catalogContext, + GuessMarketContext marketContext, + AccountContext accountContext, + String sessionUser) { this.stage = stage; this.catalogContext = catalogContext; this.marketContext = marketContext; this.accountContext = accountContext; - this.state = new AppState(catalogContext, marketContext, accountContext); + this.state = new AppState(catalogContext, marketContext, accountContext, sessionUser); stage.initStyle(StageStyle.TRANSPARENT); initScene(); } diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/components/ModalDialog.java b/ui-fx/src/main/java/market/guess/ui/desktop/components/ModalDialog.java index 21865a5..e2ed363 100644 --- a/ui-fx/src/main/java/market/guess/ui/desktop/components/ModalDialog.java +++ b/ui-fx/src/main/java/market/guess/ui/desktop/components/ModalDialog.java @@ -4,5 +4,6 @@ public enum ModalDialog { NONE, LOAD, CREATE_EVENT, - RESOLVE + RESOLVE, + DEPOSIT } diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/controllers/AppController.java b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/AppController.java index 416770e..e544200 100644 --- a/ui-fx/src/main/java/market/guess/ui/desktop/controllers/AppController.java +++ b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/AppController.java @@ -85,6 +85,8 @@ public class AppController { @FXML private CreateEventDialogController createEventDialogController; @FXML private Node resolveDialog; @FXML private ResolveDialogController resolveDialogController; + @FXML private Node depositDialog; + @FXML private DepositDialogController depositDialogController; private Node currentlyActiveContent; @@ -95,6 +97,8 @@ public class AppController { createEventDialogController.setOnCreate((CreateEventRequest req) -> createEvent(req)); resolveDialogController.setOnCancel(this::closeDialog); resolveDialogController.setOnConfirm(this::resolveEvent); + depositDialogController.setOnCancel(this::closeDialog); + depositDialogController.setOnConfirm(this::deposit); } public void init(AppView appView) { @@ -150,6 +154,7 @@ public class AppController { usersTabController.setOnCreateNewEvent(this::openCreateEventDialog); usersTabController.setOnToast(this::toast); usersTabController.setOnPlaceOrder(this::placeOrder); + usersTabController.setOnDeposit(this::openDepositDialog); } private void setupStateBindings() { @@ -273,7 +278,7 @@ public class AppController { var state = getState(); if (state == null) return; - boolean showEmpty = (state.getLoadedFile() == null); + boolean showEmpty = (state.getLoadedFile() == null) && !state.isRemote(); boolean showEvents = !showEmpty && (state.getActiveTab() == AppTab.EVENTS); boolean showUsers = !showEmpty && (state.getActiveTab() == AppTab.USERS); @@ -308,10 +313,13 @@ public class AppController { var state = getState(); if (state == null || statusBarLabel == null) return; - if (state.getLoadedFile() == null) { + if (state.getLoadedFile() == null && !state.isRemote()) { statusBarLabel.setText(" IDLE  "); } else { - String fileName = Paths.get(state.getLoadedFile()).getFileName().toString(); + String fileName = + state.isRemote() + ? state.getActingUserName() + : Paths.get(state.getLoadedFile()).getFileName().toString(); statusBarLabel.setText( "  " + fileName @@ -342,6 +350,10 @@ public class AppController { boolean isResolve = (state.getDialog() == ModalDialog.RESOLVE); resolveDialog.setVisible(isResolve); resolveDialog.setManaged(isResolve); + + boolean isDeposit = (state.getDialog() == ModalDialog.DEPOSIT); + depositDialog.setVisible(isDeposit); + depositDialog.setManaged(isDeposit); } private void updateToastOverlay() { @@ -427,7 +439,8 @@ public class AppController { state.setPendingFile(picked.getAbsolutePath()); var loadTask = - new InitialLoadTask(appView.getCatalogContext(), Paths.get(state.getPendingFile())); + new InitialLoadTask( + appView.getCatalogContext(), Paths.get(state.getPendingFile()), !state.isRemote()); this.currentLoadTask = loadTask; loadTask.setOnRunning( @@ -505,6 +518,27 @@ public class AppController { state.setDialog(ModalDialog.RESOLVE); } + public void openDepositDialog() { + depositDialogController.reset(); + appView.getState().setDialog(ModalDialog.DEPOSIT); + } + + public void deposit(String amount) { + var state = appView.getState(); + var user = state.getActingUserName(); + async( + () -> appView.getAccountContext().deposit(user, amount), + res -> { + if (res.isSuccess()) { + state.refreshData(); + state.setDialog(ModalDialog.NONE); + toast("Deposited " + Format.money(new BigDecimal(amount))); + } else { + toast("Deposit failed: " + res.getDetails()); + } + }); + } + public void createEvent(CreateEventRequest req) { var state = appView.getState(); state.setCreateType(req.mechanism()); diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/controllers/DepositDialogController.java b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/DepositDialogController.java new file mode 100644 index 0000000..8cd531f --- /dev/null +++ b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/DepositDialogController.java @@ -0,0 +1,64 @@ +package market.guess.ui.desktop.controllers; + +import java.math.BigDecimal; +import java.util.function.Consumer; +import javafx.css.PseudoClass; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.TextField; + +public class DepositDialogController { + private static final PseudoClass ERROR = PseudoClass.getPseudoClass("error"); + + private Runnable onCancel; + private Consumer onConfirm; + + @FXML private TextField amountField; + @FXML private Button confirmBtn; + + @FXML + private void initialize() { + amountField + .textProperty() + .addListener( + (obs, o, n) -> { + confirmBtn.setDisable(!isValid(n)); + amountField.pseudoClassStateChanged(ERROR, !n.isBlank() && !isValid(n)); + }); + } + + static boolean isValid(String amount) { + try { + return new BigDecimal(amount.trim()).signum() > 0; + } catch (NumberFormatException e) { + return false; + } + } + + public void setOnCancel(Runnable onCancel) { + this.onCancel = onCancel; + } + + public void setOnConfirm(Consumer onConfirm) { + this.onConfirm = onConfirm; + } + + public void reset() { + amountField.clear(); + amountField.requestFocus(); + } + + @FXML + private void handleCancel() { + if (onCancel != null) { + onCancel.run(); + } + } + + @FXML + private void handleConfirm() { + if (onConfirm != null && isValid(amountField.getText())) { + onConfirm.accept(amountField.getText().trim()); + } + } +} diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/controllers/EventsTabController.java b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/EventsTabController.java index e71be40..06e6780 100644 --- a/ui-fx/src/main/java/market/guess/ui/desktop/controllers/EventsTabController.java +++ b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/EventsTabController.java @@ -47,6 +47,7 @@ public class EventsTabController { private Graphic equalizer; private boolean updatingSelection = false; + @FXML private Button newEventBtn; @FXML private Button methodFilterAllBtn; @FXML private Button methodFilterLmsrBtn; @FXML private Button methodFilterObBtn; @@ -113,6 +114,8 @@ public class EventsTabController { public void init(AppState state) { this.state = state; + newEventBtn.setVisible(!state.isRemote()); + newEventBtn.setManaged(!state.isRemote()); equalizer = EqualizerGraphic.create(); liveBarsBox.getChildren().setAll(equalizer.getNode()); diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/controllers/UsersTabController.java b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/UsersTabController.java index 6211337..f5c787b 100644 --- a/ui-fx/src/main/java/market/guess/ui/desktop/controllers/UsersTabController.java +++ b/ui-fx/src/main/java/market/guess/ui/desktop/controllers/UsersTabController.java @@ -3,6 +3,7 @@ package market.guess.ui.desktop.controllers; import java.math.BigDecimal; import java.util.ArrayList; import java.util.function.Consumer; +import javafx.application.Platform; import javafx.collections.ListChangeListener; import javafx.css.PseudoClass; import javafx.fxml.FXML; @@ -47,11 +48,14 @@ public class UsersTabController { private Runnable onCreateNewEvent; private Consumer onToast; private OrderPlacer onPlaceOrder; + private Runnable onDeposit; private Graphic sparkline; private boolean updatingSelection = false; @FXML private StackPane sparklineBox; @FXML private ListView userListContainer; + @FXML private Button createEventBtn; + @FXML private Button depositBtn; @FXML private VBox userDetailCard; @FXML private Label userNameLabel; @FXML private Label userRolePill; @@ -86,6 +90,11 @@ public class UsersTabController { sparkline = SparklineGraphic.create(); sparklineBox.getChildren().setAll(sparkline.node); + createEventBtn.setVisible(!state.isRemote()); + createEventBtn.setManaged(!state.isRemote()); + depositBtn.setVisible(state.isRemote()); + depositBtn.setManaged(state.isRemote()); + userListContainer.setCellFactory(lv -> new UserListCell()); userListContainer .getSelectionModel() @@ -95,6 +104,9 @@ public class UsersTabController { if (updatingSelection) return; if (newVal != null && state != null) { state.setActingUser(newVal); + if (state.isRemote() && !newVal.equals(state.actingUser())) { + Platform.runLater(this::refreshUserList); + } } }); @@ -165,6 +177,10 @@ public class UsersTabController { this.onToast = onToast; } + public void setOnDeposit(Runnable onDeposit) { + this.onDeposit = onDeposit; + } + public void setOnPlaceOrder(OrderPlacer onPlaceOrder) { this.onPlaceOrder = onPlaceOrder; } @@ -430,6 +446,13 @@ public class UsersTabController { } } + @FXML + private void handleDeposit() { + if (onDeposit != null) { + onDeposit.run(); + } + } + @FXML private void handleSelectTradeYes() { if (state != null) state.setTradeOptionYes(true); diff --git a/ui-fx/src/main/java/market/guess/ui/desktop/task/InitialLoadTask.java b/ui-fx/src/main/java/market/guess/ui/desktop/task/InitialLoadTask.java index e49b0c4..a5149b8 100644 --- a/ui-fx/src/main/java/market/guess/ui/desktop/task/InitialLoadTask.java +++ b/ui-fx/src/main/java/market/guess/ui/desktop/task/InitialLoadTask.java @@ -8,10 +8,12 @@ import market.guess.api.LoadResult; public final class InitialLoadTask extends Task { private final CatalogContext catalog; private final Path path; + private final boolean slow; - public InitialLoadTask(CatalogContext catalog, Path path) { + public InitialLoadTask(CatalogContext catalog, Path path, boolean slow) { this.catalog = catalog; this.path = path; + this.slow = slow; } @Override @@ -21,7 +23,7 @@ public final class InitialLoadTask extends Task { return null; } - for (int i = 0; i < 20; i++) { + for (int i = 0; slow && i < 20; i++) { if (isCancelled()) { return null; } -- cgit v1.2.3