update asset descriptor retrieval and editing for composite assets

src/main/java/be/seeseepuff/pcinv/controllers/WebController.java

@@ -1,8 +1,12 @@
 package be.seeseepuff.pcinv.controllers;
 
+import be.seeseepuff.pcinv.meta.AssetDescriptor;
+import be.seeseepuff.pcinv.models.Asset;
+import be.seeseepuff.pcinv.models.GenericAsset;
 import be.seeseepuff.pcinv.models.WorkLogEntry;
 import be.seeseepuff.pcinv.services.AssetService;
 import be.seeseepuff.pcinv.services.BuildService;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.repository.query.Param;
 import org.springframework.http.MediaType;
@@ -15,8 +19,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.Set;
 
 /**
  * Controller for handling web requests related to assets.
@@ -33,6 +39,8 @@ public class WebController {
     private static final String ASSETS = "assets";
     /// The name of the model attribute that holds the asset being viewed or edited.
     private static final String ASSET = "asset";
+    /// The name of the model attribute that holds the list of asset types.
+    private static final String TYPES = "types";
     /// The name of the model attribute that holds a list of all properties of all descriptors.
     private static final String PROPERTIES = "properties";
     /// The name of the model attribute that holds the action to be performed.
@@ -94,7 +102,12 @@ public class WebController {
         model.addAttribute(DESCRIPTOR, assetService.getAssetDescriptor(type));
         model.addAttribute(DESCRIPTORS, tree);
         model.addAttribute(PROPERTIES, tree.stream().flatMap(d -> d.getProperties().stream()).toList());
-        model.addAttribute(ASSETS, assetService.getAssetsByType(type));
+        var assets = assetService.getAssetsByType(type);
+        assets.sort(Comparator
+                .comparing((Asset a) -> a.getAsset().getBrand(), Comparator.nullsFirst(Comparator.naturalOrder()))
+                .thenComparing((Asset a) -> a.getAsset().getModel(), Comparator.nullsFirst(Comparator.naturalOrder()))
+                .thenComparing(Asset::getQr));
+        model.addAttribute(ASSETS, assets);
         return "browse_type";
     }
 
@@ -126,6 +139,39 @@ public class WebController {
         return "build_view";
     }
 
+    /**
+     * Shows a view where the user can create a specific type of composite asset.
+     */
+    @GetMapping("/create_composite")
+    public String createCompositeType(Model model, HttpServletRequest request) {
+        var parameters = request.getParameterMap();
+        if (parameters == null || parameters.isEmpty()) {
+            model.addAttribute(TIME, System.currentTimeMillis());
+            model.addAttribute(DESCRIPTORS, assetService.getAssetDescriptors());
+            return "create_composite";
+        } else {
+            model.addAttribute(TIME, System.currentTimeMillis());
+            model.addAttribute(ACTION, "create");
+            var descriptors = new ArrayList<AssetDescriptor>();
+            var inputLists = new HashMap<String, Set<String>>();
+            descriptors.add(assetService.getAssetDescriptor(GenericAsset.TYPE));
+            for (String assetType : parameters.keySet()) {
+                descriptors.add(assetService.getAssetDescriptor(assetType));
+                inputLists.putAll(assetService.getInputList(assetType));
+            }
+            model.addAttribute(DESCRIPTORS, descriptors);
+            model.addAttribute(DESCRIPTOR, AssetDescriptor.builder()
+                    .type("composite")
+                    .displayName("Composite Asset")
+                    .pluralName("Composite Assets")
+                    .build());
+            model.addAttribute(INPUT_LIST, inputLists);
+            model.addAttribute(BUILDS, buildService.getAllBuilds());
+            model.addAttribute(TYPES, parameters.keySet().stream().toList());
+            return "create_asset";
+        }
+    }
+
     /**
      * Handles the creation of a new build.
      */
