implements PR-022

This commit is contained in:
2026-03-24 13:42:46 +00:00
parent a14a0b8b37
commit 165be76128
16 changed files with 508 additions and 22 deletions
@@ -102,10 +102,15 @@ public enum I18n {
ASSETS_SECTION_ACTIONS("assets.section.actions"),
ASSETS_ACTIONS_EMPTY("assets.actions.empty"),
ASSETS_ACTION_REGISTER("assets.action.register"),
ASSETS_ACTION_DELETE("assets.action.delete"),
ASSETS_ACTION_INCLUDE_IN_BUILD("assets.action.includeInBuild"),
ASSETS_ACTION_EXCLUDE_FROM_BUILD("assets.action.excludeFromBuild"),
ASSETS_ACTION_RELOCATE("assets.action.relocate"),
ASSETS_ACTION_REMOVE("assets.action.remove"),
ASSETS_DELETE_DIALOG_TITLE("assets.deleteDialog.title"),
ASSETS_DELETE_DIALOG_DESCRIPTION("assets.deleteDialog.description"),
ASSETS_DELETE_DIALOG_PROMPT("assets.deleteDialog.prompt"),
ASSETS_DELETE_DIALOG_NOTE("assets.deleteDialog.note"),
ASSETS_DELETE_DIALOG_CONFIRM("assets.deleteDialog.confirm"),
ASSETS_MUTATION_PREVIEW_TITLE("assets.mutation.previewTitle"),
ASSETS_MUTATION_SECTION_CHANGES("assets.mutation.section.changes"),
ASSETS_MUTATION_SECTION_AFFECTED_ASSET("assets.mutation.section.affectedAsset"),
@@ -11,6 +11,8 @@ import javafx.scene.layout.VBox;
import p.packer.messages.AssetReference;
import p.packer.dtos.PackerAssetActionAvailabilityDTO;
import p.packer.dtos.PackerAssetDetailsDTO;
import p.packer.messages.DeleteAssetRequest;
import p.packer.messages.DeleteAssetResult;
import p.packer.messages.GetAssetDetailsRequest;
import p.packer.messages.GetAssetActionsRequest;
import p.packer.messages.RegisterAssetRequest;
@@ -29,6 +31,7 @@ import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState;
import p.studio.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsRefreshRequestedEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent;
import p.studio.workspaces.assets.wizards.DeleteAssetDialog;
import p.studio.workspaces.framework.StudioEventAware;
import p.studio.workspaces.framework.StudioEventBindings;
@@ -302,12 +305,32 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware
if (actionRunning || viewState.selectedAssetReference() == null) {
return;
}
switch (action.action()) {
case REGISTER -> {
actionRunning = true;
actionFeedbackMessage = null;
renderActions();
Container.backgroundTasks().submit(() -> registerSelectedAsset(viewState.selectedAssetReference()));
}
case DELETE -> confirmDeleteAction();
}
}
private void confirmDeleteAction() {
if (viewState.selectedAssetDetails() == null || getScene() == null) {
return;
}
final boolean confirmed = DeleteAssetDialog.showAndWait(
getScene().getWindow(),
viewState.selectedAssetDetails().summary().assetName());
if (!confirmed) {
return;
}
actionRunning = true;
actionFeedbackMessage = null;
renderActions();
switch (action.action()) {
case REGISTER -> Container.backgroundTasks().submit(() -> registerSelectedAsset(viewState.selectedAssetReference()));
}
final AssetReference assetReference = viewState.selectedAssetReference();
Container.backgroundTasks().submit(() -> deleteSelectedAsset(assetReference));
}
private void registerSelectedAsset(AssetReference assetReference) {
@@ -341,6 +364,36 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware
renderActions();
}
private void deleteSelectedAsset(AssetReference assetReference) {
try {
final DeleteAssetResult result = Container.packer().workspaceService().deleteAsset(new DeleteAssetRequest(
projectReference.toPackerProjectContext(),
assetReference));
Platform.runLater(() -> applyDeleteResult(result));
} catch (RuntimeException exception) {
Platform.runLater(() -> applyDeleteFailure(exception));
}
}
private void applyDeleteResult(DeleteAssetResult result) {
actionRunning = false;
if (result.status() == p.packer.messages.PackerOperationStatus.SUCCESS) {
actionFeedbackMessage = null;
workspaceBus.publish(new StudioAssetsRefreshRequestedEvent());
return;
}
actionFeedbackMessage = Objects.requireNonNullElse(result.summary(), "Unable to delete asset.");
renderActions();
}
private void applyDeleteFailure(RuntimeException exception) {
actionRunning = false;
actionFeedbackMessage = exception.getMessage() == null || exception.getMessage().isBlank()
? "Unable to delete asset."
: exception.getMessage();
renderActions();
}
private AssetWorkspaceAssetDetails mapDetails(
PackerAssetDetailsDTO details,
java.util.List<PackerAssetActionAvailabilityDTO> actions) {
@@ -108,6 +108,7 @@ public final class AssetDetailsUiSupport {
public static String actionLabel(AssetAction action) {
return switch (action) {
case REGISTER -> Container.i18n().text(I18n.ASSETS_ACTION_REGISTER);
case DELETE -> Container.i18n().text(I18n.ASSETS_ACTION_DELETE);
};
}
@@ -0,0 +1,84 @@
package p.studio.workspaces.assets.wizards;
import javafx.beans.binding.Bindings;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.stage.Window;
import p.studio.Container;
import p.studio.utilities.i18n.I18n;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
public final class DeleteAssetDialog {
private final Stage stage;
private final AtomicReference<Boolean> result = new AtomicReference<>(false);
private final String assetName;
private final TextField confirmationField = new TextField();
private DeleteAssetDialog(Window owner, String assetName) {
this.assetName = Objects.requireNonNull(assetName, "assetName").trim();
this.stage = new Stage();
stage.initOwner(owner);
stage.initModality(Modality.WINDOW_MODAL);
stage.setTitle(Container.i18n().text(I18n.ASSETS_DELETE_DIALOG_TITLE));
stage.setScene(new Scene(buildRoot(), 520, 240));
stage.getScene().getStylesheets().add(Container.theme().getDefaultTheme());
}
public static boolean showAndWait(Window owner, String assetName) {
final DeleteAssetDialog dialog = new DeleteAssetDialog(owner, assetName);
dialog.stage.showAndWait();
return Optional.ofNullable(dialog.result.get()).orElse(false);
}
private VBox buildRoot() {
final Label title = new Label(Container.i18n().text(I18n.ASSETS_DELETE_DIALOG_TITLE));
title.getStyleClass().add("studio-launcher-section-title");
final Label description = new Label(Container.i18n().format(I18n.ASSETS_DELETE_DIALOG_DESCRIPTION, assetName));
description.getStyleClass().add("studio-launcher-subtitle");
description.setWrapText(true);
confirmationField.setPromptText(Container.i18n().text(I18n.ASSETS_DELETE_DIALOG_PROMPT));
confirmationField.setMaxWidth(Double.MAX_VALUE);
final Label note = new Label(Container.i18n().text(I18n.ASSETS_DELETE_DIALOG_NOTE));
note.getStyleClass().add("studio-launcher-feedback");
note.setWrapText(true);
final Button confirmButton = new Button();
confirmButton.textProperty().bind(Container.i18n().bind(I18n.ASSETS_DELETE_DIALOG_CONFIRM));
confirmButton.getStyleClass().addAll("studio-button", "studio-button-danger");
confirmButton.disableProperty().bind(Bindings.createBooleanBinding(
() -> !assetName.equals(confirmationField.getText().trim()),
confirmationField.textProperty()));
confirmButton.setOnAction(ignored -> {
result.set(true);
stage.close();
});
final Button cancelButton = new Button();
cancelButton.textProperty().bind(Container.i18n().bind(I18n.WIZARD_CANCEL));
cancelButton.getStyleClass().addAll("studio-button", "studio-button-cancel");
cancelButton.setOnAction(ignored -> stage.close());
final HBox actions = new HBox(12, confirmButton, cancelButton);
actions.setAlignment(Pos.CENTER_RIGHT);
final VBox root = new VBox(16, title, description, confirmationField, note, actions);
root.setPadding(new Insets(24));
VBox.setVgrow(confirmationField, Priority.NEVER);
return root;
}
}
@@ -92,6 +92,12 @@ assets.section.diagnostics=Diagnostics
assets.section.actions=Actions
assets.actions.empty=No actions available for this asset.
assets.action.register=Register
assets.action.delete=Delete
assets.deleteDialog.title=Delete Asset
assets.deleteDialog.description=Type the asset name below to confirm deletion of {0}.
assets.deleteDialog.prompt=Type the asset name exactly
assets.deleteDialog.note=Only asset.json is deleted. The asset directory and its remaining files stay on disk.
assets.deleteDialog.confirm=Delete
assets.action.includeInBuild=Include In Build
assets.action.excludeFromBuild=Exclude From Build
assets.action.relocate=Relocate