packer (WIP)
This commit is contained in:
@@ -275,6 +275,9 @@ public enum I18n {
|
||||
ASSETS_PACK_WIZARD_LABEL_PACKED_ASSETS("assets.packWizard.label.packedAssets"),
|
||||
ASSETS_PACK_WIZARD_LABEL_ELAPSED("assets.packWizard.label.elapsed"),
|
||||
ASSETS_PACK_WIZARD_LABEL_EMITTED_ARTIFACTS("assets.packWizard.label.emittedArtifacts"),
|
||||
ASSETS_PACK_WIZARD_LABEL_MIN_ARTIFACTS("assets.packWizard.label.minArtifacts"),
|
||||
ASSETS_PACK_WIZARD_LABEL_MAX_ARTIFACTS("assets.packWizard.label.maxArtifacts"),
|
||||
ASSETS_PACK_WIZARD_LABEL_LAST_MODIFIED("assets.packWizard.label.lastModified"),
|
||||
ASSETS_PACK_WIZARD_STATUS_READY("assets.packWizard.status.ready"),
|
||||
ASSETS_PACK_WIZARD_STATUS_BLOCKED("assets.packWizard.status.blocked"),
|
||||
ASSETS_PACK_WIZARD_STATUS_RUNNING("assets.packWizard.status.running"),
|
||||
|
||||
+54
-21
@@ -3,6 +3,7 @@ package p.studio.workspaces.assets.wizards;
|
||||
import javafx.application.Platform;
|
||||
import javafx.geometry.Insets;
|
||||
import javafx.geometry.Pos;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.scene.control.*;
|
||||
import javafx.scene.layout.HBox;
|
||||
@@ -12,6 +13,7 @@ import javafx.stage.Modality;
|
||||
import javafx.stage.Stage;
|
||||
import javafx.stage.Window;
|
||||
import p.packer.dtos.PackerEmittedArtifactDTO;
|
||||
import p.packer.dtos.PackerPackSummaryAssetDTO;
|
||||
import p.packer.dtos.PackerPackValidationAssetDTO;
|
||||
import p.packer.messages.PackWorkspaceRequest;
|
||||
import p.packer.messages.PackWorkspaceResult;
|
||||
@@ -127,7 +129,7 @@ public final class PackWorkspaceWizard {
|
||||
|
||||
packButton.setVisible(phase == Phase.VALIDATION);
|
||||
packButton.setManaged(phase == Phase.VALIDATION);
|
||||
packButton.setDisable(busy || validationResult == null || !validationResult.validation().canPack());
|
||||
packButton.setDisable(busy || validationResult == null || !validationResult.canPack());
|
||||
|
||||
copyFailuresButton.setVisible(phase == Phase.RESULT);
|
||||
copyFailuresButton.setManaged(phase == Phase.RESULT);
|
||||
@@ -156,18 +158,52 @@ public final class PackWorkspaceWizard {
|
||||
}
|
||||
|
||||
stepBody.getChildren().setAll(
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_CANONICAL_ARTIFACT),
|
||||
summaryResult.packSummary().canonicalArtifactName()),
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_INCLUDED_ASSETS),
|
||||
Integer.toString(summaryResult.packSummary().includedRegisteredAssetCount())),
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_OUTSIDE_BUILD_SET),
|
||||
Integer.toString(summaryResult.packSummary().outsideBuildSetAssetCount())),
|
||||
Integer.toString(summaryResult.packSummary().totalIncludedAssetCount())),
|
||||
createSummaryAssetsSection(),
|
||||
AssetDetailsUiSupport.createSectionMessage(summaryResult.summary()));
|
||||
}
|
||||
|
||||
private Node createSummaryAssetsSection() {
|
||||
if (summaryResult.packSummary().assets().isEmpty()) {
|
||||
return AssetDetailsUiSupport.createSectionMessage(
|
||||
Container.i18n().text(I18n.ASSETS_PACK_WIZARD_VALIDATION_EMPTY));
|
||||
}
|
||||
final Accordion accordion = new Accordion();
|
||||
for (PackerPackSummaryAssetDTO asset : summaryResult.packSummary().assets()) {
|
||||
accordion.getPanes().add(createSummaryPane(asset));
|
||||
}
|
||||
VBox.setVgrow(accordion, Priority.ALWAYS);
|
||||
return accordion;
|
||||
}
|
||||
|
||||
private TitledPane createSummaryPane(PackerPackSummaryAssetDTO asset) {
|
||||
final VBox content = new VBox(8);
|
||||
content.getChildren().addAll(
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_LABEL_ASSET_ID),
|
||||
Integer.toString(asset.assetId())),
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_LABEL_NAME),
|
||||
asset.assetName()),
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_LABEL_TYPE),
|
||||
AssetDetailsUiSupport.typeLabel(asset.assetFamily())),
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_MIN_ARTIFACTS),
|
||||
Integer.toString(asset.minArtifactCount())),
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_MAX_ARTIFACTS),
|
||||
Integer.toString(asset.maxArtifactCount())),
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_LAST_MODIFIED),
|
||||
Long.toString(asset.lastModified())));
|
||||
final TitledPane pane = new TitledPane(asset.assetName(), content);
|
||||
pane.setExpanded(false);
|
||||
return pane;
|
||||
}
|
||||
|
||||
private void renderValidationPhase() {
|
||||
stepTitle.textProperty().unbind();
|
||||
stepDescription.textProperty().unbind();
|
||||
@@ -185,18 +221,12 @@ public final class PackWorkspaceWizard {
|
||||
|
||||
final VBox content = new VBox(12);
|
||||
content.getChildren().addAll(
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_TOTAL_IN_SCOPE),
|
||||
Integer.toString(validationResult.validation().totalAssetsInScope())),
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_VALID_ASSETS),
|
||||
Integer.toString(validationResult.validation().validAssetCount())),
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_BLOCKED_ASSETS),
|
||||
Integer.toString(validationResult.validation().blockedAssetCount())),
|
||||
Integer.toString(validationResult.assets().size())),
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_STATUS),
|
||||
validationResult.validation().canPack()
|
||||
validationResult.canPack()
|
||||
? Container.i18n().text(I18n.ASSETS_PACK_WIZARD_STATUS_READY)
|
||||
: Container.i18n().text(I18n.ASSETS_PACK_WIZARD_STATUS_BLOCKED)),
|
||||
AssetDetailsUiSupport.createSectionMessage(validationResult.summary()));
|
||||
@@ -220,10 +250,13 @@ public final class PackWorkspaceWizard {
|
||||
content.getChildren().addAll(
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_LABEL_NAME),
|
||||
asset.asset().identity().assetName()),
|
||||
asset.assetName()),
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_LABEL_LOCATION),
|
||||
asset.asset().identity().assetRoot().toString()),
|
||||
asset.assetPath().toString()),
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_LAST_MODIFIED),
|
||||
Long.toString(asset.lastModified())),
|
||||
AssetDetailsUiSupport.createKeyValueRow(
|
||||
Container.i18n().text(I18n.ASSETS_PACK_WIZARD_LABEL_STATUS),
|
||||
asset.blocked()
|
||||
@@ -241,7 +274,7 @@ public final class PackWorkspaceWizard {
|
||||
diagnostic.severity().name() + ": " + diagnostic.message())));
|
||||
}
|
||||
|
||||
final String title = asset.asset().identity().assetName() + (asset.blocked() ? " (blocked)" : " (ready)");
|
||||
final String title = asset.assetName() + (asset.blocked() ? " (blocked)" : " (ready)");
|
||||
final TitledPane pane = new TitledPane(title, content);
|
||||
pane.setExpanded(false);
|
||||
return pane;
|
||||
@@ -372,7 +405,7 @@ public final class PackWorkspaceWizard {
|
||||
private void applyValidationResult(ValidatePackWorkspaceResult result) {
|
||||
loadingValidation = false;
|
||||
validationResult = result;
|
||||
if (!result.validation().canPack()) {
|
||||
if (!result.canPack()) {
|
||||
feedbackLabel.setText(result.summary());
|
||||
} else {
|
||||
feedbackLabel.setText("");
|
||||
@@ -387,7 +420,7 @@ public final class PackWorkspaceWizard {
|
||||
}
|
||||
|
||||
private void startPack() {
|
||||
if (validationResult == null || !validationResult.validation().canPack() || packing) {
|
||||
if (validationResult == null || !validationResult.canPack() || packing) {
|
||||
return;
|
||||
}
|
||||
phase = Phase.PACKING;
|
||||
|
||||
@@ -266,6 +266,9 @@ assets.packWizard.label.status=Status
|
||||
assets.packWizard.label.packedAssets=Packed Assets
|
||||
assets.packWizard.label.elapsed=Elapsed
|
||||
assets.packWizard.label.emittedArtifacts=Emitted Artifacts
|
||||
assets.packWizard.label.minArtifacts=Min Artifacts
|
||||
assets.packWizard.label.maxArtifacts=Max Artifacts
|
||||
assets.packWizard.label.lastModified=Last Modified
|
||||
assets.packWizard.status.ready=Ready to pack
|
||||
assets.packWizard.status.blocked=Validation blocked
|
||||
assets.packWizard.status.running=Packing in progress
|
||||
|
||||
Reference in New Issue
Block a user