added contract update into asset workspace

This commit is contained in:
2026-03-24 13:42:47 +00:00
parent bf4dc17469
commit b88a4e3c62
120 changed files with 1177 additions and 1211 deletions
@@ -55,4 +55,10 @@ public final class StudioFormSession<T> {
resetDraft();
mode = StudioFormMode.READ_ONLY;
}
public T apply() {
source = draft;
mode = StudioFormMode.READ_ONLY;
return source;
}
}
@@ -15,11 +15,11 @@ import p.studio.controls.lifecycle.StudioControlLifecycle;
import p.studio.controls.lifecycle.StudioControlLifecycleSupport;
import p.studio.events.*;
import p.studio.projects.ProjectReference;
import p.studio.utilities.events.EventSubscription;
import p.studio.utilities.i18n.I18n;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshFailedEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshStartedEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshedEvent;
import p.studio.utilities.events.EventSubscription;
import p.studio.utilities.i18n.I18n;
import java.util.ArrayList;
import java.util.List;
@@ -5,12 +5,7 @@ import java.io.UncheckedIOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.*;
public final class KnownProjectsService {
private final Path storageFile;
@@ -15,20 +15,12 @@ import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.stage.Window;
import p.studio.Container;
import p.studio.projects.ProjectCatalogService;
import p.studio.projects.ProjectCreationRequest;
import p.studio.projects.ProjectLanguageCatalogService;
import p.studio.projects.ProjectLanguageTemplate;
import p.studio.projects.ProjectReference;
import p.studio.projects.*;
import p.studio.utilities.i18n.I18n;
import java.io.File;
import java.nio.file.Path;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
public final class NewProjectWizard {
@@ -7,12 +7,8 @@ import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.ListCell;
import javafx.scene.control.ListView;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
import javafx.scene.input.MouseButton;
import javafx.scene.layout.*;
import javafx.stage.FileChooser;
import p.studio.Container;
import p.studio.projects.KnownProjectsService;
@@ -6,13 +6,7 @@ import javafx.stage.Stage;
import javafx.stage.StageStyle;
import p.packer.messages.InitWorkspaceRequest;
import p.studio.Container;
import p.studio.events.StudioProjectLoadingCompletedEvent;
import p.studio.events.StudioProjectLoadingFailedEvent;
import p.studio.events.StudioProjectLoadingPhase;
import p.studio.events.StudioProjectLoadingProgressEvent;
import p.studio.events.StudioProjectLoadingStartedEvent;
import p.studio.events.StudioProjectCreatedEvent;
import p.studio.events.StudioProjectOpenedEvent;
import p.studio.events.*;
import p.studio.projects.KnownProjectsService;
import p.studio.projects.ProjectCatalogService;
import p.studio.projects.ProjectReference;
@@ -5,6 +5,7 @@ import p.studio.events.StudioPackerOperationEvent;
import p.studio.events.StudioWorkspaceEventBus;
import p.studio.utilities.i18n.I18n;
import p.studio.utilities.logspane.LogsPane;
import p.studio.workspaces.assets.messages.events.StudioAssetLogEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshFailedEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshStartedEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshedEvent;
@@ -29,6 +30,9 @@ public final class AssetLogsPane extends LogsPane implements StudioEventAware {
@Override
public void registerEventSubscriptions() {
eventBindings.listen(workspaceBus, StudioAssetLogEvent.class).handle(event -> {
appendLine("[" + event.source() + "] " + event.message());
});
eventBindings.listen(workspaceBus, StudioAssetsWorkspaceRefreshStartedEvent.class).handle(event -> {
appendLine("[refresh] Asset scan started.");
});
@@ -60,7 +60,7 @@ public final class AssetDetailsControl extends VBox implements StudioEventAware
this.projectReference = Objects.requireNonNull(projectReference, "projectReference");
this.workspaceBus = Objects.requireNonNull(workspaceBus, "workspaceBus");
this.summaryControl = new AssetDetailsSummaryControl(projectReference, workspaceBus);
this.contractControl = new AssetDetailsContractControl(workspaceBus);
this.contractControl = new AssetDetailsContractControl(projectReference, workspaceBus);
this.actionsSection = createActionsSection();
getStyleClass().add("assets-workspace-pane");
@@ -9,6 +9,7 @@ import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import p.packer.messages.assets.AssetAction;
import p.packer.messages.assets.AssetFamilyCatalog;
import p.packer.messages.assets.OutputFormatCatalog;
import p.studio.Container;
import p.studio.projects.ProjectReference;
import p.studio.utilities.i18n.I18n;
@@ -44,6 +45,13 @@ public final class AssetDetailsUiSupport {
return createKeyValueRow(key, valueLabel);
}
public static Node createKeyValueRow(String key, OutputFormatCatalog outputFormat) {
final Label valueLabel = new Label(outputFormat.displayName());
valueLabel.getStyleClass().add("assets-details-value");
valueLabel.setWrapText(true);
return createKeyValueRow(key, valueLabel);
}
public static Node createKeyValueRow(String key, Node valueNode) {
final HBox row = new HBox(12);
row.setAlignment(Pos.TOP_LEFT);
@@ -1,8 +1,8 @@
package p.studio.workspaces.assets.details;
import p.packer.dtos.PackerAssetSummaryDTO;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetState;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary;
import p.studio.workspaces.assets.messages.AssetWorkspaceBuildParticipation;
public final class AssetListPackerMappings {
@@ -2,6 +2,7 @@ package p.studio.workspaces.assets.details.contract;
import p.packer.messages.AssetReference;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.messages.assets.OutputFormatCatalog;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails;
import java.util.LinkedHashMap;
@@ -11,13 +12,13 @@ import java.util.Objects;
public record AssetContractDraft(
AssetReference assetReference,
boolean preload,
String bank,
OutputFormatCatalog bank,
OutputCodecCatalog selectedCodec,
Map<String, String> codecFieldValues) {
public AssetContractDraft {
Objects.requireNonNull(assetReference, "assetReference");
bank = Objects.requireNonNullElse(bank, "unknown");
bank = Objects.requireNonNullElse(bank, OutputFormatCatalog.UNKNOWN);
selectedCodec = Objects.requireNonNullElse(selectedCodec, OutputCodecCatalog.UNKNOWN);
codecFieldValues = Map.copyOf(Objects.requireNonNull(codecFieldValues, "codecFieldValues"));
}
@@ -1,17 +1,15 @@
package p.studio.workspaces.assets.details.contract;
import javafx.application.Platform;
import javafx.collections.FXCollections;
import javafx.scene.Node;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.TextField;
import javafx.scene.control.*;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.dtos.PackerCodecConfigurationFieldDTO;
import p.packer.messages.UpdateAssetContractRequest;
import p.packer.messages.assets.OutputCodecCatalog;
import p.studio.Container;
import p.studio.controls.forms.StudioFormActionBar;
import p.studio.controls.forms.StudioFormMode;
@@ -19,16 +17,20 @@ import p.studio.controls.forms.StudioFormSession;
import p.studio.controls.lifecycle.StudioControlLifecycle;
import p.studio.controls.lifecycle.StudioControlLifecycleSupport;
import p.studio.events.StudioWorkspaceEventBus;
import p.studio.projects.ProjectReference;
import p.studio.utilities.i18n.I18n;
import p.studio.workspaces.assets.details.AssetDetailsUiSupport;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetDetails;
import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState;
import p.studio.workspaces.assets.messages.events.StudioAssetLogEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsRefreshRequestedEvent;
import p.studio.workspaces.framework.StudioSubscriptionBag;
import java.util.Objects;
public final class AssetDetailsContractControl extends VBox implements StudioControlLifecycle {
private final ProjectReference projectReference;
private final StudioWorkspaceEventBus workspaceBus;
private final StudioSubscriptionBag subscriptions = new StudioSubscriptionBag();
private final StudioFormActionBar actionBar = new StudioFormActionBar(
@@ -40,8 +42,9 @@ public final class AssetDetailsContractControl extends VBox implements StudioCon
private AssetWorkspaceDetailsViewState viewState;
private StudioFormSession<AssetContractDraft> formSession;
public AssetDetailsContractControl(StudioWorkspaceEventBus workspaceBus) {
public AssetDetailsContractControl(ProjectReference projectReference, StudioWorkspaceEventBus workspaceBus) {
StudioControlLifecycleSupport.install(this, this);
this.projectReference = Objects.requireNonNull(projectReference, "projectReference");
this.workspaceBus = Objects.requireNonNull(workspaceBus, "workspaceBus");
}
@@ -334,7 +337,34 @@ public final class AssetDetailsContractControl extends VBox implements StudioCon
if (formSession == null) {
return;
}
render();
final var draft = formSession.draft();
Container.backgroundTasks().submit(() -> {
final var request = new UpdateAssetContractRequest(
projectReference.toPackerProjectContext(),
draft.assetReference(),
draft.preload(),
draft.selectedCodec(),
draft.codecFieldValues());
try {
final var response = Container.packer().workspaceService().updateAssetContract(request);
if (response.success()) {
Platform.runLater(() -> {
final var r = formSession.apply();
workspaceBus.publish(new StudioAssetLogEvent("ASSET DETAILS CONTRACT", "Asset contract updated"));
workspaceBus.publish(new StudioAssetsRefreshRequestedEvent(r.assetReference()));
render();
});
} else {
Platform.runLater(() -> {
workspaceBus.publish(new StudioAssetLogEvent("ASSET DETAILS CONTRACT", response.errorMessage()));
cancelEdit();
});
}
} catch (Exception e) {
workspaceBus.publish(new StudioAssetLogEvent("ASSET DETAILS CONTRACT", e.getMessage()));
cancelEdit();
}
});
}
private void resetDraft() {
@@ -7,10 +7,10 @@ import p.studio.controls.lifecycle.StudioControlLifecycleSupport;
import p.studio.events.StudioWorkspaceEventBus;
import p.studio.projects.ProjectReference;
import p.studio.utilities.i18n.I18n;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary;
import p.studio.workspaces.assets.details.AssetDetailsUiSupport;
import p.studio.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary;
import p.studio.workspaces.assets.messages.AssetWorkspaceDetailsViewState;
import p.studio.workspaces.assets.messages.events.StudioAssetsDetailsViewStateChangedEvent;
import p.studio.workspaces.framework.StudioSubscriptionBag;
import java.util.Objects;
@@ -10,25 +10,17 @@ import javafx.scene.control.ToggleButton;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import p.packer.messages.AssetReference;
import p.packer.dtos.PackerAssetSummaryDTO;
import p.packer.messages.AssetReference;
import p.packer.messages.ListAssetsRequest;
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.messages.AssetWorkspaceAssetSummary;
import p.studio.workspaces.assets.AssetWorkspaceState;
import p.studio.workspaces.assets.details.AssetListPackerMappings;
import p.studio.workspaces.assets.messages.AssetListGroup;
import p.studio.workspaces.assets.messages.AssetListProjection;
import p.studio.workspaces.assets.messages.AssetListViewState;
import p.studio.workspaces.assets.messages.AssetWorkspaceStatus;
import p.studio.workspaces.assets.messages.events.StudioAssetsNavigatorViewStateChangedEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsRefreshRequestedEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshFailedEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshStartedEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshedEvent;
import p.studio.workspaces.assets.messages.*;
import p.studio.workspaces.assets.messages.events.*;
import p.studio.workspaces.framework.StudioEventAware;
import p.studio.workspaces.framework.StudioEventBindings;
@@ -8,13 +8,13 @@ import javafx.scene.layout.Region;
import javafx.scene.layout.VBox;
import p.packer.messages.assets.AssetFamilyCatalog;
import p.studio.Container;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent;
import p.studio.events.StudioWorkspaceEventBus;
import p.studio.projects.ProjectReference;
import p.studio.utilities.i18n.I18n;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetState;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary;
import p.studio.workspaces.assets.messages.AssetWorkspaceBuildParticipation;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceSelectionRequestedEvent;
import java.nio.file.Path;
import java.util.Objects;
@@ -1,9 +1,9 @@
package p.studio.workspaces.assets.list;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetState;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary;
import p.studio.workspaces.assets.messages.AssetListGroup;
import p.studio.workspaces.assets.messages.AssetListProjection;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetState;
import p.studio.workspaces.assets.messages.AssetWorkspaceAssetSummary;
import java.nio.file.Path;
import java.util.*;
@@ -1,6 +1,7 @@
package p.studio.workspaces.assets.messages;
import p.studio.workspaces.assets.AssetWorkspaceState;
import java.util.Objects;
public record AssetListViewState(
@@ -2,6 +2,7 @@ package p.studio.workspaces.assets.messages;
import p.packer.dtos.PackerCodecConfigurationFieldDTO;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.messages.assets.OutputFormatCatalog;
import java.nio.file.Path;
import java.util.List;
@@ -11,7 +12,7 @@ import java.util.Objects;
public record AssetWorkspaceAssetDetails(
AssetWorkspaceAssetSummary summary,
List<AssetWorkspaceAssetAction> actions,
String outputFormat,
OutputFormatCatalog outputFormat,
OutputCodecCatalog outputCodec,
List<OutputCodecCatalog> availableOutputCodecs,
Map<OutputCodecCatalog, List<PackerCodecConfigurationFieldDTO>> codecConfigurationFieldsByCodec,
@@ -20,7 +21,7 @@ public record AssetWorkspaceAssetDetails(
public AssetWorkspaceAssetDetails {
Objects.requireNonNull(summary, "summary");
actions = List.copyOf(Objects.requireNonNull(actions, "actions"));
outputFormat = Objects.requireNonNullElse(outputFormat, "unknown");
outputFormat = Objects.requireNonNullElse(outputFormat, OutputFormatCatalog.UNKNOWN);
outputCodec = Objects.requireNonNullElse(outputCodec, OutputCodecCatalog.UNKNOWN);
availableOutputCodecs = List.copyOf(Objects.requireNonNull(availableOutputCodecs, "availableOutputCodecs"));
codecConfigurationFieldsByCodec = Map.copyOf(Objects.requireNonNull(codecConfigurationFieldsByCodec, "codecConfigurationFieldsByCodec"));
@@ -1,7 +1,7 @@
package p.studio.workspaces.assets.messages;
import p.packer.messages.assets.AssetFamilyCatalog;
import p.packer.messages.AssetReference;
import p.packer.messages.assets.AssetFamilyCatalog;
import java.nio.file.Path;
import java.util.Objects;
@@ -0,0 +1,8 @@
package p.studio.workspaces.assets.messages.events;
import p.studio.events.StudioEvent;
public record StudioAssetLogEvent(
String source,
String message) implements StudioEvent {
}
@@ -5,11 +5,7 @@ import javafx.collections.FXCollections;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.TextField;
import javafx.scene.control.*;
import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
@@ -17,13 +13,13 @@ import javafx.stage.DirectoryChooser;
import javafx.stage.Modality;
import javafx.stage.Stage;
import javafx.stage.Window;
import p.packer.messages.PackerOperationStatus;
import p.packer.messages.assets.AssetFamilyCatalog;
import p.packer.messages.AssetReference;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.messages.assets.OutputFormatCatalog;
import p.packer.messages.CreateAssetRequest;
import p.packer.messages.CreateAssetResult;
import p.packer.messages.PackerOperationStatus;
import p.packer.messages.assets.AssetFamilyCatalog;
import p.packer.messages.assets.OutputCodecCatalog;
import p.packer.messages.assets.OutputFormatCatalog;
import p.studio.Container;
import p.studio.projects.ProjectReference;
import p.studio.utilities.i18n.I18n;
@@ -2,9 +2,7 @@ package p.studio.controls.forms;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;
final class StudioFormSessionTest {
@Test
@@ -3,9 +3,9 @@ package p.studio.controls.shell;
import org.junit.jupiter.api.Test;
import p.packer.events.PackerEventKind;
import p.studio.events.StudioPackerOperationEvent;
import p.studio.events.StudioProjectOpenedEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshFailedEvent;
import p.studio.workspaces.assets.messages.events.StudioAssetsWorkspaceRefreshedEvent;
import p.studio.events.StudioProjectOpenedEvent;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -6,9 +6,7 @@ import org.junit.jupiter.api.io.TempDir;
import java.nio.file.Files;
import java.nio.file.Path;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.*;
final class ProjectCatalogServiceTest {
@TempDir
@@ -1,7 +1,6 @@
package p.studio.workspaces.framework;
import org.junit.jupiter.api.Test;
import p.studio.utilities.events.EventSubscription;
import java.util.concurrent.atomic.AtomicInteger;