From 2e2c8e173233670c1938415b3736958321cafb83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn?= Date: Thu, 26 Jun 2025 17:18:04 +0200 Subject: [PATCH] fix: throw if id null review comment --- .../Components/Collections/CreateCollection.cs | 2 +- .../Parameters/Wrappers/SpeckleBlockInstanceWrapper.cs | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Collections/CreateCollection.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Collections/CreateCollection.cs index b7ff7d244..a94e8d10a 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Collections/CreateCollection.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Components/Collections/CreateCollection.cs @@ -199,7 +199,7 @@ public class CreateCollection : VariableParameterComponentBase if (instanceGoo.CastFrom(obj)) { instanceGoo.Value.Path = childPath; - wrapperGoo.Value.Parent = parentCollection; + instanceGoo.Value.Parent = parentCollection; parentCollection.Elements.Add(instanceGoo.Value); } else diff --git a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockInstanceWrapper.cs b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockInstanceWrapper.cs index a83e164bf..f83090696 100644 --- a/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockInstanceWrapper.cs +++ b/Connectors/Rhino/Speckle.Connectors.GrasshopperShared/Parameters/Wrappers/SpeckleBlockInstanceWrapper.cs @@ -59,10 +59,14 @@ public class SpeckleBlockInstanceWrapper : SpeckleObjectWrapper set { _definition = value; + if (_definition != null) { - _definition.ApplicationId ??= Guid.NewGuid().ToString(); - _instanceProxy.definitionId = _definition.ApplicationId; + _instanceProxy.definitionId = + _definition.ApplicationId + ?? throw new InvalidOperationException( + "Block definition must have ApplicationId before being assigned to instance" + ); } } }