@@ -169,18 +215,18 @@ public class WebController {
         model.addAttribute(TIME, System.currentTimeMillis());
         model.addAttribute(ACTION, "view");
 
-        var asset = assetService.getAssetByQr(qr);
+        var composite = assetService.getAssetByQr(qr);
-        if (asset == null) {
+        if (composite == null) {
             return "redirect:/";
         }
 
         var workLogSizeStr = formData.getFirst(WORKLOG_SIZE);
         if (workLogSizeStr != null) {
             var workLogSize = Integer.parseInt(workLogSizeStr);
-            if (asset.getAsset().getWorkLog().size() == workLogSize) {
+            if (composite.getAsset().getWorkLog().size() == workLogSize) {
                 var comment = formData.getFirst("comment");
                 if (comment != null && !comment.isBlank()) {
-                    assetService.addWorkLogEntry(asset, comment);
+                    assetService.addWorkLogEntry(composite, comment);
                 }
             }
         }
@@ -223,7 +269,7 @@ public class WebController {
             return "redirect:/";
         }
         model.addAttribute(ASSET, asset);
-        model.addAttribute(DESCRIPTORS, assetService.getAssetDescriptorTree(asset.getAsset().getType()));
+        model.addAttribute(DESCRIPTORS, assetService.getAssetDescriptorTree(asset));
         model.addAttribute(DESCRIPTOR, assetService.getAssetDescriptor(asset.getAsset().getType()));
         model.addAttribute(WORKLOG, asset.getAsset().getWorkLog().stream()
                 .sorted(Comparator.comparing(WorkLogEntry::getDate).reversed())
@@ -262,6 +308,35 @@ public class WebController {
         return "create_asset";
     }
 
+    /**
+     * Handles the form submission for creating an asset.
+     *
+     * @param model The model to add attributes to.
+     * @param type  The type of asset to create.
+     * @return The view name for creating the asset.
+     */
+    @PostMapping(
+            value = "/create/{type}",
+            consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE
+    )
+    public String createTypePost(Model model, @PathVariable String type, @RequestBody MultiValueMap<String, String> formData) {
+        model.addAttribute(TIME, System.currentTimeMillis());
+        var formMap = new HashMap<String, String>();
+        formData.forEach((key, values) -> {
+            if (!values.isEmpty()) {
+                formMap.put(key, values.getFirst());
+            }
+        });
+        if (type.equals("composite")) {
+            var compositeTypes = formData.get("type");
+            var asset = assetService.createCompositeAsset(compositeTypes, formMap);
+            return "redirect:/view/" + asset.getQr();
+        } else {
+            var asset = assetService.createAsset(type, formMap);
+            return "redirect:/view/" + asset.getQr();
+        }
+    }
+
     /**
      * Shows a view where the user can edit an existing asset.
      *
@@ -277,7 +352,7 @@ public class WebController {
         String assetType = asset.getAsset().getType();
         model.addAttribute(ACTION, "edit");
         model.addAttribute(ASSET, asset);
-        model.addAttribute(DESCRIPTORS, assetService.getAssetDescriptorTree(assetType));
+        model.addAttribute(DESCRIPTORS, assetService.getAssetDescriptorTree(asset));
         model.addAttribute(DESCRIPTOR, assetService.getAssetDescriptor(assetType));
         model.addAttribute(INPUT_LIST, assetService.getInputList(assetType));
         model.addAttribute(BUILDS, buildService.getAllBuilds());
@@ -299,7 +374,7 @@ public class WebController {
         String assetType = asset.getAsset().getType();
         model.addAttribute(ACTION, "duplicate");
         model.addAttribute(ASSET, asset);
-        model.addAttribute(DESCRIPTORS, assetService.getAssetDescriptorTree(assetType));
+        model.addAttribute(DESCRIPTORS, assetService.getAssetDescriptorTree(asset));
         model.addAttribute(DESCRIPTOR, assetService.getAssetDescriptor(assetType));
         model.addAttribute(INPUT_LIST, assetService.getInputList(assetType));
         return "create_asset";
@@ -322,27 +397,4 @@ public class WebController {
         var asset = assetService.editAsset(qr, formMap);
         return "redirect:/view/" + asset.getQr();
     }
-
-    /**
-     * Handles the form submission for creating an asset.
-     *
-     * @param model The model to add attributes to.
-     * @param type  The type of asset to create.
-     * @return The view name for creating the asset.
-     */
-    @PostMapping(
-            value = "/create/{type}",
-            consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE
-    )
-    public String createTypePost(Model model, @PathVariable String type, @RequestBody MultiValueMap<String, String> formData) {
-        model.addAttribute(TIME, System.currentTimeMillis());
-        var formMap = new HashMap<String, String>();
-        formData.forEach((key, values) -> {
-            if (!values.isEmpty()) {
-                formMap.put(key, values.getFirst());
-            }
-        });
-        var asset = assetService.createAsset(type, formMap);
-        return "redirect:/view/" + asset.getQr();
-    }
 }

src/main/java/be/seeseepuff/pcinv/meta/AssetDescriptor.java

@@ -16,9 +16,19 @@ import java.util.function.Supplier;
 @Getter
 @Builder
 public class AssetDescriptor {
+    public static final AssetDescriptor COMPOSITE = AssetDescriptor.builder()
+            .type("composite")
+            .displayName("Composite Asset")
+            .pluralName("Composite Assets")
+            .visible(false)
+            .build();
+
     /// The type of property, e.g.: ram, asset, etc...
     private final String type;
 
+    /// The Java class of the type.
+    private final Class<?> assetClass;
+
     /// The displayable name of the property, e.g.: "Random Access Memory"
     private final String displayName;
 
@@ -46,6 +56,7 @@ public class AssetDescriptor {
         Objects.requireNonNull(assetInfo, "Asset class must be annotated with @AssetInfo");
         var builder = AssetDescriptor.builder()
                 .type(assetInfo.type())
+                .assetClass(assetType)
                 .displayName(assetInfo.displayName())
                 .pluralName(assetInfo.pluralName())
                 .visible(assetInfo.isVisible())

src/main/java/be/seeseepuff/pcinv/meta/AssetDescriptors.java

@@ -20,8 +20,16 @@ public class AssetDescriptors {
      * @param assetType The type of the asset to load properties for.
      */
     public void loadFrom(Class<?> assetType) {
-        var property = AssetDescriptor.loadFrom(assetType);
+        add(AssetDescriptor.loadFrom(assetType));
-        assets.add(property);
+    }
+
+    /**
+     * Adds a new asset descriptor to the collection.
+     *
+     * @param assetDescriptor The asset descriptor to add.
+     */
+    public void add(AssetDescriptor assetDescriptor) {
+        assets.add(assetDescriptor);
     }
 
     /**

src/main/java/be/seeseepuff/pcinv/meta/AssetProperty.java

@@ -70,7 +70,11 @@ public class AssetProperty {
                 .setter((obj, value) -> {
                     try {
                         property.setAccessible(true);
-                        property.set(obj, Converters.convert(value, property.getType()));
+                        if (obj instanceof Asset asset) {
+                            property.set(asset.getAsset(property.getDeclaringClass()), Converters.convert(value, property.getType()));
+                        } else {
+                            property.set(obj, Converters.convert(value, property.getType()));
+                        }
                     } catch (IllegalAccessException e) {
                         throw new RuntimeException(e);
                     }
@@ -81,7 +85,12 @@ public class AssetProperty {
                             obj = asset.getAsset();
                         }
                         property.setAccessible(true);
-                        return property.get(obj);
+
+                        if (obj instanceof Asset asset) {
+                            return property.get(asset.getAsset(property.getDeclaringClass()));
+                        } else {
+                            return property.get(obj);
+                        }
                     } catch (IllegalAccessException e) {
                         throw new RuntimeException(e);
                     }

src/main/java/be/seeseepuff/pcinv/meta/CapacityInfo.java

@@ -44,6 +44,10 @@ public class CapacityInfo {
     }
 
     public static CapacityUnit idealUnitForCapacity(long capacity, CapacityUnit[] units) {
+        if (capacity <= 0) {
+            return CapacityUnit.BYTES; // Default to bytes for non-positive capacities
+        }
+
         return Arrays.stream(units)
                 .sorted(Comparator.comparing(CapacityUnit::getBytes).reversed())
                 .filter(unit -> capacity % unit.getBytes() == 0)

src/main/java/be/seeseepuff/pcinv/models/Asset.java

@@ -9,5 +9,24 @@ public interface Asset {
         return getAsset().getQr();
     }
 
+
+    /**
+     * Returns the asset as a specific type.
+     * @param assetType The type of asset to return, e.g., CpuAsset.class.
+     * @return The asset cast to the specified type.
+     * @param <T> The type of asset to return, must extend Asset.
+     * @throws IllegalArgumentException if the requested assetType is not compatible with this asset.
+     */
+    @SuppressWarnings("unchecked")
+	default <T> T getAsset(Class<T> assetType) {
+        if (assetType.equals(GenericAsset.class)) {
+            return (T) getAsset();
+        }
+        if (assetType.equals(this.getClass())) {
+			return (T) this;
+        }
+        throw new IllegalArgumentException("No asset of type " + assetType.getSimpleName() + " found in composite.");
+    }
+
     void setAsset(GenericAsset asset);
 }

src/main/java/be/seeseepuff/pcinv/models/Composite.java

@@ -0,0 +1,76 @@
+package be.seeseepuff.pcinv.models;
+
+import jakarta.annotation.Nullable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Represents a composite asset that can contain multiple other assets.
+ */
+@Getter
+@Setter
+@RequiredArgsConstructor
+@AllArgsConstructor
+public class Composite implements Asset {
+    private final GenericAsset genericAsset;
+    private List<Asset> assets = new ArrayList<>();
+
+    /**
+     * Constructs a Composite with a single asset.
+     *
+     * @param asset The asset to be added to the composite.
+     */
+    public Composite(Asset asset) {
+        this.genericAsset = asset.getAsset();
+        addAsset(asset);
+    }
+
+    @Override
+    public <T> T getAsset(Class<T> assetType) {
+        if (assetType.equals(GenericAsset.class)) {
+			//noinspection unchecked
+			return (T) getAsset();
+        }
+        if (assetType.equals(Composite.class)) {
+            return assetType.cast(this);
+        }
+        for (Asset asset : assets) {
+            if (assetType.isInstance(asset)) {
+                return assetType.cast(asset);
+            }
+        }
+        throw new IllegalArgumentException("No asset of type " + assetType.getSimpleName() + " found in composite.");
+    }
+
+    /**
+     * Adds an asset to the composite.
+     *
+     * @param asset The asset to add. If null, it will not be added.
+     */
+    public void addAsset(@Nullable Asset asset) {
+        if (asset == null) {
+            return;
+        }
+        assets.add(asset);
+    }
+
+    @Override
+    public long getId() {
+        return genericAsset.getId();
+    }
+
+    @Override
+    public GenericAsset getAsset() {
+        return genericAsset;
+    }
+
+    @Override
+    public void setAsset(GenericAsset asset) {
+        throw new UnsupportedOperationException("Composite is note a modifiable database record.");
+    }
+}

src/main/java/be/seeseepuff/pcinv/models/CpuAsset.java

@@ -30,24 +30,24 @@ public class CpuAsset implements Asset
 
 	@Description("The number of cores in the CPU.")
 	@Property("Cores")
-	private int cores;
+	private Integer cores;
 
 	@Description("The number of threads in the CPU.")
 	@Property("Threads")
-	private int threads;
+	private Integer threads;
 
 	@Description("The base clock speed of the CPU in MHz.")
 	@Property("Base Clock Speed (MHz)")
-	private int baseClockSpeed;
+	private Integer baseClockSpeed;
 
 	@Description("The boost clock speed of the CPU in MHz.")
 	@Property("Boost Clock Speed (MHz)")
 	@HideInOverview
-	private int boostClockSpeed;
+	private Integer boostClockSpeed;
 
 	@Description("The thermal design power (TDP) of the CPU in watts.")
 	@Property("Thermal Design Power (TDP) (W)")
-	private int tdp;
+	private Integer tdp;
 
 	@Description("The socket type of the CPU.")
 	@Property("Socket Type")
@@ -63,5 +63,5 @@ public class CpuAsset implements Asset
 	@Description("The manufacturing process of the CPU in nanometers.")
 	@Property("Manufacturing Process (nm)")
 	@HideInOverview
-	private int manufacturingProcess;
+	private Integer manufacturingProcess;
 }

src/main/java/be/seeseepuff/pcinv/models/HddAsset.java

@@ -57,16 +57,16 @@ public class HddAsset implements Asset
 	@InputList
 	private String driveType;
 
-	@Description("Number of heads in the drive.")
-	@Property("Heads")
-	@HideInOverview
-	private Integer heads;
-
 	@Description("Number of cylinders in the drive.")
 	@Property("Cylinders")
 	@HideInOverview
 	private Integer cylinders;
 
+	@Description("Number of heads in the drive.")
+	@Property("Heads")
+	@HideInOverview
+	private Integer heads;
+
 	@Description("Number of sectors in the drive.")
 	@Property("Sectors")
 	@HideInOverview

src/main/java/be/seeseepuff/pcinv/models/PowerSupplyAsset.java

@@ -28,7 +28,7 @@ public class PowerSupplyAsset implements Asset
 
 	@Description("The wattage rating of the power supply in watts.")
 	@Property("Wattage")
-	private int wattage;
+	private Integer wattage;
 
 	@Description("The efficiency rating of the power supply, e.g., 80 Plus Bronze, Silver, Gold, Platinum, Titanium.")
 	@Property("Efficiency Rating")
@@ -42,25 +42,25 @@ public class PowerSupplyAsset implements Asset
 
 	@Description("The number number of Molex connectors.")
 	@Property("4-pin Molex Connectors")
-	private int molexConnectors;
+	private Integer molexConnectors;
 
 	@Description("The number of 4-pin floppy connectors.")
 	@Property("4-pin Floppy Connectors")
-	private int floppyConnectors;
+	private Integer floppyConnectors;
 
 	@Description("The number of SATA power connectors.")
 	@Property("15-pin SATA Connectors")
-	private int sataConnectors;
+	private Integer sataConnectors;
 
 	@Description("The number of 6-pin PCIe connectors.")
 	@Property("6-pin PCIe Connectors")
-	private int pcie6Connectors;
+	private Integer pcie6Connectors;
 
 	@Description("The number of 8-pin PCIe connectors.")
 	@Property("8-pin PCIe Connectors")
-	private int pcie8Connectors;
+	private Integer pcie8Connectors;
 
 	@Description("The number of 4-pin ATX 12V connectors.")
 	@Property("4-pin ATX 12V Connectors")
-	private int atx12vConnectors;
+	private Integer atx12vConnectors;
 }

src/main/java/be/seeseepuff/pcinv/services/AssetService.java

@@ -2,6 +2,7 @@ package be.seeseepuff.pcinv.services;
 
 import be.seeseepuff.pcinv.meta.*;
 import be.seeseepuff.pcinv.models.Asset;
+import be.seeseepuff.pcinv.models.Composite;
 import be.seeseepuff.pcinv.models.GenericAsset;
 import be.seeseepuff.pcinv.models.WorkLogEntry;
 import be.seeseepuff.pcinv.repositories.AssetRepository;
@@ -46,12 +47,23 @@ public class AssetService {
      * @return the Asset associated with the given QR code
      * @throws IllegalArgumentException if no asset is found with the given QR code
      */
-    public Asset getAssetByQr(long qr) {
+    public Composite getAssetByQr(long qr) {
         var genericAsset = genericRepository.findByQr(qr);
         if (genericAsset == null) {
             throw new IllegalArgumentException("No asset found with QR code: " + qr);
         }
-        return getRepositoryFor(genericAsset.getType()).findByAsset(genericAsset);
+        if (genericAsset.getType().equals("composite")) {
+            var assets = new ArrayList<Asset>();
+            for (var repository : repositories) {
+                var asset = repository.findByAsset(genericAsset);
+                if (asset != null) {
+                    assets.add(asset);
+                }
+            }
+            return new Composite(genericAsset, assets);
+        } else {
+            return new Composite(getRepositoryFor(genericAsset.getType()).findByAsset(genericAsset));
+        }
     }
 
     /**
@@ -109,18 +121,34 @@ public class AssetService {
      * @return the AssetProperties for the specified type
      */
     public AssetDescriptor getAssetDescriptor(String type) {
+        if (type.equals("composite")) {
+            return AssetDescriptor.COMPOSITE;
+        }
         return getAssetDescriptors().getAssets().stream()
                 .filter(asset -> asset.getType().equals(type))
                 .findFirst()
                 .orElseThrow(() -> new IllegalArgumentException("Unknown asset type: " + type));
     }
 
+    /**
+     * Gets the asset descriptor for a specific asset instance.
+     *
+     * @param asset the asset instance to retrieve the descriptor for
+     * @return the AssetDescriptor for the specified asset
+     */
+    public AssetDescriptor getAssetDescriptor(Asset asset) {
+        var type = asset.getClass().getAnnotation(AssetInfo.class).type();
+        return getAssetDescriptor(type);
+    }
+
     /**
      * Retrieves a tree of asset descriptors for the specified type.
      *
      * @param type the type of asset to retrieve descriptors for
      * @return a list of AssetDescriptors for the specified type
+     * @deprecated Change to use Composite instead
      */
+    @Deprecated
     public List<AssetDescriptor> getAssetDescriptorTree(String type) {
         if (type.equals(GenericAsset.TYPE)) {
             return List.of(getAssetDescriptor(GenericAsset.TYPE));
@@ -128,6 +156,21 @@ public class AssetService {
         return List.of(getAssetDescriptor(GenericAsset.TYPE), getAssetDescriptor(type));
     }
 
+    /**
+     * Retrieves a tree of asset descriptors for the specified composite.
+     *
+     * @param composite the composite to retrieve descriptors for
+     * @return a set of AssetDescriptors for the composite
+     */
+    public Set<AssetDescriptor> getAssetDescriptorTree(Composite composite) {
+        var tree = new TreeSet<>(Comparator.comparing(AssetDescriptor::getDisplayName));
+        tree.add(getAssetDescriptor(GenericAsset.TYPE));
+        for (var asset : composite.getAssets()) {
+            tree.add(getAssetDescriptor(asset));
+        }
+        return tree;
+    }
+
     /**
      * Creates a new asset of the specified type with the provided form data.
      *
@@ -138,12 +181,12 @@ public class AssetService {
     @Transactional
     public Asset createAsset(String type, Map<String, String> formData) {
         var genericDescriptor = getAssetDescriptor(GenericAsset.TYPE);
-        var assetDescriptor = getAssetDescriptor(type);
-
         var genericAsset = new GenericAsset();
         genericAsset.setType(type);
         fillIn(genericAsset, genericDescriptor, formData);
 
+        var assetDescriptor = getAssetDescriptor(type);
+
         var asset = assetDescriptor.newInstance();
         fillIn(asset, assetDescriptor, formData);
 
@@ -153,6 +196,36 @@ public class AssetService {
         return asset;
     }
 
+    /**
+     * Creates a composite asset with multiple asset types.
+     *
+     * @param type     The list of asset types to include in the composite asset.
+     * @param formData The form data containing the properties for each asset type.
+     * @return The generic asset.
+     */
+    @Transactional
+    public GenericAsset createCompositeAsset(List<String> type, Map<String, String> formData) {
+        if (type.isEmpty()) {
+            throw new IllegalArgumentException("At least one asset type must be provided.");
+        }
+
+        var genericDescriptor = getAssetDescriptor(GenericAsset.TYPE);
+        var genericAsset = new GenericAsset();
+        genericAsset.setType("composite");
+        fillIn(genericAsset, genericDescriptor, formData);
+        genericAsset = genericRepository.saveAndFlush(genericAsset);
+
+        for (var assetType : type) {
+            var assetDescriptor = getAssetDescriptor(assetType);
+            var asset = assetDescriptor.newInstance();
+            fillIn(asset, assetDescriptor, formData);
+            asset.setAsset(genericAsset);
+            getRepositoryFor(assetType).saveAndFlushAsset(asset);
+        }
+
+        return genericAsset;
+    }
+
     /**
      * Edits an existing asset with the provided form data.
      *
@@ -162,20 +235,21 @@ public class AssetService {
      */
     @Transactional
     public Asset editAsset(long qr, Map<String, String> formData) {
-        var genericAsset = genericRepository.findByQr(qr);
+        var composite = getAssetByQr(qr);
-        if (genericAsset == null) {
+        if (composite == null) {
             throw new IllegalArgumentException("No asset found with QR code: " + qr);
         }
 
-        var assetType = genericAsset.getType();
+        fillIn(composite.getGenericAsset(), getAssetDescriptor(GenericAsset.TYPE), formData);
-        var assetDescriptor = getAssetDescriptor(assetType);
+        genericRepository.saveAndFlush(composite.getGenericAsset());
-        var asset = getRepositoryFor(assetType).findByAsset(genericAsset);
 
-        fillIn(genericAsset, getAssetDescriptor(GenericAsset.TYPE), formData);
+        for (var asset : composite.getAssets()) {
-        fillIn(asset, assetDescriptor, formData);
+            var assetDescriptor = getAssetDescriptor(asset);
+            fillIn(asset, assetDescriptor, formData);
+            getRepositoryFor(assetDescriptor.getType()).saveAndFlushAsset(asset);
+        }
 
-        genericRepository.saveAndFlush(genericAsset);
+        return getAssetByQr(qr);
-        return getRepositoryFor(assetType).saveAndFlushAsset(asset);
     }
 
     /**

src/main/resources/templates/browse_type.html

@@ -9,7 +9,8 @@
         <tr th:each="a : ${assets}">
             <td th:each="p : ${properties}" th:if="${!p.hideInOverview}">
                 <a th:if="${p.name == 'qr'}" th:href="'/view/'+${a.getQr()}" th:text="${p.renderValue(a)}"></a>
-                <span th:if="${p.name != 'qr'}" th:text="${p.renderValue(a)}"></span>
+                <a th:if="${p.name == 'build' && a.getAsset().getBuild() != null}" th:href="'/build/'+${a.getAsset().getBuild().getId()}" th:text="${p.renderValue(a)}"></a>
+                <span th:if="${p.name != 'qr' && (p.name != 'build' || a.getAsset().getBuild() == null)}" th:text="${p.renderValue(a)}"></span>
             </td>
             <td>
                 <a th:href="'/view/'+${a.getQr()}">View</a>

src/main/resources/templates/build_view.html

@@ -15,7 +15,7 @@
         </tr>
         <tr th:each="p : ${build.getParts()}">
             <td><a th:href="'/view/' + ${p.qr}" th:text="${p.qr}"></a></td>
-            <td th:text="${descriptors.getDescriptorForType(p.type).displayName}"></td>
+            <td><a th:href="'/browse/' + ${p.type}" th:text="${descriptors.getDescriptorForType(p.type).displayName}"></a></td>
             <td th:text="${descriptors.getGenericProperty('brand').renderValue(p)}"></td>
             <td th:text="${descriptors.getGenericProperty('model').renderValue(p)}"></td>
         </tr>

src/main/resources/templates/create_asset.html

@@ -2,6 +2,7 @@
 <div th:fragment="content">
 	<h2>Create a <span th:text="${descriptor.displayName}"></span></h2>
 	<form th:action="'/'+${(action == 'duplicate') ? 'create' : action}+'/'+${(asset != null && action != 'duplicate') ? asset.getQr() : descriptor.getType()}" method="post">
+		<input th:each="t : ${types}" type="hidden" name="type" th:value="${t}"/>
 		<div th:each="d : ${descriptors}">
 			<h2 th:text="${d.displayName}"></h2>
 			<table border="1" cellpadding="4">

src/main/resources/templates/create_composite.html

@@ -0,0 +1,11 @@
+<body th:replace="~{fragments :: base(title='Select type to create', content=~{::content})}">
+  <div th:fragment="content">
+    <h2>Create a new composite device</h2>
+    <form method="get" action="/create_composite">
+      <div th:each="d : ${descriptors.getAssets()}" th:if="${d.visible}"><label><input type="checkbox" value="on" th:name="${d.type}"><span th:text="${d.displayName}"></span></label></div>
+      <p>
+        <input type="submit" value="Create Composite">
+      </p>
+    </form>
+  </div>
+</body>

src/main/resources/templates/create_select.html

@@ -2,6 +2,7 @@
   <div th:fragment="content">
     <h2>Create a new device</h2>
     <ul>
+      <li><a href="/create_composite"><i>Composite</i></a></li>
       <li th:each="d : ${descriptors.getAssets()}" th:if="${d.visible}"><a th:href="'/create/'+${d.getType()}" th:text="${d.displayName}"></a></li>
     </ul>
   </div>

src/main/resources/templates/view.html

@@ -7,7 +7,10 @@
     <table border="1" cellpadding="4">
       <tr th:each="p : ${d.properties}">
         <th bgcolor="lightgray"><b th:text="${p.displayName}"></b></th>
-        <td th:if="${p.name == 'build'}"><a th:href="'/build/' + ${asset.getAsset().getBuild().id}" th:text="${p.renderValue(asset)}"></a></td>
+        <td th:if="${p.name == 'build'}">
+          <a th:if="${asset.getAsset().getBuild() != null}" th:href="'/build/' + ${asset.getAsset().getBuild().id}" th:text="${p.renderValue(asset)}"></a>
+          <span th:if="${asset.getAsset().getBuild() == null}" th:text="${p.renderValue(asset)}"></span>
+        </td>
         <td th:if="${p.name != 'build'}" th:text="${p.renderValue(asset)}"></td>
       </tr>
     </table>