implements PR-020

This commit is contained in:
2026-03-24 13:42:45 +00:00
parent 60a0b571f8
commit 4278d045c2
29 changed files with 943 additions and 80 deletions
@@ -100,6 +100,7 @@ public enum I18n {
ASSETS_SECTION_INPUTS_PREVIEW("assets.section.inputsPreview"),
ASSETS_SECTION_DIAGNOSTICS("assets.section.diagnostics"),
ASSETS_SECTION_ACTIONS("assets.section.actions"),
ASSETS_ACTIONS_EMPTY("assets.actions.empty"),
ASSETS_ACTION_REGISTER("assets.action.register"),
ASSETS_ACTION_INCLUDE_IN_BUILD("assets.action.includeInBuild"),
ASSETS_ACTION_EXCLUDE_FROM_BUILD("assets.action.excludeFromBuild"),
@@ -1,20 +1,28 @@
package p.studio.workspaces.assets.details;
import javafx.application.Platform;
import javafx.scene.Node;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.ScrollPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import p.packer.messages.AssetReference;
import p.packer.dtos.PackerAssetActionAvailabilityDTO;
import p.packer.dtos.PackerAssetDetailsDTO;
import p.packer.messages.GetAssetDetailsRequest;
import p.packer.messages.GetAssetActionsRequest;
import p.packer.messages.RegisterAssetRequest;
import p.packer.messages.RegisterAssetResult;
import p.packer.messages.assets.AssetAction;
import p.studio.Container;
import p.studio.events.StudioWorkspaceEventBus;
import p.studio.projects.ProjectReference;
import p.studio.utilities.i18n.I18n;
import p.studio.workspaces.assets.details.contract.AssetDetailsContractControl;
import p.studio.workspaces.assets.details.summary.AssetDetailsSummaryControl;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetAction;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails;
import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsStatus;
import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState;
@@ -46,6 +54,8 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware
private AssetWorkspaceDetailsViewState viewState = AssetDetailsViewStateFactory.empty();
private boolean readyMounted;
private boolean actionRunning;
private String actionFeedbackMessage;
public AssetDetailsControl(
ProjectReference projectReference,
@@ -109,12 +119,16 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware
private void loadSelection(AssetReference assetReference) {
final long generation = loadGeneration.incrementAndGet();
actionRunning = false;
actionFeedbackMessage = null;
publishViewState(AssetDetailsViewStateFactory.loading(assetReference));
Container.backgroundTasks().submit(() -> loadDetails(generation, assetReference));
}
private void clearSelection() {
loadGeneration.incrementAndGet();
actionRunning = false;
actionFeedbackMessage = null;
publishViewState(AssetDetailsViewStateFactory.empty());
}
@@ -128,12 +142,15 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware
private void loadDetails(long generation, AssetReference assetReference) {
try {
final var response = Container.packer()
.workspaceService()
final var workspaceService = Container.packer().workspaceService();
final var response = workspaceService
.getAssetDetails(new GetAssetDetailsRequest(
projectReference.toPackerProjectContext(),
assetReference));
final AssetWorkspaceAssetDetails details = mapDetails(response.details());
final var actionsResponse = workspaceService.getAssetActions(new GetAssetActionsRequest(
projectReference.toPackerProjectContext(),
assetReference));
final AssetWorkspaceAssetDetails details = mapDetails(response.details(), actionsResponse.actions());
Platform.runLater(() -> applyLoadedDetails(generation, assetReference, details));
} catch (RuntimeException exception) {
Platform.runLater(() -> applyLoadFailure(generation, assetReference, exception));
@@ -175,18 +192,21 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware
readyMounted = false;
setDetailsTitle(null);
setWorkspaceSummary(Container.i18n().text(I18n.ASSETS_SUMMARY_EMPTY));
renderActions();
detailsContent.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage(Container.i18n().text(I18n.ASSETS_DETAILS_NO_SELECTION)));
}
case LOADING -> {
readyMounted = false;
setDetailsTitle(null);
setWorkspaceSummary(Container.i18n().text(I18n.ASSETS_SUMMARY_LOADING));
renderActions();
detailsContent.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage(Container.i18n().text(I18n.ASSETS_DETAILS_LOADING)));
}
case ERROR -> {
readyMounted = false;
setDetailsTitle(null);
setWorkspaceSummary(Container.i18n().text(I18n.ASSETS_SUMMARY_ERROR));
renderActions();
detailsContent.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage(
Objects.requireNonNullElse(viewState.detailsErrorMessage(), Container.i18n().text(I18n.ASSETS_DETAILS_EMPTY))));
}
@@ -195,12 +215,14 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware
readyMounted = false;
setDetailsTitle(null);
setWorkspaceSummary(null);
renderActions();
detailsContent.getChildren().setAll(AssetDetailsUiSupport.createSectionMessage(Container.i18n().text(I18n.ASSETS_DETAILS_NO_SELECTION)));
return;
}
setDetailsTitle(viewState.selectedAssetDetails().summary().assetName());
setWorkspaceSummary(null);
renderActions();
if (!readyMounted) {
readyMounted = true;
detailsContent.getChildren().setAll(primarySectionsRow, contractControl);
@@ -244,9 +266,93 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware
workspaceSummaryLabel.setManaged(visible);
}
private AssetWorkspaceAssetDetails mapDetails(PackerAssetDetailsDTO details) {
private void renderActions() {
actionsContent.getChildren().setAll(buildActionNodes());
}
private java.util.List<Node> buildActionNodes() {
final java.util.List<Node> nodes = new java.util.ArrayList<>();
if (actionFeedbackMessage != null && !actionFeedbackMessage.isBlank()) {
nodes.add(AssetDetailsUiSupport.createSectionMessage(actionFeedbackMessage));
}
if (viewState.selectedAssetDetails() == null) {
nodes.add(AssetDetailsUiSupport.createSectionMessage(Container.i18n().text(I18n.ASSETS_ACTIONS_EMPTY)));
return nodes;
}
final var visibleActions = viewState.selectedAssetDetails().actions().stream()
.filter(AssetWorkspaceAssetAction::visible)
.toList();
if (visibleActions.isEmpty()) {
nodes.add(AssetDetailsUiSupport.createSectionMessage(Container.i18n().text(I18n.ASSETS_ACTIONS_EMPTY)));
return nodes;
}
for (AssetWorkspaceAssetAction action : visibleActions) {
final Button button = AssetDetailsUiSupport.createActionButton(AssetDetailsUiSupport.actionLabel(action.action()));
button.setDisable(actionRunning || !action.enabled());
button.setOnAction(ignored -> executeAction(action));
nodes.add(button);
if (action.reason() != null) {
nodes.add(AssetDetailsUiSupport.createSectionMessage(action.reason()));
}
}
return nodes;
}
private void executeAction(AssetWorkspaceAssetAction action) {
if (actionRunning || viewState.selectedAssetReference() == null) {
return;
}
actionRunning = true;
actionFeedbackMessage = null;
renderActions();
switch (action.action()) {
case REGISTER -> Container.backgroundTasks().submit(() -> registerSelectedAsset(viewState.selectedAssetReference()));
}
}
private void registerSelectedAsset(AssetReference assetReference) {
try {
final RegisterAssetResult result = Container.packer().workspaceService().registerAsset(new RegisterAssetRequest(
projectReference.toPackerProjectContext(),
assetReference));
Platform.runLater(() -> applyRegisterResult(result));
} catch (RuntimeException exception) {
Platform.runLater(() -> applyRegisterFailure(exception));
}
}
private void applyRegisterResult(RegisterAssetResult result) {
actionRunning = false;
if (result.status() == p.packer.messages.PackerOperationStatus.SUCCESS && result.assetReference() != null) {
actionFeedbackMessage = null;
workspaceBus.publish(new StudioAssetsRefreshRequestedEvent(result.assetReference()));
workspaceBus.publish(new StudioAssetsWorkspaceSelectionRequestedEvent(result.assetReference()));
return;
}
actionFeedbackMessage = Objects.requireNonNullElse(result.summary(), "Unable to register asset.");
renderActions();
}
private void applyRegisterFailure(RuntimeException exception) {
actionRunning = false;
actionFeedbackMessage = exception.getMessage() == null || exception.getMessage().isBlank()
? "Unable to register asset."
: exception.getMessage();
renderActions();
}
private AssetWorkspaceAssetDetails mapDetails(
PackerAssetDetailsDTO details,
java.util.List<PackerAssetActionAvailabilityDTO> actions) {
return new AssetWorkspaceAssetDetails(
AssetListPackerMappings.mapSummary(details.summary()),
actions.stream()
.map(action -> new AssetWorkspaceAssetAction(
action.action(),
action.enabled(),
action.visible(),
action.reason()))
.toList(),
details.outputFormat(),
details.outputCodec(),
details.availableOutputCodecs(),
@@ -2,10 +2,12 @@ package p.studio.workspaces.assets.details;
import javafx.geometry.Pos;
import javafx.scene.Node;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import p.packer.messages.assets.AssetAction;
import p.packer.messages.assets.AssetFamilyCatalog;
import p.studio.Container;
import p.studio.projects.ProjectReference;
@@ -58,6 +60,13 @@ public final class AssetDetailsUiSupport {
return chip;
}
public static Button createActionButton(String text) {
final Button button = new Button(text);
button.getStyleClass().addAll("studio-button", "studio-button-primary", "assets-details-action-button");
button.setMaxWidth(Double.MAX_VALUE);
return button;
}
public static String registrationLabel(AssetWorkspaceAssetState state) {
return switch (state) {
case REGISTERED -> Container.i18n().text(I18n.ASSETS_VALUE_REGISTERED);
@@ -96,6 +105,12 @@ public final class AssetDetailsUiSupport {
};
}
public static String actionLabel(AssetAction action) {
return switch (action) {
case REGISTER -> Container.i18n().text(I18n.ASSETS_ACTION_REGISTER);
};
}
public static String registrationChipTone(AssetWorkspaceAssetState state) {
return switch (state) {
case REGISTERED -> "assets-details-chip-registered";
@@ -0,0 +1,20 @@
package p.studio.workspaces.assets.messages;
import p.packer.messages.assets.AssetAction;
import java.util.Objects;
public record AssetWorkspaceAssetAction(
AssetAction action,
boolean enabled,
boolean visible,
String reason) {
public AssetWorkspaceAssetAction {
Objects.requireNonNull(action, "action");
reason = reason == null ? null : reason.trim();
if (reason != null && reason.isBlank()) {
reason = null;
}
}
}
@@ -10,6 +10,7 @@ import java.util.Objects;
public record AssetWorkspaceAssetDetails(
AssetWorkspaceAssetSummary summary,
List<AssetWorkspaceAssetAction> actions,
String outputFormat,
OutputCodecCatalog outputCodec,
List<OutputCodecCatalog> availableOutputCodecs,
@@ -18,6 +19,7 @@ public record AssetWorkspaceAssetDetails(
public AssetWorkspaceAssetDetails {
Objects.requireNonNull(summary, "summary");
actions = List.copyOf(Objects.requireNonNull(actions, "actions"));
outputFormat = Objects.requireNonNullElse(outputFormat, "unknown");
outputCodec = Objects.requireNonNullElse(outputCodec, OutputCodecCatalog.UNKNOWN);
availableOutputCodecs = List.copyOf(Objects.requireNonNull(availableOutputCodecs, "availableOutputCodecs"));
@@ -90,6 +90,7 @@ assets.subsection.codecConfiguration=Codec Configuration
assets.section.inputsPreview=Inputs / Preview
assets.section.diagnostics=Diagnostics
assets.section.actions=Actions
assets.actions.empty=No actions available for this asset.
assets.action.register=Register
assets.action.includeInBuild=Include In Build
assets.action.excludeFromBuild=Exclude From Build
@@ -547,6 +547,10 @@
-fx-spacing: 10;
}
.assets-details-action-button {
-fx-max-width: Infinity;
}
.assets-details-section {
-fx-background-color: #11151b;
-fx-background-radius: 12;